@remit/account-worker 0.0.33 → 0.0.35

package/src/process.ts

@@ -6,9 +6,18 @@ import type { DeletionCapabilities } from "./deletion-port.js";
 import type {
 	AccountDataPurgeEvent,
 	AccountDataPurgeFinalizeEvent,
+	AccountDeleteEvent,
+	AccountDeleteFinalizeEvent,
+	AccountExportEvent,
+	AccountFinalizeEvent,
 	OrganizeJobEvent,
 	SenderCategoryBackApplyEvent,
 } from "./events.js";
+import {
+	finalizeAccountDelete,
+	processAccountDelete,
+} from "./handlers/account-delete.js";
+import { processAccountExport } from "./handlers/account-export.js";
 import { processAccountDataPurge } from "./handlers/account-purge.js";
 import { processAccountDataPurgeFinalize } from "./handlers/account-purge-finalize.js";
 import { processOrganizeJob } from "./handlers/organize-job.js";
@@ -16,7 +25,14 @@ import { processSenderCategoryBackApply } from "./handlers/sender-category-backa
 
 export type { CascadeEntity } from "./cascade.js";
 export type { DeletionCapabilities } from "./deletion-port.js";
-export type { AccountDataPurgeEvent, AccountDataPurgeFinalizeEvent };
+export type {
+	AccountDataPurgeEvent,
+	AccountDataPurgeFinalizeEvent,
+	AccountDeleteEvent,
+	AccountDeleteFinalizeEvent,
+	AccountExportEvent,
+	AccountFinalizeEvent,
+};
 
 export type ClientFanoutEvent = OrganizeJobEvent | SenderCategoryBackApplyEvent;
 
@@ -25,12 +41,18 @@ export interface AccountFanoutContext {
 }
 
 export type AccountPurgeEvent =
+	| AccountDeleteEvent
+	| AccountDeleteFinalizeEvent
 	| AccountDataPurgeEvent
 	| AccountDataPurgeFinalizeEvent;
 
+export interface AccountExportContext {
+	client: RemitClient;
+}
+
 export interface AccountPurgeContext {
 	client: RemitClient;
-	purgeQueue: GroupedQueueProducer<AccountDataPurgeFinalizeEvent>;
+	purgeQueue: GroupedQueueProducer<AccountFinalizeEvent>;
 	capabilities: DeletionCapabilities;
 }
 
@@ -48,12 +70,36 @@ export const processAccountFanoutEvent = (
 	}
 };
 
