@windrun-huaiin/backend-core 13.0.0 → 14.0.0

package/dist/lib/upstash/redis-favorite.js

@@ -9,62 +9,48 @@ const favoriteUserKey = (userId) => `favorite:user:${userId}`;
  * Favorite a target. Returns true if added, false if already favorited, null if Redis is unavailable.
  */
 const addFavorite = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const added = yield redis.sadd(favoriteTargetKey(targetId), userId);
-    if (added === 1) {
-        yield redis.sadd(favoriteUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const added = yield redis.sadd(favoriteTargetKey(targetId), userId);
+        if (added === 1) {
+            yield redis.sadd(favoriteUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Remove a favorite. Returns true if removed, false if not found, null if Redis is unavailable.
  */
 const removeFavorite = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const removed = yield redis.srem(favoriteTargetKey(targetId), userId);
-    if (removed === 1) {
-        yield redis.srem(favoriteUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const removed = yield redis.srem(favoriteTargetKey(targetId), userId);
+        if (removed === 1) {
+            yield redis.srem(favoriteUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Check whether a user has favorited a target. Returns null if Redis is unavailable.
  */
 const isFavorited = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const result = yield redis.sismember(favoriteTargetKey(targetId), userId);
-    return result === 1;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const result = yield redis.sismember(favoriteTargetKey(targetId), userId);
+        return result === 1;
+    }));
 });
 /**
  * Get favorite count for a target. Returns null if Redis is unavailable.
  */
 const getFavoriteCount = (targetId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.scard(favoriteTargetKey(targetId));
+    return upstashConfig.withRedis((redis) => redis.scard(favoriteTargetKey(targetId)));
 });
 /**
  * Get target ids favorited by a user. Returns null if Redis is unavailable.
  */
 const getUserFavorites = (userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.smembers(favoriteUserKey(userId));
+    return upstashConfig.withRedis((redis) => redis.smembers(favoriteUserKey(userId)));
 });
 
 exports.addFavorite = addFavorite;

package/dist/lib/upstash/redis-favorite.mjs

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
-import { getRedis } from '../upstash-config.mjs';
+import { withRedis } from '../upstash-config.mjs';
 
 const favoriteTargetKey = (targetId) => `favorite:target:${targetId}`;
 const favoriteUserKey = (userId) => `favorite:user:${userId}`;
@@ -7,62 +7,48 @@ const favoriteUserKey = (userId) => `favorite:user:${userId}`;
  * Favorite a target. Returns true if added, false if already favorited, null if Redis is unavailable.
  */
 const addFavorite = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const added = yield redis.sadd(favoriteTargetKey(targetId), userId);
-    if (added === 1) {
-        yield redis.sadd(favoriteUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const added = yield redis.sadd(favoriteTargetKey(targetId), userId);
+        if (added === 1) {
+            yield redis.sadd(favoriteUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Remove a favorite. Returns true if removed, false if not found, null if Redis is unavailable.
  */
 const removeFavorite = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const removed = yield redis.srem(favoriteTargetKey(targetId), userId);
-    if (removed === 1) {
-        yield redis.srem(favoriteUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const removed = yield redis.srem(favoriteTargetKey(targetId), userId);
+        if (removed === 1) {
+            yield redis.srem(favoriteUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Check whether a user has favorited a target. Returns null if Redis is unavailable.
  */
 const isFavorited = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const result = yield redis.sismember(favoriteTargetKey(targetId), userId);
-    return result === 1;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const result = yield redis.sismember(favoriteTargetKey(targetId), userId);
+        return result === 1;
+    }));
 });
 /**
  * Get favorite count for a target. Returns null if Redis is unavailable.
  */
 const getFavoriteCount = (targetId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.scard(favoriteTargetKey(targetId));
+    return withRedis((redis) => redis.scard(favoriteTargetKey(targetId)));
 });
 /**
  * Get target ids favorited by a user. Returns null if Redis is unavailable.
  */
 const getUserFavorites = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.smembers(favoriteUserKey(userId));
+    return withRedis((redis) => redis.smembers(favoriteUserKey(userId)));
 });
 
 export { addFavorite, getFavoriteCount, getUserFavorites, isFavorited, removeFavorite };

package/dist/lib/upstash/redis-like.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-like.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-like.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAYzF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAY3F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAQ5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAOhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAOjF,CAAC"}
+{"version":3,"file":"redis-like.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-like.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CASzF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAS3F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,GAAU,UAAU,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAK5F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAAU,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAEhF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,GAAU,QAAQ,MAAM,KAAG,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAEjF,CAAC"}

package/dist/lib/upstash/redis-like.js

@@ -9,62 +9,48 @@ const likeUserKey = (userId) => `like:user:${userId}`;
  * Like a target. Returns true if the like was added, false if it already existed, null if Redis is unavailable.
  */
 const likeTarget = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const added = yield redis.sadd(likeTargetKey(targetId), userId);
-    if (added === 1) {
-        yield redis.sadd(likeUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const added = yield redis.sadd(likeTargetKey(targetId), userId);
+        if (added === 1) {
+            yield redis.sadd(likeUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Unlike a target. Returns true if removed, false if it didn't exist, null if Redis is unavailable.
  */
 const unlikeTarget = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const removed = yield redis.srem(likeTargetKey(targetId), userId);
-    if (removed === 1) {
-        yield redis.srem(likeUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const removed = yield redis.srem(likeTargetKey(targetId), userId);
+        if (removed === 1) {
+            yield redis.srem(likeUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Check whether a user liked a target. Returns null if Redis is unavailable.
  */
 const isTargetLiked = (targetId, userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    const result = yield redis.sismember(likeTargetKey(targetId), userId);
-    return result === 1;
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const result = yield redis.sismember(likeTargetKey(targetId), userId);
+        return result === 1;
+    }));
 });
 /**
  * Get like count for a target (unique by user). Returns null if Redis is unavailable.
  */
 const getTargetLikeCount = (targetId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.scard(likeTargetKey(targetId));
+    return upstashConfig.withRedis((redis) => redis.scard(likeTargetKey(targetId)));
 });
 /**
  * Get target ids liked by a user. Returns null if Redis is unavailable.
  */
 const getUserLikedTargets = (userId) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.smembers(likeUserKey(userId));
+    return upstashConfig.withRedis((redis) => redis.smembers(likeUserKey(userId)));
 });
 
 exports.getTargetLikeCount = getTargetLikeCount;

package/dist/lib/upstash/redis-like.mjs

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
-import { getRedis } from '../upstash-config.mjs';
+import { withRedis } from '../upstash-config.mjs';
 
 const likeTargetKey = (targetId) => `like:target:${targetId}`;
 const likeUserKey = (userId) => `like:user:${userId}`;
@@ -7,62 +7,48 @@ const likeUserKey = (userId) => `like:user:${userId}`;
  * Like a target. Returns true if the like was added, false if it already existed, null if Redis is unavailable.
  */
 const likeTarget = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const added = yield redis.sadd(likeTargetKey(targetId), userId);
-    if (added === 1) {
-        yield redis.sadd(likeUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const added = yield redis.sadd(likeTargetKey(targetId), userId);
+        if (added === 1) {
+            yield redis.sadd(likeUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Unlike a target. Returns true if removed, false if it didn't exist, null if Redis is unavailable.
  */
 const unlikeTarget = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const removed = yield redis.srem(likeTargetKey(targetId), userId);
-    if (removed === 1) {
-        yield redis.srem(likeUserKey(userId), targetId);
-        return true;
-    }
-    return false;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const removed = yield redis.srem(likeTargetKey(targetId), userId);
+        if (removed === 1) {
+            yield redis.srem(likeUserKey(userId), targetId);
+            return true;
+        }
+        return false;
+    }));
 });
 /**
  * Check whether a user liked a target. Returns null if Redis is unavailable.
  */
 const isTargetLiked = (targetId, userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const result = yield redis.sismember(likeTargetKey(targetId), userId);
-    return result === 1;
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const result = yield redis.sismember(likeTargetKey(targetId), userId);
+        return result === 1;
+    }));
 });
 /**
  * Get like count for a target (unique by user). Returns null if Redis is unavailable.
  */
 const getTargetLikeCount = (targetId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.scard(likeTargetKey(targetId));
+    return withRedis((redis) => redis.scard(likeTargetKey(targetId)));
 });
 /**
  * Get target ids liked by a user. Returns null if Redis is unavailable.
  */
 const getUserLikedTargets = (userId) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.smembers(likeUserKey(userId));
