kafka-ts 0.0.1-beta.4 → 0.0.1-beta.6

package/src/connection.ts

@@ -6,11 +6,12 @@ import { Api } from './utils/api';
 import { Decoder } from './utils/decoder';
 import { Encoder } from './utils/encoder';
 import { ConnectionError } from './utils/error';
+import { log } from './utils/logger';
 import { createTracer } from './utils/tracer';
 
 const trace = createTracer('Connection');
 
-export type ConnectionOptions = {
+type ConnectionOptions = {
     clientId: string | null;
     connection: TcpSocketConnectOpts;
     ssl: TLSSocketOptions | null;
@@ -24,14 +25,14 @@ export class Connection {
         [correlationId: number]: { resolve: (response: RawResonse) => void; reject: (error: Error) => void };
     } = {};
     private lastCorrelationId = 0;
-    private buffer: Buffer | null = null;
+    private chunks: Buffer[] = [];
 
     constructor(private options: ConnectionOptions) {}
 
     @trace()
     public async connect() {
         this.queue = {};
-        this.buffer = null;
+        this.chunks = [];
 
         await new Promise<void>((resolve, reject) => {
             const { ssl, connection } = this.options;
@@ -73,6 +74,7 @@ export class Connection {
     @trace((api, body) => ({ message: getApiName(api), body }))
     public async sendRequest<Request, Response>(api: Api<Request, Response>, body: Request): Promise<Response> {
         const correlationId = this.nextCorrelationId();
+        const apiName = getApiName(api);
 
         const encoder = new Encoder()
             .writeInt16(api.apiKey)
@@ -80,17 +82,24 @@ export class Connection {
             .writeInt32(correlationId)
             .writeString(this.options.clientId);
 
-        const request = api.request(encoder, body).value();
-        const requestEncoder = new Encoder().writeInt32(request.length).write(request);
+        const request = api.request(encoder, body);
+        const requestEncoder = new Encoder().writeInt32(request.getByteLength()).writeEncoder(request);
 
+        let timeout: NodeJS.Timeout | undefined;
         const { responseDecoder, responseSize } = await new Promise<RawResonse>(async (resolve, reject) => {
+            timeout = setTimeout(() => {
+                delete this.queue[correlationId];
+                reject(new ConnectionError(`${apiName} timed out`));
+            }, 30_000);
+
             try {
-                await this.write(requestEncoder.value());
                 this.queue[correlationId] = { resolve, reject };
+                await this.write(requestEncoder.value());
             } catch (error) {
                 reject(error);
             }
         });
+        clearTimeout(timeout);
         const response = await api.response(responseDecoder);
 
         assert(
@@ -116,12 +125,13 @@ export class Connection {
     }
 
     private handleData(buffer: Buffer) {
-        this.buffer = this.buffer ? Buffer.concat([this.buffer, buffer]) : buffer;
-        if (this.buffer.length < 4) {
+        this.chunks.push(buffer);
+
+        const decoder = new Decoder(Buffer.concat(this.chunks));
+        if (decoder.getBufferLength() < 4) {
             return;
         }
 
-        const decoder = new Decoder(this.buffer);
         const size = decoder.readInt32();
         if (size !== decoder.getBufferLength() - 4) {
             return;
@@ -129,15 +139,18 @@ export class Connection {
 
         const correlationId = decoder.readInt32();
 
-        const { resolve } = this.queue[correlationId];
-        delete this.queue[correlationId];
-
-        resolve({ responseDecoder: decoder, responseSize: size });
-        this.buffer = null;
+        const context = this.queue[correlationId];
+        if (context) {
+            delete this.queue[correlationId];
+            context.resolve({ responseDecoder: decoder, responseSize: size });
+        } else {
+            log.debug('Could not find pending request for correlationId', { correlationId });
+        }
+        this.chunks = [];
     }
 
     private nextCorrelationId() {
-        return (this.lastCorrelationId = (this.lastCorrelationId + 1) % 2 ** 31);
+        return this.lastCorrelationId++;
     }
 }
 

package/src/consumer/consumer-group.ts

@@ -1,11 +1,15 @@
+import EventEmitter from 'events';
 import { API, API_ERROR } from '../api';
 import { KEY_TYPE } from '../api/find-coordinator';
 import { Assignment, MemberAssignment } from '../api/sync-group';
 import { Cluster } from '../cluster';
 import { KafkaTSApiError, KafkaTSError } from '../utils/error';
+import { createTracer } from '../utils/tracer';
 import { ConsumerMetadata } from './consumer-metadata';
 import { OffsetManager } from './offset-manager';
 
+const trace = createTracer('ConsumerGroup');
+
 type ConsumerGroupOptions = {
     cluster: Cluster;
     topics: string[];
@@ -17,7 +21,7 @@ type ConsumerGroupOptions = {
     offsetManager: OffsetManager;
 };
 
-export class ConsumerGroup {
+export class ConsumerGroup extends EventEmitter<{ offsetCommit: [] }> {
     private coordinatorId = -1;
     private memberId = '';
     private generationId = -1;
@@ -26,12 +30,16 @@ export class ConsumerGroup {
     private heartbeatInterval: NodeJS.Timeout | null = null;
     private heartbeatError: KafkaTSError | null = null;
 
-    constructor(private options: ConsumerGroupOptions) {}
+    constructor(private options: ConsumerGroupOptions) {
+        super();
+    }
 
+    @trace()
     public async join() {
         await this.findCoordinator();
         await this.options.cluster.setSeedBroker(this.coordinatorId);
 
+        this.memberId = '';
         await this.joinGroup();
         await this.syncGroup();
         await this.offsetFetch();
@@ -55,12 +63,16 @@ export class ConsumerGroup {
         }
     }
 
-    public async handleLastHeartbeat() {
+    public handleLastHeartbeat() {
         if (this.heartbeatError) {
             throw this.heartbeatError;
         }
     }
 
+    public resetHeartbeat() {
+        this.heartbeatError = null;
+    }
+
     private async findCoordinator() {
         const { coordinators } = await this.options.cluster.sendRequest(API.FIND_COORDINATOR, {
             keyType: KEY_TYPE.GROUP,
@@ -147,30 +159,34 @@ export class ConsumerGroup {
         if (!request.groups.length) return;
 
         const response = await cluster.sendRequest(API.OFFSET_FETCH, request);
+
+        const topicPartitions: Record<string, Set<number>> = {};
         response.groups.forEach((group) => {
             group.topics.forEach((topic) => {
-                topic.partitions
-                    .filter(({ committedOffset }) => committedOffset >= 0)
-                    .forEach(({ partitionIndex, committedOffset }) =>
-                        offsetManager.resolve(topic.name, partitionIndex, committedOffset),
-                    );
+                topicPartitions[topic.name] ??= new Set();
+                topic.partitions.forEach(({ partitionIndex, committedOffset }) => {
+                    if (committedOffset >= 0) {
+                        topicPartitions[topic.name].add(partitionIndex);
+                        offsetManager.resolve(topic.name, partitionIndex, committedOffset);
+                    }
+                });
             });
         });
-        offsetManager.flush();
+        offsetManager.flush(topicPartitions);
     }
 
-    public async offsetCommit() {
+    public async offsetCommit(topicPartitions: Record<string, Set<number>>) {
         const { cluster, groupId, groupInstanceId, offsetManager } = this.options;
         const request = {
             groupId,
             groupInstanceId,
             memberId: this.memberId,
             generationIdOrMemberEpoch: this.generationId,
-            topics: Object.entries(offsetManager.pendingOffsets).map(([topic, partitions]) => ({
+            topics: Object.entries(topicPartitions).map(([topic, partitions]) => ({
                 name: topic,
-                partitions: Object.entries(partitions).map(([partition, offset]) => ({
-                    partitionIndex: parseInt(partition),
-                    committedOffset: offset,
+                partitions: [...partitions].map((partitionIndex) => ({
+                    partitionIndex,
+                    committedOffset: offsetManager.pendingOffsets[topic][partitionIndex],
                     committedLeaderEpoch: -1,
                     committedMetadata: null,
                 })),
@@ -180,7 +196,7 @@ export class ConsumerGroup {
             return;
         }
         await cluster.sendRequest(API.OFFSET_COMMIT, request);
-        offsetManager.flush();
+        this.emit('offsetCommit');
     }
 
     public async heartbeat() {
@@ -194,6 +210,10 @@ export class ConsumerGroup {
     }
 
     public async leaveGroup() {
+        if (this.coordinatorId === -1) {
+            return;
+        }
+
         const { cluster, groupId, groupInstanceId } = this.options;
         this.stopHeartbeater();
         try {

package/src/consumer/consumer.ts

@@ -1,3 +1,4 @@
+import EventEmitter from 'events';
 import { API, API_ERROR } from '../api';
 import { IsolationLevel } from '../api/fetch';
 import { Assignment } from '../api/sync-group';
@@ -33,7 +34,7 @@ export type ConsumerOptions = {
     concurrency?: number;
 } & ({ onBatch: (messages: Required<Message>[]) => unknown } | { onMessage: (message: Required<Message>) => unknown });
 
-export class Consumer {
+export class Consumer extends EventEmitter<{ offsetCommit: [] }> {
     private options: Required<ConsumerOptions>;
     private metadata: ConsumerMetadata;
     private consumerGroup: ConsumerGroup | undefined;
@@ -45,6 +46,8 @@ export class Consumer {
         private cluster: Cluster,
         options: ConsumerOptions,
     ) {
+        super();
+
         this.options = {
             ...options,
             groupId: options.groupId ?? null,
@@ -81,8 +84,10 @@ export class Consumer {
                   offsetManager: this.offsetManager,
               })
             : undefined;
+        this.consumerGroup?.on('offsetCommit', () => this.emit('offsetCommit'));
     }
 
+    @trace()
     public async start(): Promise<void> {
         const { topics, allowTopicAutoCreation, fromBeginning } = this.options;
 
@@ -95,7 +100,7 @@ export class Consumer {
             await this.offsetManager.fetchOffsets({ fromBeginning });
             await this.consumerGroup?.join();
         } catch (error) {
-            log.error('Failed to start consumer', error);
+            log.warn('Failed to start consumer', error);
             log.debug(`Restarting consumer in 1 second...`);
             await delay(1000);
 
@@ -113,14 +118,16 @@ export class Consumer {
                 await this.fetchManager?.stop();
             });
         }
-        await this.consumerGroup?.leaveGroup().catch((error) => log.warn(`Failed to leave group: ${error.message}`));
-        await this.cluster.disconnect().catch((error) => log.warn(`Failed to disconnect: ${error.message}`));
+        await this.consumerGroup?.leaveGroup().catch((error) => log.debug(`Failed to leave group: ${error.message}`));
+        await this.cluster.disconnect().catch((error) => log.debug(`Failed to disconnect: ${error.message}`));
     }
 
-    private startFetchManager = async () => {
+    private async startFetchManager() {
         const { batchGranularity, concurrency } = this.options;
 
         while (!this.stopHook) {
+            this.consumerGroup?.resetHeartbeat();
+
             // TODO: If leader is not available, find another read replica
             const nodeAssignments = Object.entries(
                 distributeMessagesToTopicPartitionLeaders(
@@ -158,7 +165,7 @@ export class Consumer {
                 if (!nodeAssignments.length) {
                     log.debug('No partitions assigned. Waiting for reassignment...');
                     await delay(this.options.maxWaitMs);
-                    await this.consumerGroup?.handleLastHeartbeat();
+                    this.consumerGroup?.handleLastHeartbeat();
                 }
             } catch (error) {
                 await this.fetchManager.stop();
@@ -186,12 +193,18 @@ export class Consumer {
             }
         }
         this.stopHook?.();
-    };
+    }
 
-    @trace()
+    @trace((messages) => ({ count: messages.length }))
     private async process(messages: Required<Message>[]) {
         const { options } = this;
 
+        const topicPartitions: Record<string, Set<number>> = {};
+        for (const { topic, partition } of messages) {
+            topicPartitions[topic] ??= new Set();
+            topicPartitions[topic].add(partition);
+        }
+
         if ('onBatch' in options) {
             await options.onBatch(messages);
 
@@ -199,19 +212,16 @@ export class Consumer {
                 this.offsetManager.resolve(topic, partition, offset + 1n),
             );
         } else if ('onMessage' in options) {
-            try {
-                for (const message of messages) {
-                    await options.onMessage(message);
+            for (const message of messages) {
+                await options.onMessage(message);
 
-                    const { topic, partition, offset } = message;
-                    this.offsetManager.resolve(topic, partition, offset + 1n);
-                }
-            } catch (error) {
-                await this.consumerGroup?.offsetCommit().catch(() => {});
-                throw error;
+                const { topic, partition, offset } = message;
+                this.offsetManager.resolve(topic, partition, offset + 1n);
             }
         }
-        await this.consumerGroup?.offsetCommit();
+
+        await this.consumerGroup?.offsetCommit(topicPartitions);
+        this.offsetManager.flush(topicPartitions);
     }
 
     private fetch(nodeId: number, assignment: Assignment) {

package/src/consumer/fetch-manager.ts

@@ -1,5 +1,4 @@
-import EventEmitter from 'events';
-import { API } from '../api';
+import { FetchResponse } from '../api/fetch';
 import { Assignment } from '../api/sync-group';
 import { Metadata } from '../metadata';
 import { Batch, Message } from '../types';
@@ -14,7 +13,7 @@ const trace = createTracer('FetchManager');
 export type BatchGranularity = 'partition' | 'topic' | 'broker';
 
 type FetchManagerOptions = {
-    fetch: (nodeId: number, assignment: Assignment) => Promise<Awaited<ReturnType<(typeof API.FETCH)['response']>>>;
+    fetch: (nodeId: number, assignment: Assignment) => Promise<FetchResponse>;
     process: (batch: Batch) => Promise<void>;
     metadata: Metadata;
     consumerGroup?: ConsumerGroup;
@@ -26,15 +25,15 @@ type FetchManagerOptions = {
 type Checkpoint = { kind: 'checkpoint'; fetcherId: number };
 type Entry = Batch | Checkpoint;
 
-export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number]; stop: [] }> {
+export class FetchManager {
     private queue: Entry[] = [];
     private isRunning = false;
     private fetchers: Fetcher[];
     private processors: Processor[];
+    private pollQueue: (() => void)[] = [];
+    private fetcherCallbacks: Record<number, () => void> = {};
 
     constructor(private options: FetchManagerOptions) {
-        super();
-
         const { fetch, process, consumerGroup, nodeAssignments, concurrency } = this.options;
 
         this.fetchers = nodeAssignments.map(
@@ -52,6 +51,7 @@ export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number];
         );
     }
 
+    @trace(() => ({ root: true }))
     public async start() {
         this.queue = [];
         this.isRunning = true;
@@ -62,20 +62,25 @@ export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number];
                 ...this.processors.map((processor) => processor.loop()),
             ]);
         } finally {
-            this.isRunning = false;
-            this.emit('stop');
+            await this.stop();
         }
     }
 
-    @trace()
     public async stop() {
         this.isRunning = false;
-        this.emit('stop');
 
-        await Promise.all([
+        const stopPromise = Promise.all([
             ...this.fetchers.map((fetcher) => fetcher.stop()),
             ...this.processors.map((processor) => processor.stop()),
         ]);
+
+        this.pollQueue.forEach((resolve) => resolve());
+        this.pollQueue = [];
+
+        Object.values(this.fetcherCallbacks).forEach((callback) => callback());
+        this.fetcherCallbacks = {};
+
+        await stopPromise;
     }
 
     @trace()
@@ -88,29 +93,23 @@ export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number];
         if (!batch) {
             // wait until new data is available or fetch manager is requested to stop
             await new Promise<void>((resolve) => {
-                const onData = () => {
-                    this.removeListener('stop', onStop);
-                    resolve();
-                };
-                const onStop = () => {
-                    this.removeListener('data', onData);
-                    resolve();
-                };
-                this.once('data', onData);
-                this.once('stop', onStop);
+                this.pollQueue.push(resolve);
             });
             return this.poll();
         }
 
         if ('kind' in batch && batch.kind === 'checkpoint') {
-            this.emit('checkpoint', batch.fetcherId);
+            this.fetcherCallbacks[batch.fetcherId]?.();
             return this.poll();
         }
 
+        this.pollQueue?.shift()?.();
+
         return batch as Exclude<Entry, Checkpoint>;
     }
 
-    private async onResponse(fetcherId: number, response: Awaited<ReturnType<(typeof API.FETCH)['response']>>) {
+    @trace()
+    private async onResponse(fetcherId: number, response: FetchResponse) {
         const { metadata, batchGranularity } = this.options;
 
         const batches = fetchResponseToBatches(response, batchGranularity, metadata);
@@ -120,30 +119,15 @@ export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number];
 
         // wait until all broker batches have been processed or fetch manager is requested to stop
         await new Promise<void>((resolve) => {
-            const onCheckpoint = (id: number) => {
-                if (id === fetcherId) {
-                    this.removeListener('checkpoint', onCheckpoint);
-                    this.removeListener('stop', onStop);
-                    resolve();
-                }
-            };
-            const onStop = () => {
-                this.removeListener('checkpoint', onCheckpoint);
-                resolve();
-            };
-            this.on('checkpoint', onCheckpoint);
-            this.once('stop', onStop);
-
-            this.queue.push(...batches);
-            this.queue.push({ kind: 'checkpoint', fetcherId });
-
-            this.emit('data');
+            this.fetcherCallbacks[fetcherId] = resolve;
+            this.queue.push(...batches, { kind: 'checkpoint', fetcherId });
+            this.pollQueue?.shift()?.();
         });
     }
 }
 
 const fetchResponseToBatches = (
-    batch: Awaited<ReturnType<typeof API.FETCH.response>>,
+    batch: FetchResponse,
     batchGranularity: BatchGranularity,
     metadata: Metadata,
 ): Batch[] => {
@@ -176,9 +160,9 @@ const fetchResponseToBatches = (
                 .map((topicPartition) => topicPartition.flatMap((partitionMessages) => partitionMessages))
                 .filter((messages) => messages.length);
         case 'partition':
-            return brokerTopics.flatMap((topicPartition) =>
-                topicPartition.map((partitionMessages) => partitionMessages),
-            );
+            return brokerTopics
+                .flatMap((topicPartition) => topicPartition.map((partitionMessages) => partitionMessages))
+                .filter((messages) => messages.length);
         default:
             throw new KafkaTSError(`Unhandled batch granularity: ${batchGranularity}`);
     }

package/src/consumer/fetcher.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'stream';
-import { API } from '../api';
+import { FetchResponse } from '../api/fetch';
 import { Assignment } from '../api/sync-group';
 import { createTracer } from '../utils/tracer';
 import { ConsumerGroup } from './consumer-group';
@@ -10,11 +10,11 @@ type FetcherOptions = {
     nodeId: number;
     assignment: Assignment;
     consumerGroup?: ConsumerGroup;
-    fetch: (nodeId: number, assignment: Assignment) => Promise<Awaited<ReturnType<(typeof API.FETCH)['response']>>>;
-    onResponse: (fetcherId: number, response: Awaited<ReturnType<(typeof API.FETCH)['response']>>) => Promise<void>;
+    fetch: (nodeId: number, assignment: Assignment) => Promise<FetchResponse>;
+    onResponse: (fetcherId: number, response: FetchResponse) => Promise<void>;
 };
 
-export class Fetcher extends EventEmitter<{ stop: []; stopped: []; data: []; drain: [] }> {
+export class Fetcher extends EventEmitter<{ stopped: [] }> {
     private isRunning = false;
 
     constructor(
@@ -25,17 +25,11 @@ export class Fetcher extends EventEmitter<{ stop: []; stopped: []; data: []; dra
     }
 
     public async loop() {
-        const { nodeId, assignment, consumerGroup, fetch, onResponse } = this.options;
-        
         this.isRunning = true;
-        this.once('stop', () => (this.isRunning = false));
-        
+
         try {
             while (this.isRunning) {
-                const response = await fetch(nodeId, assignment);
-                await consumerGroup?.handleLastHeartbeat();
-                await onResponse(this.fetcherId, response);
-                await consumerGroup?.handleLastHeartbeat();
+                await this.step();
             }
         } finally {
             this.isRunning = false;
@@ -44,14 +38,27 @@ export class Fetcher extends EventEmitter<{ stop: []; stopped: []; data: []; dra
     }
 
     @trace()
+    private async step() {
+        const { nodeId, assignment, consumerGroup, fetch, onResponse } = this.options;
+
+        const response = await fetch(nodeId, assignment);
+        if (!this.isRunning) {
+            return;
+        }
+        consumerGroup?.handleLastHeartbeat();
+        await onResponse(this.fetcherId, response);
+        consumerGroup?.handleLastHeartbeat();
+    }
+
     public async stop() {
         if (!this.isRunning) {
             return;
         }
 
-        this.emit('stop');
-        return new Promise<void>((resolve) => {
+        const stopPromise = new Promise<void>((resolve) => {
             this.once('stopped', resolve);
         });
+        this.isRunning = false;
+        return stopPromise;
     }
 }

package/src/consumer/offset-manager.ts

@@ -3,8 +3,11 @@ import { IsolationLevel } from '../api/fetch';
 import { Assignment } from '../api/sync-group';
 import { Cluster } from '../cluster';
 import { distributeMessagesToTopicPartitionLeaders } from '../distributors/messages-to-topic-partition-leaders';
+import { createTracer } from '../utils/tracer';
 import { ConsumerMetadata } from './consumer-metadata';
 
+const trace = createTracer('OffsetManager');
+
 type OffsetManagerOptions = {
     cluster: Cluster;
     metadata: ConsumerMetadata;
@@ -24,13 +27,18 @@ export class OffsetManager {
     public resolve(topic: string, partition: number, offset: bigint) {
         this.pendingOffsets[topic] ??= {};
         this.pendingOffsets[topic][partition] = offset;
-
-        this.currentOffsets[topic] ??= {};
-        this.currentOffsets[topic][partition] = offset;
     }
 
-    public flush() {
-        this.pendingOffsets = {};
+    public flush(topicPartitions: Record<string, Set<number>>) {
+        Object.entries(topicPartitions).forEach(([topic, partitions]) => {
+            this.currentOffsets[topic] ??= {};
+            partitions.forEach((partition) => {
+                if (this.pendingOffsets[topic]?.[partition]) {
+                    this.currentOffsets[topic][partition] = this.pendingOffsets[topic][partition];
+                    delete this.pendingOffsets[topic][partition];
+                }
+            });
+        });
     }
 
     public async fetchOffsets(options: { fromBeginning: boolean }) {
@@ -58,7 +66,6 @@ export class OffsetManager {
                 }),
             ),
         );
-        this.flush();
     }
 
     private async listOffsets({
@@ -83,11 +90,15 @@ export class OffsetManager {
                 })),
         });
 
+        const topicPartitions: Record<string, Set<number>> = {};
         offsets.topics.forEach(({ name, partitions }) => {
+            topicPartitions[name] ??= new Set();
             partitions.forEach(({ partitionIndex, offset }) => {
+                topicPartitions[name].add(partitionIndex);
                 this.resolve(name, partitionIndex, fromBeginning ? 0n : offset);
             });
         });
-        this.flush();
+
+        this.flush(topicPartitions);
     }
 }