@remit/backend 0.0.42 → 0.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/backend",
-  "version": "0.0.42",
+  "version": "0.0.43",
   "description": "Remit Mail Inspector API backend",
   "license": "MIT",
   "author": "",

package/src/handlers/filter.test.ts

@@ -1,8 +1,23 @@
 import assert from "node:assert/strict";
-import { describe, it } from "node:test";
-import type { UpdateFilterInput as UpdateFilterRequestBody } from "@remit/api-openapi-types";
-import { FilterScope, FilterState } from "@remit/domain-enums";
+import { describe, it, mock } from "node:test";
+import type {
+	CreateFilterInput,
+	UpdateFilterInput as UpdateFilterRequestBody,
+} from "@remit/api-openapi-types";
+import type {
+	CreateFilterAnchorInput,
+	CreateFilterInput as FilterAnchorTxCreateInput,
+	FilterItem,
+} from "@remit/data-ports";
 import {
+	FilterMatchOperator,
+	FilterScope,
+	FilterState,
+} from "@remit/domain-enums";
+import type { AnchorPayload } from "@remit/search-service";
+import {
+	createFilterWithAnchor,
+	type FilterCrudDeps,
 	pickFilterUpdate,
 	rejectAnchorMutation,
 	resolveFilterScopeExpiry,
@@ -163,3 +178,139 @@ describe("resolveFilterScopeExpiry (reader #266)", () => {
 		);
 	});
 });
+
+describe("createFilterWithAnchor (#351)", () => {
+	const ACCOUNT_CONFIG_ID = "acct-1";
+
+	const baseInput: CreateFilterInput = {
+		name: "Booking confirmations",
+		scope: FilterScope.Standing,
+		matchOperator: FilterMatchOperator.And,
+		literalClauses: [],
+		actionLabelId: "None",
+		actionMailboxId: "None",
+	};
+
+	const baseFilter: FilterItem = {
+		filterId: "filter-1",
+		accountConfigId: ACCOUNT_CONFIG_ID,
+		name: baseInput.name,
+		scope: FilterScope.Standing,
+		state: FilterState.Active,
+		hasAnchor: false,
+		ruleChangedAt: 1_700_000_000,
+		matchOperator: FilterMatchOperator.And,
+		literalClauses: [],
+		actionLabelId: "None",
+		actionMailboxId: "None",
+		createdAt: 1_700_000_000_000,
+		updatedAt: 1_700_000_000_000,
+	};
+
+	const anchorPayload: AnchorPayload = {
+		anchorEmbedding: [0.1, 0.2, 0.3],
+		anchorEmbeddingId: "amazon.titan-embed-text-v2:0@1024",
+		anchorSourceText: "Your booking is confirmed",
+	};
+
+	type AnchorArg = Omit<CreateFilterAnchorInput, "filterId"> | null;
+	const createWithAnchorMock = (
+		impl: (
+			filter: FilterAnchorTxCreateInput,
+			anchor: AnchorArg,
+		) => Promise<FilterItem>,
+	) => mock.fn(impl);
+
+	it("creates a purely-literal filter through one atomic call when there is no anchor message", async () => {
+		const createWithAnchor = createWithAnchorMock(async () => baseFilter);
+		const deps: FilterCrudDeps = {
+			filterAnchorTransaction: { createWithAnchor },
+			buildAnchor: mock.fn(async () => null),
+		};
+
+		const filter = await createFilterWithAnchor(
+			deps,
+			ACCOUNT_CONFIG_ID,
+			baseInput,
+		);
+
+		assert.equal(filter, baseFilter);
+		assert.equal(createWithAnchor.mock.calls.length, 1);
+		const [filterArg, anchorArg] = createWithAnchor.mock.calls[0].arguments;
+		assert.equal(filterArg.hasAnchor, false);
+		assert.equal(anchorArg, null);
+	});
+
+	it("passes the built anchor and the new hasAnchor flag to the same atomic call", async () => {
+		const createWithAnchor = createWithAnchorMock(async () => ({
+			...baseFilter,
+			hasAnchor: true,
+		}));
+		const buildAnchor = mock.fn(async () => anchorPayload);
+		const deps: FilterCrudDeps = {
+			filterAnchorTransaction: { createWithAnchor },
+			buildAnchor,
+		};
+		const input: CreateFilterInput = {
+			...baseInput,
+			anchorMessageId: "msg-1",
+		};
+
+		const filter = await createFilterWithAnchor(deps, ACCOUNT_CONFIG_ID, input);
+
+		assert.equal(filter.hasAnchor, true);
+		assert.equal(buildAnchor.mock.calls.length, 1);
+		assert.deepEqual(buildAnchor.mock.calls[0].arguments, [
+			ACCOUNT_CONFIG_ID,
+			"msg-1",
+		]);
+
+		assert.equal(createWithAnchor.mock.calls.length, 1);
+		const [filterArg, anchorArg] = createWithAnchor.mock.calls[0].arguments;
+		assert.equal(filterArg.hasAnchor, true);
+		assert.deepEqual(anchorArg, {
+			accountConfigId: ACCOUNT_CONFIG_ID,
+			anchorMessageId: "msg-1",
+			anchorEmbedding: anchorPayload.anchorEmbedding,
+			anchorEmbeddingId: anchorPayload.anchorEmbeddingId,
+			anchorSourceText: anchorPayload.anchorSourceText,
+		});
+	});
+
+	it("creates a purely-literal filter when the anchor message has no indexed chunks", async () => {
+		const createWithAnchor = createWithAnchorMock(async () => baseFilter);
+		const deps: FilterCrudDeps = {
+			filterAnchorTransaction: { createWithAnchor },
+			buildAnchor: mock.fn(async () => null),
+		};
+		const input: CreateFilterInput = {
+			...baseInput,
+			anchorMessageId: "msg-with-no-chunks",
+		};
+
+		await createFilterWithAnchor(deps, ACCOUNT_CONFIG_ID, input);
+
+		const [filterArg, anchorArg] = createWithAnchor.mock.calls[0].arguments;
+		assert.equal(filterArg.hasAnchor, false);
+		assert.equal(anchorArg, null);
+	});
+
+	it("propagates a failed atomic write as a failed create request, not a silent partial success", async () => {
+		const createWithAnchor = createWithAnchorMock(async () => {
+			throw new Error("anchor write failed");
+		});
+		const deps: FilterCrudDeps = {
+			filterAnchorTransaction: { createWithAnchor },
+			buildAnchor: mock.fn(async () => anchorPayload),
+		};
+		const input: CreateFilterInput = {
+			...baseInput,
+			anchorMessageId: "msg-1",
+		};
+
+		await assert.rejects(
+			createFilterWithAnchor(deps, ACCOUNT_CONFIG_ID, input),
+			/anchor write failed/,
+		);
+	});
+});