+    return withRedis((redis) => redis.smembers(likeUserKey(userId)));
 });
 
 export { getTargetLikeCount, getUserLikedTargets, isTargetLiked, likeTarget, unlikeTarget };

package/dist/lib/upstash/redis-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-lock.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-lock.ts"],"names":[],"mappings":"AAuCA;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAMnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAM7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAU,CAAC,EAC9B,KAAK,MAAM,EACX,OAAO,MAAM,EACb,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KACvB,OAAO,CAAC,CAAC,GAAG,IAAI,CAgBlB,CAAC"}
+{"version":3,"file":"redis-lock.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-lock.ts"],"names":[],"mappings":"AAkBA;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAMnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAM7E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,QAAQ,GAAU,CAAC,EAC9B,KAAK,MAAM,EACX,OAAO,MAAM,EACb,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KACvB,OAAO,CAAC,CAAC,GAAG,IAAI,CAWlB,CAAC"}

package/dist/lib/upstash/redis-lock.js

@@ -1,64 +1,48 @@
 'use strict';
 
 var tslib_es6 = require('../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
-var index = require('../../_virtual/index.js');
 var upstashConfig = require('../upstash-config.js');
 
-let cachedLock = null;
-let lockInitAttempted = false;
-const createLock = (redis) => {
-    const LockCtor = index.distExports.Lock;
+const unlockScript = `
+if redis.call("get", KEYS[1]) == ARGV[1] then
+  return redis.call("del", KEYS[1])
+else
+  return 0
+end
+`;
+const generateToken = () => {
     try {
-        return new LockCtor({ redis });
+        return crypto.randomUUID();
     }
     catch (_a) {
-        return new LockCtor(redis);
+        return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
     }
 };
-const getLock = () => {
-    if (cachedLock) {
-        return cachedLock;
-    }
-    if (lockInitAttempted) {
-        return null;
-    }
-    lockInitAttempted = true;
-    const redis = upstashConfig.getRedis();
-    if (!redis) {
-        return null;
-    }
-    cachedLock = createLock(redis);
-    return cachedLock;
-};
 /**
  * Acquire a distributed lock. Returns the lock token or null when unavailable.
  */
 const acquireLock = (key, ttlMs) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return null;
-    }
-    return lock.acquire(key, ttlMs);
+    return upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const token = generateToken();
+        const result = yield redis.set(key, token, { nx: true, px: ttlMs });
+        return result === 'OK' ? token : null;
+    }));
 });
 /**
  * Release a distributed lock. Returns false when the lock client is unavailable.
  */
 const releaseLock = (key, token) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return false;
