@camera.ui/server 2.0.22 → 2.0.23

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

@@ -7,15 +7,14 @@ from plugins.runtime.python.store import CameraLocation, PluginLocation, SensorL
 
 if TYPE_CHECKING:
     from _camera_ui_tools.camera_ui_rpc import RPCClient
-    from _camera_ui_tools.camera_ui_sdk import JsonSchema, SensorType
+    from _camera_ui_tools.camera_ui_sdk import JsonSchema
     from plugins.runtime.python.config_db import PluginConfigDb
     from plugins.runtime.python.plugin_api import PluginAPI
     from plugins.runtime.python.typings import PluginInfo
 
 
-# Stable storage key for sensor instance storage.
-def sensor_storage_key(camera_id: str, sensor_type: str, plugin_id: str, sensor_name: str) -> str:
-    return f"{camera_id}:sensor:{sensor_type}:{plugin_id}:{sensor_name}"
+def sensor_storage_key(sensor_id: str) -> str:
+    return f"sensor:{sensor_id}"
 
 
 class StorageController:
@@ -82,45 +81,31 @@ class StorageController:
 
     def createSensorStorage(
         self,
-        camera_id: str,
-        sensor_type: SensorType,
         plugin_id: str,
-        sensor_name: str,
         sensor_id: str,
         schemas: list[JsonSchema] = [],
     ) -> DeviceStorage:
-        storage_key = sensor_storage_key(camera_id, sensor_type.value, plugin_id, sensor_name)
+        storage_key = sensor_storage_key(sensor_id)
         storage = self.__storages.get(storage_key)
 
         if not storage:
-            # storage_key is only the in-memory registry key; persistence addresses
-            # the canonical sensors.<camId>.<type>.<name> path. sensor_id is the
-            # runtime UUID for the RPC namespace.
             storage = DeviceStorage(
                 self.__api,
                 self.__proxy,
                 self.__plugin,
                 self.__plugin_db,
-                SensorLocation(
-                    camera_id=camera_id,
-                    sensor_type=sensor_type.value,
-                    sensor_name=sensor_name,
-                ),
+                SensorLocation(sensor_id=sensor_id),
                 schemas,
                 sensor_id,
             )
             self.__storages[storage_key] = storage
-            storage.update_schema(schemas)
-        else:
-            storage.update_schema(schemas)
+
+        storage.update_schema(schemas)
 
         return storage
 
-    def getSensorStorage(
-        self, camera_id: str, sensor_type: SensorType, plugin_id: str, sensor_name: str
-    ) -> DeviceStorage | None:
-        storage_key = sensor_storage_key(camera_id, sensor_type.value, plugin_id, sensor_name)
-        return self.__storages.get(storage_key)
+    def getSensorStorage(self, sensor_id: str) -> DeviceStorage | None:
+        return self.__storages.get(sensor_storage_key(sensor_id))
 
     @overload
     async def createStorage(self, type_: Literal["camera"], device_id: str) -> DeviceStorage: ...
@@ -130,19 +115,13 @@ class StorageController:
     async def createStorage(
         self,
         type_: Literal["sensor"],
-        device_id: str,
-        sensor_type: SensorType,
-        plugin_id: str,
-        sensor_name: str,
-        sensor_id: str,
+        device_id: str,  # plugin_id
+        sensor_id: str = ...,
     ) -> DeviceStorage: ...
     async def createStorage(
         self,
         type_: Literal["camera", "plugin", "sensor"],
-        device_id: str | None = None,  # camera_id
-        sensor_type: SensorType | None = None,
-        plugin_id: str | None = None,
-        sensor_name: str | None = None,
+        device_id: str | None = None,  # camera_id or plugin_id
         sensor_id: str | None = None,
     ) -> DeviceStorage:
         storage: DeviceStorage | None = None
@@ -153,12 +132,10 @@ class StorageController:
 
             storage = self.createCameraStorage(device_id)
         elif type_ == "sensor":
