@apocaliss92/nodelink-js 0.4.6 → 0.4.7

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-F2Y5U3YP.js";
+} from "../chunk-GKLOJJ34.js";
 import {
   __require
 } from "../chunk-TR3V5FTO.js";

package/dist/index.cjs

@@ -18072,6 +18072,13 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * - "replay:XXX" - dedicated per replay session
    */
   socketPool = /* @__PURE__ */ new Map();
+  /**
+   * Consecutive stream-start (cmdId=3) timeout counter per socket tag.
+   * When a streaming socket has N consecutive timeouts, the socket is force-closed
+   * so the next attempt creates a fresh connection. Resets on success.
+   */
+  consecutiveStreamTimeouts = /* @__PURE__ */ new Map();
+  static MAX_CONSECUTIVE_STREAM_TIMEOUTS = 3;
   /** BaichuanClientOptions to use when creating new sockets */
   clientOptions;
   /**
@@ -18226,14 +18233,20 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
         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
-          });
+        if (battery.batteryPercent === void 0 && battery.chargeStatus === void 0 && battery.adapterStatus === void 0) {
+          return;
+        }
+        const key = `${battery.batteryPercent ?? ""}|${battery.chargeStatus ?? ""}|${battery.adapterStatus ?? ""}`;
+        if (this.lastBatteryPushKey.get(channel) === key) {
+          return;
         }
+        this.lastBatteryPushKey.set(channel, key);
+        this.dispatchSimpleEvent({
+          type: "battery",
+          channel,
+          timestamp: Date.now(),
+          battery
+        });
       } catch (e) {
         this.logger.debug?.(
           "[ReolinkBaichuanApi] Error parsing battery push",
@@ -18399,6 +18412,14 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   deviceCapabilitiesCache = /* @__PURE__ */ new Map();
   static CAPABILITIES_CACHE_TTL_MS = 5 * 60 * 1e3;
   // 5 minutes
+  /**
+   * Dedupe key for battery push events (cmd_id 252), per channel.
+   * Cameras emit BatteryInfoList frequently while streaming (every few
+   * seconds). We only forward an event when the meaningful fields change
+   * (percent, chargeStatus, adapterStatus) to avoid flooding SSE/MQTT
+   * consumers and the UI event log.
+   */
+  lastBatteryPushKey = /* @__PURE__ */ new Map();
   // ─────────────────────────────────────────────────────────────────────────────
   // SOCKET POOL CONSTANTS
   // ─────────────────────────────────────────────────────────────────────────────
@@ -23871,6 +23892,7 @@ ${stderr}`)
           `${ch}:${profile}:${variant}`,
           frame.header.msgNum
         );
+        this.resetStreamTimeoutCounter(targetClient);
         return;
       } catch (error) {
         lastError = error;
@@ -23885,6 +23907,10 @@ ${stderr}`)
         }
       }
     }
+    const isTimeout = lastError instanceof Error && lastError.message?.includes("timeout");
+    if (isTimeout) {
+      this.trackStreamTimeout(targetClient);
+    }
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
   /**
@@ -24344,6 +24370,18 @@ ${stderr}`)
   notifyD2cDisc() {
     const now = Date.now();
     this.lastD2cDiscAtMs = now;
+    const streamingTags = Array.from(this.socketPool.keys()).filter(
+      (tag) => tag.startsWith("streaming:")
+    );
+    if (streamingTags.length > 0) {
+      this.logger?.log?.(
+        `[D2C_DISC] Force-closing ${streamingTags.length} streaming socket(s): ${streamingTags.join(", ")}`
+      );
+      for (const tag of streamingTags) {
+        this.forceClosePooledSocket(tag, this.logger).catch(() => {
+        });
+      }
+    }
     const immediateCooldownUntil = now + _ReolinkBaichuanApi.D2C_DISC_IMMEDIATE_COOLDOWN_MS;
     const existing = this.socketPoolCooldowns.get(this.host);
     if (!existing || existing.cooldownUntil < immediateCooldownUntil) {
@@ -24376,6 +24414,43 @@ ${stderr}`)
       }
     }
   }
+  /**
+   * Find the socket pool tag for a given BaichuanClient instance.
+   * Returns undefined if the client is not in the pool (e.g. it's the general socket used directly).
+   */
+  findSocketTagForClient(client) {
+    for (const [tag, entry] of this.socketPool) {
+      if (entry.client === client) return tag;
+    }
+    return void 0;
+  }
+  /**
+   * Reset the consecutive stream-start timeout counter for a streaming socket.
+   * Called on successful stream start.
+   */
+  resetStreamTimeoutCounter(client) {
+    const tag = this.findSocketTagForClient(client);
+    if (tag) this.consecutiveStreamTimeouts.delete(tag);
+  }
+  /**
+   * Track a stream-start timeout on a streaming socket.
+   * After MAX_CONSECUTIVE_STREAM_TIMEOUTS consecutive timeouts, force-close the
+   * socket so the next attempt creates a fresh connection.
+   */
+  trackStreamTimeout(client) {
+    const tag = this.findSocketTagForClient(client);
+    if (!tag || !tag.startsWith("streaming:")) return;
+    const count = (this.consecutiveStreamTimeouts.get(tag) ?? 0) + 1;
+    this.consecutiveStreamTimeouts.set(tag, count);
+    if (count >= _ReolinkBaichuanApi.MAX_CONSECUTIVE_STREAM_TIMEOUTS) {
+      this.logger?.warn?.(
+        `[SocketPool] ${count} consecutive stream timeouts on tag=${tag}, force-closing socket`
+      );
+      this.consecutiveStreamTimeouts.delete(tag);
+      this.forceClosePooledSocket(tag, this.logger).catch(() => {
+      });
+    }
+  }
   /**
    * Best-effort sleeping inference for battery/BCUDP cameras.
    *
@@ -33640,6 +33715,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
   gracePeriodMs;
   prebufferMaxMs;
   maxBufferBytes;
+  streamTimeoutMs;
   prestartStream;
   active = false;
   server;
@@ -33653,6 +33729,11 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
   connectedClients = /* @__PURE__ */ new Set();
   clientSockets = /* @__PURE__ */ new Map();
   stopGraceTimer;
