Skip to content

Commit e163aa8

Browse files
committed
wyze: cluster mode support
1 parent 2682256 commit e163aa8

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

plugins/wyze/.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
{
3-
"scrypted.debugHost": "scrypted-nvr",
3+
"scrypted.debugHost": "127.0.0.1",
44

55
"python.analysis.extraPaths": [
66
"./node_modules/@scrypted/sdk/types/scrypted_python"

plugins/wyze/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/wyze/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@
3838
"devDependencies": {
3939
"@scrypted/sdk": "file:../../sdk"
4040
},
41-
"version": "0.0.55"
41+
"version": "0.0.56"
4242
}

plugins/wyze/src/main.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,12 @@ def kill():
305305
pkill(aprocess)
306306

307307
async def ensureServer(self, cb) -> int:
308-
server = await asyncio.start_server(cb, "127.0.0.1", 0)
308+
host = os.environ.get("SCRYPTED_CLUSTER_ADDRESS", None) or "127.0.0.1"
309+
server = await asyncio.start_server(cb, host, 0)
309310
sock = server.sockets[0]
310311
host, port = sock.getsockname()
311312
asyncio.ensure_future(server.serve_forever())
312-
return port
313+
return host, port
313314

314315
async def probeCodec(self, substream: bool):
315316
sps: bytes = None
@@ -414,7 +415,7 @@ async def getVideoStream(
414415
print_exception(self.print, e)
415416
raise
416417

417-
rfcPort = await self.rfcSubServer if substream else await self.rfcServer
418+
rfcHost, rfcPort = await self.rfcSubServer if substream else await self.rfcServer
418419

419420
msos = self.getVideoStreamOptionsInternal()
420421
mso = msos[1] if substream else msos[0]
@@ -441,7 +442,7 @@ async def getVideoStream(
441442
a=rtpmap:97 {audioCodecName}/{info.audioSampleRate}/1
442443
"""
443444
rfc = {
444-
"url": f"tcp://127.0.0.1:{rfcPort}",
445+
"url": f"tcp://{rfcHost}:{rfcPort}",
445446
"sdp": sdp,
446447
"mediaStreamOptions": mso,
447448
}

0 commit comments

Comments
 (0)