diff --git a/.gitignore b/.gitignore index 54c1397..dbb120d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,24 @@ -node_modules/ .nogit/ + +# artifacts +coverage/ +public/ + +# installs +node_modules/ + +# caches +.yarn/ +.cache/ +.rpt2_cache + +# builds dist/ -dist_rust/ -rust/target/ -deno.lock -*.log -.env -.DS_Store +dist_*/ + +# AI +.claude/ +.serena/ + +#------# custom +rust/target \ No newline at end of file diff --git a/changelog.md b/changelog.md index af61137..0e975e2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Changelog +## 2026-02-10 - 2.3.1 - fix(npmextra) +update .gitignore and npmextra.json to add ignore patterns, registries, and module metadata + +- .gitignore: expanded ignore list for artifacts, installs, caches, builds, AI dirs, and rust target path +- npmextra.json: added npmjs registry alongside internal Verdaccio registry for @git.zone/cli release settings +- npmextra.json: added projectType and module metadata (githost, gitscope, gitrepo, description, npmPackagename, license) for @git.zone/cli and added empty @ship.zone/szci entry + ## 2026-02-10 - 2.3.0 - feat(mailer-smtp) add in-process security pipeline for SMTP delivery (DKIM/SPF/DMARC, content scanning, IP reputation) diff --git a/dist_ts/00_commitinfo_data.d.ts b/dist_ts/00_commitinfo_data.d.ts deleted file mode 100644 index 931e8fc..0000000 --- a/dist_ts/00_commitinfo_data.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * autocreated commitinfo by @push.rocks/commitinfo - */ -export declare const commitinfo: { - name: string; - version: string; - description: string; -}; diff --git a/dist_ts/00_commitinfo_data.js b/dist_ts/00_commitinfo_data.js deleted file mode 100644 index 5c9a05c..0000000 --- a/dist_ts/00_commitinfo_data.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * autocreated commitinfo by @push.rocks/commitinfo - */ -export const commitinfo = { - name: '@push.rocks/smartmta', - version: '2.2.1', - description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.' -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxzQkFBc0I7SUFDNUIsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHlIQUF5SDtDQUN2SSxDQUFBIn0= \ No newline at end of file diff --git a/dist_ts/errors/index.d.ts b/dist_ts/errors/index.d.ts deleted file mode 100644 index b862d2c..0000000 --- a/dist_ts/errors/index.d.ts +++ /dev/null @@ -1,41 +0,0 @@ -/** - * MTA error classes for SMTP client operations - */ -export declare class MtaConnectionError extends Error { - code: string; - details?: any; - constructor(message: string, detailsOrCode?: any); - static timeout(host: string, port: number, timeoutMs?: number): MtaConnectionError; - static refused(host: string, port: number): MtaConnectionError; - static dnsError(host: string, err?: any): MtaConnectionError; -} -export declare class MtaAuthenticationError extends Error { - code: string; - details?: any; - constructor(message: string, detailsOrCode?: any); - static invalidCredentials(host?: string, user?: string): MtaAuthenticationError; -} -export declare class MtaDeliveryError extends Error { - code: string; - responseCode?: number; - details?: any; - constructor(message: string, detailsOrCode?: any, responseCode?: number); - static temporary(message: string, ...args: any[]): MtaDeliveryError; - static permanent(message: string, ...args: any[]): MtaDeliveryError; -} -export declare class MtaConfigurationError extends Error { - code: string; - details?: any; - constructor(message: string, detailsOrCode?: any); -} -export declare class MtaTimeoutError extends Error { - code: string; - details?: any; - constructor(message: string, detailsOrCode?: any); - static commandTimeout(command: string, hostOrTimeout?: any, timeoutMs?: number): MtaTimeoutError; -} -export declare class MtaProtocolError extends Error { - code: string; - details?: any; - constructor(message: string, detailsOrCode?: any); -} diff --git a/dist_ts/errors/index.js b/dist_ts/errors/index.js deleted file mode 100644 index 4594555..0000000 --- a/dist_ts/errors/index.js +++ /dev/null @@ -1,120 +0,0 @@ -/** - * MTA error classes for SMTP client operations - */ -export class MtaConnectionError extends Error { - code; - details; - constructor(message, detailsOrCode) { - super(message); - this.name = 'MtaConnectionError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - } - else { - this.code = 'CONNECTION_ERROR'; - this.details = detailsOrCode; - } - } - static timeout(host, port, timeoutMs) { - return new MtaConnectionError(`Connection to ${host}:${port} timed out${timeoutMs ? ` after ${timeoutMs}ms` : ''}`, 'TIMEOUT'); - } - static refused(host, port) { - return new MtaConnectionError(`Connection to ${host}:${port} refused`, 'REFUSED'); - } - static dnsError(host, err) { - const errMsg = typeof err === 'string' ? err : err?.message || ''; - return new MtaConnectionError(`DNS resolution failed for ${host}${errMsg ? `: ${errMsg}` : ''}`, 'DNS_ERROR'); - } -} -export class MtaAuthenticationError extends Error { - code; - details; - constructor(message, detailsOrCode) { - super(message); - this.name = 'MtaAuthenticationError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - } - else { - this.code = 'AUTH_ERROR'; - this.details = detailsOrCode; - } - } - static invalidCredentials(host, user) { - const detail = host && user ? `${user}@${host}` : host || user || ''; - return new MtaAuthenticationError(`Authentication failed${detail ? `: ${detail}` : ''}`, 'INVALID_CREDENTIALS'); - } -} -export class MtaDeliveryError extends Error { - code; - responseCode; - details; - constructor(message, detailsOrCode, responseCode) { - super(message); - this.name = 'MtaDeliveryError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - this.responseCode = responseCode; - } - else { - this.code = 'DELIVERY_ERROR'; - this.details = detailsOrCode; - } - } - static temporary(message, ...args) { - return new MtaDeliveryError(message, 'TEMPORARY'); - } - static permanent(message, ...args) { - return new MtaDeliveryError(message, 'PERMANENT'); - } -} -export class MtaConfigurationError extends Error { - code; - details; - constructor(message, detailsOrCode) { - super(message); - this.name = 'MtaConfigurationError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - } - else { - this.code = 'CONFIG_ERROR'; - this.details = detailsOrCode; - } - } -} -export class MtaTimeoutError extends Error { - code; - details; - constructor(message, detailsOrCode) { - super(message); - this.name = 'MtaTimeoutError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - } - else { - this.code = 'TIMEOUT'; - this.details = detailsOrCode; - } - } - static commandTimeout(command, hostOrTimeout, timeoutMs) { - const timeout = typeof hostOrTimeout === 'number' ? hostOrTimeout : timeoutMs; - return new MtaTimeoutError(`Command '${command}' timed out${timeout ? ` after ${timeout}ms` : ''}`, 'COMMAND_TIMEOUT'); - } -} -export class MtaProtocolError extends Error { - code; - details; - constructor(message, detailsOrCode) { - super(message); - this.name = 'MtaProtocolError'; - if (typeof detailsOrCode === 'string') { - this.code = detailsOrCode; - } - else { - this.code = 'PROTOCOL_ERROR'; - this.details = detailsOrCode; - } - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9lcnJvcnMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsS0FBSztJQUNwQyxJQUFJLENBQVM7SUFDYixPQUFPLENBQU87SUFDckIsWUFBWSxPQUFlLEVBQUUsYUFBbUI7UUFDOUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxvQkFBb0IsQ0FBQztRQUNqQyxJQUFJLE9BQU8sYUFBYSxLQUFLLFFBQVEsRUFBRSxDQUFDO1lBQ3RDLElBQUksQ0FBQyxJQUFJLEdBQUcsYUFBYSxDQUFDO1FBQzVCLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLElBQUksR0FBRyxrQkFBa0IsQ0FBQztZQUMvQixJQUFJLENBQUMsT0FBTyxHQUFHLGFBQWEsQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBWSxFQUFFLElBQVksRUFBRSxTQUFrQjtRQUMzRCxPQUFPLElBQUksa0JBQWtCLENBQUMsaUJBQWlCLElBQUksSUFBSSxJQUFJLGFBQWEsU0FBUyxDQUFDLENBQUMsQ0FBQyxVQUFVLFNBQVMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNqSSxDQUFDO0lBQ0QsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFZLEVBQUUsSUFBWTtRQUN2QyxPQUFPLElBQUksa0JBQWtCLENBQUMsaUJBQWlCLElBQUksSUFBSSxJQUFJLFVBQVUsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUNwRixDQUFDO0lBQ0QsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFZLEVBQUUsR0FBUztRQUNyQyxNQUFNLE1BQU0sR0FBRyxPQUFPLEdBQUcsS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxD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 \ No newline at end of file diff --git a/dist_ts/logger.d.ts b/dist_ts/logger.d.ts deleted file mode 100644 index 2b5554e..0000000 --- a/dist_ts/logger.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -declare class StandardLogger { - private defaultContext; - private correlationId; - constructor(); - log(level: 'error' | 'warn' | 'info' | 'success' | 'debug', message: string, context?: Record): void; - error(message: string, context?: Record): void; - warn(message: string, context?: Record): void; - info(message: string, context?: Record): void; - success(message: string, context?: Record): void; - debug(message: string, context?: Record): void; - setContext(context: Record, overwrite?: boolean): void; - setCorrelationId(id?: string | null): string; - getCorrelationId(): string | null; - clearCorrelationId(): void; -} -export declare const logger: StandardLogger; -export {}; diff --git a/dist_ts/logger.js b/dist_ts/logger.js deleted file mode 100644 index 680e9d1..0000000 --- a/dist_ts/logger.js +++ /dev/null @@ -1,76 +0,0 @@ -import * as plugins from './plugins.js'; -import { randomUUID } from 'node:crypto'; -// Map NODE_ENV to valid TEnvironment -const nodeEnv = process.env.NODE_ENV || 'production'; -const envMap = { - 'development': 'local', - 'test': 'test', - 'staging': 'staging', - 'production': 'production' -}; -// Default Smartlog instance -const baseLogger = new plugins.smartlog.Smartlog({ - logContext: { - environment: envMap[nodeEnv] || 'production', - runtime: 'node', - zone: 'serve.zone', - } -}); -// Extended logger compatible with the original enhanced logger API -class StandardLogger { - defaultContext = {}; - correlationId = null; - constructor() { } - // Log methods - log(level, message, context = {}) { - const combinedContext = { - ...this.defaultContext, - ...context - }; - if (this.correlationId) { - combinedContext.correlation_id = this.correlationId; - } - baseLogger.log(level, message, combinedContext); - } - error(message, context = {}) { - this.log('error', message, context); - } - warn(message, context = {}) { - this.log('warn', message, context); - } - info(message, context = {}) { - this.log('info', message, context); - } - success(message, context = {}) { - this.log('success', message, context); - } - debug(message, context = {}) { - this.log('debug', message, context); - } - // Context management - setContext(context, overwrite = false) { - if (overwrite) { - this.defaultContext = context; - } - else { - this.defaultContext = { - ...this.defaultContext, - ...context - }; - } - } - // Correlation ID management - setCorrelationId(id = null) { - this.correlationId = id || randomUUID(); - return this.correlationId; - } - getCorrelationId() { - return this.correlationId; - } - clearCorrelationId() { - this.correlationId = null; - } -} -// Export a singleton instance -export const logger = new StandardLogger(); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvbG9nZ2VyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFFekMscUNBQXFDO0FBQ3JDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxJQUFJLFlBQVksQ0FBQztBQUNyRCxNQUFNLE1BQU0sR0FBZ0U7SUFDMUUsYUFBYSxFQUFFLE9BQU87SUFDdEIsTUFBTSxFQUFFLE1BQU07SUFDZCxTQUFTLEVBQUUsU0FBUztJQUNwQixZQUFZLEVBQUUsWUFBWTtDQUMzQixDQUFDO0FBRUYsNEJBQTRCO0FBQzVCLE1BQU0sVUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUM7SUFDL0MsVUFBVSxFQUFFO1FBQ1YsV0FBVyxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxZQUFZO1FBQzVDLE9BQU8sRUFBRSxNQUFNO1FBQ2YsSUFBSSxFQUFFLFlBQVk7S0FDbkI7Q0FDRixDQUFDLENBQUM7QUFFSCxtRUFBbUU7QUFDbkUsTUFBTSxjQUFjO0lBQ1YsY0FBYyxHQUF3QixFQUFFLENBQUM7SUFDekMsYUFBYSxHQUFrQixJQUFJLENBQUM7SUFFNUMsZ0JBQWUsQ0FBQztJQUVoQixjQUFjO0lBQ1AsR0FBRyxDQUFDLEtBQXNELEVBQUUsT0FBZSxFQUFFLFVBQStCLEVBQUU7UUFDbkgsTUFBTSxlQUFlLEdBQUc7WUFDdEIsR0FBRyxJQUFJLENBQUMsY0FBYztZQUN0QixHQUFHLE9BQU87U0FDWCxDQUFDO1FBRUYsSUFBSSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDdkIsZUFBZSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDO1FBQ3RELENBQUM7UUFFRCxVQUFVLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFDbEQsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVNLElBQUksQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM1RCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVNLElBQUksQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM1RCxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVNLE9BQU8sQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUMvRCxJQUFJLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDeEMsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFlLEVBQUUsVUFBK0IsRUFBRTtRQUM3RCxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELHFCQUFxQjtJQUNkLFVBQVUsQ0FBQyxPQUE0QixFQUFFLFlBQXFCLEtBQUs7UUFDeEUsSUFBSSxTQUFTLEVBQUUsQ0FBQztZQUNkLElBQUksQ0FBQyxjQUFjLEdBQUcsT0FBTyxDQUFDO1FBQ2hDLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLGNBQWMsR0FBRztnQkFDcEIsR0FBRyxJQUFJLENBQUMsY0FBYztnQkFDdEIsR0FBRyxPQUFPO2FBQ1gsQ0FBQztRQUNKLENBQUM7SUFDSCxDQUFDO0lBRUQsNEJBQTRCO0lBQ3JCLGdCQUFnQixDQUFDLEtBQW9CLElBQUk7UUFDOUMsSUFBSSxDQUFDLGFBQWEsR0FBRyxFQUFFLElBQUksVUFBVSxFQUFFLENBQUM7UUFDeEMsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFTSxnQkFBZ0I7UUFDckIsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDO0lBQzVCLENBQUM7SUFFTSxrQkFBa0I7UUFDdkIsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUM7SUFDNUIsQ0FBQztDQUNGO0FBRUQsOEJBQThCO0FBQzlCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FBRyxJQUFJLGNBQWMsRUFBRSxDQUFDIn0= \ No newline at end of file diff --git a/dist_ts/mail/core/classes.bouncemanager.d.ts b/dist_ts/mail/core/classes.bouncemanager.d.ts deleted file mode 100644 index 33d671d..0000000 --- a/dist_ts/mail/core/classes.bouncemanager.d.ts +++ /dev/null @@ -1,185 +0,0 @@ -import type { Email } from './classes.email.js'; -/** - * Bounce types for categorizing the reasons for bounces - */ -export declare enum BounceType { - INVALID_RECIPIENT = "invalid_recipient", - DOMAIN_NOT_FOUND = "domain_not_found", - MAILBOX_FULL = "mailbox_full", - MAILBOX_INACTIVE = "mailbox_inactive", - BLOCKED = "blocked", - SPAM_RELATED = "spam_related", - POLICY_RELATED = "policy_related", - SERVER_UNAVAILABLE = "server_unavailable", - TEMPORARY_FAILURE = "temporary_failure", - QUOTA_EXCEEDED = "quota_exceeded", - NETWORK_ERROR = "network_error", - TIMEOUT = "timeout", - AUTO_RESPONSE = "auto_response", - CHALLENGE_RESPONSE = "challenge_response", - UNKNOWN = "unknown" -} -/** - * Hard vs soft bounce classification - */ -export declare enum BounceCategory { - HARD = "hard", - SOFT = "soft", - AUTO_RESPONSE = "auto_response", - UNKNOWN = "unknown" -} -/** - * Bounce data structure - */ -export interface BounceRecord { - id: string; - originalEmailId?: string; - recipient: string; - sender: string; - domain: string; - subject?: string; - bounceType: BounceType; - bounceCategory: BounceCategory; - timestamp: number; - smtpResponse?: string; - diagnosticCode?: string; - statusCode?: string; - headers?: Record; - processed: boolean; - retryCount?: number; - nextRetryTime?: number; -} -/** - * Retry strategy configuration for soft bounces - */ -interface RetryStrategy { - maxRetries: number; - initialDelay: number; - maxDelay: number; - backoffFactor: number; -} -/** - * Manager for handling email bounces - */ -export declare class BounceManager { - private retryStrategy; - private bounceStore; - private bounceCache; - private suppressionList; - private storageManager?; - constructor(options?: { - retryStrategy?: Partial; - maxCacheSize?: number; - cacheTTL?: number; - storageManager?: any; - }); - /** - * Process a bounce notification - * @param bounceData Bounce data to process - * @returns Processed bounce record - */ - processBounce(bounceData: Partial): Promise; - /** - * Process an SMTP failure as a bounce - * @param recipient Recipient email - * @param smtpResponse SMTP error response - * @param options Additional options - * @returns Processed bounce record - */ - processSmtpFailure(recipient: string, smtpResponse: string, options?: { - sender?: string; - originalEmailId?: string; - statusCode?: string; - headers?: Record; - }): Promise; - /** - * Process a bounce notification email - * @param bounceEmail The email containing bounce information - * @returns Processed bounce record or null if not a bounce - */ - processBounceEmail(bounceEmail: Email): Promise; - /** - * Handle a hard bounce by adding to suppression list - * @param bounce The bounce record - */ - private handleHardBounce; - /** - * Handle a soft bounce by scheduling a retry if eligible - * @param bounce The bounce record - */ - private handleSoftBounce; - /** - * Add an email address to the suppression list - * @param email Email address to suppress - * @param reason Reason for suppression - * @param expiresAt Expiration timestamp (undefined for permanent) - */ - addToSuppressionList(email: string, reason: string, expiresAt?: number): void; - /** - * Remove an email address from the suppression list - * @param email Email address to remove - */ - removeFromSuppressionList(email: string): void; - /** - * Check if an email is on the suppression list - * @param email Email address to check - * @returns Whether the email is suppressed - */ - isEmailSuppressed(email: string): boolean; - /** - * Get suppression information for an email - * @param email Email address to check - * @returns Suppression information or null if not suppressed - */ - getSuppressionInfo(email: string): { - reason: string; - timestamp: number; - expiresAt?: number; - } | null; - /** - * Save suppression list to disk - */ - private saveSuppressionList; - /** - * Load suppression list from disk - */ - private loadSuppressionList; - /** - * Save bounce record to disk - * @param bounce Bounce record to save - */ - private saveBounceRecord; - /** - * Update bounce cache with new bounce information - * @param bounce Bounce record to update cache with - */ - private updateBounceCache; - /** - * Check bounce history for an email address - * @param email Email address to check - * @returns Bounce information or null if no bounces - */ - getBounceInfo(email: string): { - lastBounce: number; - count: number; - type: BounceType; - category: BounceCategory; - } | null; - /** - * Get all known hard bounced addresses - * @returns Array of hard bounced email addresses - */ - getHardBouncedAddresses(): string[]; - /** - * Get suppression list - * @returns Array of suppressed email addresses - */ - getSuppressionList(): string[]; - /** - * Clear old bounce records (for maintenance) - * @param olderThan Timestamp to remove records older than - * @returns Number of records removed - */ - clearOldBounceRecords(olderThan: number): number; -} -export {}; diff --git a/dist_ts/mail/core/classes.bouncemanager.js b/dist_ts/mail/core/classes.bouncemanager.js deleted file mode 100644 index fce89fd..0000000 --- a/dist_ts/mail/core/classes.bouncemanager.js +++ /dev/null @@ -1,569 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -import { LRUCache } from 'lru-cache'; -/** - * Bounce types for categorizing the reasons for bounces - */ -export var BounceType; -(function (BounceType) { - // Hard bounces (permanent failures) - BounceType["INVALID_RECIPIENT"] = "invalid_recipient"; - BounceType["DOMAIN_NOT_FOUND"] = "domain_not_found"; - BounceType["MAILBOX_FULL"] = "mailbox_full"; - BounceType["MAILBOX_INACTIVE"] = "mailbox_inactive"; - BounceType["BLOCKED"] = "blocked"; - BounceType["SPAM_RELATED"] = "spam_related"; - BounceType["POLICY_RELATED"] = "policy_related"; - // Soft bounces (temporary failures) - BounceType["SERVER_UNAVAILABLE"] = "server_unavailable"; - BounceType["TEMPORARY_FAILURE"] = "temporary_failure"; - BounceType["QUOTA_EXCEEDED"] = "quota_exceeded"; - BounceType["NETWORK_ERROR"] = "network_error"; - BounceType["TIMEOUT"] = "timeout"; - // Special cases - BounceType["AUTO_RESPONSE"] = "auto_response"; - BounceType["CHALLENGE_RESPONSE"] = "challenge_response"; - BounceType["UNKNOWN"] = "unknown"; -})(BounceType || (BounceType = {})); -/** - * Hard vs soft bounce classification - */ -export var BounceCategory; -(function (BounceCategory) { - BounceCategory["HARD"] = "hard"; - BounceCategory["SOFT"] = "soft"; - BounceCategory["AUTO_RESPONSE"] = "auto_response"; - BounceCategory["UNKNOWN"] = "unknown"; -})(BounceCategory || (BounceCategory = {})); -/** - * Manager for handling email bounces - */ -export class BounceManager { - // Retry strategy with exponential backoff - retryStrategy = { - maxRetries: 5, - initialDelay: 15 * 60 * 1000, // 15 minutes - maxDelay: 24 * 60 * 60 * 1000, // 24 hours - backoffFactor: 2 - }; - // Store of bounced emails - bounceStore = []; - // Cache of recently bounced email addresses to avoid sending to known bad addresses - bounceCache; - // Suppression list for addresses that should not receive emails - suppressionList = new Map(); - storageManager; // StorageManager instance - constructor(options) { - // Set retry strategy with defaults - if (options?.retryStrategy) { - this.retryStrategy = { - ...this.retryStrategy, - ...options.retryStrategy - }; - } - // Initialize bounce cache with LRU (least recently used) caching - this.bounceCache = new LRUCache({ - max: options?.maxCacheSize || 10000, - ttl: options?.cacheTTL || 30 * 24 * 60 * 60 * 1000, // 30 days default - }); - // Store storage manager reference - this.storageManager = options?.storageManager; - // Load suppression list from storage - // Note: This is async but we can't await in constructor - // The suppression list will be loaded asynchronously - this.loadSuppressionList().catch(error => { - logger.log('error', `Failed to load suppression list on startup: ${error.message}`); - }); - } - /** - * Process a bounce notification - * @param bounceData Bounce data to process - * @returns Processed bounce record - */ - async processBounce(bounceData) { - try { - // Add required fields if missing - const bounce = { - id: bounceData.id || plugins.uuid.v4(), - recipient: bounceData.recipient, - sender: bounceData.sender, - domain: bounceData.domain || bounceData.recipient.split('@')[1], - subject: bounceData.subject, - bounceType: bounceData.bounceType || BounceType.UNKNOWN, - bounceCategory: bounceData.bounceCategory || BounceCategory.UNKNOWN, - timestamp: bounceData.timestamp || Date.now(), - smtpResponse: bounceData.smtpResponse, - diagnosticCode: bounceData.diagnosticCode, - statusCode: bounceData.statusCode, - headers: bounceData.headers, - processed: false, - originalEmailId: bounceData.originalEmailId, - retryCount: bounceData.retryCount || 0, - nextRetryTime: bounceData.nextRetryTime - }; - // Determine bounce type and category via Rust bridge if not provided - if (!bounceData.bounceType || bounceData.bounceType === BounceType.UNKNOWN) { - const bridge = RustSecurityBridge.getInstance(); - const rustResult = await bridge.detectBounce({ - smtpResponse: bounce.smtpResponse, - diagnosticCode: bounce.diagnosticCode, - statusCode: bounce.statusCode, - }); - bounce.bounceType = rustResult.bounce_type; - bounce.bounceCategory = rustResult.category; - } - // Process the bounce based on category - switch (bounce.bounceCategory) { - case BounceCategory.HARD: - // Handle hard bounce - add to suppression list - await this.handleHardBounce(bounce); - break; - case BounceCategory.SOFT: - // Handle soft bounce - schedule retry if eligible - await this.handleSoftBounce(bounce); - break; - case BounceCategory.AUTO_RESPONSE: - // Handle auto-response - typically no action needed - logger.log('info', `Auto-response detected for ${bounce.recipient}`); - break; - default: - // Unknown bounce type - log for investigation - logger.log('warn', `Unknown bounce type for ${bounce.recipient}`, { - bounceType: bounce.bounceType, - smtpResponse: bounce.smtpResponse - }); - break; - } - // Store the bounce record - bounce.processed = true; - this.bounceStore.push(bounce); - // Update the bounce cache - this.updateBounceCache(bounce); - // Log the bounce - logger.log(bounce.bounceCategory === BounceCategory.HARD ? 'warn' : 'info', `Email bounce processed: ${bounce.bounceCategory} bounce for ${bounce.recipient}`, { - bounceType: bounce.bounceType, - domain: bounce.domain, - category: bounce.bounceCategory - }); - // Enhanced security logging - SecurityLogger.getInstance().logEvent({ - level: bounce.bounceCategory === BounceCategory.HARD - ? SecurityLogLevel.WARN - : SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_VALIDATION, - message: `Email bounce detected: ${bounce.bounceCategory} bounce for recipient`, - domain: bounce.domain, - details: { - recipient: bounce.recipient, - bounceType: bounce.bounceType, - smtpResponse: bounce.smtpResponse, - diagnosticCode: bounce.diagnosticCode, - statusCode: bounce.statusCode - }, - success: false - }); - return bounce; - } - catch (error) { - logger.log('error', `Error processing bounce: ${error.message}`, { - error: error.message, - bounceData - }); - throw error; - } - } - /** - * Process an SMTP failure as a bounce - * @param recipient Recipient email - * @param smtpResponse SMTP error response - * @param options Additional options - * @returns Processed bounce record - */ - async processSmtpFailure(recipient, smtpResponse, options = {}) { - // Create bounce data from SMTP failure - const bounceData = { - recipient, - sender: options.sender || '', - domain: recipient.split('@')[1], - smtpResponse, - statusCode: options.statusCode, - headers: options.headers, - originalEmailId: options.originalEmailId, - timestamp: Date.now() - }; - // Process as a regular bounce - return this.processBounce(bounceData); - } - /** - * Process a bounce notification email - * @param bounceEmail The email containing bounce information - * @returns Processed bounce record or null if not a bounce - */ - async processBounceEmail(bounceEmail) { - try { - // Check if this is a bounce notification - const subject = bounceEmail.getSubject(); - const body = bounceEmail.getBody(); - // Check for common bounce notification subject patterns - const isBounceSubject = /mail delivery|delivery (failed|status|notification)|failure notice|returned mail|undeliverable|delivery problem/i.test(subject); - if (!isBounceSubject) { - // Not a bounce notification based on subject - return null; - } - // Extract original recipient from the body or headers - let recipient = ''; - let originalMessageId = ''; - // Extract recipient from common bounce formats - const recipientMatch = body.match(/(?:failed recipient|to[:=]\s*|recipient:|delivery failed:)\s*?/i); - if (recipientMatch && recipientMatch[1]) { - recipient = recipientMatch[1]; - } - // Extract diagnostic code - let diagnosticCode = ''; - const diagnosticMatch = body.match(/diagnostic(?:-|\\s+)code:\s*(.+)(?:\n|$)/i); - if (diagnosticMatch && diagnosticMatch[1]) { - diagnosticCode = diagnosticMatch[1].trim(); - } - // Extract SMTP status code - let statusCode = ''; - const statusMatch = body.match(/status(?:-|\\s+)code:\s*([0-9.]+)/i); - if (statusMatch && statusMatch[1]) { - statusCode = statusMatch[1].trim(); - } - // If recipient not found in standard patterns, try DSN (Delivery Status Notification) format - if (!recipient) { - // Look for DSN format with Original-Recipient or Final-Recipient fields - const originalRecipientMatch = body.match(/original-recipient:.*?([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i); - const finalRecipientMatch = body.match(/final-recipient:.*?([a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/i); - if (originalRecipientMatch && originalRecipientMatch[1]) { - recipient = originalRecipientMatch[1]; - } - else if (finalRecipientMatch && finalRecipientMatch[1]) { - recipient = finalRecipientMatch[1]; - } - } - // If still no recipient, can't process as bounce - if (!recipient) { - logger.log('warn', 'Could not extract recipient from bounce notification', { - subject, - sender: bounceEmail.from - }); - return null; - } - // Extract original message ID if available - const messageIdMatch = body.match(/original[ -]message[ -]id:[ \t]*]+)>?/i); - if (messageIdMatch && messageIdMatch[1]) { - originalMessageId = messageIdMatch[1].trim(); - } - // Create bounce data - const bounceData = { - recipient, - sender: bounceEmail.from, - domain: recipient.split('@')[1], - subject: bounceEmail.getSubject(), - diagnosticCode, - statusCode, - timestamp: Date.now(), - headers: {} - }; - // Process as a regular bounce - return this.processBounce(bounceData); - } - catch (error) { - logger.log('error', `Error processing bounce email: ${error.message}`); - return null; - } - } - /** - * Handle a hard bounce by adding to suppression list - * @param bounce The bounce record - */ - async handleHardBounce(bounce) { - // Add to suppression list permanently (no expiry) - this.addToSuppressionList(bounce.recipient, `Hard bounce: ${bounce.bounceType}`, undefined); - // Increment bounce count in cache - this.updateBounceCache(bounce); - // Save to permanent storage - await this.saveBounceRecord(bounce); - // Log hard bounce for monitoring - logger.log('warn', `Hard bounce for ${bounce.recipient}: ${bounce.bounceType}`, { - domain: bounce.domain, - smtpResponse: bounce.smtpResponse, - diagnosticCode: bounce.diagnosticCode - }); - } - /** - * Handle a soft bounce by scheduling a retry if eligible - * @param bounce The bounce record - */ - async handleSoftBounce(bounce) { - // Check if we've exceeded max retries - if (bounce.retryCount >= this.retryStrategy.maxRetries) { - logger.log('warn', `Max retries exceeded for ${bounce.recipient}, treating as hard bounce`); - // Convert to hard bounce after max retries - bounce.bounceCategory = BounceCategory.HARD; - await this.handleHardBounce(bounce); - return; - } - // Calculate next retry time with exponential backoff - const delay = Math.min(this.retryStrategy.initialDelay * Math.pow(this.retryStrategy.backoffFactor, bounce.retryCount), this.retryStrategy.maxDelay); - bounce.retryCount++; - bounce.nextRetryTime = Date.now() + delay; - // Add to suppression list temporarily (with expiry) - this.addToSuppressionList(bounce.recipient, `Soft bounce: ${bounce.bounceType}`, bounce.nextRetryTime); - // Log the retry schedule - logger.log('info', `Scheduled retry ${bounce.retryCount} for ${bounce.recipient} at ${new Date(bounce.nextRetryTime).toISOString()}`, { - bounceType: bounce.bounceType, - retryCount: bounce.retryCount, - nextRetry: bounce.nextRetryTime - }); - } - /** - * Add an email address to the suppression list - * @param email Email address to suppress - * @param reason Reason for suppression - * @param expiresAt Expiration timestamp (undefined for permanent) - */ - addToSuppressionList(email, reason, expiresAt) { - this.suppressionList.set(email.toLowerCase(), { - reason, - timestamp: Date.now(), - expiresAt - }); - // Save asynchronously without blocking - this.saveSuppressionList().catch(error => { - logger.log('error', `Failed to save suppression list after adding ${email}: ${error.message}`); - }); - logger.log('info', `Added ${email} to suppression list`, { - reason, - expiresAt: expiresAt ? new Date(expiresAt).toISOString() : 'permanent' - }); - } - /** - * Remove an email address from the suppression list - * @param email Email address to remove - */ - removeFromSuppressionList(email) { - const wasRemoved = this.suppressionList.delete(email.toLowerCase()); - if (wasRemoved) { - // Save asynchronously without blocking - this.saveSuppressionList().catch(error => { - logger.log('error', `Failed to save suppression list after removing ${email}: ${error.message}`); - }); - logger.log('info', `Removed ${email} from suppression list`); - } - } - /** - * Check if an email is on the suppression list - * @param email Email address to check - * @returns Whether the email is suppressed - */ - isEmailSuppressed(email) { - const lowercaseEmail = email.toLowerCase(); - const suppression = this.suppressionList.get(lowercaseEmail); - if (!suppression) { - return false; - } - // Check if suppression has expired - if (suppression.expiresAt && Date.now() > suppression.expiresAt) { - this.suppressionList.delete(lowercaseEmail); - // Save asynchronously without blocking - this.saveSuppressionList().catch(error => { - logger.log('error', `Failed to save suppression list after expiry cleanup: ${error.message}`); - }); - return false; - } - return true; - } - /** - * Get suppression information for an email - * @param email Email address to check - * @returns Suppression information or null if not suppressed - */ - getSuppressionInfo(email) { - const lowercaseEmail = email.toLowerCase(); - const suppression = this.suppressionList.get(lowercaseEmail); - if (!suppression) { - return null; - } - // Check if suppression has expired - if (suppression.expiresAt && Date.now() > suppression.expiresAt) { - this.suppressionList.delete(lowercaseEmail); - // Save asynchronously without blocking - this.saveSuppressionList().catch(error => { - logger.log('error', `Failed to save suppression list after expiry cleanup: ${error.message}`); - }); - return null; - } - return suppression; - } - /** - * Save suppression list to disk - */ - async saveSuppressionList() { - try { - const suppressionData = JSON.stringify(Array.from(this.suppressionList.entries())); - if (this.storageManager) { - // Use storage manager - await this.storageManager.set('/email/bounces/suppression-list.json', suppressionData); - } - else { - // Fall back to filesystem - await plugins.smartfs.file(plugins.path.join(paths.dataDir, 'emails', 'suppression_list.json')).write(suppressionData); - } - } - catch (error) { - logger.log('error', `Failed to save suppression list: ${error.message}`); - } - } - /** - * Load suppression list from disk - */ - async loadSuppressionList() { - try { - let entries = null; - let needsMigration = false; - if (this.storageManager) { - // Try to load from storage manager first - const suppressionData = await this.storageManager.get('/email/bounces/suppression-list.json'); - if (suppressionData) { - entries = JSON.parse(suppressionData); - } - else { - // Check if data exists in filesystem and migrate - const suppressionPath = plugins.path.join(paths.dataDir, 'emails', 'suppression_list.json'); - if (plugins.fs.existsSync(suppressionPath)) { - const data = plugins.fs.readFileSync(suppressionPath, 'utf8'); - entries = JSON.parse(data); - needsMigration = true; - logger.log('info', 'Migrating suppression list from filesystem to StorageManager'); - } - } - } - else { - // No storage manager, use filesystem directly - const suppressionPath = plugins.path.join(paths.dataDir, 'emails', 'suppression_list.json'); - if (plugins.fs.existsSync(suppressionPath)) { - const data = plugins.fs.readFileSync(suppressionPath, 'utf8'); - entries = JSON.parse(data); - } - } - if (entries) { - this.suppressionList = new Map(entries); - // Clean expired entries - const now = Date.now(); - let expiredCount = 0; - for (const [email, info] of this.suppressionList.entries()) { - if (info.expiresAt && now > info.expiresAt) { - this.suppressionList.delete(email); - expiredCount++; - } - } - if (expiredCount > 0 || needsMigration) { - logger.log('info', `Cleaned ${expiredCount} expired entries from suppression list`); - await this.saveSuppressionList(); - } - logger.log('info', `Loaded ${this.suppressionList.size} entries from suppression list`); - } - } - catch (error) { - logger.log('error', `Failed to load suppression list: ${error.message}`); - } - } - /** - * Save bounce record to disk - * @param bounce Bounce record to save - */ - async saveBounceRecord(bounce) { - try { - const bounceData = JSON.stringify(bounce, null, 2); - if (this.storageManager) { - // Use storage manager - await this.storageManager.set(`/email/bounces/records/${bounce.id}.json`, bounceData); - } - else { - // Fall back to filesystem - const bouncePath = plugins.path.join(paths.dataDir, 'emails', 'bounces', `${bounce.id}.json`); - // Ensure directory exists - const bounceDir = plugins.path.join(paths.dataDir, 'emails', 'bounces'); - await plugins.smartfs.directory(bounceDir).recursive().create(); - await plugins.smartfs.file(bouncePath).write(bounceData); - } - } - catch (error) { - logger.log('error', `Failed to save bounce record: ${error.message}`); - } - } - /** - * Update bounce cache with new bounce information - * @param bounce Bounce record to update cache with - */ - updateBounceCache(bounce) { - const email = bounce.recipient.toLowerCase(); - const existing = this.bounceCache.get(email); - if (existing) { - // Update existing cache entry - existing.lastBounce = bounce.timestamp; - existing.count++; - existing.type = bounce.bounceType; - existing.category = bounce.bounceCategory; - } - else { - // Create new cache entry - this.bounceCache.set(email, { - lastBounce: bounce.timestamp, - count: 1, - type: bounce.bounceType, - category: bounce.bounceCategory - }); - } - } - /** - * Check bounce history for an email address - * @param email Email address to check - * @returns Bounce information or null if no bounces - */ - getBounceInfo(email) { - return this.bounceCache.get(email.toLowerCase()) || null; - } - /** - * Get all known hard bounced addresses - * @returns Array of hard bounced email addresses - */ - getHardBouncedAddresses() { - const hardBounced = []; - for (const [email, info] of this.bounceCache.entries()) { - if (info.category === BounceCategory.HARD) { - hardBounced.push(email); - } - } - return hardBounced; - } - /** - * Get suppression list - * @returns Array of suppressed email addresses - */ - getSuppressionList() { - return Array.from(this.suppressionList.keys()); - } - /** - * Clear old bounce records (for maintenance) - * @param olderThan Timestamp to remove records older than - * @returns Number of records removed - */ - clearOldBounceRecords(olderThan) { - let removed = 0; - this.bounceStore = this.bounceStore.filter(bounce => { - if (bounce.timestamp < olderThan) { - removed++; - return false; - } - return true; - }); - return removed; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.bouncemanager.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.bouncemanager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/core/classes.email.d.ts b/dist_ts/mail/core/classes.email.d.ts deleted file mode 100644 index 713de9e..0000000 --- a/dist_ts/mail/core/classes.email.d.ts +++ /dev/null @@ -1,291 +0,0 @@ -import * as plugins from '../../plugins.js'; -export interface IAttachment { - filename: string; - content: Buffer; - contentType: string; - contentId?: string; - encoding?: string; -} -export interface IEmailOptions { - from: string; - to?: string | string[]; - cc?: string | string[]; - bcc?: string | string[]; - subject: string; - text: string; - html?: string; - attachments?: IAttachment[]; - headers?: Record; - mightBeSpam?: boolean; - priority?: 'high' | 'normal' | 'low'; - skipAdvancedValidation?: boolean; - variables?: Record; -} -/** - * Email class represents a complete email message. - * - * This class takes IEmailOptions in the constructor and normalizes the data: - * - 'to', 'cc', 'bcc' are always converted to arrays - * - Optional properties get default values - * - Additional properties like messageId and envelopeFrom are generated - */ -export declare class Email { - from: string; - to: string[]; - cc: string[]; - bcc: string[]; - subject: string; - text: string; - html?: string; - attachments: IAttachment[]; - headers: Record; - mightBeSpam: boolean; - priority: 'high' | 'normal' | 'low'; - variables: Record; - private envelopeFrom; - private messageId; - private static emailValidator; - constructor(options: IEmailOptions); - /** - * Validates an email address using smartmail's EmailAddressValidator - * For constructor validation, we only check syntax to avoid delays - * Supports RFC-compliant addresses including display names and bounce addresses. - * - * @param email The email address to validate - * @returns boolean indicating if the email is valid - */ - private isValidEmail; - /** - * Extracts the email address from a string that may contain a display name. - * Handles formats like: - * - simple@example.com - * - "John Doe" - * - John Doe - * - * @param emailString The email string to parse - * @returns The extracted email address or null - */ - private extractEmailAddress; - /** - * Parses and validates recipient email addresses - * @param recipients A string or array of recipient emails - * @returns Array of validated email addresses - */ - private parseRecipients; - /** - * Basic sanitization for strings to prevent header injection - * @param input The string to sanitize - * @returns Sanitized string - */ - private sanitizeString; - /** - * Gets the domain part of the from email address - * @returns The domain part of the from email or null if invalid - */ - getFromDomain(): string | null; - /** - * Gets the clean from email address without display name - * @returns The email address without display name - */ - getFromAddress(): string; - /** - * Converts IDN (International Domain Names) to ASCII - * @param email The email address to convert - * @returns The email with ASCII-converted domain - */ - private convertIDNToASCII; - /** - * Gets clean to email addresses without display names - * @returns Array of email addresses without display names - */ - getToAddresses(): string[]; - /** - * Gets clean cc email addresses without display names - * @returns Array of email addresses without display names - */ - getCcAddresses(): string[]; - /** - * Gets clean bcc email addresses without display names - * @returns Array of email addresses without display names - */ - getBccAddresses(): string[]; - /** - * Gets all recipients (to, cc, bcc) as a unique array - * @returns Array of all unique recipient email addresses - */ - getAllRecipients(): string[]; - /** - * Gets primary recipient (first in the to field) - * @returns The primary recipient email or null if none exists - */ - getPrimaryRecipient(): string | null; - /** - * Checks if the email has attachments - * @returns Boolean indicating if the email has attachments - */ - hasAttachments(): boolean; - /** - * Add a recipient to the email - * @param email The recipient email address - * @param type The recipient type (to, cc, bcc) - * @returns This instance for method chaining - */ - addRecipient(email: string, type?: 'to' | 'cc' | 'bcc'): this; - /** - * Add an attachment to the email - * @param attachment The attachment to add - * @returns This instance for method chaining - */ - addAttachment(attachment: IAttachment): this; - /** - * Add a custom header to the email - * @param name The header name - * @param value The header value - * @returns This instance for method chaining - */ - addHeader(name: string, value: string): this; - /** - * Set the email priority - * @param priority The priority level - * @returns This instance for method chaining - */ - setPriority(priority: 'high' | 'normal' | 'low'): this; - /** - * Set a template variable - * @param key The variable key - * @param value The variable value - * @returns This instance for method chaining - */ - setVariable(key: string, value: any): this; - /** - * Set multiple template variables at once - * @param variables The variables object - * @returns This instance for method chaining - */ - setVariables(variables: Record): this; - /** - * Get the subject with variables applied - * @param variables Optional additional variables to apply - * @returns The processed subject - */ - getSubjectWithVariables(variables?: Record): string; - /** - * Get the text content with variables applied - * @param variables Optional additional variables to apply - * @returns The processed text content - */ - getTextWithVariables(variables?: Record): string; - /** - * Get the HTML content with variables applied - * @param variables Optional additional variables to apply - * @returns The processed HTML content or undefined if none - */ - getHtmlWithVariables(variables?: Record): string | undefined; - /** - * Apply template variables to a string - * @param template The template string - * @param additionalVariables Optional additional variables to apply - * @returns The processed string - */ - private applyVariables; - /** - * Gets the total size of all attachments in bytes - * @returns Total size of all attachments in bytes - */ - getAttachmentsSize(): number; - /** - * Perform advanced validation on sender and recipient email addresses - * This should be called separately after instantiation when ready to check MX records - * @param options Validation options - * @returns Promise resolving to validation results for all addresses - */ - validateAddresses(options?: { - checkMx?: boolean; - checkDisposable?: boolean; - checkSenderOnly?: boolean; - checkFirstRecipientOnly?: boolean; - }): Promise<{ - sender: { - email: string; - result: any; - }; - recipients: Array<{ - email: string; - result: any; - }>; - isValid: boolean; - }>; - /** - * Convert this email to a smartmail instance - * @returns A new Smartmail instance - */ - toSmartmail(): Promise>; - /** - * Get the from email address - * @returns The from email address - */ - getFromEmail(): string; - /** - * Get the subject (Smartmail compatibility method) - * @returns The email subject - */ - getSubject(): string; - /** - * Get the body content (Smartmail compatibility method) - * @param isHtml Whether to return HTML content if available - * @returns The email body (HTML if requested and available, otherwise plain text) - */ - getBody(isHtml?: boolean): string; - /** - * Get the from address (Smartmail compatibility method) - * @returns The sender email address - */ - getFrom(): string; - /** - * Get the message ID - * @returns The message ID - */ - getMessageId(): string; - /** - * Convert the Email instance back to IEmailOptions format. - * Useful for serialization or passing to APIs that expect IEmailOptions. - * Note: This loses some Email-specific properties like messageId and envelopeFrom. - * - * @returns IEmailOptions representation of this email - */ - toEmailOptions(): IEmailOptions; - /** - * Set a custom message ID - * @param id The message ID to set - * @returns This instance for method chaining - */ - setMessageId(id: string): this; - /** - * Get the envelope from address (return-path) - * @returns The envelope from address - */ - getEnvelopeFrom(): string; - /** - * Set the envelope from address (return-path) - * @param address The envelope from address to set - * @returns This instance for method chaining - */ - setEnvelopeFrom(address: string): this; - /** - * Creates an RFC822 compliant email string - * @param variables Optional template variables to apply - * @returns The email formatted as an RFC822 compliant string - */ - toRFC822String(variables?: Record): string; - /** - * Convert to simple Smartmail-compatible object (for backward compatibility) - * @returns A Promise with a simple Smartmail-compatible object - */ - toSmartmailBasic(): Promise; - /** - * Create an Email instance from a Smartmail object - * @param smartmail The Smartmail instance to convert - * @returns A new Email instance - */ - static fromSmartmail(smartmail: plugins.smartmail.Smartmail): Email; -} diff --git a/dist_ts/mail/core/classes.email.js b/dist_ts/mail/core/classes.email.js deleted file mode 100644 index fadf057..0000000 --- a/dist_ts/mail/core/classes.email.js +++ /dev/null @@ -1,802 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { EmailValidator } from './classes.emailvalidator.js'; -/** - * Email class represents a complete email message. - * - * This class takes IEmailOptions in the constructor and normalizes the data: - * - 'to', 'cc', 'bcc' are always converted to arrays - * - Optional properties get default values - * - Additional properties like messageId and envelopeFrom are generated - */ -export class Email { - // INormalizedEmail properties - from; - to; - cc; - bcc; - subject; - text; - html; - attachments; - headers; - mightBeSpam; - priority; - variables; - // Additional Email-specific properties - envelopeFrom; - messageId; - // Static validator instance for reuse - static emailValidator; - constructor(options) { - // Initialize validator if not already - if (!Email.emailValidator) { - Email.emailValidator = new EmailValidator(); - } - // Validate and set the from address using improved validation - if (!this.isValidEmail(options.from)) { - throw new Error(`Invalid sender email address: ${options.from}`); - } - this.from = options.from; - // Handle to addresses (single or multiple) - this.to = options.to ? this.parseRecipients(options.to) : []; - // Handle optional cc and bcc - this.cc = options.cc ? this.parseRecipients(options.cc) : []; - this.bcc = options.bcc ? this.parseRecipients(options.bcc) : []; - // Note: Templates may be created without recipients - // Recipients will be added when the email is actually sent - // Set subject with sanitization - this.subject = this.sanitizeString(options.subject || ''); - // Set text content with sanitization - this.text = this.sanitizeString(options.text || ''); - // Set optional HTML content - this.html = options.html ? this.sanitizeString(options.html) : undefined; - // Set attachments - this.attachments = Array.isArray(options.attachments) ? options.attachments : []; - // Set additional headers - this.headers = options.headers || {}; - // Set spam flag - this.mightBeSpam = options.mightBeSpam || false; - // Set priority - this.priority = options.priority || 'normal'; - // Set template variables - this.variables = options.variables || {}; - // Initialize envelope from (defaults to the from address) - this.envelopeFrom = this.from; - // Generate message ID if not provided - this.messageId = `<${Date.now()}.${Math.random().toString(36).substring(2, 15)}@${this.getFromDomain() || 'localhost'}>`; - } - /** - * Validates an email address using smartmail's EmailAddressValidator - * For constructor validation, we only check syntax to avoid delays - * Supports RFC-compliant addresses including display names and bounce addresses. - * - * @param email The email address to validate - * @returns boolean indicating if the email is valid - */ - isValidEmail(email) { - if (!email || typeof email !== 'string') - return false; - // Handle empty return path (bounce address) - if (email === '<>' || email === '') { - return true; // Empty return path is valid for bounces per RFC 5321 - } - // Extract email from display name format - const extractedEmail = this.extractEmailAddress(email); - if (!extractedEmail) - return false; - // Convert IDN (International Domain Names) to ASCII for validation - let emailToValidate = extractedEmail; - const atIndex = extractedEmail.indexOf('@'); - if (atIndex > 0) { - const localPart = extractedEmail.substring(0, atIndex); - const domainPart = extractedEmail.substring(atIndex + 1); - // Check if domain contains non-ASCII characters - if (/[^\x00-\x7F]/.test(domainPart)) { - try { - // Convert IDN to ASCII using the URL API (built-in punycode support) - const url = new URL(`http://${domainPart}`); - emailToValidate = `${localPart}@${url.hostname}`; - } - catch (e) { - // If conversion fails, allow the original domain - // This supports testing and edge cases - emailToValidate = extractedEmail; - } - } - } - // Use smartmail's validation for the ASCII-converted email address - return Email.emailValidator.isValidFormat(emailToValidate); - } - /** - * Extracts the email address from a string that may contain a display name. - * Handles formats like: - * - simple@example.com - * - "John Doe" - * - John Doe - * - * @param emailString The email string to parse - * @returns The extracted email address or null - */ - extractEmailAddress(emailString) { - if (!emailString || typeof emailString !== 'string') - return null; - emailString = emailString.trim(); - // Handle empty return path first - if (emailString === '<>' || emailString === '') { - return ''; - } - // Check for angle brackets format - updated regex to handle empty content - const angleMatch = emailString.match(/<([^>]*)>/); - if (angleMatch) { - // If matched but content is empty (e.g., <>), return empty string - return angleMatch[1].trim() || ''; - } - // If no angle brackets, assume it's a plain email - return emailString.trim(); - } - /** - * Parses and validates recipient email addresses - * @param recipients A string or array of recipient emails - * @returns Array of validated email addresses - */ - parseRecipients(recipients) { - const result = []; - if (typeof recipients === 'string') { - // Handle single recipient - if (this.isValidEmail(recipients)) { - result.push(recipients); - } - else { - throw new Error(`Invalid recipient email address: ${recipients}`); - } - } - else if (Array.isArray(recipients)) { - // Handle multiple recipients - for (const recipient of recipients) { - if (this.isValidEmail(recipient)) { - result.push(recipient); - } - else { - throw new Error(`Invalid recipient email address: ${recipient}`); - } - } - } - return result; - } - /** - * Basic sanitization for strings to prevent header injection - * @param input The string to sanitize - * @returns Sanitized string - */ - sanitizeString(input) { - if (!input) - return ''; - // Remove CR and LF characters to prevent header injection - // But preserve all other special characters including Unicode - return input.replace(/\r|\n/g, ' '); - } - /** - * Gets the domain part of the from email address - * @returns The domain part of the from email or null if invalid - */ - getFromDomain() { - try { - const emailAddress = this.extractEmailAddress(this.from); - if (!emailAddress || emailAddress === '') { - return null; - } - const parts = emailAddress.split('@'); - if (parts.length !== 2 || !parts[1]) { - return null; - } - return parts[1]; - } - catch (error) { - console.error('Error extracting domain from email:', error); - return null; - } - } - /** - * Gets the clean from email address without display name - * @returns The email address without display name - */ - getFromAddress() { - const extracted = this.extractEmailAddress(this.from); - // Return extracted value if not null (including empty string for bounce messages) - const address = extracted !== null ? extracted : this.from; - // Convert IDN to ASCII for SMTP protocol - return this.convertIDNToASCII(address); - } - /** - * Converts IDN (International Domain Names) to ASCII - * @param email The email address to convert - * @returns The email with ASCII-converted domain - */ - convertIDNToASCII(email) { - if (!email || email === '') - return email; - const atIndex = email.indexOf('@'); - if (atIndex <= 0) - return email; - const localPart = email.substring(0, atIndex); - const domainPart = email.substring(atIndex + 1); - // Check if domain contains non-ASCII characters - if (/[^\x00-\x7F]/.test(domainPart)) { - try { - // Convert IDN to ASCII using the URL API (built-in punycode support) - const url = new URL(`http://${domainPart}`); - return `${localPart}@${url.hostname}`; - } - catch (e) { - // If conversion fails, return original - return email; - } - } - return email; - } - /** - * Gets clean to email addresses without display names - * @returns Array of email addresses without display names - */ - getToAddresses() { - return this.to.map(email => { - const extracted = this.extractEmailAddress(email); - const address = extracted !== null ? extracted : email; - return this.convertIDNToASCII(address); - }); - } - /** - * Gets clean cc email addresses without display names - * @returns Array of email addresses without display names - */ - getCcAddresses() { - return this.cc.map(email => { - const extracted = this.extractEmailAddress(email); - const address = extracted !== null ? extracted : email; - return this.convertIDNToASCII(address); - }); - } - /** - * Gets clean bcc email addresses without display names - * @returns Array of email addresses without display names - */ - getBccAddresses() { - return this.bcc.map(email => { - const extracted = this.extractEmailAddress(email); - const address = extracted !== null ? extracted : email; - return this.convertIDNToASCII(address); - }); - } - /** - * Gets all recipients (to, cc, bcc) as a unique array - * @returns Array of all unique recipient email addresses - */ - getAllRecipients() { - // Combine all recipients and remove duplicates - return [...new Set([...this.to, ...this.cc, ...this.bcc])]; - } - /** - * Gets primary recipient (first in the to field) - * @returns The primary recipient email or null if none exists - */ - getPrimaryRecipient() { - return this.to.length > 0 ? this.to[0] : null; - } - /** - * Checks if the email has attachments - * @returns Boolean indicating if the email has attachments - */ - hasAttachments() { - return this.attachments.length > 0; - } - /** - * Add a recipient to the email - * @param email The recipient email address - * @param type The recipient type (to, cc, bcc) - * @returns This instance for method chaining - */ - addRecipient(email, type = 'to') { - if (!this.isValidEmail(email)) { - throw new Error(`Invalid recipient email address: ${email}`); - } - switch (type) { - case 'to': - if (!this.to.includes(email)) { - this.to.push(email); - } - break; - case 'cc': - if (!this.cc.includes(email)) { - this.cc.push(email); - } - break; - case 'bcc': - if (!this.bcc.includes(email)) { - this.bcc.push(email); - } - break; - } - return this; - } - /** - * Add an attachment to the email - * @param attachment The attachment to add - * @returns This instance for method chaining - */ - addAttachment(attachment) { - this.attachments.push(attachment); - return this; - } - /** - * Add a custom header to the email - * @param name The header name - * @param value The header value - * @returns This instance for method chaining - */ - addHeader(name, value) { - this.headers[name] = value; - return this; - } - /** - * Set the email priority - * @param priority The priority level - * @returns This instance for method chaining - */ - setPriority(priority) { - this.priority = priority; - return this; - } - /** - * Set a template variable - * @param key The variable key - * @param value The variable value - * @returns This instance for method chaining - */ - setVariable(key, value) { - this.variables[key] = value; - return this; - } - /** - * Set multiple template variables at once - * @param variables The variables object - * @returns This instance for method chaining - */ - setVariables(variables) { - this.variables = { ...this.variables, ...variables }; - return this; - } - /** - * Get the subject with variables applied - * @param variables Optional additional variables to apply - * @returns The processed subject - */ - getSubjectWithVariables(variables) { - return this.applyVariables(this.subject, variables); - } - /** - * Get the text content with variables applied - * @param variables Optional additional variables to apply - * @returns The processed text content - */ - getTextWithVariables(variables) { - return this.applyVariables(this.text, variables); - } - /** - * Get the HTML content with variables applied - * @param variables Optional additional variables to apply - * @returns The processed HTML content or undefined if none - */ - getHtmlWithVariables(variables) { - return this.html ? this.applyVariables(this.html, variables) : undefined; - } - /** - * Apply template variables to a string - * @param template The template string - * @param additionalVariables Optional additional variables to apply - * @returns The processed string - */ - applyVariables(template, additionalVariables) { - // If no template or variables, return as is - if (!template || (!Object.keys(this.variables).length && !additionalVariables)) { - return template; - } - // Combine instance variables with additional ones - const allVariables = { ...this.variables, ...additionalVariables }; - // Simple variable replacement - return template.replace(/\{\{([^}]+)\}\}/g, (match, key) => { - const trimmedKey = key.trim(); - return allVariables[trimmedKey] !== undefined ? String(allVariables[trimmedKey]) : match; - }); - } - /** - * Gets the total size of all attachments in bytes - * @returns Total size of all attachments in bytes - */ - getAttachmentsSize() { - return this.attachments.reduce((total, attachment) => { - return total + (attachment.content?.length || 0); - }, 0); - } - /** - * Perform advanced validation on sender and recipient email addresses - * This should be called separately after instantiation when ready to check MX records - * @param options Validation options - * @returns Promise resolving to validation results for all addresses - */ - async validateAddresses(options = {}) { - const result = { - sender: { email: this.from, result: null }, - recipients: [], - isValid: true - }; - // Validate sender - result.sender.result = await Email.emailValidator.validate(this.from, { - checkMx: options.checkMx !== false, - checkDisposable: options.checkDisposable !== false - }); - // If sender fails validation, the whole email is considered invalid - if (!result.sender.result.isValid) { - result.isValid = false; - } - // If we're only checking the sender, return early - if (options.checkSenderOnly) { - return result; - } - // Validate recipients - const recipientsToCheck = options.checkFirstRecipientOnly ? - [this.to[0]] : this.getAllRecipients(); - for (const recipient of recipientsToCheck) { - const recipientResult = await Email.emailValidator.validate(recipient, { - checkMx: options.checkMx !== false, - checkDisposable: options.checkDisposable !== false - }); - result.recipients.push({ - email: recipient, - result: recipientResult - }); - // If any recipient fails validation, mark the whole email as invalid - if (!recipientResult.isValid) { - result.isValid = false; - } - } - return result; - } - /** - * Convert this email to a smartmail instance - * @returns A new Smartmail instance - */ - async toSmartmail() { - const smartmail = new plugins.smartmail.Smartmail({ - from: this.from, - subject: this.subject, - body: this.html || this.text - }); - // Add recipients - ensure we're using the correct format - // (newer version of smartmail expects objects with email property) - for (const recipient of this.to) { - // Use the proper addRecipient method for the current smartmail version - if (typeof smartmail.addRecipient === 'function') { - smartmail.addRecipient(recipient); - } - else { - // Fallback for older versions or different interface - smartmail.options.to.push({ - email: recipient, - name: recipient.split('@')[0] // Simple name extraction - }); - } - } - // Handle CC recipients - for (const ccRecipient of this.cc) { - if (typeof smartmail.addRecipient === 'function') { - smartmail.addRecipient(ccRecipient, 'cc'); - } - else { - // Fallback for older versions - if (!smartmail.options.cc) - smartmail.options.cc = []; - smartmail.options.cc.push({ - email: ccRecipient, - name: ccRecipient.split('@')[0] - }); - } - } - // Handle BCC recipients - for (const bccRecipient of this.bcc) { - if (typeof smartmail.addRecipient === 'function') { - smartmail.addRecipient(bccRecipient, 'bcc'); - } - else { - // Fallback for older versions - if (!smartmail.options.bcc) - smartmail.options.bcc = []; - smartmail.options.bcc.push({ - email: bccRecipient, - name: bccRecipient.split('@')[0] - }); - } - } - // Add attachments - for (const attachment of this.attachments) { - const smartAttachment = new plugins.smartfile.SmartFile({ - path: attachment.filename, - contentBuffer: attachment.content, - base: process.cwd(), - }); - // Set content type if available - if (attachment.contentType) { - smartAttachment.contentType = attachment.contentType; - } - smartmail.addAttachment(smartAttachment); - } - return smartmail; - } - /** - * Get the from email address - * @returns The from email address - */ - getFromEmail() { - return this.from; - } - /** - * Get the subject (Smartmail compatibility method) - * @returns The email subject - */ - getSubject() { - return this.subject; - } - /** - * Get the body content (Smartmail compatibility method) - * @param isHtml Whether to return HTML content if available - * @returns The email body (HTML if requested and available, otherwise plain text) - */ - getBody(isHtml = false) { - if (isHtml && this.html) { - return this.html; - } - return this.text; - } - /** - * Get the from address (Smartmail compatibility method) - * @returns The sender email address - */ - getFrom() { - return this.from; - } - /** - * Get the message ID - * @returns The message ID - */ - getMessageId() { - return this.messageId; - } - /** - * Convert the Email instance back to IEmailOptions format. - * Useful for serialization or passing to APIs that expect IEmailOptions. - * Note: This loses some Email-specific properties like messageId and envelopeFrom. - * - * @returns IEmailOptions representation of this email - */ - toEmailOptions() { - const options = { - from: this.from, - to: this.to.length === 1 ? this.to[0] : this.to, - subject: this.subject, - text: this.text - }; - // Add optional properties only if they have values - if (this.cc && this.cc.length > 0) { - options.cc = this.cc.length === 1 ? this.cc[0] : this.cc; - } - if (this.bcc && this.bcc.length > 0) { - options.bcc = this.bcc.length === 1 ? this.bcc[0] : this.bcc; - } - if (this.html) { - options.html = this.html; - } - if (this.attachments && this.attachments.length > 0) { - options.attachments = this.attachments; - } - if (this.headers && Object.keys(this.headers).length > 0) { - options.headers = this.headers; - } - if (this.mightBeSpam) { - options.mightBeSpam = this.mightBeSpam; - } - if (this.priority !== 'normal') { - options.priority = this.priority; - } - if (this.variables && Object.keys(this.variables).length > 0) { - options.variables = this.variables; - } - return options; - } - /** - * Set a custom message ID - * @param id The message ID to set - * @returns This instance for method chaining - */ - setMessageId(id) { - this.messageId = id; - return this; - } - /** - * Get the envelope from address (return-path) - * @returns The envelope from address - */ - getEnvelopeFrom() { - return this.envelopeFrom; - } - /** - * Set the envelope from address (return-path) - * @param address The envelope from address to set - * @returns This instance for method chaining - */ - setEnvelopeFrom(address) { - if (!this.isValidEmail(address)) { - throw new Error(`Invalid envelope from address: ${address}`); - } - this.envelopeFrom = address; - return this; - } - /** - * Creates an RFC822 compliant email string - * @param variables Optional template variables to apply - * @returns The email formatted as an RFC822 compliant string - */ - toRFC822String(variables) { - // Apply variables to content if any - const processedSubject = this.getSubjectWithVariables(variables); - const processedText = this.getTextWithVariables(variables); - // This is a simplified version - a complete implementation would be more complex - let result = ''; - // Add headers - result += `From: ${this.from}\r\n`; - result += `To: ${this.to.join(', ')}\r\n`; - if (this.cc.length > 0) { - result += `Cc: ${this.cc.join(', ')}\r\n`; - } - result += `Subject: ${processedSubject}\r\n`; - result += `Date: ${new Date().toUTCString()}\r\n`; - result += `Message-ID: ${this.messageId}\r\n`; - result += `Return-Path: <${this.envelopeFrom}>\r\n`; - // Add custom headers - for (const [key, value] of Object.entries(this.headers)) { - result += `${key}: ${value}\r\n`; - } - // Add priority if not normal - if (this.priority !== 'normal') { - const priorityValue = this.priority === 'high' ? '1' : '5'; - result += `X-Priority: ${priorityValue}\r\n`; - } - // Add content type and body - result += `Content-Type: text/plain; charset=utf-8\r\n`; - // Add HTML content type if available - if (this.html) { - const processedHtml = this.getHtmlWithVariables(variables); - const boundary = `boundary_${Date.now().toString(16)}`; - // Multipart content for both plain text and HTML - result = result.replace(/Content-Type: .*\r\n/, ''); - result += `MIME-Version: 1.0\r\n`; - result += `Content-Type: multipart/alternative; boundary="${boundary}"\r\n\r\n`; - // Plain text part - result += `--${boundary}\r\n`; - result += `Content-Type: text/plain; charset=utf-8\r\n\r\n`; - result += `${processedText}\r\n\r\n`; - // HTML part - result += `--${boundary}\r\n`; - result += `Content-Type: text/html; charset=utf-8\r\n\r\n`; - result += `${processedHtml}\r\n\r\n`; - // End of multipart - result += `--${boundary}--\r\n`; - } - else { - // Simple plain text - result += `\r\n${processedText}\r\n`; - } - return result; - } - /** - * Convert to simple Smartmail-compatible object (for backward compatibility) - * @returns A Promise with a simple Smartmail-compatible object - */ - async toSmartmailBasic() { - // Create a Smartmail-compatible object with the email data - const smartmail = { - options: { - from: this.from, - to: this.to, - subject: this.subject - }, - content: { - text: this.text, - html: this.html || '' - }, - headers: { ...this.headers }, - attachments: this.attachments ? this.attachments.map(attachment => ({ - name: attachment.filename, - data: attachment.content, - type: attachment.contentType, - cid: attachment.contentId - })) : [], - // Add basic Smartmail-compatible methods for compatibility - addHeader: (key, value) => { - smartmail.headers[key] = value; - } - }; - return smartmail; - } - /** - * Create an Email instance from a Smartmail object - * @param smartmail The Smartmail instance to convert - * @returns A new Email instance - */ - static fromSmartmail(smartmail) { - const options = { - from: smartmail.options.from, - to: [], - subject: smartmail.getSubject(), - text: smartmail.getBody(false), // Plain text version - html: smartmail.getBody(true), // HTML version - attachments: [] - }; - // Function to safely extract email address from recipient - const extractEmail = (recipient) => { - // Handle string recipients - if (typeof recipient === 'string') - return recipient; - // Handle object recipients - if (recipient && typeof recipient === 'object') { - const addressObj = recipient; - // Try different property names that might contain the email address - if ('address' in addressObj && typeof addressObj.address === 'string') { - return addressObj.address; - } - if ('email' in addressObj && typeof addressObj.email === 'string') { - return addressObj.email; - } - } - // Fallback for invalid input - return ''; - }; - // Filter out empty strings from the extracted emails - const filterValidEmails = (emails) => { - return emails.filter(email => email && email.length > 0); - }; - // Convert TO recipients - if (smartmail.options.to?.length > 0) { - options.to = filterValidEmails(smartmail.options.to.map(extractEmail)); - } - // Convert CC recipients - if (smartmail.options.cc?.length > 0) { - options.cc = filterValidEmails(smartmail.options.cc.map(extractEmail)); - } - // Convert BCC recipients - if (smartmail.options.bcc?.length > 0) { - options.bcc = filterValidEmails(smartmail.options.bcc.map(extractEmail)); - } - // Convert attachments (note: this handles the synchronous case only) - if (smartmail.attachments?.length > 0) { - options.attachments = smartmail.attachments.map(attachment => { - // For the test case, if the path is exactly "test.txt", use that as the filename - let filename = 'attachment.bin'; - if (attachment.path === 'test.txt') { - filename = 'test.txt'; - } - else if (attachment.parsedPath?.base) { - filename = attachment.parsedPath.base; - } - else if (typeof attachment.path === 'string') { - filename = attachment.path.split('/').pop() || 'attachment.bin'; - } - return { - filename, - content: Buffer.from(attachment.contentBuffer || Buffer.alloc(0)), - contentType: attachment?.contentType || 'application/octet-stream' - }; - }); - } - return new Email(options); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email.js","sourceRoot":"","sources":["../../../ts/mail/core/classes.email.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/core/classes.emailvalidator.d.ts b/dist_ts/mail/core/classes.emailvalidator.d.ts deleted file mode 100644 index 08138f8..0000000 --- a/dist_ts/mail/core/classes.emailvalidator.d.ts +++ /dev/null @@ -1,61 +0,0 @@ -export interface IEmailValidationResult { - isValid: boolean; - hasMx: boolean; - hasSpamMarkings: boolean; - score: number; - details?: { - formatValid?: boolean; - mxRecords?: string[]; - disposable?: boolean; - role?: boolean; - spamIndicators?: string[]; - errorMessage?: string; - }; -} -/** - * Advanced email validator class using smartmail's capabilities - */ -export declare class EmailValidator { - private validator; - private dnsCache; - constructor(options?: { - maxCacheSize?: number; - cacheTTL?: number; - }); - /** - * Validates an email address using comprehensive checks - * @param email The email to validate - * @param options Validation options - * @returns Validation result with details - */ - validate(email: string, options?: { - checkMx?: boolean; - checkDisposable?: boolean; - checkRole?: boolean; - checkSyntaxOnly?: boolean; - }): Promise; - /** - * Gets MX records for a domain with caching - * @param domain Domain to check - * @returns Array of MX records - */ - private getMxRecords; - /** - * Validates multiple email addresses in batch - * @param emails Array of emails to validate - * @param options Validation options - * @returns Object with email addresses as keys and validation results as values - */ - validateBatch(emails: string[], options?: { - checkMx?: boolean; - checkDisposable?: boolean; - checkRole?: boolean; - checkSyntaxOnly?: boolean; - }): Promise>; - /** - * Quick check if an email format is valid (synchronous, no DNS checks) - * @param email Email to check - * @returns Boolean indicating if format is valid - */ - isValidFormat(email: string): boolean; -} diff --git a/dist_ts/mail/core/classes.emailvalidator.js b/dist_ts/mail/core/classes.emailvalidator.js deleted file mode 100644 index db273f4..0000000 --- a/dist_ts/mail/core/classes.emailvalidator.js +++ /dev/null @@ -1,184 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { logger } from '../../logger.js'; -import { LRUCache } from 'lru-cache'; -/** - * Advanced email validator class using smartmail's capabilities - */ -export class EmailValidator { - validator; - dnsCache; - constructor(options) { - this.validator = new plugins.smartmail.EmailAddressValidator(); - // Initialize LRU cache for DNS records - this.dnsCache = new LRUCache({ - // Default to 1000 entries (reasonable for most applications) - max: options?.maxCacheSize || 1000, - // Default TTL of 1 hour (DNS records don't change frequently) - ttl: options?.cacheTTL || 60 * 60 * 1000, - // Optional cache monitoring - allowStale: false, - updateAgeOnGet: true, - // Add logging for cache events in production environments - disposeAfter: (value, key) => { - logger.log('debug', `DNS cache entry expired for domain: ${key}`); - }, - }); - } - /** - * Validates an email address using comprehensive checks - * @param email The email to validate - * @param options Validation options - * @returns Validation result with details - */ - async validate(email, options = {}) { - try { - const result = { - isValid: false, - hasMx: false, - hasSpamMarkings: false, - score: 0, - details: { - formatValid: false, - spamIndicators: [] - } - }; - // Always check basic format - result.details.formatValid = this.validator.isValidEmailFormat(email); - if (!result.details.formatValid) { - result.details.errorMessage = 'Invalid email format'; - return result; - } - // If syntax-only check is requested, return early - if (options.checkSyntaxOnly) { - result.isValid = true; - result.score = 0.5; - return result; - } - // Get domain for additional checks - const domain = email.split('@')[1]; - // Check MX records - if (options.checkMx !== false) { - try { - const mxRecords = await this.getMxRecords(domain); - result.details.mxRecords = mxRecords; - result.hasMx = mxRecords && mxRecords.length > 0; - if (!result.hasMx) { - result.details.spamIndicators.push('No MX records'); - result.details.errorMessage = 'Domain has no MX records'; - } - } - catch (error) { - logger.log('error', `Error checking MX records: ${error.message}`); - result.details.errorMessage = 'Unable to check MX records'; - } - } - // Check if domain is disposable - if (options.checkDisposable !== false) { - result.details.disposable = await this.validator.isDisposableEmail(email); - if (result.details.disposable) { - result.details.spamIndicators.push('Disposable email'); - } - } - // Check if email is a role account - if (options.checkRole !== false) { - result.details.role = this.validator.isRoleAccount(email); - if (result.details.role) { - result.details.spamIndicators.push('Role account'); - } - } - // Calculate spam score and final validity - result.hasSpamMarkings = result.details.spamIndicators.length > 0; - // Calculate a score between 0-1 based on checks - let scoreFactors = 0; - let scoreTotal = 0; - // Format check (highest weight) - scoreFactors += 0.4; - if (result.details.formatValid) - scoreTotal += 0.4; - // MX check (high weight) - if (options.checkMx !== false) { - scoreFactors += 0.3; - if (result.hasMx) - scoreTotal += 0.3; - } - // Disposable check (medium weight) - if (options.checkDisposable !== false) { - scoreFactors += 0.2; - if (!result.details.disposable) - scoreTotal += 0.2; - } - // Role account check (low weight) - if (options.checkRole !== false) { - scoreFactors += 0.1; - if (!result.details.role) - scoreTotal += 0.1; - } - // Normalize score based on factors actually checked - result.score = scoreFactors > 0 ? scoreTotal / scoreFactors : 0; - // Email is valid if score is above 0.7 (configurable threshold) - result.isValid = result.score >= 0.7; - return result; - } - catch (error) { - logger.log('error', `Email validation error: ${error.message}`); - return { - isValid: false, - hasMx: false, - hasSpamMarkings: true, - score: 0, - details: { - formatValid: false, - errorMessage: `Validation error: ${error.message}`, - spamIndicators: ['Validation error'] - } - }; - } - } - /** - * Gets MX records for a domain with caching - * @param domain Domain to check - * @returns Array of MX records - */ - async getMxRecords(domain) { - // Check cache first - const cachedRecords = this.dnsCache.get(domain); - if (cachedRecords) { - logger.log('debug', `Using cached MX records for domain: ${domain}`); - return cachedRecords; - } - try { - // Use smartmail's getMxRecords method - const records = await this.validator.getMxRecords(domain); - // Store in cache (TTL is handled by the LRU cache configuration) - this.dnsCache.set(domain, records); - logger.log('debug', `Cached MX records for domain: ${domain}`); - return records; - } - catch (error) { - logger.log('error', `Error fetching MX records for ${domain}: ${error.message}`); - return []; - } - } - /** - * Validates multiple email addresses in batch - * @param emails Array of emails to validate - * @param options Validation options - * @returns Object with email addresses as keys and validation results as values - */ - async validateBatch(emails, options = {}) { - const results = {}; - for (const email of emails) { - results[email] = await this.validate(email, options); - } - return results; - } - /** - * Quick check if an email format is valid (synchronous, no DNS checks) - * @param email Email to check - * @returns Boolean indicating if format is valid - */ - isValidFormat(email) { - return this.validator.isValidEmailFormat(email); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5lbWFpbHZhbGlkYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21haWwvY29yZS9jbGFzc2VzLmVtYWlsdmFsaWRhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ3pDLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFpQnJDOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGNBQWM7SUFDakIsU0FBUyxDQUEwQztJQUNuRCxRQUFRLENBQTZCO0lBRTdDLFlBQVksT0FHWDtRQUNDLElBQUksQ0FBQyxTQUFTLEdBQUcsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLHFCQUFxQixFQUFFLENBQUM7UUFFL0QsdUNBQXVDO1FBQ3ZDLElBQUksQ0FBQyxRQUFRLEdBQUcsSUFBSSxRQUFRLENBQW1CO1lBQzdDLDZEQUE2RDtZQUM3RCxHQUFHLEVBQUUsT0FBTyxFQUFFLFlBQVksSUFBSSxJQUFJO1lBQ2xDLDhEQUE4RDtZQUM5RCxHQUFHLEVBQUUsT0FBTyxFQUFFLFFBQVEsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUk7WUFDeEMsNEJBQTRCO1lBQzVCLFVBQVUsRUFBRSxLQUFLO1lBQ2pCLGNBQWMsRUFBRSxJQUFJO1lBQ3BCLDBEQUEwRDtZQUMxRCxZQUFZLEVBQUUsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLEVBQUU7Z0JBQzNCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLHVDQUF1QyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1lBQ3BFLENBQUM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxLQUFLLENBQUMsUUFBUSxDQUNuQixLQUFhLEVBQ2IsVUFLSSxFQUFFO1FBRU4sSUFBSSxDQUFDO1lBQ0gsTUFB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 \ No newline at end of file diff --git a/dist_ts/mail/core/classes.templatemanager.d.ts b/dist_ts/mail/core/classes.templatemanager.d.ts deleted file mode 100644 index 14a0d1a..0000000 --- a/dist_ts/mail/core/classes.templatemanager.d.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { Email } from './classes.email.js'; -/** - * Email template type definition - */ -export interface IEmailTemplate { - id: string; - name: string; - description: string; - from: string; - subject: string; - bodyHtml: string; - bodyText?: string; - category?: string; - sampleData?: T; - attachments?: Array<{ - name: string; - path: string; - contentType?: string; - }>; -} -/** - * Email template context - data used to render the template - */ -export interface ITemplateContext { - [key: string]: any; -} -/** - * Template category definitions - */ -export declare enum TemplateCategory { - NOTIFICATION = "notification", - TRANSACTIONAL = "transactional", - MARKETING = "marketing", - SYSTEM = "system" -} -/** - * Enhanced template manager using Email class for template rendering - */ -export declare class TemplateManager { - private templates; - private defaultConfig; - constructor(defaultConfig?: { - from?: string; - replyTo?: string; - footerHtml?: string; - footerText?: string; - }); - /** - * Register built-in email templates - */ - private registerBuiltinTemplates; - /** - * Register a new email template - * @param template The email template to register - */ - registerTemplate(template: IEmailTemplate): void; - /** - * Get an email template by ID - * @param templateId The template ID - * @returns The template or undefined if not found - */ - getTemplate(templateId: string): IEmailTemplate | undefined; - /** - * List all available templates - * @param category Optional category filter - * @returns Array of email templates - */ - listTemplates(category?: TemplateCategory): IEmailTemplate[]; - /** - * Create an Email instance from a template - * @param templateId The template ID - * @param context The template context data - * @returns A configured Email instance - */ - createEmail(templateId: string, context?: ITemplateContext): Promise; - /** - * Create and completely process an Email instance from a template - * @param templateId The template ID - * @param context The template context data - * @returns A complete, processed Email instance ready to send - */ - prepareEmail(templateId: string, context?: ITemplateContext): Promise; - /** - * Create a MIME-formatted email from a template - * @param templateId The template ID - * @param context The template context data - * @returns A MIME-formatted email string - */ - createMimeEmail(templateId: string, context?: ITemplateContext): Promise; - /** - * Load templates from a directory - * @param directory The directory containing template JSON files - */ - loadTemplatesFromDirectory(directory: string): Promise; -} diff --git a/dist_ts/mail/core/classes.templatemanager.js b/dist_ts/mail/core/classes.templatemanager.js deleted file mode 100644 index 21748b3..0000000 --- a/dist_ts/mail/core/classes.templatemanager.js +++ /dev/null @@ -1,240 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { logger } from '../../logger.js'; -import { Email } from './classes.email.js'; -/** - * Template category definitions - */ -export var TemplateCategory; -(function (TemplateCategory) { - TemplateCategory["NOTIFICATION"] = "notification"; - TemplateCategory["TRANSACTIONAL"] = "transactional"; - TemplateCategory["MARKETING"] = "marketing"; - TemplateCategory["SYSTEM"] = "system"; -})(TemplateCategory || (TemplateCategory = {})); -/** - * Enhanced template manager using Email class for template rendering - */ -export class TemplateManager { - templates = new Map(); - defaultConfig; - constructor(defaultConfig) { - // Set default configuration - this.defaultConfig = { - from: defaultConfig?.from || 'noreply@mail.lossless.com', - replyTo: defaultConfig?.replyTo, - footerHtml: defaultConfig?.footerHtml || '', - footerText: defaultConfig?.footerText || '' - }; - // Initialize with built-in templates - this.registerBuiltinTemplates(); - } - /** - * Register built-in email templates - */ - registerBuiltinTemplates() { - // Welcome email - this.registerTemplate({ - id: 'welcome', - name: 'Welcome Email', - description: 'Sent to users when they first sign up', - from: this.defaultConfig.from, - subject: 'Welcome to {{serviceName}}!', - category: TemplateCategory.TRANSACTIONAL, - bodyHtml: ` -

Welcome, {{firstName}}!

-

Thank you for joining {{serviceName}}. We're excited to have you on board.

-

To get started, visit your account.

- `, - bodyText: `Welcome, {{firstName}}! - - Thank you for joining {{serviceName}}. We're excited to have you on board. - - To get started, visit your account: {{accountUrl}} - `, - sampleData: { - firstName: 'John', - accountUrl: 'https://example.com/account' - } - }); - // Password reset - this.registerTemplate({ - id: 'password-reset', - name: 'Password Reset', - description: 'Sent when a user requests a password reset', - from: this.defaultConfig.from, - subject: 'Password Reset Request', - category: TemplateCategory.TRANSACTIONAL, - bodyHtml: ` -

Password Reset Request

-

You recently requested to reset your password. Click the link below to reset it:

-

Reset Password

-

This link will expire in {{expiryHours}} hours.

-

If you didn't request a password reset, please ignore this email.

- `, - sampleData: { - resetUrl: 'https://example.com/reset-password?token=abc123', - expiryHours: 24 - } - }); - // System notification - this.registerTemplate({ - id: 'system-notification', - name: 'System Notification', - description: 'General system notification template', - from: this.defaultConfig.from, - subject: '{{subject}}', - category: TemplateCategory.SYSTEM, - bodyHtml: ` -

{{title}}

-
{{message}}
- `, - sampleData: { - subject: 'Important System Notification', - title: 'System Maintenance', - message: 'The system will be undergoing maintenance on Saturday from 2-4am UTC.' - } - }); - } - /** - * Register a new email template - * @param template The email template to register - */ - registerTemplate(template) { - if (this.templates.has(template.id)) { - logger.log('warn', `Template with ID '${template.id}' already exists and will be overwritten`); - } - // Add footer to templates if configured - if (this.defaultConfig.footerHtml && template.bodyHtml) { - template.bodyHtml += this.defaultConfig.footerHtml; - } - if (this.defaultConfig.footerText && template.bodyText) { - template.bodyText += this.defaultConfig.footerText; - } - this.templates.set(template.id, template); - logger.log('info', `Registered email template: ${template.id}`); - } - /** - * Get an email template by ID - * @param templateId The template ID - * @returns The template or undefined if not found - */ - getTemplate(templateId) { - return this.templates.get(templateId); - } - /** - * List all available templates - * @param category Optional category filter - * @returns Array of email templates - */ - listTemplates(category) { - const templates = Array.from(this.templates.values()); - if (category) { - return templates.filter(template => template.category === category); - } - return templates; - } - /** - * Create an Email instance from a template - * @param templateId The template ID - * @param context The template context data - * @returns A configured Email instance - */ - async createEmail(templateId, context) { - const template = this.getTemplate(templateId); - if (!template) { - throw new Error(`Template with ID '${templateId}' not found`); - } - // Build attachments array for Email - const attachments = []; - if (template.attachments && template.attachments.length > 0) { - for (const attachment of template.attachments) { - try { - const attachmentPath = plugins.path.isAbsolute(attachment.path) - ? attachment.path - : plugins.path.join(paths.MtaAttachmentsDir, attachment.path); - // Read the file - const fileBuffer = await plugins.fs.promises.readFile(attachmentPath); - attachments.push({ - filename: attachment.name, - content: fileBuffer, - contentType: attachment.contentType || 'application/octet-stream' - }); - } - catch (error) { - logger.log('error', `Failed to add attachment '${attachment.name}': ${error.message}`); - } - } - } - // Create Email instance with template content - const emailOptions = { - from: template.from || this.defaultConfig.from, - subject: template.subject, - text: template.bodyText || '', - html: template.bodyHtml, - // Note: 'to' is intentionally omitted for templates - attachments, - variables: context || {} - }; - return new Email(emailOptions); - } - /** - * Create and completely process an Email instance from a template - * @param templateId The template ID - * @param context The template context data - * @returns A complete, processed Email instance ready to send - */ - async prepareEmail(templateId, context = {}) { - const email = await this.createEmail(templateId, context); - // Email class processes variables when needed, no pre-compilation required - return email; - } - /** - * Create a MIME-formatted email from a template - * @param templateId The template ID - * @param context The template context data - * @returns A MIME-formatted email string - */ - async createMimeEmail(templateId, context = {}) { - const email = await this.prepareEmail(templateId, context); - return email.toRFC822String(context); - } - /** - * Load templates from a directory - * @param directory The directory containing template JSON files - */ - async loadTemplatesFromDirectory(directory) { - try { - // Ensure directory exists - if (!plugins.fs.existsSync(directory)) { - logger.log('error', `Template directory does not exist: ${directory}`); - return; - } - // Get all JSON files - const files = plugins.fs.readdirSync(directory) - .filter(file => file.endsWith('.json')); - for (const file of files) { - try { - const filePath = plugins.path.join(directory, file); - const content = plugins.fs.readFileSync(filePath, 'utf8'); - const template = JSON.parse(content); - // Validate template - if (!template.id || !template.subject || (!template.bodyHtml && !template.bodyText)) { - logger.log('warn', `Invalid template in ${file}: missing required fields`); - continue; - } - this.registerTemplate(template); - } - catch (error) { - logger.log('error', `Error loading template from ${file}: ${error.message}`); - } - } - logger.log('info', `Loaded ${this.templates.size} email templates`); - } - catch (error) { - logger.log('error', `Failed to load templates from directory: ${error.message}`); - throw error; - } - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy50ZW1wbGF0ZW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2NvcmUvY2xhc3Nlcy50ZW1wbGF0ZW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsS0FBSyxFQUF3QyxNQUFNLG9CQUFvQixDQUFDO0FBNkJqRjs7R0FFRztBQUNILE1BQU0sQ0FBTixJQUFZLGdCQUtYO0FBTEQsV0FBWSxnQkFBZ0I7SUFDMUIsaURBQTZCLENBQUE7SUFDN0IsbURBQStCLENBQUE7SUFDL0IsMkNBQXVCLENBQUE7SUFDdkIscUNBQWlCLENBQUE7QUFDbkIsQ0FBQyxFQUxXLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFLM0I7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBQ2xCLFNBQVMsR0FBZ0MsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUNuRCxhQUFhLENBS25CO0lBRUYsWUFBWSxhQUtYO1FBQ0MsNEJBQTRCO1FBQzVCLElBQUksQ0FBQyxhQUFhLEdBQUc7WUFDbkIsSUFBSSxFQUFFLGFBQWEsRUFBRSxJQUFJLElBQUksMkJBQTJCO1lBQ3hELE9BQU8sRUFBRSxhQUFhLEVBQUUsT0FBTztZQUMvQixVQUFVLEVBQUUsYUFBYSxFQUFFLFVBQVUsSUFBSSxFQUFFO1lBQzNDLFVBQVUsRUFBRSxhQUFhLEVBQUUsVUFBVSxJQUFJLEVBQUU7U0FDNUMsQ0FBQztRQUVGLHFDQUFxQztRQUNyQyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsQ0FBQztJQUNsQyxDQUFDO0lBRUQ7O09BRUc7SUFDSyx3QkFBd0I7UUFDOUIsZ0JBQWdCO1FBQ2hCLElBQUksQ0FBQyxnQkFB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 \ No newline at end of file diff --git a/dist_ts/mail/core/index.d.ts b/dist_ts/mail/core/index.d.ts deleted file mode 100644 index a624fe1..0000000 --- a/dist_ts/mail/core/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './classes.email.js'; -export * from './classes.emailvalidator.js'; -export * from './classes.templatemanager.js'; -export * from './classes.bouncemanager.js'; diff --git a/dist_ts/mail/core/index.js b/dist_ts/mail/core/index.js deleted file mode 100644 index 28734a1..0000000 --- a/dist_ts/mail/core/index.js +++ /dev/null @@ -1,6 +0,0 @@ -// Core email components -export * from './classes.email.js'; -export * from './classes.emailvalidator.js'; -export * from './classes.templatemanager.js'; -export * from './classes.bouncemanager.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2NvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsd0JBQXdCO0FBQ3hCLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsNEJBQTRCLENBQUMifQ== \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.delivery.queue.d.ts b/dist_ts/mail/delivery/classes.delivery.queue.d.ts deleted file mode 100644 index 937487b..0000000 --- a/dist_ts/mail/delivery/classes.delivery.queue.d.ts +++ /dev/null @@ -1,163 +0,0 @@ -import { EventEmitter } from 'node:events'; -import { type EmailProcessingMode } from '../routing/classes.email.config.js'; -import type { IEmailRoute } from '../routing/interfaces.js'; -/** - * Queue item status - */ -export type QueueItemStatus = 'pending' | 'processing' | 'delivered' | 'failed' | 'deferred'; -/** - * Queue item interface - */ -export interface IQueueItem { - id: string; - processingMode: EmailProcessingMode; - processingResult: any; - route: IEmailRoute; - status: QueueItemStatus; - attempts: number; - nextAttempt: Date; - lastError?: string; - createdAt: Date; - updatedAt: Date; - deliveredAt?: Date; -} -/** - * Queue options interface - */ -export interface IQueueOptions { - storageType?: 'memory' | 'disk'; - persistentPath?: string; - checkInterval?: number; - maxQueueSize?: number; - maxPerDestination?: number; - maxRetries?: number; - baseRetryDelay?: number; - maxRetryDelay?: number; -} -/** - * Queue statistics interface - */ -export interface IQueueStats { - queueSize: number; - status: { - pending: number; - processing: number; - delivered: number; - failed: number; - deferred: number; - }; - modes: { - forward: number; - mta: number; - process: number; - }; - oldestItem?: Date; - newestItem?: Date; - averageAttempts: number; - totalProcessed: number; - processingActive: boolean; -} -/** - * A unified queue for all email modes - */ -export declare class UnifiedDeliveryQueue extends EventEmitter { - private options; - private queue; - private checkTimer?; - private stats; - private processing; - private totalProcessed; - /** - * Create a new unified delivery queue - * @param options Queue options - */ - constructor(options: IQueueOptions); - /** - * Initialize the queue - */ - initialize(): Promise; - /** - * Start queue processing - */ - private startProcessing; - /** - * Stop queue processing - */ - private stopProcessing; - /** - * Check for items that need to be processed - */ - private processQueue; - /** - * Add an item to the queue - * @param processingResult Processing result to queue - * @param mode Processing mode - * @param route Email route - */ - enqueue(processingResult: any, mode: EmailProcessingMode, route: IEmailRoute): Promise; - /** - * Get an item from the queue - * @param id Item ID - */ - getItem(id: string): IQueueItem | undefined; - /** - * Mark an item as being processed - * @param id Item ID - */ - markProcessing(id: string): Promise; - /** - * Mark an item as delivered - * @param id Item ID - */ - markDelivered(id: string): Promise; - /** - * Mark an item as failed - * @param id Item ID - * @param error Error message - */ - markFailed(id: string, error: string): Promise; - /** - * Remove an item from the queue - * @param id Item ID - */ - removeItem(id: string): Promise; - /** - * Persist an item to disk - * @param item Item to persist - */ - private persistItem; - /** - * Remove an item from disk - * @param id Item ID - */ - private removeItemFromDisk; - /** - * Load queue items from disk - */ - private loadFromDisk; - /** - * Update queue statistics - */ - private updateStats; - /** - * Get queue statistics - */ - getStats(): IQueueStats; - /** - * Pause queue processing - */ - pause(): void; - /** - * Resume queue processing - */ - resume(): void; - /** - * Clean up old delivered and failed items - * @param maxAge Maximum age in milliseconds (default: 7 days) - */ - cleanupOldItems(maxAge?: number): Promise; - /** - * Shutdown the queue - */ - shutdown(): Promise; -} diff --git a/dist_ts/mail/delivery/classes.delivery.queue.js b/dist_ts/mail/delivery/classes.delivery.queue.js deleted file mode 100644 index b29ce72..0000000 --- a/dist_ts/mail/delivery/classes.delivery.queue.js +++ /dev/null @@ -1,488 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { EventEmitter } from 'node:events'; -import * as fs from 'node:fs'; -import * as path from 'node:path'; -import { logger } from '../../logger.js'; -import {} from '../routing/classes.email.config.js'; -/** - * A unified queue for all email modes - */ -export class UnifiedDeliveryQueue extends EventEmitter { - options; - queue = new Map(); - checkTimer; - stats; - processing = false; - totalProcessed = 0; - /** - * Create a new unified delivery queue - * @param options Queue options - */ - constructor(options) { - super(); - // Set default options - this.options = { - storageType: options.storageType || 'memory', - persistentPath: options.persistentPath || path.join(process.cwd(), 'email-queue'), - checkInterval: options.checkInterval || 30000, // 30 seconds - maxQueueSize: options.maxQueueSize || 10000, - maxPerDestination: options.maxPerDestination || 100, - maxRetries: options.maxRetries || 5, - baseRetryDelay: options.baseRetryDelay || 60000, // 1 minute - maxRetryDelay: options.maxRetryDelay || 3600000 // 1 hour - }; - // Initialize statistics - this.stats = { - queueSize: 0, - status: { - pending: 0, - processing: 0, - delivered: 0, - failed: 0, - deferred: 0 - }, - modes: { - forward: 0, - mta: 0, - process: 0 - }, - averageAttempts: 0, - totalProcessed: 0, - processingActive: false - }; - } - /** - * Initialize the queue - */ - async initialize() { - logger.log('info', 'Initializing UnifiedDeliveryQueue'); - try { - // Create persistent storage directory if using disk storage - if (this.options.storageType === 'disk') { - if (!fs.existsSync(this.options.persistentPath)) { - fs.mkdirSync(this.options.persistentPath, { recursive: true }); - } - // Load existing items from disk - await this.loadFromDisk(); - } - // Start the queue processing timer - this.startProcessing(); - // Emit initialized event - this.emit('initialized'); - logger.log('info', 'UnifiedDeliveryQueue initialized successfully'); - } - catch (error) { - logger.log('error', `Failed to initialize queue: ${error.message}`); - throw error; - } - } - /** - * Start queue processing - */ - startProcessing() { - if (this.checkTimer) { - clearInterval(this.checkTimer); - } - this.checkTimer = setInterval(() => this.processQueue(), this.options.checkInterval); - this.processing = true; - this.stats.processingActive = true; - this.emit('processingStarted'); - logger.log('info', 'Queue processing started'); - } - /** - * Stop queue processing - */ - stopProcessing() { - if (this.checkTimer) { - clearInterval(this.checkTimer); - this.checkTimer = undefined; - } - this.processing = false; - this.stats.processingActive = false; - this.emit('processingStopped'); - logger.log('info', 'Queue processing stopped'); - } - /** - * Check for items that need to be processed - */ - async processQueue() { - try { - const now = new Date(); - let readyItems = []; - // Find items ready for processing - for (const item of this.queue.values()) { - if (item.status === 'pending' || (item.status === 'deferred' && item.nextAttempt <= now)) { - readyItems.push(item); - } - } - if (readyItems.length === 0) { - return; - } - // Sort by oldest first - readyItems.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime()); - // Emit event for ready items - this.emit('itemsReady', readyItems); - logger.log('info', `Found ${readyItems.length} items ready for processing`); - // Update statistics - this.updateStats(); - } - catch (error) { - logger.log('error', `Error processing queue: ${error.message}`); - this.emit('error', error); - } - } - /** - * Add an item to the queue - * @param processingResult Processing result to queue - * @param mode Processing mode - * @param route Email route - */ - async enqueue(processingResult, mode, route) { - // Check if queue is full - if (this.queue.size >= this.options.maxQueueSize) { - throw new Error('Queue is full'); - } - // Generate a unique ID - const id = `${Date.now()}-${Math.random().toString(36).substring(2, 15)}`; - // Create queue item - const item = { - id, - processingMode: mode, - processingResult, - route, - status: 'pending', - attempts: 0, - nextAttempt: new Date(), - createdAt: new Date(), - updatedAt: new Date() - }; - // Add to queue - this.queue.set(id, item); - // Persist to disk if using disk storage - if (this.options.storageType === 'disk') { - await this.persistItem(item); - } - // Update statistics - this.updateStats(); - // Emit event - this.emit('itemEnqueued', item); - logger.log('info', `Item enqueued with ID ${id}, mode: ${mode}`); - return id; - } - /** - * Get an item from the queue - * @param id Item ID - */ - getItem(id) { - return this.queue.get(id); - } - /** - * Mark an item as being processed - * @param id Item ID - */ - async markProcessing(id) { - const item = this.queue.get(id); - if (!item) { - return false; - } - // Update status - item.status = 'processing'; - item.attempts++; - item.updatedAt = new Date(); - // Persist changes if using disk storage - if (this.options.storageType === 'disk') { - await this.persistItem(item); - } - // Update statistics - this.updateStats(); - // Emit event - this.emit('itemProcessing', item); - logger.log('info', `Item ${id} marked as processing, attempt ${item.attempts}`); - return true; - } - /** - * Mark an item as delivered - * @param id Item ID - */ - async markDelivered(id) { - const item = this.queue.get(id); - if (!item) { - return false; - } - // Update status - item.status = 'delivered'; - item.updatedAt = new Date(); - item.deliveredAt = new Date(); - // Persist changes if using disk storage - if (this.options.storageType === 'disk') { - await this.persistItem(item); - } - // Update statistics - this.totalProcessed++; - this.updateStats(); - // Emit event - this.emit('itemDelivered', item); - logger.log('info', `Item ${id} marked as delivered after ${item.attempts} attempts`); - return true; - } - /** - * Mark an item as failed - * @param id Item ID - * @param error Error message - */ - async markFailed(id, error) { - const item = this.queue.get(id); - if (!item) { - return false; - } - // Determine if we should retry - if (item.attempts < this.options.maxRetries) { - // Calculate next retry time with exponential backoff - const delay = Math.min(this.options.baseRetryDelay * Math.pow(2, item.attempts - 1), this.options.maxRetryDelay); - // Update status - item.status = 'deferred'; - item.lastError = error; - item.nextAttempt = new Date(Date.now() + delay); - item.updatedAt = new Date(); - // Persist changes if using disk storage - if (this.options.storageType === 'disk') { - await this.persistItem(item); - } - // Emit event - this.emit('itemDeferred', item); - logger.log('info', `Item ${id} deferred for ${delay}ms, attempt ${item.attempts}, error: ${error}`); - } - else { - // Mark as permanently failed - item.status = 'failed'; - item.lastError = error; - item.updatedAt = new Date(); - // Persist changes if using disk storage - if (this.options.storageType === 'disk') { - await this.persistItem(item); - } - // Update statistics - this.totalProcessed++; - // Emit event - this.emit('itemFailed', item); - logger.log('warn', `Item ${id} permanently failed after ${item.attempts} attempts, error: ${error}`); - } - // Update statistics - this.updateStats(); - return true; - } - /** - * Remove an item from the queue - * @param id Item ID - */ - async removeItem(id) { - const item = this.queue.get(id); - if (!item) { - return false; - } - // Remove from queue - this.queue.delete(id); - // Remove from disk if using disk storage - if (this.options.storageType === 'disk') { - await this.removeItemFromDisk(id); - } - // Update statistics - this.updateStats(); - // Emit event - this.emit('itemRemoved', item); - logger.log('info', `Item ${id} removed from queue`); - return true; - } - /** - * Persist an item to disk - * @param item Item to persist - */ - async persistItem(item) { - try { - const filePath = path.join(this.options.persistentPath, `${item.id}.json`); - await fs.promises.writeFile(filePath, JSON.stringify(item, null, 2), 'utf8'); - } - catch (error) { - logger.log('error', `Failed to persist item ${item.id}: ${error.message}`); - this.emit('error', error); - } - } - /** - * Remove an item from disk - * @param id Item ID - */ - async removeItemFromDisk(id) { - try { - const filePath = path.join(this.options.persistentPath, `${id}.json`); - if (fs.existsSync(filePath)) { - await fs.promises.unlink(filePath); - } - } - catch (error) { - logger.log('error', `Failed to remove item ${id} from disk: ${error.message}`); - this.emit('error', error); - } - } - /** - * Load queue items from disk - */ - async loadFromDisk() { - try { - // Check if directory exists - if (!fs.existsSync(this.options.persistentPath)) { - return; - } - // Get all JSON files - const files = fs.readdirSync(this.options.persistentPath).filter(file => file.endsWith('.json')); - // Load each file - for (const file of files) { - try { - const filePath = path.join(this.options.persistentPath, file); - const data = await fs.promises.readFile(filePath, 'utf8'); - const item = JSON.parse(data); - // Convert date strings to Date objects - item.createdAt = new Date(item.createdAt); - item.updatedAt = new Date(item.updatedAt); - item.nextAttempt = new Date(item.nextAttempt); - if (item.deliveredAt) { - item.deliveredAt = new Date(item.deliveredAt); - } - // Add to queue - this.queue.set(item.id, item); - } - catch (error) { - logger.log('error', `Failed to load item from ${file}: ${error.message}`); - } - } - // Update statistics - this.updateStats(); - logger.log('info', `Loaded ${this.queue.size} items from disk`); - } - catch (error) { - logger.log('error', `Failed to load items from disk: ${error.message}`); - throw error; - } - } - /** - * Update queue statistics - */ - updateStats() { - // Reset counters - this.stats.queueSize = this.queue.size; - this.stats.status = { - pending: 0, - processing: 0, - delivered: 0, - failed: 0, - deferred: 0 - }; - this.stats.modes = { - forward: 0, - mta: 0, - process: 0 - }; - let totalAttempts = 0; - let oldestTime = Date.now(); - let newestTime = 0; - // Count by status and mode - for (const item of this.queue.values()) { - // Count by status - this.stats.status[item.status]++; - // Count by mode - this.stats.modes[item.processingMode]++; - // Track total attempts - totalAttempts += item.attempts; - // Track oldest and newest - const itemTime = item.createdAt.getTime(); - if (itemTime < oldestTime) { - oldestTime = itemTime; - } - if (itemTime > newestTime) { - newestTime = itemTime; - } - } - // Calculate average attempts - this.stats.averageAttempts = this.queue.size > 0 ? totalAttempts / this.queue.size : 0; - // Set oldest and newest - this.stats.oldestItem = this.queue.size > 0 ? new Date(oldestTime) : undefined; - this.stats.newestItem = this.queue.size > 0 ? new Date(newestTime) : undefined; - // Set total processed - this.stats.totalProcessed = this.totalProcessed; - // Set processing active - this.stats.processingActive = this.processing; - // Emit statistics event - this.emit('statsUpdated', this.stats); - } - /** - * Get queue statistics - */ - getStats() { - return { ...this.stats }; - } - /** - * Pause queue processing - */ - pause() { - if (this.processing) { - this.stopProcessing(); - logger.log('info', 'Queue processing paused'); - } - } - /** - * Resume queue processing - */ - resume() { - if (!this.processing) { - this.startProcessing(); - logger.log('info', 'Queue processing resumed'); - } - } - /** - * Clean up old delivered and failed items - * @param maxAge Maximum age in milliseconds (default: 7 days) - */ - async cleanupOldItems(maxAge = 7 * 24 * 60 * 60 * 1000) { - const cutoff = new Date(Date.now() - maxAge); - let removedCount = 0; - // Find old items - for (const item of this.queue.values()) { - if (['delivered', 'failed'].includes(item.status) && item.updatedAt < cutoff) { - // Remove item - await this.removeItem(item.id); - removedCount++; - } - } - logger.log('info', `Cleaned up ${removedCount} old items`); - return removedCount; - } - /** - * Shutdown the queue - */ - async shutdown() { - logger.log('info', 'Shutting down UnifiedDeliveryQueue'); - // Stop processing - this.stopProcessing(); - // Clear the check timer to prevent memory leaks - if (this.checkTimer) { - clearInterval(this.checkTimer); - this.checkTimer = undefined; - } - // If using disk storage, make sure all items are persisted - if (this.options.storageType === 'disk') { - const pendingWrites = []; - for (const item of this.queue.values()) { - pendingWrites.push(this.persistItem(item)); - } - // Wait for all writes to complete - await Promise.all(pendingWrites); - } - // Clear the queue (memory only) - this.queue.clear(); - // Update statistics - this.updateStats(); - // Emit shutdown event - this.emit('shutdown'); - logger.log('info', 'UnifiedDeliveryQueue shut down successfully'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.delivery.queue.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.delivery.queue.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.delivery.system.d.ts b/dist_ts/mail/delivery/classes.delivery.system.d.ts deleted file mode 100644 index 5f896c0..0000000 --- a/dist_ts/mail/delivery/classes.delivery.system.d.ts +++ /dev/null @@ -1,186 +0,0 @@ -import { EventEmitter } from 'node:events'; -import { UnifiedDeliveryQueue, type IQueueItem } from './classes.delivery.queue.js'; -import type { UnifiedEmailServer } from '../routing/classes.unified.email.server.js'; -/** - * Delivery status enumeration - */ -export declare enum DeliveryStatus { - PENDING = "pending", - DELIVERING = "delivering", - DELIVERED = "delivered", - DEFERRED = "deferred", - FAILED = "failed" -} -/** - * Delivery handler interface - */ -export interface IDeliveryHandler { - deliver(item: IQueueItem): Promise; -} -/** - * Delivery options - */ -export interface IMultiModeDeliveryOptions { - connectionPoolSize?: number; - socketTimeout?: number; - concurrentDeliveries?: number; - sendTimeout?: number; - verifyCertificates?: boolean; - tlsMinVersion?: string; - forwardHandler?: IDeliveryHandler; - deliveryHandler?: IDeliveryHandler; - processHandler?: IDeliveryHandler; - globalRateLimit?: number; - perPatternRateLimit?: Record; - processBounces?: boolean; - bounceHandler?: { - processSmtpFailure: (recipient: string, smtpResponse: string, options: any) => Promise; - }; - onDeliveryStart?: (item: IQueueItem) => Promise; - onDeliverySuccess?: (item: IQueueItem, result: any) => Promise; - onDeliveryFailed?: (item: IQueueItem, error: string) => Promise; -} -/** - * Delivery system statistics - */ -export interface IDeliveryStats { - activeDeliveries: number; - totalSuccessful: number; - totalFailed: number; - avgDeliveryTime: number; - byMode: { - forward: { - successful: number; - failed: number; - }; - mta: { - successful: number; - failed: number; - }; - process: { - successful: number; - failed: number; - }; - }; - rateLimiting: { - currentRate: number; - globalLimit: number; - throttled: number; - }; -} -/** - * Handles delivery for all email processing modes - */ -export declare class MultiModeDeliverySystem extends EventEmitter { - private queue; - private options; - private stats; - private deliveryTimes; - private activeDeliveries; - private running; - private throttled; - private rateLimitLastCheck; - private rateLimitCounter; - private emailServer?; - /** - * Create a new multi-mode delivery system - * @param queue Unified delivery queue - * @param options Delivery options - * @param emailServer Optional reference to unified email server for SmtpClient access - */ - constructor(queue: UnifiedDeliveryQueue, options: IMultiModeDeliveryOptions, emailServer?: UnifiedEmailServer); - /** - * Start the delivery system - */ - start(): Promise; - /** - * Stop the delivery system - */ - stop(): Promise; - /** - * Process ready items from the queue - * @param items Queue items ready for processing - */ - private processItems; - /** - * Deliver an item from the queue - * @param item Queue item to deliver - */ - private deliverItem; - /** - * Default handler for forward mode delivery - * @param item Queue item - */ - private handleForwardDelivery; - /** - * Legacy forward delivery using raw sockets (fallback) - * @param item Queue item - */ - private handleForwardDeliveryLegacy; - /** - * Complete the SMTP exchange after connection and initial setup - * @param socket Network socket - * @param email Email to send - * @param rule Domain rule - */ - private completeSMTPExchange; - /** - * Default handler for MTA mode delivery - * @param item Queue item - */ - private handleMtaDelivery; - /** - * Default handler for process mode delivery - * @param item Queue item - */ - private handleProcessDelivery; - /** - * Get file extension from filename - */ - private getFileExtension; - /** - * Apply DKIM signing to an email - */ - private applyDkimSigning; - /** - * Format email for SMTP transmission - * @param email Email to format - */ - private getFormattedEmail; - /** - * Send SMTP command and wait for response - * @param socket Socket connection - * @param command SMTP command to send - */ - private smtpCommand; - /** - * Send SMTP DATA command with content - * @param socket Socket connection - * @param data Email content to send - */ - private smtpData; - /** - * Upgrade socket to TLS - * @param socket Socket connection - * @param hostname Target hostname for TLS - */ - private upgradeTls; - /** - * Update delivery time statistics - */ - private updateDeliveryTimeStats; - /** - * Check if rate limit is exceeded - * @returns True if rate limited, false otherwise - */ - private checkRateLimit; - /** - * Update delivery options - * @param options New options - */ - updateOptions(options: Partial): void; - /** - * Get delivery statistics - */ - getStats(): IDeliveryStats; -} diff --git a/dist_ts/mail/delivery/classes.delivery.system.js b/dist_ts/mail/delivery/classes.delivery.system.js deleted file mode 100644 index e9d3aba..0000000 --- a/dist_ts/mail/delivery/classes.delivery.system.js +++ /dev/null @@ -1,846 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { EventEmitter } from 'node:events'; -import * as net from 'node:net'; -import * as tls from 'node:tls'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { UnifiedDeliveryQueue } from './classes.delivery.queue.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -/** - * Delivery status enumeration - */ -export var DeliveryStatus; -(function (DeliveryStatus) { - DeliveryStatus["PENDING"] = "pending"; - DeliveryStatus["DELIVERING"] = "delivering"; - DeliveryStatus["DELIVERED"] = "delivered"; - DeliveryStatus["DEFERRED"] = "deferred"; - DeliveryStatus["FAILED"] = "failed"; -})(DeliveryStatus || (DeliveryStatus = {})); -/** - * Handles delivery for all email processing modes - */ -export class MultiModeDeliverySystem extends EventEmitter { - queue; - options; - stats; - deliveryTimes = []; - activeDeliveries = new Set(); - running = false; - throttled = false; - rateLimitLastCheck = Date.now(); - rateLimitCounter = 0; - emailServer; - /** - * Create a new multi-mode delivery system - * @param queue Unified delivery queue - * @param options Delivery options - * @param emailServer Optional reference to unified email server for SmtpClient access - */ - constructor(queue, options, emailServer) { - super(); - this.queue = queue; - this.emailServer = emailServer; - // Set default options - this.options = { - connectionPoolSize: options.connectionPoolSize || 10, - socketTimeout: options.socketTimeout || 30000, // 30 seconds - concurrentDeliveries: options.concurrentDeliveries || 10, - sendTimeout: options.sendTimeout || 60000, // 1 minute - verifyCertificates: options.verifyCertificates !== false, // Default to true - tlsMinVersion: options.tlsMinVersion || 'TLSv1.2', - forwardHandler: options.forwardHandler || { - deliver: this.handleForwardDelivery.bind(this) - }, - deliveryHandler: options.deliveryHandler || { - deliver: this.handleMtaDelivery.bind(this) - }, - processHandler: options.processHandler || { - deliver: this.handleProcessDelivery.bind(this) - }, - globalRateLimit: options.globalRateLimit || 100, // 100 emails per minute - perPatternRateLimit: options.perPatternRateLimit || {}, - processBounces: options.processBounces !== false, // Default to true - bounceHandler: options.bounceHandler || null, - onDeliveryStart: options.onDeliveryStart || (async () => { }), - onDeliverySuccess: options.onDeliverySuccess || (async () => { }), - onDeliveryFailed: options.onDeliveryFailed || (async () => { }) - }; - // Initialize statistics - this.stats = { - activeDeliveries: 0, - totalSuccessful: 0, - totalFailed: 0, - avgDeliveryTime: 0, - byMode: { - forward: { - successful: 0, - failed: 0 - }, - mta: { - successful: 0, - failed: 0 - }, - process: { - successful: 0, - failed: 0 - } - }, - rateLimiting: { - currentRate: 0, - globalLimit: this.options.globalRateLimit, - throttled: 0 - } - }; - // Set up event listeners - this.queue.on('itemsReady', this.processItems.bind(this)); - } - /** - * Start the delivery system - */ - async start() { - logger.log('info', 'Starting MultiModeDeliverySystem'); - if (this.running) { - logger.log('warn', 'MultiModeDeliverySystem is already running'); - return; - } - this.running = true; - // Emit started event - this.emit('started'); - logger.log('info', 'MultiModeDeliverySystem started successfully'); - } - /** - * Stop the delivery system - */ - async stop() { - logger.log('info', 'Stopping MultiModeDeliverySystem'); - if (!this.running) { - logger.log('warn', 'MultiModeDeliverySystem is already stopped'); - return; - } - this.running = false; - // Wait for active deliveries to complete - if (this.activeDeliveries.size > 0) { - logger.log('info', `Waiting for ${this.activeDeliveries.size} active deliveries to complete`); - // Wait for a maximum of 30 seconds - await new Promise(resolve => { - const checkInterval = setInterval(() => { - if (this.activeDeliveries.size === 0) { - clearInterval(checkInterval); - clearTimeout(forceTimeout); - resolve(); - } - }, 1000); - // Force resolve after 30 seconds - const forceTimeout = setTimeout(() => { - clearInterval(checkInterval); - resolve(); - }, 30000); - }); - } - // Emit stopped event - this.emit('stopped'); - logger.log('info', 'MultiModeDeliverySystem stopped successfully'); - } - /** - * Process ready items from the queue - * @param items Queue items ready for processing - */ - async processItems(items) { - if (!this.running) { - return; - } - // Check if we're already at max concurrent deliveries - if (this.activeDeliveries.size >= this.options.concurrentDeliveries) { - logger.log('debug', `Already at max concurrent deliveries (${this.activeDeliveries.size})`); - return; - } - // Check rate limiting - if (this.checkRateLimit()) { - logger.log('debug', 'Rate limit exceeded, throttling deliveries'); - return; - } - // Calculate how many more deliveries we can start - const availableSlots = this.options.concurrentDeliveries - this.activeDeliveries.size; - const itemsToProcess = items.slice(0, availableSlots); - if (itemsToProcess.length === 0) { - return; - } - logger.log('info', `Processing ${itemsToProcess.length} items for delivery`); - // Process each item - for (const item of itemsToProcess) { - // Mark as processing - await this.queue.markProcessing(item.id); - // Add to active deliveries - this.activeDeliveries.add(item.id); - this.stats.activeDeliveries = this.activeDeliveries.size; - // Deliver asynchronously - this.deliverItem(item).catch(err => { - logger.log('error', `Unhandled error in delivery: ${err.message}`); - }); - } - // Update statistics - this.emit('statsUpdated', this.stats); - } - /** - * Deliver an item from the queue - * @param item Queue item to deliver - */ - async deliverItem(item) { - const startTime = Date.now(); - try { - // Call delivery start hook - await this.options.onDeliveryStart(item); - // Emit delivery start event - this.emit('deliveryStart', item); - logger.log('info', `Starting delivery of item ${item.id}, mode: ${item.processingMode}`); - // Choose the appropriate handler based on mode - let result; - switch (item.processingMode) { - case 'forward': - result = await this.options.forwardHandler.deliver(item); - break; - case 'mta': - result = await this.options.deliveryHandler.deliver(item); - break; - case 'process': - result = await this.options.processHandler.deliver(item); - break; - default: - throw new Error(`Unknown processing mode: ${item.processingMode}`); - } - // Mark as delivered - await this.queue.markDelivered(item.id); - // Update statistics - this.stats.totalSuccessful++; - this.stats.byMode[item.processingMode].successful++; - // Calculate delivery time - const deliveryTime = Date.now() - startTime; - this.deliveryTimes.push(deliveryTime); - this.updateDeliveryTimeStats(); - // Call delivery success hook - await this.options.onDeliverySuccess(item, result); - // Emit delivery success event - this.emit('deliverySuccess', item, result); - logger.log('info', `Item ${item.id} delivered successfully in ${deliveryTime}ms`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_DELIVERY, - message: 'Email delivery successful', - details: { - itemId: item.id, - mode: item.processingMode, - routeName: item.route?.name || 'unknown', - deliveryTime - }, - success: true - }); - } - catch (error) { - // Calculate delivery attempt time even for failures - const deliveryTime = Date.now() - startTime; - // Mark as failed - await this.queue.markFailed(item.id, error.message); - // Update statistics - this.stats.totalFailed++; - this.stats.byMode[item.processingMode].failed++; - // Call delivery failed hook - await this.options.onDeliveryFailed(item, error.message); - // Process as bounce if enabled and we have a bounce handler - if (this.options.processBounces && this.options.bounceHandler) { - try { - const email = item.processingResult; - // Extract recipient and error message - // For multiple recipients, we'd need more sophisticated parsing - const recipient = email.to.length > 0 ? email.to[0] : ''; - if (recipient) { - logger.log('info', `Processing delivery failure as bounce for recipient ${recipient}`); - // Process SMTP failure through bounce handler - await this.options.bounceHandler.processSmtpFailure(recipient, error.message, { - sender: email.from, - originalEmailId: item.id, - headers: email.headers - }); - logger.log('info', `Bounce record created for failed delivery to ${recipient}`); - } - } - catch (bounceError) { - logger.log('error', `Failed to process bounce: ${bounceError.message}`); - } - } - // Emit delivery failed event - this.emit('deliveryFailed', item, error); - logger.log('error', `Item ${item.id} delivery failed: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_DELIVERY, - message: 'Email delivery failed', - details: { - itemId: item.id, - mode: item.processingMode, - routeName: item.route?.name || 'unknown', - error: error.message, - deliveryTime - }, - success: false - }); - } - finally { - // Remove from active deliveries - this.activeDeliveries.delete(item.id); - this.stats.activeDeliveries = this.activeDeliveries.size; - // Update statistics - this.emit('statsUpdated', this.stats); - } - } - /** - * Default handler for forward mode delivery - * @param item Queue item - */ - async handleForwardDelivery(item) { - logger.log('info', `Forward delivery for item ${item.id}`); - const email = item.processingResult; - const route = item.route; - // Get target server information - const targetServer = route?.action.forward?.host; - const targetPort = route?.action.forward?.port || 25; - const useTls = false; // TLS configuration can be enhanced later - if (!targetServer) { - throw new Error('No target server configured for forward mode'); - } - logger.log('info', `Forwarding email to ${targetServer}:${targetPort}, TLS: ${useTls}`); - try { - // Get SMTP client from email server if available - if (!this.emailServer) { - // Fall back to raw socket implementation if no email server - logger.log('warn', 'No email server available, falling back to raw socket implementation'); - return this.handleForwardDeliveryLegacy(item); - } - // Get SMTP client from UnifiedEmailServer - const smtpClient = this.emailServer.getSmtpClient(targetServer, targetPort); - // Apply DKIM signing if configured in the route - if (item.route?.action.options?.mtaOptions?.dkimSign) { - await this.applyDkimSigning(email, item.route.action.options.mtaOptions); - } - // Send the email using SmtpClient - const result = await smtpClient.sendMail(email); - if (result.success) { - logger.log('info', `Email forwarded successfully to ${targetServer}:${targetPort}`); - return { - targetServer: targetServer, - targetPort: targetPort, - recipients: result.acceptedRecipients.length, - messageId: result.messageId, - rejectedRecipients: result.rejectedRecipients - }; - } - else { - throw new Error(result.error?.message || 'Failed to forward email'); - } - } - catch (error) { - logger.log('error', `Failed to forward email: ${error.message}`); - throw error; - } - } - /** - * Legacy forward delivery using raw sockets (fallback) - * @param item Queue item - */ - async handleForwardDeliveryLegacy(item) { - const email = item.processingResult; - const route = item.route; - // Get target server information - const targetServer = route?.action.forward?.host; - const targetPort = route?.action.forward?.port || 25; - const useTls = false; // TLS configuration can be enhanced later - if (!targetServer) { - throw new Error('No target server configured for forward mode'); - } - // Create a socket connection to the target server - const socket = new net.Socket(); - // Set timeout - socket.setTimeout(this.options.socketTimeout); - try { - // Connect to the target server - await new Promise((resolve, reject) => { - // Handle connection events - socket.on('connect', () => { - logger.log('debug', `Connected to ${targetServer}:${targetPort}`); - resolve(); - }); - socket.on('timeout', () => { - reject(new Error(`Connection timeout to ${targetServer}:${targetPort}`)); - }); - socket.on('error', (err) => { - reject(new Error(`Connection error to ${targetServer}:${targetPort}: ${err.message}`)); - }); - // Connect to the server - socket.connect({ - host: targetServer, - port: targetPort - }); - }); - // Send EHLO - await this.smtpCommand(socket, `EHLO ${route?.action.options?.mtaOptions?.domain || 'localhost'}`); - // Start TLS if required - if (useTls) { - await this.smtpCommand(socket, 'STARTTLS'); - // Upgrade to TLS - const tlsSocket = await this.upgradeTls(socket, targetServer); - // Send EHLO again after STARTTLS - await this.smtpCommand(tlsSocket, `EHLO ${route?.action.options?.mtaOptions?.domain || 'localhost'}`); - // Use tlsSocket for remaining commands - return this.completeSMTPExchange(tlsSocket, email, route); - } - // Complete the SMTP exchange - return this.completeSMTPExchange(socket, email, route); - } - catch (error) { - logger.log('error', `Failed to forward email: ${error.message}`); - // Close the connection - socket.destroy(); - throw error; - } - } - /** - * Complete the SMTP exchange after connection and initial setup - * @param socket Network socket - * @param email Email to send - * @param rule Domain rule - */ - async completeSMTPExchange(socket, email, route) { - try { - // Authenticate if credentials provided - if (route?.action?.forward?.auth?.user && route?.action?.forward?.auth?.pass) { - // Send AUTH LOGIN - await this.smtpCommand(socket, 'AUTH LOGIN'); - // Send username (base64) - const username = Buffer.from(route.action.forward.auth.user).toString('base64'); - await this.smtpCommand(socket, username); - // Send password (base64) - const password = Buffer.from(route.action.forward.auth.pass).toString('base64'); - await this.smtpCommand(socket, password); - } - // Send MAIL FROM - await this.smtpCommand(socket, `MAIL FROM:<${email.from}>`); - // Send RCPT TO for each recipient - for (const recipient of email.getAllRecipients()) { - await this.smtpCommand(socket, `RCPT TO:<${recipient}>`); - } - // Send DATA - await this.smtpCommand(socket, 'DATA'); - // Send email content (simplified) - const emailContent = await this.getFormattedEmail(email); - await this.smtpData(socket, emailContent); - // Send QUIT - await this.smtpCommand(socket, 'QUIT'); - // Close the connection - socket.end(); - logger.log('info', `Email forwarded successfully to ${route?.action?.forward?.host}:${route?.action?.forward?.port || 25}`); - return { - targetServer: route?.action?.forward?.host, - targetPort: route?.action?.forward?.port || 25, - recipients: email.getAllRecipients().length - }; - } - catch (error) { - logger.log('error', `Failed to forward email: ${error.message}`); - // Close the connection - socket.destroy(); - throw error; - } - } - /** - * Default handler for MTA mode delivery - * @param item Queue item - */ - async handleMtaDelivery(item) { - logger.log('info', `MTA delivery for item ${item.id}`); - const email = item.processingResult; - const route = item.route; - try { - // Apply DKIM signing if configured in the route - if (item.route?.action.options?.mtaOptions?.dkimSign) { - await this.applyDkimSigning(email, item.route.action.options.mtaOptions); - } - // In a full implementation, this would use the MTA service - // For now, we'll simulate a successful delivery - logger.log('info', `Email processed by MTA: ${email.subject} to ${email.getAllRecipients().join(', ')}`); - // Note: The MTA implementation would handle actual local delivery - // Simulate successful delivery - return { - recipients: email.getAllRecipients().length, - subject: email.subject, - dkimSigned: !!item.route?.action.options?.mtaOptions?.dkimSign - }; - } - catch (error) { - logger.log('error', `Failed to process email in MTA mode: ${error.message}`); - throw error; - } - } - /** - * Default handler for process mode delivery - * @param item Queue item - */ - async handleProcessDelivery(item) { - logger.log('info', `Process delivery for item ${item.id}`); - const email = item.processingResult; - const route = item.route; - try { - // Apply content scanning if enabled - if (route?.action.options?.contentScanning && route?.action.options?.scanners && route.action.options.scanners.length > 0) { - logger.log('info', 'Performing content scanning'); - // Apply each scanner - for (const scanner of route.action.options.scanners) { - switch (scanner.type) { - case 'spam': - logger.log('info', 'Scanning for spam content'); - // Implement spam scanning - break; - case 'virus': - logger.log('info', 'Scanning for virus content'); - // Implement virus scanning - break; - case 'attachment': - logger.log('info', 'Scanning attachments'); - // Check for blocked extensions - if (scanner.blockedExtensions && scanner.blockedExtensions.length > 0) { - for (const attachment of email.attachments) { - const ext = this.getFileExtension(attachment.filename); - if (scanner.blockedExtensions.includes(ext)) { - if (scanner.action === 'reject') { - throw new Error(`Blocked attachment type: ${ext}`); - } - else { // tag - email.addHeader('X-Attachment-Warning', `Potentially unsafe attachment: ${attachment.filename}`); - } - } - } - } - break; - } - } - } - // Apply transformations if defined - if (route?.action.options?.transformations && route?.action.options?.transformations.length > 0) { - logger.log('info', 'Applying email transformations'); - for (const transform of route.action.options.transformations) { - switch (transform.type) { - case 'addHeader': - if (transform.header && transform.value) { - email.addHeader(transform.header, transform.value); - } - break; - } - } - } - // Apply DKIM signing if configured (after all transformations) - if (item.route?.action.options?.mtaOptions?.dkimSign || item.route?.action.process?.dkim) { - await this.applyDkimSigning(email, item.route.action.options?.mtaOptions || {}); - } - logger.log('info', `Email successfully processed in store-and-forward mode`); - // Simulate successful delivery - return { - recipients: email.getAllRecipients().length, - subject: email.subject, - scanned: !!route?.action.options?.contentScanning, - transformed: !!(route?.action.options?.transformations && route?.action.options?.transformations.length > 0), - dkimSigned: !!(item.route?.action.options?.mtaOptions?.dkimSign || item.route?.action.process?.dkim) - }; - } - catch (error) { - logger.log('error', `Failed to process email: ${error.message}`); - throw error; - } - } - /** - * Get file extension from filename - */ - getFileExtension(filename) { - return filename.substring(filename.lastIndexOf('.')).toLowerCase(); - } - /** - * Apply DKIM signing to an email - */ - async applyDkimSigning(email, mtaOptions) { - if (!this.emailServer) { - logger.log('warn', 'Cannot apply DKIM signing without email server reference'); - return; - } - const domainName = mtaOptions.dkimOptions?.domainName || email.from.split('@')[1]; - const keySelector = mtaOptions.dkimOptions?.keySelector || 'default'; - try { - // Ensure DKIM keys exist for the domain - await this.emailServer.dkimCreator.handleDKIMKeysForDomain(domainName); - // Get the private key - const dkimPrivateKey = (await this.emailServer.dkimCreator.readDKIMKeys(domainName)).privateKey; - // Convert Email to raw format for signing - const rawEmail = email.toRFC822String(); - // Sign via Rust bridge - const bridge = RustSecurityBridge.getInstance(); - const signResult = await bridge.signDkim({ - rawMessage: rawEmail, - domain: domainName, - selector: keySelector, - privateKey: dkimPrivateKey, - }); - if (signResult.header) { - email.addHeader('DKIM-Signature', signResult.header); - logger.log('info', `Successfully added DKIM signature for ${domainName}`); - } - } - catch (error) { - logger.log('error', `Failed to apply DKIM signature: ${error.message}`); - // Don't throw - allow email to be sent without DKIM if signing fails - } - } - /** - * Format email for SMTP transmission - * @param email Email to format - */ - async getFormattedEmail(email) { - // This is a simplified implementation - // In a full implementation, this would use proper MIME formatting - let content = ''; - // Add headers - content += `From: ${email.from}\r\n`; - content += `To: ${email.to.join(', ')}\r\n`; - content += `Subject: ${email.subject}\r\n`; - // Add additional headers - for (const [name, value] of Object.entries(email.headers || {})) { - content += `${name}: ${value}\r\n`; - } - // Add content type for multipart - if (email.attachments && email.attachments.length > 0) { - const boundary = `----_=_NextPart_${Math.random().toString(36).substr(2)}`; - content += `MIME-Version: 1.0\r\n`; - content += `Content-Type: multipart/mixed; boundary="${boundary}"\r\n`; - content += `\r\n`; - // Add text part - content += `--${boundary}\r\n`; - content += `Content-Type: text/plain; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.text}\r\n`; - // Add HTML part if present - if (email.html) { - content += `--${boundary}\r\n`; - content += `Content-Type: text/html; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.html}\r\n`; - } - // Add attachments - for (const attachment of email.attachments) { - content += `--${boundary}\r\n`; - content += `Content-Type: ${attachment.contentType || 'application/octet-stream'}; name="${attachment.filename}"\r\n`; - content += `Content-Disposition: attachment; filename="${attachment.filename}"\r\n`; - content += `Content-Transfer-Encoding: base64\r\n`; - content += `\r\n`; - // Add base64 encoded content - const base64Content = attachment.content.toString('base64'); - // Split into lines of 76 characters - for (let i = 0; i < base64Content.length; i += 76) { - content += base64Content.substring(i, i + 76) + '\r\n'; - } - } - // End boundary - content += `--${boundary}--\r\n`; - } - else { - // Simple email with just text - content += `Content-Type: text/plain; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.text}\r\n`; - } - return content; - } - /** - * Send SMTP command and wait for response - * @param socket Socket connection - * @param command SMTP command to send - */ - async smtpCommand(socket, command) { - return new Promise((resolve, reject) => { - const onData = (data) => { - const response = data.toString().trim(); - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - // Check response code - if (response.charAt(0) === '2' || response.charAt(0) === '3') { - resolve(response); - } - else { - reject(new Error(`SMTP error: ${response}`)); - } - }; - const onError = (err) => { - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - reject(err); - }; - const onTimeout = () => { - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - reject(new Error('SMTP command timeout')); - }; - // Set up listeners - socket.once('data', onData); - socket.once('error', onError); - socket.once('timeout', onTimeout); - // Send command - socket.write(command + '\r\n'); - }); - } - /** - * Send SMTP DATA command with content - * @param socket Socket connection - * @param data Email content to send - */ - async smtpData(socket, data) { - return new Promise((resolve, reject) => { - const onData = (responseData) => { - const response = responseData.toString().trim(); - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - // Check response code - if (response.charAt(0) === '2') { - resolve(response); - } - else { - reject(new Error(`SMTP error: ${response}`)); - } - }; - const onError = (err) => { - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - reject(err); - }; - const onTimeout = () => { - // Clean up listeners - socket.removeListener('data', onData); - socket.removeListener('error', onError); - socket.removeListener('timeout', onTimeout); - reject(new Error('SMTP data timeout')); - }; - // Set up listeners - socket.once('data', onData); - socket.once('error', onError); - socket.once('timeout', onTimeout); - // Send data and end with CRLF.CRLF - socket.write(data + '\r\n.\r\n'); - }); - } - /** - * Upgrade socket to TLS - * @param socket Socket connection - * @param hostname Target hostname for TLS - */ - async upgradeTls(socket, hostname) { - return new Promise((resolve, reject) => { - const tlsOptions = { - socket, - servername: hostname, - rejectUnauthorized: this.options.verifyCertificates, - minVersion: this.options.tlsMinVersion - }; - const tlsSocket = tls.connect(tlsOptions); - tlsSocket.once('secureConnect', () => { - resolve(tlsSocket); - }); - tlsSocket.once('error', (err) => { - reject(new Error(`TLS error: ${err.message}`)); - }); - tlsSocket.setTimeout(this.options.socketTimeout); - tlsSocket.once('timeout', () => { - reject(new Error('TLS connection timeout')); - }); - }); - } - /** - * Update delivery time statistics - */ - updateDeliveryTimeStats() { - if (this.deliveryTimes.length === 0) - return; - // Keep only the last 1000 delivery times - if (this.deliveryTimes.length > 1000) { - this.deliveryTimes = this.deliveryTimes.slice(-1000); - } - // Calculate average - const sum = this.deliveryTimes.reduce((acc, time) => acc + time, 0); - this.stats.avgDeliveryTime = sum / this.deliveryTimes.length; - } - /** - * Check if rate limit is exceeded - * @returns True if rate limited, false otherwise - */ - checkRateLimit() { - const now = Date.now(); - const elapsed = now - this.rateLimitLastCheck; - // Reset counter if more than a minute has passed - if (elapsed >= 60000) { - this.rateLimitLastCheck = now; - this.rateLimitCounter = 0; - this.throttled = false; - this.stats.rateLimiting.currentRate = 0; - return false; - } - // Check if we're already throttled - if (this.throttled) { - return true; - } - // Increment counter - this.rateLimitCounter++; - // Calculate current rate (emails per minute) - const rate = (this.rateLimitCounter / elapsed) * 60000; - this.stats.rateLimiting.currentRate = rate; - // Check if rate limit is exceeded - if (rate > this.options.globalRateLimit) { - this.throttled = true; - this.stats.rateLimiting.throttled++; - // Schedule throttle reset - const resetDelay = 60000 - elapsed; - setTimeout(() => { - this.throttled = false; - this.rateLimitLastCheck = Date.now(); - this.rateLimitCounter = 0; - this.stats.rateLimiting.currentRate = 0; - }, resetDelay); - return true; - } - return false; - } - /** - * Update delivery options - * @param options New options - */ - updateOptions(options) { - this.options = { - ...this.options, - ...options - }; - // Update rate limit statistics - if (options.globalRateLimit) { - this.stats.rateLimiting.globalLimit = options.globalRateLimit; - } - logger.log('info', 'MultiModeDeliverySystem options updated'); - } - /** - * Get delivery statistics - */ - getStats() { - return { ...this.stats }; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.delivery.system.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.delivery.system.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.emailsendjob.d.ts b/dist_ts/mail/delivery/classes.emailsendjob.d.ts deleted file mode 100644 index 0d16b8f..0000000 --- a/dist_ts/mail/delivery/classes.emailsendjob.d.ts +++ /dev/null @@ -1,84 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { Email } from '../core/classes.email.js'; -import type { UnifiedEmailServer } from '../routing/classes.unified.email.server.js'; -export interface IEmailSendOptions { - maxRetries?: number; - retryDelay?: number; - connectionTimeout?: number; - tlsOptions?: plugins.tls.ConnectionOptions; - debugMode?: boolean; -} -export declare enum DeliveryStatus { - PENDING = "pending", - SENDING = "sending", - DELIVERED = "delivered", - FAILED = "failed", - DEFERRED = "deferred" -} -export interface DeliveryInfo { - status: DeliveryStatus; - attempts: number; - error?: Error; - lastAttempt?: Date; - nextAttempt?: Date; - mxServer?: string; - deliveryTime?: Date; - logs: string[]; -} -export declare class EmailSendJob { - emailServerRef: UnifiedEmailServer; - private email; - private mxServers; - private currentMxIndex; - private options; - deliveryInfo: DeliveryInfo; - constructor(emailServerRef: UnifiedEmailServer, emailArg: Email, options?: IEmailSendOptions); - /** - * Send the email to its recipients - */ - send(): Promise; - /** - * Validate the email before sending - */ - private validateEmail; - /** - * Resolve MX records for the recipient domain - */ - private resolveMxRecords; - /** - * Attempt to deliver the email with retries - */ - private attemptDelivery; - /** - * Connect to a specific MX server and send the email using SmtpClient - */ - private connectAndSend; - /** - * Record delivery event for monitoring - */ - private recordDeliveryEvent; - /** - * Check if an error represents a permanent failure - */ - private isPermanentFailure; - /** - * Resolve MX records for a domain - */ - private resolveMx; - /** - * Log a message with timestamp - */ - private log; - /** - * Save successful email to storage - */ - private saveSuccess; - /** - * Save failed email to storage - */ - private saveFailed; - /** - * Delay for specified milliseconds - */ - private delay; -} diff --git a/dist_ts/mail/delivery/classes.emailsendjob.js b/dist_ts/mail/delivery/classes.emailsendjob.js deleted file mode 100644 index 7aaa425..0000000 --- a/dist_ts/mail/delivery/classes.emailsendjob.js +++ /dev/null @@ -1,366 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { Email } from '../core/classes.email.js'; -import { EmailSignJob } from './classes.emailsignjob.js'; -// Email delivery status -export var DeliveryStatus; -(function (DeliveryStatus) { - DeliveryStatus["PENDING"] = "pending"; - DeliveryStatus["SENDING"] = "sending"; - DeliveryStatus["DELIVERED"] = "delivered"; - DeliveryStatus["FAILED"] = "failed"; - DeliveryStatus["DEFERRED"] = "deferred"; // Temporary failure, will retry -})(DeliveryStatus || (DeliveryStatus = {})); -export class EmailSendJob { - emailServerRef; - email; - mxServers = []; - currentMxIndex = 0; - options; - deliveryInfo; - constructor(emailServerRef, emailArg, options = {}) { - this.email = emailArg; - this.emailServerRef = emailServerRef; - // Set default options - this.options = { - maxRetries: options.maxRetries || 3, - retryDelay: options.retryDelay || 30000, // 30 seconds - connectionTimeout: options.connectionTimeout || 60000, // 60 seconds - tlsOptions: options.tlsOptions || {}, - debugMode: options.debugMode || false - }; - // Initialize delivery info - this.deliveryInfo = { - status: DeliveryStatus.PENDING, - attempts: 0, - logs: [] - }; - } - /** - * Send the email to its recipients - */ - async send() { - try { - // Check if the email is valid before attempting to send - this.validateEmail(); - // Resolve MX records for the recipient domain - await this.resolveMxRecords(); - // Try to send the email - return await this.attemptDelivery(); - } - catch (error) { - this.log(`Critical error in send process: ${error.message}`); - this.deliveryInfo.status = DeliveryStatus.FAILED; - this.deliveryInfo.error = error; - // Save failed email for potential future retry or analysis - await this.saveFailed(); - return DeliveryStatus.FAILED; - } - } - /** - * Validate the email before sending - */ - validateEmail() { - if (!this.email.to || this.email.to.length === 0) { - throw new Error('No recipients specified'); - } - if (!this.email.from) { - throw new Error('No sender specified'); - } - const fromDomain = this.email.getFromDomain(); - if (!fromDomain) { - throw new Error('Invalid sender domain'); - } - } - /** - * Resolve MX records for the recipient domain - */ - async resolveMxRecords() { - const domain = this.email.getPrimaryRecipient()?.split('@')[1]; - if (!domain) { - throw new Error('Invalid recipient domain'); - } - this.log(`Resolving MX records for domain: ${domain}`); - try { - const addresses = await this.resolveMx(domain); - // Sort by priority (lowest number = highest priority) - addresses.sort((a, b) => a.priority - b.priority); - this.mxServers = addresses.map(mx => mx.exchange); - this.log(`Found ${this.mxServers.length} MX servers: ${this.mxServers.join(', ')}`); - if (this.mxServers.length === 0) { - throw new Error(`No MX records found for domain: ${domain}`); - } - } - catch (error) { - this.log(`Failed to resolve MX records: ${error.message}`); - throw new Error(`MX lookup failed for ${domain}: ${error.message}`); - } - } - /** - * Attempt to deliver the email with retries - */ - async attemptDelivery() { - while (this.deliveryInfo.attempts < this.options.maxRetries) { - this.deliveryInfo.attempts++; - this.deliveryInfo.lastAttempt = new Date(); - this.deliveryInfo.status = DeliveryStatus.SENDING; - try { - this.log(`Delivery attempt ${this.deliveryInfo.attempts} of ${this.options.maxRetries}`); - // Try each MX server in order of priority - while (this.currentMxIndex < this.mxServers.length) { - const currentMx = this.mxServers[this.currentMxIndex]; - this.deliveryInfo.mxServer = currentMx; - try { - this.log(`Attempting delivery to MX server: ${currentMx}`); - await this.connectAndSend(currentMx); - // If we get here, email was sent successfully - this.deliveryInfo.status = DeliveryStatus.DELIVERED; - this.deliveryInfo.deliveryTime = new Date(); - this.log(`Email delivered successfully to ${currentMx}`); - // Record delivery for sender reputation monitoring - this.recordDeliveryEvent('delivered'); - // Save successful email record - await this.saveSuccess(); - return DeliveryStatus.DELIVERED; - } - catch (error) { - this.log(`Failed to deliver to ${currentMx}: ${error.message}`); - this.currentMxIndex++; - // If this MX server failed, try the next one - if (this.currentMxIndex >= this.mxServers.length) { - throw error; // No more MX servers to try - } - } - } - throw new Error('All MX servers failed'); - } - catch (error) { - this.deliveryInfo.error = error; - // Check if this is a permanent failure - if (this.isPermanentFailure(error)) { - this.log('Permanent failure detected, not retrying'); - this.deliveryInfo.status = DeliveryStatus.FAILED; - // Record permanent failure for bounce management - this.recordDeliveryEvent('bounced', true); - await this.saveFailed(); - return DeliveryStatus.FAILED; - } - // This is a temporary failure - if (this.deliveryInfo.attempts < this.options.maxRetries) { - this.log(`Temporary failure, will retry in ${this.options.retryDelay}ms`); - this.deliveryInfo.status = DeliveryStatus.DEFERRED; - this.deliveryInfo.nextAttempt = new Date(Date.now() + this.options.retryDelay); - // Record temporary failure for monitoring - this.recordDeliveryEvent('deferred'); - // Reset MX server index for next retry - this.currentMxIndex = 0; - // Wait before retrying - await this.delay(this.options.retryDelay); - } - } - } - // If we get here, all retries failed - this.deliveryInfo.status = DeliveryStatus.FAILED; - await this.saveFailed(); - return DeliveryStatus.FAILED; - } - /** - * Connect to a specific MX server and send the email using SmtpClient - */ - async connectAndSend(mxServer) { - this.log(`Connecting to ${mxServer}:25`); - try { - // Check if IP warmup is enabled and get an IP to use - let localAddress = undefined; - try { - const fromDomain = this.email.getFromDomain(); - const bestIP = this.emailServerRef.getBestIPForSending({ - from: this.email.from, - to: this.email.getAllRecipients(), - domain: fromDomain, - isTransactional: this.email.priority === 'high' - }); - if (bestIP) { - this.log(`Using warmed-up IP ${bestIP} for sending`); - localAddress = bestIP; - // Record the send for warm-up tracking - this.emailServerRef.recordIPSend(bestIP); - } - } - catch (error) { - this.log(`Error selecting IP address: ${error.message}`); - } - // Get SMTP client from UnifiedEmailServer - const smtpClient = this.emailServerRef.getSmtpClient(mxServer, 25); - // Sign the email with DKIM if available - let signedEmail = this.email; - try { - const fromDomain = this.email.getFromDomain(); - if (fromDomain && this.emailServerRef.hasDkimKey(fromDomain)) { - // Convert email to RFC822 format for signing - const emailMessage = this.email.toRFC822String(); - // Create sign job with proper options - const emailSignJob = new EmailSignJob(this.emailServerRef, { - domain: fromDomain, - selector: 'default', // Using default selector - headers: {}, // Headers will be extracted from emailMessage - body: emailMessage - }); - // Get the DKIM signature header - const signatureHeader = await emailSignJob.getSignatureHeader(emailMessage); - // Add the signature to the email - if (signatureHeader) { - // For now, we'll use the email as-is since SmtpClient will handle DKIM - this.log(`Email ready for DKIM signing for domain: ${fromDomain}`); - } - } - } - catch (error) { - this.log(`Failed to prepare DKIM: ${error.message}`); - } - // Send the email using SmtpClient - const result = await smtpClient.sendMail(signedEmail); - if (result.success) { - this.log(`Email sent successfully: ${result.response}`); - // Record the send for reputation monitoring - this.recordDeliveryEvent('delivered'); - } - else { - throw new Error(result.error?.message || 'Failed to send email'); - } - } - catch (error) { - this.log(`Failed to send email via ${mxServer}: ${error.message}`); - throw error; - } - } - /** - * Record delivery event for monitoring - */ - recordDeliveryEvent(eventType, isHardBounce = false) { - try { - const domain = this.email.getFromDomain(); - if (domain) { - if (eventType === 'delivered') { - this.emailServerRef.recordDelivery(domain); - } - else if (eventType === 'bounced') { - // Get the receiving domain for bounce recording - let receivingDomain = null; - const primaryRecipient = this.email.getPrimaryRecipient(); - if (primaryRecipient) { - receivingDomain = primaryRecipient.split('@')[1]; - } - if (receivingDomain) { - this.emailServerRef.recordBounce(domain, receivingDomain, isHardBounce ? 'hard' : 'soft', this.deliveryInfo.error?.message || 'Unknown error'); - } - } - } - } - catch (error) { - this.log(`Failed to record delivery event: ${error.message}`); - } - } - /** - * Check if an error represents a permanent failure - */ - isPermanentFailure(error) { - const permanentFailurePatterns = [ - 'User unknown', - 'No such user', - 'Mailbox not found', - 'Invalid recipient', - 'Account disabled', - 'Account suspended', - 'Domain not found', - 'No such domain', - 'Invalid domain', - 'Relay access denied', - 'Access denied', - 'Blacklisted', - 'Blocked', - '550', // Permanent failure SMTP code - '551', - '552', - '553', - '554' - ]; - const errorMessage = error.message.toLowerCase(); - return permanentFailurePatterns.some(pattern => errorMessage.includes(pattern.toLowerCase())); - } - /** - * Resolve MX records for a domain - */ - resolveMx(domain) { - return new Promise((resolve, reject) => { - plugins.dns.resolveMx(domain, (err, addresses) => { - if (err) { - reject(err); - } - else { - resolve(addresses || []); - } - }); - }); - } - /** - * Log a message with timestamp - */ - log(message) { - const timestamp = new Date().toISOString(); - const logEntry = `[${timestamp}] ${message}`; - this.deliveryInfo.logs.push(logEntry); - if (this.options.debugMode) { - console.log(`[EmailSendJob] ${logEntry}`); - } - } - /** - * Save successful email to storage - */ - async saveSuccess() { - try { - // Use the existing email storage path - const emailContent = this.email.toRFC822String(); - const fileName = `${Date.now()}_${this.email.from}_to_${this.email.to[0]}_success.eml`; - const filePath = plugins.path.join(paths.sentEmailsDir, fileName); - await plugins.smartfs.directory(paths.sentEmailsDir).recursive().create(); - await plugins.smartfs.file(filePath).write(emailContent); - // Also save delivery info - const infoFileName = `${Date.now()}_${this.email.from}_to_${this.email.to[0]}_info.json`; - const infoPath = plugins.path.join(paths.sentEmailsDir, infoFileName); - await plugins.smartfs.file(infoPath).write(JSON.stringify(this.deliveryInfo, null, 2)); - this.log(`Email saved to ${fileName}`); - } - catch (error) { - this.log(`Failed to save email: ${error.message}`); - } - } - /** - * Save failed email to storage - */ - async saveFailed() { - try { - // Use the existing email storage path - const emailContent = this.email.toRFC822String(); - const fileName = `${Date.now()}_${this.email.from}_to_${this.email.to[0]}_failed.eml`; - const filePath = plugins.path.join(paths.failedEmailsDir, fileName); - await plugins.smartfs.directory(paths.failedEmailsDir).recursive().create(); - await plugins.smartfs.file(filePath).write(emailContent); - // Also save delivery info with error details - const infoFileName = `${Date.now()}_${this.email.from}_to_${this.email.to[0]}_error.json`; - const infoPath = plugins.path.join(paths.failedEmailsDir, infoFileName); - await plugins.smartfs.file(infoPath).write(JSON.stringify(this.deliveryInfo, null, 2)); - this.log(`Failed email saved to ${fileName}`); - } - catch (error) { - this.log(`Failed to save failed email: ${error.message}`); - } - } - /** - * Delay for specified milliseconds - */ - delay(ms) { - return new Promise(resolve => setTimeout(resolve, ms)); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.emailsendjob.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.emailsendjob.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.emailsignjob.d.ts b/dist_ts/mail/delivery/classes.emailsignjob.d.ts deleted file mode 100644 index 159f4a2..0000000 --- a/dist_ts/mail/delivery/classes.emailsignjob.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { UnifiedEmailServer } from '../routing/classes.unified.email.server.js'; -interface Headers { - [key: string]: string; -} -interface IEmailSignJobOptions { - domain: string; - selector: string; - headers: Headers; - body: string; -} -export declare class EmailSignJob { - emailServerRef: UnifiedEmailServer; - jobOptions: IEmailSignJobOptions; - constructor(emailServerRef: UnifiedEmailServer, options: IEmailSignJobOptions); - loadPrivateKey(): Promise; - getSignatureHeader(emailMessage: string): Promise; -} -export {}; diff --git a/dist_ts/mail/delivery/classes.emailsignjob.js b/dist_ts/mail/delivery/classes.emailsignjob.js deleted file mode 100644 index 869c681..0000000 --- a/dist_ts/mail/delivery/classes.emailsignjob.js +++ /dev/null @@ -1,26 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -export class EmailSignJob { - emailServerRef; - jobOptions; - constructor(emailServerRef, options) { - this.emailServerRef = emailServerRef; - this.jobOptions = options; - } - async loadPrivateKey() { - const keyInfo = await this.emailServerRef.dkimCreator.readDKIMKeys(this.jobOptions.domain); - return keyInfo.privateKey; - } - async getSignatureHeader(emailMessage) { - const privateKey = await this.loadPrivateKey(); - const bridge = RustSecurityBridge.getInstance(); - const signResult = await bridge.signDkim({ - rawMessage: emailMessage, - domain: this.jobOptions.domain, - selector: this.jobOptions.selector, - privateKey, - }); - return signResult.header; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5lbWFpbHNpZ25qb2IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L2NsYXNzZXMuZW1haWxzaWduam9iLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUFhbEYsTUFBTSxPQUFPLFlBQVk7SUFDdkIsY0FBYyxDQUFxQjtJQUNuQyxVQUFVLENBQXVCO0lBRWpDLFlBQVksY0FBa0MsRUFBRSxPQUE2QjtRQUMzRSxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUMsVUFBVSxHQUFHLE9BQU8sQ0FBQztJQUM1QixDQUFDO0lBRUQsS0FBSyxDQUFDLGNBQWM7UUFDbEIsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMzRixPQUFPLE9BQU8sQ0FBQyxVQUFVLENBQUM7SUFDNUIsQ0FBQztJQUVNLEtBQUssQ0FBQyxrQkFBa0IsQ0FBQyxZQUFvQjtRQUNsRCxNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUMvQyxNQUFNLE1BQU0sR0FBRyxrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNoRCxNQUFNLFVBQVUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxRQUFRLENBQUM7WUFDdkMsVUFBVSxFQUFFLFlBQVk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTTtZQUM5QixRQUFRLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxRQUFRO1lBQ2xDLFVBQVU7U0FDWCxDQUFDLENBQUM7UUFDSCxPQUFPLFVBQVUsQ0FBQyxNQUFNLENBQUM7SUFDM0IsQ0FBQztDQUNGIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.mta.config.d.ts b/dist_ts/mail/delivery/classes.mta.config.d.ts deleted file mode 100644 index 503aca0..0000000 --- a/dist_ts/mail/delivery/classes.mta.config.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { UnifiedEmailServer } from '../routing/classes.unified.email.server.js'; -/** - * Configures email server storage settings - * @param emailServer Reference to the unified email server - * @param options Configuration options containing storage paths - */ -export declare function configureEmailStorage(emailServer: UnifiedEmailServer, options: any): Promise; -/** - * Configure email server with port and storage settings - * @param emailServer Reference to the unified email server - * @param config Configuration settings for email server - */ -export declare function configureEmailServer(emailServer: UnifiedEmailServer, config: { - ports?: number[]; - hostname?: string; - tls?: { - certPath?: string; - keyPath?: string; - caPath?: string; - }; - storagePath?: string; -}): Promise; diff --git a/dist_ts/mail/delivery/classes.mta.config.js b/dist_ts/mail/delivery/classes.mta.config.js deleted file mode 100644 index 294248b..0000000 --- a/dist_ts/mail/delivery/classes.mta.config.js +++ /dev/null @@ -1,51 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -/** - * Configures email server storage settings - * @param emailServer Reference to the unified email server - * @param options Configuration options containing storage paths - */ -export async function configureEmailStorage(emailServer, options) { - // Extract the receivedEmailsPath if available - if (options?.emailPortConfig?.receivedEmailsPath) { - const receivedEmailsPath = options.emailPortConfig.receivedEmailsPath; - // Ensure the directory exists - await plugins.smartfs.directory(receivedEmailsPath).recursive().create(); - // Set path for received emails - if (emailServer) { - // Storage paths are now handled by the unified email server system - await plugins.smartfs.directory(paths.receivedEmailsDir).recursive().create(); - console.log(`Configured email server to store received emails to: ${receivedEmailsPath}`); - } - } -} -/** - * Configure email server with port and storage settings - * @param emailServer Reference to the unified email server - * @param config Configuration settings for email server - */ -export async function configureEmailServer(emailServer, config) { - if (!emailServer) { - console.error('Email server not available'); - return false; - } - // Configure the email server with updated options - const serverOptions = { - ports: config.ports || [25, 587, 465], - hostname: config.hostname || 'localhost', - tls: config.tls - }; - // Update the email server options - emailServer.updateOptions(serverOptions); - console.log(`Configured email server on ports ${serverOptions.ports.join(', ')}`); - // Set up storage path if provided - if (config.storagePath) { - await configureEmailStorage(emailServer, { - emailPortConfig: { - receivedEmailsPath: config.storagePath - } - }); - } - return true; -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5tdGEuY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdHMvbWFpbC9kZWxpdmVyeS9jbGFzc2VzLm10YS5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssS0FBSyxNQUFNLGdCQUFnQixDQUFDO0FBR3hDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLHFCQUFxQixDQUFDLFdBQStCLEVBQUUsT0FBWTtJQUN2Riw4Q0FBOEM7SUFDOUMsSUFBSSxPQUFPLEVBQUUsZUFBZSxFQUFFLGtCQUFrQixFQUFFLENBQUM7UUFDakQsTUFBTSxrQkFBa0IsR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLGtCQUFrQixDQUFDO1FBRXRFLDhCQUE4QjtRQUM5QixNQUFNLE9BQU8sQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLGtCQUFrQixDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUM7UUFFekUsK0JBQStCO1FBQy9CLElBQUksV0FBVyxFQUFFLENBQUM7WUFDaEIsbUVBQW1FO1lBQ25FLE1BQU0sT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUMsU0FBUyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUM7WUFFOUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyx3REFBd0Qsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO1FBQzVGLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLG9CQUFvQixDQUN4QyxXQUErQixFQUMvQixNQVNDO0lBRUQsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ2pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztRQUM1QyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFRCxrREFBa0Q7SUFDbEQsTUFBTSxhQUFhLEdBQUc7UUFDcEIsS0FBSyxFQUFFLE1BQU0sQ0FBQyxLQUFLLElBQUksQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQztRQUNyQyxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsSUFBSSxXQUFXO1FBQ3hDLEdBQUcsRUFBRSxNQUFNLENBQUMsR0FBRztLQUNoQixDQUFDO0lBRUYsa0NBQWtDO0lBQ2xDLFdBQVcsQ0FBQyxhQUFhLENBQUMsYUFBYSxDQUFDLENBQUM7SUFFekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRWxGLGtDQUFrQztJQUNsQyxJQUFJLE1BQU0sQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUN2QixNQUFNLHFCQUFxQixDQUFDLFdBQVcsRUFBRTtZQUN2QyxlQUFlLEVBQUU7Z0JBQ2Ysa0JBQWtCLEVBQUUsTUFBTSxDQUFDLFdBQVc7YUFDdkM7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsT0FBTyxJQUFJLENBQUM7QUFDZCxDQUFDIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.ratelimiter.d.ts b/dist_ts/mail/delivery/classes.ratelimiter.d.ts deleted file mode 100644 index 2d02504..0000000 --- a/dist_ts/mail/delivery/classes.ratelimiter.d.ts +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Configuration options for rate limiter - */ -export interface IRateLimitConfig { - /** Maximum tokens per period */ - maxPerPeriod: number; - /** Time period in milliseconds */ - periodMs: number; - /** Whether to apply per domain/key (vs globally) */ - perKey: boolean; - /** Initial token count (defaults to max) */ - initialTokens?: number; - /** Grace tokens to allow occasional bursts */ - burstTokens?: number; - /** Apply global limit in addition to per-key limits */ - useGlobalLimit?: boolean; -} -/** - * Rate limiter using token bucket algorithm - * Provides more sophisticated rate limiting with burst handling - */ -export declare class RateLimiter { - /** Rate limit configuration */ - private config; - /** Token buckets per key */ - private buckets; - /** Global bucket for non-keyed rate limiting */ - private globalBucket; - /** - * Create a new rate limiter - * @param config Rate limiter configuration - */ - constructor(config: IRateLimitConfig); - /** - * Check if a request is allowed under rate limits - * @param key Key to check rate limit for (e.g. domain, user, IP) - * @param cost Token cost (defaults to 1) - * @returns Whether the request is allowed - */ - isAllowed(key?: string, cost?: number): boolean; - /** - * Check if a bucket has enough tokens and consume them - * @param bucket The token bucket to check - * @param cost Token cost - * @returns Whether tokens were consumed - */ - private checkBucket; - /** - * Consume tokens for a request (if available) - * @param key Key to consume tokens for - * @param cost Token cost (defaults to 1) - * @returns Whether tokens were consumed - */ - consume(key?: string, cost?: number): boolean; - /** - * Get the remaining tokens for a key - * @param key Key to check - * @returns Number of remaining tokens - */ - getRemainingTokens(key?: string): number; - /** - * Get stats for a specific key - * @param key Key to get stats for - * @returns Rate limit statistics - */ - getStats(key?: string): { - remaining: number; - limit: number; - resetIn: number; - allowed: number; - denied: number; - }; - /** - * Get or create a token bucket for a key - * @param key The rate limit key - * @returns Token bucket - */ - private getBucket; - /** - * Refill tokens in a bucket based on elapsed time - * @param bucket Token bucket to refill - */ - private refillBucket; - /** - * Reset rate limits for a specific key - * @param key Key to reset - */ - reset(key?: string): void; - /** - * Reset all rate limiters - */ - resetAll(): void; - /** - * Cleanup old buckets to prevent memory leaks - * @param maxAge Maximum age in milliseconds - */ - cleanup(maxAge?: number): void; - /** - * Record an error for a key (e.g., IP address) and determine if blocking is needed - * RFC 5321 Section 4.5.4.1 suggests limiting errors to prevent abuse - * - * @param key Key to record error for (typically an IP address) - * @param errorWindow Time window for error tracking in ms (default: 5 minutes) - * @param errorThreshold Maximum errors before blocking (default: 10) - * @returns true if the key should be blocked due to excessive errors - */ - recordError(key: string, errorWindow?: number, errorThreshold?: number): boolean; -} diff --git a/dist_ts/mail/delivery/classes.ratelimiter.js b/dist_ts/mail/delivery/classes.ratelimiter.js deleted file mode 100644 index 63adfac..0000000 --- a/dist_ts/mail/delivery/classes.ratelimiter.js +++ /dev/null @@ -1,241 +0,0 @@ -import { logger } from '../../logger.js'; -/** - * Rate limiter using token bucket algorithm - * Provides more sophisticated rate limiting with burst handling - */ -export class RateLimiter { - /** Rate limit configuration */ - config; - /** Token buckets per key */ - buckets = new Map(); - /** Global bucket for non-keyed rate limiting */ - globalBucket; - /** - * Create a new rate limiter - * @param config Rate limiter configuration - */ - constructor(config) { - // Set defaults - this.config = { - maxPerPeriod: config.maxPerPeriod, - periodMs: config.periodMs, - perKey: config.perKey ?? true, - initialTokens: config.initialTokens ?? config.maxPerPeriod, - burstTokens: config.burstTokens ?? 0, - useGlobalLimit: config.useGlobalLimit ?? false - }; - // Initialize global bucket - this.globalBucket = { - tokens: this.config.initialTokens, - lastRefill: Date.now(), - allowed: 0, - denied: 0, - errors: 0, - firstErrorTime: 0 - }; - // Log initialization - logger.log('info', `Rate limiter initialized: ${this.config.maxPerPeriod} per ${this.config.periodMs}ms${this.config.perKey ? ' per key' : ''}`); - } - /** - * Check if a request is allowed under rate limits - * @param key Key to check rate limit for (e.g. domain, user, IP) - * @param cost Token cost (defaults to 1) - * @returns Whether the request is allowed - */ - isAllowed(key = 'global', cost = 1) { - // If using global bucket directly, just check that - if (key === 'global' || !this.config.perKey) { - return this.checkBucket(this.globalBucket, cost); - } - // Get the key-specific bucket - const bucket = this.getBucket(key); - // If we also need to check global limit - if (this.config.useGlobalLimit) { - // Both key bucket and global bucket must have tokens - return this.checkBucket(bucket, cost) && this.checkBucket(this.globalBucket, cost); - } - else { - // Only need to check the key-specific bucket - return this.checkBucket(bucket, cost); - } - } - /** - * Check if a bucket has enough tokens and consume them - * @param bucket The token bucket to check - * @param cost Token cost - * @returns Whether tokens were consumed - */ - checkBucket(bucket, cost) { - // Refill tokens based on elapsed time - this.refillBucket(bucket); - // Check if we have enough tokens - if (bucket.tokens >= cost) { - // Use tokens - bucket.tokens -= cost; - bucket.allowed++; - return true; - } - else { - // Rate limit exceeded - bucket.denied++; - return false; - } - } - /** - * Consume tokens for a request (if available) - * @param key Key to consume tokens for - * @param cost Token cost (defaults to 1) - * @returns Whether tokens were consumed - */ - consume(key = 'global', cost = 1) { - const isAllowed = this.isAllowed(key, cost); - return isAllowed; - } - /** - * Get the remaining tokens for a key - * @param key Key to check - * @returns Number of remaining tokens - */ - getRemainingTokens(key = 'global') { - const bucket = this.getBucket(key); - this.refillBucket(bucket); - return bucket.tokens; - } - /** - * Get stats for a specific key - * @param key Key to get stats for - * @returns Rate limit statistics - */ - getStats(key = 'global') { - const bucket = this.getBucket(key); - this.refillBucket(bucket); - // Calculate time until next token - const resetIn = bucket.tokens < this.config.maxPerPeriod ? - Math.ceil(this.config.periodMs / this.config.maxPerPeriod) : - 0; - return { - remaining: bucket.tokens, - limit: this.config.maxPerPeriod, - resetIn, - allowed: bucket.allowed, - denied: bucket.denied - }; - } - /** - * Get or create a token bucket for a key - * @param key The rate limit key - * @returns Token bucket - */ - getBucket(key) { - if (!this.config.perKey || key === 'global') { - return this.globalBucket; - } - if (!this.buckets.has(key)) { - // Create new bucket - this.buckets.set(key, { - tokens: this.config.initialTokens, - lastRefill: Date.now(), - allowed: 0, - denied: 0, - errors: 0, - firstErrorTime: 0 - }); - } - return this.buckets.get(key); - } - /** - * Refill tokens in a bucket based on elapsed time - * @param bucket Token bucket to refill - */ - refillBucket(bucket) { - const now = Date.now(); - const elapsedMs = now - bucket.lastRefill; - // Calculate how many tokens to add - const rate = this.config.maxPerPeriod / this.config.periodMs; - const tokensToAdd = elapsedMs * rate; - if (tokensToAdd >= 0.1) { // Allow for partial token refills - // Add tokens, but don't exceed the normal maximum (without burst) - // This ensures burst tokens are only used for bursts and don't refill - const normalMax = this.config.maxPerPeriod; - bucket.tokens = Math.min( - // Don't exceed max + burst - this.config.maxPerPeriod + (this.config.burstTokens || 0), - // Don't exceed normal max when refilling - Math.min(normalMax, bucket.tokens + tokensToAdd)); - // Update last refill time - bucket.lastRefill = now; - } - } - /** - * Reset rate limits for a specific key - * @param key Key to reset - */ - reset(key = 'global') { - if (key === 'global' || !this.config.perKey) { - this.globalBucket.tokens = this.config.initialTokens; - this.globalBucket.lastRefill = Date.now(); - } - else if (this.buckets.has(key)) { - const bucket = this.buckets.get(key); - bucket.tokens = this.config.initialTokens; - bucket.lastRefill = Date.now(); - } - } - /** - * Reset all rate limiters - */ - resetAll() { - this.globalBucket.tokens = this.config.initialTokens; - this.globalBucket.lastRefill = Date.now(); - for (const bucket of this.buckets.values()) { - bucket.tokens = this.config.initialTokens; - bucket.lastRefill = Date.now(); - } - } - /** - * Cleanup old buckets to prevent memory leaks - * @param maxAge Maximum age in milliseconds - */ - cleanup(maxAge = 24 * 60 * 60 * 1000) { - const now = Date.now(); - let removed = 0; - for (const [key, bucket] of this.buckets.entries()) { - if (now - bucket.lastRefill > maxAge) { - this.buckets.delete(key); - removed++; - } - } - if (removed > 0) { - logger.log('debug', `Cleaned up ${removed} stale rate limit buckets`); - } - } - /** - * Record an error for a key (e.g., IP address) and determine if blocking is needed - * RFC 5321 Section 4.5.4.1 suggests limiting errors to prevent abuse - * - * @param key Key to record error for (typically an IP address) - * @param errorWindow Time window for error tracking in ms (default: 5 minutes) - * @param errorThreshold Maximum errors before blocking (default: 10) - * @returns true if the key should be blocked due to excessive errors - */ - recordError(key, errorWindow = 5 * 60 * 1000, errorThreshold = 10) { - const bucket = this.getBucket(key); - const now = Date.now(); - // Reset error count if the time window has expired - if (bucket.firstErrorTime === 0 || now - bucket.firstErrorTime > errorWindow) { - bucket.errors = 0; - bucket.firstErrorTime = now; - } - // Increment error count - bucket.errors++; - // Log error tracking - logger.log('debug', `Error recorded for ${key}: ${bucket.errors}/${errorThreshold} in window`); - // Check if threshold exceeded - if (bucket.errors >= errorThreshold) { - logger.log('warn', `Error threshold exceeded for ${key}: ${bucket.errors} errors`); - return true; // Should block - } - return false; // Continue allowing - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.ratelimiter.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.ratelimiter.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.smtp.client.legacy.d.ts b/dist_ts/mail/delivery/classes.smtp.client.legacy.d.ts deleted file mode 100644 index 200253f..0000000 --- a/dist_ts/mail/delivery/classes.smtp.client.legacy.d.ts +++ /dev/null @@ -1,275 +0,0 @@ -import { Email } from '../core/classes.email.js'; -import type { EmailProcessingMode } from './interfaces.js'; -/** - * SMTP client connection options - */ -export type ISmtpClientOptions = { - /** - * Hostname of the SMTP server - */ - host: string; - /** - * Port to connect to - */ - port: number; - /** - * Whether to use TLS for the connection - */ - secure?: boolean; - /** - * Connection timeout in milliseconds - */ - connectionTimeout?: number; - /** - * Socket timeout in milliseconds - */ - socketTimeout?: number; - /** - * Command timeout in milliseconds - */ - commandTimeout?: number; - /** - * TLS options - */ - tls?: { - /** - * Whether to verify certificates - */ - rejectUnauthorized?: boolean; - /** - * Minimum TLS version - */ - minVersion?: string; - /** - * CA certificate path - */ - ca?: string; - }; - /** - * Authentication options - */ - auth?: { - /** - * Authentication user - */ - user: string; - /** - * Authentication password - */ - pass: string; - /** - * Authentication method - */ - method?: 'PLAIN' | 'LOGIN' | 'OAUTH2'; - }; - /** - * Domain name for EHLO - */ - domain?: string; - /** - * DKIM options for signing outgoing emails - */ - dkim?: { - /** - * Whether to sign emails with DKIM - */ - enabled: boolean; - /** - * Domain name for DKIM - */ - domain: string; - /** - * Selector for DKIM - */ - selector: string; - /** - * Private key for DKIM signing - */ - privateKey: string; - /** - * Headers to sign - */ - headers?: string[]; - }; -}; -/** - * SMTP delivery result - */ -export type ISmtpDeliveryResult = { - /** - * Whether the delivery was successful - */ - success: boolean; - /** - * Message ID if successful - */ - messageId?: string; - /** - * Error message if failed - */ - error?: string; - /** - * SMTP response code - */ - responseCode?: string; - /** - * Recipients successfully delivered to - */ - acceptedRecipients: string[]; - /** - * Recipients rejected during delivery - */ - rejectedRecipients: string[]; - /** - * Server response - */ - response?: string; - /** - * Timestamp of the delivery attempt - */ - timestamp: number; - /** - * Whether DKIM signing was applied - */ - dkimSigned?: boolean; - /** - * Whether this was a TLS secured delivery - */ - secure?: boolean; - /** - * Whether authentication was used - */ - authenticated?: boolean; -}; -/** - * SMTP client for sending emails to remote mail servers - */ -export declare class SmtpClient { - private options; - private connected; - private socket?; - private supportedExtensions; - /** - * Create a new SMTP client instance - * @param options SMTP client connection options - */ - constructor(options: ISmtpClientOptions); - /** - * Connect to the SMTP server - */ - connect(): Promise; - /** - * Send EHLO command to the server - */ - private sendEhlo; - /** - * Start TLS negotiation - */ - private startTls; - /** - * Upgrade socket to TLS - * @param socket Original socket - */ - private upgradeTls; - /** - * Authenticate with the server - */ - private authenticate; - /** - * Authenticate using PLAIN method - * @param user Username - * @param pass Password - */ - private authPlain; - /** - * Authenticate using LOGIN method - * @param user Username - * @param pass Password - */ - private authLogin; - /** - * Authenticate using OAuth2 method - * @param user Username - * @param token OAuth2 token - */ - private authOAuth2; - /** - * Send an email through the SMTP client - * @param email Email to send - * @param processingMode Optional processing mode - */ - sendMail(email: Email, processingMode?: EmailProcessingMode): Promise; - /** - * Apply DKIM signature to email - * @param email Email to sign - */ - private applyDkimSignature; - /** - * Format email for SMTP transmission - * @param email Email to format - */ - private getFormattedEmail; - /** - * Get size of email in bytes - * @param email Email to measure - */ - private getEmailSize; - /** - * Send SMTP command and wait for response - * @param command SMTP command to send - */ - private commandQueue; - private processingCommands; - private supportsPipelining; - /** - * Send an SMTP command and wait for response - * @param command SMTP command to send - * @param allowPipelining Whether this command can be pipelined - */ - private sendCommand; - /** - * Process the command queue - either one by one or pipelined if supported - */ - private processCommandQueue; - /** - * Process the next command in the queue (non-pipelined mode) - */ - private processNextCommand; - /** - * Process responses for pipelined commands - */ - private processResponses; - /** - * Read response from the server - */ - private readResponse; - /** - * Check if the response is complete - * @param response Response to check - */ - private isCompleteResponse; - /** - * Check if the response is an error - * @param response Response to check - */ - private isErrorResponse; - /** - * Create appropriate error from response - * @param response Error response - * @param code SMTP status code - */ - private createErrorFromResponse; - /** - * Close the connection to the server - */ - close(): Promise; - /** - * Checks if the connection is active - */ - isConnected(): boolean; - /** - * Update SMTP client options - * @param options New options - */ - updateOptions(options: Partial): void; -} diff --git a/dist_ts/mail/delivery/classes.smtp.client.legacy.js b/dist_ts/mail/delivery/classes.smtp.client.legacy.js deleted file mode 100644 index b091f9f..0000000 --- a/dist_ts/mail/delivery/classes.smtp.client.legacy.js +++ /dev/null @@ -1,969 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -import { MtaConnectionError, MtaAuthenticationError, MtaDeliveryError, MtaConfigurationError, MtaTimeoutError, MtaProtocolError } from '../../errors/index.js'; -import { Email } from '../core/classes.email.js'; -/** - * SMTP client for sending emails to remote mail servers - */ -export class SmtpClient { - options; - connected = false; - socket; - supportedExtensions = new Set(); - /** - * Create a new SMTP client instance - * @param options SMTP client connection options - */ - constructor(options) { - // Set default options - this.options = { - ...options, - connectionTimeout: options.connectionTimeout || 30000, // 30 seconds - socketTimeout: options.socketTimeout || 60000, // 60 seconds - commandTimeout: options.commandTimeout || 30000, // 30 seconds - secure: options.secure || false, - domain: options.domain || 'localhost', - tls: { - rejectUnauthorized: options.tls?.rejectUnauthorized !== false, // Default to true - minVersion: options.tls?.minVersion || 'TLSv1.2' - } - }; - } - /** - * Connect to the SMTP server - */ - async connect() { - if (this.connected && this.socket) { - return; - } - try { - logger.log('info', `Connecting to SMTP server ${this.options.host}:${this.options.port}`); - // Create socket - const socket = new plugins.net.Socket(); - // Set timeouts - socket.setTimeout(this.options.socketTimeout); - // Connect to the server - await new Promise((resolve, reject) => { - // Handle connection events - socket.once('connect', () => { - logger.log('debug', `Connected to ${this.options.host}:${this.options.port}`); - resolve(); - }); - socket.once('timeout', () => { - reject(MtaConnectionError.timeout(this.options.host, this.options.port, this.options.connectionTimeout)); - }); - socket.once('error', (err) => { - if (err.code === 'ECONNREFUSED') { - reject(MtaConnectionError.refused(this.options.host, this.options.port)); - } - else if (err.code === 'ENOTFOUND') { - reject(MtaConnectionError.dnsError(this.options.host, err)); - } - else { - reject(new MtaConnectionError(`Connection error to ${this.options.host}:${this.options.port}: ${err.message}`, { - data: { - host: this.options.host, - port: this.options.port, - error: err.message, - code: err.code - } - })); - } - }); - // Connect to the server - const connectOptions = { - host: this.options.host, - port: this.options.port - }; - // For direct TLS connections - if (this.options.secure) { - const tlsSocket = plugins.tls.connect({ - ...connectOptions, - rejectUnauthorized: this.options.tls.rejectUnauthorized, - minVersion: this.options.tls.minVersion, - ca: this.options.tls.ca ? [this.options.tls.ca] : undefined - }); - tlsSocket.once('secureConnect', () => { - logger.log('debug', `Secure connection established to ${this.options.host}:${this.options.port}`); - this.socket = tlsSocket; - resolve(); - }); - tlsSocket.once('error', (err) => { - reject(new MtaConnectionError(`TLS connection error to ${this.options.host}:${this.options.port}: ${err.message}`, { - data: { - host: this.options.host, - port: this.options.port, - error: err.message, - code: err.code - } - })); - }); - tlsSocket.setTimeout(this.options.socketTimeout); - tlsSocket.once('timeout', () => { - reject(MtaConnectionError.timeout(this.options.host, this.options.port, this.options.connectionTimeout)); - }); - } - else { - socket.connect(connectOptions); - this.socket = socket; - } - }); - // Wait for server greeting - const greeting = await this.readResponse(); - if (!greeting.startsWith('220')) { - throw new MtaConnectionError(`Unexpected greeting from server: ${greeting}`, { - data: { - host: this.options.host, - port: this.options.port, - greeting - } - }); - } - // Send EHLO - await this.sendEhlo(); - // Start TLS if not secure and supported - if (!this.options.secure && this.supportedExtensions.has('STARTTLS')) { - await this.startTls(); - // Send EHLO again after STARTTLS - await this.sendEhlo(); - } - // Authenticate if credentials provided - if (this.options.auth) { - await this.authenticate(); - } - this.connected = true; - logger.log('info', `Successfully connected to SMTP server ${this.options.host}:${this.options.port}`); - // Set up error handling for the socket - this.socket.on('error', (err) => { - logger.log('error', `Socket error: ${err.message}`); - this.connected = false; - this.socket = undefined; - }); - this.socket.on('close', () => { - logger.log('debug', 'Socket closed'); - this.connected = false; - this.socket = undefined; - }); - this.socket.on('timeout', () => { - logger.log('error', 'Socket timeout'); - this.connected = false; - if (this.socket) { - this.socket.destroy(); - this.socket = undefined; - } - }); - } - catch (error) { - // Clean up socket if connection failed - if (this.socket) { - this.socket.destroy(); - this.socket = undefined; - } - logger.log('error', `Failed to connect to SMTP server: ${error.message}`); - throw error; - } - } - /** - * Send EHLO command to the server - */ - async sendEhlo() { - // Clear previous extensions - this.supportedExtensions.clear(); - // Send EHLO - don't allow pipelining for this command - const response = await this.sendCommand(`EHLO ${this.options.domain}`, false); - // Parse supported extensions - const lines = response.split('\r\n'); - for (let i = 1; i < lines.length; i++) { - const line = lines[i]; - if (line.startsWith('250-') || line.startsWith('250 ')) { - const extension = line.substring(4).split(' ')[0]; - this.supportedExtensions.add(extension); - } - } - // Check if server supports pipelining - this.supportsPipelining = this.supportedExtensions.has('PIPELINING'); - logger.log('debug', `Server supports extensions: ${Array.from(this.supportedExtensions).join(', ')}`); - if (this.supportsPipelining) { - logger.log('info', 'Server supports PIPELINING - will use for improved performance'); - } - } - /** - * Start TLS negotiation - */ - async startTls() { - logger.log('debug', 'Starting TLS negotiation'); - // Send STARTTLS command - const response = await this.sendCommand('STARTTLS'); - if (!response.startsWith('220')) { - throw new MtaConnectionError(`Failed to start TLS: ${response}`, { - data: { - host: this.options.host, - port: this.options.port, - response - } - }); - } - if (!this.socket) { - throw new MtaConnectionError('No socket available for TLS upgrade', { - data: { - host: this.options.host, - port: this.options.port - } - }); - } - // Upgrade socket to TLS - const currentSocket = this.socket; - this.socket = await this.upgradeTls(currentSocket); - } - /** - * Upgrade socket to TLS - * @param socket Original socket - */ - async upgradeTls(socket) { - return new Promise((resolve, reject) => { - const tlsOptions = { - socket, - servername: this.options.host, - rejectUnauthorized: this.options.tls.rejectUnauthorized, - minVersion: this.options.tls.minVersion, - ca: this.options.tls.ca ? [this.options.tls.ca] : undefined - }; - const tlsSocket = plugins.tls.connect(tlsOptions); - tlsSocket.once('secureConnect', () => { - logger.log('debug', 'TLS negotiation successful'); - resolve(tlsSocket); - }); - tlsSocket.once('error', (err) => { - reject(new MtaConnectionError(`TLS error: ${err.message}`, { - data: { - host: this.options.host, - port: this.options.port, - error: err.message, - code: err.code - } - })); - }); - tlsSocket.setTimeout(this.options.socketTimeout); - tlsSocket.once('timeout', () => { - reject(MtaTimeoutError.commandTimeout('STARTTLS', this.options.host, this.options.socketTimeout)); - }); - }); - } - /** - * Authenticate with the server - */ - async authenticate() { - if (!this.options.auth) { - return; - } - const { user, pass, method = 'LOGIN' } = this.options.auth; - logger.log('debug', `Authenticating as ${user} using ${method}`); - try { - switch (method) { - case 'PLAIN': - await this.authPlain(user, pass); - break; - case 'LOGIN': - await this.authLogin(user, pass); - break; - case 'OAUTH2': - await this.authOAuth2(user, pass); - break; - default: - throw new MtaAuthenticationError(`Authentication method ${method} not supported by client`, { - data: { - method - } - }); - } - logger.log('info', `Successfully authenticated as ${user}`); - } - catch (error) { - logger.log('error', `Authentication failed: ${error.message}`); - throw error; - } - } - /** - * Authenticate using PLAIN method - * @param user Username - * @param pass Password - */ - async authPlain(user, pass) { - // PLAIN authentication format: \0username\0password - const authString = Buffer.from(`\0${user}\0${pass}`).toString('base64'); - const response = await this.sendCommand(`AUTH PLAIN ${authString}`); - if (!response.startsWith('235')) { - throw MtaAuthenticationError.invalidCredentials(this.options.host, user); - } - } - /** - * Authenticate using LOGIN method - * @param user Username - * @param pass Password - */ - async authLogin(user, pass) { - // Start LOGIN authentication - const response = await this.sendCommand('AUTH LOGIN'); - if (!response.startsWith('334')) { - throw new MtaAuthenticationError(`Server did not accept AUTH LOGIN: ${response}`, { - data: { - host: this.options.host, - response - } - }); - } - // Send username (base64) - const userResponse = await this.sendCommand(Buffer.from(user).toString('base64')); - if (!userResponse.startsWith('334')) { - throw MtaAuthenticationError.invalidCredentials(this.options.host, user); - } - // Send password (base64) - const passResponse = await this.sendCommand(Buffer.from(pass).toString('base64')); - if (!passResponse.startsWith('235')) { - throw MtaAuthenticationError.invalidCredentials(this.options.host, user); - } - } - /** - * Authenticate using OAuth2 method - * @param user Username - * @param token OAuth2 token - */ - async authOAuth2(user, token) { - // XOAUTH2 format - const authString = `user=${user}\x01auth=Bearer ${token}\x01\x01`; - const response = await this.sendCommand(`AUTH XOAUTH2 ${Buffer.from(authString).toString('base64')}`); - if (!response.startsWith('235')) { - throw MtaAuthenticationError.invalidCredentials(this.options.host, user); - } - } - /** - * Send an email through the SMTP client - * @param email Email to send - * @param processingMode Optional processing mode - */ - async sendMail(email, processingMode) { - // Ensure we're connected - if (!this.connected || !this.socket) { - await this.connect(); - } - const startTime = Date.now(); - const result = { - success: false, - acceptedRecipients: [], - rejectedRecipients: [], - timestamp: startTime, - secure: this.options.secure || this.socket instanceof plugins.tls.TLSSocket, - authenticated: !!this.options.auth - }; - try { - logger.log('info', `Sending email to ${email.getAllRecipients().join(', ')}`); - // Apply DKIM signing if configured - if (this.options.dkim?.enabled) { - await this.applyDkimSignature(email); - result.dkimSigned = true; - } - // Get envelope and recipients - const envelope_from = email.getEnvelopeFrom() || email.from; - const recipients = email.getAllRecipients(); - // Check if we can use pipelining for MAIL FROM and RCPT TO commands - if (this.supportsPipelining && recipients.length > 0) { - logger.log('debug', 'Using SMTP pipelining for sending'); - // Send MAIL FROM command first (always needed) - const mailFromCmd = `MAIL FROM:<${envelope_from}> SIZE=${this.getEmailSize(email)}`; - let mailFromResponse; - try { - mailFromResponse = await this.sendCommand(mailFromCmd); - if (!mailFromResponse.startsWith('250')) { - throw new MtaDeliveryError(`MAIL FROM command failed: ${mailFromResponse}`, { - data: { - command: mailFromCmd, - response: mailFromResponse - } - }); - } - } - catch (error) { - logger.log('error', `MAIL FROM failed: ${error.message}`); - throw error; - } - // Pipeline all RCPT TO commands - const rcptPromises = recipients.map(recipient => { - return this.sendCommand(`RCPT TO:<${recipient}>`) - .then(response => { - if (response.startsWith('250')) { - result.acceptedRecipients.push(recipient); - return { recipient, accepted: true, response }; - } - else { - result.rejectedRecipients.push(recipient); - logger.log('warn', `Recipient ${recipient} rejected: ${response}`); - return { recipient, accepted: false, response }; - } - }) - .catch(error => { - result.rejectedRecipients.push(recipient); - logger.log('warn', `Recipient ${recipient} rejected with error: ${error.message}`); - return { recipient, accepted: false, error: error.message }; - }); - }); - // Wait for all RCPT TO commands to complete - await Promise.all(rcptPromises); - } - else { - // Fall back to sequential commands if pipelining not supported - logger.log('debug', 'Using sequential SMTP commands for sending'); - // Send MAIL FROM - await this.sendCommand(`MAIL FROM:<${envelope_from}> SIZE=${this.getEmailSize(email)}`); - // Send RCPT TO for each recipient - for (const recipient of recipients) { - try { - await this.sendCommand(`RCPT TO:<${recipient}>`); - result.acceptedRecipients.push(recipient); - } - catch (error) { - logger.log('warn', `Recipient ${recipient} rejected: ${error.message}`); - result.rejectedRecipients.push(recipient); - } - } - } - // Check if at least one recipient was accepted - if (result.acceptedRecipients.length === 0) { - throw new MtaDeliveryError('All recipients were rejected', { - data: { - recipients, - rejectedRecipients: result.rejectedRecipients - } - }); - } - // Send DATA - const dataResponse = await this.sendCommand('DATA'); - if (!dataResponse.startsWith('354')) { - throw new MtaProtocolError(`Failed to start DATA phase: ${dataResponse}`, { - data: { - response: dataResponse - } - }); - } - // Format email content efficiently - const emailContent = await this.getFormattedEmail(email); - // Send email content - const finalResponse = await this.sendCommand(emailContent + '\r\n.'); - // Extract message ID if available - const messageIdMatch = finalResponse.match(/\[(.*?)\]/); - if (messageIdMatch) { - result.messageId = messageIdMatch[1]; - } - result.success = true; - result.response = finalResponse; - logger.log('info', `Email sent successfully to ${result.acceptedRecipients.join(', ')}`); - // Log security event - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_DELIVERY, - message: 'Email sent successfully', - details: { - recipients: result.acceptedRecipients, - rejectedRecipients: result.rejectedRecipients, - messageId: result.messageId, - secure: result.secure, - authenticated: result.authenticated, - server: `${this.options.host}:${this.options.port}`, - dkimSigned: result.dkimSigned - }, - success: true - }); - return result; - } - catch (error) { - logger.log('error', `Failed to send email: ${error.message}`); - // Format error for result - result.error = error.message; - // Extract SMTP code if available - if (error.context?.data?.statusCode) { - result.responseCode = error.context.data.statusCode; - } - // Log security event - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_DELIVERY, - message: 'Email delivery failed', - details: { - error: error.message, - server: `${this.options.host}:${this.options.port}`, - recipients: email.getAllRecipients(), - acceptedRecipients: result.acceptedRecipients, - rejectedRecipients: result.rejectedRecipients, - secure: result.secure, - authenticated: result.authenticated - }, - success: false - }); - return result; - } - } - /** - * Apply DKIM signature to email - * @param email Email to sign - */ - async applyDkimSignature(email) { - if (!this.options.dkim?.enabled || !this.options.dkim?.privateKey) { - return; - } - try { - logger.log('debug', `Signing email with DKIM for domain ${this.options.dkim.domain}`); - const emailContent = await this.getFormattedEmail(email); - // Sign via Rust bridge - const bridge = RustSecurityBridge.getInstance(); - const signResult = await bridge.signDkim({ - rawMessage: emailContent, - domain: this.options.dkim.domain, - selector: this.options.dkim.selector, - privateKey: this.options.dkim.privateKey, - }); - if (signResult.header) { - email.addHeader('DKIM-Signature', signResult.header); - } - logger.log('debug', 'DKIM signature applied successfully'); - } - catch (error) { - logger.log('error', `Failed to apply DKIM signature: ${error.message}`); - throw error; - } - } - /** - * Format email for SMTP transmission - * @param email Email to format - */ - async getFormattedEmail(email) { - // This is a simplified implementation - // In a full implementation, this would use proper MIME formatting - let content = ''; - // Add headers - content += `From: ${email.from}\r\n`; - content += `To: ${email.to.join(', ')}\r\n`; - content += `Subject: ${email.subject}\r\n`; - content += `Date: ${new Date().toUTCString()}\r\n`; - content += `Message-ID: <${plugins.uuid.v4()}@${this.options.domain}>\r\n`; - // Add additional headers - for (const [name, value] of Object.entries(email.headers || {})) { - content += `${name}: ${value}\r\n`; - } - // Add content type for multipart - if (email.attachments && email.attachments.length > 0) { - const boundary = `----_=_NextPart_${Math.random().toString(36).substr(2)}`; - content += `MIME-Version: 1.0\r\n`; - content += `Content-Type: multipart/mixed; boundary="${boundary}"\r\n`; - content += `\r\n`; - // Add text part - content += `--${boundary}\r\n`; - content += `Content-Type: text/plain; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.text}\r\n`; - // Add HTML part if present - if (email.html) { - content += `--${boundary}\r\n`; - content += `Content-Type: text/html; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.html}\r\n`; - } - // Add attachments - for (const attachment of email.attachments) { - content += `--${boundary}\r\n`; - content += `Content-Type: ${attachment.contentType || 'application/octet-stream'}; name="${attachment.filename}"\r\n`; - content += `Content-Disposition: attachment; filename="${attachment.filename}"\r\n`; - content += `Content-Transfer-Encoding: base64\r\n`; - content += `\r\n`; - // Add base64 encoded content - const base64Content = attachment.content.toString('base64'); - // Split into lines of 76 characters - for (let i = 0; i < base64Content.length; i += 76) { - content += base64Content.substring(i, i + 76) + '\r\n'; - } - } - // End boundary - content += `--${boundary}--\r\n`; - } - else { - // Simple email with just text - content += `Content-Type: text/plain; charset="UTF-8"\r\n`; - content += `\r\n`; - content += `${email.text}\r\n`; - } - return content; - } - /** - * Get size of email in bytes - * @param email Email to measure - */ - getEmailSize(email) { - // Simplified size estimation - let size = 0; - // Headers - size += `From: ${email.from}\r\n`.length; - size += `To: ${email.to.join(', ')}\r\n`.length; - size += `Subject: ${email.subject}\r\n`.length; - // Body - size += (email.text?.length || 0) + 2; // +2 for CRLF - // HTML part if present - if (email.html) { - size += email.html.length + 2; - } - // Attachments - for (const attachment of email.attachments || []) { - size += attachment.content.length; - } - // Add overhead for MIME boundaries and headers - const overhead = email.attachments?.length ? 1000 + (email.attachments.length * 200) : 200; - return size + overhead; - } - /** - * Send SMTP command and wait for response - * @param command SMTP command to send - */ - // Queue for command pipelining - commandQueue = []; - // Flag to indicate if we're currently processing commands - processingCommands = false; - // Flag to indicate if server supports pipelining - supportsPipelining = false; - /** - * Send an SMTP command and wait for response - * @param command SMTP command to send - * @param allowPipelining Whether this command can be pipelined - */ - async sendCommand(command, allowPipelining = true) { - if (!this.socket) { - throw new MtaConnectionError('Not connected to server', { - data: { - host: this.options.host, - port: this.options.port - } - }); - } - // Log command if not sensitive - if (!command.startsWith('AUTH')) { - logger.log('debug', `> ${command}`); - } - else { - logger.log('debug', '> AUTH ***'); - } - return new Promise((resolve, reject) => { - // Set up timeout for command - const timeout = setTimeout(() => { - // Remove this command from the queue if it times out - const index = this.commandQueue.findIndex(item => item.command === command); - if (index !== -1) { - this.commandQueue.splice(index, 1); - } - reject(MtaTimeoutError.commandTimeout(command.split(' ')[0], this.options.host, this.options.commandTimeout)); - }, this.options.commandTimeout); - // Add command to the queue - this.commandQueue.push({ - command, - resolve, - reject, - timeout - }); - // Process command queue if we can pipeline or if not currently processing commands - if ((this.supportsPipelining && allowPipelining) || !this.processingCommands) { - this.processCommandQueue(); - } - }); - } - /** - * Process the command queue - either one by one or pipelined if supported - */ - processCommandQueue() { - if (this.processingCommands || this.commandQueue.length === 0 || !this.socket) { - return; - } - this.processingCommands = true; - try { - // If pipelining is supported, send all commands at once - if (this.supportsPipelining) { - // Send all commands in queue at once - const commands = this.commandQueue.map(item => item.command).join('\r\n') + '\r\n'; - this.socket.write(commands, (err) => { - if (err) { - // Handle write error for all commands - const error = new MtaConnectionError(`Failed to send commands: ${err.message}`, { - data: { - error: err.message - } - }); - // Fail all pending commands - while (this.commandQueue.length > 0) { - const item = this.commandQueue.shift(); - clearTimeout(item.timeout); - item.reject(error); - } - this.processingCommands = false; - } - }); - // Process responses one by one in order - this.processResponses(); - } - else { - // Process commands one by one if pipelining not supported - this.processNextCommand(); - } - } - catch (error) { - logger.log('error', `Error processing command queue: ${error.message}`); - this.processingCommands = false; - } - } - /** - * Process the next command in the queue (non-pipelined mode) - */ - processNextCommand() { - if (this.commandQueue.length === 0 || !this.socket) { - this.processingCommands = false; - return; - } - const currentCommand = this.commandQueue[0]; - this.socket.write(currentCommand.command + '\r\n', (err) => { - if (err) { - // Handle write error - const error = new MtaConnectionError(`Failed to send command: ${err.message}`, { - data: { - command: currentCommand.command.split(' ')[0], - error: err.message - } - }); - // Remove from queue - this.commandQueue.shift(); - clearTimeout(currentCommand.timeout); - currentCommand.reject(error); - // Continue with next command - this.processNextCommand(); - return; - } - // Read response - this.readResponse() - .then((response) => { - // Remove from queue and resolve - this.commandQueue.shift(); - clearTimeout(currentCommand.timeout); - currentCommand.resolve(response); - // Process next command - this.processNextCommand(); - }) - .catch((err) => { - // Remove from queue and reject - this.commandQueue.shift(); - clearTimeout(currentCommand.timeout); - currentCommand.reject(err); - // Process next command - this.processNextCommand(); - }); - }); - } - /** - * Process responses for pipelined commands - */ - async processResponses() { - try { - // Process responses for each command in order - while (this.commandQueue.length > 0) { - const currentCommand = this.commandQueue[0]; - try { - // Wait for response - const response = await this.readResponse(); - // Remove from queue and resolve - this.commandQueue.shift(); - clearTimeout(currentCommand.timeout); - currentCommand.resolve(response); - } - catch (error) { - // Remove from queue and reject - this.commandQueue.shift(); - clearTimeout(currentCommand.timeout); - currentCommand.reject(error); - // Stop processing if this is a critical error - if (error instanceof MtaConnectionError && - (error.message.includes('Connection closed') || error.message.includes('Not connected'))) { - break; - } - } - } - } - catch (error) { - logger.log('error', `Error processing responses: ${error.message}`); - } - finally { - this.processingCommands = false; - } - } - /** - * Read response from the server - */ - async readResponse() { - if (!this.socket) { - throw new MtaConnectionError('Not connected to server', { - data: { - host: this.options.host, - port: this.options.port - } - }); - } - return new Promise((resolve, reject) => { - // Use an array to collect response chunks instead of string concatenation - const responseChunks = []; - // Single function to clean up all listeners - const cleanupListeners = () => { - if (!this.socket) - return; - this.socket.removeListener('data', onData); - this.socket.removeListener('error', onError); - this.socket.removeListener('close', onClose); - this.socket.removeListener('end', onEnd); - }; - const onData = (data) => { - // Store buffer directly, avoiding unnecessary string conversion - responseChunks.push(data); - // Convert to string only for response checking - const responseData = Buffer.concat(responseChunks).toString(); - // Check if this is a complete response - if (this.isCompleteResponse(responseData)) { - // Clean up listeners - cleanupListeners(); - const trimmedResponse = responseData.trim(); - logger.log('debug', `< ${trimmedResponse}`); - // Check if this is an error response - if (this.isErrorResponse(responseData)) { - const code = responseData.substring(0, 3); - reject(this.createErrorFromResponse(trimmedResponse, code)); - } - else { - resolve(trimmedResponse); - } - } - }; - const onError = (err) => { - cleanupListeners(); - reject(new MtaConnectionError(`Socket error while waiting for response: ${err.message}`, { - data: { - error: err.message - } - })); - }; - const onClose = () => { - cleanupListeners(); - const responseData = Buffer.concat(responseChunks).toString(); - reject(new MtaConnectionError('Connection closed while waiting for response', { - data: { - partialResponse: responseData - } - })); - }; - const onEnd = () => { - cleanupListeners(); - const responseData = Buffer.concat(responseChunks).toString(); - reject(new MtaConnectionError('Connection ended while waiting for response', { - data: { - partialResponse: responseData - } - })); - }; - // Set up listeners - this.socket.on('data', onData); - this.socket.once('error', onError); - this.socket.once('close', onClose); - this.socket.once('end', onEnd); - }); - } - /** - * Check if the response is complete - * @param response Response to check - */ - isCompleteResponse(response) { - // Check if it's a multi-line response - const lines = response.split('\r\n'); - const lastLine = lines[lines.length - 2]; // Second to last because of the trailing CRLF - // Check if the last line starts with a code followed by a space - // If it does, this is a complete response - if (lastLine && /^\d{3} /.test(lastLine)) { - return true; - } - // For single line responses - if (lines.length === 2 && lines[0].length >= 3 && /^\d{3} /.test(lines[0])) { - return true; - } - return false; - } - /** - * Check if the response is an error - * @param response Response to check - */ - isErrorResponse(response) { - // Get the status code (first 3 characters) - const code = response.substring(0, 3); - // 4xx and 5xx are error codes - return code.startsWith('4') || code.startsWith('5'); - } - /** - * Create appropriate error from response - * @param response Error response - * @param code SMTP status code - */ - createErrorFromResponse(response, code) { - // Extract message part - const message = response.substring(4).trim(); - switch (code.charAt(0)) { - case '4': // Temporary errors - return MtaDeliveryError.temporary(message, 'recipient', code, response); - case '5': // Permanent errors - return MtaDeliveryError.permanent(message, 'recipient', code, response); - default: - return new MtaDeliveryError(`Unexpected error response: ${response}`, { - data: { - response, - code - } - }); - } - } - /** - * Close the connection to the server - */ - async close() { - if (!this.connected || !this.socket) { - return; - } - try { - // Send QUIT - await this.sendCommand('QUIT'); - } - catch (error) { - logger.log('warn', `Error sending QUIT command: ${error.message}`); - } - finally { - // Close socket - this.socket.destroy(); - this.socket = undefined; - this.connected = false; - logger.log('info', 'SMTP connection closed'); - } - } - /** - * Checks if the connection is active - */ - isConnected() { - return this.connected && !!this.socket; - } - /** - * Update SMTP client options - * @param options New options - */ - updateOptions(options) { - this.options = { - ...this.options, - ...options - }; - logger.log('info', 'SMTP client options updated'); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smtp.client.legacy.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.smtp.client.legacy.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/classes.unified.rate.limiter.d.ts b/dist_ts/mail/delivery/classes.unified.rate.limiter.d.ts deleted file mode 100644 index ef3d2f7..0000000 --- a/dist_ts/mail/delivery/classes.unified.rate.limiter.d.ts +++ /dev/null @@ -1,200 +0,0 @@ -import { EventEmitter } from 'node:events'; -/** - * Interface for rate limit configuration - */ -export interface IRateLimitConfig { - maxMessagesPerMinute?: number; - maxRecipientsPerMessage?: number; - maxConnectionsPerIP?: number; - maxErrorsPerIP?: number; - maxAuthFailuresPerIP?: number; - blockDuration?: number; -} -/** - * Interface for hierarchical rate limits - */ -export interface IHierarchicalRateLimits { - global: IRateLimitConfig; - patterns?: Record; - ips?: Record; - domains?: Record; - blocks?: Record; -} -/** - * Rate limiter statistics - */ -export interface IRateLimiterStats { - activeCounters: number; - totalBlocked: number; - currentlyBlocked: number; - byPattern: Record; - byIp: Record; -} -/** - * Result of a rate limit check - */ -export interface IRateLimitResult { - allowed: boolean; - reason?: string; - limit?: number; - current?: number; - resetIn?: number; -} -/** - * Unified rate limiter for all email processing modes - */ -export declare class UnifiedRateLimiter extends EventEmitter { - private config; - private counters; - private patternCounters; - private ipCounters; - private domainCounters; - private cleanupInterval?; - private stats; - /** - * Create a new unified rate limiter - * @param config Rate limit configuration - */ - constructor(config: IHierarchicalRateLimits); - /** - * Start the cleanup interval - */ - private startCleanupInterval; - /** - * Stop the cleanup interval - */ - stop(): void; - /** - * Destroy the rate limiter and clean up all resources - */ - destroy(): void; - /** - * Clean up expired counters and blocks - */ - private cleanup; - /** - * Check if a message is allowed by rate limits - * @param email Email address - * @param ip IP address - * @param recipients Number of recipients - * @param pattern Matched pattern - * @param domain Domain name for domain-specific limits - * @returns Result of rate limit check - */ - checkMessageLimit(email: string, ip: string, recipients: number, pattern?: string, domain?: string): IRateLimitResult; - /** - * Check global message rate limit - * @param email Email address - */ - private checkGlobalMessageLimit; - /** - * Check pattern-specific message rate limit - * @param pattern Pattern to check - */ - private checkPatternMessageLimit; - /** - * Check domain-specific message rate limit - * @param domain Domain to check - */ - private checkDomainMessageLimit; - /** - * Check IP-specific message rate limit - * @param ip IP address - */ - private checkIpMessageLimit; - /** - * Check recipient limit - * @param email Email address - * @param recipients Number of recipients - * @param pattern Matched pattern - * @param domain Domain name - */ - private checkRecipientLimit; - /** - * Record a connection from an IP - * @param ip IP address - * @returns Result of rate limit check - */ - recordConnection(ip: string): IRateLimitResult; - /** - * Record an error from an IP - * @param ip IP address - * @returns True if IP should be blocked - */ - recordError(ip: string): boolean; - /** - * Record an authentication failure from an IP - * @param ip IP address - * @returns True if IP should be blocked - */ - recordAuthFailure(ip: string): boolean; - /** - * Block an IP address - * @param ip IP address to block - * @param duration Override the default block duration (milliseconds) - */ - blockIp(ip: string, duration?: number): void; - /** - * Unblock an IP address - * @param ip IP address to unblock - */ - unblockIp(ip: string): void; - /** - * Check if an IP is blocked - * @param ip IP address to check - */ - isIpBlocked(ip: string): boolean; - /** - * Get the time until a block is released - * @param ip IP address - * @returns Milliseconds until release or 0 if not blocked - */ - getBlockReleaseTime(ip: string): number; - /** - * Update rate limiter statistics - */ - private updateStats; - /** - * Get rate limiter statistics - */ - getStats(): IRateLimiterStats; - /** - * Update rate limiter configuration - * @param config New configuration - */ - updateConfig(config: Partial): void; - /** - * Get configuration for debugging - */ - getConfig(): IHierarchicalRateLimits; - /** - * Apply domain-specific rate limits - * Merges domain limits with existing configuration - * @param domain Domain name - * @param limits Rate limit configuration for the domain - */ - applyDomainLimits(domain: string, limits: IRateLimitConfig): void; - /** - * Remove domain-specific rate limits - * @param domain Domain name - */ - removeDomainLimits(domain: string): void; - /** - * Get domain-specific rate limits - * @param domain Domain name - * @returns Domain rate limit config or undefined - */ - getDomainLimits(domain: string): IRateLimitConfig | undefined; -} diff --git a/dist_ts/mail/delivery/classes.unified.rate.limiter.js b/dist_ts/mail/delivery/classes.unified.rate.limiter.js deleted file mode 100644 index c17bee5..0000000 --- a/dist_ts/mail/delivery/classes.unified.rate.limiter.js +++ /dev/null @@ -1,820 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { EventEmitter } from 'node:events'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -/** - * Unified rate limiter for all email processing modes - */ -export class UnifiedRateLimiter extends EventEmitter { - config; - counters = new Map(); - patternCounters = new Map(); - ipCounters = new Map(); - domainCounters = new Map(); - cleanupInterval; - stats; - /** - * Create a new unified rate limiter - * @param config Rate limit configuration - */ - constructor(config) { - super(); - // Set default configuration - this.config = { - global: { - maxMessagesPerMinute: config.global.maxMessagesPerMinute || 100, - maxRecipientsPerMessage: config.global.maxRecipientsPerMessage || 100, - maxConnectionsPerIP: config.global.maxConnectionsPerIP || 20, - maxErrorsPerIP: config.global.maxErrorsPerIP || 10, - maxAuthFailuresPerIP: config.global.maxAuthFailuresPerIP || 5, - blockDuration: config.global.blockDuration || 3600000 // 1 hour - }, - patterns: config.patterns || {}, - ips: config.ips || {}, - blocks: config.blocks || {} - }; - // Initialize statistics - this.stats = { - activeCounters: 0, - totalBlocked: 0, - currentlyBlocked: 0, - byPattern: {}, - byIp: {} - }; - // Start cleanup interval - this.startCleanupInterval(); - } - /** - * Start the cleanup interval - */ - startCleanupInterval() { - if (this.cleanupInterval) { - clearInterval(this.cleanupInterval); - } - // Run cleanup every minute - this.cleanupInterval = setInterval(() => this.cleanup(), 60000); - } - /** - * Stop the cleanup interval - */ - stop() { - if (this.cleanupInterval) { - clearInterval(this.cleanupInterval); - this.cleanupInterval = undefined; - } - } - /** - * Destroy the rate limiter and clean up all resources - */ - destroy() { - // Stop the cleanup interval - this.stop(); - // Clear all maps to free memory - this.counters.clear(); - this.ipCounters.clear(); - this.patternCounters.clear(); - // Clear blocks - if (this.config.blocks) { - this.config.blocks = {}; - } - // Clear statistics - this.stats = { - activeCounters: 0, - totalBlocked: 0, - currentlyBlocked: 0, - byPattern: {}, - byIp: {} - }; - logger.log('info', 'UnifiedRateLimiter destroyed'); - } - /** - * Clean up expired counters and blocks - */ - cleanup() { - const now = Date.now(); - // Clean up expired blocks - if (this.config.blocks) { - for (const [ip, expiry] of Object.entries(this.config.blocks)) { - if (expiry <= now) { - delete this.config.blocks[ip]; - logger.log('info', `Rate limit block expired for IP ${ip}`); - // Update statistics - if (this.stats.byIp[ip]) { - this.stats.byIp[ip].blocked = false; - } - this.stats.currentlyBlocked--; - } - } - } - // Clean up old counters (older than 10 minutes) - const cutoff = now - 600000; - // Clean global counters - for (const [key, counter] of this.counters.entries()) { - if (counter.lastReset < cutoff) { - this.counters.delete(key); - } - } - // Clean pattern counters - for (const [key, counter] of this.patternCounters.entries()) { - if (counter.lastReset < cutoff) { - this.patternCounters.delete(key); - } - } - // Clean IP counters - for (const [key, counter] of this.ipCounters.entries()) { - if (counter.lastReset < cutoff) { - this.ipCounters.delete(key); - } - } - // Clean domain counters - for (const [key, counter] of this.domainCounters.entries()) { - if (counter.lastReset < cutoff) { - this.domainCounters.delete(key); - } - } - // Update statistics - this.updateStats(); - } - /** - * Check if a message is allowed by rate limits - * @param email Email address - * @param ip IP address - * @param recipients Number of recipients - * @param pattern Matched pattern - * @param domain Domain name for domain-specific limits - * @returns Result of rate limit check - */ - checkMessageLimit(email, ip, recipients, pattern, domain) { - // Check if IP is blocked - if (this.isIpBlocked(ip)) { - return { - allowed: false, - reason: 'IP is blocked', - resetIn: this.getBlockReleaseTime(ip) - }; - } - // Check global message rate limit - const globalResult = this.checkGlobalMessageLimit(email); - if (!globalResult.allowed) { - return globalResult; - } - // Check pattern-specific limit if pattern is provided - if (pattern) { - const patternResult = this.checkPatternMessageLimit(pattern); - if (!patternResult.allowed) { - return patternResult; - } - } - // Check domain-specific limit if domain is provided - if (domain) { - const domainResult = this.checkDomainMessageLimit(domain); - if (!domainResult.allowed) { - return domainResult; - } - } - // Check IP-specific limit - const ipResult = this.checkIpMessageLimit(ip); - if (!ipResult.allowed) { - return ipResult; - } - // Check recipient limit - const recipientResult = this.checkRecipientLimit(email, recipients, pattern, domain); - if (!recipientResult.allowed) { - return recipientResult; - } - // All checks passed - return { allowed: true }; - } - /** - * Check global message rate limit - * @param email Email address - */ - checkGlobalMessageLimit(email) { - const now = Date.now(); - const limit = this.config.global.maxMessagesPerMinute; - if (!limit) { - return { allowed: true }; - } - // Get or create counter - const key = 'global'; - let counter = this.counters.get(key); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.counters.set(key, counter); - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.count = 0; - counter.lastReset = now; - } - // Check if limit is exceeded - if (counter.count >= limit) { - // Calculate reset time - const resetIn = 60000 - (now - counter.lastReset); - return { - allowed: false, - reason: 'Global message rate limit exceeded', - limit, - current: counter.count, - resetIn - }; - } - // Increment counter - counter.count++; - // Update statistics - this.updateStats(); - return { allowed: true }; - } - /** - * Check pattern-specific message rate limit - * @param pattern Pattern to check - */ - checkPatternMessageLimit(pattern) { - const now = Date.now(); - // Get pattern-specific limit or use global - const patternConfig = this.config.patterns?.[pattern]; - const limit = patternConfig?.maxMessagesPerMinute || this.config.global.maxMessagesPerMinute; - if (!limit) { - return { allowed: true }; - } - // Get or create counter - let counter = this.patternCounters.get(pattern); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.patternCounters.set(pattern, counter); - // Initialize pattern stats if needed - if (!this.stats.byPattern[pattern]) { - this.stats.byPattern[pattern] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0 - }; - } - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.count = 0; - counter.lastReset = now; - } - // Check if limit is exceeded - if (counter.count >= limit) { - // Calculate reset time - const resetIn = 60000 - (now - counter.lastReset); - // Update statistics - this.stats.byPattern[pattern].totalBlocked++; - this.stats.totalBlocked++; - return { - allowed: false, - reason: `Pattern "${pattern}" message rate limit exceeded`, - limit, - current: counter.count, - resetIn - }; - } - // Increment counter - counter.count++; - // Update statistics - this.stats.byPattern[pattern].messagesPerMinute = counter.count; - this.stats.byPattern[pattern].totalMessages++; - return { allowed: true }; - } - /** - * Check domain-specific message rate limit - * @param domain Domain to check - */ - checkDomainMessageLimit(domain) { - const now = Date.now(); - // Get domain-specific limit or use global - const domainConfig = this.config.domains?.[domain]; - const limit = domainConfig?.maxMessagesPerMinute || this.config.global.maxMessagesPerMinute; - if (!limit) { - return { allowed: true }; - } - // Get or create counter - let counter = this.domainCounters.get(domain); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.domainCounters.set(domain, counter); - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.count = 0; - counter.lastReset = now; - } - // Check if limit is exceeded - if (counter.count >= limit) { - // Calculate reset time - const resetIn = 60000 - (now - counter.lastReset); - logger.log('warn', `Domain ${domain} rate limit exceeded: ${counter.count}/${limit} messages per minute`); - return { - allowed: false, - reason: `Domain "${domain}" message rate limit exceeded`, - limit, - current: counter.count, - resetIn - }; - } - // Increment counter - counter.count++; - return { allowed: true }; - } - /** - * Check IP-specific message rate limit - * @param ip IP address - */ - checkIpMessageLimit(ip) { - const now = Date.now(); - // Get IP-specific limit or use global - const ipConfig = this.config.ips?.[ip]; - const limit = ipConfig?.maxMessagesPerMinute || this.config.global.maxMessagesPerMinute; - if (!limit) { - return { allowed: true }; - } - // Get or create counter - let counter = this.ipCounters.get(ip); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.ipCounters.set(ip, counter); - // Initialize IP stats if needed - if (!this.stats.byIp[ip]) { - this.stats.byIp[ip] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0, - connections: 0, - errors: 0, - authFailures: 0, - blocked: false - }; - } - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.count = 0; - counter.lastReset = now; - } - // Check if limit is exceeded - if (counter.count >= limit) { - // Calculate reset time - const resetIn = 60000 - (now - counter.lastReset); - // Update statistics - this.stats.byIp[ip].totalBlocked++; - this.stats.totalBlocked++; - return { - allowed: false, - reason: `IP ${ip} message rate limit exceeded`, - limit, - current: counter.count, - resetIn - }; - } - // Increment counter - counter.count++; - // Update statistics - this.stats.byIp[ip].messagesPerMinute = counter.count; - this.stats.byIp[ip].totalMessages++; - return { allowed: true }; - } - /** - * Check recipient limit - * @param email Email address - * @param recipients Number of recipients - * @param pattern Matched pattern - * @param domain Domain name - */ - checkRecipientLimit(email, recipients, pattern, domain) { - // Get the most specific limit available - let limit = this.config.global.maxRecipientsPerMessage; - // Check pattern-specific limit - if (pattern && this.config.patterns?.[pattern]?.maxRecipientsPerMessage) { - limit = this.config.patterns[pattern].maxRecipientsPerMessage; - } - // Check domain-specific limit (overrides pattern if present) - if (domain && this.config.domains?.[domain]?.maxRecipientsPerMessage) { - limit = this.config.domains[domain].maxRecipientsPerMessage; - } - if (!limit) { - return { allowed: true }; - } - // Check if limit is exceeded - if (recipients > limit) { - return { - allowed: false, - reason: 'Recipient limit exceeded', - limit, - current: recipients - }; - } - return { allowed: true }; - } - /** - * Record a connection from an IP - * @param ip IP address - * @returns Result of rate limit check - */ - recordConnection(ip) { - const now = Date.now(); - // Check if IP is blocked - if (this.isIpBlocked(ip)) { - return { - allowed: false, - reason: 'IP is blocked', - resetIn: this.getBlockReleaseTime(ip) - }; - } - // Get IP-specific limit or use global - const ipConfig = this.config.ips?.[ip]; - const limit = ipConfig?.maxConnectionsPerIP || this.config.global.maxConnectionsPerIP; - if (!limit) { - return { allowed: true }; - } - // Get or create counter - let counter = this.ipCounters.get(ip); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.ipCounters.set(ip, counter); - // Initialize IP stats if needed - if (!this.stats.byIp[ip]) { - this.stats.byIp[ip] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0, - connections: 0, - errors: 0, - authFailures: 0, - blocked: false - }; - } - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.connections = 0; - counter.lastReset = now; - } - // Check if limit is exceeded - if (counter.connections >= limit) { - // Calculate reset time - const resetIn = 60000 - (now - counter.lastReset); - // Update statistics - this.stats.byIp[ip].totalBlocked++; - this.stats.totalBlocked++; - return { - allowed: false, - reason: `IP ${ip} connection rate limit exceeded`, - limit, - current: counter.connections, - resetIn - }; - } - // Increment counter - counter.connections++; - // Update statistics - this.stats.byIp[ip].connections = counter.connections; - return { allowed: true }; - } - /** - * Record an error from an IP - * @param ip IP address - * @returns True if IP should be blocked - */ - recordError(ip) { - const now = Date.now(); - // Get IP-specific limit or use global - const ipConfig = this.config.ips?.[ip]; - const limit = ipConfig?.maxErrorsPerIP || this.config.global.maxErrorsPerIP; - if (!limit) { - return false; - } - // Get or create counter - let counter = this.ipCounters.get(ip); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.ipCounters.set(ip, counter); - // Initialize IP stats if needed - if (!this.stats.byIp[ip]) { - this.stats.byIp[ip] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0, - connections: 0, - errors: 0, - authFailures: 0, - blocked: false - }; - } - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.errors = 0; - counter.lastReset = now; - } - // Increment counter - counter.errors++; - // Update statistics - this.stats.byIp[ip].errors = counter.errors; - // Check if limit is exceeded - if (counter.errors >= limit) { - // Block the IP - this.blockIp(ip); - logger.log('warn', `IP ${ip} blocked due to excessive errors (${counter.errors}/${limit})`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.WARN, - type: SecurityEventType.RATE_LIMITING, - message: 'IP blocked due to excessive errors', - ipAddress: ip, - details: { - errors: counter.errors, - limit - }, - success: false - }); - return true; - } - return false; - } - /** - * Record an authentication failure from an IP - * @param ip IP address - * @returns True if IP should be blocked - */ - recordAuthFailure(ip) { - const now = Date.now(); - // Get IP-specific limit or use global - const ipConfig = this.config.ips?.[ip]; - const limit = ipConfig?.maxAuthFailuresPerIP || this.config.global.maxAuthFailuresPerIP; - if (!limit) { - return false; - } - // Get or create counter - let counter = this.ipCounters.get(ip); - if (!counter) { - counter = { - count: 0, - lastReset: now, - recipients: 0, - errors: 0, - authFailures: 0, - connections: 0 - }; - this.ipCounters.set(ip, counter); - // Initialize IP stats if needed - if (!this.stats.byIp[ip]) { - this.stats.byIp[ip] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0, - connections: 0, - errors: 0, - authFailures: 0, - blocked: false - }; - } - } - // Check if counter needs to be reset - if (now - counter.lastReset >= 60000) { - counter.authFailures = 0; - counter.lastReset = now; - } - // Increment counter - counter.authFailures++; - // Update statistics - this.stats.byIp[ip].authFailures = counter.authFailures; - // Check if limit is exceeded - if (counter.authFailures >= limit) { - // Block the IP - this.blockIp(ip); - logger.log('warn', `IP ${ip} blocked due to excessive authentication failures (${counter.authFailures}/${limit})`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.WARN, - type: SecurityEventType.AUTHENTICATION, - message: 'IP blocked due to excessive authentication failures', - ipAddress: ip, - details: { - authFailures: counter.authFailures, - limit - }, - success: false - }); - return true; - } - return false; - } - /** - * Block an IP address - * @param ip IP address to block - * @param duration Override the default block duration (milliseconds) - */ - blockIp(ip, duration) { - if (!this.config.blocks) { - this.config.blocks = {}; - } - // Set block expiry time - const expiry = Date.now() + (duration || this.config.global.blockDuration || 3600000); - this.config.blocks[ip] = expiry; - // Update statistics - if (!this.stats.byIp[ip]) { - this.stats.byIp[ip] = { - messagesPerMinute: 0, - totalMessages: 0, - totalBlocked: 0, - connections: 0, - errors: 0, - authFailures: 0, - blocked: false - }; - } - this.stats.byIp[ip].blocked = true; - this.stats.currentlyBlocked++; - // Emit event - this.emit('ipBlocked', { - ip, - expiry, - duration: duration || this.config.global.blockDuration - }); - logger.log('warn', `IP ${ip} blocked until ${new Date(expiry).toISOString()}`); - } - /** - * Unblock an IP address - * @param ip IP address to unblock - */ - unblockIp(ip) { - if (!this.config.blocks) { - return; - } - // Remove block - delete this.config.blocks[ip]; - // Update statistics - if (this.stats.byIp[ip]) { - this.stats.byIp[ip].blocked = false; - this.stats.currentlyBlocked--; - } - // Emit event - this.emit('ipUnblocked', { ip }); - logger.log('info', `IP ${ip} unblocked`); - } - /** - * Check if an IP is blocked - * @param ip IP address to check - */ - isIpBlocked(ip) { - if (!this.config.blocks) { - return false; - } - // Check if IP is in blocks - if (!(ip in this.config.blocks)) { - return false; - } - // Check if block has expired - const expiry = this.config.blocks[ip]; - if (expiry <= Date.now()) { - // Remove expired block - delete this.config.blocks[ip]; - // Update statistics - if (this.stats.byIp[ip]) { - this.stats.byIp[ip].blocked = false; - this.stats.currentlyBlocked--; - } - return false; - } - return true; - } - /** - * Get the time until a block is released - * @param ip IP address - * @returns Milliseconds until release or 0 if not blocked - */ - getBlockReleaseTime(ip) { - if (!this.config.blocks || !(ip in this.config.blocks)) { - return 0; - } - const expiry = this.config.blocks[ip]; - const now = Date.now(); - return expiry > now ? expiry - now : 0; - } - /** - * Update rate limiter statistics - */ - updateStats() { - // Update active counters count - this.stats.activeCounters = this.counters.size + this.patternCounters.size + this.ipCounters.size; - // Emit statistics update - this.emit('statsUpdated', this.stats); - } - /** - * Get rate limiter statistics - */ - getStats() { - return { ...this.stats }; - } - /** - * Update rate limiter configuration - * @param config New configuration - */ - updateConfig(config) { - if (config.global) { - this.config.global = { - ...this.config.global, - ...config.global - }; - } - if (config.patterns) { - this.config.patterns = { - ...this.config.patterns, - ...config.patterns - }; - } - if (config.ips) { - this.config.ips = { - ...this.config.ips, - ...config.ips - }; - } - logger.log('info', 'Rate limiter configuration updated'); - } - /** - * Get configuration for debugging - */ - getConfig() { - return { ...this.config }; - } - /** - * Apply domain-specific rate limits - * Merges domain limits with existing configuration - * @param domain Domain name - * @param limits Rate limit configuration for the domain - */ - applyDomainLimits(domain, limits) { - if (!this.config.domains) { - this.config.domains = {}; - } - // Merge the limits with any existing domain config - this.config.domains[domain] = { - ...this.config.domains[domain], - ...limits - }; - logger.log('info', `Applied rate limits for domain ${domain}:`, limits); - } - /** - * Remove domain-specific rate limits - * @param domain Domain name - */ - removeDomainLimits(domain) { - if (this.config.domains && this.config.domains[domain]) { - delete this.config.domains[domain]; - // Also remove the counter - this.domainCounters.delete(domain); - logger.log('info', `Removed rate limits for domain ${domain}`); - } - } - /** - * Get domain-specific rate limits - * @param domain Domain name - * @returns Domain rate limit config or undefined - */ - getDomainLimits(domain) { - return this.config.domains?.[domain]; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.unified.rate.limiter.js","sourceRoot":"","sources":["../../../ts/mail/delivery/classes.unified.rate.limiter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAgF9F;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAC1C,MAAM,CAA0B;IAChC,QAAQ,GAA+B,IAAI,GAAG,EAAE,CAAC;IACjD,eAAe,GAA+B,IAAI,GAAG,EAAE,CAAC;IACxD,UAAU,GAA+B,IAAI,GAAG,EAAE,CAAC;IACnD,cAAc,GAA+B,IAAI,GAAG,EAAE,CAAC;IACvD,eAAe,CAAkB;IACjC,KAAK,CAAoB;IAEjC;;;OAGG;IACH,YAAY,MAA+B;QACzC,KAAK,EAAE,CAAC;QAER,4BAA4B;QAC5B,IAAI,CAAC,MAAM,GAAG;YACZ,MAAM,EAAE;gBACN,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,IAAI,GAAG;gBAC/D,uBAAuB,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,IAAI,GAAG;gBACrE,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,IAAI,EAAE;gBAC5D,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE;gBAClD,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,IAAI,CAAC;gBAC7D,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,SAAS;aAChE;YACD,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE;YAC/B,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,EAAE;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;SAC5B,CAAC;QAEF,wBAAwB;QACxB,IAAI,CAAC,KAAK,GAAG;YACX,cAAc,EAAE,CAAC;YACjB,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,CAAC;YACnB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,EAAE;SACT,CAAC;QAEF,yBAAyB;QACzB,IAAI,CAAC,oBAAoB,EAAE,CAAC;IAC9B,CAAC;IAED;;OAEG;IACK,oBAAoB;QAC1B,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACtC,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED;;OAEG;IACI,IAAI;QACT,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACzB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACpC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;QACnC,CAAC;IACH,CAAC;IAED;;OAEG;IACI,OAAO;QACZ,4BAA4B;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,gCAAgC;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACxB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAE7B,eAAe;QACf,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;QAC1B,CAAC;QAED,mBAAmB;QACnB,IAAI,CAAC,KAAK,GAAG;YACX,cAAc,EAAE,CAAC;YACjB,YAAY,EAAE,CAAC;YACf,gBAAgB,EAAE,CAAC;YACnB,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,EAAE;SACT,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;IACrD,CAAC;IAED;;OAEG;IACK,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,0BAA0B;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9D,IAAI,MAAM,IAAI,GAAG,EAAE,CAAC;oBAClB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAC9B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,EAAE,EAAE,CAAC,CAAC;oBAE5D,oBAAoB;oBACpB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;wBACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC;oBACtC,CAAC;oBACD,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC;QACH,CAAC;QAED,gDAAgD;QAChD,MAAM,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC;QAE5B,wBAAwB;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC;YACrD,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,yBAAyB;QACzB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,wBAAwB;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,IAAI,OAAO,CAAC,SAAS,GAAG,MAAM,EAAE,CAAC;gBAC/B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,oBAAoB;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED;;;;;;;;OAQG;IACI,iBAAiB,CAAC,KAAa,EAAE,EAAU,EAAE,UAAkB,EAAE,OAAgB,EAAE,MAAe;QACvG,yBAAyB;QACzB,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;aACtC,CAAC;QACJ,CAAC;QAED,kCAAkC;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,sDAAsD;QACtD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,aAAa,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAC7D,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC3B,OAAO,aAAa,CAAC;YACvB,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAC1D,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC1B,OAAO,YAAY,CAAC;YACtB,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,wBAAwB;QACxB,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACrF,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAO,eAAe,CAAC;QACzB,CAAC;QAED,oBAAoB;QACpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACK,uBAAuB,CAAC,KAAa;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAqB,CAAC;QAEvD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,wBAAwB;QACxB,MAAM,GAAG,GAAG,QAAQ,CAAC;QACrB,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;YAC3B,uBAAuB;YACvB,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,oCAAoC;gBAC5C,KAAK;gBACL,OAAO,EAAE,OAAO,CAAC,KAAK;gBACtB,OAAO;aACR,CAAC;QACJ,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,oBAAoB;QACpB,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACK,wBAAwB,CAAC,OAAe;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,2CAA2C;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,KAAK,GAAG,aAAa,EAAE,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAqB,CAAC;QAE9F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAE3C,qCAAqC;YACrC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBACnC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG;oBAC9B,iBAAiB,EAAE,CAAC;oBACpB,aAAa,EAAE,CAAC;oBAChB,YAAY,EAAE,CAAC;iBAChB,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;YAC3B,uBAAuB;YACvB,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,oBAAoB;YACpB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;YAC7C,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAE1B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,YAAY,OAAO,+BAA+B;gBAC1D,KAAK;gBACL,OAAO,EAAE,OAAO,CAAC,KAAK;gBACtB,OAAO;aACR,CAAC;QACJ,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;QAE9C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACK,uBAAuB,CAAC,MAAc;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,0CAA0C;QAC1C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,KAAK,GAAG,YAAY,EAAE,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAqB,CAAC;QAE7F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE9C,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;YAC3B,uBAAuB;YACvB,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,MAAM,yBAAyB,OAAO,CAAC,KAAK,IAAI,KAAK,sBAAsB,CAAC,CAAC;YAE1G,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,WAAW,MAAM,+BAA+B;gBACxD,KAAK;gBACL,OAAO,EAAE,OAAO,CAAC,KAAK;gBACtB,OAAO;aACR,CAAC;QACJ,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACK,mBAAmB,CAAC,EAAU;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,sCAAsC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,EAAE,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAqB,CAAC;QAEzF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAEjC,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;oBACpB,iBAAiB,EAAE,CAAC;oBACpB,aAAa,EAAE,CAAC;oBAChB,YAAY,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;oBACd,MAAM,EAAE,CAAC;oBACT,YAAY,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;YAClB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;YAC3B,uBAAuB;YACvB,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,oBAAoB;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAE1B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,MAAM,EAAE,8BAA8B;gBAC9C,KAAK;gBACL,OAAO,EAAE,OAAO,CAAC,KAAK;gBACtB,OAAO;aACR,CAAC;QACJ,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC;QACtD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,aAAa,EAAE,CAAC;QAEpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;;;;OAMG;IACK,mBAAmB,CAAC,KAAa,EAAE,UAAkB,EAAE,OAAgB,EAAE,MAAe;QAC9F,wCAAwC;QACxC,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAwB,CAAC;QAExD,+BAA+B;QAC/B,IAAI,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,uBAAuB,EAAE,CAAC;YACxE,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,uBAAwB,CAAC;QACjE,CAAC;QAED,6DAA6D;QAC7D,IAAI,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC;YACrE,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,uBAAwB,CAAC;QAC/D,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,6BAA6B;QAC7B,IAAI,UAAU,GAAG,KAAK,EAAE,CAAC;YACvB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,0BAA0B;gBAClC,KAAK;gBACL,OAAO,EAAE,UAAU;aACpB,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,EAAU;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,yBAAyB;QACzB,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,eAAe;gBACvB,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;aACtC,CAAC;QACJ,CAAC;QAED,sCAAsC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,EAAE,mBAAmB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAoB,CAAC;QAEvF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAEjC,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;oBACpB,iBAAiB,EAAE,CAAC;oBACpB,aAAa,EAAE,CAAC;oBAChB,YAAY,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;oBACd,MAAM,EAAE,CAAC;oBACT,YAAY,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;YACxB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,6BAA6B;QAC7B,IAAI,OAAO,CAAC,WAAW,IAAI,KAAK,EAAE,CAAC;YACjC,uBAAuB;YACvB,MAAM,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;YAElD,oBAAoB;YACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAE1B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,MAAM,EAAE,iCAAiC;gBACjD,KAAK;gBACL,OAAO,EAAE,OAAO,CAAC,WAAW;gBAC5B,OAAO;aACR,CAAC;QACJ,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,WAAW,EAAE,CAAC;QAEtB,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QAEtD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED;;;;OAIG;IACI,WAAW,CAAC,EAAU;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,sCAAsC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,EAAE,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAe,CAAC;QAE7E,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAEjC,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;oBACpB,iBAAiB,EAAE,CAAC;oBACpB,aAAa,EAAE,CAAC;oBAChB,YAAY,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;oBACd,MAAM,EAAE,CAAC;oBACT,YAAY,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;YACnB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,MAAM,EAAE,CAAC;QAEjB,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE5C,6BAA6B;QAC7B,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC;YAC5B,eAAe;YACf,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,qCAAqC,OAAO,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,CAAC;YAE5F,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,aAAa;gBACrC,OAAO,EAAE,oCAAoC;gBAC7C,SAAS,EAAE,EAAE;gBACb,OAAO,EAAE;oBACP,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,KAAK;iBACN;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,EAAU;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,sCAAsC;QACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,QAAQ,EAAE,oBAAoB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,oBAAqB,CAAC;QAEzF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB;QACxB,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG;gBACR,KAAK,EAAE,CAAC;gBACR,SAAS,EAAE,GAAG;gBACd,UAAU,EAAE,CAAC;gBACb,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;aACf,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAEjC,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;oBACpB,iBAAiB,EAAE,CAAC;oBACpB,aAAa,EAAE,CAAC;oBAChB,YAAY,EAAE,CAAC;oBACf,WAAW,EAAE,CAAC;oBACd,MAAM,EAAE,CAAC;oBACT,YAAY,EAAE,CAAC;oBACf,OAAO,EAAE,KAAK;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,qCAAqC;QACrC,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,YAAY,GAAG,CAAC,CAAC;YACzB,OAAO,CAAC,SAAS,GAAG,GAAG,CAAC;QAC1B,CAAC;QAED,oBAAoB;QACpB,OAAO,CAAC,YAAY,EAAE,CAAC;QAEvB,oBAAoB;QACpB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QAExD,6BAA6B;QAC7B,IAAI,OAAO,CAAC,YAAY,IAAI,KAAK,EAAE,CAAC;YAClC,eAAe;YACf,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAEjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,sDAAsD,OAAO,CAAC,YAAY,IAAI,KAAK,GAAG,CAAC,CAAC;YAEnH,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,cAAc;gBACtC,OAAO,EAAE,qDAAqD;gBAC9D,SAAS,EAAE,EAAE;gBACb,OAAO,EAAE;oBACP,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,KAAK;iBACN;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;OAIG;IACI,OAAO,CAAC,EAAU,EAAE,QAAiB;QAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;QAC1B,CAAC;QAED,wBAAwB;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,IAAI,OAAO,CAAC,CAAC;QACtF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;QAEhC,oBAAoB;QACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG;gBACpB,iBAAiB,EAAE,CAAC;gBACpB,aAAa,EAAE,CAAC;gBAChB,YAAY,EAAE,CAAC;gBACf,WAAW,EAAE,CAAC;gBACd,MAAM,EAAE,CAAC;gBACT,YAAY,EAAE,CAAC;gBACf,OAAO,EAAE,KAAK;aACf,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAE9B,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACrB,EAAE;YACF,MAAM;YACN,QAAQ,EAAE,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa;SACvD,CAAC,CAAC;QAEH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,kBAAkB,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC;IAED;;;OAGG;IACI,SAAS,CAAC,EAAU;QACzB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,eAAe;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE9B,oBAAoB;QACpB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC;YACpC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAChC,CAAC;QAED,aAAa;QACb,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAEjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,WAAW,CAAC,EAAU;QAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,6BAA6B;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtC,IAAI,MAAM,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACzB,uBAAuB;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAE9B,oBAAoB;YACpB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC;gBACpC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAChC,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,mBAAmB,CAAC,EAAU;QACnC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,OAAO,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACzC,CAAC;IAED;;OAEG;IACK,WAAW;QACjB,+BAA+B;QAC/B,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAElG,yBAAyB;QACzB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,MAAwC;QAC1D,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG;gBACnB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM;gBACrB,GAAG,MAAM,CAAC,MAAM;aACjB,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG;gBACrB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ;gBACvB,GAAG,MAAM,CAAC,QAAQ;aACnB,CAAC;QACJ,CAAC;QAED,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG;gBAChB,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG;gBAClB,GAAG,MAAM,CAAC,GAAG;aACd,CAAC;QACJ,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;IAC3D,CAAC;IAED;;OAEG;IACI,SAAS;QACd,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACI,iBAAiB,CAAC,MAAc,EAAE,MAAwB;QAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC;QAC3B,CAAC;QAED,mDAAmD;QACnD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;YAC5B,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,GAAG,MAAM;SACV,CAAC;QAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,MAAM,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,MAAc;QACtC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnC,0BAA0B;YAC1B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,eAAe,CAAC,MAAc;QACnC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;CACF"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/index.d.ts b/dist_ts/mail/delivery/index.d.ts deleted file mode 100644 index 7faca12..0000000 --- a/dist_ts/mail/delivery/index.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * from './classes.emailsignjob.js'; -export * from './classes.delivery.queue.js'; -export * from './classes.delivery.system.js'; -export { EmailSendJob } from './classes.emailsendjob.js'; -export { DeliveryStatus } from './classes.delivery.system.js'; -export { RateLimiter } from './classes.ratelimiter.js'; -export type { IRateLimitConfig } from './classes.ratelimiter.js'; -export * from './classes.unified.rate.limiter.js'; -export * from './classes.mta.config.js'; -import * as smtpClientMod from './smtpclient/index.js'; -export { smtpClientMod }; diff --git a/dist_ts/mail/delivery/index.js b/dist_ts/mail/delivery/index.js deleted file mode 100644 index 7a2abdf..0000000 --- a/dist_ts/mail/delivery/index.js +++ /dev/null @@ -1,17 +0,0 @@ -// Email delivery components -export * from './classes.emailsignjob.js'; -export * from './classes.delivery.queue.js'; -export * from './classes.delivery.system.js'; -// Handle exports with naming conflicts -export { EmailSendJob } from './classes.emailsendjob.js'; -export { DeliveryStatus } from './classes.delivery.system.js'; -// Rate limiter exports - fix naming conflict -export { RateLimiter } from './classes.ratelimiter.js'; -// Unified rate limiter -export * from './classes.unified.rate.limiter.js'; -// SMTP client and configuration -export * from './classes.mta.config.js'; -// Import and export SMTP modules as namespaces to avoid conflicts -import * as smtpClientMod from './smtpclient/index.js'; -export { smtpClientMod }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixjQUFjLDJCQUEyQixDQUFDO0FBQzFDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw4QkFBOEIsQ0FBQztBQUU3Qyx1Q0FBdUM7QUFDdkMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3pELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUU5RCw2Q0FBNkM7QUFDN0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBR3ZELHVCQUF1QjtBQUN2QixjQUFjLG1DQUFtQyxDQUFDO0FBRWxELGdDQUFnQztBQUNoQyxjQUFjLHlCQUF5QixDQUFDO0FBRXhDLGtFQUFrRTtBQUNsRSxPQUFPLEtBQUssYUFBYSxNQUFNLHVCQUF1QixDQUFDO0FBRXZELE9BQU8sRUFBRSxhQUFhLEVBQUUsQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/delivery/interfaces.d.ts b/dist_ts/mail/delivery/interfaces.d.ts deleted file mode 100644 index 59f7be4..0000000 --- a/dist_ts/mail/delivery/interfaces.d.ts +++ /dev/null @@ -1,243 +0,0 @@ -/** - * SMTP and email delivery interface definitions - */ -import type { Email } from '../core/classes.email.js'; -/** - * SMTP session state enumeration - */ -export declare enum SmtpState { - GREETING = "GREETING", - AFTER_EHLO = "AFTER_EHLO", - MAIL_FROM = "MAIL_FROM", - RCPT_TO = "RCPT_TO", - DATA = "DATA", - DATA_RECEIVING = "DATA_RECEIVING", - FINISHED = "FINISHED" -} -/** - * Email processing mode type - */ -export type EmailProcessingMode = 'forward' | 'mta' | 'process'; -/** - * Envelope recipient information - */ -export interface IEnvelopeRecipient { - /** - * Email address of the recipient - */ - address: string; - /** - * Additional SMTP command arguments - */ - args: Record; -} -/** - * SMTP session envelope information - */ -export interface ISmtpEnvelope { - /** - * Envelope sender (MAIL FROM) information - */ - mailFrom: { - /** - * Email address of the sender - */ - address: string; - /** - * Additional SMTP command arguments - */ - args: Record; - }; - /** - * Envelope recipients (RCPT TO) information - */ - rcptTo: IEnvelopeRecipient[]; -} -/** - * SMTP Session interface - represents an active SMTP connection - */ -export interface ISmtpSession { - /** - * Unique session identifier - */ - id: string; - /** - * Current session state in the SMTP conversation - */ - state: SmtpState; - /** - * Hostname provided by the client in EHLO/HELO command - */ - clientHostname: string; - /** - * MAIL FROM email address (legacy format) - */ - mailFrom: string; - /** - * RCPT TO email addresses (legacy format) - */ - rcptTo: string[]; - /** - * Raw email data being received - */ - emailData: string; - /** - * Chunks of email data for more efficient buffer management - */ - emailDataChunks?: string[]; - /** - * Whether the connection is using TLS - */ - useTLS: boolean; - /** - * Whether the connection has ended - */ - connectionEnded: boolean; - /** - * Remote IP address of the client - */ - remoteAddress: string; - /** - * Whether the connection is secure (TLS) - */ - secure: boolean; - /** - * Whether the client has been authenticated - */ - authenticated: boolean; - /** - * SMTP envelope information (structured format) - */ - envelope: ISmtpEnvelope; - /** - * Email processing mode to use for this session - */ - processingMode?: EmailProcessingMode; - /** - * Timestamp of last activity for session timeout tracking - */ - lastActivity?: number; - /** - * Timeout ID for DATA command timeout - */ - dataTimeoutId?: NodeJS.Timeout; -} -/** - * SMTP authentication data - */ -export interface ISmtpAuth { - /** - * Authentication method used - */ - method: 'PLAIN' | 'LOGIN' | 'OAUTH2' | string; - /** - * Username for authentication - */ - username: string; - /** - * Password or token for authentication - */ - password: string; -} -/** - * SMTP server options - */ -export interface ISmtpServerOptions { - /** - * Port to listen on - */ - port: number; - /** - * TLS private key (PEM format) - */ - key: string; - /** - * TLS certificate (PEM format) - */ - cert: string; - /** - * Server hostname for SMTP banner - */ - hostname?: string; - /** - * Host address to bind to (defaults to all interfaces) - */ - host?: string; - /** - * Secure port for dedicated TLS connections - */ - securePort?: number; - /** - * CA certificates for TLS (PEM format) - */ - ca?: string; - /** - * Maximum size of messages in bytes - */ - maxSize?: number; - /** - * Maximum number of concurrent connections - */ - maxConnections?: number; - /** - * Authentication options - */ - auth?: { - /** - * Whether authentication is required - */ - required: boolean; - /** - * Allowed authentication methods - */ - methods: ('PLAIN' | 'LOGIN' | 'OAUTH2')[]; - }; - /** - * Socket timeout in milliseconds (default: 5 minutes / 300000ms) - */ - socketTimeout?: number; - /** - * Initial connection timeout in milliseconds (default: 30 seconds / 30000ms) - */ - connectionTimeout?: number; - /** - * Interval for checking idle sessions in milliseconds (default: 5 seconds / 5000ms) - * For testing, can be set lower (e.g. 1000ms) to detect timeouts more quickly - */ - cleanupInterval?: number; - /** - * Maximum number of recipients allowed per message (default: 100) - */ - maxRecipients?: number; - /** - * Maximum message size in bytes (default: 10MB / 10485760 bytes) - * This is advertised in the EHLO SIZE extension - */ - size?: number; - /** - * Timeout for the DATA command in milliseconds (default: 60000ms / 1 minute) - * This controls how long to wait for the complete email data - */ - dataTimeout?: number; -} -/** - * Result of SMTP transaction - */ -export interface ISmtpTransactionResult { - /** - * Whether the transaction was successful - */ - success: boolean; - /** - * Error message if failed - */ - error?: string; - /** - * Message ID if successful - */ - messageId?: string; - /** - * Resulting email if successful - */ - email?: Email; -} diff --git a/dist_ts/mail/delivery/interfaces.js b/dist_ts/mail/delivery/interfaces.js deleted file mode 100644 index 7eccd4f..0000000 --- a/dist_ts/mail/delivery/interfaces.js +++ /dev/null @@ -1,17 +0,0 @@ -/** - * SMTP and email delivery interface definitions - */ -/** - * SMTP session state enumeration - */ -export var SmtpState; -(function (SmtpState) { - SmtpState["GREETING"] = "GREETING"; - SmtpState["AFTER_EHLO"] = "AFTER_EHLO"; - SmtpState["MAIL_FROM"] = "MAIL_FROM"; - SmtpState["RCPT_TO"] = "RCPT_TO"; - SmtpState["DATA"] = "DATA"; - SmtpState["DATA_RECEIVING"] = "DATA_RECEIVING"; - SmtpState["FINISHED"] = "FINISHED"; -})(SmtpState || (SmtpState = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvaW50ZXJmYWNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUlIOztHQUVHO0FBQ0gsTUFBTSxDQUFOLElBQVksU0FRWDtBQVJELFdBQVksU0FBUztJQUNuQixrQ0FBcUIsQ0FBQTtJQUNyQixzQ0FBeUIsQ0FBQTtJQUN6QixvQ0FBdUIsQ0FBQTtJQUN2QixnQ0FBbUIsQ0FBQTtJQUNuQiwwQkFBYSxDQUFBO0lBQ2IsOENBQWlDLENBQUE7SUFDakMsa0NBQXFCLENBQUE7QUFDdkIsQ0FBQyxFQVJXLFNBQVMsS0FBVCxTQUFTLFFBUXBCIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/auth-handler.d.ts b/dist_ts/mail/delivery/smtpclient/auth-handler.d.ts deleted file mode 100644 index ab7e010..0000000 --- a/dist_ts/mail/delivery/smtpclient/auth-handler.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * SMTP Client Authentication Handler - * Authentication mechanisms implementation - */ -import type { ISmtpConnection, ISmtpAuthOptions, ISmtpClientOptions } from './interfaces.js'; -import type { CommandHandler } from './command-handler.js'; -export declare class AuthHandler { - private options; - private commandHandler; - constructor(options: ISmtpClientOptions, commandHandler: CommandHandler); - /** - * Authenticate using the configured method - */ - authenticate(connection: ISmtpConnection): Promise; - /** - * Authenticate using AUTH PLAIN - */ - private authenticatePlain; - /** - * Authenticate using AUTH LOGIN - */ - private authenticateLogin; - /** - * Authenticate using OAuth2 - */ - private authenticateOAuth2; - /** - * Select appropriate authentication method - */ - private selectAuthMethod; - /** - * Check if OAuth2 token is expired - */ - private isTokenExpired; - /** - * Refresh OAuth2 access token - */ - private refreshOAuth2Token; - /** - * Validate authentication configuration - */ - validateAuthConfig(auth: ISmtpAuthOptions): string[]; -} diff --git a/dist_ts/mail/delivery/smtpclient/auth-handler.js b/dist_ts/mail/delivery/smtpclient/auth-handler.js deleted file mode 100644 index 2722fc8..0000000 --- a/dist_ts/mail/delivery/smtpclient/auth-handler.js +++ /dev/null @@ -1,190 +0,0 @@ -/** - * SMTP Client Authentication Handler - * Authentication mechanisms implementation - */ -import { AUTH_METHODS } from './constants.js'; -import { encodeAuthPlain, encodeAuthLogin, generateOAuth2String, isSuccessCode } from './utils/helpers.js'; -import { logAuthentication, logDebug } from './utils/logging.js'; -export class AuthHandler { - options; - commandHandler; - constructor(options, commandHandler) { - this.options = options; - this.commandHandler = commandHandler; - } - /** - * Authenticate using the configured method - */ - async authenticate(connection) { - if (!this.options.auth) { - logDebug('No authentication configured', this.options); - return; - } - const authOptions = this.options.auth; - const capabilities = connection.capabilities; - if (!capabilities || capabilities.authMethods.size === 0) { - throw new Error('Server does not support authentication'); - } - // Determine authentication method - const method = this.selectAuthMethod(authOptions, capabilities.authMethods); - logAuthentication('start', method, this.options); - try { - switch (method) { - case AUTH_METHODS.PLAIN: - await this.authenticatePlain(connection, authOptions); - break; - case AUTH_METHODS.LOGIN: - await this.authenticateLogin(connection, authOptions); - break; - case AUTH_METHODS.OAUTH2: - await this.authenticateOAuth2(connection, authOptions); - break; - default: - throw new Error(`Unsupported authentication method: ${method}`); - } - logAuthentication('success', method, this.options); - } - catch (error) { - logAuthentication('failure', method, this.options, { error }); - throw error; - } - } - /** - * Authenticate using AUTH PLAIN - */ - async authenticatePlain(connection, auth) { - if (!auth.user || !auth.pass) { - throw new Error('Username and password required for PLAIN authentication'); - } - const credentials = encodeAuthPlain(auth.user, auth.pass); - const response = await this.commandHandler.sendAuth(connection, AUTH_METHODS.PLAIN, credentials); - if (!isSuccessCode(response.code)) { - throw new Error(`PLAIN authentication failed: ${response.message}`); - } - } - /** - * Authenticate using AUTH LOGIN - */ - async authenticateLogin(connection, auth) { - if (!auth.user || !auth.pass) { - throw new Error('Username and password required for LOGIN authentication'); - } - // Step 1: Send AUTH LOGIN - let response = await this.commandHandler.sendAuth(connection, AUTH_METHODS.LOGIN); - if (response.code !== 334) { - throw new Error(`LOGIN authentication initiation failed: ${response.message}`); - } - // Step 2: Send username - const encodedUser = encodeAuthLogin(auth.user); - response = await this.commandHandler.sendCommand(connection, encodedUser); - if (response.code !== 334) { - throw new Error(`LOGIN username failed: ${response.message}`); - } - // Step 3: Send password - const encodedPass = encodeAuthLogin(auth.pass); - response = await this.commandHandler.sendCommand(connection, encodedPass); - if (!isSuccessCode(response.code)) { - throw new Error(`LOGIN password failed: ${response.message}`); - } - } - /** - * Authenticate using OAuth2 - */ - async authenticateOAuth2(connection, auth) { - if (!auth.oauth2) { - throw new Error('OAuth2 configuration required for OAUTH2 authentication'); - } - let accessToken = auth.oauth2.accessToken; - // Refresh token if needed - if (!accessToken || this.isTokenExpired(auth.oauth2)) { - accessToken = await this.refreshOAuth2Token(auth.oauth2); - } - const authString = generateOAuth2String(auth.oauth2.user, accessToken); - const response = await this.commandHandler.sendAuth(connection, AUTH_METHODS.OAUTH2, authString); - if (!isSuccessCode(response.code)) { - throw new Error(`OAUTH2 authentication failed: ${response.message}`); - } - } - /** - * Select appropriate authentication method - */ - selectAuthMethod(auth, serverMethods) { - // If method is explicitly specified, use it - if (auth.method && auth.method !== 'AUTO') { - const method = auth.method === 'OAUTH2' ? AUTH_METHODS.OAUTH2 : auth.method; - if (serverMethods.has(method)) { - return method; - } - throw new Error(`Requested authentication method ${auth.method} not supported by server`); - } - // Auto-select based on available credentials and server support - if (auth.oauth2 && serverMethods.has(AUTH_METHODS.OAUTH2)) { - return AUTH_METHODS.OAUTH2; - } - if (auth.user && auth.pass) { - // Prefer PLAIN over LOGIN for simplicity - if (serverMethods.has(AUTH_METHODS.PLAIN)) { - return AUTH_METHODS.PLAIN; - } - if (serverMethods.has(AUTH_METHODS.LOGIN)) { - return AUTH_METHODS.LOGIN; - } - } - throw new Error('No compatible authentication method found'); - } - /** - * Check if OAuth2 token is expired - */ - isTokenExpired(oauth2) { - if (!oauth2.expires) { - return false; // No expiry information, assume valid - } - const now = Date.now(); - const buffer = 300000; // 5 minutes buffer - return oauth2.expires < (now + buffer); - } - /** - * Refresh OAuth2 access token - */ - async refreshOAuth2Token(oauth2) { - // This is a simplified implementation - // In a real implementation, you would make an HTTP request to the OAuth2 provider - logDebug('OAuth2 token refresh required', this.options); - if (!oauth2.refreshToken) { - throw new Error('Refresh token required for OAuth2 token refresh'); - } - // TODO: Implement actual OAuth2 token refresh - // For now, throw an error to indicate this needs to be implemented - throw new Error('OAuth2 token refresh not implemented. Please provide a valid access token.'); - } - /** - * Validate authentication configuration - */ - validateAuthConfig(auth) { - const errors = []; - if (auth.method === 'OAUTH2' || auth.oauth2) { - if (!auth.oauth2) { - errors.push('OAuth2 configuration required when using OAUTH2 method'); - } - else { - if (!auth.oauth2.user) - errors.push('OAuth2 user required'); - if (!auth.oauth2.clientId) - errors.push('OAuth2 clientId required'); - if (!auth.oauth2.clientSecret) - errors.push('OAuth2 clientSecret required'); - if (!auth.oauth2.refreshToken && !auth.oauth2.accessToken) { - errors.push('OAuth2 refreshToken or accessToken required'); - } - } - } - else if (auth.method === 'PLAIN' || auth.method === 'LOGIN' || (!auth.method && (auth.user || auth.pass))) { - if (!auth.user) - errors.push('Username required for basic authentication'); - if (!auth.pass) - errors.push('Password required for basic authentication'); - } - return errors; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpclient/auth-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/command-handler.d.ts b/dist_ts/mail/delivery/smtpclient/command-handler.d.ts deleted file mode 100644 index f07cb1d..0000000 --- a/dist_ts/mail/delivery/smtpclient/command-handler.d.ts +++ /dev/null @@ -1,67 +0,0 @@ -/** - * SMTP Client Command Handler - * SMTP command sending and response parsing - */ -import { EventEmitter } from 'node:events'; -import type { ISmtpConnection, ISmtpResponse, ISmtpClientOptions, ISmtpCapabilities } from './interfaces.js'; -export declare class CommandHandler extends EventEmitter { - private options; - private responseBuffer; - private pendingCommand; - private commandTimeout; - constructor(options: ISmtpClientOptions); - /** - * Send EHLO command and parse capabilities - */ - sendEhlo(connection: ISmtpConnection, domain?: string): Promise; - /** - * Send MAIL FROM command - */ - sendMailFrom(connection: ISmtpConnection, fromAddress: string): Promise; - /** - * Send RCPT TO command - */ - sendRcptTo(connection: ISmtpConnection, toAddress: string): Promise; - /** - * Send DATA command - */ - sendData(connection: ISmtpConnection): Promise; - /** - * Send email data content - */ - sendDataContent(connection: ISmtpConnection, emailData: string): Promise; - /** - * Send RSET command - */ - sendRset(connection: ISmtpConnection): Promise; - /** - * Send NOOP command - */ - sendNoop(connection: ISmtpConnection): Promise; - /** - * Send QUIT command - */ - sendQuit(connection: ISmtpConnection): Promise; - /** - * Send STARTTLS command - */ - sendStartTls(connection: ISmtpConnection): Promise; - /** - * Send AUTH command - */ - sendAuth(connection: ISmtpConnection, method: string, credentials?: string): Promise; - /** - * Send a generic SMTP command - */ - sendCommand(connection: ISmtpConnection, command: string): Promise; - /** - * Send raw data without command formatting - */ - sendRawData(connection: ISmtpConnection, data: string): Promise; - /** - * Wait for server greeting - */ - waitForGreeting(connection: ISmtpConnection): Promise; - private handleIncomingData; - private isCompleteResponse; -} diff --git a/dist_ts/mail/delivery/smtpclient/command-handler.js b/dist_ts/mail/delivery/smtpclient/command-handler.js deleted file mode 100644 index d45c7aa..0000000 --- a/dist_ts/mail/delivery/smtpclient/command-handler.js +++ /dev/null @@ -1,277 +0,0 @@ -/** - * SMTP Client Command Handler - * SMTP command sending and response parsing - */ -import { EventEmitter } from 'node:events'; -import { SMTP_COMMANDS, SMTP_CODES, LINE_ENDINGS } from './constants.js'; -import { parseSmtpResponse, parseEhloResponse, formatCommand, isSuccessCode } from './utils/helpers.js'; -import { logCommand, logDebug } from './utils/logging.js'; -export class CommandHandler extends EventEmitter { - options; - responseBuffer = ''; - pendingCommand = null; - commandTimeout = null; - constructor(options) { - super(); - this.options = options; - } - /** - * Send EHLO command and parse capabilities - */ - async sendEhlo(connection, domain) { - const hostname = domain || this.options.domain || 'localhost'; - const command = `${SMTP_COMMANDS.EHLO} ${hostname}`; - const response = await this.sendCommand(connection, command); - if (!isSuccessCode(response.code)) { - throw new Error(`EHLO failed: ${response.message}`); - } - const capabilities = parseEhloResponse(response.raw); - connection.capabilities = capabilities; - logDebug('EHLO capabilities parsed', this.options, { capabilities }); - return capabilities; - } - /** - * Send MAIL FROM command - */ - async sendMailFrom(connection, fromAddress) { - // Handle empty return path for bounce messages - const command = fromAddress === '' - ? `${SMTP_COMMANDS.MAIL_FROM}:<>` - : `${SMTP_COMMANDS.MAIL_FROM}:<${fromAddress}>`; - return this.sendCommand(connection, command); - } - /** - * Send RCPT TO command - */ - async sendRcptTo(connection, toAddress) { - const command = `${SMTP_COMMANDS.RCPT_TO}:<${toAddress}>`; - return this.sendCommand(connection, command); - } - /** - * Send DATA command - */ - async sendData(connection) { - return this.sendCommand(connection, SMTP_COMMANDS.DATA); - } - /** - * Send email data content - */ - async sendDataContent(connection, emailData) { - // Normalize line endings to CRLF - let data = emailData.replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '\r\n'); - // Ensure email data ends with CRLF - if (!data.endsWith(LINE_ENDINGS.CRLF)) { - data += LINE_ENDINGS.CRLF; - } - // Perform dot stuffing (escape lines starting with a dot) - data = data.replace(/\r\n\./g, '\r\n..'); - // Add termination sequence - data += '.' + LINE_ENDINGS.CRLF; - return this.sendRawData(connection, data); - } - /** - * Send RSET command - */ - async sendRset(connection) { - return this.sendCommand(connection, SMTP_COMMANDS.RSET); - } - /** - * Send NOOP command - */ - async sendNoop(connection) { - return this.sendCommand(connection, SMTP_COMMANDS.NOOP); - } - /** - * Send QUIT command - */ - async sendQuit(connection) { - return this.sendCommand(connection, SMTP_COMMANDS.QUIT); - } - /** - * Send STARTTLS command - */ - async sendStartTls(connection) { - return this.sendCommand(connection, SMTP_COMMANDS.STARTTLS); - } - /** - * Send AUTH command - */ - async sendAuth(connection, method, credentials) { - const command = credentials ? - `${SMTP_COMMANDS.AUTH} ${method} ${credentials}` : - `${SMTP_COMMANDS.AUTH} ${method}`; - return this.sendCommand(connection, command); - } - /** - * Send a generic SMTP command - */ - async sendCommand(connection, command) { - return new Promise((resolve, reject) => { - if (this.pendingCommand) { - reject(new Error('Another command is already pending')); - return; - } - this.pendingCommand = { resolve, reject, command }; - // Set command timeout - const timeout = 30000; // 30 seconds - this.commandTimeout = setTimeout(() => { - this.pendingCommand = null; - this.commandTimeout = null; - reject(new Error(`Command timeout: ${command}`)); - }, timeout); - // Set up data handler - const dataHandler = (data) => { - this.handleIncomingData(data.toString()); - }; - connection.socket.on('data', dataHandler); - // Clean up function - const cleanup = () => { - connection.socket.removeListener('data', dataHandler); - if (this.commandTimeout) { - clearTimeout(this.commandTimeout); - this.commandTimeout = null; - } - }; - // Send command - const formattedCommand = command.endsWith(LINE_ENDINGS.CRLF) ? command : formatCommand(command); - logCommand(command, undefined, this.options); - logDebug(`Sending command: ${command}`, this.options); - connection.socket.write(formattedCommand, (error) => { - if (error) { - cleanup(); - this.pendingCommand = null; - reject(error); - } - }); - // Override resolve/reject to include cleanup - const originalResolve = resolve; - const originalReject = reject; - this.pendingCommand.resolve = (response) => { - cleanup(); - this.pendingCommand = null; - logCommand(command, response, this.options); - originalResolve(response); - }; - this.pendingCommand.reject = (error) => { - cleanup(); - this.pendingCommand = null; - originalReject(error); - }; - }); - } - /** - * Send raw data without command formatting - */ - async sendRawData(connection, data) { - return new Promise((resolve, reject) => { - if (this.pendingCommand) { - reject(new Error('Another command is already pending')); - return; - } - this.pendingCommand = { resolve, reject, command: 'DATA_CONTENT' }; - // Set data timeout - const timeout = 60000; // 60 seconds for data - this.commandTimeout = setTimeout(() => { - this.pendingCommand = null; - this.commandTimeout = null; - reject(new Error('Data transmission timeout')); - }, timeout); - // Set up data handler - const dataHandler = (chunk) => { - this.handleIncomingData(chunk.toString()); - }; - connection.socket.on('data', dataHandler); - // Clean up function - const cleanup = () => { - connection.socket.removeListener('data', dataHandler); - if (this.commandTimeout) { - clearTimeout(this.commandTimeout); - this.commandTimeout = null; - } - }; - // Override resolve/reject to include cleanup - const originalResolve = resolve; - const originalReject = reject; - this.pendingCommand.resolve = (response) => { - cleanup(); - this.pendingCommand = null; - originalResolve(response); - }; - this.pendingCommand.reject = (error) => { - cleanup(); - this.pendingCommand = null; - originalReject(error); - }; - // Send data - connection.socket.write(data, (error) => { - if (error) { - cleanup(); - this.pendingCommand = null; - reject(error); - } - }); - }); - } - /** - * Wait for server greeting - */ - async waitForGreeting(connection) { - return new Promise((resolve, reject) => { - const timeout = 30000; // 30 seconds - let timeoutHandler; - const dataHandler = (data) => { - this.responseBuffer += data.toString(); - if (this.isCompleteResponse(this.responseBuffer)) { - clearTimeout(timeoutHandler); - connection.socket.removeListener('data', dataHandler); - const response = parseSmtpResponse(this.responseBuffer); - this.responseBuffer = ''; - if (isSuccessCode(response.code)) { - resolve(response); - } - else { - reject(new Error(`Server greeting failed: ${response.message}`)); - } - } - }; - timeoutHandler = setTimeout(() => { - connection.socket.removeListener('data', dataHandler); - reject(new Error('Greeting timeout')); - }, timeout); - connection.socket.on('data', dataHandler); - }); - } - handleIncomingData(data) { - if (!this.pendingCommand) { - return; - } - this.responseBuffer += data; - if (this.isCompleteResponse(this.responseBuffer)) { - const response = parseSmtpResponse(this.responseBuffer); - this.responseBuffer = ''; - if (isSuccessCode(response.code) || (response.code >= 300 && response.code < 400) || response.code >= 400) { - this.pendingCommand.resolve(response); - } - else { - this.pendingCommand.reject(new Error(`Command failed: ${response.message}`)); - } - } - } - isCompleteResponse(buffer) { - // Check if we have a complete response - const lines = buffer.split(/\r?\n/); - if (lines.length < 1) { - return false; - } - // Check the last non-empty line - for (let i = lines.length - 1; i >= 0; i--) { - const line = lines[i].trim(); - if (line.length > 0) { - // Response is complete if line starts with "XXX " (space after code) - return /^\d{3} /.test(line); - } - } - return false; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpclient/command-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/connection-manager.d.ts b/dist_ts/mail/delivery/smtpclient/connection-manager.d.ts deleted file mode 100644 index 45eb4af..0000000 --- a/dist_ts/mail/delivery/smtpclient/connection-manager.d.ts +++ /dev/null @@ -1,48 +0,0 @@ -/** - * SMTP Client Connection Manager - * Connection pooling and lifecycle management - */ -import { EventEmitter } from 'node:events'; -import type { ISmtpClientOptions, ISmtpConnection, IConnectionPoolStatus } from './interfaces.js'; -export declare class ConnectionManager extends EventEmitter { - private options; - private connections; - private pendingConnections; - private idleTimeout; - constructor(options: ISmtpClientOptions); - /** - * Get or create a connection - */ - getConnection(): Promise; - /** - * Create a new connection - */ - createConnection(): Promise; - /** - * Release a connection back to the pool or close it - */ - releaseConnection(connection: ISmtpConnection): void; - /** - * Close a specific connection - */ - closeConnection(connection: ISmtpConnection): void; - /** - * Close all connections - */ - closeAllConnections(): void; - /** - * Get connection pool status - */ - getPoolStatus(): IConnectionPoolStatus; - /** - * Update connection activity timestamp - */ - updateActivity(connection: ISmtpConnection): void; - private establishSocket; - private setupSocketHandlers; - private findIdleConnection; - private shouldReuseConnection; - private getActiveConnectionCount; - private getConnectionId; - private setupIdleCleanup; -} diff --git a/dist_ts/mail/delivery/smtpclient/connection-manager.js b/dist_ts/mail/delivery/smtpclient/connection-manager.js deleted file mode 100644 index e9dca6b..0000000 --- a/dist_ts/mail/delivery/smtpclient/connection-manager.js +++ /dev/null @@ -1,239 +0,0 @@ -/** - * SMTP Client Connection Manager - * Connection pooling and lifecycle management - */ -import * as net from 'node:net'; -import * as tls from 'node:tls'; -import { EventEmitter } from 'node:events'; -import { DEFAULTS, CONNECTION_STATES } from './constants.js'; -import { logConnection, logDebug } from './utils/logging.js'; -import { generateConnectionId } from './utils/helpers.js'; -export class ConnectionManager extends EventEmitter { - options; - connections = new Map(); - pendingConnections = new Set(); - idleTimeout = null; - constructor(options) { - super(); - this.options = options; - this.setupIdleCleanup(); - } - /** - * Get or create a connection - */ - async getConnection() { - // Try to reuse an idle connection if pooling is enabled - if (this.options.pool) { - const idleConnection = this.findIdleConnection(); - if (idleConnection) { - const connectionId = this.getConnectionId(idleConnection) || 'unknown'; - logDebug('Reusing idle connection', this.options, { connectionId }); - return idleConnection; - } - // Check if we can create a new connection - if (this.getActiveConnectionCount() >= (this.options.maxConnections || DEFAULTS.MAX_CONNECTIONS)) { - throw new Error('Maximum number of connections reached'); - } - } - return this.createConnection(); - } - /** - * Create a new connection - */ - async createConnection() { - const connectionId = generateConnectionId(); - try { - this.pendingConnections.add(connectionId); - logConnection('connecting', this.options, { connectionId }); - const socket = await this.establishSocket(); - const connection = { - socket, - state: CONNECTION_STATES.CONNECTED, - options: this.options, - secure: this.options.secure || false, - createdAt: new Date(), - lastActivity: new Date(), - messageCount: 0 - }; - this.setupSocketHandlers(socket, connectionId); - this.connections.set(connectionId, connection); - this.pendingConnections.delete(connectionId); - logConnection('connected', this.options, { connectionId }); - this.emit('connection', connection); - return connection; - } - catch (error) { - this.pendingConnections.delete(connectionId); - logConnection('error', this.options, { connectionId, error }); - throw error; - } - } - /** - * Release a connection back to the pool or close it - */ - releaseConnection(connection) { - const connectionId = this.getConnectionId(connection); - if (!connectionId || !this.connections.has(connectionId)) { - return; - } - if (this.options.pool && this.shouldReuseConnection(connection)) { - // Return to pool - connection.state = CONNECTION_STATES.READY; - connection.lastActivity = new Date(); - logDebug('Connection returned to pool', this.options, { connectionId }); - } - else { - // Close connection - this.closeConnection(connection); - } - } - /** - * Close a specific connection - */ - closeConnection(connection) { - const connectionId = this.getConnectionId(connection); - if (connectionId) { - this.connections.delete(connectionId); - } - connection.state = CONNECTION_STATES.CLOSING; - try { - if (!connection.socket.destroyed) { - connection.socket.destroy(); - } - } - catch (error) { - logDebug('Error closing connection', this.options, { error }); - } - logConnection('disconnected', this.options, { connectionId }); - this.emit('disconnect', connection); - } - /** - * Close all connections - */ - closeAllConnections() { - logDebug('Closing all connections', this.options); - for (const connection of this.connections.values()) { - this.closeConnection(connection); - } - this.connections.clear(); - this.pendingConnections.clear(); - if (this.idleTimeout) { - clearInterval(this.idleTimeout); - this.idleTimeout = null; - } - } - /** - * Get connection pool status - */ - getPoolStatus() { - const total = this.connections.size; - const active = Array.from(this.connections.values()) - .filter(conn => conn.state === CONNECTION_STATES.BUSY).length; - const idle = total - active; - const pending = this.pendingConnections.size; - return { total, active, idle, pending }; - } - /** - * Update connection activity timestamp - */ - updateActivity(connection) { - connection.lastActivity = new Date(); - } - async establishSocket() { - return new Promise((resolve, reject) => { - const timeout = this.options.connectionTimeout || DEFAULTS.CONNECTION_TIMEOUT; - let socket; - if (this.options.secure) { - // Direct TLS connection - socket = tls.connect({ - host: this.options.host, - port: this.options.port, - ...this.options.tls - }); - } - else { - // Plain connection - socket = new net.Socket(); - socket.connect(this.options.port, this.options.host); - } - const timeoutHandler = setTimeout(() => { - socket.destroy(); - reject(new Error(`Connection timeout after ${timeout}ms`)); - }, timeout); - // For TLS connections, we need to wait for 'secureConnect' instead of 'connect' - const successEvent = this.options.secure ? 'secureConnect' : 'connect'; - socket.once(successEvent, () => { - clearTimeout(timeoutHandler); - resolve(socket); - }); - socket.once('error', (error) => { - clearTimeout(timeoutHandler); - reject(error); - }); - }); - } - setupSocketHandlers(socket, connectionId) { - const socketTimeout = this.options.socketTimeout || DEFAULTS.SOCKET_TIMEOUT; - socket.setTimeout(socketTimeout); - socket.on('timeout', () => { - logDebug('Socket timeout', this.options, { connectionId }); - socket.destroy(); - }); - socket.on('error', (error) => { - logConnection('error', this.options, { connectionId, error }); - this.connections.delete(connectionId); - }); - socket.on('close', () => { - this.connections.delete(connectionId); - logDebug('Socket closed', this.options, { connectionId }); - }); - } - findIdleConnection() { - for (const connection of this.connections.values()) { - if (connection.state === CONNECTION_STATES.READY) { - return connection; - } - } - return null; - } - shouldReuseConnection(connection) { - const maxMessages = this.options.maxMessages || DEFAULTS.MAX_MESSAGES; - const maxAge = 300000; // 5 minutes - const age = Date.now() - connection.createdAt.getTime(); - return connection.messageCount < maxMessages && - age < maxAge && - !connection.socket.destroyed; - } - getActiveConnectionCount() { - return this.connections.size + this.pendingConnections.size; - } - getConnectionId(connection) { - for (const [id, conn] of this.connections.entries()) { - if (conn === connection) { - return id; - } - } - return null; - } - setupIdleCleanup() { - if (!this.options.pool) { - return; - } - const cleanupInterval = DEFAULTS.POOL_IDLE_TIMEOUT; - this.idleTimeout = setInterval(() => { - const now = Date.now(); - const connectionsToClose = []; - for (const connection of this.connections.values()) { - const idleTime = now - connection.lastActivity.getTime(); - if (connection.state === CONNECTION_STATES.READY && idleTime > cleanupInterval) { - connectionsToClose.push(connection); - } - } - for (const connection of connectionsToClose) { - logDebug('Closing idle connection', this.options); - this.closeConnection(connection); - } - }, cleanupInterval); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpclient/connection-manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/constants.d.ts b/dist_ts/mail/delivery/smtpclient/constants.d.ts deleted file mode 100644 index a55bc19..0000000 --- a/dist_ts/mail/delivery/smtpclient/constants.d.ts +++ /dev/null @@ -1,129 +0,0 @@ -/** - * SMTP Client Constants and Error Codes - * All constants, error codes, and enums for SMTP client operations - */ -/** - * SMTP response codes - */ -export declare const SMTP_CODES: { - readonly SERVICE_READY: 220; - readonly SERVICE_CLOSING: 221; - readonly AUTHENTICATION_SUCCESSFUL: 235; - readonly REQUESTED_ACTION_OK: 250; - readonly USER_NOT_LOCAL: 251; - readonly CANNOT_VERIFY_USER: 252; - readonly START_MAIL_INPUT: 354; - readonly SERVICE_NOT_AVAILABLE: 421; - readonly MAILBOX_BUSY: 450; - readonly LOCAL_ERROR: 451; - readonly INSUFFICIENT_STORAGE: 452; - readonly UNABLE_TO_ACCOMMODATE: 455; - readonly SYNTAX_ERROR: 500; - readonly SYNTAX_ERROR_PARAMETERS: 501; - readonly COMMAND_NOT_IMPLEMENTED: 502; - readonly BAD_SEQUENCE: 503; - readonly PARAMETER_NOT_IMPLEMENTED: 504; - readonly MAILBOX_UNAVAILABLE: 550; - readonly USER_NOT_LOCAL_TRY_FORWARD: 551; - readonly EXCEEDED_STORAGE: 552; - readonly MAILBOX_NAME_NOT_ALLOWED: 553; - readonly TRANSACTION_FAILED: 554; -}; -/** - * SMTP command names - */ -export declare const SMTP_COMMANDS: { - readonly HELO: "HELO"; - readonly EHLO: "EHLO"; - readonly MAIL_FROM: "MAIL FROM"; - readonly RCPT_TO: "RCPT TO"; - readonly DATA: "DATA"; - readonly RSET: "RSET"; - readonly NOOP: "NOOP"; - readonly QUIT: "QUIT"; - readonly STARTTLS: "STARTTLS"; - readonly AUTH: "AUTH"; -}; -/** - * Authentication methods - */ -export declare const AUTH_METHODS: { - readonly PLAIN: "PLAIN"; - readonly LOGIN: "LOGIN"; - readonly OAUTH2: "XOAUTH2"; - readonly CRAM_MD5: "CRAM-MD5"; -}; -/** - * Common SMTP extensions - */ -export declare const SMTP_EXTENSIONS: { - readonly PIPELINING: "PIPELINING"; - readonly SIZE: "SIZE"; - readonly STARTTLS: "STARTTLS"; - readonly AUTH: "AUTH"; - readonly EIGHT_BIT_MIME: "8BITMIME"; - readonly CHUNKING: "CHUNKING"; - readonly ENHANCED_STATUS_CODES: "ENHANCEDSTATUSCODES"; - readonly DSN: "DSN"; -}; -/** - * Default configuration values - */ -export declare const DEFAULTS: { - readonly CONNECTION_TIMEOUT: 60000; - readonly SOCKET_TIMEOUT: 300000; - readonly COMMAND_TIMEOUT: 30000; - readonly MAX_CONNECTIONS: 5; - readonly MAX_MESSAGES: 100; - readonly PORT_SMTP: 25; - readonly PORT_SUBMISSION: 587; - readonly PORT_SMTPS: 465; - readonly RETRY_ATTEMPTS: 3; - readonly RETRY_DELAY: 1000; - readonly POOL_IDLE_TIMEOUT: 30000; -}; -/** - * Error types for classification - */ -export declare enum SmtpErrorType { - CONNECTION_ERROR = "CONNECTION_ERROR", - AUTHENTICATION_ERROR = "AUTHENTICATION_ERROR", - PROTOCOL_ERROR = "PROTOCOL_ERROR", - TIMEOUT_ERROR = "TIMEOUT_ERROR", - TLS_ERROR = "TLS_ERROR", - SYNTAX_ERROR = "SYNTAX_ERROR", - MAILBOX_ERROR = "MAILBOX_ERROR", - QUOTA_ERROR = "QUOTA_ERROR", - UNKNOWN_ERROR = "UNKNOWN_ERROR" -} -/** - * Regular expressions for parsing - */ -export declare const REGEX_PATTERNS: { - readonly EMAIL_ADDRESS: RegExp; - readonly RESPONSE_CODE: RegExp; - readonly ENHANCED_STATUS: RegExp; - readonly AUTH_CAPABILITIES: RegExp; - readonly SIZE_EXTENSION: RegExp; -}; -/** - * Line endings and separators - */ -export declare const LINE_ENDINGS: { - readonly CRLF: "\r\n"; - readonly LF: "\n"; - readonly CR: "\r"; -}; -/** - * Connection states for internal use - */ -export declare const CONNECTION_STATES: { - readonly DISCONNECTED: "disconnected"; - readonly CONNECTING: "connecting"; - readonly CONNECTED: "connected"; - readonly AUTHENTICATED: "authenticated"; - readonly READY: "ready"; - readonly BUSY: "busy"; - readonly CLOSING: "closing"; - readonly ERROR: "error"; -}; diff --git a/dist_ts/mail/delivery/smtpclient/constants.js b/dist_ts/mail/delivery/smtpclient/constants.js deleted file mode 100644 index 9caab70..0000000 --- a/dist_ts/mail/delivery/smtpclient/constants.js +++ /dev/null @@ -1,135 +0,0 @@ -/** - * SMTP Client Constants and Error Codes - * All constants, error codes, and enums for SMTP client operations - */ -/** - * SMTP response codes - */ -export const SMTP_CODES = { - // Positive completion replies - SERVICE_READY: 220, - SERVICE_CLOSING: 221, - AUTHENTICATION_SUCCESSFUL: 235, - REQUESTED_ACTION_OK: 250, - USER_NOT_LOCAL: 251, - CANNOT_VERIFY_USER: 252, - // Positive intermediate replies - START_MAIL_INPUT: 354, - // Transient negative completion replies - SERVICE_NOT_AVAILABLE: 421, - MAILBOX_BUSY: 450, - LOCAL_ERROR: 451, - INSUFFICIENT_STORAGE: 452, - UNABLE_TO_ACCOMMODATE: 455, - // Permanent negative completion replies - SYNTAX_ERROR: 500, - SYNTAX_ERROR_PARAMETERS: 501, - COMMAND_NOT_IMPLEMENTED: 502, - BAD_SEQUENCE: 503, - PARAMETER_NOT_IMPLEMENTED: 504, - MAILBOX_UNAVAILABLE: 550, - USER_NOT_LOCAL_TRY_FORWARD: 551, - EXCEEDED_STORAGE: 552, - MAILBOX_NAME_NOT_ALLOWED: 553, - TRANSACTION_FAILED: 554 -}; -/** - * SMTP command names - */ -export const SMTP_COMMANDS = { - HELO: 'HELO', - EHLO: 'EHLO', - MAIL_FROM: 'MAIL FROM', - RCPT_TO: 'RCPT TO', - DATA: 'DATA', - RSET: 'RSET', - NOOP: 'NOOP', - QUIT: 'QUIT', - STARTTLS: 'STARTTLS', - AUTH: 'AUTH' -}; -/** - * Authentication methods - */ -export const AUTH_METHODS = { - PLAIN: 'PLAIN', - LOGIN: 'LOGIN', - OAUTH2: 'XOAUTH2', - CRAM_MD5: 'CRAM-MD5' -}; -/** - * Common SMTP extensions - */ -export const SMTP_EXTENSIONS = { - PIPELINING: 'PIPELINING', - SIZE: 'SIZE', - STARTTLS: 'STARTTLS', - AUTH: 'AUTH', - EIGHT_BIT_MIME: '8BITMIME', - CHUNKING: 'CHUNKING', - ENHANCED_STATUS_CODES: 'ENHANCEDSTATUSCODES', - DSN: 'DSN' -}; -/** - * Default configuration values - */ -export const DEFAULTS = { - CONNECTION_TIMEOUT: 60000, // 60 seconds - SOCKET_TIMEOUT: 300000, // 5 minutes - COMMAND_TIMEOUT: 30000, // 30 seconds - MAX_CONNECTIONS: 5, - MAX_MESSAGES: 100, - PORT_SMTP: 25, - PORT_SUBMISSION: 587, - PORT_SMTPS: 465, - RETRY_ATTEMPTS: 3, - RETRY_DELAY: 1000, - POOL_IDLE_TIMEOUT: 30000 // 30 seconds -}; -/** - * Error types for classification - */ -export var SmtpErrorType; -(function (SmtpErrorType) { - SmtpErrorType["CONNECTION_ERROR"] = "CONNECTION_ERROR"; - SmtpErrorType["AUTHENTICATION_ERROR"] = "AUTHENTICATION_ERROR"; - SmtpErrorType["PROTOCOL_ERROR"] = "PROTOCOL_ERROR"; - SmtpErrorType["TIMEOUT_ERROR"] = "TIMEOUT_ERROR"; - SmtpErrorType["TLS_ERROR"] = "TLS_ERROR"; - SmtpErrorType["SYNTAX_ERROR"] = "SYNTAX_ERROR"; - SmtpErrorType["MAILBOX_ERROR"] = "MAILBOX_ERROR"; - SmtpErrorType["QUOTA_ERROR"] = "QUOTA_ERROR"; - SmtpErrorType["UNKNOWN_ERROR"] = "UNKNOWN_ERROR"; -})(SmtpErrorType || (SmtpErrorType = {})); -/** - * Regular expressions for parsing - */ -export const REGEX_PATTERNS = { - EMAIL_ADDRESS: /^[^\s@]+@[^\s@]+\.[^\s@]+$/, - RESPONSE_CODE: /^(\d{3})([ -])(.*)/, - ENHANCED_STATUS: /^(\d\.\d\.\d)\s/, - AUTH_CAPABILITIES: /AUTH\s+(.+)/i, - SIZE_EXTENSION: /SIZE\s+(\d+)/i -}; -/** - * Line endings and separators - */ -export const LINE_ENDINGS = { - CRLF: '\r\n', - LF: '\n', - CR: '\r' -}; -/** - * Connection states for internal use - */ -export const CONNECTION_STATES = { - DISCONNECTED: 'disconnected', - CONNECTING: 'connecting', - CONNECTED: 'connected', - AUTHENTICATED: 'authenticated', - READY: 'ready', - BUSY: 'busy', - CLOSING: 'closing', - ERROR: 'error' -}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vdHMvbWFpbC9kZWxpdmVyeS9zbXRwY2xpZW50L2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7O0dBR0c7QUFFSDs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRztJQUN4Qiw4QkFBOEI7SUFDOUIsYUFBYSxFQUFFLEdBQUc7SUFDbEIsZUFBZSxFQUFFLEdBQUc7SUFDcEIseUJBQXlCLEVBQUUsR0FBRztJQUM5QixtQkFBbUIsRUFBRSxHQUFHO0lBQ3hCLGNBQWMsRUFBRSxHQUFHO0lBQ25CLGtCQUFrQixFQUFFLEdBQUc7SUFFdkIsZ0NBQWdDO0lBQ2hDLGdCQUFnQixFQUFFLEdBQUc7SUFFckIsd0NBQXdDO0lBQ3hDLHFCQUFxQixFQUFFLEdBQUc7SUFDMUIsWUFBWSxFQUFFLEdBQUc7SUFDakIsV0FBVyxFQUFFLEdBQUc7SUFDaEIsb0JBQW9CLEVBQUUsR0FBRztJQUN6QixxQkFBcUIsRUFBRSxHQUFHO0lBRTFCLHdDQUF3QztJQUN4QyxZQUFZLEVBQUUsR0FBRztJQUNqQix1QkFBdUIsRUFBRSxHQUFHO0lBQzVCLHVCQUF1QixFQUFFLEdBQUc7SUFDNUIsWUFBWSxFQUFFLEdBQUc7SUFDakIseUJBQXlCLEVBQUUsR0FBRztJQUM5QixtQkFBbUIsRUFBRSxHQUFHO0lBQ3hCLDBCQUEwQixFQUFFLEdBQUc7SUFDL0IsZ0JBQWdCLEVBQUUsR0FBRztJQUNyQix3QkFBd0IsRUFBRSxHQUFHO0lBQzdCLGtCQUFrQixFQUFFLEdBQUc7Q0FDZixDQUFDO0FBRVg7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUc7SUFDM0IsSUFBSSxFQUFFLE1BQU07SUFDWixJQUFJLEVBQUUsTUFBTTtJQUNaLFNBQVMsRUFBRSxXQUFXO0lBQ3RCLE9BQU8sRUFBRSxTQUFTO0lBQ2xCLElBQUksRUFBRSxNQUFNO0lBQ1osSUFB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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/create-client.d.ts b/dist_ts/mail/delivery/smtpclient/create-client.d.ts deleted file mode 100644 index 3f6f87d..0000000 --- a/dist_ts/mail/delivery/smtpclient/create-client.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * SMTP Client Factory - * Factory function for client creation and dependency injection - */ -import { SmtpClient } from './smtp-client.js'; -import type { ISmtpClientOptions } from './interfaces.js'; -/** - * Create a complete SMTP client with all components - */ -export declare function createSmtpClient(options: ISmtpClientOptions): SmtpClient; -/** - * Create SMTP client with connection pooling enabled - */ -export declare function createPooledSmtpClient(options: ISmtpClientOptions): SmtpClient; -/** - * Create SMTP client for high-volume sending - */ -export declare function createBulkSmtpClient(options: ISmtpClientOptions): SmtpClient; -/** - * Create SMTP client for transactional emails - */ -export declare function createTransactionalSmtpClient(options: ISmtpClientOptions): SmtpClient; diff --git a/dist_ts/mail/delivery/smtpclient/create-client.js b/dist_ts/mail/delivery/smtpclient/create-client.js deleted file mode 100644 index 46b60f3..0000000 --- a/dist_ts/mail/delivery/smtpclient/create-client.js +++ /dev/null @@ -1,86 +0,0 @@ -/** - * SMTP Client Factory - * Factory function for client creation and dependency injection - */ -import { SmtpClient } from './smtp-client.js'; -import { ConnectionManager } from './connection-manager.js'; -import { CommandHandler } from './command-handler.js'; -import { AuthHandler } from './auth-handler.js'; -import { TlsHandler } from './tls-handler.js'; -import { SmtpErrorHandler } from './error-handler.js'; -import { validateClientOptions } from './utils/validation.js'; -import { DEFAULTS } from './constants.js'; -/** - * Create a complete SMTP client with all components - */ -export function createSmtpClient(options) { - // Validate options - const errors = validateClientOptions(options); - if (errors.length > 0) { - throw new Error(`Invalid client options: ${errors.join(', ')}`); - } - // Apply defaults - const clientOptions = { - connectionTimeout: DEFAULTS.CONNECTION_TIMEOUT, - socketTimeout: DEFAULTS.SOCKET_TIMEOUT, - maxConnections: DEFAULTS.MAX_CONNECTIONS, - maxMessages: DEFAULTS.MAX_MESSAGES, - pool: false, - secure: false, - debug: false, - ...options - }; - // Create handlers - const errorHandler = new SmtpErrorHandler(clientOptions); - const connectionManager = new ConnectionManager(clientOptions); - const commandHandler = new CommandHandler(clientOptions); - const authHandler = new AuthHandler(clientOptions, commandHandler); - const tlsHandler = new TlsHandler(clientOptions, commandHandler); - // Create and return SMTP client - return new SmtpClient({ - options: clientOptions, - connectionManager, - commandHandler, - authHandler, - tlsHandler, - errorHandler - }); -} -/** - * Create SMTP client with connection pooling enabled - */ -export function createPooledSmtpClient(options) { - return createSmtpClient({ - ...options, - pool: true, - maxConnections: options.maxConnections || DEFAULTS.MAX_CONNECTIONS, - maxMessages: options.maxMessages || DEFAULTS.MAX_MESSAGES - }); -} -/** - * Create SMTP client for high-volume sending - */ -export function createBulkSmtpClient(options) { - return createSmtpClient({ - ...options, - pool: true, - maxConnections: Math.max(options.maxConnections || 10, 10), - maxMessages: Math.max(options.maxMessages || 1000, 1000), - connectionTimeout: options.connectionTimeout || 30000, - socketTimeout: options.socketTimeout || 120000 - }); -} -/** - * Create SMTP client for transactional emails - */ -export function createTransactionalSmtpClient(options) { - return createSmtpClient({ - ...options, - pool: false, // Use fresh connections for transactional emails - maxConnections: 1, - maxMessages: 1, - connectionTimeout: options.connectionTimeout || 10000, - socketTimeout: options.socketTimeout || 30000 - }); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlLWNsaWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC9jcmVhdGUtY2xpZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUM5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUV0RCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFMUM7O0dBRUc7QUFDSCxNQUFNLFVBQVUsZ0JBQWdCLENBQUMsT0FBMkI7SUFDMUQsbUJBQW1CO0lBQ25CLE1BQU0sTUFBTSxHQUFHLHFCQUFxQixDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzlDLElBQUksTUFBTSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUN0QixNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRUQsaUJBQWlCO0lBQ2pCLE1BQU0sYUFBYSxHQUF1QjtRQUN4QyxpQkFBaUIsRUFBRSxRQUFRLENBQUMsa0JBQWtCO1FBQzlDLGFBQWEsRUFBRSxRQUFRLENBQUMsY0FBYztRQUN0QyxjQUFjLEVBQUUsUUFBUSxDQUFDLGVBQWU7UUFDeEMsV0FBVyxFQUFFLFFBQVEsQ0FBQyxZQUFZO1FBQ2xDLElBQUksRUFBRSxLQUFLO1FBQ1gsTUFBTSxFQUFFLEtBQUs7UUFDYixLQUFLLEVBQUUsS0FBSztRQUNaLEdBQUcsT0FBTztLQUNYLENBQUM7SUFFRixrQkFBa0I7SUFDbEIsTUFBTSxZQUFZLEdBQUcsSUFBSSxnQkFBZ0IsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN6RCxNQUFNLGlCQUFpQixHQUFHLElBQUksaUJBQWlCLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDL0QsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDekQsTUFBTSxXQUFXLEdBQUcsSUFBSSxXQUFXLENBQUMsYUFBYSxFQUFFLGNBQWMsQ0FBQyxDQUFDO0lBQ25FLE1BQU0sVUFBVSxHQUFHLElBQUksVUFBVSxDQUFDLGFBQWEsRUFBRSxjQUFjLENBQUMsQ0FBQztJQUVqRSxnQ0FBZ0M7SUFDaEMsT0FBTyxJQUFJLFVBQVUsQ0FBQztRQUNwQixPQUFPLEVBQUUsYUFBYTtRQUN0QixpQkFBaUI7UUFDakIsY0FBYztRQUNkLFdBQVc7UUFDWCxVQUFVO1FBQ1YsWUFBWTtLQUNiLENBQUMsQ0FBQztBQUNMLENBQUM7QUFFRDs7R0FFRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxPQUEyQjtJQUNoRSxPQUFPLGdCQUFnQixDQUFDO1FBQ3RCLEdBQUcsT0FBTztRQUNWLElBQUksRUFBRSxJQUFJO1FBQ1YsY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjLElBQUksUUFBUSxDQUFDLGVBQWU7UUFDbEUsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXLElBQUksUUFBUSxDQUFDLFlBQVk7S0FDMUQsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLG9CQUFvQixDQUFDLE9BQTJCO0lBQzlELE9BQU8sZ0JBQWdCLENBQUM7UUFDdEIsR0FBRyxPQUFPO1FBQ1YsSUFBSSxFQUFFLElBQUk7UUFDVixjQUFjLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsY0FBYyxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFDMUQsV0FBVyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFdBQVcsSUFBSSxJQUFJLEVBQUUsSUFBSSxDQUFDO1FBQ3hELGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsSUFBSSxLQUFLO1FBQ3JELGFBQWEsRUFBRSxPQUFPLENBQUMsYUFBYSxJQUFJLE1BQU07S0FDL0MsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLDZCQUE2QixDQUFDLE9BQTJCO0lBQ3ZFLE9BQU8sZ0JBQWdCLENBQUM7UUFDdEIsR0FBRyxPQUFPO1FBQ1YsSUFBSSxFQUFFLEtBQUssRUFBRSxpREFBaUQ7UUFDOUQsY0FBYyxFQUFFLENBQUM7UUFDakIsV0FBVyxFQUFFLENBQUM7UUFDZCxpQkFBaUIsRUFBRSxPQUFPLENBQUMsaUJBQWlCLElBQUksS0FBSztRQUNyRCxhQUFhLEVBQUUsT0FBTyxDQUFDLGFBQWEsSUFBSSxLQUFLO0tBQzlDLENBQUMsQ0FBQztBQUNMLENBQUMifQ== \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/error-handler.d.ts b/dist_ts/mail/delivery/smtpclient/error-handler.d.ts deleted file mode 100644 index 91ad403..0000000 --- a/dist_ts/mail/delivery/smtpclient/error-handler.d.ts +++ /dev/null @@ -1,28 +0,0 @@ -/** - * SMTP Client Error Handler - * Error classification and recovery strategies - */ -import { SmtpErrorType } from './constants.js'; -import type { ISmtpResponse, ISmtpErrorContext, ISmtpClientOptions } from './interfaces.js'; -export declare class SmtpErrorHandler { - private options; - constructor(options: ISmtpClientOptions); - /** - * Classify error type based on response or error - */ - classifyError(error: Error | ISmtpResponse, context?: ISmtpErrorContext): SmtpErrorType; - /** - * Determine if error is retryable - */ - isRetryable(errorType: SmtpErrorType, response?: ISmtpResponse): boolean; - /** - * Get retry delay for error type - */ - getRetryDelay(attempt: number, errorType: SmtpErrorType): number; - /** - * Create enhanced error with context - */ - createError(message: string, errorType: SmtpErrorType, context?: ISmtpErrorContext, originalError?: Error): Error; - private classifyErrorByMessage; - private classifyErrorByCode; -} diff --git a/dist_ts/mail/delivery/smtpclient/error-handler.js b/dist_ts/mail/delivery/smtpclient/error-handler.js deleted file mode 100644 index e961fcf..0000000 --- a/dist_ts/mail/delivery/smtpclient/error-handler.js +++ /dev/null @@ -1,111 +0,0 @@ -/** - * SMTP Client Error Handler - * Error classification and recovery strategies - */ -import { SmtpErrorType } from './constants.js'; -import { logDebug } from './utils/logging.js'; -export class SmtpErrorHandler { - options; - constructor(options) { - this.options = options; - } - /** - * Classify error type based on response or error - */ - classifyError(error, context) { - logDebug('Classifying error', this.options, { errorMessage: error instanceof Error ? error.message : String(error), context }); - // Handle Error objects - if (error instanceof Error) { - return this.classifyErrorByMessage(error); - } - // Handle SMTP response codes - if (typeof error === 'object' && 'code' in error) { - return this.classifyErrorByCode(error.code); - } - return SmtpErrorType.UNKNOWN_ERROR; - } - /** - * Determine if error is retryable - */ - isRetryable(errorType, response) { - switch (errorType) { - case SmtpErrorType.CONNECTION_ERROR: - case SmtpErrorType.TIMEOUT_ERROR: - return true; - case SmtpErrorType.PROTOCOL_ERROR: - // Only retry on temporary failures (4xx codes) - return response ? response.code >= 400 && response.code < 500 : false; - case SmtpErrorType.AUTHENTICATION_ERROR: - case SmtpErrorType.TLS_ERROR: - case SmtpErrorType.SYNTAX_ERROR: - case SmtpErrorType.MAILBOX_ERROR: - case SmtpErrorType.QUOTA_ERROR: - return false; - default: - return false; - } - } - /** - * Get retry delay for error type - */ - getRetryDelay(attempt, errorType) { - const baseDelay = 1000; // 1 second - const maxDelay = 30000; // 30 seconds - // Exponential backoff with jitter - const delay = Math.min(baseDelay * Math.pow(2, attempt - 1), maxDelay); - const jitter = Math.random() * 0.1 * delay; // 10% jitter - return Math.floor(delay + jitter); - } - /** - * Create enhanced error with context - */ - createError(message, errorType, context, originalError) { - const error = new Error(message); - error.type = errorType; - error.context = context; - error.originalError = originalError; - return error; - } - classifyErrorByMessage(error) { - const message = error.message.toLowerCase(); - if (message.includes('timeout') || message.includes('etimedout')) { - return SmtpErrorType.TIMEOUT_ERROR; - } - if (message.includes('connect') || message.includes('econnrefused') || - message.includes('enotfound') || message.includes('enetunreach')) { - return SmtpErrorType.CONNECTION_ERROR; - } - if (message.includes('tls') || message.includes('ssl') || - message.includes('certificate') || message.includes('handshake')) { - return SmtpErrorType.TLS_ERROR; - } - if (message.includes('auth')) { - return SmtpErrorType.AUTHENTICATION_ERROR; - } - return SmtpErrorType.UNKNOWN_ERROR; - } - classifyErrorByCode(code) { - if (code >= 500) { - // Permanent failures - if (code === 550 || code === 551 || code === 553) { - return SmtpErrorType.MAILBOX_ERROR; - } - if (code === 552) { - return SmtpErrorType.QUOTA_ERROR; - } - if (code === 500 || code === 501 || code === 502 || code === 504) { - return SmtpErrorType.SYNTAX_ERROR; - } - return SmtpErrorType.PROTOCOL_ERROR; - } - if (code >= 400) { - // Temporary failures - if (code === 450 || code === 451 || code === 452) { - return SmtpErrorType.QUOTA_ERROR; - } - return SmtpErrorType.PROTOCOL_ERROR; - } - return SmtpErrorType.UNKNOWN_ERROR; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3ItaGFuZGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC9lcnJvci1oYW5kbGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUUvQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFOUMsTUFBTSxPQUFPLGdCQUFnQjtJQUNuQixPQUFPLENBQXFCO0lBRXBDLFlBQVksT0FBMkI7UUFDckMsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDekIsQ0FBQztJQUVEOztPQUVHO0lBQ0ksYUFBYSxDQUFDLEtBQTRCLEVBQUUsT0FBMkI7UUFDNUUsUUFBUSxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxZQUFZLEVBQUUsS0FBSyxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7UUFFL0gsdUJBQXVCO1FBQ3ZCLElBQUksS0FBSyxZQUFZLEtBQUssRUFBRSxDQUFDO1lBQzNCLE9BQU8sSUFBSSxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVDLENBQUM7UUFFRCw2QkFBNkI7UUFDN0IsSUFBSSxPQUFPLEtBQUssS0FBSyxRQUFRLElBQUksTUFBTSxJQUFJLEtBQUssRUFBRSxDQUFDO1lBQ2pELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBRUQsT0FBTyxhQUFhLENBQUMsYUFBYSxDQUFDO0lBQ3JDLENBQUM7SUFFRDs7T0FFRztJQUNJLFdBQVcsQ0FBQyxTQUF3QixFQUFFLFFBQXdCO1FBQ25F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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/index.d.ts b/dist_ts/mail/delivery/smtpclient/index.d.ts deleted file mode 100644 index e582807..0000000 --- a/dist_ts/mail/delivery/smtpclient/index.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * SMTP Client Module Exports - * Modular SMTP client implementation for robust email delivery - */ -export * from './smtp-client.js'; -export * from './create-client.js'; -export * from './connection-manager.js'; -export * from './command-handler.js'; -export * from './auth-handler.js'; -export * from './tls-handler.js'; -export * from './error-handler.js'; -export * from './interfaces.js'; -export * from './constants.js'; -export * from './utils/validation.js'; -export * from './utils/logging.js'; -export * from './utils/helpers.js'; diff --git a/dist_ts/mail/delivery/smtpclient/index.js b/dist_ts/mail/delivery/smtpclient/index.js deleted file mode 100644 index 9d61526..0000000 --- a/dist_ts/mail/delivery/smtpclient/index.js +++ /dev/null @@ -1,21 +0,0 @@ -/** - * SMTP Client Module Exports - * Modular SMTP client implementation for robust email delivery - */ -// Main client class and factory -export * from './smtp-client.js'; -export * from './create-client.js'; -// Core handlers -export * from './connection-manager.js'; -export * from './command-handler.js'; -export * from './auth-handler.js'; -export * from './tls-handler.js'; -export * from './error-handler.js'; -// Interfaces and types -export * from './interfaces.js'; -export * from './constants.js'; -// Utilities -export * from './utils/validation.js'; -export * from './utils/logging.js'; -export * from './utils/helpers.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi90cy9tYWlsL2RlbGl2ZXJ5L3NtdHBjbGllbnQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7OztHQUdHO0FBRUgsZ0NBQWdDO0FBQ2hDLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxvQkFBb0IsQ0FBQztBQUVuQyxnQkFBZ0I7QUFDaEIsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHNCQUFzQixDQUFDO0FBQ3JDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLG9CQUFvQixDQUFDO0FBRW5DLHVCQUF1QjtBQUN2QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZ0JBQWdCLENBQUM7QUFFL0IsWUFBWTtBQUNaLGNBQWMsdUJBQXVCLENBQUM7QUFDdEMsY0FBYyxvQkFBb0IsQ0FBQztBQUNuQyxjQUFjLG9CQUFvQixDQUFDIn0= \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/interfaces.d.ts b/dist_ts/mail/delivery/smtpclient/interfaces.d.ts deleted file mode 100644 index a1fbf84..0000000 --- a/dist_ts/mail/delivery/smtpclient/interfaces.d.ts +++ /dev/null @@ -1,183 +0,0 @@ -/** - * SMTP Client Interfaces and Types - * All interface definitions for the modular SMTP client - */ -import type * as tls from 'node:tls'; -import type * as net from 'node:net'; -/** - * SMTP client connection options - */ -export interface ISmtpClientOptions { - /** Hostname of the SMTP server */ - host: string; - /** Port to connect to */ - port: number; - /** Whether to use TLS for the connection */ - secure?: boolean; - /** Connection timeout in milliseconds */ - connectionTimeout?: number; - /** Socket timeout in milliseconds */ - socketTimeout?: number; - /** Domain name for EHLO command */ - domain?: string; - /** Authentication options */ - auth?: ISmtpAuthOptions; - /** TLS options */ - tls?: tls.ConnectionOptions; - /** Maximum number of connections in pool */ - pool?: boolean; - maxConnections?: number; - maxMessages?: number; - /** Enable debug logging */ - debug?: boolean; - /** Proxy settings */ - proxy?: string; -} -/** - * Authentication options for SMTP - */ -export interface ISmtpAuthOptions { - /** Username */ - user?: string; - /** Password */ - pass?: string; - /** OAuth2 settings */ - oauth2?: IOAuth2Options; - /** Authentication method preference */ - method?: 'PLAIN' | 'LOGIN' | 'OAUTH2' | 'AUTO'; -} -/** - * OAuth2 authentication options - */ -export interface IOAuth2Options { - /** OAuth2 user identifier */ - user: string; - /** OAuth2 client ID */ - clientId: string; - /** OAuth2 client secret */ - clientSecret: string; - /** OAuth2 refresh token */ - refreshToken: string; - /** OAuth2 access token */ - accessToken?: string; - /** Token expiry time */ - expires?: number; -} -/** - * Result of an email send operation - */ -export interface ISmtpSendResult { - /** Whether the send was successful */ - success: boolean; - /** Message ID from server */ - messageId?: string; - /** List of accepted recipients */ - acceptedRecipients: string[]; - /** List of rejected recipients */ - rejectedRecipients: string[]; - /** Error information if failed */ - error?: Error; - /** Server response */ - response?: string; - /** Envelope information */ - envelope?: ISmtpEnvelope; -} -/** - * SMTP envelope information - */ -export interface ISmtpEnvelope { - /** Sender address */ - from: string; - /** Recipient addresses */ - to: string[]; -} -/** - * Connection pool status - */ -export interface IConnectionPoolStatus { - /** Total connections in pool */ - total: number; - /** Active connections */ - active: number; - /** Idle connections */ - idle: number; - /** Pending connection requests */ - pending: number; -} -/** - * SMTP command response - */ -export interface ISmtpResponse { - /** Response code */ - code: number; - /** Response message */ - message: string; - /** Enhanced status code */ - enhancedCode?: string; - /** Raw response */ - raw: string; -} -/** - * Connection state - */ -export declare enum ConnectionState { - DISCONNECTED = "disconnected", - CONNECTING = "connecting", - CONNECTED = "connected", - AUTHENTICATED = "authenticated", - READY = "ready", - BUSY = "busy", - CLOSING = "closing", - ERROR = "error" -} -/** - * SMTP capabilities - */ -export interface ISmtpCapabilities { - /** Supported extensions */ - extensions: Set; - /** Maximum message size */ - maxSize?: number; - /** Supported authentication methods */ - authMethods: Set; - /** Support for pipelining */ - pipelining: boolean; - /** Support for STARTTLS */ - starttls: boolean; - /** Support for 8BITMIME */ - eightBitMime: boolean; -} -/** - * Internal connection interface - */ -export interface ISmtpConnection { - /** Socket connection */ - socket: net.Socket | tls.TLSSocket; - /** Connection state */ - state: ConnectionState; - /** Server capabilities */ - capabilities?: ISmtpCapabilities; - /** Connection options */ - options: ISmtpClientOptions; - /** Whether connection is secure */ - secure: boolean; - /** Connection creation time */ - createdAt: Date; - /** Last activity time */ - lastActivity: Date; - /** Number of messages sent */ - messageCount: number; -} -/** - * Error context for detailed error reporting - */ -export interface ISmtpErrorContext { - /** Command that caused the error */ - command?: string; - /** Server response */ - response?: ISmtpResponse; - /** Connection state */ - connectionState?: ConnectionState; - /** Additional context data */ - data?: Record; -} diff --git a/dist_ts/mail/delivery/smtpclient/interfaces.js b/dist_ts/mail/delivery/smtpclient/interfaces.js deleted file mode 100644 index bf08dca..0000000 --- a/dist_ts/mail/delivery/smtpclient/interfaces.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * SMTP Client Interfaces and Types - * All interface definitions for the modular SMTP client - */ -/** - * Connection state - */ -export var ConnectionState; -(function (ConnectionState) { - ConnectionState["DISCONNECTED"] = "disconnected"; - ConnectionState["CONNECTING"] = "connecting"; - ConnectionState["CONNECTED"] = "connected"; - ConnectionState["AUTHENTICATED"] = "authenticated"; - ConnectionState["READY"] = "ready"; - ConnectionState["BUSY"] = "busy"; - ConnectionState["CLOSING"] = "closing"; - ConnectionState["ERROR"] = "error"; -})(ConnectionState || (ConnectionState = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQTZKSDs7R0FFRztBQUNILE1BQU0sQ0FBTixJQUFZLGVBU1g7QUFURCxXQUFZLGVBQWU7SUFDekIsZ0RBQTZCLENBQUE7SUFDN0IsNENBQXlCLENBQUE7SUFDekIsMENBQXVCLENBQUE7SUFDdkIsa0RBQStCLENBQUE7SUFDL0Isa0NBQWUsQ0FBQTtJQUNmLGdDQUFhLENBQUE7SUFDYixzQ0FBbUIsQ0FBQTtJQUNuQixrQ0FBZSxDQUFBO0FBQ2pCLENBQUMsRUFUVyxlQUFlLEtBQWYsZUFBZSxRQVMxQiJ9 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/smtp-client.d.ts b/dist_ts/mail/delivery/smtpclient/smtp-client.d.ts deleted file mode 100644 index 67486d5..0000000 --- a/dist_ts/mail/delivery/smtpclient/smtp-client.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -/** - * SMTP Client Core Implementation - * Main client class with delegation to handlers - */ -import { EventEmitter } from 'node:events'; -import type { Email } from '../../core/classes.email.js'; -import type { ISmtpClientOptions, ISmtpSendResult, IConnectionPoolStatus } from './interfaces.js'; -import type { ConnectionManager } from './connection-manager.js'; -import type { CommandHandler } from './command-handler.js'; -import type { AuthHandler } from './auth-handler.js'; -import type { TlsHandler } from './tls-handler.js'; -import type { SmtpErrorHandler } from './error-handler.js'; -interface ISmtpClientDependencies { - options: ISmtpClientOptions; - connectionManager: ConnectionManager; - commandHandler: CommandHandler; - authHandler: AuthHandler; - tlsHandler: TlsHandler; - errorHandler: SmtpErrorHandler; -} -export declare class SmtpClient extends EventEmitter { - private options; - private connectionManager; - private commandHandler; - private authHandler; - private tlsHandler; - private errorHandler; - private isShuttingDown; - constructor(dependencies: ISmtpClientDependencies); - /** - * Send an email - */ - sendMail(email: Email): Promise; - /** - * Test connection to SMTP server - */ - verify(): Promise; - /** - * Check if client is connected - */ - isConnected(): boolean; - /** - * Get connection pool status - */ - getPoolStatus(): IConnectionPoolStatus; - /** - * Update client options - */ - updateOptions(newOptions: Partial): void; - /** - * Close all connections and shutdown client - */ - close(): Promise; - private formatEmailData; - private extractMessageId; - private setupEventForwarding; -} -export {}; diff --git a/dist_ts/mail/delivery/smtpclient/smtp-client.js b/dist_ts/mail/delivery/smtpclient/smtp-client.js deleted file mode 100644 index c6cfaec..0000000 --- a/dist_ts/mail/delivery/smtpclient/smtp-client.js +++ /dev/null @@ -1,285 +0,0 @@ -/** - * SMTP Client Core Implementation - * Main client class with delegation to handlers - */ -import { EventEmitter } from 'node:events'; -import { CONNECTION_STATES, SmtpErrorType } from './constants.js'; -import { validateSender, validateRecipients } from './utils/validation.js'; -import { logEmailSend, logPerformance, logDebug } from './utils/logging.js'; -export class SmtpClient extends EventEmitter { - options; - connectionManager; - commandHandler; - authHandler; - tlsHandler; - errorHandler; - isShuttingDown = false; - constructor(dependencies) { - super(); - this.options = dependencies.options; - this.connectionManager = dependencies.connectionManager; - this.commandHandler = dependencies.commandHandler; - this.authHandler = dependencies.authHandler; - this.tlsHandler = dependencies.tlsHandler; - this.errorHandler = dependencies.errorHandler; - this.setupEventForwarding(); - } - /** - * Send an email - */ - async sendMail(email) { - const startTime = Date.now(); - // Extract clean email addresses without display names for SMTP operations - const fromAddress = email.getFromAddress(); - const recipients = email.getToAddresses(); - const ccRecipients = email.getCcAddresses(); - const bccRecipients = email.getBccAddresses(); - // Combine all recipients for SMTP operations - const allRecipients = [...recipients, ...ccRecipients, ...bccRecipients]; - // Validate email addresses - if (!validateSender(fromAddress)) { - throw new Error(`Invalid sender address: ${fromAddress}`); - } - const recipientErrors = validateRecipients(allRecipients); - if (recipientErrors.length > 0) { - throw new Error(`Invalid recipients: ${recipientErrors.join(', ')}`); - } - logEmailSend('start', allRecipients, this.options); - let connection = null; - const result = { - success: false, - acceptedRecipients: [], - rejectedRecipients: [], - envelope: { - from: fromAddress, - to: allRecipients - } - }; - try { - // Get connection - connection = await this.connectionManager.getConnection(); - connection.state = CONNECTION_STATES.BUSY; - // Wait for greeting if new connection - if (!connection.capabilities) { - await this.commandHandler.waitForGreeting(connection); - } - // Perform EHLO - await this.commandHandler.sendEhlo(connection, this.options.domain); - // Upgrade to TLS if needed - if (this.tlsHandler.shouldUseTLS(connection)) { - await this.tlsHandler.upgradeToTLS(connection); - // Re-send EHLO after TLS upgrade - await this.commandHandler.sendEhlo(connection, this.options.domain); - } - // Authenticate if needed - if (this.options.auth) { - await this.authHandler.authenticate(connection); - } - // Send MAIL FROM - const mailFromResponse = await this.commandHandler.sendMailFrom(connection, fromAddress); - if (mailFromResponse.code >= 400) { - throw new Error(`MAIL FROM failed: ${mailFromResponse.message}`); - } - // Send RCPT TO for each recipient (includes TO, CC, and BCC) - for (const recipient of allRecipients) { - try { - const rcptResponse = await this.commandHandler.sendRcptTo(connection, recipient); - if (rcptResponse.code >= 400) { - result.rejectedRecipients.push(recipient); - logDebug(`Recipient rejected: ${recipient}`, this.options, { response: rcptResponse }); - } - else { - result.acceptedRecipients.push(recipient); - } - } - catch (error) { - result.rejectedRecipients.push(recipient); - logDebug(`Recipient error: ${recipient}`, this.options, { error }); - } - } - // Check if we have any accepted recipients - if (result.acceptedRecipients.length === 0) { - throw new Error('All recipients were rejected'); - } - // Send DATA command - const dataResponse = await this.commandHandler.sendData(connection); - if (dataResponse.code !== 354) { - throw new Error(`DATA command failed: ${dataResponse.message}`); - } - // Send email content - const emailData = await this.formatEmailData(email); - const sendResponse = await this.commandHandler.sendDataContent(connection, emailData); - if (sendResponse.code >= 400) { - throw new Error(`Email data rejected: ${sendResponse.message}`); - } - // Success - result.success = true; - result.messageId = this.extractMessageId(sendResponse.message); - result.response = sendResponse.message; - connection.messageCount++; - logEmailSend('success', recipients, this.options, { - messageId: result.messageId, - duration: Date.now() - startTime - }); - } - catch (error) { - result.success = false; - result.error = error instanceof Error ? error : new Error(String(error)); - // Classify error and determine if we should retry - const errorType = this.errorHandler.classifyError(result.error); - result.error = this.errorHandler.createError(result.error.message, errorType, { command: 'SEND_MAIL' }, result.error); - logEmailSend('failure', recipients, this.options, { - error: result.error, - duration: Date.now() - startTime - }); - } - finally { - // Release connection - if (connection) { - connection.state = CONNECTION_STATES.READY; - this.connectionManager.updateActivity(connection); - this.connectionManager.releaseConnection(connection); - } - logPerformance('sendMail', Date.now() - startTime, this.options); - } - return result; - } - /** - * Test connection to SMTP server - */ - async verify() { - let connection = null; - try { - connection = await this.connectionManager.createConnection(); - await this.commandHandler.waitForGreeting(connection); - await this.commandHandler.sendEhlo(connection, this.options.domain); - if (this.tlsHandler.shouldUseTLS(connection)) { - await this.tlsHandler.upgradeToTLS(connection); - await this.commandHandler.sendEhlo(connection, this.options.domain); - } - if (this.options.auth) { - await this.authHandler.authenticate(connection); - } - await this.commandHandler.sendQuit(connection); - return true; - } - catch (error) { - logDebug('Connection verification failed', this.options, { error }); - return false; - } - finally { - if (connection) { - this.connectionManager.closeConnection(connection); - } - } - } - /** - * Check if client is connected - */ - isConnected() { - const status = this.connectionManager.getPoolStatus(); - return status.total > 0; - } - /** - * Get connection pool status - */ - getPoolStatus() { - return this.connectionManager.getPoolStatus(); - } - /** - * Update client options - */ - updateOptions(newOptions) { - this.options = { ...this.options, ...newOptions }; - logDebug('Client options updated', this.options); - } - /** - * Close all connections and shutdown client - */ - async close() { - if (this.isShuttingDown) { - return; - } - this.isShuttingDown = true; - logDebug('Shutting down SMTP client', this.options); - try { - this.connectionManager.closeAllConnections(); - this.emit('close'); - } - catch (error) { - logDebug('Error during client shutdown', this.options, { error }); - } - } - async formatEmailData(email) { - // Convert Email object to raw SMTP data - const headers = []; - // Required headers - headers.push(`From: ${email.from}`); - headers.push(`To: ${Array.isArray(email.to) ? email.to.join(', ') : email.to}`); - headers.push(`Subject: ${email.subject || ''}`); - headers.push(`Date: ${new Date().toUTCString()}`); - headers.push(`Message-ID: <${Date.now()}.${Math.random().toString(36)}@${this.options.host}>`); - // Optional headers - if (email.cc) { - const cc = Array.isArray(email.cc) ? email.cc.join(', ') : email.cc; - headers.push(`Cc: ${cc}`); - } - if (email.bcc) { - const bcc = Array.isArray(email.bcc) ? email.bcc.join(', ') : email.bcc; - headers.push(`Bcc: ${bcc}`); - } - // Content headers - if (email.html && email.text) { - // Multipart message - const boundary = `boundary_${Date.now()}_${Math.random().toString(36)}`; - headers.push(`Content-Type: multipart/alternative; boundary="${boundary}"`); - headers.push('MIME-Version: 1.0'); - const body = [ - `--${boundary}`, - 'Content-Type: text/plain; charset=utf-8', - 'Content-Transfer-Encoding: quoted-printable', - '', - email.text, - '', - `--${boundary}`, - 'Content-Type: text/html; charset=utf-8', - 'Content-Transfer-Encoding: quoted-printable', - '', - email.html, - '', - `--${boundary}--` - ].join('\r\n'); - return headers.join('\r\n') + '\r\n\r\n' + body; - } - else if (email.html) { - headers.push('Content-Type: text/html; charset=utf-8'); - headers.push('MIME-Version: 1.0'); - return headers.join('\r\n') + '\r\n\r\n' + email.html; - } - else { - headers.push('Content-Type: text/plain; charset=utf-8'); - headers.push('MIME-Version: 1.0'); - return headers.join('\r\n') + '\r\n\r\n' + (email.text || ''); - } - } - extractMessageId(response) { - // Try to extract message ID from server response - const match = response.match(/queued as ([^\s]+)/i) || - response.match(/id=([^\s]+)/i) || - response.match(/Message-ID: <([^>]+)>/i); - return match ? match[1] : undefined; - } - setupEventForwarding() { - // Forward events from connection manager - this.connectionManager.on('connection', (connection) => { - this.emit('connection', connection); - }); - this.connectionManager.on('disconnect', (connection) => { - this.emit('disconnect', connection); - }); - this.connectionManager.on('error', (error) => { - this.emit('error', error); - }); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smtp-client.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpclient/smtp-client.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/tls-handler.d.ts b/dist_ts/mail/delivery/smtpclient/tls-handler.d.ts deleted file mode 100644 index 684b493..0000000 --- a/dist_ts/mail/delivery/smtpclient/tls-handler.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * SMTP Client TLS Handler - * TLS and STARTTLS client functionality - */ -import * as tls from 'node:tls'; -import type { ISmtpConnection, ISmtpClientOptions } from './interfaces.js'; -import type { CommandHandler } from './command-handler.js'; -export declare class TlsHandler { - private options; - private commandHandler; - constructor(options: ISmtpClientOptions, commandHandler: CommandHandler); - /** - * Upgrade connection to TLS using STARTTLS - */ - upgradeToTLS(connection: ISmtpConnection): Promise; - /** - * Create a direct TLS connection - */ - createTLSConnection(host: string, port: number): Promise; - /** - * Validate TLS certificate - */ - validateCertificate(socket: tls.TLSSocket): boolean; - /** - * Get TLS connection information - */ - getTLSInfo(socket: tls.TLSSocket): any; - /** - * Check if TLS upgrade is required or recommended - */ - shouldUseTLS(connection: ISmtpConnection): boolean; - private performTLSUpgrade; -} diff --git a/dist_ts/mail/delivery/smtpclient/tls-handler.js b/dist_ts/mail/delivery/smtpclient/tls-handler.js deleted file mode 100644 index 8fbad1e..0000000 --- a/dist_ts/mail/delivery/smtpclient/tls-handler.js +++ /dev/null @@ -1,204 +0,0 @@ -/** - * SMTP Client TLS Handler - * TLS and STARTTLS client functionality - */ -import * as tls from 'node:tls'; -import * as net from 'node:net'; -import { DEFAULTS } from './constants.js'; -import { CONNECTION_STATES } from './constants.js'; -import { logTLS, logDebug } from './utils/logging.js'; -import { isSuccessCode } from './utils/helpers.js'; -export class TlsHandler { - options; - commandHandler; - constructor(options, commandHandler) { - this.options = options; - this.commandHandler = commandHandler; - } - /** - * Upgrade connection to TLS using STARTTLS - */ - async upgradeToTLS(connection) { - if (connection.secure) { - logDebug('Connection already secure', this.options); - return; - } - // Check if STARTTLS is supported - if (!connection.capabilities?.starttls) { - throw new Error('Server does not support STARTTLS'); - } - logTLS('starttls_start', this.options); - try { - // Send STARTTLS command - const response = await this.commandHandler.sendStartTls(connection); - if (!isSuccessCode(response.code)) { - throw new Error(`STARTTLS command failed: ${response.message}`); - } - // Upgrade the socket to TLS - await this.performTLSUpgrade(connection); - // Clear capabilities as they may have changed after TLS - connection.capabilities = undefined; - connection.secure = true; - logTLS('starttls_success', this.options); - } - catch (error) { - logTLS('starttls_failure', this.options, { error }); - throw error; - } - } - /** - * Create a direct TLS connection - */ - async createTLSConnection(host, port) { - return new Promise((resolve, reject) => { - const timeout = this.options.connectionTimeout || DEFAULTS.CONNECTION_TIMEOUT; - const tlsOptions = { - host, - port, - ...this.options.tls, - // Default TLS options for email - secureProtocol: 'TLS_method', - ciphers: 'HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA', - rejectUnauthorized: this.options.tls?.rejectUnauthorized !== false - }; - logTLS('tls_connected', this.options, { host, port }); - const socket = tls.connect(tlsOptions); - const timeoutHandler = setTimeout(() => { - socket.destroy(); - reject(new Error(`TLS connection timeout after ${timeout}ms`)); - }, timeout); - socket.once('secureConnect', () => { - clearTimeout(timeoutHandler); - if (!socket.authorized && this.options.tls?.rejectUnauthorized !== false) { - socket.destroy(); - reject(new Error(`TLS certificate verification failed: ${socket.authorizationError}`)); - return; - } - logDebug('TLS connection established', this.options, { - authorized: socket.authorized, - protocol: socket.getProtocol(), - cipher: socket.getCipher() - }); - resolve(socket); - }); - socket.once('error', (error) => { - clearTimeout(timeoutHandler); - reject(error); - }); - }); - } - /** - * Validate TLS certificate - */ - validateCertificate(socket) { - if (!socket.authorized) { - logDebug('TLS certificate not authorized', this.options, { - error: socket.authorizationError - }); - // Allow self-signed certificates if explicitly configured - if (this.options.tls?.rejectUnauthorized === false) { - logDebug('Accepting unauthorized certificate (rejectUnauthorized: false)', this.options); - return true; - } - return false; - } - const cert = socket.getPeerCertificate(); - if (!cert) { - logDebug('No peer certificate available', this.options); - return false; - } - // Additional certificate validation - const now = new Date(); - if (cert.valid_from && new Date(cert.valid_from) > now) { - logDebug('Certificate not yet valid', this.options, { validFrom: cert.valid_from }); - return false; - } - if (cert.valid_to && new Date(cert.valid_to) < now) { - logDebug('Certificate expired', this.options, { validTo: cert.valid_to }); - return false; - } - logDebug('TLS certificate validated', this.options, { - subject: cert.subject, - issuer: cert.issuer, - validFrom: cert.valid_from, - validTo: cert.valid_to - }); - return true; - } - /** - * Get TLS connection information - */ - getTLSInfo(socket) { - if (!(socket instanceof tls.TLSSocket)) { - return null; - } - return { - authorized: socket.authorized, - authorizationError: socket.authorizationError, - protocol: socket.getProtocol(), - cipher: socket.getCipher(), - peerCertificate: socket.getPeerCertificate(), - alpnProtocol: socket.alpnProtocol - }; - } - /** - * Check if TLS upgrade is required or recommended - */ - shouldUseTLS(connection) { - // Already secure - if (connection.secure) { - return false; - } - // Direct TLS connection configured - if (this.options.secure) { - return false; // Already handled in connection establishment - } - // STARTTLS available and not explicitly disabled - if (connection.capabilities?.starttls) { - return this.options.tls !== null && this.options.tls !== undefined; // Use TLS if configured - } - return false; - } - async performTLSUpgrade(connection) { - return new Promise((resolve, reject) => { - const plainSocket = connection.socket; - const timeout = this.options.connectionTimeout || DEFAULTS.CONNECTION_TIMEOUT; - const tlsOptions = { - socket: plainSocket, - host: this.options.host, - ...this.options.tls, - // Default TLS options for STARTTLS - secureProtocol: 'TLS_method', - ciphers: 'HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!SRP:!CAMELLIA', - rejectUnauthorized: this.options.tls?.rejectUnauthorized !== false - }; - const timeoutHandler = setTimeout(() => { - reject(new Error(`TLS upgrade timeout after ${timeout}ms`)); - }, timeout); - // Create TLS socket from existing connection - const tlsSocket = tls.connect(tlsOptions); - tlsSocket.once('secureConnect', () => { - clearTimeout(timeoutHandler); - // Validate certificate if required - if (!this.validateCertificate(tlsSocket)) { - tlsSocket.destroy(); - reject(new Error('TLS certificate validation failed')); - return; - } - // Replace the socket in the connection - connection.socket = tlsSocket; - connection.secure = true; - logDebug('STARTTLS upgrade completed', this.options, { - protocol: tlsSocket.getProtocol(), - cipher: tlsSocket.getCipher() - }); - resolve(); - }); - tlsSocket.once('error', (error) => { - clearTimeout(timeoutHandler); - reject(error); - }); - }); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tls-handler.js","sourceRoot":"","sources":["../../../../ts/mail/delivery/smtpclient/tls-handler.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/utils/helpers.d.ts b/dist_ts/mail/delivery/smtpclient/utils/helpers.d.ts deleted file mode 100644 index 68a7e3d..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/helpers.d.ts +++ /dev/null @@ -1,77 +0,0 @@ -/** - * SMTP Client Helper Functions - * Protocol helper functions and utilities - */ -import type { ISmtpResponse, ISmtpCapabilities } from '../interfaces.js'; -/** - * Parse SMTP server response - */ -export declare function parseSmtpResponse(data: string): ISmtpResponse; -/** - * Parse EHLO response and extract capabilities - */ -export declare function parseEhloResponse(response: string): ISmtpCapabilities; -/** - * Format SMTP command with proper line ending - */ -export declare function formatCommand(command: string, ...args: string[]): string; -/** - * Encode authentication string for AUTH PLAIN - */ -export declare function encodeAuthPlain(username: string, password: string): string; -/** - * Encode authentication string for AUTH LOGIN - */ -export declare function encodeAuthLogin(value: string): string; -/** - * Generate OAuth2 authentication string - */ -export declare function generateOAuth2String(username: string, accessToken: string): string; -/** - * Check if response code indicates success - */ -export declare function isSuccessCode(code: number): boolean; -/** - * Check if response code indicates temporary failure - */ -export declare function isTemporaryFailure(code: number): boolean; -/** - * Check if response code indicates permanent failure - */ -export declare function isPermanentFailure(code: number): boolean; -/** - * Escape email address for SMTP commands - */ -export declare function escapeEmailAddress(email: string): string; -/** - * Extract email address from angle brackets - */ -export declare function extractEmailAddress(email: string): string; -/** - * Generate unique connection ID - */ -export declare function generateConnectionId(): string; -/** - * Format timeout duration for human readability - */ -export declare function formatTimeout(milliseconds: number): string; -/** - * Validate and normalize email data size - */ -export declare function validateEmailSize(emailData: string, maxSize?: number): boolean; -/** - * Clean sensitive data from logs - */ -export declare function sanitizeForLogging(data: any): any; -/** - * Calculate exponential backoff delay - */ -export declare function calculateBackoffDelay(attempt: number, baseDelay?: number): number; -/** - * Parse enhanced status code - */ -export declare function parseEnhancedStatusCode(code: string): { - class: number; - subject: number; - detail: number; -} | null; diff --git a/dist_ts/mail/delivery/smtpclient/utils/helpers.js b/dist_ts/mail/delivery/smtpclient/utils/helpers.js deleted file mode 100644 index a3cfc1e..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/helpers.js +++ /dev/null @@ -1,196 +0,0 @@ -/** - * SMTP Client Helper Functions - * Protocol helper functions and utilities - */ -import { SMTP_CODES, REGEX_PATTERNS, LINE_ENDINGS } from '../constants.js'; -/** - * Parse SMTP server response - */ -export function parseSmtpResponse(data) { - const lines = data.trim().split(/\r?\n/); - const firstLine = lines[0]; - const match = firstLine.match(REGEX_PATTERNS.RESPONSE_CODE); - if (!match) { - return { - code: 500, - message: 'Invalid server response', - raw: data - }; - } - const code = parseInt(match[1], 10); - const separator = match[2]; - const message = lines.map(line => line.substring(4)).join(' '); - // Check for enhanced status code - const enhancedMatch = message.match(REGEX_PATTERNS.ENHANCED_STATUS); - const enhancedCode = enhancedMatch ? enhancedMatch[1] : undefined; - return { - code, - message: enhancedCode ? message.substring(enhancedCode.length + 1) : message, - enhancedCode, - raw: data - }; -} -/** - * Parse EHLO response and extract capabilities - */ -export function parseEhloResponse(response) { - const lines = response.trim().split(/\r?\n/); - const capabilities = { - extensions: new Set(), - authMethods: new Set(), - pipelining: false, - starttls: false, - eightBitMime: false - }; - for (const line of lines.slice(1)) { // Skip first line (greeting) - const extensionLine = line.substring(4); // Remove "250-" or "250 " - const parts = extensionLine.split(/\s+/); - const extension = parts[0].toUpperCase(); - capabilities.extensions.add(extension); - switch (extension) { - case 'PIPELINING': - capabilities.pipelining = true; - break; - case 'STARTTLS': - capabilities.starttls = true; - break; - case '8BITMIME': - capabilities.eightBitMime = true; - break; - case 'SIZE': - if (parts[1]) { - capabilities.maxSize = parseInt(parts[1], 10); - } - break; - case 'AUTH': - // Parse authentication methods - for (let i = 1; i < parts.length; i++) { - capabilities.authMethods.add(parts[i].toUpperCase()); - } - break; - } - } - return capabilities; -} -/** - * Format SMTP command with proper line ending - */ -export function formatCommand(command, ...args) { - const fullCommand = args.length > 0 ? `${command} ${args.join(' ')}` : command; - return fullCommand + LINE_ENDINGS.CRLF; -} -/** - * Encode authentication string for AUTH PLAIN - */ -export function encodeAuthPlain(username, password) { - const authString = `\0${username}\0${password}`; - return Buffer.from(authString, 'utf8').toString('base64'); -} -/** - * Encode authentication string for AUTH LOGIN - */ -export function encodeAuthLogin(value) { - return Buffer.from(value, 'utf8').toString('base64'); -} -/** - * Generate OAuth2 authentication string - */ -export function generateOAuth2String(username, accessToken) { - const authString = `user=${username}\x01auth=Bearer ${accessToken}\x01\x01`; - return Buffer.from(authString, 'utf8').toString('base64'); -} -/** - * Check if response code indicates success - */ -export function isSuccessCode(code) { - return code >= 200 && code < 300; -} -/** - * Check if response code indicates temporary failure - */ -export function isTemporaryFailure(code) { - return code >= 400 && code < 500; -} -/** - * Check if response code indicates permanent failure - */ -export function isPermanentFailure(code) { - return code >= 500; -} -/** - * Escape email address for SMTP commands - */ -export function escapeEmailAddress(email) { - return `<${email.trim()}>`; -} -/** - * Extract email address from angle brackets - */ -export function extractEmailAddress(email) { - const match = email.match(/^<(.+)>$/); - return match ? match[1] : email.trim(); -} -/** - * Generate unique connection ID - */ -export function generateConnectionId() { - return `smtp-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`; -} -/** - * Format timeout duration for human readability - */ -export function formatTimeout(milliseconds) { - if (milliseconds < 1000) { - return `${milliseconds}ms`; - } - else if (milliseconds < 60000) { - return `${Math.round(milliseconds / 1000)}s`; - } - else { - return `${Math.round(milliseconds / 60000)}m`; - } -} -/** - * Validate and normalize email data size - */ -export function validateEmailSize(emailData, maxSize) { - const size = Buffer.byteLength(emailData, 'utf8'); - return !maxSize || size <= maxSize; -} -/** - * Clean sensitive data from logs - */ -export function sanitizeForLogging(data) { - if (typeof data !== 'object' || data === null) { - return data; - } - const sanitized = { ...data }; - const sensitiveFields = ['password', 'pass', 'accessToken', 'refreshToken', 'clientSecret']; - for (const field of sensitiveFields) { - if (field in sanitized) { - sanitized[field] = '[REDACTED]'; - } - } - return sanitized; -} -/** - * Calculate exponential backoff delay - */ -export function calculateBackoffDelay(attempt, baseDelay = 1000) { - return Math.min(baseDelay * Math.pow(2, attempt - 1), 30000); // Max 30 seconds -} -/** - * Parse enhanced status code - */ -export function parseEnhancedStatusCode(code) { - const match = code.match(/^(\d)\.(\d)\.(\d)$/); - if (!match) { - return null; - } - return { - class: parseInt(match[1], 10), - subject: parseInt(match[2], 10), - detail: parseInt(match[3], 10) - }; -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC91dGlscy9oZWxwZXJzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxVQUFVLEVBQUUsY0FBYyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRzNFOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlCQUFpQixDQUFDLElBQVk7SUFDNUMsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN6QyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDM0IsTUFBTSxLQUFLLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDLENBQUM7SUFFNUQsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1gsT0FBTztZQUNMLElBQUksRUFBRSxHQUFHO1lBQ1QsT0FBTyxFQUFFLHlCQUF5QjtZQUNsQyxHQUFHLEVBQUUsSUFBSTtTQUNWLENBQUM7SUFDSixDQUFDO0lBRUQsTUFBTSxJQUFJLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNwQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDM0IsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFFL0QsaUNBQWlDO0lBQ2pDLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ3BFLE1B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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/utils/logging.d.ts b/dist_ts/mail/delivery/smtpclient/utils/logging.d.ts deleted file mode 100644 index 951a1f8..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/logging.d.ts +++ /dev/null @@ -1,46 +0,0 @@ -/** - * SMTP Client Logging Utilities - * Client-side logging utilities for SMTP operations - */ -import type { ISmtpResponse, ISmtpClientOptions } from '../interfaces.js'; -export interface ISmtpClientLogData { - component: string; - host?: string; - port?: number; - secure?: boolean; - command?: string; - response?: ISmtpResponse; - error?: Error; - connectionId?: string; - messageId?: string; - duration?: number; - [key: string]: any; -} -/** - * Log SMTP client connection events - */ -export declare function logConnection(event: 'connecting' | 'connected' | 'disconnected' | 'error', options: ISmtpClientOptions, data?: Partial): void; -/** - * Log SMTP command execution - */ -export declare function logCommand(command: string, response?: ISmtpResponse, options?: ISmtpClientOptions, data?: Partial): void; -/** - * Log authentication events - */ -export declare function logAuthentication(event: 'start' | 'success' | 'failure', method: string, options: ISmtpClientOptions, data?: Partial): void; -/** - * Log TLS/STARTTLS events - */ -export declare function logTLS(event: 'starttls_start' | 'starttls_success' | 'starttls_failure' | 'tls_connected', options: ISmtpClientOptions, data?: Partial): void; -/** - * Log email sending events - */ -export declare function logEmailSend(event: 'start' | 'success' | 'failure', recipients: string[], options: ISmtpClientOptions, data?: Partial): void; -/** - * Log performance metrics - */ -export declare function logPerformance(operation: string, duration: number, options: ISmtpClientOptions, data?: Partial): void; -/** - * Log debug information (only when debug is enabled) - */ -export declare function logDebug(message: string, options: ISmtpClientOptions, data?: Partial): void; diff --git a/dist_ts/mail/delivery/smtpclient/utils/logging.js b/dist_ts/mail/delivery/smtpclient/utils/logging.js deleted file mode 100644 index 0fdc7ce..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/logging.js +++ /dev/null @@ -1,153 +0,0 @@ -/** - * SMTP Client Logging Utilities - * Client-side logging utilities for SMTP operations - */ -import { logger } from '../../../../logger.js'; -/** - * Log SMTP client connection events - */ -export function logConnection(event, options, data) { - const logData = { - component: 'smtp-client', - event, - host: options.host, - port: options.port, - secure: options.secure, - ...data - }; - switch (event) { - case 'connecting': - logger.info('SMTP client connecting', logData); - break; - case 'connected': - logger.info('SMTP client connected', logData); - break; - case 'disconnected': - logger.info('SMTP client disconnected', logData); - break; - case 'error': - logger.error('SMTP client connection error', logData); - break; - } -} -/** - * Log SMTP command execution - */ -export function logCommand(command, response, options, data) { - const logData = { - component: 'smtp-client', - command, - response, - host: options?.host, - port: options?.port, - ...data - }; - if (response && response.code >= 400) { - logger.warn('SMTP command failed', logData); - } - else { - logger.debug('SMTP command executed', logData); - } -} -/** - * Log authentication events - */ -export function logAuthentication(event, method, options, data) { - const logData = { - component: 'smtp-client', - event: `auth_${event}`, - authMethod: method, - host: options.host, - port: options.port, - ...data - }; - switch (event) { - case 'start': - logger.debug('SMTP authentication started', logData); - break; - case 'success': - logger.info('SMTP authentication successful', logData); - break; - case 'failure': - logger.error('SMTP authentication failed', logData); - break; - } -} -/** - * Log TLS/STARTTLS events - */ -export function logTLS(event, options, data) { - const logData = { - component: 'smtp-client', - event, - host: options.host, - port: options.port, - ...data - }; - if (event.includes('failure')) { - logger.error('SMTP TLS operation failed', logData); - } - else { - logger.info('SMTP TLS operation', logData); - } -} -/** - * Log email sending events - */ -export function logEmailSend(event, recipients, options, data) { - const logData = { - component: 'smtp-client', - event: `send_${event}`, - recipientCount: recipients.length, - recipients: recipients.slice(0, 5), // Only log first 5 recipients for privacy - host: options.host, - port: options.port, - ...data - }; - switch (event) { - case 'start': - logger.info('SMTP email send started', logData); - break; - case 'success': - logger.info('SMTP email send successful', logData); - break; - case 'failure': - logger.error('SMTP email send failed', logData); - break; - } -} -/** - * Log performance metrics - */ -export function logPerformance(operation, duration, options, data) { - const logData = { - component: 'smtp-client', - operation, - duration, - host: options.host, - port: options.port, - ...data - }; - if (duration > 10000) { // Log slow operations (>10s) - logger.warn('SMTP slow operation detected', logData); - } - else { - logger.debug('SMTP operation performance', logData); - } -} -/** - * Log debug information (only when debug is enabled) - */ -export function logDebug(message, options, data) { - if (!options.debug) { - return; - } - const logData = { - component: 'smtp-client-debug', - host: options.host, - port: options.port, - ...data - }; - logger.debug(`[SMTP Client Debug] ${message}`, logData); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2luZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC91dGlscy9sb2dnaW5nLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQWlCL0M7O0dBRUc7QUFDSCxNQUFNLFVBQVUsYUFBYSxDQUMzQixLQUE0RCxFQUM1RCxPQUEyQixFQUMzQixJQUFrQztJQUVsQyxNQUFNLE9BQU8sR0FBdUI7UUFDbEMsU0FBUyxFQUFFLGFBQWE7UUFDeEIsS0FBSztRQUNMLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSTtRQUNsQixJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUk7UUFDbEIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxNQUFNO1FBQ3RCLEdBQUcsSUFBSTtLQUNSLENBQUM7SUFFRixRQUFRLEtBQUssRUFBRSxDQUFDO1FBQ2QsS0FBSyxZQUFZO1lBQ2YsTUFBTSxDQUFDLElBQUksQ0FBQyx3QkFBd0IsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUMvQyxNQUFNO1FBQ1IsS0FBSyxXQUFXO1lBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyx1QkFBdUIsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUM5QyxNQUFNO1FBQ1IsS0FBSyxjQUFjO1lBQ2pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsMEJBQTBCLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDakQsTUFBTTtRQUNSLEtBQUssT0FBTztZQUNWLE1BQU0sQ0FBQyxLQUFLLENBQUMsOEJBQThCLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDdEQsTUFBTTtJQUNWLENBQUM7QUFDSCxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsVUFBVSxDQUN4QixPQUFlLEVBQ2YsUUFBd0IsRUFDeEIsT0FBNEIsRUFDNUIsSUFBa0M7SUFFbEMsTUFBTSxPQUFPLEdBQXVCO1FB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 \ No newline at end of file diff --git a/dist_ts/mail/delivery/smtpclient/utils/validation.d.ts b/dist_ts/mail/delivery/smtpclient/utils/validation.d.ts deleted file mode 100644 index 33ba3e6..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/validation.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -/** - * SMTP Client Validation Utilities - * Input validation functions for SMTP client operations - */ -import type { ISmtpClientOptions, ISmtpAuthOptions } from '../interfaces.js'; -/** - * Validate email address format - * Supports RFC-compliant addresses including empty return paths for bounces - */ -export declare function validateEmailAddress(email: string): boolean; -/** - * Validate SMTP client options - */ -export declare function validateClientOptions(options: ISmtpClientOptions): string[]; -/** - * Validate authentication options - */ -export declare function validateAuthOptions(auth: ISmtpAuthOptions): string[]; -/** - * Validate hostname format - */ -export declare function validateHostname(hostname: string): boolean; -/** - * Validate port number - */ -export declare function validatePort(port: number): boolean; -/** - * Sanitize and validate domain name for EHLO - */ -export declare function validateAndSanitizeDomain(domain: string): string; -/** - * Validate recipient list - */ -export declare function validateRecipients(recipients: string | string[]): string[]; -/** - * Validate sender address - */ -export declare function validateSender(sender: string): boolean; diff --git a/dist_ts/mail/delivery/smtpclient/utils/validation.js b/dist_ts/mail/delivery/smtpclient/utils/validation.js deleted file mode 100644 index 3b777b4..0000000 --- a/dist_ts/mail/delivery/smtpclient/utils/validation.js +++ /dev/null @@ -1,139 +0,0 @@ -/** - * SMTP Client Validation Utilities - * Input validation functions for SMTP client operations - */ -import { REGEX_PATTERNS } from '../constants.js'; -/** - * Validate email address format - * Supports RFC-compliant addresses including empty return paths for bounces - */ -export function validateEmailAddress(email) { - if (typeof email !== 'string') { - return false; - } - const trimmed = email.trim(); - // Handle empty return path for bounce messages (RFC 5321) - if (trimmed === '' || trimmed === '<>') { - return true; - } - // Handle display name formats - const angleMatch = trimmed.match(/<([^>]+)>/); - if (angleMatch) { - return REGEX_PATTERNS.EMAIL_ADDRESS.test(angleMatch[1]); - } - // Regular email validation - return REGEX_PATTERNS.EMAIL_ADDRESS.test(trimmed); -} -/** - * Validate SMTP client options - */ -export function validateClientOptions(options) { - const errors = []; - // Required fields - if (!options.host || typeof options.host !== 'string') { - errors.push('Host is required and must be a string'); - } - if (!options.port || typeof options.port !== 'number' || options.port < 1 || options.port > 65535) { - errors.push('Port must be a number between 1 and 65535'); - } - // Optional field validation - if (options.connectionTimeout !== undefined) { - if (typeof options.connectionTimeout !== 'number' || options.connectionTimeout < 1000) { - errors.push('Connection timeout must be a number >= 1000ms'); - } - } - if (options.socketTimeout !== undefined) { - if (typeof options.socketTimeout !== 'number' || options.socketTimeout < 1000) { - errors.push('Socket timeout must be a number >= 1000ms'); - } - } - if (options.maxConnections !== undefined) { - if (typeof options.maxConnections !== 'number' || options.maxConnections < 1) { - errors.push('Max connections must be a positive number'); - } - } - if (options.maxMessages !== undefined) { - if (typeof options.maxMessages !== 'number' || options.maxMessages < 1) { - errors.push('Max messages must be a positive number'); - } - } - // Validate authentication options - if (options.auth) { - errors.push(...validateAuthOptions(options.auth)); - } - return errors; -} -/** - * Validate authentication options - */ -export function validateAuthOptions(auth) { - const errors = []; - if (auth.method && !['PLAIN', 'LOGIN', 'OAUTH2', 'AUTO'].includes(auth.method)) { - errors.push('Invalid authentication method'); - } - // For basic auth, require user and pass - if ((auth.user || auth.pass) && (!auth.user || !auth.pass)) { - errors.push('Both user and pass are required for basic authentication'); - } - // For OAuth2, validate required fields - if (auth.oauth2) { - const oauth = auth.oauth2; - if (!oauth.user || !oauth.clientId || !oauth.clientSecret || !oauth.refreshToken) { - errors.push('OAuth2 requires user, clientId, clientSecret, and refreshToken'); - } - if (oauth.user && !validateEmailAddress(oauth.user)) { - errors.push('OAuth2 user must be a valid email address'); - } - } - return errors; -} -/** - * Validate hostname format - */ -export function validateHostname(hostname) { - if (!hostname || typeof hostname !== 'string') { - return false; - } - // Basic hostname validation (allow IP addresses and domain names) - const hostnameRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$|^(?:\d{1,3}\.){3}\d{1,3}$|^\[(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\]$/; - return hostnameRegex.test(hostname); -} -/** - * Validate port number - */ -export function validatePort(port) { - return typeof port === 'number' && port >= 1 && port <= 65535; -} -/** - * Sanitize and validate domain name for EHLO - */ -export function validateAndSanitizeDomain(domain) { - if (!domain || typeof domain !== 'string') { - return 'localhost'; - } - const sanitized = domain.trim().toLowerCase(); - if (validateHostname(sanitized)) { - return sanitized; - } - return 'localhost'; -} -/** - * Validate recipient list - */ -export function validateRecipients(recipients) { - const errors = []; - const recipientList = Array.isArray(recipients) ? recipients : [recipients]; - for (const recipient of recipientList) { - if (!validateEmailAddress(recipient)) { - errors.push(`Invalid email address: ${recipient}`); - } - } - return errors; -} -/** - * Validate sender address - */ -export function validateSender(sender) { - return validateEmailAddress(sender); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3RzL21haWwvZGVsaXZlcnkvc210cGNsaWVudC91dGlscy92YWxpZGF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7R0FHRztBQUVILE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUdqRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsb0JBQW9CLENBQUMsS0FBYTtJQUNoRCxJQUFJLE9BQU8sS0FBSyxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQzlCLE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVELE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUU3QiwwREFBMEQ7SUFDMUQsSUFBSSxPQUFPLEtBQUssRUFBRSxJQUFJLE9BQU8sS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUN2QyxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFFRCw4QkFBOEI7SUFDOUIsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUM5QyxJQUFJLFVBQVUsRUFBRSxDQUFDO1FBQ2YsT0FBTyxjQUFjLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsMkJBQTJCO0lBQzNCLE9BQU8sY0FBYyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7QUFDcEQsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLHFCQUFxQixDQUFDLE9BQTJCO0lBQy9ELE1BQU0sTUFBTSxHQUFhLEVBQUUsQ0FBQztJQUU1QixrQkFBa0I7SUFDbEIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLElBQUksT0FBTyxPQUFPLENBQUMsSUFBSSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ3RELE1BQU0sQ0FB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 \ No newline at end of file diff --git a/dist_ts/mail/index.d.ts b/dist_ts/mail/index.d.ts deleted file mode 100644 index 555810f..0000000 --- a/dist_ts/mail/index.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export * from './routing/index.js'; -export * from './security/index.js'; -import * as Core from './core/index.js'; -import * as Delivery from './delivery/index.js'; -export { Core, Delivery }; -import { Email } from './core/classes.email.js'; -export { Email, }; diff --git a/dist_ts/mail/index.js b/dist_ts/mail/index.js deleted file mode 100644 index 802dc02..0000000 --- a/dist_ts/mail/index.js +++ /dev/null @@ -1,12 +0,0 @@ -// Export all mail modules for simplified imports -export * from './routing/index.js'; -export * from './security/index.js'; -// Make the core and delivery modules accessible -import * as Core from './core/index.js'; -import * as Delivery from './delivery/index.js'; -export { Core, Delivery }; -// For direct imports -import { Email } from './core/classes.email.js'; -// Re-export commonly used classes -export { Email, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tYWlsL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGlEQUFpRDtBQUNqRCxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMscUJBQXFCLENBQUM7QUFFcEMsZ0RBQWdEO0FBQ2hELE9BQU8sS0FBSyxJQUFJLE1BQU0saUJBQWlCLENBQUM7QUFDeEMsT0FBTyxLQUFLLFFBQVEsTUFBTSxxQkFBcUIsQ0FBQztBQUVoRCxPQUFPLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFDO0FBRTFCLHFCQUFxQjtBQUNyQixPQUFPLEVBQUUsS0FBSyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFaEQsa0NBQWtDO0FBQ2xDLE9BQU8sRUFDTCxLQUFLLEdBQ04sQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.dns.manager.d.ts b/dist_ts/mail/routing/classes.dns.manager.d.ts deleted file mode 100644 index a94072d..0000000 --- a/dist_ts/mail/routing/classes.dns.manager.d.ts +++ /dev/null @@ -1,79 +0,0 @@ -import type { IEmailDomainConfig } from './interfaces.js'; -/** External DcRouter interface shape used by DnsManager */ -interface IDcRouterLike { - storageManager: IStorageManagerLike; - dnsServer?: any; - options?: { - dnsNsDomains?: string[]; - dnsScopes?: string[]; - }; -} -/** External StorageManager interface shape used by DnsManager */ -interface IStorageManagerLike { - get(key: string): Promise; - set(key: string, value: string): Promise; -} -/** - * DNS validation result - */ -export interface IDnsValidationResult { - valid: boolean; - errors: string[]; - warnings: string[]; - requiredChanges: string[]; -} -/** - * Manages DNS configuration for email domains - * Handles both validation and creation of DNS records - */ -export declare class DnsManager { - private dcRouter; - private storageManager; - constructor(dcRouter: IDcRouterLike); - /** - * Validate all domain configurations - */ - validateAllDomains(domainConfigs: IEmailDomainConfig[]): Promise>; - /** - * Validate a single domain configuration - */ - validateDomain(config: IEmailDomainConfig): Promise; - /** - * Validate forward mode configuration - */ - private validateForwardMode; - /** - * Validate internal DNS mode configuration - */ - private validateInternalDnsMode; - /** - * Validate external DNS mode configuration - */ - private validateExternalDnsMode; - /** - * Check DNS records for a domain - */ - private checkDnsRecords; - /** - * Resolve NS records for a domain - */ - private resolveNs; - /** - * Get base domain from email domain (e.g., mail.example.com -> example.com) - */ - private getBaseDomain; - /** - * Ensure all DNS records are created for configured domains - * This is the main entry point for DNS record management - */ - ensureDnsRecords(domainConfigs: IEmailDomainConfig[], dkimCreator?: any): Promise; - /** - * Create DNS records for internal-dns mode domains - */ - private createInternalDnsRecords; - /** - * Create DKIM DNS records for all domains - */ - private createDkimRecords; -} -export {}; diff --git a/dist_ts/mail/routing/classes.dns.manager.js b/dist_ts/mail/routing/classes.dns.manager.js deleted file mode 100644 index fcee375..0000000 --- a/dist_ts/mail/routing/classes.dns.manager.js +++ /dev/null @@ -1,415 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { logger } from '../../logger.js'; -/** - * Manages DNS configuration for email domains - * Handles both validation and creation of DNS records - */ -export class DnsManager { - dcRouter; - storageManager; - constructor(dcRouter) { - this.dcRouter = dcRouter; - this.storageManager = dcRouter.storageManager; - } - /** - * Validate all domain configurations - */ - async validateAllDomains(domainConfigs) { - const results = new Map(); - for (const config of domainConfigs) { - const result = await this.validateDomain(config); - results.set(config.domain, result); - } - return results; - } - /** - * Validate a single domain configuration - */ - async validateDomain(config) { - switch (config.dnsMode) { - case 'forward': - return this.validateForwardMode(config); - case 'internal-dns': - return this.validateInternalDnsMode(config); - case 'external-dns': - return this.validateExternalDnsMode(config); - default: - return { - valid: false, - errors: [`Unknown DNS mode: ${config.dnsMode}`], - warnings: [], - requiredChanges: [] - }; - } - } - /** - * Validate forward mode configuration - */ - async validateForwardMode(config) { - const result = { - valid: true, - errors: [], - warnings: [], - requiredChanges: [] - }; - // Forward mode doesn't require DNS validation by default - if (!config.dns?.forward?.skipDnsValidation) { - logger.log('info', `DNS validation skipped for forward mode domain: ${config.domain}`); - } - // DKIM keys are still generated for consistency - result.warnings.push(`Domain "${config.domain}" uses forward mode. DKIM keys will be generated but signing only happens if email is processed.`); - return result; - } - /** - * Validate internal DNS mode configuration - */ - async validateInternalDnsMode(config) { - const result = { - valid: true, - errors: [], - warnings: [], - requiredChanges: [] - }; - // Check if DNS configuration is set up - const dnsNsDomains = this.dcRouter.options?.dnsNsDomains; - const dnsScopes = this.dcRouter.options?.dnsScopes; - if (!dnsNsDomains || dnsNsDomains.length === 0) { - result.valid = false; - result.errors.push(`Domain "${config.domain}" is configured to use internal DNS, but dnsNsDomains is not set in DcRouter configuration.`); - console.error(`❌ ERROR: Domain "${config.domain}" is configured to use internal DNS,\n` + - ' but dnsNsDomains is not set in DcRouter configuration.\n' + - ' Please configure dnsNsDomains to enable the DNS server.\n' + - ' Example: dnsNsDomains: ["ns1.myservice.com", "ns2.myservice.com"]'); - return result; - } - if (!dnsScopes || dnsScopes.length === 0) { - result.valid = false; - result.errors.push(`Domain "${config.domain}" is configured to use internal DNS, but dnsScopes is not set in DcRouter configuration.`); - console.error(`❌ ERROR: Domain "${config.domain}" is configured to use internal DNS,\n` + - ' but dnsScopes is not set in DcRouter configuration.\n' + - ' Please configure dnsScopes to define authoritative domains.\n' + - ' Example: dnsScopes: ["myservice.com", "mail.myservice.com"]'); - return result; - } - // Check if the email domain is in dnsScopes - if (!dnsScopes.includes(config.domain)) { - result.valid = false; - result.errors.push(`Domain "${config.domain}" is configured to use internal DNS, but is not included in dnsScopes.`); - console.error(`❌ ERROR: Domain "${config.domain}" is configured to use internal DNS,\n` + - ` but is not included in dnsScopes: [${dnsScopes.join(', ')}].\n` + - ' Please add this domain to dnsScopes to enable internal DNS.\n' + - ` Example: dnsScopes: [..., "${config.domain}"]`); - return result; - } - const primaryNameserver = dnsNsDomains[0]; - // Check NS delegation - try { - const nsRecords = await this.resolveNs(config.domain); - const delegatedNameservers = dnsNsDomains.filter(ns => nsRecords.includes(ns)); - const isDelegated = delegatedNameservers.length > 0; - if (!isDelegated) { - result.warnings.push(`NS delegation not found for ${config.domain}. Please add NS records at your registrar.`); - dnsNsDomains.forEach(ns => { - result.requiredChanges.push(`Add NS record: ${config.domain}. NS ${ns}.`); - }); - console.log(`📋 DNS Delegation Required for ${config.domain}:\n` + - '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' + - 'Please add these NS records at your domain registrar:\n' + - dnsNsDomains.map(ns => ` ${config.domain}. NS ${ns}.`).join('\n') + '\n' + - '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' + - 'This delegation is required for internal DNS mode to work.'); - } - else { - console.log(`✅ NS delegation verified: ${config.domain} -> [${delegatedNameservers.join(', ')}]`); - } - } - catch (error) { - result.warnings.push(`Could not verify NS delegation for ${config.domain}: ${error.message}`); - } - return result; - } - /** - * Validate external DNS mode configuration - */ - async validateExternalDnsMode(config) { - const result = { - valid: true, - errors: [], - warnings: [], - requiredChanges: [] - }; - try { - // Get current DNS records - const records = await this.checkDnsRecords(config); - const requiredRecords = config.dns?.external?.requiredRecords || ['MX', 'SPF', 'DKIM', 'DMARC']; - // Check MX record - if (requiredRecords.includes('MX') && !records.mx?.length) { - result.requiredChanges.push(`Add MX record: ${this.getBaseDomain(config.domain)} -> ${config.domain} (priority 10)`); - } - // Check SPF record - if (requiredRecords.includes('SPF') && !records.spf) { - result.requiredChanges.push(`Add TXT record: ${this.getBaseDomain(config.domain)} -> "v=spf1 a mx ~all"`); - } - // Check DKIM record - if (requiredRecords.includes('DKIM') && !records.dkim) { - const selector = config.dkim?.selector || 'default'; - const dkimPublicKey = await this.storageManager.get(`/email/dkim/${config.domain}/public.key`); - if (dkimPublicKey) { - const publicKeyBase64 = dkimPublicKey - .replace(/-----BEGIN PUBLIC KEY-----/g, '') - .replace(/-----END PUBLIC KEY-----/g, '') - .replace(/\s/g, ''); - result.requiredChanges.push(`Add TXT record: ${selector}._domainkey.${config.domain} -> "v=DKIM1; k=rsa; p=${publicKeyBase64}"`); - } - else { - result.warnings.push(`DKIM public key not found for ${config.domain}. It will be generated on first use.`); - } - } - // Check DMARC record - if (requiredRecords.includes('DMARC') && !records.dmarc) { - result.requiredChanges.push(`Add TXT record: _dmarc.${this.getBaseDomain(config.domain)} -> "v=DMARC1; p=none; rua=mailto:dmarc@${config.domain}"`); - } - // Show setup instructions if needed - if (result.requiredChanges.length > 0) { - console.log(`📋 DNS Configuration Required for ${config.domain}:\n` + - '━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n' + - result.requiredChanges.map((change, i) => `${i + 1}. ${change}`).join('\n') + - '\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'); - } - } - catch (error) { - result.errors.push(`DNS validation failed: ${error.message}`); - result.valid = false; - } - return result; - } - /** - * Check DNS records for a domain - */ - async checkDnsRecords(config) { - const records = {}; - const baseDomain = this.getBaseDomain(config.domain); - const selector = config.dkim?.selector || 'default'; - // Use custom DNS servers if specified - const resolver = new plugins.dns.promises.Resolver(); - if (config.dns?.external?.servers?.length) { - resolver.setServers(config.dns.external.servers); - } - // Check MX records - try { - const mxRecords = await resolver.resolveMx(baseDomain); - records.mx = mxRecords.map(mx => mx.exchange); - } - catch (error) { - logger.log('debug', `No MX records found for ${baseDomain}`); - } - // Check SPF record - try { - const txtRecords = await resolver.resolveTxt(baseDomain); - const spfRecord = txtRecords.find(records => records.some(record => record.startsWith('v=spf1'))); - if (spfRecord) { - records.spf = spfRecord.join(''); - } - } - catch (error) { - logger.log('debug', `No SPF record found for ${baseDomain}`); - } - // Check DKIM record - try { - const dkimRecords = await resolver.resolveTxt(`${selector}._domainkey.${config.domain}`); - const dkimRecord = dkimRecords.find(records => records.some(record => record.includes('v=DKIM1'))); - if (dkimRecord) { - records.dkim = dkimRecord.join(''); - } - } - catch (error) { - logger.log('debug', `No DKIM record found for ${selector}._domainkey.${config.domain}`); - } - // Check DMARC record - try { - const dmarcRecords = await resolver.resolveTxt(`_dmarc.${baseDomain}`); - const dmarcRecord = dmarcRecords.find(records => records.some(record => record.startsWith('v=DMARC1'))); - if (dmarcRecord) { - records.dmarc = dmarcRecord.join(''); - } - } - catch (error) { - logger.log('debug', `No DMARC record found for _dmarc.${baseDomain}`); - } - return records; - } - /** - * Resolve NS records for a domain - */ - async resolveNs(domain) { - try { - const resolver = new plugins.dns.promises.Resolver(); - const nsRecords = await resolver.resolveNs(domain); - return nsRecords; - } - catch (error) { - logger.log('warn', `Failed to resolve NS records for ${domain}: ${error.message}`); - return []; - } - } - /** - * Get base domain from email domain (e.g., mail.example.com -> example.com) - */ - getBaseDomain(domain) { - const parts = domain.split('.'); - if (parts.length <= 2) { - return domain; - } - // For subdomains like mail.example.com, return example.com - // But preserve domain structure for longer TLDs like .co.uk - if (parts[parts.length - 2].length <= 3 && parts[parts.length - 1].length === 2) { - // Likely a country code TLD like .co.uk - return parts.slice(-3).join('.'); - } - return parts.slice(-2).join('.'); - } - /** - * Ensure all DNS records are created for configured domains - * This is the main entry point for DNS record management - */ - async ensureDnsRecords(domainConfigs, dkimCreator) { - logger.log('info', `Ensuring DNS records for ${domainConfigs.length} domains`); - // First, validate all domains - const validationResults = await this.validateAllDomains(domainConfigs); - // Then create records for internal-dns domains - const internalDnsDomains = domainConfigs.filter(config => config.dnsMode === 'internal-dns'); - if (internalDnsDomains.length > 0) { - await this.createInternalDnsRecords(internalDnsDomains); - // Create DKIM records if DKIMCreator is provided - if (dkimCreator) { - await this.createDkimRecords(domainConfigs, dkimCreator); - } - } - // Log validation results for external-dns domains - for (const [domain, result] of validationResults) { - const config = domainConfigs.find(c => c.domain === domain); - if (config?.dnsMode === 'external-dns' && result.requiredChanges.length > 0) { - logger.log('warn', `External DNS configuration required for ${domain}`); - } - } - } - /** - * Create DNS records for internal-dns mode domains - */ - async createInternalDnsRecords(domainConfigs) { - // Check if DNS server is available - if (!this.dcRouter.dnsServer) { - logger.log('warn', 'DNS server not available, skipping internal DNS record creation'); - return; - } - logger.log('info', `Creating DNS records for ${domainConfigs.length} internal-dns domains`); - for (const domainConfig of domainConfigs) { - const domain = domainConfig.domain; - const ttl = domainConfig.dns?.internal?.ttl || 3600; - const mxPriority = domainConfig.dns?.internal?.mxPriority || 10; - try { - // 1. Register MX record - points to the email domain itself - this.dcRouter.dnsServer.registerHandler(domain, ['MX'], () => ({ - name: domain, - type: 'MX', - class: 'IN', - ttl: ttl, - data: { - priority: mxPriority, - exchange: domain - } - })); - logger.log('info', `MX record registered for ${domain} -> ${domain} (priority ${mxPriority})`); - // Store MX record in StorageManager - await this.storageManager.set(`/email/dns/${domain}/mx`, JSON.stringify({ - type: 'MX', - priority: mxPriority, - exchange: domain, - ttl: ttl - })); - // 2. Register SPF record - allows the domain to send emails - const spfRecord = `v=spf1 a mx ~all`; - this.dcRouter.dnsServer.registerHandler(domain, ['TXT'], () => ({ - name: domain, - type: 'TXT', - class: 'IN', - ttl: ttl, - data: spfRecord - })); - logger.log('info', `SPF record registered for ${domain}: "${spfRecord}"`); - // Store SPF record in StorageManager - await this.storageManager.set(`/email/dns/${domain}/spf`, JSON.stringify({ - type: 'TXT', - data: spfRecord, - ttl: ttl - })); - // 3. Register DMARC record - policy for handling email authentication - const dmarcRecord = `v=DMARC1; p=none; rua=mailto:dmarc@${domain}`; - this.dcRouter.dnsServer.registerHandler(`_dmarc.${domain}`, ['TXT'], () => ({ - name: `_dmarc.${domain}`, - type: 'TXT', - class: 'IN', - ttl: ttl, - data: dmarcRecord - })); - logger.log('info', `DMARC record registered for _dmarc.${domain}: "${dmarcRecord}"`); - // Store DMARC record in StorageManager - await this.storageManager.set(`/email/dns/${domain}/dmarc`, JSON.stringify({ - type: 'TXT', - name: `_dmarc.${domain}`, - data: dmarcRecord, - ttl: ttl - })); - // Log summary of DNS records created - logger.log('info', `✅ DNS records created for ${domain}: - - MX: ${domain} (priority ${mxPriority}) - - SPF: ${spfRecord} - - DMARC: ${dmarcRecord} - - DKIM: Will be created when keys are generated`); - } - catch (error) { - logger.log('error', `Failed to create DNS records for ${domain}: ${error.message}`); - } - } - } - /** - * Create DKIM DNS records for all domains - */ - async createDkimRecords(domainConfigs, dkimCreator) { - for (const domainConfig of domainConfigs) { - const domain = domainConfig.domain; - const selector = domainConfig.dkim?.selector || 'default'; - try { - // Get DKIM DNS record from DKIMCreator - const dnsRecord = await dkimCreator.getDNSRecordForDomain(domain); - // For internal-dns domains, register the DNS handler - if (domainConfig.dnsMode === 'internal-dns' && this.dcRouter.dnsServer) { - const ttl = domainConfig.dns?.internal?.ttl || 3600; - this.dcRouter.dnsServer.registerHandler(`${selector}._domainkey.${domain}`, ['TXT'], () => ({ - name: `${selector}._domainkey.${domain}`, - type: 'TXT', - class: 'IN', - ttl: ttl, - data: dnsRecord.value - })); - logger.log('info', `DKIM DNS record registered for ${selector}._domainkey.${domain}`); - // Store DKIM record in StorageManager - await this.storageManager.set(`/email/dns/${domain}/dkim`, JSON.stringify({ - type: 'TXT', - name: `${selector}._domainkey.${domain}`, - data: dnsRecord.value, - ttl: ttl - })); - } - // For external-dns domains, just log what should be configured - if (domainConfig.dnsMode === 'external-dns') { - logger.log('info', `DKIM record for external DNS: ${dnsRecord.name} -> "${dnsRecord.value}"`); - } - } - catch (error) { - logger.log('warn', `Could not create DKIM DNS record for ${domain}: ${error.message}`); - } - } - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dns.manager.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.dns.manager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.dnsmanager.d.ts b/dist_ts/mail/routing/classes.dnsmanager.d.ts deleted file mode 100644 index 854d285..0000000 --- a/dist_ts/mail/routing/classes.dnsmanager.d.ts +++ /dev/null @@ -1,165 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { DKIMCreator } from '../security/classes.dkimcreator.js'; -/** - * Interface for DNS record information - */ -export interface IDnsRecord { - name: string; - type: string; - value: string; - ttl?: number; - dnsSecEnabled?: boolean; -} -/** - * Interface for DNS lookup options - */ -export interface IDnsLookupOptions { - /** Cache time to live in milliseconds, 0 to disable caching */ - cacheTtl?: number; - /** Timeout for DNS queries in milliseconds */ - timeout?: number; -} -/** - * Interface for DNS verification result - */ -export interface IDnsVerificationResult { - record: string; - found: boolean; - valid: boolean; - value?: string; - expectedValue?: string; - error?: string; -} -/** - * Manager for DNS-related operations, including record lookups, verification, and generation - */ -export declare class DNSManager { - dkimCreator: DKIMCreator; - private cache; - private defaultOptions; - constructor(dkimCreatorArg: DKIMCreator, options?: IDnsLookupOptions); - /** - * Lookup MX records for a domain - * @param domain Domain to look up - * @param options Lookup options - * @returns Array of MX records sorted by priority - */ - lookupMx(domain: string, options?: IDnsLookupOptions): Promise; - /** - * Lookup TXT records for a domain - * @param domain Domain to look up - * @param options Lookup options - * @returns Array of TXT records - */ - lookupTxt(domain: string, options?: IDnsLookupOptions): Promise; - /** - * Find specific TXT record by subdomain and prefix - * @param domain Base domain - * @param subdomain Subdomain prefix (e.g., "dkim._domainkey") - * @param prefix Record prefix to match (e.g., "v=DKIM1") - * @param options Lookup options - * @returns Matching TXT record or null if not found - */ - findTxtRecord(domain: string, subdomain?: string, prefix?: string, options?: IDnsLookupOptions): Promise; - /** - * Verify if a domain has a valid SPF record - * @param domain Domain to verify - * @returns Verification result - */ - verifySpfRecord(domain: string): Promise; - /** - * Verify if a domain has a valid DKIM record - * @param domain Domain to verify - * @param selector DKIM selector (usually "mta" in our case) - * @returns Verification result - */ - verifyDkimRecord(domain: string, selector?: string): Promise; - /** - * Verify if a domain has a valid DMARC record - * @param domain Domain to verify - * @returns Verification result - */ - verifyDmarcRecord(domain: string): Promise; - /** - * Check all email authentication records (SPF, DKIM, DMARC) for a domain - * @param domain Domain to check - * @param dkimSelector DKIM selector - * @returns Object with verification results for each record type - */ - verifyEmailAuthRecords(domain: string, dkimSelector?: string): Promise<{ - spf: IDnsVerificationResult; - dkim: IDnsVerificationResult; - dmarc: IDnsVerificationResult; - }>; - /** - * Generate a recommended SPF record for a domain - * @param domain Domain name - * @param options Configuration options for the SPF record - * @returns Generated SPF record - */ - generateSpfRecord(domain: string, options?: { - includeMx?: boolean; - includeA?: boolean; - includeIps?: string[]; - includeSpf?: string[]; - policy?: 'none' | 'neutral' | 'softfail' | 'fail' | 'reject'; - }): IDnsRecord; - /** - * Generate a recommended DMARC record for a domain - * @param domain Domain name - * @param options Configuration options for the DMARC record - * @returns Generated DMARC record - */ - generateDmarcRecord(domain: string, options?: { - policy?: 'none' | 'quarantine' | 'reject'; - subdomainPolicy?: 'none' | 'quarantine' | 'reject'; - pct?: number; - rua?: string; - ruf?: string; - daysInterval?: number; - }): IDnsRecord; - /** - * Save DNS record recommendations to a file - * @param domain Domain name - * @param records DNS records to save - */ - saveDnsRecommendations(domain: string, records: IDnsRecord[]): Promise; - /** - * Get cache key value - * @param key Cache key - * @returns Cached value or undefined if not found or expired - */ - private getFromCache; - /** - * Set cache key value - * @param key Cache key - * @param data Data to cache - * @param ttl TTL in milliseconds - */ - private setInCache; - /** - * Clear the DNS cache - * @param key Optional specific key to clear, or all cache if not provided - */ - clearCache(key?: string): void; - /** - * Promise-based wrapper for dns.resolveMx - * @param domain Domain to resolve - * @param timeout Timeout in milliseconds - * @returns Promise resolving to MX records - */ - private dnsResolveMx; - /** - * Promise-based wrapper for dns.resolveTxt - * @param domain Domain to resolve - * @param timeout Timeout in milliseconds - * @returns Promise resolving to TXT records - */ - private dnsResolveTxt; - /** - * Generate all recommended DNS records for proper email authentication - * @param domain Domain to generate records for - * @returns Array of recommended DNS records - */ - generateAllRecommendedRecords(domain: string): Promise; -} diff --git a/dist_ts/mail/routing/classes.dnsmanager.js b/dist_ts/mail/routing/classes.dnsmanager.js deleted file mode 100644 index 16ea2af..0000000 --- a/dist_ts/mail/routing/classes.dnsmanager.js +++ /dev/null @@ -1,431 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { DKIMCreator } from '../security/classes.dkimcreator.js'; -/** - * Manager for DNS-related operations, including record lookups, verification, and generation - */ -export class DNSManager { - dkimCreator; - cache = new Map(); - defaultOptions = { - cacheTtl: 300000, // 5 minutes - timeout: 5000 // 5 seconds - }; - constructor(dkimCreatorArg, options) { - this.dkimCreator = dkimCreatorArg; - if (options) { - this.defaultOptions = { - ...this.defaultOptions, - ...options - }; - } - // Ensure the DNS records directory exists - plugins.fs.mkdirSync(paths.dnsRecordsDir, { recursive: true }); - } - /** - * Lookup MX records for a domain - * @param domain Domain to look up - * @param options Lookup options - * @returns Array of MX records sorted by priority - */ - async lookupMx(domain, options) { - const lookupOptions = { ...this.defaultOptions, ...options }; - const cacheKey = `mx:${domain}`; - // Check cache first - const cached = this.getFromCache(cacheKey); - if (cached) { - return cached; - } - try { - const records = await this.dnsResolveMx(domain, lookupOptions.timeout); - // Sort by priority - records.sort((a, b) => a.priority - b.priority); - // Cache the result - this.setInCache(cacheKey, records, lookupOptions.cacheTtl); - return records; - } - catch (error) { - console.error(`Error looking up MX records for ${domain}:`, error); - throw new Error(`Failed to lookup MX records for ${domain}: ${error.message}`); - } - } - /** - * Lookup TXT records for a domain - * @param domain Domain to look up - * @param options Lookup options - * @returns Array of TXT records - */ - async lookupTxt(domain, options) { - const lookupOptions = { ...this.defaultOptions, ...options }; - const cacheKey = `txt:${domain}`; - // Check cache first - const cached = this.getFromCache(cacheKey); - if (cached) { - return cached; - } - try { - const records = await this.dnsResolveTxt(domain, lookupOptions.timeout); - // Cache the result - this.setInCache(cacheKey, records, lookupOptions.cacheTtl); - return records; - } - catch (error) { - console.error(`Error looking up TXT records for ${domain}:`, error); - throw new Error(`Failed to lookup TXT records for ${domain}: ${error.message}`); - } - } - /** - * Find specific TXT record by subdomain and prefix - * @param domain Base domain - * @param subdomain Subdomain prefix (e.g., "dkim._domainkey") - * @param prefix Record prefix to match (e.g., "v=DKIM1") - * @param options Lookup options - * @returns Matching TXT record or null if not found - */ - async findTxtRecord(domain, subdomain = '', prefix = '', options) { - const fullDomain = subdomain ? `${subdomain}.${domain}` : domain; - try { - const records = await this.lookupTxt(fullDomain, options); - for (const recordArray of records) { - // TXT records can be split into chunks, join them - const record = recordArray.join(''); - if (!prefix || record.startsWith(prefix)) { - return record; - } - } - return null; - } - catch (error) { - // Domain might not exist or no TXT records - console.log(`No matching TXT record found for ${fullDomain} with prefix ${prefix}`); - return null; - } - } - /** - * Verify if a domain has a valid SPF record - * @param domain Domain to verify - * @returns Verification result - */ - async verifySpfRecord(domain) { - const result = { - record: 'SPF', - found: false, - valid: false - }; - try { - const spfRecord = await this.findTxtRecord(domain, '', 'v=spf1'); - if (spfRecord) { - result.found = true; - result.value = spfRecord; - // Basic validation - check if it contains all, include, ip4, ip6, or mx mechanisms - const isValid = /v=spf1\s+([-~?+]?(all|include:|ip4:|ip6:|mx|a|exists:))/.test(spfRecord); - result.valid = isValid; - if (!isValid) { - result.error = 'SPF record format is invalid'; - } - } - else { - result.error = 'No SPF record found'; - } - } - catch (error) { - result.error = `Error verifying SPF: ${error.message}`; - } - return result; - } - /** - * Verify if a domain has a valid DKIM record - * @param domain Domain to verify - * @param selector DKIM selector (usually "mta" in our case) - * @returns Verification result - */ - async verifyDkimRecord(domain, selector = 'mta') { - const result = { - record: 'DKIM', - found: false, - valid: false - }; - try { - const dkimSelector = `${selector}._domainkey`; - const dkimRecord = await this.findTxtRecord(domain, dkimSelector, 'v=DKIM1'); - if (dkimRecord) { - result.found = true; - result.value = dkimRecord; - // Basic validation - check for required fields - const hasP = dkimRecord.includes('p='); - result.valid = dkimRecord.includes('v=DKIM1') && hasP; - if (!result.valid) { - result.error = 'DKIM record is missing required fields'; - } - else if (dkimRecord.includes('p=') && !dkimRecord.match(/p=[a-zA-Z0-9+/]+/)) { - result.valid = false; - result.error = 'DKIM record has invalid public key format'; - } - } - else { - result.error = `No DKIM record found for selector ${selector}`; - } - } - catch (error) { - result.error = `Error verifying DKIM: ${error.message}`; - } - return result; - } - /** - * Verify if a domain has a valid DMARC record - * @param domain Domain to verify - * @returns Verification result - */ - async verifyDmarcRecord(domain) { - const result = { - record: 'DMARC', - found: false, - valid: false - }; - try { - const dmarcDomain = `_dmarc.${domain}`; - const dmarcRecord = await this.findTxtRecord(dmarcDomain, '', 'v=DMARC1'); - if (dmarcRecord) { - result.found = true; - result.value = dmarcRecord; - // Basic validation - check for required fields - const hasPolicy = dmarcRecord.includes('p='); - result.valid = dmarcRecord.includes('v=DMARC1') && hasPolicy; - if (!result.valid) { - result.error = 'DMARC record is missing required fields'; - } - } - else { - result.error = 'No DMARC record found'; - } - } - catch (error) { - result.error = `Error verifying DMARC: ${error.message}`; - } - return result; - } - /** - * Check all email authentication records (SPF, DKIM, DMARC) for a domain - * @param domain Domain to check - * @param dkimSelector DKIM selector - * @returns Object with verification results for each record type - */ - async verifyEmailAuthRecords(domain, dkimSelector = 'mta') { - const [spf, dkim, dmarc] = await Promise.all([ - this.verifySpfRecord(domain), - this.verifyDkimRecord(domain, dkimSelector), - this.verifyDmarcRecord(domain) - ]); - return { spf, dkim, dmarc }; - } - /** - * Generate a recommended SPF record for a domain - * @param domain Domain name - * @param options Configuration options for the SPF record - * @returns Generated SPF record - */ - generateSpfRecord(domain, options = {}) { - const { includeMx = true, includeA = true, includeIps = [], includeSpf = [], policy = 'softfail' } = options; - let value = 'v=spf1'; - if (includeMx) { - value += ' mx'; - } - if (includeA) { - value += ' a'; - } - // Add IP addresses - for (const ip of includeIps) { - if (ip.includes(':')) { - value += ` ip6:${ip}`; - } - else { - value += ` ip4:${ip}`; - } - } - // Add includes - for (const include of includeSpf) { - value += ` include:${include}`; - } - // Add policy - const policyMap = { - 'none': '?all', - 'neutral': '~all', - 'softfail': '~all', - 'fail': '-all', - 'reject': '-all' - }; - value += ` ${policyMap[policy]}`; - return { - name: domain, - type: 'TXT', - value: value - }; - } - /** - * Generate a recommended DMARC record for a domain - * @param domain Domain name - * @param options Configuration options for the DMARC record - * @returns Generated DMARC record - */ - generateDmarcRecord(domain, options = {}) { - const { policy = 'none', subdomainPolicy, pct = 100, rua, ruf, daysInterval = 1 } = options; - let value = 'v=DMARC1; p=' + policy; - if (subdomainPolicy) { - value += `; sp=${subdomainPolicy}`; - } - if (pct !== 100) { - value += `; pct=${pct}`; - } - if (rua) { - value += `; rua=mailto:${rua}`; - } - if (ruf) { - value += `; ruf=mailto:${ruf}`; - } - if (daysInterval !== 1) { - value += `; ri=${daysInterval * 86400}`; - } - // Add reporting format and ADKIM/ASPF alignment - value += '; fo=1; adkim=r; aspf=r'; - return { - name: `_dmarc.${domain}`, - type: 'TXT', - value: value - }; - } - /** - * Save DNS record recommendations to a file - * @param domain Domain name - * @param records DNS records to save - */ - async saveDnsRecommendations(domain, records) { - try { - const filePath = plugins.path.join(paths.dnsRecordsDir, `${domain}.recommendations.json`); - await plugins.smartfs.file(filePath).write(JSON.stringify(records, null, 2)); - console.log(`DNS recommendations for ${domain} saved to ${filePath}`); - } - catch (error) { - console.error(`Error saving DNS recommendations for ${domain}:`, error); - } - } - /** - * Get cache key value - * @param key Cache key - * @returns Cached value or undefined if not found or expired - */ - getFromCache(key) { - const cached = this.cache.get(key); - if (cached && cached.expires > Date.now()) { - return cached.data; - } - // Remove expired entry - if (cached) { - this.cache.delete(key); - } - return undefined; - } - /** - * Set cache key value - * @param key Cache key - * @param data Data to cache - * @param ttl TTL in milliseconds - */ - setInCache(key, data, ttl = this.defaultOptions.cacheTtl) { - if (ttl <= 0) - return; // Don't cache if TTL is disabled - this.cache.set(key, { - data, - expires: Date.now() + ttl - }); - } - /** - * Clear the DNS cache - * @param key Optional specific key to clear, or all cache if not provided - */ - clearCache(key) { - if (key) { - this.cache.delete(key); - } - else { - this.cache.clear(); - } - } - /** - * Promise-based wrapper for dns.resolveMx - * @param domain Domain to resolve - * @param timeout Timeout in milliseconds - * @returns Promise resolving to MX records - */ - dnsResolveMx(domain, timeout = 5000) { - return new Promise((resolve, reject) => { - const timeoutId = setTimeout(() => { - reject(new Error(`DNS MX lookup timeout for ${domain}`)); - }, timeout); - plugins.dns.resolveMx(domain, (err, addresses) => { - clearTimeout(timeoutId); - if (err) { - reject(err); - } - else { - resolve(addresses); - } - }); - }); - } - /** - * Promise-based wrapper for dns.resolveTxt - * @param domain Domain to resolve - * @param timeout Timeout in milliseconds - * @returns Promise resolving to TXT records - */ - dnsResolveTxt(domain, timeout = 5000) { - return new Promise((resolve, reject) => { - const timeoutId = setTimeout(() => { - reject(new Error(`DNS TXT lookup timeout for ${domain}`)); - }, timeout); - plugins.dns.resolveTxt(domain, (err, records) => { - clearTimeout(timeoutId); - if (err) { - reject(err); - } - else { - resolve(records); - } - }); - }); - } - /** - * Generate all recommended DNS records for proper email authentication - * @param domain Domain to generate records for - * @returns Array of recommended DNS records - */ - async generateAllRecommendedRecords(domain) { - const records = []; - // Get DKIM record (already created by DKIMCreator) - try { - // Call the DKIM creator directly - const dkimRecord = await this.dkimCreator.getDNSRecordForDomain(domain); - records.push(dkimRecord); - } - catch (error) { - console.error(`Error getting DKIM record for ${domain}:`, error); - } - // Generate SPF record - const spfRecord = this.generateSpfRecord(domain, { - includeMx: true, - includeA: true, - policy: 'softfail' - }); - records.push(spfRecord); - // Generate DMARC record - const dmarcRecord = this.generateDmarcRecord(domain, { - policy: 'none', // Start with monitoring mode - rua: `dmarc@${domain}` // Replace with appropriate report address - }); - records.push(dmarcRecord); - // Save recommendations - await this.saveDnsRecommendations(domain, records); - return records; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dnsmanager.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.dnsmanager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.domain.registry.d.ts b/dist_ts/mail/routing/classes.domain.registry.d.ts deleted file mode 100644 index 1e09c30..0000000 --- a/dist_ts/mail/routing/classes.domain.registry.d.ts +++ /dev/null @@ -1,54 +0,0 @@ -import type { IEmailDomainConfig } from './interfaces.js'; -/** - * Registry for email domain configurations - * Provides fast lookups and validation for domains - */ -export declare class DomainRegistry { - private domains; - private defaults; - constructor(domainConfigs: IEmailDomainConfig[], defaults?: { - dnsMode?: 'forward' | 'internal-dns' | 'external-dns'; - dkim?: IEmailDomainConfig['dkim']; - rateLimits?: IEmailDomainConfig['rateLimits']; - }); - /** - * Get default DKIM configuration - */ - private getDefaultDkimConfig; - /** - * Apply defaults to a domain configuration - */ - private applyDefaults; - /** - * Check if a domain is registered - */ - isDomainRegistered(domain: string): boolean; - /** - * Check if an email address belongs to a registered domain - */ - isEmailRegistered(email: string): boolean; - /** - * Get domain configuration - */ - getDomainConfig(domain: string): IEmailDomainConfig | undefined; - /** - * Get domain configuration for an email address - */ - getEmailDomainConfig(email: string): IEmailDomainConfig | undefined; - /** - * Extract domain from email address - */ - private extractDomain; - /** - * Get all registered domains - */ - getAllDomains(): string[]; - /** - * Get all domain configurations - */ - getAllConfigs(): IEmailDomainConfig[]; - /** - * Get domains by DNS mode - */ - getDomainsByMode(mode: 'forward' | 'internal-dns' | 'external-dns'): IEmailDomainConfig[]; -} diff --git a/dist_ts/mail/routing/classes.domain.registry.js b/dist_ts/mail/routing/classes.domain.registry.js deleted file mode 100644 index e1c1ef3..0000000 --- a/dist_ts/mail/routing/classes.domain.registry.js +++ /dev/null @@ -1,119 +0,0 @@ -import { logger } from '../../logger.js'; -/** - * Registry for email domain configurations - * Provides fast lookups and validation for domains - */ -export class DomainRegistry { - domains = new Map(); - defaults; - constructor(domainConfigs, defaults) { - // Set defaults - this.defaults = { - dnsMode: defaults?.dnsMode || 'external-dns', - ...this.getDefaultDkimConfig(), - ...defaults?.dkim, - rateLimits: defaults?.rateLimits - }; - // Process and store domain configurations - for (const config of domainConfigs) { - const processedConfig = this.applyDefaults(config); - this.domains.set(config.domain.toLowerCase(), processedConfig); - logger.log('info', `Registered domain: ${config.domain} with DNS mode: ${processedConfig.dnsMode}`); - } - } - /** - * Get default DKIM configuration - */ - getDefaultDkimConfig() { - return { - selector: 'default', - keySize: 2048, - rotateKeys: false, - rotationInterval: 90 - }; - } - /** - * Apply defaults to a domain configuration - */ - applyDefaults(config) { - return { - ...config, - dnsMode: config.dnsMode || this.defaults.dnsMode, - dkim: { - ...this.getDefaultDkimConfig(), - ...this.defaults, - ...config.dkim - }, - rateLimits: { - ...this.defaults.rateLimits, - ...config.rateLimits, - outbound: { - ...this.defaults.rateLimits?.outbound, - ...config.rateLimits?.outbound - }, - inbound: { - ...this.defaults.rateLimits?.inbound, - ...config.rateLimits?.inbound - } - } - }; - } - /** - * Check if a domain is registered - */ - isDomainRegistered(domain) { - return this.domains.has(domain.toLowerCase()); - } - /** - * Check if an email address belongs to a registered domain - */ - isEmailRegistered(email) { - const domain = this.extractDomain(email); - if (!domain) - return false; - return this.isDomainRegistered(domain); - } - /** - * Get domain configuration - */ - getDomainConfig(domain) { - return this.domains.get(domain.toLowerCase()); - } - /** - * Get domain configuration for an email address - */ - getEmailDomainConfig(email) { - const domain = this.extractDomain(email); - if (!domain) - return undefined; - return this.getDomainConfig(domain); - } - /** - * Extract domain from email address - */ - extractDomain(email) { - const parts = email.toLowerCase().split('@'); - if (parts.length !== 2) - return null; - return parts[1]; - } - /** - * Get all registered domains - */ - getAllDomains() { - return Array.from(this.domains.keys()); - } - /** - * Get all domain configurations - */ - getAllConfigs() { - return Array.from(this.domains.values()); - } - /** - * Get domains by DNS mode - */ - getDomainsByMode(mode) { - return Array.from(this.domains.values()).filter(config => config.dnsMode === mode); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb21haW4ucmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL3JvdXRpbmcvY2xhc3Nlcy5kb21haW4ucmVnaXN0cnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRXpDOzs7R0FHRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBQ2pCLE9BQU8sR0FBb0MsSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUNyRCxRQUFRLENBR2Q7SUFFRixZQUNFLGFBQW1DLEVBQ25DLFFBSUM7UUFFRCxlQUFlO1FBQ2YsSUFBSSxDQUFDLFFBQVEsR0FBRztZQUNkLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxJQUFJLGNBQWM7WUFDNUMsR0FBRyxJQUFJLENBQUMsb0JBQW9CLEVBQUU7WUFDOUIsR0FBRyxRQUFRLEVBQUUsSUFBSTtZQUNqQixVQUFVLEVBQUUsUUFBUSxFQUFFLFVBQVU7U0FDakMsQ0FBQztRQUVGLDBDQUEwQztRQUMxQyxLQUFLLE1BQU0sTUFBTSxJQUFJLGFBQWEsRUFBRSxDQUFDO1lBQ25DLE1BQU0sZUFBZSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbkQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsRUFBRSxlQUFlLENBQUMsQ0FBQztZQUMvRCxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxzQkFBc0IsTUFBTSxDQUFDLE1BQU0sbUJBQW1CLGVBQWUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBQ3RHLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSyxvQkFBb0I7UUFDMUIsT0FBTztZQUNMLFFBQVEsRUFBRSxTQUFTO1lBQ25CLE9BQU8sRUFBRSxJQUFJO1lBQ2IsVUFBVSxFQUFFLEtBQUs7WUFDakIsZ0JBQWdCLEVBQUUsRUFBRTtTQUNyQixDQUFDO0lBQ0osQ0FBQztJQUVEOztPQUVHO0lBQ0ssYUFBYSxDQUFDLE1BQTBCO1FBQzlDLE9BQU87WUFDTCxHQUFHLE1BQU07WUFDVCxPQUFPLEVBQUUsTUFBTSxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQVE7WUFDakQsSUFBSSxFQUFFO2dCQUNKLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixFQUFFO2dCQUM5QixHQUFHLElBQUksQ0FBQyxRQUFRO2dCQUNoQixHQUFHLE1BQU0sQ0FBQyxJQUFJO2FBQ2Y7WUFDRCxVQUFVLEVBQUU7Z0JBQ1YsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVU7Z0JBQzNCLEdBQUcsTUFBTSxDQUFDLFVBQVU7Z0JBQ3BCLFFBQVEsRUFBRTtvQkFDUixHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsVUFBVSxFQUFFLFFBQVE7b0JBQ3JDLEdBQUcsTUFBTSxDQUFDLFVBQVUsRUFBRSxRQUFRO2lCQUMvQjtnQkFDRCxPQUFPLEVBQUU7b0JBQ1AsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsRUFBRSxPQUFPO29CQUNwQyxHQUFHLE1BQU0sQ0FBQyxVQUFVLEVBQUUsT0FBTztpQkFDOUI7YUFDRjtTQUNGLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSCxrQkFBa0IsQ0FBQyxNQUFjO1FBQy9CLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUM7SUFDaEQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsaUJBQWlCLENBQUMsS0FBYTtRQUM3QixNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3pDLElBQUksQ0FBQyxNQUFNO1lBQUUsT0FBTyxLQUFLLENBQUM7UUFDMUIsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDekMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsZUFBZSxDQUFDLE1BQWM7UUFDNUIsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxvQkFBb0IsQ0FBQyxLQUFhO1FBQ2hDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLE1BQU07WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUM5QixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVEOztPQUVHO0lBQ0ssYUFBYSxDQUFDLEtBQWE7UUFDakMsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLFdBQVcsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUM3QyxJQUFJLEtBQUssQ0FBQyxNQUFNLEtBQUssQ0FBQztZQUFFLE9BQU8sSUFBSSxDQUFDO1FBQ3BDLE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xCLENBQUM7SUFFRDs7T0FFRztJQUNILGFBQWE7UUFDWCxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRDs7T0FFRztJQUNILGFBQWE7UUFDWCxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRDs7T0FFRztJQUNILGdCQUFnQixDQUFDLElBQWlEO1FBQ2hFLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sS0FBSyxJQUFJLENBQUMsQ0FBQztJQUNyRixDQUFDO0NBQ0YifQ== \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.email.config.d.ts b/dist_ts/mail/routing/classes.email.config.d.ts deleted file mode 100644 index b8e8d76..0000000 --- a/dist_ts/mail/routing/classes.email.config.d.ts +++ /dev/null @@ -1,64 +0,0 @@ -import type { EmailProcessingMode } from '../delivery/interfaces.js'; -export type { EmailProcessingMode }; -/** - * Domain rule interface for pattern-based routing - */ -export interface IDomainRule { - pattern: string; - mode: EmailProcessingMode; - target?: { - server: string; - port?: number; - useTls?: boolean; - authentication?: { - user?: string; - pass?: string; - }; - }; - mtaOptions?: IMtaOptions; - contentScanning?: boolean; - scanners?: IContentScanner[]; - transformations?: ITransformation[]; - rateLimits?: { - maxMessagesPerMinute?: number; - maxRecipientsPerMessage?: number; - }; -} -/** - * MTA options interface - */ -export interface IMtaOptions { - domain?: string; - allowLocalDelivery?: boolean; - localDeliveryPath?: string; - dkimSign?: boolean; - dkimOptions?: { - domainName: string; - keySelector: string; - privateKey?: string; - }; - smtpBanner?: string; - maxConnections?: number; - connTimeout?: number; - spoolDir?: string; -} -/** - * Content scanner interface - */ -export interface IContentScanner { - type: 'spam' | 'virus' | 'attachment'; - threshold?: number; - action: 'tag' | 'reject'; - blockedExtensions?: string[]; -} -/** - * Transformation interface - */ -export interface ITransformation { - type: string; - header?: string; - value?: string; - domains?: string[]; - append?: boolean; - [key: string]: any; -} diff --git a/dist_ts/mail/routing/classes.email.config.js b/dist_ts/mail/routing/classes.email.config.js deleted file mode 100644 index dd8d9dc..0000000 --- a/dist_ts/mail/routing/classes.email.config.js +++ /dev/null @@ -1,2 +0,0 @@ -export {}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5lbWFpbC5jb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL3JvdXRpbmcvY2xhc3Nlcy5lbWFpbC5jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9 \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.email.router.d.ts b/dist_ts/mail/routing/classes.email.router.d.ts deleted file mode 100644 index 03a51ca..0000000 --- a/dist_ts/mail/routing/classes.email.router.d.ts +++ /dev/null @@ -1,171 +0,0 @@ -import { EventEmitter } from 'node:events'; -import type { IEmailRoute, IEmailContext } from './interfaces.js'; -/** - * Email router that evaluates routes and determines actions - */ -export declare class EmailRouter extends EventEmitter { - private routes; - private patternCache; - private storageManager?; - private persistChanges; - /** - * Create a new email router - * @param routes Array of email routes - * @param options Router options - */ - constructor(routes: IEmailRoute[], options?: { - storageManager?: any; - persistChanges?: boolean; - }); - /** - * Sort routes by priority (higher priority first) - * @param routes Routes to sort - * @returns Sorted routes - */ - private sortRoutesByPriority; - /** - * Get all configured routes - * @returns Array of routes - */ - getRoutes(): IEmailRoute[]; - /** - * Update routes - * @param routes New routes - * @param persist Whether to persist changes (defaults to persistChanges setting) - */ - updateRoutes(routes: IEmailRoute[], persist?: boolean): Promise; - /** - * Set routes (alias for updateRoutes) - * @param routes New routes - * @param persist Whether to persist changes - */ - setRoutes(routes: IEmailRoute[], persist?: boolean): Promise; - /** - * Clear the pattern cache - */ - clearCache(): void; - /** - * Evaluate routes and find the first match - * @param context Email context - * @returns Matched route or null - */ - evaluateRoutes(context: IEmailContext): Promise; - /** - * Check if a route matches the context - * @param route Route to check - * @param context Email context - * @returns True if route matches - */ - private matchesRoute; - /** - * Check if email recipients match patterns - * @param email Email to check - * @param patterns Patterns to match - * @returns True if any recipient matches - */ - private matchesRecipients; - /** - * Check if email sender matches patterns - * @param email Email to check - * @param patterns Patterns to match - * @returns True if sender matches - */ - private matchesSenders; - /** - * Check if client IP matches patterns - * @param context Email context - * @param patterns IP patterns to match - * @returns True if IP matches - */ - private matchesClientIp; - /** - * Check if email headers match patterns - * @param email Email to check - * @param headerPatterns Header patterns to match - * @returns True if headers match - */ - private matchesHeaders; - /** - * Check if email size matches range - * @param email Email to check - * @param sizeRange Size range to match - * @returns True if size is in range - */ - private matchesSize; - /** - * Check if email subject matches pattern - * @param email Email to check - * @param pattern Pattern to match - * @returns True if subject matches - */ - private matchesSubject; - /** - * Check if a string matches a glob pattern - * @param str String to check - * @param pattern Glob pattern - * @returns True if matches - */ - private matchesPattern; - /** - * Convert glob pattern to RegExp - * @param pattern Glob pattern - * @returns Regular expression - */ - private globToRegExp; - /** - * Check if IP is in CIDR range - * @param ip IP address to check - * @param cidr CIDR notation (e.g., '192.168.0.0/16') - * @returns True if IP is in range - */ - private ipInCidr; - /** - * Convert IP address to number - * @param ip IP address - * @returns Number representation - */ - private ipToNumber; - /** - * Calculate approximate email size in bytes - * @param email Email to measure - * @returns Size in bytes - */ - private calculateEmailSize; - /** - * Save current routes to storage - */ - saveRoutes(): Promise; - /** - * Load routes from storage - * @param options Load options - */ - loadRoutes(options?: { - merge?: boolean; - replace?: boolean; - }): Promise; - /** - * Add a route - * @param route Route to add - * @param persist Whether to persist changes - */ - addRoute(route: IEmailRoute, persist?: boolean): Promise; - /** - * Remove a route by name - * @param name Route name - * @param persist Whether to persist changes - */ - removeRoute(name: string, persist?: boolean): Promise; - /** - * Update a route - * @param name Route name - * @param route Updated route data - * @param persist Whether to persist changes - */ - updateRoute(name: string, route: IEmailRoute, persist?: boolean): Promise; - /** - * Get a route by name - * @param name Route name - * @returns Route or undefined - */ - getRoute(name: string): IEmailRoute | undefined; -} diff --git a/dist_ts/mail/routing/classes.email.router.js b/dist_ts/mail/routing/classes.email.router.js deleted file mode 100644 index 142c2c5..0000000 --- a/dist_ts/mail/routing/classes.email.router.js +++ /dev/null @@ -1,494 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { EventEmitter } from 'node:events'; -/** - * Email router that evaluates routes and determines actions - */ -export class EmailRouter extends EventEmitter { - routes; - patternCache = new Map(); - storageManager; // StorageManager instance - persistChanges; - /** - * Create a new email router - * @param routes Array of email routes - * @param options Router options - */ - constructor(routes, options) { - super(); - this.routes = this.sortRoutesByPriority(routes); - this.storageManager = options?.storageManager; - this.persistChanges = options?.persistChanges ?? !!this.storageManager; - // If storage manager is provided, try to load persisted routes - if (this.storageManager) { - this.loadRoutes({ merge: true }).catch(error => { - console.error(`Failed to load persisted routes: ${error.message}`); - }); - } - } - /** - * Sort routes by priority (higher priority first) - * @param routes Routes to sort - * @returns Sorted routes - */ - sortRoutesByPriority(routes) { - return [...routes].sort((a, b) => { - const priorityA = a.priority ?? 0; - const priorityB = b.priority ?? 0; - return priorityB - priorityA; // Higher priority first - }); - } - /** - * Get all configured routes - * @returns Array of routes - */ - getRoutes() { - return [...this.routes]; - } - /** - * Update routes - * @param routes New routes - * @param persist Whether to persist changes (defaults to persistChanges setting) - */ - async updateRoutes(routes, persist) { - this.routes = this.sortRoutesByPriority(routes); - this.clearCache(); - this.emit('routesUpdated', this.routes); - // Persist if requested or if persistChanges is enabled - if (persist ?? this.persistChanges) { - await this.saveRoutes(); - } - } - /** - * Set routes (alias for updateRoutes) - * @param routes New routes - * @param persist Whether to persist changes - */ - async setRoutes(routes, persist) { - await this.updateRoutes(routes, persist); - } - /** - * Clear the pattern cache - */ - clearCache() { - this.patternCache.clear(); - this.emit('cacheCleared'); - } - /** - * Evaluate routes and find the first match - * @param context Email context - * @returns Matched route or null - */ - async evaluateRoutes(context) { - for (const route of this.routes) { - if (await this.matchesRoute(route, context)) { - this.emit('routeMatched', route, context); - return route; - } - } - return null; - } - /** - * Check if a route matches the context - * @param route Route to check - * @param context Email context - * @returns True if route matches - */ - async matchesRoute(route, context) { - const match = route.match; - // Check recipients - if (match.recipients && !this.matchesRecipients(context.email, match.recipients)) { - return false; - } - // Check senders - if (match.senders && !this.matchesSenders(context.email, match.senders)) { - return false; - } - // Check client IP - if (match.clientIp && !this.matchesClientIp(context, match.clientIp)) { - return false; - } - // Check authentication - if (match.authenticated !== undefined && - context.session.authenticated !== match.authenticated) { - return false; - } - // Check headers - if (match.headers && !this.matchesHeaders(context.email, match.headers)) { - return false; - } - // Check size - if (match.sizeRange && !this.matchesSize(context.email, match.sizeRange)) { - return false; - } - // Check subject - if (match.subject && !this.matchesSubject(context.email, match.subject)) { - return false; - } - // Check attachments - if (match.hasAttachments !== undefined && - (context.email.attachments.length > 0) !== match.hasAttachments) { - return false; - } - // All checks passed - return true; - } - /** - * Check if email recipients match patterns - * @param email Email to check - * @param patterns Patterns to match - * @returns True if any recipient matches - */ - matchesRecipients(email, patterns) { - const patternArray = Array.isArray(patterns) ? patterns : [patterns]; - const recipients = email.getAllRecipients(); - for (const recipient of recipients) { - for (const pattern of patternArray) { - if (this.matchesPattern(recipient, pattern)) { - return true; - } - } - } - return false; - } - /** - * Check if email sender matches patterns - * @param email Email to check - * @param patterns Patterns to match - * @returns True if sender matches - */ - matchesSenders(email, patterns) { - const patternArray = Array.isArray(patterns) ? patterns : [patterns]; - const sender = email.from; - for (const pattern of patternArray) { - if (this.matchesPattern(sender, pattern)) { - return true; - } - } - return false; - } - /** - * Check if client IP matches patterns - * @param context Email context - * @param patterns IP patterns to match - * @returns True if IP matches - */ - matchesClientIp(context, patterns) { - const patternArray = Array.isArray(patterns) ? patterns : [patterns]; - const clientIp = context.session.remoteAddress; - if (!clientIp) { - return false; - } - for (const pattern of patternArray) { - // Check for CIDR notation - if (pattern.includes('/')) { - if (this.ipInCidr(clientIp, pattern)) { - return true; - } - } - else { - // Exact match - if (clientIp === pattern) { - return true; - } - } - } - return false; - } - /** - * Check if email headers match patterns - * @param email Email to check - * @param headerPatterns Header patterns to match - * @returns True if headers match - */ - matchesHeaders(email, headerPatterns) { - for (const [header, pattern] of Object.entries(headerPatterns)) { - const value = email.headers[header]; - if (!value) { - return false; - } - if (pattern instanceof RegExp) { - if (!pattern.test(value)) { - return false; - } - } - else { - if (value !== pattern) { - return false; - } - } - } - return true; - } - /** - * Check if email size matches range - * @param email Email to check - * @param sizeRange Size range to match - * @returns True if size is in range - */ - matchesSize(email, sizeRange) { - // Calculate approximate email size - const size = this.calculateEmailSize(email); - if (sizeRange.min !== undefined && size < sizeRange.min) { - return false; - } - if (sizeRange.max !== undefined && size > sizeRange.max) { - return false; - } - return true; - } - /** - * Check if email subject matches pattern - * @param email Email to check - * @param pattern Pattern to match - * @returns True if subject matches - */ - matchesSubject(email, pattern) { - const subject = email.subject || ''; - if (pattern instanceof RegExp) { - return pattern.test(subject); - } - else { - return this.matchesPattern(subject, pattern); - } - } - /** - * Check if a string matches a glob pattern - * @param str String to check - * @param pattern Glob pattern - * @returns True if matches - */ - matchesPattern(str, pattern) { - // Check cache - const cacheKey = `${str}:${pattern}`; - const cached = this.patternCache.get(cacheKey); - if (cached !== undefined) { - return cached; - } - // Convert glob to regex - const regexPattern = this.globToRegExp(pattern); - const matches = regexPattern.test(str); - // Cache result - this.patternCache.set(cacheKey, matches); - return matches; - } - /** - * Convert glob pattern to RegExp - * @param pattern Glob pattern - * @returns Regular expression - */ - globToRegExp(pattern) { - // Escape special regex characters except * and ? - let regexString = pattern - .replace(/[.+^${}()|[\]\\]/g, '\\$&') - .replace(/\*/g, '.*') - .replace(/\?/g, '.'); - return new RegExp(`^${regexString}$`, 'i'); - } - /** - * Check if IP is in CIDR range - * @param ip IP address to check - * @param cidr CIDR notation (e.g., '192.168.0.0/16') - * @returns True if IP is in range - */ - ipInCidr(ip, cidr) { - try { - const [range, bits] = cidr.split('/'); - const mask = parseInt(bits, 10); - // Convert IPs to numbers - const ipNum = this.ipToNumber(ip); - const rangeNum = this.ipToNumber(range); - // Calculate mask - const maskBits = 0xffffffff << (32 - mask); - // Check if in range - return (ipNum & maskBits) === (rangeNum & maskBits); - } - catch { - return false; - } - } - /** - * Convert IP address to number - * @param ip IP address - * @returns Number representation - */ - ipToNumber(ip) { - const parts = ip.split('.'); - return parts.reduce((acc, part, index) => { - return acc + (parseInt(part, 10) << (8 * (3 - index))); - }, 0); - } - /** - * Calculate approximate email size in bytes - * @param email Email to measure - * @returns Size in bytes - */ - calculateEmailSize(email) { - let size = 0; - // Headers - for (const [key, value] of Object.entries(email.headers)) { - size += key.length + value.length + 4; // ": " + "\r\n" - } - // Body - size += (email.text || '').length; - size += (email.html || '').length; - // Attachments - for (const attachment of email.attachments) { - if (attachment.content) { - size += attachment.content.length; - } - } - return size; - } - /** - * Save current routes to storage - */ - async saveRoutes() { - if (!this.storageManager) { - this.emit('persistenceWarning', 'Cannot save routes: StorageManager not configured'); - return; - } - try { - // Validate all routes before saving - for (const route of this.routes) { - if (!route.name || !route.match || !route.action) { - throw new Error(`Invalid route: ${JSON.stringify(route)}`); - } - } - const routesData = JSON.stringify(this.routes, null, 2); - await this.storageManager.set('/email/routes/config.json', routesData); - this.emit('routesPersisted', this.routes.length); - } - catch (error) { - console.error(`Failed to save routes: ${error.message}`); - throw error; - } - } - /** - * Load routes from storage - * @param options Load options - */ - async loadRoutes(options) { - if (!this.storageManager) { - this.emit('persistenceWarning', 'Cannot load routes: StorageManager not configured'); - return []; - } - try { - const routesData = await this.storageManager.get('/email/routes/config.json'); - if (!routesData) { - return []; - } - const loadedRoutes = JSON.parse(routesData); - // Validate loaded routes - for (const route of loadedRoutes) { - if (!route.name || !route.match || !route.action) { - console.warn(`Skipping invalid route: ${JSON.stringify(route)}`); - continue; - } - } - if (options?.replace) { - // Replace all routes - this.routes = this.sortRoutesByPriority(loadedRoutes); - } - else if (options?.merge) { - // Merge with existing routes (loaded routes take precedence) - const routeMap = new Map(); - // Add existing routes - for (const route of this.routes) { - routeMap.set(route.name, route); - } - // Override with loaded routes - for (const route of loadedRoutes) { - routeMap.set(route.name, route); - } - this.routes = this.sortRoutesByPriority(Array.from(routeMap.values())); - } - this.clearCache(); - this.emit('routesLoaded', loadedRoutes.length); - return loadedRoutes; - } - catch (error) { - console.error(`Failed to load routes: ${error.message}`); - throw error; - } - } - /** - * Add a route - * @param route Route to add - * @param persist Whether to persist changes - */ - async addRoute(route, persist) { - // Validate route - if (!route.name || !route.match || !route.action) { - throw new Error('Invalid route: missing required fields'); - } - // Check if route already exists - const existingIndex = this.routes.findIndex(r => r.name === route.name); - if (existingIndex >= 0) { - throw new Error(`Route '${route.name}' already exists`); - } - // Add route - this.routes.push(route); - this.routes = this.sortRoutesByPriority(this.routes); - this.clearCache(); - this.emit('routeAdded', route); - this.emit('routesUpdated', this.routes); - // Persist if requested - if (persist ?? this.persistChanges) { - await this.saveRoutes(); - } - } - /** - * Remove a route by name - * @param name Route name - * @param persist Whether to persist changes - */ - async removeRoute(name, persist) { - const index = this.routes.findIndex(r => r.name === name); - if (index < 0) { - throw new Error(`Route '${name}' not found`); - } - const removedRoute = this.routes.splice(index, 1)[0]; - this.clearCache(); - this.emit('routeRemoved', removedRoute); - this.emit('routesUpdated', this.routes); - // Persist if requested - if (persist ?? this.persistChanges) { - await this.saveRoutes(); - } - } - /** - * Update a route - * @param name Route name - * @param route Updated route data - * @param persist Whether to persist changes - */ - async updateRoute(name, route, persist) { - // Validate route - if (!route.name || !route.match || !route.action) { - throw new Error('Invalid route: missing required fields'); - } - const index = this.routes.findIndex(r => r.name === name); - if (index < 0) { - throw new Error(`Route '${name}' not found`); - } - // Update route - this.routes[index] = route; - this.routes = this.sortRoutesByPriority(this.routes); - this.clearCache(); - this.emit('routeUpdated', route); - this.emit('routesUpdated', this.routes); - // Persist if requested - if (persist ?? this.persistChanges) { - await this.saveRoutes(); - } - } - /** - * Get a route by name - * @param name Route name - * @returns Route or undefined - */ - getRoute(name) { - return this.routes.find(r => r.name === name); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.email.router.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.email.router.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/routing/classes.unified.email.server.d.ts b/dist_ts/mail/routing/classes.unified.email.server.d.ts deleted file mode 100644 index 2db93bb..0000000 --- a/dist_ts/mail/routing/classes.unified.email.server.d.ts +++ /dev/null @@ -1,451 +0,0 @@ -import { EventEmitter } from 'events'; -import { DKIMCreator } from '../security/classes.dkimcreator.js'; -interface IIPWarmupConfig { - enabled?: boolean; - ips?: string[]; - [key: string]: any; -} -interface IReputationMonitorConfig { - enabled?: boolean; - domains?: string[]; - [key: string]: any; -} -import type { IEmailRoute, IEmailDomainConfig } from './interfaces.js'; -import { Email } from '../core/classes.email.js'; -import { DomainRegistry } from './classes.domain.registry.js'; -import { BounceType, BounceCategory } from '../core/classes.bouncemanager.js'; -import type { SmtpClient } from '../delivery/smtpclient/smtp-client.js'; -import { MultiModeDeliverySystem } from '../delivery/classes.delivery.system.js'; -import { UnifiedDeliveryQueue } from '../delivery/classes.delivery.queue.js'; -import { UnifiedRateLimiter, type IHierarchicalRateLimits } from '../delivery/classes.unified.rate.limiter.js'; -import type { EmailProcessingMode, ISmtpSession as IBaseSmtpSession } from '../delivery/interfaces.js'; -/** External DcRouter interface shape used by UnifiedEmailServer */ -interface DcRouter { - storageManager: any; - dnsServer?: any; - options?: any; -} -/** - * Extended SMTP session interface with route information - */ -export interface IExtendedSmtpSession extends ISmtpSession { - /** - * Matched route for this session - */ - matchedRoute?: IEmailRoute; -} -/** - * Options for the unified email server - */ -export interface IUnifiedEmailServerOptions { - ports: number[]; - hostname: string; - domains: IEmailDomainConfig[]; - banner?: string; - debug?: boolean; - useSocketHandler?: boolean; - auth?: { - required?: boolean; - methods?: ('PLAIN' | 'LOGIN' | 'OAUTH2')[]; - users?: Array<{ - username: string; - password: string; - }>; - }; - tls?: { - certPath?: string; - keyPath?: string; - caPath?: string; - minVersion?: string; - ciphers?: string; - }; - maxMessageSize?: number; - maxClients?: number; - maxConnections?: number; - connectionTimeout?: number; - socketTimeout?: number; - routes: IEmailRoute[]; - defaults?: { - dnsMode?: 'forward' | 'internal-dns' | 'external-dns'; - dkim?: IEmailDomainConfig['dkim']; - rateLimits?: IEmailDomainConfig['rateLimits']; - }; - outbound?: { - maxConnections?: number; - connectionTimeout?: number; - socketTimeout?: number; - retryAttempts?: number; - defaultFrom?: string; - }; - rateLimits?: IHierarchicalRateLimits; - ipWarmupConfig?: IIPWarmupConfig; - reputationMonitorConfig?: IReputationMonitorConfig; -} -/** - * Extended SMTP session interface for UnifiedEmailServer - */ -export interface ISmtpSession extends IBaseSmtpSession { - /** - * User information if authenticated - */ - user?: { - username: string; - [key: string]: any; - }; - /** - * Matched route for this session - */ - matchedRoute?: IEmailRoute; -} -/** - * Authentication data for SMTP - */ -import type { ISmtpAuth } from '../delivery/interfaces.js'; -export type IAuthData = ISmtpAuth; -/** - * Server statistics - */ -export interface IServerStats { - startTime: Date; - connections: { - current: number; - total: number; - }; - messages: { - processed: number; - delivered: number; - failed: number; - }; - processingTime: { - avg: number; - max: number; - min: number; - }; -} -/** - * Unified email server that handles all email traffic with pattern-based routing - */ -export declare class UnifiedEmailServer extends EventEmitter { - private dcRouter; - private options; - private emailRouter; - domainRegistry: DomainRegistry; - private servers; - private stats; - dkimCreator: DKIMCreator; - private rustBridge; - private ipReputationChecker; - private bounceManager; - private ipWarmupManager; - private senderReputationMonitor; - deliveryQueue: UnifiedDeliveryQueue; - deliverySystem: MultiModeDeliverySystem; - private rateLimiter; - private dkimKeys; - private smtpClients; - constructor(dcRouter: DcRouter, options: IUnifiedEmailServerOptions); - /** - * Get or create an SMTP client for the given host and port - * Uses connection pooling for efficiency - */ - getSmtpClient(host: string, port?: number): SmtpClient; - /** - * Start the unified email server - */ - start(): Promise; - /** - * Stop the unified email server - */ - stop(): Promise; - /** - * Handle an emailReceived event from the Rust SMTP server. - * Decodes the email data, processes it through the routing system, - * and sends back the result via the correlation-ID callback. - */ - private handleRustEmailReceived; - /** - * Handle an authRequest event from the Rust SMTP server. - * Validates credentials and sends back the result. - */ - private handleRustAuthRequest; - /** - * Verify inbound email security (DKIM/SPF/DMARC) using pre-computed Rust results - * or falling back to IPC call if no pre-computed results are available. - */ - private verifyInboundSecurity; - /** - * Process email based on routing rules - */ - processEmailByMode(emailData: Email | Buffer, session: IExtendedSmtpSession): Promise; - /** - * Execute action based on route configuration - */ - private executeAction; - /** - * Handle forward action - */ - private handleForwardAction; - /** - * Handle process action - */ - private handleProcessAction; - /** - * Handle deliver action - */ - private handleDeliverAction; - /** - * Handle reject action - */ - private handleRejectAction; - /** - * Handle email in MTA mode (programmatic processing) - */ - private _handleMtaMode; - /** - * Handle email in process mode (store-and-forward with scanning) - */ - private _handleProcessMode; - /** - * Get file extension from filename - */ - private getFileExtension; - /** - * Set up DKIM configuration for all domains - */ - private setupDkimForDomains; - /** - * Apply per-domain rate limits from domain configurations - */ - private applyDomainRateLimits; - /** - * Check and rotate DKIM keys if needed - */ - private checkAndRotateDkimKeys; - /** - * Generate SmartProxy routes for email ports - */ - generateProxyRoutes(portMapping?: Record): any[]; - /** - * Update server configuration - */ - updateOptions(options: Partial): void; - /** - * Update email routes - */ - updateEmailRoutes(routes: IEmailRoute[]): void; - /** - * Get server statistics - */ - getStats(): IServerStats; - /** - * Get domain registry - */ - getDomainRegistry(): DomainRegistry; - /** - * Update email routes dynamically - */ - updateRoutes(routes: IEmailRoute[]): void; - /** - * Send an email through the delivery system - * @param email The email to send - * @param mode The processing mode to use - * @param rule Optional rule to apply - * @param options Optional sending options - * @returns The ID of the queued email - */ - sendEmail(email: Email, mode?: EmailProcessingMode, route?: IEmailRoute, options?: { - skipSuppressionCheck?: boolean; - ipAddress?: string; - isTransactional?: boolean; - }): Promise; - /** - * Handle DKIM signing for an email - * @param email The email to sign - * @param domain The domain to sign with - * @param selector The DKIM selector - */ - private handleDkimSigning; - /** - * Process a bounce notification email - * @param bounceEmail The email containing bounce notification information - * @returns Processed bounce record or null if not a bounce - */ - processBounceNotification(bounceEmail: Email): Promise; - /** - * Process an SMTP failure as a bounce - * @param recipient Recipient email that failed - * @param smtpResponse SMTP error response - * @param options Additional options for bounce processing - * @returns Processed bounce record - */ - processSmtpFailure(recipient: string, smtpResponse: string, options?: { - sender?: string; - originalEmailId?: string; - statusCode?: string; - headers?: Record; - }): Promise; - /** - * Check if an email address is suppressed (has bounced previously) - * @param email Email address to check - * @returns Whether the email is suppressed - */ - isEmailSuppressed(email: string): boolean; - /** - * Get suppression information for an email - * @param email Email address to check - * @returns Suppression information or null if not suppressed - */ - getSuppressionInfo(email: string): { - reason: string; - timestamp: number; - expiresAt?: number; - } | null; - /** - * Get bounce history information for an email - * @param email Email address to check - * @returns Bounce history or null if no bounces - */ - getBounceHistory(email: string): { - lastBounce: number; - count: number; - type: BounceType; - category: BounceCategory; - } | null; - /** - * Get all suppressed email addresses - * @returns Array of suppressed email addresses - */ - getSuppressionList(): string[]; - /** - * Get all hard bounced email addresses - * @returns Array of hard bounced email addresses - */ - getHardBouncedAddresses(): string[]; - /** - * Add an email to the suppression list - * @param email Email address to suppress - * @param reason Reason for suppression - * @param expiresAt Optional expiration time (undefined for permanent) - */ - addToSuppressionList(email: string, reason: string, expiresAt?: number): void; - /** - * Remove an email from the suppression list - * @param email Email address to remove from suppression - */ - removeFromSuppressionList(email: string): void; - /** - * Get the status of IP warmup process - * @param ipAddress Optional specific IP to check - * @returns Status of IP warmup - */ - getIPWarmupStatus(ipAddress?: string): any; - /** - * Add a new IP address to the warmup process - * @param ipAddress IP address to add - */ - addIPToWarmup(ipAddress: string): void; - /** - * Remove an IP address from the warmup process - * @param ipAddress IP address to remove - */ - removeIPFromWarmup(ipAddress: string): void; - /** - * Update metrics for an IP in the warmup process - * @param ipAddress IP address - * @param metrics Metrics to update - */ - updateIPWarmupMetrics(ipAddress: string, metrics: { - openRate?: number; - bounceRate?: number; - complaintRate?: number; - }): void; - /** - * Check if an IP can send more emails today - * @param ipAddress IP address to check - * @returns Whether the IP can send more today - */ - canIPSendMoreToday(ipAddress: string): boolean; - /** - * Check if an IP can send more emails in the current hour - * @param ipAddress IP address to check - * @returns Whether the IP can send more this hour - */ - canIPSendMoreThisHour(ipAddress: string): boolean; - /** - * Get the best IP to use for sending an email based on warmup status - * @param emailInfo Information about the email being sent - * @returns Best IP to use or null - */ - getBestIPForSending(emailInfo: { - from: string; - to: string[]; - domain: string; - isTransactional?: boolean; - }): string | null; - /** - * Set the active IP allocation policy for warmup - * @param policyName Name of the policy to set - */ - setIPAllocationPolicy(policyName: string): void; - /** - * Record that an email was sent using a specific IP - * @param ipAddress IP address used for sending - */ - recordIPSend(ipAddress: string): void; - /** - * Get reputation data for a domain - * @param domain Domain to get reputation for - * @returns Domain reputation metrics - */ - getDomainReputationData(domain: string): any; - /** - * Get summary reputation data for all monitored domains - * @returns Summary data for all domains - */ - getReputationSummary(): any; - /** - * Add a domain to the reputation monitoring system - * @param domain Domain to add - */ - addDomainToMonitoring(domain: string): void; - /** - * Remove a domain from the reputation monitoring system - * @param domain Domain to remove - */ - removeDomainFromMonitoring(domain: string): void; - /** - * Record an email event for domain reputation tracking - * @param domain Domain sending the email - * @param event Event details - */ - recordReputationEvent(domain: string, event: { - type: 'sent' | 'delivered' | 'bounce' | 'complaint' | 'open' | 'click'; - count?: number; - hardBounce?: boolean; - receivingDomain?: string; - }): void; - /** - * Check if DKIM key exists for a domain - * @param domain Domain to check - */ - hasDkimKey(domain: string): boolean; - /** - * Record successful email delivery - * @param domain Sending domain - */ - recordDelivery(domain: string): void; - /** - * Record email bounce - * @param domain Sending domain - * @param receivingDomain Receiving domain that bounced - * @param bounceType Type of bounce (hard/soft) - * @param reason Bounce reason - */ - recordBounce(domain: string, receivingDomain: string, bounceType: 'hard' | 'soft', reason: string): void; - /** - * Get the rate limiter instance - * @returns The unified rate limiter - */ - getRateLimiter(): UnifiedRateLimiter; -} -export {}; diff --git a/dist_ts/mail/routing/classes.unified.email.server.js b/dist_ts/mail/routing/classes.unified.email.server.js deleted file mode 100644 index 0da1147..0000000 --- a/dist_ts/mail/routing/classes.unified.email.server.js +++ /dev/null @@ -1,1555 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { EventEmitter } from 'events'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { DKIMCreator } from '../security/classes.dkimcreator.js'; -import { IPReputationChecker } from '../../security/classes.ipreputationchecker.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -import { EmailRouter } from './classes.email.router.js'; -import { Email } from '../core/classes.email.js'; -import { DomainRegistry } from './classes.domain.registry.js'; -import { DnsManager } from './classes.dns.manager.js'; -import { BounceManager, BounceType, BounceCategory } from '../core/classes.bouncemanager.js'; -import { createPooledSmtpClient } from '../delivery/smtpclient/create-client.js'; -import { MultiModeDeliverySystem } from '../delivery/classes.delivery.system.js'; -import { UnifiedDeliveryQueue } from '../delivery/classes.delivery.queue.js'; -import { UnifiedRateLimiter } from '../delivery/classes.unified.rate.limiter.js'; -import { SmtpState } from '../delivery/interfaces.js'; -/** - * Unified email server that handles all email traffic with pattern-based routing - */ -export class UnifiedEmailServer extends EventEmitter { - dcRouter; - options; - emailRouter; - domainRegistry; - servers = []; - stats; - // Add components needed for sending and securing emails - dkimCreator; - rustBridge; - ipReputationChecker; - bounceManager; - ipWarmupManager; - senderReputationMonitor; - deliveryQueue; - deliverySystem; - rateLimiter; // TODO: Implement rate limiting in SMTP server handlers - dkimKeys = new Map(); // domain -> private key - smtpClients = new Map(); // host:port -> client - constructor(dcRouter, options) { - super(); - this.dcRouter = dcRouter; - // Set default options - this.options = { - ...options, - banner: options.banner || `${options.hostname} ESMTP UnifiedEmailServer`, - maxMessageSize: options.maxMessageSize || 10 * 1024 * 1024, // 10MB - maxClients: options.maxClients || 100, - maxConnections: options.maxConnections || 1000, - connectionTimeout: options.connectionTimeout || 60000, // 1 minute - socketTimeout: options.socketTimeout || 60000 // 1 minute - }; - // Initialize Rust security bridge (singleton) - this.rustBridge = RustSecurityBridge.getInstance(); - // Initialize DKIM creator with storage manager - this.dkimCreator = new DKIMCreator(paths.keysDir, dcRouter.storageManager); - // Initialize IP reputation checker with storage manager - this.ipReputationChecker = IPReputationChecker.getInstance({ - enableLocalCache: true, - enableDNSBL: true, - enableIPInfo: true - }, dcRouter.storageManager); - // Initialize bounce manager with storage manager - this.bounceManager = new BounceManager({ - maxCacheSize: 10000, - cacheTTL: 30 * 24 * 60 * 60 * 1000, // 30 days - storageManager: dcRouter.storageManager - }); - // IP warmup manager and sender reputation monitor are optional - // They will be initialized when the deliverability module is available - this.ipWarmupManager = null; - this.senderReputationMonitor = null; - // Initialize domain registry - this.domainRegistry = new DomainRegistry(options.domains, options.defaults); - // Initialize email router with routes and storage manager - this.emailRouter = new EmailRouter(options.routes || [], { - storageManager: dcRouter.storageManager, - persistChanges: true - }); - // Initialize rate limiter - this.rateLimiter = new UnifiedRateLimiter(options.rateLimits || { - global: { - maxConnectionsPerIP: 10, - maxMessagesPerMinute: 100, - maxRecipientsPerMessage: 50, - maxErrorsPerIP: 10, - maxAuthFailuresPerIP: 5, - blockDuration: 300000 // 5 minutes - } - }); - // Initialize delivery components - const queueOptions = { - storageType: 'memory', // Default to memory storage - maxRetries: 3, - baseRetryDelay: 300000, // 5 minutes - maxRetryDelay: 3600000 // 1 hour - }; - this.deliveryQueue = new UnifiedDeliveryQueue(queueOptions); - const deliveryOptions = { - globalRateLimit: 100, // Default to 100 emails per minute - concurrentDeliveries: 10, - processBounces: true, - bounceHandler: { - processSmtpFailure: this.processSmtpFailure.bind(this) - }, - onDeliverySuccess: async (item, _result) => { - // Record delivery success event for reputation monitoring - const email = item.processingResult; - const senderDomain = email.from.split('@')[1]; - if (senderDomain) { - this.recordReputationEvent(senderDomain, { - type: 'delivered', - count: email.to.length - }); - } - } - }; - this.deliverySystem = new MultiModeDeliverySystem(this.deliveryQueue, deliveryOptions, this); - // Initialize statistics - this.stats = { - startTime: new Date(), - connections: { - current: 0, - total: 0 - }, - messages: { - processed: 0, - delivered: 0, - failed: 0 - }, - processingTime: { - avg: 0, - max: 0, - min: 0 - } - }; - // We'll create the SMTP servers during the start() method - } - /** - * Get or create an SMTP client for the given host and port - * Uses connection pooling for efficiency - */ - getSmtpClient(host, port = 25) { - const clientKey = `${host}:${port}`; - // Check if we already have a client for this destination - let client = this.smtpClients.get(clientKey); - if (!client) { - // Create a new pooled SMTP client - client = createPooledSmtpClient({ - host, - port, - secure: port === 465, - connectionTimeout: this.options.outbound?.connectionTimeout || 30000, - socketTimeout: this.options.outbound?.socketTimeout || 120000, - maxConnections: this.options.outbound?.maxConnections || 10, - maxMessages: 1000, // Messages per connection before reconnect - pool: true, - debug: false - }); - this.smtpClients.set(clientKey, client); - logger.log('info', `Created new SMTP client pool for ${clientKey}`); - } - return client; - } - /** - * Start the unified email server - */ - async start() { - logger.log('info', `Starting UnifiedEmailServer on ports: ${this.options.ports.join(', ')}`); - try { - // Initialize the delivery queue - await this.deliveryQueue.initialize(); - logger.log('info', 'Email delivery queue initialized'); - // Start the delivery system - await this.deliverySystem.start(); - logger.log('info', 'Email delivery system started'); - // Start Rust security bridge — required for all security operations - const bridgeOk = await this.rustBridge.start(); - if (!bridgeOk) { - throw new Error('Rust security bridge failed to start. The mailer-bin binary is required. Run "pnpm build" to compile it.'); - } - logger.log('info', 'Rust security bridge started — Rust is the primary security backend'); - // Set up DKIM for all domains - await this.setupDkimForDomains(); - logger.log('info', 'DKIM configuration completed for all domains'); - // Create DNS manager and ensure all DNS records are created - const dnsManager = new DnsManager(this.dcRouter); - await dnsManager.ensureDnsRecords(this.domainRegistry.getAllConfigs(), this.dkimCreator); - logger.log('info', 'DNS records ensured for all configured domains'); - // Apply per-domain rate limits - this.applyDomainRateLimits(); - logger.log('info', 'Per-domain rate limits configured'); - // Check and rotate DKIM keys if needed - await this.checkAndRotateDkimKeys(); - logger.log('info', 'DKIM key rotation check completed'); - // Ensure we have the necessary TLS options - const hasTlsConfig = this.options.tls?.keyPath && this.options.tls?.certPath; - // Prepare the certificate and key if available - let tlsCertPem; - let tlsKeyPem; - if (hasTlsConfig) { - try { - tlsKeyPem = plugins.fs.readFileSync(this.options.tls.keyPath, 'utf8'); - tlsCertPem = plugins.fs.readFileSync(this.options.tls.certPath, 'utf8'); - logger.log('info', 'TLS certificates loaded successfully'); - } - catch (error) { - logger.log('warn', `Failed to load TLS certificates: ${error.message}`); - } - } - // --- Start Rust SMTP server --- - // Register event handlers for email reception and auth - this.rustBridge.onEmailReceived(async (data) => { - try { - await this.handleRustEmailReceived(data); - } - catch (err) { - logger.log('error', `Error handling email from Rust SMTP: ${err.message}`); - // Send rejection back to Rust - await this.rustBridge.sendEmailProcessingResult({ - correlationId: data.correlationId, - accepted: false, - smtpCode: 451, - smtpMessage: 'Internal processing error', - }); - } - }); - this.rustBridge.onAuthRequest(async (data) => { - try { - await this.handleRustAuthRequest(data); - } - catch (err) { - logger.log('error', `Error handling auth from Rust SMTP: ${err.message}`); - await this.rustBridge.sendAuthResult({ - correlationId: data.correlationId, - success: false, - message: 'Internal auth error', - }); - } - }); - // Determine which ports need STARTTLS and which need implicit TLS - const smtpPorts = this.options.ports.filter(p => p !== 465); - const securePort = this.options.ports.find(p => p === 465); - const started = await this.rustBridge.startSmtpServer({ - hostname: this.options.hostname, - ports: smtpPorts, - securePort: securePort, - tlsCertPem, - tlsKeyPem, - maxMessageSize: this.options.maxMessageSize || 10 * 1024 * 1024, - maxConnections: this.options.maxConnections || this.options.maxClients || 100, - maxRecipients: 100, - connectionTimeoutSecs: this.options.connectionTimeout ? Math.floor(this.options.connectionTimeout / 1000) : 30, - dataTimeoutSecs: 60, - authEnabled: !!this.options.auth?.required || !!(this.options.auth?.users?.length), - maxAuthFailures: 3, - socketTimeoutSecs: this.options.socketTimeout ? Math.floor(this.options.socketTimeout / 1000) : 300, - processingTimeoutSecs: 30, - rateLimits: this.options.rateLimits ? { - maxConnectionsPerIp: this.options.rateLimits.global?.maxConnectionsPerIP || 50, - maxMessagesPerSender: this.options.rateLimits.global?.maxMessagesPerMinute || 100, - maxAuthFailuresPerIp: this.options.rateLimits.global?.maxAuthFailuresPerIP || 5, - windowSecs: 60, - } : undefined, - }); - if (!started) { - throw new Error('Failed to start Rust SMTP server'); - } - logger.log('info', `Rust SMTP server listening on ports: ${smtpPorts.join(', ')}${securePort ? ` + ${securePort} (TLS)` : ''}`); - logger.log('info', 'UnifiedEmailServer started successfully'); - this.emit('started'); - } - catch (error) { - logger.log('error', `Failed to start UnifiedEmailServer: ${error.message}`); - throw error; - } - } - /** - * Stop the unified email server - */ - async stop() { - logger.log('info', 'Stopping UnifiedEmailServer'); - try { - // Stop the Rust SMTP server first - try { - await this.rustBridge.stopSmtpServer(); - logger.log('info', 'Rust SMTP server stopped'); - } - catch (err) { - logger.log('warn', `Error stopping Rust SMTP server: ${err.message}`); - } - // Clear the servers array - servers will be garbage collected - this.servers = []; - // Stop Rust security bridge - await this.rustBridge.stop(); - // Stop the delivery system - if (this.deliverySystem) { - await this.deliverySystem.stop(); - logger.log('info', 'Email delivery system stopped'); - } - // Shut down the delivery queue - if (this.deliveryQueue) { - await this.deliveryQueue.shutdown(); - logger.log('info', 'Email delivery queue shut down'); - } - // Close all SMTP client connections - for (const [clientKey, client] of this.smtpClients) { - try { - await client.close(); - logger.log('info', `Closed SMTP client pool for ${clientKey}`); - } - catch (error) { - logger.log('warn', `Error closing SMTP client for ${clientKey}: ${error.message}`); - } - } - this.smtpClients.clear(); - logger.log('info', 'UnifiedEmailServer stopped successfully'); - this.emit('stopped'); - } - catch (error) { - logger.log('error', `Error stopping UnifiedEmailServer: ${error.message}`); - throw error; - } - } - // ----------------------------------------------------------------------- - // Rust SMTP server event handlers - // ----------------------------------------------------------------------- - /** - * Handle an emailReceived event from the Rust SMTP server. - * Decodes the email data, processes it through the routing system, - * and sends back the result via the correlation-ID callback. - */ - async handleRustEmailReceived(data) { - const { correlationId, mailFrom, rcptTo, remoteAddr, clientHostname, secure, authenticatedUser } = data; - logger.log('info', `Rust SMTP received email from=${mailFrom} to=${rcptTo.join(',')} remote=${remoteAddr}`); - try { - // Decode the email data - let rawMessageBuffer; - if (data.data.type === 'inline' && data.data.base64) { - rawMessageBuffer = Buffer.from(data.data.base64, 'base64'); - } - else if (data.data.type === 'file' && data.data.path) { - rawMessageBuffer = plugins.fs.readFileSync(data.data.path); - // Clean up temp file - try { - plugins.fs.unlinkSync(data.data.path); - } - catch { - // Ignore cleanup errors - } - } - else { - throw new Error('Invalid email data transport'); - } - // Build a session-like object for processEmailByMode - const session = { - id: data.sessionId || 'rust-' + Math.random().toString(36).substring(2), - state: SmtpState.FINISHED, - mailFrom: mailFrom, - rcptTo: rcptTo, - emailData: rawMessageBuffer.toString('utf8'), - useTLS: secure, - connectionEnded: false, - remoteAddress: remoteAddr, - clientHostname: clientHostname || '', - secure: secure, - authenticated: !!authenticatedUser, - envelope: { - mailFrom: { address: mailFrom, args: {} }, - rcptTo: rcptTo.map(addr => ({ address: addr, args: {} })), - }, - }; - if (authenticatedUser) { - session.user = { username: authenticatedUser }; - } - // Attach pre-computed security results from Rust in-process pipeline - if (data.securityResults) { - session._precomputedSecurityResults = data.securityResults; - } - // Process the email through the routing system - await this.processEmailByMode(rawMessageBuffer, session); - // Send acceptance back to Rust - await this.rustBridge.sendEmailProcessingResult({ - correlationId, - accepted: true, - smtpCode: 250, - smtpMessage: '2.0.0 Message accepted for delivery', - }); - } - catch (err) { - logger.log('error', `Failed to process email from Rust SMTP: ${err.message}`); - await this.rustBridge.sendEmailProcessingResult({ - correlationId, - accepted: false, - smtpCode: 550, - smtpMessage: `5.0.0 Processing failed: ${err.message}`, - }); - } - } - /** - * Handle an authRequest event from the Rust SMTP server. - * Validates credentials and sends back the result. - */ - async handleRustAuthRequest(data) { - const { correlationId, username, password, remoteAddr } = data; - logger.log('info', `Rust SMTP auth request for user=${username} from=${remoteAddr}`); - // Check against configured users - const users = this.options.auth?.users || []; - const matched = users.find(u => u.username === username && u.password === password); - if (matched) { - await this.rustBridge.sendAuthResult({ - correlationId, - success: true, - }); - } - else { - logger.log('warn', `Auth failed for user=${username} from=${remoteAddr}`); - await this.rustBridge.sendAuthResult({ - correlationId, - success: false, - message: 'Invalid credentials', - }); - } - } - /** - * Verify inbound email security (DKIM/SPF/DMARC) using pre-computed Rust results - * or falling back to IPC call if no pre-computed results are available. - */ - async verifyInboundSecurity(email, session) { - try { - // Check for pre-computed results from Rust in-process security pipeline - const precomputed = session._precomputedSecurityResults; - let result; - if (precomputed) { - logger.log('info', 'Using pre-computed security results from Rust in-process pipeline'); - result = precomputed; - } - else { - // Fallback: IPC round-trip to Rust (for backward compat / handleSocket mode) - const rawMessage = session.emailData || email.toRFC822String(); - result = await this.rustBridge.verifyEmail({ - rawMessage, - ip: session.remoteAddress, - heloDomain: session.clientHostname || '', - hostname: this.options.hostname, - mailFrom: session.envelope?.mailFrom?.address || session.mailFrom || '', - }); - } - // Apply DKIM result headers - if (result.dkim && result.dkim.length > 0) { - const dkimSummary = result.dkim - .map((d) => `${d.status}${d.domain ? ` (${d.domain})` : ''}`) - .join(', '); - email.addHeader('X-DKIM-Result', dkimSummary); - } - // Apply SPF result header - if (result.spf) { - email.addHeader('Received-SPF', `${result.spf.result} (domain: ${result.spf.domain}, ip: ${result.spf.ip})`); - // Mark as spam on SPF hard fail - if (result.spf.result === 'fail') { - email.mightBeSpam = true; - logger.log('warn', `SPF fail for ${session.remoteAddress} — marking as potential spam`); - } - } - // Apply DMARC result header and policy - if (result.dmarc) { - email.addHeader('X-DMARC-Result', `${result.dmarc.action} (policy=${result.dmarc.policy}, dkim=${result.dmarc.dkim_result}, spf=${result.dmarc.spf_result})`); - if (result.dmarc.action === 'reject') { - email.mightBeSpam = true; - logger.log('warn', `DMARC reject for domain ${result.dmarc.domain} — marking as spam`); - } - else if (result.dmarc.action === 'quarantine') { - email.mightBeSpam = true; - logger.log('info', `DMARC quarantine for domain ${result.dmarc.domain} — marking as potential spam`); - } - } - // Apply content scan results (from pre-computed pipeline) - if (result.contentScan) { - const scan = result.contentScan; - if (scan.threatScore > 0) { - email.addHeader('X-Spam-Score', String(scan.threatScore)); - if (scan.threatType) { - email.addHeader('X-Spam-Type', scan.threatType); - } - if (scan.threatScore >= 50) { - email.mightBeSpam = true; - logger.log('warn', `Content scan threat score ${scan.threatScore} (${scan.threatType}) — marking as potential spam`); - } - } - } - // Apply IP reputation results (from pre-computed pipeline) - if (result.ipReputation) { - const rep = result.ipReputation; - email.addHeader('X-IP-Reputation-Score', String(rep.score)); - if (rep.is_spam) { - email.mightBeSpam = true; - logger.log('warn', `IP ${rep.ip} flagged by reputation check (score=${rep.score}) — marking as potential spam`); - } - } - logger.log('info', `Inbound security verified for email from ${session.remoteAddress}: DKIM=${result.dkim?.[0]?.status ?? 'none'}, SPF=${result.spf?.result ?? 'none'}, DMARC=${result.dmarc?.action ?? 'none'}`); - } - catch (err) { - logger.log('warn', `Inbound security verification failed: ${err.message} — accepting email`); - } - } - /** - * Process email based on routing rules - */ - async processEmailByMode(emailData, session) { - // Convert Buffer to Email if needed - let email; - if (Buffer.isBuffer(emailData)) { - // Parse the email data buffer into an Email object - try { - const parsed = await plugins.mailparser.simpleParser(emailData); - email = new Email({ - from: parsed.from?.value[0]?.address || session.envelope.mailFrom.address, - to: session.envelope.rcptTo[0]?.address || '', - subject: parsed.subject || '', - text: parsed.text || '', - html: parsed.html || undefined, - attachments: parsed.attachments?.map(att => ({ - filename: att.filename || '', - content: att.content, - contentType: att.contentType - })) || [] - }); - } - catch (error) { - logger.log('error', `Error parsing email data: ${error.message}`); - throw new Error(`Error parsing email data: ${error.message}`); - } - } - else { - email = emailData; - } - // Run inbound security verification (DKIM/SPF/DMARC) via Rust bridge - if (session.remoteAddress && session.remoteAddress !== '127.0.0.1') { - await this.verifyInboundSecurity(email, session); - } - // First check if this is a bounce notification email - // Look for common bounce notification subject patterns - const subject = email.subject || ''; - const isBounceLike = /mail delivery|delivery (failed|status|notification)|failure notice|returned mail|undeliverable|delivery problem/i.test(subject); - if (isBounceLike) { - logger.log('info', `Email subject matches bounce notification pattern: "${subject}"`); - // Try to process as a bounce - const isBounce = await this.processBounceNotification(email); - if (isBounce) { - logger.log('info', 'Successfully processed as bounce notification, skipping regular processing'); - return email; - } - logger.log('info', 'Not a valid bounce notification, continuing with regular processing'); - } - // Find matching route - const context = { email, session }; - const route = await this.emailRouter.evaluateRoutes(context); - if (!route) { - // No matching route - reject - throw new Error('No matching route for email'); - } - // Store matched route in session - session.matchedRoute = route; - // Execute action based on route - await this.executeAction(route.action, email, context); - // Return the processed email - return email; - } - /** - * Execute action based on route configuration - */ - async executeAction(action, email, context) { - switch (action.type) { - case 'forward': - await this.handleForwardAction(action, email, context); - break; - case 'process': - await this.handleProcessAction(action, email, context); - break; - case 'deliver': - await this.handleDeliverAction(action, email, context); - break; - case 'reject': - await this.handleRejectAction(action, email, context); - break; - default: - throw new Error(`Unknown action type: ${action.type}`); - } - } - /** - * Handle forward action - */ - async handleForwardAction(_action, email, context) { - if (!_action.forward) { - throw new Error('Forward action requires forward configuration'); - } - const { host, port = 25, auth, addHeaders } = _action.forward; - logger.log('info', `Forwarding email to ${host}:${port}`); - // Add forwarding headers - if (addHeaders) { - for (const [key, value] of Object.entries(addHeaders)) { - email.headers[key] = value; - } - } - // Add standard forwarding headers - email.headers['X-Forwarded-For'] = context.session.remoteAddress || 'unknown'; - email.headers['X-Forwarded-To'] = email.to.join(', '); - email.headers['X-Forwarded-Date'] = new Date().toISOString(); - // Get SMTP client - const client = this.getSmtpClient(host, port); - try { - // Send email - await client.sendMail(email); - logger.log('info', `Successfully forwarded email to ${host}:${port}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_FORWARDING, - message: 'Email forwarded successfully', - ipAddress: context.session.remoteAddress, - details: { - sessionId: context.session.id, - routeName: context.session.matchedRoute?.name, - targetHost: host, - targetPort: port, - recipients: email.to - }, - success: true - }); - } - catch (error) { - logger.log('error', `Failed to forward email: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_FORWARDING, - message: 'Email forwarding failed', - ipAddress: context.session.remoteAddress, - details: { - sessionId: context.session.id, - routeName: context.session.matchedRoute?.name, - targetHost: host, - targetPort: port, - error: error.message - }, - success: false - }); - // Handle as bounce - for (const recipient of email.getAllRecipients()) { - await this.bounceManager.processSmtpFailure(recipient, error.message, { - sender: email.from, - originalEmailId: email.headers['Message-ID'] - }); - } - throw error; - } - } - /** - * Handle process action - */ - async handleProcessAction(action, email, context) { - logger.log('info', `Processing email with action options`); - // Apply scanning if requested - if (action.process?.scan) { - // Use existing content scanner - // Note: ContentScanner integration would go here - logger.log('info', 'Content scanning requested'); - } - // Note: DKIM signing will be applied at delivery time to ensure signature validity - // Queue for delivery - const queue = action.process?.queue || 'normal'; - await this.deliveryQueue.enqueue(email, 'process', context.session.matchedRoute); - logger.log('info', `Email queued for delivery in ${queue} queue`); - } - /** - * Handle deliver action - */ - async handleDeliverAction(_action, email, context) { - logger.log('info', `Delivering email locally`); - // Queue for local delivery - await this.deliveryQueue.enqueue(email, 'mta', context.session.matchedRoute); - logger.log('info', 'Email queued for local delivery'); - } - /** - * Handle reject action - */ - async handleRejectAction(action, email, context) { - const code = action.reject?.code || 550; - const message = action.reject?.message || 'Message rejected'; - logger.log('info', `Rejecting email with code ${code}: ${message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.WARN, - type: SecurityEventType.EMAIL_PROCESSING, - message: 'Email rejected by routing rule', - ipAddress: context.session.remoteAddress, - details: { - sessionId: context.session.id, - routeName: context.session.matchedRoute?.name, - rejectCode: code, - rejectMessage: message, - from: email.from, - to: email.to - }, - success: false - }); - // Throw error with SMTP code and message - const error = new Error(message); - error.responseCode = code; - throw error; - } - /** - * Handle email in MTA mode (programmatic processing) - */ - async _handleMtaMode(email, session) { - logger.log('info', `Handling email in MTA mode for session ${session.id}`); - try { - // Apply MTA rule options if provided - if (session.matchedRoute?.action.options?.mtaOptions) { - const options = session.matchedRoute.action.options.mtaOptions; - // Apply DKIM signing if enabled - if (options.dkimSign && options.dkimOptions) { - const dkimDomain = options.dkimOptions.domainName; - const dkimSelector = options.dkimOptions.keySelector || 'mta'; - logger.log('info', `Signing email with DKIM for domain ${dkimDomain}`); - await this.handleDkimSigning(email, dkimDomain, dkimSelector); - } - } - // Get email content for logging/processing - const subject = email.subject; - const recipients = email.getAllRecipients().join(', '); - logger.log('info', `Email processed by MTA: ${subject} to ${recipients}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_PROCESSING, - message: 'Email processed by MTA', - ipAddress: session.remoteAddress, - details: { - sessionId: session.id, - ruleName: session.matchedRoute?.name || 'default', - subject, - recipients - }, - success: true - }); - } - catch (error) { - logger.log('error', `Failed to process email in MTA mode: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_PROCESSING, - message: 'MTA processing failed', - ipAddress: session.remoteAddress, - details: { - sessionId: session.id, - ruleName: session.matchedRoute?.name || 'default', - error: error.message - }, - success: false - }); - throw error; - } - } - /** - * Handle email in process mode (store-and-forward with scanning) - */ - async _handleProcessMode(email, session) { - logger.log('info', `Handling email in process mode for session ${session.id}`); - try { - const route = session.matchedRoute; - // Apply content scanning if enabled - if (route?.action.options?.contentScanning && route.action.options.scanners && route.action.options.scanners.length > 0) { - logger.log('info', 'Performing content scanning'); - // Apply each scanner - for (const scanner of route.action.options.scanners) { - switch (scanner.type) { - case 'spam': - logger.log('info', 'Scanning for spam content'); - // Implement spam scanning - break; - case 'virus': - logger.log('info', 'Scanning for virus content'); - // Implement virus scanning - break; - case 'attachment': - logger.log('info', 'Scanning attachments'); - // Check for blocked extensions - if (scanner.blockedExtensions && scanner.blockedExtensions.length > 0) { - for (const attachment of email.attachments) { - const ext = this.getFileExtension(attachment.filename); - if (scanner.blockedExtensions.includes(ext)) { - if (scanner.action === 'reject') { - throw new Error(`Blocked attachment type: ${ext}`); - } - else { // tag - email.addHeader('X-Attachment-Warning', `Potentially unsafe attachment: ${attachment.filename}`); - } - } - } - } - break; - } - } - } - // Apply transformations if defined - if (route?.action.options?.transformations && route.action.options.transformations.length > 0) { - logger.log('info', 'Applying email transformations'); - for (const transform of route.action.options.transformations) { - switch (transform.type) { - case 'addHeader': - if (transform.header && transform.value) { - email.addHeader(transform.header, transform.value); - } - break; - } - } - } - logger.log('info', `Email successfully processed in store-and-forward mode`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_PROCESSING, - message: 'Email processed and queued', - ipAddress: session.remoteAddress, - details: { - sessionId: session.id, - ruleName: route?.name || 'default', - contentScanning: route?.action.options?.contentScanning || false, - subject: email.subject - }, - success: true - }); - } - catch (error) { - logger.log('error', `Failed to process email: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_PROCESSING, - message: 'Email processing failed', - ipAddress: session.remoteAddress, - details: { - sessionId: session.id, - ruleName: session.matchedRoute?.name || 'default', - error: error.message - }, - success: false - }); - throw error; - } - } - /** - * Get file extension from filename - */ - getFileExtension(filename) { - return filename.substring(filename.lastIndexOf('.')).toLowerCase(); - } - /** - * Set up DKIM configuration for all domains - */ - async setupDkimForDomains() { - const domainConfigs = this.domainRegistry.getAllConfigs(); - if (domainConfigs.length === 0) { - logger.log('warn', 'No domains configured for DKIM'); - return; - } - for (const domainConfig of domainConfigs) { - const domain = domainConfig.domain; - const selector = domainConfig.dkim?.selector || 'default'; - try { - // Check if DKIM keys already exist for this domain - let keyPair; - try { - // Try to read existing keys - keyPair = await this.dkimCreator.readDKIMKeys(domain); - logger.log('info', `Using existing DKIM keys for domain: ${domain}`); - } - catch (error) { - // Generate new keys if they don't exist - keyPair = await this.dkimCreator.createDKIMKeys(); - // Store them for future use - await this.dkimCreator.createAndStoreDKIMKeys(domain); - logger.log('info', `Generated new DKIM keys for domain: ${domain}`); - } - // Store the private key for signing - this.dkimKeys.set(domain, keyPair.privateKey); - // DNS record creation is now handled by DnsManager - logger.log('info', `DKIM keys loaded for domain: ${domain} with selector: ${selector}`); - } - catch (error) { - logger.log('error', `Failed to set up DKIM for domain ${domain}: ${error.message}`); - } - } - } - /** - * Apply per-domain rate limits from domain configurations - */ - applyDomainRateLimits() { - const domainConfigs = this.domainRegistry.getAllConfigs(); - for (const domainConfig of domainConfigs) { - if (domainConfig.rateLimits) { - const domain = domainConfig.domain; - const rateLimitConfig = {}; - // Convert domain-specific rate limits to the format expected by UnifiedRateLimiter - if (domainConfig.rateLimits.outbound) { - if (domainConfig.rateLimits.outbound.messagesPerMinute) { - rateLimitConfig.maxMessagesPerMinute = domainConfig.rateLimits.outbound.messagesPerMinute; - } - // Note: messagesPerHour and messagesPerDay would need additional implementation in rate limiter - } - if (domainConfig.rateLimits.inbound) { - if (domainConfig.rateLimits.inbound.messagesPerMinute) { - rateLimitConfig.maxMessagesPerMinute = domainConfig.rateLimits.inbound.messagesPerMinute; - } - if (domainConfig.rateLimits.inbound.connectionsPerIp) { - rateLimitConfig.maxConnectionsPerIP = domainConfig.rateLimits.inbound.connectionsPerIp; - } - if (domainConfig.rateLimits.inbound.recipientsPerMessage) { - rateLimitConfig.maxRecipientsPerMessage = domainConfig.rateLimits.inbound.recipientsPerMessage; - } - } - // Apply the rate limits if we have any - if (Object.keys(rateLimitConfig).length > 0) { - this.rateLimiter.applyDomainLimits(domain, rateLimitConfig); - logger.log('info', `Applied rate limits for domain ${domain}:`, rateLimitConfig); - } - } - } - } - /** - * Check and rotate DKIM keys if needed - */ - async checkAndRotateDkimKeys() { - const domainConfigs = this.domainRegistry.getAllConfigs(); - for (const domainConfig of domainConfigs) { - const domain = domainConfig.domain; - const selector = domainConfig.dkim?.selector || 'default'; - const rotateKeys = domainConfig.dkim?.rotateKeys || false; - const rotationInterval = domainConfig.dkim?.rotationInterval || 90; - const keySize = domainConfig.dkim?.keySize || 2048; - if (!rotateKeys) { - logger.log('debug', `DKIM key rotation disabled for ${domain}`); - continue; - } - try { - // Check if keys need rotation - const needsRotation = await this.dkimCreator.needsRotation(domain, selector, rotationInterval); - if (needsRotation) { - logger.log('info', `DKIM keys need rotation for ${domain} (selector: ${selector})`); - // Rotate the keys - const newSelector = await this.dkimCreator.rotateDkimKeys(domain, selector, keySize); - // Update the domain config with new selector - domainConfig.dkim = { - ...domainConfig.dkim, - selector: newSelector - }; - // Re-register DNS handler for new selector if internal-dns mode - if (domainConfig.dnsMode === 'internal-dns' && this.dcRouter.dnsServer) { - // Get new public key - const keyPair = await this.dkimCreator.readDKIMKeysForSelector(domain, newSelector); - const publicKeyBase64 = keyPair.publicKey - .replace(/-----BEGIN PUBLIC KEY-----/g, '') - .replace(/-----END PUBLIC KEY-----/g, '') - .replace(/\s/g, ''); - const ttl = domainConfig.dns?.internal?.ttl || 3600; - // Register new selector - this.dcRouter.dnsServer.registerHandler(`${newSelector}._domainkey.${domain}`, ['TXT'], () => ({ - name: `${newSelector}._domainkey.${domain}`, - type: 'TXT', - class: 'IN', - ttl: ttl, - data: `v=DKIM1; k=rsa; p=${publicKeyBase64}` - })); - logger.log('info', `DKIM DNS handler registered for new selector: ${newSelector}._domainkey.${domain}`); - // Store the updated public key in storage - await this.dcRouter.storageManager.set(`/email/dkim/${domain}/public.key`, keyPair.publicKey); - } - // Clean up old keys after grace period (async, don't wait) - this.dkimCreator.cleanupOldKeys(domain, 30).catch(error => { - logger.log('warn', `Failed to cleanup old DKIM keys for ${domain}: ${error.message}`); - }); - } - else { - logger.log('debug', `DKIM keys for ${domain} are up to date`); - } - } - catch (error) { - logger.log('error', `Failed to check/rotate DKIM keys for ${domain}: ${error.message}`); - } - } - } - /** - * Generate SmartProxy routes for email ports - */ - generateProxyRoutes(portMapping) { - const routes = []; - const defaultPortMapping = { - 25: 10025, - 587: 10587, - 465: 10465 - }; - const actualPortMapping = portMapping || defaultPortMapping; - // Generate routes for each configured port - for (const externalPort of this.options.ports) { - const internalPort = actualPortMapping[externalPort] || externalPort + 10000; - let routeName = 'email-route'; - let tlsMode = 'passthrough'; - // Configure based on port - switch (externalPort) { - case 25: - routeName = 'smtp-route'; - tlsMode = 'passthrough'; // STARTTLS - break; - case 587: - routeName = 'submission-route'; - tlsMode = 'passthrough'; // STARTTLS - break; - case 465: - routeName = 'smtps-route'; - tlsMode = 'terminate'; // Implicit TLS - break; - default: - routeName = `email-port-${externalPort}-route`; - } - routes.push({ - name: routeName, - match: { - ports: [externalPort] - }, - action: { - type: 'forward', - target: { - host: 'localhost', - port: internalPort - }, - tls: { - mode: tlsMode - } - } - }); - } - return routes; - } - /** - * Update server configuration - */ - updateOptions(options) { - // Stop the server if changing ports - const portsChanged = options.ports && - (!this.options.ports || - JSON.stringify(options.ports) !== JSON.stringify(this.options.ports)); - if (portsChanged) { - this.stop().then(() => { - this.options = { ...this.options, ...options }; - this.start(); - }); - } - else { - // Update options without restart - this.options = { ...this.options, ...options }; - // Update domain registry if domains changed - if (options.domains) { - this.domainRegistry = new DomainRegistry(options.domains, options.defaults || this.options.defaults); - } - // Update email router if routes changed - if (options.routes) { - this.emailRouter.updateRoutes(options.routes); - } - } - } - /** - * Update email routes - */ - updateEmailRoutes(routes) { - this.options.routes = routes; - this.emailRouter.updateRoutes(routes); - } - /** - * Get server statistics - */ - getStats() { - return { ...this.stats }; - } - /** - * Get domain registry - */ - getDomainRegistry() { - return this.domainRegistry; - } - /** - * Update email routes dynamically - */ - updateRoutes(routes) { - this.emailRouter.setRoutes(routes); - logger.log('info', `Updated email routes with ${routes.length} routes`); - } - /** - * Send an email through the delivery system - * @param email The email to send - * @param mode The processing mode to use - * @param rule Optional rule to apply - * @param options Optional sending options - * @returns The ID of the queued email - */ - async sendEmail(email, mode = 'mta', route, options) { - logger.log('info', `Sending email: ${email.subject} to ${email.to.join(', ')}`); - try { - // Validate the email - if (!email.from) { - throw new Error('Email must have a sender address'); - } - if (!email.to || email.to.length === 0) { - throw new Error('Email must have at least one recipient'); - } - // Check if any recipients are on the suppression list (unless explicitly skipped) - if (!options?.skipSuppressionCheck) { - const suppressedRecipients = email.to.filter(recipient => this.isEmailSuppressed(recipient)); - if (suppressedRecipients.length > 0) { - // Filter out suppressed recipients - const originalCount = email.to.length; - const suppressed = suppressedRecipients.map(recipient => { - const info = this.getSuppressionInfo(recipient); - return { - email: recipient, - reason: info?.reason || 'Unknown', - until: info?.expiresAt ? new Date(info.expiresAt).toISOString() : 'permanent' - }; - }); - logger.log('warn', `Filtering out ${suppressedRecipients.length} suppressed recipient(s)`, { suppressed }); - // If all recipients are suppressed, throw an error - if (suppressedRecipients.length === originalCount) { - throw new Error('All recipients are on the suppression list'); - } - // Filter the recipients list to only include non-suppressed addresses - email.to = email.to.filter(recipient => !this.isEmailSuppressed(recipient)); - } - } - // IP warmup handling - let ipAddress = options?.ipAddress; - // If no specific IP was provided, use IP warmup manager to find the best IP - if (!ipAddress) { - const domain = email.from.split('@')[1]; - ipAddress = this.getBestIPForSending({ - from: email.from, - to: email.to, - domain, - isTransactional: options?.isTransactional - }); - if (ipAddress) { - logger.log('info', `Selected IP ${ipAddress} for sending based on warmup status`); - } - } - // If an IP is provided or selected by warmup manager, check its capacity - if (ipAddress) { - // Check if the IP can send more today - if (!this.canIPSendMoreToday(ipAddress)) { - logger.log('warn', `IP ${ipAddress} has reached its daily sending limit, email will be queued for later delivery`); - } - // Check if the IP can send more this hour - if (!this.canIPSendMoreThisHour(ipAddress)) { - logger.log('warn', `IP ${ipAddress} has reached its hourly sending limit, email will be queued for later delivery`); - } - // Record the send for IP warmup tracking - this.recordIPSend(ipAddress); - // Add IP header to the email - email.addHeader('X-Sending-IP', ipAddress); - } - // Check if the sender domain has DKIM keys and sign the email if needed - if (mode === 'mta' && route?.action.options?.mtaOptions?.dkimSign) { - const domain = email.from.split('@')[1]; - await this.handleDkimSigning(email, domain, route.action.options.mtaOptions.dkimOptions?.keySelector || 'mta'); - } - // Generate a unique ID for this email - const id = plugins.uuid.v4(); - // Queue the email for delivery - await this.deliveryQueue.enqueue(email, mode, route); - // Record 'sent' event for domain reputation monitoring - const senderDomain = email.from.split('@')[1]; - if (senderDomain) { - this.recordReputationEvent(senderDomain, { - type: 'sent', - count: email.to.length - }); - } - logger.log('info', `Email queued with ID: ${id}`); - return id; - } - catch (error) { - logger.log('error', `Failed to send email: ${error.message}`); - throw error; - } - } - /** - * Handle DKIM signing for an email - * @param email The email to sign - * @param domain The domain to sign with - * @param selector The DKIM selector - */ - async handleDkimSigning(email, domain, selector) { - try { - // Ensure we have DKIM keys for this domain - await this.dkimCreator.handleDKIMKeysForDomain(domain); - // Get the private key - const { privateKey } = await this.dkimCreator.readDKIMKeys(domain); - // Convert Email to raw format for signing - const rawEmail = email.toRFC822String(); - // Sign the email via Rust bridge - const signResult = await this.rustBridge.signDkim({ - rawMessage: rawEmail, - domain, - selector, - privateKey, - }); - if (signResult.header) { - email.addHeader('DKIM-Signature', signResult.header); - logger.log('info', `Successfully added DKIM signature for ${domain}`); - } - } - catch (error) { - logger.log('error', `Failed to sign email with DKIM: ${error.message}`); - // Continue without DKIM rather than failing the send - } - } - /** - * Process a bounce notification email - * @param bounceEmail The email containing bounce notification information - * @returns Processed bounce record or null if not a bounce - */ - async processBounceNotification(bounceEmail) { - logger.log('info', 'Processing potential bounce notification email'); - try { - // Process as a bounce notification (no conversion needed anymore) - const bounceRecord = await this.bounceManager.processBounceEmail(bounceEmail); - if (bounceRecord) { - logger.log('info', `Successfully processed bounce notification for ${bounceRecord.recipient}`, { - bounceType: bounceRecord.bounceType, - bounceCategory: bounceRecord.bounceCategory - }); - // Notify any registered listeners about the bounce - this.emit('bounceProcessed', bounceRecord); - // Record bounce event for domain reputation tracking - if (bounceRecord.domain) { - this.recordReputationEvent(bounceRecord.domain, { - type: 'bounce', - hardBounce: bounceRecord.bounceCategory === BounceCategory.HARD, - receivingDomain: bounceRecord.recipient.split('@')[1] - }); - } - // Log security event - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_VALIDATION, - message: `Bounce notification processed for recipient`, - domain: bounceRecord.domain, - details: { - recipient: bounceRecord.recipient, - bounceType: bounceRecord.bounceType, - bounceCategory: bounceRecord.bounceCategory - }, - success: true - }); - return true; - } - else { - logger.log('info', 'Email not recognized as a bounce notification'); - return false; - } - } - catch (error) { - logger.log('error', `Error processing bounce notification: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_VALIDATION, - message: 'Failed to process bounce notification', - details: { - error: error.message, - subject: bounceEmail.subject - }, - success: false - }); - return false; - } - } - /** - * Process an SMTP failure as a bounce - * @param recipient Recipient email that failed - * @param smtpResponse SMTP error response - * @param options Additional options for bounce processing - * @returns Processed bounce record - */ - async processSmtpFailure(recipient, smtpResponse, options = {}) { - logger.log('info', `Processing SMTP failure for ${recipient}: ${smtpResponse}`); - try { - // Process the SMTP failure through the bounce manager - const bounceRecord = await this.bounceManager.processSmtpFailure(recipient, smtpResponse, options); - logger.log('info', `Successfully processed SMTP failure for ${recipient} as ${bounceRecord.bounceCategory} bounce`, { - bounceType: bounceRecord.bounceType - }); - // Notify any registered listeners about the bounce - this.emit('bounceProcessed', bounceRecord); - // Record bounce event for domain reputation tracking - if (bounceRecord.domain) { - this.recordReputationEvent(bounceRecord.domain, { - type: 'bounce', - hardBounce: bounceRecord.bounceCategory === BounceCategory.HARD, - receivingDomain: bounceRecord.recipient.split('@')[1] - }); - } - // Log security event - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.INFO, - type: SecurityEventType.EMAIL_VALIDATION, - message: `SMTP failure processed for recipient`, - domain: bounceRecord.domain, - details: { - recipient: bounceRecord.recipient, - bounceType: bounceRecord.bounceType, - bounceCategory: bounceRecord.bounceCategory, - smtpResponse - }, - success: true - }); - return true; - } - catch (error) { - logger.log('error', `Error processing SMTP failure: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.EMAIL_VALIDATION, - message: 'Failed to process SMTP failure', - details: { - recipient, - smtpResponse, - error: error.message - }, - success: false - }); - return false; - } - } - /** - * Check if an email address is suppressed (has bounced previously) - * @param email Email address to check - * @returns Whether the email is suppressed - */ - isEmailSuppressed(email) { - return this.bounceManager.isEmailSuppressed(email); - } - /** - * Get suppression information for an email - * @param email Email address to check - * @returns Suppression information or null if not suppressed - */ - getSuppressionInfo(email) { - return this.bounceManager.getSuppressionInfo(email); - } - /** - * Get bounce history information for an email - * @param email Email address to check - * @returns Bounce history or null if no bounces - */ - getBounceHistory(email) { - return this.bounceManager.getBounceInfo(email); - } - /** - * Get all suppressed email addresses - * @returns Array of suppressed email addresses - */ - getSuppressionList() { - return this.bounceManager.getSuppressionList(); - } - /** - * Get all hard bounced email addresses - * @returns Array of hard bounced email addresses - */ - getHardBouncedAddresses() { - return this.bounceManager.getHardBouncedAddresses(); - } - /** - * Add an email to the suppression list - * @param email Email address to suppress - * @param reason Reason for suppression - * @param expiresAt Optional expiration time (undefined for permanent) - */ - addToSuppressionList(email, reason, expiresAt) { - this.bounceManager.addToSuppressionList(email, reason, expiresAt); - logger.log('info', `Added ${email} to suppression list: ${reason}`); - } - /** - * Remove an email from the suppression list - * @param email Email address to remove from suppression - */ - removeFromSuppressionList(email) { - this.bounceManager.removeFromSuppressionList(email); - logger.log('info', `Removed ${email} from suppression list`); - } - /** - * Get the status of IP warmup process - * @param ipAddress Optional specific IP to check - * @returns Status of IP warmup - */ - getIPWarmupStatus(ipAddress) { - return this.ipWarmupManager.getWarmupStatus(ipAddress); - } - /** - * Add a new IP address to the warmup process - * @param ipAddress IP address to add - */ - addIPToWarmup(ipAddress) { - this.ipWarmupManager.addIPToWarmup(ipAddress); - } - /** - * Remove an IP address from the warmup process - * @param ipAddress IP address to remove - */ - removeIPFromWarmup(ipAddress) { - this.ipWarmupManager.removeIPFromWarmup(ipAddress); - } - /** - * Update metrics for an IP in the warmup process - * @param ipAddress IP address - * @param metrics Metrics to update - */ - updateIPWarmupMetrics(ipAddress, metrics) { - this.ipWarmupManager.updateMetrics(ipAddress, metrics); - } - /** - * Check if an IP can send more emails today - * @param ipAddress IP address to check - * @returns Whether the IP can send more today - */ - canIPSendMoreToday(ipAddress) { - return this.ipWarmupManager.canSendMoreToday(ipAddress); - } - /** - * Check if an IP can send more emails in the current hour - * @param ipAddress IP address to check - * @returns Whether the IP can send more this hour - */ - canIPSendMoreThisHour(ipAddress) { - return this.ipWarmupManager.canSendMoreThisHour(ipAddress); - } - /** - * Get the best IP to use for sending an email based on warmup status - * @param emailInfo Information about the email being sent - * @returns Best IP to use or null - */ - getBestIPForSending(emailInfo) { - return this.ipWarmupManager.getBestIPForSending(emailInfo); - } - /** - * Set the active IP allocation policy for warmup - * @param policyName Name of the policy to set - */ - setIPAllocationPolicy(policyName) { - this.ipWarmupManager.setActiveAllocationPolicy(policyName); - } - /** - * Record that an email was sent using a specific IP - * @param ipAddress IP address used for sending - */ - recordIPSend(ipAddress) { - this.ipWarmupManager.recordSend(ipAddress); - } - /** - * Get reputation data for a domain - * @param domain Domain to get reputation for - * @returns Domain reputation metrics - */ - getDomainReputationData(domain) { - return this.senderReputationMonitor.getReputationData(domain); - } - /** - * Get summary reputation data for all monitored domains - * @returns Summary data for all domains - */ - getReputationSummary() { - return this.senderReputationMonitor.getReputationSummary(); - } - /** - * Add a domain to the reputation monitoring system - * @param domain Domain to add - */ - addDomainToMonitoring(domain) { - this.senderReputationMonitor.addDomain(domain); - } - /** - * Remove a domain from the reputation monitoring system - * @param domain Domain to remove - */ - removeDomainFromMonitoring(domain) { - this.senderReputationMonitor.removeDomain(domain); - } - /** - * Record an email event for domain reputation tracking - * @param domain Domain sending the email - * @param event Event details - */ - recordReputationEvent(domain, event) { - this.senderReputationMonitor.recordSendEvent(domain, event); - } - /** - * Check if DKIM key exists for a domain - * @param domain Domain to check - */ - hasDkimKey(domain) { - return this.dkimKeys.has(domain); - } - /** - * Record successful email delivery - * @param domain Sending domain - */ - recordDelivery(domain) { - this.recordReputationEvent(domain, { - type: 'delivered', - count: 1 - }); - } - /** - * Record email bounce - * @param domain Sending domain - * @param receivingDomain Receiving domain that bounced - * @param bounceType Type of bounce (hard/soft) - * @param reason Bounce reason - */ - recordBounce(domain, receivingDomain, bounceType, reason) { - // Record bounce in bounce manager - const bounceRecord = { - id: `bounce_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`, - recipient: `user@${receivingDomain}`, - sender: `user@${domain}`, - domain: domain, - bounceType: bounceType === 'hard' ? BounceType.INVALID_RECIPIENT : BounceType.TEMPORARY_FAILURE, - bounceCategory: bounceType === 'hard' ? BounceCategory.HARD : BounceCategory.SOFT, - timestamp: Date.now(), - smtpResponse: reason, - diagnosticCode: reason, - statusCode: bounceType === 'hard' ? '550' : '450', - processed: false - }; - // Process the bounce - this.bounceManager.processBounce(bounceRecord); - // Record reputation event - this.recordReputationEvent(domain, { - type: 'bounce', - count: 1, - hardBounce: bounceType === 'hard', - receivingDomain - }); - } - /** - * Get the rate limiter instance - * @returns The unified rate limiter - */ - getRateLimiter() { - return this.rateLimiter; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.unified.email.server.js","sourceRoot":"","sources":["../../../ts/mail/routing/classes.unified.email.server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AA+BlF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,uBAAuB,EAAkC,MAAM,wCAAwC,CAAC;AACjH,OAAO,EAAE,oBAAoB,EAAsB,MAAM,uCAAuC,CAAC;AACjG,OAAO,EAAE,kBAAkB,EAAgC,MAAM,6CAA6C,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAiItD;;GAEG;AACH,MAAM,OAAO,kBAAmB,SAAQ,YAAY;IAC1C,QAAQ,CAAW;IACnB,OAAO,CAA6B;IACpC,WAAW,CAAc;IAC1B,cAAc,CAAiB;IAC9B,OAAO,GAAU,EAAE,CAAC;IACpB,KAAK,CAAe;IAE5B,wDAAwD;IACjD,WAAW,CAAc;IACxB,UAAU,CAAqB;IAC/B,mBAAmB,CAAsB;IACzC,aAAa,CAAgB;IAC7B,eAAe,CAAyB;IACxC,uBAAuB,CAAiC;IACzD,aAAa,CAAuB;IACpC,cAAc,CAA0B;IACvC,WAAW,CAAqB,CAAC,wDAAwD;IACzF,QAAQ,GAAwB,IAAI,GAAG,EAAE,CAAC,CAAC,wBAAwB;IACnE,WAAW,GAA4B,IAAI,GAAG,EAAE,CAAC,CAAC,sBAAsB;IAEhF,YAAY,QAAkB,EAAE,OAAmC;QACjE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEzB,sBAAsB;QACtB,IAAI,CAAC,OAAO,GAAG;YACb,GAAG,OAAO;YACV,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,2BAA2B;YACxE,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI,EAAE,OAAO;YACnE,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,GAAG;YACrC,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,IAAI;YAC9C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,IAAI,KAAK,EAAE,WAAW;YAClE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,KAAK,CAAC,WAAW;SAC1D,CAAC;QAEF,8CAA8C;QAC9C,IAAI,CAAC,UAAU,GAAG,kBAAkB,CAAC,WAAW,EAAE,CAAC;QAEnD,+CAA+C;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE3E,wDAAwD;QACxD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC,WAAW,CAAC;YACzD,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,IAAI;SACnB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;QAE5B,iDAAiD;QACjD,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC;YACrC,YAAY,EAAE,KAAK;YACnB,QAAQ,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,UAAU;YAC9C,cAAc,EAAE,QAAQ,CAAC,cAAc;SACxC,CAAC,CAAC;QAEH,+DAA+D;QAC/D,uEAAuE;QACvE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;QAC5B,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAEpC,6BAA6B;QAC7B,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE5E,0DAA0D;QAC1D,IAAI,CAAC,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,EAAE;YACvD,cAAc,EAAE,QAAQ,CAAC,cAAc;YACvC,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QAEH,0BAA0B;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,kBAAkB,CAAC,OAAO,CAAC,UAAU,IAAI;YAC9D,MAAM,EAAE;gBACN,mBAAmB,EAAE,EAAE;gBACvB,oBAAoB,EAAE,GAAG;gBACzB,uBAAuB,EAAE,EAAE;gBAC3B,cAAc,EAAE,EAAE;gBAClB,oBAAoB,EAAE,CAAC;gBACvB,aAAa,EAAE,MAAM,CAAC,YAAY;aACnC;SACF,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,YAAY,GAAkB;YAClC,WAAW,EAAE,QAAQ,EAAE,4BAA4B;YACnD,UAAU,EAAE,CAAC;YACb,cAAc,EAAE,MAAM,EAAE,YAAY;YACpC,aAAa,EAAE,OAAO,CAAC,SAAS;SACjC,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAE5D,MAAM,eAAe,GAA8B;YACjD,eAAe,EAAE,GAAG,EAAE,mCAAmC;YACzD,oBAAoB,EAAE,EAAE;YACxB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE;gBACb,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;aACvD;YACD,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACzC,0DAA0D;gBAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAyB,CAAC;gBAC7C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAE9C,IAAI,YAAY,EAAE,CAAC;oBACjB,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE;wBACvC,IAAI,EAAE,WAAW;wBACjB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM;qBACvB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;SACF,CAAC;QAEF,IAAI,CAAC,cAAc,GAAG,IAAI,uBAAuB,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;QAE7F,wBAAwB;QACxB,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,WAAW,EAAE;gBACX,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,CAAC;aACT;YACD,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;gBACZ,MAAM,EAAE,CAAC;aACV;YACD,cAAc,EAAE;gBACd,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;aACP;SACF,CAAC;QAEF,0DAA0D;IAC5D,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,IAAY,EAAE,OAAe,EAAE;QAClD,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;QAEpC,yDAAyD;QACzD,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,kCAAkC;YAClC,MAAM,GAAG,sBAAsB,CAAC;gBAC9B,IAAI;gBACJ,IAAI;gBACJ,MAAM,EAAE,IAAI,KAAK,GAAG;gBACpB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,iBAAiB,IAAI,KAAK;gBACpE,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,IAAI,MAAM;gBAC7D,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAc,IAAI,EAAE;gBAC3D,WAAW,EAAE,IAAI,EAAE,2CAA2C;gBAC9D,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,SAAS,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAA0C,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE3G,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;YAEvD,4BAA4B;YAC5B,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;YAEpD,oEAAoE;YACpE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,0GAA0G,CAAC,CAAC;YAC9H,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qEAAqE,CAAC,CAAC;YAE1F,8BAA8B;YAC9B,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8CAA8C,CAAC,CAAC;YAEnE,4DAA4D;YAC5D,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,UAAU,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACzF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAC;YAErE,+BAA+B;YAC/B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;YAExD,uCAAuC;YACvC,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;YAExD,2CAA2C;YAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC;YAE7E,+CAA+C;YAC/C,IAAI,UAA8B,CAAC;YACnC,IAAI,SAA6B,CAAC;YAElC,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC;oBACH,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAQ,EAAE,MAAM,CAAC,CAAC;oBACvE,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAS,EAAE,MAAM,CAAC,CAAC;oBACzE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;gBAC7D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAoC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,CAAC;YACH,CAAC;YAED,iCAAiC;YACjC,uDAAuD;YACvD,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC7C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;gBAC3C,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAyC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtF,8BAA8B;oBAC9B,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;wBAC9C,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,QAAQ,EAAE,KAAK;wBACf,QAAQ,EAAE,GAAG;wBACb,WAAW,EAAE,2BAA2B;qBACzC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC3C,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBACzC,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,uCAAwC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;oBACrF,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;wBACnC,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,OAAO,EAAE,KAAK;wBACd,OAAO,EAAE,qBAAqB;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,kEAAkE;YAClE,MAAM,SAAS,GAAI,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAC1E,MAAM,UAAU,GAAI,IAAI,CAAC,OAAO,CAAC,KAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC;gBACpD,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC/B,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,UAAU;gBACtB,UAAU;gBACV,SAAS;gBACT,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,GAAG,IAAI,GAAG,IAAI;gBAC/D,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,GAAG;gBAC7E,aAAa,EAAE,GAAG;gBAClB,qBAAqB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC9G,eAAe,EAAE,EAAE;gBACnB,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC;gBAClF,eAAe,EAAE,CAAC;gBAClB,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG;gBACnG,qBAAqB,EAAE,EAAE;gBACzB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;oBACpC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,IAAI,EAAE;oBAC9E,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,IAAI,GAAG;oBACjF,oBAAoB,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,oBAAoB,IAAI,CAAC;oBAC/E,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC,CAAC,SAAS;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wCAAwC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAChI,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,uCAAuC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;QAElD,IAAI,CAAC;YACH,kCAAkC;YAClC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;gBACvC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;YACjD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oCAAqC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACnF,CAAC;YAED,8DAA8D;YAC9D,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;YAElB,4BAA4B;YAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YAE7B,2BAA2B;YAC3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;gBACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;YACtD,CAAC;YAED,+BAA+B;YAC/B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;gBACpC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YACvD,CAAC;YAED,oCAAoC;YACpC,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnD,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;oBACrB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,SAAS,EAAE,CAAC,CAAC;gBACjE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,SAAS,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBACrF,CAAC;YACH,CAAC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAEzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAC;YAC9D,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,sCAAsC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC3E,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,0EAA0E;IAC1E,kCAAkC;IAClC,0EAA0E;IAE1E;;;;OAIG;IACK,KAAK,CAAC,uBAAuB,CAAC,IAAyB;QAC7D,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;QAExG,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,QAAQ,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;QAE5G,IAAI,CAAC;YACH,wBAAwB;YACxB,IAAI,gBAAwB,CAAC;YAC7B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACpD,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC7D,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACvD,gBAAgB,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC3D,qBAAqB;gBACrB,IAAI,CAAC;oBACH,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,CAAC;gBAAC,MAAM,CAAC;oBACP,wBAAwB;gBAC1B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YAED,qDAAqD;YACrD,MAAM,OAAO,GAAyB;gBACpC,EAAE,EAAE,IAAI,CAAC,SAAS,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACvE,KAAK,EAAE,SAAS,CAAC,QAAQ;gBACzB,QAAQ,EAAE,QAAQ;gBAClB,MAAM,EAAE,MAAM;gBACd,SAAS,EAAE,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC5C,MAAM,EAAE,MAAM;gBACd,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE,UAAU;gBACzB,cAAc,EAAE,cAAc,IAAI,EAAE;gBACpC,MAAM,EAAE,MAAM;gBACd,aAAa,EAAE,CAAC,CAAC,iBAAiB;gBAClC,QAAQ,EAAE;oBACR,QAAQ,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE;oBACzC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;iBAC1D;aACF,CAAC;YAEF,IAAI,iBAAiB,EAAE,CAAC;gBACtB,OAAO,CAAC,IAAI,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC;YACjD,CAAC;YAED,qEAAqE;YACrE,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBACxB,OAAe,CAAC,2BAA2B,GAAG,IAAI,CAAC,eAAe,CAAC;YACtE,CAAC;YAED,+CAA+C;YAC/C,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAEzD,+BAA+B;YAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAC9C,aAAa;gBACb,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,GAAG;gBACb,WAAW,EAAE,qCAAqC;aACnD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,2CAA4C,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;YACzF,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAC9C,aAAa;gBACb,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,GAAG;gBACb,WAAW,EAAE,4BAA6B,GAAa,CAAC,OAAO,EAAE;aAClE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,IAAuB;QACzD,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QAE/D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,QAAQ,SAAS,UAAU,EAAE,CAAC,CAAC;QAErF,iCAAiC;QACjC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CACxB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CACxD,CAAC;QAEF,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;gBACnC,aAAa;gBACb,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,QAAQ,SAAS,UAAU,EAAE,CAAC,CAAC;YAC1E,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC;gBACnC,aAAa;gBACb,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,qBAAqB;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,KAAY,EAAE,OAA6B;QAC7E,IAAI,CAAC;YACH,wEAAwE;YACxE,MAAM,WAAW,GAAI,OAAe,CAAC,2BAA2B,CAAC;YACjE,IAAI,MAAW,CAAC;YAEhB,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mEAAmE,CAAC,CAAC;gBACxF,MAAM,GAAG,WAAW,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,6EAA6E;gBAC7E,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBAC/D,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;oBACzC,UAAU;oBACV,EAAE,EAAE,OAAO,CAAC,aAAa;oBACzB,UAAU,EAAE,OAAO,CAAC,cAAc,IAAI,EAAE;oBACxC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;oBAC/B,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,EAAE;iBACxE,CAAC,CAAC;YACL,CAAC;YAED,4BAA4B;YAC5B,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI;qBAC5B,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;qBACjE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACd,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;YAChD,CAAC;YAED,0BAA0B;YAC1B,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,aAAa,MAAM,CAAC,GAAG,CAAC,MAAM,SAAS,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;gBAE7G,gCAAgC;gBAChC,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACjC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,OAAO,CAAC,aAAa,8BAA8B,CAAC,CAAC;gBAC1F,CAAC;YACH,CAAC;YAED,uCAAuC;YACvC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBACjB,KAAK,CAAC,SAAS,CAAC,gBAAgB,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,UAAU,MAAM,CAAC,KAAK,CAAC,WAAW,SAAS,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;gBAE9J,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBACrC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,MAAM,CAAC,KAAK,CAAC,MAAM,oBAAoB,CAAC,CAAC;gBACzF,CAAC;qBAAM,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBAChD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,MAAM,CAAC,KAAK,CAAC,MAAM,8BAA8B,CAAC,CAAC;gBACvG,CAAC;YACH,CAAC;YAED,0DAA0D;YAC1D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC;gBAChC,IAAI,IAAI,CAAC,WAAW,GAAG,CAAC,EAAE,CAAC;oBACzB,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;oBAC1D,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;wBACpB,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;oBAClD,CAAC;oBACD,IAAI,IAAI,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;wBAC3B,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;wBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,UAAU,+BAA+B,CAAC,CAAC;oBACvH,CAAC;gBACH,CAAC;YACH,CAAC;YAED,2DAA2D;YAC3D,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;gBACxB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;gBAChC,KAAK,CAAC,SAAS,CAAC,uBAAuB,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC5D,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;oBAChB,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;oBACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,uCAAuC,GAAG,CAAC,KAAK,+BAA+B,CAAC,CAAC;gBAClH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,OAAO,CAAC,aAAa,UAAU,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,MAAM,SAAS,MAAM,CAAC,GAAG,EAAE,MAAM,IAAI,MAAM,WAAW,MAAM,CAAC,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QACpN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAA0C,GAAa,CAAC,OAAO,oBAAoB,CAAC,CAAC;QAC1G,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,kBAAkB,CAAC,SAAyB,EAAE,OAA6B;QACtF,oCAAoC;QACpC,IAAI,KAAY,CAAC;QACjB,IAAI,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,mDAAmD;YACnD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAChE,KAAK,GAAG,IAAI,KAAK,CAAC;oBAChB,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO;oBACzE,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE;oBAC7C,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;oBAC7B,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;oBACvB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,SAAS;oBAC9B,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBAC3C,QAAQ,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE;wBAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;wBACpB,WAAW,EAAE,GAAG,CAAC,WAAW;qBAC7B,CAAC,CAAC,IAAI,EAAE;iBACV,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAClE,MAAM,IAAI,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;QAED,qEAAqE;QACrE,IAAI,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,aAAa,KAAK,WAAW,EAAE,CAAC;YACnE,MAAM,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,qDAAqD;QACrD,uDAAuD;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,kHAAkH,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtJ,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,OAAO,GAAG,CAAC,CAAC;YAEtF,6BAA6B;YAC7B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;YAE7D,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4EAA4E,CAAC,CAAC;gBACjG,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qEAAqE,CAAC,CAAC;QAC5F,CAAC;QAED,sBAAsB;QACtB,MAAM,OAAO,GAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,6BAA6B;YAC7B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACjD,CAAC;QAED,iCAAiC;QACjC,OAAO,CAAC,YAAY,GAAG,KAAK,CAAC;QAE7B,gCAAgC;QAChC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAEvD,6BAA6B;QAC7B,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,aAAa,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QACpF,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,SAAS;gBACZ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACvD,MAAM;YAER,KAAK,QAAQ;gBACX,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;gBACtD,MAAM;YAER;gBACE,MAAM,IAAI,KAAK,CAAC,wBAAyB,MAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAqB,EAAE,KAAY,EAAE,OAAsB;QAC3F,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAE9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uBAAuB,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;QAE1D,yBAAyB;QACzB,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtD,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC7B,CAAC;QACH,CAAC;QAED,kCAAkC;QAClC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,IAAI,SAAS,CAAC;QAC9E,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAE7D,kBAAkB;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE9C,IAAI,CAAC;YACH,aAAa;YACb,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAE7B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;YAEtE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,8BAA8B;gBACvC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;gBACxC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;oBAC7C,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,KAAK,CAAC,EAAE;iBACrB;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,yBAAyB;gBAClC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;gBACxC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;oBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;oBAC7C,UAAU,EAAE,IAAI;oBAChB,UAAU,EAAE,IAAI;oBAChB,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,mBAAmB;YACnB,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBACjD,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,SAAS,EAAE,KAAK,CAAC,OAAO,EAAE;oBACpE,MAAM,EAAE,KAAK,CAAC,IAAI;oBAClB,eAAe,EAAE,KAAK,CAAC,OAAO,CAAC,YAAY,CAAW;iBACvD,CAAC,CAAC;YACL,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QAC1F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,CAAC,CAAC;QAE3D,8BAA8B;QAC9B,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;YACzB,+BAA+B;YAC/B,iDAAiD;YACjD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;QACnD,CAAC;QAED,mFAAmF;QAEnF,qBAAqB;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,IAAI,QAAQ,CAAC;QAChD,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,CAAC;QAElF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,KAAK,QAAQ,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAqB,EAAE,KAAY,EAAE,OAAsB;QAC3F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;QAE/C,2BAA2B;QAC3B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,YAAa,CAAC,CAAC;QAE9E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iCAAiC,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAAC,MAAoB,EAAE,KAAY,EAAE,OAAsB;QACzF,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,GAAG,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,IAAI,kBAAkB,CAAC;QAE7D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,IAAI,KAAK,OAAO,EAAE,CAAC,CAAC;QAEpE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;YACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;YAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;YACxC,OAAO,EAAE,gCAAgC;YACzC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa;YACxC,OAAO,EAAE;gBACP,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC7B,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI;gBAC7C,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,OAAO;gBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;aACb;YACD,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;QAChC,KAAa,CAAC,YAAY,GAAG,IAAI,CAAC;QACnC,MAAM,KAAK,CAAC;IACd,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc,CAAC,KAAY,EAAE,OAA6B;QACtE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0CAA0C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3E,IAAI,CAAC;YACH,qCAAqC;YACrC,IAAI,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,CAAC;gBACrD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;gBAE/D,gCAAgC;gBAChC,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;oBAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC;oBAClD,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,WAAW,IAAI,KAAK,CAAC;oBAC9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sCAAsC,UAAU,EAAE,CAAC,CAAC;oBACvE,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAED,2CAA2C;YAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;YAC9B,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,OAAO,OAAO,UAAU,EAAE,CAAC,CAAC;YAE1E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,OAAO;oBACP,UAAU;iBACX;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAwC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAE7E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,uBAAuB;gBAChC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAAC,KAAY,EAAE,OAA6B;QAC1E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8CAA8C,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAE/E,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC;YAEnC,oCAAoC;YACpC,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;gBAElD,qBAAqB;gBACrB,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACpD,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;wBACrB,KAAK,MAAM;4BACT,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;4BAChD,0BAA0B;4BAC1B,MAAM;wBAER,KAAK,OAAO;4BACV,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;4BACjD,2BAA2B;4BAC3B,MAAM;wBAER,KAAK,YAAY;4BACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;4BAE3C,+BAA+B;4BAC/B,IAAI,OAAO,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gCACtE,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;oCAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;oCACvD,IAAI,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;wCAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;4CAChC,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC;wCACrD,CAAC;6CAAM,CAAC,CAAC,MAAM;4CACb,KAAK,CAAC,SAAS,CAAC,sBAAsB,EAAE,kCAAkC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;wCACnG,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,MAAM;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YAED,mCAAmC;YACnC,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC9F,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;gBAErD,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;oBAC7D,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC;wBACvB,KAAK,WAAW;4BACd,IAAI,SAAS,CAAC,MAAM,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gCACxC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;4BACrD,CAAC;4BACD,MAAM;oBACV,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;YAE7E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,4BAA4B;gBACrC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,SAAS;oBAClC,eAAe,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,IAAI,KAAK;oBAChE,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,yBAAyB;gBAClC,SAAS,EAAE,OAAO,CAAC,aAAa;gBAChC,OAAO,EAAE;oBACP,SAAS,EAAE,OAAO,CAAC,EAAE;oBACrB,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,IAAI,IAAI,SAAS;oBACjD,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,QAAgB;QACvC,OAAO,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,CAAC;IAID;;OAEG;IACK,KAAK,CAAC,mBAAmB;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;YAE1D,IAAI,CAAC;gBACH,mDAAmD;gBACnD,IAAI,OAAkD,CAAC;gBAEvD,IAAI,CAAC;oBACH,4BAA4B;oBAC5B,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACtD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wCAAwC,MAAM,EAAE,CAAC,CAAC;gBACvE,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,wCAAwC;oBACxC,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC;oBAClD,4BAA4B;oBAC5B,MAAM,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;oBACtD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,MAAM,EAAE,CAAC,CAAC;gBACtE,CAAC;gBAED,oCAAoC;gBACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;gBAE9C,mDAAmD;gBACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gCAAgC,MAAM,mBAAmB,QAAQ,EAAE,CAAC,CAAC;YAC1F,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oCAAoC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACtF,CAAC;QACH,CAAC;IACH,CAAC;IAGD;;OAEG;IACK,qBAAqB;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;gBACnC,MAAM,eAAe,GAAQ,EAAE,CAAC;gBAEhC,mFAAmF;gBACnF,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;oBACrC,IAAI,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;wBACvD,eAAe,CAAC,oBAAoB,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;oBAC5F,CAAC;oBACD,gGAAgG;gBAClG,CAAC;gBAED,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;oBACpC,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;wBACtD,eAAe,CAAC,oBAAoB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC;oBAC3F,CAAC;oBACD,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC;wBACrD,eAAe,CAAC,mBAAmB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC;oBACzF,CAAC;oBACD,IAAI,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;wBACzD,eAAe,CAAC,uBAAuB,GAAG,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,oBAAoB,CAAC;oBACjG,CAAC;gBACH,CAAC;gBAED,uCAAuC;gBACvC,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;oBAC5D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,MAAM,GAAG,EAAE,eAAe,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,sBAAsB;QAClC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAE1D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;YACnC,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC;YAC1D,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,EAAE,UAAU,IAAI,KAAK,CAAC;YAC1D,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,EAAE,gBAAgB,IAAI,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC;YAEnD,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,MAAM,EAAE,CAAC,CAAC;gBAChE,SAAS;YACX,CAAC;YAED,IAAI,CAAC;gBACH,8BAA8B;gBAC9B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAE/F,IAAI,aAAa,EAAE,CAAC;oBAClB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,MAAM,eAAe,QAAQ,GAAG,CAAC,CAAC;oBAEpF,kBAAkB;oBAClB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;oBAErF,6CAA6C;oBAC7C,YAAY,CAAC,IAAI,GAAG;wBAClB,GAAG,YAAY,CAAC,IAAI;wBACpB,QAAQ,EAAE,WAAW;qBACtB,CAAC;oBAEF,gEAAgE;oBAChE,IAAI,YAAY,CAAC,OAAO,KAAK,cAAc,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;wBACvE,qBAAqB;wBACrB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;wBACpF,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS;6BACtC,OAAO,CAAC,6BAA6B,EAAE,EAAE,CAAC;6BAC1C,OAAO,CAAC,2BAA2B,EAAE,EAAE,CAAC;6BACxC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;wBAEtB,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC;wBAEpD,wBAAwB;wBACxB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,eAAe,CACrC,GAAG,WAAW,eAAe,MAAM,EAAE,EACrC,CAAC,KAAK,CAAC,EACP,GAAG,EAAE,CAAC,CAAC;4BACL,IAAI,EAAE,GAAG,WAAW,eAAe,MAAM,EAAE;4BAC3C,IAAI,EAAE,KAAK;4BACX,KAAK,EAAE,IAAI;4BACX,GAAG,EAAE,GAAG;4BACR,IAAI,EAAE,qBAAqB,eAAe,EAAE;yBAC7C,CAAC,CACH,CAAC;wBAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iDAAiD,WAAW,eAAe,MAAM,EAAE,CAAC,CAAC;wBAExG,0CAA0C;wBAC1C,MAAM,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,CACpC,eAAe,MAAM,aAAa,EAClC,OAAO,CAAC,SAAS,CAClB,CAAC;oBACJ,CAAC;oBAED,2DAA2D;oBAC3D,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;wBACxD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uCAAuC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;oBACxF,CAAC,CAAC,CAAC;gBAEL,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,iBAAiB,MAAM,iBAAiB,CAAC,CAAC;gBAChE,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wCAAwC,MAAM,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC;IACH,CAAC;IAGD;;OAEG;IACI,mBAAmB,CAAC,WAAoC;QAC7D,MAAM,MAAM,GAAU,EAAE,CAAC;QACzB,MAAM,kBAAkB,GAAG;YACzB,EAAE,EAAE,KAAK;YACT,GAAG,EAAE,KAAK;YACV,GAAG,EAAE,KAAK;SACX,CAAC;QAEF,MAAM,iBAAiB,GAAG,WAAW,IAAI,kBAAkB,CAAC;QAE5D,2CAA2C;QAC3C,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;YAC9C,MAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC,IAAI,YAAY,GAAG,KAAK,CAAC;YAE7E,IAAI,SAAS,GAAG,aAAa,CAAC;YAC9B,IAAI,OAAO,GAAG,aAAa,CAAC;YAE5B,0BAA0B;YAC1B,QAAQ,YAAY,EAAE,CAAC;gBACrB,KAAK,EAAE;oBACL,SAAS,GAAG,YAAY,CAAC;oBACzB,OAAO,GAAG,aAAa,CAAC,CAAC,WAAW;oBACpC,MAAM;gBACR,KAAK,GAAG;oBACN,SAAS,GAAG,kBAAkB,CAAC;oBAC/B,OAAO,GAAG,aAAa,CAAC,CAAC,WAAW;oBACpC,MAAM;gBACR,KAAK,GAAG;oBACN,SAAS,GAAG,aAAa,CAAC;oBAC1B,OAAO,GAAG,WAAW,CAAC,CAAC,eAAe;oBACtC,MAAM;gBACR;oBACE,SAAS,GAAG,cAAc,YAAY,QAAQ,CAAC;YACnD,CAAC;YAED,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE;oBACL,KAAK,EAAE,CAAC,YAAY,CAAC;iBACtB;gBACD,MAAM,EAAE;oBACN,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE;wBACN,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,YAAY;qBACnB;oBACD,GAAG,EAAE;wBACH,IAAI,EAAE,OAAO;qBACd;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACI,aAAa,CAAC,OAA4C;QAC/D,oCAAoC;QACpC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK;YAChC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK;gBACnB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAEzE,IAAI,YAAY,EAAE,CAAC;YACjB,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBACpB,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;gBAC/C,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;YAE/C,4CAA4C;YAC5C,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvG,CAAC;YAED,wCAAwC;YACxC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChD,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,MAAqB;QAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;QAC7B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,QAAQ;QACb,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACI,iBAAiB;QACtB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,YAAY,CAAC,MAAqB;QACvC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;IAC1E,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,SAAS,CACpB,KAAY,EACZ,OAA4B,KAAK,EACjC,KAAmB,EACnB,OAIC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,CAAC,OAAO,OAAO,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEhF,IAAI,CAAC;YACH,qBAAqB;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACtD,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAC5D,CAAC;YAED,kFAAkF;YAClF,IAAI,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC;gBACnC,MAAM,oBAAoB,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;gBAE7F,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpC,mCAAmC;oBACnC,MAAM,aAAa,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC;oBACtC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;wBACtD,MAAM,IAAI,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;wBAChD,OAAO;4BACL,KAAK,EAAE,SAAS;4BAChB,MAAM,EAAE,IAAI,EAAE,MAAM,IAAI,SAAS;4BACjC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW;yBAC9E,CAAC;oBACJ,CAAC,CAAC,CAAC;oBAEH,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,oBAAoB,CAAC,MAAM,0BAA0B,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;oBAE3G,mDAAmD;oBACnD,IAAI,oBAAoB,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;wBAClD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;oBAChE,CAAC;oBAED,sEAAsE;oBACtE,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC9E,CAAC;YACH,CAAC;YAED,qBAAqB;YACrB,IAAI,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;YAEnC,4EAA4E;YAC5E,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAExC,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC;oBACnC,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,MAAM;oBACN,eAAe,EAAE,OAAO,EAAE,eAAe;iBAC1C,CAAC,CAAC;gBAEH,IAAI,SAAS,EAAE,CAAC;oBACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,SAAS,qCAAqC,CAAC,CAAC;gBACpF,CAAC;YACH,CAAC;YAED,yEAAyE;YACzE,IAAI,SAAS,EAAE,CAAC;gBACd,sCAAsC;gBACtC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,CAAC;oBACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,SAAS,+EAA+E,CAAC,CAAC;gBACrH,CAAC;gBAED,0CAA0C;gBAC1C,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,SAAS,gFAAgF,CAAC,CAAC;gBACtH,CAAC;gBAED,yCAAyC;gBACzC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAE7B,6BAA6B;gBAC7B,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7C,CAAC;YAED,wEAAwE;YACxE,IAAI,IAAI,KAAK,KAAK,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;gBAClE,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,WAAW,IAAI,KAAK,CAAC,CAAC;YACjH,CAAC;YAED,sCAAsC;YACtC,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAE7B,+BAA+B;YAC/B,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAErD,uDAAuD;YACvD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,YAAY,EAAE,CAAC;gBACjB,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE;oBACvC,IAAI,EAAE,MAAM;oBACZ,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM;iBACvB,CAAC,CAAC;YACL,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,EAAE,EAAE,CAAC,CAAC;YAClD,OAAO,EAAE,CAAC;QACZ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9D,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,iBAAiB,CAAC,KAAY,EAAE,MAAc,EAAE,QAAgB;QAC5E,IAAI,CAAC;YACH,2CAA2C;YAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAEvD,sBAAsB;YACtB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAEnE,0CAA0C;YAC1C,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,EAAE,CAAC;YAExC,iCAAiC;YACjC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAChD,UAAU,EAAE,QAAQ;gBACpB,MAAM;gBACN,QAAQ;gBACR,UAAU;aACX,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;gBACtB,KAAK,CAAC,SAAS,CAAC,gBAAgB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,MAAM,EAAE,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACxE,qDAAqD;QACvD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,yBAAyB,CAAC,WAAkB;QACvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,kEAAkE;YAClE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE9E,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,YAAY,CAAC,SAAS,EAAE,EAAE;oBAC7F,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;iBAC5C,CAAC,CAAC;gBAEH,mDAAmD;gBACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;gBAE3C,qDAAqD;gBACrD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;oBACxB,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;wBAC9C,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE,YAAY,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;wBAC/D,eAAe,EAAE,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;qBACtD,CAAC,CAAC;gBACL,CAAC;gBAED,qBAAqB;gBACrB,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;oBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;oBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;oBACxC,OAAO,EAAE,6CAA6C;oBACtD,MAAM,EAAE,YAAY,CAAC,MAAM;oBAC3B,OAAO,EAAE;wBACP,SAAS,EAAE,YAAY,CAAC,SAAS;wBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;wBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;qBAC5C;oBACD,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+CAA+C,CAAC,CAAC;gBACpE,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,yCAAyC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAE9E,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,uCAAuC;gBAChD,OAAO,EAAE;oBACP,KAAK,EAAE,KAAK,CAAC,OAAO;oBACpB,OAAO,EAAE,WAAW,CAAC,OAAO;iBAC7B;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,SAAiB,EACjB,YAAoB,EACpB,UAKI,EAAE;QAEN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,+BAA+B,SAAS,KAAK,YAAY,EAAE,CAAC,CAAC;QAEhF,IAAI,CAAC;YACH,sDAAsD;YACtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAC9D,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAC;YAEF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2CAA2C,SAAS,OAAO,YAAY,CAAC,cAAc,SAAS,EAAE;gBAClH,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC;YAEH,mDAAmD;YACnD,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;YAE3C,qDAAqD;YACrD,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,MAAM,EAAE;oBAC9C,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,YAAY,CAAC,cAAc,KAAK,cAAc,CAAC,IAAI;oBAC/D,eAAe,EAAE,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;iBACtD,CAAC,CAAC;YACL,CAAC;YAED,qBAAqB;YACrB,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,sCAAsC;gBAC/C,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,OAAO,EAAE;oBACP,SAAS,EAAE,YAAY,CAAC,SAAS;oBACjC,UAAU,EAAE,YAAY,CAAC,UAAU;oBACnC,cAAc,EAAE,YAAY,CAAC,cAAc;oBAC3C,YAAY;iBACb;gBACD,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kCAAkC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEvE,cAAc,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,gBAAgB,CAAC,KAAK;gBAC7B,IAAI,EAAE,iBAAiB,CAAC,gBAAgB;gBACxC,OAAO,EAAE,gCAAgC;gBACzC,OAAO,EAAE;oBACP,SAAS;oBACT,YAAY;oBACZ,KAAK,EAAE,KAAK,CAAC,OAAO;iBACrB;gBACD,OAAO,EAAE,KAAK;aACf,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,KAAa;QACpC,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,KAAa;QAKrC,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACI,gBAAgB,CAAC,KAAa;QAMnC,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,kBAAkB;QACvB,OAAO,IAAI,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,OAAO,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAC;IACtD,CAAC;IAED;;;;;OAKG;IACI,oBAAoB,CAAC,KAAa,EAAE,MAAc,EAAE,SAAkB;QAC3E,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAClE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,KAAK,yBAAyB,MAAM,EAAE,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,yBAAyB,CAAC,KAAa;QAC5C,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,KAAK,wBAAwB,CAAC,CAAC;IAC/D,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,SAAkB;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;IAED;;;OAGG;IACI,aAAa,CAAC,SAAiB;QACpC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,kBAAkB,CAAC,SAAiB;QACzC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAC1B,SAAiB,EACjB,OAA2E;QAE3E,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,SAAiB;QACzC,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,SAAiB;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED;;;;OAIG;IACI,mBAAmB,CAAC,SAK1B;QACC,OAAO,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,UAAkB;QAC7C,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,YAAY,CAAC,SAAiB;QACnC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACI,uBAAuB,CAAC,MAAc;QAC3C,OAAO,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IAED;;;OAGG;IACI,oBAAoB;QACzB,OAAO,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,EAAE,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,MAAc;QACzC,IAAI,CAAC,uBAAuB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED;;;OAGG;IACI,0BAA0B,CAAC,MAAc;QAC9C,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED;;;;OAIG;IACI,qBAAqB,CAAC,MAAc,EAAE,KAK5C;QACC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAED;;;OAGG;IACI,UAAU,CAAC,MAAc;QAC9B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACI,cAAc,CAAC,MAAc;QAClC,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;YACjC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACI,YAAY,CAAC,MAAc,EAAE,eAAuB,EAAE,UAA2B,EAAE,MAAc;QACtG,kCAAkC;QAClC,MAAM,YAAY,GAAG;YACnB,EAAE,EAAE,UAAU,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;YACxE,SAAS,EAAE,QAAQ,eAAe,EAAE;YACpC,MAAM,EAAE,QAAQ,MAAM,EAAE;YACxB,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB;YAC/F,cAAc,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI;YACjF,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;YACrB,YAAY,EAAE,MAAM;YACpB,cAAc,EAAE,MAAM;YACtB,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;YACjD,SAAS,EAAE,KAAK;SACjB,CAAC;QAEF,qBAAqB;QACrB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAE/C,0BAA0B;QAC1B,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;YACjC,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,CAAC;YACR,UAAU,EAAE,UAAU,KAAK,MAAM;YACjC,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,cAAc;QACnB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;CACF"} \ No newline at end of file diff --git a/dist_ts/mail/routing/index.d.ts b/dist_ts/mail/routing/index.d.ts deleted file mode 100644 index e2c5ee7..0000000 --- a/dist_ts/mail/routing/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './classes.email.router.js'; -export * from './classes.unified.email.server.js'; -export * from './classes.dns.manager.js'; -export * from './interfaces.js'; -export * from './classes.domain.registry.js'; diff --git a/dist_ts/mail/routing/index.js b/dist_ts/mail/routing/index.js deleted file mode 100644 index 8d14b03..0000000 --- a/dist_ts/mail/routing/index.js +++ /dev/null @@ -1,7 +0,0 @@ -// Email routing components -export * from './classes.email.router.js'; -export * from './classes.unified.email.server.js'; -export * from './classes.dns.manager.js'; -export * from './interfaces.js'; -export * from './classes.domain.registry.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL3JvdXRpbmcvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsMkJBQTJCO0FBQzNCLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsaUJBQWlCLENBQUM7QUFDaEMsY0FBYyw4QkFBOEIsQ0FBQyJ9 \ No newline at end of file diff --git a/dist_ts/mail/routing/interfaces.d.ts b/dist_ts/mail/routing/interfaces.d.ts deleted file mode 100644 index fa054c2..0000000 --- a/dist_ts/mail/routing/interfaces.d.ts +++ /dev/null @@ -1,187 +0,0 @@ -import type { Email } from '../core/classes.email.js'; -import type { IExtendedSmtpSession } from './classes.unified.email.server.js'; -/** - * Route configuration for email routing - */ -export interface IEmailRoute { - /** Route identifier */ - name: string; - /** Order of evaluation (higher priority evaluated first, default: 0) */ - priority?: number; - /** Conditions to match */ - match: IEmailMatch; - /** Action to take when matched */ - action: IEmailAction; -} -/** - * Match criteria for email routing - */ -export interface IEmailMatch { - /** Email patterns to match recipients: "*@example.com", "admin@*" */ - recipients?: string | string[]; - /** Email patterns to match senders */ - senders?: string | string[]; - /** IP addresses or CIDR ranges to match */ - clientIp?: string | string[]; - /** Require authentication status */ - authenticated?: boolean; - /** Headers to match */ - headers?: Record; - /** Message size range */ - sizeRange?: { - min?: number; - max?: number; - }; - /** Subject line patterns */ - subject?: string | RegExp; - /** Has attachments */ - hasAttachments?: boolean; -} -/** - * Action to take when route matches - */ -export interface IEmailAction { - /** Type of action to perform */ - type: 'forward' | 'deliver' | 'reject' | 'process'; - /** Forward action configuration */ - forward?: { - /** Target host to forward to */ - host: string; - /** Target port (default: 25) */ - port?: number; - /** Authentication credentials */ - auth?: { - user: string; - pass: string; - }; - /** Preserve original headers */ - preserveHeaders?: boolean; - /** Additional headers to add */ - addHeaders?: Record; - }; - /** Reject action configuration */ - reject?: { - /** SMTP response code */ - code: number; - /** SMTP response message */ - message: string; - }; - /** Process action configuration */ - process?: { - /** Enable content scanning */ - scan?: boolean; - /** Enable DKIM signing */ - dkim?: boolean; - /** Delivery queue priority */ - queue?: 'normal' | 'priority' | 'bulk'; - }; - /** Options for various action types */ - options?: { - /** MTA specific options */ - mtaOptions?: { - domain?: string; - allowLocalDelivery?: boolean; - localDeliveryPath?: string; - dkimSign?: boolean; - dkimOptions?: { - domainName: string; - keySelector: string; - privateKey?: string; - }; - smtpBanner?: string; - maxConnections?: number; - connTimeout?: number; - spoolDir?: string; - }; - /** Content scanning configuration */ - contentScanning?: boolean; - scanners?: Array<{ - type: 'spam' | 'virus' | 'attachment'; - threshold?: number; - action: 'tag' | 'reject'; - blockedExtensions?: string[]; - }>; - /** Email transformations */ - transformations?: Array<{ - type: string; - header?: string; - value?: string; - domains?: string[]; - append?: boolean; - [key: string]: any; - }>; - }; - /** Delivery options (applies to forward/process/deliver) */ - delivery?: { - /** Rate limit (messages per minute) */ - rateLimit?: number; - /** Number of retry attempts */ - retries?: number; - }; -} -/** - * Context for route evaluation - */ -export interface IEmailContext { - /** The email being routed */ - email: Email; - /** The SMTP session */ - session: IExtendedSmtpSession; -} -/** - * Email domain configuration - */ -export interface IEmailDomainConfig { - /** Domain name */ - domain: string; - /** DNS handling mode */ - dnsMode: 'forward' | 'internal-dns' | 'external-dns'; - /** DNS configuration based on mode */ - dns?: { - /** For 'forward' mode */ - forward?: { - /** Skip DNS validation (default: false) */ - skipDnsValidation?: boolean; - /** Target server's expected domain */ - targetDomain?: string; - }; - /** For 'internal-dns' mode */ - internal?: { - /** TTL for DNS records in seconds (default: 3600) */ - ttl?: number; - /** MX record priority (default: 10) */ - mxPriority?: number; - }; - /** For 'external-dns' mode */ - external?: { - /** Custom DNS servers (default: system DNS) */ - servers?: string[]; - /** Which records to validate (default: ['MX', 'SPF', 'DKIM', 'DMARC']) */ - requiredRecords?: ('MX' | 'SPF' | 'DKIM' | 'DMARC')[]; - }; - }; - /** Per-domain DKIM settings (DKIM always enabled) */ - dkim?: { - /** DKIM selector (default: 'default') */ - selector?: string; - /** Key size in bits (default: 2048) */ - keySize?: number; - /** Automatically rotate keys (default: false) */ - rotateKeys?: boolean; - /** Days between key rotations (default: 90) */ - rotationInterval?: number; - }; - /** Per-domain rate limits */ - rateLimits?: { - outbound?: { - messagesPerMinute?: number; - messagesPerHour?: number; - messagesPerDay?: number; - }; - inbound?: { - messagesPerMinute?: number; - connectionsPerIp?: number; - recipientsPerMessage?: number; - }; - }; -} diff --git a/dist_ts/mail/routing/interfaces.js b/dist_ts/mail/routing/interfaces.js deleted file mode 100644 index 4f5847f..0000000 --- a/dist_ts/mail/routing/interfaces.js +++ /dev/null @@ -1,2 +0,0 @@ -export {}; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21haWwvcm91dGluZy9pbnRlcmZhY2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== \ No newline at end of file diff --git a/dist_ts/mail/security/classes.dkimcreator.d.ts b/dist_ts/mail/security/classes.dkimcreator.d.ts deleted file mode 100644 index 2516ec8..0000000 --- a/dist_ts/mail/security/classes.dkimcreator.d.ts +++ /dev/null @@ -1,68 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { Email } from '../core/classes.email.js'; -export interface IKeyPaths { - privateKeyPath: string; - publicKeyPath: string; -} -export interface IDkimKeyMetadata { - domain: string; - selector: string; - createdAt: number; - rotatedAt?: number; - previousSelector?: string; - keySize: number; -} -export declare class DKIMCreator { - private keysDir; - private storageManager?; - constructor(keysDir?: string, storageManager?: any); - getKeyPathsForDomain(domainArg: string): Promise; - handleDKIMKeysForDomain(domainArg: string): Promise; - handleDKIMKeysForEmail(email: Email): Promise; - readDKIMKeys(domainArg: string): Promise<{ - privateKey: string; - publicKey: string; - }>; - createDKIMKeys(): Promise<{ - privateKey: string; - publicKey: string; - }>; - storeDKIMKeys(privateKey: string, publicKey: string, privateKeyPath: string, publicKeyPath: string): Promise; - createAndStoreDKIMKeys(domain: string): Promise; - getDNSRecordForDomain(domainArg: string): Promise; - /** - * Get DKIM key metadata for a domain - */ - private getKeyMetadata; - /** - * Save DKIM key metadata - */ - private saveKeyMetadata; - /** - * Check if DKIM keys need rotation - */ - needsRotation(domain: string, selector?: string, rotationIntervalDays?: number): Promise; - /** - * Rotate DKIM keys for a domain - */ - rotateDkimKeys(domain: string, currentSelector?: string, keySize?: number): Promise; - /** - * Get key paths for a specific selector - */ - getKeyPathsForSelector(domain: string, selector: string): Promise; - /** - * Read DKIM keys for a specific selector - */ - readDKIMKeysForSelector(domain: string, selector: string): Promise<{ - privateKey: string; - publicKey: string; - }>; - /** - * Get DNS record for a specific selector - */ - getDNSRecordForSelector(domain: string, selector: string): Promise; - /** - * Clean up old DKIM keys after grace period - */ - cleanupOldKeys(domain: string, gracePeriodDays?: number): Promise; -} diff --git a/dist_ts/mail/security/classes.dkimcreator.js b/dist_ts/mail/security/classes.dkimcreator.js deleted file mode 100644 index afce4b3..0000000 --- a/dist_ts/mail/security/classes.dkimcreator.js +++ /dev/null @@ -1,348 +0,0 @@ -import * as plugins from '../../plugins.js'; -import * as paths from '../../paths.js'; -import { Email } from '../core/classes.email.js'; -// MtaService reference removed -const readFile = plugins.util.promisify(plugins.fs.readFile); -const writeFile = plugins.util.promisify(plugins.fs.writeFile); -const generateKeyPair = plugins.util.promisify(plugins.crypto.generateKeyPair); -export class DKIMCreator { - keysDir; - storageManager; // StorageManager instance - constructor(keysDir = paths.keysDir, storageManager) { - this.keysDir = keysDir; - this.storageManager = storageManager; - } - async getKeyPathsForDomain(domainArg) { - return { - privateKeyPath: plugins.path.join(this.keysDir, `${domainArg}-private.pem`), - publicKeyPath: plugins.path.join(this.keysDir, `${domainArg}-public.pem`), - }; - } - // Check if a DKIM key is present and creates one and stores it to disk otherwise - async handleDKIMKeysForDomain(domainArg) { - try { - await this.readDKIMKeys(domainArg); - } - catch (error) { - console.log(`No DKIM keys found for ${domainArg}. Generating...`); - await this.createAndStoreDKIMKeys(domainArg); - const dnsValue = await this.getDNSRecordForDomain(domainArg); - await plugins.smartfs.directory(paths.dnsRecordsDir).recursive().create(); - await plugins.smartfs.file(plugins.path.join(paths.dnsRecordsDir, `${domainArg}.dkimrecord.json`)).write(JSON.stringify(dnsValue, null, 2)); - } - } - async handleDKIMKeysForEmail(email) { - const domain = email.from.split('@')[1]; - await this.handleDKIMKeysForDomain(domain); - } - // Read DKIM keys - always use storage manager, migrate from filesystem if needed - async readDKIMKeys(domainArg) { - // Try to read from storage manager first - if (this.storageManager) { - try { - const [privateKey, publicKey] = await Promise.all([ - this.storageManager.get(`/email/dkim/${domainArg}/private.key`), - this.storageManager.get(`/email/dkim/${domainArg}/public.key`) - ]); - if (privateKey && publicKey) { - return { privateKey, publicKey }; - } - } - catch (error) { - // Fall through to migration check - } - // Check if keys exist in filesystem and migrate them to storage manager - const keyPaths = await this.getKeyPathsForDomain(domainArg); - try { - const [privateKeyBuffer, publicKeyBuffer] = await Promise.all([ - readFile(keyPaths.privateKeyPath), - readFile(keyPaths.publicKeyPath), - ]); - // Convert the buffers to strings - const privateKey = privateKeyBuffer.toString(); - const publicKey = publicKeyBuffer.toString(); - // Migrate to storage manager - console.log(`Migrating DKIM keys for ${domainArg} from filesystem to StorageManager`); - await Promise.all([ - this.storageManager.set(`/email/dkim/${domainArg}/private.key`, privateKey), - this.storageManager.set(`/email/dkim/${domainArg}/public.key`, publicKey) - ]); - return { privateKey, publicKey }; - } - catch (error) { - if (error.code === 'ENOENT') { - // Keys don't exist anywhere - throw new Error(`DKIM keys not found for domain ${domainArg}`); - } - throw error; - } - } - else { - // No storage manager, use filesystem directly - const keyPaths = await this.getKeyPathsForDomain(domainArg); - const [privateKeyBuffer, publicKeyBuffer] = await Promise.all([ - readFile(keyPaths.privateKeyPath), - readFile(keyPaths.publicKeyPath), - ]); - const privateKey = privateKeyBuffer.toString(); - const publicKey = publicKeyBuffer.toString(); - return { privateKey, publicKey }; - } - } - // Create a DKIM key pair - changed to public for API access - async createDKIMKeys() { - const { privateKey, publicKey } = await generateKeyPair('rsa', { - modulusLength: 2048, - publicKeyEncoding: { type: 'spki', format: 'pem' }, - privateKeyEncoding: { type: 'pkcs1', format: 'pem' }, - }); - return { privateKey, publicKey }; - } - // Store a DKIM key pair - uses storage manager if available, else disk - async storeDKIMKeys(privateKey, publicKey, privateKeyPath, publicKeyPath) { - // Store in storage manager if available - if (this.storageManager) { - // Extract domain from path (e.g., /path/to/keys/example.com-private.pem -> example.com) - const match = privateKeyPath.match(/\/([^\/]+)-private\.pem$/); - if (match) { - const domain = match[1]; - await Promise.all([ - this.storageManager.set(`/email/dkim/${domain}/private.key`, privateKey), - this.storageManager.set(`/email/dkim/${domain}/public.key`, publicKey) - ]); - } - } - // Also store to filesystem for backward compatibility - await Promise.all([writeFile(privateKeyPath, privateKey), writeFile(publicKeyPath, publicKey)]); - } - // Create a DKIM key pair and store it to disk - changed to public for API access - async createAndStoreDKIMKeys(domain) { - const { privateKey, publicKey } = await this.createDKIMKeys(); - const keyPaths = await this.getKeyPathsForDomain(domain); - await this.storeDKIMKeys(privateKey, publicKey, keyPaths.privateKeyPath, keyPaths.publicKeyPath); - console.log(`DKIM keys for ${domain} created and stored.`); - } - // Changed to public for API access - async getDNSRecordForDomain(domainArg) { - await this.handleDKIMKeysForDomain(domainArg); - const keys = await this.readDKIMKeys(domainArg); - // Remove the PEM header and footer and newlines - const pemHeader = '-----BEGIN PUBLIC KEY-----'; - const pemFooter = '-----END PUBLIC KEY-----'; - const keyContents = keys.publicKey - .replace(pemHeader, '') - .replace(pemFooter, '') - .replace(/\n/g, ''); - // Now generate the DKIM DNS TXT record - const dnsRecordValue = `v=DKIM1; h=sha256; k=rsa; p=${keyContents}`; - return { - name: `mta._domainkey.${domainArg}`, - type: 'TXT', - dnsSecEnabled: null, - value: dnsRecordValue, - }; - } - /** - * Get DKIM key metadata for a domain - */ - async getKeyMetadata(domain, selector = 'default') { - if (!this.storageManager) { - return null; - } - const metadataKey = `/email/dkim/${domain}/${selector}/metadata`; - const metadataStr = await this.storageManager.get(metadataKey); - if (!metadataStr) { - return null; - } - return JSON.parse(metadataStr); - } - /** - * Save DKIM key metadata - */ - async saveKeyMetadata(metadata) { - if (!this.storageManager) { - return; - } - const metadataKey = `/email/dkim/${metadata.domain}/${metadata.selector}/metadata`; - await this.storageManager.set(metadataKey, JSON.stringify(metadata)); - } - /** - * Check if DKIM keys need rotation - */ - async needsRotation(domain, selector = 'default', rotationIntervalDays = 90) { - const metadata = await this.getKeyMetadata(domain, selector); - if (!metadata) { - // No metadata means old keys, should rotate - return true; - } - const now = Date.now(); - const keyAgeMs = now - metadata.createdAt; - const keyAgeDays = keyAgeMs / (1000 * 60 * 60 * 24); - return keyAgeDays >= rotationIntervalDays; - } - /** - * Rotate DKIM keys for a domain - */ - async rotateDkimKeys(domain, currentSelector = 'default', keySize = 2048) { - console.log(`Rotating DKIM keys for ${domain}...`); - // Generate new selector based on date - const now = new Date(); - const newSelector = `key${now.getFullYear()}${String(now.getMonth() + 1).padStart(2, '0')}`; - // Create new keys with custom key size - const { privateKey, publicKey } = await generateKeyPair('rsa', { - modulusLength: keySize, - publicKeyEncoding: { type: 'spki', format: 'pem' }, - privateKeyEncoding: { type: 'pkcs1', format: 'pem' }, - }); - // Store new keys with new selector - const newKeyPaths = await this.getKeyPathsForSelector(domain, newSelector); - // Store in storage manager if available - if (this.storageManager) { - await Promise.all([ - this.storageManager.set(`/email/dkim/${domain}/${newSelector}/private.key`, privateKey), - this.storageManager.set(`/email/dkim/${domain}/${newSelector}/public.key`, publicKey) - ]); - } - // Also store to filesystem - await this.storeDKIMKeys(privateKey, publicKey, newKeyPaths.privateKeyPath, newKeyPaths.publicKeyPath); - // Save metadata for new keys - const metadata = { - domain, - selector: newSelector, - createdAt: Date.now(), - previousSelector: currentSelector, - keySize - }; - await this.saveKeyMetadata(metadata); - // Update metadata for old keys - const oldMetadata = await this.getKeyMetadata(domain, currentSelector); - if (oldMetadata) { - oldMetadata.rotatedAt = Date.now(); - await this.saveKeyMetadata(oldMetadata); - } - console.log(`DKIM keys rotated for ${domain}. New selector: ${newSelector}`); - return newSelector; - } - /** - * Get key paths for a specific selector - */ - async getKeyPathsForSelector(domain, selector) { - return { - privateKeyPath: plugins.path.join(this.keysDir, `${domain}-${selector}-private.pem`), - publicKeyPath: plugins.path.join(this.keysDir, `${domain}-${selector}-public.pem`), - }; - } - /** - * Read DKIM keys for a specific selector - */ - async readDKIMKeysForSelector(domain, selector) { - // Try to read from storage manager first - if (this.storageManager) { - try { - const [privateKey, publicKey] = await Promise.all([ - this.storageManager.get(`/email/dkim/${domain}/${selector}/private.key`), - this.storageManager.get(`/email/dkim/${domain}/${selector}/public.key`) - ]); - if (privateKey && publicKey) { - return { privateKey, publicKey }; - } - } - catch (error) { - // Fall through to migration check - } - // Check if keys exist in filesystem and migrate them to storage manager - const keyPaths = await this.getKeyPathsForSelector(domain, selector); - try { - const [privateKeyBuffer, publicKeyBuffer] = await Promise.all([ - readFile(keyPaths.privateKeyPath), - readFile(keyPaths.publicKeyPath), - ]); - const privateKey = privateKeyBuffer.toString(); - const publicKey = publicKeyBuffer.toString(); - // Migrate to storage manager - console.log(`Migrating DKIM keys for ${domain}/${selector} from filesystem to StorageManager`); - await Promise.all([ - this.storageManager.set(`/email/dkim/${domain}/${selector}/private.key`, privateKey), - this.storageManager.set(`/email/dkim/${domain}/${selector}/public.key`, publicKey) - ]); - return { privateKey, publicKey }; - } - catch (error) { - if (error.code === 'ENOENT') { - throw new Error(`DKIM keys not found for domain ${domain} with selector ${selector}`); - } - throw error; - } - } - else { - // No storage manager, use filesystem directly - const keyPaths = await this.getKeyPathsForSelector(domain, selector); - const [privateKeyBuffer, publicKeyBuffer] = await Promise.all([ - readFile(keyPaths.privateKeyPath), - readFile(keyPaths.publicKeyPath), - ]); - const privateKey = privateKeyBuffer.toString(); - const publicKey = publicKeyBuffer.toString(); - return { privateKey, publicKey }; - } - } - /** - * Get DNS record for a specific selector - */ - async getDNSRecordForSelector(domain, selector) { - const keys = await this.readDKIMKeysForSelector(domain, selector); - // Remove the PEM header and footer and newlines - const pemHeader = '-----BEGIN PUBLIC KEY-----'; - const pemFooter = '-----END PUBLIC KEY-----'; - const keyContents = keys.publicKey - .replace(pemHeader, '') - .replace(pemFooter, '') - .replace(/\n/g, ''); - // Generate the DKIM DNS TXT record - const dnsRecordValue = `v=DKIM1; h=sha256; k=rsa; p=${keyContents}`; - return { - name: `${selector}._domainkey.${domain}`, - type: 'TXT', - dnsSecEnabled: null, - value: dnsRecordValue, - }; - } - /** - * Clean up old DKIM keys after grace period - */ - async cleanupOldKeys(domain, gracePeriodDays = 30) { - if (!this.storageManager) { - return; - } - // List all selectors for the domain - const metadataKeys = await this.storageManager.list(`/email/dkim/${domain}/`); - for (const key of metadataKeys) { - if (key.endsWith('/metadata')) { - const metadataStr = await this.storageManager.get(key); - if (metadataStr) { - const metadata = JSON.parse(metadataStr); - // Check if key is rotated and past grace period - if (metadata.rotatedAt) { - const gracePeriodMs = gracePeriodDays * 24 * 60 * 60 * 1000; - const now = Date.now(); - if (now - metadata.rotatedAt > gracePeriodMs) { - console.log(`Cleaning up old DKIM keys for ${domain} selector ${metadata.selector}`); - // Delete key files - const keyPaths = await this.getKeyPathsForSelector(domain, metadata.selector); - try { - await plugins.fs.promises.unlink(keyPaths.privateKeyPath); - await plugins.fs.promises.unlink(keyPaths.publicKeyPath); - } - catch (error) { - console.warn(`Failed to delete old key files: ${error.message}`); - } - // Delete metadata - await this.storageManager.delete(key); - } - } - } - } - } - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dkimcreator.js","sourceRoot":"","sources":["../../../ts/mail/security/classes.dkimcreator.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/security/classes.dkimverifier.d.ts b/dist_ts/mail/security/classes.dkimverifier.d.ts deleted file mode 100644 index 743b186..0000000 --- a/dist_ts/mail/security/classes.dkimverifier.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Result of a DKIM verification - */ -export interface IDkimVerificationResult { - isValid: boolean; - domain?: string; - selector?: string; - status?: string; - details?: any; - errorMessage?: string; - signatureFields?: Record; -} -/** - * DKIM verifier — delegates to the Rust security bridge. - */ -export declare class DKIMVerifier { - constructor(); - /** - * Verify DKIM signature for an email via Rust bridge - */ - verify(emailData: string, options?: { - useCache?: boolean; - returnDetails?: boolean; - }): Promise; - /** No-op — Rust bridge handles its own caching */ - clearCache(): void; - /** Always 0 — cache is managed by the Rust side */ - getCacheSize(): number; -} diff --git a/dist_ts/mail/security/classes.dkimverifier.js b/dist_ts/mail/security/classes.dkimverifier.js deleted file mode 100644 index d2638db..0000000 --- a/dist_ts/mail/security/classes.dkimverifier.js +++ /dev/null @@ -1,58 +0,0 @@ -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -/** - * DKIM verifier — delegates to the Rust security bridge. - */ -export class DKIMVerifier { - constructor() { } - /** - * Verify DKIM signature for an email via Rust bridge - */ - async verify(emailData, options = {}) { - try { - const bridge = RustSecurityBridge.getInstance(); - const results = await bridge.verifyDkim(emailData); - const first = results[0]; - const result = { - isValid: first?.is_valid ?? false, - domain: first?.domain ?? undefined, - selector: first?.selector ?? undefined, - status: first?.status ?? 'none', - details: options.returnDetails ? results : undefined, - }; - SecurityLogger.getInstance().logEvent({ - level: result.isValid ? SecurityLogLevel.INFO : SecurityLogLevel.WARN, - type: SecurityEventType.DKIM, - message: `DKIM verification ${result.isValid ? 'passed' : 'failed'} for domain ${result.domain || 'unknown'}`, - details: { selector: result.selector, status: result.status }, - domain: result.domain || 'unknown', - success: result.isValid - }); - logger.log(result.isValid ? 'info' : 'warn', `DKIM verification: ${result.status} for domain ${result.domain || 'unknown'}`); - return result; - } - catch (error) { - logger.log('error', `DKIM verification failed: ${error.message}`); - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.DKIM, - message: `DKIM verification error`, - details: { error: error.message }, - success: false - }); - return { - isValid: false, - status: 'temperror', - errorMessage: `Verification error: ${error.message}` - }; - } - } - /** No-op — Rust bridge handles its own caching */ - clearCache() { } - /** Always 0 — cache is managed by the Rust side */ - getCacheSize() { - return 0; - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ka2ltdmVyaWZpZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL3NlY3VyaXR5L2NsYXNzZXMuZGtpbXZlcmlmaWVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUFlbEY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sWUFBWTtJQUN2QixnQkFBZSxDQUFDO0lBRWhCOztPQUVHO0lBQ0ksS0FBSyxDQUFDLE1BQU0sQ0FDakIsU0FBaUIsRUFDakIsVUFHSSxFQUFFO1FBRU4sSUFBSSxDQUFDO1lBQ0gsTUFBTSxNQUFNLEdBQUcsa0JBQWtCLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDaEQsTUFBTSxPQUFPLEdBQUcsTUFBTSxNQUFNLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ25ELE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUV6QixNQUFNLE1BQU0sR0FBNEI7Z0JBQ3RDLE9BQU8sRUFBRSxLQUFLLEVBQUUsUUFBUSxJQUFJLEtBQUs7Z0JBQ2pDLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxJQUFJLFNBQVM7Z0JBQ2xDLFFBQVEsRUFBRSxLQUFLLEVBQUUsUUFBUSxJQUFJLFNBQVM7Z0JBQ3RDLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxJQUFJLE1BQU07Z0JBQy9CLE9BQU8sRUFBRSxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDckQsQ0FBQztZQUVGLGNBQWMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUM7Z0JBQ3BDLEtBQUssRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixDQUFDLElBQUk7Z0JBQ3JFLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxJQUFJO2dCQUM1QixPQUFPLEVBQUUscUJBQXFCLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxlQUFlLE1BQU0sQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFO2dCQUM3RyxPQUFPLEVBQUUsRUFBRSxRQUFRLEVBQUUsTUFBTSxDQUFDLFFBQVEsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU0sRUFBRTtnQkFDN0QsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLElBQUksU0FBUztnQkFDbEMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxPQUFPO2FBQ3hCLENBQUMsQ0FBQztZQUVILE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQ3pDLHNCQUFzQixNQUFNLENBQUMsTUFBTSxlQUFlLE1BQU0sQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFLENBQUMsQ0FBQztZQUVsRixPQUFPLE1BQU0sQ0FBQztRQUNoQixDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLDZCQUE2QixLQUFLLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQztZQUVsRSxjQUFjLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxDQUFDO2dCQUNwQyxLQUFLLEVBQUUsZ0JBQWdCLENBQUMsS0FBSztnQkFDN0IsSUFBSSxFQUFFLGlCQUFpQixDQUFDLElBQUk7Z0JBQzVCLE9BQU8sRUFBRSx5QkFBeUI7Z0JBQ2xDLE9BQU8sRUFBRSxFQUFFLEtBQUssRUFBRSxLQUFLLENBQUMsT0FBTyxFQUFFO2dCQUNqQyxPQUFPLEVBQUUsS0FBSzthQUNmLENBQUMsQ0FBQztZQUVILE9BQU87Z0JBQ0wsT0FBTyxFQUFFLEtBQUs7Z0JBQ2QsTUFBTSxFQUFFLFdBQVc7Z0JBQ25CLFlBQVksRUFBRSx1QkFBdUIsS0FBSyxDQUFDLE9BQU8sRUFBRTthQUNyRCxDQUFDO1FBQ0osQ0FBQztJQUNILENBQUM7SUFFRCxrREFBa0Q7SUFDM0MsVUFBVSxLQUFVLENBQUM7SUFFNUIsbURBQW1EO0lBQzVDLFlBQVk7UUFDakIsT0FBTyxDQUFDLENBQUM7SUFDWCxDQUFDO0NBQ0YifQ== \ No newline at end of file diff --git a/dist_ts/mail/security/classes.dmarcverifier.d.ts b/dist_ts/mail/security/classes.dmarcverifier.d.ts deleted file mode 100644 index 43e5fb5..0000000 --- a/dist_ts/mail/security/classes.dmarcverifier.d.ts +++ /dev/null @@ -1,123 +0,0 @@ -import type { Email } from '../core/classes.email.js'; -/** - * DMARC policy types - */ -export declare enum DmarcPolicy { - NONE = "none", - QUARANTINE = "quarantine", - REJECT = "reject" -} -/** - * DMARC alignment modes - */ -export declare enum DmarcAlignment { - RELAXED = "r", - STRICT = "s" -} -/** - * DMARC record fields - */ -export interface DmarcRecord { - version: string; - policy: DmarcPolicy; - subdomainPolicy?: DmarcPolicy; - pct?: number; - adkim?: DmarcAlignment; - aspf?: DmarcAlignment; - reportInterval?: number; - failureOptions?: string; - reportUriAggregate?: string[]; - reportUriForensic?: string[]; -} -/** - * DMARC verification result - */ -export interface DmarcResult { - hasDmarc: boolean; - record?: DmarcRecord; - spfDomainAligned: boolean; - dkimDomainAligned: boolean; - spfPassed: boolean; - dkimPassed: boolean; - policyEvaluated: DmarcPolicy; - actualPolicy: DmarcPolicy; - appliedPercentage: number; - action: 'pass' | 'quarantine' | 'reject'; - details: string; - error?: string; -} -/** - * Class for verifying and enforcing DMARC policies - */ -export declare class DmarcVerifier { - private dnsManager?; - constructor(dnsManager?: any); - /** - * Parse a DMARC record from a TXT record string - * @param record DMARC TXT record string - * @returns Parsed DMARC record or null if invalid - */ - parseDmarcRecord(record: string): DmarcRecord | null; - /** - * Check if domains are aligned according to DMARC policy - * @param headerDomain Domain from header (From) - * @param authDomain Domain from authentication (SPF, DKIM) - * @param alignment Alignment mode - * @returns Whether the domains are aligned - */ - private isDomainAligned; - /** - * Extract domain from an email address - * @param email Email address - * @returns Domain part of the email - */ - private getDomainFromEmail; - /** - * Check if DMARC verification should be applied based on percentage - * @param record DMARC record - * @returns Whether DMARC verification should be applied - */ - private shouldApplyDmarc; - /** - * Determine the action to take based on DMARC policy - * @param policy DMARC policy - * @returns Action to take - */ - private determineAction; - /** - * Verify DMARC for an incoming email - * @param email Email to verify - * @param spfResult SPF verification result - * @param dkimResult DKIM verification result - * @returns DMARC verification result - */ - verify(email: Email, spfResult: { - domain: string; - result: boolean; - }, dkimResult: { - domain: string; - result: boolean; - }): Promise; - /** - * Apply DMARC policy to an email - * @param email Email to apply policy to - * @param dmarcResult DMARC verification result - * @returns Whether the email should be accepted - */ - applyPolicy(email: Email, dmarcResult: DmarcResult): boolean; - /** - * End-to-end DMARC verification and policy application - * This method should be called after SPF and DKIM verification - * @param email Email to verify - * @param spfResult SPF verification result - * @param dkimResult DKIM verification result - * @returns Whether the email should be accepted - */ - verifyAndApply(email: Email, spfResult: { - domain: string; - result: boolean; - }, dkimResult: { - domain: string; - result: boolean; - }): Promise; -} diff --git a/dist_ts/mail/security/classes.dmarcverifier.js b/dist_ts/mail/security/classes.dmarcverifier.js deleted file mode 100644 index 64631d5..0000000 --- a/dist_ts/mail/security/classes.dmarcverifier.js +++ /dev/null @@ -1,366 +0,0 @@ -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -/** - * DMARC policy types - */ -export var DmarcPolicy; -(function (DmarcPolicy) { - DmarcPolicy["NONE"] = "none"; - DmarcPolicy["QUARANTINE"] = "quarantine"; - DmarcPolicy["REJECT"] = "reject"; -})(DmarcPolicy || (DmarcPolicy = {})); -/** - * DMARC alignment modes - */ -export var DmarcAlignment; -(function (DmarcAlignment) { - DmarcAlignment["RELAXED"] = "r"; - DmarcAlignment["STRICT"] = "s"; -})(DmarcAlignment || (DmarcAlignment = {})); -/** - * Class for verifying and enforcing DMARC policies - */ -export class DmarcVerifier { - // DNS Manager reference for verifying records - dnsManager; - constructor(dnsManager) { - this.dnsManager = dnsManager; - } - /** - * Parse a DMARC record from a TXT record string - * @param record DMARC TXT record string - * @returns Parsed DMARC record or null if invalid - */ - parseDmarcRecord(record) { - if (!record.startsWith('v=DMARC1')) { - return null; - } - try { - // Initialize record with default values - const dmarcRecord = { - version: 'DMARC1', - policy: DmarcPolicy.NONE, - pct: 100, - adkim: DmarcAlignment.RELAXED, - aspf: DmarcAlignment.RELAXED - }; - // Split the record into tag/value pairs - const parts = record.split(';').map(part => part.trim()); - for (const part of parts) { - if (!part || !part.includes('=')) - continue; - const [tag, value] = part.split('=').map(p => p.trim()); - // Process based on tag - switch (tag.toLowerCase()) { - case 'v': - dmarcRecord.version = value; - break; - case 'p': - dmarcRecord.policy = value; - break; - case 'sp': - dmarcRecord.subdomainPolicy = value; - break; - case 'pct': - const pctValue = parseInt(value, 10); - if (!isNaN(pctValue) && pctValue >= 0 && pctValue <= 100) { - dmarcRecord.pct = pctValue; - } - break; - case 'adkim': - dmarcRecord.adkim = value; - break; - case 'aspf': - dmarcRecord.aspf = value; - break; - case 'ri': - const interval = parseInt(value, 10); - if (!isNaN(interval) && interval > 0) { - dmarcRecord.reportInterval = interval; - } - break; - case 'fo': - dmarcRecord.failureOptions = value; - break; - case 'rua': - dmarcRecord.reportUriAggregate = value.split(',').map(uri => { - if (uri.startsWith('mailto:')) { - return uri.substring(7).trim(); - } - return uri.trim(); - }); - break; - case 'ruf': - dmarcRecord.reportUriForensic = value.split(',').map(uri => { - if (uri.startsWith('mailto:')) { - return uri.substring(7).trim(); - } - return uri.trim(); - }); - break; - } - } - // Ensure subdomain policy is set if not explicitly provided - if (!dmarcRecord.subdomainPolicy) { - dmarcRecord.subdomainPolicy = dmarcRecord.policy; - } - return dmarcRecord; - } - catch (error) { - logger.log('error', `Error parsing DMARC record: ${error.message}`, { - record, - error: error.message - }); - return null; - } - } - /** - * Check if domains are aligned according to DMARC policy - * @param headerDomain Domain from header (From) - * @param authDomain Domain from authentication (SPF, DKIM) - * @param alignment Alignment mode - * @returns Whether the domains are aligned - */ - isDomainAligned(headerDomain, authDomain, alignment) { - if (!headerDomain || !authDomain) { - return false; - } - // For strict alignment, domains must match exactly - if (alignment === DmarcAlignment.STRICT) { - return headerDomain.toLowerCase() === authDomain.toLowerCase(); - } - // For relaxed alignment, the authenticated domain must be a subdomain of the header domain - // or the same as the header domain - const headerParts = headerDomain.toLowerCase().split('.'); - const authParts = authDomain.toLowerCase().split('.'); - // Ensures we have at least two parts (domain and TLD) - if (headerParts.length < 2 || authParts.length < 2) { - return false; - } - // Get organizational domain (last two parts) - const headerOrgDomain = headerParts.slice(-2).join('.'); - const authOrgDomain = authParts.slice(-2).join('.'); - return headerOrgDomain === authOrgDomain; - } - /** - * Extract domain from an email address - * @param email Email address - * @returns Domain part of the email - */ - getDomainFromEmail(email) { - if (!email) - return ''; - // Handle name + email format: "John Doe " - const matches = email.match(/<([^>]+)>/); - const address = matches ? matches[1] : email; - const parts = address.split('@'); - return parts.length > 1 ? parts[1] : ''; - } - /** - * Check if DMARC verification should be applied based on percentage - * @param record DMARC record - * @returns Whether DMARC verification should be applied - */ - shouldApplyDmarc(record) { - if (record.pct === undefined || record.pct === 100) { - return true; - } - // Apply DMARC randomly based on percentage - const random = Math.floor(Math.random() * 100) + 1; - return random <= record.pct; - } - /** - * Determine the action to take based on DMARC policy - * @param policy DMARC policy - * @returns Action to take - */ - determineAction(policy) { - switch (policy) { - case DmarcPolicy.REJECT: - return 'reject'; - case DmarcPolicy.QUARANTINE: - return 'quarantine'; - case DmarcPolicy.NONE: - default: - return 'pass'; - } - } - /** - * Verify DMARC for an incoming email - * @param email Email to verify - * @param spfResult SPF verification result - * @param dkimResult DKIM verification result - * @returns DMARC verification result - */ - async verify(email, spfResult, dkimResult) { - const securityLogger = SecurityLogger.getInstance(); - // Initialize result - const result = { - hasDmarc: false, - spfDomainAligned: false, - dkimDomainAligned: false, - spfPassed: spfResult.result, - dkimPassed: dkimResult.result, - policyEvaluated: DmarcPolicy.NONE, - actualPolicy: DmarcPolicy.NONE, - appliedPercentage: 100, - action: 'pass', - details: 'DMARC not configured' - }; - try { - // Extract From domain - const fromHeader = email.getFromEmail(); - const fromDomain = this.getDomainFromEmail(fromHeader); - if (!fromDomain) { - result.error = 'Invalid From domain'; - return result; - } - // Check alignment - result.spfDomainAligned = this.isDomainAligned(fromDomain, spfResult.domain, DmarcAlignment.RELAXED); - result.dkimDomainAligned = this.isDomainAligned(fromDomain, dkimResult.domain, DmarcAlignment.RELAXED); - // Lookup DMARC record - const dmarcVerificationResult = this.dnsManager ? - await this.dnsManager.verifyDmarcRecord(fromDomain) : - { found: false, valid: false, error: 'DNS Manager not available' }; - // If DMARC record exists and is valid - if (dmarcVerificationResult.found && dmarcVerificationResult.valid) { - result.hasDmarc = true; - // Parse DMARC record - const parsedRecord = this.parseDmarcRecord(dmarcVerificationResult.value); - if (parsedRecord) { - result.record = parsedRecord; - result.actualPolicy = parsedRecord.policy; - result.appliedPercentage = parsedRecord.pct || 100; - // Override alignment modes if specified in record - if (parsedRecord.adkim) { - result.dkimDomainAligned = this.isDomainAligned(fromDomain, dkimResult.domain, parsedRecord.adkim); - } - if (parsedRecord.aspf) { - result.spfDomainAligned = this.isDomainAligned(fromDomain, spfResult.domain, parsedRecord.aspf); - } - // Determine DMARC compliance - const spfAligned = result.spfPassed && result.spfDomainAligned; - const dkimAligned = result.dkimPassed && result.dkimDomainAligned; - // Email passes DMARC if either SPF or DKIM passes with alignment - const dmarcPass = spfAligned || dkimAligned; - // Use record percentage to determine if policy should be applied - const applyPolicy = this.shouldApplyDmarc(parsedRecord); - if (!dmarcPass) { - // DMARC failed, apply policy - result.policyEvaluated = applyPolicy ? parsedRecord.policy : DmarcPolicy.NONE; - result.action = this.determineAction(result.policyEvaluated); - result.details = `DMARC failed: SPF aligned=${spfAligned}, DKIM aligned=${dkimAligned}, policy=${result.policyEvaluated}`; - } - else { - result.policyEvaluated = DmarcPolicy.NONE; - result.action = 'pass'; - result.details = `DMARC passed: SPF aligned=${spfAligned}, DKIM aligned=${dkimAligned}`; - } - } - else { - result.error = 'Invalid DMARC record format'; - result.details = 'DMARC record invalid'; - } - } - else { - // No DMARC record found or invalid - result.details = dmarcVerificationResult.error || 'No DMARC record found'; - } - // Log the DMARC verification - securityLogger.logEvent({ - level: result.action === 'pass' ? SecurityLogLevel.INFO : SecurityLogLevel.WARN, - type: SecurityEventType.DMARC, - message: result.details, - domain: fromDomain, - details: { - fromDomain, - spfDomain: spfResult.domain, - dkimDomain: dkimResult.domain, - spfPassed: result.spfPassed, - dkimPassed: result.dkimPassed, - spfAligned: result.spfDomainAligned, - dkimAligned: result.dkimDomainAligned, - dmarcPolicy: result.policyEvaluated, - action: result.action - }, - success: result.action === 'pass' - }); - return result; - } - catch (error) { - logger.log('error', `Error verifying DMARC: ${error.message}`, { - error: error.message, - emailId: email.getMessageId() - }); - result.error = `DMARC verification error: ${error.message}`; - // Log error - securityLogger.logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.DMARC, - message: `DMARC verification failed with error`, - details: { - error: error.message, - emailId: email.getMessageId() - }, - success: false - }); - return result; - } - } - /** - * Apply DMARC policy to an email - * @param email Email to apply policy to - * @param dmarcResult DMARC verification result - * @returns Whether the email should be accepted - */ - applyPolicy(email, dmarcResult) { - // Apply action based on DMARC verification result - switch (dmarcResult.action) { - case 'reject': - // Reject the email - email.mightBeSpam = true; - logger.log('warn', `Email rejected due to DMARC policy: ${dmarcResult.details}`, { - emailId: email.getMessageId(), - from: email.getFromEmail(), - subject: email.subject - }); - return false; - case 'quarantine': - // Quarantine the email (mark as spam) - email.mightBeSpam = true; - // Add spam header - if (!email.headers['X-Spam-Flag']) { - email.headers['X-Spam-Flag'] = 'YES'; - } - // Add DMARC reason header - email.headers['X-DMARC-Result'] = dmarcResult.details; - logger.log('warn', `Email quarantined due to DMARC policy: ${dmarcResult.details}`, { - emailId: email.getMessageId(), - from: email.getFromEmail(), - subject: email.subject - }); - return true; - case 'pass': - default: - // Accept the email - // Add DMARC result header for information - email.headers['X-DMARC-Result'] = dmarcResult.details; - return true; - } - } - /** - * End-to-end DMARC verification and policy application - * This method should be called after SPF and DKIM verification - * @param email Email to verify - * @param spfResult SPF verification result - * @param dkimResult DKIM verification result - * @returns Whether the email should be accepted - */ - async verifyAndApply(email, spfResult, dkimResult) { - // Verify DMARC - const dmarcResult = await this.verify(email, spfResult, dkimResult); - // Apply DMARC policy - return this.applyPolicy(email, dmarcResult); - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dmarcverifier.js","sourceRoot":"","sources":["../../../ts/mail/security/classes.dmarcverifier.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/mail/security/classes.spfverifier.d.ts b/dist_ts/mail/security/classes.spfverifier.d.ts deleted file mode 100644 index c1d6b91..0000000 --- a/dist_ts/mail/security/classes.spfverifier.d.ts +++ /dev/null @@ -1,71 +0,0 @@ -import type { Email } from '../core/classes.email.js'; -/** - * SPF result qualifiers - */ -export declare enum SpfQualifier { - PASS = "+", - NEUTRAL = "?", - SOFTFAIL = "~", - FAIL = "-" -} -/** - * SPF mechanism types - */ -export declare enum SpfMechanismType { - ALL = "all", - INCLUDE = "include", - A = "a", - MX = "mx", - IP4 = "ip4", - IP6 = "ip6", - EXISTS = "exists", - REDIRECT = "redirect", - EXP = "exp" -} -/** - * SPF mechanism definition - */ -export interface SpfMechanism { - qualifier: SpfQualifier; - type: SpfMechanismType; - value?: string; -} -/** - * SPF record parsed data - */ -export interface SpfRecord { - version: string; - mechanisms: SpfMechanism[]; - modifiers: Record; -} -/** - * SPF verification result - */ -export interface SpfResult { - result: 'pass' | 'neutral' | 'softfail' | 'fail' | 'temperror' | 'permerror' | 'none'; - explanation?: string; - domain: string; - ip: string; - record?: string; - error?: string; -} -/** - * Class for verifying SPF records. - * Delegates actual SPF evaluation to the Rust security bridge. - * Retains parseSpfRecord() for lightweight local parsing. - */ -export declare class SpfVerifier { - constructor(_dnsManager?: any); - /** - * Parse SPF record from TXT record (pure string parsing, no DNS) - */ - parseSpfRecord(record: string): SpfRecord | null; - /** - * Verify SPF for a given email — delegates to Rust bridge - */ - verify(email: Email, ip: string, heloDomain: string): Promise; - /** - * Check if email passes SPF verification and apply headers - */ - verifyAndApply(email: Email, ip: string, heloDomain: string): Promise; -} diff --git a/dist_ts/mail/security/classes.spfverifier.js b/dist_ts/mail/security/classes.spfverifier.js deleted file mode 100644 index d2eb854..0000000 --- a/dist_ts/mail/security/classes.spfverifier.js +++ /dev/null @@ -1,171 +0,0 @@ -import * as plugins from '../../plugins.js'; -import { logger } from '../../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from '../../security/index.js'; -import { RustSecurityBridge } from '../../security/classes.rustsecuritybridge.js'; -/** - * SPF result qualifiers - */ -export var SpfQualifier; -(function (SpfQualifier) { - SpfQualifier["PASS"] = "+"; - SpfQualifier["NEUTRAL"] = "?"; - SpfQualifier["SOFTFAIL"] = "~"; - SpfQualifier["FAIL"] = "-"; -})(SpfQualifier || (SpfQualifier = {})); -/** - * SPF mechanism types - */ -export var SpfMechanismType; -(function (SpfMechanismType) { - SpfMechanismType["ALL"] = "all"; - SpfMechanismType["INCLUDE"] = "include"; - SpfMechanismType["A"] = "a"; - SpfMechanismType["MX"] = "mx"; - SpfMechanismType["IP4"] = "ip4"; - SpfMechanismType["IP6"] = "ip6"; - SpfMechanismType["EXISTS"] = "exists"; - SpfMechanismType["REDIRECT"] = "redirect"; - SpfMechanismType["EXP"] = "exp"; -})(SpfMechanismType || (SpfMechanismType = {})); -/** - * Class for verifying SPF records. - * Delegates actual SPF evaluation to the Rust security bridge. - * Retains parseSpfRecord() for lightweight local parsing. - */ -export class SpfVerifier { - constructor(_dnsManager) { - // dnsManager is no longer needed — Rust handles DNS lookups - } - /** - * Parse SPF record from TXT record (pure string parsing, no DNS) - */ - parseSpfRecord(record) { - if (!record.startsWith('v=spf1')) { - return null; - } - try { - const spfRecord = { - version: 'spf1', - mechanisms: [], - modifiers: {} - }; - const terms = record.split(' ').filter(term => term.length > 0); - for (let i = 1; i < terms.length; i++) { - const term = terms[i]; - if (term.includes('=')) { - const [name, value] = term.split('='); - spfRecord.modifiers[name] = value; - continue; - } - let qualifier = SpfQualifier.PASS; - let mechanismText = term; - if (term.startsWith('+') || term.startsWith('-') || - term.startsWith('~') || term.startsWith('?')) { - qualifier = term[0]; - mechanismText = term.substring(1); - } - const colonIndex = mechanismText.indexOf(':'); - let type; - let value; - if (colonIndex !== -1) { - type = mechanismText.substring(0, colonIndex); - value = mechanismText.substring(colonIndex + 1); - } - else { - type = mechanismText; - } - spfRecord.mechanisms.push({ qualifier, type, value }); - } - return spfRecord; - } - catch (error) { - logger.log('error', `Error parsing SPF record: ${error.message}`, { - record, - error: error.message - }); - return null; - } - } - /** - * Verify SPF for a given email — delegates to Rust bridge - */ - async verify(email, ip, heloDomain) { - const securityLogger = SecurityLogger.getInstance(); - const mailFrom = email.from || ''; - const domain = mailFrom.split('@')[1] || ''; - try { - const bridge = RustSecurityBridge.getInstance(); - const result = await bridge.checkSpf({ - ip, - heloDomain, - hostname: plugins.os.hostname(), - mailFrom, - }); - const spfResult = { - result: result.result, - domain: result.domain, - ip: result.ip, - explanation: result.explanation ?? undefined, - }; - securityLogger.logEvent({ - level: spfResult.result === 'pass' ? SecurityLogLevel.INFO : - (spfResult.result === 'fail' ? SecurityLogLevel.WARN : SecurityLogLevel.INFO), - type: SecurityEventType.SPF, - message: `SPF ${spfResult.result} for ${spfResult.domain} from IP ${ip}`, - domain: spfResult.domain, - details: { ip, heloDomain, result: spfResult.result, explanation: spfResult.explanation }, - success: spfResult.result === 'pass' - }); - return spfResult; - } - catch (error) { - logger.log('error', `SPF verification error: ${error.message}`, { domain, ip, error: error.message }); - securityLogger.logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.SPF, - message: `SPF verification error for ${domain}`, - domain, - details: { ip, error: error.message }, - success: false - }); - return { - result: 'temperror', - explanation: `Error verifying SPF: ${error.message}`, - domain, - ip, - error: error.message - }; - } - } - /** - * Check if email passes SPF verification and apply headers - */ - async verifyAndApply(email, ip, heloDomain) { - const result = await this.verify(email, ip, heloDomain); - email.headers['Received-SPF'] = `${result.result} (${result.domain}: ${result.explanation || ''}) client-ip=${ip}; envelope-from=${email.getEnvelopeFrom()}; helo=${heloDomain};`; - switch (result.result) { - case 'fail': - email.mightBeSpam = true; - logger.log('warn', `SPF failed for ${result.domain} from ${ip}: ${result.explanation}`); - return false; - case 'softfail': - email.mightBeSpam = true; - logger.log('info', `SPF softfailed for ${result.domain} from ${ip}: ${result.explanation}`); - return true; - case 'neutral': - case 'none': - logger.log('info', `SPF ${result.result} for ${result.domain} from ${ip}: ${result.explanation}`); - return true; - case 'pass': - logger.log('info', `SPF passed for ${result.domain} from ${ip}: ${result.explanation}`); - return true; - case 'temperror': - case 'permerror': - logger.log('error', `SPF error for ${result.domain} from ${ip}: ${result.explanation}`); - return true; - default: - return true; - } - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zcGZ2ZXJpZmllci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL21haWwvc2VjdXJpdHkvY2xhc3Nlcy5zcGZ2ZXJpZmllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGtCQUFrQixDQUFDO0FBQzVDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLGlCQUFpQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDOUYsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sOENBQThDLENBQUM7QUFHbEY7O0dBRUc7QUFDSCxNQUFNLENBQU4sSUFBWSxZQUtYO0FBTEQsV0FBWSxZQUFZO0lBQ3RCLDBCQUFVLENBQUE7SUFDViw2QkFBYSxDQUFBO0lBQ2IsOEJBQWMsQ0FBQTtJQUNkLDBCQUFVLENBQUE7QUFDWixDQUFDLEVBTFcsWUFBWSxLQUFaLFlBQVksUUFLdkI7QUFFRDs7R0FFRztBQUNILE1BQU0sQ0FBTixJQUFZLGdCQVVYO0FBVkQsV0FBWSxnQkFBZ0I7SUFDMUIsK0JBQVcsQ0FBQTtJQUNYLHVDQUFtQixDQUFBO0lBQ25CLDJCQUFPLENBQUE7SUFDUCw2QkFBUyxDQUFBO0lBQ1QsK0JBQVcsQ0FBQTtJQUNYLCtCQUFXLENBQUE7SUFDWCxxQ0FBaUIsQ0FBQTtJQUNqQix5Q0FBcUIsQ0FBQTtJQUNyQiwrQkFBVyxDQUFBO0FBQ2IsQ0FBQyxFQVZXLGdCQUFnQixLQUFoQixnQkFBZ0IsUUFVM0I7QUFnQ0Q7Ozs7R0FJRztBQUNILE1BQU0sT0FBTyxXQUFXO0lBQ3RCLFlBQVksV0FBaUI7UUFDM0IsNERBQTREO0lBQzlELENBQUM7SUFFRDs7T0FFRztJQUNJLGNBQWMsQ0FBQyxNQUFjO1FBQ2xDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7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 \ No newline at end of file diff --git a/dist_ts/mail/security/index.d.ts b/dist_ts/mail/security/index.d.ts deleted file mode 100644 index 9f880de..0000000 --- a/dist_ts/mail/security/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './classes.dkimcreator.js'; -export * from './classes.dkimverifier.js'; -export * from './classes.dmarcverifier.js'; -export * from './classes.spfverifier.js'; diff --git a/dist_ts/mail/security/index.js b/dist_ts/mail/security/index.js deleted file mode 100644 index 5c360c1..0000000 --- a/dist_ts/mail/security/index.js +++ /dev/null @@ -1,6 +0,0 @@ -// Email security components -export * from './classes.dkimcreator.js'; -export * from './classes.dkimverifier.js'; -export * from './classes.dmarcverifier.js'; -export * from './classes.spfverifier.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90cy9tYWlsL3NlY3VyaXR5L2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRCQUE0QjtBQUM1QixjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDBCQUEwQixDQUFDIn0= \ No newline at end of file diff --git a/dist_ts/paths.d.ts b/dist_ts/paths.d.ts deleted file mode 100644 index 22cc3b5..0000000 --- a/dist_ts/paths.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -export declare const baseDir: string; -export declare const packageDir: string; -export declare const distServe: string; -export declare const dataDir: string; -export declare const keysDir: string; -export declare const dnsRecordsDir: string; -export declare const sentEmailsDir: string; -export declare const receivedEmailsDir: string; -export declare const failedEmailsDir: string; -export declare const logsDir: string; -export declare const emailTemplatesDir: string; -export declare const MtaAttachmentsDir: string; -export declare const configPath: string; -export declare function ensureDirectories(): Promise; diff --git a/dist_ts/paths.js b/dist_ts/paths.js deleted file mode 100644 index 5bcad5a..0000000 --- a/dist_ts/paths.js +++ /dev/null @@ -1,39 +0,0 @@ -import * as plugins from './plugins.js'; -// Base directories -export const baseDir = process.cwd(); -export const packageDir = plugins.path.join(plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), '../'); -export const distServe = plugins.path.join(packageDir, './dist_serve'); -// Configure data directory with environment variable or default to .nogit/data -const DEFAULT_DATA_PATH = '.nogit/data'; -export const dataDir = process.env.DATA_DIR - ? process.env.DATA_DIR - : plugins.path.join(baseDir, DEFAULT_DATA_PATH); -// MTA directories -export const keysDir = plugins.path.join(dataDir, 'keys'); -export const dnsRecordsDir = plugins.path.join(dataDir, 'dns'); -export const sentEmailsDir = plugins.path.join(dataDir, 'emails', 'sent'); -export const receivedEmailsDir = plugins.path.join(dataDir, 'emails', 'received'); -export const failedEmailsDir = plugins.path.join(dataDir, 'emails', 'failed'); // For failed emails -export const logsDir = plugins.path.join(dataDir, 'logs'); // For logs -// Email template directories -export const emailTemplatesDir = plugins.path.join(dataDir, 'templates', 'email'); -export const MtaAttachmentsDir = plugins.path.join(dataDir, 'attachments'); // For email attachments -// Configuration path -export const configPath = process.env.CONFIG_PATH - ? process.env.CONFIG_PATH - : plugins.path.join(baseDir, 'config.json'); -// Create directories if they don't exist -export async function ensureDirectories() { - // Ensure data directories - await plugins.smartfs.directory(dataDir).recursive().create(); - await plugins.smartfs.directory(keysDir).recursive().create(); - await plugins.smartfs.directory(dnsRecordsDir).recursive().create(); - await plugins.smartfs.directory(sentEmailsDir).recursive().create(); - await plugins.smartfs.directory(receivedEmailsDir).recursive().create(); - await plugins.smartfs.directory(failedEmailsDir).recursive().create(); - await plugins.smartfs.directory(logsDir).recursive().create(); - // Ensure email template directories - await plugins.smartfs.directory(emailTemplatesDir).recursive().create(); - await plugins.smartfs.directory(MtaAttachmentsDir).recursive().create(); -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGF0aHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9wYXRocy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUV4QyxtQkFBbUI7QUFDbkIsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztBQUNyQyxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQ3pDLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQy9ELEtBQUssQ0FDTixDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsRUFBRSxjQUFjLENBQUMsQ0FBQztBQUV2RSwrRUFBK0U7QUFDL0UsTUFBTSxpQkFBaUIsR0FBRyxhQUFhLENBQUM7QUFDeEMsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUTtJQUN6QyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRO0lBQ3RCLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztBQUVsRCxtQkFBbUI7QUFDbkIsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztBQUMxRCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDO0FBQy9ELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUks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 \ No newline at end of file diff --git a/dist_ts/plugins.d.ts b/dist_ts/plugins.d.ts deleted file mode 100644 index b3eaee4..0000000 --- a/dist_ts/plugins.d.ts +++ /dev/null @@ -1,47 +0,0 @@ -import * as dns from 'dns'; -import * as fs from 'fs'; -import * as crypto from 'crypto'; -import * as http from 'http'; -import * as net from 'net'; -import * as os from 'os'; -import * as path from 'path'; -import * as tls from 'tls'; -import * as util from 'util'; -export { dns, fs, crypto, http, net, os, path, tls, util, }; -import * as servezoneInterfaces from '@serve.zone/interfaces'; -export { servezoneInterfaces }; -import * as typedrequest from '@api.global/typedrequest'; -import * as typedserver from '@api.global/typedserver'; -import * as typedsocket from '@api.global/typedsocket'; -export { typedrequest, typedserver, typedsocket, }; -import * as projectinfo from '@push.rocks/projectinfo'; -import * as qenv from '@push.rocks/qenv'; -import * as smartacme from '@push.rocks/smartacme'; -import * as smartdata from '@push.rocks/smartdata'; -import * as smartdns from '@push.rocks/smartdns'; -import * as smartfile from '@push.rocks/smartfile'; -import { SmartFs } from '@push.rocks/smartfs'; -import * as smartguard from '@push.rocks/smartguard'; -import * as smartjwt from '@push.rocks/smartjwt'; -import * as smartlog from '@push.rocks/smartlog'; -import * as smartmail from '@push.rocks/smartmail'; -import * as smartmetrics from '@push.rocks/smartmetrics'; -import * as smartnetwork from '@push.rocks/smartnetwork'; -import * as smartpath from '@push.rocks/smartpath'; -import * as smartproxy from '@push.rocks/smartproxy'; -import * as smartpromise from '@push.rocks/smartpromise'; -import * as smartrequest from '@push.rocks/smartrequest'; -import * as smartrule from '@push.rocks/smartrule'; -import * as smartrust from '@push.rocks/smartrust'; -import * as smartrx from '@push.rocks/smartrx'; -import * as smartunique from '@push.rocks/smartunique'; -export declare const smartfs: SmartFs; -export { projectinfo, qenv, smartacme, smartdata, smartdns, smartfile, SmartFs, smartguard, smartjwt, smartlog, smartmail, smartmetrics, smartnetwork, smartpath, smartproxy, smartpromise, smartrequest, smartrule, smartrust, smartrx, smartunique }; -export type TLogLevel = 'error' | 'warn' | 'info' | 'success' | 'debug'; -import * as cloudflare from '@apiclient.xyz/cloudflare'; -export { cloudflare, }; -import * as tsclass from '@tsclass/tsclass'; -export { tsclass, }; -import mailparser from 'mailparser'; -import * as uuid from 'uuid'; -export { mailparser, uuid, }; diff --git a/dist_ts/plugins.js b/dist_ts/plugins.js deleted file mode 100644 index b9dd418..0000000 --- a/dist_ts/plugins.js +++ /dev/null @@ -1,54 +0,0 @@ -// node native -import * as dns from 'dns'; -import * as fs from 'fs'; -import * as crypto from 'crypto'; -import * as http from 'http'; -import * as net from 'net'; -import * as os from 'os'; -import * as path from 'path'; -import * as tls from 'tls'; -import * as util from 'util'; -export { dns, fs, crypto, http, net, os, path, tls, util, }; -// @serve.zone scope -import * as servezoneInterfaces from '@serve.zone/interfaces'; -export { servezoneInterfaces }; -// @api.global scope -import * as typedrequest from '@api.global/typedrequest'; -import * as typedserver from '@api.global/typedserver'; -import * as typedsocket from '@api.global/typedsocket'; -export { typedrequest, typedserver, typedsocket, }; -// @push.rocks scope -import * as projectinfo from '@push.rocks/projectinfo'; -import * as qenv from '@push.rocks/qenv'; -import * as smartacme from '@push.rocks/smartacme'; -import * as smartdata from '@push.rocks/smartdata'; -import * as smartdns from '@push.rocks/smartdns'; -import * as smartfile from '@push.rocks/smartfile'; -import { SmartFs, SmartFsProviderNode } from '@push.rocks/smartfs'; -import * as smartguard from '@push.rocks/smartguard'; -import * as smartjwt from '@push.rocks/smartjwt'; -import * as smartlog from '@push.rocks/smartlog'; -import * as smartmail from '@push.rocks/smartmail'; -import * as smartmetrics from '@push.rocks/smartmetrics'; -import * as smartnetwork from '@push.rocks/smartnetwork'; -import * as smartpath from '@push.rocks/smartpath'; -import * as smartproxy from '@push.rocks/smartproxy'; -import * as smartpromise from '@push.rocks/smartpromise'; -import * as smartrequest from '@push.rocks/smartrequest'; -import * as smartrule from '@push.rocks/smartrule'; -import * as smartrust from '@push.rocks/smartrust'; -import * as smartrx from '@push.rocks/smartrx'; -import * as smartunique from '@push.rocks/smartunique'; -export const smartfs = new SmartFs(new SmartFsProviderNode()); -export { projectinfo, qenv, smartacme, smartdata, smartdns, smartfile, SmartFs, smartguard, smartjwt, smartlog, smartmail, smartmetrics, smartnetwork, smartpath, smartproxy, smartpromise, smartrequest, smartrule, smartrust, smartrx, smartunique }; -// apiclient.xyz scope -import * as cloudflare from '@apiclient.xyz/cloudflare'; -export { cloudflare, }; -// tsclass scope -import * as tsclass from '@tsclass/tsclass'; -export { tsclass, }; -// third party -import mailparser from 'mailparser'; -import * as uuid from 'uuid'; -export { mailparser, uuid, }; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYztBQUNkLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBQ2pDLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxFQUFFLE1BQU0sSUFBSSxDQUFDO0FBQ3pCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBRTdCLE9BQU8sRUFDTCxHQUFHLEVBQ0gsRUFBRSxFQUNGLE1BQU0sRUFDTixJQUFJLEVBQ0osR0FBRyxFQUNILEVBQUUsRUFDRixJQUFJLEVBQ0osR0FBRyxFQUNILElBQUksR0FDTCxDQUFBO0FBRUQsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxtQkFBbUIsTUFBTSx3QkFBd0IsQ0FBQztBQUU5RCxPQUFPLEVBQ0wsbUJBQW1CLEVBQ3BCLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssV0FBVyxNQUFNLHlCQUF5QixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxXQUFXLE1BQU0seUJBQXlCLENBQUM7QUFFdkQsT0FBTyxFQUNMLFlBQVksRUFDWixXQUFXLEVBQ1gsV0FBVyxHQUNaLENBQUE7QUFFRCxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEtBQUssSUFBSSxNQUFNLGtCQUFrQixDQUFDO0FBQ3pDLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxFQUFFLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25FLE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFFBQVEsTUFBTSxzQkFBc0IsQ0FBQztBQUNqRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUN6RCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUNyRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxZQUFZLE1BQU0sMEJBQTBCLENBQUM7QUFDekQsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssU0FBUyxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sS0FBSyxPQUFPLE1BQU0scUJBQXFCLENBQUM7QUFDL0MsT0FBTyxLQUFLLFdBQVcsTUFBTSx5QkFBeUIsQ0FBQztBQUV2RCxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsSUFBSSxPQUFPLENBQUMsSUFBSSxtQkFBbUIsRUFBRSxDQUFDLENBQUM7QUFFOUQsT0FBTyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxTQUFTLEVBQUUsWUFBWSxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUM7QUFLdlAsc0JBQXNCO0FBQ3RCLE9BQU8sS0FBSyxVQUFVLE1BQU0sMkJBQTJCLENBQUM7QUFFeEQsT0FBTyxFQUNMLFVBQVUsR0FDWCxDQUFBO0FBRUQsZ0JBQWdCO0FBQ2hCLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFFNUMsT0FBTyxFQUNMLE9BQU8sR0FDUixDQUFBO0FBRUQsY0FBYztBQUNkLE9BQU8sVUFBVSxNQUFNLFlBQVksQ0FBQztBQUNwQyxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUU3QixPQUFPLEVBQ0wsVUFBVSxFQUNWLElBQUksR0FDTCxDQUFBIn0= \ No newline at end of file diff --git a/dist_ts/security/classes.contentscanner.d.ts b/dist_ts/security/classes.contentscanner.d.ts deleted file mode 100644 index 41c55d7..0000000 --- a/dist_ts/security/classes.contentscanner.d.ts +++ /dev/null @@ -1,130 +0,0 @@ -import { Email } from '../mail/core/classes.email.js'; -/** - * Scan result information - */ -export interface IScanResult { - isClean: boolean; - threatType?: string; - threatDetails?: string; - threatScore: number; - scannedElements: string[]; - timestamp: number; -} -/** - * Options for content scanner configuration - */ -export interface IContentScannerOptions { - maxCacheSize?: number; - cacheTTL?: number; - scanSubject?: boolean; - scanBody?: boolean; - scanAttachments?: boolean; - maxAttachmentSizeToScan?: number; - scanAttachmentNames?: boolean; - blockExecutables?: boolean; - blockMacros?: boolean; - customRules?: Array<{ - pattern: string | RegExp; - type: string; - score: number; - description: string; - }>; - minThreatScore?: number; - highThreatScore?: number; -} -/** - * Threat categories - */ -export declare enum ThreatCategory { - SPAM = "spam", - PHISHING = "phishing", - MALWARE = "malware", - EXECUTABLE = "executable", - SUSPICIOUS_LINK = "suspicious_link", - MALICIOUS_MACRO = "malicious_macro", - XSS = "xss", - SENSITIVE_DATA = "sensitive_data", - BLACKLISTED_CONTENT = "blacklisted_content", - CUSTOM_RULE = "custom_rule" -} -/** - * Content Scanner for detecting malicious email content - */ -export declare class ContentScanner { - private static instance; - private scanCache; - private options; - /** - * Default options for the content scanner - */ - private static readonly DEFAULT_OPTIONS; - /** - * Constructor for the ContentScanner - * @param options Configuration options - */ - constructor(options?: IContentScannerOptions); - /** - * Get the singleton instance of the scanner - * @param options Configuration options - * @returns Singleton scanner instance - */ - static getInstance(options?: IContentScannerOptions): ContentScanner; - /** - * Scan an email for malicious content. - * Delegates text/subject/html/filename pattern scanning to Rust. - * Binary attachment scanning (PE headers, VBA macros) stays in TS. - * @param email The email to scan - * @returns Scan result - */ - scanEmail(email: Email): Promise; - /** - * Generate a cache key from an email - * @param email The email to generate a key for - * @returns Cache key - */ - private generateCacheKey; - /** - * Scan attachment binary content for PE headers and VBA macros. - * This stays in TS because it accesses raw Buffer data (too large for IPC). - * @param attachment The attachment to scan - * @param result The scan result to update - */ - private scanAttachmentBinary; - /** - * Apply custom rules (runtime-configured patterns) to the email. - * These stay in TS because they are configured at runtime. - * @param email The email to check - * @param result The scan result to update - */ - private applyCustomRules; - /** - * Extract text from a binary buffer for scanning - * @param buffer Binary content - * @returns Extracted text (may be partial) - */ - private extractTextFromBuffer; - /** - * Check if an Office document likely contains macros - * @param attachment The attachment to check - * @returns Whether the file likely contains macros - */ - private likelyContainsMacros; - /** - * Log a high threat finding to the security logger - * @param email The email containing the threat - * @param result The scan result - */ - private logHighThreatFound; - /** - * Log a threat finding to the security logger - * @param email The email containing the threat - * @param result The scan result - */ - private logThreatFound; - /** - * Get threat level description based on score - * @param score Threat score - * @returns Threat level description - */ - static getThreatLevel(score: number): 'none' | 'low' | 'medium' | 'high'; -} diff --git a/dist_ts/security/classes.contentscanner.js b/dist_ts/security/classes.contentscanner.js deleted file mode 100644 index 481b1dd..0000000 --- a/dist_ts/security/classes.contentscanner.js +++ /dev/null @@ -1,338 +0,0 @@ -import * as plugins from '../plugins.js'; -import * as paths from '../paths.js'; -import { logger } from '../logger.js'; -import { Email } from '../mail/core/classes.email.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js'; -import { RustSecurityBridge } from './classes.rustsecuritybridge.js'; -import { LRUCache } from 'lru-cache'; -/** - * Threat categories - */ -export var ThreatCategory; -(function (ThreatCategory) { - ThreatCategory["SPAM"] = "spam"; - ThreatCategory["PHISHING"] = "phishing"; - ThreatCategory["MALWARE"] = "malware"; - ThreatCategory["EXECUTABLE"] = "executable"; - ThreatCategory["SUSPICIOUS_LINK"] = "suspicious_link"; - ThreatCategory["MALICIOUS_MACRO"] = "malicious_macro"; - ThreatCategory["XSS"] = "xss"; - ThreatCategory["SENSITIVE_DATA"] = "sensitive_data"; - ThreatCategory["BLACKLISTED_CONTENT"] = "blacklisted_content"; - ThreatCategory["CUSTOM_RULE"] = "custom_rule"; -})(ThreatCategory || (ThreatCategory = {})); -/** - * Content Scanner for detecting malicious email content - */ -export class ContentScanner { - static instance; - scanCache; - options; - /** - * Default options for the content scanner - */ - static DEFAULT_OPTIONS = { - maxCacheSize: 10000, - cacheTTL: 24 * 60 * 60 * 1000, // 24 hours - scanSubject: true, - scanBody: true, - scanAttachments: true, - maxAttachmentSizeToScan: 10 * 1024 * 1024, // 10MB - scanAttachmentNames: true, - blockExecutables: true, - blockMacros: true, - customRules: [], - minThreatScore: 30, // Minimum score to consider content as a threat - highThreatScore: 70 // Score above which content is considered high threat - }; - /** - * Constructor for the ContentScanner - * @param options Configuration options - */ - constructor(options = {}) { - // Merge with default options - this.options = { - ...ContentScanner.DEFAULT_OPTIONS, - ...options - }; - // Initialize cache - this.scanCache = new LRUCache({ - max: this.options.maxCacheSize, - ttl: this.options.cacheTTL, - }); - logger.log('info', 'ContentScanner initialized'); - } - /** - * Get the singleton instance of the scanner - * @param options Configuration options - * @returns Singleton scanner instance - */ - static getInstance(options = {}) { - if (!ContentScanner.instance) { - ContentScanner.instance = new ContentScanner(options); - } - return ContentScanner.instance; - } - /** - * Scan an email for malicious content. - * Delegates text/subject/html/filename pattern scanning to Rust. - * Binary attachment scanning (PE headers, VBA macros) stays in TS. - * @param email The email to scan - * @returns Scan result - */ - async scanEmail(email) { - try { - // Generate a cache key from the email - const cacheKey = this.generateCacheKey(email); - // Check cache first - const cachedResult = this.scanCache.get(cacheKey); - if (cachedResult) { - logger.log('info', `Using cached scan result for email ${email.getMessageId()}`); - return cachedResult; - } - // Delegate text/subject/html/filename scanning to Rust - const bridge = RustSecurityBridge.getInstance(); - const rustResult = await bridge.scanContent({ - subject: this.options.scanSubject ? email.subject : undefined, - textBody: this.options.scanBody ? email.text : undefined, - htmlBody: this.options.scanBody ? email.html : undefined, - attachmentNames: this.options.scanAttachmentNames - ? email.attachments?.map(a => a.filename) ?? [] - : [], - }); - const result = { - isClean: true, - threatScore: rustResult.threatScore, - threatType: rustResult.threatType ?? undefined, - threatDetails: rustResult.threatDetails ?? undefined, - scannedElements: rustResult.scannedElements, - timestamp: Date.now(), - }; - // Attachment binary scanning stays in TS (PE headers, macro detection) - if (this.options.scanAttachments && email.attachments?.length > 0) { - for (const attachment of email.attachments) { - this.scanAttachmentBinary(attachment, result); - } - } - // Apply custom rules (TS-only, runtime-configured) - this.applyCustomRules(email, result); - // Determine if the email is clean based on threat score - result.isClean = result.threatScore < this.options.minThreatScore; - // Save to cache - this.scanCache.set(cacheKey, result); - // Log high threat findings - if (result.threatScore >= this.options.highThreatScore) { - this.logHighThreatFound(email, result); - } - else if (!result.isClean) { - this.logThreatFound(email, result); - } - return result; - } - catch (error) { - logger.log('error', `Error scanning email: ${error.message}`, { - messageId: email.getMessageId(), - error: error.stack - }); - // Return a safe default with error indication - return { - isClean: true, - threatScore: 0, - scannedElements: ['error'], - timestamp: Date.now(), - threatType: 'scan_error', - threatDetails: `Scan error: ${error.message}` - }; - } - } - /** - * Generate a cache key from an email - * @param email The email to generate a key for - * @returns Cache key - */ - generateCacheKey(email) { - // Use message ID if available - if (email.getMessageId()) { - return `email:${email.getMessageId()}`; - } - // Fallback to a hash of key content - const contentToHash = [ - email.from, - email.subject || '', - email.text?.substring(0, 1000) || '', - email.html?.substring(0, 1000) || '', - email.attachments?.length || 0 - ].join(':'); - return `email:${plugins.crypto.createHash('sha256').update(contentToHash).digest('hex')}`; - } - /** - * Scan attachment binary content for PE headers and VBA macros. - * This stays in TS because it accesses raw Buffer data (too large for IPC). - * @param attachment The attachment to scan - * @param result The scan result to update - */ - scanAttachmentBinary(attachment, result) { - if (!attachment.content) { - return; - } - // Skip large attachments - if (attachment.content.length > this.options.maxAttachmentSizeToScan) { - return; - } - const filename = attachment.filename.toLowerCase(); - // Check for PE headers (Windows executables disguised with non-.exe extensions) - if (attachment.content.length > 64 && - attachment.content[0] === 0x4D && - attachment.content[1] === 0x5A) { // 'MZ' header - result.threatScore += 80; - result.threatType = ThreatCategory.EXECUTABLE; - result.threatDetails = `Attachment contains executable code: ${filename}`; - return; - } - // Check for VBA macro indicators in Office documents - if (this.options.blockMacros && this.likelyContainsMacros(attachment)) { - result.threatScore += 60; - result.threatType = ThreatCategory.MALICIOUS_MACRO; - result.threatDetails = `Attachment appears to contain macros: ${filename}`; - } - } - /** - * Apply custom rules (runtime-configured patterns) to the email. - * These stay in TS because they are configured at runtime. - * @param email The email to check - * @param result The scan result to update - */ - applyCustomRules(email, result) { - if (!this.options.customRules.length) { - return; - } - const textsToCheck = []; - if (email.subject) - textsToCheck.push(email.subject); - if (email.text) - textsToCheck.push(email.text); - if (email.html) - textsToCheck.push(email.html); - for (const rule of this.options.customRules) { - const pattern = rule.pattern instanceof RegExp ? rule.pattern : new RegExp(rule.pattern, 'i'); - for (const text of textsToCheck) { - if (pattern.test(text)) { - result.threatScore += rule.score; - result.threatType = rule.type; - result.threatDetails = rule.description; - return; - } - } - } - } - /** - * Extract text from a binary buffer for scanning - * @param buffer Binary content - * @returns Extracted text (may be partial) - */ - extractTextFromBuffer(buffer) { - try { - // Limit the amount we convert to avoid memory issues - const sampleSize = Math.min(buffer.length, 100 * 1024); // 100KB max sample - const sample = buffer.slice(0, sampleSize); - // Try to convert to string, filtering out non-printable chars - return sample.toString('utf8') - .replace(/[\x00-\x09\x0B-\x1F\x7F-\x9F]/g, '') // Remove control chars - .replace(/\uFFFD/g, ''); // Remove replacement char - } - catch (error) { - logger.log('warn', `Error extracting text from buffer: ${error.message}`); - return ''; - } - } - /** - * Check if an Office document likely contains macros - * @param attachment The attachment to check - * @returns Whether the file likely contains macros - */ - likelyContainsMacros(attachment) { - const content = this.extractTextFromBuffer(attachment.content); - const macroIndicators = [ - /vbaProject\.bin/i, - /Microsoft VBA/i, - /\bVBA\b/, - /Auto_Open/i, - /AutoExec/i, - /DocumentOpen/i, - /AutoOpen/i, - /\bExecute\(/i, - /\bShell\(/i, - /\bCreateObject\(/i - ]; - for (const indicator of macroIndicators) { - if (indicator.test(content)) { - return true; - } - } - return false; - } - /** - * Log a high threat finding to the security logger - * @param email The email containing the threat - * @param result The scan result - */ - logHighThreatFound(email, result) { - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.ERROR, - type: SecurityEventType.MALWARE, - message: `High threat content detected in email from ${email.from} to ${email.to.join(', ')}`, - details: { - messageId: email.getMessageId(), - threatType: result.threatType, - threatDetails: result.threatDetails, - threatScore: result.threatScore, - scannedElements: result.scannedElements, - subject: email.subject - }, - success: false, - domain: email.getFromDomain() - }); - } - /** - * Log a threat finding to the security logger - * @param email The email containing the threat - * @param result The scan result - */ - logThreatFound(email, result) { - SecurityLogger.getInstance().logEvent({ - level: SecurityLogLevel.WARN, - type: SecurityEventType.SPAM, - message: `Suspicious content detected in email from ${email.from} to ${email.to.join(', ')}`, - details: { - messageId: email.getMessageId(), - threatType: result.threatType, - threatDetails: result.threatDetails, - threatScore: result.threatScore, - scannedElements: result.scannedElements, - subject: email.subject - }, - success: false, - domain: email.getFromDomain() - }); - } - /** - * Get threat level description based on score - * @param score Threat score - * @returns Threat level description - */ - static getThreatLevel(score) { - if (score < 20) { - return 'none'; - } - else if (score < 40) { - return 'low'; - } - else if (score < 70) { - return 'medium'; - } - else { - return 'high'; - } - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.contentscanner.js","sourceRoot":"","sources":["../../ts/security/classes.contentscanner.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/classes.ipreputationchecker.d.ts b/dist_ts/security/classes.ipreputationchecker.d.ts deleted file mode 100644 index 73a7c6d..0000000 --- a/dist_ts/security/classes.ipreputationchecker.d.ts +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Reputation check result information - */ -export interface IReputationResult { - score: number; - isSpam: boolean; - isProxy: boolean; - isTor: boolean; - isVPN: boolean; - country?: string; - asn?: string; - org?: string; - blacklists?: string[]; - timestamp: number; - error?: string; -} -/** - * Reputation threshold scores - */ -export declare enum ReputationThreshold { - HIGH_RISK = 20,// Score below this is considered high risk - MEDIUM_RISK = 50,// Score below this is considered medium risk - LOW_RISK = 80 -} -/** - * IP type classifications - */ -export declare enum IPType { - RESIDENTIAL = "residential", - DATACENTER = "datacenter", - PROXY = "proxy", - TOR = "tor", - VPN = "vpn", - UNKNOWN = "unknown" -} -/** - * Options for the IP Reputation Checker - */ -export interface IIPReputationOptions { - maxCacheSize?: number; - cacheTTL?: number; - dnsblServers?: string[]; - highRiskThreshold?: number; - mediumRiskThreshold?: number; - lowRiskThreshold?: number; - enableLocalCache?: boolean; - enableDNSBL?: boolean; - enableIPInfo?: boolean; -} -/** - * IP reputation checker — delegates DNSBL lookups to the Rust security bridge. - * Retains LRU caching and disk persistence in TypeScript. - */ -export declare class IPReputationChecker { - private static instance; - private reputationCache; - private options; - private storageManager?; - private static readonly DEFAULT_OPTIONS; - constructor(options?: IIPReputationOptions, storageManager?: any); - static getInstance(options?: IIPReputationOptions, storageManager?: any): IPReputationChecker; - /** - * Check an IP address's reputation via the Rust bridge - */ - checkReputation(ip: string): Promise; - private createErrorResult; - private isValidIPAddress; - private logReputationCheck; - private saveCache; - private loadCache; - static getRiskLevel(score: number): 'high' | 'medium' | 'low' | 'trusted'; - updateStorageManager(storageManager: any): void; -} diff --git a/dist_ts/security/classes.ipreputationchecker.js b/dist_ts/security/classes.ipreputationchecker.js deleted file mode 100644 index dd1ce60..0000000 --- a/dist_ts/security/classes.ipreputationchecker.js +++ /dev/null @@ -1,263 +0,0 @@ -import * as plugins from '../plugins.js'; -import * as paths from '../paths.js'; -import { logger } from '../logger.js'; -import { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js'; -import { RustSecurityBridge } from './classes.rustsecuritybridge.js'; -import { LRUCache } from 'lru-cache'; -/** - * Reputation threshold scores - */ -export var ReputationThreshold; -(function (ReputationThreshold) { - ReputationThreshold[ReputationThreshold["HIGH_RISK"] = 20] = "HIGH_RISK"; - ReputationThreshold[ReputationThreshold["MEDIUM_RISK"] = 50] = "MEDIUM_RISK"; - ReputationThreshold[ReputationThreshold["LOW_RISK"] = 80] = "LOW_RISK"; // Score below this is considered low risk (but not trusted) -})(ReputationThreshold || (ReputationThreshold = {})); -/** - * IP type classifications - */ -export var IPType; -(function (IPType) { - IPType["RESIDENTIAL"] = "residential"; - IPType["DATACENTER"] = "datacenter"; - IPType["PROXY"] = "proxy"; - IPType["TOR"] = "tor"; - IPType["VPN"] = "vpn"; - IPType["UNKNOWN"] = "unknown"; -})(IPType || (IPType = {})); -/** - * IP reputation checker — delegates DNSBL lookups to the Rust security bridge. - * Retains LRU caching and disk persistence in TypeScript. - */ -export class IPReputationChecker { - static instance; - reputationCache; - options; - storageManager; - static DEFAULT_OPTIONS = { - maxCacheSize: 10000, - cacheTTL: 24 * 60 * 60 * 1000, - dnsblServers: [], - highRiskThreshold: ReputationThreshold.HIGH_RISK, - mediumRiskThreshold: ReputationThreshold.MEDIUM_RISK, - lowRiskThreshold: ReputationThreshold.LOW_RISK, - enableLocalCache: true, - enableDNSBL: true, - enableIPInfo: true - }; - constructor(options = {}, storageManager) { - this.options = { - ...IPReputationChecker.DEFAULT_OPTIONS, - ...options - }; - this.storageManager = storageManager; - this.reputationCache = new LRUCache({ - max: this.options.maxCacheSize, - ttl: this.options.cacheTTL, - }); - if (this.options.enableLocalCache) { - this.loadCache().catch(error => { - logger.log('error', `Failed to load IP reputation cache during initialization: ${error.message}`); - }); - } - } - static getInstance(options = {}, storageManager) { - if (!IPReputationChecker.instance) { - IPReputationChecker.instance = new IPReputationChecker(options, storageManager); - } - return IPReputationChecker.instance; - } - /** - * Check an IP address's reputation via the Rust bridge - */ - async checkReputation(ip) { - try { - if (!this.isValidIPAddress(ip)) { - logger.log('warn', `Invalid IP address format: ${ip}`); - return this.createErrorResult(ip, 'Invalid IP address format'); - } - // Check cache first - const cachedResult = this.reputationCache.get(ip); - if (cachedResult) { - logger.log('info', `Using cached reputation data for IP ${ip}`, { - score: cachedResult.score, - isSpam: cachedResult.isSpam - }); - return cachedResult; - } - // Delegate to Rust bridge - const bridge = RustSecurityBridge.getInstance(); - const rustResult = await bridge.checkIpReputation(ip); - const result = { - score: rustResult.score, - isSpam: rustResult.listed_count > 0, - isProxy: rustResult.ip_type === 'proxy', - isTor: rustResult.ip_type === 'tor', - isVPN: rustResult.ip_type === 'vpn', - blacklists: rustResult.dnsbl_results - .filter(d => d.listed) - .map(d => d.server), - timestamp: Date.now(), - }; - this.reputationCache.set(ip, result); - if (this.options.enableLocalCache) { - this.saveCache().catch(error => { - logger.log('error', `Failed to save IP reputation cache: ${error.message}`); - }); - } - this.logReputationCheck(ip, result); - return result; - } - catch (error) { - logger.log('error', `Error checking IP reputation for ${ip}: ${error.message}`, { - ip, - stack: error.stack - }); - const errorResult = this.createErrorResult(ip, error.message); - // Cache error results to avoid repeated failing lookups - this.reputationCache.set(ip, errorResult); - return errorResult; - } - } - createErrorResult(ip, errorMessage) { - return { - score: 50, - isSpam: false, - isProxy: false, - isTor: false, - isVPN: false, - timestamp: Date.now(), - error: errorMessage - }; - } - isValidIPAddress(ip) { - const ipv4Pattern = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; - return ipv4Pattern.test(ip); - } - logReputationCheck(ip, result) { - let logLevel = SecurityLogLevel.INFO; - if (result.score < this.options.highRiskThreshold) { - logLevel = SecurityLogLevel.WARN; - } - SecurityLogger.getInstance().logEvent({ - level: logLevel, - type: SecurityEventType.IP_REPUTATION, - message: `IP reputation check ${result.isSpam ? 'flagged spam' : 'completed'} for ${ip}`, - ipAddress: ip, - details: { - score: result.score, - isSpam: result.isSpam, - isProxy: result.isProxy, - isTor: result.isTor, - isVPN: result.isVPN, - country: result.country, - blacklists: result.blacklists - }, - success: !result.isSpam - }); - } - async saveCache() { - try { - const entries = Array.from(this.reputationCache.entries()).map(([ip, data]) => ({ - ip, - data - })); - if (entries.length === 0) { - return; - } - const cacheData = JSON.stringify(entries); - if (this.storageManager) { - await this.storageManager.set('/security/ip-reputation-cache.json', cacheData); - logger.log('info', `Saved ${entries.length} IP reputation cache entries to StorageManager`); - } - else { - const cacheDir = plugins.path.join(paths.dataDir, 'security'); - await plugins.smartfs.directory(cacheDir).recursive().create(); - const cacheFile = plugins.path.join(cacheDir, 'ip_reputation_cache.json'); - await plugins.smartfs.file(cacheFile).write(cacheData); - logger.log('info', `Saved ${entries.length} IP reputation cache entries to disk`); - } - } - catch (error) { - logger.log('error', `Failed to save IP reputation cache: ${error.message}`); - } - } - async loadCache() { - try { - let cacheData = null; - let fromFilesystem = false; - if (this.storageManager) { - try { - cacheData = await this.storageManager.get('/security/ip-reputation-cache.json'); - if (!cacheData) { - const cacheFile = plugins.path.join(paths.dataDir, 'security', 'ip_reputation_cache.json'); - if (plugins.fs.existsSync(cacheFile)) { - logger.log('info', 'Migrating IP reputation cache from filesystem to StorageManager'); - cacheData = plugins.fs.readFileSync(cacheFile, 'utf8'); - fromFilesystem = true; - await this.storageManager.set('/security/ip-reputation-cache.json', cacheData); - logger.log('info', 'IP reputation cache migrated to StorageManager successfully'); - try { - plugins.fs.unlinkSync(cacheFile); - logger.log('info', 'Old cache file removed after migration'); - } - catch (deleteError) { - logger.log('warn', `Could not delete old cache file: ${deleteError.message}`); - } - } - } - } - catch (error) { - logger.log('error', `Error loading from StorageManager: ${error.message}`); - } - } - else { - const cacheFile = plugins.path.join(paths.dataDir, 'security', 'ip_reputation_cache.json'); - if (plugins.fs.existsSync(cacheFile)) { - cacheData = plugins.fs.readFileSync(cacheFile, 'utf8'); - fromFilesystem = true; - } - } - if (cacheData) { - const entries = JSON.parse(cacheData); - const now = Date.now(); - const validEntries = entries.filter(entry => { - const age = now - entry.data.timestamp; - return age < this.options.cacheTTL; - }); - for (const entry of validEntries) { - this.reputationCache.set(entry.ip, entry.data); - } - const source = fromFilesystem ? 'disk' : 'StorageManager'; - logger.log('info', `Loaded ${validEntries.length} IP reputation cache entries from ${source}`); - } - } - catch (error) { - logger.log('error', `Failed to load IP reputation cache: ${error.message}`); - } - } - static getRiskLevel(score) { - if (score < ReputationThreshold.HIGH_RISK) { - return 'high'; - } - else if (score < ReputationThreshold.MEDIUM_RISK) { - return 'medium'; - } - else if (score < ReputationThreshold.LOW_RISK) { - return 'low'; - } - else { - return 'trusted'; - } - } - updateStorageManager(storageManager) { - this.storageManager = storageManager; - logger.log('info', 'IPReputationChecker storage manager updated'); - if (this.options.enableLocalCache && this.reputationCache.size > 0) { - this.saveCache().catch(error => { - logger.log('error', `Failed to save cache to new storage manager: ${error.message}`); - }); - } - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.ipreputationchecker.js","sourceRoot":"","sources":["../../ts/security/classes.ipreputationchecker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/classes.rustsecuritybridge.d.ts b/dist_ts/security/classes.rustsecuritybridge.d.ts deleted file mode 100644 index e008e4d..0000000 --- a/dist_ts/security/classes.rustsecuritybridge.d.ts +++ /dev/null @@ -1,229 +0,0 @@ -interface IDkimVerificationResult { - is_valid: boolean; - domain: string | null; - selector: string | null; - status: string; - details: string | null; -} -interface ISpfResult { - result: string; - domain: string; - ip: string; - explanation: string | null; -} -interface IDmarcResult { - passed: boolean; - policy: string; - domain: string; - dkim_result: string; - spf_result: string; - action: string; - details: string | null; -} -interface IEmailSecurityResult { - dkim: IDkimVerificationResult[]; - spf: ISpfResult | null; - dmarc: IDmarcResult | null; -} -interface IValidationResult { - valid: boolean; - formatValid: boolean; - score: number; - error: string | null; -} -interface IBounceDetection { - bounce_type: string; - category: string; -} -interface IReputationResult { - ip: string; - score: number; - risk_level: string; - ip_type: string; - dnsbl_results: Array<{ - server: string; - listed: boolean; - response: string | null; - }>; - listed_count: number; - total_checked: number; -} -interface IContentScanResult { - threatScore: number; - threatType: string | null; - threatDetails: string | null; - scannedElements: string[]; -} -interface IVersionInfo { - bin: string; - core: string; - security: string; - smtp: string; -} -interface ISmtpServerConfig { - hostname: string; - ports: number[]; - securePort?: number; - tlsCertPem?: string; - tlsKeyPem?: string; - maxMessageSize?: number; - maxConnections?: number; - maxRecipients?: number; - connectionTimeoutSecs?: number; - dataTimeoutSecs?: number; - authEnabled?: boolean; - maxAuthFailures?: number; - socketTimeoutSecs?: number; - processingTimeoutSecs?: number; - rateLimits?: IRateLimitConfig; -} -interface IRateLimitConfig { - maxConnectionsPerIp?: number; - maxMessagesPerSender?: number; - maxAuthFailuresPerIp?: number; - windowSecs?: number; -} -interface IEmailData { - type: 'inline' | 'file'; - base64?: string; - path?: string; -} -interface IEmailReceivedEvent { - correlationId: string; - sessionId: string; - mailFrom: string; - rcptTo: string[]; - data: IEmailData; - remoteAddr: string; - clientHostname: string | null; - secure: boolean; - authenticatedUser: string | null; - securityResults: any | null; -} -interface IAuthRequestEvent { - correlationId: string; - sessionId: string; - username: string; - password: string; - remoteAddr: string; -} -/** - * Bridge between TypeScript and the Rust `mailer-bin` binary. - * - * Uses `@push.rocks/smartrust` for JSON-over-stdin/stdout IPC. - * Singleton — access via `RustSecurityBridge.getInstance()`. - */ -export declare class RustSecurityBridge { - private static instance; - private bridge; - private _running; - private constructor(); - /** Get or create the singleton instance. */ - static getInstance(): RustSecurityBridge; - /** Whether the Rust process is currently running and accepting commands. */ - get running(): boolean; - /** - * Spawn the Rust binary and wait for the ready signal. - * @returns `true` if the binary started successfully, `false` otherwise. - */ - start(): Promise; - /** Kill the Rust process. */ - stop(): Promise; - /** Ping the Rust process. */ - ping(): Promise; - /** Get version information for all Rust crates. */ - getVersion(): Promise; - /** Validate an email address. */ - validateEmail(email: string): Promise; - /** Detect bounce type from SMTP response / diagnostic code. */ - detectBounce(opts: { - smtpResponse?: string; - diagnosticCode?: string; - statusCode?: string; - }): Promise; - /** Scan email content for threats (phishing, spam, malware, etc.). */ - scanContent(opts: { - subject?: string; - textBody?: string; - htmlBody?: string; - attachmentNames?: string[]; - }): Promise; - /** Check IP reputation via DNSBL. */ - checkIpReputation(ip: string): Promise; - /** Verify DKIM signatures on a raw email message. */ - verifyDkim(rawMessage: string): Promise; - /** Sign an email with DKIM. */ - signDkim(opts: { - rawMessage: string; - domain: string; - selector?: string; - privateKey: string; - }): Promise<{ - header: string; - signedMessage: string; - }>; - /** Check SPF for a sender. */ - checkSpf(opts: { - ip: string; - heloDomain: string; - hostname?: string; - mailFrom: string; - }): Promise; - /** - * Compound email security verification: DKIM + SPF + DMARC in one IPC call. - * - * This is the preferred method for inbound email verification — it avoids - * 3 sequential round-trips and correctly passes raw mail-auth types internally. - */ - verifyEmail(opts: { - rawMessage: string; - ip: string; - heloDomain: string; - hostname?: string; - mailFrom: string; - }): Promise; - /** - * Start the Rust SMTP server. - * The server will listen on the configured ports and emit events for - * emailReceived and authRequest that must be handled by the caller. - */ - startSmtpServer(config: ISmtpServerConfig): Promise; - /** Stop the Rust SMTP server. */ - stopSmtpServer(): Promise; - /** - * Send the result of email processing back to the Rust SMTP server. - * This resolves a pending correlation-ID callback, allowing the Rust - * server to send the SMTP response to the client. - */ - sendEmailProcessingResult(opts: { - correlationId: string; - accepted: boolean; - smtpCode?: number; - smtpMessage?: string; - }): Promise; - /** - * Send the result of authentication validation back to the Rust SMTP server. - */ - sendAuthResult(opts: { - correlationId: string; - success: boolean; - message?: string; - }): Promise; - /** Update rate limit configuration at runtime. */ - configureRateLimits(config: IRateLimitConfig): Promise; - /** - * Register a handler for emailReceived events from the Rust SMTP server. - * These events fire when a complete email has been received and needs processing. - */ - onEmailReceived(handler: (data: IEmailReceivedEvent) => void): void; - /** - * Register a handler for authRequest events from the Rust SMTP server. - * The handler must call sendAuthResult() with the correlationId. - */ - onAuthRequest(handler: (data: IAuthRequestEvent) => void): void; - /** Remove an emailReceived event handler. */ - offEmailReceived(handler: (data: IEmailReceivedEvent) => void): void; - /** Remove an authRequest event handler. */ - offAuthRequest(handler: (data: IAuthRequestEvent) => void): void; -} -export type { IDkimVerificationResult, ISpfResult, IDmarcResult, IEmailSecurityResult, IValidationResult, IBounceDetection, IContentScanResult, IReputationResult as IRustReputationResult, IVersionInfo, ISmtpServerConfig, IRateLimitConfig, IEmailData, IEmailReceivedEvent, IAuthRequestEvent, }; diff --git a/dist_ts/security/classes.rustsecuritybridge.js b/dist_ts/security/classes.rustsecuritybridge.js deleted file mode 100644 index 349a922..0000000 --- a/dist_ts/security/classes.rustsecuritybridge.js +++ /dev/null @@ -1,204 +0,0 @@ -import * as plugins from '../plugins.js'; -import * as paths from '../paths.js'; -import { logger } from '../logger.js'; -// --------------------------------------------------------------------------- -// RustSecurityBridge — singleton wrapper around smartrust.RustBridge -// --------------------------------------------------------------------------- -/** - * Bridge between TypeScript and the Rust `mailer-bin` binary. - * - * Uses `@push.rocks/smartrust` for JSON-over-stdin/stdout IPC. - * Singleton — access via `RustSecurityBridge.getInstance()`. - */ -export class RustSecurityBridge { - static instance = null; - bridge; - _running = false; - constructor() { - this.bridge = new plugins.smartrust.RustBridge({ - binaryName: 'mailer-bin', - cliArgs: ['--management'], - requestTimeoutMs: 30_000, - readyTimeoutMs: 10_000, - localPaths: [ - plugins.path.join(paths.packageDir, 'dist_rust', 'mailer-bin'), - plugins.path.join(paths.packageDir, 'rust', 'target', 'release', 'mailer-bin'), - plugins.path.join(paths.packageDir, 'rust', 'target', 'debug', 'mailer-bin'), - ], - searchSystemPath: false, - }); - // Forward lifecycle events - this.bridge.on('ready', () => { - this._running = true; - logger.log('info', 'Rust security bridge is ready'); - }); - this.bridge.on('exit', (code, signal) => { - this._running = false; - logger.log('warn', `Rust security bridge exited (code=${code}, signal=${signal})`); - }); - this.bridge.on('stderr', (line) => { - logger.log('debug', `[rust-bridge] ${line}`); - }); - } - /** Get or create the singleton instance. */ - static getInstance() { - if (!RustSecurityBridge.instance) { - RustSecurityBridge.instance = new RustSecurityBridge(); - } - return RustSecurityBridge.instance; - } - /** Whether the Rust process is currently running and accepting commands. */ - get running() { - return this._running; - } - // ----------------------------------------------------------------------- - // Lifecycle - // ----------------------------------------------------------------------- - /** - * Spawn the Rust binary and wait for the ready signal. - * @returns `true` if the binary started successfully, `false` otherwise. - */ - async start() { - if (this._running) { - return true; - } - try { - const ok = await this.bridge.spawn(); - this._running = ok; - if (ok) { - logger.log('info', 'Rust security bridge started'); - } - else { - logger.log('warn', 'Rust security bridge failed to start (binary not found or timeout)'); - } - return ok; - } - catch (err) { - logger.log('error', `Failed to start Rust security bridge: ${err.message}`); - return false; - } - } - /** Kill the Rust process. */ - async stop() { - if (!this._running) { - return; - } - try { - this.bridge.kill(); - this._running = false; - logger.log('info', 'Rust security bridge stopped'); - } - catch (err) { - logger.log('error', `Error stopping Rust security bridge: ${err.message}`); - } - } - // ----------------------------------------------------------------------- - // Commands — thin typed wrappers over sendCommand - // ----------------------------------------------------------------------- - /** Ping the Rust process. */ - async ping() { - const res = await this.bridge.sendCommand('ping', {}); - return res?.pong === true; - } - /** Get version information for all Rust crates. */ - async getVersion() { - return this.bridge.sendCommand('version', {}); - } - /** Validate an email address. */ - async validateEmail(email) { - return this.bridge.sendCommand('validateEmail', { email }); - } - /** Detect bounce type from SMTP response / diagnostic code. */ - async detectBounce(opts) { - return this.bridge.sendCommand('detectBounce', opts); - } - /** Scan email content for threats (phishing, spam, malware, etc.). */ - async scanContent(opts) { - return this.bridge.sendCommand('scanContent', opts); - } - /** Check IP reputation via DNSBL. */ - async checkIpReputation(ip) { - return this.bridge.sendCommand('checkIpReputation', { ip }); - } - /** Verify DKIM signatures on a raw email message. */ - async verifyDkim(rawMessage) { - return this.bridge.sendCommand('verifyDkim', { rawMessage }); - } - /** Sign an email with DKIM. */ - async signDkim(opts) { - return this.bridge.sendCommand('signDkim', opts); - } - /** Check SPF for a sender. */ - async checkSpf(opts) { - return this.bridge.sendCommand('checkSpf', opts); - } - /** - * Compound email security verification: DKIM + SPF + DMARC in one IPC call. - * - * This is the preferred method for inbound email verification — it avoids - * 3 sequential round-trips and correctly passes raw mail-auth types internally. - */ - async verifyEmail(opts) { - return this.bridge.sendCommand('verifyEmail', opts); - } - // ----------------------------------------------------------------------- - // SMTP Server lifecycle - // ----------------------------------------------------------------------- - /** - * Start the Rust SMTP server. - * The server will listen on the configured ports and emit events for - * emailReceived and authRequest that must be handled by the caller. - */ - async startSmtpServer(config) { - const result = await this.bridge.sendCommand('startSmtpServer', config); - return result?.started === true; - } - /** Stop the Rust SMTP server. */ - async stopSmtpServer() { - await this.bridge.sendCommand('stopSmtpServer', {}); - } - /** - * Send the result of email processing back to the Rust SMTP server. - * This resolves a pending correlation-ID callback, allowing the Rust - * server to send the SMTP response to the client. - */ - async sendEmailProcessingResult(opts) { - await this.bridge.sendCommand('emailProcessingResult', opts); - } - /** - * Send the result of authentication validation back to the Rust SMTP server. - */ - async sendAuthResult(opts) { - await this.bridge.sendCommand('authResult', opts); - } - /** Update rate limit configuration at runtime. */ - async configureRateLimits(config) { - await this.bridge.sendCommand('configureRateLimits', config); - } - // ----------------------------------------------------------------------- - // Event registration — delegates to the underlying bridge EventEmitter - // ----------------------------------------------------------------------- - /** - * Register a handler for emailReceived events from the Rust SMTP server. - * These events fire when a complete email has been received and needs processing. - */ - onEmailReceived(handler) { - this.bridge.on('management:emailReceived', handler); - } - /** - * Register a handler for authRequest events from the Rust SMTP server. - * The handler must call sendAuthResult() with the correlationId. - */ - onAuthRequest(handler) { - this.bridge.on('management:authRequest', handler); - } - /** Remove an emailReceived event handler. */ - offEmailReceived(handler) { - this.bridge.off('management:emailReceived', handler); - } - /** Remove an authRequest event handler. */ - offAuthRequest(handler) { - this.bridge.off('management:authRequest', handler); - } -} -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5ydXN0c2VjdXJpdHlicmlkZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9zZWN1cml0eS9jbGFzc2VzLnJ1c3RzZWN1cml0eWJyaWRnZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEtBQUssS0FBSyxNQUFNLGFBQWEsQ0FBQztBQUNyQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sY0FBYyxDQUFDO0FBcU50Qyw4RUFBOEU7QUFDOUUscUVBQXFFO0FBQ3JFLDhFQUE4RTtBQUU5RTs7Ozs7R0FLRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDckIsTUFBTSxDQUFDLFFBQVEsR0FBOEIsSUFBSSxDQUFDO0lBRWxELE1BQU0sQ0FBcUU7SUFDM0UsUUFBUSxHQUFHLEtBQUssQ0FBQztJQUV6QjtRQUNFLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLFVBQVUsQ0FBa0I7WUFDOUQsVUFBVSxFQUFFLFlBQVk7WUFDeEIsT0FBTyxFQUFFLENBQUMsY0FBYyxDQUFDO1lBQ3pCLGdCQUFnQixFQUFFLE1BQU07WUFDeEIsY0FBYyxFQUFFLE1BQU07WUFDdEIsVUFBVSxFQUFFO2dCQUNWLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsV0FBVyxFQUFFLFlBQVksQ0FBQztnQkFDOUQsT0FBTyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7Z0JBQzlFLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFDO2FBQzdFO1lBQ0QsZ0JBQWdCLEVBQUUsS0FBSztT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 \ No newline at end of file diff --git a/dist_ts/security/classes.securitylogger.d.ts b/dist_ts/security/classes.securitylogger.d.ts deleted file mode 100644 index 352c71b..0000000 --- a/dist_ts/security/classes.securitylogger.d.ts +++ /dev/null @@ -1,140 +0,0 @@ -/** - * Log level for security events - */ -export declare enum SecurityLogLevel { - INFO = "info", - WARN = "warn", - ERROR = "error", - CRITICAL = "critical" -} -/** - * Security event types for categorization - */ -export declare enum SecurityEventType { - AUTHENTICATION = "authentication", - ACCESS_CONTROL = "access_control", - EMAIL_VALIDATION = "email_validation", - EMAIL_PROCESSING = "email_processing", - EMAIL_FORWARDING = "email_forwarding", - EMAIL_DELIVERY = "email_delivery", - DKIM = "dkim", - SPF = "spf", - DMARC = "dmarc", - RATE_LIMIT = "rate_limit", - RATE_LIMITING = "rate_limiting", - SPAM = "spam", - MALWARE = "malware", - CONNECTION = "connection", - DATA_EXPOSURE = "data_exposure", - CONFIGURATION = "configuration", - IP_REPUTATION = "ip_reputation", - REJECTED_CONNECTION = "rejected_connection" -} -/** - * Security event interface - */ -export interface ISecurityEvent { - timestamp: number; - level: SecurityLogLevel; - type: SecurityEventType; - message: string; - details?: any; - ipAddress?: string; - userId?: string; - sessionId?: string; - emailId?: string; - domain?: string; - action?: string; - result?: string; - success?: boolean; -} -/** - * Security logger for enhanced security monitoring - */ -export declare class SecurityLogger { - private static instance; - private securityEvents; - private maxEventHistory; - private enableNotifications; - private constructor(); - /** - * Get singleton instance - */ - static getInstance(options?: { - maxEventHistory?: number; - enableNotifications?: boolean; - }): SecurityLogger; - /** - * Log a security event - * @param event The security event to log - */ - logEvent(event: Omit): void; - /** - * Get recent security events - * @param limit Maximum number of events to return - * @param filter Filter for specific event types - * @returns Recent security events - */ - getRecentEvents(limit?: number, filter?: { - level?: SecurityLogLevel; - type?: SecurityEventType; - fromTimestamp?: number; - toTimestamp?: number; - }): ISecurityEvent[]; - /** - * Get events by security level - * @param level The security level to filter by - * @param limit Maximum number of events to return - * @returns Security events matching the level - */ - getEventsByLevel(level: SecurityLogLevel, limit?: number): ISecurityEvent[]; - /** - * Get events by security type - * @param type The event type to filter by - * @param limit Maximum number of events to return - * @returns Security events matching the type - */ - getEventsByType(type: SecurityEventType, limit?: number): ISecurityEvent[]; - /** - * Get security events for a specific IP address - * @param ipAddress The IP address to filter by - * @param limit Maximum number of events to return - * @returns Security events for the IP address - */ - getEventsByIP(ipAddress: string, limit?: number): ISecurityEvent[]; - /** - * Get security events for a specific domain - * @param domain The domain to filter by - * @param limit Maximum number of events to return - * @returns Security events for the domain - */ - getEventsByDomain(domain: string, limit?: number): ISecurityEvent[]; - /** - * Send a notification for critical security events - * @param event The security event to notify about - * @private - */ - private sendNotification; - /** - * Clear event history - */ - clearEvents(): void; - /** - * Get statistical summary of security events - * @param timeWindow Optional time window in milliseconds - * @returns Summary of security events - */ - getEventsSummary(timeWindow?: number): { - total: number; - byLevel: Record; - byType: Record; - topIPs: Array<{ - ip: string; - count: number; - }>; - topDomains: Array<{ - domain: string; - count: number; - }>; - }; -} diff --git a/dist_ts/security/classes.securitylogger.js b/dist_ts/security/classes.securitylogger.js deleted file mode 100644 index ce24678..0000000 --- a/dist_ts/security/classes.securitylogger.js +++ /dev/null @@ -1,235 +0,0 @@ -import * as plugins from '../plugins.js'; -import { logger } from '../logger.js'; -/** - * Log level for security events - */ -export var SecurityLogLevel; -(function (SecurityLogLevel) { - SecurityLogLevel["INFO"] = "info"; - SecurityLogLevel["WARN"] = "warn"; - SecurityLogLevel["ERROR"] = "error"; - SecurityLogLevel["CRITICAL"] = "critical"; -})(SecurityLogLevel || (SecurityLogLevel = {})); -/** - * Security event types for categorization - */ -export var SecurityEventType; -(function (SecurityEventType) { - SecurityEventType["AUTHENTICATION"] = "authentication"; - SecurityEventType["ACCESS_CONTROL"] = "access_control"; - SecurityEventType["EMAIL_VALIDATION"] = "email_validation"; - SecurityEventType["EMAIL_PROCESSING"] = "email_processing"; - SecurityEventType["EMAIL_FORWARDING"] = "email_forwarding"; - SecurityEventType["EMAIL_DELIVERY"] = "email_delivery"; - SecurityEventType["DKIM"] = "dkim"; - SecurityEventType["SPF"] = "spf"; - SecurityEventType["DMARC"] = "dmarc"; - SecurityEventType["RATE_LIMIT"] = "rate_limit"; - SecurityEventType["RATE_LIMITING"] = "rate_limiting"; - SecurityEventType["SPAM"] = "spam"; - SecurityEventType["MALWARE"] = "malware"; - SecurityEventType["CONNECTION"] = "connection"; - SecurityEventType["DATA_EXPOSURE"] = "data_exposure"; - SecurityEventType["CONFIGURATION"] = "configuration"; - SecurityEventType["IP_REPUTATION"] = "ip_reputation"; - SecurityEventType["REJECTED_CONNECTION"] = "rejected_connection"; -})(SecurityEventType || (SecurityEventType = {})); -/** - * Security logger for enhanced security monitoring - */ -export class SecurityLogger { - static instance; - securityEvents = []; - maxEventHistory; - enableNotifications; - constructor(options) { - this.maxEventHistory = options?.maxEventHistory || 1000; - this.enableNotifications = options?.enableNotifications || false; - } - /** - * Get singleton instance - */ - static getInstance(options) { - if (!SecurityLogger.instance) { - SecurityLogger.instance = new SecurityLogger(options); - } - return SecurityLogger.instance; - } - /** - * Log a security event - * @param event The security event to log - */ - logEvent(event) { - const fullEvent = { - ...event, - timestamp: Date.now() - }; - // Store in memory buffer - this.securityEvents.push(fullEvent); - // Trim history if needed - if (this.securityEvents.length > this.maxEventHistory) { - this.securityEvents.shift(); - } - // Log to regular logger with appropriate level - switch (event.level) { - case SecurityLogLevel.INFO: - logger.log('info', `[SECURITY:${event.type}] ${event.message}`, event.details); - break; - case SecurityLogLevel.WARN: - logger.log('warn', `[SECURITY:${event.type}] ${event.message}`, event.details); - break; - case SecurityLogLevel.ERROR: - case SecurityLogLevel.CRITICAL: - logger.log('error', `[SECURITY:${event.type}] ${event.message}`, event.details); - // Send notification for critical events if enabled - if (event.level === SecurityLogLevel.CRITICAL && this.enableNotifications) { - this.sendNotification(fullEvent); - } - break; - } - } - /** - * Get recent security events - * @param limit Maximum number of events to return - * @param filter Filter for specific event types - * @returns Recent security events - */ - getRecentEvents(limit = 100, filter) { - let filteredEvents = this.securityEvents; - // Apply filters - if (filter) { - if (filter.level) { - filteredEvents = filteredEvents.filter(event => event.level === filter.level); - } - if (filter.type) { - filteredEvents = filteredEvents.filter(event => event.type === filter.type); - } - if (filter.fromTimestamp) { - filteredEvents = filteredEvents.filter(event => event.timestamp >= filter.fromTimestamp); - } - if (filter.toTimestamp) { - filteredEvents = filteredEvents.filter(event => event.timestamp <= filter.toTimestamp); - } - } - // Return most recent events up to limit - return filteredEvents - .sort((a, b) => b.timestamp - a.timestamp) - .slice(0, limit); - } - /** - * Get events by security level - * @param level The security level to filter by - * @param limit Maximum number of events to return - * @returns Security events matching the level - */ - getEventsByLevel(level, limit = 100) { - return this.getRecentEvents(limit, { level }); - } - /** - * Get events by security type - * @param type The event type to filter by - * @param limit Maximum number of events to return - * @returns Security events matching the type - */ - getEventsByType(type, limit = 100) { - return this.getRecentEvents(limit, { type }); - } - /** - * Get security events for a specific IP address - * @param ipAddress The IP address to filter by - * @param limit Maximum number of events to return - * @returns Security events for the IP address - */ - getEventsByIP(ipAddress, limit = 100) { - return this.securityEvents - .filter(event => event.ipAddress === ipAddress) - .sort((a, b) => b.timestamp - a.timestamp) - .slice(0, limit); - } - /** - * Get security events for a specific domain - * @param domain The domain to filter by - * @param limit Maximum number of events to return - * @returns Security events for the domain - */ - getEventsByDomain(domain, limit = 100) { - return this.securityEvents - .filter(event => event.domain === domain) - .sort((a, b) => b.timestamp - a.timestamp) - .slice(0, limit); - } - /** - * Send a notification for critical security events - * @param event The security event to notify about - * @private - */ - sendNotification(event) { - // In a production environment, this would integrate with a notification service - // For now, we'll just log that we would send a notification - logger.log('error', `[SECURITY NOTIFICATION] ${event.message}`, { - ...event, - notificationSent: true - }); - // Future integration with alerting systems would go here - } - /** - * Clear event history - */ - clearEvents() { - this.securityEvents = []; - } - /** - * Get statistical summary of security events - * @param timeWindow Optional time window in milliseconds - * @returns Summary of security events - */ - getEventsSummary(timeWindow) { - // Filter by time window if provided - let events = this.securityEvents; - if (timeWindow) { - const cutoff = Date.now() - timeWindow; - events = events.filter(e => e.timestamp >= cutoff); - } - // Count by level - const byLevel = Object.values(SecurityLogLevel).reduce((acc, level) => { - acc[level] = events.filter(e => e.level === level).length; - return acc; - }, {}); - // Count by type - const byType = Object.values(SecurityEventType).reduce((acc, type) => { - acc[type] = events.filter(e => e.type === type).length; - return acc; - }, {}); - // Count by IP - const ipCounts = new Map(); - events.forEach(e => { - if (e.ipAddress) { - ipCounts.set(e.ipAddress, (ipCounts.get(e.ipAddress) || 0) + 1); - } - }); - // Count by domain - const domainCounts = new Map(); - events.forEach(e => { - if (e.domain) { - domainCounts.set(e.domain, (domainCounts.get(e.domain) || 0) + 1); - } - }); - // Sort and limit top entries - const topIPs = Array.from(ipCounts.entries()) - .map(([ip, count]) => ({ ip, count })) - .sort((a, b) => b.count - a.count) - .slice(0, 10); - const topDomains = Array.from(domainCounts.entries()) - .map(([domain, count]) => ({ domain, count })) - .sort((a, b) => b.count - a.count) - .slice(0, 10); - return { - total: events.length, - byLevel, - byType, - topIPs, - topDomains - }; - } -} -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.securitylogger.js","sourceRoot":"","sources":["../../ts/security/classes.securitylogger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist_ts/security/index.d.ts b/dist_ts/security/index.d.ts deleted file mode 100644 index 88c9ad1..0000000 --- a/dist_ts/security/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { SecurityLogger, SecurityLogLevel, SecurityEventType, type ISecurityEvent } from './classes.securitylogger.js'; -export { IPReputationChecker, ReputationThreshold, IPType, type IReputationResult, type IIPReputationOptions } from './classes.ipreputationchecker.js'; -export { ContentScanner, ThreatCategory, type IScanResult, type IContentScannerOptions } from './classes.contentscanner.js'; -export { RustSecurityBridge, type IDkimVerificationResult, type ISpfResult, type IDmarcResult, type IEmailSecurityResult, type IValidationResult, type IBounceDetection, type IRustReputationResult, type IVersionInfo, } from './classes.rustsecuritybridge.js'; diff --git a/dist_ts/security/index.js b/dist_ts/security/index.js deleted file mode 100644 index 6d1ca4a..0000000 --- a/dist_ts/security/index.js +++ /dev/null @@ -1,5 +0,0 @@ -export { SecurityLogger, SecurityLogLevel, SecurityEventType } from './classes.securitylogger.js'; -export { IPReputationChecker, ReputationThreshold, IPType } from './classes.ipreputationchecker.js'; -export { ContentScanner, ThreatCategory } from './classes.contentscanner.js'; -export { RustSecurityBridge, } from './classes.rustsecuritybridge.js'; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9zZWN1cml0eS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsY0FBYyxFQUNkLGdCQUFnQixFQUNoQixpQkFBaUIsRUFFbEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEVBQ0wsbUJBQW1CLEVBQ25CLG1CQUFtQixFQUNuQixNQUFNLEVBR1AsTUFBTSxrQ0FBa0MsQ0FBQztBQUUxQyxPQUFPLEVBQ0wsY0FBYyxFQUNkLGNBQWMsRUFHZixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLE9BQU8sRUFDTCxrQkFBa0IsR0FTbkIsTUFBTSxpQ0FBaUMsQ0FBQyJ9 \ No newline at end of file diff --git a/npmextra.json b/npmextra.json index 6fc225e..7df3b82 100644 --- a/npmextra.json +++ b/npmextra.json @@ -8,9 +8,20 @@ "@git.zone/cli": { "release": { "registries": [ - "https://verdaccio.lossless.digital" + "https://verdaccio.lossless.digital", + "https://registry.npmjs.org" ], "accessLevel": "public" + }, + "projectType": "npm", + "module": { + "githost": "code.foss.global", + "gitscope": "push.rocks", + "gitrepo": "smartmta", + "description": "an mta implementation as TypeScript package, with network side implemented in rust", + "npmPackagename": "@push.rocks/smartmta", + "license": "MIT" } - } + }, + "@ship.zone/szci": {} } \ No newline at end of file diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 7e87997..64312dc 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@push.rocks/smartmta', - version: '2.3.0', + version: '2.3.1', description: 'A high-performance, enterprise-grade Mail Transfer Agent (MTA) built from scratch in TypeScript with Rust acceleration.' }