@veryfront/ext-redis 0.1.1190 → 0.1.1192

package/esm/index.d.ts

@@ -10,7 +10,7 @@ export default extRedis;
 export { RedisMemory } from "./agent-memory.js";
 export { createRedisCacheAdministration } from "./cache-administration.js";
 export { RedisCacheBackend } from "./cache-backend.js";
-export { RedisRateLimitStore } from "./rate-limit-store.js";
+export { type RedisRateLimitOptions, RedisRateLimitStore } from "./rate-limit-store.js";
 export { RedisCacheStore } from "./render-cache-store.js";
 export { startProxyRoutingInvalidationBus } from "./routing-invalidation-bus.js";
 export { createRedisRuntimeProvider } from "./redis-runtime-provider.js";

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAOnE,QAAA,MAAM,QAAQ,EAAE,gBAqCf,CAAC;AAEF,eAAe,QAAQ,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,YAAY,EACV,WAAW,EACX,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,oBAAoB,GACrB,MAAM,kCAAkC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAOnE,QAAA,MAAM,QAAQ,EAAE,gBAqCf,CAAC;AAEF,eAAe,QAAQ,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,KAAK,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,YAAY,EACV,WAAW,EACX,kBAAkB,EAClB,yBAAyB,EACzB,iCAAiC,EACjC,oBAAoB,GACrB,MAAM,kCAAkC,CAAC"}

package/esm/rate-limit-store.d.ts

