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

package/dist/broker.d.ts

@@ -21,7 +21,7 @@ export declare class Broker {
     sendRequest: SendRequest;
     constructor(options: BrokerOptions);
     connect(): Promise<this>;
-    ensureConnected: () => Promise<this>;
+    ensureConnected(): Promise<void>;
     disconnect(): Promise<void>;
     private validateApiVersions;
     private saslHandshake;

package/dist/broker.js

@@ -4,7 +4,6 @@ exports.Broker = void 0;
 const api_1 = require("./api");
 const connection_1 = require("./connection");
 const error_1 = require("./utils/error");
-const memo_1 = require("./utils/memo");
 class Broker {
     options;
     connection;
@@ -25,7 +24,11 @@ class Broker {
         await this.saslAuthenticate();
         return this;
     }
-    ensureConnected = (0, memo_1.memo)(() => this.connect());
+    async ensureConnected() {
+        if (!this.connection.isConnected()) {
+            await this.connect();
+        }
+    }
     async disconnect() {
         await this.connection.disconnect();
     }

package/dist/cluster.d.ts

@@ -17,6 +17,7 @@ export declare class Cluster {
     private brokerMetadata;
     constructor(options: ClusterOptions);
     connect(): Promise<void>;
+    ensureConnected(): Promise<void>;
     disconnect(): Promise<void>;
     setSeedBroker: (nodeId: number) => Promise<void>;
     sendRequest: SendRequest;

package/dist/cluster.js

@@ -23,6 +23,9 @@ class Cluster {
         });
         this.brokerMetadata = Object.fromEntries(metadata.brokers.map((options) => [options.nodeId, options]));
     }
+    async ensureConnected() {
+        await Promise.all([this.seedBroker, ...Object.values(this.brokerById)].map((x) => x.ensureConnected()));
+    }
     async disconnect() {
         await Promise.all([this.seedBroker.disconnect(), ...Object.values(this.brokerById).map((x) => x.disconnect())]);
     }

package/dist/connection.d.ts

@@ -15,6 +15,7 @@ export declare class Connection {
     private lastCorrelationId;
     private chunks;
     constructor(options: ConnectionOptions);
+    isConnected(): boolean;
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     sendRequest<Request, Response>(api: Api<Request, Response>, body: Request): Promise<Response>;

package/dist/connection.js

@@ -55,6 +55,9 @@ class Connection {
     constructor(options) {
         this.options = options;
     }
+    isConnected() {
+        return !this.socket.pending && !this.socket.destroyed;
+    }
     async connect() {
         this.queue = {};
         this.chunks = [];

package/dist/producer/producer.js

@@ -15,7 +15,7 @@ const messages_to_topic_partition_leaders_1 = require("../distributors/messages-
 const partitioner_1 = require("../distributors/partitioner");
 const metadata_1 = require("../metadata");
 const delay_1 = require("../utils/delay");
-const memo_1 = require("../utils/memo");
+const error_1 = require("../utils/error");
 const tracer_1 = require("../utils/tracer");
 const trace = (0, tracer_1.createTracer)('Producer');
 class Producer {
@@ -43,63 +43,73 @@ 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(async ([nodeId, topicPartitionMessages]) => {
-            const topicData = Object.entries(topicPartitionMessages).map(([topic, partitionMessages]) => ({
-                name: topic,
-                partitionData: Object.entries(partitionMessages).map(([partition, messages]) => {
-                    const partitionIndex = parseInt(partition);
-                    let baseTimestamp;
-                    let maxTimestamp;
-                    messages.forEach(({ timestamp = defaultTimestamp }) => {
-                        if (!baseTimestamp || timestamp < baseTimestamp) {
-                            baseTimestamp = timestamp;
-                        }
-                        if (!maxTimestamp || timestamp > maxTimestamp) {
-                            maxTimestamp = timestamp;
-                        }
-                    });
-                    return {
-                        index: partitionIndex,
-                        baseOffset: 0n,
-                        partitionLeaderEpoch: -1,
-                        attributes: 0,
-                        lastOffsetDelta: messages.length - 1,
-                        baseTimestamp: baseTimestamp ?? 0n,
-                        maxTimestamp: maxTimestamp ?? 0n,
-                        producerId: this.producerId,
-                        producerEpoch: 0,
-                        baseSequence: this.getSequence(topic, partitionIndex),
-                        records: messages.map((message, index) => ({
+        try {
+            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);
+                        let baseTimestamp;
+                        let maxTimestamp;
+                        messages.forEach(({ timestamp = defaultTimestamp }) => {
+                            if (!baseTimestamp || timestamp < baseTimestamp) {
+                                baseTimestamp = timestamp;
+                            }
+                            if (!maxTimestamp || timestamp > maxTimestamp) {
+                                maxTimestamp = timestamp;
+                            }
+                        });
+                        return {
+                            index: partitionIndex,
+                            baseOffset: 0n,
+                            partitionLeaderEpoch: -1,
                             attributes: 0,
-                            timestampDelta: (message.timestamp ?? defaultTimestamp) - (baseTimestamp ?? 0n),
-                            offsetDelta: index,
-                            key: message.key ?? null,
-                            value: message.value,
-                            headers: Object.entries(message.headers ?? {}).map(([key, value]) => ({ key, value })),
-                        })),
-                    };
-                }),
-            }));
-            await this.cluster.sendRequestToNode(parseInt(nodeId))(api_1.API.PRODUCE, {
-                transactionalId: null,
-                acks,
-                timeoutMs: 5000,
-                topicData,
-            });
-            topicData.forEach(({ name, partitionData }) => {
-                partitionData.forEach(({ index, records }) => {
-                    this.updateSequence(name, index, records.length);
+                            lastOffsetDelta: messages.length - 1,
+                            baseTimestamp: baseTimestamp ?? 0n,
+                            maxTimestamp: maxTimestamp ?? 0n,
+                            producerId: this.producerId,
+                            producerEpoch: 0,
+                            baseSequence: this.getSequence(topic, partitionIndex),
+                            records: messages.map((message, index) => ({
+                                attributes: 0,
+                                timestampDelta: (message.timestamp ?? defaultTimestamp) - (baseTimestamp ?? 0n),
+                                offsetDelta: index,
+                                key: message.key ?? null,
+                                value: message.value,
+                                headers: Object.entries(message.headers ?? {}).map(([key, value]) => ({ key, value })),
+                            })),
+                        };
+                    }),
+                }));
+                await this.cluster.sendRequestToNode(parseInt(nodeId))(api_1.API.PRODUCE, {
+                    transactionalId: null,
+                    acks,
+                    timeoutMs: 5000,
+                    topicData,
                 });
-            });
-        }));
+                topicData.forEach(({ name, partitionData }) => {
+                    partitionData.forEach(({ index, records }) => {
+                        this.updateSequence(name, index, records.length);
+                    });
+                });
+            }));
+        }
+        catch (error) {
+            if ((error instanceof error_1.KafkaTSApiError) && error.errorCode === api_1.API_ERROR.OUT_OF_ORDER_SEQUENCE_NUMBER) {
+                await this.initProducerId();
+            }
+            throw error;
+        }
     }
     async close() {
         await this.cluster.disconnect();
     }
-    ensureConnected = (0, memo_1.memo)(async () => {
-        await this.cluster.connect();
-        await this.initProducerId();
-    });
+    async ensureConnected() {
+        await this.cluster.ensureConnected();
+        if (!this.producerId) {
+            await this.initProducerId();
+        }
+    }
     async initProducerId() {
         try {
             const result = await this.cluster.sendRequest(api_1.API.INIT_PRODUCER_ID, {

package/package.json

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

package/dist/utils/memo.d.ts

@@ -1 +0,0 @@
-export declare const memo: <T extends (...args: any[]) => any>(fn: T) => (...args: Parameters<T>) => ReturnType<T>;

package/dist/utils/memo.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.memo = void 0;
-const memo = (fn) => {
-    const cache = {};
-    return (...args) => {
-        const key = JSON.stringify(args);
-        if (cache[key]) {
-            return cache[key];
-        }
-        const result = fn(...args);
-        cache[key] = result;
-        return result;
-    };
-};
-exports.memo = memo;