exodus-framework 2.1.1047 → 2.1.1049
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,5 +1,6 @@
|
|
|
1
1
|
import { Worker } from 'cluster';
|
|
2
2
|
import System from './system';
|
|
3
|
+
import { eExecutionSide } from '../../contracts/core';
|
|
3
4
|
/**
|
|
4
5
|
* Disponibiliza ações de controle de clusters, incluindo comunicação básica
|
|
5
6
|
*
|
|
@@ -36,6 +37,7 @@ declare abstract class Managed extends System {
|
|
|
36
37
|
protected onMasterUnhandledRejection(_reason: unknown, _promise: Promise<unknown>): void;
|
|
37
38
|
protected isMaster(): boolean;
|
|
38
39
|
protected isCluster(): boolean;
|
|
40
|
+
protected getExecutionSide(): eExecutionSide.MASTER | eExecutionSide.CLUSTER;
|
|
39
41
|
protected getWorkers(): NodeJS.Dict<Worker>;
|
|
40
42
|
protected getWorkId(): number;
|
|
41
43
|
protected getClusterCount(): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed.d.ts","sourceRoot":"","sources":["../../../src/app/classes/managed.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,MAAM,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"managed.d.ts","sourceRoot":"","sources":["../../../src/app/classes/managed.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE1C,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;GAMG;AACH,uBAAe,OAAQ,SAAQ,MAAM;IACnC,OAAO,CAAC,SAAS,CAAU;IAC3B,OAAO,CAAC,UAAU,CAAU;;IAS5B,OAAO,CAAC,wBAAwB;IAYhC,SAAS,CAAC,MAAM;IAYhB,SAAS,CAAC,aAAa;IACvB,SAAS,CAAC,YAAY;IAOtB,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM;IAI9B,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM;IACrC,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM;IACpC,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAGvE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAI1C,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IACjD,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAGhD,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAI3C,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAClD,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAGjD,SAAS,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAI3C,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAClD,SAAS,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO;IAGjD,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK;IAIzC,SAAS,CAAC,0BAA0B,CAAC,IAAI,EAAE,KAAK;IAChD,SAAS,CAAC,yBAAyB,CAAC,IAAI,EAAE,KAAK;IAG/C,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAI3E,SAAS,CAAC,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAClF,SAAS,CAAC,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC;IAGjF,SAAS,CAAC,QAAQ;IAGlB,SAAS,CAAC,SAAS;IAGnB,SAAS,CAAC,gBAAgB;IAK1B,SAAS,CAAC,UAAU;IAGpB,SAAS,CAAC,SAAS;IAMnB,SAAS,CAAC,eAAe;CAG1B;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -7,6 +7,7 @@ exports.default = void 0;
|
|
|
7
7
|
var _cluster = _interopRequireDefault(require("cluster"));
|
|
8
8
|
var _event = _interopRequireDefault(require("./event"));
|
|
9
9
|
var _system = _interopRequireDefault(require("./system"));
|
|
10
|
+
var _core = require("../../contracts/core");
|
|
10
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
11
12
|
/**
|
|
12
13
|
* Disponibiliza ações de controle de clusters, incluindo comunicação básica
|
|
@@ -87,6 +88,9 @@ class Managed extends _system.default {
|
|
|
87
88
|
isCluster() {
|
|
88
89
|
return this._isCluster;
|
|
89
90
|
}
|
|
91
|
+
getExecutionSide() {
|
|
92
|
+
return this.isMaster() ? _core.eExecutionSide.MASTER : _core.eExecutionSide.CLUSTER;
|
|
93
|
+
}
|
|
90
94
|
getWorkers() {
|
|
91
95
|
return _cluster.default.workers;
|
|
92
96
|
}
|
|
@@ -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;AAGtD,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,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;AAGtD,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EACL,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAItB;;;;;;GAMG;AACH,cAAM,eAAgB,SAAQ,OAAO;IACnC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,UAAU,CAA2B;IAC7C,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,oBAAoB,CAA0D;IACtF,OAAO,CAAC,QAAQ,CAAsB;IAEtC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAS;IAEf,aAAa;IAeb,OAAO;IAMP,eAAe;IAMf,WAAW;IAKX,OAAO;IA+BP,eAAe;IAkBrB,iBAAiB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,sBAAsB;IAKtF,OAAO,CAAC,iBAAiB;IAYzB;;;;;;;;;OASG;IACG,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACpD,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC7B,aAAa,CAAC,EAAE,MAAM;IAKxB;;;;;;;;OAQG;IACG,OAAO,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAChD,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAC7B,aAAa,CAAC,EAAE,MAAM;IAqBlB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IAoCjD,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IAiBhD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,wBAAwB;IAI/C,aAAa,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACvD,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAY9B,cAAc,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC;IAW7D,YAAY,CACjB,CAAC,SAAS,MAAM,oBAAoB,EACpC,CAAC,SAAS,MAAM,oBAAoB,EACpC,IAAI,EAAE;QACN,IAAI,EAAE;YAAE,KAAK,EAAE,CAAC,CAAC;YAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAA;SAAE,CAAC;QAClD,MAAM,EAAE;YACN,KAAK,EAAE,CAAC,CAAC;YACT,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACpC,SAAS,EAAE,MAAM,IAAI,CAAC;YACtB,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;KACH;CAwBF;AAED,eAAe,eAAe,CAAC"}
|
package/lib/services/rabitmq.js
CHANGED
|
@@ -8,7 +8,6 @@ var _amqplib = _interopRequireDefault(require("amqplib"));
|
|
|
8
8
|
var _crypto = require("crypto");
|
|
9
9
|
var _app = require("../app");
|
|
10
10
|
var _service = _interopRequireDefault(require("../app/classes/service"));
|
|
11
|
-
var _core = require("../contracts/core");
|
|
12
11
|
var _messaging = _interopRequireDefault(require("../routes/messaging"));
|
|
13
12
|
var _logger = _interopRequireDefault(require("../services/logger"));
|
|
14
13
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
@@ -90,7 +89,7 @@ class RabbitMQService extends _service.default {
|
|
|
90
89
|
for (const [topic, handler] of Object.entries(this.mainRouter)) {
|
|
91
90
|
if (Array.isArray(handler)) {
|
|
92
91
|
const [side] = handler;
|
|
93
|
-
if (this.
|
|
92
|
+
if (this.getExecutionSide() != side) continue;
|
|
94
93
|
await this.channel.bindQueue(this.queueName, this.exchangeName, topic);
|
|
95
94
|
} else {
|
|
96
95
|
await this.channel.bindQueue(this.queueName, this.exchangeName, topic);
|
|
@@ -98,7 +97,7 @@ class RabbitMQService extends _service.default {
|
|
|
98
97
|
}
|
|
99
98
|
}
|
|
100
99
|
registerDecorator(metadata, handler) {
|
|
101
|
-
if (this.
|
|
100
|
+
if (this.getExecutionSide() != metadata.side) return;
|
|
102
101
|
this.decoratorRouter[metadata.queue] = handler;
|
|
103
102
|
}
|
|
104
103
|
setupErrorHandles() {
|
|
@@ -167,11 +166,13 @@ class RabbitMQService extends _service.default {
|
|
|
167
166
|
const callBack = this.mainRouter[topic];
|
|
168
167
|
if (callBack) {
|
|
169
168
|
if (Array.isArray(callBack)) {
|
|
170
|
-
const [, cb] = callBack;
|
|
171
|
-
|
|
169
|
+
const [side, cb] = callBack;
|
|
170
|
+
if (this.getExecutionSide() === side) {
|
|
171
|
+
await cb(content.data, () => {}, content.serviceId, content.transactionId);
|
|
172
|
+
}
|
|
173
|
+
} else {
|
|
174
|
+
await callBack(content.data, () => {}, content.serviceId, content.transactionId);
|
|
172
175
|
}
|
|
173
|
-
} else {
|
|
174
|
-
await callBack(content.data, () => {}, content.serviceId, content.transactionId);
|
|
175
176
|
}
|
|
176
177
|
this.channel.ack(msg);
|
|
177
178
|
if (this.eventCustomListeners.has(topic)) {
|