fluxmail 0.9.0 → 0.10.0

package/dist/accounts/oauthCallback.js

@@ -0,0 +1,237 @@
+import { createServer } from 'node:http';
+import { createInterface } from 'node:readline';
+import { EmailError } from '@fluxmail/core';
+export const DEFAULT_OAUTH_CALLBACK_TIMEOUT_MS = 10 * 60 * 1000;
+function providerName(provider) {
+    return provider === 'gmail' ? 'Google' : 'Microsoft';
+}
+function checkCallback(url, params, callbackPath) {
+    if (url.pathname !== callbackPath)
+        return { kind: 'ignore', status: 404, message: 'Not found' };
+    if (url.searchParams.get('state') !== params.state) {
+        return { kind: 'ignore', status: 400, message: 'State mismatch. Restart the flow.' };
+    }
+    const oauthError = url.searchParams.get('error');
+    if (oauthError) {
+        const description = url.searchParams.get('error_description') ?? oauthError;
+        const name = providerName(params.provider);
+        return {
+            kind: 'error',
+            error: new EmailError('invalid_request', `${name} OAuth error: ${description}`),
+            message: `${name} returned an error: ${description}.`,
+        };
+    }
+    const code = url.searchParams.get('code');
+    if (!code)
+        return { kind: 'ignore', status: 400, message: 'Missing code parameter.' };
+    return { kind: 'code', code };
+}
+function escapeHtml(value) {
+    return value.replace(/[&<>"']/g, (char) => {
+        const entities = {
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#39;',
+        };
+        return entities[char];
+    });
+}
+function callbackPage(title, message) {
+    return ('<html><body style="font-family: sans-serif">' +
+        `<h2>${escapeHtml(title)}</h2><p>${escapeHtml(message)}</p>` +
+        '<p>You can close this tab and return to the terminal.</p></body></html>');
+}
+function failureMessage(error) {
+    return error instanceof EmailError
+        ? { status: 400, message: error.message }
+        : { status: 500, message: 'Fluxmail could not finish connecting this account. Check the terminal for details.' };
+}
+function timeoutError(params, timeoutMs) {
+    const minutes = Math.max(1, Math.round(timeoutMs / 60_000));
+    const pasteHint = params.options?.paste
+        ? 'If your browser runs on another computer, try again and paste the URL from its address bar ' +
+            'after you approve access. '
+        : '';
+    return new EmailError('invalid_request', `Timed out after ${minutes} minute${minutes === 1 ? '' : 's'} waiting for ${providerName(params.provider)} to redirect back. ` +
+        pasteHint +
+        `You can also forward the callback port with "ssh -L ${params.port}:127.0.0.1:${params.port} <server>".`);
+}
+/** Explains a busy callback port, including the Docker Compose case where the container owns it. */
+export function callbackPortInUseError(error, port, provider) {
+    if (error.code !== 'EADDRINUSE')
+        return error;
+    return new Error(`OAuth callback port ${port} is already in use.\n\n` +
+        'If Fluxmail is running with Docker Compose, connect the account inside the container:\n\n' +
+        `  docker compose exec fluxmail fluxmail accounts add ${provider}\n\n` +
+        `Otherwise, stop the process using port ${port} and try again.`, { cause: error });
+}
+/**
+ * Waits for the OAuth redirect on the loopback listener and, when a terminal
+ * is available, for the same callback URL pasted into it. The first callback
+ * that carries a code wins, and the flow gives up after a timeout.
+ */
+export function runOAuthCallbackFlow(params) {
+    const callbackPath = new URL(params.redirectUri).pathname;
+    const paste = params.options?.paste;
+    const timeoutMs = params.options?.timeoutMs ?? DEFAULT_OAUTH_CALLBACK_TIMEOUT_MS;
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        // An authorization code is single use, so only the first one is exchanged.
+        // Once a code is claimed, later callbacks, including provider errors, cannot end the flow.
+        let claimed = false;
+        let listening = false;
+        let announced = false;
+        const server = createServer((request, response) => {
+            void handleRequest(request.url ?? '/', response);
+        });
+        const lines = paste ? createInterface({ input: paste.input, terminal: false }) : undefined;
+        // The wait ends when a code is claimed. The token exchange that follows is
+        // bounded by the provider request itself.
+        const timer = setTimeout(() => {
+            if (claimed)
+                return;
+            settle(() => {
+                params.options?.onCallback?.('timeout');
+                reject(timeoutError(params, timeoutMs));
+            });
+        }, timeoutMs);
+        function cleanup() {
+            clearTimeout(timer);
+            lines?.close();
+            if (listening) {
+                // Responses carry Connection: close, so open sockets end once the page
+                // is written. Force any stragglers shut so the CLI process can exit.
+                server.close();
+                server.closeIdleConnections();
+                setTimeout(() => server.closeAllConnections(), 1000).unref();
+            }
+        }
+        function settle(action) {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            action();
+        }
+        function announce() {
+            if (announced)
+                return;
+            announced = true;
+            params.onAuthUrl(params.authUrl, { listening, pasteEnabled: paste !== undefined });
+        }
+        function busy() {
+            return claimed || settled;
+        }
+        /** Exchange a claimed code, then report the outcome to whichever path supplied it. */
+        async function exchange(source, code) {
+            claimed = true;
+            params.options?.onCallback?.(source);
+            try {
+                const { email, value } = await params.complete(code);
+                settle(() => resolve(value));
+                return { email };
+            }
+            catch (error) {
+                settle(() => reject(error));
+                return { error };
+            }
+        }
+        function respond(response, status, body, html = false) {
+            response
+                .writeHead(status, {
+                connection: 'close',
+                'content-type': html ? 'text/html; charset=utf-8' : 'text/plain; charset=utf-8',
+            })
+                .end(body);
+        }
+        async function handleRequest(rawUrl, response) {
+            let url;
+            try {
+                url = new URL(rawUrl, params.redirectUri);
+            }
+            catch {
+                respond(response, 400, 'Bad request');
+                return;
+            }
+            const check = checkCallback(url, params, callbackPath);
+            if (check.kind === 'ignore') {
+                respond(response, check.status, check.message);
+                return;
+            }
+            if (busy()) {
+                respond(response, 409, 'This connection is already being completed. Return to the terminal.');
+                return;
+            }
+            if (check.kind === 'error') {
+                settle(() => reject(check.error));
+                respond(response, 400, `${check.message} You can close this tab.`);
+                return;
+            }
+            const outcome = await exchange('listener', check.code);
+            if (outcome.email !== undefined) {
+                respond(response, 200, callbackPage(`${outcome.email} is connected to Fluxmail`, 'The account is ready to use.'), true);
+                return;
+            }
+            const failure = failureMessage(outcome.error);
+            respond(response, failure.status, callbackPage('Fluxmail could not connect this account', failure.message), true);
+        }
+        async function handlePastedLine(line) {
+            const text = line.trim();
+            if (!text || settled)
+                return;
+            if (claimed) {
+                paste.write('Fluxmail is already finishing this connection. Wait for it to complete.');
+                return;
+            }
+            let url;
+            try {
+                url = new URL(text);
+            }
+            catch {
+                paste.write('That is not a URL. Paste the full address from your browser, starting with ' +
+                    `${new URL(params.redirectUri).origin}.`);
+                return;
+            }
+            const check = checkCallback(url, params, callbackPath);
+            if (check.kind === 'ignore') {
+                paste.write(check.status === 404
+                    ? `That URL is not the Fluxmail callback. It should start with ${params.redirectUri}.`
+                    : `${check.message} Paste the URL from the most recent authorization.`);
+                return;
+            }
+            if (check.kind === 'error') {
+                settle(() => reject(check.error));
+                return;
+            }
+            await exchange('pasted', check.code);
+        }
+        lines?.on('line', (line) => void handlePastedLine(line));
+        lines?.on('close', () => {
+            // With the listener running, the browser redirect can still finish the flow.
+            if (settled || claimed || listening)
+                return;
+            settle(() => reject(new EmailError('invalid_request', 'Input closed before a callback URL was pasted, and the callback port is in use. Run the command again.')));
+        });
+        server.on('error', (error) => {
+            if (listening || settled)
+                return;
+            // Without a terminal, the listener is the only way to finish.
+            if (!paste || error.code !== 'EADDRINUSE') {
+                settle(() => reject(callbackPortInUseError(error, params.port, params.provider)));
+                return;
+            }
+            announce();
+        });
+        server.listen(params.port, params.host, () => {
+            listening = true;
+            if (settled) {
+                server.close();
+                return;
+            }
+            announce();
+        });
+    });
+}
+//# sourceMappingURL=oauthCallback.js.map

