@opra/rabbitmq 1.21.0 → 1.22.1

package/{esm/config-builder.js → config-builder.js}

@@ -2,6 +2,8 @@ import { merge } from '@jsopen/objects';
 import { MQ_CONTROLLER_METADATA, } from '@opra/common';
 import { RMQ_OPERATION_METADATA, RMQ_OPERATION_METADATA_RESOLVER, } from './constants.js';
 export class ConfigBuilder {
+    document;
+    config;
     constructor(document, config) {
         this.document = document;
         this.config = config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.21.0",
+  "version": "1.22.1",
   "description": "Opra RabbitMQ adapter",
   "author": "Panates",
   "license": "MIT",
@@ -8,50 +8,34 @@
     "@jsopen/objects": "^2.0.2",
     "@browsery/type-is": "^2.0.1",
     "content-type": "^1.0.5",
-    "iconv-lite": "^0.7.0",
-    "node-events-async": "^1.2.0",
+    "iconv-lite": "^0.7.1",
+    "node-events-async": "^1.5.0",
     "tslib": "^2.8.1",
     "valgen": "^5.18.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.21.0",
-    "@opra/core": "^1.21.0",
+    "@opra/common": "^1.22.1",
+    "@opra/core": "^1.22.1",
     "rabbitmq-client": ">=5.0.0 <6"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/panates/opra.git",
     "directory": "packages/rabbitmq"
   },
-  "engines": {
-    "node": ">=16.0",
-    "npm": ">=7.0.0"
-  },
-  "files": [
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "opra",
     "rabbitmq",

package/{esm/rabbitmq-adapter.js → rabbitmq-adapter.js}

@@ -21,6 +21,15 @@ const noOp = () => undefined;
  * @class RabbitmqAdapter
  */
 export class RabbitmqAdapter extends PlatformAdapter {
+    static PlatformName = 'rabbitmq';
+    _config;
+    _controllerInstances = new Map();
+    _connection;
+    _consumers = [];
+    _status = 'idle';
+    transform = 'mq';
+    platform = RabbitmqAdapter.PlatformName;
+    interceptors;
     /**
      *
      * @param document
@@ -29,11 +38,6 @@ export class RabbitmqAdapter extends PlatformAdapter {
      */
     constructor(document, config) {
         super(config);
-        this._controllerInstances = new Map();
-        this._consumers = [];
-        this._status = 'idle';
-        this.transform = 'mq';
-        this.platform = RabbitmqAdapter.PlatformName;
         this._document = document;
         this._config = config;
         if (!(this.document.api instanceof MQApi &&
@@ -299,4 +303,3 @@ export class RabbitmqAdapter extends PlatformAdapter {
         return wrappedErrors;
     }
 }
-RabbitmqAdapter.PlatformName = 'rabbitmq';

package/{esm/rabbitmq-context.js → rabbitmq-context.js}

@@ -4,6 +4,12 @@ import { ExecutionContext } from '@opra/core';
  * It extends the ExecutionContext and implements the AsyncEventEmitter.
  */
 export class RabbitmqContext extends ExecutionContext {
+    queue;
+    consumer;
+    message;
+    content;
+    headers;
+    reply;
     /**
      * Constructor
      * @param init the context options

package/cjs/augmentation/opra-common.augmentation.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("@opra/core");
-const common_1 = require("@opra/common");
-const constants_js_1 = require("../constants.js");
-/** Implementation **/
-common_1.classes.MQOperationDecoratorFactory.augment((decorator, decoratorChain) => {
-    decorator.RabbitMQ = (config) => {
-        decoratorChain.push((_, target, propertyKey) => {
-            if (typeof config === 'function') {
-                Reflect.defineMetadata(constants_js_1.RMQ_OPERATION_METADATA_RESOLVER, config, target, propertyKey);
-            }
-            else {
-                Reflect.defineMetadata(constants_js_1.RMQ_OPERATION_METADATA, { ...config }, target, propertyKey);
-            }
-        });
-        return decorator;
-    };
-});

package/cjs/config-builder.js

@@ -1,88 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConfigBuilder = void 0;
-const objects_1 = require("@jsopen/objects");
-const common_1 = require("@opra/common");
-const constants_js_1 = require("./constants.js");
-class ConfigBuilder {
-    constructor(document, config) {
-        this.document = document;
-        this.config = config;
-    }
-    async build() {
-        this.controllerInstances = new Map();
-        this.handlerArgs = [];
-        this._prepareConnectionOptions();
-        /** Initialize consumers */
-        for (const controller of this.document.getMqApi().controllers.values()) {
-            let instance = controller.instance;
-            if (!instance && controller.ctor)
-                instance = new controller.ctor();
-            if (!instance)
-                continue;
-            this.controllerInstances.set(controller, instance);
-            /** Build HandlerData array */
-            for (const operation of controller.operations.values()) {
-                const consumerConfig = await this._getConsumerConfig(controller, instance, operation);
-                if (!consumerConfig)
-                    continue;
-                const args = {
-                    // consumer: null as any,
-                    controller,
-                    instance,
-                    operation,
-                    consumerConfig,
-                    // handler: null as any,
-                    topics: (Array.isArray(operation.channel)
-                        ? operation.channel
-                        : [operation.channel]).map(String),
-                };
-                this.handlerArgs.push(args);
-            }
-        }
-    }
-    _prepareConnectionOptions() {
-        this.connectionOptions = {};
-        if (Array.isArray(this.config.connection))
-            this.connectionOptions.urls = this.config.connection;
-        else if (typeof this.config.connection === 'object') {
-            (0, objects_1.merge)(this.connectionOptions, this.config.connection, { deep: true });
-        }
-        else
-            this.connectionOptions.urls = [
-                this.config.connection || 'amqp://guest:guest@localhost:5672',
-            ];
-    }
-    /**
-     *
-     * @param controller
-     * @param instance
-     * @param operation
-     * @protected
-     */
-    async _getConsumerConfig(controller, instance, operation) {
-        if (typeof instance[operation.name] !== 'function')
-            return;
-        const proto = controller.ctor?.prototype || Object.getPrototypeOf(instance);
-        if (Reflect.hasMetadata(common_1.MQ_CONTROLLER_METADATA, proto, operation.name))
-            return;
-        const operationConfig = {};
-        if (this.config.defaults) {
-            if (this.config.defaults.consumer) {
-                (0, objects_1.merge)(operationConfig, this.config.defaults.consumer, { deep: true });
-            }
-        }
-        let metadata = Reflect.getMetadata(constants_js_1.RMQ_OPERATION_METADATA, proto, operation.name);
-        if (!metadata) {
-            const configResolver = Reflect.getMetadata(constants_js_1.RMQ_OPERATION_METADATA_RESOLVER, proto, operation.name);
-            if (configResolver) {
-                metadata = await configResolver();
-            }
-        }
-        if (metadata && typeof metadata === 'object') {
-            (0, objects_1.merge)(operationConfig, metadata, { deep: true });
-        }
-        return operationConfig;
-    }
-}
-exports.ConfigBuilder = ConfigBuilder;

package/cjs/constants.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RMQ_OPERATION_METADATA_RESOLVER = exports.RMQ_OPERATION_METADATA = exports.RMQ_DEFAULT_GROUP = void 0;
-exports.RMQ_DEFAULT_GROUP = 'default';
-exports.RMQ_OPERATION_METADATA = 'RMQ_OPERATION_METADATA';
-exports.RMQ_OPERATION_METADATA_RESOLVER = 'RMQ_OPERATION_METADATA_RESOLVER';

package/cjs/index.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-require("./augmentation/opra-common.augmentation.js");
-tslib_1.__exportStar(require("./constants.js"), exports);
-tslib_1.__exportStar(require("./rabbitmq-adapter.js"), exports);
-tslib_1.__exportStar(require("./rabbitmq-context.js"), exports);

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/cjs/rabbitmq-adapter.js

@@ -1,307 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RabbitmqAdapter = void 0;
-const tslib_1 = require("tslib");
-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 content_type_1 = require("content-type");
-const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
-const rabbit = tslib_1.__importStar(require("rabbitmq-client"));
-const util_1 = require("util");
-const valgen_1 = require("valgen");
-const config_builder_js_1 = require("./config-builder.js");
-const rabbitmq_context_js_1 = require("./rabbitmq-context.js");
-const gunzipAsync = (0, util_1.promisify)(node_zlib_1.default.gunzip);
-const deflateAsync = (0, util_1.promisify)(node_zlib_1.default.deflate);
-const inflateAsync = (0, util_1.promisify)(node_zlib_1.default.inflate);
-const brotliAsync = (0, util_1.promisify)(node_zlib_1.default.brotliCompress);
-const globalErrorTypes = ['unhandledRejection', 'uncaughtException'];
-const signalTraps = ['SIGTERM', 'SIGINT', 'SIGUSR2'];
-const noOp = () => undefined;
-/**
- *
- * @class RabbitmqAdapter
- */
-class RabbitmqAdapter extends core_1.PlatformAdapter {
-    /**
-     *
-     * @param document
-     * @param config
-     * @constructor
-     */
-    constructor(document, config) {
-        super(config);
-        this._controllerInstances = new Map();
-        this._consumers = [];
-        this._status = 'idle';
-        this.transform = 'mq';
-        this.platform = RabbitmqAdapter.PlatformName;
-        this._document = document;
-        this._config = config;
-        if (!(this.document.api instanceof common_1.MQApi &&
-            this.document.api.platform === RabbitmqAdapter.PlatformName)) {
-            throw new TypeError(`The document doesn't expose a RabbitMQ Api`);
-        }
-        this.interceptors = [...(config.interceptors || [])];
-        globalErrorTypes.forEach(type => {
-            process.on(type, e => {
-                this._emitError(e);
-                return this.close();
-            });
-        });
-        signalTraps.forEach(type => {
-            process.once(type, () => this.close());
-        });
-    }
-    get api() {
-        return this.document.getMqApi();
-    }
-    get connection() {
-        return this._connection;
-    }
-    get scope() {
-        return this._config.scope;
-    }
-    get status() {
-        return this._status;
-    }
-    /**
-     * Starts the service
-     */
-    async start() {
-        if (this.status !== 'idle')
-            return;
-        this._status = 'starting';
-        // const handlerArgs: HandlerArguments[] = [];
-        const configBuilder = new config_builder_js_1.ConfigBuilder(this.document, this._config);
-        await configBuilder.build();
-        this._connection = new rabbit.Connection(configBuilder.connectionOptions);
-        try {
-            /** Establish connection */
-            await this._connection.onConnect().catch(e => {
-                e.message = `RabbitMQ connection error. ${e.message}`;
-                throw e;
-            });
-            this.logger?.info?.(`Connected RabbitMQ at ${configBuilder.connectionOptions.urls}`);
-            /** Subscribe to queues */
-            const promises = [];
-            for (const args of configBuilder.handlerArgs) {
-                for (const queue of args.topics) {
-                    const handler = this._createHandler(args);
-                    promises.push(new Promise((resolve, reject) => {
-                        const consumer = this._connection.createConsumer({
-                            ...args.consumerConfig,
-                            queueOptions: {
-                                ...args.consumerConfig.queueOptions,
-                                durable: args.consumerConfig.queueOptions?.durable ?? true,
-                            },
-                            queue,
-                        }, async (msg, reply) => {
-                            await this.emitAsync('message', msg, queue).catch(noOp);
-                            try {
-                                await handler(consumer, queue, msg, reply);
-                            }
-                            catch (e) {
-                                this._emitError(e);
-                            }
-                        });
-                        this._consumers.push(consumer);
-                        consumer.on('ready', () => {
-                            this.logger?.info?.(`Subscribed to topic "${queue}"`);
-                            resolve();
-                        });
-                        consumer.on('error', (err) => {
-                            err.message = `Consumer error (${queue})". ${err.message}`;
-                            err.queue = queue;
-                            reject(err);
-                        });
-                    }));
-                }
-            }
-            await Promise.all(promises);
-            this._status = 'started';
-        }
-        catch (err) {
-            this._emitError(err);
-            await this.close();
-        }
-    }
-    /**
-     * Closes all connections and stops the service
-     */
-    async close() {
-        if (this._consumers.length)
-            await Promise.allSettled(this._consumers.map(consumer => consumer.close()));
-        await this._connection?.close();
-        this._connection = undefined;
-        this._consumers = [];
-        this._controllerInstances.clear();
-        this._status = 'idle';
-    }
-    getControllerInstance(controllerPath) {
-        const controller = this.api.findController(controllerPath);
-        return controller && this._controllerInstances.get(controller);
-    }
-    /**
-     *
-     * @param args
-     * @protected
-     */
-    _createHandler(args) {
-        const { controller, instance, operation } = args;
-        /** Prepare parsers */
-        const decodePayload = operation.generateCodec('decode', {
-            scope: this.scope,
-            ignoreReadonlyFields: true,
-        });
-        operation.headers.forEach(header => {
-            let decode = this[core_1.kAssetCache].get(header, 'decode');
-            if (!decode) {
-                decode = header.generateCodec('decode', {
-                    scope: this.scope,
-                    ignoreReadonlyFields: true,
-                });
-                this[core_1.kAssetCache].set(header, 'decode', decode);
-            }
-        });
-        return async (consumer, queue, message, _reply) => {
-            if (!message)
-                return;
-            const operationHandler = instance[operation.name];
-            let replyCalled = false;
-            const reply = async (body, envelope) => {
-                if (replyCalled)
-                    return;
-                replyCalled = true;
-                return _reply(body, envelope);
-            };
-            const headers = {};
-            /** Create context */
-            const context = new rabbitmq_context_js_1.RabbitmqContext({
-                __adapter: this,
-                __contDef: controller,
-                __controller: instance,
-                __oprDef: operation,
-                __handler: operationHandler,
-                queue,
-                consumer,
-                message,
-                content: undefined,
-                headers,
-                reply,
-            });
-            try {
-                /** Parse and decode `payload` */
-                let content = await this._parseContent(message);
-                if (content && decodePayload) {
-                    if (Buffer.isBuffer(content))
-                        content = content.toString('utf-8');
-                    content = decodePayload(content);
-                }
-                // message.properties.
-                /** Parse and decode `headers` */
-                if (message.headers) {
-                    for (const [k, v] of Object.entries(message.headers)) {
-                        const header = operation.findHeader(k);
-                        const decode = this[core_1.kAssetCache].get(header, 'decode') || valgen_1.vg.isAny();
-                        headers[k] = decode(Buffer.isBuffer(v) ? v.toString() : v);
-                    }
-                }
-                context.content = content;
-            }
-            catch (e) {
-                this._emitError(e, context);
-                return;
-            }
-            await this.emitAsync('execute', context).catch(noOp);
-            try {
-                /** Call operation handler */
-                const result = await operationHandler.call(instance, context);
-                if (result !== undefined)
-                    await reply(result);
-                await this.emitAsync('finish', context, result).catch(noOp);
-            }
-            catch (e) {
-                this._emitError(e, context);
-            }
-        };
-    }
-    async _parseContent(msg) {
-        if (!Buffer.isBuffer(msg.body))
-            return msg.body;
-        if (!msg.body?.length)
-            return;
-        let content = msg.body;
-        if (msg.contentEncoding) {
-            switch (msg.contentEncoding) {
-                case 'gzip':
-                case 'x-gzip': {
-                    content = await gunzipAsync(content);
-                    break;
-                }
-                case 'deflate':
-                case 'x-deflate': {
-                    content = await deflateAsync(content);
-                    break;
-                }
-                case 'inflate':
-                case 'x-inflate': {
-                    content = await inflateAsync(content);
-                    break;
-                }
-                case 'br': {
-                    content = await brotliAsync(content);
-                    break;
-                }
-                case 'base64': {
-                    content = content.toString('base64');
-                    break;
-                }
-            }
-        }
-        const mediaType = msg.contentType
-            ? (0, content_type_1.parse)(msg.contentType || '')
-            : undefined;
-        if (mediaType && type_is_1.default.is(mediaType.type, ['json', 'xml', 'txt'])) {
-            const charset = (mediaType.parameters.charset || '').toLowerCase() || 'utf-8';
-            content = iconv_lite_1.default.decode(content, charset);
-            if (type_is_1.default.is(mediaType.type, ['json']))
-                return JSON.parse(content);
-        }
-        return content;
-    }
-    _emitError(error, context) {
-        Promise.resolve()
-            .then(async () => {
-            const logger = this.logger;
-            if (context) {
-                if (!context.errors.length)
-                    context.errors.push(error);
-                context.errors = this._wrapExceptions(context.errors);
-                if (context.listenerCount('error')) {
-                    await context
-                        .emitAsync('error', context.errors[0], context)
-                        .catch(noOp);
-                }
-                if (logger?.error) {
-                    context.errors.forEach(err => logger.error(err));
-                }
-            }
-            else
-                logger?.error(error);
-            if (this.listenerCount('error'))
-                this._emitError(error, context);
-        })
-            .catch(noOp);
-    }
-    _wrapExceptions(exceptions) {
-        const wrappedErrors = exceptions.map(e => e instanceof common_1.OpraException ? e : new common_1.OpraException(e));
-        if (!wrappedErrors.length)
-            wrappedErrors.push(new common_1.OpraException('Internal Server Error'));
-        return wrappedErrors;
-    }
-}
-exports.RabbitmqAdapter = RabbitmqAdapter;
-RabbitmqAdapter.PlatformName = 'rabbitmq';

package/cjs/rabbitmq-context.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RabbitmqContext = void 0;
-const core_1 = require("@opra/core");
-/**
- * RabbitmqContext class provides the context for handling RabbitMQ messages.
- * It extends the ExecutionContext and implements the AsyncEventEmitter.
- */
-class RabbitmqContext extends core_1.ExecutionContext {
-    /**
-     * Constructor
-     * @param init the context options
-     */
-    constructor(init) {
-        super({
-            ...init,
-            __docNode: init.__oprDef?.node ||
-                init.__contDef?.node ||
-                init.__adapter.document.node,
-            transport: 'mq',
-            platform: 'rabbitmq',
-        });
-        if (init.__contDef)
-            this.__contDef = init.__contDef;
-        if (init.__oprDef)
-            this.__oprDef = init.__oprDef;
-        if (init.__controller)
-            this.__controller = init.__controller;
-        if (init.__handler)
-            this.__handler = init.__handler;
-        this.consumer = init.consumer;
-        this.queue = init.queue;
-        this.message = init.message;
-        this.headers = init.headers || {};
-        this.content = init.content;
-        this.reply = init.reply;
-    }
-}
-exports.RabbitmqContext = RabbitmqContext;

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}

package/types/index.d.cts

@@ -1,4 +0,0 @@
-import './augmentation/opra-common.augmentation.js';
-export * from './constants.js';
-export * from './rabbitmq-adapter.js';
-export * from './rabbitmq-context.js';