@apocaliss92/nodelink-js 0.2.3 → 0.2.5

package/dist/index.d.cts

@@ -3323,6 +3323,12 @@ interface BaichuanRtspServerOptions {
     }>;
     /** Require authentication for RTSP connections (default: false if no credentials set) */
     requireAuth?: boolean;
+    /**
+     * External identifier for dedicated socket session.
+     * When provided, a dedicated BaichuanClient is created for the stream,
+     * isolating it from other streams on the shared socket (avoids streamType mismatch).
+     */
+    deviceId?: string;
 }
 /**
  * BaichuanRtspServer - RTSP server that serves a Baichuan video stream.
@@ -3352,6 +3358,8 @@ declare class BaichuanRtspServer extends EventEmitter<{
     private tcpRtpFraming;
     private active;
     private flow;
+    private deviceId;
+    private dedicatedSessionRelease;
     private authCredentials;
     private requireAuth;
     private authNonces;
@@ -3440,7 +3448,9 @@ declare class BaichuanRtspServer extends EventEmitter<{
      */
     private stopNativeStream;
     /**
-     * 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.
      */
     private removeClient;
     /**
@@ -7416,6 +7426,8 @@ declare class BaichuanEventEmitter {
  */
 declare function createNativeStream(api: ReolinkBaichuanApi, channel: number, profile: StreamProfile, options?: {
     variant?: NativeVideoStreamVariant;
+    /** Optional dedicated BaichuanClient for stream isolation. When omitted, uses api.client (shared). */
+    client?: BaichuanClient;
 }): AsyncGenerator<{
     audio: boolean;
     data: Buffer;
@@ -8169,6 +8181,13 @@ interface BaichuanHlsServerOptions {
     playlistSize?: number;
     /** ffmpeg binary path (default: "ffmpeg") */
     ffmpegPath?: string;
+    /**
+     * External video stream from a shared pool (e.g. createRfc4571TcpServer).
+     * When provided, the HLS server subscribes to this stream's events instead
+     * of creating its own via createNativeStream. This allows multiple outputs
+     * (MJPEG, HLS, WebRTC) to share a single camera streaming session.
+     */
+    externalVideoStream?: BaichuanVideoStream;
     /** Logger callback */
     logger?: (level: "debug" | "info" | "warn" | "error", message: string) => void;
 }
@@ -8190,6 +8209,7 @@ declare class BaichuanHlsServer extends EventEmitter {
     private readonly segmentDuration;
     private readonly playlistSize;
     private readonly ffmpegPath;
+    private readonly externalVideoStream;
     private readonly log;
     private outputDir;
     private createdTempDir;
@@ -8235,6 +8255,11 @@ declare class BaichuanHlsServer extends EventEmitter {
         data: Buffer;
         contentType: string;
     } | null>;
+    /**
+     * Wrap a BaichuanVideoStream's videoAccessUnit events into an async generator
+     * compatible with createNativeStream's output format.
+     */
+    private wrapVideoStreamAsGenerator;
     private pumpNativeToFfmpeg;
     private spawnFfmpeg;
 }

package/dist/index.d.ts

@@ -994,6 +994,7 @@ export declare class BaichuanHlsServer extends EventEmitter {
     private readonly segmentDuration;
     private readonly playlistSize;
     private readonly ffmpegPath;
+    private readonly externalVideoStream;
     private readonly log;
     private outputDir;
     private createdTempDir;
@@ -1039,6 +1040,11 @@ export declare class BaichuanHlsServer extends EventEmitter {
         data: Buffer;
         contentType: string;
     } | null>;
+    /**
+     * Wrap a BaichuanVideoStream's videoAccessUnit events into an async generator
+     * compatible with createNativeStream's output format.
+     */
+    private wrapVideoStreamAsGenerator;
     private pumpNativeToFfmpeg;
     private spawnFfmpeg;
 }
@@ -1060,6 +1066,13 @@ export declare interface BaichuanHlsServerOptions {
     playlistSize?: number;
     /** ffmpeg binary path (default: "ffmpeg") */
     ffmpegPath?: string;
+    /**
+     * External video stream from a shared pool (e.g. createRfc4571TcpServer).
+     * When provided, the HLS server subscribes to this stream's events instead
+     * of creating its own via createNativeStream. This allows multiple outputs
+     * (MJPEG, HLS, WebRTC) to share a single camera streaming session.
+     */
+    externalVideoStream?: BaichuanVideoStream;
     /** Logger callback */
     logger?: (level: "debug" | "info" | "warn" | "error", message: string) => void;
 }
@@ -1298,6 +1311,8 @@ export declare class BaichuanRtspServer extends EventEmitter<{
     private tcpRtpFraming;
     private active;
     private flow;
+    private deviceId;
+    private dedicatedSessionRelease;
     private authCredentials;
     private requireAuth;
     private authNonces;
@@ -1386,7 +1401,9 @@ export declare class BaichuanRtspServer extends EventEmitter<{
      */
     private stopNativeStream;
     /**
-     * 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.
      */
     private removeClient;
     /**
@@ -1440,6 +1457,12 @@ export declare interface BaichuanRtspServerOptions {
     }>;
     /** Require authentication for RTSP connections (default: false if no credentials set) */
     requireAuth?: boolean;
+    /**
+     * External identifier for dedicated socket session.
+     * When provided, a dedicated BaichuanClient is created for the stream,
+     * isolating it from other streams on the shared socket (avoids streamType mismatch).
+     */
+    deviceId?: string;
 }
 
 export declare type BaichuanSerialPush = {
@@ -3290,6 +3313,8 @@ export declare function createMjpegBoundary(): string;
  */
 export declare function createNativeStream(api: ReolinkBaichuanApi, channel: number, profile: StreamProfile, options?: {
     variant?: NativeVideoStreamVariant;
+    /** Optional dedicated BaichuanClient for stream isolation. When omitted, uses api.client (shared). */
+    client?: BaichuanClient;
 }): AsyncGenerator<{
     audio: boolean;
     data: Buffer;

package/dist/index.js

@@ -38,7 +38,7 @@ import {
   normalizeUid,
   parseSupportXml,
   setGlobalLogger
-} from "./chunk-RWYEGEWG.js";
+} from "./chunk-EG5IY3CM.js";
 import {
   AesStreamDecryptor,
   BC_AES_IV,
@@ -215,7 +215,7 @@ import {
   testChannelStreams,
   xmlEscape,
   zipDirectory
-} from "./chunk-NLTB7GTA.js";
+} from "./chunk-APEEZ4UN.js";
 
 // src/reolink/baichuan/HlsSessionManager.ts
 var withTimeout = async (p, ms, label) => {
@@ -6494,6 +6494,7 @@ var BaichuanHlsServer = class extends EventEmitter6 {
   segmentDuration;
   playlistSize;
   ffmpegPath;
+  externalVideoStream;
   log;
   outputDir = null;
   createdTempDir = false;
@@ -6520,6 +6521,7 @@ var BaichuanHlsServer = class extends EventEmitter6 {
       this.outputDir = options.outputDir;
       this.createdTempDir = false;
     }
+    this.externalVideoStream = options.externalVideoStream;
     this.log = options.logger ?? (() => {
     });
   }
@@ -6544,12 +6546,16 @@ var BaichuanHlsServer = class extends EventEmitter6 {
       this.playlistPath = path.join(this.outputDir, "playlist.m3u8");
       this.segmentPattern = path.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";
@@ -6668,6 +6674,56 @@ var BaichuanHlsServer = class extends EventEmitter6 {
   // ============================================================================
   // 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;