@camera.ui/browser 0.0.184 → 0.0.185

package/dist/index.js

@@ -419,9 +419,44 @@ var snapshotCache = /* @__PURE__ */ new Map();
 var timestampCache = /* @__PURE__ */ new Map();
 var urlCache = /* @__PURE__ */ new Map();
 var subscribers = /* @__PURE__ */ new Map();
+var pendingLoads$2 = /* @__PURE__ */ new Map();
 function notify(cameraId) {
 	subscribers.get(cameraId)?.forEach((cb) => cb());
 }
+function fetchSnapshotShared(deviceManager, id, forceFresh = false) {
+	const pending = pendingLoads$2.get(id);
+	if (pending) return pending;
+	const promise = (async () => {
+		const device = await acquireCameraDevice(deviceManager, id);
+		try {
+			if (!device) return void 0;
+			const result = await device.fetchSnapshot(void 0, forceFresh ? true : void 0);
+			if (result) setSnapshot(id, result);
+			return result ?? void 0;
+		} finally {
+			if (device) releaseCameraDevice(id);
+		}
+	})().finally(() => pendingLoads$2.delete(id));
+	pendingLoads$2.set(id, promise);
+	return promise;
+}
+var reconnectHooked = false;
+function hookReconnectRefresh(cameraUi, deviceManager) {
+	if (reconnectHooked) return;
+	reconnectHooked = true;
+	cameraUi.on("reconnected", () => {
+		let delay = 0;
+		for (const id of subscribers.keys()) {
+			if ((subscribers.get(id)?.size ?? 0) === 0) continue;
+			const cameraId = id;
+			setTimeout(() => {
+				if ((subscribers.get(cameraId)?.size ?? 0) === 0) return;
+				fetchSnapshotShared(deviceManager, cameraId).catch(() => void 0);
+			}, delay);
+			delay += 150;
+		}
+	});
+}
 function deferRevoke(url) {
 	setTimeout(() => URL.revokeObjectURL(url), REVOKE_DELAY_MS);
 }
@@ -468,6 +503,7 @@ function useSnapshot(cameraIdOrName) {
 	const snapshot = shallowRef();
 	const _isLoading = ref(false);
 	const initialLoadDone = ref(false);
+	hookReconnectRefresh(cameraUi, deviceManager);
 	const snapshotSrc = computed(() => {
 		if (!snapshot.value) return void 0;
 		const idOrName = toValue(cameraIdOrName);
@@ -524,18 +560,8 @@ function useSnapshot(cameraIdOrName) {
 		}
 		_isLoading.value = true;
 		try {
-			const device = await acquireCameraDevice(deviceManager, id);
-			try {
-				if (device) {
-					const result = await device.fetchSnapshot();
-					if (result) {
-						setSnapshot(id, result);
-						snapshot.value = result;
-					}
-				}
-			} finally {
-				if (device) releaseCameraDevice(id);
-			}
+			const result = await fetchSnapshotShared(deviceManager, id);
+			if (result) snapshot.value = result;
 		} catch {} finally {
 			_isLoading.value = false;
 			initialLoadDone.value = true;
@@ -551,18 +577,8 @@ function useSnapshot(cameraIdOrName) {
 		if (isCameraDisabled(cameraIdName)) return;
 		_isLoading.value = true;
 		try {
-			const device = await acquireCameraDevice(deviceManager, id);
-			try {
-				if (device) {
-					const result = await device.fetchSnapshot(void 0, true);
-					if (result) {
-						setSnapshot(id, result);
-						snapshot.value = result;
-					}
-				}
-			} finally {
-				if (device) releaseCameraDevice(id);
-			}
+			const result = await fetchSnapshotShared(deviceManager, id, true);
+			if (result) snapshot.value = result;
 		} catch {} finally {
 			_isLoading.value = false;
 			initialLoadDone.value = true;
@@ -589,15 +605,7 @@ function useSnapshot(cameraIdOrName) {
 			snapshot.value = void 0;
 		}
 	}, { immediate: true });
-	const onReconnected = () => {
-		const idOrName = toValue(cameraIdOrName);
-		if (isCameraDisabled(idOrName)) return;
-		const id = typeof idOrName === "string" ? idOrName : idOrName._id;
-		if (id) loadSnapshot(id, true);
-	};
-	cameraUi.on("reconnected", onReconnected);
 	tryOnScopeDispose(() => {
-		cameraUi.off("reconnected", onReconnected);
 		unsubscribe?.();
 		releaseHeldDevice();
 	});
@@ -1778,18 +1786,25 @@ function useClassifierSensors(camera) {
 //#endregion
 //#region src/composables/resolvePluginId.ts
 var pluginIdCache = /* @__PURE__ */ new Map();
+var pendingResolves = /* @__PURE__ */ new Map();
 function clearPluginIdCache() {
 	pluginIdCache.clear();
 }
 async function resolvePluginId(rpcRef, pluginName) {
 	const cached = pluginIdCache.get(pluginName);
 	if (cached) return cached;
-	const namespaces = NamespaceManager.coreManagerNamespaces();
-	const pluginInfo = await rpcCall(rpcRef, (rpc) => rpc.createProxy(namespaces.coreManagerRpc).getPlugin(pluginName));
-	if (pluginInfo) {
-		pluginIdCache.set(pluginName, pluginInfo.id);
-		return pluginInfo.id;
-	}
+	const pending = pendingResolves.get(pluginName);
+	if (pending) return pending;
+	const promise = (async () => {
+		const namespaces = NamespaceManager.coreManagerNamespaces();
+		const pluginInfo = await rpcCall(rpcRef, (rpc) => rpc.createProxy(namespaces.coreManagerRpc).getPlugin(pluginName));
+		if (pluginInfo) {
+			pluginIdCache.set(pluginName, pluginInfo.id);
+			return pluginInfo.id;
+		}
+	})().finally(() => pendingResolves.delete(pluginName));
+	pendingResolves.set(pluginName, promise);
+	return promise;
 }
 //#endregion
 //#region src/composables/useStorage.ts
@@ -1797,11 +1812,16 @@ function createReactiveStorage(proxy) {
 	const config = shallowRef();
 	const isLoading = ref(false);
 	const error = ref();
+	let inFlightConfig = null;
 	async function getConfig() {
+		if (inFlightConfig) return inFlightConfig;
 		isLoading.value = true;
 		error.value = void 0;
 		try {
-			config.value = await proxy.getConfig();
+			inFlightConfig = proxy.getConfig().finally(() => {
+				inFlightConfig = null;
+			});
+			config.value = await inFlightConfig;
 			return config.value;
 		} catch (err) {
 			error.value = err instanceof Error ? err : new Error(String(err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.184",
+  "version": "0.0.185",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/cameraui/clients)",
   "type": "module",