@apocaliss92/nodelink-js 0.2.2 → 0.2.4

package/dist/cli/rtsp-server.js

@@ -3,10 +3,10 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-MN7GUZT7.js";
+} from "../chunk-EG5IY3CM.js";
 import {
   __require
-} from "../chunk-NLTB7GTA.js";
+} from "../chunk-APEEZ4UN.js";
 
 // src/cli/rtsp-server.ts
 function parseArgs() {

package/dist/index.cjs

@@ -3000,14 +3000,6 @@ var init_BaichuanVideoStream = __esm({
               this.profile,
               { variant: this.variant, client: this.client }
             );
-            if (this.client.getTransport?.() === "udp") {
-              await startPromise;
-            } else {
-              await Promise.race([
-                startPromise,
-                new Promise((resolve) => setTimeout(resolve, 400))
-              ]);
-            }
             const updateActiveMsgNum = () => {
               try {
                 const getMsgNum = this.api.getActiveVideoMsgNumWithVariant;
@@ -3017,6 +3009,15 @@ var init_BaichuanVideoStream = __esm({
               }
             };
             updateActiveMsgNum();
+            if (this.client.getTransport?.() === "udp") {
+              await startPromise;
+            } else {
+              await Promise.race([
+                startPromise,
+                new Promise((resolve) => setTimeout(resolve, 400))
+              ]);
+            }
+            updateActiveMsgNum();
             void startPromise.then(() => updateActiveMsgNum()).catch((e) => {
               const err = e instanceof Error ? e : new Error(String(e));
               this.emitSafeError(err);
@@ -12542,8 +12543,24 @@ var BaichuanEventEmitter = class {
   }
 };
 async function* createNativeStream(api, channel, profile, options) {
+  let client = options?.client;
+  let dedicatedRelease;
+  if (!client) {
+    const variantSuffix = options?.variant && options.variant !== "default" ? `:${options.variant}` : "";
+    const sessionKey = `live:native${variantSuffix}:ch${channel}:${profile}`;
+    try {
+      api.logger?.info?.(`[createNativeStream] acquiring dedicated session  key=${sessionKey}`);
+      const session = await api.createDedicatedSession(sessionKey);
+      client = session.client;
+      dedicatedRelease = session.release;
+      api.logger?.info?.(`[createNativeStream] dedicated session acquired  key=${sessionKey}`);
+    } catch (e) {
+      api.logger?.warn?.(`[createNativeStream] dedicated session failed, using shared client: ${e instanceof Error ? e.message : e}`);
+      client = api.client;
+    }
+  }
   const videoStream = new BaichuanVideoStream({
-    client: api.client,
+    client,
     api,
     channel,
     profile,
@@ -12557,9 +12574,15 @@ async function* createNativeStream(api, channel, profile, options) {
   let closed = false;
   const onError = (_error) => {
     closed = true;
+    api.logger?.warn?.(
+      `[createNativeStream] stream error \u2192 closed  channel=${channel} profile=${profile} error=${_error?.message ?? _error}`
+    );
   };
   const onClose = () => {
     closed = true;
+    api.logger?.warn?.(
+      `[createNativeStream] stream close \u2192 closed  channel=${channel} profile=${profile}`
+    );
   };
   try {
     videoStream.on("error", onError);
@@ -12670,6 +12693,10 @@ async function* createNativeStream(api, channel, profile, options) {
     }
     videoStream.removeListener("error", onError);
     videoStream.removeListener("close", onClose);
+    if (dedicatedRelease) {
+      dedicatedRelease().catch(() => {
+      });
+    }
   }
 }
 
@@ -12909,6 +12936,8 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
   tcpRtpFraming;
   active = false;
   flow;
+  deviceId;
+  dedicatedSessionRelease;
   // Authentication
   authCredentials = [];
   requireAuth;
@@ -12951,6 +12980,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 +13020,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;
@@ -13050,6 +13104,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     this.path = options.path ?? `/stream/${this.profile}`;
     this.logger = options.logger ?? console;
     this.tcpRtpFraming = options.tcpRtpFraming ?? "rfc4571";
+    this.deviceId = options.deviceId;
     this.authCredentials = options.credentials ?? [];
     this.requireAuth = options.requireAuth ?? this.authCredentials.length > 0;
     const transport = this.api.client.getTransport();
@@ -13379,7 +13434,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 +13446,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 +13465,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 +13669,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 +13739,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 +14176,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 +14205,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`
@@ -14403,14 +14490,31 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     this.firstAudioPromise = new Promise((resolve) => {
       this.firstAudioResolve = resolve;
     });
+    let dedicatedClient;
+    const variantSuffix = this.variant && this.variant !== "default" ? `:${this.variant}` : "";
+    const deviceIdPart = this.deviceId ?? "rtsp-server";
+    const sessionKey = `live:${deviceIdPart}:ch${this.channel}:${this.profile}${variantSuffix}`;
+    try {
+      const session = await this.api.createDedicatedSession(sessionKey, this.logger);
+      dedicatedClient = session.client;
+      this.dedicatedSessionRelease = session.release;
+      this.logger.info(
+        `[rebroadcast] dedicated session acquired  sessionKey=${sessionKey}`
+      );
+    } catch (e) {
+      this.logger.warn(
+        `[rebroadcast] failed to acquire dedicated session, falling back to shared socket: ${e}`
+      );
+    }
     this.logger.info(
-      `[rebroadcast] native stream starting  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size}`
+      `[rebroadcast] native stream starting  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size} dedicated=${!!dedicatedClient}`
     );
     await this.flow.startKeepAlive(this.api);
     this.nativeFanout = new NativeStreamFanout({
       maxQueueItems: 200,
       createSource: () => createNativeStream(this.api, this.channel, this.profile, {
-        variant: this.variant
+        variant: this.variant,
+        ...dedicatedClient ? { client: dedicatedClient } : {}
       }),
       onFrame: (frame) => {
         if (frame.audio) {
@@ -14442,6 +14546,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 +14571,13 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
         this.firstFramePromise = null;
         this.firstFrameResolve = null;
         this.nativeFanout = null;
+        this.prebuffer = [];
+        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}`
         );
@@ -14523,6 +14646,15 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
       this.nativeFanout = null;
       await fanout.stop();
     }
+    this.prebuffer = [];
+    if (this.dedicatedSessionRelease) {
+      const release = this.dedicatedSessionRelease;
+      this.dedicatedSessionRelease = void 0;
+      try {
+        await release();
+      } catch {
+      }
+    }
     if (this.tempStreamGenerator) {
       try {
         await this.tempStreamGenerator.return(void 0);
@@ -14532,14 +14664,22 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events4.E
     }
   }
   /**
-   * Remove a client and stop native stream if no clients remain.
+   * Remove a client and schedule native stream stop if no clients remain.
+   * Uses a grace period so rapid reconnects (e.g. Frigate polling) reuse the running stream
+   * and benefit from the prebuffer instead of waiting for a fresh keyframe.
    */
   removeClient(clientId) {
     if (this.connectedClients.has(clientId)) {
       this.connectedClients.delete(clientId);
       this.emit("clientDisconnected", clientId);
       if (this.connectedClients.size === 0) {
-        void this.stopNativeStream();
+        this.clearNoClientAutoStopTimer();
+        this.noClientAutoStopTimer = setTimeout(() => {
+          if (this.connectedClients.size === 0) {
+            void this.stopNativeStream();
+          }
+        }, 3e4);
+        this.noClientAutoStopTimer?.unref?.();
       }
     }
   }
@@ -34111,6 +34251,7 @@ var BaichuanHlsServer = class extends import_node_events10.EventEmitter {
   segmentDuration;
   playlistSize;
   ffmpegPath;
+  externalVideoStream;
   log;
   outputDir = null;
   createdTempDir = false;
@@ -34137,6 +34278,7 @@ var BaichuanHlsServer = class extends import_node_events10.EventEmitter {
       this.outputDir = options.outputDir;
       this.createdTempDir = false;
     }
+    this.externalVideoStream = options.externalVideoStream;
     this.log = options.logger ?? (() => {
     });
   }
@@ -34161,12 +34303,16 @@ var BaichuanHlsServer = class extends import_node_events10.EventEmitter {
       this.playlistPath = import_node_path3.default.join(this.outputDir, "playlist.m3u8");
       this.segmentPattern = import_node_path3.default.join(this.outputDir, "segment_%05d.ts");
       this.log("info", `Starting HLS stream to ${this.outputDir}`);
-      this.nativeStream = createNativeStream(
-        this.api,
-        this.channel,
-        this.profile,
-        this.variant ? { variant: this.variant } : void 0
-      );
+      if (this.externalVideoStream) {
+        this.nativeStream = this.wrapVideoStreamAsGenerator(this.externalVideoStream);
+      } else {
+        this.nativeStream = createNativeStream(
+          this.api,
+          this.channel,
+          this.profile,
+          this.variant ? { variant: this.variant } : void 0
+        );
+      }
       this.pumpPromise = this.pumpNativeToFfmpeg();
       this.startedAt = /* @__PURE__ */ new Date();
       this.state = "running";
@@ -34285,6 +34431,56 @@ var BaichuanHlsServer = class extends import_node_events10.EventEmitter {
   // ============================================================================
   // Private Methods
   // ============================================================================
+  /**
+   * Wrap a BaichuanVideoStream's videoAccessUnit events into an async generator
+   * compatible with createNativeStream's output format.
+   */
+  async *wrapVideoStreamAsGenerator(videoStream) {
+    const queue = [];
+    let resolve = null;
+    let done = false;
+    const onFrame = (au) => {
+      queue.push(au);
+      resolve?.();
+      resolve = null;
+    };
+    const onClose = () => {
+      done = true;
+      resolve?.();
+      resolve = null;
+    };
+    const onError = () => {
+      done = true;
+      resolve?.();
+      resolve = null;
+    };
+    videoStream.on("videoAccessUnit", onFrame);
+    videoStream.on("close", onClose);
+    videoStream.on("error", onError);
+    try {
+      while (!done) {
+        if (queue.length === 0) {
+          await new Promise((r) => {
+            resolve = r;
+          });
+        }
+        while (queue.length > 0) {
+          const frame = queue.shift();
+          yield {
+            audio: false,
+            data: frame.data,
+            videoType: frame.videoType,
+            isKeyframe: frame.isKeyframe,
+            microseconds: frame.microseconds
+          };
+        }
+      }
+    } finally {
+      videoStream.removeListener("videoAccessUnit", onFrame);
+      videoStream.removeListener("close", onClose);
+      videoStream.removeListener("error", onError);
+    }
+  }
   async pumpNativeToFfmpeg() {
     if (!this.nativeStream || !this.playlistPath || !this.segmentPattern) {
       return;