@opra/rabbitmq 1.15.1 → 1.16.0

package/cjs/rabbitmq-adapter.js

@@ -6,7 +6,7 @@ const node_zlib_1 = tslib_1.__importDefault(require("node:zlib"));
 const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const core_1 = require("@opra/core");
-const amqplib_1 = tslib_1.__importDefault(require("amqplib"));
+const amqp_connection_manager_1 = require("amqp-connection-manager");
 const content_type_1 = require("content-type");
 const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
 const util_1 = require("util");
@@ -34,7 +34,6 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
     constructor(document, config) {
         super(config);
         this._controllerInstances = new Map();
-        this._connections = [];
         this._status = 'idle';
         this.protocol = 'rpc';
         this.platform = RabbitmqAdapter.PlatformName;
@@ -102,54 +101,54 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
                     handlerArgs.push(args);
                 }
             }
-            /** Connect to server */
-            for (const connectionOptions of this._config.connection) {
-                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
-                    : connectionOptions;
-                this.logger?.info?.(`Connected to ${hostname}`);
-                /** Subscribe to channels */
-                for (const args of handlerArgs) {
-                    /** Create channel per operation */
-                    const channel = await connection.createChannel();
-                    for (const topic of args.topics) {
-                        const opts = this._config.queues?.[topic];
-                        if (opts)
-                            await channel.assertQueue(topic, opts);
+            const connectionOptions = typeof this._config.connection === 'string'
+                ? {
+                    urls: [this._config.connection],
+                }
+                : Array.isArray(this._config.connection)
+                    ? {
+                        urls: this._config.connection,
                     }
-                    for (const topic of args.topics) {
-                        await channel.assertQueue(topic);
-                        await channel
-                            .consume(topic, async (msg) => {
-                            if (!msg)
-                                return;
-                            await this.emitAsync('message', msg, topic).catch(noOp);
-                            try {
-                                await args.handler(channel, topic, msg);
-                            }
-                            catch (e) {
-                                this._emitError(e);
-                            }
-                        }, 
-                        /** Consume options */
-                        args.operationConfig.consumer)
-                            .catch(e => {
+                    : this._config.connection;
+            this._client = new amqp_connection_manager_1.AmqpConnectionManagerClass(connectionOptions.urls, connectionOptions);
+            this._client.connect().catch(e => {
+                e.message =
+                    'Unable to connect to RabbitMQ server at ' +
+                        connectionOptions.urls +
+                        '. ' +
+                        e.message;
+                throw e;
+            });
+            this.logger?.info?.(`Connected RabbitMQ at ${connectionOptions.urls}`);
+            for (const args of handlerArgs) {
+                /** Create channel per operation */
+                const channel = this._client.createChannel();
+                for (const topic of args.topics) {
+                    const opts = this._config.queues?.[topic];
+                    if (opts)
+                        await channel.assertQueue(topic, opts);
+                }
+                for (const topic of args.topics) {
+                    await channel.assertQueue(topic);
+                    await channel
+                        .consume(topic, async (msg) => {
+                        if (!msg)
+                            return;
+                        await this.emitAsync('message', msg, topic).catch(noOp);
+                        try {
+                            await args.handler(channel, topic, msg);
+                        }
+                        catch (e) {
                             this._emitError(e);
-                            throw e;
-                        });
-                        this.logger?.info?.(`Subscribed to topic${args.topics.length > 1 ? 's' : ''} "${args.topics}"`);
-                    }
+                        }
+                    }, 
+                    /** Consume options */
+                    args.operationConfig.consumer)
+                        .catch(e => {
+                        this._emitError(e);
+                        throw e;
+                    });
+                    this.logger?.info?.(`Subscribed to topic${args.topics.length > 1 ? 's' : ''} "${args.topics}"`);
                 }
             }
             this._status = 'started';
@@ -163,8 +162,8 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
      * Closes all connections and stops the service
      */
     async close() {
-        await Promise.all(this._connections.map(c => c.close()));
-        this._connections = [];
+        await this._client?.close();
+        this._client = undefined;
         this._controllerInstances.clear();
         this._status = 'idle';
     }
@@ -187,7 +186,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             return;
         const operationConfig = {
             consumer: {
-                noAck: false,
+                noAck: true,
             },
         };
         if (this._config.defaults) {

package/esm/rabbitmq-adapter.js

@@ -2,7 +2,7 @@ import zlib from 'node:zlib';
 import typeIs from '@browsery/type-is';
 import { OpraException, RPC_CONTROLLER_METADATA, RpcApi, } from '@opra/common';
 import { kAssetCache, PlatformAdapter } from '@opra/core';
-import amqplib from 'amqplib';
+import { AmqpConnectionManagerClass, } from 'amqp-connection-manager';
 import { parse as parseContentType } from 'content-type';
 import iconv from 'iconv-lite';
 import { promisify } from 'util';
@@ -30,7 +30,6 @@ export class RabbitmqAdapter extends PlatformAdapter {
     constructor(document, config) {
         super(config);
         this._controllerInstances = new Map();
-        this._connections = [];
         this._status = 'idle';
         this.protocol = 'rpc';
         this.platform = RabbitmqAdapter.PlatformName;
@@ -98,54 +97,54 @@ export class RabbitmqAdapter extends PlatformAdapter {
                     handlerArgs.push(args);
                 }
             }
-            /** Connect to server */
-            for (const connectionOptions of this._config.connection) {
-                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
-                    : connectionOptions;
-                this.logger?.info?.(`Connected to ${hostname}`);
-                /** Subscribe to channels */
-                for (const args of handlerArgs) {
-                    /** Create channel per operation */
-                    const channel = await connection.createChannel();
-                    for (const topic of args.topics) {
-                        const opts = this._config.queues?.[topic];
-                        if (opts)
-                            await channel.assertQueue(topic, opts);
+            const connectionOptions = typeof this._config.connection === 'string'
+                ? {
+                    urls: [this._config.connection],
+                }
+                : Array.isArray(this._config.connection)
+                    ? {
+                        urls: this._config.connection,
                     }
-                    for (const topic of args.topics) {
-                        await channel.assertQueue(topic);
-                        await channel
-                            .consume(topic, async (msg) => {
-                            if (!msg)
-                                return;
-                            await this.emitAsync('message', msg, topic).catch(noOp);
-                            try {
-                                await args.handler(channel, topic, msg);
-                            }
-                            catch (e) {
-                                this._emitError(e);
-                            }
-                        }, 
-                        /** Consume options */
-                        args.operationConfig.consumer)
-                            .catch(e => {
+                    : this._config.connection;
+            this._client = new AmqpConnectionManagerClass(connectionOptions.urls, connectionOptions);
+            this._client.connect().catch(e => {
+                e.message =
+                    'Unable to connect to RabbitMQ server at ' +
+                        connectionOptions.urls +
+                        '. ' +
+                        e.message;
+                throw e;
+            });
+            this.logger?.info?.(`Connected RabbitMQ at ${connectionOptions.urls}`);
+            for (const args of handlerArgs) {
+                /** Create channel per operation */
+                const channel = this._client.createChannel();
+                for (const topic of args.topics) {
+                    const opts = this._config.queues?.[topic];
+                    if (opts)
+                        await channel.assertQueue(topic, opts);
+                }
+                for (const topic of args.topics) {
+                    await channel.assertQueue(topic);
+                    await channel
+                        .consume(topic, async (msg) => {
+                        if (!msg)
+                            return;
+                        await this.emitAsync('message', msg, topic).catch(noOp);
+                        try {
+                            await args.handler(channel, topic, msg);
+                        }
+                        catch (e) {
                             this._emitError(e);
-                            throw e;
-                        });
-                        this.logger?.info?.(`Subscribed to topic${args.topics.length > 1 ? 's' : ''} "${args.topics}"`);
-                    }
+                        }
+                    }, 
+                    /** Consume options */
+                    args.operationConfig.consumer)
+                        .catch(e => {
+                        this._emitError(e);
+                        throw e;
+                    });
+                    this.logger?.info?.(`Subscribed to topic${args.topics.length > 1 ? 's' : ''} "${args.topics}"`);
                 }
             }
             this._status = 'started';
@@ -159,8 +158,8 @@ export class RabbitmqAdapter extends PlatformAdapter {
      * Closes all connections and stops the service
      */
     async close() {
-        await Promise.all(this._connections.map(c => c.close()));
-        this._connections = [];
+        await this._client?.close();
+        this._client = undefined;
         this._controllerInstances.clear();
         this._status = 'idle';
     }
@@ -183,7 +182,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
             return;
         const operationConfig = {
             consumer: {
-                noAck: false,
+                noAck: true,
             },
         };
         if (this._config.defaults) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.15.1",
+  "version": "1.16.0",
   "description": "Opra RabbitMQ package",
   "author": "Panates",
   "license": "MIT",
@@ -13,8 +13,9 @@
     "valgen": "^5.15.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.15.1",
-    "@opra/core": "^1.15.1",
+    "@opra/common": "^1.16.0",
+    "@opra/core": "^1.16.0",
+    "amqp-connection-manager": "^4.1.14",
     "amqplib": "^0.10.7"
   },
   "type": "module",

package/types/rabbitmq-adapter.d.ts

@@ -1,6 +1,7 @@
 import { ApiDocument, OpraException, OpraSchema, RpcApi, RpcController, RpcOperation } from '@opra/common';
 import { PlatformAdapter } from '@opra/core';
-import amqplib, { Channel } from 'amqplib';
+import { type AmqpConnectionManager, type AmqpConnectionManagerOptions, type ChannelWrapper, type ConnectionUrl } from 'amqp-connection-manager';
+import amqplib from 'amqplib';
 import { ConsumeMessage } from 'amqplib/properties';
 import { RabbitmqContext } from './rabbitmq-context.js';
 export interface OperationConfig {
@@ -12,7 +13,7 @@ interface HandlerArguments {
     instance: any;
     operation: RpcOperation;
     operationConfig: OperationConfig;
-    handler: (channel: Channel, queue: string, msg: ConsumeMessage | null) => void | Promise<void>;
+    handler: (channel: ChannelWrapper, queue: string, msg: ConsumeMessage | null) => void | Promise<void>;
     topics: string[];
 }
 /**
@@ -23,7 +24,7 @@ export declare class RabbitmqAdapter extends PlatformAdapter<RabbitmqAdapter.Eve
     static readonly PlatformName = "rabbitmq";
     protected _config: RabbitmqAdapter.Config;
     protected _controllerInstances: Map<RpcController, any>;
-    protected _connections: amqplib.ChannelModel[];
+    protected _client?: AmqpConnectionManager;
     protected _status: RabbitmqAdapter.Status;
     readonly protocol: OpraSchema.Transport;
     readonly platform = "rabbitmq";
@@ -71,9 +72,11 @@ export declare class RabbitmqAdapter extends PlatformAdapter<RabbitmqAdapter.Eve
 export declare namespace RabbitmqAdapter {
     type NextCallback = () => Promise<any>;
     type Status = 'idle' | 'starting' | 'started';
-    type ConnectionOptions = amqplib.Options.Connect;
+    interface ConnectionOptions extends AmqpConnectionManagerOptions {
+        urls?: ConnectionUrl[];
+    }
     interface Config extends PlatformAdapter.Options {
-        connection: (string | ConnectionOptions)[];
+        connection: string | string[] | ConnectionOptions;
         queues?: Record<string, amqplib.Options.AssertQueue>;
         defaults?: {
             consumer?: amqplib.Options.Consume;

package/types/rabbitmq-context.d.ts

@@ -1,6 +1,6 @@
 import { OpraSchema, RpcController, RpcOperation } from '@opra/common';
 import { ExecutionContext } from '@opra/core';
-import type { Channel } from 'amqplib';
+import type { ChannelWrapper } from 'amqp-connection-manager';
 import type { ConsumeMessage } from 'amqplib/properties';
 import type { AsyncEventEmitter } from 'node-events-async';
 import type { RabbitmqAdapter } from './rabbitmq-adapter';
@@ -18,7 +18,7 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
     readonly operation?: RpcOperation;
     readonly operationHandler?: Function;
     readonly queue: string;
-    readonly channel: Channel;
+    readonly channel: ChannelWrapper;
     readonly message: ConsumeMessage;
     readonly content: any;
     readonly headers: Record<string, any>;
@@ -27,15 +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;
+    get properties(): import("amqplib/properties").MessageProperties;
+    get fields(): import("amqplib/properties").ConsumeMessageFields;
     ack(): void;
     nack(): void;
 }
 export declare namespace RabbitmqContext {
     interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol' | 'documentNode'> {
         adapter: RabbitmqAdapter;
-        channel: Channel;
+        channel: ChannelWrapper;
         controller?: RpcController;
         controllerInstance?: any;
         operation?: RpcOperation;