@camstack/addon-provider-reolink 1.2.35 → 1.2.37

package/dist/addon.js

@@ -230966,10 +230966,13 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 					const confirmDeadline = Date.now() + CONFIRM_TIMEOUT_MS;
 					const parent = await this.getParentHub();
 					let confirmed = false;
+					let observedAwake = false;
 					while (Date.now() < confirmDeadline) {
 						if (parent !== null) try {
-							if ((await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel())?.sleeping === false) {
+							const entry = (await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel());
+							if (entry !== void 0 && entry.online !== false) {
 								confirmed = true;
+								observedAwake = entry.sleeping === false;
 								break;
 							}
 						} catch {}
@@ -230982,13 +230985,14 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							}
 							if (state === "awake") {
 								confirmed = true;
+								observedAwake = true;
 								break;
 							}
 						}
 						await sleep$1(CONFIRM_POLL_MS);
 					}
 					const confirmSource = parent !== null ? "hub-summary" : "sleep-poll";
-					if (confirmed && this.commitSleepState(false, confirmSource)) {
+					if (observedAwake && this.commitSleepState(false, confirmSource)) {
 						this.ctx.logger.info("battery wakeForStream: wake confirmed — driving wake transition", {
 							tags: { deviceId: this.id },
 							meta: {
@@ -231008,6 +231012,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							durationMs: Date.now() - startedAt
 						};
 					}
+					if (confirmed && !observedAwake && parent !== null) this.watchHubChildAwake(parent).catch(() => {});
 					return {
 						awoke: true,
 						durationMs: Date.now() - startedAt
@@ -231186,6 +231191,29 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.lastProactiveWakeAt = Date.now();
 	}
 	/**
+	* Post-confirm watch for a hub child whose wake lands on the consumer's
+	* relay dial: re-read the parent's channel summary a few times over the
+	* dial's wake window and commit `sleeping: false` the moment the firmware
+	* reports it. Ends EARLY once committed; bounded hard so a dead link can't
+	* leak a timer. Costs the camera nothing — the summary is the hub's own
+	* mains-powered read.
+	*/
+	async watchHubChildAwake(parent) {
+		const deadline = Date.now() + 45e3;
+		while (Date.now() < deadline) {
+			await sleep$1(5e3);
+			try {
+				if ((await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel())?.sleeping === false) {
+					if (this.commitSleepState(false, "hub-summary")) {
+						this.ctx.logger.info("battery wakeForStream: hub child observed awake after the dial", { tags: { deviceId: this.id } });
+						this.onWakeTransition("hub-summary").catch(() => {});
+					}
+					return;
+				}
+			} catch {}
+		}
+	}
+	/**
 	* Close the transient "waking" window on a wake that did NOT produce a
 	* committed transition (ACK with no awake evidence, or a timeout).
 	* `BatteryOnWakeStarted` opens it; normally the `sleeping: false` commit
@@ -236647,6 +236675,14 @@ function computeHealthCheckBackoffMs(consecutive) {
 //#endregion
 //#region src/reolink-hub.ts
 var HUB_DISCOVERY_REFRESH_TIMEOUT_MS = 8e3;
+/**
+* How often the hub re-reads its own channels summary to reconcile the
+* adopted children's sleep slices. 60 s: a naturally-waking camera (PIR,
+* schedule) is caught within a minute, and the play path has its own
+* faster confirm + post-dial watch, so this only ever carries background
+* drift. Never wakes a child — the summary is answered by the hub itself.
+*/
+var HUB_CHILD_SLEEP_RECONCILE_MS = 6e4;
 var HUB_RECONNECT_BASE_MS = 2e3;
 var HUB_RECONNECT_MAX_MS = 3e4;
 /**
@@ -236680,6 +236716,8 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	connectInFlight = null;
 	reconnectAttempts = 0;
 	reconnectTimer = null;
+	/** Periodic child-sleep reconcile timer (armed in `onActivate`). */
+	sleepReconcileTimer = null;
 	shutdownRequested = false;
 	/** Diagnostic Sessions snapshot — same shape as the camera's. */
 	sessionsSnapshot = null;
@@ -236764,6 +236802,10 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 			this.ctx.logger.info("Reolink Hub: child unregistered externally — refreshing discovery", cid !== null ? { tags: { deviceId: cid } } : {});
 			this.refreshDiscoveryFromCamera().catch(() => {});
 		}));
