exodus-framework 2.0.750 → 2.0.752
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/lib/contracts/messaging.d.ts +11 -3
- package/lib/contracts/messaging.d.ts.map +1 -1
- package/lib/contracts/messaging.js +1 -0
- package/lib/services/rabitmq.d.ts.map +1 -1
- package/lib/services/rabitmq.js +5 -7
- package/lib/services/task.d.ts +1 -0
- package/lib/services/task.d.ts.map +1 -1
- package/lib/services/task.js +14 -11
- package/package.json +2 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { IAccount, IApplication, IDatabseHost, IEnvironment } from './entity';
|
|
2
1
|
import { Connection } from '@sequelize/core';
|
|
3
2
|
import { Application } from '../models';
|
|
3
|
+
import { IAccount, IApplication, IDatabseHost, IEnvironment } from './entity';
|
|
4
4
|
export declare enum EMessagingQueue {
|
|
5
5
|
test = "exodus.queue.test",
|
|
6
6
|
accountCreated = "exodus.account.created",
|
|
@@ -16,7 +16,8 @@ export declare enum EMessagingQueue {
|
|
|
16
16
|
applicationSync = "exodus.application.sync",
|
|
17
17
|
applicationCreated = "exodus.application.created",
|
|
18
18
|
applicationUpdate = "exodus.application.updated",
|
|
19
|
-
applicationDeleted = "exodus.application.deleted"
|
|
19
|
+
applicationDeleted = "exodus.application.deleted",
|
|
20
|
+
smsSend = "exodus.sms.send"
|
|
20
21
|
}
|
|
21
22
|
export type TMessageQueueDataMap = {
|
|
22
23
|
[EMessagingQueue.test]: {
|
|
@@ -57,7 +58,14 @@ export type TMessageQueueDataMap = {
|
|
|
57
58
|
[EMessagingQueue.applicationDeleted]: {
|
|
58
59
|
uuid: string;
|
|
59
60
|
};
|
|
61
|
+
[EMessagingQueue.smsSend]: {
|
|
62
|
+
phone: string;
|
|
63
|
+
message: string;
|
|
64
|
+
campaignId: string;
|
|
65
|
+
};
|
|
60
66
|
};
|
|
61
|
-
export type TMessagingQueueHandler<K extends keyof TMessageQueueDataMap = any> = (data: TMessageQueueDataMap[K]
|
|
67
|
+
export type TMessagingQueueHandler<K extends keyof TMessageQueueDataMap = any> = (data: TMessageQueueDataMap[K] & {
|
|
68
|
+
serviceId?: string;
|
|
69
|
+
}, ack: () => void, serviceId?: string) => void;
|
|
62
70
|
export type TMessagingQueueEventList = Partial<Record<keyof TMessageQueueDataMap, TMessagingQueueHandler>>;
|
|
63
71
|
//# sourceMappingURL=messaging.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/contracts/messaging.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/contracts/messaging.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,5 +20,6 @@ let EMessagingQueue = exports.EMessagingQueue = /*#__PURE__*/function (EMessagin
|
|
|
20
20
|
EMessagingQueue["applicationCreated"] = "exodus.application.created";
|
|
21
21
|
EMessagingQueue["applicationUpdate"] = "exodus.application.updated";
|
|
22
22
|
EMessagingQueue["applicationDeleted"] = "exodus.application.deleted";
|
|
23
|
+
EMessagingQueue["smsSend"] = "exodus.sms.send";
|
|
23
24
|
return EMessagingQueue;
|
|
24
25
|
}({}); // Mapeamento de tópicos para tipos
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabitmq.d.ts","sourceRoot":"","sources":["../../src/services/rabitmq.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEtD,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAWhD,cAAM,eAAgB,SAAQ,OAAQ,YAAW,QAAQ;IACvD,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,UAAU,CAA2B;;IAMvC,IAAI;IAMJ,eAAe;IAiBf,OAAO;IAwBP,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"rabitmq.d.ts","sourceRoot":"","sources":["../../src/services/rabitmq.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEtD,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAWhD,cAAM,eAAgB,SAAQ,OAAQ,YAAW,QAAQ;IACvD,UAAU,EAAG,UAAU,CAAC;IACxB,OAAO,EAAG,OAAO,CAAC;IAClB,OAAO,CAAC,SAAS,CAAW;IAC5B,OAAO,CAAC,UAAU,CAA2B;;IAMvC,IAAI;IAMJ,eAAe;IAiBf,OAAO;IAwBP,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAkBzF,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IAgBjD,cAAc,CAAC,MAAM,EAAE,wBAAwB;CAGhD;AAED,eAAe,eAAe,CAAC"}
|
package/lib/services/rabitmq.js
CHANGED
|
@@ -70,15 +70,13 @@ class RabbitMQService extends _service.default {
|
|
|
70
70
|
if (!this.channel) {
|
|
71
71
|
await this.connect();
|
|
72
72
|
}
|
|
73
|
-
this.channel.publish(_app.Core.settings.getMessaging().exchanges.main, topic, Buffer.from(JSON.stringify(
|
|
73
|
+
this.channel.publish(_app.Core.settings.getMessaging().exchanges.main, topic, Buffer.from(JSON.stringify({
|
|
74
|
+
...data,
|
|
75
|
+
serviceId: _app.Core.settings.getAppication().appId
|
|
76
|
+
})), {
|
|
74
77
|
messageId: new Date().toDateString(),
|
|
75
78
|
persistent: true
|
|
76
79
|
});
|
|
77
|
-
|
|
78
|
-
/* this.channel.sendToQueue(queue, Buffer.from(JSON.stringify(data)), {
|
|
79
|
-
messageId: new Date().toDateString(),
|
|
80
|
-
persistent: true
|
|
81
|
-
}); */
|
|
82
80
|
} catch (error) {
|
|
83
81
|
new _error.ApplicationException('Houve um erro no envio de uma mensagem para o rabitmq', error);
|
|
84
82
|
}
|
|
@@ -91,7 +89,7 @@ class RabbitMQService extends _service.default {
|
|
|
91
89
|
const topic = msg.fields.routingKey;
|
|
92
90
|
const content = JSON.parse(msg.content.toString());
|
|
93
91
|
const callBack = this.mainRouter[topic];
|
|
94
|
-
callBack(content, () => this.channel.ack(msg));
|
|
92
|
+
callBack(content.data, () => this.channel.ack(msg), content.serviceId);
|
|
95
93
|
} catch (error) {
|
|
96
94
|
this.channel.ack(msg);
|
|
97
95
|
new _error.ApplicationException('Error on parsing message from queue', error);
|
package/lib/services/task.d.ts
CHANGED
|
@@ -32,6 +32,7 @@ export declare class TaskQueueService extends TaskServiceBase {
|
|
|
32
32
|
registerJob(job: QueueTask<any>): Promise<void>;
|
|
33
33
|
private importAllJobs;
|
|
34
34
|
private processAllJobs;
|
|
35
|
+
startTask(task: QueueTask<any>): Promise<void>;
|
|
35
36
|
}
|
|
36
37
|
export declare abstract class QueueTask<DataType, ResultType = any, NameType extends string = string> extends Singleton {
|
|
37
38
|
protected queue: Queue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,uBAAe,eAAgB,SAAQ,OAAQ,YAAW,QAAQ;IAChE,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnD,WAAW,CAAC,IAAI,EAAE,MAAM;CAGzB;AAGD,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,OAAO,CAAC,IAAI,CAAmB;IAEzB,IAAI;IAYG,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAG9C,aAAa;YAcb,cAAc;CAO7B;AACD,8BAAsB,cAAe,SAAQ,SAAS;IACpD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,UAAU;IAGV,SAAS;IAGT,UAAU;CAGlB;AAGD,qBAAa,gBAAiB,SAAQ,eAAe;IACnD,OAAO,CAAC,IAAI,CAAmB;IAC/B,OAAO,CAAC,UAAU,CAAoB;IAEhC,IAAI;IAeG,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAI9C,aAAa;YAUb,cAAc;
|
|
1
|
+
{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../src/services/task.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,SAAS,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,uBAAe,eAAgB,SAAQ,OAAQ,YAAW,QAAQ;IAChE,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEnD,WAAW,CAAC,IAAI,EAAE,MAAM;CAGzB;AAGD,qBAAa,qBAAsB,SAAQ,eAAe;IACxD,OAAO,CAAC,IAAI,CAAmB;IAEzB,IAAI;IAYG,WAAW,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAG9C,aAAa;YAcb,cAAc;CAO7B;AACD,8BAAsB,cAAe,SAAQ,SAAS;IACpD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE1B,UAAU;IAGV,SAAS;IAGT,UAAU;CAGlB;AAGD,qBAAa,gBAAiB,SAAQ,eAAe;IACnD,OAAO,CAAC,IAAI,CAAmB;IAC/B,OAAO,CAAC,UAAU,CAAoB;IAEhC,IAAI;IAeG,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;YAI9C,aAAa;YAUb,cAAc;IAMf,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC;CAiB5C;AACD,8BAAsB,SAAS,CAC7B,QAAQ,EACR,UAAU,GAAG,GAAG,EAChB,QAAQ,SAAS,MAAM,GAAG,MAAM,CAChC,SAAQ,SAAS;IACjB,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE9B,UAAU;IAoBjB,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAEjB,MAAM,CAAC,IAAI,EAAE,QAAQ;IAI3B,QAAQ;IAGR,QAAQ,CAAC,KAAK,EAAE,KAAK;IAGrB,SAAS;IAGT,SAAS,CAAC,MAAM,EAAE,MAAM;IAGxB,SAAS;IAIT,YAAY,IAAI,MAAM;IAG7B,QAAQ,CAAC,MAAM,CAEb,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,EAEzC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,UAAU,CAAC;CACvB"}
|
package/lib/services/task.js
CHANGED
|
@@ -103,19 +103,22 @@ class TaskQueueService extends TaskServiceBase {
|
|
|
103
103
|
}
|
|
104
104
|
async processAllJobs() {
|
|
105
105
|
for (const job of this.jobs) {
|
|
106
|
-
|
|
107
|
-
const queue = new _bullmq.Queue(job.getQueueName(), {
|
|
108
|
-
connection: this.connection
|
|
109
|
-
});
|
|
110
|
-
const worker = new _bullmq.Worker(job.getQueueName(), job.handle.bind(job), {
|
|
111
|
-
connection: this.connection
|
|
112
|
-
});
|
|
113
|
-
job.setQueue(queue);
|
|
114
|
-
job.setWorker(worker);
|
|
115
|
-
job.init();
|
|
116
|
-
this.log(`Job '${job.getQueueName()}' started...`, 'warning');
|
|
106
|
+
this.startTask(job);
|
|
117
107
|
}
|
|
118
108
|
}
|
|
109
|
+
async startTask(task) {
|
|
110
|
+
if (!task.getActive()) return;
|
|
111
|
+
const queue = new _bullmq.Queue(task.getQueueName(), {
|
|
112
|
+
connection: this.connection
|
|
113
|
+
});
|
|
114
|
+
const worker = new _bullmq.Worker(task.getQueueName(), task.handle.bind(task), {
|
|
115
|
+
connection: this.connection
|
|
116
|
+
});
|
|
117
|
+
task.setQueue(queue);
|
|
118
|
+
task.setWorker(worker);
|
|
119
|
+
task.init();
|
|
120
|
+
this.log(`Job '${task.getQueueName()}' started...`, 'warning');
|
|
121
|
+
}
|
|
119
122
|
}
|
|
120
123
|
exports.TaskQueueService = TaskQueueService;
|
|
121
124
|
class QueueTask extends _singleton.default {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "exodus-framework",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.752",
|
|
4
4
|
"description": "Exodus Framework",
|
|
5
5
|
"author": "jhownpaixao",
|
|
6
6
|
"license": "ISC",
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
"build:types": "tsc --emitDeclarationOnly",
|
|
16
16
|
"dev": "ts-node-dev -r tsconfig-paths/register --respawn --transpile-only --ignore-watch node_modules src/server.ts",
|
|
17
17
|
"start": "node build/server.js",
|
|
18
|
+
"update": "npm run build && npm publish",
|
|
18
19
|
"fix": "npm run fix:eslint && npm run fix:prettier",
|
|
19
20
|
"fix:eslint": "eslint --fix \"**/*.ts\" ",
|
|
20
21
|
"fix:prettier": "prettier --write \"**/*.ts\" ",
|