dt-common-device 13.0.10 → 13.0.14

package/dist/alerts/Alert.service.js

@@ -603,14 +603,14 @@ let AlertService = (() => {
             const alerts = await this.queryAlerts(query);
             if (!alerts.length)
                 return null;
-            if (alerts.length > 1) {
-                throw new Error("Multiple alerts found, please specify a more specific query");
+            for (const alert of alerts) {
+                const alertModel = await Alert_model_1.AlertModel.findById(alert._id || alert.id);
+                if (!alertModel)
+                    return null;
+                alertModel.deactivate(updatedBy);
+                await alertModel.save();
             }
-            const alert = await Alert_model_1.AlertModel.findById(alerts[0]._id || alerts[0].id);
-            if (!alert)
-                return null;
-            alert.deactivate(updatedBy);
-            return await alert.save();
+            return null;
         }
         /**
          * Snooze an alert with business logic

package/dist/config/config.js

@@ -74,6 +74,11 @@ async function initialize(cfg) {
         db_keys = constants_1.CONFIG_KEYS.OPERATION_NODE.db_keys;
         await validateServiceConfig(cfg);
     }
+    if (cfg.SOURCE === "NOTIFICATION_SERVICE") {
+        sourceKey = "NOTIFICATION";
+        db_keys = constants_1.CONFIG_KEYS.NOTIFICATION.db_keys;
+        await validateServiceConfig(cfg);
+    }
     // Connect to databases
     try {
         await (0, db_1.connectDatabase)();

package/dist/config/config.types.d.ts

@@ -4,7 +4,7 @@ export interface ILogger {
     warn(message: string, ...args: any[]): void;
     error(message: string, ...args: any[]): void;
 }
-type AllowedSource = "ACCESS_SERVICE" | "ADMIN_SERVICE" | "ENERGY_SERVICE" | "REMOTE_SERVICE" | "SCHEDULE_SERVICE" | "MIGRATION" | "OPERATION_NODE_SERVICE";
+type AllowedSource = "ACCESS_SERVICE" | "ADMIN_SERVICE" | "ENERGY_SERVICE" | "REMOTE_SERVICE" | "SCHEDULE_SERVICE" | "MIGRATION" | "OPERATION_NODE_SERVICE" | "NOTIFICATION_SERVICE";
 export type IConfig = {
     SOURCE: AllowedSource;
     INTERNAL_EVENT_HANDLER?: IInternalEvent;

package/dist/config/constants.d.ts

@@ -63,4 +63,12 @@ export declare const CONFIG_KEYS: {
             pms: string;
         };
     };
+    NOTIFICATION: {
+        env: string[];
+        INTERNAL_EVENT_HANDLER: boolean;
+        db_keys: {
+            redis: string;
+            redis_port: string;
+        };
+    };
 };

package/dist/config/constants.js

@@ -106,4 +106,12 @@ exports.CONFIG_KEYS = {
             pms: "PMS_DB_URI",
         },
     },
+    NOTIFICATION: {
+        env: ["REDIS_HOST", "REDIS_PORT"],
+        INTERNAL_EVENT_HANDLER: false,
+        db_keys: {
+            redis: "REDIS_HOST",
+            redis_port: "REDIS_PORT",
+        },
+    },
 };

package/dist/index.d.ts

@@ -20,3 +20,4 @@ export { initialize, getConfig, shutdown } from "./config/config";
 export * from "./webhookQueue";
 export * from "./copilotQueue";
 export * from "./serviceQueue";
+export * from "./notificationQueue";

package/dist/index.js

@@ -65,3 +65,5 @@ __exportStar(require("./webhookQueue"), exports);
 __exportStar(require("./copilotQueue"), exports);
 //Export Service Queue
 __exportStar(require("./serviceQueue"), exports);
+// Export Notification Queue (Redis pub/sub for notifications)
+__exportStar(require("./notificationQueue"), exports);

package/dist/notificationQueue/index.d.ts

@@ -0,0 +1 @@
+export * from "./queue.service";

package/dist/notificationQueue/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./queue.service"), exports);

package/dist/notificationQueue/queue.service.d.ts

@@ -0,0 +1,21 @@
+export interface NotificationQueuePayload {
+    userId: string;
+    orgId?: string;
+    propertyId?: string;
+    data?: any;
+    title?: string;
+    message?: string;
+    url?: string;
+}
+export interface NotificationQueueOptions {
+    channel?: string;
+}
+/**
+ * Publish an event payload to Redis so any interested consumer can process it.
+ */
+export declare function enqueueEvent(event: NotificationQueuePayload, opts?: NotificationQueueOptions): Promise<void>;
+/**
+ * Start a single pub/sub consumer in this process.
+ * The `handler` is responsible for business logic (e.g. calling processEvent()).
+ */
+export declare function startConsumer(handler: (payload: NotificationQueuePayload) => Promise<void>, opts?: NotificationQueueOptions): Promise<void>;

package/dist/notificationQueue/queue.service.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enqueueEvent = enqueueEvent;
+exports.startConsumer = startConsumer;
+const redis_1 = require("../db/redis");
+const DEFAULT_CHANNEL = "notification:events";
+let consumerStarted = false;
+/**
+ * Publish an event payload to Redis so any interested consumer can process it.
+ */
+async function enqueueEvent(event, opts) {
+    const client = (0, redis_1.getRedisClient)();
+    const channel = opts?.channel ?? DEFAULT_CHANNEL;
+    try {
+        await client.publish(channel, JSON.stringify(event));
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.error("Failed to publish notification event", {
+            error,
+            channel,
+            event,
+        });
+    }
+}
+/**
+ * Start a single pub/sub consumer in this process.
+ * The `handler` is responsible for business logic (e.g. calling processEvent()).
+ */
+async function startConsumer(handler, opts) {
+    if (consumerStarted) {
+        // eslint-disable-next-line no-console
+        console.warn("NotificationQueue consumer already started; skipping");
+        return;
+    }
+    consumerStarted = true;
+    const baseClient = (0, redis_1.getRedisClient)();
+    const subscriber = baseClient.duplicate();
+    const channel = opts?.channel ?? DEFAULT_CHANNEL;
+    try {
+        await subscriber.connect();
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.error("Failed to connect Redis subscriber for notifications", {
+            error,
+        });
+        return;
+    }
+    subscriber.on("error", (error) => {
+        // eslint-disable-next-line no-console
+        console.error("Redis notification subscriber error", { error });
+    });
+    try {
+        // ioredis `subscribe` expects an (err, count) callback, not a message handler.
+        // We subscribe first, then attach a separate "message" listener.
+        await subscriber.subscribe(channel);
+        subscriber.on("message", async (subscribedChannel, message) => {
+            // Only process messages for the intended channel (defensive in case of multiple subscriptions)
+            if (subscribedChannel !== channel) {
+                return;
+            }
+            let payload;
+            try {
+                payload = JSON.parse(message);
+            }
+            catch (error) {
+                // eslint-disable-next-line no-console
+                console.error("Failed to parse pub/sub notification payload", {
+                    error,
+                    message,
+                    channel: subscribedChannel,
+                });
+                return;
+            }
+            try {
+                await handler(payload);
+            }
+            catch (error) {
+                // eslint-disable-next-line no-console
+                console.error("Failed to process pub/sub notification event", {
+                    error,
+                    payload,
+                    channel: subscribedChannel,
+                });
+            }
+        });
+    }
+    catch (error) {
+        // eslint-disable-next-line no-console
+        console.error("Error while subscribing to notification channel", {
+            error,
+            channel,
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "13.0.10",
+  "version": "13.0.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [