exodus-framework 2.0.718 → 2.0.720

package/lib/services/rabitmq.d.ts

@@ -1,6 +1,6 @@
+import client, { Channel, Connection } from 'amqplib';
 import Service from '../app/service';
-import { TMessageQueueDataMap, TMessagingQueueEventList, TMessagingQueueHandler } from '../contracts';
-import { Channel, Connection } from 'amqplib';
+import { TMessageQueueDataMap, TMessagingQueueEventList } from '../contracts';
 import { IService } from '../contracts/service';
 declare class RabbitMQService extends Service implements IService {
     connection: Connection;
@@ -9,10 +9,10 @@ declare class RabbitMQService extends Service implements IService {
     private mainRouter;
     constructor();
     init(): Promise<void>;
-    registerHandles(): void;
+    registerHandles(): Promise<void>;
     connect(): Promise<void>;
-    sendToQueue<K extends keyof TMessageQueueDataMap>(queue: K, data: TMessageQueueDataMap[K]): Promise<void>;
-    consumeFromQueue<K extends keyof TMessageQueueDataMap>(queue: K, callBack: TMessagingQueueHandler<K>): Promise<void>;
+    sendToQueue<K extends keyof TMessageQueueDataMap>(topic: K, data: TMessageQueueDataMap[K]): Promise<void>;
+    consumeFromQueue(msg: client.ConsumeMessage): Promise<void>;
     registerRouter(router: TMessagingQueueEventList): void;
 }
 export default RabbitMQService;

package/lib/services/rabitmq.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rabitmq.d.ts","sourceRoot":"","sources":["../../src/services/rabitmq.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAEL,oBAAoB,EACpB,wBAAwB,EACxB,sBAAsB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAe,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAYhD,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;IAMV,eAAe;IAKT,OAAO;IAuBP,WAAW,CAAC,CAAC,SAAS,MAAM,oBAAoB,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAuBzF,gBAAgB,CAAC,CAAC,SAAS,MAAM,oBAAoB,EACzD,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC;IAmCrC,cAAc,CAAC,MAAM,EAAE,wBAAwB;CAGhD;AAED,eAAe,eAAe,CAAC"}
+{"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;IAuBzF,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,cAAc;IAgBjD,cAAc,CAAC,MAAM,EAAE,wBAAwB;CAGhD;AAED,eAAe,eAAe,CAAC"}

package/lib/services/rabitmq.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _service = _interopRequireDefault(require("../app/service"));
 var _amqplib = _interopRequireDefault(require("amqplib"));
-var _error = require("./error");
 var _app = require("../app");
+var _service = _interopRequireDefault(require("../app/service"));
 var _messaging = _interopRequireDefault(require("../routes/messaging"));
+var _error = require("./error");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Serviço de Mensageria
@@ -36,10 +36,13 @@ class RabbitMQService extends _service.default {
     }; // # Register native router
     await this.connect();
   }
-  registerHandles() {
-    for (const [queue, handle] of Object.entries(this.mainRouter)) {
-      this.consumeFromQueue(queue, handle);
+  async registerHandles() {
+    for (const topic of Object.keys(this.mainRouter)) {
+      await this.channel.bindQueue(_app.Core.settings.getAppication().appId, _app.Core.settings.getMessaging().exchanges.main, topic);
     }
+    await this.channel.consume(_app.Core.settings.getAppication().appId, this.consumeFromQueue.bind(this), {
+      noAck: false
+    });
   }
   async connect() {
     if (this.connected && this.channel) return;else this.connected = true;
@@ -48,7 +51,10 @@ class RabbitMQService extends _service.default {
       this.connection = await _amqplib.default.connect(`amqp://${_app.Core.settings.getMessaging().user}:${_app.Core.settings.getMessaging().pass}@${_app.Core.settings.getMessaging().host}:5672`);
       this.log(`✅ Rabbit MQ Connection is ready`);
       this.channel = await this.connection.createChannel();
-      this.channel.assertExchange(_app.Core.settings.getMessaging().exchanges.main, 'topic', {
+      await this.channel.assertExchange(_app.Core.settings.getMessaging().exchanges.main, 'topic', {
+        durable: true
+      });
+      await this.channel.assertQueue(_app.Core.settings.getAppication().appId, {
         durable: true
       });
       this.log(`🛸 Created RabbitMQ Channel successfully`);
@@ -59,12 +65,12 @@ class RabbitMQService extends _service.default {
   }
 
   //# Common
-  async sendToQueue(queue, data) {
+  async sendToQueue(topic, data) {
     try {
       if (!this.channel) {
         await this.connect();
       }
-      this.channel.publish(_app.Core.settings.getMessaging().exchanges.main, queue, Buffer.from(JSON.stringify(data)), {
+      this.channel.publish(_app.Core.settings.getMessaging().exchanges.main, topic, Buffer.from(JSON.stringify(data)), {
         messageId: new Date().toDateString(),
         persistent: true
       });
@@ -77,26 +83,19 @@ class RabbitMQService extends _service.default {
       new _error.ApplicationException('Houve um erro no envio de uma mensagem para o rabitmq', error);
     }
   }
-  async consumeFromQueue(queue, callBack) {
-    const assertation = await this.channel.assertQueue(`${_app.Core.settings.getAppication().appId}@queue`, {
-      durable: true
-    });
-    await this.channel.bindQueue(assertation.queue, _app.Core.settings.getMessaging().exchanges.main, queue);
-    this.channel.consume(assertation.queue, msg => {
-      {
-        if (!msg) {
-          return this.log(`Invalid incoming message in`);
-        }
-        try {
-          callBack(JSON.parse(msg.content.toString()), () => this.channel.ack(msg));
-        } catch (error) {
-          this.channel.ack(msg);
-          new _error.ApplicationException('Error on parsing message from queue', error);
-        }
-      }
-    }, {
-      noAck: false
-    });
+  async consumeFromQueue(msg) {
+    if (!msg) {
+      return this.log(`Invalid incoming message in`);
+    }
+    try {
+      const topic = msg.fields.routingKey;
+      const content = JSON.parse(msg.content.toString());
+      const callBack = this.mainRouter[topic];
+      callBack(content, () => this.channel.ack(msg));
+    } catch (error) {
+      this.channel.ack(msg);
+      new _error.ApplicationException('Error on parsing message from queue', error);
+    }
   }
   registerRouter(router) {
     this.mainRouter = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.718",
+  "version": "2.0.720",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",