@opra/rabbitmq 1.12.2 → 1.12.4

package/cjs/rabbitmq-adapter.js

@@ -104,7 +104,16 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             }
             /** Connect to server */
             for (const connectionOptions of this._config.connection) {
-                const connection = await amqplib_1.default.connect(connectionOptions);
+                const connection = await amqplib_1.default.connect(connectionOptions).catch(e => {
+                    e.message = 'Unable to connect to RabbitMQ server';
+                    throw new Error('Unable to connect to RabbitMQ server (' +
+                        (typeof connectionOptions == 'object'
+                            ? connectionOptions.hostname + ':' + connectionOptions.port
+                            : connectionOptions) +
+                        ')', 
+                    // @ts-ignore
+                    e);
+                });
                 this._connections.push(connection);
                 const hostname = typeof connectionOptions === 'object'
                     ? connectionOptions.hostname
@@ -127,8 +136,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                                 return;
                             await this.emitAsync('message', msg).catch(() => undefined);
                             try {
-                                await args.handler(topic, msg);
-                                // channel.ack(msg);
+                                await args.handler(channel, topic, msg);
                             }
                             catch (e) {
                                 this._emitError(e);
@@ -180,7 +188,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             return;
         const operationConfig = {
             consumer: {
-                noAck: true,
+                noAck: false,
             },
         };
         if (this._config.defaults) {
@@ -225,15 +233,28 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                 this[core_1.kAssetCache].set(header, 'decode', decode);
             }
         });
-        args.handler = async (queue, message) => {
+        args.handler = async (channel, queue, message) => {
             if (!message)
                 return;
             const operationHandler = instance[operation.name];
-            let content;
             const headers = {};
+            /** Create context */
+            const context = new rabbitmq_context_js_1.RabbitmqContext({
+                adapter: this,
+                platform: this.platform,
+                controller,
+                controllerInstance: instance,
+                operation,
+                operationHandler,
+                queue,
+                channel,
+                message,
+                content: undefined,
+                headers,
+            });
             try {
                 /** Parse and decode `payload` */
-                content = await this._parseContent(message);
+                let content = await this._parseContent(message);
                 if (content && decodePayload) {
                     if (Buffer.isBuffer(content))
                         content = content.toString('utf-8');
@@ -248,25 +269,12 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                         headers[k] = decode(Buffer.isBuffer(v) ? v.toString() : v);
                     }
                 }
+                context.content = content;
             }
             catch (e) {
-                this._emitError(e);
+                this._emitError(e, context);
                 return;
             }
-            /** Create context */
-            const context = new rabbitmq_context_js_1.RabbitmqContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
-                queue,
-                fields: message.fields,
-                properties: message.properties,
-                content,
-                headers,
-            });
             await this.emitAsync('before-execute', context);
             try {
                 /** Call operation handler */
@@ -339,7 +347,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             else
                 logger?.error(error);
             if (this.listenerCount('error'))
-                this.emit('error', error);
+                this.emit('error', error, context);
         })
             .catch(noOp);
     }

package/cjs/rabbitmq-context.js

@@ -18,6 +18,7 @@ class RabbitmqContext extends core_1.ExecutionContext {
             documentNode: init.controller?.node,
             protocol: 'rpc',
         });
+        this._ackSent = false;
         this.adapter = init.adapter;
         this.platform = init.adapter.platform;
         this.protocol = 'rpc';
@@ -29,11 +30,29 @@ class RabbitmqContext extends core_1.ExecutionContext {
             this.operation = init.operation;
         if (init.operationHandler)
             this.operationHandler = init.operationHandler;
+        this.channel = init.channel;
         this.queue = init.queue;
-        this.fields = init.fields;
-        this.properties = init.properties;
+        this.message = init.message;
         this.headers = init.headers || {};
         this.content = init.content;
     }
+    get properties() {
+        return this.message.properties;
+    }
+    get fields() {
+        return this.message.fields;
+    }
+    ack() {
+        if (this._ackSent)
+            return;
+        this._ackSent = true;
+        this.channel.ack(this.message);
+    }
+    nack() {
+        if (this._ackSent)
+            return;
+        this._ackSent = true;
+        this.channel.nack(this.message);
+    }
 }
 exports.RabbitmqContext = RabbitmqContext;

