@freecorps/ember-email 0.5.8 → 0.5.9

package/README.md

@@ -60,6 +60,8 @@ export const signup = mutation({
     - a plus-addressed token (`support+t_…@`) still threads from any sender.
   - `replyToken: true` in the install config puts that token in the Reply-To of replies, composed emails and
     auto-replies, as before 0.5.4.
+  - Replies and auto-replies cite the Message-ID and References exactly as the sender wrote them (Gmail only groups a
+    reply in the conversation on an exact match); lookups ignore case.
   - It handles spam per sender per hour and auto-replies without loops.
   - Your `onInbound` hook runs in the same transaction (tickets, push).
 - **Inbox queries** for dashboards and mobile apps: `threads`, `thread`, `unread` (aggregate), `search`

package/dist/address.d.ts

@@ -28,9 +28,13 @@ export declare function withPlus(email: string, tag: string): string;
 export declare function subjectKey(subject: string | undefined): string;
 /** "Hello" → "Re: Hello" (once). */
 export declare function replySubject(subject: string): string;
+/** A `Message-ID` value without the angle brackets, as written (the case kept: headers that cite it must match it). */
+export declare function bareMessageId(id: string | undefined | null): string | null;
 /** A `Message-ID` value without the angle brackets, lowercased (header lookups). */
 export declare function normalizeMessageId(id: string | undefined | null): string | null;
-/** All Message-IDs in a `References` / `In-Reply-To` header value. */
+/** All Message-IDs in a `References` / `In-Reply-To` header value, as written. */
+export declare function bareMessageIdList(h: string | undefined | null): string[];
+/** All Message-IDs in a `References` / `In-Reply-To` header value, lowercased (header lookups). */
 export declare function messageIdList(h: string | undefined | null): string[];
 /** Addresses that must never get an automatic reply. */
 export declare function isNoReplySender(email: string): boolean;

package/dist/address.js

@@ -93,27 +93,35 @@ export function subjectKey(subject) {
 export function replySubject(subject) {
     return /^\s*re\s*:/i.test(subject) ? subject : `Re: ${subject}`;
 }
-/** A `Message-ID` value without the angle brackets, lowercased (header lookups). */
-export function normalizeMessageId(id) {
+/** A `Message-ID` value without the angle brackets, as written (the case kept: headers that cite it must match it). */
+export function bareMessageId(id) {
     if (!id)
         return null;
     const m = /<([^<>]+)>/.exec(id);
     const v = (m ? m[1] : id).trim();
-    return v ? v.toLowerCase() : null;
+    return v || null;
 }
-/** All Message-IDs in a `References` / `In-Reply-To` header value. */
-export function messageIdList(h) {
+/** A `Message-ID` value without the angle brackets, lowercased (header lookups). */
+export function normalizeMessageId(id) {
+    return bareMessageId(id)?.toLowerCase() ?? null;
+}
+/** All Message-IDs in a `References` / `In-Reply-To` header value, as written. */
+export function bareMessageIdList(h) {
     if (!h)
         return [];
     const out = [];
     for (const m of h.matchAll(/<([^<>]+)>/g))
-        out.push(m[1].trim().toLowerCase());
+        out.push(m[1].trim());
     if (!out.length)
         for (const t of h.split(/\s+/))
             if (t.includes("@"))
-                out.push(t.toLowerCase());
+                out.push(t);
     return out;
 }
+/** All Message-IDs in a `References` / `In-Reply-To` header value, lowercased (header lookups). */
+export function messageIdList(h) {
+    return bareMessageIdList(h).map((x) => x.toLowerCase());
+}
 /** Addresses that must never get an automatic reply. */
 export function isNoReplySender(email) {
     const local = email.slice(0, email.lastIndexOf("@")).toLowerCase();

package/dist/component.d.ts

@@ -728,6 +728,8 @@ export declare const emailFunctions: {
                 html?: string;
                 truncated?: boolean;
                 inReplyTo?: string;
+                messageIdRaw?: string;
+                referencesRaw?: string[];
                 droppedAttachments?: number;
                 auth?: {
                     spf: string;
@@ -893,6 +895,8 @@ export declare const emailFunctions: {
                 html?: string;
                 truncated?: boolean;
                 inReplyTo?: string;
+                messageIdRaw?: string;
+                referencesRaw?: string[];
                 droppedAttachments?: number;
                 auth?: {
                     spf: string;
@@ -1557,6 +1561,8 @@ export declare const email: import("@freecorps/ember-server").ComponentDefinitio
                 html?: string;
                 truncated?: boolean;
                 inReplyTo?: string;
+                messageIdRaw?: string;
+                referencesRaw?: string[];
                 droppedAttachments?: number;
                 auth?: {
                     spf: string;
@@ -1722,6 +1728,8 @@ export declare const email: import("@freecorps/ember-server").ComponentDefinitio
                 html?: string;
                 truncated?: boolean;
                 inReplyTo?: string;
+                messageIdRaw?: string;
+                referencesRaw?: string[];
                 droppedAttachments?: number;
                 auth?: {
                     spf: string;

package/dist/component.js

@@ -20,7 +20,7 @@
  */
 import { componentBuilders, cronJobs, defineComponent, EmberError, v } from "@freecorps/ember-server";
 import { rateLimit } from "@freecorps/ember-rate-limit";
-import { domainOf, isNoReplySender, parseAddress, parseAddressList, replySubject, splitPlus, subjectKey, normalizeMessageId, withPlus, } from "./address.js";
+import { bareMessageId, domainOf, isNoReplySender, parseAddress, parseAddressList, replySubject, splitPlus, subjectKey, normalizeMessageId, withPlus, } from "./address.js";
 import { nextStatus, parseDeliveryEvent } from "./events.js";
 import { parseInbound, snippetOf } from "./mime.js";
 import { addressV, emailSchema, errorV } from "./schema.js";
@@ -486,6 +486,8 @@ function ingest(ctx, a) {
         });
         thread = ctx.db.get(id);
     }
+    // The Message-ID as written, when it is the same id as the lookup one.
+    const idRaw = a.messageId && a.messageIdRaw?.toLowerCase() === a.messageId ? a.messageIdRaw : undefined;
     const msgId = ctx.db.insert("messages", {
         threadId: thread._id,
         mailbox: a.mailbox,
@@ -493,6 +495,8 @@ function ingest(ctx, a) {
         ...(a.messageId ? { messageIdHeader: a.messageId } : {}),
         ...(a.inReplyTo ? { inReplyTo: a.inReplyTo } : {}),
         references: a.references.slice(-100),
+        ...(idRaw ? { messageIdRaw: idRaw } : {}),
+        ...(a.referencesRaw?.length ? { referencesRaw: a.referencesRaw.slice(-100) } : {}),
         from: a.from,
         fromEmail: a.from.email,
         to: a.to,
@@ -536,7 +540,7 @@ function ingest(ctx, a) {
                 subject: renderTemplateSafe(mb.autoReply.subject, data, false),
                 text,
                 html: mb.autoReply.html ? emailLayout(renderTemplateSafe(mb.autoReply.html, data, true)) : emailLayout(textToHtml(text)),
-                headers: { "Auto-Submitted": "auto-replied", ...(a.messageId ? { "In-Reply-To": `<${a.messageId}>`, References: `<${a.messageId}>` } : {}) },
+                headers: { "Auto-Submitted": "auto-replied", ...(a.messageId ? { "In-Reply-To": `<${idRaw ?? a.messageId}>`, References: `<${idRaw ?? a.messageId}>` } : {}) },
                 threadId: thread._id,
             }).id;
         }
@@ -569,6 +573,15 @@ function ingest(ctx, a) {
     }
     return { ...event, autoReplyId };
 }
+/** A message's Message-ID as its sender wrote it (the lowercased one for messages stored before 0.5.9). */
+function citedId(m) {
+    return m.messageIdRaw ?? m.messageIdHeader ?? null;
+}
+/** A message's References as written, when they were kept for every id (else the lowercased ones). */
+function citedRefs(m) {
+    const raw = m.referencesRaw;
+    return raw && raw.length === m.references.length && raw.every((r, i) => r.toLowerCase() === m.references[i]) ? raw : m.references;
+}
 function renderTemplateSafe(src, data, escape) {
     try {
         return renderTemplate(src, data, { escape });
@@ -796,7 +809,7 @@ export const emailFunctions = {
                             .filter((q) => q.eq(q.field("emailId"), a.emailId))
                             .first();
                         if (out && !out.messageIdHeader)
-                            ctx.db.patch(out._id, { messageIdHeader: mid });
+                            ctx.db.patch(out._id, { messageIdHeader: mid, messageIdRaw: bareMessageId(a.messageId) });
                     }
                     // Events can arrive before `finish` commits (the provider is fast): apply the ones already stored, exactly
                     // as `applyEvent` would have (status, suppression, onEvent hook).
@@ -1162,8 +1175,10 @@ export const emailFunctions = {
                     .order("desc")
                     .filter((q) => q.eq(q.field("direction"), "inbound"))
                     .first();
-                const refs = last?.messageIdHeader ? [...last.references.slice(-20), last.messageIdHeader] : [];
-                const headers = refs.length ? { "In-Reply-To": `<${last.messageIdHeader}>`, References: refs.map((r) => `<${r}>`).join(" ") } : {};
+                // Cited as written: Gmail threads a reply only when In-Reply-To / References match the Message-ID exactly.
+                const cited = last ? citedId(last) : null;
+                const refs = last && cited ? [...citedRefs(last).slice(-20), cited] : [];
+                const headers = refs.length ? { "In-Reply-To": `<${cited}>`, References: refs.map((r) => `<${r}>`).join(" ") } : {};
                 const quote = last ? `\n\n${new Date(last.at).toUTCString()}, ${last.from.name ?? last.from.email}:\n${last.text.split("\n").slice(0, 40).map((l) => `> ${l}`).join("\n")}` : "";
                 const html = a.html ?? emailLayout(textToHtml(a.text) + (last ? `<blockquote style="margin:16px 0 0 0;padding-left:12px;border-left:3px solid #dee2e6;color:#868e96">${textToHtml(last.text.split("\n").slice(0, 40).join("\n"))}</blockquote>` : ""));
                 const to = [{ email: thread.contact, ...(thread.contactName ? { name: thread.contactName } : {}) }];
@@ -1333,6 +1348,8 @@ async function onEmail(ctx, message) {
         ...(p.messageId ? { messageId: p.messageId } : {}),
         ...(p.inReplyTo ? { inReplyTo: p.inReplyTo } : {}),
         references: p.references,
+        ...(p.messageIdRaw ? { messageIdRaw: p.messageIdRaw } : {}),
+        ...(p.referencesRaw.length ? { referencesRaw: p.referencesRaw } : {}),
         from,
         ...(p.replyTo ? { replyTo: p.replyTo } : {}),
         to: p.to,

package/dist/mime.d.ts

@@ -17,6 +17,9 @@ export interface ParsedInbound {
     messageId: string | null;
     inReplyTo: string | null;
     references: string[];
+    /** The same Message-ID and References as written: replies cite these (Gmail compares them exactly). */
+    messageIdRaw: string | null;
+    referencesRaw: string[];
     from: EmailAddress | null;
     replyTo: EmailAddress | null;
     to: EmailAddress[];

package/dist/mime.js

@@ -3,7 +3,7 @@
 // header Cloudflare's MX adds (`Authentication-Results: mx.cloudflare.net; dkim=…; dmarc=…; spf=…`): only the
 // first such header is trusted, and only when its authserv-id is mx.cloudflare.net (the sender can add others).
 import PostalMime, {} from "postal-mime";
-import { messageIdList, normalizeMessageId } from "./address.js";
+import { bareMessageId, bareMessageIdList, messageIdList, normalizeMessageId } from "./address.js";
 import { htmlToText } from "./template.js";
 const flat = (list) => {
     const out = [];
@@ -92,6 +92,8 @@ export async function parseInbound(raw, limits = {}) {
         messageId: normalizeMessageId(email.messageId),
         inReplyTo: normalizeMessageId(email.inReplyTo),
         references: messageIdList(email.references),
+        messageIdRaw: bareMessageId(email.messageId),
+        referencesRaw: bareMessageIdList(email.references),
         from,
         replyTo: flat(email.replyTo)[0] ?? null,
         to: flat(email.to),

package/dist/schema.d.ts

@@ -228,9 +228,13 @@ export declare const emailSchema: import("@freecorps/ember-server").SchemaDefini
         mailbox: import("@freecorps/ember-values").Validator<string, "required", never>;
         /** inbound | outbound | note */
         direction: import("@freecorps/ember-values").Validator<string, "required", never>;
+        /** Message-ID, In-Reply-To and References lowercased, for lookups. */
         messageIdHeader: import("@freecorps/ember-values").Validator<string, "optional", never>;
         inReplyTo: import("@freecorps/ember-values").Validator<string, "optional", never>;
         references: import("@freecorps/ember-values").Validator<string[], "required", never>;
+        /** Message-ID and References as written, for the headers of a reply (absent on messages stored before 0.5.9). */
+        messageIdRaw: import("@freecorps/ember-values").Validator<string, "optional", never>;
+        referencesRaw: import("@freecorps/ember-values").Validator<string[], "optional", never>;
         from: import("@freecorps/ember-values").Validator<{
             email: string;
             name?: string;

package/dist/schema.js

@@ -143,9 +143,13 @@ export const emailSchema = defineSchema({
             mailbox: v.string(),
             /** inbound | outbound | note */
             direction: v.string(),
+            /** Message-ID, In-Reply-To and References lowercased, for lookups. */
             messageIdHeader: v.optional(v.string()),
             inReplyTo: v.optional(v.string()),
             references: v.array(v.string()),
+            /** Message-ID and References as written, for the headers of a reply (absent on messages stored before 0.5.9). */
+            messageIdRaw: v.optional(v.string()),
+            referencesRaw: v.optional(v.array(v.string())),
             from: addressV,
             fromEmail: v.string(),
             to: v.array(addressV),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freecorps/ember-email",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Email component for Ember on Cloudflare: send (atomic from mutations, scheduled, idempotent) through Email Service, templates, suppressions and per-project rate limits, delivery events from the Queue, inbound mail (Email Routing) parsed into mailboxes and threads. `@freecorps/ember-email/cloudflare` onboards a domain (sending, routing rules, event subscription) and removes it.",
   "keywords": [
     "ember",
@@ -52,9 +52,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@freecorps/ember-rate-limit": "0.5.8",
-    "@freecorps/ember-server": "0.5.8",
-    "@freecorps/ember-values": "0.5.8",
+    "@freecorps/ember-rate-limit": "0.5.9",
+    "@freecorps/ember-server": "0.5.9",
+    "@freecorps/ember-values": "0.5.9",
     "postal-mime": "^4.1.4"
   }
 }