@apocaliss92/nodelink-js 0.4.4 → 0.4.5

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-UHFJPQA4.js";
+} from "../chunk-WDFKIHM5.js";
 import {
   __require
 } from "../chunk-DEOMUWBN.js";

package/dist/index.cjs

@@ -9682,6 +9682,14 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
    *   even if the current client instance is idle/disconnected.
    */
   static streamingRegistry = /* @__PURE__ */ new Map();
+  /**
+   * Per-host D2C_DISC backoff state that persists across client instance recreation.
+   *
+   * Why: when a D2C_DISC kills a client, the socket pool destroys the old instance
+   * and creates a new one. Instance-level backoff variables would reset to zero,
+   * allowing immediate reconnection and perpetuating the storm.
+   */
+  static d2cDiscBackoff = /* @__PURE__ */ new Map();
   /**
    * Global (process-wide) CoverPreview serialization.
    *
@@ -10377,7 +10385,12 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
   }
   async waitForUdpReconnectCooldown() {
     const now = Date.now();
-    const waitMs = this.udpReconnectCooldownUntilMs - now;
+    const staticEntry = _BaichuanClient.d2cDiscBackoff.get(this.opts.host);
+    const effectiveCooldownUntil = Math.max(
+      this.udpReconnectCooldownUntilMs,
+      staticEntry?.cooldownUntilMs ?? 0
+    );
+    const waitMs = effectiveCooldownUntil - now;
     if (waitMs <= 0) return;
     const sid = this.socketSessionId;
     const shortUid = this.opts.uid ? this.opts.uid.substring(0, 5) : void 0;
@@ -10386,7 +10399,8 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
       host: this.opts.host,
       sid,
       uid: shortUid,
-      waitMs
+      waitMs,
+      persistent: staticEntry != null
     });
     await new Promise((resolve) => setTimeout(resolve, waitMs));
   }
@@ -10629,21 +10643,30 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
           uid: shortUid2,
           message: err.message
         });
-        const withinWindow = now - this.udpReconnectLastD2cDiscAtMs < 6e4;
+        const hostKey = this.opts.host;
+        const prev = _BaichuanClient.d2cDiscBackoff.get(hostKey);
+        const withinWindow = prev != null && now - prev.lastAtMs < 6e4;
         const baseMs = 2e3;
         const maxMs = 3e4;
         const nextBackoffMs = withinWindow ? Math.min(
           maxMs,
           Math.max(
             baseMs,
-            this.udpReconnectBackoffMs > 0 ? this.udpReconnectBackoffMs * 2 : baseMs
+            prev.backoffMs > 0 ? prev.backoffMs * 2 : baseMs
           )
         ) : baseMs;
-        this.udpReconnectLastD2cDiscAtMs = now;
-        this.udpReconnectBackoffMs = nextBackoffMs;
+        const cooldownUntilMs = Math.max(
+          prev?.cooldownUntilMs ?? 0,
+          now + nextBackoffMs
+        );
+        _BaichuanClient.d2cDiscBackoff.set(hostKey, {
+          backoffMs: nextBackoffMs,
+          lastAtMs: now,
+          cooldownUntilMs
+        });
         this.udpReconnectCooldownUntilMs = Math.max(
           this.udpReconnectCooldownUntilMs,
-          now + nextBackoffMs
+          cooldownUntilMs
         );
         this.logDebug("d2c_disc_backoff", {
           transport: "udp",
@@ -10651,7 +10674,8 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
           sid: sid2,
           uid: shortUid2,
           backoffMs: nextBackoffMs,
-          cooldownUntilMs: this.udpReconnectCooldownUntilMs
+          cooldownUntilMs,
+          persistent: true
         });
         this.stopKeepAlive();
         this.loggedIn = false;
@@ -10660,6 +10684,7 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
           this.videoSubscriptions.clear();
           this.recomputeGlobalStreamingContribution();
         }
+        this.emit("d2c_disc", { host: this.opts.host, atMs: now });
       }
       this.emit("error", err);
     });
@@ -10958,6 +10983,13 @@ var BaichuanClient = class _BaichuanClient extends import_node_events2.EventEmit
       }
     }
     this.emit("push", frame);
+    if (frame.header.cmdId === 252 && frame.body.length > 0) {
+      try {
+        this.emit("batteryPush", frame);
+      } catch (error) {
+        this.logDebug("battery_push_error", error);
+      }
+    }
     if (frame.header.cmdId === 33) {
       try {
         const sid = this.socketSessionId;
@@ -18077,6 +18109,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       }
     }
     const newClient = new BaichuanClient(this.clientOptions);
+    this.attachD2cDiscListener(newClient);
     this.socketPool.set("general", {
       client: newClient,
       refCount: 1,
@@ -18122,6 +18155,31 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       if (!mapped) return;
       this.dispatchSimpleEvent(mapped);
     });
+    client.on("batteryPush", (frame) => {
+      try {
+        const xml = this.client.tryDecryptXml(
+          frame.body,
+          frame.header.channelId,
+          this.client.enc
+        );
+        if (!xml) return;
+        const channel = frame.header.channelId;
+        const battery = this.parseBatteryInfoXml(xml, channel);
+        if (battery.batteryPercent !== void 0 || battery.chargeStatus !== void 0 || battery.adapterStatus !== void 0) {
+          this.dispatchSimpleEvent({
+            type: "battery",
+            channel,
+            timestamp: Date.now(),
+            battery
+          });
+        }
+      } catch (e) {
+        this.logger.debug?.(
+          "[ReolinkBaichuanApi] Error parsing battery push",
+          formatErrorForLog(e)
+        );
+      }
+    });
     client.on("channelInfo", (xml) => {
       try {
         this.parseAndStoreChannelInfo(xml);
@@ -18257,6 +18315,21 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   rtspServers = /* @__PURE__ */ new Set();
   // Track all RTSP servers for cleanup
   activeVideoMsgNums = /* @__PURE__ */ new Map();
