@remit/account-worker 0.0.25 → 0.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/account-worker",
-  "version": "0.0.25",
+  "version": "0.0.27",
   "type": "module",
   "main": "dist/index.js",
   "exports": {
@@ -33,6 +33,7 @@
     "dev": "node --import tsx src/poller.ts"
   },
   "dependencies": {
+    "@remit/logger": "*",
     "@remit/data-ports": "*",
     "@remit/logger-lambda": "*",
     "@remit/drizzle-service": "*",
@@ -40,7 +41,6 @@
     "@remit/sqs-client": "*",
     "@remit/storage-service": "*",
     "@remit/electrodb-entities": "*",
-    "@remit/search-index-worker": "*",
     "@aws-sdk/client-sqs": "*",
     "archiver": "*",
     "electrodb": "*",

package/src/cascade-enumerate.test.ts

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import type { MessageDescription } from "@remit/data-ports";
-import { noopLogger } from "@remit/logger-lambda/noop-logger";
+import { noopLogger } from "@remit/logger";
 import {
 	type CascadeEntity,
 	type CascadeServices,
@@ -18,11 +18,10 @@ const messageWithChildren = {
 	bodyPartParameter: [{ bodyPartParameterId: "bpp-1" }],
 	rawMessageStorage: [{ rawStorageId: "rms-1" }],
 	bodyPartStorage: [{ bodyPartStorageId: "bps-1" }],
-	bodyPartContent: [{ bodyPartContentId: "bpc-1" }],
 } as unknown as MessageDescription;
 
 describe("collectMessageChildEntities", () => {
-	it("expands the nine child entities of one message", () => {
+	it("expands the eight child entities of one message", () => {
 		const entities: CascadeEntity[] = [];
 		collectMessageChildEntities(entities, messageWithChildren);
 
@@ -36,13 +35,7 @@ describe("collectMessageChildEntities", () => {
 			"BodyPartParameter",
 			"RawMessageStorage",
 			"BodyPartStorage",
-			"BodyPartContent",
 		]);
-		assert.equal(
-			entities.find((e) => e.entityType === "BodyPartContent")?.key
-				.bodyPartContentId,
-			"bpc-1",
-		);
 	});
 
 	it("appends nothing when every child list is empty", () => {
@@ -56,7 +49,6 @@ describe("collectMessageChildEntities", () => {
 			bodyPartParameter: [],
 			rawMessageStorage: [],
 			bodyPartStorage: [],
-			bodyPartContent: [],
 		} as unknown as MessageDescription);
 		assert.equal(entities.length, 0);
 	});
@@ -96,13 +88,7 @@ const fullServices = (): CascadeServices =>
 			listByAccountConfig: async () => [{ accountSettingId: "set-1" }],
 		},
 		filterService: {
-			listByAccountConfig: async () => [
-				{ filterId: "flt-1", hasAnchor: true },
-				{ filterId: "flt-2", hasAnchor: false },
-			],
-		},
-		filterAnchorService: {
-			get: async () => ({ filterId: "flt-1" }),
+			listByAccountConfig: async () => [{ filterId: "flt-1" }],
 		},
 		labelService: {
 			listByAccountConfig: async () => [{ labelId: "lbl-1" }],
@@ -128,7 +114,6 @@ describe("enumerateCascadeEntities", () => {
 			"Mailbox",
 			"Message",
 			"MessageFlag",
-			"BodyPartContent",
 			"OutboxMessage",
 			"MailboxLock",
 			"MessagePlacementMove",
@@ -136,7 +121,6 @@ describe("enumerateCascadeEntities", () => {
 			"ThreadMessage",
 			"AccountSetting",
 			"Filter",
-			"FilterAnchor",
 			"Label",
 			"MessageLabel",
 			"Address",
@@ -148,40 +132,6 @@ describe("enumerateCascadeEntities", () => {
 		assert.equal(types[types.length - 1], "AccountConfig");
 	});
 
-	it("emits a Filter without a FilterAnchor when the filter has no anchor", async () => {
-		const services = fullServices();
-		services.filterService.listByAccountConfig = async () =>
-			[{ filterId: "flt-2", hasAnchor: false }] as never;
-
-		const { entities } = await enumerateCascadeEntities(
-			"cfg-1",
-			services,
-			noopLogger,
-		);
-
-		assert.equal(entities.filter((e) => e.entityType === "Filter").length, 1);
-		assert.equal(
-			entities.filter((e) => e.entityType === "FilterAnchor").length,
-			0,
-		);
-	});
-
-	it("skips the FilterAnchor when the anchor lookup returns null", async () => {
-		const services = fullServices();
-		services.filterAnchorService.get = async () => null as never;
-
-		const { entities } = await enumerateCascadeEntities(
-			"cfg-1",
-			services,
-			noopLogger,
-		);
-
-		assert.equal(
-			entities.filter((e) => e.entityType === "FilterAnchor").length,
-			0,
-		);
-	});
-
 	it("yields only the AccountConfig row for an empty tenant", async () => {
 		const services = fullServices();
 		services.accountConfigService.describe = async () =>

package/src/cascade.ts

@@ -5,7 +5,6 @@ import type {
 	IAccountSettingRepository,
 	IAddressRepository,
 	IEnvelopeRepository,
-	IFilterAnchorRepository,
 	IFilterRepository,
 	ILabelRepository,
 	IMailboxLockRepository,
@@ -19,7 +18,7 @@ import type {
 	IThreadMessageRepository,
 	MessageDescription,
 } from "@remit/data-ports";
-import type { Logger } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
 
 export interface CascadeEntity {
 	entityType: string;
@@ -42,7 +41,6 @@ export interface CascadeServices {
 	accountExportRequestService: IAccountExportRequestRepository;
 	accountSettingService: IAccountSettingRepository;
 	filterService: IFilterRepository;
-	filterAnchorService: IFilterAnchorRepository;
 	labelService: ILabelRepository;
 	messageLabelService: IMessageLabelRepository;
 }
@@ -111,12 +109,6 @@ export const collectMessageChildEntities = (
 			key: { bodyPartStorageId: bps.bodyPartStorageId },
 		});
 	}
-	for (const bpc of messageData.bodyPartContent) {
-		entities.push({
-			entityType: "BodyPartContent",
-			key: { bodyPartContentId: bpc.bodyPartContentId },
-		});
-	}
 };
 
 export const enumerateCascadeEntities = async (
@@ -138,7 +130,6 @@ export const enumerateCascadeEntities = async (
 		messageFlagPushService,
 		accountSettingService,
 		filterService,
-		filterAnchorService,
 		labelService,
 		messageLabelService,
 	} = services;
@@ -225,13 +216,6 @@ export const enumerateCascadeEntities = async (
 						key: { bodyPartStorageId: bps.bodyPartStorageId },
 					});
 				}
-
-				for (const bpc of messageData.bodyPartContent) {
-					entities.push({
-						entityType: "BodyPartContent",
-						key: { bodyPartContentId: bpc.bodyPartContentId },
-					});
-				}
 			}
 		}
 
@@ -292,7 +276,7 @@ export const enumerateCascadeEntities = async (
 		});
 	}
 
-	// Filter/FilterAnchor/Label/MessageLabel are accountConfig-scoped (RFC 034),
+	// Filter/Label/MessageLabel are accountConfig-scoped (RFC 034),
 	// not per sub-account, so — like AccountSetting and ThreadMessage above —
 	// they are enumerated once here rather than inside the per-account loop.
 	const filters = await filterService.listByAccountConfig(accountConfigId);
@@ -301,16 +285,6 @@ export const enumerateCascadeEntities = async (
 			entityType: "Filter",
 			key: { accountConfigId, filterId: filter.filterId },
 		});
-		if (!filter.hasAnchor) continue;
-		const anchor = await filterAnchorService.get(
-			accountConfigId,
-			filter.filterId,
-		);
-		if (!anchor) continue;
-		entities.push({
-			entityType: "FilterAnchor",
-			key: { accountConfigId, filterId: filter.filterId },
-		});
 	}
 
 	const labels = await labelService.listByAccountConfig(accountConfigId);
@@ -354,30 +328,3 @@ export const enumerateCascadeEntities = async (
 
 	return { entities, messageIds };
 };
-
-export const COVERED_ENTITY_TYPES = [
-	"Account",
-	"AccountConfig",
-	"AccountSetting",
-	"Address",
-	"BodyPart",
-	"BodyPartContent",
-	"BodyPartParameter",
-	"BodyPartStorage",
-	"Envelope",
-	"EnvelopeAddress",
-	"Filter",
-	"FilterAnchor",
-	"Label",
-	"Mailbox",
-	"MailboxLock",
-	"Message",
-	"MessageFlag",
-	"MessageFlagPush",
-	"MessageLabel",
-	"MessagePlacementMove",
-	"MessageReference",
-	"OutboxMessage",
-	"RawMessageStorage",
-	"ThreadMessage",
-] as const;

package/src/compose-relational.test.ts

@@ -3,7 +3,7 @@ import { mkdir, mkdtemp, stat, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { afterEach, beforeEach, describe, it } from "node:test";
-import { noopLogger } from "@remit/logger-lambda/noop-logger";
+import { noopLogger } from "@remit/logger";
 import { buildRelationalDeletionCapabilities } from "./compose-relational.js";
 
 const exists = (path: string): Promise<boolean> =>
@@ -79,16 +79,3 @@ describe("relational deletion capabilities — filesystem storage cleanup", () =
 		await caps.deleteStoragePrefix("accounts/never-existed/", noopLogger);
 	});
 });
-
-describe("relational deletion capabilities — CDN and sign-out are no-ops", () => {
-	it("invalidateContent resolves without a CDN", async () => {
-		const caps = buildRelationalDeletionCapabilities();
-		await caps.invalidateContent("cfg-1", noopLogger);
-		await caps.invalidateContent("cfg-1/acc-1", noopLogger);
-	});
-
-	it("signOut resolves without a federated session store", async () => {
-		const caps = buildRelationalDeletionCapabilities();
-		await caps.signOut("user-123", noopLogger);
-	});
-});

package/src/compose-relational.ts

@@ -3,9 +3,9 @@ import { join } from "node:path";
 import {
 	type CascadeDeleter,
 	createSqliteCascadeDeleter,
+	sqliteDatabasePathsFromEnv,
 } from "@remit/drizzle-service";
-import type { Logger } from "@remit/logger-lambda";
-import { env } from "expect-env";
+import type { Logger } from "@remit/logger";
 import type { DeletionCapabilities } from "./deletion-capabilities.js";
 
 // Mirrors `@remit/storage-service`'s filesystem-backend default: bodies
@@ -30,14 +30,14 @@ const deleteStoragePrefix = async (
 };
 
 // The Drizzle cascade deleter is opened once, on first use, and reused: it
-// opens the shared file at `SQLITE_DB_PATH` (the native binding loads there,
+// opens the app, mail and search databases (the native binding loads there,
 // hence async). Built lazily so the fanout worker — which signs out but never
 // cascade-deletes — does not open a database handle it will not use.
 let deleterPromise: Promise<CascadeDeleter> | undefined;
 
 const getDeleter = (): Promise<CascadeDeleter> => {
 	if (!deleterPromise)
-		deleterPromise = createSqliteCascadeDeleter(env.SQLITE_DB_PATH);
+		deleterPromise = createSqliteCascadeDeleter(sqliteDatabasePathsFromEnv());
 	return deleterPromise;
 };
 
@@ -52,8 +52,7 @@ const getDeleter = (): Promise<CascadeDeleter> => {
  *   backend with no response cache (`deploy/vps/caddy/routes.caddy`), so there
  *   is nothing to invalidate.
  * - `deleteStoragePrefix`: recursive filesystem removal.
- * - `cascadeDelete`: the Drizzle cascade over SQLite. Message
- *   subtrees emit `message.removed` outbox rows the search-index worker relays.
+ * - `cascadeDelete`: the Drizzle cascade over SQLite.
  */
 export const buildRelationalDeletionCapabilities =
 	(): DeletionCapabilities => ({

package/src/config.test.ts

@@ -51,9 +51,4 @@ describe("getImapWorkerQueueUrl", () => {
 		delete process.env.SQS_QUEUE_URL_IMAP_WORKER;
 		assert.equal(getImapWorkerQueueUrl(), undefined);
 	});
-
-	it("returns the configured value when set", () => {
-		process.env.SQS_QUEUE_URL_IMAP_WORKER = "http://queue/imap-worker";
-		assert.equal(getImapWorkerQueueUrl(), "http://queue/imap-worker");
-	});
 });

package/src/config.ts

@@ -26,8 +26,6 @@ export const getSqsClient = (queueUrl: string): SQSClient => {
 // 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 =>
-	env.SQS_QUEUE_URL_SEARCH_INDEX;
 // Optional, and read through `process.env` rather than expect-env so an unset
 // var yields undefined instead of throwing. IMAP_WORKER_STOP is a no-op
 // acknowledgement in the cascade contract — the account tombstone fence is what
@@ -48,7 +46,7 @@ let cascadeServicesPromise: Promise<CascadeServices> | null = null;
 
 // Every cascade service is a `RemitClient` repository, so the whole enumeration
 // runs on whatever backend `getClient()` resolved — DynamoDB (ElectroDB) or
-// SQLite (Drizzle). Filter/FilterAnchor/Label/MessageLabel (Smart Organize,
+// SQLite (Drizzle). Filter/Label/MessageLabel (Smart Organize,
 // RFC 034) are present on both via the client, so they need no
 // backend-specific wiring here.
 export const getCascadeServices = (): Promise<CascadeServices> => {
@@ -69,7 +67,6 @@ export const getCascadeServices = (): Promise<CascadeServices> => {
 			accountExportRequestService: remitClient.accountExportRequest,
 			accountSettingService: remitClient.accountSetting,
 			filterService: remitClient.filter,
-			filterAnchorService: remitClient.filterAnchor,
 			labelService: remitClient.label,
 			messageLabelService: remitClient.messageLabel,
 		}));
@@ -84,5 +81,3 @@ export const getStorageService = (): StorageService => {
 	}
 	return storageService;
 };
-
-export const dataBackend = process.env.DATA_BACKEND;

package/src/deletion-capabilities.ts

@@ -1,4 +1,4 @@
-import type { Logger } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
 import type { CascadeEntity } from "./cascade.js";
 
 /**
@@ -71,7 +71,7 @@ export const setDeletionCapabilities = (
 const buildDeletionCapabilitiesFromEnv =
 	async (): Promise<DeletionCapabilities> => {
 		if (injectedCapabilities) return injectedCapabilities;
-		if (process.env.SQLITE_DB_PATH) {
+		if (process.env.SQLITE_APP_DB_PATH) {
 			const { buildRelationalDeletionCapabilities } = await import(
 				"./compose-relational.js"
 			);

package/src/events.ts

@@ -9,7 +9,7 @@ export type AccountDeleteEvent = {
 
 /**
  * Per-account hard-delete. Purges ONE mail account's data (mailboxes,
- * messages, body parts, thread messages, S3 objects, search vectors) while
+ * messages, body parts, thread messages, S3 objects) while
  * keeping the AccountConfig/tenant and any sibling accounts intact. Emitted
  * by the API on `deleteAccount`; consumed by the fanout worker.
  */

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

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { Readable } from "node:stream";
 import { describe, it } from "node:test";
-import { noopLogger } from "@remit/logger-lambda/noop-logger";
+import { noopLogger } from "@remit/logger";
 import type { StorageService } from "@remit/storage-service";
 import type { CascadeServices } from "../cascade.js";
 import type { AccountExportEvent } from "../events.js";

package/src/handlers/account-export.ts

@@ -1,5 +1,5 @@
 import { PassThrough } from "node:stream";
-import type { Logger } from "@remit/logger-lambda";
+import type { Logger } from "@remit/logger";
 import type { StorageService } from "@remit/storage-service";
 import { ZipArchive } from "archiver";
 import type { CascadeServices } from "../cascade.js";

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

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { afterEach, describe, it } from "node:test";
 import type { SQSClient } from "@aws-sdk/client-sqs";
-import { noopLogger } from "@remit/logger-lambda/noop-logger";
+import { noopLogger } from "@remit/logger";
 import type { CascadeServices } from "../cascade.js";
 import type { AccountDeleteEvent } from "../events.js";
 import { processAccountFanout } from "./account-fanout.js";
@@ -32,7 +32,6 @@ const buildServices = (): CascadeServices =>
 		threadMessageService: { listAllByAccount: async () => [] },
 		accountSettingService: { listByAccountConfig: async () => [] },
 		filterService: { listByAccountConfig: async () => [] },
-		filterAnchorService: { get: async () => null },
 		labelService: { listByAccountConfig: async () => [] },
 		messageLabelService: { listByLabelId: async () => [] },
 	}) as unknown as CascadeServices;

