@omnitron-dev/titan-lock 0.1.3 → 0.3.0
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.
- package/dist/lock.decorators.d.ts.map +1 -1
- package/dist/lock.decorators.js +7 -1
- package/dist/lock.decorators.js.map +1 -1
- package/dist/lock.module.d.ts.map +1 -1
- package/dist/lock.module.js +16 -1
- package/dist/lock.module.js.map +1 -1
- package/dist/lock.service.d.ts +10 -1
- package/dist/lock.service.d.ts.map +1 -1
- package/dist/lock.service.js +77 -13
- package/dist/lock.service.js.map +1 -1
- package/dist/lock.tokens.d.ts +1 -0
- package/dist/lock.tokens.d.ts.map +1 -1
- package/dist/lock.tokens.js +1 -0
- package/dist/lock.tokens.js.map +1 -1
- package/dist/lock.types.d.ts +4 -0
- package/dist/lock.types.d.ts.map +1 -1
- package/package.json +9 -7
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.decorators.d.ts","sourceRoot":"","sources":["../src/lock.decorators.ts"],"names":[],"mappings":"AA6CA,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"lock.decorators.d.ts","sourceRoot":"","sources":["../src/lock.decorators.ts"],"names":[],"mappings":"AA6CA,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,GAAE,MAAc,GAAG,eAAe,CA2D3F;AAKD,eAAO,MAAM,IAAI,4BAAsB,CAAC"}
|
package/dist/lock.decorators.js
CHANGED
|
@@ -23,7 +23,13 @@ export function WithDistributedLock(lockKey, ttlMs = 60000) {
|
|
|
23
23
|
return await originalMethod.apply(this, args);
|
|
24
24
|
}
|
|
25
25
|
finally {
|
|
26
|
-
|
|
26
|
+
try {
|
|
27
|
+
await lockService.releaseLock(lockKey, lockId);
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
const logger = this.logger ?? this.loggerModule?.logger;
|
|
31
|
+
logger?.warn?.({ lockKey, method: propertyKey.toString(), err }, '[WithDistributedLock] Failed to release lock; it will expire by its TTL');
|
|
32
|
+
}
|
|
27
33
|
}
|
|
28
34
|
};
|
|
29
35
|
return descriptor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.decorators.js","sourceRoot":"","sources":["../src/lock.decorators.ts"],"names":[],"mappings":"AA6CA,MAAM,UAAU,mBAAmB,CAAC,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"lock.decorators.js","sourceRoot":"","sources":["../src/lock.decorators.ts"],"names":[],"mappings":"AA6CA,MAAM,UAAU,mBAAmB,CAAC,OAAe,EAAE,KAAK,GAAW,KAAK;IACxE,OAAO,UAAU,MAAc,EAAE,WAA4B,EAAE,UAA8B;QAC3F,MAAM,cAAc,GAAG,UAAU,CAAC,KAAiD,CAAC;QAEpF,IAAI,OAAO,cAAc,KAAK,UAAU,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QAGD,UAAU,CAAC,KAAK,GAAG,KAAK,WAA8C,GAAG,IAAe;YACtF,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC;YAEzC,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,eAAe,GAAI,MAAM,CAAC,WAAiC,CAAC,IAAI,IAAI,SAAS,CAAC;gBACpF,MAAM,IAAI,KAAK,CACb,uCAAuC,eAAe,IAAI;oBACxD,qFAAqF,CACxF,CAAC;YACJ,CAAC;YAGD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAE7D,IAAI,CAAC,MAAM,EAAE,CAAC;gBAEZ,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;gBACxD,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CACV,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,EAC3C,+DAA+D,CAChE,CAAC;gBACJ,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAED,IAAI,CAAC;gBAEH,OAAO,MAAM,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAChD,CAAC;oBAAS,CAAC;gBAOT,IAAI,CAAC;oBACH,MAAM,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBACjD,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC;oBACxD,MAAM,EAAE,IAAI,EAAE,CACZ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,EAChD,yEAAyE,CAC1E,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;AACJ,CAAC;AAKD,MAAM,CAAC,MAAM,IAAI,GAAG,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.module.d.ts","sourceRoot":"","sources":["../src/lock.module.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAgD,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.module.d.ts","sourceRoot":"","sources":["../src/lock.module.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAgD,MAAM,2BAA2B,CAAC;AAI7G,OAAO,KAAK,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAsDnF,qBACa,eAAe;IAI1B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,kBAAuB,GAAG,aAAa,CAyC9D;IAKD,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,uBAAuB,GAAG,aAAa,CA+CnE;CACF;AAKD,eAAO,MAAM,UAAU,wBAAkB,CAAC"}
|
package/dist/lock.module.js
CHANGED
|
@@ -7,7 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var TitanLockModule_1;
|
|
8
8
|
import { Module } from '@omnitron-dev/titan/decorators';
|
|
9
9
|
import { DistributedLockService } from './lock.service.js';
|
|
10
|
-
import { LOCK_SERVICE_TOKEN, LOCK_OPTIONS_TOKEN } from './lock.tokens.js';
|
|
10
|
+
import { LOCK_SERVICE_TOKEN, LOCK_OPTIONS_TOKEN, LOCK_REDIS_TOKEN } from './lock.tokens.js';
|
|
11
|
+
import { REDIS_MANAGER } from '@omnitron-dev/titan-redis';
|
|
11
12
|
const DEFAULT_OPTIONS = {
|
|
12
13
|
defaultTtl: 30000,
|
|
13
14
|
keyPrefix: 'lock',
|
|
@@ -25,6 +26,13 @@ let TitanLockModule = TitanLockModule_1 = class TitanLockModule {
|
|
|
25
26
|
useValue: mergedOptions,
|
|
26
27
|
},
|
|
27
28
|
],
|
|
29
|
+
[
|
|
30
|
+
LOCK_REDIS_TOKEN,
|
|
31
|
+
{
|
|
32
|
+
useFactory: (manager, opts) => manager.getClient(opts.redisClientName),
|
|
33
|
+
inject: [REDIS_MANAGER, LOCK_OPTIONS_TOKEN],
|
|
34
|
+
},
|
|
35
|
+
],
|
|
28
36
|
[
|
|
29
37
|
LOCK_SERVICE_TOKEN,
|
|
30
38
|
{
|
|
@@ -58,6 +66,13 @@ let TitanLockModule = TitanLockModule_1 = class TitanLockModule {
|
|
|
58
66
|
inject: (options.inject ?? []),
|
|
59
67
|
},
|
|
60
68
|
],
|
|
69
|
+
[
|
|
70
|
+
LOCK_REDIS_TOKEN,
|
|
71
|
+
{
|
|
72
|
+
useFactory: (manager, opts) => manager.getClient(opts.redisClientName),
|
|
73
|
+
inject: [REDIS_MANAGER, LOCK_OPTIONS_TOKEN],
|
|
74
|
+
},
|
|
75
|
+
],
|
|
61
76
|
[
|
|
62
77
|
LOCK_SERVICE_TOKEN,
|
|
63
78
|
{
|
package/dist/lock.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.module.js","sourceRoot":"","sources":["../src/lock.module.ts"],"names":[],"mappings":";;;;;;;AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAExD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.module.js","sourceRoot":"","sources":["../src/lock.module.ts"],"names":[],"mappings":"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"}
|
package/dist/lock.service.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { IRedisClient } from '@omnitron-dev/titan-redis';
|
|
2
2
|
import { type ILoggerModule } from '@omnitron-dev/titan/module/logger';
|
|
3
3
|
import type { IDistributedLockService, ILockModuleOptions, IWithLockOptions } from './lock.types.js';
|
|
4
4
|
export declare class DistributedLockService implements IDistributedLockService {
|
|
@@ -7,7 +7,13 @@ export declare class DistributedLockService implements IDistributedLockService {
|
|
|
7
7
|
private _releaseLockSha;
|
|
8
8
|
private _extendLockSha;
|
|
9
9
|
private readonly options;
|
|
10
|
+
private readonly acquireFailures;
|
|
11
|
+
private readonly releaseFailures;
|
|
12
|
+
private readonly extendFailures;
|
|
13
|
+
private readonly statusFailures;
|
|
10
14
|
constructor(redis: IRedisClient, loggerModule: ILoggerModule, options: ILockModuleOptions);
|
|
15
|
+
private emitFailure;
|
|
16
|
+
private emitRecovery;
|
|
11
17
|
private get releaseLockSha();
|
|
12
18
|
private get extendLockSha();
|
|
13
19
|
private get logger();
|
|
@@ -15,6 +21,9 @@ export declare class DistributedLockService implements IDistributedLockService {
|
|
|
15
21
|
acquireLock(key: string, ttlMs: number): Promise<string | null>;
|
|
16
22
|
releaseLock(key: string, lockId: string): Promise<boolean>;
|
|
17
23
|
extendLock(key: string, lockId: string, ttlMs: number): Promise<boolean>;
|
|
24
|
+
withLock<T>(key: string, fn: () => Promise<T>, options: IWithLockOptions & {
|
|
25
|
+
skipOnLockFailure: true;
|
|
26
|
+
}): Promise<T | undefined>;
|
|
18
27
|
withLock<T>(key: string, fn: () => Promise<T>, options?: IWithLockOptions): Promise<T>;
|
|
19
28
|
isLocked(key: string): Promise<boolean>;
|
|
20
29
|
getLockTtl(key: string): Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.service.d.ts","sourceRoot":"","sources":["../src/lock.service.ts"],"names":[],"mappings":"AAiBA,OAAO,
|
|
1
|
+
{"version":3,"file":"lock.service.d.ts","sourceRoot":"","sources":["../src/lock.service.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAE7F,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAyErG,qBACa,sBAAuB,YAAW,uBAAuB;IAmBxC,OAAO,CAAC,QAAQ,CAAC,KAAK;IAClB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAnB7D,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqE;IAU7F,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAwB;IACxD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAwB;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IACvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwB;IAEvD,YAC6C,KAAK,EAAE,YAAY,EACf,YAAY,EAAE,aAAa,EAC9C,OAAO,EAAE,kBAAkB,EAGxD;IAQD,OAAO,CAAC,WAAW;IAkCnB,OAAO,CAAC,YAAY;IAMpB,OAAO,KAAK,cAAc,GAGzB;IAED,OAAO,KAAK,aAAa,GAGxB;IAED,OAAO,KAAK,MAAM,GAEjB;YAMa,UAAU;IAmBlB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmCpE;IAYK,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB/D;IAaK,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB7E;IAYK,QAAQ,CAAC,CAAC,EACd,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,EAAE,gBAAgB,GAAG;QAAE,iBAAiB,EAAE,IAAI,CAAA;KAAE,GACtD,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IACpB,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAmGvF,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAW5C;IAQK,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW7C;IAMD,OAAO,CAAC,UAAU;CAGnB"}
|
package/dist/lock.service.js
CHANGED
|
@@ -11,10 +11,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
11
11
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
12
12
|
};
|
|
13
13
|
import { Injectable, Inject } from '@omnitron-dev/titan/decorators';
|
|
14
|
-
import { InjectRedis } from '@omnitron-dev/titan-redis';
|
|
15
14
|
import { LOGGER_SERVICE_TOKEN } from '@omnitron-dev/titan/module/logger';
|
|
16
|
-
import { generateUuidV7 } from '@omnitron-dev/titan/utils';
|
|
17
|
-
import { LOCK_OPTIONS_TOKEN, DEFAULT_LOCK_PREFIX } from './lock.tokens.js';
|
|
15
|
+
import { generateUuidV7, FailureTracker } from '@omnitron-dev/titan/utils';
|
|
16
|
+
import { LOCK_OPTIONS_TOKEN, LOCK_REDIS_TOKEN, DEFAULT_LOCK_PREFIX } from './lock.tokens.js';
|
|
18
17
|
const RELEASE_LOCK_SCRIPT = `
|
|
19
18
|
if redis.call("get", KEYS[1]) == ARGV[1] then
|
|
20
19
|
return redis.call("del", KEYS[1])
|
|
@@ -41,8 +40,41 @@ let DistributedLockService = class DistributedLockService {
|
|
|
41
40
|
this.loggerModule = loggerModule;
|
|
42
41
|
this._releaseLockSha = null;
|
|
43
42
|
this._extendLockSha = null;
|
|
43
|
+
this.acquireFailures = new FailureTracker();
|
|
44
|
+
this.releaseFailures = new FailureTracker();
|
|
45
|
+
this.extendFailures = new FailureTracker();
|
|
46
|
+
this.statusFailures = new FailureTracker();
|
|
44
47
|
this.options = { ...DEFAULT_OPTIONS, ...options };
|
|
45
48
|
}
|
|
49
|
+
emitFailure(decision, op, context) {
|
|
50
|
+
const payload = { op, count: decision.count, elapsedMs: decision.elapsedMs, ...context };
|
|
51
|
+
switch (decision.level) {
|
|
52
|
+
case 'first':
|
|
53
|
+
this.logger.warn(payload, `[DistributedLock] ${op} started failing`);
|
|
54
|
+
break;
|
|
55
|
+
case 'continuing':
|
|
56
|
+
this.logger.debug(payload, `[DistributedLock] ${op} still failing`);
|
|
57
|
+
break;
|
|
58
|
+
case 'persistent':
|
|
59
|
+
this.logger.error(payload, `[DistributedLock] ${op} persistent failure (Redis may be OOM / unreachable — check server health)`);
|
|
60
|
+
break;
|
|
61
|
+
case 'suppress':
|
|
62
|
+
break;
|
|
63
|
+
case 'recovery':
|
|
64
|
+
this.logger.info(payload, `[DistributedLock] ${op} recovered`);
|
|
65
|
+
break;
|
|
66
|
+
default: {
|
|
67
|
+
const unexpected = decision.level;
|
|
68
|
+
this.logger.warn({ ...payload, level: unexpected }, 'Unhandled failure-tracker level');
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
emitRecovery(decision, op, context) {
|
|
74
|
+
if (!decision)
|
|
75
|
+
return;
|
|
76
|
+
this.emitFailure(decision, op, context);
|
|
77
|
+
}
|
|
46
78
|
get releaseLockSha() {
|
|
47
79
|
if (!this._releaseLockSha)
|
|
48
80
|
this._releaseLockSha = this.loadScript(RELEASE_LOCK_SCRIPT);
|
|
@@ -71,6 +103,7 @@ let DistributedLockService = class DistributedLockService {
|
|
|
71
103
|
const lockKey = this.getLockKey(key);
|
|
72
104
|
try {
|
|
73
105
|
const result = (await this.redis.eval(`return redis.call('SET', KEYS[1], ARGV[1], 'NX', 'PX', ARGV[2])`, 1, lockKey, lockId, ttlMs.toString()));
|
|
106
|
+
this.emitRecovery(this.acquireFailures.recordSuccess(`acquire:${key}`), 'acquireLock', { key });
|
|
74
107
|
if (result === 'OK') {
|
|
75
108
|
this.logger.debug({ key, lockId, ttlMs }, '[DistributedLock] Lock acquired');
|
|
76
109
|
return lockId;
|
|
@@ -79,7 +112,8 @@ let DistributedLockService = class DistributedLockService {
|
|
|
79
112
|
return null;
|
|
80
113
|
}
|
|
81
114
|
catch (error) {
|
|
82
|
-
this.
|
|
115
|
+
const decision = this.acquireFailures.recordFailure(`acquire:${key}`);
|
|
116
|
+
this.emitFailure(decision, 'acquireLock', { key, error });
|
|
83
117
|
return null;
|
|
84
118
|
}
|
|
85
119
|
}
|
|
@@ -88,6 +122,7 @@ let DistributedLockService = class DistributedLockService {
|
|
|
88
122
|
try {
|
|
89
123
|
const sha = await this.releaseLockSha;
|
|
90
124
|
const result = (await this.redis.evalsha(sha, 1, lockKey, lockId));
|
|
125
|
+
this.emitRecovery(this.releaseFailures.recordSuccess(`release:${key}`), 'releaseLock', { key });
|
|
91
126
|
if (result === 1) {
|
|
92
127
|
this.logger.debug({ key, lockId }, '[DistributedLock] Lock released');
|
|
93
128
|
return true;
|
|
@@ -96,7 +131,8 @@ let DistributedLockService = class DistributedLockService {
|
|
|
96
131
|
return false;
|
|
97
132
|
}
|
|
98
133
|
catch (error) {
|
|
99
|
-
this.
|
|
134
|
+
const decision = this.releaseFailures.recordFailure(`release:${key}`);
|
|
135
|
+
this.emitFailure(decision, 'releaseLock', { key, lockId, error });
|
|
100
136
|
return false;
|
|
101
137
|
}
|
|
102
138
|
}
|
|
@@ -105,6 +141,7 @@ let DistributedLockService = class DistributedLockService {
|
|
|
105
141
|
try {
|
|
106
142
|
const sha = await this.extendLockSha;
|
|
107
143
|
const result = (await this.redis.evalsha(sha, 1, lockKey, lockId, ttlMs.toString()));
|
|
144
|
+
this.emitRecovery(this.extendFailures.recordSuccess(`extend:${key}`), 'extendLock', { key });
|
|
108
145
|
if (result === 1) {
|
|
109
146
|
this.logger.debug({ key, lockId, ttlMs }, '[DistributedLock] Lock extended');
|
|
110
147
|
return true;
|
|
@@ -113,7 +150,8 @@ let DistributedLockService = class DistributedLockService {
|
|
|
113
150
|
return false;
|
|
114
151
|
}
|
|
115
152
|
catch (error) {
|
|
116
|
-
this.
|
|
153
|
+
const decision = this.extendFailures.recordFailure(`extend:${key}`);
|
|
154
|
+
this.emitFailure(decision, 'extendLock', { key, lockId, error });
|
|
117
155
|
return false;
|
|
118
156
|
}
|
|
119
157
|
}
|
|
@@ -123,17 +161,38 @@ let DistributedLockService = class DistributedLockService {
|
|
|
123
161
|
const retryDelay = options?.retryDelay ?? this.options.defaultRetryDelay;
|
|
124
162
|
const exponentialBackoff = options?.exponentialBackoff ?? true;
|
|
125
163
|
const skipOnLockFailure = options?.skipOnLockFailure ?? false;
|
|
126
|
-
|
|
164
|
+
const autoRenew = options?.autoRenew ?? true;
|
|
165
|
+
const renewIntervalMs = options?.renewIntervalMs ?? Math.max(1, Math.floor(ttl / 3));
|
|
166
|
+
const attempts = Math.max(1, retries);
|
|
167
|
+
for (let i = 0; i < attempts; i++) {
|
|
127
168
|
const lockId = await this.acquireLock(key, ttl);
|
|
128
169
|
if (lockId) {
|
|
170
|
+
let renewTimer;
|
|
171
|
+
if (autoRenew) {
|
|
172
|
+
renewTimer = setInterval(() => {
|
|
173
|
+
this.extendLock(key, lockId, ttl)
|
|
174
|
+
.then((extended) => {
|
|
175
|
+
if (!extended && renewTimer) {
|
|
176
|
+
this.logger.error({ key, lockId }, '[DistributedLock] Auto-renew failed — lock lost while critical section is still running');
|
|
177
|
+
clearInterval(renewTimer);
|
|
178
|
+
renewTimer = undefined;
|
|
179
|
+
}
|
|
180
|
+
})
|
|
181
|
+
.catch(() => {
|
|
182
|
+
});
|
|
183
|
+
}, renewIntervalMs);
|
|
184
|
+
renewTimer.unref?.();
|
|
185
|
+
}
|
|
129
186
|
try {
|
|
130
187
|
return await fn();
|
|
131
188
|
}
|
|
132
189
|
finally {
|
|
190
|
+
if (renewTimer)
|
|
191
|
+
clearInterval(renewTimer);
|
|
133
192
|
await this.releaseLock(key, lockId);
|
|
134
193
|
}
|
|
135
194
|
}
|
|
136
|
-
if (i <
|
|
195
|
+
if (i < attempts - 1) {
|
|
137
196
|
const delay = exponentialBackoff ? retryDelay * (i + 1) : retryDelay;
|
|
138
197
|
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
139
198
|
}
|
|
@@ -142,26 +201,31 @@ let DistributedLockService = class DistributedLockService {
|
|
|
142
201
|
this.logger.debug({ key, retries }, '[DistributedLock] Lock acquisition failed, skipping');
|
|
143
202
|
return undefined;
|
|
144
203
|
}
|
|
145
|
-
throw new Error(`Failed to acquire lock for key: ${key} after ${
|
|
204
|
+
throw new Error(`Failed to acquire lock for key: ${key} after ${attempts} attempt(s)`);
|
|
146
205
|
}
|
|
147
206
|
async isLocked(key) {
|
|
148
207
|
const lockKey = this.getLockKey(key);
|
|
149
208
|
try {
|
|
150
209
|
const result = await this.redis.exists(lockKey);
|
|
210
|
+
this.emitRecovery(this.statusFailures.recordSuccess(`status:${key}`), 'isLocked', { key });
|
|
151
211
|
return result === 1;
|
|
152
212
|
}
|
|
153
213
|
catch (error) {
|
|
154
|
-
this.
|
|
214
|
+
const decision = this.statusFailures.recordFailure(`status:${key}`);
|
|
215
|
+
this.emitFailure(decision, 'isLocked', { key, error });
|
|
155
216
|
return false;
|
|
156
217
|
}
|
|
157
218
|
}
|
|
158
219
|
async getLockTtl(key) {
|
|
159
220
|
const lockKey = this.getLockKey(key);
|
|
160
221
|
try {
|
|
161
|
-
|
|
222
|
+
const ttl = await this.redis.pttl(lockKey);
|
|
223
|
+
this.emitRecovery(this.statusFailures.recordSuccess(`status:${key}`), 'getLockTtl', { key });
|
|
224
|
+
return ttl;
|
|
162
225
|
}
|
|
163
226
|
catch (error) {
|
|
164
|
-
this.
|
|
227
|
+
const decision = this.statusFailures.recordFailure(`status:${key}`);
|
|
228
|
+
this.emitFailure(decision, 'getLockTtl', { key, error });
|
|
165
229
|
return -2;
|
|
166
230
|
}
|
|
167
231
|
}
|
|
@@ -171,7 +235,7 @@ let DistributedLockService = class DistributedLockService {
|
|
|
171
235
|
};
|
|
172
236
|
DistributedLockService = __decorate([
|
|
173
237
|
Injectable(),
|
|
174
|
-
__param(0,
|
|
238
|
+
__param(0, Inject(LOCK_REDIS_TOKEN)),
|
|
175
239
|
__param(1, Inject(LOGGER_SERVICE_TOKEN)),
|
|
176
240
|
__param(2, Inject(LOCK_OPTIONS_TOKEN)),
|
|
177
241
|
__metadata("design:paramtypes", [Object, Object, Object])
|
package/dist/lock.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.service.js","sourceRoot":"","sources":["../src/lock.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.service.js","sourceRoot":"","sources":["../src/lock.service.ts"],"names":[],"mappings":"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"}
|
package/dist/lock.tokens.d.ts
CHANGED
|
@@ -2,5 +2,6 @@ import { type Token } from '@omnitron-dev/titan/nexus';
|
|
|
2
2
|
import type { IDistributedLockService, ILockModuleOptions } from './lock.types.js';
|
|
3
3
|
export declare const LOCK_SERVICE_TOKEN: Token<IDistributedLockService>;
|
|
4
4
|
export declare const LOCK_OPTIONS_TOKEN: Token<ILockModuleOptions>;
|
|
5
|
+
export declare const LOCK_REDIS_TOKEN: Token<unknown>;
|
|
5
6
|
export declare const DEFAULT_LOCK_PREFIX = "lock";
|
|
6
7
|
//# sourceMappingURL=lock.tokens.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.tokens.d.ts","sourceRoot":"","sources":["../src/lock.tokens.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAKnF,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,uBAAuB,CACE,CAAC;AAKjE,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAwD,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.tokens.d.ts","sourceRoot":"","sources":["../src/lock.tokens.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,KAAK,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAKnF,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,uBAAuB,CACE,CAAC;AAKjE,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,CAAwD,CAAC;AAYlH,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,OAAO,CAA2C,CAAC;AAKxF,eAAO,MAAM,mBAAmB,SAAS,CAAC"}
|
package/dist/lock.tokens.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createToken } from '@omnitron-dev/titan/nexus';
|
|
2
2
|
export const LOCK_SERVICE_TOKEN = createToken('DistributedLockService');
|
|
3
3
|
export const LOCK_OPTIONS_TOKEN = createToken('LockModuleOptions');
|
|
4
|
+
export const LOCK_REDIS_TOKEN = createToken('LockRedisClient');
|
|
4
5
|
export const DEFAULT_LOCK_PREFIX = 'lock';
|
|
5
6
|
//# sourceMappingURL=lock.tokens.js.map
|
package/dist/lock.tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.tokens.js","sourceRoot":"","sources":["../src/lock.tokens.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAc,MAAM,2BAA2B,CAAC;AAMpE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,WAAW,CAA0B,wBAAwB,CAAC,CAAC;AAKjE,MAAM,CAAC,MAAM,kBAAkB,GAA8B,WAAW,CAAqB,mBAAmB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.tokens.js","sourceRoot":"","sources":["../src/lock.tokens.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAc,MAAM,2BAA2B,CAAC;AAMpE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,WAAW,CAA0B,wBAAwB,CAAC,CAAC;AAKjE,MAAM,CAAC,MAAM,kBAAkB,GAA8B,WAAW,CAAqB,mBAAmB,CAAC,CAAC;AAYlH,MAAM,CAAC,MAAM,gBAAgB,GAAmB,WAAW,CAAU,iBAAiB,CAAC,CAAC;AAKxF,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC"}
|
package/dist/lock.types.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export interface ILockOptions {
|
|
|
7
7
|
}
|
|
8
8
|
export interface IWithLockOptions extends ILockOptions {
|
|
9
9
|
skipOnLockFailure?: boolean;
|
|
10
|
+
autoRenew?: boolean;
|
|
11
|
+
renewIntervalMs?: number;
|
|
10
12
|
}
|
|
11
13
|
export interface ILockHandle {
|
|
12
14
|
lockId: string;
|
|
@@ -40,10 +42,12 @@ export interface IWithDistributedLockContext {
|
|
|
40
42
|
__lockService__?: IDistributedLockService;
|
|
41
43
|
logger?: {
|
|
42
44
|
debug: (obj: Record<string, unknown>, msg: string) => void;
|
|
45
|
+
warn?: (obj: Record<string, unknown>, msg: string) => void;
|
|
43
46
|
};
|
|
44
47
|
loggerModule?: {
|
|
45
48
|
logger: {
|
|
46
49
|
debug: (obj: Record<string, unknown>, msg: string) => void;
|
|
50
|
+
warn?: (obj: Record<string, unknown>, msg: string) => void;
|
|
47
51
|
};
|
|
48
52
|
};
|
|
49
53
|
}
|
package/dist/lock.types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock.types.d.ts","sourceRoot":"","sources":["../src/lock.types.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAK/E,MAAM,WAAW,YAAY;IAE3B,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAKD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IAEpD,iBAAiB,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"lock.types.d.ts","sourceRoot":"","sources":["../src/lock.types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@omnitron-dev/titan-lock",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Distributed lock module for Titan framework with Redis-backed locking",
|
|
5
5
|
"author": "LuxQuant",
|
|
6
6
|
"license": "MIT",
|
|
@@ -17,17 +17,19 @@
|
|
|
17
17
|
"dist"
|
|
18
18
|
],
|
|
19
19
|
"peerDependencies": {
|
|
20
|
-
"@omnitron-dev/titan": "0.
|
|
21
|
-
"@omnitron-dev/titan-redis": "0.
|
|
20
|
+
"@omnitron-dev/titan": "0.3.0",
|
|
21
|
+
"@omnitron-dev/titan-redis": "0.3.0"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@types/node": "25.0
|
|
24
|
+
"@types/node": "25.6.0",
|
|
25
25
|
"reflect-metadata": "^0.2.2",
|
|
26
|
-
"typescript": "^
|
|
27
|
-
"vitest": "^
|
|
26
|
+
"typescript": "^7.0.2",
|
|
27
|
+
"vitest": "^5.0.0",
|
|
28
|
+
"@omnitron-dev/titan": "0.3.0",
|
|
29
|
+
"@omnitron-dev/titan-redis": "0.3.0"
|
|
28
30
|
},
|
|
29
31
|
"scripts": {
|
|
30
|
-
"build": "
|
|
32
|
+
"build": "../../scripts/build-package.sh -p ./tsconfig.json",
|
|
31
33
|
"test": "vitest run",
|
|
32
34
|
"clean": "rm -rf dist",
|
|
33
35
|
"typecheck": "tsc --noEmit"
|