@serve.zone/dcrouter 17.6.1 → 17.7.1

package/ts/email/classes.accepted-email-spool.ts

@@ -875,9 +875,11 @@ export class AcceptedEmailSpool {
       cachedEmail.status = 'deferred';
       cachedEmail.lastError = item.lastError || 'SmartMTA delivery deferred';
       const smartMtaNextAttempt = item.nextAttempt || new Date(Date.now() + ACCEPTED_EMAIL_RETRY_DELAY_MS);
+      cachedEmail.smartMtaNextAttempt = smartMtaNextAttempt;
       cachedEmail.nextAttempt = new Date(smartMtaNextAttempt.getTime() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
     } else {
       cachedEmail.status = 'queued';
+      cachedEmail.smartMtaNextAttempt = undefined;
       cachedEmail.nextAttempt = new Date(Date.now() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
     }
     await cachedEmail.save();
@@ -954,6 +956,7 @@ export class AcceptedEmailSpool {
     }
     this.updateSmartMtaRouteData(cachedEmail, queueItem, status);
     const smartMtaNextAttempt = queueItem.nextAttempt || new Date(Date.now() + ACCEPTED_EMAIL_RETRY_DELAY_MS);
+    cachedEmail.smartMtaNextAttempt = status === 'deferred' ? smartMtaNextAttempt : undefined;
     cachedEmail.nextAttempt = new Date(smartMtaNextAttempt.getTime() + ACCEPTED_EMAIL_QUEUE_LEASE_MS);
     await cachedEmail.save();
     await this.notifyEmailQueuePersisted(cachedEmail, 'email-live-queue-postponed');

package/ts/logger.ts

@@ -1,6 +1,7 @@
 import * as plugins from './plugins.js';
 import { randomUUID } from 'node:crypto';
 import { SmartlogDestinationBuffer } from '@push.rocks/smartlog/destination-buffer';
+import { DestinationLocal } from '@push.rocks/smartlog/destination-local';
 
 // Map NODE_ENV to valid TEnvironment
 const nodeEnv = process.env.NODE_ENV || 'production';
@@ -26,6 +27,11 @@ export const baseLogger = new plugins.smartlog.Smartlog({
 // Wire the buffer destination so all logs are captured
 baseLogger.addLogDestination(logBuffer);
 
+// Also write to the process console: without this, dcrouter-level logs (e.g.
+// RemoteIngress egress failures) exist only in the in-memory ops buffer and are
+// invisible to process-manager log capture.
+baseLogger.addLogDestination(new DestinationLocal());
+
 // Extended logger compatible with the original enhanced logger API
 class StandardLogger {
   private defaultContext: Record<string, any> = {};

package/ts/opsserver/handlers/email-ops.handler.ts

@@ -180,9 +180,18 @@ export class EmailOpsHandler {
     const { headers, body } = this.parseRawEmail(rawContent);
     const session = this.parseCachedEmailSession(doc);
 
+    // Display SmartMTA's true retry schedule — doc.nextAttempt is the spool's
+    // recovery lease (retry time + 30min grace), not the user-facing countdown.
+    const nextAttemptMs = doc.smartMtaNextAttempt ? new Date(doc.smartMtaNextAttempt).getTime() : NaN;
     return {
       ...base,
       smtpTransactions: structuredClone(doc.smtpTransactions || []),
+      ...(base.status === 'deferred' && Number.isFinite(nextAttemptMs) && nextAttemptMs > 0
+        ? {
+            nextAttemptAt: nextAttemptMs,
+            nextAttemptNumber: (doc.attempts || 0) + 1,
+          }
+        : {}),
       toList: doc.to || [],
       cc: doc.cc || [],
       smtpLog: this.flattenSmtpTransactions(doc.smtpTransactions || []),

package/ts_web/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@serve.zone/dcrouter',
-  version: '17.6.1',
+  version: '17.7.1',
   description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 }