+		this.sleepReconcileTimer = setInterval(() => {
+			this.refreshDiscoveryFromCamera().catch(() => {});
+		}, HUB_CHILD_SLEEP_RECONCILE_MS);
+		if (typeof this.sleepReconcileTimer.unref === "function") this.sleepReconcileTimer.unref();
 	}
 	eventUnsubscribers = [];
 	/** Per-channel throttle for the unrouted-event warning (see
@@ -236775,6 +236817,10 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 			clearTimeout(this.reconnectTimer);
 			this.reconnectTimer = null;
 		}
+		if (this.sleepReconcileTimer) {
+			clearInterval(this.sleepReconcileTimer);
+			this.sleepReconcileTimer = null;
+		}
 		for (const unsub of this.eventUnsubscribers) try {
 			unsub();
 		} catch {}

package/dist/addon.mjs

@@ -230946,10 +230946,13 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 					const confirmDeadline = Date.now() + CONFIRM_TIMEOUT_MS;
 					const parent = await this.getParentHub();
 					let confirmed = false;
+					let observedAwake = false;
 					while (Date.now() < confirmDeadline) {
 						if (parent !== null) try {
-							if ((await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel())?.sleeping === false) {
+							const entry = (await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel());
+							if (entry !== void 0 && entry.online !== false) {
 								confirmed = true;
+								observedAwake = entry.sleeping === false;
 								break;
 							}
 						} catch {}
@@ -230962,13 +230965,14 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							}
 							if (state === "awake") {
 								confirmed = true;
+								observedAwake = true;
 								break;
 							}
 						}
 						await sleep$1(CONFIRM_POLL_MS);
 					}
 					const confirmSource = parent !== null ? "hub-summary" : "sleep-poll";
-					if (confirmed && this.commitSleepState(false, confirmSource)) {
+					if (observedAwake && this.commitSleepState(false, confirmSource)) {
 						this.ctx.logger.info("battery wakeForStream: wake confirmed — driving wake transition", {
 							tags: { deviceId: this.id },
 							meta: {
@@ -230988,6 +230992,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							durationMs: Date.now() - startedAt
 						};
 					}
+					if (confirmed && !observedAwake && parent !== null) this.watchHubChildAwake(parent).catch(() => {});
 					return {
 						awoke: true,
 						durationMs: Date.now() - startedAt
@@ -231166,6 +231171,29 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.lastProactiveWakeAt = Date.now();
 	}
 	/**
+	* Post-confirm watch for a hub child whose wake lands on the consumer's
+	* relay dial: re-read the parent's channel summary a few times over the
+	* dial's wake window and commit `sleeping: false` the moment the firmware
+	* reports it. Ends EARLY once committed; bounded hard so a dead link can't
+	* leak a timer. Costs the camera nothing — the summary is the hub's own
+	* mains-powered read.
+	*/
+	async watchHubChildAwake(parent) {
+		const deadline = Date.now() + 45e3;
+		while (Date.now() < deadline) {
+			await sleep$1(5e3);
+			try {
+				if ((await (await parent.getApi()).getNvrChannelsSummary({ channels: [this.getChannel()] })).devices.find((d) => d.channel === this.getChannel())?.sleeping === false) {
+					if (this.commitSleepState(false, "hub-summary")) {
+						this.ctx.logger.info("battery wakeForStream: hub child observed awake after the dial", { tags: { deviceId: this.id } });
+						this.onWakeTransition("hub-summary").catch(() => {});
+					}
+					return;
+				}
+			} catch {}
+		}
+	}
+	/**
 	* Close the transient "waking" window on a wake that did NOT produce a
 	* committed transition (ACK with no awake evidence, or a timeout).
 	* `BatteryOnWakeStarted` opens it; normally the `sleeping: false` commit
@@ -236627,6 +236655,14 @@ function computeHealthCheckBackoffMs(consecutive) {
 //#endregion
 //#region src/reolink-hub.ts
 var HUB_DISCOVERY_REFRESH_TIMEOUT_MS = 8e3;
+/**
+* How often the hub re-reads its own channels summary to reconcile the
+* adopted children's sleep slices. 60 s: a naturally-waking camera (PIR,
+* schedule) is caught within a minute, and the play path has its own
+* faster confirm + post-dial watch, so this only ever carries background
+* drift. Never wakes a child — the summary is answered by the hub itself.
+*/
+var HUB_CHILD_SLEEP_RECONCILE_MS = 6e4;
 var HUB_RECONNECT_BASE_MS = 2e3;
 var HUB_RECONNECT_MAX_MS = 3e4;
 /**
@@ -236660,6 +236696,8 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 	connectInFlight = null;
 	reconnectAttempts = 0;
 	reconnectTimer = null;
+	/** Periodic child-sleep reconcile timer (armed in `onActivate`). */
+	sleepReconcileTimer = null;
 	shutdownRequested = false;
 	/** Diagnostic Sessions snapshot — same shape as the camera's. */
 	sessionsSnapshot = null;
@@ -236744,6 +236782,10 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 			this.ctx.logger.info("Reolink Hub: child unregistered externally — refreshing discovery", cid !== null ? { tags: { deviceId: cid } } : {});
 			this.refreshDiscoveryFromCamera().catch(() => {});
 		}));
+		this.sleepReconcileTimer = setInterval(() => {
+			this.refreshDiscoveryFromCamera().catch(() => {});
+		}, HUB_CHILD_SLEEP_RECONCILE_MS);
+		if (typeof this.sleepReconcileTimer.unref === "function") this.sleepReconcileTimer.unref();
 	}
 	eventUnsubscribers = [];
 	/** Per-channel throttle for the unrouted-event warning (see
@@ -236755,6 +236797,10 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 			clearTimeout(this.reconnectTimer);
 			this.reconnectTimer = null;
 		}
+		if (this.sleepReconcileTimer) {
+			clearInterval(this.sleepReconcileTimer);
+			this.sleepReconcileTimer = null;
+		}
 		for (const unsub of this.eventUnsubscribers) try {
 			unsub();
 		} catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-reolink",
-  "version": "1.2.35",
+  "version": "1.2.37",
   "description": "Reolink camera device provider addon for CamStack — native Baichuan protocol",
   "keywords": [
     "camstack",