@apocaliss92/nodelink-js 0.5.2 → 0.6.1

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-7HSTETZR.js";
+} from "../chunk-EAHRVNEX.js";
 import "../chunk-XDVBNZGR.js";
 import {
   __require

package/dist/index.cjs

@@ -9047,12 +9047,28 @@ async function getServerBinding(uid, options = {}) {
   const fetchImpl = options.fetchImpl ?? globalThis.fetch;
   const logger = options.logger;
   if (typeof fetchImpl !== "function") {
-    logger?.debug?.(
+    logger?.log?.(
       `[server-binding] global fetch unavailable; skipping cloud lookup`
     );
     cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
     return void 0;
   }
+  try {
+    const apiHostname = new URL(baseUrl).hostname;
+    const dns2 = await import("dns/promises");
+    const answers = await dns2.lookup(apiHostname, { family: 4, all: true });
+    const sinkholed = answers.find(
+      (a) => a.address?.startsWith("127.") || a.address === "0.0.0.0" || a.address?.startsWith("10.") || a.address?.startsWith("192.168.") || /^172\.(1[6-9]|2[0-9]|3[0-1])\./.test(a.address ?? "")
+    );
+    if (sinkholed) {
+      logger?.log?.(
+        `[server-binding] ${uid}: DNS for ${apiHostname} resolves to ${sinkholed.address} (sinkhole / /etc/hosts override). Cloud directory unreachable \u2014 falling back to the 22-hostname P2P sweep. Whitelist ${apiHostname} to enable.`
+      );
+      cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+      return void 0;
+    }
+  } catch {
+  }
   const url = `${baseUrl}/devices/${encodeURIComponent(uid)}/server-binding?language=${encodeURIComponent(language)}`;
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
@@ -9063,8 +9079,8 @@ async function getServerBinding(uid, options = {}) {
       headers: { Accept: "application/json" }
     });
     if (!res.ok) {
-      logger?.debug?.(
-        `[server-binding] ${uid}: HTTP ${res.status} ${res.statusText}`
+      logger?.log?.(
+        `[server-binding] ${uid}: HTTP ${res.status} ${res.statusText} from ${url}`
       );
       cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
       return void 0;
@@ -9072,8 +9088,15 @@ async function getServerBinding(uid, options = {}) {
     const json = await res.json();
     const parsed = parseServerBindingResponse(json);
     if (!parsed) {
-      logger?.debug?.(
-        `[server-binding] ${uid}: response shape did not match expectations`
+      logger?.log?.(
+        `[server-binding] ${uid}: response shape did not match expectations (Reolink schema change?)`
+      );
+      cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
+      return void 0;
+    }
+    if (parsed.availableZones.length === 0) {
+      logger?.log?.(
+        `[server-binding] ${uid}: cloud returned 0 zones \u2014 UID not registered with Reolink cloud (or wrong region)`
       );
       cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
       return void 0;
@@ -9092,9 +9115,23 @@ async function getServerBinding(uid, options = {}) {
     );
     return parsed;
   } catch (e) {
-    logger?.debug?.(
-      `[server-binding] ${uid}: ${e?.message ?? String(e)}`
-    );
+    const msg = e?.message ?? String(e);
+    const errName = e?.name;
+    if (errName === "AbortError" || msg.includes("aborted")) {
+      logger?.log?.(
+        `[server-binding] ${uid}: timed out after ${timeoutMs}ms (cloud unreachable)`
+      );
+    } else if (msg.includes("ENOTFOUND") || msg.includes("EAI_AGAIN")) {
+      logger?.log?.(
+        `[server-binding] ${uid}: DNS failed (${msg}) \u2014 apis.reolink.com may be blocked at resolver`
+      );
+    } else if (msg.includes("ECONNREFUSED") || msg.includes("EHOSTUNREACH") || msg.includes("ENETUNREACH")) {
+      logger?.log?.(
+        `[server-binding] ${uid}: network unreachable (${msg}) \u2014 cloud port blocked`
+      );
+    } else {
+      logger?.log?.(`[server-binding] ${uid}: fetch failed \u2014 ${msg}`);
+    }
     cache.set(uid, { kind: "err", expires: now + NEGATIVE_TTL_MS });
     return void 0;
   } finally {
@@ -9530,12 +9567,19 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
     const tid = (Math.floor(Math.random() * 2147483647) | 0) >>> 0;
     const xml = buildC2mQ({ uid });
     const pkt = encodeDiscoveryPacket(tid, xml);
+    const counters = { sentBytes: 0, rxBytes: 0 };
     return await new Promise((resolve, reject) => {
       const deadline = setTimeout(() => {
         cleanup();
-        reject(new Error(`P2P UID lookup timeout (${dest.host}:${dest.port})`));
+        const err = new Error(
+          `P2P UID lookup timeout (${dest.host}:${dest.port}) \u2014 sent=${counters.sentBytes}B rx=${counters.rxBytes}B`
+        );
+        err.sentBytes = counters.sentBytes;
+        err.rxBytes = counters.rxBytes;
+        reject(err);
       }, timeoutMs);
       const onMsg = (msg) => {
+        counters.rxBytes += msg.length;
         try {
           const p = decodeBcUdpPacket(msg);
           if (p.kind !== "discovery") return;
@@ -9543,13 +9587,19 @@ var BcUdpStream = class extends import_node_events.EventEmitter {
           const qr = parseM2cQr(p.xml);
           if (!qr?.reg || !qr?.relay) return;
           cleanup();
-          resolve({ reg: qr.reg, relay: qr.relay });
+          resolve({
+            reg: qr.reg,
+            relay: qr.relay,
+            sentBytes: counters.sentBytes,
+            rxBytes: counters.rxBytes
+          });
         } catch {
         }
       };
       const send = () => {
         try {
           sock.send(pkt, dest.port, dest.host);
+          counters.sentBytes += pkt.length;
         } catch {
         }
       };
@@ -35165,10 +35215,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
     }
   }
   async startFfmpegCompositionFromRtspUrls(mainWidth, mainHeight, pipWidth, pipHeight, position, widerRtspUrl, teleRtspUrl, rtspTransport) {
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       // Input 0: wider
@@ -35189,27 +35247,33 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       // Output: always H.264 Annex-B
       "-an",
       "-c:v",
-      "libx264",
+      videoEncoder,
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
     ];
-    this.logger.log?.(`[CompositeStream] Starting ffmpeg (rtsp inputs): ${ffmpegArgs.join(" ")}`);
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
+    this.logger.log?.(
+      `[CompositeStream] Starting ffmpeg (rtsp inputs): bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
+    );
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -35276,10 +35340,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-i",
       "pipe:3"
     ];
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       "-probesize",
@@ -35298,33 +35370,40 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-map",
       "[out]",
       "-c:v",
-      "libx264",
-      // Re-encode for compatibility
-      // Make the stream easy to join mid-flight: frequent IDRs + in-band headers + AUD.
-      // Without this, a new client may wait many seconds for the next keyframe.
+      videoEncoder,
+      // Make the stream easy to join mid-flight: frequent IDRs + in-band
+      // headers + AUD. Without this, a new client may wait many seconds
+      // for the next keyframe.
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      // libx264-specific knobs. We deliberately skip these for HW encoders
+      // — each one has its own option vocabulary (`-q:v`, `-rc`, etc.)
+      // and the user is expected to express them via extraOutputArgs.
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
       // Output (stdout)
     ];
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
     this.logger.log?.(
-      `[CompositeStream] Starting ffmpeg: ${ffmpegArgs.join(" ")}`
+      `[CompositeStream] Starting ffmpeg: bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
     );
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["pipe", "pipe", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -36032,6 +36111,20 @@ async function createRfc4571TcpServerInternal(options) {
       ...forceH264 !== void 0 ? { forceH264 } : defaultForceH264 ? { forceH264: true } : {},
       ...compositeOptions?.assumeH264Inputs !== void 0 ? { assumeH264Inputs: compositeOptions.assumeH264Inputs } : {},
       ...compositeOptions?.disableTranscode !== void 0 ? { disableTranscode: compositeOptions.disableTranscode } : {},
+      // Propagate ffmpeg binary path — required when the embedder strips
+      // PATH (Scrypted on Windows, Electron sandboxes, distroless Docker)
+      // and the bundled ffmpeg is at a fixed absolute path only the
+      // embedder knows.
+      ...compositeOptions?.ffmpegPath ? { ffmpegPath: compositeOptions.ffmpegPath } : {},
+      // Encoder tuning knobs — see CompositeStreamPipOptions for the
+      // semantic contract on each one. Plumbed verbatim so the
+      // CompositeStream layer can apply defaults.
+      ...compositeOptions?.videoEncoder ? { videoEncoder: compositeOptions.videoEncoder } : {},
+      ...compositeOptions?.encoderPreset ? { encoderPreset: compositeOptions.encoderPreset } : {},
+      ...typeof compositeOptions?.crf === "number" ? { crf: compositeOptions.crf } : {},
+      ...typeof compositeOptions?.gopSeconds === "number" ? { gopSeconds: compositeOptions.gopSeconds } : {},
+      ...compositeOptions?.extraGlobalArgs ? { extraGlobalArgs: compositeOptions.extraGlobalArgs } : {},
+      ...compositeOptions?.extraOutputArgs ? { extraOutputArgs: compositeOptions.extraOutputArgs } : {},
       logger
     });
     isCompositeStream = true;