@scrypted/server 0.123.1 → 0.123.3

package/dist/services/plugin.js

@@ -168,29 +168,14 @@ class PluginComponent {
     async getRemoteServicePort(pluginId, name, ...args) {
         if (name === 'console') {
             const consoleServer = await this.scrypted.plugins[pluginId].consoleServer;
-            return consoleServer.readPort;
+            return [consoleServer.readPort, process.env.SCRYPTED_CLUSTER_ADDRESS];
         }
         if (name === 'console-writer') {
             const consoleServer = await this.scrypted.plugins[pluginId].consoleServer;
-            return consoleServer.writePort;
+            return [consoleServer.writePort, process.env.SCRYPTED_CLUSTER_ADDRESS];
         }
         return this.scrypted.plugins[pluginId].remote.getServicePort(name, ...args);
     }
-    async setHostParam(pluginId, name, param) {
-        const host = this.scrypted.plugins[pluginId];
-        if (!host)
-            return;
-        const key = `oob-param-${name}`;
-        if (param === undefined)
-            delete host.peer.params[key];
-        else
-            host.peer.params[key] = param;
-    }
-    async getHostParam(pluginId, name) {
-        const host = this.scrypted.plugins[pluginId];
-        const key = `oob-param-${name}`;
-        return host?.peer?.params?.[key];
-    }
 }
 exports.PluginComponent = PluginComponent;
 //# sourceMappingURL=plugin.js.map

