@fedify/redis 2.2.0-pr.715.28 → 2.2.0-pr.731.0.33

package/dist/mq.cjs

@@ -7,6 +7,25 @@ const logger = (0, require("@logtape/logtape").getLogger)([
 	"redis",
 	"mq"
 ]);
+function isRedisClosedError(error) {
+	return error instanceof Error && /connection is (already )?closed/i.test(error.message);
+}
+async function quitRedisGracefully(redis) {
+	const client = redis;
+	if (client.status === "wait" || client.status === "end") {
+		client.disconnect();
+		return;
+	}
+	if (typeof client.quit !== "function") {
+		client.disconnect();
+		return;
+	}
+	try {
+		await client.quit();
+	} catch (error) {
+		if (!isRedisClosedError(error)) throw error;
+	}
+}
 /**
 * A message queue that uses Redis as the underlying storage.
 *
@@ -200,9 +219,15 @@ var RedisMessageQueue = class {
 	}
 	[Symbol.dispose]() {
 		clearInterval(this.#loopHandle);
+		this.#loopHandle = void 0;
 		this.#redis.disconnect();
 		this.#subRedis.disconnect();
 	}
+	async [Symbol.asyncDispose]() {
+		clearInterval(this.#loopHandle);
+		this.#loopHandle = void 0;
+		await Promise.all([quitRedisGracefully(this.#redis), quitRedisGracefully(this.#subRedis)]);
+	}
 };
 //#endregion
 exports.RedisMessageQueue = RedisMessageQueue;

package/dist/mq.d.cts

@@ -81,6 +81,7 @@ declare class RedisMessageQueue implements MessageQueue, Disposable {
   enqueueMany(messages: readonly any[], options?: MessageQueueEnqueueOptions): Promise<void>;
   listen(handler: (message: any) => void | Promise<void>, options?: MessageQueueListenOptions): Promise<void>;
   [Symbol.dispose](): void;
+  [Symbol.asyncDispose](): Promise<void>;
 }
 //#endregion
 export { RedisMessageQueue, RedisMessageQueueOptions };

package/dist/mq.d.ts

@@ -82,6 +82,7 @@ declare class RedisMessageQueue implements MessageQueue, Disposable {
   enqueueMany(messages: readonly any[], options?: MessageQueueEnqueueOptions): Promise<void>;
   listen(handler: (message: any) => void | Promise<void>, options?: MessageQueueListenOptions): Promise<void>;
   [Symbol.dispose](): void;
+  [Symbol.asyncDispose](): Promise<void>;
 }
 //#endregion
 export { RedisMessageQueue, RedisMessageQueueOptions };

package/dist/mq.js

@@ -7,6 +7,25 @@ const logger = getLogger([
 	"redis",
 	"mq"
 ]);
+function isRedisClosedError(error) {
+	return error instanceof Error && /connection is (already )?closed/i.test(error.message);
+}
+async function quitRedisGracefully(redis) {
+	const client = redis;
+	if (client.status === "wait" || client.status === "end") {
+		client.disconnect();
+		return;
+	}
+	if (typeof client.quit !== "function") {
+		client.disconnect();
+		return;
+	}
+	try {
+		await client.quit();
+	} catch (error) {
+		if (!isRedisClosedError(error)) throw error;
+	}
+}
 /**
 * A message queue that uses Redis as the underlying storage.
 *
@@ -200,9 +219,15 @@ var RedisMessageQueue = class {
 	}
 	[Symbol.dispose]() {
 		clearInterval(this.#loopHandle);
+		this.#loopHandle = void 0;
 		this.#redis.disconnect();
 		this.#subRedis.disconnect();
 	}
+	async [Symbol.asyncDispose]() {
+		clearInterval(this.#loopHandle);
+		this.#loopHandle = void 0;
+		await Promise.all([quitRedisGracefully(this.#redis), quitRedisGracefully(this.#subRedis)]);
+	}
 };
 //#endregion
 export { RedisMessageQueue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/redis",
-  "version": "2.2.0-pr.715.28+06979f5f",
+  "version": "2.2.0-pr.731.0.33+a54d18e7",
   "description": "Redis drivers for Fedify",
   "keywords": [
     "fedify",
@@ -82,7 +82,7 @@
   },
   "peerDependencies": {
     "ioredis": "^5.8.2",
-    "@fedify/fedify": "^2.2.0-pr.715.28+06979f5f"
+    "@fedify/fedify": "^2.2.0-pr.731.0.33+a54d18e7"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
@@ -90,7 +90,7 @@
     "tsdown": "^0.21.6",
     "typescript": "^5.9.2",
     "@fedify/fixture": "^2.0.0",
-    "@fedify/testing": "^2.2.0-pr.715.28+06979f5f"
+    "@fedify/testing": "^2.2.0-pr.731.0.33+a54d18e7"
   },
   "scripts": {
     "build:self": "tsdown",