@remit/smtp-worker 0.0.28 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/smtp-worker",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -32,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/e2e-processor-shim.ts

@@ -6,7 +6,7 @@ import {
 } from "@aws-sdk/client-sqs";
 import { createLogger } from "@remit/logger";
 import { installNodeLogger } from "@remit/logger-lambda/node";
-import { createQueueProducer } from "@remit/sqs-client/producer";
+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";
@@ -34,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/handlers/send-message.ts

@@ -1,5 +1,4 @@
 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";
@@ -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 (