@apocaliss92/nodelink-js 0.4.24 → 0.4.28

package/dist/cli/rtsp-server.cjs

@@ -8114,6 +8114,21 @@ async function* createNativeStream(api, channel, profile, options) {
   let audioSampleRate = null;
   let streamStarted = false;
   let closed = false;
+  const signal = options?.signal;
+  let sleepResolve = null;
+  let sleepTimer = null;
+  const clearSleepTimer = () => {
+    if (sleepTimer) {
+      clearTimeout(sleepTimer);
+      sleepTimer = null;
+    }
+  };
+  const handleAbort = () => {
+    clearSleepTimer();
+    const r = sleepResolve;
+    sleepResolve = null;
+    r?.();
+  };
   const onError = (_error) => {
     closed = true;
     api.logger?.warn?.(
@@ -8211,7 +8226,13 @@ async function* createNativeStream(api, channel, profile, options) {
       }
     });
     streamStarted = true;
-    const signal = options?.signal;
+    if (signal) {
+      if (signal.aborted) {
+        closed = true;
+      } else {
+        signal.addEventListener("abort", handleAbort);
+      }
+    }
     while (!closed && !signal?.aborted) {
       if (frameQueue.length > 0) {
         const frame = frameQueue.shift();
@@ -8219,31 +8240,30 @@ async function* createNativeStream(api, channel, profile, options) {
       } else {
         await new Promise((resolve) => {
           frameResolve = resolve;
-          const timer = setTimeout(() => {
+          sleepResolve = resolve;
+          sleepTimer = setTimeout(() => {
+            sleepTimer = null;
+            if (sleepResolve === resolve) sleepResolve = null;
             if (frameResolve === resolve) {
               frameResolve = null;
               resolve();
             }
           }, 1e3);
-          if (signal) {
-            const onAbort = () => {
-              clearTimeout(timer);
-              if (frameResolve === resolve) frameResolve = null;
-              resolve();
-            };
-            if (signal.aborted) {
-              clearTimeout(timer);
-              frameResolve = null;
-              resolve();
-            } else {
-              signal.addEventListener("abort", onAbort, { once: true });
-            }
+          if (signal?.aborted) {
+            clearSleepTimer();
+            sleepResolve = null;
+            frameResolve = null;
+            resolve();
           }
         });
+        sleepResolve = null;
+        clearSleepTimer();
       }
     }
   } finally {
     closed = true;
+    if (signal) signal.removeEventListener("abort", handleAbort);
+    clearSleepTimer();
     try {
       await videoStream.stop();
     } catch {
@@ -10277,12 +10297,13 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
         if (frame.videoType === "H264" || frame.videoType === "H265") {
           this.setFlowVideoType(frame.videoType, "native stream");
         }
-        this.flow.extractParameterSets(frame.data);
-        const { hasParamSets } = this.flow.getFmtp();
-        if (hasParamSets) {
+        if (!this.flow.getFmtp().hasParamSets) {
+          this.flow.extractParameterSets(frame.data);
+        }
+        if (this.flow.getFmtp().hasParamSets) {
           this.markFirstFrameReceived();
         }
-        const isKeyframe = this.isRawFrameKeyframe(frame);
+        const isKeyframe = typeof frame.isKeyframe === "boolean" ? frame.isKeyframe : this.isRawFrameKeyframe(frame);
         this.prebuffer.push({
           frame: { ...frame, data: Buffer.from(frame.data) },
           time: Date.now(),
@@ -19000,6 +19021,62 @@ 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/emailPush/bus.ts
+var import_node_events5 = require("events");
+var emitter = new import_node_events5.EventEmitter();
+function onEmailPushEvent(handler) {
+  emitter.on("event", handler);
+  return () => emitter.off("event", handler);
+}
+function mapEmailPushInferredType(inferred) {
+  switch (inferred) {
+    case "motion":
+    case "doorbell":
+    case "people":
+    case "vehicle":
+    case "animal":
+    case "face":
+    case "package":
+      return inferred;
+    case "other":
+    default:
+      return "motion";
+  }
+}
+
 // src/reolink/baichuan/ReolinkBaichuanApi.ts
 var DUAL_LENS_DUAL_MOTION_MODELS = /* @__PURE__ */ new Set([
   "Reolink Duo PoE",
@@ -19145,7 +19222,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * general socket is created, logged in, and all event/push/guard listeners
    * are re-attached automatically.
    *
-   * This is a **no-op** when the API is already {@link isReady}.
+   * This is a **no-op** when the API is already ready (see `isReadyState()`).
    *
    * @throws If `close()` was called — the API is permanently closed and a new
    *         instance must be created.
@@ -19226,7 +19303,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   /**
    * Attach event, push, channelInfo, and guard listeners to the current
    * "general" client.  Called from the constructor and from
-   * {@link reconnectGeneralSocket}.
+   * `reconnectGeneralSocket()`.
    */
   setupGeneralClientListeners() {
     const client = this.client;
@@ -19278,7 +19355,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 {
@@ -20815,6 +20892,40 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       this.econnresetStormRebootInFlight = void 0;
     });
   }
+  /**
+   * Bind this API instance to the global email-push bus so that incoming
+   * SMTP-delivered motion / AI events for the matching camera surface on
+   * this instance's standard `onSimpleEvent` channel. The consumer keeps
+   * a single subscription (`onSimpleEvent`) and gets both the native
+   * Baichuan push and the email-push transport on the same stream.
+   *
+   * - `cameraId` shorthand: match events with `event.cameraId === cameraId`.
+   * - `match`: arbitrary predicate (e.g. when the consumer uses a
+   *   nickname-based mapping or wants to handle multiple recipients).
+   *
+   * Returns an `off()` handle. Safe to call repeatedly — each call
+   * registers its own listener.
+   */
+  subscribeEmailPushEvents(params) {
+    const channel = params.channel ?? 0;
+    const matches = "match" in params ? params.match : (event) => event.cameraId === params.cameraId;
+    const off = onEmailPushEvent((event) => {
+      if (!matches(event)) return;
+      this.dispatchSimpleEvent({
+        type: mapEmailPushInferredType(event.inferredType),
+        channel,
+        timestamp: event.receivedAtMs
+      });
+      if (event.inferredType !== "motion" && event.inferredType !== "doorbell" && event.inferredType !== "other") {
+        this.dispatchSimpleEvent({
+          type: "motion",
+          channel,
+          timestamp: event.receivedAtMs
+        });
+      }
+    });
+    return off;
+  }
   /**
    * Subscribe to minimal high-level events.
    * The API manages Baichuan subscribe/unsubscribe automatically.
@@ -20873,7 +20984,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * Subscribe to per-frame detection events sourced from the BcMedia
    * `additionalHeader` block on active video streams.
    *
-   * Mirrors {@link onSimpleEvent} but is fed by the streaming side-channel:
+   * Mirrors `onSimpleEvent()` but is fed by the streaming side-channel:
    * one event fires for every I-frame / P-frame that carries an overlay block.
    * Coordinates are reported in normalized [0, 1] fractions of the source
    * frame, so the same box renders correctly on mainStream, subStream, and
@@ -20900,7 +21011,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * Subscribe to AI object detections (people / vehicle / animal / face boxes
    * with class label and confidence) without managing a video stream yourself.
    *
-   * Mirrors {@link onSimpleEvent} end-to-end: on the first listener for a given
+   * Mirrors `onSimpleEvent()` end-to-end: on the first listener for a given
    * `(channel, profile)` tuple the API ensures the corresponding video stream
    * is running (the pool socket may already be shared with a regular consumer),
    * forwards every box-bearing `additionalHeader` to your callback, and tears
@@ -27744,7 +27855,7 @@ ${xml}`
    * Field meaning per stream:
    *  - `audio`           — 0/1 toggle
    *  - `width`/`height`  — resolution in pixels. Must be one of the
-   *                        resolutions returned by {@link getStreamInfoList}.
+   *                        resolutions returned by `getStreamInfoList()`.
    *  - `bitRate`         — kbps. Must match the table from `getStreamInfoList`.
    *  - `frameRate`       — fps. Must match the table from `getStreamInfoList`.
    *  - `videoEncType`    — `"h264"` or `"h265"`
@@ -28319,6 +28430,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() {
@@ -28351,6 +28489,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 }
+          }
         } : {}
       });
     }
@@ -28374,6 +28524,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)
   // --------------------
@@ -29071,10 +29244,12 @@ ${xml}`
     const triggers = params.triggerTypes ?? ["MD", "people", "vehicle"];
     const attachmentType = params.attachmentType ?? "picture";
     const interval = params.interval ?? 30;
+    const rawUser = params.authUsername ?? recipient;
+    const wireUser = rawUser.includes("@") ? rawUser : `${rawUser}@${domain}`;
     const emailPatch = {
       smtpServer: params.managerHost,
       smtpPort: port,
-      userName: params.authUsername ?? recipient,
+      userName: wireUser,
       password: params.authPassword ?? "",
       address1: recipient,
       address2: "",