@servicelabsco/nestjs-utility-services 1.2.140 → 1.2.142
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/app.controller.js +4 -1
- package/dist/app.controller.js.map +1 -1
- package/dist/common/adapters/redis.io.adapter.js.map +1 -1
- package/dist/common/libraries/common.job.d.ts +0 -2
- package/dist/common/libraries/common.job.js +4 -19
- package/dist/common/libraries/common.job.js.map +1 -1
- package/dist/common/libraries/hash.d.ts +1 -0
- package/dist/common/libraries/hash.js +10 -0
- package/dist/common/libraries/hash.js.map +1 -1
- package/dist/platformUtility/jobs/test.job.d.ts +2 -1
- package/dist/platformUtility/jobs/test.job.js +2 -4
- package/dist/platformUtility/jobs/test.job.js.map +1 -1
- package/dist/platformUtility/services/queue.service.d.ts +8 -1
- package/dist/platformUtility/services/queue.service.js +26 -1
- package/dist/platformUtility/services/queue.service.js.map +1 -1
- package/dist/system/services/event.queue.service.d.ts +1 -1
- package/dist/system/services/event.queue.service.js +4 -4
- package/dist/system/services/event.queue.service.js.map +1 -1
- package/package.json +3 -2
package/dist/app.controller.js
CHANGED
|
@@ -54,7 +54,10 @@ let AppController = class AppController {
|
|
|
54
54
|
async queue(id) {
|
|
55
55
|
return this.queueService.getJobDetails(id);
|
|
56
56
|
}
|
|
57
|
-
async set(req) {
|
|
57
|
+
async set(req) {
|
|
58
|
+
await this.testJob.dispatch({ id: 1 }, { delay: 100 });
|
|
59
|
+
return this.queueService.addJob('ba4c3857dfa9feac842416d9c39d0edd', { id: 2 });
|
|
60
|
+
}
|
|
58
61
|
async test() { }
|
|
59
62
|
async pause(query) {
|
|
60
63
|
return this.queueService.pause();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;
|
|
1
|
+
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis.io.adapter.js","sourceRoot":"","sources":["../../../src/common/adapters/redis.io.adapter.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AACvD,4DAAyD;AACzD,iCAAqC;AAGrC,yBAAuB;AAEvB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;AAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"redis.io.adapter.js","sourceRoot":"","sources":["../../../src/common/adapters/redis.io.adapter.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AACvD,4DAAyD;AACzD,iCAAqC;AAGrC,yBAAuB;AAEvB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;AACpC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;AAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;AAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;AAElD,MAAa,cAAe,SAAQ,8BAAS;IAGzC,KAAK,CAAC,cAAc;QAChB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,EAAE,GAAG,EAAE,WAAW,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAChH,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;QAExC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,kBAAkB,GAAG,IAAA,6BAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAClE,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,OAAuB;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAjBD,wCAiBC"}
|
|
@@ -22,8 +22,6 @@ export declare class CommonJob implements BaseJobInterface {
|
|
|
22
22
|
dispatch(data?: any, options?: QueueOptionsDto, eventId?: number): Promise<any>;
|
|
23
23
|
delayedDispatch(data: any, options?: QueueOptionsDto, eventId?: number): Promise<any>;
|
|
24
24
|
private handleRedisJob;
|
|
25
|
-
private setDuplicateOptions;
|
|
26
|
-
private canHandleDuplicatePayload;
|
|
27
25
|
handle(data: any, job?: Job): Promise<any>;
|
|
28
26
|
protected isColumnUpdated(event: DatabaseEventDto<any>, column: string | string[]): boolean;
|
|
29
27
|
protected isNewRecord(event: DatabaseEventDto<any>): boolean;
|
|
@@ -49,26 +49,11 @@ class CommonJob {
|
|
|
49
49
|
options.timeout = this.timeout;
|
|
50
50
|
options.removeOnComplete = this.completeLimit;
|
|
51
51
|
options.removeOnFail = this.failureLimit;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
async setDuplicateOptions(payload, options) {
|
|
57
|
-
if (!this.noDuplicate)
|
|
58
|
-
return {};
|
|
59
|
-
if (this.canHandleDuplicatePayload(payload.payload) === false) {
|
|
60
|
-
if (!options?.jobId)
|
|
61
|
-
return;
|
|
52
|
+
if (this.noDuplicate) {
|
|
53
|
+
const dupOptions = await this.queueService.getDuplicateOptions(this.hashIdentifier, payload, options);
|
|
54
|
+
options = { ...options, ...dupOptions };
|
|
62
55
|
}
|
|
63
|
-
|
|
64
|
-
return { jobId: id, removeOnComplete: true, removeOnFail: true };
|
|
65
|
-
}
|
|
66
|
-
canHandleDuplicatePayload(data) {
|
|
67
|
-
if (!data)
|
|
68
|
-
return 0;
|
|
69
|
-
const safeTypes = ['string', 'number', 'boolean'];
|
|
70
|
-
const type = typeof data;
|
|
71
|
-
return safeTypes.includes(type);
|
|
56
|
+
return this.queueService.add(queue, payload, options);
|
|
72
57
|
}
|
|
73
58
|
async handle(data, job) {
|
|
74
59
|
return data;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/libraries/common.job.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,yBAAuB;AAIvB,6EAAyE;AASzE,MAAa,SAAS;IAwFlB,YAAY,IAAY;QAjFd,gBAAW,GAAY,KAAK,CAAC;QAO7B,aAAQ,GAAG,CAAC,CAAC;QAOb,YAAO,GAAG,KAAK,CAAC;QAQnB,UAAK,GAAW,qBAAqB,CAAC;QAQnC,WAAM,GAAW,IAAI,eAAM,CAAC,YAAY,CAAC,CAAC;QAiB1C,SAAI,GAAW,OAAO,CAAC;QAgBvB,oBAAe,GAAY,KAAK,CAAC;QAUjC,kBAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;QACpE,iBAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAQxE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/B,CAAC;IAQD,KAAK,CAAC,QAAQ,CAAC,IAAU,EAAE,OAAyB,EAAE,OAAgB;QAClE,MAAM,OAAO,GAAQ;YACjB,GAAG,EAAE,IAAI,CAAC,cAAc;YACxB,OAAO,EAAE,IAAI,IAAI,IAAI;YACrB,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;YAC3B,QAAQ,EAAE,OAAO;SACpB,CAAC;QAGF,IAAI,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAC5B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YACpD,OAAO,OAAO,CAAC,gBAAgB,CAAC;QACpC,CAAC;QAGD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAGxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC;QACrF,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,wCAAkB,CAAC,SAAS,IAAI,CAAC,IAAI,wDAAwD,CAAC,CAAC;QAExH,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IASD,KAAK,CAAC,eAAe,CAAC,IAAS,EAAE,OAAyB,EAAE,OAAgB;QACxE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC;QAErC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAUO,KAAK,CAAC,cAAc,CAAC,OAAY,EAAE,OAAyB;QAChE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;QAG1C,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,QAAQ;YAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1E,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,OAAO;YAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAEtE,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC;QAC9C,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAEzC,
|
|
1
|
+
{"version":3,"file":"common.job.js","sourceRoot":"","sources":["../../../src/common/libraries/common.job.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,yBAAuB;AAIvB,6EAAyE;AASzE,MAAa,SAAS;IAwFlB,YAAY,IAAY;QAjFd,gBAAW,GAAY,KAAK,CAAC;QAO7B,aAAQ,GAAG,CAAC,CAAC;QAOb,YAAO,GAAG,KAAK,CAAC;QAQnB,UAAK,GAAW,qBAAqB,CAAC;QAQnC,WAAM,GAAW,IAAI,eAAM,CAAC,YAAY,CAAC,CAAC;QAiB1C,SAAI,GAAW,OAAO,CAAC;QAgBvB,oBAAe,GAAY,KAAK,CAAC;QAUjC,kBAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAE,EAAE,CAAC,CAAC;QACpE,iBAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAQxE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC/B,CAAC;IAQD,KAAK,CAAC,QAAQ,CAAC,IAAU,EAAE,OAAyB,EAAE,OAAgB;QAClE,MAAM,OAAO,GAAQ;YACjB,GAAG,EAAE,IAAI,CAAC,cAAc;YACxB,OAAO,EAAE,IAAI,IAAI,IAAI;YACrB,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI;YAC3B,QAAQ,EAAE,OAAO;SACpB,CAAC;QAGF,IAAI,OAAO,EAAE,gBAAgB,EAAE,CAAC;YAC5B,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;YACpD,OAAO,OAAO,CAAC,gBAAgB,CAAC;QACpC,CAAC;QAGD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAGxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC;QACrF,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,wCAAkB,CAAC,SAAS,IAAI,CAAC,IAAI,wDAAwD,CAAC,CAAC;QAExH,OAAO,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IASD,KAAK,CAAC,eAAe,CAAC,IAAS,EAAE,OAAyB,EAAE,OAAgB;QACxE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,GAAG,CAAC;QAErC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAUO,KAAK,CAAC,cAAc,CAAC,OAAY,EAAE,OAAyB;QAChE,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAExB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC;QAG1C,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,QAAQ;YAAE,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC1E,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,EAAE,OAAO;YAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAEtE,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,aAAa,CAAC;QAC9C,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QAEzC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YACtG,OAAO,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,CAAC;QAC5C,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAUD,KAAK,CAAC,MAAM,CAAC,IAAS,EAAE,GAAS;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAUS,eAAe,CAAC,KAA4B,EAAE,MAAyB;QAE7E,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAEzC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAE1D,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAAE,OAAO,IAAI,CAAC;QAC/D,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IASS,WAAW,CAAC,KAA4B;QAC9C,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAElE,OAAO,IAAI,CAAC;IAChB,CAAC;IASS,aAAa,CAAC,KAA4B;QAChD,OAAO,KAAK,CAAC,MAAM,KAAK,OAAO,CAAC;IACpC,CAAC;CACJ;AA5ND,8BA4NC"}
|
|
@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Hash = void 0;
|
|
4
4
|
const bcrypt = require("bcryptjs");
|
|
5
5
|
const md5 = require("md5");
|
|
6
|
+
const xxhash = require('xxhash-wasm');
|
|
7
|
+
let hasher64 = null;
|
|
6
8
|
class Hash {
|
|
7
9
|
static getKey() {
|
|
8
10
|
if (!this.key)
|
|
@@ -22,6 +24,14 @@ class Hash {
|
|
|
22
24
|
static generateSalt(len) {
|
|
23
25
|
return bcrypt.genSaltSync(len);
|
|
24
26
|
}
|
|
27
|
+
static async easyHash(input) {
|
|
28
|
+
if (!hasher64) {
|
|
29
|
+
hasher64 = await xxhash();
|
|
30
|
+
}
|
|
31
|
+
const stringInput = typeof input === 'string' ? input : input.toString();
|
|
32
|
+
const hash = hasher64.h64(stringInput);
|
|
33
|
+
return hash.toString(16);
|
|
34
|
+
}
|
|
25
35
|
}
|
|
26
36
|
exports.Hash = Hash;
|
|
27
37
|
Hash.key = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../../src/common/libraries/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,2BAA2B;
|
|
1
|
+
{"version":3,"file":"hash.js","sourceRoot":"","sources":["../../../src/common/libraries/hash.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,2BAA2B;AAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEtC,IAAI,QAAQ,GAAQ,IAAI,CAAC;AAQzB,MAAa,IAAI;IAUL,MAAM,CAAC,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;QAC9C,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAUD,MAAM,CAAC,IAAI,CAAC,GAAW;QACnB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrC,CAAC;IASD,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,IAAY;QACpC,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IASD,MAAM,CAAC,OAAO,CAAC,GAAW;QACtB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;IACpB,CAAC;IASD,MAAM,CAAC,YAAY,CAAC,GAAW;QAC3B,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IASD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAsB;QACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,QAAQ,GAAG,MAAM,MAAM,EAAE,CAAC;QAC9B,CAAC;QAED,MAAM,WAAW,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACzE,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEvC,OAAO,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7B,CAAC;;AA7EL,oBA8EC;AA7EkB,QAAG,GAAW,IAAI,CAAC"}
|
|
@@ -9,6 +9,7 @@ export declare class TestJob extends CommonJob {
|
|
|
9
9
|
protected readonly uploadService: UploadService;
|
|
10
10
|
protected readonly sqlService: SqlService;
|
|
11
11
|
protected readonly propertyService: PropertyService;
|
|
12
|
+
protected noDuplicate: boolean;
|
|
12
13
|
constructor(queueService: QueueService, uploadService: UploadService, sqlService: SqlService, propertyService: PropertyService);
|
|
13
|
-
handle(data: any, job: Job): Promise<
|
|
14
|
+
handle(data: any, job: Job): Promise<any>;
|
|
14
15
|
}
|
|
@@ -11,7 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TestJob = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const user_entity_1 = require("../../auth/entities/user.entity");
|
|
15
14
|
const property_service_1 = require("../../system/services/property.service");
|
|
16
15
|
const upload_service_1 = require("../../system/services/upload.service");
|
|
17
16
|
const sql_service_1 = require("../services/sql.service");
|
|
@@ -24,11 +23,10 @@ let TestJob = class TestJob extends common_job_1.CommonJob {
|
|
|
24
23
|
this.uploadService = uploadService;
|
|
25
24
|
this.sqlService = sqlService;
|
|
26
25
|
this.propertyService = propertyService;
|
|
26
|
+
this.noDuplicate = true;
|
|
27
27
|
}
|
|
28
28
|
async handle(data, job) {
|
|
29
|
-
|
|
30
|
-
r.email = 'test@test.com';
|
|
31
|
-
await r.save();
|
|
29
|
+
return data;
|
|
32
30
|
}
|
|
33
31
|
};
|
|
34
32
|
exports.TestJob = TestJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.job.js","sourceRoot":"","sources":["../../../src/platformUtility/jobs/test.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"test.job.js","sourceRoot":"","sources":["../../../src/platformUtility/jobs/test.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,6EAAyE;AACzE,yEAAqE;AACrE,yDAAqD;AACrD,oEAAgE;AAChE,+DAA2D;AAGpD,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,sBAAS;IAGlC,YACuB,YAA0B,EAC1B,aAA4B,EAC5B,UAAsB,EACtB,eAAgC;QAEnD,KAAK,CAAC,kCAAkC,CAAC,CAAC;QALvB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAY;QACtB,oBAAe,GAAf,eAAe,CAAiB;QAN7C,gBAAW,GAAY,IAAI,CAAC;IAStC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAS,EAAE,GAAQ;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAdY,0BAAO;kBAAP,OAAO;IADnB,IAAA,mBAAU,GAAE;qCAK4B,4BAAY;QACX,8BAAa;QAChB,wBAAU;QACL,kCAAe;GAP9C,OAAO,CAcnB"}
|
|
@@ -2,11 +2,11 @@ import { Logger } from '@nestjs/common';
|
|
|
2
2
|
import { ConfigService } from '@nestjs/config';
|
|
3
3
|
import { Job, Queue } from 'bullmq';
|
|
4
4
|
import 'dotenv/config';
|
|
5
|
+
import { CommonService } from '../../common/libraries/common.service';
|
|
5
6
|
import { PropertyService } from '../../system/services/property.service';
|
|
6
7
|
import { QueueOptionsDto } from '../dtos/queue.options.dto';
|
|
7
8
|
import { LocalPropertyService } from './local.property.service';
|
|
8
9
|
import { SqsService } from './sqs.service';
|
|
9
|
-
import { CommonService } from '../../common/libraries/common.service';
|
|
10
10
|
export declare class QueueService extends CommonService {
|
|
11
11
|
private readonly businessQueue;
|
|
12
12
|
private readonly localPropertyService;
|
|
@@ -45,4 +45,11 @@ export declare class QueueService extends CommonService {
|
|
|
45
45
|
isWorkerInstance(): true;
|
|
46
46
|
shouldJobBeDrained(): boolean;
|
|
47
47
|
setQueueDrainCheck(): Promise<void>;
|
|
48
|
+
getDuplicateOptions(hashIdentifier: string, payload: any, options: QueueOptionsDto): Promise<{
|
|
49
|
+
jobId: string;
|
|
50
|
+
removeOnComplete: boolean;
|
|
51
|
+
removeOnFail: boolean;
|
|
52
|
+
}>;
|
|
53
|
+
private getJobId;
|
|
54
|
+
private isPrimitivePayload;
|
|
48
55
|
}
|
|
@@ -18,12 +18,13 @@ const common_1 = require("@nestjs/common");
|
|
|
18
18
|
const config_1 = require("@nestjs/config");
|
|
19
19
|
const bullmq_2 = require("bullmq");
|
|
20
20
|
require("dotenv/config");
|
|
21
|
+
const common_service_1 = require("../../common/libraries/common.service");
|
|
21
22
|
const date_util_1 = require("../../common/libraries/date.util");
|
|
23
|
+
const hash_1 = require("../../common/libraries/hash");
|
|
22
24
|
const property_service_1 = require("../../system/services/property.service");
|
|
23
25
|
const operation_exception_1 = require("./../../common/exceptions/operation.exception");
|
|
24
26
|
const local_property_service_1 = require("./local.property.service");
|
|
25
27
|
const sqs_service_1 = require("./sqs.service");
|
|
26
|
-
const common_service_1 = require("../../common/libraries/common.service");
|
|
27
28
|
const queueName = process.env.BULL_QUEUE_NAME;
|
|
28
29
|
let QueueService = class QueueService extends common_service_1.CommonService {
|
|
29
30
|
constructor(businessQueue, localPropertyService, sqsService, propertyService, configService) {
|
|
@@ -68,6 +69,10 @@ let QueueService = class QueueService extends common_service_1.CommonService {
|
|
|
68
69
|
return this.addSqsJob(jobInstance.mode, payload);
|
|
69
70
|
options = options ?? {};
|
|
70
71
|
options.priority = options.priority || jobInstance.priority;
|
|
72
|
+
if (jobInstance.noDuplicate) {
|
|
73
|
+
const dupOptions = await this.getDuplicateOptions(type, payload, options);
|
|
74
|
+
options = { ...options, ...dupOptions };
|
|
75
|
+
}
|
|
71
76
|
return this.businessQueue.add(jobInstance.queue, payload, options);
|
|
72
77
|
}
|
|
73
78
|
async addSqsJob(mode, payload) {
|
|
@@ -178,6 +183,26 @@ let QueueService = class QueueService extends common_service_1.CommonService {
|
|
|
178
183
|
}
|
|
179
184
|
}, +interval);
|
|
180
185
|
}
|
|
186
|
+
async getDuplicateOptions(hashIdentifier, payload, options) {
|
|
187
|
+
const id = await this.getJobId(payload, options);
|
|
188
|
+
const jobId = `${hashIdentifier}:${id}`;
|
|
189
|
+
return { jobId, removeOnComplete: true, removeOnFail: true };
|
|
190
|
+
}
|
|
191
|
+
async getJobId(payload, options) {
|
|
192
|
+
if (options?.jobId)
|
|
193
|
+
return options.jobId;
|
|
194
|
+
const isNotPrimitive = this.isPrimitivePayload(payload.payload) === false;
|
|
195
|
+
if (isNotPrimitive)
|
|
196
|
+
return hash_1.Hash.easyHash(JSON.stringify({ data: payload.payload }));
|
|
197
|
+
return payload.payload;
|
|
198
|
+
}
|
|
199
|
+
isPrimitivePayload(data) {
|
|
200
|
+
if (!data)
|
|
201
|
+
return 0;
|
|
202
|
+
const safeTypes = ['string', 'number', 'boolean'];
|
|
203
|
+
const type = typeof data;
|
|
204
|
+
return safeTypes.includes(type);
|
|
205
|
+
}
|
|
181
206
|
};
|
|
182
207
|
exports.QueueService = QueueService;
|
|
183
208
|
exports.QueueService = QueueService = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6C;AAC7C,2CAAoD;AACpD,2CAA+C;AAC/C,mCAAoC;AACpC,yBAAuB;AACvB,gEAA4D;AAC5D,6EAAyE;AAEzE,uFAAmF;AACnF,qEAAgE;AAChE,+CAA2C;
|
|
1
|
+
{"version":3,"file":"queue.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/queue.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EventQueueEntity } from '../entities/event.queue.entity';
|
|
2
1
|
import { QueueService } from '../../platformUtility/services/queue.service';
|
|
2
|
+
import { EventQueueEntity } from '../entities/event.queue.entity';
|
|
3
3
|
export declare class EventQueueService {
|
|
4
4
|
private readonly queueService;
|
|
5
5
|
constructor(queueService: QueueService);
|
|
@@ -12,11 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.EventQueueService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const typeorm_1 = require("typeorm");
|
|
15
|
+
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
15
16
|
const date_util_1 = require("../../common/libraries/date.util");
|
|
17
|
+
const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
16
18
|
const event_detail_entity_1 = require("../entities/event.detail.entity");
|
|
17
19
|
const event_queue_entity_1 = require("../entities/event.queue.entity");
|
|
18
|
-
const operation_exception_1 = require("../../common/exceptions/operation.exception");
|
|
19
|
-
const queue_service_1 = require("../../platformUtility/services/queue.service");
|
|
20
20
|
let EventQueueService = class EventQueueService {
|
|
21
21
|
constructor(queueService) {
|
|
22
22
|
this.queueService = queueService;
|
|
@@ -50,7 +50,7 @@ let EventQueueService = class EventQueueService {
|
|
|
50
50
|
event.start_time = date_util_1.DateUtil.getDateTime();
|
|
51
51
|
try {
|
|
52
52
|
const payload = this.getPayload(event);
|
|
53
|
-
const job = await this.queueService.addJob(event.event.identifier, payload);
|
|
53
|
+
const job = await this.queueService.addJob(event.event.identifier, payload, { priority: 0 });
|
|
54
54
|
event.attributes = { ...event.attributes, job_id: job.id };
|
|
55
55
|
global.console.log('triggered event : ', event.event.identifier, payload, job.id);
|
|
56
56
|
}
|
|
@@ -67,7 +67,7 @@ let EventQueueService = class EventQueueService {
|
|
|
67
67
|
event.start_time = date_util_1.DateUtil.getDateTime();
|
|
68
68
|
try {
|
|
69
69
|
const payload = this.getPayload(event);
|
|
70
|
-
const job = await this.queueService.addJob(event.event.identifier, payload);
|
|
70
|
+
const job = await this.queueService.addJob(event.event.identifier, payload, { priority: 0 });
|
|
71
71
|
event.attributes = { ...event.attributes, job_id: job.id };
|
|
72
72
|
global.console.log('triggered event : ', event.event.identifier, payload, job.id);
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA2C;AAC3C,gEAA4D;AAC5D,yEAAoE;AACpE,uEAAkE;
|
|
1
|
+
{"version":3,"file":"event.queue.service.js","sourceRoot":"","sources":["../../../src/system/services/event.queue.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@servicelabsco/nestjs-utility-services",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.142",
|
|
4
4
|
"description": "NestJS generic packages to support development",
|
|
5
5
|
"author": "Hemant Kumar Sah <hemantanshu@gmail.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -104,7 +104,8 @@
|
|
|
104
104
|
"socket.io": "^4.7.2",
|
|
105
105
|
"source-map-support": "^0.5.21",
|
|
106
106
|
"typeorm": "^0.3.20",
|
|
107
|
-
"typeorm-naming-strategies": "^4.1.0"
|
|
107
|
+
"typeorm-naming-strategies": "^4.1.0",
|
|
108
|
+
"xxhash-wasm": "^1.1.0"
|
|
108
109
|
},
|
|
109
110
|
"devDependencies": {
|
|
110
111
|
"@nestjs/cli": "^10.0.0",
|