-    }
-    return lock.release(key, token);
+    const result = yield upstashConfig.withRedis((redis) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const released = yield redis.eval(unlockScript, [key], [token]);
+        return Number(released) === 1;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Run a function under a distributed lock. Returns null when the lock is unavailable.
  */
 const withLock = (key, ttlMs, fn) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return null;
-    }
-    const token = yield lock.acquire(key, ttlMs);
+    const token = yield acquireLock(key, ttlMs);
     if (!token) {
         return null;
     }
@@ -66,7 +50,7 @@ const withLock = (key, ttlMs, fn) => tslib_es6.__awaiter(void 0, void 0, void 0,
         return yield fn();
     }
     finally {
-        yield lock.release(key, token);
+        yield releaseLock(key, token);
     }
 });
 

package/dist/lib/upstash/redis-lock.mjs

@@ -1,62 +1,46 @@
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
-import { d as distExports } from '../../_virtual/index.mjs';
-import { getRedis } from '../upstash-config.mjs';
+import { withRedis } from '../upstash-config.mjs';
 
-let cachedLock = null;
-let lockInitAttempted = false;
-const createLock = (redis) => {
-    const LockCtor = distExports.Lock;
+const unlockScript = `
+if redis.call("get", KEYS[1]) == ARGV[1] then
+  return redis.call("del", KEYS[1])
+else
+  return 0
+end
+`;
+const generateToken = () => {
     try {
-        return new LockCtor({ redis });
+        return crypto.randomUUID();
     }
     catch (_a) {
-        return new LockCtor(redis);
+        return `${Date.now()}-${Math.random().toString(16).slice(2)}`;
     }
 };
-const getLock = () => {
-    if (cachedLock) {
-        return cachedLock;
-    }
-    if (lockInitAttempted) {
-        return null;
-    }
-    lockInitAttempted = true;
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    cachedLock = createLock(redis);
-    return cachedLock;
-};
 /**
  * Acquire a distributed lock. Returns the lock token or null when unavailable.
  */
 const acquireLock = (key, ttlMs) => __awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return null;
-    }
-    return lock.acquire(key, ttlMs);
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const token = generateToken();
+        const result = yield redis.set(key, token, { nx: true, px: ttlMs });
+        return result === 'OK' ? token : null;
+    }));
 });
 /**
  * Release a distributed lock. Returns false when the lock client is unavailable.
  */
 const releaseLock = (key, token) => __awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return false;
