@apocaliss92/nodelink-js 0.4.5 → 0.4.6

package/dist/cli/rtsp-server.js

@@ -3,10 +3,10 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-WDFKIHM5.js";
+} from "../chunk-F2Y5U3YP.js";
 import {
   __require
-} from "../chunk-DEOMUWBN.js";
+} from "../chunk-TR3V5FTO.js";
 
 // src/cli/rtsp-server.ts
 function parseArgs() {

package/dist/index.cjs

@@ -2178,6 +2178,19 @@ var init_BaichuanVideoStream = __esm({
       // Stateful AES decryptor for fragmented BcMedia packets (full_aes mode)
       // In CFB mode, continuation frames must use the cipher state from previous frames.
       aesStreamDecryptor = null;
+      /**
+       * 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.
+       */
+      _pendingStartupError;
+      /** Consume and clear any pending startup error. */
+      consumePendingStartupError() {
+        const err = this._pendingStartupError;
+        this._pendingStartupError = void 0;
+        return err;
+      }
       emitSafeError(err) {
         if (!this.active) {
           this.logger?.warn?.(
@@ -2189,6 +2202,7 @@ var init_BaichuanVideoStream = __esm({
           this.logger?.warn?.(
             `[BaichuanVideoStream] Unhandled stream error: ${err.message}`
           );
+          this._pendingStartupError = err;
           return;
         }
         this.emit("error", err);
@@ -8527,6 +8541,9 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
   resendTimer;
   hbTimer;
   discoveryTid;
+  // Track discovery-phase timers so close() can cancel them even if
+  // discovery is still in progress (prevents ERR_SOCKET_DGRAM_NOT_RUNNING).
+  discoveryTimers = [];
   acceptSent = false;
   lastAcceptAtMs;
   ackScheduled = false;
@@ -8575,9 +8592,31 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     });
     sock.on("error", (e) => this.emit("error", e));
     sock.on("close", () => this.emit("close"));
-    await new Promise(
-      (resolve) => sock.bind(0, "0.0.0.0", () => resolve())
-    );
+    const portRange = Array.from({ length: 500 }, (_, i) => 53500 + i);
+    for (let i = portRange.length - 1; i > 0; i--) {
+      const j = Math.floor(Math.random() * (i + 1));
+      [portRange[i], portRange[j]] = [portRange[j], portRange[i]];
+    }
+    let bound = false;
+    for (const port of portRange) {
+      try {
+        await new Promise((resolve, reject) => {
+          sock.once("error", reject);
+          sock.bind(port, "0.0.0.0", () => {
+            sock.removeListener("error", reject);
+            resolve();
+          });
+        });
+        bound = true;
+        break;
+      } catch {
+      }
+    }
+    if (!bound) {
+      await new Promise(
+        (resolve) => sock.bind(0, "0.0.0.0", () => resolve())
+      );
+    }
     if (this.opts.mode === "direct") {
       this.remote = { host: this.opts.host, port: this.opts.port };
       this.clientId = this.opts.clientId;
@@ -8997,7 +9036,24 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
       BCUDP_DISCOVERY_PORT_LOCAL_ANY,
       BCUDP_DISCOVERY_PORT_LOCAL_UID
     ];
-    const broadcastHost = "255.255.255.255";
+    const broadcastHosts = ["255.255.255.255"];
+    const ifaces = (0, import_node_os.networkInterfaces)();
+    for (const name of Object.keys(ifaces)) {
+      const entries = ifaces[name];
+      if (!entries) continue;
+      for (const addr2 of entries) {
+        if (addr2.family === "IPv4" && !addr2.internal && addr2.cidr) {
+          const ipParts = addr2.address.split(".").map(Number);
+          const maskParts = addr2.netmask.split(".").map(Number);
+          if (ipParts.length === 4 && maskParts.length === 4) {
+            const bcast = ipParts.map((octet, i) => octet | ~maskParts[i] & 255).join(".");
+            if (!broadcastHosts.includes(bcast)) {
+              broadcastHosts.push(bcast);
+            }
+          }
+        }
+      }
+    }
     const directHost = (this.opts.directHost ?? "").trim();
     const localMode = opts?.localMode ?? "local-broadcast";
     const directFirstWindowMs = localMode === "local-direct" && directHost ? 3e3 : 0;
@@ -9024,6 +9080,7 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
           )
         );
       }, discoveryTimeout);
+      this.discoveryTimers.push(timeout);
       let retryTimer;
       let retryCount = 0;
       let discoveredSid;
@@ -9200,11 +9257,11 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
             if (directHost) {
               if (directFirstWindowMs > 0 && elapsedMs < directFirstWindowMs)
                 return [directHost];
-              return [directHost, broadcastHost];
+              return [directHost, ...broadcastHosts];
             }
-            return [broadcastHost];
+            return broadcastHosts;
           }