package/dist/accounts/oauthCallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauthCallback.js","sourceRoot":"","sources":["../../src/accounts/oauthCallback.ts"],"names":[],"mappings":"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"}

package/dist/accounts/telemetry.d.ts

@@ -1,5 +1,6 @@
 import type { Provider } from '@fluxmail/core';
 import type { FluxmailConfig } from '../config.js';
+import type { OAuthCallbackSource } from './oauthCallback.js';
 import type { TelemetryProperties } from '../telemetry.js';
 import type { AccountRegistry } from './registry.js';
 /** Where the provider sends the browser after consent. */
@@ -19,6 +20,8 @@ export interface ConnectionTelemetry {
     reauthorize?: boolean;
     flow?: ConnectionFlow;
     oauthApp?: OAuthAppKind;
+    /** How a loopback callback reached the CLI, or that it timed out waiting. */
+    callback?: OAuthCallbackSource;
 }
 /** Describe a connection attempt without naming the mailbox it connects. */
 export declare function connectionProperties(connection: ConnectionTelemetry): TelemetryProperties;

package/dist/accounts/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/accounts/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnD,6EAA6E;AAC7E,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEjD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAGvG;AAED,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAE3G;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAED,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,mBAAmB,GAAG,mBAAmB,CAOzF;AAED,8EAA8E;AAC9E,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,GAAG,SAAS,GACnE,mBAAmB,CAcrB"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/accounts/telemetry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,0DAA0D;AAC1D,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnD,6EAA6E;AAC7E,MAAM,MAAM,YAAY,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEjD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,CAGvG;AAED,+EAA+E;AAC/E,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,GAAG,SAAS,CAE3G;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,QAAQ,CAAC;IACnB,2EAA2E;IAC3E,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,mBAAmB,CAAC;CAChC;AAED,4EAA4E;AAC5E,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,mBAAmB,GAAG,mBAAmB,CAQzF;AAED,8EAA8E;AAC9E,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,uBAAuB,CAAC,GAAG,SAAS,GACnE,mBAAmB,CAcrB"}

