@platformatic/kafka 1.7.0 → 1.8.0

package/dist/clients/base/base.js

@@ -148,13 +148,26 @@ export class Base extends EventEmitter {
         }, callback);
     }
     [kMetadata](options, callback) {
-        const metadataMaxAge = options.metadataMaxAge ?? this[kOptions].metadataMaxAge;
-        const isStale = options.forceUpdate ||
-            !this.#metadata ||
-            Date.now() > this.#metadata.lastUpdate + metadataMaxAge ||
-            options.topics.some(topic => !this.#metadata?.topics.has(topic));
-        if (!isStale) {
-            callback(null, this.#metadata);
+        const expiralDate = Date.now() - (options.metadataMaxAge ?? this[kOptions].metadataMaxAge);
+        let topicsToFetch = [];
+        // Determine which topics we need to fetch
+        if (!this.#metadata || options.forceUpdate) {
+            topicsToFetch = options.topics;
+        }
+        else {
+            for (const topic of options.topics) {
+                const existingTopic = this.#metadata.topics.get(topic);
+                if (!existingTopic || existingTopic.lastUpdate < expiralDate) {
+                    topicsToFetch.push(topic);
+                }
+            }
+        }
+        // All topics are already up-to-date, simply return them
+        if (this.#metadata && !topicsToFetch.length) {
+            callback(null, {
+                ...this.#metadata,
+                topics: new Map(options.topics.map(topic => [topic, this.#metadata.topics.get(topic)]))
+            });
             return;
         }
         const autocreateTopics = options.autocreateTopics ?? this[kOptions].autocreateTopics;
@@ -178,12 +191,26 @@ export class Base extends EventEmitter {
                     deduplicateCallback(error, undefined);
                     return;
                 }
+                const lastUpdate = Date.now();
+                if (!this.#metadata) {
+                    this.#metadata = {
+                        id: metadata.clusterId,
+                        brokers: new Map(),
+                        topics: new Map(),
+                        lastUpdate
+                    };
+                }
+                else {
+                    this.#metadata.lastUpdate = lastUpdate;
+                }
                 const brokers = new Map();
-                const topics = new Map();
+                // This should never change, but we act defensively here
                 for (const broker of metadata.brokers) {
                     const { host, port } = broker;
                     brokers.set(broker.nodeId, { host, port });
                 }
+                this.#metadata.brokers = brokers;
+                // Update all the topics in the cache
                 for (const { name, topicId: id, partitions: rawPartitions, isInternal } of metadata.topics) {
                     /* c8 ignore next 3 - Sometimes internal topics might be returned by Kafka */
                     if (isInternal) {
@@ -197,16 +224,15 @@ export class Base extends EventEmitter {
                             replicas: rawPartition.replicaNodes
                         };
                     }
-                    topics.set(name, { id, partitions, partitionsCount: rawPartitions.length });
+                    this.#metadata.topics.set(name, { id, partitions, partitionsCount: rawPartitions.length, lastUpdate });
                 }
-                this.#metadata = {
-                    id: metadata.clusterId,
-                    brokers,
-                    topics,
-                    lastUpdate: Date.now()
+                // Now build the object to return
+                const updatedMetadata = {
+                    ...this.#metadata,
+                    topics: new Map(options.topics.map(topic => [topic, this.#metadata.topics.get(topic)]))
                 };
-                this.emitWithDebug('client', 'metadata', this.#metadata);
-                deduplicateCallback(null, this.#metadata);
+                this.emitWithDebug('client', 'metadata', updatedMetadata);
+                deduplicateCallback(null, updatedMetadata);
             }, 0);
         }, callback);
     }

package/dist/clients/base/types.d.ts

@@ -14,6 +14,7 @@ export interface ClusterTopicMetadata {
     id: string;
     partitions: ClusterPartitionMetadata[];
     partitionsCount: number;
+    lastUpdate: number;
 }
 export interface ClusterMetadata {
     id: string;

package/package.json

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