kafka-ts 0.0.3-beta → 0.0.3

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,10 +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();
@@ -53,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,
@@ -70,7 +84,7 @@ export class ConsumerGroup {
     private async joinGroup(): Promise<void> {
         const { cluster, groupId, groupInstanceId, sessionTimeoutMs, rebalanceTimeoutMs, topics } = this.options;
         try {
-            const response = await cluster.sendRequestToNode(this.coordinatorId)(API.JOIN_GROUP, {
+            const response = await cluster.sendRequest(API.JOIN_GROUP, {
                 groupId,
                 groupInstanceId,
                 memberId: this.memberId,
@@ -113,7 +127,7 @@ export class ConsumerGroup {
             assignments = Object.entries(memberAssignments).map(([memberId, assignment]) => ({ memberId, assignment }));
         }
 
-        const response = await cluster.sendRequestToNode(this.coordinatorId)(API.SYNC_GROUP, {
+        const response = await cluster.sendRequest(API.SYNC_GROUP, {
             groupId,
             groupInstanceId,
             memberId: this.memberId,
@@ -133,8 +147,6 @@ export class ConsumerGroup {
             groups: [
                 {
                     groupId,
-                    memberId: this.memberId,
-                    memberEpoch: -1,
                     topics: topics
                         .map((topic) => ({ name: topic, partitionIndexes: assignment[topic] ?? [] }))
                         .filter(({ partitionIndexes }) => partitionIndexes.length),
@@ -144,31 +156,35 @@ export class ConsumerGroup {
         };
         if (!request.groups.length) return;
 
-        const response = await cluster.sendRequestToNode(this.coordinatorId)(API.OFFSET_FETCH, request);
+        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,
                 })),
@@ -177,13 +193,13 @@ export class ConsumerGroup {
         if (!request.topics.length) {
             return;
         }
-        await cluster.sendRequestToNode(this.coordinatorId)(API.OFFSET_COMMIT, request);
-        offsetManager.flush();
+        await cluster.sendRequest(API.OFFSET_COMMIT, request);
+        this.emit('offsetCommit');
     }
 
     public async heartbeat() {
         const { cluster, groupId, groupInstanceId } = this.options;
-        await cluster.sendRequestToNode(this.coordinatorId)(API.HEARTBEAT, {
+        await cluster.sendRequest(API.HEARTBEAT, {
             groupId,
             groupInstanceId,
             memberId: this.memberId,
@@ -192,10 +208,14 @@ export class ConsumerGroup {
     }
 
     public async leaveGroup() {
+        if (this.coordinatorId === -1) {
+            return;
+        }
+
         const { cluster, groupId, groupInstanceId } = this.options;
         this.stopHeartbeater();
         try {
-            await cluster.sendRequestToNode(this.coordinatorId)(API.LEAVE_GROUP, {
+            await cluster.sendRequest(API.LEAVE_GROUP, {
                 groupId,
                 members: [{ memberId: this.memberId, groupInstanceId, reason: null }],
             });

package/src/consumer/consumer.ts

@@ -1,17 +1,21 @@
+import EventEmitter from 'events';
 import { API, API_ERROR } from '../api';
 import { IsolationLevel } from '../api/fetch';
 import { Assignment } from '../api/sync-group';
 import { Cluster } from '../cluster';
-import { distributeAssignmentsToNodes } from '../distributors/assignments-to-replicas';
+import { distributeMessagesToTopicPartitionLeaders } from '../distributors/messages-to-topic-partition-leaders';
 import { Message } from '../types';
 import { delay } from '../utils/delay';
 import { ConnectionError, KafkaTSApiError } from '../utils/error';
-import { defaultRetrier, Retrier } from '../utils/retrier';
+import { log } from '../utils/logger';
+import { createTracer } from '../utils/tracer';
 import { ConsumerGroup } from './consumer-group';
 import { ConsumerMetadata } from './consumer-metadata';
-import { FetchManager, Granularity } from './fetch-manager';
+import { BatchGranularity, FetchManager } from './fetch-manager';
 import { OffsetManager } from './offset-manager';
 
+const trace = createTracer('Consumer');
+
 export type ConsumerOptions = {
     topics: string[];
     groupId?: string | null;
@@ -26,12 +30,11 @@ export type ConsumerOptions = {
     partitionMaxBytes?: number;
     allowTopicAutoCreation?: boolean;
     fromBeginning?: boolean;
-    retrier?: Retrier;
-    granularity?: Granularity;
+    batchGranularity?: BatchGranularity;
     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;
@@ -43,6 +46,8 @@ export class Consumer {
         private cluster: Cluster,
         options: ConsumerOptions,
     ) {
+        super();
+
         this.options = {
             ...options,
             groupId: options.groupId ?? null,
@@ -52,13 +57,12 @@ export class Consumer {
             rebalanceTimeoutMs: options.rebalanceTimeoutMs ?? 60_000,
             maxWaitMs: options.maxWaitMs ?? 5000,
             minBytes: options.minBytes ?? 1,
-            maxBytes: options.maxBytes ?? 1_000_000,
-            partitionMaxBytes: options.partitionMaxBytes ?? 1_000_000,
+            maxBytes: options.maxBytes ?? 1_048_576,
+            partitionMaxBytes: options.partitionMaxBytes ?? 1_048_576,
             isolationLevel: options.isolationLevel ?? IsolationLevel.READ_UNCOMMITTED,
             allowTopicAutoCreation: options.allowTopicAutoCreation ?? false,
             fromBeginning: options.fromBeginning ?? false,
-            retrier: options.retrier ?? defaultRetrier,
-            granularity: options.granularity ?? 'broker',
+            batchGranularity: options.batchGranularity ?? 'partition',
             concurrency: options.concurrency ?? 1,
         };
 
@@ -80,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;
 
@@ -94,16 +100,17 @@ export class Consumer {
             await this.offsetManager.fetchOffsets({ fromBeginning });
             await this.consumerGroup?.join();
         } catch (error) {
-            console.error(error);
-            console.debug(`Restarting consumer in 1 second...`);
+            log.warn('Failed to start consumer', error);
+            log.debug(`Restarting consumer in 1 second...`);
             await delay(1000);
 
             if (this.stopHook) return (this.stopHook as () => void)();
             return this.close(true).then(() => this.start());
         }
-        setImmediate(() => this.startFetchManager());
+        this.startFetchManager();
     }
 
+    @trace()
     public async close(force = false): Promise<void> {
         if (!force) {
             await new Promise<void>(async (resolve) => {
@@ -111,22 +118,33 @@ export class Consumer {
                 await this.fetchManager?.stop();
             });
         }
-        await this.consumerGroup
-            ?.leaveGroup()
-            .catch((error) => console.warn(`Failed to leave group: ${error.message}`));
-        await this.cluster.disconnect().catch((error) => console.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 () => {
-        const { granularity, concurrency } = this.options;
+    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(
-                distributeAssignmentsToNodes(
-                    this.metadata.getAssignment(),
-                    this.metadata.getTopicPartitionReplicaIds(),
+                distributeMessagesToTopicPartitionLeaders(
+                    Object.entries(this.metadata.getAssignment()).flatMap(([topic, partitions]) =>
+                        partitions.map((partition) => ({ topic, partition })),
+                    ),
+                    this.metadata.getTopicPartitionLeaderIds(),
                 ),
-            ).map(([nodeId, assignment]) => ({ nodeId: parseInt(nodeId), assignment }));
+            ).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);
@@ -137,7 +155,7 @@ export class Consumer {
                 metadata: this.metadata,
                 consumerGroup: this.consumerGroup,
                 nodeAssignments,
-                granularity,
+                batchGranularity,
                 concurrency: numProcessors,
             });
 
@@ -145,19 +163,19 @@ export class Consumer {
                 await this.fetchManager.start();
 
                 if (!nodeAssignments.length) {
-                    console.debug('No partitions assigned. Waiting for reassignment...');
+                    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();
 
                 if ((error as KafkaTSApiError).errorCode === API_ERROR.REBALANCE_IN_PROGRESS) {
-                    console.debug('Rebalance in progress...');
+                    log.debug('Rebalance in progress...');
                     continue;
                 }
                 if ((error as KafkaTSApiError).errorCode === API_ERROR.FENCED_INSTANCE_ID) {
-                    console.debug('New consumer with the same groupInstanceId joined. Exiting the consumer...');
+                    log.debug('New consumer with the same groupInstanceId joined. Exiting the consumer...');
                     this.close();
                     break;
                 }
@@ -165,42 +183,45 @@ export class Consumer {
                     error instanceof ConnectionError ||
                     (error instanceof KafkaTSApiError && error.errorCode === API_ERROR.NOT_COORDINATOR)
                 ) {
-                    console.debug(`${error.message}. Restarting consumer...`);
+                    log.debug(`${error.message}. Restarting consumer...`);
                     this.close().then(() => this.start());
                     break;
                 }
-                console.error(error);
+                log.error((error as Error).message, error);
                 this.close();
                 break;
             }
         }
         this.stopHook?.();
-    };
+    }
 
+    @trace((messages) => ({ count: messages.length }))
     private async process(messages: Required<Message>[]) {
         const { options } = this;
-        const { retrier } = options;
+
+        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 retrier(() => options.onBatch(messages));
+            await options.onBatch(messages);
 
             messages.forEach(({ topic, partition, offset }) =>
                 this.offsetManager.resolve(topic, partition, offset + 1n),
             );
         } else if ('onMessage' in options) {
-            try {
-                for (const message of messages) {
-                    await retrier(() => 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';
@@ -11,30 +10,30 @@ import { Processor } from './processor';
 
 const trace = createTracer('FetchManager');
 
-export type Granularity = 'partition' | 'topic' | 'broker';
+export type BatchGranularity = 'partition' | 'topic' | 'broker';
 
 type FetchManagerOptions = {
-    fetch: (nodeId: number, assignment: Assignment) => Promise<ReturnType<(typeof API.FETCH)['response']>>;
+    fetch: (nodeId: number, assignment: Assignment) => Promise<FetchResponse>;
     process: (batch: Batch) => Promise<void>;
     metadata: Metadata;
     consumerGroup?: ConsumerGroup;
     nodeAssignments: { nodeId: number; assignment: Assignment }[];
-    granularity: Granularity;
+    batchGranularity: BatchGranularity;
     concurrency: number;
 };
 
 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()
@@ -86,59 +91,44 @@ export class FetchManager extends EventEmitter<{ data: []; checkpoint: [number];
 
         const batch = this.queue.shift();
         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: ReturnType<(typeof API.FETCH)['response']>) {
-        const { metadata, granularity } = this.options;
-
-        const batches = fetchResponseToBatches(response, granularity, metadata);
-        if (batches.length) {
-            this.queue.push(...batches);
-            this.queue.push({ kind: 'checkpoint', fetcherId });
+    @trace()
+    private async onResponse(fetcherId: number, response: FetchResponse) {
+        const { metadata, batchGranularity } = this.options;
 
-            this.emit('data');
-            await new Promise<void>((resolve) => {
-                const onCheckpoint = (id: number) => {
-                    if (id === fetcherId) {
-                        this.removeListener('stop', onStop);
-                        resolve();
-                    }
-                };
-                const onStop = () => {
-                    this.removeListener('checkpoint', onCheckpoint);
-                    resolve();
-                };
-                this.once('checkpoint', onCheckpoint);
-                this.once('stop', onStop);
-            });
+        const batches = fetchResponseToBatches(response, batchGranularity, metadata);
+        if (!batches.length) {
+            return;
         }
+
+        // wait until all broker batches have been processed or fetch manager is requested to stop
+        await new Promise<void>((resolve) => {
+            this.fetcherCallbacks[fetcherId] = resolve;
+            this.queue.push(...batches, { kind: 'checkpoint', fetcherId });
+            this.pollQueue?.shift()?.();
+        });
     }
 }
 
 const fetchResponseToBatches = (
-    batch: ReturnType<typeof API.FETCH.response>,
-    granularity: Granularity,
+    batch: FetchResponse,
+    batchGranularity: BatchGranularity,
     metadata: Metadata,
 ): Batch[] => {
     const brokerTopics = batch.responses.map(({ topicId, partitions }) =>
@@ -159,7 +149,7 @@ const fetchResponseToBatches = (
         ),
     );
 
-    switch (granularity) {
+    switch (batchGranularity) {
         case 'broker':
             const messages = brokerTopics.flatMap((topicPartition) =>
                 topicPartition.flatMap((partitionMessages) => partitionMessages),
@@ -170,10 +160,10 @@ 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: ${granularity}`);
+            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<ReturnType<(typeof API.FETCH)['response']>>;
-    onResponse: (fetcherId: number, response: 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;
     }
 }