@remit/drizzle-service 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/drizzle-service",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Drizzle ORM service over SQLite",
   "type": "module",
   "main": "src/index.ts",

package/src/repos/message.ts

@@ -18,6 +18,7 @@ import {
 	lt,
 	or,
 	type SQL,
+	sql,
 } from "drizzle-orm";
 import type { SqliteBatchItem, WriteBatch } from "../batch.js";
 import { chunk, chunkRows } from "../bound-parameters.js";
@@ -280,6 +281,32 @@ const placementTerms = (expected: PlacementPredicate): SQL[] => {
 	return terms;
 };
 
+/** The rows `listStrandedPlacements` returns: `moving` or `deleting`, unwritten since `untouchedSince`. */
+export const strandedPlacementCondition = (
+	mailboxIds: readonly string[],
+	untouchedSince: number,
+): SQL =>
+	and(
+		lt(messageTable.updatedAt, untouchedSince),
+		or(
+			and(
+				eq(messageTable.status, "moving"),
+				inList(messageTable.originalMailboxId, mailboxIds),
+				isNotNull(messageTable.originalUid),
+			),
+			and(
+				eq(messageTable.status, "deleting"),
+				inList(messageTable.mailboxId, mailboxIds),
+			),
+			and(
+				eq(messageTable.status, "moving"),
+				eq(messageTable.uid, 0),
+				isNull(messageTable.originalUid),
+				inList(messageTable.mailboxId, mailboxIds),
+			),
+		),
+	) ?? sql`0`;
+
 export class DrizzleMessageRepository implements IMessageRepository {
 	private readonly db: DB;
 	private readonly batch: WriteBatch;
@@ -888,32 +915,10 @@ export class DrizzleMessageRepository implements IMessageRepository {
 		untouchedSince: number,
 	): ReturnType<IMessageRepository["listStrandedPlacements"]> {
 		if (mailboxIds.length === 0) return [];
-		const ids = [...mailboxIds];
 		const rows = await this.db
 			.select()
 			.from(messageTable)
-			.where(
-				and(
-					lt(messageTable.updatedAt, untouchedSince),
-					or(
-						and(
-							eq(messageTable.status, "moving"),
-							inList(messageTable.originalMailboxId, ids),
-							isNotNull(messageTable.originalUid),
-						),
-						and(
-							eq(messageTable.status, "deleting"),
-							inList(messageTable.mailboxId, ids),
-						),
-						and(
-							eq(messageTable.status, "moving"),
-							eq(messageTable.uid, 0),
-							isNull(messageTable.originalUid),
-							inList(messageTable.mailboxId, ids),
-						),
-					),
-				),
-			)
+			.where(strandedPlacementCondition(mailboxIds, untouchedSince))
 			.orderBy(asc(messageTable.updatedAt), asc(messageTable.messageId));
 		return rows.map(toMessageItem);
 	}

package/src/search/thread-message-search.sqlite.test.ts

@@ -161,6 +161,29 @@ describe("the thread-message search index in its own database", () => {
 		assert.deepEqual(await found("receipt"), [created.threadMessageId]);
 	});
 
+	test("rebuilds while a live writer indexes a message the rebuild has yet to reach", async () => {
+		const created = await repo.create(input({ subject: "Raced reminder" }));
+		const store = syncStore(search.db, BETTER_SQLITE3_LIMITS);
+		let raced = false;
+		const migrator = new SearchIndex(mail.db, {
+			...store,
+			batch: async (items) => {
+				if (!raced) {
+					raced = true;
+					await index.sync([created.threadMessageId]);
+				}
+				return store.batch(items);
+			},
+		});
+
+		await migrator.rebuild();
+		await migrator.rebuild();
+
+		assert.equal(raced, true);
+		assert.equal(await index.needsRebuild(), false);
+		assert.deepEqual(await found("reminder"), [created.threadMessageId]);
+	});
+
 	test("matches the body text past the snippet, through a rewrite and a rebuild", async () => {
 		const created = await repo.create(
 			input({ subject: "Long letter", snippet: "Dear reader, a preview" }),

package/src/search/thread-message-search.ts

@@ -267,13 +267,24 @@ export class SearchIndex {
 				.limit(DOCUMENTS_PER_REBUILD_PAGE);
 			const last = rows.at(-1);
 			if (!last) return indexed;
+			// A live writer may index one of these messages after the delete
+			// above, so each page replaces its documents the way sync does.
 			await this.batch(
-				chunkRows(threadMessageSearchTable, rows, this.maxBoundParameters).map(
-					(slice) =>
-						this.search
-							.insert(threadMessageSearchTable)
-							.values(slice.map(toDocument)),
-				),
+				chunkRows(
+					threadMessageSearchTable,
+					rows,
+					this.maxBoundParameters,
+				).flatMap((slice) => [
+					this.search.delete(threadMessageSearchTable).where(
+						inArray(
+							threadMessageSearchTable.rowid,
+							slice.map((row) => searchRowid(row.threadMessageId)),
+						),
+					),
+					this.search
+						.insert(threadMessageSearchTable)
+						.values(slice.map(toDocument)),
+				]),
 			);
 			indexed += rows.length;
 			after = last.threadMessageId;