@camera.ui/browser 0.1.6 → 0.1.7

package/dist/index.js

@@ -676,6 +676,7 @@ var subscribers = /* @__PURE__ */ new Map();
 var pendingLoads$2 = /* @__PURE__ */ new Map();
 var refreshingCameras = reactive(/* @__PURE__ */ new Set());
 var refreshLingers = /* @__PURE__ */ new Map();
+var forcedRefreshes = /* @__PURE__ */ new Map();
 var serverClockOffset = 0;
 function notify(cameraId) {
 	subscribers.get(cameraId)?.forEach((cb) => cb());
@@ -691,7 +692,9 @@ function fetchSnapshotShared(deviceManager, id, forceFresh = false) {
 		} finally {
 			if (device) releaseCameraDevice(device);
 		}
-	})().finally(() => pendingLoads$2.delete(id));
+	})().finally(() => {
+		if (pendingLoads$2.get(id) === promise) pendingLoads$2.delete(id);
+	});
 	pendingLoads$2.set(id, promise);
 	return promise;
 }
@@ -700,6 +703,7 @@ function hookReconnectRefresh(cameraUi, deviceManager) {
 	if (hookedContexts.has(cameraUi)) return;
 	hookedContexts.add(cameraUi);
 	cameraUi.on("reconnected", () => {
+		pendingLoads$2.clear();
 		setTimeout(() => {
 			let delay = 0;
 			for (const id of subscribers.keys()) {
@@ -723,12 +727,19 @@ function isOutdated(settings, fetchedAt) {
 function deferRevoke(url) {
 	setTimeout(() => URL.revokeObjectURL(url), REVOKE_DELAY_MS);
 }
-function startSnapshotRefresh(cameraId) {
+function startSnapshotRefresh(cameraId, forced = false) {
 	clearTimeout(refreshLingers.get(cameraId));
 	refreshLingers.delete(cameraId);
+	if (forced) forcedRefreshes.set(cameraId, (forcedRefreshes.get(cameraId) ?? 0) + 1);
 	refreshingCameras.add(cameraId);
 }
-function endSnapshotRefresh(cameraId) {
+function endSnapshotRefresh(cameraId, forced = false) {
+	const running = (forcedRefreshes.get(cameraId) ?? 0) - (forced ? 1 : 0);
+	if (running > 0) {
+		forcedRefreshes.set(cameraId, running);
+		return;
+	}
+	forcedRefreshes.delete(cameraId);
 	clearTimeout(refreshLingers.get(cameraId));
 	const linger = setTimeout(() => {
 		refreshLingers.delete(cameraId);
@@ -801,6 +812,7 @@ function clearSnapshotCache() {
 	takenAtCache.clear();
 	stampCache.clear();
 	refreshLingers.clear();
+	forcedRefreshes.clear();
 	refreshingCameras.clear();
 	serverClockOffset = 0;
 }
@@ -989,8 +1001,15 @@ function useSnapshot(cameraIdOrName) {
 //#endregion
 //#region src/composables/useCamera.ts
 var NOT_MODIFIED = "not-modified";
+var CLOCK_SAMPLE_MAX_MS = 5e3;
 var snapshotWithMetaSupport = /* @__PURE__ */ new WeakMap();
 var sensorEventFanouts = /* @__PURE__ */ new WeakMap();
+function replyTime(result, requestedAt) {
+	if (result.stamp === void 0 || result.fetchedAt === void 0) return result.fetchedAt;
+	if (Date.now() - requestedAt > CLOCK_SAMPLE_MAX_MS) return toBrowserTime(result.stamp);
+	rememberServerClock(result.fetchedAt, result.stamp);
+	return result.fetchedAt;
+}
 async function createReactiveCameraDevice(rpcOrContext, initialCamera) {
 	const cameraNamespaces = NamespaceManager.cameraNamespaces(initialCamera._id);
 	const ctx = "rpc" in rpcOrContext && "value" in rpcOrContext.rpc ? rpcOrContext : void 0;
@@ -1050,7 +1069,7 @@ async function createReactiveCameraDevice(rpcOrContext, initialCamera) {
 	const hasPtz = computed(() => existingSensorTypes.value.has(SensorType.PTZ));
 	async function fetchSnapshot(sourceId, forceNew) {
 		snapshotLoading.value = true;
-		startSnapshotRefresh(initialCamera._id);
+		startSnapshotRefresh(initialCamera._id, forceNew);
 		const requestedAt = Date.now();
 		try {
 			const result = await requestSnapshot(sourceId, forceNew);
@@ -1060,14 +1079,14 @@ async function createReactiveCameraDevice(rpcOrContext, initialCamera) {
 					sourceId,
 					fetchedAt: result.stamp
 				};
-				if (stamp && result.fetchedAt !== void 0) rememberServerClock(result.fetchedAt, stamp.fetchedAt);
-				setSnapshot(initialCamera._id, result.data, result.fetchedAt, result.fetchedAt ?? requestedAt, stamp);
+				const fetchedAt = replyTime(result, requestedAt);
+				setSnapshot(initialCamera._id, result.data, fetchedAt, fetchedAt ?? requestedAt, stamp);
 				return result.data;
 			}
 			return;
 		} finally {
 			snapshotLoading.value = false;
-			endSnapshotRefresh(initialCamera._id);
+			endSnapshotRefresh(initialCamera._id, forceNew);
 		}
 	}
 	async function requestSnapshot(sourceId, forceNew) {

package/package.json

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