murlock 5.0.0 → 5.1.0

package/README.md

@@ -166,6 +166,8 @@ async anotherFunction(user: User): Promise<void> {
 
 When using `@MurLock` with other decorators (such as `@Transactional` from typeorm-transactional), you may encounter issues with parameter name extraction if the other decorator wraps the method before `@MurLock` is applied.
 
+> **Note on minification / transpilation:** MurLock derives parameter names by parsing the method signature at runtime. Aggressive minifiers/bundlers (terser, esbuild, swc) may rename or strip parameter names, in which case **name-based** key params (e.g. `'userId'`, `'user.id'`) cannot be resolved and the decorator throws `Parameter ... not found`. If you minify your server build, either use **numeric index** key params (e.g. `'0'`, `'0.id'`) — which are always stable — or declare names explicitly with `@SetParamNames` (below).
+
 ### Problem
 
 TypeScript decorators execute in bottom-up order. If another decorator wraps the method before `@MurLock`, the parameter names cannot be extracted from the wrapped function:
@@ -519,6 +521,9 @@ Here are the customizable options for `MurLockModule`, allowing you to tailor it
 - **autoExtend (optional)**: When set to `true`, MurLock keeps the lock alive while the wrapped operation is still running by periodically extending its TTL (a "watchdog"). This prevents the lock from expiring mid-execution when an operation runs longer than `releaseTime`, which would otherwise let another instance acquire the same lock and break mutual exclusion. Defaults to `false`.
 - **extendInterval (optional)**: Interval in milliseconds between watchdog TTL extensions. Only used when `autoExtend` is `true`. Defaults to one third of the lock's `releaseTime` (`Math.floor(releaseTime / 3)`), guaranteeing at least two refresh attempts before the TTL would expire.
 - **onRedisError (optional)**: Callback `(error: Error) => void` invoked when the Redis client emits a runtime `error` event. Use it to plug in custom alerting or fail-fast behavior.
+- **reentrant (optional)**: When set to `true`, locks become reentrant within the same async context: a method that locks a key and (directly or transitively) calls another method locking the **same** key reuses the existing lock instead of deadlocking. The underlying Redis lock is acquired once (outermost entry) and released when the outermost call completes. Defaults to `false`.
+- **encodeKeyParts (optional)**: When set to `true`, each lock-key part derived from method arguments is URL-encoded so values containing the `:` separator cannot collide (e.g. `a:b` + `c` vs `a` + `b:c`). Changes the generated key format, so it is opt-in to avoid breaking existing keys across a rolling deploy. Defaults to `false`.
+- **jitter (optional)**: When set to `true`, retry back-off delays use equal jitter (`delay/2 + random*delay/2`) to avoid a thundering herd when many workers wait on the same lock. Applies to both attempt-based and blocking modes. Defaults to `false`.
 
 ### MurLockService
 

package/dist/als/als-manager.d.ts

@@ -1,21 +1,8 @@
 /// <reference types="node" />
 import { AsyncLocalStorage } from 'async_hooks';
-export declare class AsyncStorageManager<T> implements Map<string, T> {
+export declare class AsyncStorageManager<T> {
     private readonly asyncLocalStorage;
-    constructor(asyncLocalStorage?: AsyncLocalStorage<Map<string, T>>);
-    private getStore;
-    register(): void;
-    runWithNewContext<R, TArgs extends any[]>(fn: (...args: TArgs) => R, ...args: TArgs): R;
-    set(key: string, value: T): this;
-    get(key: string): T | undefined;
-    clear(): void;
-    delete(key: string): boolean;
-    forEach(callbackfn: (value: T, key: string, map: Map<string, T>) => void, thisArg?: any): void;
-    has(key: string): boolean;
-    get size(): number;
-    entries(): IterableIterator<[string, T]>;
-    keys(): IterableIterator<string>;
-    values(): IterableIterator<T>;
-    [Symbol.iterator](): IterableIterator<[string, T]>;
-    [Symbol.toStringTag]: string;
+    constructor(asyncLocalStorage?: AsyncLocalStorage<T>);
+    run<R>(store: T, fn: () => R): R;
+    getStore(): T | undefined;
 }

package/dist/als/als-manager.js

@@ -8,67 +8,22 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncStorageManager = void 0;
 const common_1 = require("@nestjs/common");
 const async_hooks_1 = require("async_hooks");
-const exceptions_1 = require("../exceptions");
 let AsyncStorageManager = class AsyncStorageManager {
     constructor(asyncLocalStorage = new async_hooks_1.AsyncLocalStorage()) {
         this.asyncLocalStorage = asyncLocalStorage;
-        this[_a] = '[object AsyncContext]';
     }
-    getStore() {
-        const store = this.asyncLocalStorage.getStore();
-        if (!store) {
-            throw new exceptions_1.AsyncStorageManagerException('No active store found');
-        }
-        return store;
-    }
-    register() {
-        this.asyncLocalStorage.enterWith(new Map());
-    }
-    runWithNewContext(fn, ...args) {
-        return this.asyncLocalStorage.run(new Map(), fn, ...args);
-    }
-    set(key, value) {
-        this.getStore().set(key, value);
-        return this;
-    }
-    get(key) {
-        return this.getStore().get(key);
-    }
-    clear() {
-        return this.getStore().clear();
-    }
-    delete(key) {
-        return this.getStore().delete(key);
+    run(store, fn) {
+        return this.asyncLocalStorage.run(store, fn);
     }
-    forEach(callbackfn, thisArg) {
-        return this.getStore().forEach(callbackfn, thisArg);
-    }
-    has(key) {
-        return this.getStore().has(key);
-    }
-    get size() {
-        return this.getStore().size;
-    }
-    entries() {
-        return this.getStore().entries();
-    }
-    keys() {
-        return this.getStore().keys();
-    }
-    values() {
-        return this.getStore().values();
-    }
-    [Symbol.iterator]() {
-        return this.getStore()[Symbol.iterator]();
+    getStore() {
+        return this.asyncLocalStorage.getStore();
     }
 };
 exports.AsyncStorageManager = AsyncStorageManager;
-_a = Symbol.toStringTag;
 exports.AsyncStorageManager = AsyncStorageManager = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [Object])

package/dist/als/als-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"als-manager.js","sourceRoot":"","sources":["../../lib/als/als-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAgD;AAChD,8CAA6D;AAGtD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAA6B,oBAAoB,IAAI,+BAAiB,EAAkB;QAA3D,sBAAiB,GAAjB,iBAAiB,CAA0C;QA+DxF,QAAoB,GAAW,uBAAuB,CAAC;IA/DoC,CAAC;IAEpF,QAAQ;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QAChD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,yCAA4B,CAAC,uBAAuB,CAAC,CAAC;SACjE;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,QAAQ;QACN,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED,iBAAiB,CAAyB,EAAyB,EAAE,GAAG,IAAW;QACjF,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,GAAG,EAAa,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IACvE,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAQ;QACvB,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,UAAgE,EAAE,OAAa;QACrF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,CAAC,MAAM,CAAC,QAAQ,CAAC;QACf,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC5C,CAAC;CAGF,CAAA;AAjEY,kDAAmB;KAgE7B,MAAM,CAAC,WAAW;8BAhER,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;;GACA,mBAAmB,CAiE/B"}
+{"version":3,"file":"als-manager.js","sourceRoot":"","sources":["../../lib/als/als-manager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAgD;AAQzC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,oBAAoB,IAAI,+BAAiB,EAAK;QAA9C,sBAAiB,GAAjB,iBAAiB,CAA6B;IAC9D,CAAC;IAGJ,GAAG,CAAI,KAAQ,EAAE,EAAW;QAC1B,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGD,QAAQ;QACN,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;CACF,CAAA;AAdY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;;GACA,mBAAmB,CAc/B"}

package/dist/als/als.module.js

@@ -20,9 +20,7 @@ exports.AsyncStorageManagerModule = AsyncStorageManagerModule = __decorate([
         providers: [
             {
                 provide: als_manager_1.AsyncStorageManager,
-                useFactory: () => {
-                    return new als_manager_1.AsyncStorageManager(new async_hooks_1.AsyncLocalStorage());
-                },
+                useFactory: () => new als_manager_1.AsyncStorageManager(new async_hooks_1.AsyncLocalStorage()),
             },
             als_service_1.AsyncStorageService,
         ],

package/dist/als/als.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"als.module.js","sourceRoot":"","sources":["../../lib/als/als.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,+CAAoD;AACpD,+CAAoD;AACpD,6CAAgD;AAezC,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAAG,CAAA;AAA5B,8DAAyB;oCAAzB,yBAAyB;IAbrC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,iCAAmB;gBAC5B,UAAU,EAAE,GAAG,EAAE;oBACf,OAAO,IAAI,iCAAmB,CAAS,IAAI,+BAAiB,EAAuB,CAAC,CAAC;gBACvF,CAAC;aACF;YACD,iCAAmB;SACpB;QACD,OAAO,EAAE,CAAC,iCAAmB,CAAC;KAC/B,CAAC;GACW,yBAAyB,CAAG"}
+{"version":3,"file":"als.module.js","sourceRoot":"","sources":["../../lib/als/als.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAChD,+CAAoD;AACpD,+CAAoE;AACpE,6CAAgD;AAgBzC,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAAG,CAAA;AAA5B,8DAAyB;oCAAzB,yBAAyB;IAdrC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE;YACT;gBACE,OAAO,EAAE,iCAAmB;gBAC5B,UAAU,EAAE,GAAG,EAAE,CACf,IAAI,iCAAmB,CACrB,IAAI,+BAAiB,EAAkB,CACxC;aACJ;YACD,iCAAmB;SACpB;QACD,OAAO,EAAE,CAAC,iCAAmB,CAAC;KAC/B,CAAC;GACW,yBAAyB,CAAG"}

package/dist/als/als.service.d.ts

@@ -1,9 +1,11 @@
 import { AsyncStorageManager } from './als-manager';
+export interface MurLockContext {
+    clientId: string;
+    holds: Map<string, number>;
+}
 export declare class AsyncStorageService {
     private readonly asyncStorageManager;
-    constructor(asyncStorageManager: AsyncStorageManager<string>);
-    runWithNewContext<R, TArgs extends any[]>(fn: (...args: TArgs) => R, ...args: TArgs): R;
-    registerContext(): void;
-    get(key: string): string;
-    setClientID(key: string, value: string): void;
+    constructor(asyncStorageManager: AsyncStorageManager<MurLockContext>);
+    run<R>(store: MurLockContext, fn: () => R): R;
+    getContext(): MurLockContext | undefined;
 }

package/dist/als/als.service.js

@@ -16,17 +16,11 @@ let AsyncStorageService = class AsyncStorageService {
     constructor(asyncStorageManager) {
         this.asyncStorageManager = asyncStorageManager;
     }
-    runWithNewContext(fn, ...args) {
-        return this.asyncStorageManager.runWithNewContext(fn, ...args);
+    run(store, fn) {
+        return this.asyncStorageManager.run(store, fn);
     }
-    registerContext() {
-        this.asyncStorageManager.register();
-    }
-    get(key) {
-        return this.asyncStorageManager.get(key);
-    }
-    setClientID(key, value) {
-        this.asyncStorageManager.set(key, value);
+    getContext() {
+        return this.asyncStorageManager.getStore();
     }
 };
 exports.AsyncStorageService = AsyncStorageService;

package/dist/als/als.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"als.service.js","sourceRoot":"","sources":["../../lib/als/als.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAoD;AAG7C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YAA6B,mBAAgD;QAAhD,wBAAmB,GAAnB,mBAAmB,CAA6B;IAAG,CAAC;IAEjF,iBAAiB,CAAyB,EAAyB,EAAE,GAAG,IAAW;QACjF,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IACjE,CAAC;IAED,eAAe;QACb,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IACtC,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,WAAW,CAAC,GAAW,EAAE,KAAa;QACpC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3C,CAAC;CACF,CAAA;AAlBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAEuC,iCAAmB;GAD1D,mBAAmB,CAkB/B"}
+{"version":3,"file":"als.service.js","sourceRoot":"","sources":["../../lib/als/als.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,+CAAoD;AAa7C,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,mBAAwD;QAAxD,wBAAmB,GAAnB,mBAAmB,CAAqC;IACxE,CAAC;IAGJ,GAAG,CAAI,KAAqB,EAAE,EAAW;QACvC,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IACjD,CAAC;IAGD,UAAU;QACR,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;CACF,CAAA;AAdY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAG6B,iCAAmB;GAFhD,mBAAmB,CAc/B"}

package/dist/decorators/murlock.decorator.js

@@ -121,7 +121,8 @@ function MurLock(releaseTime, waitOrKeyParam, ...keyParams) {
             }
             return methodParameterNames.indexOf(source);
         }
-        function constructLockKey(args, lockKeyPrefix = 'default') {
+        function constructLockKey(args, lockKeyPrefix = 'default', encodeKeyParts = false) {
+            const encodePart = (value) => encodeKeyParts ? encodeURIComponent(String(value)) : value;
             const lockKeyElements = [];
             if (lockKeyPrefix != 'custom') {
                 lockKeyElements.push(target.constructor.name);
@@ -145,11 +146,11 @@ function MurLock(releaseTime, waitOrKeyParam, ...keyParams) {
                         typeof parameterValue === 'object' &&
                         parameterValue !== null &&
                         path in parameterValue) {
-                        return parameterValue[path];
+                        return encodePart(parameterValue[path]);
                     }
-                    return parameterValue instanceof Object
+                    return encodePart(parameterValue instanceof Object
                         ? parameterValue.toString()
-                        : parameterValue;
+                        : parameterValue);
                 }
                 if (lockKeyPrefix == 'custom') {
                     return source;
@@ -161,7 +162,7 @@ function MurLock(releaseTime, waitOrKeyParam, ...keyParams) {
         const wrapped = function (...args) {
             return __awaiter(this, void 0, void 0, function* () {
                 const murLockService = this.murlockServiceDecorator;
-                const lockKey = constructLockKey(args, murLockService.options.lockKeyPrefix);
+                const lockKey = constructLockKey(args, murLockService.options.lockKeyPrefix, murLockService.options.encodeKeyParts);
                 if (!murLockService) {
                     throw new exceptions_1.MurLockException('MurLockService is not available.');
                 }

package/dist/decorators/murlock.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"murlock.decorator.js","sourceRoot":"","sources":["../../lib/decorators/murlock.decorator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"murlock.decorator.js","sourceRoot":"","sources":["../../lib/decorators/murlock.decorator.ts"],"names":[],"mappings":"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"}

package/dist/exceptions/murlock-redis.exception.d.ts

@@ -1,3 +1,4 @@
-export declare class MurLockRedisException extends Error {
+import { MurLockException } from './murlock.exception';
+export declare class MurLockRedisException extends MurLockException {
     constructor(message: string);
 }

package/dist/exceptions/murlock-redis.exception.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MurLockRedisException = void 0;
-class MurLockRedisException extends Error {
+const murlock_exception_1 = require("./murlock.exception");
+class MurLockRedisException extends murlock_exception_1.MurLockException {
     constructor(message) {
         super(message);
         this.name = "MurLockRedisException";

package/dist/exceptions/murlock-redis.exception.js.map

@@ -1 +1 @@
-{"version":3,"file":"murlock-redis.exception.js","sourceRoot":"","sources":["../../lib/exceptions/murlock-redis.exception.ts"],"names":[],"mappings":";;;AAAA,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AALD,sDAKC"}
+{"version":3,"file":"murlock-redis.exception.js","sourceRoot":"","sources":["../../lib/exceptions/murlock-redis.exception.ts"],"names":[],"mappings":";;;AAAA,2DAAuD;AAQvD,MAAa,qBAAsB,SAAQ,oCAAgB;IACzD,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,uBAAuB,CAAC;IACtC,CAAC;CACF;AALD,sDAKC"}

package/dist/interfaces/murlock-options.interface.d.ts

@@ -11,6 +11,9 @@ export interface MurLockModuleOptions {
     autoExtend?: boolean;
     extendInterval?: number;
     onRedisError?: (error: Error) => void;
+    reentrant?: boolean;
+    encodeKeyParts?: boolean;
+    jitter?: boolean;
 }
 export interface MurLockModuleAsyncOptions {
     imports?: any[];

package/dist/murlock.service.d.ts

@@ -9,11 +9,16 @@ export declare class MurLockService implements OnModuleInit, OnApplicationShutdo
     private lockScript;
     private unlockScript;
     private extendScript;
+    private readonly scriptShas;
     constructor(options: MurLockModuleOptions, asyncStorageService: AsyncStorageService);
     onModuleInit(): Promise<void>;
     onApplicationShutdown(signal?: string): Promise<void>;
+    private validateOptions;
     private sleep;
+    private withJitter;
     private log;
+    private loadScripts;
+    private evalScript;
     private lock;
     private unlock;
     private extendLock;
@@ -22,6 +27,7 @@ export declare class MurLockService implements OnModuleInit, OnApplicationShutdo
     private releaseLock;
     runWithLock<R>(lockKey: string, releaseTime: number, fn: () => Promise<R>): Promise<R>;
     runWithLock<R>(lockKey: string, releaseTime: number, wait: number | ((retries: number) => number), fn: () => Promise<R>): Promise<R>;
+    private runReentrant;
     private registerRedisErrorHandlers;
     private blockingLock;
 }

package/dist/murlock.service.js

@@ -35,9 +35,11 @@ let MurLockService = MurLockService_1 = class MurLockService {
         this.options = options;
         this.asyncStorageService = asyncStorageService;
         this.logger = new common_1.Logger(MurLockService_1.name);
+        this.scriptShas = {};
     }
     onModuleInit() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.validateOptions();
             try {
                 this.lockScript = yield (0, promises_1.readFile)((0, path_1.join)(__dirname, './lua/lock.lua'), 'utf8');
                 this.unlockScript = yield (0, promises_1.readFile)((0, path_1.join)(__dirname, './lua/unlock.lua'), 'utf8');
@@ -54,6 +56,7 @@ let MurLockService = MurLockService_1 = class MurLockService {
             this.registerRedisErrorHandlers();
             try {
                 yield this.redisClient.connect();
+                yield this.loadScripts();
             }
             catch (error) {
                 this.log('error', `Failed to connect to Redis: ${error.message}`);
@@ -71,9 +74,28 @@ let MurLockService = MurLockService_1 = class MurLockService {
             }
         });
     }
+    validateOptions() {
+        const { maxAttempts, wait, extendInterval } = this.options;
+        if (!Number.isFinite(maxAttempts) || maxAttempts < 1) {
+            throw new exceptions_1.MurLockException(`Invalid MurLock option 'maxAttempts': ${maxAttempts} (must be an integer >= 1).`);
+        }
+        if (!Number.isFinite(wait) || wait < 0) {
+            throw new exceptions_1.MurLockException(`Invalid MurLock option 'wait': ${wait} (must be a number >= 0).`);
+        }
+        if (extendInterval !== undefined &&
+            (!Number.isFinite(extendInterval) || extendInterval <= 0)) {
+            throw new exceptions_1.MurLockException(`Invalid MurLock option 'extendInterval': ${extendInterval} (must be a number > 0).`);
+        }
+    }
     sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));
     }
+    withJitter(delay) {
+        if (!this.options.jitter) {
+            return delay;
+        }
+        return Math.floor(delay / 2 + Math.random() * (delay / 2));
+    }
     log(level, message, context) {
         if (this.options.logLevel === 'none') {
             return;
@@ -88,6 +110,76 @@ let MurLockService = MurLockService_1 = class MurLockService {
             this.logger[level](message, context);
         }
     }
+    loadScripts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.scriptShas.lock = (yield this.redisClient.sendCommand([
+                    'SCRIPT',
+                    'LOAD',
+                    this.lockScript,
+                ]));
+                this.scriptShas.unlock = (yield this.redisClient.sendCommand([
+                    'SCRIPT',
+                    'LOAD',
+                    this.unlockScript,
+                ]));
+                this.scriptShas.extend = (yield this.redisClient.sendCommand([
+                    'SCRIPT',
+                    'LOAD',
+                    this.extendScript,
+                ]));
+            }
+            catch (error) {
+                this.log('warn', `MurLock could not preload Lua scripts (will fall back to EVAL): ${error.message}`);
+            }
+        });
+    }
+    evalScript(name, script, keys, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const numkeys = keys.length.toString();
+            const sha = this.scriptShas[name];
+            if (sha) {
+                try {
+                    return yield this.redisClient.sendCommand([
+                        'EVALSHA',
+                        sha,
+                        numkeys,
+                        ...keys,
+                        ...args,
+                    ]);
+                }
+                catch (error) {
+                    if (!/NOSCRIPT/i.test(String(error === null || error === void 0 ? void 0 : error.message))) {
+                        throw error;
+                    }
+                    try {
+                        const fresh = (yield this.redisClient.sendCommand([
+                            'SCRIPT',
+                            'LOAD',
+                            script,
+                        ]));
+                        this.scriptShas[name] = fresh;
+                        return yield this.redisClient.sendCommand([
+                            'EVALSHA',
+                            fresh,
+                            numkeys,
+                            ...keys,
+                            ...args,
+                        ]);
+                    }
+                    catch (_a) {
+                    }
+                }
+            }
+            return yield this.redisClient.sendCommand([
+                'EVAL',
+                script,
+                numkeys,
+                ...keys,
+                ...args,
+            ]);
+        });
+    }
     lock(lockKey, releaseTime, clientId, wait) {
         return __awaiter(this, void 0, void 0, function* () {
             this.log('debug', `MurLock Client ID is ${clientId}`);
@@ -99,32 +191,29 @@ let MurLockService = MurLockService_1 = class MurLockService {
                     throw new exceptions_1.MurLockException(`Failed to obtain lock for key ${lockKey} after ${this.options.maxAttempts} attempts.`);
                 }
                 try {
-                    const isLockSuccessful = yield this.redisClient.sendCommand([
-                        'EVAL',
-                        this.lockScript,
-                        '1',
-                        lockKey,
-                        clientId,
-                        releaseTime.toString(),
-                    ]);
+                    const isLockSuccessful = yield this.evalScript('lock', this.lockScript, [lockKey], [clientId, releaseTime.toString()]);
                     if (isLockSuccessful === 1) {
                         this.log('log', `Successfully obtained lock for key ${lockKey}`);
                         return true;
                     }
                     else {
-                        const delay = wait
+                        const baseDelay = wait
                             ? typeof wait === 'function'
                                 ? wait(this.options.maxAttempts - attemptsRemaining + 1)
                                 : wait
                             : this.options.wait *
                                 (this.options.maxAttempts - attemptsRemaining + 1);
+                        const delay = this.withJitter(baseDelay);
                         this.log('warn', `Failed to obtain lock for key ${lockKey}, retrying in ${delay} ms...`);
                         yield this.sleep(delay);
                         return attemptLock(attemptsRemaining - 1);
                     }
                 }
                 catch (error) {
-                    throw new exceptions_1.MurLockException(`Unexpected error when trying to obtain lock for key ${lockKey}: ${error.message}`);
+                    if (error instanceof exceptions_1.MurLockException) {
+                        throw error;
+                    }
+                    throw new exceptions_1.MurLockRedisException(`Unexpected error when trying to obtain lock for key ${lockKey}: ${error.message}`);
                 }
             });
             return attemptLock(this.options.maxAttempts);
@@ -132,13 +221,7 @@ let MurLockService = MurLockService_1 = class MurLockService {
     }
     unlock(lockKey, clientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.redisClient.sendCommand([
-                'EVAL',
-                this.unlockScript,
-                '1',
-                lockKey,
-                clientId,
-            ]);
+            const result = yield this.evalScript('unlock', this.unlockScript, [lockKey], [clientId]);
             if (result === 0) {
                 if (!this.options.ignoreUnlockFail) {
                     throw new exceptions_1.MurLockException(`Failed to release lock for key ${lockKey}`);
@@ -151,14 +234,7 @@ let MurLockService = MurLockService_1 = class MurLockService {
     }
     extendLock(lockKey, clientId, releaseTime) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.redisClient.sendCommand([
-                'EVAL',
-                this.extendScript,
-                '1',
-                lockKey,
-                clientId,
-                releaseTime.toString(),
-            ]);
+            const result = yield this.evalScript('extend', this.extendScript, [lockKey], [clientId, releaseTime.toString()]);
             return result === 1;
         });
     }
@@ -196,6 +272,9 @@ let MurLockService = MurLockService_1 = class MurLockService {
                 isLockSuccessful = yield this.lock(lockKey, releaseTime, clientId, wait);
             }
             catch (error) {
+                if (error instanceof exceptions_1.MurLockException) {
+                    throw error;
+                }
                 throw new exceptions_1.MurLockException(`Failed to acquire lock for key ${lockKey}: ${error.message}`);
             }
             if (!isLockSuccessful) {
@@ -209,6 +288,9 @@ let MurLockService = MurLockService_1 = class MurLockService {
                 yield this.unlock(lockKey, clientId);
             }
             catch (error) {
+                if (error instanceof exceptions_1.MurLockException) {
+                    throw error;
+                }
                 throw new exceptions_1.MurLockException(`Failed to release lock for key ${lockKey}: ${error.message}`);
             }
         });
@@ -224,17 +306,67 @@ let MurLockService = MurLockService_1 = class MurLockService {
                 wait = waitOrFn;
                 operation = fn;
             }
-            this.asyncStorageService.registerContext();
-            this.asyncStorageService.setClientID('clientId', (0, utils_1.generateUuid)());
-            const clientId = this.asyncStorageService.get('clientId');
-            yield this.acquireLock(lockKey, clientId, releaseTime, wait);
-            const stopWatchdog = this.startWatchdog(lockKey, clientId, releaseTime);
+            if (!Number.isFinite(releaseTime) || releaseTime <= 0) {
+                throw new exceptions_1.MurLockException(`Invalid releaseTime for key ${lockKey}: ${releaseTime} (must be > 0).`);
+            }
+            if (!this.options.reentrant) {
+                const clientId = (0, utils_1.generateUuid)();
+                yield this.acquireLock(lockKey, clientId, releaseTime, wait);
+                const stopWatchdog = this.startWatchdog(lockKey, clientId, releaseTime);
+                try {
+                    return yield operation();
+                }
+                finally {
+                    stopWatchdog();
+                    yield this.releaseLock(lockKey, clientId);
+                }
+            }
+            const existing = this.asyncStorageService.getContext();
+            if (existing) {
+                return this.runReentrant(existing, lockKey, releaseTime, wait, operation);
+            }
+            const context = {
+                clientId: (0, utils_1.generateUuid)(),
+                holds: new Map(),
+            };
+            return this.asyncStorageService.run(context, () => this.runReentrant(context, lockKey, releaseTime, wait, operation));
+        });
+    }
+    runReentrant(context, lockKey, releaseTime, wait, operation) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const depth = (_a = context.holds.get(lockKey)) !== null && _a !== void 0 ? _a : 0;
+            if (depth > 0) {
+                context.holds.set(lockKey, depth + 1);
+                try {
+                    return yield operation();
+                }
+                finally {
+                    const current = (_b = context.holds.get(lockKey)) !== null && _b !== void 0 ? _b : 1;
+                    if (current <= 1) {
+                        context.holds.delete(lockKey);
+                    }
+                    else {
+                        context.holds.set(lockKey, current - 1);
+                    }
+                }
+            }
+            yield this.acquireLock(lockKey, context.clientId, releaseTime, wait);
+            context.holds.set(lockKey, 1);
+            const stopWatchdog = this.startWatchdog(lockKey, context.clientId, releaseTime);
             try {
                 return yield operation();
             }
             finally {
-                stopWatchdog();
-                yield this.releaseLock(lockKey, clientId);
+                const current = (_c = context.holds.get(lockKey)) !== null && _c !== void 0 ? _c : 1;
+                if (current <= 1) {
+                    context.holds.delete(lockKey);
+                    stopWatchdog();
+                    yield this.releaseLock(lockKey, context.clientId);
+                }
+                else {
+                    context.holds.set(lockKey, current - 1);
+                }
             }
         });
     }
@@ -264,26 +396,20 @@ let MurLockService = MurLockService_1 = class MurLockService {
         return __awaiter(this, void 0, void 0, function* () {
             while (true) {
                 try {
-                    const isLockSuccessful = yield this.redisClient.sendCommand([
-                        'EVAL',
-                        this.lockScript,
-                        '1',
-                        lockKey,
-                        clientId,
-                        releaseTime.toString(),
-                    ]);
+                    const isLockSuccessful = yield this.evalScript('lock', this.lockScript, [lockKey], [clientId, releaseTime.toString()]);
                     if (isLockSuccessful === 1) {
                         this.log('log', `Successfully obtained lock for key ${lockKey} in blocking mode`);
                         return true;
                     }
                     else {
-                        this.log('warn', `Lock busy for key ${lockKey}, waiting ${this.options.wait} ms before next attempt (blocking mode)...`);
-                        yield this.sleep(this.options.wait);
+                        const delay = this.withJitter(this.options.wait);
+                        this.log('warn', `Lock busy for key ${lockKey}, waiting ${delay} ms before next attempt (blocking mode)...`);
+                        yield this.sleep(delay);
                     }
                 }
                 catch (error) {
                     this.log('error', `Unexpected error in blocking lock for key ${lockKey}: ${error.message}`);
-                    yield this.sleep(this.options.wait);
+                    yield this.sleep(this.withJitter(this.options.wait));
                 }
             }
         });