@@ -30,6 +30,7 @@ export declare class RedisRateLimitStore implements RateLimitStore {
     private loadClientFactory;
     private disconnectBestEffort;
     private disconnectClient;
+    private markDisconnected;
     private withTimeout;
     private connectClient;
     private storageKey;

package/esm/rate-limit-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limit-store.d.ts","sourceRoot":"","sources":["../src/rate-limit-store.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAGpB,MAAM,qDAAqD,CAAC;AAyC7D,4CAA4C;AAC5C,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wCAAwC;AACxC,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,aAAa,CAAqC;IAC1D,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6C;IAChF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8B;IAClE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA0B;IACnE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IACnE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;gBAEhC,OAAO,GAAE,qBAA0B;IA0B/C,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,6BAA6B;YAoBvB,iBAAiB;YAIjB,oBAAoB;IAUlC,OAAO,CAAC,gBAAgB;YAmCV,WAAW;YAsBX,aAAa;IAgE3B,OAAO,CAAC,UAAU;IAIZ,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA6BjE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B/B"}
+{"version":3,"file":"rate-limit-store.d.ts","sourceRoot":"","sources":["../src/rate-limit-store.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,cAAc,EAKpB,MAAM,qDAAqD,CAAC;AA+B7D,4CAA4C;AAC5C,MAAM,WAAW,qBAAqB;IACpC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,wEAAwE;IACxE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,wCAAwC;AACxC,qBAAa,mBAAoB,YAAW,cAAc;IACxD,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,CAAC,aAAa,CAAqC;IAC1D,OAAO,CAAC,uBAAuB,CAA6B;IAC5D,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA6C;IAChF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA8B;IAClE,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA0B;IACnE,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IACnE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAS;gBAEhC,OAAO,GAAE,qBAA0B;IA0B/C,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,gBAAgB;IAiBxB,OAAO,CAAC,6BAA6B;YAoBvB,iBAAiB;YAIjB,oBAAoB;IAclC,OAAO,CAAC,gBAAgB;IA2CxB,OAAO,CAAC,gBAAgB;YAMV,WAAW;YAuBX,aAAa;IAgE3B,OAAO,CAAC,UAAU;IAIZ,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IA6BjE,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBjC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CA8B/B"}

package/esm/rate-limit-store.js

@@ -1,20 +1,11 @@
 import * as dntShim from "./_dnt.shims.js";
-import { createError, toError } from "veryfront/errors";
+import { createError, isVeryfrontError, TIMEOUT_ERROR, toError } from "veryfront/errors";
 import { serverLogger } from "veryfront/utils/logger";
-import { createClient } from "redis";
-import { MAX_TIMER_DELAY_MS, requireRateLimitKey, requireRateLimitWindowMs, } from "veryfront/extensions/distributed/rate-limit-support";
+import { ClientClosedError, createClient } from "redis";
+import { MAX_TIMER_DELAY_MS, REDIS_RATE_LIMIT_INCREMENT_WITH_TTL_SCRIPT, requireRateLimitKey, requireRateLimitWindowMs, unrefTimer, } from "veryfront/extensions/distributed/rate-limit-support";
 const logger = serverLogger.component("redis-ratelimit");
 const DEFAULT_REDIS_CONNECT_TIMEOUT_MS = 5_000;
 const DEFAULT_REDIS_OPERATION_TIMEOUT_MS = 5_000;
-const INCREMENT_WITH_TTL_SCRIPT = `
-local count = redis.call("INCR", KEYS[1])
-local ttl = redis.call("PTTL", KEYS[1])
-if ttl < 0 then
-  redis.call("PEXPIRE", KEYS[1], ARGV[1])
-  ttl = tonumber(ARGV[1])
-end
-return { count, ttl }
-`;
 /** Implement redis rate limit store. */
 export class RedisRateLimitStore {
     client = null;
@@ -93,6 +84,10 @@ export class RedisRateLimitStore {
             await this.disconnectClient(client);
         }
         catch (error) {
+            if (isAlreadyClosedClientError(error)) {
+                this.markDisconnected(client);
+                return;
+            }
             logger.warn("client disconnect failed", {
                 errorName: error instanceof Error ? error.name : typeof error,
             });
@@ -114,27 +109,42 @@ export class RedisRateLimitStore {
         this.pendingDisconnectClients.add(client);
         try {
             Promise.resolve(client.disconnect()).then(() => {
-                this.disconnectPromises.delete(client);
-                this.pendingDisconnectClients.delete(client);
-                this.disconnectedClients.add(client);
+                this.markDisconnected(client);
                 resolveDisconnect();
             }, (error) => {
                 this.disconnectPromises.delete(client);
+                if (isAlreadyClosedClientError(error)) {
+                    this.markDisconnected(client);
+                    resolveDisconnect();
+                    return;
+                }
                 rejectDisconnect(error);
             });
         }
         catch (error) {
             this.disconnectPromises.delete(client);
-            rejectDisconnect(error);
+            if (isAlreadyClosedClientError(error)) {
+                this.markDisconnected(client);
+                resolveDisconnect();
+            }
+            else {
+                rejectDisconnect(error);
+            }
         }
         return pending;
     }
+    markDisconnected(client) {
+        this.disconnectPromises.delete(client);
+        this.pendingDisconnectClients.delete(client);
+        this.disconnectedClients.add(client);
+    }
     async withTimeout(operation, timeoutMs, operationName, cancellation) {
         let timeoutId;
         const timeout = new Promise((_, reject) => {
             timeoutId = dntShim.setTimeout(() => {
                 reject(createTimeoutError(operationName, timeoutMs));
             }, timeoutMs);
+            unrefTimer(timeoutId);
         });
         try {
             return await Promise.race(cancellation === undefined ? [operation, timeout] : [operation, timeout, cancellation]);
@@ -209,7 +219,7 @@ export class RedisRateLimitStore {
         const redisKey = this.storageKey(normalizedKey);
         let result;
         try {
-            result = await this.withTimeout(client.eval(INCREMENT_WITH_TTL_SCRIPT, {
+            result = await this.withTimeout(client.eval(REDIS_RATE_LIMIT_INCREMENT_WITH_TTL_SCRIPT, {
                 keys: [redisKey],
                 arguments: [String(normalizedWindowMs)],
             }), this.operationTimeoutMs, "increment");
@@ -225,10 +235,11 @@ export class RedisRateLimitStore {
         return { count, resetAt: Date.now() + ttl };
     }
     async reset(key) {
+        const normalizedKey = requireRateLimitKey(key);
         const client = await this.ensureClient();
         const generation = this.clientGeneration;
         try {
-            await this.withTimeout(client.del(this.storageKey(requireRateLimitKey(key))), this.operationTimeoutMs, "reset");
+            await this.withTimeout(client.del(this.storageKey(normalizedKey)), this.operationTimeoutMs, "reset");
         }
         catch (error) {
             if (isTimeoutError(error)) {
@@ -241,6 +252,9 @@ export class RedisRateLimitStore {
         const client = this.client;
         const connectingClient = this.connectingClient;
         const pending = this.clientPromise;
+        // Mark the pending connection rejection as observed before cancellation;
+        // disconnect work below may otherwise leave an unhandled-rejection window.
+        pending?.catch(() => { });
         const cancelPendingConnection = this.cancelPendingConnection;
         const clientsToDisconnect = new Set(this.pendingDisconnectClients);
         if (client)
@@ -259,7 +273,6 @@ export class RedisRateLimitStore {
             disconnectFailed = true;
             disconnectError ??= error;
         })));
-        pending?.catch(() => { });
         if (disconnectFailed)
             throw disconnectError;
     }
@@ -274,12 +287,15 @@ function requireTimeoutMs(value, name) {
     return value;
 }
 function createTimeoutError(operationName, timeoutMs) {
-    const error = new Error(`Redis rate limit ${operationName} timed out after ${timeoutMs}ms`);
-    error.name = "TimeoutError";
-    return error;
+    return TIMEOUT_ERROR.create({
+        detail: `Redis rate limit ${operationName} timed out after ${timeoutMs}ms`,
+    });
 }
 function isTimeoutError(error) {
-    return error instanceof Error && error.name === "TimeoutError";
+    return isVeryfrontError(error) && error.slug === TIMEOUT_ERROR.slug;
+}
+function isAlreadyClosedClientError(error) {
+    return error instanceof ClientClosedError;
 }
 function parseIncrementResult(result) {
     if (!Array.isArray(result) || result.length < 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veryfront/ext-redis",
-  "version": "0.1.1190",
+  "version": "0.1.1192",
   "description": "Veryfront first-party extension package for ext-redis",
   "keywords": [
     "veryfront",
@@ -66,7 +66,7 @@
     "redis": "5.11.0"
   },
   "peerDependencies": {
-    "veryfront": "^0.1.1190"
+    "veryfront": "^0.1.1192"
   },
   "type": "module",
   "types": "./esm/index.d.ts",