@uber-clone/common 1.0.8 → 1.0.10

package/build/events/driver-events.d.ts

@@ -0,0 +1,37 @@
+import { Subjects } from "./subjects";
+export interface DriverCreatedEvent {
+    type: Subjects.DriverCreated;
+    data: {
+        id: string;
+        name: string;
+        email: string;
+        phone: string;
+        city: string;
+        vehicle: {
+            make: string;
+            model: string;
+            year: number;
+            plate: string;
+        };
+        userId: string;
+        version: number;
+    };
+}
+export interface DriverUpdatedEvent {
+    type: Subjects.DriverUpdated;
+    data: {
+        id: string;
+        name?: string;
+        email?: string;
+        phone?: string;
+        city?: string;
+        vehicle?: {
+            make: string;
+            model: string;
+            year: number;
+            plate: string;
+        };
+        userId: string;
+        version: number;
+    };
+}

package/build/events/driver-events.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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,
@@ -77,53 +79,54 @@ class KafkaClient {
     }
     ensureTopics() {
         return __awaiter(this, void 0, void 0, function* () {
+            const replicationFactor = parseInt(process.env.KAFKA_REPLICATION_FACTOR || "-1");
             const topics = [
                 // User events
-                { topic: subjects_1.Subjects.UserCreated, partitions: 3, replicationFactor: 3 },
-                { topic: subjects_1.Subjects.UserUpdated, partitions: 3, replicationFactor: 3 },
-                { topic: subjects_1.Subjects.UserDeleted, partitions: 3, replicationFactor: 3 },
+                { topic: subjects_1.Subjects.UserCreated, partitions: 3, replicationFactor },
+                { topic: subjects_1.Subjects.UserUpdated, partitions: 3, replicationFactor },
+                { topic: subjects_1.Subjects.UserDeleted, partitions: 3, replicationFactor },
                 {
                     topic: subjects_1.Subjects.UserProfileUpdated,
                     partitions: 3,
-                    replicationFactor: 3,
+                    replicationFactor,
                 },
                 // Auth events
-                { topic: subjects_1.Subjects.UserSignedIn, partitions: 3, replicationFactor: 3 },
-                { topic: subjects_1.Subjects.UserSignedOut, partitions: 3, replicationFactor: 3 },
+                { topic: subjects_1.Subjects.UserSignedIn, partitions: 3, replicationFactor },
+                { topic: subjects_1.Subjects.UserSignedOut, partitions: 3, replicationFactor },
                 {
                     topic: subjects_1.Subjects.UserPasswordChanged,
                     partitions: 3,
-                    replicationFactor: 3,
+                    replicationFactor,
                 },
                 {
                     topic: subjects_1.Subjects.UserAccountLocked,
                     partitions: 3,
-                    replicationFactor: 3,
+                    replicationFactor,
                 },
                 // // Ride events
-                // { topic: Subjects.RideRequested, partitions: 6, replicationFactor: 3 },
-                // { topic: Subjects.RideAccepted, partitions: 6, replicationFactor: 3 },
-                // { topic: Subjects.RideStarted, partitions: 6, replicationFactor: 3 },
-                // { topic: Subjects.RideCompleted, partitions: 6, replicationFactor: 3 },
-                // { topic: Subjects.RideCancelled, partitions: 6, replicationFactor: 3 },
+                { topic: subjects_1.Subjects.RideRequested, partitions: 6, replicationFactor },
+                { topic: subjects_1.Subjects.RideAccepted, partitions: 6, replicationFactor },
+                { topic: subjects_1.Subjects.RideStarted, partitions: 6, replicationFactor },
+                { topic: subjects_1.Subjects.RideCompleted, partitions: 6, replicationFactor },
+                { topic: subjects_1.Subjects.RideCancelled, partitions: 6, replicationFactor },
                 // // Driver events
-                // { topic: Subjects.DriverOnline, partitions: 6, replicationFactor: 3 },
-                // { topic: Subjects.DriverOffline, partitions: 6, replicationFactor: 3 },
-                // {
-                //   topic: Subjects.DriverLocationUpdated,
-                //   partitions: 12,
-                //   replicationFactor: 3,
-                // },
-                // {
-                //   topic: Subjects.DriverRideAccepted,
-                //   partitions: 6,
-                //   replicationFactor: 3,
-                // },
-                // {
-                //   topic: Subjects.DriverRideCompleted,
-                //   partitions: 6,
-                //   replicationFactor: 3,
-                // },
+                { topic: subjects_1.Subjects.DriverOnline, partitions: 6, replicationFactor },
+                { topic: subjects_1.Subjects.DriverOffline, partitions: 6, replicationFactor },
+                {
+                    topic: subjects_1.Subjects.DriverLocationUpdated,
+                    partitions: 12,
+                    replicationFactor,
+                },
+                {
+                    topic: subjects_1.Subjects.DriverRideAccepted,
+                    partitions: 6,
+                    replicationFactor,
+                },
+                {
+                    topic: subjects_1.Subjects.DriverRideCompleted,
+                    partitions: 6,
+                    replicationFactor,
+                },
                 // // Payment events
                 // { topic: Subjects.PaymentInitiated, partitions: 4, replicationFactor: 3 },
                 // { topic: Subjects.PaymentCompleted, partitions: 4, replicationFactor: 3 },
@@ -208,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 {
@@ -226,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/build/events/passenger-events.d.ts

@@ -0,0 +1,25 @@
+import { Subjects } from "./subjects";
+export interface PassengerCreatedEvent {
+    type: Subjects.PassengerCreated;
+    data: {
+        id: string;
+        name: string;
+        email: string;
+        phone: string;
+        paymentMethod: string;
+        userId: string;
+        version: number;
+    };
+}
+export interface PassengerUpdatedEvent {
+    type: Subjects.PassengerUpdated;
+    data: {
+        id: string;
+        name?: string;
+        email?: string;
+        phone?: string;
+        paymentMethod?: string;
+        userId: string;
+        version: number;
+    };
+}

package/build/events/passenger-events.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/events/subjects.d.ts

@@ -17,6 +17,10 @@ export declare enum Subjects {
     DriverLocationUpdated = "driver.location-updated",
     DriverRideAccepted = "driver.ride-accepted",
     DriverRideCompleted = "driver.ride-completed",
+    DriverCreated = "driver.created",
+    DriverUpdated = "driver.updated",
+    PassengerCreated = "passenger.created",
+    PassengerUpdated = "passenger.updated",
     PaymentInitiated = "payment.initiated",
     PaymentCompleted = "payment.completed",
     PaymentFailed = "payment.failed",

package/build/events/subjects.js

@@ -26,6 +26,10 @@ var Subjects;
     Subjects["DriverLocationUpdated"] = "driver.location-updated";
     Subjects["DriverRideAccepted"] = "driver.ride-accepted";
     Subjects["DriverRideCompleted"] = "driver.ride-completed";
+    Subjects["DriverCreated"] = "driver.created";
+    Subjects["DriverUpdated"] = "driver.updated";
+    Subjects["PassengerCreated"] = "passenger.created";
+    Subjects["PassengerUpdated"] = "passenger.updated";
     // Payment events
     Subjects["PaymentInitiated"] = "payment.initiated";
     Subjects["PaymentCompleted"] = "payment.completed";

package/build/index.d.ts

@@ -11,6 +11,8 @@ export * from "./middlewares/validate-request";
 export * from "./events/kafka-client";
 export * from "./events/types";
 export * from "./events/subjects";
+export * from "./events/driver-events";
+export * from "./events/passenger-events";
 export * from "./metrics/app.metrics";
 export * from "./utils/logger";
 export * from "./redis/redis-client";

package/build/index.js

@@ -27,6 +27,8 @@ __exportStar(require("./middlewares/validate-request"), exports);
 __exportStar(require("./events/kafka-client"), exports);
 __exportStar(require("./events/types"), exports);
 __exportStar(require("./events/subjects"), exports);
+__exportStar(require("./events/driver-events"), exports);
+__exportStar(require("./events/passenger-events"), exports);
 __exportStar(require("./metrics/app.metrics"), exports);
 __exportStar(require("./utils/logger"), exports);
 __exportStar(require("./redis/redis-client"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uber-clone/common",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [