@holo-js/cache-redis 0.1.4 → 0.1.6

package/dist/index.d.ts

@@ -71,6 +71,7 @@ type RedisClusterOptions = {
 };
 type RedisClientLike = {
     readonly isCluster?: boolean;
+    disconnect?(): void;
     get(key: string): Promise<string | null>;
     set(key: string, value: string, ...arguments_: readonly (string | number)[]): Promise<'OK' | null>;
     del(...keys: string[]): Promise<number>;

package/dist/index.mjs

@@ -5,6 +5,7 @@ import {
   CacheInvalidNumericMutationError
 } from "@holo-js/cache";
 var REDIS_SCAN_COUNT = 100;
+var CACHE_DRIVER_DISPOSE_SYMBOL = /* @__PURE__ */ Symbol.for("holo.cache.driver.dispose");
 var RELEASE_LOCK_SCRIPT = [
   'if redis.call("get", KEYS[1]) == ARGV[1] then',
   '  return redis.call("del", KEYS[1])',
@@ -153,10 +154,14 @@ function createRedisLock(client, name, seconds, ownerFactory, sleep, now) {
         if (await tryAcquire()) {
           return withCallback(callback);
         }
+        const remainingWait = deadline - now();
+        if (remainingWait <= 0) {
+          return false;
+        }
+        await sleep(Math.min(10, remainingWait));
         if (now() >= deadline) {
           return false;
         }
-        await sleep(10);
       }
     }
   };
@@ -178,7 +183,7 @@ function createRedisCacheDriver(options) {
       }
     } while (cursor !== "0");
   }
-  return {
+  const driver = {
     name: options.name,
     driver: "redis",
     async get(key) {
@@ -204,10 +209,6 @@ function createRedisCacheDriver(options) {
       return true;
     },
     async add(input) {
-      if (typeof input.expiresAt === "number" && input.expiresAt <= now()) {
-        await client.del(input.key);
-        return true;
-      }
       if (typeof input.expiresAt === "number") {
         return await client.set(input.key, input.payload, "PXAT", input.expiresAt, "NX") === "OK";
       }
@@ -255,6 +256,12 @@ function createRedisCacheDriver(options) {
       return createRedisLock(client, name, seconds, ownerFactory, sleep, now);
     }
   };
+  Object.defineProperty(driver, CACHE_DRIVER_DISPOSE_SYMBOL, {
+    value() {
+      client.disconnect?.();
+    }
+  });
+  return driver;
 }
 var redisCacheDriverInternals = {
   createRedisClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/cache-redis",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Holo-JS Framework - Redis cache driver",
   "type": "module",
   "license": "MIT",
@@ -20,20 +20,21 @@
     "build": "tsup",
     "stub": "tsup",
     "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "vitest --run"
+    "test": "vitest --run",
+    "test:integration": "HOLO_REDIS_INTEGRATION=1 vitest --run"
   },
   "peerDependencies": {
-    "@holo-js/cache": "^0.1.4"
+    "@holo-js/cache": "^0.1.6"
   },
   "dependencies": {
-    "ioredis": "catalog:",
+    "ioredis": "^5.4.2",
     "tslib": "^2.8.1"
   },
   "devDependencies": {
-    "@holo-js/cache": "workspace:*",
+    "@holo-js/cache": "^0.1.6",
     "@types/node": "^22.10.2",
     "tsup": "^8.3.5",
     "typescript": "^5.7.2",
-    "vitest": "^2.1.8"
+    "vitest": "^4.1.5"
   }
 }