+  // ─── D2C_DISC cooldown & storm detection ────────────────────────────────────
+  // Tracked on the API instance (survives BaichuanClient recreation).
+  /** Timestamp of the most recent D2C_DISC from any client for this device. */
+  lastD2cDiscAtMs = 0;
+  /** Sliding window of recent D2C_DISC timestamps for storm detection. */
+  d2cDiscTimestamps = [];
+  /** Immediate cooldown (ms) applied to socket pool on every D2C_DISC.
+   *  Prevents reconnect attempts while the camera is transitioning to sleep. */
+  static D2C_DISC_IMMEDIATE_COOLDOWN_MS = 1e4;
+  /** Number of D2C_DISCs within the storm window to trigger extended cooldown. */
+  static D2C_DISC_STORM_THRESHOLD = 3;
+  /** Sliding window size (ms) for storm detection. */
+  static D2C_DISC_STORM_WINDOW_MS = 6e4;
+  /** Extended cooldown (ms) applied to socket pool when a D2C_DISC storm is detected. */
+  static D2C_DISC_STORM_COOLDOWN_MS = 12e4;
   nvrChannelsSummaryCache = /* @__PURE__ */ new Map();
   /**
    * Cached device capabilities per channel.
@@ -18670,6 +18743,14 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
     }
     return "general";
   }
+  /**
+   * Attach a D2C_DISC listener to a BaichuanClient so that the API-level
+   * grace period and storm detection are updated regardless of which
+   * pool socket receives the disconnect.
+   */
+  attachD2cDiscListener(client) {
+    client.on("d2c_disc", () => this.notifyD2cDisc());
+  }
   /**
    * Acquire a socket from the pool by tag.
    * Creates a new socket if needed, or reuses an existing one.
@@ -18690,10 +18771,12 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
         );
       } else if (now < cooldownEntry.cooldownUntil) {
         const remainingMs = cooldownEntry.cooldownUntil - now;
+        const isD2cDisc = this.lastD2cDiscAtMs > 0 && now - this.lastD2cDiscAtMs < 12e4;
+        const reason = isD2cDisc ? "D2C_DISC (camera sleeping)" : "repeated login failures";
         const error = new Error(
-          `[SocketPool] Host ${this.host} is in cooldown for ${Math.ceil(remainingMs / 1e3)}s due to repeated login failures. tag=${tag}`
+          `[SocketPool] Host ${this.host} is in cooldown for ${Math.ceil(remainingMs / 1e3)}s due to ${reason}. tag=${tag}`
         );
-        log?.warn?.(error.message);
+        log?.debug?.(error.message);
         throw error;
       }
     }
@@ -18784,12 +18867,21 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       try {
         const clientOpts = log ? { ...this.clientOptions, logger: log } : this.clientOptions;
         const newClient = new BaichuanClient(clientOpts);
+        this.attachD2cDiscListener(newClient);
         await newClient.login();
-        if (this.socketPoolCooldowns.has(this.host)) {
-          log?.debug?.(
-            `[SocketPool] Clearing cooldown for host=${this.host} after successful login`
-          );
-          this.socketPoolCooldowns.delete(this.host);
+        const existingCooldown = this.socketPoolCooldowns.get(this.host);
+        if (existingCooldown) {
+          const isStormCooldown = existingCooldown.failureCount >= _ReolinkBaichuanApi.D2C_DISC_STORM_THRESHOLD;
+          if (!isStormCooldown) {
+            log?.debug?.(
+              `[SocketPool] Clearing cooldown for host=${this.host} after successful login`
+            );
+            this.socketPoolCooldowns.delete(this.host);
+          } else {
+            log?.debug?.(
+              `[SocketPool] Preserving D2C_DISC storm cooldown for host=${this.host} (expires in ${Math.ceil((existingCooldown.cooldownUntil - Date.now()) / 1e3)}s)`
+            );
+          }
         }
         entry.client = newClient;
         entry.refCount = 1;
@@ -19091,6 +19183,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       ...opts.channel !== void 0 ? { channel: opts.channel } : {}
     };
     const generalClient = new BaichuanClient(opts);
+    this.attachD2cDiscListener(generalClient);
     this.socketPool.set("general", {
       client: generalClient,
       refCount: 1,
@@ -24155,6 +24248,49 @@ ${stderr}`)
     if (batteryVersion !== void 0) out.batteryVersion = batteryVersion;
     return out;
   }
+  /**
+   * Called when any BaichuanClient for this device receives a D2C_DISC.
+   *
+   * Two-tier response:
+   *  1. **Immediate**: every D2C_DISC applies a short socket pool cooldown
+   *     (10 s) to prevent reconnect attempts while the camera transitions to sleep.
+   *  2. **Storm**: ≥3 D2C_DISCs within 60 s triggers extended cooldown (120 s).
+   */
+  notifyD2cDisc() {
+    const now = Date.now();
+    this.lastD2cDiscAtMs = now;
+    const immediateCooldownUntil = now + _ReolinkBaichuanApi.D2C_DISC_IMMEDIATE_COOLDOWN_MS;
+    const existing = this.socketPoolCooldowns.get(this.host);
+    if (!existing || existing.cooldownUntil < immediateCooldownUntil) {
+      this.socketPoolCooldowns.set(this.host, {
+        failureCount: existing?.failureCount ?? 1,
+        lastFailureAt: now,
+        cooldownUntil: immediateCooldownUntil
+      });
+      this.logger?.log?.(
+        `[D2C_DISC] Immediate cooldown: socket pool blocked for ${_ReolinkBaichuanApi.D2C_DISC_IMMEDIATE_COOLDOWN_MS / 1e3}s`
+      );
+    }
+    this.d2cDiscTimestamps.push(now);
+    const cutoff = now - _ReolinkBaichuanApi.D2C_DISC_STORM_WINDOW_MS;
+    while (this.d2cDiscTimestamps.length > 0 && this.d2cDiscTimestamps[0] < cutoff) {
+      this.d2cDiscTimestamps.shift();
+    }
+    if (this.d2cDiscTimestamps.length >= _ReolinkBaichuanApi.D2C_DISC_STORM_THRESHOLD) {
+      const stormCooldownUntil = now + _ReolinkBaichuanApi.D2C_DISC_STORM_COOLDOWN_MS;
+      const currentEntry = this.socketPoolCooldowns.get(this.host);
+      if (!currentEntry || currentEntry.cooldownUntil < stormCooldownUntil) {
+        this.socketPoolCooldowns.set(this.host, {
+          failureCount: this.d2cDiscTimestamps.length,
+          lastFailureAt: now,
+          cooldownUntil: stormCooldownUntil
+        });
+        this.logger?.warn?.(
+          `[D2C_DISC] Storm detected: ${this.d2cDiscTimestamps.length} disconnects in ${_ReolinkBaichuanApi.D2C_DISC_STORM_WINDOW_MS / 1e3}s \u2192 socket pool cooldown ${_ReolinkBaichuanApi.D2C_DISC_STORM_COOLDOWN_MS / 1e3}s`
+        );
+      }
+    }
+  }
   /**
    * Best-effort sleeping inference for battery/BCUDP cameras.
    *
@@ -24185,6 +24321,8 @@ ${stderr}`)
     const socketConnected = this.client.isSocketConnected?.() ?? false;
     const now = Date.now();
     const cutoff = now - windowMs;
+    const msSinceD2cDisc = now - this.lastD2cDiscAtMs;
+    const recentD2cDisc = this.lastD2cDiscAtMs > 0 && msSinceD2cDisc < 3e4;
     const rx = (this.client.getRxHistory?.() ?? []).filter(
       (h) => h.atMs >= cutoff
     );
@@ -24192,6 +24330,12 @@ ${stderr}`)
       (h) => h.atMs >= cutoff
     );
     if (rx.length === 0 && tx.length === 0) {
+      if (recentD2cDisc) {
+        return {
+          state: "sleeping",
+          reason: `D2C_DISC ${Math.round(msSinceD2cDisc / 1e3)}s ago, camera terminated session`
+        };
+      }
       return {
         state: "sleeping",
         reason: `no rx/tx activity in last ${windowMs}ms${socketConnected ? "" : " (socket disconnected)"}`,
@@ -24215,6 +24359,12 @@ ${stderr}`)
         idleMs: now - firstWakingTx.atMs
       };
     }
+    if (recentD2cDisc) {
+      return {
+        state: "sleeping",
+        reason: `only non-waking cmdIds + D2C_DISC ${Math.round(msSinceD2cDisc / 1e3)}s ago, camera terminated session`
+      };
+    }
     return {
       state: "sleeping",
       reason: `only non-waking cmdIds observed in last ${windowMs}ms (non-waking: ${Array.from(nonWakingCmdIds).join(",")})`,