@camstack/addon-provider-reolink 1.2.32 → 1.2.34

package/dist/addon.js

@@ -230953,6 +230953,8 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 				});
 				this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnWakeStarted, this.eventSource(), { deviceId: this.id }));
 				const channel = this.getChannel();
+				const isHubChild = this.isHubChild();
+				const wakeTimeoutMs = isHubChild ? Math.max(timeoutMs, 2e4) : timeoutMs;
 				try {
 					await Promise.race([(async () => {
 						await api.wakeUp(channel, {
@@ -230960,7 +230962,11 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							attempts: 2
 						});
 						await sleep$1(1500);
-					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), timeoutMs))]);
+						if (isHubChild) {
+							const dialId = buildCamStreamId("native", channel, "main", 1);
+							await Promise.race([this.ensureRfc4571Server(dialId, channel, "main"), sleep$1(1e4)]);
+						}
+					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), wakeTimeoutMs))]);
 					const CONFIRM_TIMEOUT_MS = 1e4;
 					const CONFIRM_POLL_MS = 1e3;
 					const confirmDeadline = Date.now() + CONFIRM_TIMEOUT_MS;
@@ -231002,6 +231008,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							tags: { deviceId: this.id },
 							meta: { confirmTimeoutMs: CONFIRM_TIMEOUT_MS }
 						});
+						this.emitWakeSettled();
 						return {
 							awoke: false,
 							durationMs: Date.now() - startedAt
@@ -231019,6 +231026,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							error: err instanceof Error ? err.message : String(err)
 						}
 					});
+					this.emitWakeSettled();
 					return {
 						awoke: false,
 						durationMs: Date.now() - startedAt
@@ -231184,6 +231192,26 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.lastProactiveWakeAt = Date.now();
 	}
 	/**
+	* 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
+	* closes it via `BatteryOnStatusChanged` — but a failed wake changes no
+	* state, so nothing ever closes it, and listeners (the snapshot overlay,
+	* the broker's "WAKING UP" placeholder) kept showing WAKING for the whole
+	* 35 s TTL after the answer was already known (2026-08-15: the overlay
+	* flapped sleeping↔waking on every retry — read as "random"). Re-asserting
+	* the unchanged slice still emits the event (the runtime-state bridge
+	* re-emits per WRITE), which is exactly the "wake is over, nothing came of
+	* it" signal those windows listen for.
+	*/
+	emitWakeSettled() {
+		if (!this.isBattery) return;
+		this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnStatusChanged, this.eventSource(), {
+			deviceId: this.id,
+			status: this.state.battery
+		}));
+	}
+	/**
 	* Gate for a PROACTIVE camera read, checked BEFORE `ensureApi()`.
 	*
 	* The login itself is the wake. On a sleeping UDP/battery camera the
@@ -236683,6 +236711,13 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		this.ensureApi().catch((err) => {
 			this.ctx.logger.warn("Reolink Hub initial connect failed — will retry", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
+		this.eventUnsubscribers.push(this.ctx.eventBus.subscribe({ category: EventCategory.DeviceRegistered }, (event) => {
+			if (event.data.parentDeviceId !== this.id) return;
+			(async () => {
+				const byChannel = await this.loadAdoptedChildrenByChannel();
+				for (const [ch, did] of byChannel) this.channelToDeviceId.set(ch, did);
+			})().catch(() => {});
+		}));
 		this.eventUnsubscribers.push(this.ctx.eventBus.subscribe({ category: EventCategory.DeviceUnregistered }, (event) => {
 			const data = event.data;
 			if (data.parentDeviceId !== this.id) return;
@@ -236695,6 +236730,9 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		}));
 	}
 	eventUnsubscribers = [];
+	/** Per-channel throttle for the unrouted-event warning (see
+	*  `routeSimpleEvent`) — a chatty unmapped channel must not flood. */
+	unroutedChannelLoggedAt = /* @__PURE__ */ new Map();
 	async removeDevice() {
 		this.shutdownRequested = true;
 		if (this.reconnectTimer) {
@@ -237251,7 +237289,18 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		const channel = ev?.channel;
 		if (typeof channel !== "number") return;
 		const deviceId = this.channelToDeviceId.get(channel);
-		if (deviceId === void 0) return;
+		if (deviceId === void 0) {
+			const last = this.unroutedChannelLoggedAt.get(channel) ?? 0;
+			const now = Date.now();
+			if (now - last > 6e4) {
+				this.unroutedChannelLoggedAt.set(channel, now);
+				this.ctx.logger.warn("Reolink Hub: simpleEvent for an unmapped channel dropped", { meta: {
+					channel,
+					type: ev?.type ?? "unknown"
+				} });
+			}
+			return;
+		}
 		this.ctx.devices.getAll().then((all) => all.find((d) => d.id === deviceId)).then((child) => {
 			if (!(child instanceof ReolinkCamera)) return;
 			child.handleSimpleEvent(ev);

package/dist/addon.mjs

@@ -230933,6 +230933,8 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 				});
 				this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnWakeStarted, this.eventSource(), { deviceId: this.id }));
 				const channel = this.getChannel();
