@apocaliss92/nodelink-js 0.4.5 → 0.4.7

package/dist/index.d.cts

@@ -2434,6 +2434,7 @@ declare class BcUdpStream extends EventEmitter<{
     private resendTimer;
     private hbTimer;
     private discoveryTid;
+    private discoveryTimers;
     private acceptSent;
     private lastAcceptAtMs;
     private ackScheduled;
@@ -3655,6 +3656,15 @@ declare class BaichuanVideoStream extends EventEmitter<{
     private lastPpsH265;
     private lastPrependedParamSetsH265;
     private aesStreamDecryptor;
+    /**
+     * Pending startup error stashed when emitSafeError is called before any
+     * "error" listener is registered (e.g. camera returns 400 during start()).
+     * The rfc4571-server's waitForKeyframe can consume this immediately instead
+     * of waiting for the full keyframe timeout.
+     */
+    private _pendingStartupError;
+    /** Consume and clear any pending startup error. */
+    consumePendingStartupError(): Error | undefined;
     private emitSafeError;
     private lastMediaAtMs;
     private watchdogTimer;
@@ -4229,6 +4239,13 @@ declare class ReolinkBaichuanApi {
      * - "replay:XXX" - dedicated per replay session
      */
     private readonly socketPool;
+    /**
+     * 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.
+     */
+    private readonly consecutiveStreamTimeouts;
+    private static readonly MAX_CONSECUTIVE_STREAM_TIMEOUTS;
     /** BaichuanClientOptions to use when creating new sockets */
     private readonly clientOptions;
     /**
@@ -4373,6 +4390,14 @@ declare class ReolinkBaichuanApi {
      */
     private readonly deviceCapabilitiesCache;
     private static readonly CAPABILITIES_CACHE_TTL_MS;
+    /**
+     * 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.
+     */
+    private readonly lastBatteryPushKey;
     /** Keep replay/streaming sockets warm briefly to reduce clip switch latency. */
     private static readonly SOCKET_POOL_KEEPALIVE_MS;
     /**
@@ -4505,6 +4530,18 @@ declare class ReolinkBaichuanApi {
      * which indicates subStream (e.g., RecS03_, RecS_).
      */
     private determineStreamTypeFromFileName;
+    /**
+     * Stream profiles that the device explicitly rejected (response_code 400).
+     * Keyed by `"ch:profile"` (e.g. `"0:ext"`). Once a profile is in this set
+     * it is excluded from `buildVideoStreamOptions()` results and no further
+     * start attempts are made until the API instance is recreated.
+     */
+    private readonly _rejectedStreamProfiles;
+    /**
+     * Check whether a stream profile was rejected by the device at runtime
+     * (e.g. ext returned response_code 400).
+     */
+    isStreamProfileRejected(channel: number, profile: StreamProfile): boolean;
     /**
      * Cache for buildVideoStreamOptions.
      *
@@ -5700,6 +5737,22 @@ declare class ReolinkBaichuanApi {
      *  2. **Storm**: ≥3 D2C_DISCs within 60 s triggers extended cooldown (120 s).
      */
     private notifyD2cDisc;
+    /**
+     * 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).
+     */
+    private findSocketTagForClient;
+    /**
+     * Reset the consecutive stream-start timeout counter for a streaming socket.
+     * Called on successful stream start.
+     */
+    private resetStreamTimeoutCounter;
+    /**
+     * 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.
+     */
+    private trackStreamTimeout;
     /**
      * Best-effort sleeping inference for battery/BCUDP cameras.
      *
@@ -8024,6 +8077,13 @@ interface Go2rtcTcpServerOptions {
     prebufferMs?: number;
     /** Maximum write buffer per client before dropping the connection (default: 100 MB). */
     maxBufferBytes?: number;
+    /**
+     * Stream inactivity timeout in ms. If no frames arrive from the native
+     * stream for this duration, the stream is considered dead and will be
+     * torn down + restarted (similar to go2rtc's per-packet read deadline).
+     * Default: 15 000 (15s). Set to 0 to disable.
+     */
+    streamTimeoutMs?: number;
     /**
      * When true, the native camera stream is started immediately on start()
      * rather than waiting for the first TCP client. This ensures frames are
@@ -8053,6 +8113,7 @@ declare class Go2rtcTcpServer extends EventEmitter<{
     private readonly gracePeriodMs;
     private readonly prebufferMaxMs;
     private readonly maxBufferBytes;
+    private readonly streamTimeoutMs;
     private readonly prestartStream;
     private active;
     private server;
@@ -8064,6 +8125,10 @@ declare class Go2rtcTcpServer extends EventEmitter<{
     private connectedClients;
     private clientSockets;
     private stopGraceTimer;
+    private lastFrameAt;
+    private streamHealthTimer;
+    private totalFramesReceived;
+    private totalVideoFramesWritten;
     private prebuffer;
     constructor(options: Go2rtcTcpServerOptions);
     /** Start listening. Resolves once the TCP server is bound. */
@@ -8090,6 +8155,8 @@ declare class Go2rtcTcpServer extends EventEmitter<{
     private static splitAnnexBNals;
     private startNativeStream;
     private stopNativeStream;
+    private startStreamHealthMonitor;
+    private stopStreamHealthMonitor;
     private removeClient;
     private scheduleStop;
 }

package/dist/index.d.ts

@@ -1647,6 +1647,15 @@ export declare class BaichuanVideoStream extends EventEmitter<{
     private lastPpsH265;
     private lastPrependedParamSetsH265;
     private aesStreamDecryptor;
+    /**
+     * Pending startup error stashed when emitSafeError is called before any
+     * "error" listener is registered (e.g. camera returns 400 during start()).
+     * The rfc4571-server's waitForKeyframe can consume this immediately instead
+     * of waiting for the full keyframe timeout.
+     */
+    private _pendingStartupError;
+    /** Consume and clear any pending startup error. */
+    consumePendingStartupError(): Error | undefined;
     private emitSafeError;
     private lastMediaAtMs;
     private watchdogTimer;
@@ -2337,6 +2346,7 @@ export declare class BcUdpStream extends EventEmitter<{
     private resendTimer;
     private hbTimer;
     private discoveryTid;
+    private discoveryTimers;
     private acceptSent;
     private lastAcceptAtMs;
     private ackScheduled;
@@ -4190,6 +4200,7 @@ export declare class Go2rtcTcpServer extends EventEmitter<{
     private readonly gracePeriodMs;
     private readonly prebufferMaxMs;
     private readonly maxBufferBytes;
+    private readonly streamTimeoutMs;
     private readonly prestartStream;
     private active;
     private server;
@@ -4201,6 +4212,10 @@ export declare class Go2rtcTcpServer extends EventEmitter<{
     private connectedClients;
     private clientSockets;
     private stopGraceTimer;
+    private lastFrameAt;
+    private streamHealthTimer;
+    private totalFramesReceived;
+    private totalVideoFramesWritten;
     private prebuffer;
     constructor(options: Go2rtcTcpServerOptions);
     /** Start listening. Resolves once the TCP server is bound. */
@@ -4227,6 +4242,8 @@ export declare class Go2rtcTcpServer extends EventEmitter<{
     private static splitAnnexBNals;
     private startNativeStream;
     private stopNativeStream;
+    private startStreamHealthMonitor;
+    private stopStreamHealthMonitor;
     private removeClient;
     private scheduleStop;
 }
@@ -4258,6 +4275,13 @@ export declare interface Go2rtcTcpServerOptions {
     prebufferMs?: number;
     /** Maximum write buffer per client before dropping the connection (default: 100 MB). */
     maxBufferBytes?: number;
+    /**
+     * Stream inactivity timeout in ms. If no frames arrive from the native
+     * stream for this duration, the stream is considered dead and will be
+     * torn down + restarted (similar to go2rtc's per-packet read deadline).
+     * Default: 15 000 (15s). Set to 0 to disable.
+     */
+    streamTimeoutMs?: number;
     /**
      * When true, the native camera stream is started immediately on start()
      * rather than waiting for the first TCP client. This ensures frames are
@@ -5072,6 +5096,13 @@ export declare class ReolinkBaichuanApi {
      * - "replay:XXX" - dedicated per replay session
      */
     private readonly socketPool;
+    /**
+     * 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.
+     */
+    private readonly consecutiveStreamTimeouts;
+    private static readonly MAX_CONSECUTIVE_STREAM_TIMEOUTS;
     /** BaichuanClientOptions to use when creating new sockets */
     private readonly clientOptions;
     /**
@@ -5216,6 +5247,14 @@ export declare class ReolinkBaichuanApi {
      */
     private readonly deviceCapabilitiesCache;
     private static readonly CAPABILITIES_CACHE_TTL_MS;
+    /**
+     * 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.
+     */
+    private readonly lastBatteryPushKey;
     /** Keep replay/streaming sockets warm briefly to reduce clip switch latency. */
     private static readonly SOCKET_POOL_KEEPALIVE_MS;
     /**
@@ -5348,6 +5387,18 @@ export declare class ReolinkBaichuanApi {
      * which indicates subStream (e.g., RecS03_, RecS_).
      */
     private determineStreamTypeFromFileName;
+    /**
+     * Stream profiles that the device explicitly rejected (response_code 400).
+     * Keyed by `"ch:profile"` (e.g. `"0:ext"`). Once a profile is in this set
+     * it is excluded from `buildVideoStreamOptions()` results and no further
+     * start attempts are made until the API instance is recreated.
+     */
+    private readonly _rejectedStreamProfiles;
+    /**
+     * Check whether a stream profile was rejected by the device at runtime
+     * (e.g. ext returned response_code 400).
+     */
+    isStreamProfileRejected(channel: number, profile: StreamProfile): boolean;
     /**
      * Cache for buildVideoStreamOptions.
      *
@@ -6543,6 +6594,22 @@ export declare class ReolinkBaichuanApi {
      *  2. **Storm**: ≥3 D2C_DISCs within 60 s triggers extended cooldown (120 s).
      */
     private notifyD2cDisc;
+    /**
+     * 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).
+     */
+    private findSocketTagForClient;
+    /**
+     * Reset the consecutive stream-start timeout counter for a streaming socket.
+     * Called on successful stream start.
+     */
+    private resetStreamTimeoutCounter;
+    /**
+     * 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.
+     */
+    private trackStreamTimeout;
     /**
      * Best-effort sleeping inference for battery/BCUDP cameras.
      *

package/dist/index.js

@@ -43,7 +43,7 @@ import {
   parseSupportXml,
   setGlobalLogger,
   xmlIndicatesFloodlight
-} from "./chunk-WDFKIHM5.js";
+} from "./chunk-GKLOJJ34.js";
 import {
   AesStreamDecryptor,
   BC_AES_IV,
@@ -223,7 +223,7 @@ import {
   testChannelStreams,
   xmlEscape,
   zipDirectory
-} from "./chunk-DEOMUWBN.js";
+} from "./chunk-TR3V5FTO.js";
 
 // src/reolink/baichuan/HlsSessionManager.ts
 var withTimeout = async (p, ms, label) => {
@@ -3466,6 +3466,11 @@ async function createRfc4571TcpServerInternal(options) {
           "videoAccessUnit",
           onAu
         );
+        const pendingErr = videoStream.consumePendingStartupError?.();
+        if (pendingErr) {
+          cleanup();
+          reject(pendingErr);
+        }
       });
     }
   };
@@ -3477,24 +3482,32 @@ async function createRfc4571TcpServerInternal(options) {
       await videoStream.stop();
     } catch {
     }
-    if (closeApiOnTeardown) {
-      await Promise.allSettled(
-        Array.from(apisToClose).map(async (a) => {
+    if (dedicatedSession) {
+      try {
+        await dedicatedSession.release();
+      } catch {
+      }
+    }
+    if (!dedicatedSession) {
+      if (closeApiOnTeardown) {
+        await Promise.allSettled(
+          Array.from(apisToClose).map(async (a) => {
+            try {
+              await a.close();
+            } catch {
+            }
+          })
+        );
+      } else {
+        const graceMs = isComposite ? 5e3 : 0;
+        for (const a of Array.from(apisToClose)) {
           try {
-            await a.close();
+            a?.client?.requestIdleDisconnectSoon?.(
+              "rfc4571_teardown",
+              graceMs
+            );
           } catch {
           }
-        })
-      );
-    } else {
-      const graceMs = isComposite ? 5e3 : 0;
-      for (const a of Array.from(apisToClose)) {
-        try {
-          a?.client?.requestIdleDisconnectSoon?.(
-            "rfc4571_teardown",
-            graceMs
-          );
-        } catch {
         }
       }
     }
@@ -3750,7 +3763,7 @@ async function createRfc4571TcpServerInternal(options) {
       } catch {
       }
     }
-    if (closeApiOnTeardown) {
+    if (closeApiOnTeardown && !dedicatedSession) {
       await Promise.allSettled(
         Array.from(apisToClose).map(async (a) => {
           try {
@@ -4712,6 +4725,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
   gracePeriodMs;
   prebufferMaxMs;
   maxBufferBytes;
+  streamTimeoutMs;
   prestartStream;
   active = false;
   server;
@@ -4725,6 +4739,11 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
   connectedClients = /* @__PURE__ */ new Set();
   clientSockets = /* @__PURE__ */ new Map();
   stopGraceTimer;
+  // Stream health monitoring
+  lastFrameAt = 0;
+  streamHealthTimer;
+  totalFramesReceived = 0;
+  totalVideoFramesWritten = 0;
   // Prebuffer
   prebuffer = [];
   constructor(options) {
@@ -4740,6 +4759,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
     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;
   }
   // -----------------------------------------------------------------------
@@ -4778,6 +4798,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
     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);
@@ -4831,12 +4852,12 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
         `[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;
@@ -4897,6 +4918,7 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
         }
         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}`
@@ -5023,6 +5045,8 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
         ...dedicatedClient ? { client: dedicatedClient } : {}
       }),
       onFrame: (frame) => {
+        this.lastFrameAt = Date.now();
+        this.totalFramesReceived++;
         if (!frame.audio && (frame.videoType === "H264" || frame.videoType === "H265")) {
           this.detectedVideoType = frame.videoType;
         }
@@ -5049,6 +5073,12 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
         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(() => {
           });
@@ -5056,16 +5086,18 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
         }
         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) {
@@ -5079,14 +5111,50 @@ var Go2rtcTcpServer = class _Go2rtcTcpServer extends EventEmitter2 {
     }
   }
   // -----------------------------------------------------------------------
+  // 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) {