+  // Stream health monitoring
+  lastFrameAt = 0;
+  streamHealthTimer;
+  totalFramesReceived = 0;
+  totalVideoFramesWritten = 0;
   // Prebuffer
   prebuffer = [];
   constructor(options) {
@@ -33668,6 +33749,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
     this.gracePeriodMs = options.gracePeriodMs ?? 3e4;
     this.prebufferMaxMs = options.prebufferMs ?? 3e3;
     this.maxBufferBytes = options.maxBufferBytes ?? 1e8;
+    this.streamTimeoutMs = options.streamTimeoutMs ?? 15e3;
     this.prestartStream = options.prestartStream ?? true;
   }
   // -----------------------------------------------------------------------
@@ -33706,6 +33788,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
     if (!this.active) return;
     this.active = false;
     clearTimeout(this.stopGraceTimer);
+    this.stopStreamHealthMonitor();
     for (const [id, sock] of this.clientSockets) {
       sock.destroy();
       this.connectedClients.delete(id);
@@ -33759,12 +33842,12 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
         `[Go2rtcTcpServer] feedClient error  id=${clientId}: ${err}`
       );
     });
-    const cleanup = () => {
-      this.removeClient(clientId);
+    const cleanup = (reason) => {
+      this.removeClient(clientId, reason);
       socket.destroy();
     };
-    socket.on("error", cleanup);
-    socket.on("close", cleanup);
+    socket.on("error", (err) => cleanup(`error: ${err.message}`));
+    socket.on("close", (hadError) => cleanup(hadError ? "close (with error)" : "close (clean)"));
   }
   async feedClient(clientId, socket) {
     const fanoutDeadline = Date.now() + 3e4;
@@ -33825,6 +33908,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
         }
         socket.write(annexB);
         liveVideoWritten++;
+        this.totalVideoFramesWritten++;
         if (Date.now() - lastLogAt > 1e4) {
           this.logger.info?.(
             `[Go2rtcTcpServer] live stats  client=${clientId} received=${liveFrameCount} written=${liveVideoWritten} bufLen=${socket.writableLength}`
@@ -33951,6 +34035,8 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
         ...dedicatedClient ? { client: dedicatedClient } : {}
       }),
       onFrame: (frame) => {
+        this.lastFrameAt = Date.now();
+        this.totalFramesReceived++;
         if (!frame.audio && (frame.videoType === "H264" || frame.videoType === "H265")) {
           this.detectedVideoType = frame.videoType;
         }
@@ -33977,6 +34063,12 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
         if (!this.nativeStreamActive) return;
         this.nativeStreamActive = false;
         this.nativeFanout = null;
+        this.stopStreamHealthMonitor();
+        const silenceMs = this.lastFrameAt > 0 ? Date.now() - this.lastFrameAt : -1;
+        const diagnosis = silenceMs > this.streamTimeoutMs ? "camera stopped sending frames" : silenceMs >= 0 ? "stream source closed" : "no frames were ever received";
+        this.logger.warn?.(
+          `[Go2rtcTcpServer] native stream ended  diagnosis="${diagnosis}" lastFrame=${silenceMs >= 0 ? `${(silenceMs / 1e3).toFixed(1)}s ago` : "never"} totalRx=${this.totalFramesReceived} clients=${this.connectedClients.size}`
+        );
         if (this.dedicatedSessionRelease) {
           this.dedicatedSessionRelease().catch(() => {
           });
@@ -33984,16 +34076,18 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
         }
         if (this.active && (this.connectedClients.size > 0 || this.prestartStream)) {
           this.logger.info?.(
-            `[Go2rtcTcpServer] native stream ended, restarting (clients=${this.connectedClients.size}, prestart=${this.prestartStream})`
+            `[Go2rtcTcpServer] restarting native stream (clients=${this.connectedClients.size}, prestart=${this.prestartStream})`
           );
           this.startNativeStream();
         }
       }
     });
     this.nativeFanout.start();
