@remit/mailbox-service 0.0.115 → 0.0.116

package/dist/connection-test.d.ts

@@ -1,41 +1,10 @@
-/**
- * Connection testing utilities for IMAP and SMTP servers
- *
- * Used to validate credentials before saving account configuration.
- */
-import type { MailCredentials } from "./types.js";
-export interface TestResult {
-    success: boolean;
-    error?: string;
-}
+import type { TestResult } from "@remit/data-ports";
+import type { ImapTransport, MailCredentials } from "./types.js";
 export interface ImapTestConfig {
-    host: string;
-    port: number;
-    secure: boolean;
-    startTls?: boolean;
-    credentials: MailCredentials;
-    user: string;
-}
-export interface SmtpTestConfig {
     host: string;
     port: number;
     secure: boolean;
     credentials: MailCredentials;
     user: string;
 }
-/**
- * Test IMAP connection with provided credentials.
- *
- * Uses a raw socket to send AUTH PLAIN directly — bypasses the CAPABILITY
- * round-trip that IMAP clients typically perform first, avoiding deadlocks
- * with servers that pipeline their tagged responses.
- *
- * Supports plaintext, direct TLS (secure: true), and STARTTLS (startTls: true).
- */
-export declare const testImapConnection: (config: ImapTestConfig) => Promise<TestResult>;
-/**
- * Test SMTP connection with provided credentials
- *
- * Uses nodemailer's verify() method to test authentication.
- */
-export declare const testSmtpConnection: (config: SmtpTestConfig) => Promise<TestResult>;
+export declare const testImapConnection: (config: ImapTestConfig, transport: ImapTransport) => Promise<TestResult>;

package/dist/connection-test.js

@@ -1,152 +1,19 @@
-/**
- * Connection testing utilities for IMAP and SMTP servers
- *
- * Used to validate credentials before saving account configuration.
- */
-import { createConnection as createNetConnection } from "node:net";
-import { connect as tlsConnect } from "node:tls";
-import { createTransport } from "nodemailer";
-import { MailConnectionError } from "./types.js";
-// TODO(#468): Wire OAuth testConnection once authType/oauthRefreshTokenHash are
-// available on Account. For OAuth accounts, mint a token via MailOAuthService
-// before calling testImapConnection / testSmtpConnection, and map
-// RefreshTokenError(reauth-required) to MailConnectionError("auth", ...).
+import { ImapFlowConnection } from "./imapflow-connection.js";
 const TEST_TIMEOUT_MS = 12_000;