package/src/handlers/account-fanout.ts

@@ -1,11 +1,10 @@
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
+import { createLogger, type Logger } from "@remit/logger";
 import {
-	createLogger,
-	type Logger,
 	queueNameFromEventSource,
 	recordQueueEvent,
-	withTelemetry,
-} from "@remit/logger-lambda";
+} from "@remit/logger-lambda/metrics";
+import { installNodeLogger, withTelemetry } from "@remit/logger-lambda/node";
 import type { SQSBatchResponse, SQSEvent, SQSHandler } from "aws-lambda";
 import type { CascadeServices } from "../cascade.js";
 import { enumerateCascadeEntities } from "../cascade.js";
@@ -30,6 +29,8 @@ import { processAccountDataPurge } from "./account-purge.js";
 import { processOrganizeJob } from "./organize-job.js";
 import { processSenderCategoryBackApply } from "./sender-category-backapply.js";
 
+installNodeLogger();
+
 export interface ProcessAccountFanoutDeps {
 	services?: CascadeServices;
 	sqs?: SQSClient;
@@ -41,8 +42,8 @@ export interface ProcessAccountFanoutDeps {
 
 /**
  * Fanout step of the account-deletion cascade. Read-only: enumerates the
- * AccountConfig's data and dispatches downstream work — search-index
- * deletes, per-account imap-worker stops, a sign-out, and the finalize
+ * AccountConfig's data and dispatches downstream work — per-account
+ * imap-worker stops, a sign-out, and the finalize
  * enqueue. Throws on any non-swallowable error so SQS partial batch-failure
  * retries the whole record.
  */

package/src/handlers/account-finalize.ts

@@ -1,11 +1,10 @@
 import { inspect } from "node:util";
+import { createLogger, type Logger } from "@remit/logger";
 import {
-	createLogger,
-	type Logger,
 	queueNameFromEventSource,
 	recordQueueEvent,
-	withTelemetry,
-} from "@remit/logger-lambda";
+} from "@remit/logger-lambda/metrics";
+import { installNodeLogger, withTelemetry } from "@remit/logger-lambda/node";
 import type { SQSEvent, SQSHandler } from "aws-lambda";
 import {
 	type CascadeEntity,
@@ -24,6 +23,8 @@ import type {
 	AccountFinalizeEvent,
 } from "../events.js";
 
+installNodeLogger();
+
 export interface ProcessFinalizeDeps {
 	capabilities?: DeletionCapabilities;
 	cascadeServices?: CascadeServices;
@@ -131,10 +132,7 @@ export const processAccountFinalize = async (
  * the work; this worker only ever consumes.
  *
  * Idempotency: the cascade on a missing key is a no-op, so a redelivered batch
- * (or container) no-ops on already-gone rows. Search-index cleanup is not driven
- * from here: on DynamoDB the fanout step enqueues a REMOVE per message id up
- * front; on the relational backends the cascade emits a `message.removed` outbox
- * row the search-index worker relays.
+ * (or container) no-ops on already-gone rows.
  */
 export const processAccountDataPurgeFinalize = async (
 	event: AccountDataPurgeFinalizeEvent,

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

@@ -1,7 +1,7 @@
 import assert from "node:assert/strict";
 import { describe, it } from "node:test";
 import type { SQSClient } from "@aws-sdk/client-sqs";
-import { noopLogger } from "@remit/logger-lambda/noop-logger";
+import { noopLogger } from "@remit/logger";
 import type { CascadeServices } from "../cascade.js";
 import type { AccountDataPurgeEvent } from "../events.js";
 import {
@@ -12,28 +12,19 @@ import {
 interface Sent {
 	queueUrl: string | undefined;
 	body: Record<string, unknown>;
-	entries?: Array<{ Id: string; MessageBody: string }>;
 }
 
-const recordingSqs = (sent: Sent[], failBatch = false): SQSClient =>
+const recordingSqs = (sent: Sent[]): SQSClient =>
 	({
 		send: async (command: {
-			input: {
-				QueueUrl?: string;
-				MessageBody?: string;
-				Entries?: Array<{ Id: string; MessageBody: string }>;
-			};
+			input: { QueueUrl?: string; MessageBody?: string };
 		}) => {
 			sent.push({
 				queueUrl: command.input.QueueUrl,
 				body: command.input.MessageBody
 					? JSON.parse(command.input.MessageBody)
 					: {},
-				entries: command.input.Entries,
 			});
-			if (command.input.Entries && failBatch) {
-				return { Failed: [{ Id: "0" }] };
-			}
 			return {};
 		},
 	}) as unknown as SQSClient;
@@ -73,19 +64,14 @@ const baseDeps = (
 	]),
 	sqs: recordingSqs(sent),
 	accountPurgeDeleteQueueUrl: "http://queue/purge",
-	searchIndexQueueUrl: "http://queue/search",
-	dataBackend: "dynamodb",
 	...overrides,
 });
 
 describe("processAccountDataPurge", () => {
-	it("enqueues vector deletes then a subtrees batch and one container leftover", async () => {
+	it("enqueues a subtrees batch and one container leftover", async () => {
 		const sent: Sent[] = [];
 		await processAccountDataPurge(event, noopLogger, baseDeps(sent));
 
-		const vectorBatch = sent.find((m) => m.queueUrl === "http://queue/search");
-		assert.equal(vectorBatch?.entries?.length, 2, "one entry per message");
-
 		const finalize = sent.filter((m) => m.queueUrl === "http://queue/purge");
 		const kinds = finalize.map((m) => m.body.kind);
 		assert.deepEqual(kinds, ["subtrees", "container"]);
@@ -96,27 +82,6 @@ describe("processAccountDataPurge", () => {
 		);
 	});
 
-	it("skips vector deletes on the relational backend, still enqueuing finalize", async () => {
-		const sent: Sent[] = [];
-		await processAccountDataPurge(
-			event,
-			noopLogger,
-			baseDeps(sent, { dataBackend: "sqlite" }),
-		);
-
-		assert.equal(
-			sent.some((m) => m.queueUrl === "http://queue/search"),
-			false,
-			"no search-index enqueue on the relational backend",
-		);
-		assert.deepEqual(
-			sent
-				.filter((m) => m.queueUrl === "http://queue/purge")
-				.map((m) => m.body.kind),
-			["subtrees", "container"],
-		);
-	});
-
 	it("drops manifest rows outside the account's mailbox set", async () => {
 		const sent: Sent[] = [];
 		await processAccountDataPurge(event, noopLogger, {
@@ -167,15 +132,4 @@ describe("processAccountDataPurge", () => {
 			/dynamo throttled/,
 		);
 	});
-
-	it("throws when a vector-delete batch reports failed entries", async () => {
-		const sent: Sent[] = [];
-		await assert.rejects(
-			processAccountDataPurge(event, noopLogger, {
-				...baseDeps(sent),
-				sqs: recordingSqs(sent, true),
-			}),
-			/failed entries/,
-		);
-	});
 });