@camstack/addon-provider-reolink 1.2.34 → 1.2.36

package/dist/addon.js

@@ -230953,8 +230953,6 @@ 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, {
@@ -230962,20 +230960,19 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							attempts: 2
 						});
 						await sleep$1(1500);
-						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))]);
+					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), timeoutMs))]);
 					const CONFIRM_TIMEOUT_MS = 1e4;
 					const CONFIRM_POLL_MS = 1e3;
 					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 {}
@@ -230988,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: {
@@ -233632,8 +233630,50 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* drained the battery and, by bursting the socket, was itself what starved
 	* GetEnc.
 	*/
+	/**
+	* The catalog a SLEEPING hub child can still offer: the parent's RTSP
+	* relay entries, derived from the parent's config (host + credentials +
+	* the Reolink Hub's per-channel relay scheme), with zero contact to the
+	* child. This is the difference between a sleeping hub child being
+	* playable and being a permanent "sleeping" tile: the broker gets a
+	* dialable URL, the relay dial wakes the camera over RF (verified live
+	* against the Home Hub, 2026-08-15), and the catalog never depended on
+	* the child being awake to build.
+	*/
+	async buildHubRelayDescriptors() {
+		if (!this.isHubChild()) return [];
+		const parentId = this.parentDeviceId;
+		if (parentId === null) return [];
+		const cfg = (await this.ctx.devices.getAll()).find((d) => d.id === parentId)?.config.values;
+		const host = cfg?.host;
+		if (typeof host !== "string" || host.length === 0) return [];
+		const user = encodeURIComponent(String(cfg?.username ?? ""));
+		const password = encodeURIComponent(String(cfg?.password ?? ""));
+		const port = typeof cfg?.port === "number" && cfg.port > 0 ? cfg.port : 554;
+		const channel = this.getChannel();
+		const channelCount = this.channelCount();
+		const relayChannel = channel + 1;
+		const out = [];
+		for (const profile of ["main", "sub"]) out.push({
+			camStreamId: buildCamStreamId("rtsp", channel, profile, channelCount),
+			kind: "pull-rtsp",
+			label: `Hub relay (${profile})`,
+			url: `rtsp://${user}:${password}@${host}:${port}/h264Preview_0${relayChannel}_${profile}`,
+			autoEligible: true,
+			deviceFeatures: [...this.features]
+		});
+		return out;
+	}
 	async buildStreamCatalogUncached() {
 		if (this.isBattery && this.sleeping) {
+			const relay = await this.buildHubRelayDescriptors().catch(() => []);
+			if (relay.length > 0) {
+				this.ctx.logger.debug("buildStreamCatalog: sleeping hub child — serving hub relay entries", {
+					tags: { deviceId: this.id },
+					meta: { entries: relay.map((r) => r.camStreamId) }
+				});
+				return relay;
+			}
 			this.ctx.logger.debug("buildStreamCatalog: battery cam sleeping, no cache — deferring to wake", { tags: { deviceId: this.id } });
 			return [];
 		}

package/dist/addon.mjs

@@ -230933,8 +230933,6 @@ 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, {
@@ -230942,20 +230940,19 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 							attempts: 2
 						});
 						await sleep$1(1500);
-						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))]);
+					})(), new Promise((_, rej) => setTimeout(() => rej(/* @__PURE__ */ new Error("wakeForStream timeout")), timeoutMs))]);
 					const CONFIRM_TIMEOUT_MS = 1e4;
 					const CONFIRM_POLL_MS = 1e3;
 					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 {}
@@ -230968,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: {
@@ -233612,8 +233610,50 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* drained the battery and, by bursting the socket, was itself what starved
 	* GetEnc.
 	*/
+	/**
+	* The catalog a SLEEPING hub child can still offer: the parent's RTSP
+	* relay entries, derived from the parent's config (host + credentials +
+	* the Reolink Hub's per-channel relay scheme), with zero contact to the
+	* child. This is the difference between a sleeping hub child being
+	* playable and being a permanent "sleeping" tile: the broker gets a
+	* dialable URL, the relay dial wakes the camera over RF (verified live
+	* against the Home Hub, 2026-08-15), and the catalog never depended on
+	* the child being awake to build.
+	*/
+	async buildHubRelayDescriptors() {
+		if (!this.isHubChild()) return [];
+		const parentId = this.parentDeviceId;
+		if (parentId === null) return [];
+		const cfg = (await this.ctx.devices.getAll()).find((d) => d.id === parentId)?.config.values;
+		const host = cfg?.host;
+		if (typeof host !== "string" || host.length === 0) return [];
+		const user = encodeURIComponent(String(cfg?.username ?? ""));
+		const password = encodeURIComponent(String(cfg?.password ?? ""));
+		const port = typeof cfg?.port === "number" && cfg.port > 0 ? cfg.port : 554;
+		const channel = this.getChannel();
+		const channelCount = this.channelCount();
+		const relayChannel = channel + 1;
+		const out = [];
+		for (const profile of ["main", "sub"]) out.push({
+			camStreamId: buildCamStreamId("rtsp", channel, profile, channelCount),
+			kind: "pull-rtsp",
+			label: `Hub relay (${profile})`,
+			url: `rtsp://${user}:${password}@${host}:${port}/h264Preview_0${relayChannel}_${profile}`,
+			autoEligible: true,
+			deviceFeatures: [...this.features]
+		});
+		return out;
+	}
 	async buildStreamCatalogUncached() {
 		if (this.isBattery && this.sleeping) {
+			const relay = await this.buildHubRelayDescriptors().catch(() => []);
+			if (relay.length > 0) {
+				this.ctx.logger.debug("buildStreamCatalog: sleeping hub child — serving hub relay entries", {
+					tags: { deviceId: this.id },
+					meta: { entries: relay.map((r) => r.camStreamId) }
+				});
+				return relay;
+			}
 			this.ctx.logger.debug("buildStreamCatalog: battery cam sleeping, no cache — deferring to wake", { tags: { deviceId: this.id } });
 			return [];
 		}

package/package.json

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