kafka-ts 0.0.13 → 0.0.16

package/dist/connection.js

@@ -122,6 +122,7 @@ class Connection {
         }
         catch (error) {
             if (error instanceof error_1.KafkaTSApiError) {
+                error.apiName = apiName;
                 error.request = body;
             }
             throw error;

package/dist/consumer/consumer.d.ts

@@ -42,6 +42,7 @@ export declare class Consumer extends EventEmitter<{
     start(): Promise<void>;
     close(force?: boolean): Promise<void>;
     private startFetchManager;
+    private waitForReassignment;
     private process;
     private fetch;
 }

package/dist/consumer/consumer.js

@@ -108,38 +108,36 @@ class Consumer extends events_1.default {
     async startFetchManager() {
         const { groupId, batchGranularity, concurrency } = this.options;
         while (!this.stopHook) {
-            await this.consumerGroup?.join();
-            // TODO: If leader is not available, find another read replica
-            const nodeAssignments = Object.entries((0, messages_to_topic_partition_leaders_1.distributeMessagesToTopicPartitionLeaders)(Object.entries(this.metadata.getAssignment()).flatMap(([topic, partitions]) => partitions.map((partition) => ({ topic, partition }))), this.metadata.getTopicPartitionLeaderIds())).map(([nodeId, assignment]) => ({
-                nodeId: parseInt(nodeId),
-                assignment: Object.fromEntries(Object.entries(assignment).map(([topic, partitions]) => [
-                    topic,
-                    Object.keys(partitions).map(Number),
-                ])),
-            }));
-            const numPartitions = Object.values(this.metadata.getAssignment()).flat().length;
-            const numProcessors = Math.min(concurrency, numPartitions);
-            this.fetchManager = new fetch_manager_1.FetchManager({
-                fetch: this.fetch.bind(this),
-                process: this.process.bind(this),
-                metadata: this.metadata,
-                consumerGroup: this.consumerGroup,
-                nodeAssignments,
-                batchGranularity,
-                concurrency: numProcessors,
-            });
             try {
+                await this.consumerGroup?.join();
+                // TODO: If leader is not available, find another read replica
+                const nodeAssignments = Object.entries((0, messages_to_topic_partition_leaders_1.distributeMessagesToTopicPartitionLeaders)(Object.entries(this.metadata.getAssignment()).flatMap(([topic, partitions]) => partitions.map((partition) => ({ topic, partition }))), this.metadata.getTopicPartitionLeaderIds())).map(([nodeId, assignment]) => ({
+                    nodeId: parseInt(nodeId),
+                    assignment: Object.fromEntries(Object.entries(assignment).map(([topic, partitions]) => [
+                        topic,
+                        Object.keys(partitions).map(Number),
+                    ])),
+                }));
+                const numPartitions = Object.values(this.metadata.getAssignment()).flat().length;
+                const numProcessors = Math.min(concurrency, numPartitions);
+                this.fetchManager = new fetch_manager_1.FetchManager({
+                    fetch: this.fetch.bind(this),
+                    process: this.process.bind(this),
+                    metadata: this.metadata,
+                    consumerGroup: this.consumerGroup,
+                    nodeAssignments,
+                    batchGranularity,
+                    concurrency: numProcessors,
+                });
                 await this.fetchManager.start();
                 if (!nodeAssignments.length) {
-                    logger_1.log.debug('No partitions assigned. Waiting for reassignment...', { groupId });
-                    await (0, delay_1.delay)(this.options.maxWaitMs);
-                    this.consumerGroup?.handleLastHeartbeat();
+                    await this.waitForReassignment();
                 }
             }
             catch (error) {
-                await this.fetchManager.stop();
+                await this.fetchManager?.stop();
                 if (error.errorCode === api_1.API_ERROR.REBALANCE_IN_PROGRESS) {
-                    logger_1.log.debug('Rebalance in progress...');
+                    logger_1.log.debug('Rebalance in progress...', { apiName: error.apiName });
                     continue;
                 }
                 if (error.errorCode === api_1.API_ERROR.FENCED_INSTANCE_ID) {
@@ -162,6 +160,14 @@ class Consumer extends events_1.default {
         }
         this.stopHook?.();
     }
+    async waitForReassignment() {
+        const { groupId } = this.options;
+        logger_1.log.debug('No partitions assigned. Waiting for reassignment...', { groupId });
+        while (!this.stopHook) {
+            await (0, delay_1.delay)(1000);
+            this.consumerGroup?.handleLastHeartbeat();
+        }
+    }
     async process(messages) {
         const { options } = this;
         const { retrier } = options;

package/dist/utils/error.d.ts

@@ -5,6 +5,7 @@ export declare class KafkaTSApiError<T = any> extends KafkaTSError {
     errorCode: number;
     errorMessage: string | null;
     response: T;
+    apiName: string | undefined;
     request: unknown | undefined;
     constructor(errorCode: number, errorMessage: string | null, response: T);
 }

package/dist/utils/error.js

@@ -13,6 +13,7 @@ class KafkaTSApiError extends KafkaTSError {
     errorCode;
     errorMessage;
     response;
+    apiName;
     request;
     constructor(errorCode, errorMessage, response) {
         const [errorName] = Object.entries(api_1.API_ERROR).find(([, value]) => value === errorCode) ?? ['UNKNOWN'];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kafka-ts",
-    "version": "0.0.13",
+    "version": "0.0.16",
     "main": "dist/index.js",
     "author": "Priit Käärd",
     "license": "MIT",