dt-common-device 8.0.0 → 8.0.2

package/dist/config/config.d.ts

@@ -4,9 +4,11 @@ export declare function initialize(cfg: IConfig): Promise<void>;
 export declare function getConfig(): IConfig;
 export declare function getDeviceServiceUrl(): string;
 export declare function getAdminServiceUrl(): string;
-export declare function getDeviceProfileServiceUrl(): string;
+export declare function getMonitoringServiceUrl(): string;
 export declare function getSqsQueueUrl(): string;
 export declare function getReservationSqsQueueUrl(): string;
+export declare function getHeartbeatSqsQueueUrl(): string;
+export declare function getIssueSqsQueueUrl(): string;
 export declare function getEventSubscription(): InternalEventSubscription | null;
 export declare function checkRequiredEnv(requiredEnvs: string[]): void;
 export declare function ensureAuditInitialized(): void;

package/dist/config/config.js

@@ -7,9 +7,11 @@ exports.initialize = initialize;
 exports.getConfig = getConfig;
 exports.getDeviceServiceUrl = getDeviceServiceUrl;
 exports.getAdminServiceUrl = getAdminServiceUrl;
-exports.getDeviceProfileServiceUrl = getDeviceProfileServiceUrl;
+exports.getMonitoringServiceUrl = getMonitoringServiceUrl;
 exports.getSqsQueueUrl = getSqsQueueUrl;
 exports.getReservationSqsQueueUrl = getReservationSqsQueueUrl;
+exports.getHeartbeatSqsQueueUrl = getHeartbeatSqsQueueUrl;
+exports.getIssueSqsQueueUrl = getIssueSqsQueueUrl;
 exports.getEventSubscription = getEventSubscription;
 exports.checkRequiredEnv = checkRequiredEnv;
 exports.ensureAuditInitialized = ensureAuditInitialized;
@@ -140,16 +142,13 @@ function getAdminServiceUrl() {
     }
     throw new Error("dt-common-device: ADMIN_SERVICE is not configured for this service");
 }
