@rndmjoker/proton-mcp 0.4.11 → 0.4.13

package/dist/mail/search.js

@@ -12,24 +12,115 @@
  *
  * Metadata queries are cheap by comparison: unread came back in 3 ms, a size
  * filter in 437 ms.
+ *
+ * Text is the exception to "the Bridge searches". Measured on 2026-11-02 and
+ * read in the source of gluon, its IMAP library: SUBJECT, FROM and TO compare
+ * against the header as it is stored, and a header with one letter outside
+ * ASCII is stored encoded, "Mit Anhang" as "Mit_Anhang", or in base64, where no
+ * word is legible at all. Up to 0.4.11 a subject search for "Mit Anhang" found
+ * nothing, and the answer read like a search without matches. So the Bridge
+ * now filters by everything but those three, and this server compares them
+ * against the envelope, which imapflow decodes. Full text stays with the
+ * Bridge, which compares the raw bytes; a word outside ASCII is also asked for
+ * in the form a quoted-printable part carries it, and a part sent as base64
+ * stays out of reach, which every answer says.
  */
 import { BridgeError } from '../bridge/errors.js';
-import { fetchDates, fetchHeaders, orderNewestFirst, MAX_LIST_LIMIT, withTrashMarks, } from './messages.js';
-/** Translates the criteria into what imapflow expects. */
-export function buildQuery(criteria) {
+import { searchUids } from './uid-search.js';
+import { fetchEnvelopes, fetchHeaders, orderNewestFirst, MAX_LIST_LIMIT, withTrashMarks, } from './messages.js';
+/**
+ * How many envelopes a search compares itself, at most.
+ *
+ * Without other criteria a subject search reads the envelope of every message
+ * in the mailbox. Reading one per hit is what the ordering has always cost, and
+ * a common word matched 6803 messages in a mailbox of 26816, but there has to
+ * be an end. Past it, the most recently added messages are compared and the
+ * answer says so; there is no silent cut.
+ */
+export const MAX_COMPARED = 20_000;
+/** Whether a byte sequence has anything outside ASCII. */
+const outsideAscii = (text) => /[^\x00-\x7f]/.test(text);
+/**
+ * A word as a quoted-printable part carries it: every byte of its UTF-8 form
+ * outside printable ASCII, and the equals sign, as =XX.
+ */
+export function quotedPrintable(text) {
+    let out = '';
+    for (const byte of Buffer.from(text.normalize('NFC'), 'utf8')) {
+        out +=
+            byte > 0x7e || byte < 0x20 || byte === 0x3d
+                ? `=${byte.toString(16).toUpperCase().padStart(2, '0')}`
+                : String.fromCharCode(byte);
+    }
+    return out;
+}
+/**
+ * The forms a full-text word is asked for in.
+ *
+ * The Bridge compares the raw bytes of a message, lower cased, so a word with a
+ * letter outside ASCII is found only where a part carries it unencoded. Most
+ * text with umlauts travels as quoted-printable, where a u with umlaut is the
+ * six characters "=C3=BC" and an a with umlaut "=C3=A4". Lower casing does not reach into
+ * that encoding, so the usual spellings of a word are each asked for: as given,
+ * in lower case, and capitalised. Forms that differ only in the case of ASCII
+ * letters are asked once, since the Bridge lower cases both sides. A word
+ * broken across a line by the encoding is still missed, and so is anything in
+ * base64.
+ */
+export function textForms(term) {
+    if (!outsideAscii(term))
+        return [term];
+    const lower = term.toLowerCase();
+    const capitalised = lower.charAt(0).toUpperCase() + lower.slice(1);
+    const forms = new Map([[term.toLowerCase(), term]]);
+    for (const spelling of [term, lower, capitalised]) {
+        const form = quotedPrintable(spelling);
+        if (!forms.has(form.toLowerCase()))
+            forms.set(form.toLowerCase(), form);
+    }
+    return [...forms.values()];
+}
+/** Folded for comparison: one Unicode form, lower case. */
+const fold = (text) => text.normalize('NFC').toLowerCase();
+/** How an address reads in a header, which is what FROM and TO used to match. */
+const shown = (a) => (a.name ? `${a.name} <${a.address}>` : a.address);
+/** Whether a message passes what this server compares itself. */
+export function matchesLocally(entry, local) {
+    if (local.subject !== undefined && !fold(entry.subject).includes(fold(local.subject)))
+        return false;
+    if (local.from !== undefined && !entry.from.some((a) => fold(shown(a)).includes(fold(local.from ?? '')))) {
+        return false;
+    }
+    if (local.to !== undefined && !entry.to.some((a) => fold(shown(a)).includes(fold(local.to ?? '')))) {
+        return false;
+    }
+    return true;
+}
+/**
+ * Splits the criteria into what the Bridge is asked and what this server
+ * compares itself.
+ */
+export function planSearch(criteria) {
     // Typed as what it is rather than built loosely and cast at the end. The cast
     // was how `since` survived: a field name imapflow does not know is silently
     // an ignored criterion, so the search returns too much and nothing complains.
     // With the real type a wrong name is a compile error.
     const query = {};
-    if (criteria.text)
-        query.text = criteria.text;
+    const local = {};
+    if (criteria.text) {
+        const forms = textForms(criteria.text);
+        if (forms.length === 1)
+            query.text = criteria.text;
+        else
+            query.or = forms.map((form) => ({ text: form }));
+    }
+    // Compared here rather than by the Bridge, see the top of this file.
     if (criteria.subject)
-        query.header = { subject: criteria.subject };
+        local.subject = criteria.subject;
     if (criteria.from)
-        query.from = criteria.from;
+        local.from = criteria.from;
     if (criteria.to)
-        query.to = criteria.to;
+        local.to = criteria.to;
     // sentSince and sentBefore, not since and before. Those two are IMAP SINCE
     // and BEFORE, which compare INTERNALDATE, the moment the server received the
     // message. Everything this server shows and sorts by comes from the envelope,
@@ -50,11 +141,16 @@ export function buildQuery(criteria) {
         query.larger = criteria.largerThan;
     // An empty query would match everything, which is list_messages rather than
     // a search. Saying so is better than silently returning the whole mailbox.
-    if (Object.keys(query).length === 0) {
+    const comparedHere = Object.keys(local).length > 0;
+    if (Object.keys(query).length === 0 && !comparedHere) {
         throw new BridgeError('A search needs at least one criterion. Pass text, subject, from, to, since, before, ' +
             'unread, starred or largerThan. To see everything in a mailbox use list_messages instead.');
     }
-    return query;
+    // Only the comparison here narrows it down, so the Bridge hands over every
+    // message and this server reads their envelopes.
+    if (Object.keys(query).length === 0)
+        query.all = true;
+    return { query, local };
 }
 /** Whether a query contains the expensive full-text part. */
 export function isFullText(criteria) {
@@ -71,15 +167,15 @@ export async function searchMessages(connection, path, options) {
     const limit = Math.min(Math.max(rawLimit ?? 25, 1), MAX_LIST_LIMIT);
     const offset = Math.max(rawOffset ?? 0, 0);
     // Built before opening the mailbox, so an empty query fails fast.
-    const query = buildQuery(criteria);
+    const { query, local } = planSearch(criteria);
+    const comparedHere = Object.keys(local).length > 0;
+    const fullText = isFullText(criteria);
+    const encodedForms = Boolean(criteria.text) && textForms(criteria.text ?? '').length > 1;
     const started = process.hrtime.bigint();
     const uids = await connection.withMailbox(path, async (client, status) => {
         if (status.messages === 0)
             return [];
-        const hits = await client.search(query, { uid: true });
-        // imapflow answers with false rather than an empty array when a search
-        // yields nothing, and `?? []` would let that through.
-        return Array.isArray(hits) ? hits : [];
+        return searchUids(client, query, `messages in "${path}"`);
     });
     const elapsedMs = Math.round(Number(process.hrtime.bigint() - started) / 1e6);
     if (uids.length === 0) {
@@ -90,17 +186,30 @@ export async function searchMessages(connection, path, options) {
             headers: [],
             elapsedMs,
             ordering: { messages: 0, elapsedMs: 0 },
-            fullText: isFullText(criteria),
+            fullText,
+            encodedForms,
         };
     }
-    // Ordering reads the date of every hit, because a page can only be cut out of
-    // a list that is already in order. Only the dates: the full header fetch below
-    // still covers one page, which is what keeps this affordable. A common word
-    // matched 6803 messages in the measured mailbox.
+    // Past the limit the most recently added are compared: the highest uids. The
+    // answer says so, see MAX_COMPARED.
+    let candidates = uids;
+    let compared;
+    if (comparedHere && uids.length > MAX_COMPARED) {
+        candidates = [...uids].sort((a, b) => b - a).slice(0, MAX_COMPARED);
+        compared = { compared: MAX_COMPARED, of: uids.length };
+    }
+    // Ordering reads the envelope of every candidate, because a page can only be
+    // cut out of a list that is already in order. The same read carries the
+    // subject, sender and recipients compared here. Only the envelopes: the full
+    // header fetch below still covers one page, which is what keeps this
+    // affordable. A common word matched 6803 messages in the measured mailbox.
     const orderStarted = process.hrtime.bigint();
-    const ordered = await connection.withMailbox(path, async (client) => orderNewestFirst(await fetchDates(client, uids)));
+    const ordered = await connection.withMailbox(path, async (client) => {
+        const entries = await fetchEnvelopes(client, candidates);
+        return orderNewestFirst(comparedHere ? entries.filter((entry) => matchesLocally(entry, local)) : entries);
+    });
     const ordering = {
-        messages: uids.length,
+        messages: candidates.length,
         elapsedMs: Math.round(Number(process.hrtime.bigint() - orderStarted) / 1e6),
     };
     const page = ordered.slice(offset, offset + limit);
@@ -113,7 +222,9 @@ export async function searchMessages(connection, path, options) {
         headers,
         elapsedMs,
         ordering,
-        fullText: isFullText(criteria),
+        fullText,
+        encodedForms,
+        ...(compared ? { compared } : {}),
     });
 }
 //# sourceMappingURL=search.js.map

package/dist/mail/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/mail/search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/mail/search.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EACL,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,cAAc,GAIf,MAAM,eAAe,CAAA;AAEtB;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAA;AAgElC,0DAA0D;AAC1D,MAAM,YAAY,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAEzE;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC;QAC9D,GAAG;YACD,IAAI,GAAG,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,IAAI,KAAK,IAAI;gBACzC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;gBACxD,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACtC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;IAChC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAiB,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IACnE,KAAK,MAAM,QAAQ,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAA;QACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAA;IACzE,CAAC;IACD,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;AAC5B,CAAC;AAED,2DAA2D;AAC3D,MAAM,IAAI,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;AAE1E,iFAAiF;AACjF,MAAM,KAAK,GAAG,CAAC,CAAqC,EAAU,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;AAElH,iEAAiE;AACjE,MAAM,UAAU,cAAc,CAAC,KAAoB,EAAE,KAAiB;IACpE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAAE,OAAO,KAAK,CAAA;IACnG,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzG,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,KAAK,CAAC,EAAE,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnG,OAAO,KAAK,CAAA;IACd,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,QAAwB;IACjD,8EAA8E;IAC9E,4EAA4E;IAC5E,8EAA8E;IAC9E,sDAAsD;IACtD,MAAM,KAAK,GAAiB,EAAE,CAAA;IAC9B,MAAM,KAAK,GAAe,EAAE,CAAA;IAE5B,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;;YAC7C,KAAK,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IACvD,CAAC;IACD,qEAAqE;IACrE,IAAI,QAAQ,CAAC,OAAO;QAAE,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IACtD,IAAI,QAAQ,CAAC,IAAI;QAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC7C,IAAI,QAAQ,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAA;IACvC,2EAA2E;IAC3E,6EAA6E;IAC7E,8EAA8E;IAC9E,sEAAsE;IACtE,6EAA6E;IAC7E,2EAA2E;IAC3E,6EAA6E;IAC7E,mCAAmC;IACnC,IAAI,QAAQ,CAAC,KAAK;QAAE,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAA;IACpD,IAAI,QAAQ,CAAC,MAAM;QAAE,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAA;IACvD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC3D,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS;QAAE,KAAK,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IACpE,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS;QAAE,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAA;IAEzE,4EAA4E;IAC5E,2EAA2E;IAC3E,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IAClD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACrD,MAAM,IAAI,WAAW,CACnB,sFAAsF;YACpF,0FAA0F,CAC7F,CAAA;IACH,CAAC;IACD,2EAA2E;IAC3E,iDAAiD;IACjD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,KAAK,CAAC,GAAG,GAAG,IAAI,CAAA;IAErD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,UAAU,CAAC,QAAwB;IACjD,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;AAC/B,CAAC;AAOD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAsB,EACtB,IAAY,EACZ,OAAsB;IAEtB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAA;IACnE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1C,kEAAkE;IAClE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IAClD,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA;IACrC,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;IAExF,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;IAEvC,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAqB,EAAE;QAC1F,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QACpC,OAAO,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,gBAAgB,IAAI,GAAG,CAAC,CAAA;IAC3D,CAAC,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,GAAG,CAAC,CAAA;IAE7E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,CAAC;YACR,MAAM;YACN,OAAO,EAAE,EAAE;YACX,SAAS;YACT,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;YACvC,QAAQ;YACR,YAAY;SACb,CAAA;IACH,CAAC;IAED,6EAA6E;IAC7E,oCAAoC;IACpC,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,IAAI,QAAkC,CAAA;IACtC,IAAI,YAAY,IAAI,IAAI,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC;QAC/C,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;QACnE,QAAQ,GAAG,EAAE,QAAQ,EAAE,YAAY,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAA;IACxD,CAAC;IAED,6EAA6E;IAC7E,wEAAwE;IACxE,6EAA6E;IAC7E,qEAAqE;IACrE,2EAA2E;IAC3E,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;IAC5C,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAClE,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QACxD,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAC3G,CAAC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAiB;QAC7B,QAAQ,EAAE,UAAU,CAAC,MAAM;QAC3B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,YAAY,CAAC,GAAG,GAAG,CAAC;KAC5E,CAAA;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAA;IAElD,mEAAmE;IACnE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;IAE1F,OAAO,cAAc,CAAC,UAAU,EAAE;QAChC,IAAI;QACJ,KAAK,EAAE,OAAO,CAAC,MAAM;QACrB,MAAM;QACN,OAAO;QACP,SAAS;QACT,QAAQ;QACR,QAAQ;QACR,YAAY;QACZ,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,CAAC,CAAA;AACJ,CAAC"}

package/dist/mail/send.js

@@ -40,8 +40,8 @@
  * envelope is stated separately below.
  */
 import { createTransport } from 'nodemailer';
-import { BridgeError } from '../bridge/errors.js';
-import { ensurePinned } from '../bridge/certificate.js';
+import { BridgeError, explainError, isConnectionFailure } from '../bridge/errors.js';
+import { certificateChanged, pinFor } from '../bridge/certificate.js';
 import { buildMessage, allRecipients } from './compose.js';
 /**
  * Opens an authenticated SMTP connection to the Bridge.
@@ -49,12 +49,7 @@ import { buildMessage, allRecipients } from './compose.js';
  * Built per send rather than held open. Sending is rare, and a connection that
  * sits idle holding the Bridge password is a worse trade than a handshake.
  */
-async function transport(config, credentials) {
-    // The pin is recorded against the IMAP port because that is where the first
-    // connection happens. Measured to be the same certificate on the SMTP port,
-    // so this is the material to verify against; a difference fails the
-    // handshake rather than being waved through.
-    const pinned = await ensurePinned(config.host, config.imapPort);
+function transport(config, credentials, pinned) {
     return createTransport({
         host: config.host,
         port: config.smtpPort,
@@ -104,7 +99,17 @@ export async function sendMessage(config, getCredentials, readOnly, draft) {
     // Built without the blind copies in the headers. They travel in the envelope
     // below, where the other recipients never see them.
     const raw = await buildMessage(draft, { keepBcc: false });
-    const mailer = await transport(config, credentials);
+    // The pin is recorded against the IMAP port because that is where the first
+    // connection happens. Measured to be the same certificate on the SMTP port,
+    // so this is the material to verify against; a difference fails the
+    // handshake rather than being waved through.
+    //
+    // On first use reading it is the first thing that reaches the Bridge, so a
+    // Bridge that is not running fails here, before the try below.
+    const pinned = await pinFor(config.host, config.imapPort).catch((error) => {
+        throw error instanceof BridgeError ? error : explainError(error, config.host, config.imapPort);
+    });
+    const mailer = transport(config, credentials, pinned);
     try {
         const info = await mailer.sendMail({
             // The bytes, not the fields: what was confirmed is what goes out.
@@ -122,6 +127,16 @@ export async function sendMessage(config, getCredentials, readOnly, draft) {
         };
     }
     catch (error) {
+        // A certificate other than the pinned one fails the handshake before AUTH,
+        // and from here that looks like any other failure. Only now is a probe
+        // worth it.
+        const changed = await certificateChanged(config.host, config.imapPort, pinned);
+        if (changed)
+            throw changed;
+        // With a pin there is no probe in front of the send any more, so a Bridge
+        // that is not running is first noticed here, and is explained the same way.
+        if (isConnectionFailure(error))
+            throw explainError(error, config.host, config.smtpPort);
         throw new BridgeError(`The Bridge did not accept the message: ${error.message}. ` +
             'Nothing was sent, and it can be sent again once the Bridge is reachable.', 'unreachable', { cause: error });
     }

package/dist/mail/send.js.map

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

package/dist/mail/uid-search.d.ts

@@ -0,0 +1,17 @@
+/**
+ * A UID SEARCH that tells a failure apart from an empty result.
+ *
+ * imapflow answers a search that matched nothing with an empty array, and a
+ * search that failed with `false`: it catches the error, logs it and returns.
+ * The logger is switched off here, so `false` is all that arrives. Read as
+ * "nothing matched", a failed search makes a mailbox look empty and a message
+ * look as though it did not exist, and the assistant goes on to act on an
+ * answer that never came.
+ */
+import type { ImapFlow, SearchObject } from 'imapflow';
+/**
+ * Runs the search and returns the matching UIDs, or throws when it failed.
+ *
+ * `what` names what was being looked for, so the refusal can say it.
+ */
+export declare function searchUids(client: ImapFlow, query: SearchObject, what: string): Promise<number[]>;

package/dist/mail/uid-search.js

@@ -0,0 +1,25 @@
+/**
+ * A UID SEARCH that tells a failure apart from an empty result.
+ *
+ * imapflow answers a search that matched nothing with an empty array, and a
+ * search that failed with `false`: it catches the error, logs it and returns.
+ * The logger is switched off here, so `false` is all that arrives. Read as
+ * "nothing matched", a failed search makes a mailbox look empty and a message
+ * look as though it did not exist, and the assistant goes on to act on an
+ * answer that never came.
+ */
+import { BridgeError } from '../bridge/errors.js';
+/**
+ * Runs the search and returns the matching UIDs, or throws when it failed.
+ *
+ * `what` names what was being looked for, so the refusal can say it.
+ */
+export async function searchUids(client, query, what) {
+    const hits = await client.search(query, { uid: true });
+    if (Array.isArray(hits))
+        return hits;
+    throw new BridgeError(`The search for ${what} failed, so this says nothing about which messages match: it is not ` +
+        'an empty result. The Bridge gave no reason. Try again, and if it fails again, check that ' +
+        'the Bridge is running and unlocked.');
+}
+//# sourceMappingURL=uid-search.js.map

package/dist/mail/uid-search.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uid-search.js","sourceRoot":"","sources":["../../src/mail/uid-search.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAgB,EAChB,KAAmB,EACnB,IAAY;IAEZ,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAA;IACpC,MAAM,IAAI,WAAW,CACnB,kBAAkB,IAAI,sEAAsE;QAC1F,2FAA2F;QAC3F,qCAAqC,CACxC,CAAA;AACH,CAAC"}

package/dist/mime/filenames.d.ts

@@ -0,0 +1,24 @@
+/**
+ * File names taken from a message, made safe to hand on.
+ *
+ * A name in a message was chosen by whoever wrote it. It ends up as the name of
+ * an attachment this server builds, and with save_attachment as a name on this
+ * machine's disk, so the same rule serves both.
+ *
+ * Letters and digits of every script stay. An attachment name may carry them
+ * (RFC 2231), and a name with underscores where its umlauts were helps nobody:
+ * up to 0.4.11 a forwarded original named after a German subject lost every
+ * one of them. Everything else becomes an underscore: path separators, the
+ * characters Windows forbids in a name, control characters, and formatting
+ * characters such as U+202E, which can make "txt.exe" read as "exe.txt".
+ */
+/**
+ * Reduces a name to a plain file name.
+ *
+ * Never empty and never a path: the result has no separator, does not start
+ * with a dot and is not a device name on Windows. `fallback` is used when
+ * nothing usable is left, and has to be plain itself.
+ */
+export declare function plainFileName(name: string, fallback: string, maxLength?: number): string;
+/** The name a forwarded original travels under, built from its subject. */
+export declare function forwardedFileName(subject: string | undefined): string;

package/dist/mime/filenames.js

@@ -0,0 +1,58 @@
+/**
+ * File names taken from a message, made safe to hand on.
+ *
+ * A name in a message was chosen by whoever wrote it. It ends up as the name of
+ * an attachment this server builds, and with save_attachment as a name on this
+ * machine's disk, so the same rule serves both.
+ *
+ * Letters and digits of every script stay. An attachment name may carry them
+ * (RFC 2231), and a name with underscores where its umlauts were helps nobody:
+ * up to 0.4.11 a forwarded original named after a German subject lost every
+ * one of them. Everything else becomes an underscore: path separators, the
+ * characters Windows forbids in a name, control characters, and formatting
+ * characters such as U+202E, which can make "txt.exe" read as "exe.txt".
+ */
+/** Everything that is not a letter, a mark, a digit or one of a few separators. */
+const OUTSIDE_PLAIN = /[^\p{L}\p{M}\p{N} ._()-]/gu;
+/** Names Windows reserves for devices, with or without an extension. */
+const RESERVED = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(\..*)?$/i;
+/** An extension worth keeping when a name has to be shortened. */
+const EXTENSION = /\.[\p{L}\p{N}]{1,10}$/u;
+/** Drops the dots and spaces Windows strips without asking, and hidden-file dots. */
+const trimEdges = (name) => name.replace(/^[. ]+/, '').replace(/[. ]+$/, '');
+/**
+ * Shortens to a number of characters, not UTF-16 units, so a letter outside the
+ * basic plane is never cut in half. The extension survives when there is one.
+ */
+function shorten(name, maxLength) {
+    const chars = Array.from(name);
+    if (chars.length <= maxLength)
+        return name;
+    const extension = EXTENSION.exec(name)?.[0] ?? '';
+    const extensionChars = Array.from(extension);
+    const base = chars.slice(0, chars.length - extensionChars.length);
+    const room = maxLength - extensionChars.length;
+    // Cutting can leave a dot or a space at the new end, which trimEdges would
+    // have removed had it been there before.
+    return trimEdges(base.slice(0, Math.max(room, 1)).join('')) + extension;
+}
+/**
+ * Reduces a name to a plain file name.
+ *
+ * Never empty and never a path: the result has no separator, does not start
+ * with a dot and is not a device name on Windows. `fallback` is used when
+ * nothing usable is left, and has to be plain itself.
+ */
+export function plainFileName(name, fallback, maxLength = 100) {
+    let result = trimEdges(name.normalize('NFC').replace(OUTSIDE_PLAIN, '_'));
+    if (!result)
+        result = fallback;
+    if (RESERVED.test(result))
+        result = `_${result}`;
+    return shorten(result, maxLength);
+}
+/** The name a forwarded original travels under, built from its subject. */
+export function forwardedFileName(subject) {
+    return `${plainFileName(subject ?? '', 'message', 60)}.eml`;
+}
+//# sourceMappingURL=filenames.js.map

package/dist/mime/filenames.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"filenames.js","sourceRoot":"","sources":["../../src/mime/filenames.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,mFAAmF;AACnF,MAAM,aAAa,GAAG,4BAA4B,CAAA;AAElD,wEAAwE;AACxE,MAAM,QAAQ,GAAG,+CAA+C,CAAA;AAEhE,kEAAkE;AAClE,MAAM,SAAS,GAAG,wBAAwB,CAAA;AAE1C,qFAAqF;AACrF,MAAM,SAAS,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AAE5F;;;GAGG;AACH,SAAS,OAAO,CAAC,IAAY,EAAE,SAAiB;IAC9C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC9B,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS;QAAE,OAAO,IAAI,CAAA;IAE1C,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACjD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IACjE,MAAM,IAAI,GAAG,SAAS,GAAG,cAAc,CAAC,MAAM,CAAA;IAC9C,2EAA2E;IAC3E,yCAAyC;IACzC,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAA;AACzE,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,QAAgB,EAAE,SAAS,GAAG,GAAG;IAC3E,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,CAAA;IACzE,IAAI,CAAC,MAAM;QAAE,MAAM,GAAG,QAAQ,CAAA;IAC9B,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;IAChD,OAAO,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;AACnC,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,iBAAiB,CAAC,OAA2B;IAC3D,OAAO,GAAG,aAAa,CAAC,OAAO,IAAI,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,MAAM,CAAA;AAC7D,CAAC"}

package/dist/mime/parts.d.ts

@@ -0,0 +1,34 @@
+/**
+ * The parts of a stored message, read so that they can be built into a message
+ * again unchanged.
+ *
+ * mailparser is the wrong tool for this, measured with mailparser 3.14.1. It
+ * descends into a forwarded original (message/rfc822) and writes it into the
+ * body as a table of its headers, so the original disappears from the
+ * attachments and turns up as markup nobody wrote. And it rewrites every cid:
+ * image into a data: address, which the markup check refuses at every level. A
+ * stored draft read back that way could not be sent as it was stored.
+ *
+ * mailsplit, the splitter mailparser itself is built on, keeps a forwarded
+ * original as one part when asked to and hands out the bytes of every part.
+ * The body here is the first text/plain and the first text/html part that is
+ * not an attachment; everything else is a file, carried along as it was.
+ */
+/** A file inside a stored message, with its content. */
+export interface CarriedFile {
+    filename: string;
+    contentType: string;
+    content: Buffer;
+    /** Set when the markup refers to the file by cid. */
+    contentId?: string;
+}
+export interface StoredParts {
+    /** The plain text body, when there is one. */
+    text?: string;
+    /** The markup body, with its cid: references as they were. */
+    html?: string;
+    /** Every other part, in the order the message carries them. */
+    files: CarriedFile[];
+}
+/** Reads a stored message into its body and the files it carries. */
+export declare function readParts(source: Buffer): Promise<StoredParts>;

package/dist/mime/parts.js

@@ -0,0 +1,92 @@
+/**
+ * The parts of a stored message, read so that they can be built into a message
+ * again unchanged.
+ *
+ * mailparser is the wrong tool for this, measured with mailparser 3.14.1. It
+ * descends into a forwarded original (message/rfc822) and writes it into the
+ * body as a table of its headers, so the original disappears from the
+ * attachments and turns up as markup nobody wrote. And it rewrites every cid:
+ * image into a data: address, which the markup check refuses at every level. A
+ * stored draft read back that way could not be sent as it was stored.
+ *
+ * mailsplit, the splitter mailparser itself is built on, keeps a forwarded
+ * original as one part when asked to and hands out the bytes of every part.
+ * The body here is the first text/plain and the first text/html part that is
+ * not an attachment; everything else is a file, carried along as it was.
+ */
+import { Splitter } from '@zone-eu/mailsplit';
+import libmime from 'libmime';
+import { isProtonPublicKey } from './parse.js';
+/** Runs bytes through a stream and collects what comes out. */
+async function through(stream, chunks) {
+    const out = [];
+    const done = (async () => {
+        for await (const chunk of stream)
+            out.push(Buffer.from(chunk));
+    })();
+    for (const chunk of chunks)
+        stream.write(chunk);
+    stream.end();
+    await done;
+    return Buffer.concat(out);
+}
+async function asText(node, decoded) {
+    const text = (await through(libmime.createDecodeStream(node.charset || 'utf-8'), [decoded])).toString('utf8');
+    return node.flowed ? libmime.decodeFlowed(text, node.delSp) : text;
+}
+/** Splits the message into its nodes, each with the raw bytes of its body. */
+async function split(source) {
+    // ignoreEmbedded keeps a forwarded original as one part instead of
+    // descending into it, which is the whole reason this module exists.
+    const splitter = new Splitter({ ignoreEmbedded: true });
+    const nodes = [];
+    let current;
+    const done = (async () => {
+        for await (const chunk of splitter) {
+            if (chunk.type === 'node') {
+                current = { node: chunk, body: [] };
+                nodes.push(current);
+            }
+            else if (chunk.type === 'body' && current && chunk.value) {
+                current.body.push(Buffer.from(chunk.value));
+            }
+        }
+    })();
+    splitter.end(source);
+    await done;
+    return nodes;
+}
+/** Reads a stored message into its body and the files it carries. */
+export async function readParts(source) {
+    const parts = { files: [] };
+    for (const { node, body } of await split(source)) {
+        // A multipart node is only a container; its children follow as nodes.
+        if (node.multipart)
+            continue;
+        const contentType = (node.contentType || 'text/plain').toLowerCase();
+        const decoded = await through(node.getDecoder(), body);
+        const isBody = node.disposition !== 'attachment' &&
+            !node.filename &&
+            (contentType === 'text/plain' || contentType === 'text/html');
+        if (isBody && contentType === 'text/html' && parts.html === undefined) {
+            parts.html = await asText(node, decoded);
+            continue;
+        }
+        if (isBody && contentType === 'text/plain' && parts.text === undefined) {
+            parts.text = await asText(node, decoded);
+            continue;
+        }
+        const filename = node.filename || `part-${parts.files.length + 1}`;
+        // Proton attaches its own key to whatever it sends, so a key carried over
+        // from a stored draft would go out twice.
+        if (isProtonPublicKey(contentType, filename))
+            continue;
+        const id = node.headers ? node.headers.getFirst('content-id').trim() : '';
+        const file = { filename, contentType, content: decoded };
+        if (id)
+            file.contentId = id.replace(/^<|>$/g, '');
+        parts.files.push(file);
+    }
+    return parts;
+}
+//# sourceMappingURL=parts.js.map

package/dist/mime/parts.js.map

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