package/dist/accounts/telemetry.js

@@ -19,6 +19,7 @@ export function connectionProperties(connection) {
         ...(connection.reauthorize === undefined ? {} : { reauthorize: connection.reauthorize }),
         ...(connection.flow ? { connection_flow: connection.flow } : {}),
         ...(connection.oauthApp ? { oauth_app: connection.oauthApp } : {}),
+        ...(connection.callback ? { oauth_callback: connection.callback } : {}),
     };
 }
 /** Mailbox totals by provider. Counts only: no address, id, or credential. */

package/dist/accounts/telemetry.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/accounts/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AASnE;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,QAAkB,EAAE,QAA4B;IAC3E,IAAI,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvD,OAAO,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,wBAAwB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC/F,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,sBAAsB,CAAC,MAAsB,EAAE,QAAkB;IAC/E,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC7G,CAAC;AAUD,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB,CAAC,UAA+B;IAClE,OAAO;QACL,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,GAAG,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;QACxF,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnE,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,0BAA0B,CACxC,QAAoE;IAEpE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,EAAE,qBAAqB,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,KAAK;YAC3B,mBAAmB,EAAE,MAAM,CAAC,KAAK;YACjC,qBAAqB,EAAE,MAAM,CAAC,OAAO;YACrC,kBAAkB,EAAE,MAAM,CAAC,IAAI;SAChC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,mDAAmD;QACnD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/accounts/telemetry.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AASnE;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,QAAkB,EAAE,QAA4B;IAC3E,IAAI,QAAQ,KAAK,MAAM,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvD,OAAO,QAAQ,KAAK,OAAO,IAAI,QAAQ,KAAK,wBAAwB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC/F,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,sBAAsB,CAAC,MAAsB,EAAE,QAAkB;IAC/E,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAC7G,CAAC;AAYD,4EAA4E;AAC5E,MAAM,UAAU,oBAAoB,CAAC,UAA+B;IAClE,OAAO;QACL,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,GAAG,CAAC,UAAU,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC;QACxF,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACxE,CAAC;AACJ,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,0BAA0B,CACxC,QAAoE;IAEpE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,QAAQ,EAAE,qBAAqB,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACvB,OAAO;YACL,aAAa,EAAE,MAAM,CAAC,KAAK;YAC3B,mBAAmB,EAAE,MAAM,CAAC,KAAK;YACjC,qBAAqB,EAAE,MAAM,CAAC,OAAO;YACrC,kBAAkB,EAAE,MAAM,CAAC,IAAI;SAChC,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,mDAAmD;QACnD,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAyB1C,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAapE,OAAO,EAQL,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAQL,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AAsBxB,OAAO,EAAmD,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAuCrH,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,iBAAiB,EAAE,gBAAgB,UAAQ,GAAG,gBAAgB,CAoB/G;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,GAC9C,gBAAgB,CAQlB;AAkID,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACrD;AA+ED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAatF;AAED,UAAU,cAAc;IACtB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACnD;AAUD,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAQjE;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAExE;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CAgsDzE;AAED,wBAAsB,MAAM,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlF"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AA0B1C,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAapE,OAAO,EAQL,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAQL,KAAK,SAAS,EAEf,MAAM,gBAAgB,CAAC;AAsBxB,OAAO,EAAmD,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAuCrH,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAcD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,iBAAiB,EAAE,gBAAgB,UAAQ,GAAG,gBAAgB,CAoB/G;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC,GAC9C,gBAAgB,CAQlB;AAwKD,MAAM,WAAW,iBAAiB;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,qBAAqB,CAAC,EAAE,wBAAwB,CAAC;IACjD,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACrD;AA+ED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAatF;AAED,UAAU,cAAc;IACtB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACnD;AAUD,wBAAsB,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAQjE;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAExE;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,iBAAsB,GAAG,OAAO,CA0rDzE;AAED,wBAAsB,MAAM,CAAC,IAAI,GAAE,SAAS,MAAM,EAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAQlF"}

