kafka-ts 1.1.3 → 1.1.5

package/dist/connection.js

@@ -70,10 +70,11 @@ class Connection {
                     ...(connection.host && !(0, net_1.isIP)(connection.host) && { servername: connection.host }),
                 }, resolve)
                 : net_1.default.connect(connection, resolve);
+            this.socket.setKeepAlive(true, 30_000);
             this.socket.once('error', reject);
         });
         this.socket.removeAllListeners('error');
-        this.socket.on('error', error => logger_1.log.debug('Socket error', { error }));
+        this.socket.on('error', (error) => logger_1.log.debug('Socket error', { error }));
         this.socket.on('data', (data) => this.handleData(data));
         this.socket.once('close', async () => {
             Object.values(this.queue).forEach(({ reject }) => {
@@ -118,7 +119,7 @@ class Connection {
         clearTimeout(timeout);
         try {
             const response = await api.response(responseDecoder);
-            (0, assert_1.default)(responseDecoder.getOffset() - 4 === responseSize, `Buffer not correctly consumed: ${responseDecoder.getOffset() - 4} !== ${responseSize}`);
+            (0, assert_1.default)(responseDecoder.getOffset() === responseSize, `Buffer not correctly consumed: ${responseDecoder.getOffset()} !== ${responseSize}`);
             return response;
         }
         catch (error) {
@@ -145,23 +146,25 @@ class Connection {
     handleData(buffer) {
         this.chunks.push(buffer);
         const decoder = new decoder_1.Decoder(Buffer.concat(this.chunks));
-        if (!decoder.canReadBytes(4)) {
+        if (!decoder.canReadBytes(4))
             return;
-        }
-        const size = decoder.readInt32();
-        if (size !== decoder.getBufferLength() - 4) {
+        const responseSize = decoder.readInt32();
+        if (!decoder.canReadBytes(responseSize))
             return;
-        }
-        const correlationId = decoder.readInt32();
+        const responseDecoder = new decoder_1.Decoder(decoder.read(responseSize));
+        const correlationId = responseDecoder.readInt32();
         const context = this.queue[correlationId];
         if (context) {
             delete this.queue[correlationId];
-            context.resolve({ responseDecoder: decoder, responseSize: size });
+            context.resolve({ responseDecoder, responseSize });
         }
         else {
             logger_1.log.debug('Could not find pending request for correlationId', { correlationId });
         }
         this.chunks = [];
+        const remaining = decoder.read();
+        if (remaining.length)
+            this.handleData(remaining);
     }
     nextCorrelationId() {
         return this.lastCorrelationId++;

package/package.json

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