@apocaliss92/nodelink-js 0.4.29 → 0.4.31

package/dist/index.d.cts

@@ -6310,9 +6310,19 @@ declare class ReolinkBaichuanApi {
     subscribeEmailPushEvents(params: {
         cameraId: string;
         channel?: number;
+        /**
+         * Optional handler invoked with the *full* `EmailPushEvent`
+         * after the simple-event dispatch. Useful for consumers that
+         * need fields beyond what `onSimpleEvent` carries — most
+         * notably `event.attachment` (the JPEG snapshot from the
+         * trigger frame) which a downstream plugin can republish to
+         * MQTT or cache as the camera's last picture.
+         */
+        onEvent?: (event: EmailPushEvent) => void;
     } | {
         match: (event: EmailPushEvent) => boolean;
         channel?: number;
+        onEvent?: (event: EmailPushEvent) => void;
     }): () => void;
     /**
      * Subscribe to minimal high-level events.

package/dist/index.d.ts

@@ -7295,9 +7295,19 @@ export declare class ReolinkBaichuanApi {
     subscribeEmailPushEvents(params: {
         cameraId: string;
         channel?: number;
+        /**
+         * Optional handler invoked with the *full* `EmailPushEvent`
+         * after the simple-event dispatch. Useful for consumers that
+         * need fields beyond what `onSimpleEvent` carries — most
+         * notably `event.attachment` (the JPEG snapshot from the
+         * trigger frame) which a downstream plugin can republish to
+         * MQTT or cache as the camera's last picture.
+         */
+        onEvent?: (event: EmailPushEvent) => void;
     } | {
         match: (event: EmailPushEvent) => boolean;
         channel?: number;
+        onEvent?: (event: EmailPushEvent) => void;
     }): () => void;
     /**
      * Subscribe to minimal high-level events.

package/dist/index.js

@@ -65,7 +65,7 @@ import {
   setEmailPushCameraResolver,
   setGlobalLogger,
   xmlIndicatesFloodlight
-} from "./chunk-NQ7D5TLR.js";
+} from "./chunk-XVFCEFM6.js";
 import {
   ReolinkCgiApi,
   ReolinkHttpClient,
@@ -8284,6 +8284,7 @@ function base64DecodeToBytes(b64) {
 }
 
 // src/emailPush/server.ts
+import { format as utilFormat } from "util";
 import { SMTPServer } from "smtp-server";
 import { simpleParser } from "mailparser";
 
@@ -8339,8 +8340,10 @@ function createEmailPushServer(params) {
   let server;
   let status = buildInitialStatus(config);
   function parseRecipient(rcpt) {
-    const [local, domain] = rcpt.toLowerCase().split("@");
-    if (!local || !domain) return void 0;
+    const at = rcpt.lastIndexOf("@");
+    if (at <= 0 || at === rcpt.length - 1) return void 0;
+    const local = rcpt.slice(0, at);
+    const domain = rcpt.slice(at + 1).toLowerCase();
     return { local, domain };
   }
   function resolveCameraIdFromRecipient(rcpt) {
@@ -8393,10 +8396,19 @@ function createEmailPushServer(params) {
       disabledCommands: config.requireAuth ? [] : ["AUTH"],
       allowInsecureAuth: !config.tls,
       size: config.maxMessageBytes,
+      // smtp-server invokes its internal logger as
+      //   logger.info(metadata, formatString, ...args)
+      // where `metadata` is an opaque session/connection object and
+      // `formatString` may contain printf-style placeholders.
+      // Naive `.map(String).join(" ")` would surface `[object Object]`
+      // and leave `%s` unresolved (which is what the user was seeing).
+      // Here we strip the metadata (keeping a compact `tnx`/`cid` tag
+      // when present), then apply `util.format` so placeholders are
+      // expanded by Node exactly like the smtp-server defaults do.
       logger: {
-        info: (...args) => log.debug(`[smtp] ${args.map((a) => String(a)).join(" ")}`),
-        debug: (...args) => log.debug(`[smtp] ${args.map((a) => String(a)).join(" ")}`),
-        error: (...args) => log.warn(`[smtp] ${args.map((a) => String(a)).join(" ")}`)
+        info: (...args) => log.info(formatSmtpLogArgs(args)),
+        debug: (...args) => log.debug(formatSmtpLogArgs(args)),
+        error: (...args) => log.warn(formatSmtpLogArgs(args))
       },
       ...tlsOptions ? { secure: false, ...tlsOptions } : {},
       onConnect(session, callback) {
@@ -8445,24 +8457,37 @@ function createEmailPushServer(params) {
         );
         return callback(new Error("Invalid username or password"));
       },
-      onRcptTo(address, _session, callback) {
+      onRcptTo(address, session, callback) {
         const cameraId = resolveCameraIdFromRecipient(address.address);
         if (!cameraId) {
           status.messagesRejected++;
+          log.warn(
+            `SMTP RCPT TO rejected ${address.address} \u2014 unknown recipient (sessionId=${session.id})`
+          );
           return callback(
             new Error(
               `Unknown recipient ${address.address} (not registered)`
             )
           );
         }
+        log.info(
+          `SMTP RCPT TO ${address.address} \u2192 camera=${cameraId} (sessionId=${session.id})`
+        );
         callback();
       },
       onData(stream, session, callback) {
+        const startedAt = Date.now();
+        log.debug(
+          `SMTP DATA start (sessionId=${session.id} from=${session.envelope.mailFrom ? session.envelope.mailFrom.address : "?"})`
+        );
         const chunks = [];
         stream.on("data", (chunk) => chunks.push(chunk));
         stream.on("end", () => {
           const recipients = session.envelope.rcptTo?.map((r) => r.address) ?? [];
           const buffer = Buffer.concat(chunks);
+          log.info(
+            `SMTP DATA received ${buffer.length}B in ${Date.now() - startedAt}ms for ${recipients.length} recipient(s) (sessionId=${session.id})`
+          );
           const matched = recipients.map((r) => ({
             recipient: r,
             cameraId: resolveCameraIdFromRecipient(r)
@@ -8471,6 +8496,9 @@ function createEmailPushServer(params) {
           );
           if (matched.length === 0) {
             status.messagesRejected++;
+            log.warn(
+              `SMTP DATA dropped \u2014 no recognised recipients in [${recipients.join(", ")}] (sessionId=${session.id})`
+            );
             return callback(new Error("No recognised recipients"));
           }
           Promise.all(
@@ -8479,13 +8507,15 @@ function createEmailPushServer(params) {
             )
           ).then(() => callback()).catch((err) => {
             const msg = err instanceof Error ? err.message : String(err);
-            log.error(`Email push pipeline error: ${msg}`);
+            log.error(
+              `Email push pipeline error (sessionId=${session.id}): ${msg}`
+            );
             status.lastErrorMessage = msg;
             callback(new Error(msg));
           });
         });
         stream.on("error", (err) => {
-          log.warn(`SMTP stream error: ${err.message}`);
+          log.warn(`SMTP stream error (sessionId=${session.id}): ${err.message}`);
           callback(err);
         });
       }
@@ -8533,6 +8563,25 @@ function createEmailPushServer(params) {
     }
   };
 }
+function formatSmtpLogArgs(args) {
+  if (args.length === 0) return "[smtp]";
+  const [first, ...rest] = args;
+  let tag = "";
+  let formatArgs = args;
+  if (first && typeof first === "object" && !Array.isArray(first)) {
+    const meta = first;
+    const tnx = typeof meta.tnx === "string" ? meta.tnx : void 0;
+    const cid = typeof meta.cid === "string" ? meta.cid : void 0;
+    const sid = typeof meta.sid === "string" ? meta.sid : void 0;
+    const bits = [];
+    if (tnx) bits.push(tnx);
+    if (cid) bits.push(`cid=${cid}`);
+    if (sid) bits.push(`sid=${sid}`);
+    if (bits.length > 0) tag = ` [${bits.join(" ")}]`;
+    formatArgs = rest;
+  }
+  return `[smtp]${tag} ${utilFormat(...formatArgs)}`;
+}
 function buildInitialStatus(config) {
   return {
     enabled: true,