@opra/rabbitmq 1.19.3 → 1.19.5

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

@@ -4,7 +4,7 @@ require("@opra/core");
 const common_1 = require("@opra/common");
 const constants_js_1 = require("../constants.js");
 /** Implementation **/
-common_1.classes.RpcOperationDecoratorFactory.augment((decorator, decoratorChain) => {
+common_1.classes.MQOperationDecoratorFactory.augment((decorator, decoratorChain) => {
     decorator.RabbitMQ = (config) => {
         decoratorChain.push((_, target, propertyKey) => {
             if (typeof config === 'function') {

package/cjs/config-builder.js

@@ -14,7 +14,7 @@ class ConfigBuilder {
         this.handlerArgs = [];
         this._prepareConnectionOptions();
         /** Initialize consumers */
-        for (const controller of this.document.rpcApi.controllers.values()) {
+        for (const controller of this.document.mqApi.controllers.values()) {
             let instance = controller.instance;
             if (!instance && controller.ctor)
                 instance = new controller.ctor();
@@ -64,7 +64,7 @@ class ConfigBuilder {
         if (typeof instance[operation.name] !== 'function')
             return;
         const proto = controller.ctor?.prototype || Object.getPrototypeOf(instance);
-        if (Reflect.hasMetadata(common_1.RPC_CONTROLLER_METADATA, proto, operation.name))
+        if (Reflect.hasMetadata(common_1.MQ_CONTROLLER_METADATA, proto, operation.name))
             return;
         const operationConfig = {};
         if (this.config.defaults) {

package/cjs/rabbitmq-adapter.js

@@ -36,11 +36,11 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
         this._controllerInstances = new Map();
         this._consumers = [];
         this._status = 'idle';
-        this.protocol = 'rpc';
+        this.protocol = 'mq';
         this.platform = RabbitmqAdapter.PlatformName;
         this._document = document;
         this._config = config;
-        if (!(this.document.api instanceof common_1.RpcApi &&
+        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`);
         }
@@ -56,7 +56,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
         });
     }
     get api() {
-        return this.document.rpcApi;
+        return this.document.mqApi;
     }
     get connection() {
         return this._connection;

package/cjs/rabbitmq-context.js

@@ -16,11 +16,11 @@ class RabbitmqContext extends core_1.ExecutionContext {
             ...init,
             document: init.adapter.document,
             documentNode: init.controller?.node,
-            protocol: 'rpc',
+            protocol: 'mq',
         });
         this.adapter = init.adapter;
         this.platform = init.adapter.platform;
-        this.protocol = 'rpc';
+        this.protocol = 'mq';
         if (init.controller)
             this.controller = init.controller;
         if (init.controllerInstance)

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

@@ -2,7 +2,7 @@ import '@opra/core';
 import { classes } from '@opra/common';
 import { RMQ_OPERATION_METADATA, RMQ_OPERATION_METADATA_RESOLVER, } from '../constants.js';
 /** Implementation **/
-classes.RpcOperationDecoratorFactory.augment((decorator, decoratorChain) => {
+classes.MQOperationDecoratorFactory.augment((decorator, decoratorChain) => {
     decorator.RabbitMQ = (config) => {
         decoratorChain.push((_, target, propertyKey) => {
             if (typeof config === 'function') {

package/esm/config-builder.js

@@ -1,5 +1,5 @@
 import { merge } from '@jsopen/objects';
-import { RPC_CONTROLLER_METADATA, } from '@opra/common';
+import { MQ_CONTROLLER_METADATA, } from '@opra/common';
 import { RMQ_OPERATION_METADATA, RMQ_OPERATION_METADATA_RESOLVER, } from './constants.js';
 export class ConfigBuilder {
     constructor(document, config) {
@@ -11,7 +11,7 @@ export class ConfigBuilder {
         this.handlerArgs = [];
         this._prepareConnectionOptions();
         /** Initialize consumers */
-        for (const controller of this.document.rpcApi.controllers.values()) {
+        for (const controller of this.document.mqApi.controllers.values()) {
             let instance = controller.instance;
             if (!instance && controller.ctor)
                 instance = new controller.ctor();
@@ -61,7 +61,7 @@ export class ConfigBuilder {
         if (typeof instance[operation.name] !== 'function')
             return;
         const proto = controller.ctor?.prototype || Object.getPrototypeOf(instance);
-        if (Reflect.hasMetadata(RPC_CONTROLLER_METADATA, proto, operation.name))
+        if (Reflect.hasMetadata(MQ_CONTROLLER_METADATA, proto, operation.name))
             return;
         const operationConfig = {};
         if (this.config.defaults) {

package/esm/rabbitmq-adapter.js

@@ -1,6 +1,6 @@
 import zlib from 'node:zlib';
 import typeIs from '@browsery/type-is';
-import { OpraException, RpcApi, } from '@opra/common';
+import { MQApi, OpraException, } from '@opra/common';
 import { kAssetCache, PlatformAdapter } from '@opra/core';
 import { parse as parseContentType } from 'content-type';
 import iconv from 'iconv-lite';
@@ -32,11 +32,11 @@ export class RabbitmqAdapter extends PlatformAdapter {
         this._controllerInstances = new Map();
         this._consumers = [];
         this._status = 'idle';
-        this.protocol = 'rpc';
+        this.protocol = 'mq';
         this.platform = RabbitmqAdapter.PlatformName;
         this._document = document;
         this._config = config;
-        if (!(this.document.api instanceof RpcApi &&
+        if (!(this.document.api instanceof MQApi &&
             this.document.api.platform === RabbitmqAdapter.PlatformName)) {
             throw new TypeError(`The document doesn't expose a RabbitMQ Api`);
         }
@@ -52,7 +52,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
         });
     }
     get api() {
-        return this.document.rpcApi;
+        return this.document.mqApi;
     }
     get connection() {
         return this._connection;

package/esm/rabbitmq-context.js

@@ -13,11 +13,11 @@ export class RabbitmqContext extends ExecutionContext {
             ...init,
             document: init.adapter.document,
             documentNode: init.controller?.node,
-            protocol: 'rpc',
+            protocol: 'mq',
         });
         this.adapter = init.adapter;
         this.platform = init.adapter.platform;
-        this.protocol = 'rpc';
+        this.protocol = 'mq';
         if (init.controller)
             this.controller = init.controller;
         if (init.controllerInstance)

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.19.3",
-  "description": "Opra RabbitMQ package",
+  "version": "1.19.5",
+  "description": "Opra RabbitMQ adapter",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@jsopen/objects": "^2.0.1",
-    "@browsery/type-is": "^1.6.18-r8",
+    "@jsopen/objects": "^2.0.2",
+    "@browsery/type-is": "^2.0.1",
     "content-type": "^1.0.5",
-    "iconv-lite": "^0.6.3",
+    "iconv-lite": "^0.7.0",
     "node-events-async": "^1.2.0",
     "tslib": "^2.8.1",
-    "valgen": "^5.18.0"
+    "valgen": "^5.18.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.19.3",
-    "@opra/core": "^1.19.3",
+    "@opra/common": "^1.19.5",
+    "@opra/core": "^1.19.5",
     "rabbitmq-client": ">=5.0.0 <6"
   },
   "type": "module",

package/types/augmentation/opra-common.augmentation.d.ts

@@ -1,7 +1,7 @@
 import '@opra/core';
 import { RabbitmqAdapter } from '../rabbitmq-adapter.js';
 declare module '@opra/common' {
-    interface RpcOperationDecorator {
+    interface MQOperationDecorator {
         RabbitMQ(config: RabbitmqAdapter.ConsumerConfig | (() => RabbitmqAdapter.ConsumerConfig | Promise<RabbitmqAdapter.ConsumerConfig>)): this;
     }
 }

package/types/config-builder.d.ts

@@ -1,10 +1,10 @@
-import { ApiDocument, RpcController, RpcOperation } from '@opra/common';
+import { ApiDocument, MQController, MQOperation } from '@opra/common';
 import type { RabbitmqAdapter } from './rabbitmq-adapter.js';
 export declare class ConfigBuilder {
     readonly document: ApiDocument;
     readonly config: RabbitmqAdapter.Config;
     connectionOptions: RabbitmqAdapter.ConnectionOptions;
-    controllerInstances: Map<RpcController, any>;
+    controllerInstances: Map<MQController, any>;
     handlerArgs: ConfigBuilder.OperationArguments[];
     constructor(document: ApiDocument, config: RabbitmqAdapter.Config);
     build(): Promise<void>;
@@ -16,13 +16,13 @@ export declare class ConfigBuilder {
      * @param operation
      * @protected
      */
-    protected _getConsumerConfig(controller: RpcController, instance: any, operation: RpcOperation): Promise<RabbitmqAdapter.ConsumerConfig | undefined>;
+    protected _getConsumerConfig(controller: MQController, instance: any, operation: MQOperation): Promise<RabbitmqAdapter.ConsumerConfig | undefined>;
 }
 export declare namespace ConfigBuilder {
     interface OperationArguments {
-        controller: RpcController;
+        controller: MQController;
         instance: any;
-        operation: RpcOperation;
+        operation: MQOperation;
         consumerConfig: RabbitmqAdapter.ConsumerConfig;
         topics: string[];
     }

package/types/rabbitmq-adapter.d.ts

@@ -1,4 +1,4 @@
-import { ApiDocument, OpraException, OpraSchema, RpcApi, RpcController } from '@opra/common';
+import { ApiDocument, MQApi, MQController, OpraException, OpraSchema } from '@opra/common';
 import { PlatformAdapter } from '@opra/core';
 import * as rabbit from 'rabbitmq-client';
 import type { Envelope, MessageBody } from 'rabbitmq-client/lib/codec';
@@ -11,7 +11,7 @@ import { RabbitmqContext } from './rabbitmq-context.js';
 export declare class RabbitmqAdapter extends PlatformAdapter<RabbitmqAdapter.Events> {
     static readonly PlatformName = "rabbitmq";
     protected _config: RabbitmqAdapter.Config;
-    protected _controllerInstances: Map<RpcController, any>;
+    protected _controllerInstances: Map<MQController, any>;
     protected _connection?: rabbit.Connection;
     protected _consumers: rabbit.Consumer[];
     protected _status: RabbitmqAdapter.Status;
@@ -25,7 +25,7 @@ export declare class RabbitmqAdapter extends PlatformAdapter<RabbitmqAdapter.Eve
      * @constructor
      */
     constructor(document: ApiDocument, config: RabbitmqAdapter.Config);
-    get api(): RpcApi;
+    get api(): MQApi;
     get connection(): rabbit.Connection | undefined;
     get scope(): string | undefined;
     get status(): RabbitmqAdapter.Status;
@@ -80,9 +80,9 @@ export declare namespace RabbitmqAdapter {
         intercept(context: RabbitmqContext, next: NextCallback): Promise<any>;
     };
     interface Events {
-        error: [Error, RabbitmqContext | undefined];
-        execute: [RabbitmqContext];
-        finish: [RabbitmqContext, any];
-        message: [rabbit.AsyncMessage, string];
+        error: [error: Error, context: RabbitmqContext | undefined];
+        execute: [context: RabbitmqContext];
+        finish: [context: RabbitmqContext, result: any];
+        message: [message: rabbit.AsyncMessage, queue: string];
     }
 }

package/types/rabbitmq-context.d.ts

@@ -1,4 +1,4 @@
-import { OpraSchema, RpcController, RpcOperation } from '@opra/common';
+import { MQController, MQOperation, OpraSchema } from '@opra/common';
 import { ExecutionContext } from '@opra/core';
 import type { AsyncEventEmitter } from 'node-events-async';
 import * as rabbit from 'rabbitmq-client';
@@ -11,9 +11,9 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
     readonly protocol: OpraSchema.Transport;
     readonly platform: string;
     readonly adapter: RabbitmqAdapter;
-    readonly controller?: RpcController;
+    readonly controller?: MQController;
     readonly controllerInstance?: any;
-    readonly operation?: RpcOperation;
+    readonly operation?: MQOperation;
     readonly operationHandler?: Function;
     readonly queue: string;
     readonly consumer: rabbit.Consumer;
@@ -31,9 +31,9 @@ export declare namespace RabbitmqContext {
     interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol' | 'documentNode'> {
         adapter: RabbitmqAdapter;
         consumer: rabbit.Consumer;
-        controller?: RpcController;
+        controller?: MQController;
         controllerInstance?: any;
-        operation?: RpcOperation;
+        operation?: MQOperation;
         operationHandler?: Function;
         content: any;
         headers: Record<string, any>;