@apocaliss92/nodelink-js 0.2.2 → 0.2.3

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-MN7GUZT7.js";
+} from "../chunk-RWYEGEWG.js";
 import {
   __require
 } from "../chunk-NLTB7GTA.js";

package/dist/index.cjs

@@ -12951,6 +12951,12 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
   // Shared native stream fan-out (single camera stream, multiple RTSP clients)
   nativeFanout = null;
   noClientAutoStopTimer;
+  // 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
+  // from the last IDR in the prebuffer immediately.
+  PREBUFFER_MAX_MS = 3e3;
+  prebuffer = [];
   static isAdtsAacFrame(b) {
     return b.length >= 2 && b[0] === 255 && (b[1] & 240) === 240;
   }
@@ -12985,6 +12991,25 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     );
     return { sampleRate, channels, configHex };
   }
+  /** Returns true if the raw (packed/Annex B) frame is an IDR (H.264) or IRAP (H.265). */
+  isRawFrameKeyframe(frame) {
+    try {
+      if (frame.videoType === "H264") {
+        const nals = _BaichuanRtspServer.splitAnnexBNals(
+          convertToAnnexB(frame.data)
+        );
+        return nals.some((n) => n.length >= 1 && (n[0] & 31) === 5);
+      }
+      if (frame.videoType === "H265") {
+        const nals = splitAnnexBToNalPayloads2(convertToAnnexB2(frame.data));
+        return nals.some(
+          (n) => n.length >= 2 && isH265Irap(n[0] >> 1 & 63)
+        );
+      }
+    } catch {
+    }
+    return false;
+  }
   static parseInterleavedChannels(transportHeader) {
     const m = transportHeader.match(/interleaved\s*=\s*(\d+)\s*-\s*(\d+)/i);
     if (!m) return null;
@@ -13379,7 +13404,11 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
             }
             const { hasParamSets: hasParamSets2 } = this.flow.getFmtp();
             if (!hasParamSets2) {
-              const primingMs = this.api.client.getTransport() === "udp" ? 4e3 : 1500;
+              const primingMs = this.api.client.getTransport() === "udp" ? 4e3 : 3e3;
+              const primingStart = Date.now();
+              this.logger.info(
+                `[rebroadcast] DESCRIBE priming: waiting up to ${primingMs}ms for SPS/PPS  client=${clientId} path=${this.path}`
+              );
               try {
                 await Promise.race([
                   this.firstFramePromise || Promise.resolve(),
@@ -13387,6 +13416,17 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
                 ]);
               } catch {
               }
+              const primingElapsed = Date.now() - primingStart;
+              const { hasParamSets: hasParamSetsAfter } = this.flow.getFmtp();
+              if (hasParamSetsAfter) {
+                this.logger.info(
+                  `[rebroadcast] DESCRIBE priming: SPS/PPS received after ${primingElapsed}ms  client=${clientId} path=${this.path}`
+                );
+              } else {
+                this.logger.warn(
+                  `[rebroadcast] DESCRIBE priming: timed out after ${primingElapsed}ms without SPS/PPS \u2014 SDP will lack sprop-parameter-sets, downstream decoder may hang  client=${clientId} path=${this.path}`
+                );
+              }
             }
           }
           {
@@ -13395,11 +13435,6 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
             this.logger.info(
               `[BaichuanRtspServer] DESCRIBE SDP for ${clientId} path=${this.path} codec=${this.flow.sdpCodec} hasParamSets=${hasParamSets2} fmtp=${fmtpPreview}`
             );
-            if (!hasParamSets2) {
-              this.rtspDebugLog(
-                `DESCRIBE responding without parameter sets yet (client=${clientId}, path=${this.path}, flow=${this.flow.key})`
-              );
-            }
           }
           const sdp = this.generateSdp();
           sendResponse(
@@ -13604,10 +13639,6 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       sdp += `a=control:track1\r
 `;
     }
-    sdp += `a=setup:passive\r
-`;
-    sdp += `a=connection:new\r
-`;
     return sdp;
   }
   /**
@@ -13678,6 +13709,14 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
           return false;
         if (channel === audioRtpChannel && !resources2?.setupTrack1)
           return false;
+        const buffered = rtspSocket.writableLength;
+        if (buffered > 10 * 1024 * 1024) {
+          this.logger.warn(
+            `[rebroadcast] backpressure: ${Math.round(buffered / 1024)}KB buffered for client=${clientId} \u2014 disconnecting`
+          );
+          rtspSocket.destroy();
+          return false;
+        }
         try {
           return rtspSocket.write(frameRtpOverTcp(channel, msg));
         } catch (error) {
@@ -14107,6 +14146,24 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     let frameCount = 0;
     let lastFrameTime = Date.now();
     const targetFrameInterval = streamMetadata && streamMetadata.frameRate > 0 ? 1e3 / streamMetadata.frameRate : 40;
+    const prebufferSnap = this.prebuffer.slice();
+    let lastIdrIdx = -1;
+    for (let i = prebufferSnap.length - 1; i >= 0; i--) {
+      if (prebufferSnap[i].isKeyframe) {
+        lastIdrIdx = i;
+        break;
+      }
+    }
+    const prebufferFrames = lastIdrIdx >= 0 ? prebufferSnap.slice(lastIdrIdx) : [];
+    if (prebufferFrames.length > 0) {
+      this.logger.info(
+        `[rebroadcast] prebuffer replay  client=${clientId} frames=${prebufferFrames.length} starting from IDR`
+      );
+    }
+    const combined = async function* () {
+      for (const entry of prebufferFrames) yield entry.frame;
+      for await (const f of clientGenerator) yield f;
+    };
     const feedFrames = async () => {
       try {
         this.rtspDebugLog(
@@ -14118,7 +14175,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
         let firstVideoFrameSeenLogged = false;
         let h265WaitParamSetsLogged = false;
         let h265WaitIrapLogged = false;
-        for await (const frame of clientGenerator) {
+        for await (const frame of combined()) {
           if (!this.connectedClients.has(clientId)) {
             this.rtspDebugLog(
               `Client ${clientId} disconnected, stopping frame feed`
@@ -14442,6 +14499,18 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
         if (hasParamSets2) {
           this.markFirstFrameReceived();
         }
+        const isKeyframe = this.isRawFrameKeyframe(frame);
+        this.prebuffer.push({
+          frame: { ...frame, data: Buffer.from(frame.data) },
+          time: Date.now(),
+          isKeyframe
+        });
+        const cutoff = Date.now() - this.PREBUFFER_MAX_MS;
+        let trimIdx = 0;
+        while (trimIdx < this.prebuffer.length && this.prebuffer[trimIdx].time < cutoff) {
+          trimIdx++;
+        }
+        if (trimIdx > 0) this.prebuffer.splice(0, trimIdx);
       },
       onError: (error) => {
         this.logger.warn(
@@ -14455,6 +14524,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
         this.firstFramePromise = null;
         this.firstFrameResolve = null;
         this.nativeFanout = null;
+        this.prebuffer = [];
         this.logger.info(
           `[rebroadcast] native stream ended (camera sleeping or connection lost)  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size}`
         );
@@ -14523,6 +14593,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       this.nativeFanout = null;
       await fanout.stop();
     }
+    this.prebuffer = [];
     if (this.tempStreamGenerator) {
       try {
         await this.tempStreamGenerator.return(void 0);