kafka-ts 0.0.6-beta.5 → 0.0.6-beta.7

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

@@ -7,7 +7,7 @@ const error_1 = require("./utils/error");
 const logger_1 = require("./utils/logger");
 class Cluster {
     options;
-    seedBroker = new broker_1.Broker({ clientId: null, sasl: null, ssl: null, options: { port: 9092 } });
+    seedBroker;
     brokerById = {};
     brokerMetadata = {};
     constructor(options) {
@@ -23,11 +23,20 @@ class Cluster {
         });
         this.brokerMetadata = Object.fromEntries(metadata.brokers.map((options) => [options.nodeId, options]));
     }
+    async ensureConnected() {
+        if (!this.seedBroker) {
+            return this.connect();
+        }
+        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())]);
+        await Promise.all([
+            this.seedBroker?.disconnect(),
+            ...Object.values(this.brokerById).map((x) => x.disconnect()),
+        ]);
     }
     setSeedBroker = async (nodeId) => {
-        await this.seedBroker.disconnect();
+        await this.seedBroker?.disconnect();
         this.seedBroker = await this.acquireBroker(nodeId);
     };
     sendRequest = (...args) => this.seedBroker.sendRequest(...args);

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

@@ -16,7 +16,6 @@ const partitioner_1 = require("../distributors/partitioner");
 const metadata_1 = require("../metadata");
 const delay_1 = require("../utils/delay");
 const error_1 = require("../utils/error");
-const memo_1 = require("../utils/memo");
 const tracer_1 = require("../utils/tracer");
 const trace = (0, tracer_1.createTracer)('Producer');
 class Producer {
@@ -105,10 +104,12 @@ class Producer {
     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.5",
+    "version": "0.0.6-beta.7",
     "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;