@fedify/postgres 2.2.13 → 2.2.14

package/dist/kv.cjs

@@ -58,11 +58,12 @@ var PostgresKvStore = class {
 	async set(key, value, options) {
 		await this.initialize();
 		const ttl = options?.ttl == null ? null : options.ttl.toString();
+		const jsonValue = value === null ? this.#sql`'null'::jsonb` : this.#json(value);
 		await this.#sql`
       INSERT INTO ${this.#sql(this.#tableName)} (key, value, ttl)
       VALUES (
         ${key},
-        ${this.#json(value)},
+        ${jsonValue},
         ${ttl}
       )
       ON CONFLICT (key)

package/dist/kv.js

@@ -57,11 +57,12 @@ var PostgresKvStore = class {
 	async set(key, value, options) {
 		await this.initialize();
 		const ttl = options?.ttl == null ? null : options.ttl.toString();
+		const jsonValue = value === null ? this.#sql`'null'::jsonb` : this.#json(value);
 		await this.#sql`
       INSERT INTO ${this.#sql(this.#tableName)} (key, value, ttl)
       VALUES (
         ${key},
-        ${this.#json(value)},
+        ${jsonValue},
         ${ttl}
       )
       ON CONFLICT (key)

package/dist/mq.cjs

@@ -140,6 +140,7 @@ var PostgresMessageQueue = class {
 	async listen(handler, options = {}) {
 		await this.initialize();
 		const { signal } = options;
+		if (signal?.aborted) return;
 		const poll = async () => {
 			while (!signal?.aborted) {
 				let processed = false;
@@ -233,6 +234,7 @@ var PostgresMessageQueue = class {
 		};
 		const timeouts = /* @__PURE__ */ new Set();
 		const listen = await this.#sql.listen(this.#channelName, async (delay) => {
+			if (signal?.aborted) return;
 			try {
 				const durationMs = Temporal.Duration.from(delay).total("millisecond");
 				if (durationMs < 1) await safeSerializedPoll("notify-immediate");
@@ -256,31 +258,35 @@ var PostgresMessageQueue = class {
 			timeouts.clear();
 		};
 		signal?.addEventListener("abort", clearTimeouts, { once: true });
-		let unlistenError;
 		try {
 			while (!signal?.aborted) {
-				let timeout;
 				await new Promise((resolve) => {
-					signal?.addEventListener("abort", resolve, { once: true });
-					timeout = setTimeout(() => {
-						signal?.removeEventListener("abort", resolve);
-						resolve(0);
+					const onAbort = () => {
+						clearTimeout(timeout);
+						signal?.removeEventListener("abort", onAbort);
+						resolve();
+					};
+					const timeout = setTimeout(() => {
+						signal?.removeEventListener("abort", onAbort);
+						resolve();
 					}, this.#pollIntervalMs);
-					timeouts.add(timeout);
+					signal?.addEventListener("abort", onAbort, { once: true });
 				});
-				if (timeout != null) timeouts.delete(timeout);
 				await safeSerializedPoll("interval");
 			}
 		} finally {
 			signal?.removeEventListener("abort", clearTimeouts);
 			clearTimeouts();
+			await pollLock;
 			try {
 				await listen.unlisten();
 			} catch (error) {
-				if (!isConnectionDestroyedError(error)) unlistenError = error;
+				if (!isConnectionDestroyedError(error)) logger.error("Error while unlistening from channel {channelName}: {error}", {
+					channelName: this.#channelName,
+					error
+				});
 			}
 		}
-		if (unlistenError != null) throw unlistenError;
 	}
 	/**
 	* Initializes the message queue table if it does not already exist.

package/dist/mq.js

@@ -137,6 +137,7 @@ var PostgresMessageQueue = class {
 	async listen(handler, options = {}) {
 		await this.initialize();
 		const { signal } = options;
+		if (signal?.aborted) return;
 		const poll = async () => {
 			while (!signal?.aborted) {
 				let processed = false;
@@ -230,6 +231,7 @@ var PostgresMessageQueue = class {
 		};
 		const timeouts = /* @__PURE__ */ new Set();
 		const listen = await this.#sql.listen(this.#channelName, async (delay) => {
+			if (signal?.aborted) return;
 			try {
 				const durationMs = Temporal.Duration.from(delay).total("millisecond");
 				if (durationMs < 1) await safeSerializedPoll("notify-immediate");
@@ -253,31 +255,35 @@ var PostgresMessageQueue = class {
 			timeouts.clear();
 		};
 		signal?.addEventListener("abort", clearTimeouts, { once: true });
-		let unlistenError;
 		try {
 			while (!signal?.aborted) {
-				let timeout;
 				await new Promise((resolve) => {
-					signal?.addEventListener("abort", resolve, { once: true });
-					timeout = setTimeout(() => {
-						signal?.removeEventListener("abort", resolve);
-						resolve(0);
+					const onAbort = () => {
+						clearTimeout(timeout);
+						signal?.removeEventListener("abort", onAbort);
+						resolve();
+					};
+					const timeout = setTimeout(() => {
+						signal?.removeEventListener("abort", onAbort);
+						resolve();
 					}, this.#pollIntervalMs);
-					timeouts.add(timeout);
+					signal?.addEventListener("abort", onAbort, { once: true });
 				});
-				if (timeout != null) timeouts.delete(timeout);
 				await safeSerializedPoll("interval");
 			}
 		} finally {
 			signal?.removeEventListener("abort", clearTimeouts);
 			clearTimeouts();
+			await pollLock;
 			try {
 				await listen.unlisten();
 			} catch (error) {
-				if (!isConnectionDestroyedError(error)) unlistenError = error;
+				if (!isConnectionDestroyedError(error)) logger.error("Error while unlistening from channel {channelName}: {error}", {
+					channelName: this.#channelName,
+					error
+				});
 			}
 		}
-		if (unlistenError != null) throw unlistenError;
 	}
 	/**
 	* Initializes the message queue table if it does not already exist.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/postgres",
-  "version": "2.2.13",
+  "version": "2.2.14",
   "description": "PostgreSQL drivers for Fedify",
   "keywords": [
     "fedify",
@@ -74,14 +74,14 @@
   },
   "peerDependencies": {
     "postgres": "^3.4.7",
-    "@fedify/fedify": "^2.2.13"
+    "@fedify/fedify": "^2.2.14"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
     "tsdown": "^0.21.6",
     "typescript": "^6.0.0",
     "@fedify/fixture": "^2.0.0",
-    "@fedify/testing": "^2.2.13"
+    "@fedify/testing": "^2.2.14"
   },
   "scripts": {
     "build:self": "tsdown",