-    }
-    return lock.release(key, token);
+    const result = yield withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const released = yield redis.eval(unlockScript, [key], [token]);
+        return Number(released) === 1;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Run a function under a distributed lock. Returns null when the lock is unavailable.
  */
 const withLock = (key, ttlMs, fn) => __awaiter(void 0, void 0, void 0, function* () {
-    const lock = getLock();
-    if (!lock) {
-        return null;
-    }
-    const token = yield lock.acquire(key, ttlMs);
+    const token = yield acquireLock(key, ttlMs);
     if (!token) {
         return null;
     }
@@ -64,7 +48,7 @@ const withLock = (key, ttlMs, fn) => __awaiter(void 0, void 0, void 0, function*
         return yield fn();
     }
     finally {
-        yield lock.release(key, token);
+        yield releaseLock(key, token);
     }
 });
 

package/dist/lib/upstash/redis-structures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redis-structures.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-structures.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACd,OAAO,CAAC,OAAO,CAajB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAOlE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAU,CAAC,EAC7B,KAAK,MAAM,EACX,OAAO,CAAC,EACR,SAAS,MAAM,KACd,OAAO,CAAC,OAAO,CAcjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAU,CAAC,EAAE,KAAK,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAgB9D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,CAQ5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAQ7F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAOpF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,EACjC,KAAK,MAAM,EACX,OAAO,MAAM,EACb,OAAO,CAAC,KACP,OAAO,CAAC,OAAO,CASjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,EAAE,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAgBjF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAQnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAQjF,CAAC;AAEF,KAAK,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,QAAQ,GACnB,KAAK,MAAM,EACX,QAAQ,MAAM,EAAE,EAChB,YAAW,aAAuB,KACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAavB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAClB,KAAK,MAAM,EACX,YAAW,aAAuB,KACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAOvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,KAAK,MAAM,EACX,cAAS,EACT,aAAS,KACR,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAOzB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAOnE,CAAC"}
+{"version":3,"file":"redis-structures.d.ts","sourceRoot":"","sources":["../../../src/lib/upstash/redis-structures.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,KAAK,MAAM,EACX,OAAO,MAAM,EACb,SAAS,MAAM,KACd,OAAO,CAAC,OAAO,CAUjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAElE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAU,CAAC,EAC7B,KAAK,MAAM,EACX,OAAO,CAAC,EACR,SAAS,MAAM,KACd,OAAO,CAAC,OAAO,CAWjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAU,CAAC,EAAE,KAAK,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAa9D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,OAAO,CAM5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAM7F,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAEpF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,EACjC,KAAK,MAAM,EACX,OAAO,MAAM,EACb,OAAO,CAAC,KACP,OAAO,CAAC,OAAO,CAOjB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW,GAAU,CAAC,EAAE,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAajF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAKnF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAU,KAAK,MAAM,EAAE,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAMjF,CAAC;AAEF,KAAK,aAAa,GAAG,MAAM,GAAG,OAAO,CAAC;AAEtC;;GAEG;AACH,eAAO,MAAM,QAAQ,GACnB,KAAK,MAAM,EACX,QAAQ,MAAM,EAAE,EAChB,YAAW,aAAuB,KACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAUvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAClB,KAAK,MAAM,EACX,YAAW,aAAuB,KACjC,OAAO,CAAC,MAAM,GAAG,IAAI,CAIvB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,GACpB,KAAK,MAAM,EACX,cAAS,EACT,aAAS,KACR,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAEzB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,GAAU,KAAK,MAAM,KAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAEnE,CAAC"}