@apocaliss92/nodelink-js 0.4.1 → 0.4.3

package/dist/index.d.cts

@@ -1,7 +1,8 @@
 import { EventEmitter } from 'node:events';
 import { Readable } from 'node:stream';
+import * as net from 'node:net';
+import net__default from 'node:net';
 import http from 'node:http';
-import net from 'node:net';
 
 declare const BC_TCP_DEFAULT_PORT = 9000;
 /** Magic header bytes: `f0 de bc 0a` */
@@ -3308,8 +3309,8 @@ declare class ReolinkCgiApi {
  *
  * Structure:
  * - RTSP server uses ffmpeg -rtsp_flags listen to create RTSP server from stdin
- * - Native stream starts only when at least one client is connected
- * - Native stream stops when no clients are connected
+ * - Native stream starts when the first client needs video (e.g. DESCRIBE/PLAY path)
+ * - Native stream auto-stop when no clients is optional (see nativeStreamIdleStopMs)
  * - Tracks connected clients
  * - Passes native frames directly to ffmpeg without repacketization
  */
@@ -3346,6 +3347,23 @@ interface BaichuanRtspServerOptions {
      * isolating it from other streams on the shared socket (avoids streamType mismatch).
      */
     deviceId?: string;
+    /**
+     * When true, the server does NOT create its own net.Server.
+     * Connections are accepted externally via acceptConnection().
+     * start() still performs metadata fetch and codec detection.
+     */
+    externalListener?: boolean;
+    /**
+     * Ms after the last RTSP client disconnects before stopping the native Baichuan stream.
+     * 0 = keep the native stream running (matches rtsp proxy idle timeout 0 / always-mounted sources).
+     * Default 30000.
+     */
+    nativeStreamIdleStopMs?: number;
+    /**
+     * If the native stream is primed (e.g. DESCRIBE) but no client SETUP/PLAYs, stop after this many ms.
+     * 0 = disable. Default 15000 when nativeStreamIdleStopMs > 0, else 0.
+     */
+    nativeStreamPrimeIdleStopMs?: number;
 }
 /**
  * BaichuanRtspServer - RTSP server that serves a Baichuan video stream.
@@ -3355,8 +3373,8 @@ interface BaichuanRtspServerOptions {
  *
  * Lifecycle:
  * - Server starts immediately (ffmpeg RTSP server)
- * - Native stream starts only when first client connects
- * - Native stream stops when last client disconnects
+ * - Native stream starts when clients need media
+ * - Native stream may stay running with zero RTSP clients if nativeStreamIdleStopMs is 0
  */
 declare class BaichuanRtspServer extends EventEmitter<{
     client: [string];
@@ -3377,6 +3395,7 @@ declare class BaichuanRtspServer extends EventEmitter<{
     private flow;
     private deviceId;
     private dedicatedSessionRelease;
+    private externalListener;
     private authCredentials;
     private requireAuth;
     private authNonces;
@@ -3401,6 +3420,10 @@ declare class BaichuanRtspServer extends EventEmitter<{
     private tempStreamGenerator;
     private nativeFanout;
     private noClientAutoStopTimer;
+    /** After last RTSP client; 0 = never auto-stop native stream. */
+    private readonly nativeStreamIdleStopMs;
+    /** Primed-but-no-PLAY timeout; 0 = disabled. */
+    private readonly nativeStreamPrimeIdleStopMs;
     private readonly PREBUFFER_MAX_MS;
     private prebuffer;
     private static isAdtsAacFrame;
@@ -3441,6 +3464,13 @@ declare class BaichuanRtspServer extends EventEmitter<{
      * Start the RTSP server.
      */
     start(): Promise<void>;
+    /**
+     * 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: net.Socket, initialBuffer?: Buffer): void;
     /**
      * Handle RTSP connection from a client.
      */
@@ -3493,6 +3523,33 @@ declare class BaichuanRtspServer extends EventEmitter<{
      * Get number of connected clients.
      */
     getClientCount(): number;
+    /**
+     * 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.
+     */
+    subscribeDiagnostic(id: string): Promise<AsyncGenerator<{
+        audio: boolean;
+        data: Buffer;
+        codec: string | null;
+        sampleRate: number | null;
+        microseconds: number | null;
+        videoType?: "H264" | "H265";
+    }, void, unknown>>;
+    /**
+     * Unsubscribe a diagnostic session.
+     */
+    unsubscribeDiagnostic(id: string): void;
+    /**
+     * Returns detected audio metadata (available after first audio frame).
+     */
+    getAudioInfo(): {
+        codec: "aac-adts";
+        sampleRate: number;
+        channels: number;
+        configHex: string;
+    } | null;
 }
 
 /**
@@ -3926,6 +3983,8 @@ declare function captureModelFixtures(params: {
     outDir: string;
     /** Logger (defaults to console) */
     log?: (...args: unknown[]) => void;
+    /** Skip the stream combination test (useful for NVR channels where the test should be done separately per-camera) */
+    skipStreamCombinationTest?: boolean;
 }): Promise<ModelFixtureCaptureResult>;
 
 /**
@@ -7610,7 +7669,7 @@ declare function packetizeAacRawFrame(raw: Buffer, rtp: RtpWriter): {
     packets: Buffer[];
 };
 interface Rfc4571Client {
-    socket: net.Socket;
+    socket: net__default.Socket;
     needsKeyframe: boolean;
     sentVideoConfig: boolean;
 }
@@ -7637,7 +7696,7 @@ declare class Rfc4571Muxer {
     private cachedH264ParamSetsAnnexB;
     private cachedH265ParamSetsAnnexB;
     constructor(logger: Console, videoPayloadType: number, audioPayloadType: number | undefined, videoFpsFallback?: number, maxRtpPayload?: number);
-    addClient(socket: net.Socket): void;
+    addClient(socket: net__default.Socket): void;
     private static readonly ANNEXB_START_CODE;
     private static joinAnnexBNals;
     private updateVideoParamSetsFromAccessUnit;
@@ -7759,7 +7818,7 @@ interface Rfc4571TcpServer {
     };
     username: string;
     password: string;
-    server: net.Server;
+    server: net__default.Server;
     videoStream: BaichuanVideoStream | CompositeStream;
     close: (reason?: unknown) => Promise<void>;
 }
@@ -7815,7 +7874,7 @@ interface Rfc4571ReplayServer {
     };
     username: string;
     password: string;
-    server: net.Server;
+    server: net__default.Server;
     videoStream: BaichuanVideoStream;
     /** Called when replay naturally ends (all data sent). */
     onReplayEnd?: () => void;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'node:events';
 import http from 'node:http';
-import net from 'node:net';
+import * as net from 'node:net';
+import { default as net_2 } from 'node:net';
 import { Readable } from 'node:stream';
 
 export declare function abilitiesHasAny(abilities: AbilityInfo | undefined, re: RegExp): boolean;
@@ -1269,8 +1270,8 @@ export declare type BaichuanRecordSchedule = {
  *
  * Lifecycle:
  * - Server starts immediately (ffmpeg RTSP server)
- * - Native stream starts only when first client connects
- * - Native stream stops when last client disconnects
+ * - Native stream starts when clients need media
+ * - Native stream may stay running with zero RTSP clients if nativeStreamIdleStopMs is 0
  */
 export declare class BaichuanRtspServer extends EventEmitter<{
     client: [string];
@@ -1291,6 +1292,7 @@ export declare class BaichuanRtspServer extends EventEmitter<{
     private flow;
     private deviceId;
     private dedicatedSessionRelease;
+    private externalListener;
     private authCredentials;
     private requireAuth;
     private authNonces;
@@ -1315,6 +1317,10 @@ export declare class BaichuanRtspServer extends EventEmitter<{
     private tempStreamGenerator;
     private nativeFanout;
     private noClientAutoStopTimer;
+    /** After last RTSP client; 0 = never auto-stop native stream. */
+    private readonly nativeStreamIdleStopMs;
+    /** Primed-but-no-PLAY timeout; 0 = disabled. */
+    private readonly nativeStreamPrimeIdleStopMs;
     private readonly PREBUFFER_MAX_MS;
     private prebuffer;
     private static isAdtsAacFrame;
@@ -1355,6 +1361,13 @@ export declare class BaichuanRtspServer extends EventEmitter<{
      * Start the RTSP server.
      */
     start(): Promise<void>;
+    /**
+     * 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: net.Socket, initialBuffer?: Buffer): void;
     /**
      * Handle RTSP connection from a client.
      */
@@ -1407,6 +1420,33 @@ export declare class BaichuanRtspServer extends EventEmitter<{
      * Get number of connected clients.
      */
     getClientCount(): number;
+    /**
+     * 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.
+     */
+    subscribeDiagnostic(id: string): Promise<AsyncGenerator<{
+        audio: boolean;
+        data: Buffer;
+        codec: string | null;
+        sampleRate: number | null;
+        microseconds: number | null;
+        videoType?: "H264" | "H265";
+    }, void, unknown>>;
+    /**
+     * Unsubscribe a diagnostic session.
+     */
+    unsubscribeDiagnostic(id: string): void;
+    /**
+     * Returns detected audio metadata (available after first audio frame).
+     */
+    getAudioInfo(): {
+        codec: "aac-adts";
+        sampleRate: number;
+        channels: number;
+        configHex: string;
+    } | null;
 }
 
 export declare interface BaichuanRtspServerOptions {
@@ -1441,6 +1481,23 @@ export declare interface BaichuanRtspServerOptions {
      * isolating it from other streams on the shared socket (avoids streamType mismatch).
      */
     deviceId?: string;
+    /**
+     * When true, the server does NOT create its own net.Server.
+     * Connections are accepted externally via acceptConnection().
+     * start() still performs metadata fetch and codec detection.
+     */
+    externalListener?: boolean;
+    /**
+     * Ms after the last RTSP client disconnects before stopping the native Baichuan stream.
+     * 0 = keep the native stream running (matches rtsp proxy idle timeout 0 / always-mounted sources).
+     * Default 30000.
+     */
+    nativeStreamIdleStopMs?: number;
+    /**
+     * If the native stream is primed (e.g. DESCRIBE) but no client SETUP/PLAYs, stop after this many ms.
+     * 0 = disable. Default 15000 when nativeStreamIdleStopMs > 0, else 0.
+     */
+    nativeStreamPrimeIdleStopMs?: number;
 }
 
 export declare type BaichuanSerialPush = {
@@ -2520,6 +2577,8 @@ export declare function captureModelFixtures(params: {
     outDir: string;
     /** Logger (defaults to console) */
     log?: (...args: unknown[]) => void;
+    /** Skip the stream combination test (useful for NVR channels where the test should be done separately per-camera) */
+    skipStreamCombinationTest?: boolean;
 }): Promise<ModelFixtureCaptureResult>;
 
 export declare type CgiAbility = {
@@ -8409,7 +8468,7 @@ export declare interface Rfc4571ApiFactoryContext {
 }
 
 export declare interface Rfc4571Client {
-    socket: net.Socket;
+    socket: net_2.Socket;
     needsKeyframe: boolean;
     sentVideoConfig: boolean;
 }
@@ -8437,7 +8496,7 @@ export declare class Rfc4571Muxer {
     private cachedH264ParamSetsAnnexB;
     private cachedH265ParamSetsAnnexB;
     constructor(logger: Console, videoPayloadType: number, audioPayloadType: number | undefined, videoFpsFallback?: number, maxRtpPayload?: number);
-    addClient(socket: net.Socket): void;
+    addClient(socket: net_2.Socket): void;
     private static readonly ANNEXB_START_CODE;
     private static joinAnnexBNals;
     private updateVideoParamSetsFromAccessUnit;
@@ -8477,7 +8536,7 @@ export declare interface Rfc4571ReplayServer {
     };
     username: string;
     password: string;
-    server: net.Server;
+    server: net_2.Server;
     videoStream: BaichuanVideoStream;
     /** Called when replay naturally ends (all data sent). */
     onReplayEnd?: () => void;
@@ -8536,7 +8595,7 @@ export declare interface Rfc4571TcpServer {
     };
     username: string;
     password: string;
-    server: net.Server;
+    server: net_2.Server;
     videoStream: BaichuanVideoStream | CompositeStream;
     close: (reason?: unknown) => Promise<void>;
 }

package/dist/index.js

@@ -43,7 +43,7 @@ import {
   parseSupportXml,
   setGlobalLogger,
   xmlIndicatesFloodlight
-} from "./chunk-SDRNJQ5U.js";
+} from "./chunk-UHFJPQA4.js";
 import {
   AesStreamDecryptor,
   BC_AES_IV,
@@ -223,7 +223,7 @@ import {
   testChannelStreams,
   xmlEscape,
   zipDirectory
-} from "./chunk-DUHWTZ7U.js";
+} from "./chunk-DEOMUWBN.js";
 
 // src/reolink/baichuan/HlsSessionManager.ts
 var withTimeout = async (p, ms, label) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apocaliss92/nodelink-js",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "TypeScript library implementing Reolink Baichuan protocol (control + streaming) with CGI and RTSP helpers. Full TypeScript support with comprehensive type definitions.",
   "license": "MIT",
   "author": "",