@fedify/redis 2.0.0-dev.236 → 2.0.0-dev.241

package/dist/mq.cjs

@@ -115,31 +115,29 @@ var RedisMessageQueue = class {
 				await handler(message);
 			}
 		};
-		const promise = this.#subRedis.subscribe(this.#channelKey, () => {
-			/**
-			* Cast to Redis for event methods. Both Redis and Cluster extend EventEmitter
-			* and get the same methods via applyMixin at runtime, but their TypeScript
-			* interfaces are incompatible:
-			* - Redis declares specific overloads: on(event: "message", cb: (channel, message) => void)
-			* - Cluster only has generic: on(event: string | symbol, listener: Function)
-			*
-			* This makes the union type Redis | Cluster incompatible for these method calls.
-			* The cast is safe because both classes use applyMixin(Class, EventEmitter) which
-			* copies all EventEmitter prototype methods, giving them identical pub/sub functionality.
-			*
-			* @see https://github.com/redis/ioredis/blob/main/lib/Redis.ts#L863 (has specific overloads)
-			* @see https://github.com/redis/ioredis/blob/main/lib/cluster/index.ts#L1110 (empty interface)
-			*/
-			const subRedis = this.#subRedis;
-			subRedis.on("message", poll);
-			signal?.addEventListener("abort", () => {
-				subRedis.off("message", poll);
-			});
-		});
+		await this.#subRedis.subscribe(this.#channelKey);
+		/**
+		* Cast to Redis for event methods. Both Redis and Cluster extend EventEmitter
+		* and get the same methods via applyMixin at runtime, but their TypeScript
+		* interfaces are incompatible:
+		* - Redis declares specific overloads: on(event: "message", cb: (channel, message) => void)
+		* - Cluster only has generic: on(event: string | symbol, listener: Function)
+		*
+		* This makes the union type Redis | Cluster incompatible for these method calls.
+		* The cast is safe because both classes use applyMixin(Class, EventEmitter) which
+		* copies all EventEmitter prototype methods, giving them identical pub/sub functionality.
+		*
+		* @see https://github.com/redis/ioredis/blob/main/lib/Redis.ts#L863 (has specific overloads)
+		* @see https://github.com/redis/ioredis/blob/main/lib/cluster/index.ts#L1110 (empty interface)
+		*/
+		const subRedis = this.#subRedis;
+		subRedis.on("message", poll);
+		const timeouts = /* @__PURE__ */ new Set();
 		signal?.addEventListener("abort", () => {
+			subRedis.off("message", poll);
 			for (const timeout of timeouts) clearTimeout(timeout);
 		});
