@remit/imap-worker 0.0.2 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/imap-worker",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -27,15 +27,6 @@
     "@aws-sdk/client-sqs": "*",
     "@aws-sdk/client-ssm": "*",
     "@aws-sdk/core": "*",
-    "@remit/backend": "*",
-    "@remit/data-ports": "*",
-    "@remit/domain-enums": "*",
-    "@remit/logger-lambda": "*",
-    "@remit/mail-oauth-service": "*",
-    "@remit/mailbox-service": "*",
-    "@remit/search-index-worker": "*",
-    "@remit/secrets-service": "*",
-    "@remit/sqs-client": "*",
     "@remit/storage-service": "*",
     "@types/aws-lambda": "*",
     "@types/nodemailer": "*",
@@ -46,7 +37,16 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.1055.0",
-    "nodemailer": "^9.0.3"
+    "nodemailer": "^9.0.3",
+    "@remit/data-ports": "*",
+    "@remit/logger-lambda": "*",
+    "@remit/mailbox-service": "*",
+    "@remit/search-index-worker": "*",
+    "@remit/sqs-client": "*",
+    "@remit/backend": "*",
+    "@remit/domain-enums": "*",
+    "@remit/mail-oauth-service": "*",
+    "@remit/secrets-service": "*"
   },
   "license": "MIT",
   "publishConfig": {

package/src/e2e-processor-shim.ts

@@ -3,12 +3,10 @@ import cluster from "node:cluster";
 import {
 	DeleteMessageCommand,
 	ReceiveMessageCommand,
-	SQSClient,
 } from "@aws-sdk/client-sqs";
-import { AwsQueryProtocol } from "@aws-sdk/core/protocols";
 import { createLogger } from "@remit/logger-lambda";
 import { handler as searchIndexHandler } from "@remit/search-index-worker";
-import { resolveSqsCredentials } from "@remit/sqs-client";
+import { createQueueProducer } from "@remit/sqs-client/producer";
 import type {
 	Context,
 	SQSBatchResponse,
@@ -117,12 +115,7 @@ if (cluster.isPrimary) {
 
 	const maxMessages = 10; // SQS API limit
 
-	const isLocal = queueUrl.startsWith("http://localhost");
-	const sqs = new SQSClient({
-		endpoint: isLocal ? new URL(queueUrl).origin : undefined,
-		...(isLocal && { protocol: AwsQueryProtocol }),
-		credentials: resolveSqsCredentials(),
-	});
+	const sqs = createQueueProducer({ queueUrl });
 
 	let isShuttingDown = false;
 

package/src/emit.ts

@@ -1,7 +1,9 @@
 import { randomUUID } from "node:crypto";
-import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
-import { AwsQueryProtocol } from "@aws-sdk/core/protocols";
-import { resolveSqsCredentials } from "@remit/sqs-client";
+import { SendMessageCommand } from "@aws-sdk/client-sqs";
+import {
+	createQueueProducer,
+	isLocalEndpoint,
+} from "@remit/sqs-client/producer";
 import { env } from "expect-env";
 import type {
 	ImapEvent,
@@ -21,13 +23,9 @@ const flagsQueueUrl = env.SQS_QUEUE_URL_FLAGS;
 const mailboxMgmtQueueUrl = env.SQS_QUEUE_URL_MAILBOX_MGMT;
 const messageMgmtQueueUrl = env.SQS_QUEUE_URL_MESSAGE_MGMT;
 
-const isLocal = mailboxesQueueUrl.startsWith("http://localhost");
+const isLocal = isLocalEndpoint(mailboxesQueueUrl);
 
-const sqs = new SQSClient({
-	endpoint: isLocal ? new URL(mailboxesQueueUrl).origin : undefined,
-	...(isLocal && { protocol: AwsQueryProtocol }),
-	credentials: resolveSqsCredentials(),
-});
+const sqs = createQueueProducer({ queueUrl: mailboxesQueueUrl });
 
 const queueUrlMap: Record<ImapEvent["type"], string> = {
 	SYNC_MAILBOXES: mailboxesQueueUrl,

package/src/handlers/delete-account-objects.ts

@@ -3,10 +3,9 @@ import {
 	ListObjectsV2Command,
 	S3Client,
 } from "@aws-sdk/client-s3";
-import { SendMessageCommand, SQSClient } from "@aws-sdk/client-sqs";
-import { AwsQueryProtocol } from "@aws-sdk/core/protocols";
+import { SendMessageCommand } from "@aws-sdk/client-sqs";
 import type { Logger } from "@remit/logger-lambda";
-import { resolveSqsCredentials } from "@remit/sqs-client";
+import { createQueueProducer } from "@remit/sqs-client/producer";
 import { env } from "expect-env";
 
 export interface DeleteAccountObjectsEvent {
@@ -18,13 +17,7 @@ export interface DeleteAccountObjectsEvent {
 const s3 = new S3Client({});
 
 const sqsQueueUrl = env.SQS_QUEUE_URL_MESSAGE_MGMT;
-const isLocal = sqsQueueUrl.startsWith("http://localhost");
-
-const sqs = new SQSClient({
-	endpoint: isLocal ? new URL(sqsQueueUrl).origin : undefined,
-	...(isLocal && { protocol: AwsQueryProtocol }),
-	credentials: resolveSqsCredentials(),
-});
+const sqs = createQueueProducer({ queueUrl: sqsQueueUrl });
 
 const BATCH_SIZE = 1_000;
 const MIN_REMAINING_MS = 30_000;

package/src/scheduler/handler.ts

@@ -1,8 +1,6 @@
-import { SQSClient } from "@aws-sdk/client-sqs";
-import { AwsQueryProtocol } from "@aws-sdk/core/protocols";
 import { getClient } from "@remit/backend/client";
 import { createLogger, withTelemetry } from "@remit/logger-lambda";
-import { resolveSqsCredentials } from "@remit/sqs-client";
+import { createQueueProducer } from "@remit/sqs-client/producer";
 import type { ScheduledHandler } from "aws-lambda";
 import { env } from "expect-env";
 import { getOfflineIntervalMs, getTickIntervalMs } from "./config.js";
@@ -11,13 +9,7 @@ import { runSchedulerTick } from "./run-tick.js";
 const log = createLogger();
 
 const mailboxesQueueUrl = env.SQS_QUEUE_URL_MAILBOXES;
-const isLocal = mailboxesQueueUrl.startsWith("http://localhost");
-
-const sqsClient = new SQSClient({
-	endpoint: isLocal ? new URL(mailboxesQueueUrl).origin : undefined,
-	...(isLocal && { protocol: AwsQueryProtocol }),
-	credentials: resolveSqsCredentials(),
-});
+const sqsClient = createQueueProducer({ queueUrl: mailboxesQueueUrl });
 
 /**
  * EventBridge-scheduled entry point for the periodic mailbox-sync tick

package/src/scheduler/local-runner.ts

@@ -1,10 +1,8 @@
 #!/usr/bin/env node
 import { setTimeout as delay } from "node:timers/promises";
-import { SQSClient } from "@aws-sdk/client-sqs";
-import { AwsQueryProtocol } from "@aws-sdk/core/protocols";
 import { getClient } from "@remit/backend/client";
 import { createLogger } from "@remit/logger-lambda";
-import { resolveSqsCredentials } from "@remit/sqs-client";
+import { createQueueProducer } from "@remit/sqs-client/producer";
 import { env } from "expect-env";
 import { getOfflineIntervalMs, getTickIntervalMs } from "./config.js";
 import { runSchedulerTick } from "./run-tick.js";
@@ -27,13 +25,7 @@ import { runSchedulerTick } from "./run-tick.js";
 const log = createLogger();
 
 const mailboxesQueueUrl = env.SQS_QUEUE_URL_MAILBOXES;
-const isLocal = mailboxesQueueUrl.startsWith("http://localhost");
-
-const sqsClient = new SQSClient({
-	endpoint: isLocal ? new URL(mailboxesQueueUrl).origin : undefined,
-	...(isLocal && { protocol: AwsQueryProtocol }),
-	credentials: resolveSqsCredentials(),
-});
+const sqsClient = createQueueProducer({ queueUrl: mailboxesQueueUrl });
 
 const tickIntervalMs = getTickIntervalMs();
 const offlineIntervalMs = getOfflineIntervalMs();