package/esm/rabbitmq-adapter.js

@@ -100,7 +100,16 @@ export class RabbitmqAdapter extends PlatformAdapter {
             }
             /** Connect to server */
             for (const connectionOptions of this._config.connection) {
-                const connection = await amqplib.connect(connectionOptions);
+                const connection = await amqplib.connect(connectionOptions).catch(e => {
+                    e.message = 'Unable to connect to RabbitMQ server';
+                    throw new Error('Unable to connect to RabbitMQ server (' +
+                        (typeof connectionOptions == 'object'
+                            ? connectionOptions.hostname + ':' + connectionOptions.port
+                            : connectionOptions) +
+                        ')', 
+                    // @ts-ignore
+                    e);
+                });
                 this._connections.push(connection);
                 const hostname = typeof connectionOptions === 'object'
                     ? connectionOptions.hostname
@@ -123,8 +132,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
                                 return;
                             await this.emitAsync('message', msg).catch(() => undefined);
                             try {
-                                await args.handler(topic, msg);
-                                // channel.ack(msg);
+                                await args.handler(channel, topic, msg);
                             }
                             catch (e) {
                                 this._emitError(e);
@@ -176,7 +184,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
             return;
         const operationConfig = {
             consumer: {
-                noAck: true,
+                noAck: false,
             },
         };
         if (this._config.defaults) {
@@ -221,15 +229,28 @@ export class RabbitmqAdapter extends PlatformAdapter {
                 this[kAssetCache].set(header, 'decode', decode);
             }
         });
-        args.handler = async (queue, message) => {
+        args.handler = async (channel, queue, message) => {
             if (!message)
                 return;
             const operationHandler = instance[operation.name];
-            let content;
             const headers = {};
+            /** Create context */
+            const context = new RabbitmqContext({
+                adapter: this,
+                platform: this.platform,
+                controller,
+                controllerInstance: instance,
+                operation,
+                operationHandler,
+                queue,
+                channel,
+                message,
+                content: undefined,
+                headers,
+            });
             try {
                 /** Parse and decode `payload` */
-                content = await this._parseContent(message);
+                let content = await this._parseContent(message);
                 if (content && decodePayload) {
                     if (Buffer.isBuffer(content))
                         content = content.toString('utf-8');
@@ -244,25 +265,12 @@ export class RabbitmqAdapter extends PlatformAdapter {
                         headers[k] = decode(Buffer.isBuffer(v) ? v.toString() : v);
                     }
                 }
+                context.content = content;
             }
             catch (e) {
-                this._emitError(e);
+                this._emitError(e, context);
                 return;
             }
-            /** Create context */
-            const context = new RabbitmqContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
-                queue,
-                fields: message.fields,
-                properties: message.properties,
-                content,
-                headers,
-            });
             await this.emitAsync('before-execute', context);
             try {
                 /** Call operation handler */
@@ -335,7 +343,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
             else
                 logger?.error(error);
             if (this.listenerCount('error'))
-                this.emit('error', error);
+                this.emit('error', error, context);
         })
             .catch(noOp);
     }

package/esm/rabbitmq-context.js

@@ -15,6 +15,7 @@ export class RabbitmqContext extends ExecutionContext {
             documentNode: init.controller?.node,
             protocol: 'rpc',
         });
+        this._ackSent = false;
         this.adapter = init.adapter;
         this.platform = init.adapter.platform;
         this.protocol = 'rpc';
@@ -26,10 +27,28 @@ export class RabbitmqContext extends ExecutionContext {
             this.operation = init.operation;
         if (init.operationHandler)
             this.operationHandler = init.operationHandler;
+        this.channel = init.channel;
         this.queue = init.queue;
-        this.fields = init.fields;
-        this.properties = init.properties;
+        this.message = init.message;
         this.headers = init.headers || {};
         this.content = init.content;
     }
