@remit/account-worker 0.0.1 → 0.0.3

package/package.json

@@ -1,50 +1,74 @@
 {
-	"name": "@remit/account-worker",
-	"version": "0.0.1",
-	"type": "module",
-	"main": "dist/index.js",
-	"scripts": {
-		"bundle": "esbuild src/index.ts --sourcemap --bundle --platform=node --format=esm --outfile=dist/index.js",
-		"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-cloudfront": "*",
-		"@aws-sdk/client-cognito-identity-provider": "*",
-		"@aws-sdk/client-dynamodb": "*",
-		"@aws-sdk/client-s3": "*",
-		"@aws-sdk/client-sqs": "*",
-		"@aws-sdk/core": "*",
-		"@aws-sdk/lib-dynamodb": "*",
-		"@aws-sdk/lib-storage": "*",
-		"@aws-sdk/s3-request-presigner": "*",
-		"@remit/backend": "*",
-		"@remit/data-ports": "*",
-		"@remit/electrodb-entities": "*",
-		"@remit/drizzle-service": "*",
-		"@remit/domain-enums": "*",
-		"@remit/logger-lambda": "*",
-		"@remit/search-index-worker": "*",
-		"@remit/search-service": "*",
-		"@remit/sqs-client": "*",
-		"@remit/storage-service": "*",
-		"@types/archiver": "*",
-		"@types/aws-lambda": "*",
-		"archiver": "*",
-		"aws-sdk-client-mock": "*",
-		"electrodb": "*",
-		"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/account-worker"
-	}
+  "name": "@remit/account-worker",
+  "version": "0.0.3",
+  "type": "module",
+  "main": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./src/index.ts",
+      "default": "./src/index.ts"
+    },
+    "./cascade": {
+      "types": "./src/cascade.ts",
+      "default": "./src/cascade.ts"
+    },
+    "./deletion-capabilities": {
+      "types": "./src/deletion-capabilities.ts",
+      "default": "./src/deletion-capabilities.ts"
+    },
+    "./fanout": {
+      "types": "./src/handlers/account-fanout.ts",
+      "default": "./src/handlers/account-fanout.ts"
+    },
+    "./finalize": {
+      "types": "./src/handlers/account-finalize.ts",
+      "default": "./src/handlers/account-finalize.ts"
+    }
+  },
+  "scripts": {
+    "bundle": "esbuild src/index.ts --sourcemap --bundle --platform=node --format=esm --outfile=dist/index.js",
+    "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"
+  },
+  "dependencies": {
+    "@remit/data-ports": "*",
+    "@remit/logger-lambda": "*",
+    "@remit/drizzle-service": "*",
+    "@remit/backend": "*",
+    "@remit/sqs-client": "*",
+    "@remit/storage-service": "*",
+    "@remit/electrodb-entities": "*",
+    "@remit/search-index-worker": "*"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-cloudfront": "*",
+    "@aws-sdk/client-cognito-identity-provider": "*",
+    "@aws-sdk/client-dynamodb": "*",
+    "@aws-sdk/client-s3": "*",
+    "@aws-sdk/client-sqs": "*",
+    "@aws-sdk/core": "*",
+    "@aws-sdk/lib-dynamodb": "*",
+    "@aws-sdk/lib-storage": "*",
+    "@aws-sdk/s3-request-presigner": "*",
+    "@remit/domain-enums": "*",
+    "@remit/search-service": "*",
+    "@types/archiver": "*",
+    "@types/aws-lambda": "*",
+    "archiver": "*",
+    "aws-sdk-client-mock": "*",
+    "electrodb": "*",
+    "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/account-worker"
+  }
 }

package/src/config.ts

@@ -6,15 +6,13 @@ import { createStorageService } from "@remit/storage-service/s3";
 import { env } from "expect-env";
 import type { CascadeServices } from "./cascade.js";
 
-const remitClient = await getClient();
-
 export const sqsClient = new SQSClient({
 	credentials: resolveSqsCredentials(),
 });
 
 // SQS env vars are lazy-evaluated. The fanout worker needs them at handler time;
