@serve.zone/dcrouter 17.3.0 → 17.4.0

package/dist_ts/opsserver/handlers/email-ops.handler.js

@@ -155,14 +155,7 @@ export class EmailOpsHandler {
                 authMethod: '',
                 authUser: this.extractSessionUser(session),
             },
-            authenticationResults: {
-                spf: 'none',
-                spfDomain: '',
-                dkim: 'none',
-                dkimDomain: '',
-                dmarc: 'none',
-                dmarcPolicy: '',
-            },
+            authenticationResults: this.mapInboundSecurityResults(doc.inboundSecurityResults),
             rejectionReason: doc.status === 'failed' ? doc.lastError : undefined,
             bounceMessage: doc.status === 'failed' ? doc.lastError : undefined,
             headers,
@@ -328,6 +321,43 @@ export class EmailOpsHandler {
     /**
      * Map queue status to catalog TEmailStatus
      */
+    /**
+     * Maps SmartMTA inbound SPF/DKIM/DMARC verdicts (persisted as JSON on the
+     * cached email) into the catalog authenticationResults shape. Falls back to
+     * all-'none' when no verdicts were captured.
+     */
+    mapInboundSecurityResults(serializedArg) {
+        const noneResult = {
+            spf: 'none',
+            spfDomain: '',
+            dkim: 'none',
+            dkimDomain: '',
+            dmarc: 'none',
+            dmarcPolicy: '',
+        };
+        if (!serializedArg)
+            return noneResult;
+        try {
+            const parsed = JSON.parse(serializedArg);
+            const spfResult = (parsed.spf?.result || '').toLowerCase();
+            const spf = ['pass', 'fail', 'softfail', 'neutral'].find((value) => value === spfResult) || 'none';
+            const dkimSignatures = Array.isArray(parsed.dkim) ? parsed.dkim : [];
+            const validSignature = dkimSignatures.find((signature) => signature?.is_valid);
+            const dkim = validSignature ? 'pass' : dkimSignatures.length > 0 ? 'fail' : 'none';
+            const dmarc = parsed.dmarc ? (parsed.dmarc.passed ? 'pass' : 'fail') : 'none';
+            return {
+                spf,
+                spfDomain: parsed.spf?.domain || '',
+                dkim,
+                dkimDomain: validSignature?.domain || dkimSignatures[0]?.domain || '',
+                dmarc,
+                dmarcPolicy: parsed.dmarc?.policy || '',
+            };
+        }
+        catch {
+            return noneResult;
+        }
+    }
     mapStatus(queueStatus) {
         switch (queueStatus) {
             case 'pending':
@@ -335,6 +365,7 @@ export class EmailOpsHandler {
             case 'queued':
                 return 'pending';
             case 'delivered':
+            case 'stored':
                 return 'delivered';
             case 'failed':
                 return 'bounced';
@@ -363,4 +394,4 @@ export class EmailOpsHandler {
         return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"email-ops.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/email-ops.handler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"email-ops.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/email-ops.handler.ts"],"names":[],"mappings":"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"}

package/dist_ts_web/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@serve.zone/dcrouter',
-    version: '17.3.0',
+    version: '17.4.0',
     description: 'A multifaceted routing service handling mail and SMS delivery functions.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHNfd2ViLzAwX2NvbW1pdGluZm9fZGF0YS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4QixJQUFJLEVBQUUsc0JBQXNCO0lBQzVCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwwRUFBMEU7Q0FDeEYsQ0FBQSJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@serve.zone/dcrouter",
   "private": false,
-  "version": "17.3.0",
+  "version": "17.4.0",
   "description": "A multifaceted routing service handling mail and SMS delivery functions.",
   "type": "module",
   "bin": {
@@ -39,7 +39,7 @@
     "@push.rocks/smartacme": "^9.5.0",
     "@push.rocks/smartbucket": "^4.6.1",
     "@push.rocks/smartchallenge": "^1.1.0",
-    "@push.rocks/smartdata": "^7.3.1",
+    "@push.rocks/smartdata": "^7.4.0",
     "@push.rocks/smartdb": "^2.14.0",
     "@push.rocks/smartdns": "^7.12.1",
     "@push.rocks/smartfs": "^1.6.0",
@@ -49,7 +49,7 @@
     "@push.rocks/smartmcp": "^0.2.0",
     "@push.rocks/smartmetrics": "^3.0.3",
     "@push.rocks/smartmigration": "1.4.1",
-    "@push.rocks/smartmta": "^8.0.1",
+    "@push.rocks/smartmta": "^8.1.1",
     "@push.rocks/smartnetwork": "^4.8.0",
     "@push.rocks/smartpath": "^6.0.0",
     "@push.rocks/smartpromise": "^4.2.4",

package/readme.plan.md

@@ -0,0 +1,22 @@
+# Platform refactoring program
+
+Status: approved 2026-07-21, derived from that day's incident ledger (deploy-verification crashes, unbounded scans, DNS/IP logic duplication, version-skew scares). Upstream foundations are RELEASED; consumer adoption and the dcrouter-internal refactors are sequenced below — do not start them mid-wave, fold them into the next natural release of each surface.
+
+## Shipped upstream (adopt on next dependency bump)
+
+1. **Typed-request error boundary — already existed.** @api.global/typedrequest ≥ 3.3.2 sanitizes every handler/middleware throw into a structured error envelope (no socket destruction). Action: ensure every deployed consumer (cloudly, dcrouter, coreflow, onebox) resolves ≥ 3.3.2 and remove any local try/catch layers that only re-implement it.
+2. **Canonical IP helpers — @push.rocks/smartnetwork 4.9.0.** `isPublicIpAddress`, `toReverseDnsName` (non-throwing), `expandIpv6`, alongside the existing `getIpVersion`/`isValidIpv4`/`isValidIpv6`. Adoption: dcrouter ts/email/classes.mail-dns-sync.ts drops its private `toReverseDnsName`/`expandIpv6` (and the `Invalid IP address:` throw); cloudly's `isPublicDeploymentAddress` (classes.deploymentoperationmanager.ts) delegates to `isPublicIpAddress` (IPv4 semantics are byte-identical; IPv6 is 2000::/3 minus 2001:db8::/32).
+3. **Cursor pagination as the org default — @push.rocks/smartdata 7.4.0.** `SmartDataDbDoc.getPagedInstances({ filter, sortField, sortDirection, uniqueField, limit ≤ 1000, cursor, withTotal })` — seek pagination with a unique tiebreaker, never materializes the full set. Adoption: OpsConfigEventDoc.findFiltered becomes a thin wrapper; every future list surface uses it. Review rule: a list API without a cursor is a defect.
+4. **Binary provenance — @git.zone/tsrust 1.7.0.** Every built binary gets a JSON trailer (project, version, git commit, target, builtAt, tsrust version); `tsrust inspect <binary>` prints it. Adoption: bump tsrust across the Rust-bridge repos (smartdb, smartproxy, smartmta, smartnetwork, coretraffic, remoteingress) on their next releases; deployment verification can then assert binary identity instead of guessing (see the strings-on-x86 pitfall in smartdb readme.hints.md).
+
+## Sequenced (do NOT start mid-wave)
+
+5. **Ops-handler base class (dcrouter).** 25 handler files carry 11 copies of the requireAuth wrapper and 49 hand-written "manager not initialized" guards. Introduce a base with `registerMethod(name, scope, handlerFn)` doing auth, manager guard, error boundary, and realtime invalidation; migrate handlers opportunistically (new handlers must use it; old ones migrate when touched).
+6. **Composition-root service table (dcrouter).** classes.dcrouter.ts (2,326 lines) has 20 near-identical addService blocks with drift (withRetry presence, error logging). Replace with a declarative registration table; behavior-preserving.
+7. **Mail-detail contract dedup (interfaces + catalog + dcrouter).** IEmailDetail and friends exist twice by convention ("matches @serve.zone/catalog"). Move the contract into @serve.zone/interfaces; catalog and dcrouter consume it. Sequence AFTER the in-flight mail-detail wave (countdown, verdicts, transfer stats) fully lands — one migration wave, no compatibility layer.
+8. **Version-skew hardening (conventions).** (a) Tolerant-reader parsing for persisted operation/evidence/state documents that cross release boundaries; (b) version handshake wherever a live process or socket is reused across upgrades (LocalSmartDb engine reuse — smartdb plan Track 6; gateway-client policyGeneration is the precedent).
+
+## Non-goals
+
+- No big-bang rewrites: every item lands either additive-upstream or inside a surface's next natural release.
+- No compatibility layers (org rule): consumers move to the canonical helpers outright when their wave touches the code.

package/ts/00_commitinfo_data.ts

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

package/ts/classes.dcrouter.ts

@@ -1719,6 +1719,21 @@ export class DcRouter {
   
   
   
+  /**
+   * Org default: every email domain accepts inbound mail. Domains without an
+   * explicit inbound policy get catch-all store with 30-day retention, so
+   * replies to platform-sent mail are never bounced by omission. Explicit
+   * SmartMTA routes always outrank this no-route fallback.
+   */
+  private applyDefaultInboundPolicy<T extends { inboundPolicy?: { defaultAction: 'store' | 'reject'; retentionDays: number } }>(
+    domainsArg: T[] | undefined,
+  ): T[] {
+    return (domainsArg || []).map((domain) => ({
+      ...domain,
+      inboundPolicy: domain.inboundPolicy ?? { defaultAction: 'store' as const, retentionDays: 30 },
+    }));
+  }
+
   /**
    * Set up unified email handling with pattern-based routing
    * This implements the consolidated emailConfig approach
@@ -1770,6 +1785,7 @@ export class DcRouter {
     let emailConfig: IUnifiedEmailServerOptions = await this.workAppMailManager.applyStoredIdentitiesToEmailConfig({
       ...this.options.emailConfig,
       ports: mappedEmailPorts,
+      domains: this.applyDefaultInboundPolicy(this.options.emailConfig.domains),
       dkimKeyProvisioning: 'caller-managed',
       persistRoutes: this.options.emailConfig.persistRoutes ?? false,
       queue: queueOptions,
@@ -1812,6 +1828,13 @@ export class DcRouter {
             smtpMessage: configuredDecision?.smtpMessage ?? dcrouterDecision.smtpMessage,
           };
         },
+        onAcceptEnvelope: async (context) => {
+          const emailServer = this.emailServer;
+          if (!emailServer) {
+            throw new Error('Email server is not available for durable envelope acceptance');
+          }
+          await this.acceptedEmailSpool.acceptEnvelope(context, emailServer);
+        },
       },
     });
     
@@ -1827,7 +1850,7 @@ export class DcRouter {
       )) {
         emailConfig = await this.workAppMailManager.applyStoredIdentitiesToEmailConfig({
           ...emailConfig,
-          domains: [...(this.options.emailConfig?.domains || [])],
+          domains: this.applyDefaultInboundPolicy(this.options.emailConfig?.domains),
         });
         // DkimManager captures its DomainRegistry at construction. Rebuild the
         // unstarted server so per-domain repair failures are absent from

package/ts/db/documents/classes.cached.email.ts

@@ -6,7 +6,7 @@ const TTL = plugins.smartdata.smartdataTtlValues;
 /**
  * Email status in the cache
  */
-export type TCachedEmailStatus = 'pending' | 'processing' | 'queued' | 'delivered' | 'failed' | 'deferred';
+export type TCachedEmailStatus = 'pending' | 'processing' | 'queued' | 'delivered' | 'failed' | 'deferred' | 'stored';
 
 /**
  * Direction of an accepted email: 'inbound' = received from a remote peer,
@@ -141,6 +141,14 @@ export class CachedEmail extends plugins.smartdata.SmartdataCachedDocument<Cache
   @plugins.smartdata.svDb()
   public status!: TCachedEmailStatus;
 
+  /** Attachment count derived from the parsed message at acceptance. */
+  @plugins.smartdata.svDb()
+  public attachmentCount?: number;
+
+  /** JSON-serialized inbound SPF/DKIM/DMARC verdicts from the SMTP session. */
+  @plugins.smartdata.svDb()
+  public inboundSecurityResults?: string;
+
   /**
    * Number of delivery attempts
    */
@@ -344,6 +352,18 @@ export class CachedEmail extends plugins.smartdata.SmartdataCachedDocument<Cache
     this.deliveredAt = new Date();
   }
 
+  /**
+   * Mark as terminally stored (catch-all inbound): visible in the email log,
+   * pruned after the retention window.
+   */
+  public markStored(retentionMs: number): void {
+    this.status = 'stored';
+    this.deliveredAt = new Date();
+    // Base-class TTL: the CacheCleaner deletes expired rows and their raw
+    // payloads via beforeDeleteCachedEmail.
+    this.setTTL(retentionMs);
+  }
+
   /**
    * Mark as failed with error
    */

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

@@ -7,6 +7,7 @@ import type {
 } from '../db/documents/classes.cached.email.js';
 import type {
   Email,
+  IAcceptEnvelopeContext,
   IExtendedSmtpSession,
   IMessageAcceptanceContext,
   IMessageAcceptanceDecision,
@@ -20,6 +21,8 @@ const ACCEPTED_EMAIL_RETRY_DELAY_MS = 5 * 60_000;
 const ACCEPTED_EMAIL_QUEUE_LEASE_MS = 30 * 60_000;
 const ACCEPTED_EMAIL_SPOOL_BATCH_SIZE = 25;
 const ACCEPTED_EMAIL_STOP_DRAIN_TIMEOUT_MS = 30_000;
+/** Retention for catch-all stored inbound mail (30 days). */
+const INBOUND_STORE_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
 
 export type TSmartMtaQueueItemLike = {
   id?: string;
@@ -252,6 +255,114 @@ export class AcceptedEmailSpool {
     };
   }
 
+  /**
+   * Durable acceptance for envelopes containing at least one catch-all store
+   * route: anchors the exact raw message + metadata as a CachedEmail before
+   * SMTP 250, then dispatches any non-store recipients through SmartMTA's
+   * exact-plan executor. Store recipients are fulfilled by the anchor itself.
+   */
+  public async acceptEnvelope(
+    context: IAcceptEnvelopeContext,
+    emailServer: UnifiedEmailServer,
+  ): Promise<void> {
+    if (!this.dcRouterRef.dcRouterDb?.isReady()) {
+      throw new Error('DcRouterDb is not available for durable envelope acceptance');
+    }
+    this.throwIfMessageAcceptanceAborted(context.abortSignal);
+
+    const email = context.email;
+    const session = context.session;
+    const cachedEmail = CachedEmail.createNew();
+    this.removeHeader(email.headers, DCROUTER_CACHE_ID_HEADER);
+    email.headers[DCROUTER_CACHE_ID_HEADER] = cachedEmail.id;
+    cachedEmail.messageId = email.headers['Message-ID'] || email.headers['message-id'] || cachedEmail.id;
+    cachedEmail.from = context.envelope.mailFrom || email.from || '';
+    cachedEmail.to = context.envelope.rcptTo.length > 0
+      ? [...context.envelope.rcptTo]
+      : Array.isArray(email.to) ? email.to : [];
+    cachedEmail.cc = Array.isArray(email.cc) ? email.cc : [];
+    cachedEmail.bcc = Array.isArray(email.bcc) ? email.bcc : [];
+    cachedEmail.subject = email.subject || '';
+    cachedEmail.attachmentCount = context.attachmentCount;
+    if (context.securityResults) {
+      cachedEmail.inboundSecurityResults = JSON.stringify(context.securityResults);
+    }
+
+    // Build the exact per-recipient dispatch plan before durably committing,
+    // so an unplannable envelope is refused instead of half-anchored.
+    const idempotencyKeys = context.resolvedRecipientRoutes.map(
+      (resolution) => `${cachedEmail.id}:${resolution.recipient}`,
+    );
+    const plan = emailServer.createAcceptedEnvelopeDispatchPlan(context, idempotencyKeys);
+    const nonStoreEntries = plan.filter((entry) => entry.action.type !== 'store');
+
+    const persistedRawMessage = this.setDcRouterCacheIdHeader(
+      context.rawMessage.toString('utf8'),
+      cachedEmail.id,
+    );
+    await this.persistRawMessage(cachedEmail, persistedRawMessage);
+    cachedEmail.direction = session.authenticated ? 'outbound' : 'inbound';
+    cachedEmail.acceptedAt = Date.now();
+    cachedEmail.markStored(INBOUND_STORE_RETENTION_MS);
+    cachedEmail.routeData = JSON.stringify({
+      acceptedAt: new Date().toISOString(),
+      acceptance: 'durable-envelope',
+      recipientPlans: plan.map((entry) => ({
+        recipient: entry.recipient,
+        routeName: entry.routeName,
+        source: entry.source,
+        actionType: entry.action.type,
+      })),
+      session: {
+        id: session.id,
+        remoteAddress: session.remoteAddress,
+        clientHostname: session.clientHostname,
+        secure: !!session.secure,
+        authenticated: !!session.authenticated,
+        user: session.user,
+        envelope: context.envelope,
+      },
+    });
+    cachedEmail.updateSenderDomain();
+    cachedEmail.updateRecipientDomains();
+    try {
+      await cachedEmail.save();
+      await this.notifyEmailQueuePersisted(cachedEmail, 'envelope-stored');
+    } catch (error) {
+      await this.deleteRawMessage(cachedEmail).catch(() => undefined);
+      throw error;
+    }
+    if (context.abortSignal?.aborted) {
+      cachedEmail.markFailed('Envelope acceptance aborted before SMTP success');
+      await cachedEmail.save();
+      await this.notifyEmailQueuePersisted(cachedEmail, 'envelope-acceptance-aborted');
+      throw new Error('Envelope acceptance aborted before SMTP success');
+    }
+
+    if (nonStoreEntries.length > 0) {
+      const dispatchResult = await emailServer.dispatchAcceptedEnvelope(
+        context.rawMessage,
+        plan,
+        {
+          mailFrom: context.envelope.mailFrom,
+          session: {
+            id: session.id,
+            remoteAddress: session.remoteAddress,
+            clientHostname: session.clientHostname,
+            secure: !!session.secure,
+            authenticated: !!session.authenticated,
+          },
+        },
+      );
+      const failed = dispatchResult.results.filter(
+        (result) => result.status === 'failed' || result.status === 'rejected',
+      );
+      if (failed.length > 0) {
+        logger.log('warn', `Durable envelope ${cachedEmail.id}: ${failed.length}/${dispatchResult.results.length} non-store recipients failed dispatch: ${failed.map((result) => `${result.recipient}=${result.message || result.status}`).join('; ')}`);
+      }
+    }
+  }
+
   /** Start the interval-driven spool processor and trigger an immediate run. */
   public start(): void {
     this.clearSpoolTimer();

package/ts/email/classes.smartmta-storage-manager.ts

@@ -1,5 +1,9 @@
 import * as plugins from '../plugins.js';
-import type { IStorageManager } from '@push.rocks/smartmta';
+import type {
+  IStorageManager,
+  IStorageListPageOptions,
+  IStorageListPageResult,
+} from '@push.rocks/smartmta';
 import {
   getSmartMtaTextNamespace,
   hashSmartMtaStorageKey,
@@ -98,6 +102,58 @@ export class SmartMtaStorageManager implements IStorageManager {
       .sort();
   }
 
+  /**
+   * Bounded, deletion-stable page listing: seeks strictly beyond the last
+   * returned key, so tokens stay valid while pages are deleted and an
+   * otherwise stable prefix is always exhausted.
+   */
+  public async listPage(
+    prefix: string,
+    options: IStorageListPageOptions,
+  ): Promise<IStorageListPageResult> {
+    const normalizedPrefix = normalizeSmartMtaStorageKey(prefix);
+    getSmartMtaTextNamespace(normalizedPrefix);
+    const requestedLimit = Number.isSafeInteger(options?.limit) && options.limit > 0
+      ? options.limit
+      : 100;
+    const limit = Math.min(requestedLimit, 1000);
+    let seekAfter: string | undefined;
+    if (options?.continuationToken) {
+      const decoded = Buffer.from(options.continuationToken, 'base64url').toString('utf8');
+      if (!decoded.startsWith(normalizedPrefix)) {
+        throw new Error('SmartMTA storage continuation token does not match the requested prefix');
+      }
+      seekAfter = decoded;
+    }
+
+    const documents = await this.collection
+      .find({
+        key: {
+          ...(seekAfter ? { $gt: seekAfter } : { $gte: normalizedPrefix }),
+          $lt: `${normalizedPrefix}￿`,
+        },
+      })
+      .sort({ key: 1 })
+      .limit(limit + 1)
+      .toArray();
+
+    const hasMore = documents.length > limit;
+    const pageDocuments = documents.slice(0, limit);
+    const keys = pageDocuments
+      .map((document: ISmartMtaStorageDocument) => this.validateDocument(document).key)
+      .filter((key: string) => key.startsWith(normalizedPrefix));
+    const lastKey = pageDocuments.length > 0
+      ? (pageDocuments[pageDocuments.length - 1] as ISmartMtaStorageDocument).key
+      : undefined;
+
+    return {
+      keys,
+      ...(hasMore && lastKey
+        ? { continuationToken: Buffer.from(lastKey, 'utf8').toString('base64url') }
+        : {}),
+    };
+  }
+
   public async delete(key: string): Promise<void> {
     const normalizedKey = normalizeSmartMtaStorageKey(key);
     getSmartMtaTextNamespace(normalizedKey);

package/ts/email/smartmta-storage-policy.ts

@@ -11,6 +11,8 @@ export const smartMtaTextNamespaces: readonly ISmartMtaTextNamespace[] = Object.
   { prefix: '/email/bounces/', maxBytes: 8 * 1024 * 1024 },
   { prefix: '/email/templates/', maxBytes: 4 * 1024 * 1024 },
   { prefix: '/email/routes/config.json', maxBytes: 4 * 1024 * 1024 },
+  // SmartMTA 8.1+ accepted-envelope dispatch bookkeeping (idempotent replay records).
+  { prefix: '/email/accepted-envelope-dispatch/', maxBytes: 64 * 1024 },
   { prefix: '/security/ip-reputation-cache.json', maxBytes: 8 * 1024 * 1024 },
   { prefix: '/workhosters/mail-identities.json', maxBytes: 4 * 1024 * 1024 },
 ]);

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

@@ -197,14 +197,7 @@ export class EmailOpsHandler {
         authMethod: '',
         authUser: this.extractSessionUser(session),
       },
-      authenticationResults: {
-        spf: 'none',
-        spfDomain: '',
-        dkim: 'none',
-        dkimDomain: '',
-        dmarc: 'none',
-        dmarcPolicy: '',
-      },
+      authenticationResults: this.mapInboundSecurityResults(doc.inboundSecurityResults),
       rejectionReason: doc.status === 'failed' ? doc.lastError : undefined,
       bounceMessage: doc.status === 'failed' ? doc.lastError : undefined,
       headers,
@@ -388,6 +381,46 @@ export class EmailOpsHandler {
   /**
    * Map queue status to catalog TEmailStatus
    */
+  /**
+   * Maps SmartMTA inbound SPF/DKIM/DMARC verdicts (persisted as JSON on the
+   * cached email) into the catalog authenticationResults shape. Falls back to
+   * all-'none' when no verdicts were captured.
+   */
+  private mapInboundSecurityResults(serializedArg?: string): interfaces.requests.IEmailDetail['authenticationResults'] {
+    const noneResult: interfaces.requests.IEmailDetail['authenticationResults'] = {
+      spf: 'none',
+      spfDomain: '',
+      dkim: 'none',
+      dkimDomain: '',
+      dmarc: 'none',
+      dmarcPolicy: '',
+    };
+    if (!serializedArg) return noneResult;
+    try {
+      const parsed = JSON.parse(serializedArg) as {
+        spf?: { result?: string; domain?: string } | null;
+        dkim?: Array<{ is_valid?: boolean; domain?: string | null; status?: string }> | null;
+        dmarc?: { passed?: boolean; policy?: string; domain?: string } | null;
+      };
+      const spfResult = (parsed.spf?.result || '').toLowerCase();
+      const spf = (['pass', 'fail', 'softfail', 'neutral'] as const).find((value) => value === spfResult) || 'none';
+      const dkimSignatures = Array.isArray(parsed.dkim) ? parsed.dkim : [];
+      const validSignature = dkimSignatures.find((signature) => signature?.is_valid);
+      const dkim = validSignature ? 'pass' : dkimSignatures.length > 0 ? 'fail' : 'none';
+      const dmarc = parsed.dmarc ? (parsed.dmarc.passed ? 'pass' : 'fail') : 'none';
+      return {
+        spf,
+        spfDomain: parsed.spf?.domain || '',
+        dkim,
+        dkimDomain: validSignature?.domain || dkimSignatures[0]?.domain || '',
+        dmarc,
+        dmarcPolicy: parsed.dmarc?.policy || '',
+      };
+    } catch {
+      return noneResult;
+    }
+  }
+
   private mapStatus(queueStatus: string): interfaces.requests.TEmailStatus {
     switch (queueStatus) {
       case 'pending':
@@ -395,6 +428,7 @@ export class EmailOpsHandler {
       case 'queued':
         return 'pending';
       case 'delivered':
+      case 'stored':
         return 'delivered';
       case 'failed':
         return 'bounced';

package/ts_web/00_commitinfo_data.ts

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