Merge pull request #1078 from mback2k/livestreaming

Support for MPEG-TS livestreaming via local TCP proxy server

Author: fronzbot

blinkpy/api.py

@@ -230,6 +230,18 @@ async def request_command_status(blink, network, command_id):
     return await http_get(blink, url)
 
 
+async def request_command_done(blink, network, command_id):
+    """
+    Request command to be done.
+
+    :param blink: Blink instance.
+    :param network: Sync module network id.
+    :param command_id: Command id to mark as done.
+    """
+    url = f"{blink.urls.base_url}/network/{network}/command/{command_id}/done/"
+    return await http_post(blink, url)
+
+
 @Throttle(seconds=MIN_THROTTLE_TIME)
 async def request_homescreen(blink, **kwargs):
     """Request homescreen info."""
@@ -347,7 +359,8 @@ async def request_camera_liveview(blink, network, camera_id):
         f"{blink.urls.base_url}/api/v5/accounts/{blink.account_id}"
         f"/networks/{network}/cameras/{camera_id}/liveview"
     )
-    response = await http_post(blink, url)
+    data = dumps({"intent": "liveview"})
+    response = await http_post(blink, url, data=data)
     await wait_for_command(blink, response)
     return response
 
@@ -561,6 +574,7 @@ async def wait_for_command(blink, json_data: dict) -> bool:
         network_id = json_data.get("network_id")
         command_id = json_data.get("id")
     except AttributeError:
+        _LOGGER.exception("No network_id or id in response")
         return False
     if command_id and network_id:
         for _ in range(0, MAX_RETRY):
@@ -573,3 +587,5 @@ async def wait_for_command(blink, json_data: dict) -> bool:
                 if status.get("complete"):
                     return True
             await sleep(COMMAND_POLL_TIME)
+    else:
+        _LOGGER.debug("No network_id or id in response")

blinkpy/camera.py

@@ -13,6 +13,7 @@
 from blinkpy import api
 from blinkpy.helpers.constants import TIMEOUT_MEDIA
 from blinkpy.helpers.util import to_alphanumeric
+from blinkpy.livestream import BlinkLiveStream
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -413,6 +414,15 @@ async def get_liveview(self):
         )
         return response["server"]
 
+    async def init_livestream(self):
+        """Initialize livestream."""
+        response = await api.request_camera_liveview(
+            self.sync.blink, self.sync.network_id, self.camera_id
+        )
+        if not response["server"].startswith("immis://"):
+            raise NotImplementedError("Unsupported: {}".format(response["server"]))
+        return BlinkLiveStream(self, response)
+
     async def image_to_file(self, path):
         """
         Write image to file.
@@ -548,13 +558,24 @@ async def get_liveview(self):
             f"{self.sync.blink.account_id}/networks/"
             f"{self.network_id}/owls/{self.camera_id}/liveview"
         )
-        response = await api.http_post(self.sync.blink, url)
+        data = dumps({"intent": "liveview"})
+        response = await api.http_post(self.sync.blink, url, data=data)
+        await api.wait_for_command(self.sync.blink, response)
+        return response["server"]
+
+    async def init_livestream(self):
+        """Initialize livestream."""
+        url = (
+            f"{self.sync.urls.base_url}/api/v1/accounts/"
+            f"{self.sync.blink.account_id}/networks/"
+            f"{self.network_id}/owls/{self.camera_id}/liveview"
+        )
+        data = dumps({"intent": "liveview"})
+        response = await api.http_post(self.sync.blink, url, data=data)
         await api.wait_for_command(self.sync.blink, response)
-        server = response["server"]
-        server_split = server.split(":")
-        server_split[0] = "rtsps"
-        link = ":".join(server_split)
-        return link
+        if not response["server"].startswith("immis://"):
+            raise NotImplementedError("Unsupported: {}".format(response["server"]))
+        return BlinkLiveStream(self, response)
 
 
 class BlinkDoorbell(BlinkCamera):
@@ -620,8 +641,21 @@ async def get_liveview(self):
             f"{self.sync.blink.account_id}/networks/"
             f"{self.sync.network_id}/doorbells/{self.camera_id}/liveview"
         )
-        response = await api.http_post(self.sync.blink, url)
+        data = dumps({"intent": "liveview"})
+        response = await api.http_post(self.sync.blink, url, data=data)
+        await api.wait_for_command(self.sync.blink, response)
+        return response["server"]
+
+    async def init_livestream(self):
+        """Initialize livestream."""
+        url = (
+            f"{self.sync.urls.base_url}/api/v1/accounts/"
+            f"{self.sync.blink.account_id}/networks/"
+            f"{self.sync.network_id}/doorbells/{self.camera_id}/liveview"
+        )
+        data = dumps({"intent": "liveview"})
+        response = await api.http_post(self.sync.blink, url, data=data)
         await api.wait_for_command(self.sync.blink, response)
-        server = response["server"]
-        link = server.replace("immis://", "rtsps://")
-        return link
+        if not response["server"].startswith("immis://"):
+            raise NotImplementedError("Unsupported: {}".format(response["server"]))
+        return BlinkLiveStream(self, response)