@remit/smtp-worker 0.0.27 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/smtp-worker",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -16,11 +16,12 @@
   "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-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/handlers/send-message.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"
   },
   "dependencies": {
+    "@remit/logger": "*",
     "@remit/data-ports": "*",
     "@remit/drizzle-service": "*",
     "@remit/logger-lambda": "*",
@@ -31,9 +32,9 @@
     "@remit/domain-enums": "*",
     "@remit/mail-oauth-service": "*",
     "@remit/mailbox-service": "*",
-    "@aws-sdk/client-sqs": "*",
-    "expect-env": "*",
-    "@types/aws-lambda": "*"
+    "@aws-sdk/client-sqs": "^3.1090.0",
+    "expect-env": "^1.0.1",
+    "@types/aws-lambda": "^8.10.162"
   },
   "devDependencies": {
     "esbuild": "^0.28.1"

package/src/data-ports.ts

@@ -26,33 +26,25 @@ export interface SmtpDataPorts {
 // marked `external` for the Lambda esbuild build (LAMBDA_ESBUILD_OPTIONS), so
 // esbuild leaves this `import()` unresolved in the bundle. It resolves only
 // where the relational composition actually runs, which has the package
-// installed. Mirrors the search-index-worker data-ports seam.
+// installed.
 const buildSqliteDataPorts = async (): Promise<SmtpDataPorts> => {
-	const sqliteDbPath = process.env.SQLITE_DB_PATH;
-	if (!sqliteDbPath) throw new Error("SQLITE_DB_PATH is required");
-
 	const {
-		AccountRepo,
-		AddressRepo,
-		createSqliteDatabase,
-		DrizzleEnvelopeRepository,
-		DrizzleMessageRepository,
-		messageDataSchema,
-		OutboxAttachmentRepo,
-		OutboxMessageRepo,
+		createSqliteRepositories,
+		openSqliteDatabases,
+		sqliteDatabasePathsFromEnv,
 	} = await import("@remit/drizzle-service");
 
-	const { db } = await createSqliteDatabase(messageDataSchema, {
-		filename: sqliteDbPath,
-	});
+	const repositories = createSqliteRepositories(
+		await openSqliteDatabases(sqliteDatabasePathsFromEnv()),
+	);
 
 	return {
-		account: new AccountRepo(db),
-		outboxMessage: new OutboxMessageRepo(db),
-		outboxAttachment: new OutboxAttachmentRepo(db),
-		address: new AddressRepo(db),
-		message: new DrizzleMessageRepository(db),
-		envelope: new DrizzleEnvelopeRepository(db),
+		account: repositories.account,
+		outboxMessage: repositories.outboxMessage,
+		outboxAttachment: repositories.outboxAttachment,
+		address: repositories.address,
+		message: repositories.message,
+		envelope: repositories.envelope,
 	};
 };
 
@@ -71,12 +63,12 @@ export const setSmtpDataPorts = (ports: SmtpDataPorts): void => {
 /**
  * The SMTP data ports for this process: the ones a composition root registered,
  * or — for a process that registered none — the SQLite composition this build
- * contains. `SQLITE_DB_PATH` is that composition's precondition, not a backend
+ * contains. `SQLITE_APP_DB_PATH` is that composition's precondition, not a backend
  * selection.
  */
 export const buildDataPortsFromEnv = async (): Promise<SmtpDataPorts> => {
 	if (injectedDataPorts) return injectedDataPorts;
-	if (process.env.SQLITE_DB_PATH) return buildSqliteDataPorts();
+	if (process.env.SQLITE_APP_DB_PATH) return buildSqliteDataPorts();
 	throw new Error(
 		"no SMTP data ports registered — register them with setSmtpDataPorts() from your composition root",
 	);

package/src/e2e-processor-shim.ts

@@ -4,12 +4,15 @@ import {
 	DeleteMessageCommand,
 	ReceiveMessageCommand,
 } from "@aws-sdk/client-sqs";
-import { createLogger } from "@remit/logger-lambda";
-import { createQueueProducer } from "@remit/sqs-client/producer";
+import { createLogger } from "@remit/logger";
+import { installNodeLogger } from "@remit/logger-lambda/node";
+import { createSqsClient } from "@remit/sqs-client/producer";
 import type { Context, SQSBatchResponse, SQSEvent } from "aws-lambda";
 import { env } from "expect-env";
 import { handler } from "./index.js";
 
+installNodeLogger();
+
 /**
  * E2E-only queue drainer.
  *
@@ -31,7 +34,7 @@ const queueUrl = env.SQS_QUEUE_URL_SMTP;
 const queueName = new URL(queueUrl).pathname.split("/").pop();
 const log = createLogger().child({ queue: queueName });
 
-const sqs = createQueueProducer({ queueUrl });
+const sqs = createSqsClient({ queueUrl });
 
 const maxMessages = 10;
 

package/src/failure-kind.ts

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

package/src/handlers/engagement-counters.ts

@@ -1,5 +1,6 @@
 import type { OutboxMessageItem } from "@remit/data-ports";
-import type { Logger } from "@remit/logger-lambda";
+import { bareMessageId, wireMessageId } from "@remit/data-ports/id";
+import type { Logger } from "@remit/logger";
 import type { EngagementCounterDeps, SendTenant } from "./send-message-core.js";
 
 /**
@@ -119,8 +120,7 @@ const collectReferenceHeaders = (outbox: OutboxMessageItem): string[] => {
 	return result;
 };
 
-const headerVariants = (header: string): string[] => {
-	const stripped = header.replace(/^<|>$/g, "");
-	if (stripped === header) return [`<${header}>`, header];
-	return [header, stripped];
-};
+const headerVariants = (header: string): string[] => [
+	wireMessageId(header),
+	bareMessageId(header),
+];

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

@@ -5,7 +5,8 @@ import type {
 	UpdateOutboxMessageInput,
 } from "@remit/data-ports";
 import { AccountAuthType, OutboxMessageStatus } from "@remit/domain-enums";
-import { type Logger, recordSmtpFailure } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
+import { recordSmtpFailure } from "@remit/logger-lambda/metrics";
 import { RefreshTokenError } from "@remit/mail-oauth-service";
 import type { CredentialResolution } from "@remit/mailbox-service/account-credentials";
 import { OutboxAttachmentUnavailableError } from "@remit/mailbox-service/outbox-attachment-content";

package/src/handlers/send-message.ts

@@ -1,8 +1,7 @@
 import { randomUUID } from "node:crypto";
-import { SendMessageCommand } from "@aws-sdk/client-sqs";
 import { deriveAddressId, deriveMessageId } from "@remit/data-ports/id";
 import type { ConnectionState } from "@remit/domain-enums";
-import type { Logger } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
 import {
 	createMailOAuthService,
 	microsoftProviderConfig,
@@ -15,10 +14,8 @@ import {
 	type AccountCredentialsDeps,
 	resolveConnectionCredentials,
 } from "@remit/mailbox-service/account-credentials";
-import {
-	createKmsDataKeyProvider,
-	createSecretsService,
-} from "@remit/secrets-service";
+import { createSecretsService } from "@remit/secrets-service";
+import { createKmsDataKeyProvider } from "@remit/secrets-service/kms";
 import { sendMail } from "@remit/smtp-service";
 import { createQueueProducer } from "@remit/sqs-client/producer";
 import { createStorageService } from "@remit/storage-service/s3";
@@ -67,29 +64,31 @@ const getTokenService = () => {
 
 // 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;
-const messageMgmtSqs = createQueueProducer({
-	queueUrl: messageMgmtQueueUrl,
+interface AppendSentMessageEvent {
+	type: "APPEND_SENT_MESSAGE";
+	accountId: string;
+	outboxMessageId: string;
+	eventId: string;
+	timestamp: number;
+}
+
+const messageMgmtQueue = createQueueProducer<AppendSentMessageEvent>({
+	queueUrl: env.SQS_QUEUE_URL_MESSAGE_MGMT,
 });
 
 const emitAppendSentMessage = async (
 	accountId: string,
 	outboxMessageId: string,
 ): Promise<void> => {
-	const event = {
-		type: "APPEND_SENT_MESSAGE" as const,
+	const event: AppendSentMessageEvent = {
+		type: "APPEND_SENT_MESSAGE",
 		accountId,
 		outboxMessageId,
 		eventId: randomUUID(),
 		timestamp: Date.now(),
 	};
 
-	await messageMgmtSqs.send(
-		new SendMessageCommand({
-			QueueUrl: messageMgmtQueueUrl,
-			MessageBody: JSON.stringify(event),
-		}),
-	);
+	await messageMgmtQueue.send({ body: event });
 };
 
 const findMessageByHeader = async (

package/src/index.ts

@@ -1,16 +1,18 @@
 import { inspect } from "node:util";
+import { createLogger } from "@remit/logger";
 import {
-	createLogger,
 	queueNameFromEventSource,
 	recordQueueEvent,
 	recordSmtpFailure,
-	withTelemetry,
-} from "@remit/logger-lambda";
+} from "@remit/logger-lambda/metrics";
+import { installNodeLogger, withTelemetry } from "@remit/logger-lambda/node";
 import type { SQSBatchResponse, SQSEvent } from "aws-lambda";
 import type { SmtpEvent } from "./events.js";
 import { smtpFailureKind } from "./failure-kind.js";
 import { processEvent } from "./processor.js";
 
+installNodeLogger();
+
 const log = createLogger();
 
 /**

package/src/poller.ts

@@ -1,8 +1,12 @@
-import { createLogger, startMetricsServer } from "@remit/logger-lambda";
+import { createLogger } from "@remit/logger";
+import { startMetricsServer } from "@remit/logger-lambda/metrics";
+import { installNodeLogger } from "@remit/logger-lambda/node";
 import { runQueuePoller } from "@remit/sqs-client/poller";
 import { env } from "expect-env";
 import { handler } from "./index.js";
 
+installNodeLogger();
+
 /** Production queue poller — the deployed form of `e2e-processor-shim.ts`. */
 const log = createLogger();
 

package/src/processor.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
 import type { SmtpEvent } from "./events.js";
 import { handleSendMessage } from "./handlers/send-message.js";