@camera.ui/browser 0.0.132 → 0.0.134

package/dist/index.d.ts

@@ -143,6 +143,7 @@ export declare interface CameraDeviceInterface extends CameraDeviceImplementatio
     refreshStates(): Promise<RefreshedStates>;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
+    snapshotWithMeta(sourceId: string, forceNew?: boolean): Promise<SnapshotWithMeta | undefined>;
     probeStream(sourceId: string, probeConfig?: ProbeConfig, refresh?: boolean): Promise<ProbeStream | undefined>;
     getStreamStatus(sourceId: string): Promise<string>;
     registerSensor(sensor: SensorJSON, pluginId: string): Promise<boolean>;
@@ -971,6 +972,11 @@ declare interface SensorRemovedEvent {
 
 /* Excluded from this release type: SmokeSensorProperties */
 
+declare interface SnapshotWithMeta {
+    data: ArrayBuffer;
+    ageMs: number;
+}
+
 export declare interface StorageRPC {
     getValue<T = string>(key: string, defaultValue?: T): Promise<T | undefined>;
     setValue<T = string>(key: string, newValue: T): Promise<void>;
@@ -984,6 +990,7 @@ export declare interface StorageRPC {
 
 export declare interface StoredSensorData {
     id: string;
+    stableId: string;
     type: SensorType;
     name: string;
     displayName: string;
@@ -1216,6 +1223,7 @@ export declare function useSnapshot(cameraIdOrName: MaybeRefOrGetter<string | DB
 export declare interface UseSnapshotReturn {
     snapshot: ShallowRef<ArrayBuffer | undefined>;
     snapshotSrc: ComputedRef<string | undefined>;
+    snapshotTimestamp: ComputedRef<number | undefined>;
     isLoading: ComputedRef<boolean>;
     refresh: () => Promise<void>;
 }

package/dist/index.js

@@ -411,6 +411,7 @@ function makeAbortError() {
 //#region src/composables/useSnapshot.ts
 var REVOKE_DELAY_MS = 5e3;
 var snapshotCache = /* @__PURE__ */ new Map();
+var timestampCache = /* @__PURE__ */ new Map();
 var urlCache = /* @__PURE__ */ new Map();
 var subscribers = /* @__PURE__ */ new Map();
 function notify(cameraId) {
@@ -419,13 +420,14 @@ function notify(cameraId) {
 function deferRevoke(url) {
 	setTimeout(() => URL.revokeObjectURL(url), REVOKE_DELAY_MS);
 }
-function setSnapshot(cameraId, data) {
+function setSnapshot(cameraId, data, fetchedAt) {
 	const oldUrl = urlCache.get(cameraId);
 	if (oldUrl) {
 		deferRevoke(oldUrl);
 		urlCache.delete(cameraId);
 	}
 	snapshotCache.set(cameraId, data);
+	if (fetchedAt !== void 0) timestampCache.set(cameraId, fetchedAt);
 	notify(cameraId);
 }
 function getSnapshot(cameraId) {
@@ -452,6 +454,7 @@ function clearSnapshotCache() {
 	for (const url of urlCache.values()) URL.revokeObjectURL(url);
 	urlCache.clear();
 	snapshotCache.clear();
+	timestampCache.clear();
 }
 function useSnapshot(cameraIdOrName) {
 	const { isConnected } = useCameraUi();
@@ -464,6 +467,12 @@ function useSnapshot(cameraIdOrName) {
 		const idOrName = toValue(cameraIdOrName);
 		return getSnapshotUrl(typeof idOrName === "string" ? idOrName : idOrName._id);
 	});
+	const snapshotTimestamp = computed(() => {
+		if (!snapshot.value) return void 0;
+		const idOrName = toValue(cameraIdOrName);
+		const id = typeof idOrName === "string" ? idOrName : idOrName._id;
+		return timestampCache.get(id);
+	});
 	function subscribe(cameraId) {
 		if (!subscribers.has(cameraId)) subscribers.set(cameraId, /* @__PURE__ */ new Set());
 		const updateFn = () => {
@@ -475,6 +484,30 @@ function useSnapshot(cameraIdOrName) {
 		};
 	}
 	let unsubscribe;
+	let heldDeviceId;
+	let pendingHoldId;
+	async function holdDevice(id) {
+		if (heldDeviceId === id || pendingHoldId === id) return;
+		pendingHoldId = id;
+		try {
+			if (!await acquireCameraDevice(deviceManager, id)) return;
+			const idOrName = toValue(cameraIdOrName);
+			if ((typeof idOrName === "string" ? idOrName : idOrName._id) !== id || heldDeviceId === id) {
+				releaseCameraDevice(id);
+				return;
+			}
+			releaseHeldDevice();
+			heldDeviceId = id;
+		} catch {} finally {
+			pendingHoldId = void 0;
+		}
+	}
+	function releaseHeldDevice() {
+		if (heldDeviceId) {
+			releaseCameraDevice(heldDeviceId);
+			heldDeviceId = void 0;
+		}
+	}
 	async function loadSnapshot(id) {
 		if (!isConnected.value || !id) return;
 		const cached = snapshotCache.get(id);
@@ -539,18 +572,25 @@ function useSnapshot(cameraIdOrName) {
 		const id = typeof cameraIdName === "string" ? cameraIdName : cameraIdName._id;
 		if (connected && id && !disabled) {
 			unsubscribe = subscribe(id);
+			await holdDevice(id);
 			await loadSnapshot(id);
 		} else if (id) {
+			releaseHeldDevice();
 			snapshot.value = snapshotCache.get(id);
 			initialLoadDone.value = true;
-		} else snapshot.value = void 0;
+		} else {
+			releaseHeldDevice();
+			snapshot.value = void 0;
+		}
 	}, { immediate: true });
 	tryOnScopeDispose(() => {
 		unsubscribe?.();
+		releaseHeldDevice();
 	});
 	return {
 		snapshot,
 		snapshotSrc,
+		snapshotTimestamp,
 		isLoading: computed(() => _isLoading.value || !initialLoadDone.value),
 		refresh
 	};
@@ -608,10 +648,19 @@ async function createReactiveCameraDevice(rpcOrContext, initialCamera) {
 	async function fetchSnapshot(sourceId, forceNew) {
 		snapshotLoading.value = true;
 		try {
-			const result = await rpcCall(rpcRef, (client) => client.createProxy(cameraNamespaces.cameraControllerRpc).snapshot(sourceId, forceNew));
-			if (result && result.byteLength > 0) {
-				setSnapshot(initialCamera._id, result);
-				return result;
+			try {
+				const result = await rpcCall(rpcRef, (client) => client.createProxy(cameraNamespaces.cameraControllerRpc).snapshotWithMeta(sourceId, forceNew));
+				if (result && result.data.byteLength > 0) {
+					setSnapshot(initialCamera._id, result.data, Date.now() - result.ageMs);
+					return result.data;
+				}
+				return;
+			} catch {
+				const result = await rpcCall(rpcRef, (client) => client.createProxy(cameraNamespaces.cameraControllerRpc).snapshot(sourceId, forceNew));
+				if (result && result.byteLength > 0) {
+					setSnapshot(initialCamera._id, result, forceNew ? Date.now() : void 0);
+					return result;
+				}
 			}
 		} finally {
 			snapshotLoading.value = false;
@@ -645,7 +694,7 @@ async function createReactiveCameraDevice(rpcOrContext, initialCamera) {
 				frameWorkerConnected.value = event.data;
 				break;
 			case "snapshot:updated":
-				setSnapshot(initialCamera._id, event.data.snapshot);
+				setSnapshot(initialCamera._id, event.data.snapshot, Date.now());
 				break;
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camera.ui/browser",
-  "version": "0.0.132",
+  "version": "0.0.134",
   "description": "camera.ui browser client",
   "author": "seydx (https://github.com/cameraui/clients)",
   "type": "module",
@@ -31,7 +31,7 @@
   "peerDependencies": {
     "@camera.ui/logger": ">=0.0.2",
     "@camera.ui/rpc": ">=1.0.9",
-    "@camera.ui/sdk": ">=0.0.16",
+    "@camera.ui/sdk": ">=0.0.19",
     "@camera.ui/transport": ">=0.0.1",
     "@vueuse/core": ">=14.3.0",
     "vue": ">=3.5.39"
@@ -39,13 +39,13 @@
   "devDependencies": {
     "@camera.ui/logger": "file:../../packages/logger",
     "@camera.ui/rpc": "^1.0.9",
-    "@camera.ui/sdk": "~0.0.16",
+    "@camera.ui/sdk": "~0.0.19",
     "@camera.ui/transport": "file:../../packages/transport",
     "@eneris/push-receiver": "^4.3.1",
     "@microsoft/api-extractor": "^7.58.9",
     "@stylistic/eslint-plugin": "^5.10.0",
     "@types/webrtc": "^0.0.47",
-    "@typescript-eslint/parser": "^8.63.0",
+    "@typescript-eslint/parser": "^8.64.0",
     "@vitejs/plugin-vue": "^6.0.7",
     "@vue/eslint-config-prettier": "^10.2.0",
     "@vue/eslint-config-typescript": "^14.9.0",
@@ -59,7 +59,7 @@
     "prettier": "^3.9.5",
     "rimraf": "^6.1.3",
     "typescript": "5.9.3",
-    "typescript-eslint": "^8.63.0",
+    "typescript-eslint": "^8.64.0",
     "unplugin-dts": "^1.0.3",
     "updates": "^17.18.2",
     "vite": "^8.1.4",