@scrypted/server 0.119.1 → 0.119.3

package/dist/plugin/runtime/child-process-worker.js

@@ -17,6 +17,12 @@ class ChildProcessWorker extends ws_1.EventEmitter {
         this.worker.on('disconnect', () => this.emit('error', new Error('disconnect')));
         this.worker.on('exit', (code, signal) => this.emit('exit', code, signal));
         this.worker.on('error', e => this.emit('error', e));
+        // aggressively catch errors
+        // ECONNRESET can be raised when the child process is killed
+        for (const stdio of this.worker.stdio || []) {
+            if (stdio)
+                stdio.on('error', e => this.emit('error', e));
+        }
     }
     get pid() {
         return this.worker?.pid;

package/dist/plugin/runtime/child-process-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"child-process-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/child-process-worker.ts"],"names":[],"mappings":";;;AACA,2BAAkC;AAIlC,MAAsB,kBAAmB,SAAQ,iBAAY;IAOtC;IANT,MAAM,CAA6B;IAE7C,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAmB,QAAgB,EAAE,OAA6B;QAC9D,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAQ;IAEnC,CAAC;IAED,WAAW;QACP,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,MAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,OAAO;QACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;CAIJ;AAvCD,gDAuCC"}
+{"version":3,"file":"child-process-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/child-process-worker.ts"],"names":[],"mappings":";;;AACA,2BAAkC;AAIlC,MAAsB,kBAAmB,SAAQ,iBAAY;IAOtC;IANT,MAAM,CAA6B;IAE7C,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAmB,QAAgB,EAAE,OAA6B;QAC9D,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAQ;IAEnC,CAAC;IAED,WAAW;QACP,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,MAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACpD,4BAA4B;QAC5B,4DAA4D;QAC5D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,EAAE,CAAC;YAC1C,IAAI,KAAK;gBACL,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,OAAO;QACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;CAIJ;AA7CD,gDA6CC"}

package/dist/rpc.d.ts