+    get properties() {
+        return this.message.properties;
+    }
+    get fields() {
+        return this.message.fields;
+    }
+    ack() {
+        if (this._ackSent)
+            return;
+        this._ackSent = true;
+        this.channel.ack(this.message);
+    }
+    nack() {
+        if (this._ackSent)
+            return;
+        this._ackSent = true;
+        this.channel.nack(this.message);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.12.2",
+  "version": "1.12.4",
   "description": "Opra RabbitMQ package",
   "author": "Panates",
   "license": "MIT",
@@ -10,11 +10,11 @@
     "iconv-lite": "^0.6.3",
     "node-events-async": "^1.0.0",
     "tslib": "^2.8.1",
-    "valgen": "^5.13.0"
+    "valgen": "^5.13.3"
   },
   "peerDependencies": {
-    "@opra/common": "^1.12.2",
-    "@opra/core": "^1.12.2",
+    "@opra/common": "^1.12.4",
+    "@opra/core": "^1.12.4",
     "amqplib": "^0.10.5"
   },
   "type": "module",

package/types/rabbitmq-adapter.d.ts

@@ -1,6 +1,6 @@
 import { ApiDocument, OpraException, OpraSchema, RpcApi, RpcController, RpcOperation } from '@opra/common';
 import { PlatformAdapter } from '@opra/core';
-import amqplib from 'amqplib';
+import amqplib, { Channel } from 'amqplib';
 import { ConsumeMessage } from 'amqplib/properties';
 import { RabbitmqContext } from './rabbitmq-context.js';
 export interface OperationConfig {
@@ -12,7 +12,7 @@ interface HandlerArguments {
     instance: any;
     operation: RpcOperation;
     operationConfig: OperationConfig;
-    handler: (queue: string, msg: ConsumeMessage | null) => void | Promise<void>;
+    handler: (channel: Channel, queue: string, msg: ConsumeMessage | null) => void | Promise<void>;
     topics: string[];
 }
 /**

package/types/rabbitmq-context.d.ts

@@ -1,6 +1,7 @@
 import { OpraSchema, RpcController, RpcOperation } from '@opra/common';
 import { ExecutionContext } from '@opra/core';
-import amqplib from 'amqplib';
+import type { Channel } from 'amqplib';
+import type { ConsumeMessage } from 'amqplib/properties';
 import type { AsyncEventEmitter } from 'node-events-async';
 import type { RabbitmqAdapter } from './rabbitmq-adapter';
 /**
@@ -8,6 +9,7 @@ import type { RabbitmqAdapter } from './rabbitmq-adapter';
  * It extends the ExecutionContext and implements the AsyncEventEmitter.
  */
 export declare class RabbitmqContext extends ExecutionContext implements AsyncEventEmitter {
+    private _ackSent;
     readonly protocol: OpraSchema.Transport;
     readonly platform: string;
     readonly adapter: RabbitmqAdapter;
@@ -16,8 +18,8 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
     readonly operation?: RpcOperation;
     readonly operationHandler?: Function;
     readonly queue: string;
-    readonly fields: amqplib.MessageFields;
-    readonly properties: amqplib.MessageProperties;
+    readonly channel: Channel;
+    readonly message: ConsumeMessage;
     readonly content: any;
     readonly headers: Record<string, any>;
     /**
@@ -25,10 +27,15 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
      * @param init the context options
      */
     constructor(init: RabbitmqContext.Initiator);
+    get properties(): import("amqplib").MessageProperties;
+    get fields(): import("amqplib").ConsumeMessageFields;
+    ack(): void;
+    nack(): void;
 }
 export declare namespace RabbitmqContext {
     interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol' | 'documentNode'> {
         adapter: RabbitmqAdapter;
+        channel: Channel;
         controller?: RpcController;
         controllerInstance?: any;
         operation?: RpcOperation;
@@ -36,7 +43,6 @@ export declare namespace RabbitmqContext {
         content: any;
         headers: Record<string, any>;
         queue: string;
-        fields: amqplib.MessageFields;
-        properties: amqplib.MessageProperties;
+        message: ConsumeMessage;
     }
 }