@apocaliss92/scrypted-reolink-native 0.5.23 → 0.5.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apocaliss92/scrypted-reolink-native",
-  "version": "0.5.23",
+  "version": "0.5.24",
   "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
   "author": "@apocaliss92",
   "license": "Apache",
@@ -44,7 +44,7 @@
     ]
   },
   "dependencies": {
-    "@apocaliss92/nodelink-js": "^0.4.30",
+    "@apocaliss92/nodelink-js": "^0.4.31",
     "@scrypted/common": "file:../../scrypted/common",
     "@scrypted/rtsp": "file:../../scrypted/plugins/rtsp",
     "@scrypted/sdk": "^0.3.118"

package/src/camera.ts

@@ -2745,37 +2745,32 @@ export class ReolinkCamera
 
   /**
    * Called from `baichuan-base.subscribeToEvents` when a per-camera
-   * email-push event lands on the bus. If the camera attached the
-   * trigger-frame JPEG (the common case for `attachmentType=picture`),
-   * we wrap it in a Scrypted MediaObject and overwrite `lastPicture`
-   * so the next `takePicture()` returns the fresh snapshot — which is
-   * what the Snapshot mixin → MQTT/HA image entity republishes off the
-   * back of the motion event. Without this hook, battery cams have
-   * nothing fresh to give and HA shows the previous cached frame.
+   * email-push event lands on the bus. We don't use the e-mail's image
+   * attachment — Reolink firmwares vary on quality/encoding and we'd
+   * be reimplementing the snapshot pipeline. Instead we leverage the
+   * fact that the camera is *guaranteed awake* right now (it just
+   * pushed an e-mail) and call the live Baichuan snapshot API: it
+   * returns a fresh frame in milliseconds without forcing an extra
+   * wake-up cycle. The result is stashed in `lastPicture` so the
+   * Snapshot mixin → MQTT image entity (and any other consumer that
+   * calls `takePicture()` on the back of the motion event) serves the
+   * trigger frame instead of the previous cached one.
    */
   private async handleEmailPushSnapshot(
     event: EmailPushEvent,
   ): Promise<void> {
     const logger = this.getBaichuanLogger();
-    if (!event.attachment) {
-      logger.debug(
-        `E-mail Push event without attachment (type=${event.inferredType}); skipping snapshot cache update`,
-      );
-      return;
-    }
     try {
-      const mo = await this.createMediaObject(
-        event.attachment.data,
-        event.attachment.contentType,
-      );
+      const client = await this.ensureClient();
+      const mo = await this.takePictureInternal(client);
       this.lastPicture = { mo, atMs: event.receivedAtMs };
       this.forceNewSnapshot = false;
       logger.log(
-        `E-mail Push snapshot cached (${event.attachment.data.length}B, ${event.attachment.contentType}) — next takePicture will serve it`,
+        `E-mail Push snapshot fetched live (type=${event.inferredType}) — next takePicture will serve it`,
       );
     } catch (e) {
       logger.warn(
-        `E-mail Push: failed to wrap attachment as MediaObject: ${e?.message || String(e)}`,
+        `E-mail Push: live snapshot fetch failed: ${e?.message || String(e)}`,
       );
     }
   }