package/dist/services/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/services/plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../src/services/plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@scrypted/server",
-  "version": "0.123.1",
+  "version": "0.123.3",
   "description": "",
   "dependencies": {
     "@scrypted/ffmpeg-static": "^6.1.0-build3",
     "@scrypted/node-pty": "^1.0.18",
-    "@scrypted/types": "^0.3.64",
+    "@scrypted/types": "^0.3.66",
     "adm-zip": "^0.5.16",
     "body-parser": "^1.20.3",
     "cookie-parser": "^1.4.7",

package/python/plugin_remote.py

@@ -555,9 +555,129 @@ class DeviceManager(scrypted_python.scrypted_sdk.types.DeviceManager):
         return self.nativeIds.get(nativeId, None)
 
 
+def isClusterAddress(address: str):
+    return not address or address == os.environ.get("SCRYPTED_CLUSTER_ADDRESS", None)
+
+def getClusterPeerKey(address: str, port: int):
+    return f"{address}:{port}"
+
+class ClusterSetup():
+    def __init__(self, loop: AbstractEventLoop, peer: rpc.RpcPeer):
+        self.loop = loop
+        self.peer = peer
+        self.clusterId: str = None
+        self.clusterSecret: str = None
+        self.clusterAddress: str = None
+        self.clusterPort: int = None
+        self.SCRYPTED_CLUSTER_ADDRESS: str = None
+        self.clusterPeers: Mapping[str, asyncio.Future[rpc.RpcPeer]] = {}
+
+    async def resolveObject(self, id: str, sourceKey: str):
+        sourcePeer: rpc.RpcPeer = (
+            self.peer
+            if not sourceKey
+            else await rpc.maybe_await(self.clusterPeers.get(sourceKey, None))
+        )
+        if not sourcePeer:
+            return
+        return sourcePeer.localProxyMap.get(id, None)
+
+    async def connectRPCObject(self, o: ClusterObject):
+        sha256 = self.computeClusterObjectHash(o)
+        if sha256 != o["sha256"]:
+            raise Exception("secret incorrect")
+        return await self.resolveObject(o.get('proxyId', None), o.get('sourceKey', None))
+
+    def onProxySerialization(self, peer: rpc.RpcPeer, value: Any, sourceKey: str = None):
+        properties: dict = rpc.RpcPeer.prepareProxyProperties(value) or {}
+        clusterEntry = properties.get("__cluster", None)
+        proxyId: str
+        existing = peer.localProxied.get(value, None)
+        if existing:
+            proxyId = existing["id"]
+        else:
+            proxyId = (
+                clusterEntry and clusterEntry.get("proxyId", None)
+            ) or rpc.RpcPeer.generateId()
+
+        if clusterEntry:
+            if (
+                isClusterAddress(clusterEntry.get("address", None))
+                and self.clusterPort == clusterEntry["port"]
+                and sourceKey != clusterEntry.get("sourceKey", None)
+            ):
+                clusterEntry = None
+
+        if not clusterEntry:
+            clusterEntry: ClusterObject = {
+                "id": self.clusterId,
+                "proxyId": proxyId,
+                "address": self.SCRYPTED_CLUSTER_ADDRESS,
+                "port": self.clusterPort,
+                "sourceKey": sourceKey,
+            }
+            clusterEntry["sha256"] = self.computeClusterObjectHash(clusterEntry)
+            properties["__cluster"] = clusterEntry
+
+        return proxyId, properties
+
+    async def initializeCluster(self, options: dict):
+        if self.clusterPort:
+            return
+        self.clusterId = options["clusterId"]
+        self.clusterSecret = options["clusterSecret"]
+        self.SCRYPTED_CLUSTER_ADDRESS = os.environ.get("SCRYPTED_CLUSTER_ADDRESS", None)
+
+        async def handleClusterClient(
+            reader: asyncio.StreamReader, writer: asyncio.StreamWriter
+        ):
+            clusterPeerAddress, clusterPeerPort = writer.get_extra_info("peername")
+            clusterPeerKey = getClusterPeerKey(clusterPeerAddress, clusterPeerPort)
+            rpcTransport = rpc_reader.RpcStreamTransport(reader, writer)
+            peer: rpc.RpcPeer
+            peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(
+                self.loop, rpcTransport
+            )
+            # set all params from self.peer
+            for key, value in self.peer.params.items():
+                peer.params[key] = value
+            peer.onProxySerialization = lambda value: self.onProxySerialization(
+                peer, value, clusterPeerKey
+            )
+            future: asyncio.Future[rpc.RpcPeer] = asyncio.Future()
+            future.set_result(peer)
+            self.clusterPeers[clusterPeerKey] = future
+            peer.params["connectRPCObject"] = lambda o: self.connectRPCObject(o)
+            try:
+                await peerReadLoop()
+            except:
+                pass
+            finally:
+                self.clusterPeers.pop(clusterPeerKey)
+                peer.kill("cluster client killed")
+                writer.close()
+
+        listenAddress = "0.0.0.0" if self.SCRYPTED_CLUSTER_ADDRESS else "127.0.0.1"
+        clusterRpcServer = await asyncio.start_server(
+            handleClusterClient, listenAddress, 0
+        )
+        self.clusterPort = clusterRpcServer.sockets[0].getsockname()[1]
+        self.peer.onProxySerialization = lambda value: self.onProxySerialization(self.peer, value, None)
+        del self.peer.params["initializeCluster"]
+
+    def computeClusterObjectHash(self, o: ClusterObject) -> str:
+        m = hashlib.sha256()
+        m.update(
+            bytes(
+                f"{o['id']}{o.get('address') or ''}{o['port']}{o.get('sourceKey', None) or ''}{o['proxyId']}{self.clusterSecret}",
+                "utf8",
+            )
+        )
+        return base64.b64encode(m.digest()).decode("utf-8")
+
 class PluginRemote:
     def __init__(
-        self, peer: rpc.RpcPeer, api, pluginId: str, hostInfo, loop: AbstractEventLoop
+        self, clusterSetup: ClusterSetup, api, pluginId: str, hostInfo, loop: AbstractEventLoop
     ):
         self.systemState: Mapping[str, Mapping[str, SystemDeviceState]] = {}
         self.nativeIds: Mapping[str, DeviceStorage] = {}
@@ -565,7 +685,8 @@ class PluginRemote:
         self.consoles: Mapping[str, Future[Tuple[StreamReader, StreamWriter]]] = {}
         self.ptimeSum = 0
         self.allMemoryStats = {}
-        self.peer = peer
+        self.peer = clusterSetup.peer
+        self.clusterSetup = clusterSetup
         self.api = api
         self.pluginId = pluginId
         self.hostInfo = hostInfo
@@ -593,8 +714,8 @@ class PluginRemote:
             consoleFuture = Future()
             self.consoles[nativeId] = consoleFuture
             plugins = await self.api.getComponent("plugins")
-            port = await plugins.getRemoteServicePort(self.pluginId, "console-writer")
-            connection = await asyncio.open_connection(port=port)
+            port, hostname = await plugins.getRemoteServicePort(self.pluginId, "console-writer")
+            connection = await asyncio.open_connection(host=hostname, port=port)
             _, writer = connection
             if not nativeId:
                 nid = "undefined"
@@ -631,122 +752,16 @@ class PluginRemote:
             traceback.print_exc()
             raise
 
-    async def loadZipWrapped(self, packageJson, getZip: Any, options: dict):
-        sdk = ScryptedStatic()
+    async def loadZipWrapped(self, packageJson, zipAPI: Any, options: dict):
+        await self.clusterSetup.initializeCluster(options)
 
-        clusterId = options["clusterId"]
-        clusterSecret = options["clusterSecret"]
-        SCRYPTED_CLUSTER_ADDRESS = os.environ.get("SCRYPTED_CLUSTER_ADDRESS", None)
-
-        def computeClusterObjectHash(o: ClusterObject) -> str:
-            m = hashlib.sha256()
-            m.update(
-                bytes(
-                    f"{o['id']}{o.get('address') or ''}{o['port']}{o.get('sourceKey', None) or ''}{o['proxyId']}{clusterSecret}",
-                    "utf8",
-                )
-            )
-            return base64.b64encode(m.digest()).decode("utf-8")
-
-        def isClusterAddress(address: str):
-            return not address or address == SCRYPTED_CLUSTER_ADDRESS
-
-        def onProxySerialization(peer: rpc.RpcPeer, value: Any, sourceKey: str = None):
-            properties: dict = rpc.RpcPeer.prepareProxyProperties(value) or {}
-            clusterEntry = properties.get("__cluster", None)
-            proxyId: str
-            existing = peer.localProxied.get(value, None)
-            if existing:
-                proxyId = existing["id"]
-            else:
-                proxyId = (
-                    clusterEntry and clusterEntry.get("proxyId", None)
-                ) or rpc.RpcPeer.generateId()
-
-            if clusterEntry:
-                if (
-                    isClusterAddress(clusterEntry.get("address", None))
-                    and clusterPort == clusterEntry["port"]
-                    and sourceKey != clusterEntry.get("sourceKey", None)
-                ):
-                    clusterEntry = None
-
-            if not clusterEntry:
-                clusterEntry: ClusterObject = {
-                    "id": clusterId,
-                    "proxyId": proxyId,
-                    "address": SCRYPTED_CLUSTER_ADDRESS,
-                    "port": clusterPort,
-                    "sourceKey": sourceKey,
-                }
-                clusterEntry["sha256"] = computeClusterObjectHash(clusterEntry)
-                properties["__cluster"] = clusterEntry
-
-            return proxyId, properties
-
-        self.peer.onProxySerialization = lambda value: onProxySerialization(
-            self.peer, value, None
-        )
-
-        async def resolveObject(id: str, sourceKey: str):
-            sourcePeer: rpc.RpcPeer = (
-                self.peer
-                if not sourceKey
-                else await rpc.maybe_await(clusterPeers.get(sourceKey, None))
-            )
-            if not sourcePeer:
-                return
-            return sourcePeer.localProxyMap.get(id, None)
-
-        clusterPeers: Mapping[str, asyncio.Future[rpc.RpcPeer]] = {}
-
-        def getClusterPeerKey(address: str, port: int):
-            return f"{address}:{port}"
-
-        async def handleClusterClient(
-            reader: asyncio.StreamReader, writer: asyncio.StreamWriter
-        ):
-            clusterPeerAddress, clusterPeerPort = writer.get_extra_info("peername")
-            clusterPeerKey = getClusterPeerKey(clusterPeerAddress, clusterPeerPort)
-            rpcTransport = rpc_reader.RpcStreamTransport(reader, writer)
-            peer: rpc.RpcPeer
-            peer, peerReadLoop = await rpc_reader.prepare_peer_readloop(
-                self.loop, rpcTransport
-            )
-            peer.onProxySerialization = lambda value: onProxySerialization(
-                peer, value, clusterPeerKey
-            )
-            future: asyncio.Future[rpc.RpcPeer] = asyncio.Future()
-            future.set_result(peer)
-            clusterPeers[clusterPeerKey] = future
-
-            async def connectRPCObject(o: ClusterObject):
-                sha256 = computeClusterObjectHash(o)
-                if sha256 != o["sha256"]:
-                    raise Exception("secret incorrect")
-                return await resolveObject(o["proxyId"], o.get("sourceKey", None))
-
-            peer.params["connectRPCObject"] = connectRPCObject
-            try:
-                await peerReadLoop()
-            except:
-                pass
-            finally:
-                clusterPeers.pop(clusterPeerKey)
-                peer.kill("cluster client killed")
-                writer.close()
-
-        listenAddress = "0.0.0.0" if SCRYPTED_CLUSTER_ADDRESS else "127.0.0.1"
-        clusterRpcServer = await asyncio.start_server(
-            handleClusterClient, listenAddress, 0
-        )
-        clusterPort = clusterRpcServer.sockets[0].getsockname()[1]
+        sdk = ScryptedStatic()
 
         def ensureClusterPeer(address: str, port: int):
             if isClusterAddress(address):
                 address = "127.0.0.1"
             clusterPeerKey = getClusterPeerKey(address, port)
-            clusterPeerPromise = clusterPeers.get(clusterPeerKey)
+            clusterPeerPromise = self.clusterSetup.clusterPeers.get(clusterPeerKey)
             if clusterPeerPromise:
                 return clusterPeerPromise
 
@@ -755,7 +770,7 @@ class PluginRemote:
                     reader, writer = await asyncio.open_connection(address, port)
                     sourceAddress, sourcePort = writer.get_extra_info("sockname")
                     if (
-                        sourceAddress != SCRYPTED_CLUSTER_ADDRESS
+                        sourceAddress != self.clusterSetup.SCRYPTED_CLUSTER_ADDRESS
                         and sourceAddress != "127.0.0.1"
                     ):
                         print("source address mismatch", sourceAddress)
@@ -763,13 +778,16 @@ class PluginRemote:
                     clusterPeer, peerReadLoop = await rpc_reader.prepare_peer_readloop(
                         self.loop, rpcTransport
                     )
+                    # set all params from self.peer
+                    for key, value in self.peer.params.items():
+                        clusterPeer.params[key] = value
                     clusterPeer.onProxySerialization = (
-                        lambda value: onProxySerialization(
+                        lambda value: self.clusterSetup.onProxySerialization(
                             clusterPeer, value, clusterPeerKey
                         )
                     )
                 except:
-                    clusterPeers.pop(clusterPeerKey)
+                    self.clusterSetup.clusterPeers.pop(clusterPeerKey)
                     raise
 
                 async def run_loop():
@@ -778,14 +796,14 @@ class PluginRemote:
                     except:
                         pass
                     finally:
-                        clusterPeers.pop(clusterPeerKey)
+                        self.clusterSetup.clusterPeers.pop(clusterPeerKey)
 
                 asyncio.run_coroutine_threadsafe(run_loop(), self.loop)
                 return clusterPeer
 
             clusterPeerPromise = self.loop.create_task(connectClusterPeer())
 
-            clusterPeers[clusterPeerKey] = clusterPeerPromise
+            self.clusterSetup.clusterPeers[clusterPeerKey] = clusterPeerPromise
             return clusterPeerPromise
 
         async def connectRPCObject(value):
@@ -795,16 +813,14 @@ class PluginRemote:
 
             clusterObject: ClusterObject = __cluster
 
-            if clusterObject.get("id", None) != clusterId:
+            if clusterObject.get("id", None) != self.clusterSetup.clusterId:
                 return value
 
             address = clusterObject.get("address", None)
             port = clusterObject["port"]
             proxyId = clusterObject["proxyId"]
-            if port == clusterPort:
-                return await resolveObject(
-                    proxyId, clusterObject.get("sourceKey", None)
-                )
+            if port == self.clusterSetup.clusterPort:
+                return await self.clusterSetup.connectRPCObject(clusterObject)
 
             clusterPeerPromise = ensureClusterPeer(address, port)
 
@@ -846,7 +862,7 @@ class PluginRemote:
 
         if not os.path.exists(zipPath) or debug:
             os.makedirs(os.path.dirname(zipPath), exist_ok=True)
-            zipData = await getZip()
+            zipData = await zipAPI.getZip()
             zipPathTmp = zipPath + ".tmp"
             with open(zipPathTmp, "wb") as f:
                 f.write(zipData)
@@ -962,7 +978,7 @@ class PluginRemote:
         self.deviceManager = DeviceManager(self.nativeIds, self.systemManager)
         self.mediaManager = MediaManager(await self.api.getMediaManager())
 
-        await self.start_stats_runner()
+        await self.start_stats_runner(zipAPI.updateState)
 
         try:
             from scrypted_sdk import sdk_init2  # type: ignore
@@ -1030,7 +1046,7 @@ class PluginRemote:
                     forkOptions = options.copy()
                     forkOptions["fork"] = True
                     forkOptions["debug"] = debug
-                    return await remote.loadZip(packageJson, getZip, forkOptions)
+                    return await remote.loadZip(packageJson, zipAPI.getZip, forkOptions)
 
                 pluginFork.result = asyncio.create_task(getFork())
                 return pluginFork
@@ -1119,10 +1135,10 @@ class PluginRemote:
                 raise Exception("REPL unavailable: Plugin not loaded.")
             if self.replPort == 0:
                 raise Exception("REPL unavailable: Python REPL not available.")
-            return self.replPort
+            return [self.replPort, os.getenv("SCRYPTED_CLUSTER_ADDRESS", None)]
         raise Exception(f"unknown service {name}")
 
-    async def start_stats_runner(self):
+    async def start_stats_runner(self, update_stats):
         pong = None
 
         async def ping(time: int):
@@ -1132,11 +1148,6 @@ class PluginRemote:
 
         self.peer.params["ping"] = ping
 
-        update_stats = await self.peer.getParam("updateStats")
-        if not update_stats:
-            print("host did not provide update_stats")
-            return
-
         def stats_runner():
             ptime = round(time.process_time() * 1000000) + self.ptimeSum
             try:
@@ -1175,8 +1186,12 @@ async def plugin_async_main(
 ):
     peer, readLoop = await rpc_reader.prepare_peer_readloop(loop, rpcTransport)
     peer.params["print"] = print
+
+    clusterSetup = ClusterSetup(loop, peer)
+    peer.params["initializeCluster"] = lambda options: clusterSetup.initializeCluster(options)
+
     peer.params["getRemote"] = lambda api, pluginId, hostInfo: PluginRemote(
-        peer, api, pluginId, hostInfo, loop
+        clusterSetup, api, pluginId, hostInfo, loop
     )
 
     try:

package/python/rpc_reader.py

@@ -12,23 +12,7 @@ import multiprocessing.connection
 import rpc
 import concurrent.futures
 import json
-import math
-
-def convert_nan_inf_to_none(obj):
-    if isinstance(obj, dict):
-        return {key: convert_nan_inf_to_none(value) for key, value in obj.items()}
-    elif isinstance(obj, list):
-        return [convert_nan_inf_to_none(item) for item in obj]
-    elif isinstance(obj, float):
-        if math.isnan(obj):
-            return None
-        if math.isinf(obj):
-            return None
-    return obj
-
-def json_dumps_clean(obj, **kwargs):
-    cleaned_obj = convert_nan_inf_to_none(obj)
-    return json.dumps(cleaned_obj, **kwargs)
+
 
 class BufferSerializer(rpc.RpcSerializer):
     def serialize(self, value, serializationContext):
@@ -110,7 +94,7 @@ class RpcFileTransport(RpcTransport):
                 reject(e)
 
     def writeJSON(self, j, reject):
-        return self.writeMessage(0, bytes(json_dumps_clean(j), 'utf8'), reject)
+        return self.writeMessage(0, bytes(json.dumps(j, allow_nan=False), 'utf8'), reject)
 
     def writeBuffer(self, buffer, reject):
         return self.writeMessage(1, buffer, reject)
@@ -144,7 +128,7 @@ class RpcStreamTransport(RpcTransport):
                 reject(e)
 
     def writeJSON(self, j, reject):
-        return self.writeMessage(0, bytes(json_dumps_clean(j), 'utf8'), reject)
+        return self.writeMessage(0, bytes(json.dumps(j, allow_nan=False), 'utf8'), reject)
 
     def writeBuffer(self, buffer, reject):
         return self.writeMessage(1, buffer, reject)

package/src/ip.ts

@@ -1,10 +1,11 @@
 import os from 'os';
 import net from 'net';
 
+export const loopbackList = new net.BlockList();
+loopbackList.addSubnet('127.0.0.0', 8);
+loopbackList.addAddress('::1', 'ipv6');
+
 const unusableList = new net.BlockList();
-// loopback
-unusableList.addSubnet('127.0.0.0', 8);
-unusableList.addAddress('::1', 'ipv6');
 
 // link local
 unusableList.addSubnet('169.254.0.0', 16);
@@ -56,7 +57,7 @@ function isUsableNetworkAddress(address: string) {
         if (type === 'ipv6' && privateList.check(address, type))
             return false;
 
-        return !unusableList.check(address, type);
+        return !unusableList.check(address, type) && !loopbackList.check(address, type);
     }
     catch (e) {
         return false;

package/src/listen-zero.ts

@@ -1,5 +1,6 @@
 import { once } from 'events';
 import net from 'net';
+import tls from 'tls';
 
 export class ListenZeroSingleClientTimeoutError extends Error {
     constructor() {
@@ -13,8 +14,8 @@ export async function listenZero(server: net.Server, hostname: string) {
     return (server.address() as net.AddressInfo).port;
 }
 
-export async function listenZeroSingleClient(hostname: string, options?: net.ServerOpts, listenTimeout = 30000) {
-    const server = new net.Server(options);
+export async function listenZeroSingleClient(hostname: string, options?: net.ServerOpts & { tls?: boolean }, listenTimeout = 30000) {
+    const server = options?.tls ? new tls.Server(options) : new net.Server(options);
     const port = await listenZero(server, hostname);
 
     let cancel: () => void;

package/src/plugin/plugin-api.ts

@@ -1,5 +1,6 @@
 import type { Device, DeviceManifest, EventDetails, EventListenerOptions, EventListenerRegister, MediaManager, MediaObject, ScryptedDevice, ScryptedInterfaceDescriptor, ScryptedInterfaceProperty, ScryptedNativeId, SystemDeviceState } from '@scrypted/types';
-import { AccessControls } from './acl';
+import type { AccessControls } from './acl';
+import type { PluginStats } from './plugin-remote-stats';
 
 export interface PluginLogger {
     log(level: string, message: string): Promise<void>;
@@ -167,8 +168,15 @@ export interface PluginRemoteLoadZipOptions {
     clusterSecret: string;
 }
 
+export class PluginZipAPI {
+    constructor(
+        public getZip: () => Promise<Buffer>,
+        public updateStats: (stats: PluginStats) => Promise<void>) {
+    }
+}
+
 export interface PluginRemote {
-    loadZip(packageJson: any, getZip: () => Promise<Buffer>, options: PluginRemoteLoadZipOptions): Promise<any>;
+    loadZip(packageJson: any, zipAPI: PluginZipAPI, options: PluginRemoteLoadZipOptions): Promise<any>;
     setSystemState(state: { [id: string]: { [property: string]: SystemDeviceState } }): Promise<void>;
     setNativeId(nativeId: ScryptedNativeId, id: string, storage: { [key: string]: any }): Promise<void>;
     updateDeviceState(id: string, state: { [property: string]: SystemDeviceState }): Promise<void>;
@@ -182,7 +190,7 @@ export interface PluginRemote {
 
     createDeviceState(id: string, setState: (property: string, value: any) => Promise<any>): Promise<any>;
 
-    getServicePort(name: string, ...args: any[]): Promise<number>;
+    getServicePort(name: string, ...args: any[]): Promise<[number, string]>;
 }
 
 export interface MediaObjectRemote extends MediaObject {