-/**
- * Build nodemailer auth object from credentials.
- */
-const buildSmtpAuth = (user, credentials) => {
-    if (credentials.kind === "password") {
-        return { user, pass: credentials.password };
-    }
-    return {
-        type: "OAuth2",
-        user,
-        accessToken: credentials.accessToken,
-    };
-};
-/**
- * Test IMAP connection with provided credentials.
- *
- * Uses a raw socket to send AUTH PLAIN directly — bypasses the CAPABILITY
- * round-trip that IMAP clients typically perform first, avoiding deadlocks
- * with servers that pipeline their tagged responses.
- *
- * Supports plaintext, direct TLS (secure: true), and STARTTLS (startTls: true).
- */
-export const testImapConnection = async (config) => {
-    if (config.credentials.kind !== "password") {
-        return { success: false, error: "OAuth not supported for connection test" };
-    }
-    const { user, credentials } = config;
-    const authPlain = Buffer.from(`\x00${user}\x00${credentials.password}`).toString("base64");
-    return new Promise((resolve) => {
-        let settled = false;
-        const done = (result) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(timeoutId);
-            resolve(result);
-        };
-        const timeoutId = setTimeout(() => done({ success: false, error: "Connection timed out" }), TEST_TIMEOUT_MS);
-        let buf = "";
-        let phase = "greeting";
-        // biome-ignore lint/suspicious/noExplicitAny: socket type varies between net.Socket and tls.TLSSocket
-        let sock;
-        const onData = (chunk) => {
-            buf += chunk.toString();
-            const lines = buf.split("\r\n");
-            buf = lines.pop() ?? "";
-            for (const line of lines) {
-                if (phase === "greeting" && /^\* OK/i.test(line)) {
-                    if (config.startTls) {
-                        phase = "starttls";
-                        sock.write("A001 STARTTLS\r\n");
-                    }
-                    else {
-                        phase = "auth";
-                        sock.write(`A001 AUTHENTICATE PLAIN ${authPlain}\r\n`);
-                    }
-                }
-                else if (phase === "starttls" && /^A001 OK/i.test(line)) {
-                    phase = "tls-upgrade";
-                    // Upgrade socket to TLS in place
-                    const tlsSock = tlsConnect({
-                        socket: sock,
-                        host: config.host,
-                        rejectUnauthorized: false,
-                    });
-                    tlsSock.on("data", onData);
-                    tlsSock.on("error", onError);
-                    tlsSock.once("secureConnect", () => {
-                        phase = "auth";
-                        sock = tlsSock;
-                        sock.write(`A002 AUTHENTICATE PLAIN ${authPlain}\r\n`);
-                    });
-                }
-                else if (phase === "auth" &&
-                    (/^A00[12] OK/i.test(line) || /^A001 OK/i.test(line))) {
-                    phase = "done";
-                    sock.write("A099 LOGOUT\r\n");
-                    done({ success: true });
-                }
-                else if (phase === "auth" &&
-                    (/^A00[12] NO/i.test(line) || /^A00[12] BAD/i.test(line))) {
-                    phase = "done";
-                    sock.destroy();
-                    done({ success: false, error: "Authentication failed" });
-                }
-            }
-        };
-        const onError = (err) => {
-            done({ success: false, error: err.message });
-        };
-        if (config.secure) {
-            sock = tlsConnect({
-                host: config.host,
-                port: config.port,
-                rejectUnauthorized: false,
-            });
-        }
-        else {
-            sock = createNetConnection({ host: config.host, port: config.port });
-        }
-        sock.on("data", onData);
-        sock.on("error", onError);
-    });
-};
-/**
- * Test SMTP connection with provided credentials
- *
- * Uses nodemailer's verify() method to test authentication.
- */
-export const testSmtpConnection = async (config) => {
-    const transport = createTransport({
+export const testImapConnection = async (config, transport) => {
+    const connection = new ImapFlowConnection({
         host: config.host,
         port: config.port,
-        secure: config.secure,
-        auth: buildSmtpAuth(config.user, config.credentials),
-        connectionTimeout: TEST_TIMEOUT_MS,
-        greetingTimeout: TEST_TIMEOUT_MS,
-        socketTimeout: TEST_TIMEOUT_MS,
+        tls: config.secure,
+        user: config.user,
+        credentials: config.credentials,
+        transport,
+        connTimeout: TEST_TIMEOUT_MS,
     });
-    const attempt = transport
-        .verify()
-        .then(() => ({ success: true }))
-        .catch((error) => {
-        if (error instanceof MailConnectionError) {
-            return { success: false, error: error.message };
-        }
-        return {
-            success: false,
-            error: error instanceof Error ? error.message : "Connection failed",
-        };
-    })
-        .finally(() => transport.close());
-    const timeout = new Promise((resolve) => setTimeout(() => {
-        transport.close();
-        resolve({ success: false, error: "Connection timed out" });
-    }, TEST_TIMEOUT_MS));
-    return Promise.race([attempt, timeout]);
+    const result = await connection.connectOnce().then(() => ({ success: true }), (error) => ({
+        success: false,
+        error: error instanceof Error ? error.message : "Connection failed",
+    }));
+    await connection.disconnect();
+    return result;
 };

package/dist/imapflow-connection.d.ts

@@ -79,6 +79,11 @@ export declare class ImapFlowConnection {
      * Authentication errors are not retried.
      */
     connect: () => Promise<void>;
+    /**
+     * Connect once, without retrying. A failure is classified into a
+     * MailConnectionError where possible and leaves the connection closed.
+     */
+    connectOnce: () => Promise<void>;
     /**
      * Single connection attempt
      */

package/dist/imapflow-connection.js

@@ -172,36 +172,36 @@ export class ImapFlowConnection {
      * Authentication errors are not retried.
      */
     connect = async () => {
-        if (this.client) {
-            throw new Error("Already connected");
-        }
         const maxRetries = 3;
         const baseDelayMs = 1000;
         for (let attempt = 1; attempt <= maxRetries; attempt++) {
-            try {
-                await this.attemptConnect();
+            const failure = await this.connectOnce().then(() => null, (error) => error);
+            if (failure === null) {
                 return;
             }
-            catch (error) {
-                const classified = classifyImapError(error, `${this.config.host}:${this.config.port}`);
-                // Auth errors won't fix themselves on retry — throw immediately.
-                if (classified?.kind === "auth") {
-                    throw classified;
-                }
-                // Final attempt exhausted: throw the classified error if we have
-                // one (network failures), otherwise let the raw error bubble.
-                if (attempt === maxRetries) {
-                    throw classified ?? error;
-                }
-                // Network and unknown errors fall through to retry-with-backoff.
-                // Exponential backoff: 1s, 2s, 4s
-                const delay = baseDelayMs * 2 ** (attempt - 1);
-                await this.sleep(delay);
-                // Reset state for retry
-                this.cleanup();
+            if (failure instanceof MailConnectionError && failure.kind === "auth") {
+                throw failure;
+            }
+            if (attempt === maxRetries) {
+                throw failure;
             }
+            await this.sleep(baseDelayMs * 2 ** (attempt - 1));
         }
     };
+    /**
+     * Connect once, without retrying. A failure is classified into a
+     * MailConnectionError where possible and leaves the connection closed.
+     */
+    connectOnce = async () => {
+        if (this.client) {
+            throw new Error("Already connected");
+        }
+        await this.attemptConnect().catch((error) => {
+            this.cleanup();
+            throw (classifyImapError(error, `${this.config.host}:${this.config.port}`) ??
+                error);
+        });
+    };
     /**
      * Single connection attempt
      */
@@ -225,6 +225,8 @@ export class ImapFlowConnection {
             port: this.config.port,
             secure: this.config.tls,
             transport: this.config.transport,
+            connectionTimeout: this.config.connTimeout,
+            greetingTimeout: this.config.connTimeout,
             servername: this.config.tlsOptions?.servername,
             auth,
             tls: tlsOptions,

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export { isMessageBodySyncBroken, type ResolveExhaustedBodySyncDeps, type Resolv
 export { backfillClassifications, type ClassificationBackfillCheckpoint, type ClassificationBackfillCheckpointStore, type ClassificationBackfillDeps, type ClassificationBackfillLogger, type ClassificationBackfillOptions, type ClassificationBackfillProgress, type ClassificationBackfillResult, type ClassificationBackfillTotals, } from "./classification-backfill.js";
 export { classifyParsedMessage, extractPrimaryFromEmail, } from "./classify-message.js";
 export { type ConnectionScope, connectionScope, createConnection, createConnectionWithCredentials, } from "./connection-factory.js";
-export { type ImapTestConfig, type SmtpTestConfig, type TestResult, testImapConnection, testSmtpConnection, } from "./connection-test.js";
+export { type ImapTestConfig, testImapConnection, } from "./connection-test.js";
 export { type CreatedFilter, createFilter, type FilterPage, type FilterPatch, listFilters, type NewFilter, resolveFilterUpdate, updateFilter, } from "./filter-operations.js";
 export { extractListId, normalizeListId } from "./filters/list-id.js";
 export { clauseMatches, type FilterMessage, type LiteralClauseNarrowing, literalClausesMatch, literalClauseTerms, NO_ACTION, selectMoveWinner, } from "./filters/match.js";

package/dist/index.js

@@ -14,7 +14,7 @@ export { classifyParsedMessage, extractPrimaryFromEmail, } from "./classify-mess
 // Connection factory
 export { connectionScope, createConnection, createConnectionWithCredentials, } from "./connection-factory.js";
 // Connection testing
-export { testImapConnection, testSmtpConnection, } from "./connection-test.js";
+export { testImapConnection, } from "./connection-test.js";
 export { createFilter, listFilters, resolveFilterUpdate, updateFilter, } from "./filter-operations.js";
 export { extractListId, normalizeListId } from "./filters/list-id.js";
 export { clauseMatches, literalClausesMatch, literalClauseTerms, NO_ACTION, selectMoveWinner, } from "./filters/match.js";

package/dist/types.d.ts

@@ -47,10 +47,8 @@ export interface ImapConnectionConfig {
         rejectUnauthorized?: boolean;
         servername?: string;
     };
-    /** Connection timeout in milliseconds */
+    /** Connection and greeting timeout in milliseconds */
     connTimeout?: number;
-    /** Authentication timeout in milliseconds */
-    authTimeout?: number;
 }
 /**
  * IMAP connection state

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/mailbox-service",
-	"version": "0.0.115",
+	"version": "0.0.116",
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -61,7 +61,6 @@
 	"dependencies": {
 		"imapflow": "^2.9.1",
 		"mailparser": "3.12.2",
-		"nodemailer": "^10.0.6",
 		"p-map": "^7.0.4",
 		"tldts": "^7.4.9",
 		"@remit/data-ports": "*",
@@ -73,7 +72,6 @@
 		"natural": "^8.1.1",
 		"stopword": "^3.1.5",
 		"@types/mailparser": "^3.4.6",
-		"@types/nodemailer": "^8.0.1",
 		"@types/stopword": "^2.0.3",
 		"@remit/calendar-service": "*"
 	},