@camera.ui/server 2.0.21 → 2.0.23

package/dist/server/src/plugins/runtime/node/storageController.js

@@ -1,7 +1,6 @@
 import { DeviceStorage } from './storage.js';
-// Stable storage key for sensor instance storage.
-function sensorStorageKey(cameraId, sensorType, pluginId, sensorName) {
-    return `${cameraId}:sensor:${sensorType}:${pluginId}:${sensorName}`;
+function sensorStorageKey(sensorId) {
+    return `sensor:${sensorId}`;
 }
 export class StorageController {
     #api;
@@ -43,39 +42,32 @@ export class StorageController {
     getPluginStorage() {
         return this.#storages.get('storage');
     }
-    createSensorStorage(cameraId, sensorType, pluginId, sensorName, sensorId, schemas = []) {
-        const storageKey = sensorStorageKey(cameraId, sensorType, pluginId, sensorName);
+    createSensorStorage(pluginId, sensorId, schemas = []) {
+        const storageKey = sensorStorageKey(sensorId);
         let storage = this.#storages.get(storageKey);
         if (!storage) {
-            // storageKey is only the in-memory registry key; persistence addresses
-            // the canonical sensors.<camId>.<type>.<name> path. sensorId is the
-            // runtime UUID for the RPC namespace.
-            storage = new DeviceStorage(this.#api, this.#proxy, this.#plugin, this.#pluginDb, { kind: 'sensor', cameraId, sensorType, sensorName }, schemas, sensorId);
+            storage = new DeviceStorage(this.#api, this.#proxy, this.#plugin, this.#pluginDb, { kind: 'sensor', pluginId, sensorId }, schemas, sensorId);
             this.#storages.set(storageKey, storage);
-            storage.updateSchema(schemas);
-        }
-        else {
-            storage.updateSchema(schemas);
         }
+        storage.updateSchema(schemas);
         return storage;
     }
-    getSensorStorage(cameraId, sensorType, pluginId, sensorName) {
-        const storageKey = sensorStorageKey(cameraId, sensorType, pluginId, sensorName);
-        return this.#storages.get(storageKey);
+    getSensorStorage(sensorId) {
+        return this.#storages.get(sensorStorageKey(sensorId));
     }
-    async createStorage(type, deviceIdOrCameraId, sensorTypeOrUndefined, pluginId, sensorName, sensorId) {
+    async createStorage(type, deviceIdOrPluginId, sensorId) {
         let storage;
         if (type === 'camera') {
-            if (!deviceIdOrCameraId) {
+            if (!deviceIdOrPluginId) {
                 throw new Error('deviceId is required for camera storage creation');
             }
-            storage = this.createCameraStorage(deviceIdOrCameraId);
+            storage = this.createCameraStorage(deviceIdOrPluginId);
         }
         else if (type === 'sensor') {
-            if (!deviceIdOrCameraId || !sensorTypeOrUndefined || !pluginId || !sensorName || !sensorId) {
-                throw new Error('cameraId, sensorType, pluginId, sensorName and sensorId are required for sensor storage creation');
+            if (!deviceIdOrPluginId || !sensorId) {
+                throw new Error('pluginId and sensorId are required for sensor storage creation');
             }
-            storage = this.createSensorStorage(deviceIdOrCameraId, sensorTypeOrUndefined, pluginId, sensorName, sensorId);
+            storage = this.createSensorStorage(deviceIdOrPluginId, sensorId);
         }
         else {
             storage = this.createPluginStorage();
@@ -83,19 +75,19 @@ export class StorageController {
         await storage.registerStorage();
         return storage;
     }
-    async removeStorage(type, deviceIdOrCameraId, sensorTypeOrUndefined, pluginId, sensorName) {
+    async removeStorage(type, deviceIdOrSensorId) {
         let storageKey;
         if (type === 'sensor') {
-            if (!deviceIdOrCameraId || !sensorTypeOrUndefined || !pluginId || !sensorName) {
-                throw new Error('cameraId, sensorType, pluginId and sensorName are required for sensor storage removal');
+            if (!deviceIdOrSensorId) {
+                throw new Error('sensorId is required for sensor storage removal');
             }
-            storageKey = sensorStorageKey(deviceIdOrCameraId, sensorTypeOrUndefined, pluginId, sensorName);
+            storageKey = sensorStorageKey(deviceIdOrSensorId);
         }
         else if (type === 'camera') {
-            if (!deviceIdOrCameraId) {
+            if (!deviceIdOrSensorId) {
                 throw new Error('deviceId is required for camera storage removal');
             }
-            storageKey = deviceIdOrCameraId;
+            storageKey = deviceIdOrSensorId;
         }
         else {
             storageKey = 'storage';

package/dist/server/src/plugins/runtime/node/storageController.js.map

@@ -1 +1 @@
-{"version":3,"file":"storageController.js","sourceRoot":"","sources":["../../../../../../src/plugins/runtime/node/storageController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAO7C,kDAAkD;AAClD,SAAS,gBAAgB,CAAC,QAAgB,EAAE,UAAsB,EAAE,QAAgB,EAAE,UAAkB;IACtG,OAAO,GAAG,QAAQ,WAAW,UAAU,IAAI,QAAQ,IAAI,UAAU,EAAE,CAAC;AACtE,CAAC;AAED,MAAM,OAAO,iBAAiB;IAC5B,IAAI,CAAY;IAChB,MAAM,CAAY;IAClB,OAAO,CAAa;IACpB,SAAS,CAAiB;IAC1B,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAC;IAElD,YAAY,GAAc,EAAE,KAAgB,EAAE,MAAkB,EAAE,QAAwB;QACxF,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAEM,mBAAmB,CAAsD,QAAgB,EAAE,UAAwB,EAAE;QAC1H,IAAI,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEjD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,IAAI,aAAa,CAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;YAClI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,aAAiC,CAAC;IAC3C,CAAC;IAEM,mBAAmB,CAAsD,UAAwB,EAAE;QACxG,IAAI,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAElD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,IAAI,aAAa,CAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;YACxH,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,aAAiC,CAAC;IAC3C,CAAC;IAEM,gBAAgB,CAAsD,QAAgB;QAC3F,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAiC,CAAC;IACtE,CAAC;IAEM,gBAAgB;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAiC,CAAC;IACvE,CAAC;IAEM,mBAAmB,CACxB,QAAgB,EAChB,UAAsB,EACtB,QAAgB,EAChB,UAAkB,EAClB,QAAgB,EAChB,UAAwB,EAAE;QAE1B,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChF,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE7C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,uEAAuE;YACvE,oEAAoE;YACpE,sCAAsC;YACtC,OAAO,GAAG,IAAI,aAAa,CAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC9J,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACxC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;QAED,OAAO,OAA2B,CAAC;IACrC,CAAC;IAEM,gBAAgB,CACrB,QAAgB,EAChB,UAAsB,EACtB,QAAgB,EAChB,UAAkB;QAElB,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAiC,CAAC;IACxE,CAAC;IAYM,KAAK,CAAC,aAAa,CACxB,IAAoC,EACpC,kBAA2B,EAC3B,qBAAkC,EAClC,QAAiB,EACjB,UAAmB,EACnB,QAAiB;QAEjB,IAAI,OAAuC,CAAC;QAE5C,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;YACD,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,IAAI,CAAC,qBAAqB,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC3F,MAAM,IAAI,KAAK,CAAC,kGAAkG,CAAC,CAAC;YACtH,CAAC;YACD,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAChH,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACvC,CAAC;QAED,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC;IACjB,CAAC;IAKM,KAAK,CAAC,aAAa,CACxB,IAAoC,EACpC,kBAA2B,EAC3B,qBAAkC,EAClC,QAAiB,EACjB,UAAmB;QAEnB,IAAI,UAAkB,CAAC;QAEvB,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,IAAI,CAAC,kBAAkB,IAAI,CAAC,qBAAqB,IAAI,CAAC,QAAQ,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC9E,MAAM,IAAI,KAAK,CAAC,uFAAuF,CAAC,CAAC;YAC3G,CAAC;YACD,UAAU,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QACjG,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;YACrE,CAAC;YACD,UAAU,GAAG,kBAAkB,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,aAAa,EAAE,OAAO,EAAE,CAAC;QAC/B,MAAM,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACzC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,4CAA4C;IACrC,KAAK,CAAC,KAAK;QAChB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,CAAC;YAC9C,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"storageController.js","sourceRoot":"","sources":["../../../../../../src/plugins/runtime/node/storageController.ts"],"names":[],"mappings":"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"}

package/dist/server/src/plugins/runtime/python/child.py

@@ -33,8 +33,7 @@ from plugins.runtime.python.namespaces import NamespaceManager
 from plugins.runtime.python.plugin_api import PluginAPI
 from plugins.runtime.python.proxy.camera_device import CameraDeviceProxy
 from plugins.runtime.python.proxy.file_serve import PluginFileServer
-from plugins.runtime.python.store import STORE_FILE_NAME, PluginStoreFile
-from plugins.runtime.python.store_migrate import migrate_legacy_lmdbm, needs_lmdbm_migration
+from plugins.runtime.python.store import PluginStoreFile
 from plugins.runtime.python.typings import (
     PLUGIN_COMMAND,
     PLUGIN_STATUS,
@@ -61,6 +60,7 @@ class PluginChild:
                     "user": os.environ["PROXY_USER"],
                     "password": os.environ["PROXY_PASSWORD"],
                 },
+                "reconnected_cb": self._on_rpc_reconnected,
             }
         )
 
@@ -113,6 +113,12 @@ class PluginChild:
         finally:
             await self.stop_plugin()
 
+    async def _on_rpc_reconnected(self) -> None:
+        if self.stopped or self.api is None:
+            return
+        self.api.sensor_manager.on_rpc_reconnected()
+        self.api.device_manager.on_rpc_reconnected()
+
     async def on_start(self) -> None:
         self.channel = await self.proxy.private_channel("plugin-communication", "camera.ui")
         self.channel.on("message", self.on_message)
@@ -155,10 +161,12 @@ class PluginChild:
                 await self.file_server.register()
 
             self.api.device_manager.set_plugin(self.plugin)
+            self.api.sensor_manager.set_plugin(self.plugin)
 
             await self.api.device_manager.init()
             await self.api.core_manager.init()
             await self.configure_cameras(self.api, plugin_info, cameras)
+            await self.api.sensor_manager.init()
 
             await self.send_message({"type": PLUGIN_STATUS.STARTED.value})
 
@@ -185,6 +193,7 @@ class PluginChild:
                     f"Shutdown listeners still pending after {SHUTDOWN_LISTENER_TIMEOUT}s, continuing teardown"
                 )
 
+            await self.api.sensor_manager.close()
             await self.api.device_manager.close()
             await self.api.core_manager.close()
             await self.api.storage_controller.close()
@@ -248,12 +257,8 @@ class PluginChild:
             return remote_db
 
         volume_dir = Path(storage_path) / "volume"
-        store_path = volume_dir / STORE_FILE_NAME
-
-        if await asyncio.to_thread(needs_lmdbm_migration, volume_dir, store_path):
-            await migrate_legacy_lmdbm(volume_dir, store_path, self.logger)
 
-        store = PluginStoreFile(str(volume_dir), plugin_id, self.logger)
+        store = PluginStoreFile(str(volume_dir), self.logger)
         await store.open()
         return LocalPluginConfigDb(store)
 
@@ -268,6 +273,7 @@ class PluginChild:
                 CameraDeviceProxy(
                     self.proxy,
                     api.storage_controller,
+                    api.sensor_manager,
                     camera,
                     plugin_info,
                     camera_logger,

package/dist/server/src/plugins/runtime/python/namespaces.py

@@ -47,9 +47,9 @@ class PluginSensorNamespaces:
 
 
 @dataclass(frozen=True, slots=True)
-class SensorControllerNamespaces:
-    sensor_subject: str
-    sensor_rpc: str
+class SensorRegistryNamespaces:
+    sensors_subject: str
+    sensors_rpc: str
 
 
 @dataclass(frozen=True, slots=True)
@@ -159,30 +159,28 @@ class NamespaceManager:
         )
 
     @staticmethod
-    def plugin_sensor_namespaces(plugin_id: str, camera_id: str, sensor_id: str) -> PluginSensorNamespaces:
+    def plugin_sensor_namespaces(plugin_id: str, sensor_id: str) -> PluginSensorNamespaces:
         return PluginSensorNamespaces(
-            sensor_storage_rpc=f"plugin.{plugin_id}.camera.{camera_id}.sensor.{sensor_id}.storage.rpc",
+            sensor_storage_rpc=f"plugin.{plugin_id}.sensor.{sensor_id}.storage.rpc",
         )
 
     @staticmethod
-    def sensor_controller_namespaces(camera_id: str) -> SensorControllerNamespaces:
-        return SensorControllerNamespaces(
-            sensor_subject=f"camera.{camera_id}.sensors.subject",
-            sensor_rpc=f"camera.{camera_id}.sensors.rpc",
+    def sensor_registry_namespaces() -> SensorRegistryNamespaces:
+        return SensorRegistryNamespaces(
+            sensors_subject="sensors.subject",
+            sensors_rpc="sensors.rpc",
         )
 
     @staticmethod
-    def sensor_event_namespaces(camera_id: str, sensor_id: str) -> SensorEventNamespaces:
+    def sensor_event_namespaces(sensor_id: str) -> SensorEventNamespaces:
         return SensorEventNamespaces(
-            sensor_subject=f"camera.{camera_id}.sensor.{sensor_id}.subject",
+            sensor_subject=f"sensor.{sensor_id}.subject",
         )
 
     @staticmethod
-    def sensor_provider_namespaces(
-        plugin_id: str, camera_id: str, sensor_id: str
-    ) -> SensorProviderNamespaces:
+    def sensor_provider_namespaces(plugin_id: str, sensor_id: str) -> SensorProviderNamespaces:
         return SensorProviderNamespaces(
-            sensor_rpc=f"plugin.{plugin_id}.camera.{camera_id}.sensor.{sensor_id}.rpc",
+            sensor_rpc=f"plugin.{plugin_id}.sensor.{sensor_id}.rpc",
         )
 
     @staticmethod
@@ -196,7 +194,3 @@ class NamespaceManager:
         return DetectionEventNamespaces(
             detection_event_subject=f"camera.{camera_id}.events.subject",
         )
-
-    @staticmethod
-    def sensor_controller_rpc(camera_id: str) -> str:
-        return f"camera.{camera_id}.sensors.controller.rpc"

package/dist/server/src/plugins/runtime/python/plugin_api.py

@@ -9,6 +9,7 @@ from _camera_ui_tools.camera_ui_sdk import (
     DeviceManager,
     DownloadManager,
     NotificationManager,
+    SensorManager,
 )
 from _camera_ui_tools.camera_ui_sdk import PluginAPI as PluginAPIInterface
 from _camera_ui_tools.camera_ui_sdk.internal import AsyncEventEmitter
@@ -17,6 +18,7 @@ from plugins.runtime.python.proxy.core_manager import CoreManagerProxy
 from plugins.runtime.python.proxy.device_manager import DeviceManagerProxy
 from plugins.runtime.python.proxy.download_manager import DownloadManagerProxy
 from plugins.runtime.python.proxy.notification_manager import NotificationManagerProxy
+from plugins.runtime.python.proxy.sensor_manager import SensorManagerProxy
 from plugins.runtime.python.storage_controller import StorageController
 from plugins.runtime.python.typings import PluginInfo
 
@@ -36,7 +38,10 @@ class PluginAPI(AsyncEventEmitter, PluginAPIInterface):
         self.storage_path = storage_path
         self.storage_controller = StorageController(self, proxy, plugin, plugin_db)
         self.core_manager = CoreManagerProxy(proxy, logger, plugin)
-        self.device_manager = DeviceManagerProxy(proxy, self.storage_controller, logger, plugin)
+        self.sensor_manager = SensorManagerProxy(proxy, self.storage_controller, plugin, logger)
+        self.device_manager = DeviceManagerProxy(
+            proxy, self.storage_controller, self.sensor_manager, logger, plugin
+        )
         self.download_manager = DownloadManagerProxy(proxy)
         self.notification_manager = NotificationManagerProxy(proxy, plugin)
 
@@ -48,6 +53,10 @@ class PluginAPI(AsyncEventEmitter, PluginAPIInterface):
     def deviceManager(self) -> DeviceManager:
         return cast(DeviceManager, self.device_manager)
 
+    @property
+    def sensorManager(self) -> SensorManager:
+        return cast(SensorManager, self.sensor_manager)
+
     @property
     def downloadManager(self) -> DownloadManager:
         return cast(DownloadManager, self.download_manager)