-            if not device_id or not sensor_type or not plugin_id or not sensor_name or not sensor_id:
-                raise ValueError(
-                    "cameraId, sensorType, pluginId, sensorName and sensorId are required for sensor storage creation"
-                )
+            if not device_id or not sensor_id:
+                raise ValueError("pluginId and sensorId are required for sensor storage creation")
 
-            storage = self.createSensorStorage(device_id, sensor_type, plugin_id, sensor_name, sensor_id)
+            storage = self.createSensorStorage(device_id, sensor_id)
         else:
             storage = self.createPluginStorage()
 
@@ -173,28 +150,20 @@ class StorageController:
     async def removeStorage(
         self,
         type_: Literal["sensor"],
-        device_id: str | None = None,
-        sensor_type: SensorType | None = None,
-        plugin_id: str | None = None,
-        sensor_name: str | None = None,
+        device_id: str,  # sensor_id
     ) -> None: ...
     async def removeStorage(
         self,
         type_: Literal["camera", "plugin", "sensor"],
         device_id: str | None = None,
-        sensor_type: SensorType | None = None,
-        plugin_id: str | None = None,
-        sensor_name: str | None = None,
     ) -> None:
         storage_key: str
 
         if type_ == "sensor":
-            if not device_id or not sensor_type or not plugin_id or not sensor_name:
-                raise ValueError(
-                    "cameraId, sensorType, pluginId and sensorName are required for sensor storage removal"
-                )
+            if not device_id:
+                raise ValueError("sensorId is required for sensor storage removal")
 
-            storage_key = sensor_storage_key(device_id, sensor_type.value, plugin_id, sensor_name)
+            storage_key = sensor_storage_key(device_id)
         elif type_ == "camera":
             if not device_id:
                 raise ValueError("ID is required for storage removal")

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

@@ -263,9 +263,7 @@ class CameraLocation:
 
 @dataclass(frozen=True)
 class SensorLocation:
-    camera_id: str
-    sensor_type: str
-    sensor_name: str
+    sensor_id: str
 
 
 StoreLocation = PluginLocation | CameraLocation | SensorLocation
