@opra/rabbitmq 1.10.0 → 1.11.1

package/cjs/rabbitmq-adapter.js

@@ -127,7 +127,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                                 return;
                             await this.emitAsync('message', msg).catch(() => undefined);
                             try {
-                                await args.handler(msg);
+                                await args.handler(topic, msg);
                                 // channel.ack(msg);
                             }
                             catch (e) {
@@ -152,11 +152,6 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             throw e;
         }
     }
-    // protected async _connect() {
-    //   if (!this._connection)
-    //     this._connection = await amqplib.connect(this._config.connection);
-    //   return this._connection;
-    // }
     /**
      * Closes all connections and stops the service
      */
@@ -230,7 +225,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                 this[core_1.kAssetCache].set(header, 'decode', decode);
             }
         });
-        args.handler = async (message) => {
+        args.handler = async (queue, message) => {
             if (!message)
                 return;
             const operationHandler = instance[operation.name];
@@ -266,6 +261,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                 controllerInstance: instance,
                 operation,
                 operationHandler,
+                queue,
                 fields: message.fields,
                 properties: message.properties,
                 content,

package/cjs/rabbitmq-context.js

@@ -29,6 +29,7 @@ class RabbitmqContext extends core_1.ExecutionContext {
             this.operation = init.operation;
         if (init.operationHandler)
             this.operationHandler = init.operationHandler;
+        this.queue = init.queue;
         this.fields = init.fields;
         this.properties = init.properties;
         this.headers = init.headers || {};

package/esm/rabbitmq-adapter.js

@@ -123,7 +123,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
                                 return;
                             await this.emitAsync('message', msg).catch(() => undefined);
                             try {
-                                await args.handler(msg);
+                                await args.handler(topic, msg);
                                 // channel.ack(msg);
                             }
                             catch (e) {
@@ -148,11 +148,6 @@ export class RabbitmqAdapter extends PlatformAdapter {
             throw e;
         }
     }
-    // protected async _connect() {
-    //   if (!this._connection)
-    //     this._connection = await amqplib.connect(this._config.connection);
-    //   return this._connection;
-    // }
     /**
      * Closes all connections and stops the service
      */
@@ -226,7 +221,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
                 this[kAssetCache].set(header, 'decode', decode);
             }
         });
-        args.handler = async (message) => {
+        args.handler = async (queue, message) => {
             if (!message)
                 return;
             const operationHandler = instance[operation.name];
@@ -262,6 +257,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
                 controllerInstance: instance,
                 operation,
                 operationHandler,
+                queue,
                 fields: message.fields,
                 properties: message.properties,
                 content,

package/esm/rabbitmq-context.js

@@ -26,6 +26,7 @@ export class RabbitmqContext extends ExecutionContext {
             this.operation = init.operation;
         if (init.operationHandler)
             this.operationHandler = init.operationHandler;
+        this.queue = init.queue;
         this.fields = init.fields;
         this.properties = init.properties;
         this.headers = init.headers || {};

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.10.0",
+  "version": "1.11.1",
   "description": "Opra RabbitMQ package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r8",
-    "@opra/common": "^1.10.0",
-    "@opra/core": "^1.10.0",
     "content-type": "^1.0.5",
     "iconv-lite": "^0.6.3",
     "node-events-async": "^1.0.0",
@@ -15,6 +13,8 @@
     "valgen": "^5.13.0"
   },
   "peerDependencies": {
+    "@opra/common": "^1.11.1",
+    "@opra/core": "^1.11.1",
     "amqplib": "^0.10.5"
   },
   "type": "module",

package/types/rabbitmq-adapter.d.ts

@@ -12,7 +12,7 @@ interface HandlerArguments {
     instance: any;
     operation: RpcOperation;
     operationConfig: OperationConfig;
-    handler: (msg: ConsumeMessage | null) => void | Promise<void>;
+    handler: (queue: string, msg: ConsumeMessage | null) => void | Promise<void>;
     topics: string[];
 }
 /**

package/types/rabbitmq-context.d.ts

@@ -15,6 +15,7 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
     readonly controllerInstance?: any;
     readonly operation?: RpcOperation;
     readonly operationHandler?: Function;
+    readonly queue: string;
     readonly fields: amqplib.MessageFields;
     readonly properties: amqplib.MessageProperties;
     readonly content: any;
@@ -34,6 +35,7 @@ export declare namespace RabbitmqContext {
         operationHandler?: Function;
         content: any;
         headers: Record<string, any>;
+        queue: string;
         fields: amqplib.MessageFields;
         properties: amqplib.MessageProperties;
     }