murlock 3.0.0 → 3.0.1
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/README.md +2 -2
- package/dist/lua/lock.lua +1 -1
- package/dist/murlock.module.js +1 -7
- package/dist/murlock.module.js.map +1 -1
- package/dist/murlock.service.d.ts +2 -3
- package/dist/murlock.service.js +5 -9
- package/dist/murlock.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -2
package/README.md
CHANGED
|
@@ -31,7 +31,7 @@ import { MurLockModule } from 'murlock';
|
|
|
31
31
|
@Module({
|
|
32
32
|
imports: [
|
|
33
33
|
MurLockModule.forRoot({
|
|
34
|
-
redisOptions: {
|
|
34
|
+
redisOptions: { url: 'redis://localhost:6379' },
|
|
35
35
|
wait: 1000,
|
|
36
36
|
maxAttempts: 3,
|
|
37
37
|
logLevel: 'log',
|
|
@@ -55,7 +55,7 @@ export class AppService {
|
|
|
55
55
|
}
|
|
56
56
|
```
|
|
57
57
|
|
|
58
|
-
By default, if there is single wrapped parameter, the property of parameter can be called directly as it shown
|
|
58
|
+
By default, if there is single wrapped parameter, the property of parameter can be called directly as it shown.
|
|
59
59
|
|
|
60
60
|
```typescript
|
|
61
61
|
import { MurLock } from 'murlock';
|
package/dist/lua/lock.lua
CHANGED
|
@@ -2,7 +2,7 @@ local key = KEYS[1]
|
|
|
2
2
|
local clientId = ARGV[1]
|
|
3
3
|
local releaseTime = ARGV[2]
|
|
4
4
|
|
|
5
|
-
if redis.call("get",key) == clientId or redis.call("set", key, clientId, "NX", "PX", releaseTime) then
|
|
5
|
+
if redis.call("get", key) == clientId or redis.call("set", key, clientId, "NX", "PX", releaseTime) then
|
|
6
6
|
return 1
|
|
7
7
|
else
|
|
8
8
|
return 0
|
package/dist/murlock.module.js
CHANGED
|
@@ -12,7 +12,6 @@ const common_1 = require("@nestjs/common");
|
|
|
12
12
|
const murlock_service_1 = require("./murlock.service");
|
|
13
13
|
require("reflect-metadata");
|
|
14
14
|
const constants_1 = require("./constants");
|
|
15
|
-
const nestjs_cls_1 = require("nestjs-cls");
|
|
16
15
|
let MurLockModule = MurLockModule_1 = class MurLockModule {
|
|
17
16
|
static forRoot(options) {
|
|
18
17
|
return {
|
|
@@ -66,12 +65,7 @@ exports.MurLockModule = MurLockModule;
|
|
|
66
65
|
exports.MurLockModule = MurLockModule = MurLockModule_1 = __decorate([
|
|
67
66
|
(0, common_1.Global)(),
|
|
68
67
|
(0, common_1.Module)({
|
|
69
|
-
imports: [
|
|
70
|
-
nestjs_cls_1.ClsModule.forRoot({
|
|
71
|
-
global: true,
|
|
72
|
-
interceptor: { mount: true },
|
|
73
|
-
}),
|
|
74
|
-
],
|
|
68
|
+
imports: [],
|
|
75
69
|
providers: [murlock_service_1.MurLockService],
|
|
76
70
|
exports: [murlock_service_1.MurLockService],
|
|
77
71
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"murlock.module.js","sourceRoot":"","sources":["../lib/murlock.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAyE;AACzE,uDAAmD;AACnD,4BAA0B;AAE1B,2CAA2D;
|
|
1
|
+
{"version":3,"file":"murlock.module.js","sourceRoot":"","sources":["../lib/murlock.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAyE;AACzE,uDAAmD;AACnD,4BAA0B;AAE1B,2CAA2D;AAQpD,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACxB,MAAM,CAAC,OAAO,CAAC,OAA6B;QAC1C,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,iBAAiB;oBAC1B,QAAQ,EAAE,OAAO;iBAClB;gBACD,gCAAc;gBACd;oBACE,OAAO,EAAE,wCAA4B;oBACrC,UAAU,EAAE,CAAC,cAA8B,EAAE,EAAE;wBAC7C,OAAO,CAAC,cAAc,CAAC,wCAA4B,EAAE,cAAc,EAAE,gCAAc,CAAC,CAAC;wBACrF,OAAO,cAAc,CAAC;oBACxB,CAAC;oBACD,MAAM,EAAE,CAAC,gCAAc,CAAC;iBACzB;aACF;YACD,OAAO,EAAE,CAAC,gCAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,OAAkC;QACpD,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACT,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC;gBACxC,gCAAc;gBACd;oBACE,OAAO,EAAE,wCAA4B;oBACrC,UAAU,EAAE,CAAC,cAA8B,EAAE,EAAE;wBAC7C,OAAO,CAAC,cAAc,CAAC,wCAA4B,EAAE,cAAc,EAAE,gCAAc,CAAC,CAAC;wBACrF,OAAO,cAAc,CAAC;oBACxB,CAAC;oBACD,MAAM,EAAE,CAAC,gCAAc,CAAC;iBACzB;aACF;YACD,OAAO,EAAE,CAAC,gCAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,0BAA0B,CAAC,OAAkC;QAC1E,OAAO;YACL,OAAO,EAAE,iBAAiB;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;CACF,CAAA;AAlDY,sCAAa;wBAAb,aAAa;IANzB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,EAAE;QACX,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,OAAO,EAAE,CAAC,gCAAc,CAAC;KAC1B,CAAC;GACW,aAAa,CAkDzB"}
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import { OnApplicationShutdown, OnModuleInit } from '@nestjs/common';
|
|
2
2
|
import { MurLockModuleOptions } from './interfaces';
|
|
3
|
-
import { ClsService } from 'nestjs-cls';
|
|
4
3
|
export declare class MurLockService implements OnModuleInit, OnApplicationShutdown {
|
|
5
4
|
protected readonly options: MurLockModuleOptions;
|
|
6
|
-
private readonly clsService;
|
|
7
5
|
private readonly logger;
|
|
8
6
|
private redisClient;
|
|
9
7
|
private readonly lockScript;
|
|
10
8
|
private readonly unlockScript;
|
|
11
|
-
|
|
9
|
+
private clientId;
|
|
10
|
+
constructor(options: MurLockModuleOptions);
|
|
12
11
|
onModuleInit(): Promise<void>;
|
|
13
12
|
onApplicationShutdown(signal?: string): void;
|
|
14
13
|
private generateUuid;
|
package/dist/murlock.service.js
CHANGED
|
@@ -27,12 +27,10 @@ const common_1 = require("@nestjs/common");
|
|
|
27
27
|
const redis_1 = require("redis");
|
|
28
28
|
const fs_1 = require("fs");
|
|
29
29
|
const path_1 = require("path");
|
|
30
|
-
const nestjs_cls_1 = require("nestjs-cls");
|
|
31
30
|
const exceptions_1 = require("./exceptions");
|
|
32
31
|
let MurLockService = MurLockService_1 = class MurLockService {
|
|
33
|
-
constructor(options
|
|
32
|
+
constructor(options) {
|
|
34
33
|
this.options = options;
|
|
35
|
-
this.clsService = clsService;
|
|
36
34
|
this.logger = new common_1.Logger(MurLockService_1.name);
|
|
37
35
|
this.lockScript = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, './lua/lock.lua')).toString();
|
|
38
36
|
this.unlockScript = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, './lua/unlock.lua')).toString();
|
|
@@ -60,12 +58,10 @@ let MurLockService = MurLockService_1 = class MurLockService {
|
|
|
60
58
|
});
|
|
61
59
|
}
|
|
62
60
|
getClientId() {
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
clientId = this.generateUuid();
|
|
66
|
-
this.clsService.set('clientId', clientId);
|
|
61
|
+
if (this.clientId) {
|
|
62
|
+
return this.clientId;
|
|
67
63
|
}
|
|
68
|
-
return clientId;
|
|
64
|
+
return this.clientId = this.generateUuid();
|
|
69
65
|
}
|
|
70
66
|
sleep(ms) {
|
|
71
67
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
@@ -130,6 +126,6 @@ exports.MurLockService = MurLockService;
|
|
|
130
126
|
exports.MurLockService = MurLockService = MurLockService_1 = __decorate([
|
|
131
127
|
(0, common_1.Injectable)(),
|
|
132
128
|
__param(0, (0, common_1.Inject)('MURLOCK_OPTIONS')),
|
|
133
|
-
__metadata("design:paramtypes", [Object
|
|
129
|
+
__metadata("design:paramtypes", [Object])
|
|
134
130
|
], MurLockService);
|
|
135
131
|
//# sourceMappingURL=murlock.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"murlock.service.js","sourceRoot":"","sources":["../lib/murlock.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAiG;AACjG,iCAAsD;AACtD,2BAAkC;AAClC,+BAA4B;AAE5B,
|
|
1
|
+
{"version":3,"file":"murlock.service.js","sourceRoot":"","sources":["../lib/murlock.service.ts"],"names":[],"mappings":"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"}
|