@apocaliss92/nodelink-js 0.4.5 → 0.4.7

package/dist/{DiagnosticsTools-55PR4WFD.js → DiagnosticsTools-UMN4C7SY.js}

@@ -12,7 +12,7 @@ import {
   sampleStreams,
   sanitizeFixtureData,
   testChannelStreams
-} from "./chunk-DEOMUWBN.js";
+} from "./chunk-TR3V5FTO.js";
 export {
   captureModelFixtures,
   collectCgiDiagnostics,
@@ -28,4 +28,4 @@ export {
   sanitizeFixtureData,
   testChannelStreams
 };
-//# sourceMappingURL=DiagnosticsTools-55PR4WFD.js.map
+//# sourceMappingURL=DiagnosticsTools-UMN4C7SY.js.map

package/dist/{chunk-WDFKIHM5.js → chunk-GKLOJJ34.js}

@@ -144,7 +144,7 @@ import {
   talkTraceLog,
   traceLog,
   xmlEscape
-} from "./chunk-DEOMUWBN.js";
+} from "./chunk-TR3V5FTO.js";
 
 // src/protocol/framing.ts
 function encodeHeader(h) {
@@ -654,6 +654,9 @@ var BcUdpStream = class extends 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;
@@ -702,9 +705,31 @@ var BcUdpStream = class extends 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;
@@ -1124,7 +1149,24 @@ var BcUdpStream = class extends 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 = 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;
@@ -1151,6 +1193,7 @@ var BcUdpStream = class extends EventEmitter {
           )
         );
       }, discoveryTimeout);
+      this.discoveryTimers.push(timeout);
       let retryTimer;
       let retryCount = 0;
       let discoveredSid;
@@ -1327,11 +1370,11 @@ var BcUdpStream = class extends 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) {
@@ -1339,8 +1382,7 @@ var BcUdpStream = class extends 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 {
             }
           }
         }
@@ -1349,6 +1391,7 @@ var BcUdpStream = class extends EventEmitter {
       retryTimer = setIntervalNode(() => {
         sendDiscovery();
       }, retryInterval);
+      this.discoveryTimers.push(retryTimer);
     });
     this.clientId = reply.cid;
     this.cameraId = reply.did;
@@ -1665,6 +1708,10 @@ var BcUdpStream = class extends 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;
@@ -10083,6 +10130,13 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * - "replay:XXX" - dedicated per replay session
    */
   socketPool = /* @__PURE__ */ new Map();
+  /**
+   * Consecutive stream-start (cmdId=3) timeout counter per socket tag.
+   * When a streaming socket has N consecutive timeouts, the socket is force-closed
+   * so the next attempt creates a fresh connection. Resets on success.
+   */
+  consecutiveStreamTimeouts = /* @__PURE__ */ new Map();
+  static MAX_CONSECUTIVE_STREAM_TIMEOUTS = 3;
   /** BaichuanClientOptions to use when creating new sockets */
   clientOptions;
   /**
@@ -10237,14 +10291,20 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
         if (!xml) return;
         const channel = frame.header.channelId;
         const battery = this.parseBatteryInfoXml(xml, channel);
-        if (battery.batteryPercent !== void 0 || battery.chargeStatus !== void 0 || battery.adapterStatus !== void 0) {
-          this.dispatchSimpleEvent({
-            type: "battery",
-            channel,
-            timestamp: Date.now(),
-            battery
-          });
+        if (battery.batteryPercent === void 0 && battery.chargeStatus === void 0 && battery.adapterStatus === void 0) {
+          return;
         }
+        const key = `${battery.batteryPercent ?? ""}|${battery.chargeStatus ?? ""}|${battery.adapterStatus ?? ""}`;
+        if (this.lastBatteryPushKey.get(channel) === key) {
+          return;
+        }
+        this.lastBatteryPushKey.set(channel, key);
+        this.dispatchSimpleEvent({
+          type: "battery",
+          channel,
+          timestamp: Date.now(),
+          battery
+        });
       } catch (e) {
         this.logger.debug?.(
           "[ReolinkBaichuanApi] Error parsing battery push",
@@ -10410,6 +10470,14 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   deviceCapabilitiesCache = /* @__PURE__ */ new Map();
   static CAPABILITIES_CACHE_TTL_MS = 5 * 60 * 1e3;
   // 5 minutes
+  /**
+   * Dedupe key for battery push events (cmd_id 252), per channel.
+   * Cameras emit BatteryInfoList frequently while streaming (every few
+   * seconds). We only forward an event when the meaningful fields change
+   * (percent, chargeStatus, adapterStatus) to avoid flooding SSE/MQTT
+   * consumers and the UI event log.
+   */
+  lastBatteryPushKey = /* @__PURE__ */ new Map();
   // ─────────────────────────────────────────────────────────────────────────────
   // SOCKET POOL CONSTANTS
   // ─────────────────────────────────────────────────────────────────────────────
@@ -10726,6 +10794,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.
    *
@@ -15850,6 +15932,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}`
           );
@@ -15858,6 +15950,7 @@ ${stderr}`)
           `${ch}:${profile}:${variant}`,
           frame.header.msgNum
         );
