@rentbase/common 1.0.22 → 1.0.25

package/build/events/consumer.d.ts

@@ -1,2 +1,2 @@
 import { EventMap } from "./types";
-export declare const connectConsumer: <T extends keyof EventMap>(queue: T, rabbitUrl: string, onMessage: (data: EventMap[T]) => void) => Promise<void>;
+export declare const connectConsumer: <T extends keyof EventMap>(queue: T, rabbitUrl: string, onMessage: (data: EventMap[T]) => void | Promise<void>) => Promise<void>;

package/build/events/consumer.js

@@ -14,17 +14,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectConsumer = void 0;
 const amqplib_1 = __importDefault(require("amqplib"));
+const DEFAULT_EXCHANGE = process.env.RABBITMQ_EXCHANGE || "rentbase.events";
 const connectConsumer = (queue, rabbitUrl, onMessage) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!rabbitUrl) {
+        throw new Error("RabbitMQ URL is required for connectConsumer()");
+    }
+    const routingKey = String(queue);
+    const serviceName = process.env.SERVICE_NAME;
+    const queueName = serviceName ? `${serviceName}.${routingKey}` : routingKey;
     const connection = yield amqplib_1.default.connect(rabbitUrl);
     const channel = yield connection.createChannel();
-    yield channel.assertQueue(queue, { durable: true });
-    channel.consume(queue, (msg) => {
-        if (msg) {
+    // Topic exchange enables pub/sub (each service has its own queue).
+    yield channel.assertExchange(DEFAULT_EXCHANGE, "topic", { durable: true });
+    // Durable queue allows the service to catch up after being down.
+    yield channel.assertQueue(queueName, { durable: true });
+    yield channel.bindQueue(queueName, DEFAULT_EXCHANGE, routingKey);
+    // Process messages one at a time per consumer to avoid overwhelming downstream DBs.
+    yield channel.prefetch(1);
+    channel.consume(queueName, (msg) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!msg)
+            return;
+        try {
             const data = JSON.parse(msg.content.toString());
-            onMessage(data);
+            yield onMessage(data);
             channel.ack(msg);
         }
-    });
-    console.log(`[Consumer] Listening on ${queue}`);
+        catch (error) {
+            console.error(`[Consumer] Error processing ${routingKey}:`, error);
+            // Requeue so transient failures don't drop events.
+            // If you see a poison-message loop, switch this to `false` or add a DLQ.
+            channel.nack(msg, false, true);
+        }
+    }));
+    console.log(`[Consumer] Listening on ${queueName} (exchange=${DEFAULT_EXCHANGE}, key=${routingKey})`);
 });
 exports.connectConsumer = connectConsumer;

package/build/events/producer.js

@@ -15,10 +15,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishEvent = exports.connectProducer = void 0;
 const amqplib_1 = __importDefault(require("amqplib"));
 let channel;
+const DEFAULT_EXCHANGE = process.env.RABBITMQ_EXCHANGE || "rentbase.events";
 const connectProducer = (rabbitUrl, retries = 5, delay = 3000) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const connection = yield amqplib_1.default.connect(rabbitUrl);
         channel = yield connection.createChannel();
+        yield channel.assertExchange(DEFAULT_EXCHANGE, "topic", { durable: true });
         console.log("[RabbitMQ Producer ✅] Connected successfully");
     }
     catch (err) {
@@ -35,8 +37,22 @@ exports.connectProducer = connectProducer;
 const publishEvent = (queue, message) => __awaiter(void 0, void 0, void 0, function* () {
     if (!channel)
         throw new Error("RabbitMQ channel not initialized. Call connectProducer() first.");
-    yield channel.assertQueue(queue, { durable: true });
-    channel.sendToQueue(queue, Buffer.from(JSON.stringify(message)));
-    console.log(`[Producer ➡️] Sent to ${queue}:`, message);
+    // Topic exchange enables pub/sub (each service can bind its own durable queue).
+    yield channel.assertExchange(DEFAULT_EXCHANGE, "topic", { durable: true });
+    const payload = Buffer.from(JSON.stringify(message));
+    const routingKey = String(queue);
+    channel.publish(DEFAULT_EXCHANGE, routingKey, payload, {
+        persistent: true,
+        contentType: "application/json",
+    });
+    // Optional legacy mode for old consumers that still read directly from a shared queue.
+    if (process.env.RABBITMQ_LEGACY_QUEUE === "true") {
+        yield channel.assertQueue(routingKey, { durable: true });
+        channel.sendToQueue(routingKey, payload, {
+            persistent: true,
+            contentType: "application/json",
+        });
+    }
+    console.log(`[Producer ➡️] Published ${routingKey} on ${DEFAULT_EXCHANGE}:`, message);
 });
 exports.publishEvent = publishEvent;

package/build/events/types/kyc-events.d.ts

@@ -78,6 +78,7 @@ export interface LandlordApplicationCreatedEvent {
     landlordDetails: LandlordDetails;
     kycDocuments: {
         idDocument?: string;
+        idDocumentBack?: string;
         selfie?: string;
         proofOfAddress?: string;
     };
@@ -154,6 +155,7 @@ export interface LandlordApplicationUpdatedEvent {
     landlordDetails: LandlordDetails;
     kycDocuments: {
         idDocument?: string;
+        idDocumentBack?: string;
         selfie?: string;
         proofOfAddress?: string;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rentbase/common",
-  "version": "1.0.22",
+  "version": "1.0.25",
   "description": "common library for rentbase",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",