-// the finalize worker imports `cascadeServices` from this module but talks to no
-// queue, so its Lambda doesn't carry the env vars. Eager evaluation here would
+// the finalize worker imports `getCascadeServices` from this module but talks to
+// no queue, so its Lambda doesn't carry the env vars. Eager evaluation here would
 // crash finalize at module load — getters defer the read to the fanout-only call
 // sites.
 export const getSearchIndexQueueUrl = (): string =>
@@ -31,34 +29,42 @@ export const graceSeconds = graceSecondsRaw
 	? Number.parseInt(graceSecondsRaw, 10)
 	: 60;
 
+// The RemitClient is resolved lazily and cached, not at module load: the
+// DynamoDB backend is injected by the composition root before the first cascade
+// runs, so building at import time would race the registration.
+let cascadeServicesPromise: Promise<CascadeServices> | null = null;
+
 // Every cascade service is a `RemitClient` repository, so the whole enumeration
 // runs on whatever backend `getClient()` selected — DynamoDB (ElectroDB),
 // Postgres, or SQLite (Drizzle). Filter/FilterAnchor/Label/MessageLabel (Smart
 // Organize, RFC 034) are present on all three backends via the client, so they
 // need no backend-specific wiring here.
-export const cascadeServices: CascadeServices = {
-	accountConfigService: remitClient.accountConfig,
-	accountService: remitClient.account,
-	addressService: remitClient.address,
-	mailboxService: remitClient.mailbox,
-	messageService: remitClient.message,
-	messageFlagService: remitClient.messageFlag,
-	envelopeService: remitClient.envelope,
-	outboxMessageService: remitClient.outboxMessage,
-	threadMessageService: remitClient.threadMessage,
-	mailboxLockService: remitClient.mailboxLock,
-	messagePlacementMoveService: remitClient.placementMove,
-	messageFlagPushService: remitClient.flagPush,
-	accountExportRequestService: remitClient.accountExportRequest,
-	accountSettingService: remitClient.accountSetting,
-	filterService: remitClient.filter,
-	filterAnchorService: remitClient.filterAnchor,
-	labelService: remitClient.label,
-	messageLabelService: remitClient.messageLabel,
+export const getCascadeServices = (): Promise<CascadeServices> => {
+	if (!cascadeServicesPromise) {
+		cascadeServicesPromise = getClient().then((remitClient) => ({
+			accountConfigService: remitClient.accountConfig,
+			accountService: remitClient.account,
+			addressService: remitClient.address,
+			mailboxService: remitClient.mailbox,
+			messageService: remitClient.message,
+			messageFlagService: remitClient.messageFlag,
+			envelopeService: remitClient.envelope,
+			outboxMessageService: remitClient.outboxMessage,
+			threadMessageService: remitClient.threadMessage,
+			mailboxLockService: remitClient.mailboxLock,
+			messagePlacementMoveService: remitClient.placementMove,
+			messageFlagPushService: remitClient.flagPush,
+			accountExportRequestService: remitClient.accountExportRequest,
+			accountSettingService: remitClient.accountSetting,
+			filterService: remitClient.filter,
+			filterAnchorService: remitClient.filterAnchor,
+			labelService: remitClient.label,
+			messageLabelService: remitClient.messageLabel,
+		}));
+	}
+	return cascadeServicesPromise;
 };
 
-export const accountConfigService = cascadeServices.accountConfigService;
-
 let storageService: StorageService | null = null;
 export const getStorageService = (): StorageService => {
 	if (!storageService) {

package/src/deletion-capabilities.ts

@@ -6,15 +6,16 @@ import type { CascadeEntity } from "./cascade.js";
  * else — enumerating the AccountConfig's rows, the FIFO purge orchestration, the
  * queue sends — is backend-neutral and lives in the handlers unchanged.
  *
- * Two composition roots build this, selected by `DATA_BACKEND` exactly like
- * `@remit/backend`'s `compose-{dynamodb,postgres,sqlite}`:
+ * Two composition roots build this:
  *
- * - `compose-dynamodb.ts` (AWS custody stack): Cognito global sign-out,
+ * - The DynamoDB composition (AWS custody stack): Cognito global sign-out,
  *   CloudFront invalidation, raw-S3 prefix delete, DynamoDB `BatchWriteItem`
- *   cascade. Byte-for-byte the pre-split behavior. Stripped from the open-core
- *   export and loaded through a lazy `import()` so the closed AWS SDK/ElectroDB
- *   graph never reaches the relational tree.
- * - `compose-relational.ts` (self-host stack, RFC 035/036): no-op sign-out
+ *   cascade. Byte-for-byte the pre-split behavior. It imports the AWS SDK /
+ *   ElectroDB graph and lives outside this shared, open-core module; it is
+ *   injected here through `setDeletionCapabilities` so that graph never reaches
+ *   the relational tree.
+ * - `compose-relational.ts` (self-host stack, RFC 035/036), selected by
+ *   `DATA_BACKEND`: no-op sign-out
  *   (deleting the AccountConfig severs the session's data resolution; there is
  *   no CDN to sign out of), no-op invalidation (Caddy proxies `/content/*`
  *   straight to the backend with no cache), filesystem prefix delete, and the
@@ -60,6 +61,20 @@ const isRelationalBackend = (): boolean => {
 	return backend === "postgres" || backend === "sqlite";
 };
 
+let injectedCapabilities: DeletionCapabilities | null = null;
+
+/**
+ * Register the DynamoDB-backed deletion capabilities from the composition root.
+ * The DynamoDB composition imports the AWS SDK / ElectroDB graph and lives
+ * outside this shared, open-core module; it is never imported here. The
+ * relational backend composes in-package below and never touches this seam.
+ */
+export const setDeletionCapabilities = (
+	capabilities: DeletionCapabilities,
+): void => {
+	injectedCapabilities = capabilities;
+};
+
 const buildDeletionCapabilitiesFromEnv =
 	async (): Promise<DeletionCapabilities> => {
 		if (isRelationalBackend()) {
@@ -68,15 +83,12 @@ const buildDeletionCapabilitiesFromEnv =
 			);
 			return buildRelationalDeletionCapabilities();
 		}
-		// `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 = {
-			buildDynamoDBDeletionCapabilities: () => DeletionCapabilities;
-		};
-		const { buildDynamoDBDeletionCapabilities } = (await import(
-			"./compose-dynamodb.js" as string
-		)) as ComposeDynamoDBModule;
-		return buildDynamoDBDeletionCapabilities();
+		if (!injectedCapabilities) {
+			throw new Error(
+				"no DynamoDB deletion capabilities registered — register them with setDeletionCapabilities() from your composition root",
+			);
+		}
+		return injectedCapabilities;
 	};
 
 let capabilitiesPromise: Promise<DeletionCapabilities> | undefined;

package/src/handlers/account-export.ts

@@ -3,7 +3,7 @@ import type { Logger } from "@remit/logger-lambda";
 import type { StorageService } from "@remit/storage-service";
 import { ZipArchive } from "archiver";
 import type { CascadeServices } from "../cascade.js";
-import { cascadeServices, getStorageService } from "../config.js";
+import { getCascadeServices, getStorageService } from "../config.js";
 import type { AccountExportEvent } from "../events.js";
 
 const THIRTY_DAYS_MILLIS = 30 * 24 * 60 * 60 * 1000;
@@ -13,8 +13,8 @@ export interface ProcessAccountExportDeps {
 	storageService: StorageService;
 }
 
-const defaultDeps = (): ProcessAccountExportDeps => ({
-	services: cascadeServices,
+const defaultDeps = async (): Promise<ProcessAccountExportDeps> => ({
+	services: await getCascadeServices(),
 	storageService: getStorageService(),
 });
 
@@ -66,10 +66,10 @@ const appendMessageBodies = async (
 export const processAccountExport = async (
 	event: AccountExportEvent,
 	log: Logger,
-	deps: ProcessAccountExportDeps = defaultDeps(),
+	deps?: ProcessAccountExportDeps,
 ): Promise<void> => {
 	const { accountConfigId, accountExportRequestId } = event;
-	const { services, storageService } = deps;
+	const { services, storageService } = deps ?? (await defaultDeps());
 	const { accountExportRequestService } = services;
 
 	await accountExportRequestService.get(accountExportRequestId);

package/src/handlers/account-fanout.ts

@@ -1,12 +1,16 @@
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
-import { createLogger, type Logger, withTelemetry } from "@remit/logger-lambda";
+import {
+	createLogger,
+	type Logger,
+	withTelemetry,
+} from "@remit/logger-lambda";
 import type { SQSBatchResponse, SQSEvent, SQSHandler } from "aws-lambda";
 import type { CascadeServices } from "../cascade.js";
 import { enumerateCascadeEntities } from "../cascade.js";
 import {
-	cascadeServices,
 	getAccountFinalizeQueueUrl,
 	getAccountPurgeDeleteQueueUrl,
+	getCascadeServices,
 	getImapWorkerQueueUrl,
 	sqsClient,
 } from "../config.js";
@@ -44,7 +48,7 @@ export const processAccountFanout = async (
 	log: Logger,
 	deps: ProcessAccountFanoutDeps = {},
 ): Promise<void> => {
-	const services = deps.services ?? cascadeServices;
+	const services = deps.services ?? (await getCascadeServices());
 	const sqs = deps.sqs ?? sqsClient;
 
 	if (event.type === "AccountDataPurge") {

package/src/handlers/account-finalize.ts

@@ -1,5 +1,9 @@
 import { inspect } from "node:util";
-import { createLogger, type Logger, withTelemetry } from "@remit/logger-lambda";
+import {
+	createLogger,
+	type Logger,
+	withTelemetry,
+} from "@remit/logger-lambda";
 import type { SQSEvent, SQSHandler } from "aws-lambda";
 import {
 	type CascadeEntity,
@@ -7,7 +11,7 @@ import {
 	collectMessageChildEntities,
 	enumerateCascadeEntities,
 } from "../cascade.js";
-import { cascadeServices as defaultCascadeServices } from "../config.js";
+import { getCascadeServices } from "../config.js";
 import {
 	type DeletionCapabilities,
 	getDeletionCapabilities,
@@ -30,7 +34,7 @@ const resolveDeps = async (
 	services: CascadeServices;
 }> => ({
 	capabilities: deps.capabilities ?? (await getDeletionCapabilities()),
-	services: deps.cascadeServices ?? defaultCascadeServices,
+	services: deps.cascadeServices ?? (await getCascadeServices()),
 });
 
 /**

package/src/handlers/account-purge.ts

@@ -10,10 +10,10 @@ import type { SearchIndexMessage } from "@remit/search-index-worker";
 import { Entity } from "electrodb";
 import type { CascadeServices } from "../cascade.js";
 import {
-	cascadeServices as defaultCascadeServices,
 	dataBackend as defaultDataBackend,
 	sqsClient as defaultSqsClient,
 	getAccountPurgeDeleteQueueUrl,
+	getCascadeServices,
 	getSearchIndexQueueUrl,
 } from "../config.js";
 import type {
@@ -161,7 +161,7 @@ export const processAccountDataPurge = async (
 	deps: ProcessPurgeFanoutDeps = {},
 ): Promise<void> => {
 	const { accountId, accountConfigId } = event;
-	const services = deps.services ?? defaultCascadeServices;
+	const services = deps.services ?? (await getCascadeServices());
 	const sqs = deps.sqs ?? defaultSqsClient;
 	const accountPurgeDeleteQueueUrl =
 		deps.accountPurgeDeleteQueueUrl ?? getAccountPurgeDeleteQueueUrl();