@restorecommerce/kafka-client 0.3.0 → 0.4.0

package/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.4.0](https://github.com/restorecommerce/kafka-client/compare/@restorecommerce/kafka-client@0.3.2...@restorecommerce/kafka-client@0.4.0) (2022-05-16)
+
+
+### Features
+
+* major upgrade ([a407cb4](https://github.com/restorecommerce/kafka-client/commit/a407cb4ec91c2c36c905d2a1619b9a18708f6c3e))
+
+
+
+
+
+## [0.3.2](https://github.com/restorecommerce/kafka-client/compare/@restorecommerce/kafka-client@0.3.1...@restorecommerce/kafka-client@0.3.2) (2022-04-29)
+
+
+### Bug Fixes
+
+* **kafka-client:** fix to reset consumers on kafkajs crash error KafkaJSNonRetriableError ([2a23174](https://github.com/restorecommerce/kafka-client/commit/2a231741179155c56858ef1e90f32c1dbdbd755a))
+* **kafka-client:** up kafkajs error name ([f20658a](https://github.com/restorecommerce/kafka-client/commit/f20658af9747e3493dda85159dfb8722d12e7676))
+
+
+
+
+
+## [0.3.1](https://github.com/restorecommerce/kafka-client/compare/@restorecommerce/kafka-client@0.3.0...@restorecommerce/kafka-client@0.3.1) (2022-02-14)
+
+**Note:** Version bump only for package @restorecommerce/kafka-client
+
+
+
+
+
 # [0.3.0](https://github.com/restorecommerce/kafka-client/compare/@restorecommerce/kafka-client@0.2.29...@restorecommerce/kafka-client@0.3.0) (2022-02-09)
 
 

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) Invend GmbH and other contributors.
+Copyright (c) n-fuse GmbH and other contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/lib/events/index.js

@@ -29,8 +29,8 @@ const registerEventProvider = (name, provider) => {
     eventProviders[name] = provider;
 };
 exports.registerEventProvider = registerEventProvider;
-exports.registerEventProvider(kafka.Name, kafka.Kafka);
-exports.registerEventProvider(local.Name, local.Local);
+(0, exports.registerEventProvider)(kafka.Name, kafka.Kafka);
+(0, exports.registerEventProvider)(local.Name, local.Local);
 /**
  * Events manages an event provider.
  */
@@ -55,10 +55,10 @@ class Events {
         // logger
         if (_.isNil(logger)) {
             if (_.isNil(this.config.logger)) {
-                this.logger = logger_1.createLogger();
+                this.logger = (0, logger_1.createLogger)();
             }
             else {
-                this.logger = logger_1.createLogger(loggerCfg);
+                this.logger = (0, logger_1.createLogger)(loggerCfg);
             }
         }
         else {

package/lib/events/provider/kafka/index.d.ts

@@ -81,6 +81,14 @@ export declare class Topic {
      * with the corresponding offset.
      */
     $wait(offset: number): Promise<any>;
+    /**
+     * Reset consumer, unsubscribes all the events on the topic and then
+     * subcribes again for same set of events
+     *
+     * @param {string[]} eventNames list of event names
+     * @param {number} offset The offset at which to restart from.
+     */
+    $resetConsumer(eventNames: string[], offset: number): Promise<void>;
     /**
      * Force a committed offset reset.
      *

package/lib/events/provider/kafka/index.js

@@ -183,7 +183,7 @@ class Topic {
             return new Promise((() => {
                 return (cb) => {
                     if (this.currentOffset >= offset) {
-                        cb();
+                        cb(null);
                         return;
                     }
                     this.waitQueue.push({ offset, cb });
@@ -191,6 +191,36 @@ class Topic {
             })());
         });
     }
+    /**
+     * Reset consumer, unsubscribes all the events on the topic and then
+     * subcribes again for same set of events
+     *
+     * @param {string[]} eventNames list of event names
+     * @param {number} offset The offset at which to restart from.
+     */
+    $resetConsumer(eventNames, offset) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.provider.logger.info('Event Names for consumer reset', eventNames);
+            if (eventNames && eventNames.length > 0) {
+                // since the consumer is set to undefined only when there is no more subscription
+                // need to unsubcribe all eventNames and then resubcribe at once
+                const eventNamesList = _.clone(eventNames);
+                // unsubscribe all events on consumer
+                for (let eventName of eventNamesList) {
+                    yield this.$unsubscribe(eventName);
+                    this.provider.logger.info(`Unsubscribed event ${eventName}`);
+                }
+                // subscribe all events on consumer
+                for (let eventName of eventNamesList) {
+                    yield this.$subscribe(eventName, offset);
+                    this.provider.logger.info(`Subscribed event ${eventName}`);
+                }
+            }
+            else {
+                this.provider.logger.warn('Event names empty for consumer reset');
+            }
+        });
+    }
     /**
      * Force a committed offset reset.
      *
@@ -358,6 +388,14 @@ class Topic {
             this.provider.logger.verbose('Offsets committed successfully');
         }).catch(error => {
             this.provider.logger.warn('Failed to commit offsets, resuming anyway after:', error);
+            // Fix for kafkaJS onCrash issue for KafkaJSNonRetriableError, to reset the consumers
+            this.provider.logger.warn('Commit error name', { name: error.name });
+            this.provider.logger.warn('Commit error message', { message: error.message });
+            if ((error.name === 'KafkaJSNonRetriableError' || error.name === 'KafkaJSError') && error.message === 'The coordinator is not aware of this member') {
+                this.provider.logger.info('Reset Consumer connection due to KafkaJSNonRetriableError');
+                this.$resetConsumer(this.subscribed, this.currentOffset);
+                this.provider.logger.info('Consumer connection reset successfully');
+            }
         });
     }
     commitCurrentOffsets() {

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@restorecommerce/kafka-client",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Opinionated Kafka Client for Microservices",
   "main": "./lib/index.js",
-  "author": "Invend GmbH",
+  "author": "n-fuse GmbH",
   "repository": {
     "type": "git",
     "url": "https://github.com/restorecommerce/kafka-client.git"
@@ -17,36 +17,36 @@
   ],
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@restorecommerce/logger": "^0.12.0",
+    "@restorecommerce/logger": "^0.12.2",
     "async": "^3.2.0",
     "cls-rtracer": "^2.5.1",
     "events": "^3.3.0",
-    "kafkajs": "^1.15.0",
+    "kafkajs": "^2.0.0",
     "lodash": "^4.17.21",
     "protobufjs": "^6.11.2",
     "retry": "^0.13.1",
-    "winston": "^3.4.0"
+    "winston": "^3.7.2"
   },
   "devDependencies": {
-    "@types/async": "^3.2.6",
-    "@types/long": "^4.0.0",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.11.12",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/eslint-plugin-tslint": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
-    "coveralls": "^3.0.7",
+    "@types/async": "^3.2.13",
+    "@types/long": "^4.0.2",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^17.0.33",
+    "@typescript-eslint/eslint-plugin": "^5.23.0",
+    "@typescript-eslint/eslint-plugin-tslint": "^5.23.0",
+    "@typescript-eslint/parser": "^5.23.0",
+    "coveralls": "^3.1.1",
     "cross-env": "^7.0.3",
-    "eslint": "^8.4.1",
-    "eslint-plugin-prefer-arrow-functions": "^3.0.1",
-    "mocha": "^9.1.3",
+    "eslint": "^8.15.0",
+    "eslint-plugin-prefer-arrow-functions": "^3.1.4",
+    "mocha": "^10.0.0",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.1.0",
     "rimraf": "^3.0.0",
     "should": "^13.2.3",
-    "ts-node": "^10.4.0",
+    "ts-node": "^10.7.0",
     "tslint": "^6.1.3",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.4"
   },
   "scripts": {
     "pretest": "npm run build && node setupTopics.js com.example.test",
@@ -62,5 +62,5 @@
   "engines": {
     "node": ">= 12.0.0"
   },
-  "gitHead": "97966555c4e421699a8a7c054f41ccc4385f618f"
+  "gitHead": "ec10625052f498dc6cd83f340b26e18ffdf9a6eb"
 }