wyze: cluster mode support

koush · Dec 31, 2024 · e163aa8 · e163aa8
1 parent 2682256
commit e163aa8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/plugins/wyze/.vscode/settings.json b/plugins/wyze/.vscode/settings.json
@@ -1,6 +1,6 @@
 
 {
-    "scrypted.debugHost": "scrypted-nvr",
+    "scrypted.debugHost": "127.0.0.1",
 
     "python.analysis.extraPaths": [
         "./node_modules/@scrypted/sdk/types/scrypted_python"

diff --git a/plugins/wyze/package-lock.json b/plugins/wyze/package-lock.json
diff --git a/plugins/wyze/package.json b/plugins/wyze/package.json
@@ -38,5 +38,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.0.55"
+   "version": "0.0.56"
 }
diff --git a/plugins/wyze/src/main.py b/plugins/wyze/src/main.py
@@ -305,11 +305,12 @@ def kill():
                 pkill(aprocess)
 
     async def ensureServer(self, cb) -> int:
-        server = await asyncio.start_server(cb, "127.0.0.1", 0)
+        host = os.environ.get("SCRYPTED_CLUSTER_ADDRESS", None) or "127.0.0.1"
+        server = await asyncio.start_server(cb, host, 0)
         sock = server.sockets[0]
         host, port = sock.getsockname()
         asyncio.ensure_future(server.serve_forever())
-        return port
+        return host, port
 
     async def probeCodec(self, substream: bool):
         sps: bytes = None
@@ -414,7 +415,7 @@ async def getVideoStream(
             print_exception(self.print, e)
             raise
 
-        rfcPort = await self.rfcSubServer if substream else await self.rfcServer
+        rfcHost, rfcPort = await self.rfcSubServer if substream else await self.rfcServer
 
         msos = self.getVideoStreamOptionsInternal()
         mso = msos[1] if substream else msos[0]
@@ -441,7 +442,7 @@ async def getVideoStream(
 a=rtpmap:97 {audioCodecName}/{info.audioSampleRate}/1
 """
         rfc = {
-            "url": f"tcp://127.0.0.1:{rfcPort}",
+            "url": f"tcp://{rfcHost}:{rfcPort}",
             "sdp": sdp,
             "mediaStreamOptions": mso,
         }