@rnw-community/nestjs-rxjs-lock 0.53.0 → 0.54.0

package/dist/cjs/nestjs-rxjs-lock-module.options.d.ts

@@ -1,5 +1,5 @@
-import type Redlock from 'redlock';
-export interface NestJSRxJSLockModuleOptions extends Redlock.Options {
+import type { Settings } from 'redlock';
+export interface NestJSRxJSLockModuleOptions extends Settings {
     defaultExpireMs: number;
 }
 export declare const defaultNestJSRxJSLockModuleOptions: NestJSRxJSLockModuleOptions;

package/dist/cjs/nestjs-rxjs-lock-module.options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock-module.options.d.ts","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock-module.options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,2BAA4B,SAAQ,OAAO,CAAC,OAAO;IAChE,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,kCAAkC,EAAE,2BAGhD,CAAC"}
+{"version":3,"file":"nestjs-rxjs-lock-module.options.d.ts","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock-module.options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,WAAW,2BAA4B,SAAQ,QAAQ;IACzD,eAAe,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,kCAAkC,EAAE,2BAOhD,CAAC"}

package/dist/cjs/nestjs-rxjs-lock-module.options.js

@@ -4,5 +4,9 @@ exports.defaultNestJSRxJSLockModuleOptions = void 0;
 exports.defaultNestJSRxJSLockModuleOptions = {
     defaultExpireMs: 10000,
     retryCount: 0,
+    driftFactor: 0.01,
+    retryDelay: 200,
+    retryJitter: 200,
+    automaticExtensionThreshold: 500,
 };
 //# sourceMappingURL=nestjs-rxjs-lock-module.options.js.map

package/dist/cjs/nestjs-rxjs-lock-module.options.js.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock-module.options.js","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock-module.options.ts"],"names":[],"mappings":";;;AAMa,QAAA,kCAAkC,GAAgC;IAC3E,eAAe,EAAE,KAAK;IACtB,UAAU,EAAE,CAAC;CAChB,CAAC"}
+{"version":3,"file":"nestjs-rxjs-lock-module.options.js","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock-module.options.ts"],"names":[],"mappings":";;;AAMa,QAAA,kCAAkC,GAAgC;IAC3E,eAAe,EAAE,KAAK;IACtB,UAAU,EAAE,CAAC;IACb,WAAW,EAAE,IAAI;IACjB,UAAU,EAAE,GAAG;IACf,WAAW,EAAE,GAAG;IAChB,2BAA2B,EAAE,GAAG;CACnC,CAAC"}

package/dist/cjs/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.d.ts

@@ -1,12 +1,12 @@
+import { Redis } from 'ioredis';
 import { type Observable } from 'rxjs';
 import type { NestJSRxJSLockModuleOptions } from '../nestjs-rxjs-lock-module.options';
