@fedify/postgres 2.1.0-dev.421 → 2.1.0-dev.523

package/dist/mq.cjs

@@ -17,6 +17,15 @@ const INITIALIZE_BACKOFF_MS = 10;
 function sleep(milliseconds) {
 	return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
+function withTimeout(result, timeoutMs) {
+	const resolved = Promise.resolve(result);
+	if (timeoutMs <= 0) return resolved;
+	let timer;
+	const timeoutPromise = new Promise((_, reject) => {
+		timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Message handler timed out after ${timeoutMs}ms`)), timeoutMs);
+	});
+	return Promise.race([resolved, timeoutPromise]).finally(() => clearTimeout(timer));
+}
 function isInitializationRaceError(error) {
 	return error instanceof postgres.default.PostgresError && (error.constraint_name === "pg_type_typname_nsp_index" || error.constraint_name === "pg_class_relname_nsp_index" || error.code === "42P07" || error.code === "42710");
 }
@@ -47,6 +56,7 @@ var PostgresMessageQueue = class {
 	#tableName;
 	#channelName;
 	#pollIntervalMs;
+	#handlerTimeoutMs;
 	#initialized;
 	#initPromise;
 	#driverSerializesJson = false;
@@ -55,6 +65,7 @@ var PostgresMessageQueue = class {
 		this.#tableName = options?.tableName ?? "fedify_message_v2";
 		this.#channelName = options?.channelName ?? "fedify_channel";
 		this.#pollIntervalMs = Temporal.Duration.from(options?.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#handlerTimeoutMs = Temporal.Duration.from(options?.handlerTimeout ?? { seconds: 60 }).total("millisecond");
 		this.#initialized = options?.initialized ?? false;
 	}
 	async enqueue(message, options) {
@@ -143,7 +154,7 @@ var PostgresMessageQueue = class {
           RETURNING message, ordering_key;
         `) {
 					if (signal?.aborted) return;
-					await handler(row.message);
+					await withTimeout(handler(row.message), this.#handlerTimeoutMs);
 					processed = true;
 				}
 				if (processed) continue;
@@ -180,7 +191,7 @@ var PostgresMessageQueue = class {
                 `;
 								for (const row of deleteResult) {
 									if (signal?.aborted) return;
-									await handler(row.message);
+									await withTimeout(handler(row.message), this.#handlerTimeoutMs);
 									processed = true;
 								}
 							} finally {
@@ -219,15 +230,23 @@ var PostgresMessageQueue = class {
 		};
 		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 safeSerializedPoll("notify-immediate");
-			else {
-				const timeout = setTimeout(() => {
-					timeouts.delete(timeout);
-					safeSerializedPoll("notify-delayed");
-				}, durationMs);
-				timeouts.add(timeout);
+			try {
+				const duration = Temporal.Duration.from(delay);
+				const durationMs = duration.total("millisecond");
+				if (durationMs < 1) await safeSerializedPoll("notify-immediate");
+				else {
+					const timeout = setTimeout(() => {
+						timeouts.delete(timeout);
+						safeSerializedPoll("notify-delayed");
+					}, durationMs);
+					timeouts.add(timeout);
+				}
+			} catch (error) {
+				logger.error("Error parsing NOTIFY payload {delay}: {error}", {
+					delay,
+					error
+				});
+				await safeSerializedPoll("notify-fallback");
 			}
 		}, () => safeSerializedPoll("subscribe"));
 		signal?.addEventListener("abort", () => {

package/dist/mq.d.cts

@@ -28,6 +28,19 @@ interface PostgresMessageQueueOptions {
   * @default `{ seconds: 5 }`
   */
   readonly pollInterval?: Temporal.Duration | Temporal.DurationLike;
+  /**
+  * The maximum time to wait for a message handler to complete before
+  * considering it hung.  When a handler exceeds this timeout, it is
+  * treated as an error and the poll loop moves on to the next message,
+  * preventing a single hung handler from permanently blocking the queue.
+  *
+  * Set to zero to disable the timeout (not recommended in production).
+  *
+  * 60 seconds by default.
+  * @default `{ seconds: 60 }`
+  * @since 2.0.3
+  */
+  readonly handlerTimeout?: Temporal.Duration | Temporal.DurationLike;
 }
 /**
 * A message queue that uses PostgreSQL as the underlying storage.

package/dist/mq.d.ts

@@ -29,6 +29,19 @@ interface PostgresMessageQueueOptions {
   * @default `{ seconds: 5 }`
   */
   readonly pollInterval?: Temporal.Duration | Temporal.DurationLike;
+  /**
+  * The maximum time to wait for a message handler to complete before
+  * considering it hung.  When a handler exceeds this timeout, it is
+  * treated as an error and the poll loop moves on to the next message,
+  * preventing a single hung handler from permanently blocking the queue.
+  *
+  * Set to zero to disable the timeout (not recommended in production).
+  *
+  * 60 seconds by default.
+  * @default `{ seconds: 60 }`
+  * @since 2.0.3
+  */
+  readonly handlerTimeout?: Temporal.Duration | Temporal.DurationLike;
 }
 /**
 * A message queue that uses PostgreSQL as the underlying storage.

package/dist/mq.js

@@ -16,6 +16,15 @@ const INITIALIZE_BACKOFF_MS = 10;
 function sleep(milliseconds) {
 	return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
+function withTimeout(result, timeoutMs) {
+	const resolved = Promise.resolve(result);
+	if (timeoutMs <= 0) return resolved;
+	let timer;
+	const timeoutPromise = new Promise((_, reject) => {
+		timer = setTimeout(() => reject(/* @__PURE__ */ new Error(`Message handler timed out after ${timeoutMs}ms`)), timeoutMs);
+	});
+	return Promise.race([resolved, timeoutPromise]).finally(() => clearTimeout(timer));
+}
 function isInitializationRaceError(error) {
 	return error instanceof postgres.PostgresError && (error.constraint_name === "pg_type_typname_nsp_index" || error.constraint_name === "pg_class_relname_nsp_index" || error.code === "42P07" || error.code === "42710");
 }
@@ -46,6 +55,7 @@ var PostgresMessageQueue = class {
 	#tableName;
 	#channelName;
 	#pollIntervalMs;
+	#handlerTimeoutMs;
 	#initialized;
 	#initPromise;
 	#driverSerializesJson = false;
@@ -54,6 +64,7 @@ var PostgresMessageQueue = class {
 		this.#tableName = options?.tableName ?? "fedify_message_v2";
 		this.#channelName = options?.channelName ?? "fedify_channel";
 		this.#pollIntervalMs = Temporal.Duration.from(options?.pollInterval ?? { seconds: 5 }).total("millisecond");
+		this.#handlerTimeoutMs = Temporal.Duration.from(options?.handlerTimeout ?? { seconds: 60 }).total("millisecond");
 		this.#initialized = options?.initialized ?? false;
 	}
 	async enqueue(message, options) {
@@ -142,7 +153,7 @@ var PostgresMessageQueue = class {
           RETURNING message, ordering_key;
         `) {
 					if (signal?.aborted) return;
-					await handler(row.message);
+					await withTimeout(handler(row.message), this.#handlerTimeoutMs);
 					processed = true;
 				}
 				if (processed) continue;
@@ -179,7 +190,7 @@ var PostgresMessageQueue = class {
                 `;
 								for (const row of deleteResult) {
 									if (signal?.aborted) return;
-									await handler(row.message);
+									await withTimeout(handler(row.message), this.#handlerTimeoutMs);
 									processed = true;
 								}
 							} finally {
@@ -218,15 +229,23 @@ var PostgresMessageQueue = class {
 		};
 		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 safeSerializedPoll("notify-immediate");
-			else {
-				const timeout = setTimeout(() => {
-					timeouts.delete(timeout);
-					safeSerializedPoll("notify-delayed");
-				}, durationMs);
-				timeouts.add(timeout);
+			try {
+				const duration = Temporal.Duration.from(delay);
+				const durationMs = duration.total("millisecond");
+				if (durationMs < 1) await safeSerializedPoll("notify-immediate");
+				else {
+					const timeout = setTimeout(() => {
+						timeouts.delete(timeout);
+						safeSerializedPoll("notify-delayed");
+					}, durationMs);
+					timeouts.add(timeout);
+				}
+			} catch (error) {
+				logger.error("Error parsing NOTIFY payload {delay}: {error}", {
+					delay,
+					error
+				});
+				await safeSerializedPoll("notify-fallback");
 			}
 		}, () => safeSerializedPoll("subscribe"));
 		signal?.addEventListener("abort", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/postgres",
-  "version": "2.1.0-dev.421+8225ebc2",
+  "version": "2.1.0-dev.523+150998a5",
   "description": "PostgreSQL drivers for Fedify",
   "keywords": [
     "fedify",
@@ -74,13 +74,13 @@
   },
   "peerDependencies": {
     "postgres": "^3.4.7",
-    "@fedify/fedify": "^2.1.0-dev.421+8225ebc2"
+    "@fedify/fedify": "^2.1.0-dev.523+150998a5"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
     "tsdown": "^0.12.9",
     "typescript": "^5.9.3",
-    "@fedify/testing": "^2.1.0-dev.421+8225ebc2",
+    "@fedify/testing": "^2.1.0-dev.523+150998a5",
     "@fedify/fixture": "^2.0.0"
   },
   "scripts": {