@camstack/addon-provider-reolink 1.2.58 → 1.2.59

package/dist/addon.js

@@ -236221,10 +236221,12 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* descriptors served by the `stream-catalog` cap (broker PULLS via
 	* `registerStreamCatalogProvider`).
 	*
-	* Returns `[]` (logging at debug, matching the prior early-returns) on
-	* the battery-sleep gate, `ensureApi` failure, or
-	* `buildVideoStreamOptions` failure — the broker simply sees no
-	* descriptors for the device until the next reconcile.
+	* Returns `[]` only when there is genuinely nothing to say: the
+	* battery-sleep gate (logged at debug), or a camera that connected and
+	* reported zero streams. An `ensureApi` / `buildVideoStreamOptions` failure
+	* THROWS — `[]` and an error are not the same fact, and the broker needs
+	* the difference to keep the device's existing entry and to schedule its
+	* per-device backoff instead of treating the camera as stream-less.
 	*
 	* This method only BUILDS descriptors — it never opens an upstream
 	* session or touches the broker.
@@ -236352,10 +236354,22 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			channel: ownChannel,
 			onNvr: true
 		} : void 0;
+		const readStreamOptions = async (current) => withTimeout(buildOptions ? current.buildVideoStreamOptions(buildOptions) : current.buildVideoStreamOptions(), 1e4, "buildVideoStreamOptions");
 		try {
-			streamOptions = await withTimeout(buildOptions ? api.buildVideoStreamOptions(buildOptions) : api.buildVideoStreamOptions(), 1e4, "buildVideoStreamOptions");
+			streamOptions = await readStreamOptions(api);
 		} catch (err) {
-			throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
+			if (isChild) throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
+			this.ctx.logger.warn("buildStreamCatalog: stream options read failed — dropping the Baichuan session and retrying once", {
+				tags: { deviceId: this.id },
+				meta: { error: err instanceof Error ? err.message : String(err) }
+			});
+			await this.dropBaichuanSession("stream-catalog-retry");
+			try {
+				streamOptions = await readStreamOptions(await withTimeout(this.ensureApi(), 1e4, "ensureApi"));
+			} catch (retryErr) {
+				throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id} (after one re-auth retry): ${retryErr instanceof Error ? retryErr.message : String(retryErr)}`, { cause: retryErr });
+			}
+			this.ctx.logger.info("buildStreamCatalog: stream options read recovered after re-auth", { tags: { deviceId: this.id } });
 		}
 		const channelCount = this.channelCount();
 		const desired = /* @__PURE__ */ new Map();
@@ -239237,6 +239251,30 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* `awake` push (or a snapshot demand from the operator) will
 	* lazily call `ensureApi()` and re-establish the client.
 	*/
+	/**
+	* Close and forget the cached control-channel client so the NEXT
+	* `ensureApi()` performs a fresh login.
+	*
+	* The one thing `scheduleReconnect` cannot express: an EXPIRED session on a
+	* socket that is still open. No `close`/`error` ever fires, so the reconnect
+	* ladder is never armed, and `ensureApi`'s `if (this.api) return this.api`
+	* keeps handing back a client whose every request answers `responseCode
+	* 400`. Callers that see an application-level rejection they believe is a
+	* dead session call this and retry ONCE — they must never loop on it.
+	*
+	* Same teardown the `disconnectAll` / debug-options paths use: `close()`
+	* best-effort, then null the field. Active RFC 4571 servers are untouched —
+	* each owns a dedicated socket and survives a control-channel reset (see
+	* `scheduleReconnect`).
+	*/
+	async dropBaichuanSession(reason) {
+		const current = this.api;
+		this.api = null;
+		if (!current) return;
+		try {
+			await current.close({ reason });
+		} catch {}
+	}
 	scheduleReconnect(reason) {
 		if (this.reconnectTimer) return;
 		if (this.isBattery) {

package/dist/addon.mjs

@@ -236201,10 +236201,12 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* descriptors served by the `stream-catalog` cap (broker PULLS via
 	* `registerStreamCatalogProvider`).
 	*
-	* Returns `[]` (logging at debug, matching the prior early-returns) on
-	* the battery-sleep gate, `ensureApi` failure, or
-	* `buildVideoStreamOptions` failure — the broker simply sees no
-	* descriptors for the device until the next reconcile.
+	* Returns `[]` only when there is genuinely nothing to say: the
+	* battery-sleep gate (logged at debug), or a camera that connected and
+	* reported zero streams. An `ensureApi` / `buildVideoStreamOptions` failure
+	* THROWS — `[]` and an error are not the same fact, and the broker needs
+	* the difference to keep the device's existing entry and to schedule its
+	* per-device backoff instead of treating the camera as stream-less.
 	*
 	* This method only BUILDS descriptors — it never opens an upstream
 	* session or touches the broker.
@@ -236332,10 +236334,22 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 			channel: ownChannel,
 			onNvr: true
 		} : void 0;
+		const readStreamOptions = async (current) => withTimeout(buildOptions ? current.buildVideoStreamOptions(buildOptions) : current.buildVideoStreamOptions(), 1e4, "buildVideoStreamOptions");
 		try {
-			streamOptions = await withTimeout(buildOptions ? api.buildVideoStreamOptions(buildOptions) : api.buildVideoStreamOptions(), 1e4, "buildVideoStreamOptions");
+			streamOptions = await readStreamOptions(api);
 		} catch (err) {
-			throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
+			if (isChild) throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id}: ${err instanceof Error ? err.message : String(err)}`, { cause: err });
+			this.ctx.logger.warn("buildStreamCatalog: stream options read failed — dropping the Baichuan session and retrying once", {
+				tags: { deviceId: this.id },
+				meta: { error: err instanceof Error ? err.message : String(err) }
+			});
+			await this.dropBaichuanSession("stream-catalog-retry");
+			try {
+				streamOptions = await readStreamOptions(await withTimeout(this.ensureApi(), 1e4, "ensureApi"));
+			} catch (retryErr) {
+				throw new Error(`buildStreamCatalog: buildVideoStreamOptions failed for device ${this.id} (after one re-auth retry): ${retryErr instanceof Error ? retryErr.message : String(retryErr)}`, { cause: retryErr });
+			}
+			this.ctx.logger.info("buildStreamCatalog: stream options read recovered after re-auth", { tags: { deviceId: this.id } });
 		}
 		const channelCount = this.channelCount();
 		const desired = /* @__PURE__ */ new Map();