-import type { RedisService } from 'nestjs-redis';
 export declare abstract class NestJSRxJSLockService<E = string> {
-    readonly redis: RedisService;
+    readonly redis: Redis;
     readonly options: NestJSRxJSLockModuleOptions;
     private readonly lock;
     private readonly expireInMs;
-    protected constructor(redis: RedisService, options: NestJSRxJSLockModuleOptions);
+    protected constructor(redis: Redis, options: NestJSRxJSLockModuleOptions);
     /**
      * RxJS wrapper for redlock acquire lock method
      *

package/dist/cjs/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock.service.d.ts","sourceRoot":"","sources":["../../../src/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAA6B,MAAM,MAAM,CAAC;AAIlE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,8BAAsB,qBAAqB,CAAC,CAAC,GAAG,MAAM;IAM9C,QAAQ,CAAC,KAAK,EAAE,YAAY;IAC5B,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IANjD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,SAAS,aAEI,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,2BAA2B;IAUjD;;;;;;;;;;OAUG;IACH,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,SAAkB,GAAG,UAAU,CAAC,CAAC,CAAC;IAQ7G,OAAO,CAAC,MAAM,CAAC,YAAY;CAG9B"}
+{"version":3,"file":"nestjs-rxjs-lock.service.d.ts","sourceRoot":"","sources":["../../../src/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,OAAO,EAAE,KAAK,UAAU,EAA6B,MAAM,MAAM,CAAC;AAKlE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAEtF,8BAAsB,qBAAqB,CAAC,CAAC,GAAG,MAAM;IAIb,QAAQ,CAAC,KAAK,EAAE,KAAK;IAAE,QAAQ,CAAC,OAAO,EAAE,2BAA2B;IAHzG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;IAC/B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IAEpC,SAAS,aAAqC,KAAK,EAAE,KAAK,EAAW,OAAO,EAAE,2BAA2B;IAOzG;;;;;;;;;;OAUG;IACH,KAAK,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,SAAkB,GAAG,UAAU,CAAC,CAAC,CAAC;IAQ7G,OAAO,CAAC,MAAM,CAAC,YAAY;CAG9B"}

package/dist/cjs/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.js

@@ -1,22 +1,33 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestJSRxJSLockService = void 0;
+const ioredis_1 = require("@nestjs-modules/ioredis");
+const ioredis_2 = require("ioredis");
 const redlock_1 = __importDefault(require("redlock"));
 const rxjs_1 = require("rxjs");
 const shared_1 = require("@rnw-community/shared");
-class NestJSRxJSLockService {
-    constructor(
-    // TODO: Can we avoid nestjs-redis dependency?
-    redis, options) {
+let NestJSRxJSLockService = class NestJSRxJSLockService {
+    constructor(redis, options) {
         this.redis = redis;
         this.options = options;
         const { defaultExpireMs, ...redlockOptions } = options;
         this.expireInMs = options.defaultExpireMs;
-        const redisInstances = Array.from(redis.getClients().values());
-        this.lock = new redlock_1.default(redisInstances, redlockOptions);
+        this.lock = new redlock_1.default([redis], redlockOptions);
     }
     /**
      * RxJS wrapper for redlock acquire lock method
@@ -31,11 +42,15 @@ class NestJSRxJSLockService {
      */
     lock$(name, prefix, handler$, expireInMs = this.expireInMs) {
         const lockName = NestJSRxJSLockService.generateName(name, prefix);
-        return (0, rxjs_1.from)(this.lock.acquire([lockName], expireInMs)).pipe((0, rxjs_1.concatMap)(lock => handler$().pipe((0, rxjs_1.finalize)(() => void lock.unlock().catch(() => void 0)))));
+        return (0, rxjs_1.from)(this.lock.acquire([lockName], expireInMs)).pipe((0, rxjs_1.concatMap)(lock => handler$().pipe((0, rxjs_1.finalize)(() => void lock.release().catch(() => void 0)))));
     }
     static generateName(name, prefix) {
         return ['lock', prefix, name].filter(shared_1.isNotEmptyString).join(':');
     }
-}
+};
+NestJSRxJSLockService = __decorate([
+    __param(0, (0, ioredis_1.InjectRedis)()),
+    __metadata("design:paramtypes", [ioredis_2.Redis, Object])
+], NestJSRxJSLockService);
 exports.NestJSRxJSLockService = NestJSRxJSLockService;
 //# sourceMappingURL=nestjs-rxjs-lock.service.js.map

