namirasoft-node-redis 1.4.7 → 1.4.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,10 @@
1
1
  import { RedisInstance } from "./RedisInstance";
2
2
  import { RedisScope } from "./RedisScope";
3
3
  export declare abstract class RedisScopeLock<Parameters> extends RedisScope<number> {
4
- constructor(instance: RedisInstance);
4
+ private ttl_seconds;
5
+ constructor(instance: RedisInstance, ttl_seconds: number);
5
6
  protected abstract key(key_parameter: Parameters): string;
6
- lock(key_parameter: Parameters, ttl_seconds: number): Promise<boolean>;
7
- waitForLock(key_parameter: Parameters, ttl_seconds: number): Promise<void>;
7
+ lock(key_parameter: Parameters, ttl_seconds?: number): Promise<boolean>;
8
+ waitForLock(key_parameter: Parameters, ttl_seconds?: number): Promise<void>;
8
9
  unlock(key_parameter: Parameters): Promise<void>;
9
10
  }
@@ -12,14 +12,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.RedisScopeLock = void 0;
13
13
  const RedisScope_1 = require("./RedisScope");
14
14
  class RedisScopeLock extends RedisScope_1.RedisScope {
15
- constructor(instance) {
15
+ constructor(instance, ttl_seconds) {
16
16
  super(instance);
17
+ this.ttl_seconds = ttl_seconds;
17
18
  this.lock = this.lock.bind(this);
19
+ this.waitForLock = this.waitForLock.bind(this);
18
20
  this.unlock = this.unlock.bind(this);
19
21
  }
20
22
  lock(key_parameter, ttl_seconds) {
21
23
  return __awaiter(this, void 0, void 0, function* () {
22
- let ans = yield this._set(this.key(key_parameter), Math.random(), true, ttl_seconds);
24
+ let ans = yield this._set(this.key(key_parameter), Math.random(), true, ttl_seconds !== null && ttl_seconds !== void 0 ? ttl_seconds : this.ttl_seconds);
23
25
  if (ans)
24
26
  return true;
25
27
  return false;
@@ -28,7 +30,7 @@ class RedisScopeLock extends RedisScope_1.RedisScope {
28
30
  waitForLock(key_parameter, ttl_seconds) {
29
31
  return __awaiter(this, void 0, void 0, function* () {
30
32
  while (true) {
31
- let ans = yield this._set(this.key(key_parameter), Math.random(), true, ttl_seconds);
33
+ let ans = yield this.lock(key_parameter, ttl_seconds);
32
34
  if (ans)
33
35
  break;
34
36
  yield new Promise(res => setTimeout(res, 10));
@@ -1 +1 @@
1
- {"version":3,"file":"RedisScopeLock.js","sourceRoot":"","sources":["../src/RedisScopeLock.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAE1C,MAAsB,cAA2B,SAAQ,uBAAkB;IAEvE,YAAY,QAAuB;QAE/B,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAEK,IAAI,CAAC,aAAyB,EAAE,WAAmB;;YAErD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;YACrF,IAAI,GAAG;gBACH,OAAO,IAAI,CAAC;YAChB,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IACK,WAAW,CAAC,aAAyB,EAAE,WAAmB;;YAE5D,OAAO,IAAI,EACX,CAAC;gBACG,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;gBACrF,IAAI,GAAG;oBACH,MAAM;gBACV,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;KAAA;IACK,MAAM,CAAC,aAAyB;;YAElC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7C,CAAC;KAAA;CACJ;AA9BD,wCA8BC;AAAA,CAAC"}
1
+ {"version":3,"file":"RedisScopeLock.js","sourceRoot":"","sources":["../src/RedisScopeLock.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAA0C;AAE1C,MAAsB,cAA2B,SAAQ,uBAAkB;IAEvE,YAAY,QAAuB,EAAU,WAAmB;QAE5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QAFyB,gBAAW,GAAX,WAAW,CAAQ;QAG5D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAEK,IAAI,CAAC,aAAyB,EAAE,WAAoB;;YAEtD,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,CAAC,WAAW,CAAC,CAAC;YACzG,IAAI,GAAG;gBACH,OAAO,IAAI,CAAC;YAChB,OAAO,KAAK,CAAC;QACjB,CAAC;KAAA;IACK,WAAW,CAAC,aAAyB,EAAE,WAAoB;;YAE7D,OAAO,IAAI,EACX,CAAC;gBACG,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;gBACtD,IAAI,GAAG;oBACH,MAAM;gBACV,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACL,CAAC;KAAA;IACK,MAAM,CAAC,aAAyB;;YAElC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7C,CAAC;KAAA;CACJ;AA/BD,wCA+BC;AAAA,CAAC"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.7",
11
+ "version": "1.4.8",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/index.js",
@@ -3,25 +3,26 @@ import { RedisScope } from "./RedisScope";
3
3
 
4
4
  export abstract class RedisScopeLock<Parameters> extends RedisScope<number>
5
5
  {
6
- constructor(instance: RedisInstance)
6
+ constructor(instance: RedisInstance, private ttl_seconds: number)
7
7
  {
8
8
  super(instance);
9
9
  this.lock = this.lock.bind(this);
10
+ this.waitForLock = this.waitForLock.bind(this);
10
11
  this.unlock = this.unlock.bind(this);
11
12
  }
12
13
  protected abstract key(key_parameter: Parameters): string;
13
- async lock(key_parameter: Parameters, ttl_seconds: number): Promise<boolean>
14
+ async lock(key_parameter: Parameters, ttl_seconds?: number): Promise<boolean>
14
15
  {
15
- let ans = await this._set(this.key(key_parameter), Math.random(), true, ttl_seconds);
16
+ let ans = await this._set(this.key(key_parameter), Math.random(), true, ttl_seconds ?? this.ttl_seconds);
16
17
  if (ans)
17
18
  return true;
18
19
  return false;
19
20
  }
20
- async waitForLock(key_parameter: Parameters, ttl_seconds: number): Promise<void>
21
+ async waitForLock(key_parameter: Parameters, ttl_seconds?: number): Promise<void>
21
22
  {
22
23
  while (true)
23
24
  {
24
- let ans = await this._set(this.key(key_parameter), Math.random(), true, ttl_seconds);
25
+ let ans = await this.lock(key_parameter, ttl_seconds);
25
26
  if (ans)
26
27
  break;
27
28
  await new Promise(res => setTimeout(res, 10));