@remit/account-worker 0.0.14 → 0.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/account-worker",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/compose-relational.ts

@@ -2,7 +2,6 @@ import { rm } from "node:fs/promises";
 import { join } from "node:path";
 import {
 	type CascadeDeleter,
-	createCascadeDeleter,
 	createSqliteCascadeDeleter,
 } from "@remit/drizzle-service";
 import type { Logger } from "@remit/logger-lambda";
@@ -30,22 +29,15 @@ const deleteStoragePrefix = async (
 	log.info({ keyPrefix, target }, "Filesystem storage prefix cleanup complete");
 };
 
-// The Drizzle cascade deleter is opened once, on first use, and reused. On
-// Postgres it binds to `PG_CONNECTION_URL`; on SQLite it opens the shared file
-// at `SQLITE_DB_PATH` (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.
+// 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,
+// 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 buildDeleter = async (): Promise<CascadeDeleter> => {
-	if (process.env.DATA_BACKEND === "sqlite") {
-		return createSqliteCascadeDeleter(env.SQLITE_DB_PATH);
-	}
-	return createCascadeDeleter(env.PG_CONNECTION_URL);
-};
-
 const getDeleter = (): Promise<CascadeDeleter> => {
-	if (!deleterPromise) deleterPromise = buildDeleter();
+	if (!deleterPromise)
+		deleterPromise = createSqliteCascadeDeleter(env.SQLITE_DB_PATH);
 	return deleterPromise;
 };
 
@@ -60,7 +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 Postgres or SQLite. Message
+ * - `cascadeDelete`: the Drizzle cascade over SQLite. Message
  *   subtrees emit `message.removed` outbox rows the search-index worker relays.
  */
 export const buildRelationalDeletionCapabilities =

package/src/config.ts

@@ -52,10 +52,10 @@ export const graceSeconds = graceSecondsRaw
 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.
+// runs on whatever backend `getClient()` resolved — DynamoDB (ElectroDB) or
+// SQLite (Drizzle). Filter/FilterAnchor/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> => {
 	if (!cascadeServicesPromise) {
 		cascadeServicesPromise = getClient().then((remitClient) => ({

package/src/deletion-capabilities.ts

@@ -14,12 +14,11 @@ import type { CascadeEntity } from "./cascade.js";
  *   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
+ * - `compose-relational.ts` (self-host stack, RFC 035/036): 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
- *   Drizzle cascade over Postgres or SQLite.
+ *   Drizzle cascade over SQLite.
  */
 export interface DeletionCapabilities {
 	/**
@@ -49,18 +48,12 @@ export interface DeletionCapabilities {
 	deleteStoragePrefix(keyPrefix: string, log: Logger): Promise<void>;
 	/**
 	 * Remove the enumerated rows in dependency order (children → parents). AWS:
-	 * DynamoDB `BatchWriteItem`. Relational: Drizzle transaction (Postgres or
-	 * SQLite). Excludes the AccountConfig row, which the caller deletes last
+	 * DynamoDB `BatchWriteItem`. Relational: a Drizzle transaction. Excludes the AccountConfig row, which the caller deletes last
 	 * through its repository as the cascade-in-progress marker.
 	 */
 	cascadeDelete(entities: CascadeEntity[], log: Logger): Promise<void>;
 }
 
-const isRelationalBackend = (): boolean => {
-	const backend = process.env.DATA_BACKEND;
-	return backend === "postgres" || backend === "sqlite";
-};
-
 let injectedCapabilities: DeletionCapabilities | null = null;
 
 /**
@@ -77,18 +70,16 @@ export const setDeletionCapabilities = (
 
 const buildDeletionCapabilitiesFromEnv =
 	async (): Promise<DeletionCapabilities> => {
-		if (isRelationalBackend()) {
+		if (injectedCapabilities) return injectedCapabilities;
+		if (process.env.SQLITE_DB_PATH) {
 			const { buildRelationalDeletionCapabilities } = await import(
 				"./compose-relational.js"
 			);
 			return buildRelationalDeletionCapabilities();
 		}
-		if (!injectedCapabilities) {
-			throw new Error(
-				"no DynamoDB deletion capabilities registered — register them with setDeletionCapabilities() from your composition root",
-			);
-		}
-		return injectedCapabilities;
+		throw new Error(
+			"no deletion capabilities registered — register them with setDeletionCapabilities() from your composition root",
+		);
 	};
 
 let capabilitiesPromise: Promise<DeletionCapabilities> | undefined;

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

@@ -106,18 +106,18 @@ describe("processAccountDataPurge", () => {
 		);
 	});
 
-	it("skips vector deletes on the postgres backend, still enqueuing finalize", async () => {
+	it("skips vector deletes on the relational backend, still enqueuing finalize", async () => {
 		const sent: Sent[] = [];
 		await processAccountDataPurge(
 			event,
 			noopLog,
-			baseDeps(sent, { dataBackend: "postgres" }),
+			baseDeps(sent, { dataBackend: "sqlite" }),
 		);
 
 		assert.equal(
 			sent.some((m) => m.queueUrl === "http://queue/search"),
 			false,
-			"no search-index enqueue on postgres",
+			"no search-index enqueue on the relational backend",
 		);
 		assert.deepEqual(
 			sent

package/src/handlers/account-purge.ts

@@ -196,11 +196,11 @@ export const processAccountDataPurge = async (
 
 	const messageIds = [...new Set(items.map((i) => i.messageId))];
 
-	// On Postgres the destructive delete emits a `message.removed` outbox row per
-	// message, which the pg-index worker relays as a search-index REMOVE; enqueuing
-	// here too would double the removal. On DynamoDB this fanout is the sole
-	// producer of the vector deletes (#457).
-	if (dataBackend !== "postgres") {
+	// On the relational backend the destructive delete emits a `message.removed`
+	// outbox row per message, which the search-index worker relays as a
+	// search-index REMOVE; enqueuing here too would double the removal. On
+	// DynamoDB this fanout is the sole producer of the vector deletes (#457).
+	if (dataBackend !== "sqlite") {
 		await enqueueVectorDeletes(
 			sqsFor(searchIndexQueueUrl),
 			searchIndexQueueUrl,

package/src/handlers/organize-job.ts

@@ -39,14 +39,19 @@ export const processOrganizeJob = async (
 
 	try {
 		const predicate = predicateFromJob(job);
+		const matchDeps = buildOrganizeMatchDeps(client);
 		const { messageIds, semanticUnavailable } = await matchOrganize(
-			buildOrganizeMatchDeps(client),
+			matchDeps,
 			accountConfigId,
 			predicate,
 			ORGANIZE_MATCH_LIMIT,
 		);
 		const { applied, failed } = await applyOrganize(
-			{ client, moveService: buildOrganizeMoveService(client) },
+			{
+				client,
+				moveService: buildOrganizeMoveService(client),
+				match: matchDeps,
+			},
 			accountConfigId,
 			messageIds,
 			predicate,

package/src/poller.ts

@@ -5,7 +5,7 @@ import { fanoutHandler, finalizeHandler } from "./index.js";
 
 /**
  * Production queue poller. No e2e shim exists for account-worker today —
- * the deletion cascade is not exercised on the Postgres/compose stack in
+ * the deletion cascade is not exercised on the compose stack in
  * CI (see AGENTS.md worker roster notes). This is the standalone
  * production entrypoint for the dedicated image.
  *