@platformatic/kafka 2.4.0 → 2.6.0

package/dist/network/connection.js

@@ -50,6 +50,7 @@ export class Connection extends TypedEventEmitter {
     #responseReader;
     #socket;
     #socketMustBeDrained;
+    #detectMissingTLS;
     #reauthenticationTimeout;
     constructor(clientId, options = {}) {
         super();
@@ -75,6 +76,7 @@ export class Connection extends TypedEventEmitter {
         this.#responseBuffer = new DynamicBuffer();
         this.#responseReader = new Reader(this.#responseBuffer);
         this.#socketMustBeDrained = false;
+        this.#detectMissingTLS = !this.#options.tls;
         notifyCreation('connection', this);
     }
     /* c8 ignore next 3 - Simple getter */
@@ -120,6 +122,7 @@ export class Connection extends TypedEventEmitter {
                 return callback[kCallbackPromise];
             }
             this.#status = ConnectionStatuses.CONNECTING;
+            this.#detectMissingTLS = !this.#options.tls;
             const connectionOptions = {
                 timeout: this.#options.connectTimeout
             };
@@ -259,7 +262,7 @@ export class Connection extends TypedEventEmitter {
     }
     send(apiKey, apiVersion, createPayload, responseParser, hasRequestHeaderTaggedFields, hasResponseHeaderTaggedFields, callback) {
         // Correlation ID is a 32-bit integer in the protocol, so we need to wrap around after 2^31 - 1
-        const correlationId = (this.#correlationId + 1) & 0x7FFFFFFF;
+        const correlationId = (this.#correlationId + 1) & 0x7fffffff;
         this.#correlationId = correlationId;
         const diagnostic = createDiagnosticContext({
             connection: this,
@@ -467,6 +470,27 @@ export class Connection extends TypedEventEmitter {
         correlation_id => INT32
     */
     #onData(chunk) {
+        if (this.#detectMissingTLS) {
+            this.#detectMissingTLS = false;
+            if (this.#isTLSRecord(chunk)) {
+                const error = new UserError('Broker requires TLS.');
+                this.#status = ConnectionStatuses.ERROR;
+                for (const request of this.#afterDrainRequests) {
+                    if (!request.noResponse) {
+                        clearTimeout(request.timeoutHandle);
+                        request.callback(error, undefined);
+                    }
+                }
+                this.#afterDrainRequests = [];
+                for (const request of this.#inflightRequests.values()) {
+                    clearTimeout(request.timeoutHandle);
+                    request.callback(error, undefined);
+                }
+                this.#inflightRequests.clear();
+                this.#socket.destroy();
+                return;
+            }
+        }
         this.#responseBuffer.append(chunk);
         // There is at least one message size to add
         // Note that here the initial position is always 0
@@ -547,6 +571,12 @@ export class Connection extends TypedEventEmitter {
         this.#socketMustBeDrained = false;
         this.emit('drain');
     }
+    #isTLSRecord(chunk) {
+        return (chunk.length >= 3 &&
+            (chunk[0] === 0x14 || chunk[0] === 0x15 || chunk[0] === 0x16 || chunk[0] === 0x17) &&
+            chunk[1] === 0x03 &&
+            chunk[2] <= 0x04);
+    }
     #onClose() {
         this.#status = ConnectionStatuses.CLOSED;
         this.emit('close');

package/dist/registries/confluent-schema-registry.d.ts

@@ -1,4 +1,4 @@
-import { type ValidateFunction } from 'ajv';
+import { type Options, type ValidateFunction } from 'ajv';
 import { type Type } from 'avsc';
 import { type Root } from 'protobufjs';
 import { type Callback } from '../apis/definitions.ts';
@@ -20,6 +20,7 @@ export interface ConfluentSchemaRegistryOptions {
     };
     protobufTypeMapper?: ConfluentSchemaRegistryProtobufTypeMapper;
     jsonValidateSend?: boolean;
+    jsonAjvOptions?: Options;
 }
 export interface Schema {
     id: number;

package/dist/registries/confluent-schema-registry.js

@@ -1,7 +1,8 @@
+import { Ajv2020 } from 'ajv/dist/2020.js';
 import avro from 'avsc';
 import { createRequire } from 'node:module';
 import { jsonDeserializer, jsonSerializer, stringDeserializer, stringSerializer } from "../clients/serde.js";
-import { ajv, EMPTY_BUFFER, UnsupportedFormatError, UserError } from "../index.js";
+import { EMPTY_BUFFER, UnsupportedFormatError, UserError } from "../index.js";
 import { getCredential } from "../protocol/sasl/utils.js";
 import { AbstractSchemaRegistry } from "./abstract.js";
 const require = createRequire(import.meta.url);
@@ -17,6 +18,7 @@ export class ConfluentSchemaRegistry extends AbstractSchemaRegistry {
     #protobufParse;
     #protobufTypeMapper;
     #jsonValidateSend;
+    #jsonAjv;
     #auth;
     constructor(options) {
         super();
@@ -24,6 +26,7 @@ export class ConfluentSchemaRegistry extends AbstractSchemaRegistry {
         this.#schemas = new Map();
         this.#protobufTypeMapper = options.protobufTypeMapper ?? defaultProtobufTypeMapper;
         this.#jsonValidateSend = options.jsonValidateSend ?? false;
+        this.#jsonAjv = new Ajv2020({ allErrors: true, coerceTypes: false, strict: true, ...options.jsonAjvOptions });
         this.#auth = options.auth;
     }
     getSchemaId(message, type) {
@@ -75,7 +78,7 @@ export class ConfluentSchemaRegistry extends AbstractSchemaRegistry {
                     this.#schemas.set(id, { id, type: 'protobuf', schema: this.#protobufParse(schema).root });
                     break;
                 case 'JSON':
-                    this.#schemas.set(id, { id, type: 'json', schema: ajv.compile(JSON.parse(schema)) });
+                    this.#schemas.set(id, { id, type: 'json', schema: this.#jsonAjv.compile(JSON.parse(schema)) });
                     break;
             }
             process.nextTick(callback);
@@ -169,7 +172,7 @@ export class ConfluentSchemaRegistry extends AbstractSchemaRegistry {
                     const validate = schema.schema;
                     const valid = validate(data);
                     if (!valid) {
-                        throw new UserError(`JSON Schema validation failed before serialization: ${ajv.errorsText(validate.errors)}`, { type, data, headers, validationErrors: validate.errors });
+                        throw new UserError(`JSON Schema validation failed before serialization: ${this.#jsonAjv.errorsText(validate.errors)}`, { type, data, headers, validationErrors: validate.errors });
                     }
                 }
                 encodedMessage = Buffer.from(JSON.stringify(data));
@@ -208,7 +211,7 @@ export class ConfluentSchemaRegistry extends AbstractSchemaRegistry {
                 const validate = schema.schema;
                 const valid = validate(parsed);
                 if (!valid) {
-                    throw new UserError(`JSON Schema validation failed before deserialization: ${ajv.errorsText(validate.errors)}`, { type, data: parsed, headers, validationErrors: validate.errors });
+                    throw new UserError(`JSON Schema validation failed before deserialization: ${this.#jsonAjv.errorsText(validate.errors)}`, { type, data: parsed, headers, validationErrors: validate.errors });
                 }
                 return parsed;
             }

package/dist/typescript-4/dist/registries/confluent-schema-registry.d.ts

@@ -1,4 +1,4 @@
-import { type ValidateFunction } from 'ajv';
+import { type Options, type ValidateFunction } from 'ajv';
 import { type Type } from 'avsc';
 import { type Root } from 'protobufjs';
 import { type Callback } from "../apis/definitions";
@@ -20,6 +20,7 @@ export interface ConfluentSchemaRegistryOptions {
   };
   protobufTypeMapper?: ConfluentSchemaRegistryProtobufTypeMapper;
   jsonValidateSend?: boolean;
+  jsonAjvOptions?: Options;
 }
 export interface Schema {
   id: number;

package/dist/version.js

@@ -1,2 +1,2 @@
 export const name = "@platformatic/kafka";
-export const version = "2.4.0";
+export const version = "2.6.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/kafka",
-  "version": "2.4.0",
+  "version": "2.6.0",
   "description": "Modern and performant client for Apache Kafka",
   "homepage": "https://github.com/platformatic/kafka",
   "author": "Platformatic Inc. <oss@platformatic.dev> (https://platformatic.dev)",