@dawnlit/outlook-bridge 1.1.1 → 2.1.0

package/dist/windows/send.js

@@ -6,120 +6,108 @@ exports.replyOutlookEmail = replyOutlookEmail;
 const run_1 = require("./run");
 const scripts_1 = require("./scripts");
 const replyBody_1 = require("../shared/replyBody");
+const errors_1 = require("../errors");
 const json_1 = require("../shared/json");
-const signatures_1 = require("./signatures");
-const templates_1 = require("./templates");
 /**
  * Set the sending account through IDispatch reflection.
  *
- * Direct assignment (`$mail.SendUsingAccount = $account`) is a silent no-op under
+ * Plain assignment (`$mail.SendUsingAccount = $account`) is a silent no-op under
  * PowerShell's COM binding — the mail then goes out from whichever account
- * Outlook considers default, which is the failure this package exists to prevent.
+ * Outlook considers default, which is exactly what this package must never do.
  *
- * Refuses a mailbox that resolved to a store with no account. `accountScript`
- * admits those deliberately so the reads can reach them, but SendUsingAccount
- * takes an Account and there is no store to substitute: sending anyway would
- * leave $account null and fall through to the default account — the exact silent
- * wrong-mailbox send this function exists to stop. The guard lives here rather
- * than at the two call sites so neither can be added without it.
- *
- * The wording avoids the phrase `classifyRunFailure` matches for
- * AccountNotFoundError; the mailbox WAS found, it just cannot send.
+ * Refuses a mailbox that resolved to a store with no Account: SendUsingAccount
+ * takes an Account, and sending with none falls through to the default account.
+ * The usual cause is a stale session — Outlook builds its Accounts list at
+ * startup, so a mailbox added since has its store mounted and readable but no
+ * Account until Outlook restarts — and the message says so.
  */
 function sendUsingAccount(variable) {
-    return `if ($account -eq $null) { throw "Mailbox '$target' is a secondary store with no sending account attached." }
+    return `if ($account -eq $null) {
+    throw "${(0, errors_1.failureTag)('INVALID_REQUEST')}Mailbox '$target' has no sending account in this Outlook session. If it was added to the profile after Outlook started, restart Outlook and try again."
+}
 [void]$${variable}.GetType().InvokeMember('SendUsingAccount', [Reflection.BindingFlags]::SetProperty, $null, $${variable}, @($account))`;
 }
 /**
- * What to do with a composed item: send it, show it, or file it silently.
- *
- * `Display()` only shows the compose window — it never files the item, so a
- * windowless draft has to `Save()` into Drafts explicitly.
+ * What to do with a composed item. `Display()` only shows a compose window and
+ * never files the item, so a windowless draft has to `Save()` into Drafts.
  */
-function composeAction(variable, sendImmediately, openDraftWindow) {
-    if (sendImmediately)
-        return `$${variable}.Send()`;
-    return openDraftWindow !== false ? `$${variable}.Display()` : `$${variable}.Save()`;
+function dispose(variable, disposition) {
+    switch (disposition) {
+        case 'send':
+            return `$${variable}.Send()`;
+        case 'display':
+            return `$${variable}.Display()`;
+        case 'save':
+            return `$${variable}.Save()`;
+    }
 }
-/** Send (or display for review) an email through Outlook COM. */
-async function sendOutlookEmail(params) {
-    (0, run_1.requireWindows)();
-    const attachLine = params.attachmentPath
-        ? `$mail.Attachments.Add('${(0, run_1.psEscape)(params.attachmentPath)}') | Out-Null`
-        : '';
-    // The HTML body goes through a file: inline, a large email is what pushes the
-    // generated script past the command-line length limit.
-    const body = (0, run_1.scriptInput)('email-body', params.htmlBody);
-    const script = `${(0, scripts_1.accountScript)(params.emailAccount)}
+/** Outlook takes recipients as one semicolon-separated line. */
+function recipientLine(entries) {
+    return (0, run_1.psString)(entries.join('; '));
+}
+/**
+ * Send, display or file a new email. Only a filed draft reports an id: a sent
+ * item has left for the Outbox, and a displayed one is saved nowhere yet. The
+ * id is read after `Save()`, which is what assigns it — the EntryID the
+ * draft then keeps, and the one listOutlookDrafts reports.
+ */
+async function sendOutlookEmail(request) {
+    // The body goes through a file: inline, a large email bloats the script and
+    // every error that carries it.
+    const body = (0, run_1.scriptInput)('email-body', request.htmlBody);
+    const attach = request.attachments
+        .map(file => `[void]$mail.Attachments.Add(${(0, run_1.psString)(file)})`)
+        .join('\n');
+    const draftEntryId = request.disposition === 'save' ? '[string]$mail.EntryID' : "''";
+    try {
+        const output = await (0, run_1.runPowerShellJson)(`${(0, scripts_1.accountScript)(request.account)}
 $mail = $outlook.CreateItem(0)
 ${sendUsingAccount('mail')}
-$mail.To = '${(0, run_1.psEscape)(params.to)}'
-$mail.CC = '${(0, run_1.psEscape)(params.cc || '')}'
-$mail.Subject = '${(0, run_1.psEscape)(params.subject)}'
-$mail.HTMLBody = [IO.File]::ReadAllText('${(0, run_1.psEscape)(body.path)}', [Text.Encoding]::UTF8)
-${attachLine}
-${composeAction('mail', params.sendImmediately, params.openDraftWindow)}
-`;
-    try {
-        await (0, run_1.runPowerShellFile)(script, 120000);
+$mail.To = ${recipientLine(request.to)}
+$mail.CC = ${recipientLine(request.cc)}
+$mail.BCC = ${recipientLine(request.bcc)}
+$mail.Subject = ${(0, run_1.psString)(request.subject)}
+$mail.HTMLBody = [IO.File]::ReadAllText(${(0, run_1.psString)(body.path)}, [Text.Encoding]::UTF8)
+${attach}
+${dispose('mail', request.disposition)}
+ConvertTo-Json -Compress @{ draftEntryId = ${draftEntryId} }
+`, 'standard');
+        return { draftEntryId: (0, json_1.str)((0, json_1.record)(output).draftEntryId) };
     }
     finally {
         body.cleanup();
     }
 }
-/**
- * Reply to an email, inserting the caller's HTML above the quoted original.
- *
- * The body may be given directly or named as a saved template — see
- * `composeReplyHtml`, which resolves the template, its section and its
- * placeholders before anything reaches Outlook.
- */
-async function replyOutlookEmail(params) {
-    (0, run_1.requireWindows)();
-    const insertHtml = await (0, replyBody_1.composeReplyHtml)(params, {
-        readTemplateEmails: templates_1.readTemplateEmails,
-        readOutlookSignatureHtml: signatures_1.readOutlookSignatureHtml,
-        listOutlookSignatures: signatures_1.listOutlookSignatures,
-    });
-    const body = (0, run_1.scriptInput)('reply-insert', insertHtml);
-    const replyMethod = params.replyAll ? 'ReplyAll' : 'Reply';
-    // Outlook builds the reply as a Word document whose own empty paragraph sits
-    // inside WordSection1; inserting straight after that div's opening tag puts
-    // the new text where the user's cursor would have been. A reply Outlook did
-    // not build that way falls back to just inside <body>.
-    const script = `${(0, scripts_1.accountScript)(params.emailAccount)}
-${(0, scripts_1.getItemScript)(params.entryId, params.storeId)}
-$reply = $item.${replyMethod}()
+/** Reply to an email, with the composed HTML above the quoted original. */
+async function replyOutlookEmail(request) {
+    const insert = (0, run_1.scriptInput)('reply-insert', request.html);
+    try {
+        const output = await (0, run_1.runPowerShellJson)(`${(0, scripts_1.accountScript)(request.account)}
+${(0, scripts_1.itemLookupScript)(request.email)}
+$reply = $item.${request.replyAll ? 'ReplyAll' : 'Reply'}()
 ${sendUsingAccount('reply')}
-
-$insertHtml = [IO.File]::ReadAllText('${(0, run_1.psEscape)(body.path)}', [Text.Encoding]::UTF8)
-$keyWord = '${(0, run_1.psEscape)(replyBody_1.WORD_SECTION_ANCHOR)}'
-# Bound to a local first: each $reply.HTMLBody read marshals the WHOLE generated
-# reply across COM, and a Word reply on a long thread runs to hundreds of KB.
-$html = $reply.HTMLBody
-$idx = $html.IndexOf($keyWord)
-if ($idx -ge 0) { $idx += $keyWord.Length } else {
-    $m = [regex]::Match($html, '<body[^>]*>')
-    $idx = if ($m.Success) { $m.Index + $m.Length } else { 0 }
+$insertHtml = [IO.File]::ReadAllText(${(0, run_1.psString)(insert.path)}, [Text.Encoding]::UTF8)
+$anchor = ${(0, run_1.psString)(replyBody_1.WORD_SECTION_ANCHOR)}
+# Read once: every HTMLBody read marshals the whole generated reply across COM,
+# and a reply on a long thread runs to hundreds of KB.
+$html = [string]$reply.HTMLBody
+$at = $html.IndexOf($anchor)
+if ($at -ge 0) { $at += $anchor.Length } else {
+    $bodyTag = [regex]::Match($html, '<body[^>]*>')
+    $at = if ($bodyTag.Success) { $bodyTag.Index + $bodyTag.Length } else { 0 }
 }
-$reply.HTMLBody = $html.Insert($idx, $insertHtml)
+$reply.HTMLBody = $html.Insert($at, $insertHtml)
 $to = [string]$reply.To
 $subject = [string]$reply.Subject
-$sender = ''
-try { $sender = [string]$item.SenderEmailAddress } catch {}
-${composeAction('reply', params.sendImmediately, params.openDraftWindow)}
-ConvertTo-Json @{ to = $to; subject = $subject; repliedToSender = $sender }
-`;
-    try {
-        const parsed = (0, json_1.parseObject)(await (0, run_1.runPowerShell)(script, 60000));
-        return {
-            to: (0, json_1.str)(parsed.to),
-            subject: (0, json_1.str)(parsed.subject),
-            repliedToSender: (0, json_1.str)(parsed.repliedToSender),
-        };
+${scripts_1.SENDER_SMTP_PS}
+${dispose('reply', request.disposition)}
+ConvertTo-Json -Compress @{ to = $to; subject = $subject; repliedToSender = $senderSmtp }
+`, 'standard');
+        const result = (0, json_1.record)(output);
+        return { to: (0, json_1.str)(result.to), subject: (0, json_1.str)(result.subject), repliedToSender: (0, json_1.str)(result.repliedToSender) };
     }
     finally {
-        body.cleanup();
+        insert.cleanup();
     }
 }
 //# sourceMappingURL=send.js.map

package/dist/windows/send.js.map

@@ -1 +1 @@
-{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/windows/send.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/windows/send.ts"],"names":[],"mappings":"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","sourcesContent":["// Composing outgoing mail: a new email, and a reply to an existing one.\nimport { psString, runPowerShellJson, scriptInput } from './run';\nimport { accountScript, itemLookupScript, SENDER_SMTP_PS } from './scripts';\nimport { WORD_SECTION_ANCHOR } from '../shared/replyBody';\nimport { failureTag } from '../errors';\nimport { record, str } from '../shared/json';\nimport type { Disposition, ReplyRequest, SendRequest } from '../backend';\nimport type { ReplyEmailResult, SendEmailResult } from '../types';\n\n/**\n * Set the sending account through IDispatch reflection.\n *\n * Plain assignment (`$mail.SendUsingAccount = $account`) is a silent no-op under\n * PowerShell's COM binding — the mail then goes out from whichever account\n * Outlook considers default, which is exactly what this package must never do.\n *\n * Refuses a mailbox that resolved to a store with no Account: SendUsingAccount\n * takes an Account, and sending with none falls through to the default account.\n * The usual cause is a stale session — Outlook builds its Accounts list at\n * startup, so a mailbox added since has its store mounted and readable but no\n * Account until Outlook restarts — and the message says so.\n */\nfunction sendUsingAccount(variable: string): string {\n    return `if ($account -eq $null) {\n    throw \"${failureTag('INVALID_REQUEST')}Mailbox '$target' has no sending account in this Outlook session. If it was added to the profile after Outlook started, restart Outlook and try again.\"\n}\n[void]$${variable}.GetType().InvokeMember('SendUsingAccount', [Reflection.BindingFlags]::SetProperty, $null, $${variable}, @($account))`;\n}\n\n/**\n * What to do with a composed item. `Display()` only shows a compose window and\n * never files the item, so a windowless draft has to `Save()` into Drafts.\n */\nfunction dispose(variable: string, disposition: Disposition): string {\n    switch (disposition) {\n        case 'send':\n            return `$${variable}.Send()`;\n        case 'display':\n            return `$${variable}.Display()`;\n        case 'save':\n            return `$${variable}.Save()`;\n    }\n}\n\n/** Outlook takes recipients as one semicolon-separated line. */\nfunction recipientLine(entries: readonly string[]): string {\n    return psString(entries.join('; '));\n}\n\n/**\n * Send, display or file a new email. Only a filed draft reports an id: a sent\n * item has left for the Outbox, and a displayed one is saved nowhere yet. The\n * id is read after `Save()`, which is what assigns it — the EntryID the\n * draft then keeps, and the one listOutlookDrafts reports.\n */\nexport async function sendOutlookEmail(request: SendRequest): Promise<SendEmailResult> {\n    // The body goes through a file: inline, a large email bloats the script and\n    // every error that carries it.\n    const body = scriptInput('email-body', request.htmlBody);\n    const attach = request.attachments\n        .map(file => `[void]$mail.Attachments.Add(${psString(file)})`)\n        .join('\\n');\n    const draftEntryId = request.disposition === 'save' ? '[string]$mail.EntryID' : \"''\";\n    try {\n        const output = await runPowerShellJson(`${accountScript(request.account)}\n$mail = $outlook.CreateItem(0)\n${sendUsingAccount('mail')}\n$mail.To = ${recipientLine(request.to)}\n$mail.CC = ${recipientLine(request.cc)}\n$mail.BCC = ${recipientLine(request.bcc)}\n$mail.Subject = ${psString(request.subject)}\n$mail.HTMLBody = [IO.File]::ReadAllText(${psString(body.path)}, [Text.Encoding]::UTF8)\n${attach}\n${dispose('mail', request.disposition)}\nConvertTo-Json -Compress @{ draftEntryId = ${draftEntryId} }\n`, 'standard');\n        return { draftEntryId: str(record(output).draftEntryId) };\n    } finally {\n        body.cleanup();\n    }\n}\n\n/** Reply to an email, with the composed HTML above the quoted original. */\nexport async function replyOutlookEmail(request: ReplyRequest): Promise<ReplyEmailResult> {\n    const insert = scriptInput('reply-insert', request.html);\n    try {\n        const output = await runPowerShellJson(`${accountScript(request.account)}\n${itemLookupScript(request.email)}\n$reply = $item.${request.replyAll ? 'ReplyAll' : 'Reply'}()\n${sendUsingAccount('reply')}\n$insertHtml = [IO.File]::ReadAllText(${psString(insert.path)}, [Text.Encoding]::UTF8)\n$anchor = ${psString(WORD_SECTION_ANCHOR)}\n# Read once: every HTMLBody read marshals the whole generated reply across COM,\n# and a reply on a long thread runs to hundreds of KB.\n$html = [string]$reply.HTMLBody\n$at = $html.IndexOf($anchor)\nif ($at -ge 0) { $at += $anchor.Length } else {\n    $bodyTag = [regex]::Match($html, '<body[^>]*>')\n    $at = if ($bodyTag.Success) { $bodyTag.Index + $bodyTag.Length } else { 0 }\n}\n$reply.HTMLBody = $html.Insert($at, $insertHtml)\n$to = [string]$reply.To\n$subject = [string]$reply.Subject\n${SENDER_SMTP_PS}\n${dispose('reply', request.disposition)}\nConvertTo-Json -Compress @{ to = $to; subject = $subject; repliedToSender = $senderSmtp }\n`, 'standard');\n        const result = record(output);\n        return { to: str(result.to), subject: str(result.subject), repliedToSender: str(result.repliedToSender) };\n    } finally {\n        insert.cleanup();\n    }\n}\n"]}

package/dist/windows/signatures.d.ts

@@ -1,14 +1,8 @@
-/**
- * Names of the user's Outlook signatures (the ".htm" files), sorted. Empty off
- * Windows. Reads from disk synchronously but is declared async to match macOS,
- * which has to ask Outlook itself — one signature for both platforms.
- */
+/** The signature names — the ".htm" files — sorted. */
 export declare function listOutlookSignatures(): Promise<string[]>;
 /**
- * Read a named signature's HTML with its image references rewritten to absolute
- * file: URIs. Outlook stores signature images relative to a "<name>_files"
- * folder; once the refs are absolute, assigning the HTML to a mail body lets
- * Outlook resolve and embed the images on Display/Send. Returns '' if the
- * signature can't be found.
+ * A signature's HTML with its image references made absolute file: URIs, so an
+ * email body built from it resolves and embeds the images; '' when there is no
+ * signature by that name.
  */
 export declare function readOutlookSignatureHtml(name: string): Promise<string>;

package/dist/windows/signatures.js

@@ -5,27 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listOutlookSignatures = listOutlookSignatures;
 exports.readOutlookSignatureHtml = readOutlookSignatureHtml;
-// Outlook stores each signature as "<name>.htm" (plus .rtf/.txt and a
-// "<name>_files" folder for images) under %APPDATA%\Microsoft\Signatures, so
-// both of these read the disk rather than driving COM.
+// Outlook for Windows keeps each signature as "<name>.htm" (beside .rtf/.txt
+// copies and a "<name>_files" folder of images) under
+// %APPDATA%\Microsoft\Signatures, so these read the disk rather than COM.
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const url_1 = require("url");
-const SIGNATURES_DIR = process.env.APPDATA
-    ? path_1.default.join(process.env.APPDATA, 'Microsoft', 'Signatures')
-    : '';
-/**
- * Names of the user's Outlook signatures (the ".htm" files), sorted. Empty off
- * Windows. Reads from disk synchronously but is declared async to match macOS,
- * which has to ask Outlook itself — one signature for both platforms.
- */
+function signaturesDir() {
+    return process.env.APPDATA ? path_1.default.join(process.env.APPDATA, 'Microsoft', 'Signatures') : '';
+}
+/** The signature names — the ".htm" files — sorted. */
 async function listOutlookSignatures() {
-    if (process.platform !== 'win32' || !SIGNATURES_DIR)
+    const dir = signaturesDir();
+    if (!dir)
         return [];
     try {
-        return fs_1.default.readdirSync(SIGNATURES_DIR)
-            .filter(f => f.toLowerCase().endsWith('.htm'))
-            .map(f => f.slice(0, -4))
+        return fs_1.default.readdirSync(dir)
+            .filter(file => file.toLowerCase().endsWith('.htm'))
+            .map(file => file.slice(0, -'.htm'.length))
             .sort((a, b) => a.localeCompare(b));
     }
     catch {
@@ -33,37 +30,33 @@ async function listOutlookSignatures() {
     }
 }
 /**
- * Read a named signature's HTML with its image references rewritten to absolute
- * file: URIs. Outlook stores signature images relative to a "<name>_files"
- * folder; once the refs are absolute, assigning the HTML to a mail body lets
- * Outlook resolve and embed the images on Display/Send. Returns '' if the
- * signature can't be found.
+ * A signature's HTML with its image references made absolute file: URIs, so an
+ * email body built from it resolves and embeds the images; '' when there is no
+ * signature by that name.
  */
 async function readOutlookSignatureHtml(name) {
-    if (process.platform !== 'win32' || !SIGNATURES_DIR)
+    const dir = signaturesDir();
+    if (!dir)
         return '';
-    // Only accept a bare signature name — never a path — so a crafted name can't
-    // escape the Signatures folder.
-    const safe = path_1.default.basename(name);
-    const file = path_1.default.join(SIGNATURES_DIR, `${safe}.htm`);
+    // A bare name only — never a path — so a crafted name can't reach outside
+    // the Signatures folder.
+    const file = path_1.default.join(dir, `${path_1.default.basename(name)}.htm`);
     if (!fs_1.default.existsSync(file))
         return '';
-    // Classic Outlook signatures are saved as windows-1252, not UTF-8; decode by
-    // the charset the file declares so accented text / smart quotes survive.
-    const buf = fs_1.default.readFileSync(file);
-    const head = buf.toString('latin1', 0, 2048);
-    const charset = head.match(/charset=["']?([\w-]+)/i)?.[1] || 'utf-8';
+    // Signatures are saved in whatever charset Outlook chose (often
+    // windows-1252), so decode by the one the file declares.
+    const bytes = fs_1.default.readFileSync(file);
+    const charset = bytes.toString('latin1', 0, 2048).match(/charset=["']?([\w-]+)/i)?.[1] || 'utf-8';
     let html;
     try {
-        html = new TextDecoder(charset).decode(buf);
+        html = new TextDecoder(charset).decode(bytes);
     }
     catch {
-        html = buf.toString('utf-8');
+        html = bytes.toString('utf8');
     }
-    // pathToFileURL encodes spaces/specials the same way Outlook's relative refs
-    // are, so prefixing the (already relative, already-encoded) src keeps a valid URI.
-    const dirUri = (0, url_1.pathToFileURL)(SIGNATURES_DIR + path_1.default.sep).href;
-    html = html.replace(/(src|background)=(["'])(?!https?:|cid:|data:|file:|mailto:|#)/gi, `$1=$2${dirUri}`);
-    return html;
+    // pathToFileURL encodes the directory the way Outlook's relative refs are
+    // already encoded, so prefixing it keeps each reference a valid URI.
+    const dirUri = (0, url_1.pathToFileURL)(dir + path_1.default.sep).href;
+    return html.replace(/(src|background)=(["'])(?!https?:|cid:|data:|file:|mailto:|#)/gi, `$1=$2${dirUri}`);
 }
 //# sourceMappingURL=signatures.js.map

package/dist/windows/signatures.js.map

@@ -1 +1 @@
-{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/windows/signatures.ts"],"names":[],"mappings":";;;;;AAgBA,sDAUC;AASD,4DA0BC;AA7DD,sEAAsE;AACtE,6EAA6E;AAC7E,uDAAuD;AACvD,4CAAoB;AACpB,gDAAwB;AACxB,6BAAoC;AAEpC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO;IACtC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC;IAC3D,CAAC,CAAC,EAAE,CAAC;AAET;;;;GAIG;AACI,KAAK,UAAU,qBAAqB;IACvC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAC/D,IAAI,CAAC;QACD,OAAO,YAAE,CAAC,WAAW,CAAC,cAAc,CAAC;aAChC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,wBAAwB,CAAC,IAAY;IACvD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,cAAc;QAAE,OAAO,EAAE,CAAC;IAC/D,6EAA6E;IAC7E,gCAAgC;IAChC,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;IACtD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,GAAG,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;IACrE,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACD,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACL,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IACD,6EAA6E;IAC7E,mFAAmF;IACnF,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,cAAc,GAAG,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IAC7D,IAAI,GAAG,IAAI,CAAC,OAAO,CACf,iEAAiE,EACjE,QAAQ,MAAM,EAAE,CACnB,CAAC;IACF,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"signatures.js","sourceRoot":"","sources":["../../src/windows/signatures.ts"],"names":[],"mappings":";;;;;AAYA,sDAWC;AAOD,4DAqBC;AAnDD,6EAA6E;AAC7E,sDAAsD;AACtD,0EAA0E;AAC1E,4CAAoB;AACpB,gDAAwB;AACxB,6BAAoC;AAEpC,SAAS,aAAa;IAClB,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAChG,CAAC;AAED,uDAAuD;AAChD,KAAK,UAAU,qBAAqB;IACvC,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,IAAI,CAAC;QACD,OAAO,YAAE,CAAC,WAAW,CAAC,GAAG,CAAC;aACrB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aACnD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aAC1C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,wBAAwB,CAAC,IAAY;IACvD,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,0EAA0E;IAC1E,yBAAyB;IACzB,MAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,cAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,gEAAgE;IAChE,yDAAyD;IACzD,MAAM,KAAK,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC;IAClG,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACD,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACL,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IACD,0EAA0E;IAC1E,qEAAqE;IACrE,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,GAAG,GAAG,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IAClD,OAAO,IAAI,CAAC,OAAO,CAAC,iEAAiE,EAAE,QAAQ,MAAM,EAAE,CAAC,CAAC;AAC7G,CAAC","sourcesContent":["// Outlook for Windows keeps each signature as \"<name>.htm\" (beside .rtf/.txt\n// copies and a \"<name>_files\" folder of images) under\n// %APPDATA%\\Microsoft\\Signatures, so these read the disk rather than COM.\nimport fs from 'fs';\nimport path from 'path';\nimport { pathToFileURL } from 'url';\n\nfunction signaturesDir(): string {\n    return process.env.APPDATA ? path.join(process.env.APPDATA, 'Microsoft', 'Signatures') : '';\n}\n\n/** The signature names — the \".htm\" files — sorted. */\nexport async function listOutlookSignatures(): Promise<string[]> {\n    const dir = signaturesDir();\n    if (!dir) return [];\n    try {\n        return fs.readdirSync(dir)\n            .filter(file => file.toLowerCase().endsWith('.htm'))\n            .map(file => file.slice(0, -'.htm'.length))\n            .sort((a, b) => a.localeCompare(b));\n    } catch {\n        return [];\n    }\n}\n\n/**\n * A signature's HTML with its image references made absolute file: URIs, so an\n * email body built from it resolves and embeds the images; '' when there is no\n * signature by that name.\n */\nexport async function readOutlookSignatureHtml(name: string): Promise<string> {\n    const dir = signaturesDir();\n    if (!dir) return '';\n    // A bare name only — never a path — so a crafted name can't reach outside\n    // the Signatures folder.\n    const file = path.join(dir, `${path.basename(name)}.htm`);\n    if (!fs.existsSync(file)) return '';\n    // Signatures are saved in whatever charset Outlook chose (often\n    // windows-1252), so decode by the one the file declares.\n    const bytes = fs.readFileSync(file);\n    const charset = bytes.toString('latin1', 0, 2048).match(/charset=[\"']?([\\w-]+)/i)?.[1] || 'utf-8';\n    let html: string;\n    try {\n        html = new TextDecoder(charset).decode(bytes);\n    } catch {\n        html = bytes.toString('utf8');\n    }\n    // pathToFileURL encodes the directory the way Outlook's relative refs are\n    // already encoded, so prefixing it keeps each reference a valid URI.\n    const dirUri = pathToFileURL(dir + path.sep).href;\n    return html.replace(/(src|background)=([\"'])(?!https?:|cid:|data:|file:|mailto:|#)/gi, `$1=$2${dirUri}`);\n}\n"]}

package/dist/windows/templates.d.ts

@@ -1,25 +1,19 @@
+import type { EditTemplateRequest, ReadTemplatesRequest, SaveTemplateRequest } from '../backend';
 import type { SaveTemplateResult, TemplateFolderResult } from '../types';
 /**
- * Read the template emails saved in a mailbox folder (default "Templates"),
- * returning each item's full HTML body. When the folder doesn't exist, returns
- * folderFound:false plus the mailbox's folder names instead of throwing, so the
- * caller can ask the user whether to create it rather than fail.
+ * The template emails in a mailbox folder, newest first. A missing folder is
+ * reported as folderFound:false with the mailbox's top-level folder names
+ * rather than thrown, so a caller can offer to create it.
  */
-export declare function readTemplateEmails(emailAccount: string, folderName?: string, limit?: number, includeBody?: boolean, subject?: string): Promise<TemplateFolderResult>;
+export declare function readTemplateEmails(request: ReadTemplatesRequest): Promise<TemplateFolderResult>;
 /**
- * Save a new template email into a mailbox folder (default "Templates"),
- * creating the folder at the mailbox root if it doesn't exist. The item is a
- * plain unsent mail (subject + HTML body) that can be edited in Outlook.
- * Never overwrites an existing item — it always adds a new one, so check with
- * readTemplateEmails first and only call after the user has agreed to create it.
+ * Save a new template email into a folder, creating the folder at the mailbox
+ * root when absent. Always adds a new item — never overwrites one.
  */
-export declare function saveTemplateEmail(emailAccount: string, subject: string, htmlBody: string, folderName?: string): Promise<SaveTemplateResult>;
+export declare function saveTemplateEmail(request: SaveTemplateRequest): Promise<SaveTemplateResult>;
 /**
- * Open an Outlook compose window pre-filled with `currentHtml`, wait for the
- * user to close it, and return the HTML they saved.
- *
- * Deliberately unbounded: the run lasts as long as the person is editing. Give
- * it an AbortSignal (`bridge.withOptions({ signal })`) if the caller needs a way
- * to give up on them.
+ * Open a compose window pre-filled with the HTML, wait for it to close, and
+ * return what was saved (Ctrl+S) — or, failing a save, the body as it last
+ * stood while the window was open. Leftover editor drafts are removed.
  */
-export declare function editEmailTemplate(label: string, currentHtml: string): Promise<string>;
+export declare function editEmailTemplate(request: EditTemplateRequest): Promise<string>;