@apocaliss92/nodelink-js 0.4.31 → 0.4.33

package/README.md

@@ -49,14 +49,46 @@ Battery cameras (Argus, Go, …) can't reliably keep a TCP/ONVIF push subscripti
    - **Auto** — manager: **Email Push** tab in the camera modal → *Auto-configure*. Scrypted: open the camera's Settings → **E-mail Push** group → *Auto-configure from Email Push Server*. Both call `setupEmailPushToManager` under the hood.
    - **API** — `await api.setupEmailPushToManager({ managerHost, managerPort, recipientLocalPart, domain, authUsername, authPassword, triggerTypes, attachmentType }, channel)`. The lib auto-wraps a bare username as `<user@domain>` so MAIL FROM stays RFC 5321 compliant.
    - **Manual** — fill the Reolink app form: server = manager LAN IP, port = `2525`, sender = `authUsername`, password = `authPassword`, TLS off, receiver = `cam-<id>@<domain>`.
-4. On motion, the camera sends an e-mail. The intake parses it, classifies the trigger (`MD` / `people` / `vehicle`), and emits an `EmailPushEvent` on the shared bus. Snapshots are kept in memory only (no disk persistence) — they're forwarded to whatever per-event handler the consumer wires (MQTT image entities in the manager, `motionDetected` flip in the Scrypted plugin).
+4. On motion, the camera sends an e-mail. The intake parses it, classifies the trigger (`MD` / `people` / `vehicle`), and emits an `EmailPushEvent` on the shared bus. From there it lands on `api.onSimpleEvent` automatically — see "Unified event stream" below.
 
 See [documentation/baichuan-api/email.md](./documentation/baichuan-api/email.md) for the full Baichuan API surface and [documentation/baichuan-api/time.md](./documentation/baichuan-api/time.md) for the related NTP / DST / system clock setters.
 
+### Unified event stream (since 0.4.32)
+
+Construct the api with `emailPushCameraId` (and optionally `emailPushChannel`) and the library wires the SMTP bus into the api's internal `simpleEventListeners` for you. Every consumer registered via `api.onSimpleEvent(...)` then receives native Baichuan push **and** SMTP-delivered motion through the same stream — no separate `onEmailPushEvent` subscription needed. The bridge survives TCP transient disconnects (it's a pure JS fan-out, not a network operation) and is released automatically by `close()`.
+
+```ts
+import { ReolinkBaichuanApi } from "@apocaliss92/nodelink-js";
+
+const api = new ReolinkBaichuanApi({
+  host: "192.168.1.100",
+  username: "admin",
+  password: "secret",
+  transport: "udp",
+  uid: "REOLINK-UID-HERE",
+
+  // Auto-bridge SMTP motion into api.onSimpleEvent. Match the same
+  // cameraId your `createEmailPushServer({ cameraResolver })` returns
+  // (typically the camera's nativeId / stable identifier).
+  emailPushCameraId: "my-battery-cam",
+  emailPushChannel: 0, // optional, default 0
+});
+
+await api.login();
+await api.onSimpleEvent((event) => {
+  // Fires for both native Baichuan push AND SMTP motion.
+  console.log(event.type, "on ch", event.channel, "@", event.timestamp);
+});
+```
+
+For single-owner consumers that already manage their own bridge (e.g. a custom resolver scheme), the lower-level `api.subscribeEmailPushEvents({ cameraId | match, channel })` is still exposed.
+
 **Library entry points**:
 
 - `createEmailPushServer({ config, cameraResolver, logger, loadTls? })` — factory returning `{ start, stop, restart, updateConfig, getStatus }`
-- `subscribeEmailPushEvents({ cameraId? | match?, channel? })` on a `ReolinkBaichuanApi` instance — bridges per-camera SMTP events into the same `onSimpleEvent` stream native Baichuan push uses
+- `new ReolinkBaichuanApi({ ..., emailPushCameraId, emailPushChannel? })` — auto-bridge into `onSimpleEvent` (recommended)
+- `api.subscribeEmailPushEvents({ cameraId | match, channel? })` — manual per-api bridge with custom matcher
+- `onEmailPushEvent(handler)` — raw global bus subscription (use when you need the full `EmailPushEvent` payload, not just the synthesised `ReolinkSimpleEvent`)
 - `getRecentEmailPushEvents(limit)` — bounded in-memory ring buffer of accepted deliveries
 - `setupEmailPushToManager(params, channel)` — orchestrator: `setEmail` + `setEmailTask` + optional `testEmail`
 - `getEmail`, `setEmail`, `testEmail`, `getEmailTask`, `setEmailTask` — low-level Baichuan accessors

package/dist/{chunk-XVFCEFM6.js → chunk-OZL6C2YJ.js}

