@remit/smtp-worker 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/smtp-worker",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -11,12 +11,16 @@
     "./data-ports": {
       "types": "./src/data-ports.ts",
       "default": "./src/data-ports.ts"
+    },
+    "./process": {
+      "types": "./src/process.ts",
+      "default": "./src/process.ts"
     }
   },
   "scripts": {
     "bundle": "node build.mjs",
     "test:typecheck": "tsgo --noEmit",
-    "test:run": "node $NODE_TEST_FLAGS --env-file=../../localhost-test-unit.env --experimental-test-module-mocks --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/**/*.test.tsx' --test-coverage-exclude='src/handlers/send-message.ts' --test-coverage-lines=83 --test 'src/**/*.test.ts'",
+    "test:run": "node $NODE_TEST_FLAGS --env-file=../../localhost-test-unit.env --experimental-test-module-mocks --experimental-test-coverage --test-coverage-include='src/**' --test-coverage-exclude='src/**/*.test.ts' --test-coverage-exclude='src/**/*.test.tsx' --test-coverage-exclude='src/lambda-context.ts' --test-coverage-lines=83 --test 'src/**/*.test.ts'",
     "test": "npm run test:typecheck && npm run test:run",
     "dev": "node --import tsx src/e2e-processor-shim.ts"
   },

package/src/data-ports.ts

@@ -1,24 +1,6 @@
-import type {
-	IAccountRepository,
-	IAddressRepository,
-	IEnvelopeRepository,
-	IMessageRepository,
-	IOutboxAttachmentRepository,
-	IOutboxMessageRepository,
-} from "@remit/data-ports";
+import type { SmtpDataPorts } from "./ports.js";
 
-/**
- * The repositories the SMTP send path reads and writes. One neutral seam so the
- * same handler serves every stack.
- */
-export interface SmtpDataPorts {
-	account: IAccountRepository;
-	outboxMessage: IOutboxMessageRepository;
-	outboxAttachment: IOutboxAttachmentRepository;
-	address: IAddressRepository;
-	message: IMessageRepository;
-	envelope: IEnvelopeRepository;
-}
+export type { SmtpDataPorts } from "./ports.js";
 
 // `@remit/drizzle-service` is loaded lazily, inside this function, instead of as
 // a static top-level import. A static import is bundled (and evaluated at module
