@apocaliss92/nodelink-js 0.4.23 → 0.4.26

package/dist/cli/rtsp-server.js

@@ -3,7 +3,7 @@ import {
   BaichuanRtspServer,
   ReolinkBaichuanApi,
   autoDetectDeviceType
-} from "../chunk-P4X5OU25.js";
+} from "../chunk-F3XCYKYT.js";
 import "../chunk-AHY4L7JI.js";
 import {
   __require

package/dist/index.cjs

@@ -17723,9 +17723,10 @@ function parseRectTags(block) {
 function decodePrivacyMaskZones(xml) {
   const canvas = extractCanvasFromShelterXml(xml);
   const enable = Number(getXmlText(xml, "enable") ?? "0") === 1;
-  const maxNum = Number(getXmlText(xml, "maxNum") ?? "0") | 0;
   const trackEnable = Number(getXmlText(xml, "trackEnable") ?? "0") === 1;
   const maxTrackShelterNum = Number(getXmlText(xml, "maxTrackShelterNum") ?? "0") | 0;
+  const rawMaxNum = getXmlText(xml, "maxNum");
+  const maxNum = rawMaxNum !== void 0 ? Number(rawMaxNum) | 0 : maxTrackShelterNum > 0 ? maxTrackShelterNum : 4;
   const shelterList = [];
   const shelterListBlock = xml.match(
     /<shelterList>([\s\S]*?)<\/shelterList>/
@@ -19634,6 +19635,39 @@ var applyFloodlightSettingsToXml = (xml, settings) => {
   return modifiedXml;
 };
 
+// src/reolink/baichuan/utils/whiteLedStatusPush.ts
+var parseFloodlightStatusListPushXml = (xml) => {
+  const out = [];
+  const re = /<channel>\s*(\d+)\s*<\/channel>[\s\S]*?<status>\s*(\d+)\s*<\/status>/gi;
+  let m;
+  while ((m = re.exec(xml)) !== null) {
+    const channel = Number.parseInt(m[1] ?? "", 10);
+    const status = Number.parseInt(m[2] ?? "", 10);
+    if (!Number.isFinite(channel) || !Number.isFinite(status)) continue;
+    out.push({ channel, status });
+  }
+  return out;
+};
+
+// src/reolink/baichuan/utils/sirenStatusPush.ts
+var parseSirenStatusListPushXml = (xml) => {
+  const out = [];
+  const re = /<(?:channelId|channel)>\s*(\d+)\s*<\/(?:channelId|channel)>[\s\S]*?<status>\s*(\d+)\s*<\/status>(?:[\s\S]*?<playing>\s*(\d+)\s*<\/playing>)?/gi;
+  let m;
+  while ((m = re.exec(xml)) !== null) {
+    const channel = Number.parseInt(m[1] ?? "", 10);
+    const status = Number.parseInt(m[2] ?? "", 10);
+    if (!Number.isFinite(channel) || !Number.isFinite(status)) continue;
+    const entry = { channel, status };
+    if (m[3] !== void 0) {
+      const playing = Number.parseInt(m[3], 10);
+      if (Number.isFinite(playing)) entry.playing = playing;
+    }
+    out.push(entry);
+  }
+  return out;
+};
+
 // src/reolink/baichuan/ReolinkBaichuanApi.ts
 var DUAL_LENS_DUAL_MOTION_MODELS = /* @__PURE__ */ new Set([
   "Reolink Duo PoE",
@@ -19912,7 +19946,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
     });
     client.on("push", (frame) => {
       const cmdId = frame.header.cmdId;
-      if (cmdId !== BC_CMD_ID_PUSH_VIDEO_INPUT && cmdId !== BC_CMD_ID_PUSH_SERIAL && cmdId !== BC_CMD_ID_PUSH_NET_INFO && cmdId !== BC_CMD_ID_PUSH_DINGDONG_LIST && cmdId !== BC_CMD_ID_PUSH_SLEEP_STATUS && cmdId !== BC_CMD_ID_PUSH_COORDINATE_POINT_LIST) {
+      if (cmdId !== BC_CMD_ID_PUSH_VIDEO_INPUT && cmdId !== BC_CMD_ID_PUSH_SERIAL && cmdId !== BC_CMD_ID_PUSH_NET_INFO && cmdId !== BC_CMD_ID_PUSH_DINGDONG_LIST && cmdId !== BC_CMD_ID_PUSH_SLEEP_STATUS && cmdId !== BC_CMD_ID_PUSH_COORDINATE_POINT_LIST && cmdId !== BC_CMD_ID_FLOODLIGHT_STATUS_LIST && cmdId !== BC_CMD_ID_GET_AUDIO_ALARM) {
         return;
       }
       try {
@@ -28953,6 +28987,33 @@ ${xml}`
       };
       return;
     }
+    if (cmdId === BC_CMD_ID_FLOODLIGHT_STATUS_LIST) {
+      const entries = parseFloodlightStatusListPushXml(xml);
+      if (entries.length === 0) return;
+      for (const entry of entries) {
+        const channel = normalizePushChannel(entry.channel) ?? channelFromHeader;
+        getEntry(channel).floodlightStatus = {
+          updatedAtMs: now,
+          value: { status: entry.status === 1 }
+        };
+      }
+      return;
+    }
+    if (cmdId === BC_CMD_ID_GET_AUDIO_ALARM) {
+      const entries = parseSirenStatusListPushXml(xml);
+      if (entries.length === 0) return;
+      for (const entry of entries) {
+        const channel = normalizePushChannel(entry.channel) ?? channelFromHeader;
+        getEntry(channel).sirenStatus = {
+          updatedAtMs: now,
+          value: {
+            status: entry.status === 1,
+            ...entry.playing !== void 0 ? { playing: entry.playing === 1 } : {}
+          }
+        };
+      }
+      return;
+    }
   }
   /** Read-only snapshot of cached settings pushes (cmd_id 78/79/464/484/623/723). */
   getSettingsPushCacheSnapshot() {
@@ -28985,6 +29046,18 @@ ${xml}`
             ...entry.coordinatePointList,
             value: { ...entry.coordinatePointList.value }
           }
+        } : {},
+        ...entry.floodlightStatus ? {
+          floodlightStatus: {
+            ...entry.floodlightStatus,
+            value: { ...entry.floodlightStatus.value }
+          }
+        } : {},
+        ...entry.sirenStatus ? {
+          sirenStatus: {
+            ...entry.sirenStatus,
+            value: { ...entry.sirenStatus.value }
+          }
         } : {}
       });
     }
@@ -29008,6 +29081,29 @@ ${xml}`
   getCoordinatePointListFromPushCache(channel = 0) {
     return this.settingsPushCache.get(channel)?.coordinatePointList;
   }
+  /**
+   * Last cmd_id 291 (FloodlightStatusList) push observed for the channel.
+   * The camera emits this whenever the floodlight transitions on/off,
+   * including the auto-off after the FloodlightManual duration. This is
+   * the only reliable source for the current manual state because cmd 289
+   * only returns the FloodlightTask config.
+   *
+   * Returns undefined when no push has been received yet.
+   */
+  getCachedFloodlightStatus(channel = 0) {
+    return this.settingsPushCache.get(channel)?.floodlightStatus;
+  }
+  /**
+   * Last cmd_id 547 (SirenStatusList) push observed for the channel.
+   * Captures the actual on/off transitions including the firmware's
+   * built-in auto-off after the siren playback duration expires —
+   * polling cmd 547 alone can race that auto-off.
+   *
+   * Returns undefined when no push has been received yet.
+   */
+  getCachedSirenStatus(channel = 0) {
+    return this.settingsPushCache.get(channel)?.sirenStatus;
+  }
   // --------------------
   // PCAP-derived settings getters (typed wrappers)
   // --------------------