package/dist/cli.js

@@ -178,6 +178,33 @@ function readSecretFile(file) {
 async function secretInput(file, label) {
     return file === undefined ? hiddenPrompt(label) : readSecretFile(file);
 }
+/** Print the consent URL and explain how to finish when the redirect cannot reach this computer. */
+function printLoopbackInstructions(provider, url, context, port) {
+    const providerName = provider === 'gmail' ? 'Google' : 'Microsoft';
+    const access = provider === 'gmail' ? 'Gmail access' : 'Microsoft mail access';
+    console.log(`\nOpen this URL in your browser to authorize ${access}:\n`);
+    console.log(`  ${url}\n`);
+    if (!context.listening) {
+        console.log(`Port ${port} is already in use, so Fluxmail cannot receive the redirect from ${providerName}.\n\n` +
+            'If Fluxmail is running with Docker Compose, press Ctrl-C and connect the account inside the container ' +
+            'so it is saved there:\n\n' +
+            `  docker compose exec fluxmail fluxmail accounts add ${provider}\n\n` +
+            "Otherwise, approve access, then copy the full URL from your browser's address bar and paste it here.");
+        return;
+    }
+    console.log(`Waiting for ${providerName} to redirect back...`);
+    if (context.pasteEnabled) {
+        console.log('If your browser runs on another computer, the page will not load after you approve access. ' +
+            'Copy the full URL from its address bar and paste it here.');
+    }
+}
+/** Accept a pasted callback URL when a person is at the terminal, and report how the callback arrived. */
+function loopbackFlowOptions(program, provider) {
+    return {
+        ...(process.stdin.isTTY ? { paste: { input: process.stdin, write: (message) => console.error(message) } } : {}),
+        onCallback: (callback) => recordCliOperationProperties(program, connectionProperties({ provider, callback })),
+    };
+}
 /** Offered when a configured public URL, not an explicit --hosted, chose the hosted flow. */
 const LOOPBACK_FLOW_REMEDY = 'Pass --local to use the loopback flow on this computer instead.';
 function planLine(ent) {
@@ -979,11 +1006,7 @@ export function createCliProgram(options = {}) {
                     console.log('This link expires in 10 minutes and can only be used once.');
                     return;
                 }
-                const account = await runMicrosoftLoopbackFlow(ctx.config, (url) => {
-                    console.log('\nOpen this URL in your browser to authorize Microsoft mail access:\n');
-                    console.log(`  ${url}\n`);
-                    console.log('Waiting for Microsoft to redirect back...');
-                }, (result) => {
+                const account = await runMicrosoftLoopbackFlow(ctx.config, (url, context) => printLoopbackInstructions('outlook', url, context, ctx.config.oauthPort), (result) => {
                     const duplicate = ctx.registry
                         .listAccounts()
                         .find((candidate) => candidate.email.toLowerCase() === result.email.toLowerCase());
@@ -995,7 +1018,7 @@ export function createCliProgram(options = {}) {
                             'Try again and choose the matching Microsoft account.');
                     }
                     return ctx.registry.addOutlookAccount(result.email, result.credentials, result.displayName, owner.id, existing?.id, access);
-                });
+                }, loopbackFlowOptions(program, 'outlook'));
                 auditConnection('account.connection.complete', account.id);
                 recordCliOperationProperties(program, {
                     reauthorize: accountIdsBeforeConnection.has(account.id),
@@ -1018,11 +1041,7 @@ export function createCliProgram(options = {}) {
                 console.log('This link expires in 10 minutes and can only be used once.');
                 return;
             }
-            const account = await runLoopbackFlow(ctx.config, (url) => {
-                console.log('\nOpen this URL in your browser to authorize Gmail access:\n');
-                console.log(`  ${url}\n`);
-                console.log('Waiting for Google to redirect back…');
-            }, (result) => {
+            const account = await runLoopbackFlow(ctx.config, (url, context) => printLoopbackInstructions('gmail', url, context, ctx.config.oauthPort), (result) => {
                 const duplicate = ctx.registry
                     .listAccounts()
                     .find((candidate) => candidate.email.toLowerCase() === result.email.toLowerCase());
@@ -1034,7 +1053,7 @@ export function createCliProgram(options = {}) {
                         'Try again and choose the matching Google account.');
                 }
                 return ctx.registry.addGmailAccount(result.email, result.tokens, result.displayName, owner.id, access, result.oauthClient);
-            });
+            }, loopbackFlowOptions(program, 'gmail'));
             auditConnection('account.connection.complete', account.id);
             recordCliOperationProperties(program, {
                 reauthorize: accountIdsBeforeConnection.has(account.id),