dt-common-device 4.0.11 → 5.0.2

package/dist/db/db.js

@@ -5,11 +5,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connectDatabase = void 0;
 exports.getPostgresClient = getPostgresClient;
+exports.getAccessPostgresClient = getAccessPostgresClient;
+exports.getPmsPostgresClient = getPmsPostgresClient;
 const pg_1 = require("pg");
 const config_1 = require("../config/config");
 const mongoose_1 = __importDefault(require("mongoose"));
 function getPostgresClient() {
-    const URI = (0, config_1.getPostgresDbUri)();
+    const URI = (0, config_1.getAdminPostgresDbUri)();
+    let pool = null;
+    if (!pool) {
+        pool = new pg_1.Pool({
+            connectionString: URI,
+        });
+    }
+    return pool;
+}
+function getAccessPostgresClient() {
+    const URI = (0, config_1.getAccessPostgresDbUri)();
+    let pool = null;
+    if (!pool) {
+        pool = new pg_1.Pool({
+            connectionString: URI,
+        });
+    }
+    return pool;
+}
+function getPmsPostgresClient() {
+    const URI = (0, config_1.getPmsPostgresDbUri)();
     let pool = null;
     if (!pool) {
         pool = new pg_1.Pool({

package/dist/events/BaseEventHandler.d.ts

@@ -1,8 +1,8 @@
 import { DeviceEvent } from "./interfaces/DeviceEvent";
 import { IEventHandler } from "./interfaces/IEventHandler";
 import { ILogger } from "../config/config.types";
-import { LocalDeviceService } from "../device/local/services/Device.service";
-import { AuditProperties } from "../audit/AuditProperties";
+import { LocalDeviceService } from "../entities/device/local/services/Device.service";
+import { IAuditProperties } from "../audit/IAuditProperties";
 export declare abstract class BaseEventHandler implements IEventHandler {
     protected readonly supportedEventTypes: string[];
     protected readonly priority: number;
@@ -20,7 +20,7 @@ export declare abstract class BaseEventHandler implements IEventHandler {
      * Handle multiple events - default implementation processes them sequentially
      */
     handleEvents(events: DeviceEvent[]): Promise<void>;
-    onStateChange(deviceId: string, state: Record<string, any>, event: DeviceEvent, auditProperties: AuditProperties): Promise<void>;
+    onStateChange(deviceId: string, state: Record<string, any>, event: DeviceEvent, auditProperties: IAuditProperties): Promise<void>;
     /**
      * Check if this handler can process the given event type
      */

package/dist/events/BaseEventHandler.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEventHandler = void 0;
 const config_1 = require("../config/config");
-const Device_service_1 = require("../device/local/services/Device.service");
+const Device_service_1 = require("../entities/device/local/services/Device.service");
 const typedi_1 = __importDefault(require("typedi"));
 class BaseEventHandler {
     constructor(supportedEventTypes, priority = 100) {

package/dist/events/DeviceEventHandler.d.ts

@@ -1,4 +1,4 @@
-import { IDevice } from "../device/local/interfaces";
+import { IDevice } from "../entities/device/local/interfaces";
 import { BaseEventHandler } from "./BaseEventHandler";
 import { DeviceEvent } from "./interfaces/DeviceEvent";
 export declare class DeviceEventHandler extends BaseEventHandler {

package/dist/events/DeviceEventHandler.js

@@ -72,9 +72,10 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceEventHandler = void 0;
+const IAuditProperties_1 = require("../audit/IAuditProperties");
 const constants_1 = require("../constants");
 const Event_1 = require("../constants/Event");
-const services_1 = require("../device/local/services");
+const services_1 = require("../entities/device/local/services");
 const BaseEventHandler_1 = require("./BaseEventHandler");
 const typedi_1 = __importStar(require("typedi"));
 let DeviceEventHandler = (() => {
@@ -136,7 +137,8 @@ let DeviceEventHandler = (() => {
                         deviceId: deviceData.deviceId,
                         deviceName: deviceData.name,
                         propertyId: deviceData.propertyId,
-                        resource: "device",
+                        resource: IAuditProperties_1.Resource.DEVICE,
+                        source: constants_1.Source.CLOUD_EVENT,
                     });
                     break;
                 case Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED:
@@ -144,7 +146,8 @@ let DeviceEventHandler = (() => {
                         deviceId: deviceData.deviceId,
                         deviceName: deviceData.name,
                         propertyId: deviceData.propertyId,
-                        resource: "device",
+                        resource: IAuditProperties_1.Resource.DEVICE,
+                        source: constants_1.Source.CLOUD_EVENT,
                     });
                     break;
             }

package/dist/events/EventHandler.d.ts

@@ -1,14 +1,15 @@
-import { AuditProperties } from "../audit/AuditProperties";
-import { IStatus, IStatusQuery } from "../device/local/interfaces";
+import { IAuditProperties } from "../audit/IAuditProperties";
+import { IStatus, IStatusQuery } from "../entities/device/local/interfaces";
 export declare class EventHandler {
     private readonly source;
+    private readonly auditUtils;
     constructor();
     onDeviceCreate(body: any): Promise<void>;
-    onDeviceUpdate(deviceId: string, body: any, auditBody: AuditProperties): Promise<void>;
-    onDeviceDelete(deviceId: string, auditBody: AuditProperties): Promise<void>;
-    onStateChange(deviceId: string, state: any, auditProperties: AuditProperties): Promise<void>;
-    onStatusChange(deviceId: string, status: any, auditProperties: AuditProperties): Promise<void>;
-    onStatusChangeMany(query: IStatusQuery, status: IStatus, auditProperties: AuditProperties): Promise<void>;
-    onBatteryLevelChange(deviceId: string, batteryLevel: number, auditProperties: AuditProperties): Promise<void>;
-    onDeviceMetaChange(deviceId: string, metaData: Record<string, any>, auditProperties: AuditProperties): Promise<void>;
+    onDeviceUpdate(deviceId: string, body: any, auditBody: IAuditProperties): Promise<void>;
+    onDeviceDelete(deviceId: string, auditBody: IAuditProperties): Promise<void>;
+    onStateChange(deviceId: string, state: any, auditProperties: IAuditProperties): Promise<void>;
+    onStatusChange(deviceId: string, status: any, auditProperties: IAuditProperties): Promise<void>;
+    onStatusChangeMany(query: IStatusQuery, status: IStatus, auditProperties: IAuditProperties): Promise<void>;
+    onBatteryLevelChange(deviceId: string, batteryLevel: number, auditProperties: IAuditProperties): Promise<void>;
+    onDeviceMetaChange(deviceId: string, metaData: Record<string, any>, auditProperties: IAuditProperties): Promise<void>;
 }

package/dist/events/EventHandler.js

@@ -1,4 +1,20 @@
 "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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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";
@@ -33,6 +49,23 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     }
     return useValue ? value : void 0;
 };
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 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 });
@@ -41,7 +74,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventHandler = void 0;
 const dt_audit_library_1 = require("dt-audit-library");
 const Event_1 = require("../constants/Event");
-const typedi_1 = require("typedi");
+const typedi_1 = __importStar(require("typedi"));
 const AuditUtils_1 = require("../audit/AuditUtils");
 // TODO: For all the Event handlers, we need to publish the respective events for External Consumption
 let EventHandler = (() => {
@@ -52,32 +85,40 @@ let EventHandler = (() => {
     var EventHandler = _classThis = class {
         constructor() {
             this.source = "dt-common-device";
+            this.auditUtils = typedi_1.default.get(AuditUtils_1.AuditUtils);
         }
         async onDeviceCreate(body) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
-                properties: (0, AuditUtils_1.buildAuditProperties)(body),
+                properties: await this.auditUtils.buildAuditProperties(body),
             };
             await (0, dt_audit_library_1.publishAudit)(payload);
         }
         async onDeviceUpdate(deviceId, body, auditBody) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS,
-                properties: (0, AuditUtils_1.buildAuditProperties)({ ...auditBody, deviceId, ...body }),
+                properties: await this.auditUtils.buildAuditProperties({
+                    ...auditBody,
+                    deviceId,
+                    ...body,
+                }),
             };
             await (0, dt_audit_library_1.publishAudit)(payload);
         }
         async onDeviceDelete(deviceId, auditBody) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS,
-                properties: (0, AuditUtils_1.buildAuditProperties)({ ...auditBody, deviceId }),
+                properties: await this.auditUtils.buildAuditProperties({
+                    ...auditBody,
+                    deviceId,
+                }),
             };
             await (0, dt_audit_library_1.publishAudit)(payload);
         }
         async onStateChange(deviceId, state, auditProperties) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATE.SET,
-                properties: (0, AuditUtils_1.buildAuditProperties)({
+                properties: await this.auditUtils.buildAuditProperties({
                     ...auditProperties,
                     deviceId,
                     ...state,
@@ -88,7 +129,7 @@ let EventHandler = (() => {
         async onStatusChange(deviceId, status, auditProperties) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATUS.SET,
-                properties: (0, AuditUtils_1.buildAuditProperties)({
+                properties: await this.auditUtils.buildAuditProperties({
                     ...auditProperties,
                     deviceId,
                     ...status,
@@ -99,7 +140,7 @@ let EventHandler = (() => {
         async onStatusChangeMany(query, status, auditProperties) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATUS.UPDATED,
-                properties: (0, AuditUtils_1.buildAuditProperties)({
+                properties: await this.auditUtils.buildAuditProperties({
                     ...auditProperties,
                     ...query,
                     ...status,
@@ -110,7 +151,7 @@ let EventHandler = (() => {
         async onBatteryLevelChange(deviceId, batteryLevel, auditProperties) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.SET,
-                properties: (0, AuditUtils_1.buildAuditProperties)({
+                properties: await this.auditUtils.buildAuditProperties({
                     ...auditProperties,
                     deviceId,
                     batteryLevel,
@@ -121,7 +162,7 @@ let EventHandler = (() => {
         async onDeviceMetaChange(deviceId, metaData, auditProperties) {
             const payload = {
                 eventType: Event_1.DT_EVENT_TYPES.DEVICE.META_DATA.SET,
-                properties: (0, AuditUtils_1.buildAuditProperties)({
+                properties: await this.auditUtils.buildAuditProperties({
                     ...auditProperties,
                     deviceId,
                     metaData,

package/dist/events/InternalEventSubscription.js

@@ -17,7 +17,7 @@ class InternalEventSubscription {
         this.internalEventHandler = internalEventHandler;
         this.isInitialized = false;
         this.isSubscribed = false;
-        this.sqsQueueUrl = (0, config_1.getConfig)().SQS_QUEUE_URL;
+        this.sqsQueueUrl = (0, config_1.getSqsQueueUrl)() || "";
         this.logger = (0, config_1.getConfig)().LOGGER;
         this.isInitialized = true;
     }

package/dist/index.d.ts

@@ -1,17 +1,18 @@
 export * from "./microservice";
 export * from "./constants";
-export { CloudDevice, CloudDeviceService, DeviceFactory, } from "./device/cloud/entities";
-export { LocalDeviceService, LocalHubService, LocalScheduleService, } from "./device/local/services";
-export * from "./device/local/interfaces";
-export * from "./device/cloud/interfaces";
-export * from "./admin";
-export * from "./connection";
-export * from "./property";
+export { CloudDevice, CloudDeviceService, DeviceFactory, } from "./entities/device/cloud/entities";
+export { LocalDeviceService, LocalHubService, LocalScheduleService, } from "./entities/device/local/services";
+export * from "./entities/device/local/interfaces";
+export * from "./entities/device/cloud/interfaces";
+export * from "./entities/admin";
+export * from "./entities/connection";
+export * from "./entities/property";
 export * from "./events";
 export * from "./events/interfaces";
 export * from "./alerts";
 export * from "./issues";
 export * from "./utils";
 export * from "./queue";
-export * from "./pms";
+export * from "./entities/pms";
+export * from "./audit";
 export { initialize, getConfig, shutdown } from "./config/config";

package/dist/index.js

@@ -21,22 +21,22 @@ __exportStar(require("./microservice"), exports);
 // CONSTANTS EXPORTS
 __exportStar(require("./constants"), exports);
 // DEVICE EXPORTS
-var entities_1 = require("./device/cloud/entities");
+var entities_1 = require("./entities/device/cloud/entities");
 Object.defineProperty(exports, "CloudDevice", { enumerable: true, get: function () { return entities_1.CloudDevice; } });
 Object.defineProperty(exports, "CloudDeviceService", { enumerable: true, get: function () { return entities_1.CloudDeviceService; } });
 Object.defineProperty(exports, "DeviceFactory", { enumerable: true, get: function () { return entities_1.DeviceFactory; } });
-var services_1 = require("./device/local/services");
+var services_1 = require("./entities/device/local/services");
 Object.defineProperty(exports, "LocalDeviceService", { enumerable: true, get: function () { return services_1.LocalDeviceService; } });
 Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: function () { return services_1.LocalHubService; } });
 Object.defineProperty(exports, "LocalScheduleService", { enumerable: true, get: function () { return services_1.LocalScheduleService; } });
-__exportStar(require("./device/local/interfaces"), exports);
-__exportStar(require("./device/cloud/interfaces"), exports);
+__exportStar(require("./entities/device/local/interfaces"), exports);
+__exportStar(require("./entities/device/cloud/interfaces"), exports);
 // ADMIN EXPORTS
-__exportStar(require("./admin"), exports);
+__exportStar(require("./entities/admin"), exports);
 // CONNECTION EXPORTS
-__exportStar(require("./connection"), exports);
+__exportStar(require("./entities/connection"), exports);
 // PROPERTY EXPORTS
-__exportStar(require("./property"), exports);
+__exportStar(require("./entities/property"), exports);
 // EVENTS EXPORTS
 __exportStar(require("./events"), exports);
 __exportStar(require("./events/interfaces"), exports);
@@ -49,7 +49,9 @@ __exportStar(require("./utils"), exports);
 // QUEUE EXPORTS
 __exportStar(require("./queue"), exports);
 // PMS EXPORTS
-__exportStar(require("./pms"), exports);
+__exportStar(require("./entities/pms"), exports);
+// AUDIT EXPORTS
+__exportStar(require("./audit"), exports);
 // CONFIG EXPORTS
 var config_1 = require("./config/config");
 Object.defineProperty(exports, "initialize", { enumerable: true, get: function () { return config_1.initialize; } });

package/dist/issues/Issue.service.d.ts

@@ -3,7 +3,7 @@ import { IIssueDocument } from "./Issue.model";
 import { CreateIssueData, UpdateIssueData, AddCommentData, IssueStatus, IssuePriority, IssuesCategory, EntityType } from "./issue.types";
 import { IssueBuilder } from "./IssueBuilder";
 import { Source } from "../constants/Service";
-import { IDevice } from "../device/local/interfaces";
+import { IDevice } from "../entities/device/local/interfaces";
 export declare class IssueService {
     private readonly issueRepository;
     constructor(issueRepository: IssueRepository);

package/dist/microservice/MicroServiceFactory.d.ts

@@ -1,5 +1,5 @@
 import { SERVICE_NAME } from "../constants";
-import { DeviceType } from "../device/cloud/interfaces";
+import { DeviceType } from "../entities/device/cloud/interfaces";
 export declare class MicroServiceFactory {
     private readonly deviceType;
     private static instances;

package/dist/microservice/MicroServiceFactory.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MicroServiceFactory = void 0;
 const constants_1 = require("../constants");
-const interfaces_1 = require("../device/cloud/interfaces");
+const interfaces_1 = require("../entities/device/cloud/interfaces");
 class MicroServiceFactory {
     constructor(deviceType) {
         this.deviceType = deviceType;

package/dist/queue/utils/rateLimit.utils.js

@@ -64,7 +64,7 @@ class RateLimitUtils {
             provider: constants_1.CONNECTION_PROVIDERS.SCHLAGE,
         });
         configs.set(constants_1.CONNECTION_PROVIDERS.SMARTTHINGS, {
-            maxRequests: 12,
+            maxRequests: 250,
             windowMs: 60000, // 1 minute
             provider: constants_1.CONNECTION_PROVIDERS.SMARTTHINGS,
         });

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

@@ -7,8 +7,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 getAccessServiceAxiosInstance(): any;
-export declare function getCloudServiceAxiosInstance(): any;
+export declare function getAdminServiceAxiosInstance(): any;
 /**
  * Retry function for failed HTTP requests
  */

package/dist/utils/http.utils.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateServiceUrl = validateServiceUrl;
 exports.createAxiosInstance = createAxiosInstance;
 exports.getDeviceServiceAxiosInstance = getDeviceServiceAxiosInstance;
-exports.getAccessServiceAxiosInstance = getAccessServiceAxiosInstance;
-exports.getCloudServiceAxiosInstance = getCloudServiceAxiosInstance;
+exports.getAdminServiceAxiosInstance = getAdminServiceAxiosInstance;
 exports.retryRequest = retryRequest;
 const config_1 = require("../config/config");
 const axios_1 = __importDefault(require("axios"));
@@ -36,7 +35,7 @@ function createAxiosInstance(baseURL) {
         headers: {
             "Content-Type": "application/json",
             "User-Agent": "dt-common-device/1.3.0",
-            "x-api-key": (0, config_1.getConfig)().CLOUD_SERVICE_API_KEY,
+            "x-api-key": (0, config_1.getDTApiKey)(),
         },
     });
     // Add request interceptor for logging
@@ -84,39 +83,17 @@ function createAxiosInstance(baseURL) {
 let deviceServiceAxiosInstance = null;
 function getDeviceServiceAxiosInstance() {
     if (!deviceServiceAxiosInstance) {
-        const { DEVICE_SERVICE } = (0, config_1.getConfig)();
-        if (!DEVICE_SERVICE) {
-            throw new Error("DEVICE_SERVICE is not configured. Call initialize() first with DEVICE_SERVICE.");
-        }
-        deviceServiceAxiosInstance = createAxiosInstance(DEVICE_SERVICE);
+        deviceServiceAxiosInstance = createAxiosInstance((0, config_1.getDeviceServiceUrl)());
     }
     return deviceServiceAxiosInstance;
 }
-/**
- * Centralized axios instance for access service
- */
-let accessServiceAxiosInstance = null;
-function getAccessServiceAxiosInstance() {
-    if (!accessServiceAxiosInstance) {
-        const { ACCESS_SERVICE } = (0, config_1.getConfig)();
-        if (!ACCESS_SERVICE) {
-            throw new Error("ACCESS_SERVICE is not configured. Call initialize() first with ACCESS_SERVICE.");
-        }
-        accessServiceAxiosInstance = createAxiosInstance(ACCESS_SERVICE);
-    }
-    return accessServiceAxiosInstance;
-}
 /**
  * Centralized axios instance for cloud service (smart-cloud)
  */
 let cloudServiceAxiosInstance = null;
-function getCloudServiceAxiosInstance() {
-    const { ADMIN_SERVICE } = (0, config_1.getConfig)();
+function getAdminServiceAxiosInstance() {
     if (!cloudServiceAxiosInstance) {
-        if (!ADMIN_SERVICE) {
-            throw new Error("ADMIN_SERVICE is not configured. Call initialize() first with ADMIN_SERVICE.");
-        }
-        cloudServiceAxiosInstance = createAxiosInstance(ADMIN_SERVICE);
+        cloudServiceAxiosInstance = createAxiosInstance((0, config_1.getAdminServiceUrl)());
     }
     return cloudServiceAxiosInstance;
 }

package/package.json

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

package/dist/admin/Admin.repository.d.ts

@@ -1,7 +0,0 @@
-export declare class AdminRepository {
-    private readonly axiosInstance;
-    private readonly deviceRepository;
-    private readonly postgres;
-    constructor();
-    getZonesByAccessGroupIds(accessGroupIds: string[]): Promise<any[]>;
-}