@apocaliss92/nodelink-js 0.2.5 → 0.3.5

package/dist/cli/rtsp-server.cjs

@@ -8079,14 +8079,16 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
 `;
           }
           if (body) {
-            response += `Content-Length: ${Buffer.byteLength(body, "utf8")}\r
+            const bodyBuf = Buffer.from(body, "utf8");
+            response += `Content-Length: ${bodyBuf.length}\r
 `;
+            response += "\r\n";
+            socket.write(response);
+            socket.write(bodyBuf);
+          } else {
+            response += "\r\n";
+            socket.write(response);
           }
-          response += "\r\n";
-          if (body) {
-            response += body;
-          }
-          socket.write(response);
         };
         this.rtspDebugLog(`RTSP ${method} ${url}`);
         if (this.requireAuth) {
@@ -8296,10 +8298,25 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
               );
             }
           }
-          sendResponse(200, "OK", {
-            Session: sessionId,
-            Range: "npt=0.000-"
-          });
+          {
+            const baseUrl = `rtsp://${this.listenHost}:${this.listenPort}${this.path}`;
+            const resources = this.clientResources.get(clientId);
+            const rtpInfoParts = [];
+            if (resources?.setupTrack0) {
+              rtpInfoParts.push(`url=${baseUrl}/track0`);
+            }
+            if (resources?.setupTrack1) {
+              rtpInfoParts.push(`url=${baseUrl}/track1`);
+            }
+            const playHeaders = {
+              Session: sessionId,
+              Range: "npt=now-"
+            };
+            if (rtpInfoParts.length > 0) {
+              playHeaders["RTP-Info"] = rtpInfoParts.join(",");
+            }
+            sendResponse(200, "OK", playHeaders);
+          }
         } else if (method === "TEARDOWN") {
           this.logger.info(
             `[rebroadcast] TEARDOWN  client=${clientId} session=${sessionId}`
@@ -8329,6 +8346,8 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
     sdp += `c=IN IP4 ${this.listenHost}\r
 `;
     sdp += "t=0 0\r\n";
+    sdp += "a=range:npt=now-\r\n";
+    sdp += "a=control:*\r\n";
     sdp += `m=video 0 RTP/AVP ${videoPayloadType}\r
 `;
     sdp += `a=rtpmap:${videoPayloadType} ${codec}/90000\r
@@ -9271,7 +9290,14 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
         this.firstFramePromise = null;
         this.firstFrameResolve = null;
         this.nativeFanout = null;
-        this.prebuffer = [];
+        for (const [, resources] of this.clientResources) {
+          const res = resources;
+          res.rtpVideoBaseMicroseconds = void 0;
+          res.rtpVideoBaseTimestamp = void 0;
+          res.rtpVideoLastTimestamp = void 0;
+          res.seenFirstVideoKeyframe = false;
+          res.rtpSentVideoConfig = false;
+        }
         if (this.dedicatedSessionRelease) {
           const release = this.dedicatedSessionRelease;
           this.dedicatedSessionRelease = void 0;
@@ -11345,6 +11371,22 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
   static coverPreviewBackoffMs = /* @__PURE__ */ new Map();
   static COVER_PREVIEW_INITIAL_BACKOFF_MS = 1e3;
   static COVER_PREVIEW_MAX_BACKOFF_MS = 3e4;
+  /**
+   * Per-client snapshot (cmd_id=109) serialization queue.
+   * 
+   * WHY: On NVR/multi-camera devices sharing one socket, concurrent snapshot requests
+   * can cause JPEG data to mix (even with per-request msgNum filtering):
+   * - Camera A and B both send frames on same socket
+   * - Frame listener is global per socket
+   * - Timing quirks can cause chunk reordering or listener confusion
+   * 
+   * FIX: Serialize all cmd_id=109 requests on THIS client instance.
+   * Each snapshot waits for previous one to complete before starting.
+   * This ensures clean frame sequences per request, zero data corruption.
+   * 
+   * Impact: Snapshots are ~0–50ms slower per camera (negligible for users).
+   */
+  snapshotQueueTail = Promise.resolve();
   opts;
   debugCfg;
   logger;
@@ -13826,6 +13868,20 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
     });
   }
   async sendBinarySnapshot109(params) {
+    const prevTail = this.snapshotQueueTail;
+    let resolve;
+    const newTail = new Promise((r) => {
+      resolve = r;
+    });
+    this.snapshotQueueTail = newTail;
+    try {
+      await prevTail;
+      return await this.sendBinarySnapshot109Impl(params);
+    } finally {
+      resolve();
+    }
+  }
+  async sendBinarySnapshot109Impl(params) {
     await this.connect();
     const channel = params.channel ?? this.opts.channel ?? 0;
     const channelId = params.channelIdOverride ?? (params.channel == null ? this.hostChannelId : channel + 1);
@@ -13885,7 +13941,8 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
       };
       const onFrame = (frame) => {
         if (frame.header.cmdId !== cmdId) return;
-        if (frame.header.msgNum === msgNum && frame.header.responseCode >= 400) {
+        if (frame.header.msgNum !== msgNum) return;
+        if (frame.header.responseCode >= 400) {
           fail(
             new Error(
               `Baichuan snapshot request rejected (cmdId=${cmdId} msgNum=${msgNum} responseCode=${frame.header.responseCode})`
@@ -22003,13 +22060,13 @@ ${stderr}`)
    */
   async muxToMp4(params) {
     const { spawn: spawn4 } = await import("child_process");
-    const { randomUUID: randomUUID2 } = await import("crypto");
+    const { randomUUID: randomUUID3 } = await import("crypto");
     const fs5 = await import("fs/promises");
     const os = await import("os");
     const path5 = await import("path");
     const ffmpeg = params.ffmpegPath ?? "ffmpeg";
     const tmpDir = os.tmpdir();
-    const id = randomUUID2();
+    const id = randomUUID3();
     const videoFormat = params.videoCodec === "H265" ? "hevc" : "h264";
     const videoPath = path5.join(tmpDir, `reolink-${id}.${videoFormat}`);
     const outputPath = path5.join(tmpDir, `reolink-${id}.mp4`);
@@ -26991,8 +27048,13 @@ ${scheduleItems}
 init_constants();
 
 // src/reolink/discovery.ts
+var import_node_child_process4 = require("child_process");
+var import_node_crypto3 = require("crypto");
 var import_node_dgram2 = __toESM(require("dgram"), 1);
+var net3 = __toESM(require("net"), 1);
 var import_node_os2 = require("os");
+var import_node_util = require("util");
+var execFileAsync = (0, import_node_util.promisify)(import_node_child_process4.execFile);
 async function discoverViaUdpDirect(host, options) {
   if (!options.enableUdpDiscovery) return [];
   const logger = options.logger;
@@ -27234,8 +27296,8 @@ function isTcpFailureThatShouldFallbackToUdp(e) {
 async function pingHost(host, timeoutMs = 3e3) {
   return new Promise((resolve) => {
     const { exec } = require("child_process");
-    const platform = process.platform;
-    const pingCmd = platform === "win32" ? `ping -n 1 -w ${timeoutMs} ${host}` : platform === "darwin" ? (
+    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}`
     ) : (