@apocaliss92/nodelink-js 0.4.4 → 0.4.6

package/dist/index.d.cts

@@ -1009,11 +1009,13 @@ interface ReolinkDayNightNotification {
     timestamp?: number;
 }
 type ReolinkEvent = ReolinkMotionNotification | ReolinkAiNotification | ReolinkVisitorNotification | ReolinkDayNightNotification;
-type ReolinkSimpleEventType = "motion" | "doorbell" | "people" | "vehicle" | "animal" | "face" | "package" | "daynight" | "sleeping" | "awake" | "online" | "offline" | "other";
+type ReolinkSimpleEventType = "motion" | "doorbell" | "people" | "vehicle" | "animal" | "face" | "package" | "daynight" | "sleeping" | "awake" | "online" | "offline" | "battery" | "other";
 interface ReolinkSimpleEvent {
     type: ReolinkSimpleEventType;
     channel: number;
     timestamp: number;
+    /** Present when type === "battery" — pushed by the camera via cmdId 252. */
+    battery?: Partial<BatteryInfo>;
 }
 interface TwoWayAudioConfig {
     channel: number;
@@ -1935,6 +1937,11 @@ declare class BaichuanClient extends EventEmitter<{
     debug: [string, unknown?];
     event: [ReolinkEvent];
     channelInfo: [string];
+    batteryPush: [BaichuanFrame];
+    d2c_disc: [{
+        host: string;
+        atMs: number;
+    }];
 }> {
     /**
      * Process-wide streaming activity registry.
@@ -1946,6 +1953,14 @@ declare class BaichuanClient extends EventEmitter<{
      *   even if the current client instance is idle/disconnected.
      */
     private static readonly streamingRegistry;
+    /**
+     * Per-host D2C_DISC backoff state that persists across client instance recreation.
+     *
+     * Why: when a D2C_DISC kills a client, the socket pool destroys the old instance
+     * and creates a new one. Instance-level backoff variables would reset to zero,
+     * allowing immediate reconnection and perpetuating the storm.
+     */
+    private static readonly d2cDiscBackoff;
     /**
      * Global (process-wide) CoverPreview serialization.
      *
@@ -2419,6 +2434,7 @@ declare class BcUdpStream extends EventEmitter<{
     private resendTimer;
     private hbTimer;
     private discoveryTid;
+    private discoveryTimers;
     private acceptSent;
     private lastAcceptAtMs;
     private ackScheduled;
@@ -3640,6 +3656,15 @@ declare class BaichuanVideoStream extends EventEmitter<{
     private lastPpsH265;
     private lastPrependedParamSetsH265;
     private aesStreamDecryptor;
+    /**
+     * Pending startup error stashed when emitSafeError is called before any
+     * "error" listener is registered (e.g. camera returns 400 during start()).
+     * The rfc4571-server's waitForKeyframe can consume this immediately instead
+     * of waiting for the full keyframe timeout.
+     */
+    private _pendingStartupError;
+    /** Consume and clear any pending startup error. */
+    consumePendingStartupError(): Error | undefined;
     private emitSafeError;
     private lastMediaAtMs;
     private watchdogTimer;
@@ -4338,6 +4363,19 @@ declare class ReolinkBaichuanApi {
     private readonly aiAlarmCandidateTypesCache;
     private rtspServers;
     private readonly activeVideoMsgNums;
+    /** Timestamp of the most recent D2C_DISC from any client for this device. */
+    private lastD2cDiscAtMs;
+    /** Sliding window of recent D2C_DISC timestamps for storm detection. */
+    private readonly d2cDiscTimestamps;
+    /** Immediate cooldown (ms) applied to socket pool on every D2C_DISC.
+     *  Prevents reconnect attempts while the camera is transitioning to sleep. */
+    private static readonly D2C_DISC_IMMEDIATE_COOLDOWN_MS;
+    /** Number of D2C_DISCs within the storm window to trigger extended cooldown. */
+    private static readonly D2C_DISC_STORM_THRESHOLD;
+    /** Sliding window size (ms) for storm detection. */
+    private static readonly D2C_DISC_STORM_WINDOW_MS;
+    /** Extended cooldown (ms) applied to socket pool when a D2C_DISC storm is detected. */
+    private static readonly D2C_DISC_STORM_COOLDOWN_MS;
     private readonly nvrChannelsSummaryCache;
     /**
      * Cached device capabilities per channel.
@@ -4477,6 +4515,18 @@ declare class ReolinkBaichuanApi {
      * which indicates subStream (e.g., RecS03_, RecS_).
      */
     private determineStreamTypeFromFileName;
+    /**
+     * Stream profiles that the device explicitly rejected (response_code 400).
+     * Keyed by `"ch:profile"` (e.g. `"0:ext"`). Once a profile is in this set
+     * it is excluded from `buildVideoStreamOptions()` results and no further
+     * start attempts are made until the API instance is recreated.
+     */
+    private readonly _rejectedStreamProfiles;
+    /**
+     * Check whether a stream profile was rejected by the device at runtime
+     * (e.g. ext returned response_code 400).
+     */
+    isStreamProfileRejected(channel: number, profile: StreamProfile): boolean;
     /**
      * Cache for buildVideoStreamOptions.
      *
@@ -4512,6 +4562,12 @@ declare class ReolinkBaichuanApi {
      * @returns The socket pool tag to use
      */
     private resolveSocketTag;
+    /**
+     * Attach a D2C_DISC listener to a BaichuanClient so that the API-level
+     * grace period and storm detection are updated regardless of which
+     * pool socket receives the disconnect.
+     */
+    private attachD2cDiscListener;
     /**
      * Acquire a socket from the pool by tag.
      * Creates a new socket if needed, or reuses an existing one.
@@ -5657,6 +5713,15 @@ declare class ReolinkBaichuanApi {
     zoomToFactor(zoomFactor: number, channel?: number): Promise<void>;
     zoomToFactor(channel: number, zoomFactor: number): Promise<void>;
     private parseBatteryInfoXml;
+    /**
+     * Called when any BaichuanClient for this device receives a D2C_DISC.
+     *
+     * Two-tier response:
+     *  1. **Immediate**: every D2C_DISC applies a short socket pool cooldown
+     *     (10 s) to prevent reconnect attempts while the camera transitions to sleep.
+     *  2. **Storm**: ≥3 D2C_DISCs within 60 s triggers extended cooldown (120 s).
+     */
+    private notifyD2cDisc;
     /**
      * Best-effort sleeping inference for battery/BCUDP cameras.
      *

package/dist/index.d.ts

@@ -396,6 +396,11 @@ export declare class BaichuanClient extends EventEmitter<{
     debug: [string, unknown?];
     event: [ReolinkEvent];
     channelInfo: [string];
+    batteryPush: [BaichuanFrame];
+    d2c_disc: [{
+        host: string;
+        atMs: number;
+    }];
 }> {
     /**
      * Process-wide streaming activity registry.
@@ -407,6 +412,14 @@ export declare class BaichuanClient extends EventEmitter<{
      *   even if the current client instance is idle/disconnected.
      */
     private static readonly streamingRegistry;
+    /**
+     * Per-host D2C_DISC backoff state that persists across client instance recreation.
+     *
+     * Why: when a D2C_DISC kills a client, the socket pool destroys the old instance
+     * and creates a new one. Instance-level backoff variables would reset to zero,
+     * allowing immediate reconnection and perpetuating the storm.
+     */
+    private static readonly d2cDiscBackoff;
     /**
      * Global (process-wide) CoverPreview serialization.
      *
@@ -1634,6 +1647,15 @@ export declare class BaichuanVideoStream extends EventEmitter<{
     private lastPpsH265;
     private lastPrependedParamSetsH265;
     private aesStreamDecryptor;
+    /**
+     * Pending startup error stashed when emitSafeError is called before any
+     * "error" listener is registered (e.g. camera returns 400 during start()).
+     * The rfc4571-server's waitForKeyframe can consume this immediately instead
+     * of waiting for the full keyframe timeout.
+     */
+    private _pendingStartupError;
+    /** Consume and clear any pending startup error. */
+    consumePendingStartupError(): Error | undefined;
     private emitSafeError;
     private lastMediaAtMs;
     private watchdogTimer;
@@ -2324,6 +2346,7 @@ export declare class BcUdpStream extends EventEmitter<{
     private resendTimer;
     private hbTimer;
     private discoveryTid;
+    private discoveryTimers;
     private acceptSent;
     private lastAcceptAtMs;
     private ackScheduled;
@@ -5183,6 +5206,19 @@ export declare class ReolinkBaichuanApi {
     private readonly aiAlarmCandidateTypesCache;
     private rtspServers;
     private readonly activeVideoMsgNums;
+    /** Timestamp of the most recent D2C_DISC from any client for this device. */
+    private lastD2cDiscAtMs;
+    /** Sliding window of recent D2C_DISC timestamps for storm detection. */
+    private readonly d2cDiscTimestamps;
+    /** Immediate cooldown (ms) applied to socket pool on every D2C_DISC.
+     *  Prevents reconnect attempts while the camera is transitioning to sleep. */
+    private static readonly D2C_DISC_IMMEDIATE_COOLDOWN_MS;
+    /** Number of D2C_DISCs within the storm window to trigger extended cooldown. */
+    private static readonly D2C_DISC_STORM_THRESHOLD;
+    /** Sliding window size (ms) for storm detection. */
+    private static readonly D2C_DISC_STORM_WINDOW_MS;
+    /** Extended cooldown (ms) applied to socket pool when a D2C_DISC storm is detected. */
+    private static readonly D2C_DISC_STORM_COOLDOWN_MS;
     private readonly nvrChannelsSummaryCache;
     /**
      * Cached device capabilities per channel.
@@ -5322,6 +5358,18 @@ export declare class ReolinkBaichuanApi {
      * which indicates subStream (e.g., RecS03_, RecS_).
      */
     private determineStreamTypeFromFileName;
+    /**
+     * Stream profiles that the device explicitly rejected (response_code 400).
+     * Keyed by `"ch:profile"` (e.g. `"0:ext"`). Once a profile is in this set
+     * it is excluded from `buildVideoStreamOptions()` results and no further
+     * start attempts are made until the API instance is recreated.
+     */
+    private readonly _rejectedStreamProfiles;
+    /**
+     * Check whether a stream profile was rejected by the device at runtime
+     * (e.g. ext returned response_code 400).
+     */
+    isStreamProfileRejected(channel: number, profile: StreamProfile): boolean;
     /**
      * Cache for buildVideoStreamOptions.
      *
@@ -5357,6 +5405,12 @@ export declare class ReolinkBaichuanApi {
      * @returns The socket pool tag to use
      */
     private resolveSocketTag;
+    /**
+     * Attach a D2C_DISC listener to a BaichuanClient so that the API-level
+     * grace period and storm detection are updated regardless of which
+     * pool socket receives the disconnect.
+     */
+    private attachD2cDiscListener;
     /**
      * Acquire a socket from the pool by tag.
      * Creates a new socket if needed, or reuses an existing one.
@@ -6502,6 +6556,15 @@ export declare class ReolinkBaichuanApi {
     zoomToFactor(zoomFactor: number, channel?: number): Promise<void>;
     zoomToFactor(channel: number, zoomFactor: number): Promise<void>;
     private parseBatteryInfoXml;
+    /**
+     * Called when any BaichuanClient for this device receives a D2C_DISC.
+     *
+     * Two-tier response:
+     *  1. **Immediate**: every D2C_DISC applies a short socket pool cooldown
+     *     (10 s) to prevent reconnect attempts while the camera transitions to sleep.
+     *  2. **Storm**: ≥3 D2C_DISCs within 60 s triggers extended cooldown (120 s).
+     */
+    private notifyD2cDisc;
     /**
      * Best-effort sleeping inference for battery/BCUDP cameras.
      *
@@ -8361,9 +8424,11 @@ export declare interface ReolinkSimpleEvent {
     type: ReolinkSimpleEventType;
     channel: number;
     timestamp: number;
+    /** Present when type === "battery" — pushed by the camera via cmdId 252. */
+    battery?: Partial<BatteryInfo>;
 }
 
-export declare type ReolinkSimpleEventType = "motion" | "doorbell" | "people" | "vehicle" | "animal" | "face" | "package" | "daynight" | "sleeping" | "awake" | "online" | "offline" | "other";
+export declare type ReolinkSimpleEventType = "motion" | "doorbell" | "people" | "vehicle" | "animal" | "face" | "package" | "daynight" | "sleeping" | "awake" | "online" | "offline" | "battery" | "other";
 
 /**
  * Complete media stream options with all available metadata.

package/dist/index.js

@@ -43,7 +43,7 @@ import {
   parseSupportXml,
   setGlobalLogger,
   xmlIndicatesFloodlight
-} from "./chunk-UHFJPQA4.js";
+} from "./chunk-F2Y5U3YP.js";
 import {
   AesStreamDecryptor,
   BC_AES_IV,
@@ -223,7 +223,7 @@ import {
   testChannelStreams,
   xmlEscape,
   zipDirectory
-} from "./chunk-DEOMUWBN.js";
+} from "./chunk-TR3V5FTO.js";
 
 // src/reolink/baichuan/HlsSessionManager.ts
 var withTimeout = async (p, ms, label) => {
@@ -3466,6 +3466,11 @@ async function createRfc4571TcpServerInternal(options) {
           "videoAccessUnit",
           onAu
         );
+        const pendingErr = videoStream.consumePendingStartupError?.();
+        if (pendingErr) {
+          cleanup();
+          reject(pendingErr);
+        }
       });
     }
   };
@@ -3477,24 +3482,32 @@ async function createRfc4571TcpServerInternal(options) {
       await videoStream.stop();
     } catch {
     }
-    if (closeApiOnTeardown) {
-      await Promise.allSettled(
-        Array.from(apisToClose).map(async (a) => {
+    if (dedicatedSession) {
+      try {
+        await dedicatedSession.release();
+      } catch {
+      }
+    }
+    if (!dedicatedSession) {
+      if (closeApiOnTeardown) {
+        await Promise.allSettled(
+          Array.from(apisToClose).map(async (a) => {
+            try {
+              await a.close();
+            } catch {
+            }
+          })
+        );
+      } else {
+        const graceMs = isComposite ? 5e3 : 0;
+        for (const a of Array.from(apisToClose)) {
           try {
-            await a.close();
+            a?.client?.requestIdleDisconnectSoon?.(
+              "rfc4571_teardown",
+              graceMs
+            );
           } catch {
           }
-        })
-      );
-    } else {
-      const graceMs = isComposite ? 5e3 : 0;
-      for (const a of Array.from(apisToClose)) {
-        try {
-          a?.client?.requestIdleDisconnectSoon?.(
-            "rfc4571_teardown",
-            graceMs
-          );
-        } catch {
         }
       }
     }
@@ -3750,7 +3763,7 @@ async function createRfc4571TcpServerInternal(options) {
       } catch {
       }
     }
-    if (closeApiOnTeardown) {
+    if (closeApiOnTeardown && !dedicatedSession) {
       await Promise.allSettled(
         Array.from(apisToClose).map(async (a) => {
           try {