@serve.zone/dcrouter 18.3.0 → 18.4.1

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

@@ -33,6 +33,8 @@ export class EmailOpsHandler {
             dataArg.direction,
             dataArg.limit,
             dataArg.search,
+            dataArg.from,
+            dataArg.to,
           );
         }
       )
@@ -116,11 +118,18 @@ export class EmailOpsHandler {
     direction?: interfaces.requests.TEmailDirection,
     limitArg?: number,
     searchArg?: string,
+    fromArg?: number,
+    toArg?: number,
   ): Promise<interfaces.requests.IEmail[]> {
     const limit = Math.min(Math.max(Math.floor(limitArg ?? 200), 1), 1000);
     const search = normalizeEmailLogSearch(searchArg);
+    const range = this.normalizeEmailLogRange(fromArg, toArg);
     const cachedDocs = this.isCachedEmailStoreAvailable()
-      ? await CachedEmail.findRecent(limit, { direction, search: search || undefined })
+      ? await CachedEmail.findRecent(limit, {
+          direction,
+          search: search || undefined,
+          ...(range || {}),
+        })
       : [];
     const emails = cachedDocs.map((doc) => this.mapCachedEmailToEmail(doc));
     const representedIds = new Set(cachedDocs.map((doc) => doc.id));
@@ -136,7 +145,11 @@ export class EmailOpsHandler {
           continue;
         }
         const email = this.mapQueueItemToEmail(item);
-        if (this.matchesEmailSearch(email, search)) {
+        const emailTimestamp = new Date(email.timestamp).getTime();
+        if (
+          this.matchesEmailSearch(email, search)
+          && (!range || (emailTimestamp >= range.from && emailTimestamp <= range.to))
+        ) {
           emails.push(email);
         }
       }
@@ -152,17 +165,23 @@ export class EmailOpsHandler {
     direction?: interfaces.requests.TEmailDirection,
     limitArg?: number,
     searchArg?: string,
+    fromArg?: number,
+    toArg?: number,
   ): Promise<interfaces.requests.IReq_GetAllEmails['response']> {
     const search = normalizeEmailLogSearch(searchArg);
     const now = Date.now();
+    const storeAvailable = this.isCachedEmailStoreAvailable();
     const filter = { direction, search: search || undefined };
-    const emails = await this.getAllEmails(direction, limitArg, search);
+    const emails = await this.getAllEmails(direction, limitArg, search, fromArg, toArg);
+    const trafficContextEmails = !storeAvailable && (fromArg !== undefined || toArg !== undefined)
+      ? await this.getAllEmails(direction, 1000, search)
+      : emails;
 
     let oldestMatchAt: number | null = null;
     if (search) {
-      oldestMatchAt = this.isCachedEmailStoreAvailable()
+      oldestMatchAt = storeAvailable
         ? await CachedEmail.findOldestAcceptedAt(filter, now - EMAIL_LOG_RETENTION_MS)
-        : emails.reduce<number | null>((oldest, email) => {
+        : trafficContextEmails.reduce<number | null>((oldest, email) => {
             const timestamp = new Date(email.timestamp).getTime();
             if (!Number.isFinite(timestamp)) return oldest;
             return oldest === null ? timestamp : Math.min(oldest, timestamp);
@@ -171,14 +190,14 @@ export class EmailOpsHandler {
 
     const descriptor = selectEmailLogTrafficWindow(search, oldestMatchAt, now);
     const emptyTraffic = buildEmailLogTraffic(descriptor, [], now);
-    const sparseTraffic = this.isCachedEmailStoreAvailable()
+    const sparseTraffic = storeAvailable
       ? await CachedEmail.aggregateEmailLogTraffic(
           filter,
           emptyTraffic.windowStart,
           emptyTraffic.windowEnd,
           descriptor.bucketSizeMs,
         )
-      : aggregateEmailLogTrafficInMemory(emails, descriptor, now);
+      : aggregateEmailLogTrafficInMemory(trafficContextEmails, descriptor, now);
 
     return {
       emails,
@@ -186,6 +205,26 @@ export class EmailOpsHandler {
     };
   }
 
+  private normalizeEmailLogRange(
+    fromArg?: number,
+    toArg?: number,
+  ): { from: number; to: number } | undefined {
+    if (fromArg === undefined && toArg === undefined) return undefined;
+    const now = Date.now();
+    if (
+      !Number.isSafeInteger(fromArg)
+      || !Number.isSafeInteger(toArg)
+      || (fromArg as number) < now - EMAIL_LOG_RETENTION_MS
+      || (toArg as number) > now + 60_000
+      || (toArg as number) < (fromArg as number)
+    ) {
+      throw new plugins.typedrequest.TypedResponseError(
+        'Email log time range is invalid or outside retention.',
+      );
+    }
+    return { from: fromArg as number, to: toArg as number };
+  }
+
   private async getEmailSecurityFindings(
     limitArg?: number,
   ): Promise<interfaces.requests.IEmailSecurityFinding[]> {
@@ -261,10 +300,15 @@ export class EmailOpsHandler {
    * Map a CachedEmail row to catalog IEmail format
    */
   private mapCachedEmailToEmail(doc: CachedEmail): interfaces.requests.IEmail {
+    const mappedStatus = this.mapStatus(doc.status);
     return {
       id: doc.id,
       direction: doc.direction,
-      status: this.mapStatus(doc.status),
+      status: doc.direction === 'inbound'
+        && mappedStatus === 'accepted'
+        && doc.inboundSecurityDisposition === 'flagged'
+        ? 'flagged'
+        : mappedStatus,
       from: doc.from || '',
       to: doc.to?.[0] || '',
       subject: doc.subject || '',
@@ -295,9 +339,13 @@ export class EmailOpsHandler {
     // 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;
+    const outboundAuthentication = doc.direction === 'outbound'
+      ? this.getLatestOutboundAuthentication(doc.smtpTransactions || [])
+      : undefined;
     return {
       ...base,
       smtpTransactions: structuredClone(doc.smtpTransactions || []),
+      ...(outboundAuthentication ? { outboundAuthentication } : {}),
       ...(base.status === 'deferred' && Number.isFinite(nextAttemptMs) && nextAttemptMs > 0
         ? {
             nextAttemptAt: nextAttemptMs,
@@ -318,7 +366,9 @@ export class EmailOpsHandler {
         authMethod: '',
         authUser: this.extractSessionUser(session),
       },
-      authenticationResults: this.mapInboundSecurityResults(doc.inboundSecurityResults),
+      authenticationResults: outboundAuthentication
+        ? this.mapOutboundAuthenticationResults(outboundAuthentication)
+        : this.mapInboundSecurityResults(doc.inboundSecurityResults),
       rejectionReason: doc.status === 'failed' ? doc.lastError : undefined,
       bounceMessage: doc.status === 'failed' ? doc.lastError : undefined,
       headers,
@@ -449,6 +499,7 @@ export class EmailOpsHandler {
     const base = this.mapQueueItemToEmail(item);
     const processingResult = item.processingResult;
 
+    const outboundAuthentication = this.getLatestOutboundAuthentication(item.smtpTransactions || []);
     let toList: string[] = [];
     let cc: string[] = [];
     let headers: Record<string, string> = {};
@@ -471,6 +522,7 @@ export class EmailOpsHandler {
       ...base,
       smtpTransactions: structuredClone(item.smtpTransactions || []),
       toList,
+      ...(outboundAuthentication ? { outboundAuthentication } : {}),
       cc,
       smtpLog: this.flattenSmtpTransactions(item.smtpTransactions || []),
       connectionInfo: {
@@ -484,14 +536,7 @@ export class EmailOpsHandler {
         authMethod: '',
         authUser: '',
       },
-      authenticationResults: {
-        spf: 'none',
-        spfDomain: '',
-        dkim: 'none',
-        dkimDomain: '',
-        dmarc: 'none',
-        dmarcPolicy: '',
-      },
+      authenticationResults: this.mapOutboundAuthenticationResults(outboundAuthentication),
       rejectionReason: item.status === 'failed' ? item.lastError : undefined,
       bounceMessage: item.status === 'failed' ? item.lastError : undefined,
       headers,
@@ -499,6 +544,47 @@ export class EmailOpsHandler {
     };
   }
 
+  private getLatestOutboundAuthentication(
+    transactionsArg: Array<{ outboundAuthentication?: interfaces.requests.IOutboundAuthenticationCheck }>,
+  ): interfaces.requests.IOutboundAuthenticationCheck | undefined {
+    for (let index = transactionsArg.length - 1; index >= 0; index--) {
+      const authentication = transactionsArg[index]?.outboundAuthentication;
+      if (!authentication) continue;
+      return structuredClone(authentication);
+    }
+    return undefined;
+  }
+
+  private mapOutboundAuthenticationResults(
+    authenticationArg?: interfaces.requests.IOutboundAuthenticationCheck,
+  ): interfaces.requests.IEmailDetail['authenticationResults'] {
+    const noneResult: interfaces.requests.IEmailDetail['authenticationResults'] = {
+      spf: 'none',
+      spfDomain: '',
+      dkim: 'none',
+      dkimDomain: '',
+      dmarc: 'none',
+      dmarcPolicy: '',
+    };
+    if (authenticationArg?.state !== 'completed') return noneResult;
+    const dkimSignatures = (authenticationArg.dkim || [])
+      .filter((signature) => signature.status.toLowerCase() !== 'none');
+    const validDkim = dkimSignatures.find((signature) => signature.is_valid);
+    const spfValue = (authenticationArg.spf?.result || '').toLowerCase();
+    const spf = (['pass', 'fail', 'softfail', 'neutral'] as string[]).includes(spfValue)
+      ? spfValue as interfaces.requests.IAuthenticationResults['spf']
+      : 'none';
+    return {
+      spf,
+      spfDomain: authenticationArg.spf?.domain || '',
+      dkim: validDkim ? 'pass' : dkimSignatures.length > 0 ? 'fail' : 'none',
+      dkimDomain: validDkim?.domain || dkimSignatures[0]?.domain || '',
+      dmarc: authenticationArg.dmarc ? (authenticationArg.dmarc.passed ? 'pass' : 'fail') : 'none',
+      dmarcPolicy: authenticationArg.dmarc?.policy || '',
+    };
+  }
+
+
   /**
    * Map queue status to catalog TEmailStatus
    */
@@ -525,7 +611,8 @@ export class EmailOpsHandler {
       };
       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 dkimSignatures = (Array.isArray(parsed.dkim) ? parsed.dkim : [])
+        .filter((signature) => String(signature?.status || '').toLowerCase() !== 'none');
       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';

package/ts/remoteingress/classes.tunnel-manager.ts

@@ -370,6 +370,20 @@ export class TunnelManager {
     return { ready: false, eligibleEdgeCount: 0, reason };
   }
 
+  /**
+   * Delegate source-bound connection evidence to the owned RemoteIngress hub.
+   */
+  public async waitForEgressConnectionEvidence(
+    proxyId: string,
+    edgeId: string,
+    timeoutMs?: number,
+  ): Promise<plugins.remoteingress.IRemoteIngressHubEgressConnectionEvent | null> {
+    if (this.stopped) {
+      return null;
+    }
+    return await this.hub.waitForEgressConnectionEvidence(proxyId, edgeId, timeoutMs);
+  }
+
   public async stopEgressTcpProxy(proxyId: string): Promise<boolean> {
     if (this.stopped) {
       return false;

package/ts_web/00_commitinfo_data.ts

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

package/ts_web/appstate/email-ops.ts

@@ -8,6 +8,7 @@ export interface IEmailOpsState {
   emails: interfaces.requests.IEmail[];
   traffic: interfaces.requests.IEmailLogTraffic | null;
   searchQuery: string;
+  selectedRange: { from: number; to: number } | null;
   securityFindings: interfaces.requests.IEmailSecurityFinding[];
   securityFindingsLoading: boolean;
   securityFindingsError: string | null;
@@ -23,6 +24,7 @@ export const emailOpsStatePart = await appState.getStatePart<IEmailOpsState>(
     emails: [],
     traffic: null,
     searchQuery: '',
+    selectedRange: null,
     securityFindings: [],
     securityFindingsLoading: false,
     securityFindingsError: null,
@@ -38,11 +40,13 @@ export const emailOpsStatePart = await appState.getStatePart<IEmailOpsState>(
 // ============================================================================
 
 let activeSearchQuery = '';
+let activeSelectedRange: { from: number; to: number } | null = null;
 let emailListRequestGeneration = 0;
 let securityFindingsRequestGeneration = 0;
 
 export interface IEmailOpsFetchOptions {
   searchQuery?: string;
+  selectedRange?: { from: number; to: number } | null;
 }
 
 export function setActiveEmailSearchQuery(searchQueryArg: string): string {
@@ -58,6 +62,27 @@ export function setActiveEmailSearchQuery(searchQueryArg: string): string {
   return activeSearchQuery;
 }
 
+export function setActiveEmailSelectedRange(
+  rangeArg: { from: number; to: number } | null,
+): { from: number; to: number } | null {
+  if (rangeArg && (
+    !Number.isSafeInteger(rangeArg.from)
+    || !Number.isSafeInteger(rangeArg.to)
+    || rangeArg.from < 0
+    || rangeArg.to <= rangeArg.from
+  )) {
+    throw new Error('Invalid email time range');
+  }
+  activeSelectedRange = rangeArg ? { ...rangeArg } : null;
+  emailListRequestGeneration++;
+  const currentState = emailOpsStatePart.getState()!;
+  emailOpsStatePart.setState({
+    ...currentState,
+    selectedRange: activeSelectedRange,
+  });
+  return activeSelectedRange;
+}
+
 // Fetch All Emails Action
 export const fetchAllEmailsAction = emailOpsStatePart.createAction<IEmailOpsFetchOptions | null>(async (
   statePartArg,
@@ -69,6 +94,9 @@ export const fetchAllEmailsAction = emailOpsStatePart.createAction<IEmailOpsFetc
   const searchQuery = dataArg?.searchQuery !== undefined
     ? setActiveEmailSearchQuery(dataArg.searchQuery)
     : activeSearchQuery;
+  const selectedRange = dataArg?.selectedRange !== undefined
+    ? setActiveEmailSelectedRange(dataArg.selectedRange)
+    : activeSelectedRange;
   const requestGeneration = ++emailListRequestGeneration;
   const ticket = captureRealtimeTicket(['emailQueue', 'smtpAttempts']);
 
@@ -80,6 +108,7 @@ export const fetchAllEmailsAction = emailOpsStatePart.createAction<IEmailOpsFetc
     const response = await request.fire({
       identity: context.identity,
       ...(searchQuery ? { search: searchQuery } : {}),
+      ...(selectedRange ? selectedRange : {}),
     });
     if (
       requestGeneration !== emailListRequestGeneration
@@ -92,6 +121,7 @@ export const fetchAllEmailsAction = emailOpsStatePart.createAction<IEmailOpsFetc
       traffic: response.traffic,
       searchQuery,
       isLoading: false,
+      selectedRange,
       error: null,
       lastUpdated: Date.now(),
     };

package/ts_web/elements/email/ops-view-emails.ts

@@ -29,6 +29,9 @@ export class OpsViewEmails extends DeesElement {
   @state()
   accessor searchQuery = '';
 
+  @state()
+  accessor selectedRange: { from: number; to: number } | null = null;
+
   private stateSubscription: any;
   private lastEmailOpsUpdate = 0;
   private detailRequestGeneration = 0;
@@ -40,6 +43,7 @@ export class OpsViewEmails extends DeesElement {
       this.emails = state.emails;
       this.traffic = state.traffic;
       this.searchQuery = state.searchQuery;
+      this.selectedRange = state.selectedRange;
       const hasNewSnapshot = state.lastUpdated > this.lastEmailOpsUpdate;
       this.lastEmailOpsUpdate = Math.max(this.lastEmailOpsUpdate, state.lastUpdated);
       if (hasNewSnapshot && this.selectedEmail) {
@@ -75,7 +79,23 @@ export class OpsViewEmails extends DeesElement {
         height: 100%;
       }
 
-      dees-chart-area[slot='above-table'] {
+      .chartStack {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+      }
+
+      .rangeSummary {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        min-height: 32px;
+        padding: 0 4px;
+        color: ${cssManager.bdTheme('#374151', '#d1d5db')};
+        font-size: 13px;
+      }
+
+      .chartStack dees-chart-area {
         min-height: 360px;
       }
     `,
@@ -101,16 +121,26 @@ export class OpsViewEmails extends DeesElement {
                 @email-click=${this.handleEmailClick}
               >
                 ${this.traffic ? html`
-                  <dees-chart-area
-                    slot="above-table"
-                    .label=${this.traffic.label}
-                    .series=${this.getEmailTrafficSeries()}
-                    .realtimeMode=${true}
-                    .rollingWindow=${this.traffic.durationMs}
-                    .legendStats=${['latest']}
-                    .chartLines=${[]}
-                    .yAxisFormatter=${(valueArg: number) => `${valueArg}`}
-                  ></dees-chart-area>
+                  <div slot="above-table" class="chartStack">
+                    ${this.selectedRange ? html`
+                      <div class="rangeSummary">
+                        <span>${this.formatSelectedRange()}</span>
+                        <dees-button @click=${this.clearSelectedRange}>Clear time range</dees-button>
+                      </div>
+                    ` : html``}
+                    <dees-chart-area
+                      .label=${this.traffic.label}
+                      .series=${this.getEmailTrafficSeries()}
+                      .realtimeMode=${true}
+                      .rollingWindow=${this.traffic.durationMs}
+                      .legendStats=${['latest']}
+                      .chartLines=${[]}
+                      .rangeSelectionEnabled=${true}
+                      .selectedRange=${this.selectedRange}
+                      .yAxisFormatter=${(valueArg: number) => `${valueArg}`}
+                      @range-change=${this.handleRangeChange}
+                    ></dees-chart-area>
+                  </div>
                 ` : html``}
               </sz-mta-list-view>
             `
@@ -155,6 +185,32 @@ export class OpsViewEmails extends DeesElement {
     }, 300);
   }
 
+
+  private handleRangeChange = (
+    eventArg: CustomEvent<{ from: number; to: number }>,
+  ): void => {
+    void appstate.emailOpsStatePart.dispatchAction(
+      appstate.fetchAllEmailsAction,
+      { selectedRange: eventArg.detail },
+    );
+  };
+
+  private clearSelectedRange = (): void => {
+    void appstate.emailOpsStatePart.dispatchAction(
+      appstate.fetchAllEmailsAction,
+      { selectedRange: null },
+    );
+  };
+
+  private formatSelectedRange(): string {
+    if (!this.selectedRange) return '';
+    const formatter = new Intl.DateTimeFormat(undefined, {
+      dateStyle: 'medium',
+      timeStyle: 'short',
+    });
+    return `Showing emails from ${formatter.format(this.selectedRange.from)} to ${formatter.format(this.selectedRange.to)}`;
+  }
+
   private getEmailTrafficSeries(): Array<{
     name: string;
     color: string;