@apocaliss92/nodelink-js 0.4.6 → 0.4.7

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

@@ -10130,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;
   /**
@@ -10284,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",
@@ -10457,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
   // ─────────────────────────────────────────────────────────────────────────────
@@ -15929,6 +15950,7 @@ ${stderr}`)
           `${ch}:${profile}:${variant}`,
           frame.header.msgNum
         );
+        this.resetStreamTimeoutCounter(targetClient);
         return;
       } catch (error) {
         lastError = error;
@@ -15943,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));
   }
   /**
@@ -16402,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) {
@@ -16434,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.
    *
@@ -21248,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);
     });
@@ -21803,4 +21878,4 @@ export {
   isTcpFailureThatShouldFallbackToUdp,
   autoDetectDeviceType
 };
-//# sourceMappingURL=chunk-F2Y5U3YP.js.map
+//# sourceMappingURL=chunk-GKLOJJ34.js.map