kafka-ts 0.0.6-beta.0 → 0.0.6-beta.2

package/dist/connection.js

@@ -112,9 +112,17 @@ class Connection {
             }
         });
         clearTimeout(timeout);
-        const response = await api.response(responseDecoder);
-        (0, assert_1.default)(responseDecoder.getOffset() - 4 === responseSize, `Buffer not correctly consumed: ${responseDecoder.getOffset() - 4} !== ${responseSize}`);
-        return response;
+        try {
+            const response = await api.response(responseDecoder);
+            (0, assert_1.default)(responseDecoder.getOffset() - 4 === responseSize, `Buffer not correctly consumed: ${responseDecoder.getOffset() - 4} !== ${responseSize}`);
+            return response;
+        }
+        catch (error) {
+            if (error instanceof error_1.KafkaTSApiError) {
+                error.request = JSON.stringify(body, logger_1.jsonSerializer);
+            }
+            throw error;
+        }
     }
     write(buffer) {
         return new Promise((resolve, reject) => {

package/dist/consumer/offset-manager.js

@@ -49,7 +49,13 @@ class OffsetManager {
                 .flatMap(([topic, partitions]) => partitions.map((partition) => ({ topic, partition })))
                 .map(({ topic, partition }) => ({
                 name: topic,
-                partitions: [{ partitionIndex: partition, currentLeaderEpoch: -1, timestamp: -1n }],
+                partitions: [
+                    {
+                        partitionIndex: partition,
+                        currentLeaderEpoch: -1,
+                        timestamp: fromBeginning ? -2n : -1n,
+                    },
+                ],
             })),
         });
         const topicPartitions = {};
@@ -57,7 +63,7 @@ class OffsetManager {
             topicPartitions[name] ??= new Set();
             partitions.forEach(({ partitionIndex, offset }) => {
                 topicPartitions[name].add(partitionIndex);
-                this.resolve(name, partitionIndex, fromBeginning ? 0n : offset);
+                this.resolve(name, partitionIndex, offset);
             });
         });
         this.flush(topicPartitions);

package/dist/producer/producer.d.ts

@@ -20,5 +20,6 @@ export declare class Producer {
     close(): Promise<void>;
     private ensureConnected;
     private initProducerId;
-    private getBaseSequence;
+    private nextBaseSequence;
+    private revertBaseSequence;
 }

package/dist/producer/producer.js

@@ -43,11 +43,8 @@ class Producer {
         const topics = Array.from(new Set(messages.map((message) => message.topic)));
         await this.metadata.fetchMetadataIfNecessary({ topics, allowTopicAutoCreation });
         const nodeTopicPartitionMessages = (0, messages_to_topic_partition_leaders_1.distributeMessagesToTopicPartitionLeaders)(messages.map((message) => ({ ...message, partition: this.partition(message) })), this.metadata.getTopicPartitionLeaderIds());
-        await Promise.all(Object.entries(nodeTopicPartitionMessages).map(([nodeId, topicPartitionMessages]) => this.cluster.sendRequestToNode(parseInt(nodeId))(api_1.API.PRODUCE, {
-            transactionalId: null,
-            acks,
-            timeoutMs: 5000,
-            topicData: Object.entries(topicPartitionMessages).map(([topic, partitionMessages]) => ({
+        await Promise.all(Object.entries(nodeTopicPartitionMessages).map(async ([nodeId, topicPartitionMessages]) => {
+            const topicData = Object.entries(topicPartitionMessages).map(([topic, partitionMessages]) => ({
                 name: topic,
                 partitionData: Object.entries(partitionMessages).map(([partition, messages]) => {
                     const partitionIndex = parseInt(partition);
@@ -61,7 +58,7 @@ class Producer {
                             maxTimestamp = timestamp;
                         }
                     });
-                    const baseSequence = this.getBaseSequence(topic, partitionIndex, messages.length);
+                    const baseSequence = this.nextBaseSequence(topic, partitionIndex, messages.length);
                     return {
                         index: partitionIndex,
                         baseOffset: 0n,
@@ -86,8 +83,24 @@ class Producer {
                         })),
                     };
                 }),
-            })),
-        })));
+            }));
+            try {
+                return await this.cluster.sendRequestToNode(parseInt(nodeId))(api_1.API.PRODUCE, {
+                    transactionalId: null,
+                    acks,
+                    timeoutMs: 5000,
+                    topicData,
+                });
+            }
+            catch (error) {
+                topicData.forEach(({ name, partitionData }) => {
+                    partitionData.forEach(({ index, records }) => {
+                        this.revertBaseSequence(name, index, records.length);
+                    });
+                });
+                throw error;
+            }
+        }));
     }
     async close() {
         await this.cluster.disconnect();
@@ -116,13 +129,16 @@ class Producer {
             throw error;
         }
     }
-    getBaseSequence(topic, partition, messagesCount) {
+    nextBaseSequence(topic, partition, messagesCount) {
         this.sequences[topic] ??= {};
         this.sequences[topic][partition] ??= 0;
         const baseSequence = this.sequences[topic][partition];
         this.sequences[topic][partition] += messagesCount;
         return baseSequence;
     }
+    revertBaseSequence(topic, partition, messagesCount) {
+        this.sequences[topic][partition] -= messagesCount;
+    }
 }
 exports.Producer = Producer;
 __decorate([

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;
+    request: string | undefined;
     constructor(errorCode: number, errorMessage: string | null, response: T);
 }
 export declare class ConnectionError extends KafkaTSError {

package/dist/utils/error.js

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

package/dist/utils/logger.js

@@ -3,7 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setLogger = exports.log = exports.jsonSerializer = void 0;
 const jsonSerializer = (_, v) => {
     if (v instanceof Error) {
-        return { name: v.name, message: v.message, stack: v.stack, cause: v.cause };
+        return Object.getOwnPropertyNames(v).reduce((acc, key) => {
+            acc[key] = v[key];
+            return acc;
+        }, {});
+    }
+    if (Buffer.isBuffer(v)) {
+        return v.toString();
     }
     if (typeof v === 'bigint') {
         return v.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kafka-ts",
-    "version": "0.0.6-beta.0",
+    "version": "0.0.6-beta.2",
     "main": "dist/index.js",
     "author": "Priit Käärd",
     "license": "MIT",
@@ -10,7 +10,7 @@
     },
     "scripts": {
         "start": "docker-compose down && KAFKA_VERSION=3.7.1 docker-compose up -d && sleep 5 && bash ./scripts/create-scram-user.sh",
-        "version:beta": "npm version prerelease --preid=beta",
+        "version:prerelease": "npm version prerelease",
         "version:patch": "npm version patch",
         "format": "prettier --write .",
         "build": "tsc",