@remit/smtp-worker 0.0.1 → 0.0.2

package/package.json

@@ -1,40 +1,50 @@
 {
-	"name": "@remit/smtp-worker",
-	"version": "0.0.1",
-	"type": "module",
-	"main": "dist/index.js",
-	"scripts": {
-		"bundle": "node build.mjs",
-		"test:typecheck": "tsgo --noEmit",
-		"test:run": "node --env-file=../../localhost-test-unit.env --test 'src/**/*.test.ts'",
-		"test": "npm run test:typecheck && npm run test:run"
-	},
-	"devDependencies": {
-		"@aws-sdk/client-sqs": "*",
-		"@aws-sdk/core": "*",
-		"@remit/data-ports": "*",
-		"@remit/drizzle-service": "*",
-		"@remit/domain-enums": "*",
-		"@remit/logger-lambda": "*",
-		"@remit/mail-oauth-service": "*",
-		"@remit/mailbox-service": "*",
-		"@remit/secrets-service": "*",
-		"@remit/smtp-service": "*",
-		"@remit/sqs-client": "*",
-		"@remit/storage-service": "*",
-		"@types/aws-lambda": "*",
-		"@types/pg": "^8.0.0",
-		"esbuild": "^0.27.7",
-		"expect-env": "*",
-		"p-map": "*"
-	},
-	"license": "MIT",
-	"publishConfig": {
-		"access": "public"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/remit-mail/remit.git",
-		"directory": "packages/smtp-worker"
-	}
+  "name": "@remit/smtp-worker",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
+    },
+    "./data-ports": {
+      "types": "./src/data-ports.ts",
+      "default": "./src/data-ports.ts"
+    }
+  },
+  "scripts": {
+    "bundle": "node build.mjs",
+    "test:typecheck": "tsgo --noEmit",
+    "test:run": "node --env-file=../../localhost-test-unit.env --test 'src/**/*.test.ts'",
+    "test": "npm run test:typecheck && npm run test:run"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-sqs": "*",
+    "@aws-sdk/core": "*",
+    "@remit/data-ports": "*",
+    "@remit/drizzle-service": "*",
+    "@remit/domain-enums": "*",
+    "@remit/logger-lambda": "*",
+    "@remit/mail-oauth-service": "*",
+    "@remit/mailbox-service": "*",
+    "@remit/secrets-service": "*",
+    "@remit/smtp-service": "*",
+    "@remit/sqs-client": "*",
+    "@remit/storage-service": "*",
+    "@types/aws-lambda": "*",
+    "@types/pg": "^8.0.0",
+    "esbuild": "^0.27.7",
+    "expect-env": "*",
+    "p-map": "*"
+  },
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/remit-mail/remit.git",
+    "directory": "packages/smtp-worker"
+  }
 }

package/src/data-ports.ts

@@ -96,31 +96,33 @@ const buildSqliteDataPorts = async (): Promise<SmtpDataPorts> => {
 	};
 };
 
+let injectedDataPorts: SmtpDataPorts | null = null;
+
+/**
+ * Register the DynamoDB-backed SMTP data ports from the composition root. The
+ * DynamoDB composition lives outside this shared, open-core module and is never
+ * imported here. The relational backends compose in-package below and never
+ * touch this seam.
+ */
+export const setSmtpDataPorts = (ports: SmtpDataPorts): void => {
+	injectedDataPorts = ports;
+};
+
 /**
  * Select the SMTP data ports from the environment, mirroring the other workers'
  * `DATA_BACKEND` selection:
  *
  * - `DATA_BACKEND=postgres` → Drizzle repos over `PG_CONNECTION_URL`.
  * - `DATA_BACKEND=sqlite` → Drizzle repos over the shared `SQLITE_DB_PATH` file.
- * - otherwise → ElectroDB services over `DYNAMODB_TABLE_NAME` (the AWS path,
- *   unchanged from the pre-convergence worker).
- *
- * The DynamoDB branch loads its composition through a dynamic `import()`, so the
- * sole importer of the closed `@remit/remit-electrodb-service`
- * (`./compose-dynamodb.js`) is never loaded on the relational (open-core) tree,
- * where that module is not shipped. esbuild still bundles it into the Lambda
- * because the specifier is a relative import, not an `external`.
+ * - otherwise → the DynamoDB ElectroDB ports the composition root injected.
  */
 export const buildDataPortsFromEnv = async (): Promise<SmtpDataPorts> => {
 	if (process.env.DATA_BACKEND === "postgres") return buildPostgresDataPorts();
 	if (process.env.DATA_BACKEND === "sqlite") return buildSqliteDataPorts();
-	// `as string` stops tsgo resolving the module in the open-core tree, which
-	// strips it; the named contract keeps the call site typed rather than `any`.
-	type ComposeDynamoDBModule = {
-		buildDynamoDBDataPorts: () => SmtpDataPorts;
-	};
-	const { buildDynamoDBDataPorts } = (await import(
-		"./compose-dynamodb.js" as string
-	)) as ComposeDynamoDBModule;
-	return buildDynamoDBDataPorts();
+	if (!injectedDataPorts) {
+		throw new Error(
+			"no DynamoDB SMTP data ports registered — register them with setSmtpDataPorts() from your composition root",
+		);
+	}
+	return injectedDataPorts;
 };

package/src/handlers/send-message.test.ts

@@ -11,7 +11,10 @@ import {
 	type EncryptedPayload,
 	serializeEncryptedPayload,
 } from "@remit/secrets-service";
-import { type SendResult, SmtpConnectionError } from "@remit/smtp-service";
+import {
+	type SendResult,
+	SmtpConnectionError,
+} from "@remit/smtp-service";
 import type { SendMessageEvent } from "../events.js";
 import { type SendMessageDeps, sendMessage } from "./send-message-core.js";
 