+    this.startStreamHealthMonitor();
   }
   async stopNativeStream() {
     this.nativeStreamActive = false;
+    this.stopStreamHealthMonitor();
     const fanout = this.nativeFanout;
     this.nativeFanout = null;
     if (fanout) {
@@ -34007,14 +34101,50 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends import_node_events6.EventEm
     }
   }
   // -----------------------------------------------------------------------
+  // Stream health monitoring
+  // -----------------------------------------------------------------------
+  startStreamHealthMonitor() {
+    this.stopStreamHealthMonitor();
+    if (this.streamTimeoutMs <= 0) return;
+    this.lastFrameAt = Date.now();
+    this.streamHealthTimer = setInterval(() => {
+      if (!this.nativeStreamActive || !this.active) {
+        this.stopStreamHealthMonitor();
+        return;
+      }
+      const silenceMs = Date.now() - this.lastFrameAt;
+      if (silenceMs > this.streamTimeoutMs) {
+        this.logger.warn?.(
+          `[Go2rtcTcpServer] stream inactivity timeout: no frames for ${(silenceMs / 1e3).toFixed(1)}s (threshold=${this.streamTimeoutMs}ms), totalReceived=${this.totalFramesReceived} clients=${this.connectedClients.size} \u2014 forcing stream restart`
+        );
+        this.stopStreamHealthMonitor();
+        const fanout = this.nativeFanout;
+        if (fanout) {
+          this.nativeStreamActive = false;
+          this.nativeFanout = null;
+          fanout.stop().catch(() => {
+          });
+        }
+      }
+    }, Math.min(this.streamTimeoutMs / 2, 5e3));
+  }
+  stopStreamHealthMonitor() {
+    if (this.streamHealthTimer) {
+      clearInterval(this.streamHealthTimer);
+      this.streamHealthTimer = void 0;
+    }
+  }
+  // -----------------------------------------------------------------------
   // Client lifecycle
   // -----------------------------------------------------------------------
-  removeClient(clientId) {
+  removeClient(clientId, reason) {
     if (!this.connectedClients.has(clientId)) return;
     this.connectedClients.delete(clientId);
     this.clientSockets.delete(clientId);
+    const silenceMs = this.lastFrameAt > 0 ? Date.now() - this.lastFrameAt : -1;
+    const silenceInfo = silenceMs >= 0 ? ` lastFrame=${(silenceMs / 1e3).toFixed(1)}s ago` : "";
     this.logger.info?.(
-      `[Go2rtcTcpServer] client disconnected  id=${clientId} remaining=${this.connectedClients.size}`
+      `[Go2rtcTcpServer] client disconnected  id=${clientId} reason=${reason ?? "unknown"}  remaining=${this.connectedClients.size}  totalRx=${this.totalFramesReceived} totalTx=${this.totalVideoFramesWritten}${silenceInfo}`
     );
     this.emit("clientDisconnected", clientId);
     if (this.connectedClients.size === 0 && !this.prestartStream) {
@@ -36349,16 +36479,16 @@ function isTcpFailureThatShouldFallbackToUdp(e) {
   return message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("EHOSTUNREACH") || message.includes("ENETUNREACH") || message.includes("socket hang up") || message.includes("TCP connection timeout") || message.includes("Baichuan socket closed") || message.includes("timeout waiting for nonce") || message.includes("expected encryption info") || message.includes("ECONNRESET") || message.includes("EPIPE");
 }
 async function pingHost(host, timeoutMs = 3e3) {
+  const { exec } = await import("child_process");
+  const platform2 = process.platform;
+  const pingCmd = platform2 === "win32" ? `ping -n 1 -w ${timeoutMs} ${host}` : platform2 === "darwin" ? (
+    // macOS: -W is in milliseconds (Linux: seconds)
+    `ping -c 1 -W ${timeoutMs} ${host}`
+  ) : (
+    // Linux/BSD-ish: -W is in seconds on most distros
+    `ping -c 1 -W ${Math.max(1, Math.floor(timeoutMs / 1e3))} ${host}`
+  );
   return new Promise((resolve) => {
-    const { exec } = require("child_process");
-    const platform2 = process.platform;
-    const pingCmd = platform2 === "win32" ? `ping -n 1 -w ${timeoutMs} ${host}` : platform2 === "darwin" ? (
-      // macOS: -W is in milliseconds (Linux: seconds)
-      `ping -c 1 -W ${timeoutMs} ${host}`
-    ) : (
-      // Linux/BSD-ish: -W is in seconds on most distros
-      `ping -c 1 -W ${Math.max(1, Math.floor(timeoutMs / 1e3))} ${host}`
-    );
     exec(pingCmd, (error) => {
       resolve(!error);
     });