-function getDeviceProfileServiceUrl() {
-    if (constants_1.CONFIG_KEYS[sourceKey].env.includes("MONITORING_SERVICE_PYTHON")) {
-        const deviceProfileServiceUrl = process.env.MONITORING_SERVICE_PYTHON;
-        if (!deviceProfileServiceUrl) {
-            getConfig().LOGGER.error("MONITORING_SERVICE_PYTHON must be set in environment variables");
-            throw new Error("dt-common-device: MONITORING_SERVICE_PYTHON must be set in environment variables");
-        }
-        return deviceProfileServiceUrl;
+function getMonitoringServiceUrl() {
+    const monitoringServiceUrl = process.env.MONITORING_SERVICE_PYTHON;
+    if (!monitoringServiceUrl) {
+        getConfig().LOGGER.error("MONITORING_SERVICE_PYTHON must be set in environment variables");
+        throw new Error("dt-common-device: MONITORING_SERVICE_PYTHON must be set in environment variables");
     }
-    throw new Error("dt-common-device: DEVICE_PROFILE_SERVICE is not configured for this service");
+    return monitoringServiceUrl;
 }
 function getSqsQueueUrl() {
     if (constants_1.CONFIG_KEYS[sourceKey].env.includes("AWS_SQS_URL")) {
@@ -173,6 +172,28 @@ function getReservationSqsQueueUrl() {
     }
     return "";
 }
+function getHeartbeatSqsQueueUrl() {
+    if (constants_1.CONFIG_KEYS[sourceKey].env.includes("HEARTBEAT_SQS_URL")) {
+        const heartbeatSqsQueueUrl = process.env.HEARTBEAT_SQS_URL;
+        if (!heartbeatSqsQueueUrl) {
+            getConfig().LOGGER.error("HEARTBEAT_SQS_URL must be set in environment variables");
+            throw new Error("dt-common-device: HEARTBEAT_SQS_URL must be set in environment variables");
+        }
+        return heartbeatSqsQueueUrl;
+    }
+    return "";
+}
+function getIssueSqsQueueUrl() {
+    if (constants_1.CONFIG_KEYS[sourceKey].env.includes("ISSUE_SQS_URL")) {
+        const issueSqsQueueUrl = process.env.ISSUE_SQS_URL;
+        if (!issueSqsQueueUrl) {
+            getConfig().LOGGER.error("ISSUE_SQS_URL must be set in environment variables");
+            throw new Error("dt-common-device: ISSUE_SQS_URL must be set in environment variables");
+        }
+        return issueSqsQueueUrl;
+    }
+    return "";
+}
 function getEventSubscription() {
     return eventSubscription;
 }

package/dist/config/constants.js

@@ -23,6 +23,7 @@ exports.CONFIG_KEYS = {
             "PMS_DB_URI",
             "AWS_SQS_URL",
             "RESERVATION_SQS_URL",
+            "HEARTBEAT_SQS_URL",
             "ADMIN_SERVICE",
             "CRONICLE_ENDPOINT",
             "CRONICLE_API_KEY",
@@ -41,6 +42,7 @@ exports.CONFIG_KEYS = {
             "CRONICLE_ENDPOINT",
             "CRONICLE_API_KEY",
             "AWS_SQS_URL",
+            "ISSUE_SQS_URL",
         ],
         INTERNAL_EVENT_HANDLER: true,
         db_keys: {
@@ -50,7 +52,13 @@ exports.CONFIG_KEYS = {
         },
     },
     ENERGY: {
-        env: ["ADMIN_DB_URI", "PMS_DB_URI", "AWS_SQS_URL", "ADMIN_SERVICE"],
+        env: [
+            "ADMIN_DB_URI",
+            "PMS_DB_URI",
+            "AWS_SQS_URL",
+            "ADMIN_SERVICE",
+            "HEARTBEAT_SQS_URL",
+        ],
         INTERNAL_EVENT_HANDLER: true,
         db_keys: {
             energy: "DATABASE_URL",
@@ -72,6 +80,7 @@ exports.CONFIG_KEYS = {
             "ADMIN_DB_URI",
             "ACCESS_DB_URI",
             "AWS_SQS_URL",
+            "HEARTBEAT_SQS_URL",
             "CRONICLE_ENDPOINT",
             "CRONICLE_API_KEY",
         ],

package/dist/entities/device/local/services/Device.service.d.ts

@@ -6,7 +6,7 @@ export declare class LocalDeviceService {
     private readonly deviceRepository;
     private readonly issueService;
     private readonly localPropertyService;
-    private readonly deviceProfileRepository;
+    private readonly monitoringRepository;
     constructor();
     createDevice(body: IDevice): Promise<IDevice>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;

package/dist/entities/device/local/services/Device.service.js

@@ -83,7 +83,7 @@ const constants_1 = require("../../../../constants");
 const audit_1 = require("../../../../audit");
 const issue_types_1 = require("../../../../issues/issue.types");
 const property_1 = require("../../../property");
-const DeviceProfile_repository_1 = require("../repository/DeviceProfile.repository");
+const Monitoring_repository_1 = require("../../../monitoring/Monitoring.repository");
 let LocalDeviceService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -96,7 +96,7 @@ let LocalDeviceService = (() => {
             this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
             this.issueService = typedi_1.default.get(Issue_service_1.IssueService);
             this.localPropertyService = typedi_1.default.get(property_1.LocalPropertyService);
-            this.deviceProfileRepository = typedi_1.default.get(DeviceProfile_repository_1.DeviceProfileRepository);
+            this.monitoringRepository = typedi_1.default.get(Monitoring_repository_1.MonitoringRepository);
         }
         async createDevice(body) {
             const device = await this.deviceRepository.createDevice(body);
@@ -351,7 +351,7 @@ let LocalDeviceService = (() => {
             }
         }
         async getDeviceBaseline(deviceId) {
-            const response = await this.deviceProfileRepository.getDeviceBaseLine(deviceId);
+            const response = await this.monitoringRepository.getDeviceBaseLine(deviceId);
             const baselineInMilliseconds = response?.baseline && response?.baseline * 60 * 1000;
             return baselineInMilliseconds ?? 3600000; // 1 hour in milliseconds
         }

package/dist/entities/monitoring/Monitoring.repository.d.ts

@@ -0,0 +1,5 @@
+export declare class MonitoringRepository {
+    private readonly axiosInstance;
+    constructor();
+    getDeviceBaseLine(deviceId: string): Promise<any>;
+}

package/dist/entities/monitoring/Monitoring.repository.js

@@ -0,0 +1,75 @@
+"use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MonitoringRepository = void 0;
+const typedi_1 = require("typedi");
+const utils_1 = require("../../utils");
+const config_1 = require("../../config/config");
+let MonitoringRepository = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var MonitoringRepository = _classThis = class {
+        constructor() {
+            this.axiosInstance = (0, utils_1.getMonitoringServiceAxiosInstance)();
+        }
+        async getDeviceBaseLine(deviceId) {
+            try {
+                const response = await this.axiosInstance.get(`/baseline/${deviceId}`);
+                return response.data;
+            }
+            catch (error) {
+                (0, config_1.getConfig)().LOGGER.error(`Failed to get device baseline for ${deviceId}:`, error);
+                throw new Error(`Failed to get device baseline: ${error.message || "Unknown error"}`);
+            }
+        }
+    };
+    __setFunctionName(_classThis, "MonitoringRepository");
+    (() => {
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        MonitoringRepository = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return MonitoringRepository = _classThis;
+})();
+exports.MonitoringRepository = MonitoringRepository;

package/dist/events/InternalEventSubscription.d.ts

@@ -10,6 +10,8 @@ export declare class InternalEventSubscription {
     private readonly internalEventHandler;
     private readonly sqsQueueUrl;
     private readonly reservationSqsQueueUrl;
+    private readonly heartbeatSqsQueueUrl;
+    private readonly issueSqsQueueUrl;
     private readonly logger;
     private readonly isInitialized;
     private isSubscribed;

package/dist/events/InternalEventSubscription.js

@@ -20,6 +20,8 @@ class InternalEventSubscription {
         this.isSubscribed = false;
         this.sqsQueueUrl = (0, config_1.getSqsQueueUrl)() || "";
         this.reservationSqsQueueUrl = (0, config_1.getReservationSqsQueueUrl)() || "";
+        this.heartbeatSqsQueueUrl = (0, config_1.getHeartbeatSqsQueueUrl)() || "";
+        this.issueSqsQueueUrl = (0, config_1.getIssueSqsQueueUrl)() || "";
         this.logger = (0, config_1.getConfig)().LOGGER;
         this.isInitialized = true;
     }
@@ -108,9 +110,13 @@ class InternalEventSubscription {
         }
         try {
             if (this.reservationSqsQueueUrl) {
-                this.logger.info(`Subscribing to reservation events : ${this.reservationSqsQueueUrl}`);
                 await dt_pub_sub_1.eventDispatcher.subscribeToQueue(this.reservationSqsQueueUrl, this.handleMessage.bind(this));
-                this.logger.info(`Successfully subscribed to reservation events : ${this.reservationSqsQueueUrl}`);
+            }
+            if (this.heartbeatSqsQueueUrl) {
+                await dt_pub_sub_1.eventDispatcher.subscribeToQueue(this.heartbeatSqsQueueUrl, this.handleMessage.bind(this));
+            }
+            if (this.issueSqsQueueUrl) {
+                await dt_pub_sub_1.eventDispatcher.subscribeToQueue(this.issueSqsQueueUrl, this.handleMessage.bind(this));
             }
             await dt_pub_sub_1.eventDispatcher.subscribeToQueue(this.sqsQueueUrl, this.handleMessage.bind(this));
             this.isSubscribed = true;

package/dist/utils/http.utils.d.ts

@@ -8,7 +8,7 @@ export declare function validateServiceUrl(url: string): boolean;
 export declare function createAxiosInstance(baseURL?: string): import("axios").AxiosInstance;
 export declare function getDeviceServiceAxiosInstance(): any;
 export declare function getAdminServiceAxiosInstance(): any;
-export declare function getDeviceProfileServiceAxiosInstance(): any;
+export declare function getMonitoringServiceAxiosInstance(): any;
 /**
  * Retry function for failed HTTP requests
  */

package/dist/utils/http.utils.js

@@ -7,7 +7,7 @@ exports.validateServiceUrl = validateServiceUrl;
 exports.createAxiosInstance = createAxiosInstance;
 exports.getDeviceServiceAxiosInstance = getDeviceServiceAxiosInstance;
 exports.getAdminServiceAxiosInstance = getAdminServiceAxiosInstance;
-exports.getDeviceProfileServiceAxiosInstance = getDeviceProfileServiceAxiosInstance;
+exports.getMonitoringServiceAxiosInstance = getMonitoringServiceAxiosInstance;
 exports.retryRequest = retryRequest;
 const config_1 = require("../config/config");
 const axios_1 = __importDefault(require("axios"));
@@ -98,12 +98,12 @@ function getAdminServiceAxiosInstance() {
     }
     return cloudServiceAxiosInstance;
 }
-let deviceProfileServiceAxiosInstance = null;
-function getDeviceProfileServiceAxiosInstance() {
-    if (!deviceProfileServiceAxiosInstance) {
-        deviceProfileServiceAxiosInstance = createAxiosInstance((0, config_1.getDeviceProfileServiceUrl)());
+let deviceMonitoringServiceAxiosInstance = null;
+function getMonitoringServiceAxiosInstance() {
+    if (!deviceMonitoringServiceAxiosInstance) {
+        deviceMonitoringServiceAxiosInstance = createAxiosInstance((0, config_1.getMonitoringServiceUrl)());
     }
-    return deviceProfileServiceAxiosInstance;
+    return deviceMonitoringServiceAxiosInstance;
 }
 /**
  * Retry function for failed HTTP requests

package/package.json

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