+        this.resetStreamTimeoutCounter(targetClient);
         return;
       } catch (error) {
         lastError = error;
@@ -15872,6 +15965,10 @@ ${stderr}`)
         }
       }
     }
+    const isTimeout = lastError instanceof Error && lastError.message?.includes("timeout");
+    if (isTimeout) {
+      this.trackStreamTimeout(targetClient);
+    }
     throw lastError instanceof Error ? lastError : new Error(String(lastError));
   }
   /**
@@ -16331,6 +16428,18 @@ ${stderr}`)
   notifyD2cDisc() {
     const now = Date.now();
     this.lastD2cDiscAtMs = now;
+    const streamingTags = Array.from(this.socketPool.keys()).filter(
+      (tag) => tag.startsWith("streaming:")
+    );
+    if (streamingTags.length > 0) {
+      this.logger?.log?.(
+        `[D2C_DISC] Force-closing ${streamingTags.length} streaming socket(s): ${streamingTags.join(", ")}`
+      );
+      for (const tag of streamingTags) {
+        this.forceClosePooledSocket(tag, this.logger).catch(() => {
+        });
+      }
+    }
     const immediateCooldownUntil = now + _ReolinkBaichuanApi.D2C_DISC_IMMEDIATE_COOLDOWN_MS;
     const existing = this.socketPoolCooldowns.get(this.host);
     if (!existing || existing.cooldownUntil < immediateCooldownUntil) {
@@ -16363,6 +16472,43 @@ ${stderr}`)
       }
     }
   }
+  /**
+   * Find the socket pool tag for a given BaichuanClient instance.
+   * Returns undefined if the client is not in the pool (e.g. it's the general socket used directly).
+   */
+  findSocketTagForClient(client) {
+    for (const [tag, entry] of this.socketPool) {
+      if (entry.client === client) return tag;
+    }
+    return void 0;
+  }
+  /**
+   * Reset the consecutive stream-start timeout counter for a streaming socket.
+   * Called on successful stream start.
+   */
+  resetStreamTimeoutCounter(client) {
+    const tag = this.findSocketTagForClient(client);
+    if (tag) this.consecutiveStreamTimeouts.delete(tag);
+  }
+  /**
+   * Track a stream-start timeout on a streaming socket.
+   * After MAX_CONSECUTIVE_STREAM_TIMEOUTS consecutive timeouts, force-close the
+   * socket so the next attempt creates a fresh connection.
+   */
+  trackStreamTimeout(client) {
+    const tag = this.findSocketTagForClient(client);
+    if (!tag || !tag.startsWith("streaming:")) return;
+    const count = (this.consecutiveStreamTimeouts.get(tag) ?? 0) + 1;
+    this.consecutiveStreamTimeouts.set(tag, count);
+    if (count >= _ReolinkBaichuanApi.MAX_CONSECUTIVE_STREAM_TIMEOUTS) {
+      this.logger?.warn?.(
+        `[SocketPool] ${count} consecutive stream timeouts on tag=${tag}, force-closing socket`
+      );
+      this.consecutiveStreamTimeouts.delete(tag);
+      this.forceClosePooledSocket(tag, this.logger).catch(() => {
+      });
+    }
+  }
   /**
    * Best-effort sleeping inference for battery/BCUDP cameras.
    *
@@ -17871,6 +18017,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({
@@ -18032,7 +18180,7 @@ ${xml}`
    * @returns Test results for all stream types and profiles
    */
   async testChannelStreams(channel, logger) {
-    const { testChannelStreams } = await import("./DiagnosticsTools-55PR4WFD.js");
+    const { testChannelStreams } = await import("./DiagnosticsTools-UMN4C7SY.js");
     return await testChannelStreams({
       api: this,
       channel: this.normalizeChannel(channel),
@@ -18048,7 +18196,7 @@ ${xml}`
    * @returns Complete diagnostics for all channels and streams
    */
   async collectMultifocalDiagnostics(logger) {
-    const { collectMultifocalDiagnostics } = await import("./DiagnosticsTools-55PR4WFD.js");
+    const { collectMultifocalDiagnostics } = await import("./DiagnosticsTools-UMN4C7SY.js");
     return await collectMultifocalDiagnostics({
       api: this,
       logger
@@ -21175,16 +21323,16 @@ function isTcpFailureThatShouldFallbackToUdp(e) {
   return message.includes("ECONNREFUSED") || message.includes("ETIMEDOUT") || message.includes("EHOSTUNREACH") || message.includes("ENETUNREACH") || message.includes("socket hang up") || message.includes("TCP connection timeout") || message.includes("Baichuan socket closed") || message.includes("timeout waiting for nonce") || message.includes("expected encryption info") || message.includes("ECONNRESET") || message.includes("EPIPE");
 }
 async function pingHost(host, timeoutMs = 3e3) {
+  const { exec } = await import("child_process");
+  const platform2 = process.platform;
+  const pingCmd = platform2 === "win32" ? `ping -n 1 -w ${timeoutMs} ${host}` : platform2 === "darwin" ? (
+    // macOS: -W is in milliseconds (Linux: seconds)
+    `ping -c 1 -W ${timeoutMs} ${host}`
+  ) : (
+    // Linux/BSD-ish: -W is in seconds on most distros
+    `ping -c 1 -W ${Math.max(1, Math.floor(timeoutMs / 1e3))} ${host}`
+  );
   return new Promise((resolve) => {
-    const { exec } = __require("child_process");
-    const platform2 = process.platform;
-    const pingCmd = platform2 === "win32" ? `ping -n 1 -w ${timeoutMs} ${host}` : platform2 === "darwin" ? (
-      // macOS: -W is in milliseconds (Linux: seconds)
-      `ping -c 1 -W ${timeoutMs} ${host}`
-    ) : (
-      // Linux/BSD-ish: -W is in seconds on most distros
-      `ping -c 1 -W ${Math.max(1, Math.floor(timeoutMs / 1e3))} ${host}`
-    );
     exec(pingCmd, (error) => {
       resolve(!error);
     });
@@ -21730,4 +21878,4 @@ export {
   isTcpFailureThatShouldFallbackToUdp,
   autoDetectDeviceType
 };
-//# sourceMappingURL=chunk-WDFKIHM5.js.map
+//# sourceMappingURL=chunk-GKLOJJ34.js.map