@@ -239217,6 +239231,30 @@ var ReolinkCamera = class ReolinkCamera extends BaseDevice {
 	* `awake` push (or a snapshot demand from the operator) will
 	* lazily call `ensureApi()` and re-establish the client.
 	*/
+	/**
+	* Close and forget the cached control-channel client so the NEXT
+	* `ensureApi()` performs a fresh login.
+	*
+	* The one thing `scheduleReconnect` cannot express: an EXPIRED session on a
+	* socket that is still open. No `close`/`error` ever fires, so the reconnect
+	* ladder is never armed, and `ensureApi`'s `if (this.api) return this.api`
+	* keeps handing back a client whose every request answers `responseCode
+	* 400`. Callers that see an application-level rejection they believe is a
+	* dead session call this and retry ONCE — they must never loop on it.
+	*
+	* Same teardown the `disconnectAll` / debug-options paths use: `close()`
+	* best-effort, then null the field. Active RFC 4571 servers are untouched —
+	* each owns a dedicated socket and survives a control-channel reset (see
+	* `scheduleReconnect`).
+	*/
+	async dropBaichuanSession(reason) {
+		const current = this.api;
+		this.api = null;
+		if (!current) return;
+		try {
+			await current.close({ reason });
+		} catch {}
+	}
 	scheduleReconnect(reason) {
 		if (this.reconnectTimer) return;
 		if (this.isBattery) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-reolink",
-  "version": "1.2.58",
+  "version": "1.2.59",
   "description": "Reolink camera device provider addon for CamStack — native Baichuan protocol",
   "keywords": [
     "camstack",
@@ -44,7 +44,8 @@
         "mode": "standalone",
         "execution": {
           "placement": "hub-only",
-          "heapProfile": "heavy"
+          "heapProfile": "heavy",
+          "rssBudgetMb": 1024
         },
         "capabilities": [
           {