@apocaliss92/nodelink-js 0.4.1 → 0.4.3

package/dist/cli/rtsp-server.js

@@ -3,10 +3,10 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-SDRNJQ5U.js";
+} from "../chunk-UHFJPQA4.js";
 import {
   __require
-} from "../chunk-DUHWTZ7U.js";
+} from "../chunk-DEOMUWBN.js";
 
 // src/cli/rtsp-server.ts
 function parseArgs() {

package/dist/index.cjs

@@ -5641,7 +5641,7 @@ async function captureModelFixtures(params) {
     () => api.getDualLensChannelInfo(channel),
     (v) => writeJsonSafe(path4.join(outDir, "dual-lens-info.json"), v)
   );
-  await capture("streamCombinationTest", async () => {
+  if (!params.skipStreamCombinationTest) await capture("streamCombinationTest", async () => {
     let dualLensInfo;
     try {
       dualLensInfo = await api.getDualLensChannelInfo(channel);
@@ -13410,6 +13410,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
   flow;
   deviceId;
   dedicatedSessionRelease;
+  externalListener;
   // Authentication
   authCredentials = [];
   requireAuth;
@@ -13452,6 +13453,10 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
   // Shared native stream fan-out (single camera stream, multiple RTSP clients)
   nativeFanout = null;
   noClientAutoStopTimer;
+  /** After last RTSP client; 0 = never auto-stop native stream. */
+  nativeStreamIdleStopMs;
+  /** Primed-but-no-PLAY timeout; 0 = disabled. */
+  nativeStreamPrimeIdleStopMs;
   // Prebuffer: rolling ring of recent video frames for IDR-aligned fast startup.
   // When a new client connects while the stream is already running it does not need
   // to wait up to one full GOP interval for the next keyframe — we replay frames
@@ -13577,6 +13582,9 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     this.logger = options.logger ?? console;
     this.tcpRtpFraming = options.tcpRtpFraming ?? "rfc4571";
     this.deviceId = options.deviceId;
+    this.externalListener = options.externalListener ?? false;
+    this.nativeStreamIdleStopMs = options.nativeStreamIdleStopMs ?? 3e4;
+    this.nativeStreamPrimeIdleStopMs = options.nativeStreamPrimeIdleStopMs ?? (this.nativeStreamIdleStopMs > 0 ? 15e3 : 0);
     this.authCredentials = options.credentials ?? [];
     this.requireAuth = options.requireAuth ?? this.authCredentials.length > 0;
     const transport = this.api.client.getTransport();
@@ -13707,41 +13715,56 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       this.streamMetadata = { frameRate: 25 };
       this.setFlowVideoType("H264", "metadata unavailable");
     }
-    this.clientConnectionServer = net2.createServer((socket) => {
-      this.handleRtspConnection(socket);
-    });
-    await new Promise((resolve, reject) => {
-      this.clientConnectionServer.listen(
-        this.listenPort,
-        this.listenHost,
-        () => {
-          const address = this.clientConnectionServer.address();
-          if (address && typeof address === "object" && "port" in address) {
-            this.listenPort = address.port;
+    if (!this.externalListener) {
+      this.clientConnectionServer = net2.createServer((socket) => {
+        this.handleRtspConnection(socket);
+      });
+      await new Promise((resolve, reject) => {
+        this.clientConnectionServer.listen(
+          this.listenPort,
+          this.listenHost,
+          () => {
+            const address = this.clientConnectionServer.address();
+            if (address && typeof address === "object" && "port" in address) {
+              this.listenPort = address.port;
+            }
+            resolve();
           }
-          resolve();
-        }
-      );
-      this.clientConnectionServer.on("error", (error) => {
-        reject(error);
+        );
+        this.clientConnectionServer.on("error", (error) => {
+          reject(error);
+        });
       });
-    });
+    }
     this.active = true;
     this.logger.info(
       `[BaichuanRtspServer] RTSP server started on ${this.listenHost}:${this.listenPort}, path: ${this.path}`
     );
   }
+  /**
+   * Accept an externally-routed RTSP connection.
+   * Used in directHandoff mode where RtspProxyServer routes sockets here.
+   * @param socket - The client TCP socket (already authenticated by proxy)
+   * @param initialBuffer - Any bytes already read during path parsing/auth
+   */
+  acceptConnection(socket, initialBuffer) {
+    if (!this.active) {
+      socket.end("RTSP/1.0 503 Service Unavailable\r\n\r\n");
+      return;
+    }
+    this.handleRtspConnection(socket, initialBuffer);
+  }
   /**
    * Handle RTSP connection from a client.
    */
-  handleRtspConnection(socket) {
+  handleRtspConnection(socket, initialBuffer) {
     const clientId = `${socket.remoteAddress}:${socket.remotePort}`;
     const connectTime = Date.now();
     this.logger.info(
       `[rebroadcast] client connected  client=${clientId} path=${this.path} profile=${this.profile} channel=${this.channel}`
     );
     let sessionId = "";
-    let buffer = Buffer.alloc(0);
+    let buffer = initialBuffer ?? Buffer.alloc(0);
     let clientFfmpeg;
     let useTcpInterleaved = false;
     let clientUdpSocket = null;
@@ -13826,8 +13849,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       }
       cleanup();
     });
-    socket.on("data", async (data) => {
-      buffer = Buffer.concat([buffer, data]);
+    const processBuffer = async () => {
       while (buffer.includes("\r\n\r\n")) {
         const endIndex = buffer.indexOf("\r\n\r\n");
         const requestText = buffer.subarray(0, endIndex).toString();
@@ -14102,7 +14124,14 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
           sendResponse(501, "Not Implemented");
         }
       }
+    };
+    socket.on("data", (data) => {
+      buffer = Buffer.concat([buffer, data]);
+      void processBuffer();
     });
+    if (buffer.includes("\r\n\r\n")) {
+      void processBuffer();
+    }
   }
   /**
    * Generate SDP (Session Description Protocol) for RTSP DESCRIBE.
@@ -15070,34 +15099,42 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
           res.seenFirstVideoKeyframe = false;
           res.rtpSentVideoConfig = false;
         }
-        if (this.dedicatedSessionRelease) {
-          const release = this.dedicatedSessionRelease;
-          this.dedicatedSessionRelease = void 0;
-          release().catch(() => {
-          });
-        }
         this.logger.info(
           `[rebroadcast] native stream ended (camera sleeping or connection lost)  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size}`
         );
-        if (this.connectedClients.size > 0) {
-          this.logger.info(
-            `[rebroadcast] restarting native stream for ${this.connectedClients.size} active client(s)`
-          );
-          setImmediate(() => void this.startNativeStream());
-        }
+        const releaseAndRestart = async () => {
+          if (this.dedicatedSessionRelease) {
+            const release = this.dedicatedSessionRelease;
+            this.dedicatedSessionRelease = void 0;
+            try {
+              await release();
+            } catch {
+            }
+          }
+          if (this.connectedClients.size > 0) {
+            this.logger.info(
+              `[rebroadcast] restarting native stream for ${this.connectedClients.size} active client(s)`
+            );
+            await new Promise((r) => setTimeout(r, 500));
+            void this.startNativeStream();
+          }
+        };
+        void releaseAndRestart();
       }
     });
     this.nativeFanout.start();
     this.clearNoClientAutoStopTimer();
-    this.noClientAutoStopTimer = setTimeout(() => {
-      if (this.connectedClients.size === 0) {
-        this.rtspDebugLog(
-          `Auto-stopping primed native stream (no clients connected)`
-        );
-        void this.stopNativeStream();
-      }
-    }, 15e3);
-    this.noClientAutoStopTimer?.unref?.();
+    if (this.nativeStreamPrimeIdleStopMs > 0) {
+      this.noClientAutoStopTimer = setTimeout(() => {
+        if (this.connectedClients.size === 0) {
+          this.rtspDebugLog(
+            `Auto-stopping primed native stream (no clients connected)`
+          );
+          void this.stopNativeStream();
+        }
+      }, this.nativeStreamPrimeIdleStopMs);
+      this.noClientAutoStopTimer?.unref?.();
+    }
   }
   markFirstFrameReceived() {
     if (!this.firstFrameReceived && this.firstFrameResolve) {
@@ -15172,12 +15209,14 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       this.emit("clientDisconnected", clientId);
       if (this.connectedClients.size === 0) {
         this.clearNoClientAutoStopTimer();
-        this.noClientAutoStopTimer = setTimeout(() => {
-          if (this.connectedClients.size === 0) {
-            void this.stopNativeStream();
-          }
-        }, 3e4);
-        this.noClientAutoStopTimer?.unref?.();
+        if (this.nativeStreamIdleStopMs > 0) {
+          this.noClientAutoStopTimer = setTimeout(() => {
+            if (this.connectedClients.size === 0) {
+              void this.stopNativeStream();
+            }
+          }, this.nativeStreamIdleStopMs);
+          this.noClientAutoStopTimer?.unref?.();
+        }
       }
     }
   }
@@ -15308,6 +15347,31 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
   getClientCount() {
     return this.connectedClients.size;
   }
+  /**
+   * Subscribe to the raw native stream for diagnostic purposes.
+   * The subscriber receives the same frames as RTSP clients.
+   * Counts as a "consumer" for lifecycle — prevents auto-stop while subscribed.
+   * If the native stream is not active, starts it automatically.
+   */
+  async subscribeDiagnostic(id) {
+    this.connectedClients.add(`diag:${id}`);
+    if (!this.nativeStreamActive) {
+      await this.startNativeStream();
+    }
+    return this.nativeFanout.subscribe(`diag:${id}`);
+  }
+  /**
+   * Unsubscribe a diagnostic session.
+   */
+  unsubscribeDiagnostic(id) {
+    this.removeClient(`diag:${id}`);
+  }
+  /**
+   * Returns detected audio metadata (available after first audio frame).
+   */
+  getAudioInfo() {
+    return this.audioInfo;
+  }
 };
 
 // src/reolink/baichuan/ReolinkBaichuanApi.ts