@opra/rabbitmq 1.19.7 → 1.21.0

package/cjs/config-builder.js

@@ -14,7 +14,7 @@ class ConfigBuilder {
         this.handlerArgs = [];
         this._prepareConnectionOptions();
         /** Initialize consumers */
-        for (const controller of this.document.mqApi.controllers.values()) {
+        for (const controller of this.document.getMqApi().controllers.values()) {
             let instance = controller.instance;
             if (!instance && controller.ctor)
                 instance = new controller.ctor();

package/cjs/rabbitmq-adapter.js

@@ -36,7 +36,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
         this._controllerInstances = new Map();
         this._consumers = [];
         this._status = 'idle';
-        this.protocol = 'mq';
+        this.transform = 'mq';
         this.platform = RabbitmqAdapter.PlatformName;
         this._document = document;
         this._config = config;
@@ -56,7 +56,7 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
         });
     }
     get api() {
-        return this.document.mqApi;
+        return this.document.getMqApi();
     }
     get connection() {
         return this._connection;
@@ -152,18 +152,17 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
     _createHandler(args) {
         const { controller, instance, operation } = args;
         /** Prepare parsers */
-        const decodePayload = operation.payloadType?.generateCodec('decode', {
+        const decodePayload = operation.generateCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
+            ignoreReadonlyFields: true,
         });
         operation.headers.forEach(header => {
             let decode = this[core_1.kAssetCache].get(header, 'decode');
             if (!decode) {
-                decode =
-                    header.type?.generateCodec('decode', {
-                        scope: this.scope,
-                        ignoreReadonlyFields: true,
-                    }) || valgen_1.vg.isAny();
+                decode = header.generateCodec('decode', {
+                    scope: this.scope,
+                    ignoreReadonlyFields: true,
+                });
                 this[core_1.kAssetCache].set(header, 'decode', decode);
             }
         });
@@ -181,12 +180,11 @@ class RabbitmqAdapter extends core_1.PlatformAdapter {
             const headers = {};
             /** Create context */
             const context = new rabbitmq_context_js_1.RabbitmqContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
+                __adapter: this,
+                __contDef: controller,
+                __controller: instance,
+                __oprDef: operation,
+                __handler: operationHandler,
                 queue,
                 consumer,
                 message,

package/cjs/rabbitmq-context.js

@@ -14,21 +14,20 @@ class RabbitmqContext extends core_1.ExecutionContext {
     constructor(init) {
         super({
             ...init,
-            document: init.adapter.document,
-            documentNode: init.controller?.node,
-            protocol: 'mq',
+            __docNode: init.__oprDef?.node ||
+                init.__contDef?.node ||
+                init.__adapter.document.node,
+            transport: 'mq',
+            platform: 'rabbitmq',
         });
-        this.adapter = init.adapter;
-        this.platform = init.adapter.platform;
-        this.protocol = 'mq';
-        if (init.controller)
-            this.controller = init.controller;
-        if (init.controllerInstance)
-            this.controllerInstance = init.controllerInstance;
-        if (init.operation)
-            this.operation = init.operation;
-        if (init.operationHandler)
-            this.operationHandler = init.operationHandler;
+        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;

package/esm/config-builder.js

@@ -11,7 +11,7 @@ export class ConfigBuilder {
         this.handlerArgs = [];
         this._prepareConnectionOptions();
         /** Initialize consumers */
-        for (const controller of this.document.mqApi.controllers.values()) {
+        for (const controller of this.document.getMqApi().controllers.values()) {
             let instance = controller.instance;
             if (!instance && controller.ctor)
                 instance = new controller.ctor();

package/esm/rabbitmq-adapter.js

@@ -32,7 +32,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
         this._controllerInstances = new Map();
         this._consumers = [];
         this._status = 'idle';
-        this.protocol = 'mq';
+        this.transform = 'mq';
         this.platform = RabbitmqAdapter.PlatformName;
         this._document = document;
         this._config = config;
@@ -52,7 +52,7 @@ export class RabbitmqAdapter extends PlatformAdapter {
         });
     }
     get api() {
-        return this.document.mqApi;
+        return this.document.getMqApi();
     }
     get connection() {
         return this._connection;
@@ -148,18 +148,17 @@ export class RabbitmqAdapter extends PlatformAdapter {
     _createHandler(args) {
         const { controller, instance, operation } = args;
         /** Prepare parsers */
-        const decodePayload = operation.payloadType?.generateCodec('decode', {
+        const decodePayload = operation.generateCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
+            ignoreReadonlyFields: true,
         });
         operation.headers.forEach(header => {
             let decode = this[kAssetCache].get(header, 'decode');
             if (!decode) {
-                decode =
-                    header.type?.generateCodec('decode', {
-                        scope: this.scope,
-                        ignoreReadonlyFields: true,
-                    }) || vg.isAny();
+                decode = header.generateCodec('decode', {
+                    scope: this.scope,
+                    ignoreReadonlyFields: true,
+                });
                 this[kAssetCache].set(header, 'decode', decode);
             }
         });
@@ -177,12 +176,11 @@ export class RabbitmqAdapter extends PlatformAdapter {
             const headers = {};
             /** Create context */
             const context = new RabbitmqContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
+                __adapter: this,
+                __contDef: controller,
+                __controller: instance,
+                __oprDef: operation,
+                __handler: operationHandler,
                 queue,
                 consumer,
                 message,

package/esm/rabbitmq-context.js

@@ -11,21 +11,20 @@ export class RabbitmqContext extends ExecutionContext {
     constructor(init) {
         super({
             ...init,
-            document: init.adapter.document,
-            documentNode: init.controller?.node,
-            protocol: 'mq',
+            __docNode: init.__oprDef?.node ||
+                init.__contDef?.node ||
+                init.__adapter.document.node,
+            transport: 'mq',
+            platform: 'rabbitmq',
         });
-        this.adapter = init.adapter;
-        this.platform = init.adapter.platform;
-        this.protocol = 'mq';
-        if (init.controller)
-            this.controller = init.controller;
-        if (init.controllerInstance)
-            this.controllerInstance = init.controllerInstance;
-        if (init.operation)
-            this.operation = init.operation;
-        if (init.operationHandler)
-            this.operationHandler = init.operationHandler;
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/rabbitmq",
-  "version": "1.19.7",
+  "version": "1.21.0",
   "description": "Opra RabbitMQ adapter",
   "author": "Panates",
   "license": "MIT",
@@ -14,8 +14,8 @@
     "valgen": "^5.18.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.19.7",
-    "@opra/core": "^1.19.7",
+    "@opra/common": "^1.21.0",
+    "@opra/core": "^1.21.0",
     "rabbitmq-client": ">=5.0.0 <6"
   },
   "type": "module",

package/types/rabbitmq-adapter.d.ts

@@ -15,7 +15,7 @@ export declare class RabbitmqAdapter extends PlatformAdapter<RabbitmqAdapter.Eve
     protected _connection?: rabbit.Connection;
     protected _consumers: rabbit.Consumer[];
     protected _status: RabbitmqAdapter.Status;
-    readonly protocol: OpraSchema.Transport;
+    readonly transform: OpraSchema.Transport;
     readonly platform = "rabbitmq";
     readonly interceptors: (RabbitmqAdapter.InterceptorFunction | RabbitmqAdapter.IRabbitmqInterceptor)[];
     /**

package/types/rabbitmq-context.d.ts

@@ -1,4 +1,4 @@
-import { MQController, MQOperation, OpraSchema } from '@opra/common';
+import { MQController, MQOperation } from '@opra/common';
 import { ExecutionContext } from '@opra/core';
 import type { AsyncEventEmitter } from 'node-events-async';
 import * as rabbit from 'rabbitmq-client';
@@ -8,13 +8,11 @@ import type { RabbitmqAdapter } from './rabbitmq-adapter';
  * It extends the ExecutionContext and implements the AsyncEventEmitter.
  */
 export declare class RabbitmqContext extends ExecutionContext implements AsyncEventEmitter {
-    readonly protocol: OpraSchema.Transport;
-    readonly platform: string;
-    readonly adapter: RabbitmqAdapter;
-    readonly controller?: MQController;
-    readonly controllerInstance?: any;
-    readonly operation?: MQOperation;
-    readonly operationHandler?: Function;
+    readonly __contDef: MQController;
+    readonly __oprDef: MQOperation;
+    readonly __controller: any;
+    readonly __handler?: Function;
+    readonly __adapter: RabbitmqAdapter;
     readonly queue: string;
     readonly consumer: rabbit.Consumer;
     readonly message: rabbit.AsyncMessage;
@@ -28,13 +26,13 @@ export declare class RabbitmqContext extends ExecutionContext implements AsyncEv
     constructor(init: RabbitmqContext.Initiator);
 }
 export declare namespace RabbitmqContext {
-    interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol' | 'documentNode'> {
-        adapter: RabbitmqAdapter;
+    interface Initiator extends Omit<ExecutionContext.Initiator, '__adapter' | 'transport' | 'platform' | '__docNode'> {
+        __adapter: RabbitmqAdapter;
+        __contDef?: MQController;
+        __controller?: any;
+        __oprDef?: MQOperation;
+        __handler?: Function;
         consumer: rabbit.Consumer;
-        controller?: MQController;
-        controllerInstance?: any;
-        operation?: MQOperation;
-        operationHandler?: Function;
         content: any;
         headers: Record<string, any>;
         queue: string;