@@ -11439,6 +11439,13 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    * Once closed, the API instance should not be reused.
    */
   _closed = false;
+  /**
+   * Off-handle for the auto-bridge between the global email-push bus
+   * and this api's `simpleEventListeners`. Set in the constructor
+   * when `emailPushCameraId` is provided; released in `close()`.
+   * `undefined` means no bridge was requested for this api.
+   */
+  emailPushAutoBridgeOff;
   // ─────────────────────────────────────────────────────────────────────────────
   // SOCKET POOL - Tag-based socket management
   // ─────────────────────────────────────────────────────────────────────────────
@@ -11811,6 +11818,21 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   // check every 10s
   simpleEventWatchdogSilenceThresholdMs = 5 * 6e4;
   // 5 min without events
+  /**
+   * Whether the silence-based resubscribe path of the watchdog is
+   * enabled. On UDP (battery cameras) silence is the *normal* state
+   * while the device sleeps — firing `ensureSimpleEventSubscribed`
+   * every 5 minutes wakes the camera on every tick, drains the
+   * battery, and is observably wrong because the cam emits a
+   * sleep/awake push when it actually wakes for motion.
+   *
+   * Defaults: `false` on UDP, `true` on TCP / `auto`. The subscription-
+   * failed recovery path (Case 2) stays active regardless — it only
+   * runs when the connection is alive, doesn't wake anyone, and is
+   * useful on every transport when the initial subscribe call lost
+   * the response packet.
+   */
+  eventWatchdogSilenceResubscribeEnabled = true;
   statePollingInterval;
   udpSleepInferenceInterval;
   udpLastInferredSleepStateByChannel = /* @__PURE__ */ new Map();
@@ -12768,6 +12790,12 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
     } else {
       this.eventResubscribeEnabled = opts.transport !== "udp";
     }
+    const explicitWatchdogResubscribe = opts.enableEventWatchdogSilenceResubscribe;
+    if (typeof explicitWatchdogResubscribe === "boolean") {
+      this.eventWatchdogSilenceResubscribeEnabled = explicitWatchdogResubscribe;
+    } else {
+      this.eventWatchdogSilenceResubscribeEnabled = opts.transport !== "udp";
+    }
     const maxSessions = opts.maxDedicatedSessionsBeforeReboot;
     if (typeof maxSessions === "number" && Number.isFinite(maxSessions) && maxSessions > 0) {
       this.maxDedicatedSessionsBeforeReboot = Math.floor(maxSessions);
@@ -12781,6 +12809,12 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
       this.rebootAfterConsecutiveEconnreset = Math.floor(econnresetThreshold);
     }
     this.setupGeneralClientListeners();
+    if (opts.emailPushCameraId) {
+      this.emailPushAutoBridgeOff = this.subscribeEmailPushEvents({
+        cameraId: opts.emailPushCameraId,
+        channel: opts.emailPushChannel ?? 0
+      });
+    }
   }
   /**
    * CGI forward: fetch RTSP URL for a channel via `GetRtspUrl`.
@@ -13584,6 +13618,14 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
     if (this.simpleEventSubscribed && this.simpleEventLastReceivedAt > 0) {
       const silence = now - this.simpleEventLastReceivedAt;
       if (silence < this.simpleEventWatchdogSilenceThresholdMs) return;
+      if (!this.eventWatchdogSilenceResubscribeEnabled) {
+        this.logger.debug?.(
+          `[ReolinkBaichuanApi] event watchdog: silence-based resubscribe disabled (UDP / battery), skipping`,
+          { host: this.host, silenceMs: silence }
+        );
+        this.simpleEventLastReceivedAt = now;
+        return;
+      }
       (this.logger.warn ?? this.logger.log).call(
         this.logger,
         `[ReolinkBaichuanApi] event watchdog: no events for ${Math.round(silence / 6e4)} min, forcing resubscribe`,
@@ -13904,6 +13946,13 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
   async close(options) {
     if (this._closed) return;
     this._closed = true;
+    if (this.emailPushAutoBridgeOff) {
+      try {
+        this.emailPushAutoBridgeOff();
+      } catch {
+      }
+      this.emailPushAutoBridgeOff = void 0;
+    }
     if (this.sessionGuardIntervalTimer) {
       clearInterval(this.sessionGuardIntervalTimer);
       this.sessionGuardIntervalTimer = void 0;
@@ -24733,4 +24782,4 @@ export {
   isTcpFailureThatShouldFallbackToUdp,
   autoDetectDeviceType
 };
-//# sourceMappingURL=chunk-XVFCEFM6.js.map
+//# sourceMappingURL=chunk-OZL6C2YJ.js.map