package/src/handlers/send-message.ts

@@ -23,11 +23,19 @@ import {
 import { sendMail } from "@remit/smtp-service";
 import { resolveSqsCredentials } from "@remit/sqs-client";
 import { env } from "expect-env";
-import { buildDataPortsFromEnv } from "../data-ports.js";
+import { buildDataPortsFromEnv, type SmtpDataPorts } from "../data-ports.js";
 import type { SendMessageEvent } from "../events.js";
 import { sendMessage } from "./send-message-core.js";
 
-const ports = await buildDataPortsFromEnv();
+// The data ports are resolved lazily and cached, not at module load: the
+// DynamoDB backend is injected by the composition root before the first send,
+// so building at import time would race the registration.
+let portsPromise: Promise<SmtpDataPorts> | null = null;
+const getPorts = (): Promise<SmtpDataPorts> => {
+	if (!portsPromise) portsPromise = buildDataPortsFromEnv();
+	return portsPromise;
+};
+
 const dataKeyProvider = createKmsDataKeyProvider(env.KMS_KEY_ID);
 const secrets = createSecretsService(dataKeyProvider);
 
@@ -48,12 +56,6 @@ const getTokenService = () => {
 	return _tokenService;
 };
 
-const accountService = ports.account;
-const outboxService = ports.outboxMessage;
-const addressService = ports.address;
-const messageService = ports.message;
-const envelopeService = ports.envelope;
-
 // APPEND_SENT_MESSAGE is processed by the IMAP worker via the
 // message-management queue (see remit-imap-worker/src/emit.ts).
 const messageMgmtQueueUrl = env.SQS_QUEUE_URL_MESSAGE_MGMT;
@@ -90,7 +92,8 @@ const findMessageByHeader = async (
 	messageIdHeader: string,
 ) => {
 	const messageId = deriveMessageId(accountId, messageIdHeader);
-	return messageService.get(messageId).catch((error: unknown) => {
+	const { message } = await getPorts();
+	return message.get(messageId).catch((error: unknown) => {
 		if ((error as { name?: string })?.name === "NotFoundError") return null;
 		throw error;
 	});
@@ -99,7 +102,8 @@ const findMessageByHeader = async (
 const getEnvelopeFromEmail = async (
 	messageId: string,
 ): Promise<string | null> => {
-	const data = await envelopeService
+	const { envelope } = await getPorts();
+	const data = await envelope
 		.getMessageData(messageId)
 		.catch((error: unknown) => {
 			if ((error as { name?: string })?.name === "NotFoundError") return null;
@@ -122,7 +126,8 @@ const buildCredentialDeps = (): AccountCredentialsDeps => ({
 	secrets,
 	tokenService: getTokenService(),
 	persistRotatedToken: async (accountId, encryptedHash, updatedAt) => {
-		await accountService.update(accountId, {
+		const { account } = await getPorts();
+		await account.update(accountId, {
 			oauthRefreshTokenHash: encryptedHash,
 			oauthTokenUpdatedAt: updatedAt,
 		});
@@ -135,19 +140,25 @@ export const handleSendMessage = (
 ): Promise<void> => {
 	const credentialDeps = buildCredentialDeps();
 	return sendMessage(event, log, {
-		getOutbox: (accountConfigId, id) => outboxService.get(accountConfigId, id),
-		getAccount: (id) => accountService.get(id),
-		updateOutbox: (accountConfigId, id, patch) =>
-			outboxService.update(accountConfigId, id, patch),
-		updateOutboxStatus: (accountConfigId, id, status) =>
-			outboxService.updateStatus(accountConfigId, id, status),
-		markOutboxSent: (accountConfigId, id, fields) =>
-			outboxService.markSent(accountConfigId, id, fields),
+		getOutbox: async (accountConfigId, id) =>
+			(await getPorts()).outboxMessage.get(accountConfigId, id),
+		getAccount: async (id) => (await getPorts()).account.get(id),
+		updateOutbox: async (accountConfigId, id, patch) =>
+			(await getPorts()).outboxMessage.update(accountConfigId, id, patch),
+		updateOutboxStatus: async (accountConfigId, id, status) =>
+			(await getPorts()).outboxMessage.updateStatus(
+				accountConfigId,
+				id,
+				status,
+			),
+		markOutboxSent: async (accountConfigId, id, fields) =>
+			(await getPorts()).outboxMessage.markSent(accountConfigId, id, fields),
 		secrets,
 		resolveCredentials: (account) =>
 			resolveConnectionCredentials(account, credentialDeps),
 		updateConnectionState: async (id, state) => {
-			await accountService.update(id, {
+			const { account } = await getPorts();
+			await account.update(id, {
 				connectionState:
 					state as (typeof ConnectionState)[keyof typeof ConnectionState],
 			});
@@ -156,10 +167,18 @@ export const handleSendMessage = (
 		emitAppendSentMessage,
 		engagement: {
 			resolveAddressId: deriveAddressId,
-			incrementOutboundCount: (accountConfigId, addressId, now) =>
-				addressService.incrementOutboundCount(accountConfigId, addressId, now),
-			incrementReplyCount: (accountConfigId, addressId, now) =>
-				addressService.incrementReplyCount(accountConfigId, addressId, now),
+			incrementOutboundCount: async (accountConfigId, addressId, now) =>
+				(await getPorts()).address.incrementOutboundCount(
+					accountConfigId,
+					addressId,
+					now,
+				),
+			incrementReplyCount: async (accountConfigId, addressId, now) =>
+				(await getPorts()).address.incrementReplyCount(
+					accountConfigId,
+					addressId,
+					now,
+				),
 			findMessageByHeader,
 			getEnvelopeFromEmail,
 		},