@camera.ui/browser 0.0.190 → 0.0.192

package/dist/index.d.ts

@@ -883,7 +883,7 @@ export declare interface ReactiveContactSensor extends ReactiveSensor<ContactSen
     getProperty(property: string): unknown;
 }
 
-export declare interface ReactiveCoreManager extends Omit<CoreManager, 'connectToPlugin' | 'signRequest' | 'onEvent'> {
+export declare interface ReactiveCoreManager extends Omit<CoreManager, 'connectToPlugin' | 'signRequest' | 'onEvent' | 'assistantAsk' | 'assistantAccess'> {
 }
 
 export declare interface ReactiveDeviceManager {
@@ -1078,6 +1078,7 @@ export declare interface ReactiveSmokeSensor extends ReactiveSensor<SmokeSensorP
 
 export declare interface ReactiveStorage {
     readonly proxy: Promisify<StorageRPC>;
+    readonly client: RPCClient;
     readonly config: ShallowRef<SchemaConfig | undefined>;
     readonly isLoading: Ref<boolean>;
     readonly error: Ref<Error | undefined>;

package/dist/index.js

@@ -430,9 +430,7 @@ function fetchSnapshotShared(deviceManager, id, forceFresh = false) {
 		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;
+			return await device.fetchSnapshot(void 0, forceFresh ? true : void 0) ?? void 0;
 		} finally {
 			if (device) releaseCameraDevice(id);
 		}
@@ -445,28 +443,32 @@ 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;
-		}
+		setTimeout(() => {
+			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;
+			}
+		}, 0);
 	});
 }
 function deferRevoke(url) {
 	setTimeout(() => URL.revokeObjectURL(url), REVOKE_DELAY_MS);
 }
 function setSnapshot(cameraId, data, fetchedAt) {
-	const oldUrl = urlCache.get(cameraId);
-	if (oldUrl) {
-		deferRevoke(oldUrl);
-		urlCache.delete(cameraId);
+	if (snapshotCache.get(cameraId) !== data) {
+		const oldUrl = urlCache.get(cameraId);
+		if (oldUrl) {
+			deferRevoke(oldUrl);
+			urlCache.delete(cameraId);
+		}
+		snapshotCache.set(cameraId, data);
 	}
-	snapshotCache.set(cameraId, data);
 	if (fetchedAt !== void 0) timestampCache.set(cameraId, fetchedAt);
 	notify(cameraId);
 }
@@ -1808,7 +1810,7 @@ async function resolvePluginId(rpcRef, pluginName) {
 }
 //#endregion
 //#region src/composables/useStorage.ts
-function createReactiveStorage(proxy) {
+function createReactiveStorage(proxy, client) {
 	const config = shallowRef();
 	const isLoading = ref(false);
 	const error = ref();
@@ -1872,6 +1874,7 @@ function createReactiveStorage(proxy) {
 	}
 	return {
 		proxy,
+		client,
 		config,
 		isLoading,
 		error,
@@ -1891,10 +1894,10 @@ function getCameraStorageKey(pluginId, cameraId) {
 function getSensorStorageKey(pluginId, sensorId) {
 	return `plugin:${pluginId}:sensor:${sensorId}`;
 }
-function acquireStorage(key, createProxy) {
-	return storageCache.acquire(key, () => {
-		return createReactiveStorage(createProxy());
-	});
+function acquireStorage(key, client, createProxy) {
+	const cached = storageCache.get(key);
+	if (cached && cached.client !== client) storageCache.forceRelease(key);
+	return storageCache.acquire(key, () => createReactiveStorage(createProxy(), client));
 }
 function releaseStorage(key) {
 	storageCache.release(key);
@@ -1918,10 +1921,23 @@ function cleanupStorage(state, isConnected, config) {
 	state.cachedStorage = void 0;
 	config.value = void 0;
 }
+function bindStorage(state, storageKey, client, config, createProxy) {
+	if (state.currentStorageKey === storageKey && state.cachedStorage?.client === client) return;
+	if (state.currentStorageKey && state.currentStorageKey !== storageKey) {
+		releaseStorage(state.currentStorageKey);
+		config.value = void 0;
+	}
+	state.currentStorageKey = storageKey;
+	state.cachedStorage = acquireStorage(storageKey, client, createProxy);
+}
 var GET_CONFIG_RETRY_DELAYS = [
 	2e3,
 	5e3,
 	1e4,
+	15e3,
+	15e3,
+	15e3,
+	15e3,
 	15e3
 ];
 function sleep(ms) {
@@ -2017,7 +2033,8 @@ function createStorageOperations(state, config, isLoading, error) {
 	};
 }
 function usePluginStorage(pluginName) {
-	const { rpc, isConnected: clientConnected } = useCameraUi();
+	const cameraUi = useCameraUi();
+	const { rpc, isConnected: clientConnected } = cameraUi;
 	const config = shallowRef();
 	const _isLoading = ref(false);
 	const initialSetupDone = ref(false);
@@ -2026,16 +2043,14 @@ function usePluginStorage(pluginName) {
 	const state = createStorageState();
 	const operations = createStorageOperations(state, config, _isLoading, error);
 	async function connect(name) {
-		if (!rpc.value || !clientConnected.value) return false;
+		const client = rpc.value;
+		if (!client || !clientConnected.value) return false;
 		try {
 			const pluginId = await resolvePluginId(rpc, name);
 			if (!pluginId) throw new Error(`Plugin "${name}" not found`);
-			const storageKey = getPluginStorageKey(pluginId);
-			if (state.currentStorageKey && state.currentStorageKey !== storageKey) releaseStorage(state.currentStorageKey);
-			state.currentStorageKey = storageKey;
-			state.cachedStorage = acquireStorage(storageKey, () => {
+			bindStorage(state, getPluginStorageKey(pluginId), client, config, () => {
 				const namespaces = NamespaceManager.pluginNamespaces(pluginId);
-				return rpc.value.createProxy(namespaces.pluginStorageRpc);
+				return client.createProxy(namespaces.pluginStorageRpc);
 			});
 			isConnected.value = true;
 			return true;
@@ -2053,14 +2068,20 @@ function usePluginStorage(pluginName) {
 		}
 		return operations.getConfig();
 	}
-	watch([clientConnected, () => toValue(pluginName)], async ([connected, name]) => {
-		if (connected && name) {
+	async function sync() {
+		const name = toValue(pluginName);
+		if (clientConnected.value && name) {
 			await connect(name);
 			operations.getConfig();
 		} else cleanupStorage(state, isConnected, config);
 		initialSetupDone.value = true;
-	}, { immediate: true });
-	tryOnScopeDispose(() => cleanupStorage(state, isConnected, config));
+	}
+	watch([clientConnected, () => toValue(pluginName)], sync, { immediate: true });
+	cameraUi.on("reconnected", sync);
+	tryOnScopeDispose(() => {
+		cameraUi.off("reconnected", sync);
+		cleanupStorage(state, isConnected, config);
+	});
 	return {
 		config,
 		isLoading: computed(() => _isLoading.value || !initialSetupDone.value),
@@ -2073,7 +2094,8 @@ function usePluginStorage(pluginName) {
 	};
 }
 function useCameraStorage(camera, pluginName) {
-	const { rpc, isConnected: clientConnected } = useCameraUi();
+	const cameraUi = useCameraUi();
+	const { rpc, isConnected: clientConnected } = cameraUi;
 	const config = shallowRef();
 	const _isLoading = ref(false);
 	const initialSetupDone = ref(false);
@@ -2082,16 +2104,14 @@ function useCameraStorage(camera, pluginName) {
 	const state = createStorageState();
 	const operations = createStorageOperations(state, config, _isLoading, error);
 	async function connect(cameraId, name) {
-		if (!rpc.value || !clientConnected.value) return false;
+		const client = rpc.value;
+		if (!client || !clientConnected.value) return false;
 		try {
 			const pluginId = await resolvePluginId(rpc, name);
 			if (!pluginId) throw new Error(`Plugin "${name}" not found`);
-			const storageKey = getCameraStorageKey(pluginId, cameraId);
-			if (state.currentStorageKey && state.currentStorageKey !== storageKey) releaseStorage(state.currentStorageKey);
-			state.currentStorageKey = storageKey;
-			state.cachedStorage = acquireStorage(storageKey, () => {
+			bindStorage(state, getCameraStorageKey(pluginId, cameraId), client, config, () => {
 				const namespaces = NamespaceManager.pluginCameraNamespaces(pluginId, cameraId);
-				return rpc.value.createProxy(namespaces.cameraStorageRpc);
+				return client.createProxy(namespaces.cameraStorageRpc);
 			});
 			isConnected.value = true;
 			return true;
@@ -2110,18 +2130,25 @@ function useCameraStorage(camera, pluginName) {
 		}
 		return operations.getConfig();
 	}
-	watch([
-		clientConnected,
-		() => extractCameraId(toValue(camera)),
-		() => toValue(pluginName)
-	], async ([connected, cameraId, name]) => {
-		if (connected && cameraId && name) {
+	async function sync() {
+		const cameraId = extractCameraId(toValue(camera));
+		const name = toValue(pluginName);
+		if (clientConnected.value && cameraId && name) {
 			await connect(cameraId, name);
 			operations.getConfig();
 		} else cleanupStorage(state, isConnected, config);
 		initialSetupDone.value = true;
-	}, { immediate: true });
-	tryOnScopeDispose(() => cleanupStorage(state, isConnected, config));
+	}
+	watch([
+		clientConnected,
+		() => extractCameraId(toValue(camera)),
+		() => toValue(pluginName)
+	], sync, { immediate: true });
+	cameraUi.on("reconnected", sync);
+	tryOnScopeDispose(() => {
+		cameraUi.off("reconnected", sync);
+		cleanupStorage(state, isConnected, config);
+	});
 	return {
 		config,
 		isLoading: computed(() => _isLoading.value || !initialSetupDone.value),
@@ -2134,7 +2161,8 @@ function useCameraStorage(camera, pluginName) {
 	};
 }
 function useSensorStorage(sensorId, pluginId) {
-	const { rpc, isConnected: clientConnected } = useCameraUi();
+	const cameraUi = useCameraUi();
+	const { rpc, isConnected: clientConnected } = cameraUi;
 	const config = shallowRef();
 	const _isLoading = ref(false);
 	const initialSetupDone = ref(false);
@@ -2143,14 +2171,12 @@ function useSensorStorage(sensorId, pluginId) {
 	const state = createStorageState();
 	const operations = createStorageOperations(state, config, _isLoading, error);
 	function connect(senId, plugId) {
-		if (!rpc.value || !clientConnected.value) return false;
+		const client = rpc.value;
+		if (!client || !clientConnected.value) return false;
 		try {
-			const storageKey = getSensorStorageKey(plugId, senId);
-			if (state.currentStorageKey && state.currentStorageKey !== storageKey) releaseStorage(state.currentStorageKey);
-			state.currentStorageKey = storageKey;
-			state.cachedStorage = acquireStorage(storageKey, () => {
+			bindStorage(state, getSensorStorageKey(plugId, senId), client, config, () => {
 				const namespaces = NamespaceManager.pluginSensorNamespaces(plugId, senId);
-				return rpc.value.createProxy(namespaces.sensorStorageRpc);
+				return client.createProxy(namespaces.sensorStorageRpc);
 			});
 			isConnected.value = true;
 			return true;
@@ -2169,18 +2195,25 @@ function useSensorStorage(sensorId, pluginId) {
 		}
 		return operations.getConfig();
 	}
-	watch([
-		clientConnected,
-		() => toValue(sensorId),
-		() => toValue(pluginId)
-	], ([connected, senId, plugId]) => {
-		if (connected && senId && plugId) {
+	function sync() {
+		const senId = toValue(sensorId);
+		const plugId = toValue(pluginId);
+		if (clientConnected.value && senId && plugId) {
 			connect(senId, plugId);
 			operations.getConfig();
 		} else cleanupStorage(state, isConnected, config);
 		initialSetupDone.value = true;
-	}, { immediate: true });
-	tryOnScopeDispose(() => cleanupStorage(state, isConnected, config));
+	}
+	watch([
+		clientConnected,
+		() => toValue(sensorId),
+		() => toValue(pluginId)
+	], sync, { immediate: true });
+	cameraUi.on("reconnected", sync);
+	tryOnScopeDispose(() => {
+		cameraUi.off("reconnected", sync);
+		cleanupStorage(state, isConnected, config);
+	});
 	return {
 		config,
 		isLoading: computed(() => _isLoading.value || !initialSetupDone.value),
@@ -3018,6 +3051,7 @@ async function processWebRTCMessage(handler, msg) {
 //#endregion
 //#region src/streaming/streamConnection.ts
 var log = new Logger("StreamConnection");
+var MSE_AUDIO_CODEC = /mp4a|opus|flac|mp3/i;
 function isVideoInPictureInPicture(video) {
 	if (!video) return false;
 	if (typeof document !== "undefined" && "pictureInPictureElement" in document && document.pictureInPictureElement === video) return true;
@@ -3597,6 +3631,9 @@ var StreamConnection = class {
 		this.markSourceUndecodable();
 		this.restart();
 	}
+	noteDeliveredAudio(delivered) {
+		if (delivered && !this.hasAudio.value) this.hasAudio.value = true;
+	}
 	async probeStream() {
 		const cam = this.camera.value;
 		const source = this.source.value;
@@ -3681,7 +3718,10 @@ var StreamConnection = class {
 				else if (this.backchannelHandler) processWebRTCMessage(this.backchannelHandler, msg);
 				break;
 			case "mse":
-				if (this.mseHandler && typeof msg.value === "string") this.mseHandler.initializeBuffer(msg.value);
+				if (this.mseHandler && typeof msg.value === "string") {
+					this.noteDeliveredAudio(MSE_AUDIO_CODEC.test(msg.value));
+					this.mseHandler.initializeBuffer(msg.value);
+				}
 				break;
 			case "error": if (this.requestedMode.value !== "auto") {
 				this.error.value = new Error(msg.value);
@@ -3717,6 +3757,7 @@ var StreamConnection = class {
 			this.handleWebRTCFailed();
 			return;
 		}
+		this.noteDeliveredAudio(stream.getAudioTracks().length > 0);
 		this.activeMode.value = this.requestedMode.value === "auto" ? "webrtc" : this.requestedMode.value;
 		this.lastMediaStream = stream;
 		video.srcObject = stream;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.190",
+  "version": "0.0.192",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/cameraui/clients)",
   "type": "module",
@@ -63,7 +63,7 @@
     "unplugin-dts": "^1.1.0",
     "updates": "^18.1.0",
     "vite": "^8.3.0",
-    "vitest": "^5.0.0",
+    "vitest": "^5.0.1",
     "vue": "^3.5.42",
     "vue-tsc": "^3.3.11"
   },