package/dist/cjs/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock.service.js","sourceRoot":"","sources":["../../../src/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,+BAAkE;AAElE,kDAAyD;AAKzD,MAAsB,qBAAqB;IAIvC;IACI,8CAA8C;IACrC,KAAmB,EACnB,OAAoC;QADpC,UAAK,GAAL,KAAK,CAAc;QACnB,YAAO,GAAP,OAAO,CAA6B;QAE7C,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;QACvD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC;QAE1C,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAI,GAAG,IAAI,iBAAO,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAI,IAAY,EAAE,MAAS,EAAE,QAA6B,EAAE,UAAU,GAAG,IAAI,CAAC,UAAU;QACzF,MAAM,QAAQ,GAAG,qBAAqB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAElE,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CACvD,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAC7F,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,YAAY,CAAI,IAAY,EAAE,MAAS;QAClD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,yBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;CACJ;AAvCD,sDAuCC"}
+{"version":3,"file":"nestjs-rxjs-lock.service.js","sourceRoot":"","sources":["../../../src/nestjs-rxjs-lock-service/nestjs-rxjs-lock.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,qDAAsD;AACtD,qCAAgC;AAChC,sDAA8B;AAC9B,+BAAkE;AAElE,kDAAyD;AAKlD,IAAe,qBAAqB,GAApC,MAAe,qBAAqB;IAIvC,YAA8C,KAAY,EAAW,OAAoC;QAA3D,UAAK,GAAL,KAAK,CAAO;QAAW,YAAO,GAAP,OAAO,CAA6B;QACrG,MAAM,EAAE,eAAe,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;QACvD,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC;QAE1C,IAAI,CAAC,IAAI,GAAG,IAAI,iBAAO,CAAC,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAI,IAAY,EAAE,MAAS,EAAE,QAA6B,EAAE,UAAU,GAAG,IAAI,CAAC,UAAU;QACzF,MAAM,QAAQ,GAAG,qBAAqB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAElE,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CACvD,IAAA,gBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,GAAG,EAAE,CAAC,KAAK,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAC9F,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,YAAY,CAAI,IAAY,EAAE,MAAS;QAClD,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,yBAAgB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AAjCqB,qBAAqB;IAIhB,WAAA,IAAA,qBAAW,GAAE,CAAA;qCAAiB,eAAK;GAJxC,qBAAqB,CAiC1C;AAjCqB,sDAAqB"}

package/dist/cjs/nestjs-rxjs-lock.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock.module.d.ts","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAsB,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAGnF,OAAO,EAAE,KAAK,2BAA2B,EAAsC,MAAM,mCAAmC,CAAC;AACzH,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAE5F,qBACa,oBAAoB;IAC7B,MAAM,CAAC,kBAAkB,CAAC,CAAC,GAAG,MAAM,EAChC,OAAO,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,CAAC,aAAa,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;CAiBrD"}
+{"version":3,"file":"nestjs-rxjs-lock.module.d.ts","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock.module.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAAsB,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAInF,OAAO,EAAE,KAAK,2BAA2B,EAAsC,MAAM,mCAAmC,CAAC;AACzH,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAE5F,qBACa,oBAAoB;IAC7B,MAAM,CAAC,kBAAkB,CAAC,CAAC,GAAG,MAAM,EAChC,OAAO,GAAE,OAAO,CAAC,2BAA2B,CAAM,GACnD,CAAC,aAAa,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;CAiBrD"}

package/dist/cjs/nestjs-rxjs-lock.module.js

@@ -8,12 +8,16 @@ 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 var NestJSRxJSLockModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestJSRxJSLockModule = void 0;
 // eslint-disable-next-line max-classes-per-file
 const common_1 = require("@nestjs/common");
-const nestjs_redis_1 = require("nestjs-redis");
+const ioredis_1 = require("@nestjs-modules/ioredis");
+const ioredis_2 = __importDefault(require("ioredis"));
 const nestjs_rxjs_lock_module_options_1 = require("./nestjs-rxjs-lock-module.options");
 const nestjs_rxjs_lock_service_1 = require("./nestjs-rxjs-lock-service/nestjs-rxjs-lock.service");
 let NestJSRxJSLockModule = NestJSRxJSLockModule_1 = class NestJSRxJSLockModule {
@@ -25,10 +29,10 @@ let NestJSRxJSLockModule = NestJSRxJSLockModule_1 = class NestJSRxJSLockModule {
         };
         LockService = __decorate([
             (0, common_1.Injectable)(),
-            __metadata("design:paramtypes", [nestjs_redis_1.RedisService])
+            __metadata("design:paramtypes", [ioredis_2.default])
         ], LockService);
         const LockModule = {
-            imports: [nestjs_redis_1.RedisModule],
+            imports: [ioredis_1.RedisModule],
             module: NestJSRxJSLockModule_1,
             providers: [LockService],
             exports: [LockService],

package/dist/cjs/nestjs-rxjs-lock.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"nestjs-rxjs-lock.module.js","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,gDAAgD;AAChD,2CAAmF;AACnF,+CAAyD;AAEzD,uFAAyH;AACzH,kGAA4F;AAGrF,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IACtB,AAAP,MAAM,CAAC,kBAAkB,CACrB,UAAgD,EAAE;QAElD,IACM,WAAW,GADjB,MACM,WAAY,SAAQ,gDAAwB;YAC9C,YAAY,KAAmB;gBAC3B,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,oEAAkC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACxE,CAAC;SACJ,CAAA;QAJK,WAAW;YADhB,IAAA,mBAAU,GAAE;6CAEU,2BAAY;WAD7B,WAAW,CAIhB;QAED,MAAM,UAAU,GAAG;YACf,OAAO,EAAE,CAAC,0BAAW,CAAC;YACtB,MAAM,EAAE,sBAAoB;YAC5B,SAAS,EAAE,CAAC,WAAW,CAAC;YACxB,OAAO,EAAE,CAAC,WAAW,CAAC;SACzB,CAAC;QAEF,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AApBY,oBAAoB;IADhC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,oBAAoB,CAoBhC;AApBY,oDAAoB"}
+{"version":3,"file":"nestjs-rxjs-lock.module.js","sourceRoot":"","sources":["../../src/nestjs-rxjs-lock.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,2CAAmF;AACnF,qDAAsD;AACtD,sDAA4B;AAE5B,uFAAyH;AACzH,kGAA4F;AAGrF,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IACtB,AAAP,MAAM,CAAC,kBAAkB,CACrB,UAAgD,EAAE;QAElD,IACM,WAAW,GADjB,MACM,WAAY,SAAQ,gDAAwB;YAC9C,YAAY,KAAY;gBACpB,KAAK,CAAC,KAAK,EAAE,EAAE,GAAG,oEAAkC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;YACxE,CAAC;SACJ,CAAA;QAJK,WAAW;YADhB,IAAA,mBAAU,GAAE;6CAEU,iBAAK;WADtB,WAAW,CAIhB;QAED,MAAM,UAAU,GAAG;YACf,OAAO,EAAE,CAAC,qBAAW,CAAC;YACtB,MAAM,EAAE,sBAAoB;YAC5B,SAAS,EAAE,CAAC,WAAW,CAAC;YACxB,OAAO,EAAE,CAAC,WAAW,CAAC;SACzB,CAAC;QAEF,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IACrC,CAAC;CACJ,CAAA;AApBY,oBAAoB;IADhC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,oBAAoB,CAoBhC;AApBY,oDAAoB"}