@apocaliss92/nodelink-js 0.3.4 → 0.3.9

package/dist/cli/rtsp-server.cjs

@@ -4912,6 +4912,7 @@ var init_zip = __esm({
 // src/debug/DiagnosticsTools.ts
 var DiagnosticsTools_exports = {};
 __export(DiagnosticsTools_exports, {
+  captureModelFixtures: () => captureModelFixtures,
   collectCgiDiagnostics: () => collectCgiDiagnostics,
   collectMultifocalDiagnostics: () => collectMultifocalDiagnostics,
   collectNativeDiagnostics: () => collectNativeDiagnostics,
@@ -4945,6 +4946,10 @@ function writeJson(filePath, obj) {
   mkdirp(path4.dirname(filePath));
   fs4.writeFileSync(filePath, JSON.stringify(obj, null, 2));
 }
+function writeText(filePath, text) {
+  mkdirp(path4.dirname(filePath));
+  fs4.writeFileSync(filePath, text);
+}
 function appendNdjson(filePath, obj) {
   mkdirp(path4.dirname(filePath));
   fs4.appendFileSync(filePath, JSON.stringify(obj) + "\n");
@@ -7208,6 +7213,172 @@ async function runAllDiagnosticsConsecutively(params) {
     streamsDir
   };
 }
+async function captureModelFixtures(params) {
+  const { api, channel, outDir } = params;
+  const log = params.log ?? console.log;
+  mkdirp(outDir);
+  const calls = {};
+  const errors = [];
+  async function capture(name, fn, writer) {
+    try {
+      const value = await fn();
+      calls[name] = { ok: true, value };
+      if (writer && value !== void 0 && value !== null) {
+        writer(value);
+      }
+      log(`  \u2713 ${name}`);
+      return value;
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      calls[name] = { ok: false, error: msg };
+      errors.push(`${name}: ${msg}`);
+      log(`  \u2717 ${name}: ${msg}`);
+      return void 0;
+    }
+  }
+  const info = await capture(
+    "getInfo",
+    () => api.getInfo(channel),
+    (v) => writeJson(path4.join(outDir, "device-info.json"), v)
+  );
+  const support = await capture(
+    "getSupportInfo",
+    () => api.getSupportInfo(),
+    (v) => writeJson(path4.join(outDir, "support-info.json"), v)
+  );
+  const abilities = await capture(
+    "getAbilityInfo",
+    () => api.getAbilityInfo(),
+    (v) => writeJson(path4.join(outDir, "ability-info.json"), v)
+  );
+  await capture(
+    "getDeviceCapabilities",
+    () => api.getDeviceCapabilities(channel),
+    (v) => writeJson(path4.join(outDir, "capabilities.json"), v)
+  );
+  await capture("cmd289-WhiteLed", () => api.sendXml({
+    cmdId: BC_CMD_ID_GET_WHITE_LED,
+    channel,
+    timeoutMs: 3e3
+  }), (v) => writeText(path4.join(outDir, "cmd289-white-led.xml"), v));
+  await capture(
+    "getStreamMetadata",
+    () => api.getStreamMetadata(channel),
+    (v) => writeJson(path4.join(outDir, "stream-metadata.json"), v)
+  );
+  await capture(
+    "getEncXml",
+    () => api.getEncXml(channel),
+    (v) => writeText(path4.join(outDir, "enc-config.xml"), v)
+  );
+  await capture(
+    "getPorts",
+    () => api.getPorts(),
+    (v) => writeJson(path4.join(outDir, "ports.json"), v)
+  );
+  await capture(
+    "getTalkAbility",
+    () => api.getTalkAbility(channel),
+    (v) => writeJson(path4.join(outDir, "talk-ability.json"), v)
+  );
+  await capture(
+    "getTwoWayAudioConfig",
+    () => api.getTwoWayAudioConfig(channel),
+    (v) => writeJson(path4.join(outDir, "two-way-audio-config.json"), v)
+  );
+  await capture(
+    "getAiState",
+    () => api.getAiState(channel),
+    (v) => writeJson(path4.join(outDir, "ai-state.json"), v)
+  );
+  await capture(
+    "getAiCfg",
+    () => api.getAiCfg(channel),
+    (v) => writeJson(path4.join(outDir, "ai-cfg.json"), v)
+  );
+  await capture(
+    "getOsd",
+    () => api.getOsd(channel),
+    (v) => writeJson(path4.join(outDir, "osd.json"), v)
+  );
+  await capture(
+    "getMotionAlarm",
+    () => api.getMotionAlarm(channel),
+    (v) => writeJson(path4.join(outDir, "motion-alarm.json"), v)
+  );
+  await capture(
+    "getRecordCfg",
+    () => api.getRecordCfg(channel),
+    (v) => writeJson(path4.join(outDir, "record-cfg.json"), v)
+  );
+  await capture(
+    "getVideoInput",
+    () => api.getVideoInput(channel),
+    (v) => writeJson(path4.join(outDir, "video-input.json"), v)
+  );
+  await capture(
+    "getPtzPresets",
+    () => api.getPtzPresets(channel),
+    (v) => writeJson(path4.join(outDir, "ptz-presets.json"), v)
+  );
+  await capture(
+    "getNetworkInfo",
+    () => api.getNetworkInfo(),
+    (v) => writeJson(path4.join(outDir, "network-info.json"), v)
+  );
+  await capture(
+    "getSystemGeneral",
+    () => api.getSystemGeneral(),
+    (v) => writeJson(path4.join(outDir, "system-general.json"), v)
+  );
+  await capture(
+    "getWifiSignal",
+    () => api.getWifiSignal(channel),
+    (v) => writeJson(path4.join(outDir, "wifi-signal.json"), v)
+  );
+  await capture(
+    "getWhiteLedState",
+    () => api.getWhiteLedState(channel),
+    (v) => writeJson(path4.join(outDir, "white-led-state.json"), v)
+  );
+  await capture(
+    "getFloodlightOnMotion",
+    () => api.getFloodlightOnMotion(channel),
+    (v) => writeJson(path4.join(outDir, "floodlight-on-motion.json"), v)
+  );
+  await capture(
+    "buildVideoStreamOptions",
+    () => api.buildVideoStreamOptions({ channel }),
+    (v) => writeJson(path4.join(outDir, "video-stream-options.json"), v)
+  );
+  const total = Object.keys(calls).length;
+  const ok = Object.values(calls).filter((c) => c.ok).length;
+  const failed = total - ok;
+  const summary = { total, ok, failed, errors };
+  writeJson(path4.join(outDir, "_summary.json"), {
+    collectedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    model: info?.type ?? "unknown",
+    itemNo: info?.itemNo ?? "unknown",
+    firmwareVersion: info?.firmwareVersion ?? "unknown",
+    channel,
+    ...summary,
+    calls: Object.fromEntries(
+      Object.entries(calls).map(([k, v]) => [
+        k,
+        v.ok ? "ok" : `FAILED: ${v.error}`
+      ])
+    )
+  });
+  log(`
+  Summary: ${ok}/${total} ok, ${failed} failed`);
+  if (errors.length) {
+    log(`  Errors:`);
+    for (const err of errors) {
+      log(`    - ${err}`);
+    }
+  }
+  return { calls, outDir, summary };
+}
 var fs4, path4, import_node_child_process2, import_node_path;
 var init_DiagnosticsTools = __esm({
   "src/debug/DiagnosticsTools.ts"() {
@@ -11371,6 +11542,22 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
   static coverPreviewBackoffMs = /* @__PURE__ */ new Map();
   static COVER_PREVIEW_INITIAL_BACKOFF_MS = 1e3;
   static COVER_PREVIEW_MAX_BACKOFF_MS = 3e4;
+  /**
+   * Per-client snapshot (cmd_id=109) serialization queue.
+   * 
+   * WHY: On NVR/multi-camera devices sharing one socket, concurrent snapshot requests
+   * can cause JPEG data to mix (even with per-request msgNum filtering):
+   * - Camera A and B both send frames on same socket
+   * - Frame listener is global per socket
+   * - Timing quirks can cause chunk reordering or listener confusion
+   * 
+   * FIX: Serialize all cmd_id=109 requests on THIS client instance.
+   * Each snapshot waits for previous one to complete before starting.
+   * This ensures clean frame sequences per request, zero data corruption.
+   * 
+   * Impact: Snapshots are ~0–50ms slower per camera (negligible for users).
+   */
+  snapshotQueueTail = Promise.resolve();
   opts;
   debugCfg;
   logger;
@@ -13852,6 +14039,20 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
     });
   }
   async sendBinarySnapshot109(params) {
+    const prevTail = this.snapshotQueueTail;
+    let resolve;
+    const newTail = new Promise((r) => {
+      resolve = r;
+    });
+    this.snapshotQueueTail = newTail;
+    try {
+      await prevTail;
+      return await this.sendBinarySnapshot109Impl(params);
+    } finally {
+      resolve();
+    }
+  }
+  async sendBinarySnapshot109Impl(params) {
     await this.connect();
     const channel = params.channel ?? this.opts.channel ?? 0;
     const channelId = params.channelIdOverride ?? (params.channel == null ? this.hostChannelId : channel + 1);
@@ -13911,7 +14112,8 @@ var BaichuanClient = class _BaichuanClient extends import_node_events4.EventEmit
       };
       const onFrame = (frame) => {
         if (frame.header.cmdId !== cmdId) return;
-        if (frame.header.msgNum === msgNum && frame.header.responseCode >= 400) {
+        if (frame.header.msgNum !== msgNum) return;
+        if (frame.header.responseCode >= 400) {
           fail(
             new Error(
               `Baichuan snapshot request rejected (cmdId=${cmdId} msgNum=${msgNum} responseCode=${frame.header.responseCode})`
@@ -14713,6 +14915,17 @@ function computeDeviceCapabilities(params) {
   if (ptzMode !== void 0) result.ptzMode = ptzMode;
   return result;
 }
+function xmlIndicatesFloodlight(xml) {
+  if (/(<FloodlightTask\b|<FloodlightManual\b|<FloodlightStatusList\b)/i.test(
+    xml
+  )) {
+    return true;
+  }
+  if (/<WhiteLed\b/i.test(xml)) {
+    return /(<brightness_cur>|<bright>|<LightingSchedule\b)/i.test(xml);
+  }
+  return false;
+}
 
 // src/reolink/baichuan/utils/abilityInfo.ts
 init_xml();
@@ -23749,9 +23962,7 @@ ${stderr}`)
         `probeFloodlightSupportByCmd289: received XML for channel ${ch}:
 ${xml}`
       );
-      return /(<FloodlightTask\b|<FloodlightManual\b|<FloodlightStatusList\b|<WhiteLed\b)/i.test(
-        xml
-      );
+      return xmlIndicatesFloodlight(xml);
     } catch {
       return false;
     }