@remit/queue-sidecar 0.0.15 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@remit/queue-sidecar",
-	"version": "0.0.15",
+	"version": "0.1.1",
 	"type": "module",
 	"main": "src/index.ts",
 	"types": "src/index.ts",

package/src/store.test.ts

@@ -326,7 +326,6 @@ describe("QueueStore", () => {
 			filename: path,
 			mode: "open",
 			synchronous: "FULL",
-			schema: {},
 		});
 		seed.sqlite
 			.prepare(

package/src/store.ts

@@ -53,8 +53,6 @@ const releaseRedrive = sqliteTable("release_redrive", {
 	release: text("release").notNull(),
 });
 
-const schema = { queues, messages, dedup, releaseRedrive };
-
 export interface QueueDefinition {
 	readonly name: string;
 	readonly fifo: boolean;
@@ -130,8 +128,8 @@ const toQueueRecord = (row: QueueRow): QueueRecord => ({
  * here so the behaviour is testable without a running HTTP server.
  */
 export class QueueStore {
-	private readonly handle: SqliteHandle<typeof schema>;
-	private readonly db: SqliteHandle<typeof schema>["db"];
+	private readonly handle: SqliteHandle;
+	private readonly db: SqliteHandle["db"];
 	private sequenceCounter: bigint;
 	private readonly startedAt = Date.now();
 	private readonly lastReceiveAt = new Map<string, number>();
@@ -146,7 +144,6 @@ export class QueueStore {
 			filename,
 			mode: "create",
 			synchronous: "FULL",
-			schema,
 		});
 		this.db = this.handle.db;
 		this.migrate();
@@ -508,6 +505,15 @@ export class QueueStore {
 	 * a FIFO group still sees it after anything sent since.
 	 */
 	redriveDeadLetters(deadLetterName: string, now = Date.now()): number {
+		return this.db.transaction(
+			(): number => this.moveDeadLetters(deadLetterName, now),
+			IMMEDIATE,
+		);
+	}
+
+	// The body of a redrive, for a caller already inside a transaction:
+	// node:sqlite cannot begin one inside another.
+	private moveDeadLetters(deadLetterName: string, now: number): number {
 		this.requireQueue(deadLetterName);
 		const source = this.listQueues().find(
 			(queue) => queue.deadLetterTargetName === deadLetterName,
@@ -517,18 +523,14 @@ export class QueueStore {
 				`${deadLetterName} is not the dead-letter queue of any queue`,
 			);
 		}
-		const destination = source.name;
-
-		return this.db.transaction((): number => {
-			const rows = this.db
-				.select()
-				.from(messages)
-				.where(eq(messages.queueName, deadLetterName))
-				.orderBy(asc(messages.id))
-				.all();
-			for (const row of rows) this.moveToQueue(row, destination, now);
-			return rows.length;
-		}, IMMEDIATE);
+		const rows = this.db
+			.select()
+			.from(messages)
+			.where(eq(messages.queueName, deadLetterName))
+			.orderBy(asc(messages.id))
+			.all();
+		for (const row of rows) this.moveToQueue(row, source.name, now);
+		return rows.length;
 	}
 
 	redriveForRelease(release: string, deadLetterNames: string[]): void {
@@ -539,7 +541,8 @@ export class QueueStore {
 				.where(eq(releaseRedrive.id, 1))
 				.get();
 			if (marker?.release === release) return;
-			for (const name of deadLetterNames) this.redriveDeadLetters(name);
+			const now = Date.now();
+			for (const name of deadLetterNames) this.moveDeadLetters(name, now);
 			this.db
 				.insert(releaseRedrive)
 				.values({ id: 1, release })