@apocaliss92/nodelink-js 0.4.28 → 0.4.30

package/dist/cli/rtsp-server.js

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

package/dist/index.cjs

@@ -21585,6 +21585,7 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
    */
   subscribeEmailPushEvents(params) {
     const channel = params.channel ?? 0;
+    const onEvent = params.onEvent;
     const matches = "match" in params ? params.match : (event) => event.cameraId === params.cameraId;
     const off = onEmailPushEvent((event) => {
       if (!matches(event)) return;
@@ -21600,6 +21601,15 @@ var ReolinkBaichuanApi = class _ReolinkBaichuanApi {
           timestamp: event.receivedAtMs
         });
       }
+      if (onEvent) {
+        try {
+          onEvent(event);
+        } catch (err) {
+          this.logger.warn?.(
+            `[ReolinkBaichuanApi] subscribeEmailPushEvents onEvent threw: ${err instanceof Error ? err.message : err}`
+          );
+        }
+      }
     });
     return off;
   }
@@ -41065,6 +41075,7 @@ function base64DecodeToBytes(b64) {
 }
 
 // src/emailPush/server.ts
+var import_node_util2 = require("util");
 var import_smtp_server = require("smtp-server");
 var import_mailparser = require("mailparser");
 
@@ -41144,6 +41155,9 @@ function createEmailPushServer(params) {
       return;
     }
     const receivedAtMs = Date.now();
+    const imageAttachment = (parsed.attachments ?? []).find(
+      (a) => a && typeof a.contentType === "string" && a.contentType.toLowerCase().startsWith("image/") && Buffer.isBuffer(a.content)
+    );
     const event = {
       cameraId,
       recipient,
@@ -41151,11 +41165,18 @@ function createEmailPushServer(params) {
       receivedAtMs,
       subject: parsed.subject ?? "",
       from: typeof parsed.from === "object" && parsed.from !== null && "text" in parsed.from ? String(parsed.from.text) : "",
-      bodyExcerpt: (parsed.text ?? "").slice(0, 500)
+      bodyExcerpt: (parsed.text ?? "").slice(0, 500),
+      ...imageAttachment ? {
+        attachment: {
+          contentType: imageAttachment.contentType,
+          data: imageAttachment.content,
+          ...imageAttachment.filename ? { filename: imageAttachment.filename } : {}
+        }
+      } : {}
     };
     status.messagesAccepted++;
     log.info(
-      `Email push for camera=${cameraId} type=${event.inferredType} subject="${event.subject.slice(0, 80)}"`
+      `Email push for camera=${cameraId} type=${event.inferredType} attachment=${event.attachment ? `${event.attachment.contentType} ${event.attachment.data.length}B` : "none"} subject="${event.subject.slice(0, 80)}"`
     );
     emitEmailPushEvent(event);
   }
@@ -41174,10 +41195,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) {
@@ -41226,24 +41256,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)
@@ -41252,6 +41295,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(
@@ -41260,13 +41306,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);
         });
       }
@@ -41314,6 +41362,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} ${(0, import_node_util2.format)(...formatArgs)}`;
+}
 function buildInitialStatus(config) {
   return {
     enabled: true,