@camera.ui/server 2.0.4 → 2.0.5

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

@@ -1,19 +1,19 @@
+from __future__ import annotations
+
 import truststore
 
 truststore.inject_into_ssl()
 
 import asyncio
 import importlib.util
-import json
 import os
 import sys
 from contextlib import suppress
 from pathlib import Path
 from types import ModuleType
-from typing import Any, Literal, cast
+from typing import Any, cast
 
 import setproctitle
-from lmdbm import Lmdb
 
 from _camera_ui_tools.camera_ui_common import (
     LoggerOptions,
@@ -23,11 +23,18 @@ from _camera_ui_tools.camera_ui_common import (
 from _camera_ui_tools.camera_ui_rpc import CloseHandler, RPCClient, create_rpc_client
 from _camera_ui_tools.camera_ui_sdk import API_EVENT, BasePlugin, Camera
 from _camera_ui_tools.camera_ui_sdk import CameraDevice as CameraDeviceInterface
-from plugins.runtime.python.config_db import PluginConfigDb, PluginConfigStoreRPC, RemotePluginConfigDb
+from plugins.runtime.python.config_db import (
+    LocalPluginConfigDb,
+    PluginConfigDb,
+    PluginConfigStoreRPC,
+    RemotePluginConfigDb,
+)
 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.typings import (
     PLUGIN_COMMAND,
     PLUGIN_STATUS,
@@ -40,20 +47,7 @@ from plugins.runtime.python.typings import (
 process_name = sys.argv[2] if len(sys.argv) > 2 else sys.argv[1] if len(sys.argv) > 1 else "Plugin"
 setproctitle.setproctitle(f"camera.ui - {process_name}")
 
-
-class JsonLmdb(Lmdb[Literal["config"], dict[str, Any]]):
-    def _pre_key(self, key: Literal["config"]) -> bytes:
-        return key.encode("utf-8")
-
-    def _post_key(self, key: bytes) -> Literal["config"]:
-        _key: Any = key.decode("utf-8")
-        return _key
-
-    def _pre_value(self, value: dict[str, Any]) -> bytes:
-        return json.dumps(value).encode("utf-8")
-
-    def _post_value(self, value: bytes) -> dict[str, Any]:
-        return json.loads(value.decode("utf-8"))
+RPC_TEARDOWN_TIMEOUT = 0.5
 
 
 class PluginChild:
@@ -98,7 +92,7 @@ class PluginChild:
         self.signal_handler = SignalHandler(
             {
                 "display_name": "[Signal]",
-                "timeout_duration": 3,
+                "timeout_duration": 2,
                 "logger": self.logger,
                 "close_function": self.stop_plugin,
             }
@@ -125,7 +119,7 @@ class PluginChild:
 
     async def start_plugin(self, data: ProcessLoadMessage) -> None:
         try:
-            # Host-local writable dir - on a remote worker the master's path from
+            # Host-local writable dir — on a remote worker the master's path from
             # the START message would point at the wrong machine.
             storage_path = os.environ.get("PLUGIN_STORAGE_PATH") or data["storage"]["storagePath"]
             plugin_info = data["plugin"]
@@ -145,7 +139,6 @@ class PluginChild:
             plugin_storage = await self.api.storage_controller.createStorage("plugin")
             self.plugin = cast(BasePlugin, plugin_constructor(self.logger, self.api, plugin_storage))
 
-            # Apply storage_schema if defined by plugin
             if hasattr(self.plugin, "storage_schema") and self.plugin.storage_schema:
                 plugin_storage.defineSchemas(self.plugin.storage_schema)
 
@@ -154,11 +147,12 @@ class PluginChild:
                 namespaces.plugin_child_rpc, self.plugin, without_decorators=True
             )
 
+            # Remote-hosted: serve this worker's files so the master can stream
+            # downloads/exports of them.
             if os.environ.get("PLUGIN_REMOTE_MODE"):
                 self.file_server = PluginFileServer(self.proxy, plugin_info["id"])
                 await self.file_server.register()
 
-            # Set the plugin instance on device_manager for lifecycle callbacks
             self.api.device_manager.set_plugin(self.plugin)
 
             await self.api.device_manager.init()
@@ -180,15 +174,31 @@ class PluginChild:
         self.stopped = True
 
         if self.api:
-            self.api.emit(API_EVENT.SHUTDOWN.value)
-            await asyncio.sleep(0.5)
+            completed = await self.api.emit_and_wait(
+                API_EVENT.SHUTDOWN.value,
+                timeout=1.0,
+                on_error=lambda e: self.logger.error(f"Shutdown listener failed: {e}"),
+            )
+            if not completed:
+                self.logger.warn("Shutdown listeners still pending after 1s, continuing teardown")
+
+            await self.api.device_manager.close()
+            await self.api.core_manager.close()
+            await self.api.storage_controller.close()
+
             self.api.cancel()
 
         if self.plugin_db is not None:
             with suppress(Exception):
-                self.plugin_db.close()
+                await self.plugin_db.close()
             self.plugin_db = None
 
+        try:
+            await asyncio.wait_for(self._close_rpc(), timeout=RPC_TEARDOWN_TIMEOUT)
+        except TimeoutError:
+            self.logger.warn(f"RPC teardown still pending after {RPC_TEARDOWN_TIMEOUT}s, exiting anyway")
+
+    async def _close_rpc(self) -> None:
         if self.channel:
             with suppress(Exception):
                 await self.channel.close()
@@ -202,7 +212,8 @@ class PluginChild:
             with suppress(Exception):
                 await self.close_proxy()
 
-        await self.proxy.disconnect()
+        with suppress(Exception):
+            await self.proxy.disconnect()
 
     async def send_message(self, message: ProcessResponse) -> None:
         await self.channel.send(message)
@@ -224,25 +235,24 @@ class PluginChild:
                 pass
 
     async def configure_plugin_db(self, storage_path: str, plugin_id: str) -> PluginConfigDb:
-        # Remote-hosted: config lives on the master (re-homing safe) - persist
+        # Remote-hosted: config lives on the master (re-homing safe) — persist
         # through its config store instead of a worker-local file.
         if os.environ.get("PLUGIN_CONFIG_STORE_RPC"):
             namespaces = NamespaceManager.plugin_namespaces(plugin_id)
-            store = self.proxy.create_proxy(namespaces.plugin_config_store_rpc, PluginConfigStoreRPC)
-            remote_db = RemotePluginConfigDb(store)
+            store_rpc = self.proxy.create_proxy(namespaces.plugin_config_store_rpc, PluginConfigStoreRPC)
+            remote_db = RemotePluginConfigDb(store_rpc)
             await remote_db.init()
             return remote_db
 
-        db_path = Path(storage_path) / "volume"
-        Path(db_path).mkdir(parents=True, exist_ok=True)
-
-        plugin_db = cast(Lmdb[Literal["config"], dict[str, Any]], JsonLmdb.open(file=str(db_path), flag="c"))
-        config = cast(dict[str, Any] | None, plugin_db.get("config"))
+        volume_dir = Path(storage_path) / "volume"
+        store_path = volume_dir / STORE_FILE_NAME
 
-        if config is None:
-            plugin_db.update({"config": {}})
+        if await asyncio.to_thread(needs_lmdbm_migration, volume_dir, store_path):
+            await migrate_legacy_lmdbm(volume_dir, store_path, self.logger)
 
-        return plugin_db
+        store = PluginStoreFile(str(volume_dir), plugin_id, self.logger)
+        await store.open()
+        return LocalPluginConfigDb(store)
 
     async def configure_cameras(self, api: PluginAPI, plugin_info: PluginInfo, cameras: list[Camera]) -> None:
         cameras_devices: list[CameraDeviceProxy] = []
@@ -254,7 +264,6 @@ class PluginChild:
             cameras_devices.append(
                 CameraDeviceProxy(
                     self.proxy,
-                    api,
                     api.storage_controller,
                     camera,
                     plugin_info,

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

@@ -1,5 +1,9 @@
-import asyncio
-from typing import Any, Literal, Protocol
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any, Literal, Protocol
+
+if TYPE_CHECKING:
+    from plugins.runtime.python.store import PluginStoreFile
 
 
 class PluginConfigStoreRPC(Protocol):
@@ -9,11 +13,25 @@ class PluginConfigStoreRPC(Protocol):
 
 
 class PluginConfigDb(Protocol):
-    def get(self, key: Literal["config"]) -> dict[str, Any] | None: ...
+    def get(self, key: Literal["config"], /) -> dict[str, Any] | None: ...
+
+    async def put(self, key: Literal["config"], value: dict[str, Any], /) -> None: ...
 
-    def update(self, mapping: dict[Literal["config"], dict[str, Any]], /) -> None: ...
+    async def close(self) -> None: ...
 
-    def close(self) -> None: ...
+
+class LocalPluginConfigDb:
+    def __init__(self, store: PluginStoreFile) -> None:
+        self._store = store
+
+    def get(self, key: Literal["config"], /) -> dict[str, Any]:
+        return self._store.get()
+
+    async def put(self, key: Literal["config"], value: dict[str, Any], /) -> None:
+        await self._store.put(value)
+
+    async def close(self) -> None:
+        await self._store.close()
 
 
 class RemotePluginConfigDb:
@@ -24,19 +42,12 @@ class RemotePluginConfigDb:
     async def init(self) -> None:
         self._cache = (await self._store.get()) or {}
 
-    def get(self, _key: Literal["config"]) -> dict[str, Any]:
+    def get(self, key: Literal["config"], /) -> dict[str, Any]:
         return self._cache
 
-    def update(self, mapping: dict[Literal["config"], dict[str, Any]], /) -> None:
-        config = mapping["config"]
-        self._cache = config
-        # Lmdb-compatible sync signature — persistence is fire-and-forget; the
-        # cache is already current and errors only cost durability of this write.
-        task = asyncio.create_task(self._persist(dict(config)))
-        task.add_done_callback(lambda t: t.exception())
+    async def put(self, key: Literal["config"], value: dict[str, Any], /) -> None:
+        self._cache = value
+        await self._store.put(value)
 
-    def close(self) -> None:
+    async def close(self) -> None:
         return None
-
-    async def _persist(self, config: dict[str, Any]) -> None:
-        await self._store.put(config)

package/dist/server/src/plugins/runtime/python/index.js

@@ -29,6 +29,7 @@ export class PythonPluginRuntime extends BasePluginRuntime {
                     ...this.getEnv(),
                 },
                 cwd: this.plugin.mainPath,
+                windowsHide: true,
             });
             this.worker.on('spawn', this.onSpawn.bind(this, this.worker.pid, command, args, processNames, resolve));
             this.worker.on('error', this.onError.bind(this, reject));

package/dist/server/src/plugins/runtime/python/index.js.map

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

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

@@ -1,6 +1,4 @@
-from typing import Any, Literal, cast
-
-from plugins.runtime.python.config_db import PluginConfigDb
+from typing import Any, cast
 
 from _camera_ui_tools.camera_ui_common import LoggerService
 from _camera_ui_tools.camera_ui_rpc import RPCClient
@@ -14,6 +12,7 @@ from _camera_ui_tools.camera_ui_sdk import (
 )
 from _camera_ui_tools.camera_ui_sdk import PluginAPI as PluginAPIInterface
 from _camera_ui_tools.camera_ui_sdk.internal import AsyncEventEmitter
+from plugins.runtime.python.config_db import PluginConfigDb
 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
@@ -33,10 +32,11 @@ class PluginAPI(AsyncEventEmitter, PluginAPIInterface):
     ) -> None:
         super().__init__()
 
+        self.logger = logger
         self.storage_path = storage_path
         self.storage_controller = StorageController(self, proxy, plugin, plugin_db)
-        self.core_manager = CoreManagerProxy(proxy, self, logger, plugin)
-        self.device_manager = DeviceManagerProxy(proxy, self, self.storage_controller, logger, plugin)
+        self.core_manager = CoreManagerProxy(proxy, logger, plugin)
+        self.device_manager = DeviceManagerProxy(proxy, self.storage_controller, logger, plugin)
         self.download_manager = DownloadManagerProxy(proxy)
         self.notification_manager = NotificationManagerProxy(proxy, plugin)
 

package/dist/server/src/plugins/runtime/python/proxy/camera_device.py

@@ -9,7 +9,6 @@ from deepdiff.diff import DeepDiff
 from _camera_ui_tools.camera_ui_common import Subscribed, TaskSet
 from _camera_ui_tools.camera_ui_rpc import CloseHandler, RPCClient
 from _camera_ui_tools.camera_ui_sdk import (
-    API_EVENT,
     BehaviorSubject,
     Camera,
     CameraDetectionSettings,
@@ -53,7 +52,6 @@ from _camera_ui_tools.camera_ui_sdk import (
 from _camera_ui_tools.camera_ui_sdk import CameraDevice as CameraDeviceInterface
 from _camera_ui_tools.camera_ui_sdk.internal import SensorJSON
 from plugins.runtime.python.camera.utils import build_snapshot_url, build_target_url
-from plugins.runtime.python.remote_urls import rewrite_source_urls_for_remote
 from plugins.runtime.python.namespaces import (
     CameraNamespaces,
     FrameWorkerDetectionNamespaces,
@@ -67,6 +65,7 @@ from plugins.runtime.python.proxy.sensor import (
     SensorControllerInterface,
     SensorProxy,
 )
+from plugins.runtime.python.remote_urls import rewrite_source_urls_for_remote
 from plugins.runtime.python.typings import (
     CameraEventMessage,
     PluginInfo,
@@ -78,7 +77,6 @@ from plugins.runtime.python.typings import (
 )
 
 if TYPE_CHECKING:
-    from plugins.runtime.python.plugin_api import PluginAPI
     from plugins.runtime.python.storage_controller import StorageController
 
 
@@ -99,7 +97,10 @@ class CameraControllerInterface(Protocol):
     async def disconnect(self) -> None: ...
     async def snapshot(self, source_id: str, force_new: bool | None = None) -> bytes | None: ...
     async def probeStream(
-        self, source_id: str, probe_config: ProbeConfig | None = None, refresh: bool | None = False
+        self,
+        source_id: str,
+        probe_config: ProbeConfig | None = None,
+        refresh: bool | None = False,
     ) -> ProbeStream | None: ...
     async def refreshStates(self) -> dict[str, Any]: ...
     async def registerSensor(self, sensor: SensorJSON, plugin_id: str) -> bool: ...
@@ -144,7 +145,6 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
     def __init__(
         self,
         proxy: RPCClient,
-        api: PluginAPI,
         storage_controller: StorageController,
         camera: Camera,
         plugin: PluginInfo,
@@ -163,7 +163,6 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
         )
 
         self._logger = logger
-        self._api: PluginAPI = api
         self._proxy = proxy
         self._plugin = plugin
         self._contract: PluginContract = plugin["contract"]
@@ -199,8 +198,6 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
             NamespaceManager.frame_worker_detection_namespaces(self.id),
         )
 
-        self._api.once(API_EVENT.SHUTDOWN.value, self.cleanup)
-
     @property
     def _cameraObject(self) -> Camera:
         return deepcopy(self._camera_subject.value)
@@ -345,7 +342,7 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
         return self._proxy.create_proxy(self._namespaces[4].detection_rpc)
 
     def getSourceById(self, id: str) -> CameraDeviceSource | None:
-        return next((s for s in self.sources if s._id == id), None)
+        return next((s for s in self.sources if s._id == id), None)  # pyright: ignore[reportPrivateUsage]
 
     def _can_access_sensor(self, sensor: StoredSensorData) -> bool:
         # Own sensors are always accessible
@@ -609,7 +606,10 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
         return await self._camera_controller_proxy.snapshot(source_id, force_new)
 
     async def _probe_stream(
-        self, source_id: str, probe_config: ProbeConfig | None = None, refresh: bool | None = False
+        self,
+        source_id: str,
+        probe_config: ProbeConfig | None = None,
+        refresh: bool | None = False,
     ) -> ProbeStream | None:
         return await self._camera_controller_proxy.probeStream(source_id, probe_config, refresh)
 
@@ -624,8 +624,6 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
 
         self.unsubscribe()
 
-        self._api.removeListener(API_EVENT.SHUTDOWN.value, self.cleanup)
-
         self._tasks.remove_all()
 
         if self._close_subscription:
@@ -772,7 +770,10 @@ class CameraDeviceProxy(Subscribed, CameraDeviceInterface):
             self._sensors.pop(removed_data["sensorId"], None)
 
             self._sensor_removed_subject.next(
-                {"sensorId": removed_data["sensorId"], "sensorType": removed_data["sensorType"]}
+                {
+                    "sensorId": removed_data["sensorId"],
+                    "sensorType": removed_data["sensorType"],
+                }
             )
 
         elif event_type == "sensor:assignment:changed":

package/dist/server/src/plugins/runtime/python/proxy/core_manager.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 import asyncio
 import os
-from typing import TYPE_CHECKING, Any, TypedDict
+from typing import Any, TypedDict
 
 from _camera_ui_tools.camera_ui_common import LoggerService
 from _camera_ui_tools.camera_ui_rpc import CloseHandler, RPCClient
 from _camera_ui_tools.camera_ui_sdk import (
-    API_EVENT,
     BasePlugin,
     CoreManager,
     CoreManagerEvent,
@@ -15,13 +14,14 @@ from _camera_ui_tools.camera_ui_sdk import (
     PluginInterface,
     Subject,
 )
-from plugins.runtime.python.namespaces import CoreManagerNamespaces, NamespaceManager, PluginNamespaces
+from plugins.runtime.python.namespaces import (
+    CoreManagerNamespaces,
+    NamespaceManager,
+    PluginNamespaces,
+)
 from plugins.runtime.python.rpc.typings import CoreManagerInterface
 from plugins.runtime.python.typings import PluginInfo
 
-if TYPE_CHECKING:
-    from plugins.runtime.python.plugin_api import PluginAPI
-
 
 class RPCConnection(TypedDict):
     proxy: BasePlugin
@@ -32,13 +32,11 @@ class CoreManagerProxy(CoreManager):
     def __init__(
         self,
         proxy: RPCClient,
-        api: PluginAPI,
         logger: LoggerService,
         plugin: PluginInfo,
     ):
         self.__initialized = False
 
-        self.__api: PluginAPI = api
         self.__proxy = proxy
         self.__logger = logger
         self.__plugin = plugin
@@ -52,8 +50,6 @@ class CoreManagerProxy(CoreManager):
         self.__rpc_connections: dict[str, RPCConnection] = {}
         self.__event_subject: Subject[CoreManagerEvent] = Subject()
 
-        self.__api.once(API_EVENT.SHUTDOWN.value, self.__close)
-
     @property
     def __core_manager_proxy(self) -> CoreManagerInterface:
         return self.__proxy.create_proxy(
@@ -112,6 +108,11 @@ class CoreManagerProxy(CoreManager):
     async def getPluginsByInterface(self, interfaceName: PluginInterface) -> list[PluginInfo]:
         return await self.__core_manager_proxy.getPluginsByInterface(interfaceName)
 
+    async def close(self) -> None:
+        """Internal method to close the core manager proxy."""
+        self.__initialized = False
+        self.__event_subject.complete()
+
     async def __on_event_message(self, event: dict[str, Any]) -> None:
         event_type = event.get("type")
         if not event_type:
@@ -119,10 +120,6 @@ class CoreManagerProxy(CoreManager):
         data = event.get("data")
         self.__event_subject.next({"type": event_type, "data": data})
 
-    async def __close(self) -> None:
-        self.__initialized = False
-        self.__event_subject.complete()
-        self.__api.removeListener(API_EVENT.SHUTDOWN.value, self.__close)
         if self.__close_subscription:
             await self.__close_subscription()
             self.__close_subscription = None

package/dist/server/src/plugins/runtime/python/proxy/device_manager.py

@@ -1,14 +1,13 @@
 from __future__ import annotations
 
 import asyncio
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from _camera_ui_tools.camera_ui_common import (
     LoggerService,
 )
 from _camera_ui_tools.camera_ui_rpc import CloseHandler, RPCClient
 from _camera_ui_tools.camera_ui_sdk import (
-    API_EVENT,
     BasePlugin,
     Camera,
     DeviceManager,
@@ -20,21 +19,20 @@ from plugins.runtime.python.namespaces import (
     NamespaceManager,
     PluginNamespaces,
 )
-from plugins.runtime.python.rpc.typings import DeviceManagerInterface, DiscoveryManagerInterface
+from plugins.runtime.python.rpc.typings import (
+    DeviceManagerInterface,
+    DiscoveryManagerInterface,
+)
 from plugins.runtime.python.storage_controller import StorageController
 from plugins.runtime.python.typings import PluginInfo
 
 from .camera_device import CameraDeviceProxy
 
-if TYPE_CHECKING:
-    from plugins.runtime.python.plugin_api import PluginAPI
-
 
 class DeviceManagerProxy(DeviceManager):
     def __init__(
         self,
         proxy: RPCClient,
-        api: PluginAPI,
         storage_controller: StorageController,
         logger: LoggerService,
         plugin: PluginInfo,
@@ -42,7 +40,6 @@ class DeviceManagerProxy(DeviceManager):
         self.__initialized = False
         self.__plugin_instance: BasePlugin | None = None
 
-        self.__api: PluginAPI = api
         self.__proxy = proxy
         self.__storage_controller = storage_controller
         self.__logger = logger
@@ -56,8 +53,6 @@ class DeviceManagerProxy(DeviceManager):
             NamespaceManager.discovery_manager_namespaces(),
         )
 
-        self.__api.once(API_EVENT.SHUTDOWN.value, self.__close)
-
     @property
     def __device_manager_proxy(self) -> DeviceManagerInterface:
         return self.__proxy.create_proxy(self.__namespaces[0].device_manager_rpc, DeviceManagerInterface)
@@ -97,6 +92,16 @@ class DeviceManagerProxy(DeviceManager):
     async def configureCameras(self, camera_devices: list[CameraDeviceProxy]) -> None:
         await asyncio.gather(*[self.__get_camera_device(camera_device) for camera_device in camera_devices])
 
+    async def close(self) -> None:
+        """Internal method to close the device manager proxy and cleanup resources."""
+        self.__initialized = False
+        if self.__close_request:
+            await self.__close_request()
+
+        for device in self.__devices.values():
+            await device.cleanup()
+        self.__devices.clear()
+
     async def __on_event_message(self, event: Any) -> None:
         if not self.__plugin_instance:
             self.__logger.warn("Plugin instance not set, cannot handle lifecycle event")
@@ -107,6 +112,9 @@ class DeviceManagerProxy(DeviceManager):
 
         if event_type == "cameraAdded":
             camera: Camera = data.get("camera")
+            if camera["_id"] in self.__devices:
+                return
+
             camera_device = await self.__get_camera_device(camera)
 
             if camera_device:
@@ -153,11 +161,14 @@ class DeviceManagerProxy(DeviceManager):
                 camera_device = self.__devices[camera["_id"]]
             else:
                 camera_logger = self.__logger.create_logger(
-                    {"suffix": camera["name"], "target_id": camera["_id"], "target_type": "camera"}
+                    {
+                        "suffix": camera["name"],
+                        "target_id": camera["_id"],
+                        "target_type": "camera",
+                    }
                 )
                 camera_device = CameraDeviceProxy(
                     self.__proxy,
-                    self.__api,
                     self.__storage_controller,
                     camera,
                     self.__plugin,
@@ -177,9 +188,3 @@ class DeviceManagerProxy(DeviceManager):
 
     async def __remove_camera_storage(self, camera_id: str) -> None:
         await self.__storage_controller.removeStorage("camera", camera_id)
-
-    async def __close(self) -> None:
-        self.__initialized = False
-        self.__api.removeListener(API_EVENT.SHUTDOWN.value, self.__close)
-        if self.__close_request:
-            await self.__close_request()

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

@@ -8,11 +8,7 @@ _LOCALHOST = re.compile(r"127\.0\.0\.1|localhost")
 def _rewrite_url(url: str, master: str, user: str | None, password: str | None) -> str:
     rewritten = _LOCALHOST.sub(master, url)
 
-    if (
-        user
-        and rewritten.startswith("rtsp://")
-        and "@" not in rewritten[7:].split("/")[0]
-    ):
+    if user and rewritten.startswith("rtsp://") and "@" not in rewritten[7:].split("/")[0]:
         rewritten = rewritten.replace("rtsp://", f"rtsp://{user}:{password or ''}@", 1)
 
     return rewritten
@@ -22,9 +18,9 @@ def _walk(value: Any, master: str, user: str | None, password: str | None) -> An
     if isinstance(value, str):
         return _rewrite_url(value, master, user, password)
     if isinstance(value, list):
-        return [_walk(v, master, user, password) for v in value]
+        return [_walk(v, master, user, password) for v in value]  # pyright: ignore[reportUnknownVariableType]
     if isinstance(value, dict):
-        return {k: _walk(v, master, user, password) for k, v in value.items()}
+        return {k: _walk(v, master, user, password) for k, v in value.items()}  # pyright: ignore[reportUnknownVariableType]
     return value