@fedify/postgres 2.0.0-pr.559.6 → 2.0.1-dev.400

package/dist/mq.cjs

@@ -12,6 +12,14 @@ const logger = (0, __logtape_logtape.getLogger)([
 	"postgres",
 	"mq"
 ]);
+const INITIALIZE_MAX_ATTEMPTS = 5;
+const INITIALIZE_BACKOFF_MS = 10;
+function sleep(milliseconds) {
+	return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+function isInitializationRaceError(error) {
+	return error instanceof postgres.default.PostgresError && (error.constraint_name === "pg_type_typname_nsp_index" || error.code === "42P07" || error.code === "42710");
+}
 /**
 * A message queue that uses PostgreSQL as the underlying storage.
 *
@@ -35,6 +43,7 @@ var PostgresMessageQueue = class {
 	#channelName;
 	#pollIntervalMs;
 	#initialized;
+	#initPromise;
 	#driverSerializesJson = false;
 	constructor(sql, options = {}) {
 		this.#sql = sql;
@@ -114,7 +123,7 @@ var PostgresMessageQueue = class {
 		const poll = async () => {
 			while (!signal?.aborted) {
 				let processed = false;
-				const query = this.#sql`
+				for (const row of await this.#sql`
           WITH candidate AS (
             SELECT id, ordering_key
             FROM ${this.#sql(this.#tableName)}
@@ -127,15 +136,11 @@ var PostgresMessageQueue = class {
           DELETE FROM ${this.#sql(this.#tableName)}
           WHERE id IN (SELECT id FROM candidate)
           RETURNING message, ordering_key;
-        `.execute();
-				const cancel = query.cancel.bind(query);
-				signal?.addEventListener("abort", cancel);
-				for (const row of await query) {
+        `) {
 					if (signal?.aborted) return;
 					await handler(row.message);
 					processed = true;
 				}
-				signal?.removeEventListener("abort", cancel);
 				if (processed) continue;
 				const attemptedOrderingKeys = /* @__PURE__ */ new Set();
 				while (!signal?.aborted) {
@@ -153,49 +158,67 @@ var PostgresMessageQueue = class {
 					const candidateId = candidate.id;
 					const orderingKey = candidate.ordering_key;
 					attemptedOrderingKeys.add(orderingKey);
-					const lockResult = await this.#sql`
-            SELECT pg_try_advisory_lock(
-              hashtext(${this.#tableName}),
-              hashtext(${orderingKey})
-            ) AS acquired
-          `;
-					if (lockResult[0].acquired) {
-						try {
-							const deleteResult = await this.#sql`
-                DELETE FROM ${this.#sql(this.#tableName)}
-                WHERE id = ${candidateId}
-                RETURNING message, ordering_key
-              `;
-							for (const row of deleteResult) {
-								if (signal?.aborted) return;
-								await handler(row.message);
-								processed = true;
+					const reserved = await this.#sql.reserve();
+					try {
+						const lockResult = await reserved`
+              SELECT pg_try_advisory_lock(
+                hashtext(${this.#tableName}),
+                hashtext(${orderingKey})
+              ) AS acquired
+            `;
+						if (lockResult[0].acquired) {
+							try {
+								const deleteResult = await reserved`
+                  DELETE FROM ${reserved(this.#tableName)}
+                  WHERE id = ${candidateId}
+                  RETURNING message, ordering_key
+                `;
+								for (const row of deleteResult) {
+									if (signal?.aborted) return;
+									await handler(row.message);
+									processed = true;
+								}
+							} finally {
+								await reserved`
+                  SELECT pg_advisory_unlock(
+                    hashtext(${this.#tableName}),
+                    hashtext(${orderingKey})
+                  )
+                `;
 							}
-						} finally {
-							await this.#sql`
-                SELECT pg_advisory_unlock(
-                  hashtext(${this.#tableName}),
-                  hashtext(${orderingKey})
-                )
-              `;
+							if (processed) break;
 						}
-						if (processed) break;
+					} finally {
+						reserved.release();
 					}
 				}
 				if (processed) continue;
 				break;
 			}
 		};
+		let pollLock = Promise.resolve();
+		const serializedPoll = () => {
+			const next = pollLock.then(poll);
+			pollLock = next.catch(() => {});
+			return next;
+		};
 		const timeouts = /* @__PURE__ */ new Set();
 		const listen = await this.#sql.listen(this.#channelName, async (delay) => {
 			const duration = Temporal.Duration.from(delay);
 			const durationMs = duration.total("millisecond");
-			if (durationMs < 1) await poll();
-			else timeouts.add(setTimeout(poll, durationMs));
-		}, poll);
+			if (durationMs < 1) await serializedPoll();
+			else {
+				const timeout = setTimeout(() => {
+					timeouts.delete(timeout);
+					serializedPoll();
+				}, durationMs);
+				timeouts.add(timeout);
+			}
+		}, serializedPoll);
 		signal?.addEventListener("abort", () => {
 			listen.unlisten();
 			for (const timeout of timeouts) clearTimeout(timeout);
+			timeouts.clear();
 		});
 		while (!signal?.aborted) {
 			let timeout;
@@ -208,7 +231,7 @@ var PostgresMessageQueue = class {
 				timeouts.add(timeout);
 			});
 			if (timeout != null) timeouts.delete(timeout);
-			await poll();
+			await serializedPoll();
 		}
 		await new Promise((resolve) => {
 			signal?.addEventListener("abort", () => resolve());
@@ -218,10 +241,13 @@ var PostgresMessageQueue = class {
 	/**
 	* Initializes the message queue table if it does not already exist.
 	*/
-	async initialize() {
-		if (this.#initialized) return;
+	initialize() {
+		if (this.#initialized) return Promise.resolve();
+		return this.#initPromise ??= this.#doInitialize();
+	}
+	async #doInitialize() {
 		logger.debug("Initializing the message queue table {tableName}...", { tableName: this.#tableName });
-		try {
+		for (let attempt = 1; attempt <= INITIALIZE_MAX_ATTEMPTS; attempt++) try {
 			await this.#sql`
       CREATE TABLE IF NOT EXISTS ${this.#sql(this.#tableName)} (
         id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
@@ -235,11 +261,21 @@ var PostgresMessageQueue = class {
       ALTER TABLE ${this.#sql(this.#tableName)}
       ADD COLUMN IF NOT EXISTS ordering_key text;
     `;
+			break;
 		} catch (error) {
-			if (!(error instanceof postgres.default.PostgresError && error.constraint_name === "pg_type_typname_nsp_index")) {
+			if (!isInitializationRaceError(error) || attempt >= INITIALIZE_MAX_ATTEMPTS) {
 				logger.error("Failed to initialize the message queue table: {error}", { error });
 				throw error;
 			}
+			const backoffMs = INITIALIZE_BACKOFF_MS * 2 ** (attempt - 1);
+			logger.debug("Initialization raced for table {tableName}; retrying in {backoffMs}ms (attempt {attempt}/{maxAttempts}).", {
+				tableName: this.#tableName,
+				backoffMs,
+				attempt,
+				maxAttempts: INITIALIZE_MAX_ATTEMPTS,
+				error
+			});
+			await sleep(backoffMs);
 		}
 		this.#driverSerializesJson = await require_utils.driverSerializesJson(this.#sql);
 		this.#initialized = true;

package/dist/mq.js

@@ -11,6 +11,14 @@ const logger = getLogger([
 	"postgres",
 	"mq"
 ]);
+const INITIALIZE_MAX_ATTEMPTS = 5;
+const INITIALIZE_BACKOFF_MS = 10;
+function sleep(milliseconds) {
+	return new Promise((resolve) => setTimeout(resolve, milliseconds));
+}
+function isInitializationRaceError(error) {
+	return error instanceof postgres.PostgresError && (error.constraint_name === "pg_type_typname_nsp_index" || error.code === "42P07" || error.code === "42710");
+}
 /**
 * A message queue that uses PostgreSQL as the underlying storage.
 *
@@ -34,6 +42,7 @@ var PostgresMessageQueue = class {
 	#channelName;
 	#pollIntervalMs;
 	#initialized;
+	#initPromise;
 	#driverSerializesJson = false;
 	constructor(sql, options = {}) {
 		this.#sql = sql;
@@ -113,7 +122,7 @@ var PostgresMessageQueue = class {
 		const poll = async () => {
 			while (!signal?.aborted) {
 				let processed = false;
-				const query = this.#sql`
+				for (const row of await this.#sql`
           WITH candidate AS (
             SELECT id, ordering_key
             FROM ${this.#sql(this.#tableName)}
@@ -126,15 +135,11 @@ var PostgresMessageQueue = class {
           DELETE FROM ${this.#sql(this.#tableName)}
           WHERE id IN (SELECT id FROM candidate)
           RETURNING message, ordering_key;
-        `.execute();
-				const cancel = query.cancel.bind(query);
-				signal?.addEventListener("abort", cancel);
-				for (const row of await query) {
+        `) {
 					if (signal?.aborted) return;
 					await handler(row.message);
 					processed = true;
 				}
-				signal?.removeEventListener("abort", cancel);
 				if (processed) continue;
 				const attemptedOrderingKeys = /* @__PURE__ */ new Set();
 				while (!signal?.aborted) {
@@ -152,49 +157,67 @@ var PostgresMessageQueue = class {
 					const candidateId = candidate.id;
 					const orderingKey = candidate.ordering_key;
 					attemptedOrderingKeys.add(orderingKey);
-					const lockResult = await this.#sql`
-            SELECT pg_try_advisory_lock(
-              hashtext(${this.#tableName}),
-              hashtext(${orderingKey})
-            ) AS acquired
-          `;
-					if (lockResult[0].acquired) {
-						try {
-							const deleteResult = await this.#sql`
-                DELETE FROM ${this.#sql(this.#tableName)}
-                WHERE id = ${candidateId}
-                RETURNING message, ordering_key
-              `;
-							for (const row of deleteResult) {
-								if (signal?.aborted) return;
-								await handler(row.message);
-								processed = true;
+					const reserved = await this.#sql.reserve();
+					try {
+						const lockResult = await reserved`
+              SELECT pg_try_advisory_lock(
+                hashtext(${this.#tableName}),
+                hashtext(${orderingKey})
+              ) AS acquired
+            `;
+						if (lockResult[0].acquired) {
+							try {
+								const deleteResult = await reserved`
+                  DELETE FROM ${reserved(this.#tableName)}
+                  WHERE id = ${candidateId}
+                  RETURNING message, ordering_key
+                `;
+								for (const row of deleteResult) {
+									if (signal?.aborted) return;
+									await handler(row.message);
+									processed = true;
+								}
+							} finally {
+								await reserved`
+                  SELECT pg_advisory_unlock(
+                    hashtext(${this.#tableName}),
+                    hashtext(${orderingKey})
+                  )
+                `;
 							}
-						} finally {
-							await this.#sql`
-                SELECT pg_advisory_unlock(
-                  hashtext(${this.#tableName}),
-                  hashtext(${orderingKey})
-                )
-              `;
+							if (processed) break;
 						}
-						if (processed) break;
+					} finally {
+						reserved.release();
 					}
 				}
 				if (processed) continue;
 				break;
 			}
 		};
+		let pollLock = Promise.resolve();
+		const serializedPoll = () => {
+			const next = pollLock.then(poll);
+			pollLock = next.catch(() => {});
+			return next;
+		};
 		const timeouts = /* @__PURE__ */ new Set();
 		const listen = await this.#sql.listen(this.#channelName, async (delay) => {
 			const duration = Temporal.Duration.from(delay);
 			const durationMs = duration.total("millisecond");
-			if (durationMs < 1) await poll();
-			else timeouts.add(setTimeout(poll, durationMs));
-		}, poll);
+			if (durationMs < 1) await serializedPoll();
+			else {
+				const timeout = setTimeout(() => {
+					timeouts.delete(timeout);
+					serializedPoll();
+				}, durationMs);
+				timeouts.add(timeout);
+			}
+		}, serializedPoll);
 		signal?.addEventListener("abort", () => {
 			listen.unlisten();
 			for (const timeout of timeouts) clearTimeout(timeout);
+			timeouts.clear();
 		});
 		while (!signal?.aborted) {
 			let timeout;
@@ -207,7 +230,7 @@ var PostgresMessageQueue = class {
 				timeouts.add(timeout);
 			});
 			if (timeout != null) timeouts.delete(timeout);
-			await poll();
+			await serializedPoll();
 		}
 		await new Promise((resolve) => {
 			signal?.addEventListener("abort", () => resolve());
@@ -217,10 +240,13 @@ var PostgresMessageQueue = class {
 	/**
 	* Initializes the message queue table if it does not already exist.
 	*/
-	async initialize() {
-		if (this.#initialized) return;
+	initialize() {
+		if (this.#initialized) return Promise.resolve();
+		return this.#initPromise ??= this.#doInitialize();
+	}
+	async #doInitialize() {
 		logger.debug("Initializing the message queue table {tableName}...", { tableName: this.#tableName });
-		try {
+		for (let attempt = 1; attempt <= INITIALIZE_MAX_ATTEMPTS; attempt++) try {
 			await this.#sql`
       CREATE TABLE IF NOT EXISTS ${this.#sql(this.#tableName)} (
         id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
@@ -234,11 +260,21 @@ var PostgresMessageQueue = class {
       ALTER TABLE ${this.#sql(this.#tableName)}
       ADD COLUMN IF NOT EXISTS ordering_key text;
     `;
+			break;
 		} catch (error) {
-			if (!(error instanceof postgres.PostgresError && error.constraint_name === "pg_type_typname_nsp_index")) {
+			if (!isInitializationRaceError(error) || attempt >= INITIALIZE_MAX_ATTEMPTS) {
 				logger.error("Failed to initialize the message queue table: {error}", { error });
 				throw error;
 			}
+			const backoffMs = INITIALIZE_BACKOFF_MS * 2 ** (attempt - 1);
+			logger.debug("Initialization raced for table {tableName}; retrying in {backoffMs}ms (attempt {attempt}/{maxAttempts}).", {
+				tableName: this.#tableName,
+				backoffMs,
+				attempt,
+				maxAttempts: INITIALIZE_MAX_ATTEMPTS,
+				error
+			});
+			await sleep(backoffMs);
 		}
 		this.#driverSerializesJson = await driverSerializesJson(this.#sql);
 		this.#initialized = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/postgres",
-  "version": "2.0.0-pr.559.6+b50404e9",
+  "version": "2.0.1-dev.400+51b2d013",
   "description": "PostgreSQL drivers for Fedify",
   "keywords": [
     "fedify",
@@ -74,14 +74,14 @@
   },
   "peerDependencies": {
     "postgres": "^3.4.7",
-    "@fedify/fedify": "^2.0.0-pr.559.6+b50404e9"
+    "@fedify/fedify": "^2.0.1-dev.400+51b2d013"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
     "tsdown": "^0.12.9",
     "typescript": "^5.9.3",
     "@fedify/fixture": "^2.0.0",
-    "@fedify/testing": "^2.0.0-pr.559.6+b50404e9"
+    "@fedify/testing": "^2.0.1-dev.400+51b2d013"
   },
   "scripts": {
     "build:self": "tsdown",
@@ -90,6 +90,6 @@
     "pretest": "pnpm build",
     "test": "node --experimental-transform-types --test",
     "pretest:bun": "pnpm build",
-    "test:bun": "bun test --timeout=10000"
+    "test:bun": "bun test --timeout=60000"
   }
 }