@opra/kafka 1.19.7 → 1.20.0

package/cjs/kafka-adapter.js

@@ -29,7 +29,7 @@ class KafkaAdapter extends core_1.PlatformAdapter {
         this._consumers = new Map();
         this._handlerArgs = [];
         this._status = 'idle';
-        this.protocol = 'mq';
+        this.transform = 'mq';
         this.platform = KafkaAdapter.PlatformName;
         this._document = document;
         this._config = config;
@@ -50,7 +50,7 @@ class KafkaAdapter extends core_1.PlatformAdapter {
         });
     }
     get api() {
-        return this.document.mqApi;
+        return this.document.getMqApi();
     }
     get kafka() {
         return this._kafka;
@@ -221,7 +221,7 @@ class KafkaAdapter extends core_1.PlatformAdapter {
      * @protected
      */
     async _createAllConsumers() {
-        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();
@@ -281,22 +281,21 @@ class KafkaAdapter extends core_1.PlatformAdapter {
         const parseKey = request_parser_js_1.RequestParser.STRING;
         const parsePayload = request_parser_js_1.RequestParser.STRING;
         /** Prepare decoders */
-        const decodeKey = operation.keyType?.generateCodec('decode', {
+        const decodeKey = operation.generateKeyCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
-        }) || valgen_1.vg.isAny();
-        const decodePayload = operation.payloadType?.generateCodec('decode', {
+            ignoreReadonlyFields: true,
+        });
+        const decodePayload = operation.generateCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
-        }) || valgen_1.vg.isAny();
+            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);
             }
         });
@@ -331,12 +330,11 @@ class KafkaAdapter extends core_1.PlatformAdapter {
             }
             /** Create context */
             const context = new kafka_context_js_1.KafkaContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
+                __adapter: this,
+                __contDef: controller,
+                __controller: instance,
+                __oprDef: operation,
+                __handler: operationHandler,
                 topic,
                 partition,
                 payload,

package/cjs/kafka-context.js

@@ -14,21 +14,20 @@ class KafkaContext 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: 'kafka',
         });
-        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.partition = init.partition;
         this.headers = init.headers || {};
         this.topic = init.topic;

package/esm/kafka-adapter.js

@@ -26,7 +26,7 @@ export class KafkaAdapter extends PlatformAdapter {
         this._consumers = new Map();
         this._handlerArgs = [];
         this._status = 'idle';
-        this.protocol = 'mq';
+        this.transform = 'mq';
         this.platform = KafkaAdapter.PlatformName;
         this._document = document;
         this._config = config;
@@ -47,7 +47,7 @@ export class KafkaAdapter extends PlatformAdapter {
         });
     }
     get api() {
-        return this.document.mqApi;
+        return this.document.getMqApi();
     }
     get kafka() {
         return this._kafka;
@@ -218,7 +218,7 @@ export class KafkaAdapter extends PlatformAdapter {
      * @protected
      */
     async _createAllConsumers() {
-        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();
@@ -278,22 +278,21 @@ export class KafkaAdapter extends PlatformAdapter {
         const parseKey = RequestParser.STRING;
         const parsePayload = RequestParser.STRING;
         /** Prepare decoders */
-        const decodeKey = operation.keyType?.generateCodec('decode', {
+        const decodeKey = operation.generateKeyCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
-        }) || vg.isAny();
-        const decodePayload = operation.payloadType?.generateCodec('decode', {
+            ignoreReadonlyFields: true,
+        });
+        const decodePayload = operation.generateCodec('decode', {
             scope: this.scope,
-            ignoreWriteonlyFields: true,
-        }) || vg.isAny();
+            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);
             }
         });
@@ -328,12 +327,11 @@ export class KafkaAdapter extends PlatformAdapter {
             }
             /** Create context */
             const context = new KafkaContext({
-                adapter: this,
-                platform: this.platform,
-                controller,
-                controllerInstance: instance,
-                operation,
-                operationHandler,
+                __adapter: this,
+                __contDef: controller,
+                __controller: instance,
+                __oprDef: operation,
+                __handler: operationHandler,
                 topic,
                 partition,
                 payload,

package/esm/kafka-context.js

@@ -11,21 +11,20 @@ export class KafkaContext 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: 'kafka',
         });
-        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.partition = init.partition;
         this.headers = init.headers || {};
         this.topic = init.topic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/kafka",
-  "version": "1.19.7",
+  "version": "1.20.0",
   "description": "Opra Kafka adapter",
   "author": "Panates",
   "license": "MIT",
@@ -10,8 +10,8 @@
     "valgen": "^5.18.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.19.7",
-    "@opra/core": "^1.19.7",
+    "@opra/common": "^1.20.0",
+    "@opra/core": "^1.20.0",
     "kafkajs": ">=2.2.4 <3"
   },
   "type": "module",

package/types/kafka-adapter.d.ts

@@ -29,7 +29,7 @@ export declare class KafkaAdapter extends PlatformAdapter<KafkaAdapter.Events> {
     protected _handlerArgs: HandlerArguments[];
     protected _kafka: Kafka;
     protected _status: KafkaAdapter.Status;
-    readonly protocol: OpraSchema.Transport;
+    readonly transform: OpraSchema.Transport;
     readonly platform = "kafka";
     readonly interceptors: (KafkaAdapter.InterceptorFunction | KafkaAdapter.IKafkaInterceptor)[];
     /**

package/types/kafka-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 { KafkaMessage } from 'kafkajs';
 import type { AsyncEventEmitter } from 'node-events-async';
@@ -8,13 +8,11 @@ import type { KafkaAdapter } from './kafka-adapter.js';
  * It extends the ExecutionContext and implements the AsyncEventEmitter.
  */
 export declare class KafkaContext extends ExecutionContext implements AsyncEventEmitter {
-    readonly protocol: OpraSchema.Transport;
-    readonly platform: string;
-    readonly adapter: KafkaAdapter;
-    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: KafkaAdapter;
     readonly topic: string;
     readonly key: any;
     readonly payload: any;
@@ -30,12 +28,12 @@ export declare class KafkaContext extends ExecutionContext implements AsyncEvent
     constructor(init: KafkaContext.Initiator);
 }
 export declare namespace KafkaContext {
-    interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol' | 'documentNode'> {
-        adapter: KafkaAdapter;
-        controller?: MQController;
-        controllerInstance?: any;
-        operation?: MQOperation;
-        operationHandler?: Function;
+    interface Initiator extends Omit<ExecutionContext.Initiator, '__adapter' | 'transport' | 'platform' | '__docNode'> {
+        __adapter: KafkaAdapter;
+        __contDef?: MQController;
+        __controller?: any;
+        __oprDef?: MQOperation;
+        __handler?: Function;
         topic: string;
         partition: number;
         key: any;