+export const processAccountExportEvent = (
+	event: AccountExportEvent,
+	ctx: AccountExportContext,
+): Promise<void> =>
+	processAccountExport(event, log, {
+		services: cascadeServicesOf(ctx.client),
+		storageService: ctx.client.storage,
+	});
+
 export const processAccountPurgeEvent = (
 	event: AccountPurgeEvent,
 	ctx: AccountPurgeContext,
 ): Promise<void> => {
 	const services = cascadeServicesOf(ctx.client);
 	switch (event.type) {
+		case "AccountDelete":
+			return processAccountDelete(event, log, {
+				services,
+				signOut: ctx.capabilities.signOut,
+				enqueueFinalize: (finalizeEvent) =>
+					ctx.purgeQueue.send({
+						body: finalizeEvent,
+						groupId: finalizeEvent.accountConfigId,
+					}),
+			});
+		case "FinalizeAccountDelete":
+			return finalizeAccountDelete(event, log, {
+				services,
+				capabilities: ctx.capabilities,
+			});
 		case "AccountDataPurge":
 			return processAccountDataPurge(event, log, {
 				services,

package/src/handlers/account-export.test.ts

@@ -1,140 +0,0 @@
-import assert from "node:assert/strict";
-import { Readable } from "node:stream";
-import { describe, it } from "node:test";
-import { noopLogger } from "@remit/logger";
-import type { StorageService } from "@remit/storage-service";
-import type { CascadeServices } from "../cascade.js";
-import type { AccountExportEvent } from "../events.js";
-import {
-	type ProcessAccountExportDeps,
-	processAccountExport,
-} from "./account-export.js";
-
-interface Update {
-	state: string;
-	objectKey?: string;
-	expiresAt?: number;
-	errorMessage?: string;
-}
-
-const bodyOf = (text: string): Readable => Readable.from([Buffer.from(text)]);
-
-const buildDeps = (
-	updates: Update[],
-	overrides: {
-		retrieveMessageBodyStream?: StorageService["retrieveMessageBodyStream"];
-		storeExportArchiveStream?: StorageService["storeExportArchiveStream"];
-	} = {},
-): ProcessAccountExportDeps => ({
-	services: {
-		accountExportRequestService: {
-			get: async () => ({ accountExportRequestId: "exp-1" }),
-			update: async (_id: string, patch: Update) => {
-				updates.push(patch);
-			},
-		},
-		accountConfigService: {
-			describe: async () => ({ account: [{ accountId: "acc-1" }] }),
-		},
-		accountService: {
-			describe: async () => ({
-				mailbox: [{ mailboxId: "mbx-1", fullPath: "INBOX" }],
-			}),
-		},
-		messageService: {
-			listAllByMailbox: async () => [
-				{ messageId: "msg-1" },
-				{ messageId: "msg-2" },
-			],
-		},
-	} as unknown as CascadeServices,
-	storageService: {
-		retrieveMessageBodyStream:
-			overrides.retrieveMessageBodyStream ??
-			(async (_cfg: string, _acc: string, messageId: string) =>
-				messageId === "msg-2" ? null : bodyOf("raw-eml")),
-		storeExportArchiveStream:
-			overrides.storeExportArchiveStream ??
-			(async (_cfg: string, _req: string, stream: NodeJS.ReadableStream) => {
-				await new Promise<void>((resolve) => {
-					stream.on("data", () => {});
-					stream.on("end", resolve);
-				});
-				return "exports/exp-1.zip";
-			}),
-	} as unknown as StorageService,
-});
-
-const event: AccountExportEvent = {
-	type: "AccountExport",
-	accountConfigId: "cfg-1",
-	accountExportRequestId: "exp-1",
-};
-
-describe("processAccountExport", () => {
-	it("drives the request Processing then Ready and stores the archive key", async () => {
-		const updates: Update[] = [];
-		await processAccountExport(event, noopLogger, buildDeps(updates));
-
-		assert.deepEqual(
-			updates.map((u) => u.state),
-			["Processing", "Ready"],
-		);
-		const ready = updates[1];
-		assert.equal(ready?.objectKey, "exports/exp-1.zip");
-		assert.ok(
-			ready?.expiresAt && ready.expiresAt > Date.now(),
-			"expiresAt is set in the future",
-		);
-	});
-
-	it("skips messages that have no raw body without failing the export", async () => {
-		const updates: Update[] = [];
-		let retrieved = 0;
-		await processAccountExport(
-			event,
-			noopLogger,
-			buildDeps(updates, {
-				retrieveMessageBodyStream: async (
-					_cfg: string,
-					_acc: string,
-					messageId: string,
-				) => {
-					retrieved += 1;
-					return messageId === "msg-2" ? null : bodyOf("raw");
-				},
-			}),
-		);
-
-		assert.equal(retrieved, 2, "both messages were consulted");
-		assert.equal(updates.at(-1)?.state, "Ready");
-	});
-
-	it("marks the request Failed and rethrows when storage upload rejects", async () => {
-		const updates: Update[] = [];
-		await assert.rejects(
-			processAccountExport(
-				event,
-				noopLogger,
-				buildDeps(updates, {
-					storeExportArchiveStream: async (
-						_cfg: string,
-						_req: string,
-						stream: NodeJS.ReadableStream,
-					) => {
-						await new Promise<void>((resolve) => {
-							stream.on("data", () => {});
-							stream.on("end", resolve);
-						});
-						throw new Error("s3 down");
-					},
-				}),
-			),
-			/s3 down/,
-		);
-
-		const failed = updates.at(-1);
-		assert.equal(failed?.state, "Failed");
-		assert.equal(failed?.errorMessage, "s3 down");
-	});
-});