@apocaliss92/nodelink-js 0.4.16 → 0.4.17

package/dist/cli/rtsp-server.js

@@ -3,8 +3,8 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-65HTCC62.js";
-import "../chunk-2JNXKT3C.js";
+} from "../chunk-EF6BCSCZ.js";
+import "../chunk-S2UTGNFN.js";
 import {
   __require
 } from "../chunk-C57QV7IL.js";

package/dist/index.cjs

@@ -5723,11 +5723,20 @@ async function captureModelFixtures(params) {
       return void 0;
     }
   }
-  const info = await capture(
+  const channelInfo = await capture(
     "getInfo",
-    () => api.getInfo(channel),
-    (v) => writeJsonSafe(path4.join(outDir, "device-info.json"), v)
+    () => api.getInfo(channel)
   );
+  const baseInfo = await capture(
+    "getInfoBase",
+    () => api.getInfo()
+  );
+  const mergedInfo = { ...baseInfo ?? {} };
+  for (const [k, v] of Object.entries(channelInfo ?? {})) {
+    if (v !== void 0 && v !== null && v !== "") mergedInfo[k] = v;
+  }
+  const info = Object.keys(mergedInfo).length > 0 ? mergedInfo : void 0;
+  if (info) writeJsonSafe(path4.join(outDir, "device-info.json"), info);
   const support = await capture(
     "getSupportInfo",
     () => api.getSupportInfo(),
@@ -5843,6 +5852,76 @@ async function captureModelFixtures(params) {
     () => api.getDualLensChannelInfo(channel),
     (v) => writeJsonSafe(path4.join(outDir, "dual-lens-info.json"), v)
   );
+  await capture(
+    "getEncOptions",
+    () => api.getEncOptions(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "enc-options.json"), v)
+  );
+  await capture(
+    "getEnc",
+    () => api.getEnc(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "enc.json"), v)
+  );
+  await capture(
+    "getStreamInfoList",
+    () => api.getStreamInfoList(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "stream-info-list.json"), v)
+  );
+  await capture(
+    "getAutoFocus",
+    () => api.getAutoFocus(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "autofocus.json"), v)
+  );
+  await capture(
+    "getLedState",
+    () => api.getLedState(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "led-state.json"), v)
+  );
+  await capture(
+    "getIrLights",
+    () => api.getIrLights(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "ir-lights.json"), v)
+  );
+  await capture(
+    "getImage",
+    () => api.getImage(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "image.json"), v)
+  );
+  await capture(
+    "getIsp",
+    () => api.getIsp(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "isp.json"), v)
+  );
+  await capture(
+    "getDayNightThreshold",
+    () => api.getDayNightThreshold(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "day-night-threshold.json"), v)
+  );
+  await capture(
+    "getMask",
+    () => api.getMask(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "mask.json"), v)
+  );
+  await capture(
+    "getAudioCfg",
+    () => api.getAudioCfg(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "audio-cfg.json"), v)
+  );
+  await capture(
+    "getOsdDatetime",
+    () => api.getOsdDatetime(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "osd-datetime.json"), v)
+  );
+  await capture(
+    "getPtzPosition",
+    () => api.getPtzPosition(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "ptz-position.json"), v)
+  );
+  await capture(
+    "getZoomFocus",
+    () => api.getZoomFocus(channel),
+    (v) => writeJsonSafe(path4.join(outDir, "zoom-focus.json"), v)
+  );
   if (!params.skipStreamCombinationTest) await capture("streamCombinationTest", async () => {
     let dualLensInfo;
     try {
@@ -19194,7 +19273,15 @@ var applyFloodlightSettingsToXml = (xml, settings) => {
 // src/reolink/baichuan/ReolinkBaichuanApi.ts
 var DUAL_LENS_DUAL_MOTION_MODELS = /* @__PURE__ */ new Set([
   "Reolink Duo PoE",
-  "Reolink Duo WiFi"
+  "Reolink Duo WiFi",
+  // Duo 2 family
+  "Reolink Duo 2 PoE",
+  "Reolink Duo 2 WiFi",
+  // Duo 3 family — physically dual-sensor, marketed as a stitched 16MP feed
+  // (the firmware exposes a single logical channel, so callers should still
+  // check `getDualLensChannelInfo` for the actual channel topology).
+  "Reolink Duo 3 PoE",
+  "Reolink Duo 3 WiFi"
 ]);
 var DUAL_LENS_SINGLE_MOTION_MODELS = /* @__PURE__ */ new Set([
   "Reolink TrackMix",
@@ -19209,7 +19296,10 @@ var DUAL_LENS_MODELS = /* @__PURE__ */ new Set([
 ]);
 var isDualLenseModel = (model) => {
   const lower = model.toLowerCase();
-  return Array.from(DUAL_LENS_MODELS).some((m) => m.toLowerCase() === lower) || lower.includes("trackmix") || lower.includes("trackflex");
+  if (Array.from(DUAL_LENS_MODELS).some((m) => m.toLowerCase() === lower)) {
+    return true;
+  }
+  return lower.includes("trackmix") || lower.includes("trackflex") || /\bduo\b/.test(lower);
 };
 var NVR_HUB_EXACT_TYPES = ["NVR", "WIFI_NVR", "HOMEHUB"];
 var NVR_HUB_MODEL_PATTERNS = [
@@ -27008,6 +27098,13 @@ ${xml}`
       model = deviceInfo.type?.trim();
     } catch {
     }
+    if (!model) {
+      try {
+        const deviceInfoBase = await this.getInfo(void 0, { tags: ["type"] });
+        model = deviceInfoBase.type?.trim();
+      } catch {
+      }
+    }
     try {
       const capabilities = await this.getDeviceCapabilities(channel);
       channelNum = capabilities.support?.channelNum;