-		const timeouts = /* @__PURE__ */ new Set();
+		await poll();
 		while (!signal?.aborted) {
 			let timeout;
 			await new Promise((resolve) => {
@@ -153,12 +151,6 @@ var RedisMessageQueue = class {
 			if (timeout != null) timeouts.delete(timeout);
 			await poll();
 		}
-		return await new Promise((resolve) => {
-			signal?.addEventListener("abort", () => {
-				promise.catch(() => resolve()).then(() => resolve());
-			});
-			promise.catch(() => resolve()).then(() => resolve());
-		});
 	}
 	[Symbol.dispose]() {
 		clearInterval(this.#loopHandle);

package/dist/mq.js

@@ -114,31 +114,29 @@ var RedisMessageQueue = class {
 				await handler(message);
 			}
 		};
-		const promise = this.#subRedis.subscribe(this.#channelKey, () => {
-			/**
-			* Cast to Redis for event methods. Both Redis and Cluster extend EventEmitter
-			* and get the same methods via applyMixin at runtime, but their TypeScript
-			* interfaces are incompatible:
-			* - Redis declares specific overloads: on(event: "message", cb: (channel, message) => void)
-			* - Cluster only has generic: on(event: string | symbol, listener: Function)
-			*
-			* This makes the union type Redis | Cluster incompatible for these method calls.
-			* The cast is safe because both classes use applyMixin(Class, EventEmitter) which
-			* copies all EventEmitter prototype methods, giving them identical pub/sub functionality.
-			*
-			* @see https://github.com/redis/ioredis/blob/main/lib/Redis.ts#L863 (has specific overloads)
-			* @see https://github.com/redis/ioredis/blob/main/lib/cluster/index.ts#L1110 (empty interface)
-			*/
-			const subRedis = this.#subRedis;
-			subRedis.on("message", poll);
-			signal?.addEventListener("abort", () => {
-				subRedis.off("message", poll);
-			});
-		});
+		await this.#subRedis.subscribe(this.#channelKey);
+		/**
+		* Cast to Redis for event methods. Both Redis and Cluster extend EventEmitter
+		* and get the same methods via applyMixin at runtime, but their TypeScript
+		* interfaces are incompatible:
+		* - Redis declares specific overloads: on(event: "message", cb: (channel, message) => void)
+		* - Cluster only has generic: on(event: string | symbol, listener: Function)
+		*
+		* This makes the union type Redis | Cluster incompatible for these method calls.
+		* The cast is safe because both classes use applyMixin(Class, EventEmitter) which
+		* copies all EventEmitter prototype methods, giving them identical pub/sub functionality.
+		*
+		* @see https://github.com/redis/ioredis/blob/main/lib/Redis.ts#L863 (has specific overloads)
+		* @see https://github.com/redis/ioredis/blob/main/lib/cluster/index.ts#L1110 (empty interface)
+		*/
+		const subRedis = this.#subRedis;
+		subRedis.on("message", poll);
+		const timeouts = /* @__PURE__ */ new Set();
 		signal?.addEventListener("abort", () => {
+			subRedis.off("message", poll);
 			for (const timeout of timeouts) clearTimeout(timeout);
 		});
-		const timeouts = /* @__PURE__ */ new Set();
+		await poll();
 		while (!signal?.aborted) {
 			let timeout;
 			await new Promise((resolve) => {
@@ -152,12 +150,6 @@ var RedisMessageQueue = class {
 			if (timeout != null) timeouts.delete(timeout);
 			await poll();
 		}
-		return await new Promise((resolve) => {
-			signal?.addEventListener("abort", () => {
-				promise.catch(() => resolve()).then(() => resolve());
-			});
-			promise.catch(() => resolve()).then(() => resolve());
-		});
 	}
 	[Symbol.dispose]() {
 		clearInterval(this.#loopHandle);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/redis",
-  "version": "2.0.0-dev.236+9f9235d1",
+  "version": "2.0.0-dev.241+58c8126c",
   "description": "Redis drivers for Fedify",
   "keywords": [
     "fedify",
@@ -82,20 +82,21 @@
   },
   "peerDependencies": {
     "ioredis": "^5.8.2",
-    "@fedify/fedify": "^2.0.0-dev.236+9f9235d1"
+    "@fedify/fedify": "^2.0.0-dev.241+58c8126c"
   },
   "devDependencies": {
     "@std/async": "npm:@jsr/std__async@^1.0.13",
     "@types/node": "^22.17.0",
     "tsdown": "^0.12.9",
     "typescript": "^5.9.3",
-    "@fedify/testing": "^2.0.0-dev.236+9f9235d1",
-    "@fedify/fixture": "^2.0.0"
+    "@fedify/fixture": "^2.0.0",
+    "@fedify/testing": "^2.0.0-dev.241+58c8126c"
   },
   "scripts": {
-    "build": "tsdown",
-    "prepublish": "tsdown",
-    "test": "tsdown && node --experimental-transform-types --test",
-    "test:bun": "tsdown && bun test --timeout=10000"
+    "build:self": "tsdown",
+    "build": "pnpm --filter @fedify/redis... run build:self",
+    "prepublish": "pnpm build",
+    "test": "pnpm build && node --experimental-transform-types --test",
+    "test:bun": "pnpm build && bun test --timeout=10000"
   }
 }