@@ -29,6 +11,7 @@ export interface SmtpDataPorts {
 // installed.
 const buildSqliteDataPorts = async (): Promise<SmtpDataPorts> => {
 	const {
+		BETTER_SQLITE3_LIMITS,
 		createSqliteRepositories,
 		openSqliteDatabases,
 		sqliteDatabasePathsFromEnv,
@@ -36,6 +19,7 @@ const buildSqliteDataPorts = async (): Promise<SmtpDataPorts> => {
 
 	const repositories = createSqliteRepositories(
 		await openSqliteDatabases(sqliteDatabasePathsFromEnv()),
+		BETTER_SQLITE3_LIMITS,
 	);
 
 	return {

package/src/events.ts

@@ -15,3 +15,8 @@ export interface ProcessOutboxEvent extends BaseEvent {
 }
 
 export type SmtpEvent = SendMessageEvent | ProcessOutboxEvent;
+
+export interface AppendSentMessageEvent extends BaseEvent {
+	type: "APPEND_SENT_MESSAGE";
+	outboxMessageId: string;
+}

package/src/failure-kind.ts

@@ -1,4 +1,4 @@
-import type { MailFailureKind } from "@remit/logger-lambda/metrics";
+import type { MailFailureKind } from "@remit/logger";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
 import { SmtpConnectionError } from "@remit/smtp-service";
 

package/src/handlers/attachment-storage.test.ts

@@ -1,11 +1,7 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
-import type { OutboxAttachmentItem } from "@remit/data-ports";
 import { createMockStorageService } from "@remit/storage-service";
-import {
-	createAttachmentLoader,
-	createAttachmentReader,
-} from "./attachment-storage.js";
+import { createAttachmentReader } from "./attachment-storage.js";
 
 describe("createAttachmentReader", () => {
 	it("refuses to read on a Lambda with no bucket, naming the missing setting", () => {
@@ -51,56 +47,3 @@ describe("createAttachmentReader", () => {
 		assert.equal(created, 1);
 	});
 });
-
-describe("createAttachmentLoader", () => {
-	it("reads the draft's stored files for the tenant it is given", async () => {
-		const storage = createMockStorageService();
-		await storage.storeOutboxAttachment({
-			accountConfigId: "cfg",
-			accountId: "acc",
-			outboxMessageId: "ob",
-			outboxAttachmentId: "att",
-			content: Buffer.from("%PDF"),
-		});
-		const row: OutboxAttachmentItem = {
-			outboxAttachmentId: "att",
-			outboxMessageId: "ob",
-			accountId: "acc",
-			accountConfigId: "cfg",
-			filename: "report.pdf",
-			contentType: "application/pdf",
-			sizeBytes: 4,
-			state: "Stored",
-			storageKey: "k",
-			reservationExpiresAt: 0,
-			createdAt: 0,
-			updatedAt: 0,
-		};
-		const asked: string[][] = [];
-		const load = createAttachmentLoader(
-			storage,
-			async () => ({
-				listByOutboxMessage: async (accountConfigId, outboxMessageId) => {
-					asked.push([accountConfigId, outboxMessageId]);
-					return [row];
-				},
-			}),
-			() => 1_000_000,
-		);
-
-		const files = await load(
-			{ accountConfigId: "cfg", accountId: "acc" },
-			"ob",
-		);
-
-		assert.deepEqual(asked, [["cfg", "ob"]]);
-		assert.deepEqual(
-			files.map((file) => [
-				file.filename,
-				file.contentType,
-				String(file.content),
-			]),
-			[["report.pdf", "application/pdf", "%PDF"]],
-		);
-	});
-});

package/src/handlers/attachment-storage.ts

@@ -1,8 +1,4 @@
-import type { IOutboxAttachmentRepository } from "@remit/data-ports";
-import { loadOutboxAttachmentContents } from "@remit/mailbox-service/outbox-attachment-content";
-import type { MailAttachment } from "@remit/smtp-service";
 import type { StorageService } from "@remit/storage-service";
-import type { SendTenant } from "./send-message-core.js";
 
 export type AttachmentReader = Pick<StorageService, "retrieveOutboxAttachment">;
 
@@ -31,22 +27,3 @@ export const createAttachmentReader = (
 		},
 	};
 };
-
-/** The files a message goes out with, read from this worker's ports and storage. */
-export const createAttachmentLoader =
-	(
-		reader: AttachmentReader,
-		getRepository: () => Promise<
-			Pick<IOutboxAttachmentRepository, "listByOutboxMessage">
-		>,
-		now: () => number = Date.now,
-	) =>
-	async (
-		tenant: SendTenant,
-		outboxMessageId: string,
-	): Promise<MailAttachment[]> =>
-		loadOutboxAttachmentContents(
-			{ attachments: await getRepository(), storage: reader },
-			{ ...tenant, outboxMessageId },
-			Math.floor(now() / 1000),
-		);

package/src/handlers/engagement-counters.test.ts

@@ -0,0 +1,108 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import type { MessageItem, OutboxMessageItem } from "@remit/data-ports";
+import { noopLogger } from "@remit/logger";
+import {
+	type EngagementCounterDeps,
+	writeEngagementCounters,
+} from "./engagement-counters.js";
+
+const tenant = { accountConfigId: "cfg-1", accountId: "acc-1" };
+
+const reply = (overrides: Partial<OutboxMessageItem>): OutboxMessageItem =>
+	({
+		outboxMessageId: "obx-1",
+		accountId: "acc-1",
+		accountConfigId: "cfg-1",
+		fromAddress: "alice@example.com",
+		toAddresses: ["bob@example.com"],
+		messageIdValue: "msg-1@example.com",
+		status: "sent",
+		createdAt: 0,
+		updatedAt: 0,
+		...overrides,
+	}) as OutboxMessageItem;
+
+const parent = { messageId: "msg-parent" } as MessageItem;
+
+const recordingDeps = (
+	parentSender: string,
+): { deps: EngagementCounterDeps; replies: string[]; lookups: string[] } => {
+	const replies: string[] = [];
+	const lookups: string[] = [];
+	return {
+		replies,
+		lookups,
+		deps: {
+			resolveAddressId: (accountConfigId, email) =>
+				`addr-${accountConfigId}-${email}`,
+			incrementOutboundCount: async () => {},
+			incrementReplyCount: async (_accountConfigId, addressId) => {
+				replies.push(addressId);
+			},
+			findMessageByHeader: async (accountId) => {
+				lookups.push(accountId);
+				return parent;
+			},
+			getEnvelopeFromEmail: async () => parentSender,
+		},
+	};
+};
+
+describe("writeEngagementCounters reply targets", () => {
+	it("increments replyCount when In-Reply-To resolves to a recipient", async () => {
+		const { deps, replies } = recordingDeps("bob@example.com");
+
+		await writeEngagementCounters(
+			reply({ inReplyTo: "parent-msg@example.com" }),
+			tenant,
+			deps,
+			noopLogger,
+		);
+
+		assert.deepEqual(replies, ["addr-cfg-1-bob@example.com"]);
+	});
+
+	it("does not increment replyCount when the resolved sender is not a recipient", async () => {
+		const { deps, replies } = recordingDeps("stranger@example.com");
+
+		await writeEngagementCounters(
+			reply({ inReplyTo: "parent-msg@example.com" }),
+			tenant,
+			deps,
+			noopLogger,
+		);
+
+		assert.deepEqual(replies, []);
+	});
+
+	it("collapses duplicate replyCount increments via the resolved Address", async () => {
+		const { deps, replies } = recordingDeps("bob@example.com");
+
+		await writeEngagementCounters(
+			reply({
+				inReplyTo: "parent-msg@example.com",
+				references: ["root-msg@example.com", "parent-msg@example.com"],
+			}),
+			tenant,
+			deps,
+			noopLogger,
+		);
+
+		assert.equal(replies.length, 1);
+	});
+
+	it("looks the parent up by accountId, never by accountConfigId", async () => {
+		const { deps, lookups } = recordingDeps("bob@example.com");
+
+		await writeEngagementCounters(
+			reply({ inReplyTo: "parent-msg@example.com" }),
+			tenant,
+			deps,
+			noopLogger,
+		);
+
+		assert.ok(lookups.length > 0);
+		assert.ok(lookups.every((id) => id === "acc-1"));
+	});
+});

package/src/handlers/engagement-counters.ts

@@ -1,7 +1,31 @@
-import type { OutboxMessageItem } from "@remit/data-ports";
+import type { MessageItem, OutboxMessageItem } from "@remit/data-ports";
 import { bareMessageId, wireMessageId } from "@remit/data-ports/id";
 import type { Logger } from "@remit/logger";
-import type { EngagementCounterDeps, SendTenant } from "./send-message-core.js";
+
+/** Tenant scope carried from the loaded account, never read off a looked-up row. */
+export interface SendTenant {
+	accountConfigId: string;
+	accountId: string;
+}
+
+export interface EngagementCounterDeps {
+	resolveAddressId: (accountConfigId: string, email: string) => string;
+	incrementOutboundCount: (
+		accountConfigId: string,
+		addressId: string,
+		now: number,
+	) => Promise<void>;
+	incrementReplyCount: (
+		accountConfigId: string,
+		addressId: string,
+		now: number,
+	) => Promise<void>;
+	findMessageByHeader: (
+		accountId: string,
+		messageIdHeader: string,
+	) => Promise<MessageItem | null>;
+	getEnvelopeFromEmail: (messageId: string) => Promise<string | null>;
+}
 
 /**
  * Engagement counters for an outbound send.
@@ -65,7 +89,7 @@ const normalizeEmail = (raw: string): string | null => {
 	const trimmed = raw.trim();
 	if (trimmed === "") return null;
 	const angle = trimmed.match(/<([^>]+)>/);
-	const candidate = angle ? angle[1] : trimmed;
+	const candidate = angle?.[1] ?? trimmed;
 	if (!candidate.includes("@")) return null;
 	return candidate.toLowerCase();
 };

package/src/handlers/resolve-smtp-config.ts

@@ -3,7 +3,7 @@ import {
 	deserializeEncryptedPayload,
 	type SecretsService,
 } from "@remit/secrets-service";
-import type { SmtpConfig } from "@remit/smtp-service";
+import type { SmtpServerConfig } from "@remit/smtp-service";
 
 export interface SmtpConfigMissing {
 	ok: false;
@@ -12,7 +12,7 @@ export interface SmtpConfigMissing {
 
 export interface SmtpConfigResolved {
 	ok: true;
-	config: SmtpConfig;
+	config: SmtpServerConfig;
 }
 
 export type ResolvedSmtpConfig = SmtpConfigResolved | SmtpConfigMissing;