proton-mail-bridge-client 2.1.19 → 2.1.21

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -154,6 +154,7 @@ const TOOLS = [
             type: "object",
             properties: {
                 emailId: { type: "string", description: "Original email id." },
+                undoWindowSeconds: { type: "number", description: "Override PROTONMAIL_SEND_DELAY_SECONDS for this one send: queue it for this many seconds (cancelable via cancel_send) instead of the server's configured default. 0 sends immediately even if the server has a default window configured. Same caveat as the server default: only fires while this server process stays running." },
                 body: { type: "string", description: "Reply body to prepend (plain text). Required unless markdownBody is provided." },
                 markdownBody: { type: "string", description: "Reply body in Markdown. Rendered to HTML with body as plain-text fallback; takes precedence over body+isHtml." },
                 replyAll: { type: "boolean", description: "Reply to all original recipients.", default: false },
@@ -194,6 +195,7 @@ const TOOLS = [
             type: "object",
             properties: {
                 emailId: { type: "string", description: "Original email id." },
+                undoWindowSeconds: { type: "number", description: "Override PROTONMAIL_SEND_DELAY_SECONDS for this one send: queue it for this many seconds (cancelable via cancel_send) instead of the server's configured default. 0 sends immediately even if the server has a default window configured. Same caveat as the server default: only fires while this server process stays running." },
                 body: { type: "string", description: "Reply body to prepend (plain text). Required unless markdownBody is provided." },
                 markdownBody: { type: "string", description: "Reply body in Markdown. Rendered to HTML with body as plain-text fallback; takes precedence over body+isHtml." },
                 isHtml: { type: "boolean", description: "Send body as HTML (ignored when markdownBody is provided).", default: false },
@@ -233,6 +235,7 @@ const TOOLS = [
             type: "object",
             properties: {
                 emailId: { type: "string", description: "Original email id." },
+                undoWindowSeconds: { type: "number", description: "Override PROTONMAIL_SEND_DELAY_SECONDS for this one send: queue it for this many seconds (cancelable via cancel_send) instead of the server's configured default. 0 sends immediately even if the server has a default window configured. Same caveat as the server default: only fires while this server process stays running." },
                 to: { type: "string", description: "Forward recipient list, comma-separated." },
                 body: { type: "string", description: "Optional message before the forwarded content (plain text)." },
                 markdownBody: { type: "string", description: "Optional introductory note in Markdown. Rendered to HTML with body as plain-text fallback; takes precedence over body+isHtml." },
@@ -2530,7 +2533,61 @@ function parseResourceUri(uri) {
     }
     throw new Error(`Unsupported resource URI: ${uri}`);
 }
+// Writes attachment bytes to <downloadDir>/<saveTo>, refusing any path that escapes the
+// download dir (lexically or through a symlink). The containment check canonicalizes
+// BOTH sides — comparing a canonical target with a merely-resolved allowed dir rejected
+// every save when the allowed dir is or sits under a symlink (macOS /var/folders is
+// really /private/var/folders). Attachments are private mail content, so directories
+// created here are owner-only (0700) and the file is 0600, existing files included.
+export async function writeAttachmentToDownloadDir(downloadDir, saveTo, data) {
+    const { resolve: pathResolve, join: pathJoin, dirname, basename, sep } = await import("node:path");
+    const { realpathSync } = await import("node:fs");
+    const { writeFile: wf, mkdir: mkd, chmod: chm } = await import("node:fs/promises");
+    const absDir = pathResolve(downloadDir);
+    const absTarget = pathJoin(absDir, saveTo);
+    // A hardcoded "/" never matched on win32 (path.resolve/join produce
+    // backslash-separated paths there), hence `sep`.
+    if (!absTarget.startsWith(absDir + sep) && absTarget !== absDir) {
+        throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
+    }
+    await mkd(pathResolve(absTarget, ".."), { recursive: true, mode: 0o700 });
+    const realDir = realpathSync(absDir);
+    let realTarget;
+    try {
+        realTarget = realpathSync(absTarget);
+    }
+    catch (error) {
+        if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+            realTarget = realpathSync(dirname(absTarget)) + sep + basename(absTarget);
+        }
+        else {
+            throw error;
+        }
+    }
+    if (!realTarget.startsWith(realDir + sep) && realTarget !== realDir) {
+        throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
+    }
+    await wf(absTarget, data, { mode: 0o600 });
+    // writeFile's mode only applies to a newly created file; tighten an existing one too.
+    await chm(absTarget, 0o600);
+    return absTarget;
+}
+// Syncs run one at a time per draft, and re-read the draft once they hold the lock: a
+// sync that queued behind another sees the remoteDraft the first one recorded (so it
+// updates that copy instead of APPENDing a second) and uploads the latest content.
 async function syncDraftToRemote(draftStore, smtpService, imapService, draft) {
+    try {
+        return await draftStore.withDraftSyncLock(draft.id, async () => syncDraftToRemoteLocked(draftStore, smtpService, imapService, await draftStore.getDraft(draft.id).catch(() => draft)));
+    }
+    catch (error) {
+        // Only reachable when the sync lock itself could not be taken — the upload's own
+        // failures are handled (and recorded) inside syncDraftToRemoteLocked.
+        const message = error instanceof Error ? error.message : String(error);
+        logger.warn("Draft remote sync could not start", "MCPServer", { draftId: draft.id, error });
+        return { draft: await draftStore.markRemoteSyncError(draft.id, message), remoteSync: { ok: false, message } };
+    }
+}
+async function syncDraftToRemoteLocked(draftStore, smtpService, imapService, draft) {
     try {
         const raw = await smtpService.buildRawMessage({
             to: draft.to,
@@ -3387,6 +3444,33 @@ export function createServer(config, options = {}) {
     function responseSlug(bundle) {
         return bundle.account.slug === accountManager.primary().account.slug ? undefined : bundle.account.slug;
     }
+    // Undo-send window for one send: the server default (PROTONMAIL_SEND_DELAY_SECONDS),
+    // overridable per call with undoWindowSeconds (0 = send immediately). Shared by
+    // send_email, reply_to_email, reply_all_email and forward_email.
+    function resolveUndoWindowSeconds(args) {
+        if (args.undoWindowSeconds === undefined) {
+            return config.runtime.sendDelaySeconds ?? 0;
+        }
+        const requested = Number(args.undoWindowSeconds);
+        if (!Number.isInteger(requested) || requested < 0 || requested > 300) {
+            throw new McpError(ErrorCode.InvalidParams, "undoWindowSeconds must be an integer between 0 and 300.");
+        }
+        return requested;
+    }
+    // Queues a send on the SENDING account's own delivery queue (so it fires through that
+    // account's SMTP) and returns the tool result. The id carries that account's slug so
+    // cancel_send/list_scheduled_sends can find it again.
+    async function queueUndoSend(bundle, payload, undoWindowSeconds, toolName, toolArgs, extra = {}) {
+        const sendAt = new Date(Date.now() + undoWindowSeconds * 1000).toISOString();
+        const queued = await withAudit(auditService, toolName, toolArgs, async () => bundle.deliveryQueueService.enqueue(payload, sendAt, "undo_send"));
+        return createTextResult({
+            queued: true,
+            id: withAccountPrefix(responseSlug(bundle), queued.id),
+            sendAt: queued.sendAt,
+            ...extra,
+            note: `Not sent yet — will send in ~${undoWindowSeconds}s unless canceled with cancel_send. This server must stay running for the send to fire; if it's restarted before sendAt, the send fires on next startup instead.`,
+        });
+    }
     // Alias for responseSlug — tagAccountIds (added alongside the digest/follow-up
     // multi-account fan-out) was written against this name; kept as a thin alias rather
     // than rewriting every call site to the other name.
@@ -3652,14 +3736,7 @@ export function createServer(config, options = {}) {
                     // immediately, cancelable via cancel_send until the window elapses.
                     // undoWindowSeconds overrides the server default for this one send —
                     // including forcing 0 (send immediately) when a default is configured.
-                    let undoWindowSeconds = config.runtime.sendDelaySeconds;
-                    if (args.undoWindowSeconds !== undefined) {
-                        const requested = Number(args.undoWindowSeconds);
-                        if (!Number.isInteger(requested) || requested < 0 || requested > 300) {
-                            throw new McpError(ErrorCode.InvalidParams, "undoWindowSeconds must be an integer between 0 and 300.");
-                        }
-                        undoWindowSeconds = requested;
-                    }
+                    const undoWindowSeconds = resolveUndoWindowSeconds(args);
                     // A `from` matching a configured additional account routes through that
                     // account's own SMTP connection — required under Bridge's Split Addresses
                     // feature, where each address is its own separate IMAP/SMTP login, not just
@@ -3874,7 +3951,7 @@ export function createServer(config, options = {}) {
                     if (dryRunReply) {
                         return createTextResult({ dryRun: true, wouldSendTo: { to, cc, bcc: extraBcc }, subject: prefixedSubject(detail.subject, "Re:"), note: "No email was sent." }, false, [emailSource({ ...detail, id: prefixedIdFor(readBundleReply, detail.id) })]);
                     }
-                    const result = await withAudit(auditService, name, args, async () => sendBundleForReply.smtpService.sendEmail({
+                    const replyPayload = {
                         to,
                         cc,
                         bcc: extraBcc,
@@ -3890,7 +3967,12 @@ export function createServer(config, options = {}) {
                         attachments,
                         // Already applied above, before quote-wrapping.
                         appendSignature: false,
-                    }));
+                    };
+                    const undoWindowreply = resolveUndoWindowSeconds(args);
+                    if (undoWindowreply > 0) {
+                        return queueUndoSend(sendBundleForReply, replyPayload, undoWindowreply, name, args, { repliedTo: prefixedIdFor(readBundleReply, detail.id), to, cc });
+                    }
+                    const result = await withAudit(auditService, name, args, async () => sendBundleForReply.smtpService.sendEmail(replyPayload));
                     let sentCopyTokenReply = "[sent-copy:unverified]";
                     try {
                         const verifyMsgId = result.messageId;
@@ -3963,7 +4045,7 @@ export function createServer(config, options = {}) {
                     const replyHtmlBodyRa = includeQuoteRa && signedReplyRa.htmlBody !== undefined
                         ? buildReplyHtml(detailRa, signedReplyRa.htmlBody)
                         : signedReplyRa.htmlBody;
-                    const resultRa = await withAudit(auditService, name, args, async () => sendBundleForRa.smtpService.sendEmail({
+                    const replyAllPayload = {
                         to: toRa,
                         cc: ccRa,
                         bcc: extraBccRa,
@@ -3979,7 +4061,12 @@ export function createServer(config, options = {}) {
                         attachments: attachmentsRa,
                         // Already applied above, before quote-wrapping.
                         appendSignature: false,
-                    }));
+                    };
+                    const undoWindowreplyAll = resolveUndoWindowSeconds(args);
+                    if (undoWindowreplyAll > 0) {
+                        return queueUndoSend(sendBundleForRa, replyAllPayload, undoWindowreplyAll, name, args, { repliedTo: prefixedIdFor(readBundleRa, detailRa.id), to: toRa, cc: ccRa });
+                    }
+                    const resultRa = await withAudit(auditService, name, args, async () => sendBundleForRa.smtpService.sendEmail(replyAllPayload));
                     let sentCopyTokenRa = "[sent-copy:unverified]";
                     try {
                         const verifyMsgId = resultRa.messageId;
@@ -4076,7 +4163,7 @@ export function createServer(config, options = {}) {
                     const forwardHtmlBody = signedFwd.htmlBody !== undefined
                         ? buildForwardHtml(detail, signedFwd.htmlBody)
                         : signedFwd.htmlBody;
-                    const result = await withAudit(auditService, name, args, async () => sendBundleForFwd.smtpService.sendEmail({
+                    const forwardPayload = {
                         to,
                         cc,
                         bcc,
@@ -4090,7 +4177,12 @@ export function createServer(config, options = {}) {
                         attachments: fwdAttachments,
                         // Already applied above, before quote-wrapping.
                         appendSignature: false,
-                    }));
+                    };
+                    const undoWindowforward = resolveUndoWindowSeconds(args);
+                    if (undoWindowforward > 0) {
+                        return queueUndoSend(sendBundleForFwd, forwardPayload, undoWindowforward, name, args, { forwardedMessage: prefixedIdFor(readBundleFwd, detail.id), to, cc });
+                    }
+                    const result = await withAudit(auditService, name, args, async () => sendBundleForFwd.smtpService.sendEmail(forwardPayload));
                     let sentCopyTokenFwd = "[sent-copy:unverified]";
                     try {
                         const verifyMsgId = result.messageId;
@@ -4801,7 +4893,10 @@ export function createServer(config, options = {}) {
                         // Draft content is already finalized and reviewed — see the
                         // identical note on send_draft.
                         appendSignature: false,
-                    }, new Date(sendAtTime).toISOString(), "scheduled_send", draft.id));
+                    }, new Date(sendAtTime).toISOString(), "scheduled_send", draft.id, 
+                    // The draft stays in its own account's store even when `from` routes the
+                    // send through another account's queue/SMTP.
+                    scheduleDraftBundle.account.slug));
                     return createTextResult({
                         queued: true,
                         id: withAccountPrefix(responseSlug(sendBundleForScheduleDraft), queued.id),
@@ -6887,42 +6982,9 @@ export function createServer(config, options = {}) {
                             if (!downloadDir) {
                                 throw new McpError(ErrorCode.InvalidParams, "PROTONMAIL_ALLOW_FILE_DOWNLOAD_DIR env var is not set.");
                             }
-                            const { resolve: pathResolve, join: pathJoin, dirname, basename, sep } = await import("node:path");
-                            const { realpathSync } = await import("node:fs");
-                            const { writeFile: wf, mkdir: mkd } = await import("node:fs/promises");
-                            const absDir = pathResolve(downloadDir);
-                            const absTarget = pathJoin(absDir, saveTo);
-                            // Hardcoded "/" here never matched on win32 (path.resolve/join
-                            // produce backslash-separated paths there), so every subdirectory
-                            // save failed with a false "escapes the allowed directory" —
-                            // fails safe/closed, not a security bypass, but breaks a normal
-                            // save on the Windows deployment this codebase explicitly
-                            // supports (see install-claude-desktop.ts's win32 branches).
-                            if (!absTarget.startsWith(absDir + sep) && absTarget !== absDir) {
-                                throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
-                            }
-                            await mkd(pathResolve(absTarget, ".."), { recursive: true });
-                            let realTarget;
-                            try {
-                                realTarget = realpathSync(absTarget);
-                            }
-                            catch (error) {
-                                if (error &&
-                                    typeof error === "object" &&
-                                    "code" in error &&
-                                    error.code === "ENOENT") {
-                                    realTarget = realpathSync(dirname(absTarget)) + sep + basename(absTarget);
-                                }
-                                else {
-                                    throw error;
-                                }
-                            }
-                            if (!realTarget.startsWith(absDir + sep) && realTarget !== absDir) {
-                                throw new McpError(ErrorCode.InvalidParams, "saveTo path escapes the allowed directory.");
-                            }
                             const buf = Buffer.from(result.base64, "base64");
-                            await wf(absTarget, buf);
-                            return createTextResult({ saved: true, path: absTarget, bytes: buf.length, filename: result.attachment?.filename });
+                            const savedPath = await writeAttachmentToDownloadDir(downloadDir, saveTo, buf);
+                            return createTextResult({ saved: true, path: savedPath, bytes: buf.length, filename: result.attachment?.filename });
                         }
                         return createTextResult(result, false, [attachmentSource(result.emailId, result.attachment)]);
                     }