@opra/kafka 1.14.0 → 1.15.1

package/cjs/kafka-adapter.js

@@ -135,7 +135,6 @@ class KafkaAdapter extends core_1.PlatformAdapter {
                                 this._emitError(e);
                             }
                         }
-                        await this.emitAsync('message-finish', payload);
                     },
                 })
                     .catch(e => {
@@ -347,11 +346,11 @@ class KafkaAdapter extends core_1.PlatformAdapter {
                 heartbeat,
                 pause,
             });
-            await this.emitAsync('before-execute', context);
+            await this.emitAsync('execute', context);
             try {
                 /** Call operation handler */
                 const result = await operationHandler.call(instance, context);
-                await this.emitAsync('after-execute', context, result);
+                await this.emitAsync('finish', context, result);
             }
             catch (e) {
                 this._emitError(e, context);
@@ -367,7 +366,9 @@ class KafkaAdapter extends core_1.PlatformAdapter {
                     context.errors.push(error);
                 context.errors = this._wrapExceptions(context.errors);
                 if (context.listenerCount('error')) {
-                    await context.emitAsync('error', context.errors[0], context);
+                    await context
+                        .emitAsync('error', context.errors[0], context)
+                        .catch(noOp);
                 }
                 if (logger?.error) {
                     context.errors.forEach(err => logger.error(err));
@@ -376,7 +377,7 @@ class KafkaAdapter extends core_1.PlatformAdapter {
             else
                 logger?.error(error);
             if (this.listenerCount('error'))
-                this.emit('error', error);
+                this._emitError(error);
         })
             .catch(noOp);
     }

package/esm/kafka-adapter.js

@@ -132,7 +132,6 @@ export class KafkaAdapter extends PlatformAdapter {
                                 this._emitError(e);
                             }
                         }
-                        await this.emitAsync('message-finish', payload);
                     },
                 })
                     .catch(e => {
@@ -344,11 +343,11 @@ export class KafkaAdapter extends PlatformAdapter {
                 heartbeat,
                 pause,
             });
-            await this.emitAsync('before-execute', context);
+            await this.emitAsync('execute', context);
             try {
                 /** Call operation handler */
                 const result = await operationHandler.call(instance, context);
-                await this.emitAsync('after-execute', context, result);
+                await this.emitAsync('finish', context, result);
             }
             catch (e) {
                 this._emitError(e, context);
@@ -364,7 +363,9 @@ export class KafkaAdapter extends PlatformAdapter {
                     context.errors.push(error);
                 context.errors = this._wrapExceptions(context.errors);
                 if (context.listenerCount('error')) {
-                    await context.emitAsync('error', context.errors[0], context);
+                    await context
+                        .emitAsync('error', context.errors[0], context)
+                        .catch(noOp);
                 }
                 if (logger?.error) {
                     context.errors.forEach(err => logger.error(err));
@@ -373,7 +374,7 @@ export class KafkaAdapter extends PlatformAdapter {
             else
                 logger?.error(error);
             if (this.listenerCount('error'))
-                this.emit('error', error);
+                this._emitError(error);
         })
             .catch(noOp);
     }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@opra/kafka",
-  "version": "1.14.0",
+  "version": "1.15.1",
   "description": "Opra Kafka package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "node-events-async": "^1.0.0",
+    "node-events-async": "^1.1.1",
     "tslib": "^2.8.1",
-    "valgen": "^5.14.0"
+    "valgen": "^5.15.0"
   },
   "peerDependencies": {
-    "@opra/common": "^1.14.0",
-    "@opra/core": "^1.14.0",
+    "@opra/common": "^1.15.1",
+    "@opra/core": "^1.15.1",
     "kafkajs": ">=2.2.4 <3"
   },
   "type": "module",
@@ -34,7 +34,7 @@
   "types": "./types/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/panates/opra.git",
+    "url": "git+https://github.com/panates/opra.git",
     "directory": "packages/kafka"
   },
   "engines": {
@@ -52,5 +52,8 @@
     "opra",
     "kafka",
     "consumer"
-  ]
+  ],
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/types/kafka-adapter.d.ts

@@ -1,6 +1,6 @@
 import { ApiDocument, OpraException, OpraSchema, RpcApi, RpcController, RpcOperation } from '@opra/common';
 import { type ILogger, PlatformAdapter } from '@opra/core';
-import { type Consumer, type ConsumerConfig, type EachMessageHandler, Kafka, type KafkaConfig } from 'kafkajs';
+import { type Consumer, type ConsumerConfig, type EachMessageHandler, EachMessagePayload, Kafka, type KafkaConfig } from 'kafkajs';
 import type { StrictOmit } from 'ts-gems';
 import { KafkaContext } from './kafka-context.js';
 export interface OperationConfig {
@@ -21,7 +21,7 @@ interface HandlerArguments {
  *
  * @class KafkaAdapter
  */
-export declare class KafkaAdapter extends PlatformAdapter {
+export declare class KafkaAdapter extends PlatformAdapter<KafkaAdapter.Events> {
     static readonly PlatformName = "kafka";
     protected _config: KafkaAdapter.Config;
     protected _controllerInstances: Map<RpcController, any>;
@@ -124,5 +124,11 @@ export declare namespace KafkaAdapter {
     type IKafkaInterceptor = {
         intercept(context: KafkaContext, next: NextCallback): Promise<any>;
     };
+    interface Events {
+        error: [Error, KafkaContext | undefined];
+        finish: [KafkaContext, any];
+        execute: [KafkaContext];
+        message: [EachMessagePayload];
+    }
 }
 export {};