+				const isHubChild = this.isHubChild();
+				const wakeTimeoutMs = isHubChild ? Math.max(timeoutMs, 2e4) : timeoutMs;
 				try {
 					await Promise.race([(async () => {
 						await api.wakeUp(channel, {
@@ -230940,7 +230942,11 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							attempts: 2
 						});
 						await sleep$1(1500);
-					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), timeoutMs))]);
+						if (isHubChild) {
+							const dialId = buildCamStreamId("native", channel, "main", 1);
+							await Promise.race([this.ensureRfc4571Server(dialId, channel, "main"), sleep$1(1e4)]);
+						}
+					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), wakeTimeoutMs))]);
 					const CONFIRM_TIMEOUT_MS = 1e4;
 					const CONFIRM_POLL_MS = 1e3;
 					const confirmDeadline = Date.now() + CONFIRM_TIMEOUT_MS;
@@ -230982,6 +230988,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							tags: { deviceId: this.id },
 							meta: { confirmTimeoutMs: CONFIRM_TIMEOUT_MS }
 						});
+						this.emitWakeSettled();
 						return {
 							awoke: false,
 							durationMs: Date.now() - startedAt
@@ -230999,6 +231006,7 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							error: err instanceof Error ? err.message : String(err)
 						}
 					});
+					this.emitWakeSettled();
 					return {
 						awoke: false,
 						durationMs: Date.now() - startedAt
@@ -231164,6 +231172,26 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 		this.lastProactiveWakeAt = Date.now();
 	}
 	/**
+	* 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
+	* closes it via `BatteryOnStatusChanged` — but a failed wake changes no
+	* state, so nothing ever closes it, and listeners (the snapshot overlay,
+	* the broker's "WAKING UP" placeholder) kept showing WAKING for the whole
+	* 35 s TTL after the answer was already known (2026-08-15: the overlay
+	* flapped sleeping↔waking on every retry — read as "random"). Re-asserting
+	* the unchanged slice still emits the event (the runtime-state bridge
+	* re-emits per WRITE), which is exactly the "wake is over, nothing came of
+	* it" signal those windows listen for.
+	*/
+	emitWakeSettled() {
+		if (!this.isBattery) return;
+		this.ctx.eventBus.emit(createEvent(EventCategory.BatteryOnStatusChanged, this.eventSource(), {
+			deviceId: this.id,
+			status: this.state.battery
+		}));
+	}
+	/**
 	* Gate for a PROACTIVE camera read, checked BEFORE `ensureApi()`.
 	*
 	* The login itself is the wake. On a sleeping UDP/battery camera the
@@ -236663,6 +236691,13 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		this.ensureApi().catch((err) => {
 			this.ctx.logger.warn("Reolink Hub initial connect failed — will retry", { meta: { error: err instanceof Error ? err.message : String(err) } });
 		});
+		this.eventUnsubscribers.push(this.ctx.eventBus.subscribe({ category: EventCategory.DeviceRegistered }, (event) => {
+			if (event.data.parentDeviceId !== this.id) return;
+			(async () => {
+				const byChannel = await this.loadAdoptedChildrenByChannel();
+				for (const [ch, did] of byChannel) this.channelToDeviceId.set(ch, did);
+			})().catch(() => {});
+		}));
 		this.eventUnsubscribers.push(this.ctx.eventBus.subscribe({ category: EventCategory.DeviceUnregistered }, (event) => {
 			const data = event.data;
 			if (data.parentDeviceId !== this.id) return;
@@ -236675,6 +236710,9 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		}));
 	}
 	eventUnsubscribers = [];
+	/** Per-channel throttle for the unrouted-event warning (see
+	*  `routeSimpleEvent`) — a chatty unmapped channel must not flood. */
+	unroutedChannelLoggedAt = /* @__PURE__ */ new Map();
 	async removeDevice() {
 		this.shutdownRequested = true;
 		if (this.reconnectTimer) {
@@ -237231,7 +237269,18 @@ var ReolinkHub = class ReolinkHub extends BaseDevice {
 		const channel = ev?.channel;
 		if (typeof channel !== "number") return;
 		const deviceId = this.channelToDeviceId.get(channel);
-		if (deviceId === void 0) return;
+		if (deviceId === void 0) {
+			const last = this.unroutedChannelLoggedAt.get(channel) ?? 0;
+			const now = Date.now();
+			if (now - last > 6e4) {
+				this.unroutedChannelLoggedAt.set(channel, now);
+				this.ctx.logger.warn("Reolink Hub: simpleEvent for an unmapped channel dropped", { meta: {
+					channel,
+					type: ev?.type ?? "unknown"
+				} });
+			}
+			return;
+		}
 		this.ctx.devices.getAll().then((all) => all.find((d) => d.id === deviceId)).then((child) => {
 			if (!(child instanceof ReolinkCamera)) return;
 			child.handleSimpleEvent(ev);

package/package.json

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