@uber-clone/common 1.0.9 → 1.0.11

package/build/events/kafka-client.d.ts

@@ -4,7 +4,9 @@ export declare class KafkaClient {
     private consumer;
     private admin;
     private isConnected;
+    private isConsumerRunning;
     private config;
+    private subscriptions;
     constructor();
     private getKafkaConfig;
     connect(): Promise<void>;

package/build/events/kafka-client.js

@@ -15,6 +15,8 @@ const subjects_1 = require("./subjects");
 class KafkaClient {
     constructor() {
         this.isConnected = false;
+        this.isConsumerRunning = false;
+        this.subscriptions = new Map();
         this.config = this.getKafkaConfig();
         this.kafka = new kafkajs_1.Kafka({
             clientId: this.config.clientId,
@@ -130,19 +132,19 @@ class KafkaClient {
                 // { topic: Subjects.PaymentCompleted, partitions: 4, replicationFactor: 3 },
                 // { topic: Subjects.PaymentFailed, partitions: 4, replicationFactor: 3 },
                 // { topic: Subjects.PaymentRefunded, partitions: 4, replicationFactor: 3 },
-                // // Notification events
-                // {
-                //   topic: Subjects.NotificationEmail,
-                //   partitions: 4,
-                //   replicationFactor: 3,
-                // },
-                // { topic: Subjects.NotificationSMS, partitions: 4, replicationFactor: 3 },
-                // { topic: Subjects.NotificationPush, partitions: 4, replicationFactor: 3 },
-                // {
-                //   topic: Subjects.NotificationInApp,
-                //   partitions: 4,
-                //   replicationFactor: 3,
-                // },
+                // Notification events
+                {
+                    topic: subjects_1.Subjects.NotificationEmail,
+                    partitions: 4,
+                    replicationFactor,
+                },
+                { topic: subjects_1.Subjects.NotificationSMS, partitions: 4, replicationFactor },
+                { topic: subjects_1.Subjects.NotificationPush, partitions: 4, replicationFactor },
+                {
+                    topic: subjects_1.Subjects.NotificationInApp,
+                    partitions: 4,
+                    replicationFactor: 3,
+                },
             ];
             try {
                 const existingTopics = yield this.admin.listTopics();
@@ -209,12 +211,23 @@ class KafkaClient {
     subscribe(topic, handler, options) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.ensureConnection();
+            // Store the handler so we can restart the consumer with all topics if needed
+            this.subscriptions.set(topic, handler);
             try {
-                yield this.consumer.subscribe({
-                    topic,
-                    fromBeginning: (options === null || options === void 0 ? void 0 : options.fromBeginning) || false,
-                });
-                console.log(`Subscribed to topic: ${topic}`);
+                if (this.isConsumerRunning) {
+                    // Consumer is already running — stop it, re-subscribe all topics, then restart
+                    yield this.consumer.stop();
+                    this.isConsumerRunning = false;
+                }
+                // Subscribe all known topics (KafkaJS requires this before consumer.run())
+                for (const [t,] of this.subscriptions) {
+                    yield this.consumer.subscribe({
+                        topic: t,
+                        fromBeginning: (options === null || options === void 0 ? void 0 : options.fromBeginning) || false,
+                    });
+                    console.log(`Subscribed to topic: ${t}`);
+                }
+                // Start the consumer loop once with a dispatcher that routes to the correct handler
                 yield this.consumer.run({
                     eachMessage: (_a) => __awaiter(this, [_a], void 0, function* ({ topic, partition, message }) {
                         try {
@@ -227,14 +240,20 @@ class KafkaClient {
                                 offset: message.offset,
                                 eventType: event.type || "unknown",
                             });
-                            yield handler(event);
+                            const topicHandler = this.subscriptions.get(topic);
+                            if (topicHandler) {
+                                yield topicHandler(event);
+                            }
+                            else {
+                                console.warn(`No handler registered for topic: ${topic}`);
+                            }
                         }
                         catch (error) {
                             console.error(`Error processing message from ${topic}:${partition}:`, error);
-                            // In production, you might want to implement dead letter queue or retry logic here
                         }
                     }),
                 });
+                this.isConsumerRunning = true;
             }
             catch (error) {
                 console.error(`Failed to subscribe to topic ${topic}:`, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uber-clone/common",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [
@@ -33,4 +33,4 @@
     "redlock": "^5.0.0-beta.2",
     "winston": "^3.18.3"
   }
-}
+}