@@ -276,8 +274,7 @@ def read_location(config: dict[str, Any], location: StoreLocation) -> dict[str,
         return config.get("plugin")
     if isinstance(location, CameraLocation):
         return (config.get("cameras") or {}).get(location.camera_id)
-    by_camera = (config.get("sensors") or {}).get(location.camera_id) or {}
-    return (by_camera.get(location.sensor_type) or {}).get(location.sensor_name)
+    return (config.get("sensors") or {}).get(location.sensor_id)
 
 
 def write_location(config: dict[str, Any], location: StoreLocation, values: dict[str, Any]) -> None:
@@ -287,8 +284,7 @@ def write_location(config: dict[str, Any], location: StoreLocation, values: dict
     if isinstance(location, CameraLocation):
         config.setdefault("cameras", {})[location.camera_id] = values
         return
-    by_camera = config.setdefault("sensors", {}).setdefault(location.camera_id, {})
-    by_camera.setdefault(location.sensor_type, {})[location.sensor_name] = values
+    config.setdefault("sensors", {})[location.sensor_id] = values
 
 
 def delete_location(config: dict[str, Any], location: StoreLocation) -> None:
@@ -304,18 +300,8 @@ def delete_location(config: dict[str, Any], location: StoreLocation) -> None:
         return
 
     sensors = config.get("sensors")
-    if not isinstance(sensors, dict):
-        return
-    by_camera = sensors.get(location.camera_id)
-    if not isinstance(by_camera, dict):
-        return
-    by_type = by_camera.get(location.sensor_type)
-    if not isinstance(by_type, dict):
-        return
-
-    by_type.pop(location.sensor_name, None)
-    _prune_if_empty(by_camera, location.sensor_type)
-    _prune_if_empty(sensors, location.camera_id)
+    if isinstance(sensors, dict):
+        sensors.pop(location.sensor_id, None)
     _prune_if_empty(config, "sensors")
 
 
@@ -325,79 +311,19 @@ def _prune_if_empty(parent: dict[str, Any], key: str) -> None:
         del parent[key]
 
 
-_CANONICAL_SECTIONS = ("plugin", "cameras", "sensors")
-_LEGACY_SENSOR_MARKER = ":sensor:"
-
-
-def is_canonical_layout(payload: dict[str, Any]) -> bool:
-    return all(key in _CANONICAL_SECTIONS for key in payload)
+_LAYOUT_VERSION_KEY = "__v"
+# v2: sensors keyed by persistent sensor id, pre-entity camera-keyed trees are unmappable
+_LAYOUT_VERSION = 2
 
 
-# Go-SDK legacy blobs ('<pluginId>.plugin', ...) are remapped by the Go SDK
-# itself, not here: server and plugin update independently, and a plugin on
-# an old SDK must keep finding its keys untouched.
-def _is_go_legacy_layout(payload: dict[str, Any], plugin_id: str) -> bool:
-    return len(payload) > 0 and all(key.startswith(f"{plugin_id}.") for key in payload)
-
-
-def remap_legacy_layout(
-    payload: dict[str, Any], plugin_id: str, log: StoreLogger | None = None
-) -> dict[str, Any]:
-    if is_canonical_layout(payload) or _is_go_legacy_layout(payload, plugin_id):
+def upgrade_layout(payload: dict[str, Any]) -> dict[str, Any]:
+    if payload.get(_LAYOUT_VERSION_KEY) == _LAYOUT_VERSION:
         return payload
 
-    canonical: dict[str, Any] = {
-        section: payload[section] for section in _CANONICAL_SECTIONS if section in payload
-    }
-
-    for key, values in payload.items():
-        if key in _CANONICAL_SECTIONS:
-            continue
-
-        if key == "storage":
-            # In a mixed legacy+canonical document the canonical section is the
-            # newer write - the legacy duplicate is stale and must never win.
-            if "plugin" in canonical:
-                if log:
-                    log.warn(
-                        f"store: legacy key 'storage' dropped — canonical 'plugin' already present ({plugin_id})"
-                    )
-                continue
-            canonical["plugin"] = values
-            continue
-
-        sensor_idx = key.find(_LEGACY_SENSOR_MARKER)
-        if sensor_idx != -1:
-            # <camId>:sensor:<type>:<pluginId>:<name> - type and pluginId contain
-            # no colons; the name keeps everything after them verbatim.
-            camera_id = key[:sensor_idx]
-            rest = key[sensor_idx + len(_LEGACY_SENSOR_MARKER) :]
-            type_end = rest.find(":")
-            plugin_end = rest.find(":", type_end + 1)
-            if type_end != -1 and plugin_end != -1:
-                sensor_type = rest[:type_end]
-                sensor_name = rest[plugin_end + 1 :]
-                by_camera = canonical.setdefault("sensors", {}).setdefault(camera_id, {})
-                if sensor_name in by_camera.get(sensor_type, {}):
-                    if log:
-                        log.warn(
-                            f"store: legacy sensor key '{key}' dropped — canonical target already present ({plugin_id})"
-                        )
-                    continue
-                by_camera.setdefault(sensor_type, {})[sensor_name] = values
-                continue
-            if log:
-                log.warn(f"store: unparsable legacy sensor key '{key}' kept under cameras ({plugin_id})")
-
-        if key in (canonical.get("cameras") or {}):
-            if log:
-                log.warn(
-                    f"store: legacy key '{key}' dropped — canonical 'cameras.{key}' already present ({plugin_id})"
-                )
-            continue
-        canonical.setdefault("cameras", {})[key] = values
-
-    return canonical
+    upgraded = dict(payload)
+    upgraded.pop("sensors", None)
+    upgraded[_LAYOUT_VERSION_KEY] = _LAYOUT_VERSION
+    return upgraded
 
 
 # Values must round-trip identically through all three runtimes' msgpack
@@ -453,9 +379,8 @@ def _walk_value(value: Any, path: str, depth: int) -> None:
 
 
 class PluginStoreFile:
-    def __init__(self, volume_dir: str, plugin_id: str, log: StoreLogger | None = None) -> None:
+    def __init__(self, volume_dir: str, log: StoreLogger | None = None) -> None:
         self._volume_dir = volume_dir
-        self._plugin_id = plugin_id
         self._log = log
         self._path = str(Path(volume_dir) / STORE_FILE_NAME)
         self._writer = CoalescingWriter(self._write_snapshot, log)
@@ -472,15 +397,14 @@ class PluginStoreFile:
 
         payload = await read_store_file(self._path, self._log)
         if payload is None:
-            # Persist the initial envelope so later opens skip the legacy probe.
             payload = {}
             await write_store_file(self._path, payload, self._log)
 
-        remapped = remap_legacy_layout(payload, self._plugin_id, self._log)
-        if remapped is not payload:
-            await write_store_file(self._path, remapped, self._log)
+        upgraded = upgrade_layout(payload)
+        if upgraded is not payload:
+            await write_store_file(self._path, upgraded, self._log)
 
-        self._payload = remapped
+        self._payload = upgraded
         await backup_store_file(self._path, self._log)
         self._closed = False
 

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

@@ -52,13 +52,24 @@ class StoredSensorData(TypedDict):
     type: SensorType
     name: str
     displayName: str
+    nativeId: NotRequired[str]
     pluginId: str
+    assignedCameraIds: list[str]
+    boundCameraId: NotRequired[str]
+    exposed: bool
+    connected: bool
     properties: dict[str, Any]
     capabilities: NotRequired[list[str]]
     requiresFrames: NotRequired[bool]
     modelSpec: NotRequired[ModelSpec]
 
 
+class SensorRegistration(TypedDict):
+    id: str
+    assignedCameraIds: list[str]
+    active: bool
+
+
 class SensorRefreshedState(TypedDict):
     type: SensorType
     properties: dict[str, Any]
@@ -67,33 +78,41 @@ class SensorRefreshedState(TypedDict):
 
 
 class SensorAddedEvent(TypedDict):
-    cameraId: str
     sensor: StoredSensorData
     state: SensorRefreshedState
 
 
-class SensorRemovedEvent(TypedDict):
-    cameraId: str
+class SensorDeletedEvent(TypedDict):
     sensorId: str
     sensorType: SensorType
 
 
+class SensorConnectedChangedEvent(TypedDict):
+    sensorId: str
+    sensorType: SensorType
+    connected: bool
+
+
 class SensorCapabilitiesChangedEvent(TypedDict):
-    cameraId: str
     sensorId: str
     capabilities: list[str]
 
 
 class SensorDisplayNameChangedEvent(TypedDict):
-    cameraId: str
     sensorId: str
     displayName: str
 
 
+class SensorExposedChangedEvent(TypedDict):
+    sensorId: str
+    sensorType: SensorType
+    exposed: bool
+
+
 class SensorAssignmentChangedEvent(TypedDict):
-    cameraId: str
-    pluginId: str
+    sensorId: str
     sensorType: SensorType
+    cameraId: str
     assigned: bool
 
 
@@ -101,18 +120,22 @@ class SensorEventMessage(TypedDict):
     type: Literal[
         "property:changed",
         "sensor:added",
-        "sensor:removed",
+        "sensor:deleted",
+        "sensor:connected:changed",
         "sensor:displayName:changed",
         "sensor:capabilities:changed",
         "sensor:assignment:changed",
+        "sensor:exposed:changed",
     ]
     data: (
         PropertyChangedEvent
         | SensorAddedEvent
-        | SensorRemovedEvent
+        | SensorDeletedEvent
+        | SensorConnectedChangedEvent
         | SensorDisplayNameChangedEvent
         | SensorCapabilitiesChangedEvent
         | SensorAssignmentChangedEvent
+        | SensorExposedChangedEvent
     )
 
 

package/dist/server/src/plugins/store/layout.d.ts

@@ -1,2 +1 @@
-export declare function isCanonicalLayout(payload: Record<string, any>): boolean;
-export declare function remapLegacyLayout(payload: Record<string, any>, pluginId: string): Record<string, any>;
+export declare function upgradeStoreLayout(payload: Record<string, any>): Record<string, any>;

package/dist/server/src/plugins/store/layout.js

@@ -1,60 +1,13 @@
-const CANONICAL_SECTIONS = new Set(['plugin', 'cameras', 'sensors']);
-const LEGACY_SENSOR_MARKER = ':sensor:';
-export function isCanonicalLayout(payload) {
-    return Object.keys(payload).every((key) => CANONICAL_SECTIONS.has(key));
-}
-function isGoLegacyLayout(payload, pluginId) {
-    const keys = Object.keys(payload);
-    return keys.length > 0 && keys.every((key) => key.startsWith(`${pluginId}.`));
-}
-export function remapLegacyLayout(payload, pluginId) {
-    if (isCanonicalLayout(payload) || isGoLegacyLayout(payload, pluginId)) {
+const LAYOUT_VERSION_KEY = '__v';
+// v2: sensors keyed by persistent sensor id, pre-entity camera-keyed trees are unmappable
+const LAYOUT_VERSION = 2;
+export function upgradeStoreLayout(payload) {
+    if (payload[LAYOUT_VERSION_KEY] === LAYOUT_VERSION) {
         return payload;
     }
-    const canonical = {};
-    for (const section of CANONICAL_SECTIONS) {
-        if (payload[section] !== undefined) {
-            canonical[section] = payload[section];
-        }
-    }
-    for (const [key, values] of Object.entries(payload)) {
-        if (CANONICAL_SECTIONS.has(key)) {
-            continue;
-        }
-        if (key === 'storage') {
-            if (canonical.plugin !== undefined) {
-                continue;
-            }
-            canonical.plugin = values;
-            continue;
-        }
-        const sensorIdx = key.indexOf(LEGACY_SENSOR_MARKER);
-        if (sensorIdx !== -1) {
-            // <camId>:sensor:<type>:<pluginId>:<name> — type and pluginId contain no
-            // colons; the name keeps everything after them verbatim.
-            const cameraId = key.slice(0, sensorIdx);
-            const rest = key.slice(sensorIdx + LEGACY_SENSOR_MARKER.length);
-            const typeEnd = rest.indexOf(':');
-            const pluginEnd = rest.indexOf(':', typeEnd + 1);
-            if (typeEnd !== -1 && pluginEnd !== -1) {
-                const sensorType = rest.slice(0, typeEnd);
-                const sensorName = rest.slice(pluginEnd + 1);
-                if (canonical.sensors?.[cameraId]?.[sensorType]?.[sensorName] !== undefined) {
-                    continue;
-                }
-                canonical.sensors ??= {};
-                canonical.sensors[cameraId] ??= {};
-                canonical.sensors[cameraId][sensorType] ??= {};
-                canonical.sensors[cameraId][sensorType][sensorName] = values;
-                continue;
-            }
-        }
-        if (canonical.cameras?.[key] !== undefined) {
-            continue;
-        }
-        canonical.cameras ??= {};
-        canonical.cameras[key] = values;
-    }
-    return canonical;
+    const upgraded = { ...payload };
+    delete upgraded.sensors;
+    upgraded[LAYOUT_VERSION_KEY] = LAYOUT_VERSION;
+    return upgraded;
 }
 //# sourceMappingURL=layout.js.map

package/dist/server/src/plugins/store/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../../../../src/plugins/store/layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../../../../src/plugins/store/layout.ts"],"names":[],"mappings":"AAAA,MAAM,kBAAkB,GAAG,KAAK,CAAC;AACjC,0FAA0F;AAC1F,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,MAAM,UAAU,kBAAkB,CAAC,OAA4B;IAC7D,IAAI,OAAO,CAAC,kBAAkB,CAAC,KAAK,cAAc,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,QAAQ,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAChC,OAAO,QAAQ,CAAC,OAAO,CAAC;IACxB,QAAQ,CAAC,kBAAkB,CAAC,GAAG,cAAc,CAAC;IAC9C,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/server/src/plugins/store/location.d.ts

@@ -5,9 +5,8 @@ export type StoreLocation = {
     cameraId: string;
 } | {
     kind: 'sensor';
-    cameraId: string;
-    sensorType: string;
-    sensorName: string;
+    pluginId: string;
+    sensorId: string;
 };
 export declare function readLocation(config: Record<string, any>, location: StoreLocation): Record<string, any> | undefined;
 export declare function writeLocation(config: Record<string, any>, location: StoreLocation, values: Record<string, any>): void;

package/dist/server/src/plugins/store/location.js

@@ -5,7 +5,7 @@ export function readLocation(config, location) {
         case 'camera':
             return config.cameras?.[location.cameraId];
         case 'sensor':
-            return config.sensors?.[location.cameraId]?.[location.sensorType]?.[location.sensorName];
+            return config.sensors?.[location.sensorId];
     }
 }
 export function writeLocation(config, location, values) {
@@ -19,9 +19,7 @@ export function writeLocation(config, location, values) {
             return;
         case 'sensor':
             config.sensors ??= {};
-            config.sensors[location.cameraId] ??= {};
-            config.sensors[location.cameraId][location.sensorType] ??= {};
-            config.sensors[location.cameraId][location.sensorType][location.sensorName] = values;
+            config.sensors[location.sensorId] = values;
             return;
     }
 }
@@ -34,16 +32,10 @@ export function deleteLocation(config, location) {
             delete config.cameras?.[location.cameraId];
             pruneIfEmpty(config, 'cameras');
             return;
-        case 'sensor': {
-            const byType = config.sensors?.[location.cameraId]?.[location.sensorType];
-            if (byType) {
-                delete byType[location.sensorName];
-                pruneIfEmpty(config.sensors[location.cameraId], location.sensorType);
-                pruneIfEmpty(config.sensors, location.cameraId);
-                pruneIfEmpty(config, 'sensors');
-            }
+        case 'sensor':
+            delete config.sensors?.[location.sensorId];
+            pruneIfEmpty(config, 'sensors');
             return;
-        }
     }
 }
 function pruneIfEmpty(parent, key) {

package/dist/server/src/plugins/store/location.js.map

@@ -1 +1 @@
-{"version":3,"file":"location.js","sourceRoot":"","sources":["../../../../../src/plugins/store/location.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,MAA2B,EAAE,QAAuB;IAC/E,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC7F,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAA2B,EAAE,QAAuB,EAAE,MAA2B;IAC7G,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;YAC3C,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC9D,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;YACrF,OAAO;IACX,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAA2B,EAAE,QAAuB;IACjF,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,MAAM,CAAC;YACrB,OAAO;QACT,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAChC,OAAO;QACT,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC1E,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACnC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACrE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAChD,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAClC,CAAC;YACD,OAAO;QACT,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B,EAAE,GAAW;IAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1E,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"location.js","sourceRoot":"","sources":["../../../../../src/plugins/store/location.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,MAA2B,EAAE,QAAuB;IAC/E,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC7C,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAA2B,EAAE,QAAuB,EAAE,MAA2B;IAC7G,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YACvB,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;YAC3C,OAAO;QACT,KAAK,QAAQ;YACX,MAAM,CAAC,OAAO,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;YAC3C,OAAO;IACX,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAA2B,EAAE,QAAuB;IACjF,QAAQ,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtB,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,MAAM,CAAC;YACrB,OAAO;QACT,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAChC,OAAO;QACT,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,YAAY,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YAChC,OAAO;IACX,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,MAA2B,EAAE,GAAW;IAC5D,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1E,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;AACH,CAAC"}

package/dist/server/src/plugins/store/pluginStoreFile.d.ts

@@ -1,12 +1,11 @@
 export declare const STORE_FILE_NAME = "store.cui";
 export declare class PluginStoreFile {
     private readonly volumeDir;
-    private readonly pluginId;
     private readonly path;
     private readonly writer;
     private payload;
     private closed;
-    constructor(volumeDir: string, pluginId: string);
+    constructor(volumeDir: string);
     open(): Promise<void>;
     get(): Record<string, any>;
     put(payload: Record<string, any>): Promise<void>;

package/dist/server/src/plugins/store/pluginStoreFile.js

@@ -1,20 +1,17 @@
 import { mkdir } from 'node:fs/promises';
 import { join } from 'node:path';
 import { CoalescingWriter } from './coalescingWriter.js';
-import { remapLegacyLayout } from './layout.js';
-import { migrateLmdbToStoreFile } from './migrate.js';
+import { upgradeStoreLayout } from './layout.js';
 import { backupStoreFile, readStoreFile, removeOrphanedTmpFiles, writeStoreFile } from './storeFile.js';
 export const STORE_FILE_NAME = 'store.cui';
 export class PluginStoreFile {
     volumeDir;
-    pluginId;
     path;
     writer;
     payload = {};
     closed = true;
-    constructor(volumeDir, pluginId) {
+    constructor(volumeDir) {
         this.volumeDir = volumeDir;
-        this.pluginId = pluginId;
         this.path = join(volumeDir, STORE_FILE_NAME);
         this.writer = new CoalescingWriter((snapshot) => writeStoreFile(this.path, snapshot));
     }
@@ -23,18 +20,14 @@ export class PluginStoreFile {
         await removeOrphanedTmpFiles(this.path);
         let payload = await readStoreFile(this.path);
         if (payload === undefined) {
-            const migrated = await migrateLmdbToStoreFile(this.volumeDir, this.path);
-            payload = migrated ? await readStoreFile(this.path) : undefined;
-            if (payload === undefined) {
-                payload = {};
-                await writeStoreFile(this.path, payload);
-            }
+            payload = {};
+            await writeStoreFile(this.path, payload);
         }
-        const remapped = remapLegacyLayout(payload, this.pluginId);
-        if (remapped !== payload) {
-            await writeStoreFile(this.path, remapped);
+        const upgraded = upgradeStoreLayout(payload);
+        if (upgraded !== payload) {
+            await writeStoreFile(this.path, upgraded);
         }
-        this.payload = remapped;
+        this.payload = upgraded;
         await backupStoreFile(this.path);
         this.closed = false;
     }

package/dist/server/src/plugins/store/pluginStoreFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"pluginStoreFile.js","sourceRoot":"","sources":["../../../../../src/plugins/store/pluginStoreFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pluginStoreFile.js","sourceRoot":"","sources":["../../../../../src/plugins/store/pluginStoreFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAExG,MAAM,CAAC,MAAM,eAAe,GAAG,WAAW,CAAC;AAE3C,MAAM,OAAO,eAAe;IAMG;IALZ,IAAI,CAAS;IACb,MAAM,CAAmB;IAClC,OAAO,GAAwB,EAAE,CAAC;IAClC,MAAM,GAAG,IAAI,CAAC;IAEtB,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACxF,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,MAAM,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,IAAI,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;QACxB,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAEM,GAAG;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,OAA4B;QAC3C,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,iEAAiE;YACjE,yCAAyC;YACzC,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;CACF"}

package/dist/server/src/plugins/worker.d.ts

@@ -13,6 +13,7 @@ export declare class PluginWorker {
     private shuttingDown;
     private isRemote;
     private remoteStartTimeout?;
+    private localReadyTimeout?;
     private configStore?;
     private opChain;
     private channel?;
@@ -33,6 +34,7 @@ export declare class PluginWorker {
     cleanup(): Promise<void>;
     private runExclusive;
     private doStart;
+    private armLocalReadyTimeout;
     private openChannel;
     private ensureConfigStore;
     private workerManagerRef;