-          return [broadcastHost];
+          return broadcastHosts;
         })();
         for (const host of Array.from(new Set(hosts))) {
           for (const port of ports) {
@@ -9212,8 +9269,7 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
               sock.send(packet, port, host);
               retryCount++;
               this.emit("debug", "discovery_send", { retryCount, host, port });
-            } catch (e) {
-              this.emit("error", e instanceof Error ? e : new Error(String(e)));
+            } catch {
             }
           }
         }
@@ -9222,6 +9278,7 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
       retryTimer = (0, import_node_timers.setInterval)(() => {
         sendDiscovery();
       }, retryInterval);
+      this.discoveryTimers.push(retryTimer);
     });
     this.clientId = reply.cid;
     this.cameraId = reply.did;
@@ -9538,6 +9595,10 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     this.ackTimer = void 0;
     this.resendTimer = void 0;
     this.hbTimer = void 0;
+    for (const t of this.discoveryTimers) {
+      clearInterval(t);
+    }
+    this.discoveryTimers = [];
     const s = this.sock;
     this.sock = void 0;
     if (!s) return;
@@ -18654,6 +18715,20 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
     const prefix = basename.substring(0, 10).toUpperCase();
     return prefix.includes("S") ? "subStream" : "mainStream";
   }
+  /**
+   * 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.
+   */
+  _rejectedStreamProfiles = /* @__PURE__ */ new Set();
+  /**
+   * Check whether a stream profile was rejected by the device at runtime
+   * (e.g. ext returned response_code 400).
+   */
+  isStreamProfileRejected(channel, profile) {
+    return this._rejectedStreamProfiles.has(`${channel}:${profile}`);
+  }
   /**
    * Cache for buildVideoStreamOptions.
    *
@@ -23778,6 +23853,16 @@ ${stderr}`)
         }
         if (!frame) frame = await targetClient.sendFrame(baseParams);
         if (frame.header.responseCode !== 200) {
+          if (frame.header.responseCode === 400) {
+            const rejKey = `${ch}:${profile}`;
+            if (!this._rejectedStreamProfiles.has(rejKey)) {
+              this._rejectedStreamProfiles.add(rejKey);
+              this.videoStreamOptionsCache.clear();
+              this.logger?.warn?.(
+                `[ReolinkBaichuanApi] Stream profile rejected by device: channel=${ch} profile=${profile} (response_code 400). This profile will be excluded from available streams. The camera may not support this stream profile with the current firmware.`
+              );
+            }
+          }
           throw new Error(
             `Video stream request rejected (response_code ${frame.header.responseCode}). Expected response_code 200, camera returned ${frame.header.responseCode}`
           );
@@ -25799,6 +25884,8 @@ ${xml}`
       for (const metadata of params.metadatas) {
         const profile = metadata.profile;
         if (isMultiFocal && profile === "ext") continue;
+        if (this._rejectedStreamProfiles.has(`${params.channel}:${profile}`))
+          continue;
         if (params.includeRtsp && profile !== "ext") {
           const streamName = profile === "main" ? "main" : "sub";
           pushRtsp({
@@ -32289,6 +32376,11 @@ async function createRfc4571TcpServerInternal(options) {
           "videoAccessUnit",
           onAu
         );
+        const pendingErr = videoStream.consumePendingStartupError?.();
+        if (pendingErr) {
+          cleanup();
+          reject(pendingErr);
+        }
       });
     }
   };
@@ -32300,24 +32392,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 {
         }
       }
     }
@@ -32573,7 +32673,7 @@ async function createRfc4571TcpServerInternal(options) {
       } catch {
       }
     }
-    if (closeApiOnTeardown) {
+    if (closeApiOnTeardown && !dedicatedSession) {
       await Promise.allSettled(
         Array.from(apisToClose).map(async (a) => {
           try {