package/src/handlers/filter.ts

@@ -3,7 +3,11 @@ import type {
 	FilterResponse,
 	UpdateFilterInput as UpdateFilterRequestBody,
 } from "@remit/api-openapi-types";
-import type { FilterItem, UpdateFilterInput } from "@remit/data-ports";
+import type {
+	FilterItem,
+	IFilterAnchorTransaction,
+	UpdateFilterInput,
+} from "@remit/data-ports";
 import { BadRequestError } from "@remit/data-ports/errors";
 import { FilterScope, FilterState } from "@remit/domain-enums";
 import type { AnchorPayload } from "@remit/search-service";
@@ -19,46 +23,18 @@ import type {
 import { assertAccountOwnership } from "./account-ownership.js";
 
 /**
- * Minimal filter-service surface the CRUD handlers need — declared as a `Pick`
- * so tests can stub it without a live table.
+ * Minimal filter-service surface the create handler needs — declared as a
+ * `Pick` so tests can stub it without a live table.
  */
 export interface FilterCrudDeps {
-	filter: {
-		create(input: {
-			accountConfigId: string;
-			name: string;
-			scope: FilterItem["scope"];
-			expiresAt?: string;
-			ttl?: number;
-			matchOperator: FilterItem["matchOperator"];
-			literalClauses: FilterItem["literalClauses"];
-			actionLabelId: string;
-			actionMailboxId: string;
-			hasAnchor: boolean;
-		}): Promise<FilterItem>;
-		get(accountConfigId: string, filterId: string): Promise<FilterItem>;
-		update(
-			accountConfigId: string,
-			filterId: string,
-			input: UpdateFilterInput,
-		): Promise<FilterItem>;
-		delete(accountConfigId: string, filterId: string): Promise<void>;
-		refreshExpiry(item: FilterItem): Promise<FilterItem>;
-		listPageByAccountConfig(
-			accountConfigId: string,
-			options?: { limit?: number; continuationToken?: string },
-		): Promise<{ items: FilterItem[]; continuationToken: string | undefined }>;
-	};
-	filterAnchor: {
-		put(input: {
-			accountConfigId: string;
-			filterId: string;
-			anchorMessageId: string;
-			anchorEmbedding: number[];
-			anchorEmbeddingId: string;
-			anchorSourceText: string;
-		}): Promise<unknown>;
-	};
+	/**
+	 * Creates the `Filter` row and its optional sibling `FilterAnchor` row in
+	 * one transaction (#351) — a failure on the anchor write can never leave a
+	 * `Filter` durably marked `hasAnchor: true` with no matching anchor row,
+	 * and it surfaces as a failed create request rather than a silently
+	 * broken filter.
+	 */
+	filterAnchorTransaction: IFilterAnchorTransaction;
 	buildAnchor(
 		accountConfigId: string,
 		anchorMessageId: string,
@@ -221,12 +197,11 @@ const toFilterResponse = (item: FilterItem): FilterResponse => ({
 
 /**
  * Create a filter, wiring the semantic anchor when `anchorMessageId` is set
- * (RFC 034 Decision 2). The anchor is built first, before the row is written,
- * so `hasAnchor` is set correctly at creation and the sibling `FilterAnchor`
- * row is written against the new `filterId` — never a second round-trip that
- * would bump `ruleChangedAt`. A message with no indexed chunks yields no anchor:
- * the filter is created as purely literal (`hasAnchor: false`) rather than with
- * an empty anchor.
+ * (RFC 034 Decision 2). The anchor is built first, then the `Filter` row and
+ * its sibling `FilterAnchor` row are written together in one transaction
+ * (#351) — never as two independent writes a partial failure could split. A
+ * message with no indexed chunks yields no anchor: the filter is created as
+ * purely literal (`hasAnchor: false`) rather than with an empty anchor.
  */
 export const createFilterWithAnchor = async (
 	deps: FilterCrudDeps,
@@ -238,31 +213,29 @@ export const createFilterWithAnchor = async (
 		? await deps.buildAnchor(accountConfigId, anchorMessageId)
 		: null;
 
-	const filter = await deps.filter.create({
-		accountConfigId,
-		name: input.name,
-		scope: input.scope,
-		expiresAt: input.expiresAt,
-		ttl: deriveFilterTtl(input.scope, input.expiresAt),
-		matchOperator: input.matchOperator,
-		literalClauses: input.literalClauses,
-		actionLabelId: input.actionLabelId,
-		actionMailboxId: input.actionMailboxId,
-		hasAnchor: anchor !== null,
-	});
-
-	if (anchor && anchorMessageId) {
-		await deps.filterAnchor.put({
+	return deps.filterAnchorTransaction.createWithAnchor(
+		{
 			accountConfigId,
-			filterId: filter.filterId,
-			anchorMessageId,
-			anchorEmbedding: anchor.anchorEmbedding,
-			anchorEmbeddingId: anchor.anchorEmbeddingId,
-			anchorSourceText: anchor.anchorSourceText,
-		});
-	}
-
-	return filter;
+			name: input.name,
+			scope: input.scope,
+			expiresAt: input.expiresAt,
+			ttl: deriveFilterTtl(input.scope, input.expiresAt),
+			matchOperator: input.matchOperator,
+			literalClauses: input.literalClauses,
+			actionLabelId: input.actionLabelId,
+			actionMailboxId: input.actionMailboxId,
+			hasAnchor: anchor !== null,
+		},
+		anchor && anchorMessageId
+			? {
+					accountConfigId,
+					anchorMessageId,
+					anchorEmbedding: anchor.anchorEmbedding,
+					anchorEmbeddingId: anchor.anchorEmbeddingId,
+					anchorSourceText: anchor.anchorSourceText,
+				}
+			: null,
+	);
 };
 
 export const FilterOperations: Record<
@@ -311,8 +284,7 @@ export const FilterOperations: Record<
 
 		const filter = await createFilterWithAnchor(
 			{
-				filter: client.filter,
-				filterAnchor: client.filterAnchor,
+				filterAnchorTransaction: client.filterAnchorTransaction,
 				buildAnchor: buildFilterAnchor,
 			},
 			accountConfigId,

package/src/service/compose-postgres.ts

@@ -5,6 +5,7 @@ import {
 	AccountSettingRepo,
 	AddressRepo,
 	DrizzleEnvelopeRepository,
+	DrizzleFilterAnchorTransaction,
 	DrizzleMessageFlagRepository,
 	DrizzleMessageRepository,
 	DrizzleThreadMessageRepository,
@@ -65,6 +66,7 @@ export const buildPostgresClient = (): RemitClient => {
 		flagPush: new MessageFlagPushRepo(genericDb),
 		filter: new FilterRepo(genericDb),
 		filterAnchor: new FilterAnchorRepo(genericDb),
+		filterAnchorTransaction: new DrizzleFilterAnchorTransaction(genericDb),
 		label: new LabelRepo(genericDb),
 		messageLabel: new MessageLabelRepo(genericDb),
 		unitOfWork: new DrizzleUnitOfWork(messageDataDb),

package/src/service/compose-sqlite.ts

@@ -6,6 +6,7 @@ import {
 	AddressRepo,
 	createSqliteDatabase,
 	DrizzleEnvelopeRepository,
+	DrizzleFilterAnchorTransaction,
 	DrizzleMessageFlagRepository,
 	DrizzleMessageRepository,
 	DrizzleThreadMessageRepository,
@@ -73,6 +74,7 @@ export const buildSqliteClient = async (): Promise<RemitClient> => {
 		flagPush: new MessageFlagPushRepo(genericDb),
 		filter: new FilterRepo(genericDb),
 		filterAnchor: new FilterAnchorRepo(genericDb),
+		filterAnchorTransaction: new DrizzleFilterAnchorTransaction(genericDb),
 		label: new LabelRepo(genericDb),
 		messageLabel: new MessageLabelRepo(genericDb),
 		unitOfWork: new DrizzleUnitOfWork(messageDataDb),

package/src/service/create-remit-client.ts

@@ -6,6 +6,7 @@ import type {
 	IAddressRepository,
 	IEnvelopeRepository,
 	IFilterAnchorRepository,
+	IFilterAnchorTransaction,
 	IFilterRepository,
 	ILabelRepository,
 	IMailboxLockRepository,
@@ -90,6 +91,11 @@ export interface RemitClient {
 	// on the row still existing, so the missing reaper is housekeeping only.
 	filter: IFilterRepository;
 	filterAnchor: IFilterAnchorRepository;
+
+	// Atomically creates a Filter and its optional sibling FilterAnchor row in
+	// one transaction (#351) — a failed anchor write can never leave a Filter
+	// durably marked hasAnchor: true with no matching FilterAnchor row.
+	filterAnchorTransaction: IFilterAnchorTransaction;
 	label: ILabelRepository;
 	messageLabel: IMessageLabelRepository;
 
@@ -163,6 +169,7 @@ export interface RemitClientRepositories {
 	flagPush: IMessageFlagPushRepository;
 	filter: IFilterRepository;
 	filterAnchor: IFilterAnchorRepository;
+	filterAnchorTransaction: IFilterAnchorTransaction;
 	label: ILabelRepository;
 	messageLabel: IMessageLabelRepository;
 	unitOfWork?: IUnitOfWork;
@@ -365,6 +372,7 @@ export const createRemitClient = (deps: RemitClientDeps): RemitClient => {
 		organizeJobRequest: repositories.organizeJobRequest,
 		filter: repositories.filter,
 		filterAnchor: repositories.filterAnchor,
+		filterAnchorTransaction: repositories.filterAnchorTransaction,
 		label: repositories.label,
 		messageLabel: repositories.messageLabel,
 		unitOfWork: repositories.unitOfWork,