@camstack/addon-provider-reolink 1.2.33 → 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;
@@ -236705,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;
@@ -236717,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) {
@@ -237273,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;
@@ -236685,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;
@@ -236697,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) {
@@ -237253,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.33",
+  "version": "1.2.34",
   "description": "Reolink camera device provider addon for CamStack — native Baichuan protocol",
   "keywords": [
     "camstack",