@@ -94,7 +94,7 @@ export declare class RpcPeer {
     killed: Promise<string>;
     killedDeferred: Deferred;
     tags: any;
-    yieldedAsyncIterators: Set<AsyncGenerator<unknown, any, unknown>>;
+    yieldedAsyncIterators: Set<AsyncGenerator<unknown, any, any>>;
     static readonly finalizerIdSymbol: unique symbol;
     static remotesCollected: number;
     static remotesCreated: number;

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@scrypted/server",
-  "version": "0.119.1",
+  "version": "0.119.3",
   "description": "",
   "dependencies": {
     "@scrypted/ffmpeg-static": "^6.1.0-build1",
     "@scrypted/node-pty": "^1.0.18",
-    "@scrypted/types": "^0.3.57",
+    "@scrypted/types": "^0.3.62",
     "adm-zip": "^0.5.16",
-    "body-parser": "^1.20.2",
-    "cookie-parser": "^1.4.6",
+    "body-parser": "^1.20.3",
+    "cookie-parser": "^1.4.7",
     "dotenv": "^16.4.5",
-    "engine.io": "^6.6.0",
-    "express": "^4.19.2",
+    "engine.io": "^6.6.2",
+    "express": "^4.21.1",
     "follow-redirects": "^1.15.9",
     "http-auth": "^4.2.0",
     "level": "^8.0.1",
@@ -19,24 +19,24 @@
     "node-dijkstra": "^2.5.0",
     "node-forge": "^1.3.1",
     "node-gyp": "^10.2.0",
-    "py": "npm:@bjia56/portable-python@^0.1.83",
+    "py": "npm:@bjia56/portable-python@^0.1.94",
     "semver": "^7.6.3",
     "sharp": "^0.33.5",
     "source-map-support": "^0.5.21",
     "tar": "^7.4.3",
-    "tslib": "^2.7.0",
-    "typescript": "^5.5.4",
+    "tslib": "^2.8.0",
+    "typescript": "^5.6.3",
     "whatwg-mimetype": "^4.0.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
     "@types/cookie-parser": "^1.4.7",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
     "@types/follow-redirects": "^1.14.4",
     "@types/http-auth": "^4.1.4",
-    "@types/lodash": "^4.17.7",
-    "@types/node": "^22.5.4",
+    "@types/lodash": "^4.17.10",
+    "@types/node": "^22.7.6",
     "@types/node-dijkstra": "^2.5.6",
     "@types/node-forge": "^1.3.11",
     "@types/semver": "^7.5.8",

package/python/plugin_remote.py

@@ -4,10 +4,12 @@ import asyncio
 import base64
 import gc
 import hashlib
+import inspect
 import multiprocessing
 import multiprocessing.connection
 import os
 import platform
+import random
 import sys
 import threading
 import time
@@ -18,7 +20,7 @@ from asyncio.futures import Future
 from asyncio.streams import StreamReader, StreamWriter
 from collections.abc import Mapping
 from io import StringIO
-from typing import Any, Optional, Set, Tuple, TypedDict
+from typing import Any, Optional, Set, Tuple, TypedDict, Callable, Coroutine
 
 import plugin_volume as pv
 import rpc
@@ -57,6 +59,14 @@ class SystemDeviceState(TypedDict):
     value: any
 
 
+def ensure_not_coroutine(fn: Callable | Coroutine) -> Callable:
+    if inspect.iscoroutinefunction(fn):
+        def wrapper(*args, **kwargs):
+            return asyncio.create_task(fn(*args, **kwargs))
+        return wrapper
+    return fn
+
+
 class DeviceProxy(object):
     def __init__(self, systemManager: SystemManager, id: str):
         self.systemManager = systemManager
@@ -97,6 +107,116 @@ class DeviceProxy(object):
         return apply()
 
 
+class EventListenerRegisterImpl(scrypted_python.scrypted_sdk.EventListenerRegister):
+    removeListener: Callable[[], None]
+
+    def __init__(self, removeListener: Callable[[], None] | Coroutine[Any, None, None]) -> None:
+        self.removeListener = ensure_not_coroutine(removeListener)
+
+
+class EventRegistry(object):
+    systemListeners: Set[scrypted_python.scrypted_sdk.EventListener]
+    listeners: Mapping[str, Set[Callable[[scrypted_python.scrypted_sdk.EventDetails, Any], None]]]
+
+    __allowedEventInterfaces = set([
+        ScryptedInterface.ScryptedDevice.value,
+        'Logger',
+        'Storage'
+    ])
+
+    def __init__(self) -> None:
+        self.systemListeners = set()
+        self.listeners = {}
+
+    def __getMixinEventName(self, options: str | scrypted_python.scrypted_sdk.EventListenerOptions) -> str:
+        mixinId = None
+        if type(options) == str:
+            event = options
+        else:
+            options = options or {}
+            event = options.get("event", None)
+            mixinId = options.get("mixinId", None)
+        if not event:
+            event = "undefined"
+        if not mixinId:
+            return event
+        return f"{event}-mixin-{mixinId}"
+
+    def __generateBase36Str(self) -> str:
+        alphabet = "0123456789abcdefghijklmnopqrstuvwxyz"
+        return "".join(random.choices(alphabet, k=10))
+
+    def listen(
+        self, callback: scrypted_python.scrypted_sdk.EventListener
+    ) -> scrypted_python.scrypted_sdk.EventListenerRegister:
+        callback = ensure_not_coroutine(callback)
+        self.systemListeners.add(callback)
+        return EventListenerRegisterImpl(lambda: self.systemListeners.remove(callback))
+
+    def listenDevice(
+        self,
+        id: str,
+        options: str | scrypted_python.scrypted_sdk.EventListenerOptions,
+        callback: Callable[[scrypted_python.scrypted_sdk.EventDetails, Any], None],
+    ) -> scrypted_python.scrypted_sdk.EventListenerRegister:
+        event = self.__getMixinEventName(options)
+        token = f"{id}#{event}"
+        events = self.listeners.get(token)
+        if not events:
+            events = set()
+            self.listeners[token] = events
+        callback = ensure_not_coroutine(callback)
+        self.listeners[id].add(callback)
+        return EventListenerRegisterImpl(lambda: self.listeners[id].remove(callback))
+
+    def notify(self, id: str, eventTime: int, eventInterface: str, property: str, value: Any, options: dict = None):
+        options = options or {}
+        changed = options.get("changed")
+        mixinId = options.get("mixinId")
+
+        # prevent property event noise
+        if property and not changed:
+            return False
+
+        eventDetails = {
+            "eventId": None,
+            "eventTime": eventTime,
+            "eventInterface": eventInterface,
+            "property": property,
+            "mixinId": mixinId,
+        }
+
+        return self.notifyEventDetails(id, eventDetails, value)
+
+    def notifyEventDetails(self, id: str, eventDetails: scrypted_python.scrypted_sdk.EventDetails, value: Any, eventInterface: str = None):
+        if not eventDetails.get("eventId"):
+            eventDetails["eventId"] = self.__generateBase36Str()
+        if not eventInterface:
+            eventInterface = eventDetails.get("eventInterface")
+
+        # system listeners only get state changes.
+        # there are many potentially noisy stateless events, like
+        # object detection and settings changes
+        if (eventDetails.get("property") and not eventDetails.get("mixinId")) or \
+            (eventInterface in EventRegistry.__allowedEventInterfaces):
+            for listener in self.systemListeners:
+                listener(id, eventDetails, value)
+
+        token = f"{id}#{eventInterface}"
+        listeners = self.listeners.get(token)
+        if listeners:
+            for listener in listeners:
+                listener(eventDetails, value)
+
+        token = f"{id}#undefined"
+        listeners = self.listeners.get(token)
+        if listeners:
+            for listener in listeners:
+                listener(eventDetails, value)
+
+        return True
+
+
 class SystemManager(scrypted_python.scrypted_sdk.types.SystemManager):
     def __init__(
         self, api: Any, systemState: Mapping[str, Mapping[str, SystemDeviceState]]
@@ -105,6 +225,7 @@ class SystemManager(scrypted_python.scrypted_sdk.types.SystemManager):
         self.api = api
         self.systemState = systemState
         self.deviceProxies: Mapping[str, DeviceProxy] = {}
+        self.events = EventRegistry()
 
     async def getComponent(self, id: str) -> Any:
         return await self.api.getComponent(id)
@@ -170,20 +291,34 @@ class SystemManager(scrypted_python.scrypted_sdk.types.SystemManager):
             if checkName.get("value", None) == name:
                 return self.getDeviceById(check)
 
-    # TODO
-    async def listen(
+    def listen(
         self, callback: scrypted_python.scrypted_sdk.EventListener
     ) -> scrypted_python.scrypted_sdk.EventListenerRegister:
-        return super().listen(callback)
+        return self.events.listen(callback)
 
-    # TODO
-    async def listenDevice(
+    def listenDevice(
         self,
         id: str,
-        event: str | scrypted_python.scrypted_sdk.EventListenerOptions,
+        options: str | scrypted_python.scrypted_sdk.EventListenerOptions,
         callback: scrypted_python.scrypted_sdk.EventListener,
     ) -> scrypted_python.scrypted_sdk.EventListenerRegister:
-        return super().listenDevice(id, event, callback)
+        callback = ensure_not_coroutine(callback)
+        if type(options) != str and options.get("watch"):
+            return self.events.listenDevice(
+                id, options,
+                lambda eventDetails, eventData: callback(self.getDeviceById(id), eventDetails, eventData)
+            )
+
+        register_fut = asyncio.ensure_future(
+            self.api.listenDevice(
+                id, options,
+                lambda eventDetails, eventData: callback(self.getDeviceById(id), eventDetails, eventData)
+            )
+        )
+        async def unregister():
+            register = await register_fut
+            await register.removeListener()
+        return EventListenerRegisterImpl(lambda: asyncio.ensure_future(unregister()))
 
     async def removeDevice(self, id: str) -> None:
         return await self.api.removeDevice(id)

package/src/plugin/runtime/child-process-worker.ts

@@ -19,6 +19,12 @@ export abstract class ChildProcessWorker extends EventEmitter implements Runtime
         this.worker.on('disconnect', () => this.emit('error', new Error('disconnect')));
         this.worker.on('exit', (code, signal) => this.emit('exit', code, signal));
         this.worker.on('error', e => this.emit('error', e));
+        // aggressively catch errors
+        // ECONNRESET can be raised when the child process is killed
+        for (const stdio of this.worker.stdio || []) {
+            if (stdio)
+                stdio.on('error', e => this.emit('error', e));
+        }
     }
 
     get pid() {