dt-common-device 1.0.18 → 1.0.20

package/dist/device/cloud/entities/DeviceFactory.js

@@ -7,7 +7,15 @@ class DeviceFactory {
         this.localDeviceService = new Device_service_1.LocalDeviceService();
     }
     async getDevice(deviceId) {
-        return await this.localDeviceService.getDevice(deviceId);
+        try {
+            return await this.localDeviceService.getDevice(deviceId);
+        }
+        catch (error) {
+            // Log the error for debugging purposes
+            console.error(`DeviceFactory: Failed to get device ${deviceId}:`, error);
+            // Re-throw the error with additional context
+            throw new Error(`DeviceFactory: Unable to retrieve device ${deviceId}. ${error instanceof Error ? error.message : "Unknown error occurred"}`);
+        }
     }
 }
 exports.DeviceFactory = DeviceFactory;

package/dist/device/local/interfaces/IConnection.d.ts

@@ -10,7 +10,7 @@ export interface IConnection {
     connectionProvider: ConnectionProvider;
     accessToken?: string;
     clientId?: string;
-    clientSecret?: string;
+    clientSecret: string;
     isActive?: boolean;
     metaData?: any;
 }

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

@@ -13,11 +13,11 @@ export declare class LocalDeviceService {
     updateDevice(deviceId: string, body: any): Promise<any>;
     deleteDevice(deviceId: string): Promise<any>;
     getState(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
-    setState(deviceId: string, state: any): Promise<void>;
+    setState(deviceId: string, newState: any): Promise<void>;
     getStatus(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
-    setStatus(deviceId: string, status: any): Promise<void>;
+    setStatus(deviceId: string, newStatus: any): Promise<void>;
     getBatteryLevel(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
-    setBatteryLevel(deviceId: string, batteryLevel: number): Promise<void>;
+    setBatteryLevel(deviceId: string, newBatteryLevel: any): Promise<void>;
     getMetaData(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
     setMetaData(deviceId: string, metaData: Record<string, any>): Promise<void>;
     getDeviceByZone(zoneId: string): Promise<any>;

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

@@ -38,7 +38,14 @@ class LocalDeviceService {
         await (0, dt_audit_library_1.publishAudit)(payload);
     }
     async getDevice(deviceId, withHubDetails = false) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}?withHubDetails=${withHubDetails} `);
+        try {
+            const response = await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}?withHubDetails=${withHubDetails} `);
+            return response.data;
+        }
+        catch (error) {
+            console.log(error);
+            throw new Error(`Failed to get device: ${error.message}`);
+        }
     }
     async getDevices(deviceIds, withHubDetails = false) {
         return await axios_1.default.get(`${this.baseUrl}/devices`, {
@@ -74,26 +81,28 @@ class LocalDeviceService {
     async getState(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/state`);
     }
-    async setState(deviceId, state) {
+    async setState(deviceId, newState) {
         // If old state and new state are different
-        const oldState = await this.getState(deviceId);
-        if (!(0, lodash_1.isEqual)(oldState?.data?.state, state)) {
-            return await this.eventHandler.onStateChange(deviceId, state);
+        const oldState = (await this.getState(deviceId))?.data?.state || {};
+        const changedKeys = Object.keys(newState).filter((key) => !(0, lodash_1.isEqual)(oldState[key], newState[key]));
+        if (changedKeys.length > 0) {
+            return await this.eventHandler.onStateChange(deviceId, newState);
         }
     }
     async getStatus(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/status`);
     }
-    async setStatus(deviceId, status) {
+    async setStatus(deviceId, newStatus) {
         // If old status and new status are different
         const oldStatus = await this.getStatus(deviceId);
-        if (!(0, lodash_1.isEqual)(oldStatus, status)) {
-            return await this.eventHandler.onStatusChange(deviceId, status);
+        const changedKeys = Object.keys(newStatus).filter((key) => !(0, lodash_1.isEqual)(oldStatus?.data?.[key], newStatus?.[key]));
+        if (changedKeys.length > 0) {
+            return await this.eventHandler.onStatusChange(deviceId, newStatus);
         }
         // If both old and new status are offline, check the time difference between the last offline status and current time
         if (oldStatus?.data?.online === false &&
             oldStatus?.data?.lastUpdated &&
-            status?.online === false) {
+            newStatus?.online === false) {
             const lastOfflineTime = new Date(oldStatus?.data?.lastUpdated).getTime();
             const currentTime = Date.now();
             const timeDifference = currentTime - lastOfflineTime;
@@ -106,14 +115,15 @@ class LocalDeviceService {
     async getBatteryLevel(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/battery-level`);
     }
-    async setBatteryLevel(deviceId, batteryLevel) {
+    async setBatteryLevel(deviceId, newBatteryLevel) {
         // If old battery level and new battery level are different
         const oldBatteryLevel = await this.getBatteryLevel(deviceId);
-        if (!(0, lodash_1.isEqual)(oldBatteryLevel?.data?.value, batteryLevel)) {
-            this.eventHandler.onBatteryLevelChange(deviceId, batteryLevel);
+        const changedKeys = Object.keys(newBatteryLevel).filter((key) => !(0, lodash_1.isEqual)(oldBatteryLevel?.data?.[key], newBatteryLevel?.[key]));
+        if (changedKeys.length > 0) {
+            return await this.eventHandler.onBatteryLevelChange(deviceId, newBatteryLevel);
         }
         // If current battery level is less than 20% and lsat updated time is more than 8 hours, raise an energy alert
-        if (batteryLevel < 20 &&
+        if (newBatteryLevel?.value < 20 &&
             oldBatteryLevel?.data?.value < 20 &&
             new Date(oldBatteryLevel?.data?.lastUpdated).getTime() <
                 Date.now() - 1000 * 60 * 60 * 8) {

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "dt-common-device",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc ",
+    "patch": "npm version patch && npm run build",
+    "minor": "npm version minor && npm run build",
+    "major": "npm version major && npm run build",
     "security:audit": "npm audit --audit-level=moderate",
     "security:fix": "npm audit fix",
     "security:check": "npm audit && npm outdated",

package/src/device/cloud/entities/DeviceFactory.ts

@@ -9,6 +9,18 @@ export class DeviceFactory {
   }
 
   async getDevice(deviceId: string): Promise<IDevice> {
-    return await this.localDeviceService.getDevice(deviceId);
+    try {
+      return await this.localDeviceService.getDevice(deviceId);
+    } catch (error) {
+      // Log the error for debugging purposes
+      console.error(`DeviceFactory: Failed to get device ${deviceId}:`, error);
+
+      // Re-throw the error with additional context
+      throw new Error(
+        `DeviceFactory: Unable to retrieve device ${deviceId}. ${
+          error instanceof Error ? error.message : "Unknown error occurred"
+        }`
+      );
+    }
   }
 }

package/src/device/local/interfaces/IConnection.ts

@@ -11,7 +11,7 @@ export interface IConnection {
   connectionProvider: ConnectionProvider;
   accessToken?: string;
   clientId?: string;
-  clientSecret?: string;
+  clientSecret: string;
   isActive?: boolean;
   metaData?: any;
-}
+}

package/src/device/local/services/Device.service.ts

@@ -10,7 +10,7 @@ import { publishAudit } from "dt-audit-library";
 import { EventHandler } from "../handler/EventHandler";
 import { isEqual } from "lodash";
 import { AlertService } from "./Alert.service";
-import { getRedisClient, getPostgresClient } from "../../../db";
+import { getPostgresClient } from "../../../db";
 
 export class LocalDeviceService {
   private readonly baseUrl: string;
@@ -50,9 +50,15 @@ export class LocalDeviceService {
     deviceId: string,
     withHubDetails: boolean = false
   ): Promise<IDevice> {
-    return await axios.get(
-      `${this.baseUrl}/devices/${deviceId}?withHubDetails=${withHubDetails} `
-    );
+    try {
+      const response = await axios.get(
+        `${this.baseUrl}/devices/${deviceId}?withHubDetails=${withHubDetails} `
+      );
+      return response.data;
+    } catch (error: any) {
+      console.log(error);
+      throw new Error(`Failed to get device: ${error.message}`);
+    }
   }
 
   async getDevices(
@@ -108,11 +114,14 @@ export class LocalDeviceService {
     return await axios.get(`${this.baseUrl}/devices/${deviceId}/state`);
   }
 
-  async setState(deviceId: string, state: any) {
+  async setState(deviceId: string, newState: any) {
     // If old state and new state are different
-    const oldState = await this.getState(deviceId);
-    if (!isEqual(oldState?.data?.state, state)) {
-      return await this.eventHandler.onStateChange(deviceId, state);
+    const oldState = (await this.getState(deviceId))?.data?.state || {};
+    const changedKeys = Object.keys(newState).filter(
+      (key) => !isEqual(oldState[key], newState[key])
+    );
+    if (changedKeys.length > 0) {
+      return await this.eventHandler.onStateChange(deviceId, newState);
     }
   }
 
@@ -120,17 +129,20 @@ export class LocalDeviceService {
     return await axios.get(`${this.baseUrl}/devices/${deviceId}/status`);
   }
 
-  async setStatus(deviceId: string, status: any) {
+  async setStatus(deviceId: string, newStatus: any) {
     // If old status and new status are different
     const oldStatus = await this.getStatus(deviceId);
-    if (!isEqual(oldStatus, status)) {
-      return await this.eventHandler.onStatusChange(deviceId, status);
+    const changedKeys = Object.keys(newStatus).filter(
+      (key) => !isEqual(oldStatus?.data?.[key], newStatus?.[key])
+    );
+    if (changedKeys.length > 0) {
+      return await this.eventHandler.onStatusChange(deviceId, newStatus);
     }
     // If both old and new status are offline, check the time difference between the last offline status and current time
     if (
       oldStatus?.data?.online === false &&
       oldStatus?.data?.lastUpdated &&
-      status?.online === false
+      newStatus?.online === false
     ) {
       const lastOfflineTime = new Date(oldStatus?.data?.lastUpdated).getTime();
       const currentTime = Date.now();
@@ -145,15 +157,21 @@ export class LocalDeviceService {
   async getBatteryLevel(deviceId: string) {
     return await axios.get(`${this.baseUrl}/devices/${deviceId}/battery-level`);
   }
-  async setBatteryLevel(deviceId: string, batteryLevel: number) {
+  async setBatteryLevel(deviceId: string, newBatteryLevel: any) {
     // If old battery level and new battery level are different
     const oldBatteryLevel = await this.getBatteryLevel(deviceId);
-    if (!isEqual(oldBatteryLevel?.data?.value, batteryLevel)) {
-      this.eventHandler.onBatteryLevelChange(deviceId, batteryLevel);
+    const changedKeys = Object.keys(newBatteryLevel).filter(
+      (key) => !isEqual(oldBatteryLevel?.data?.[key], newBatteryLevel?.[key])
+    );
+    if (changedKeys.length > 0) {
+      return await this.eventHandler.onBatteryLevelChange(
+        deviceId,
+        newBatteryLevel
+      );
     }
     // If current battery level is less than 20% and lsat updated time is more than 8 hours, raise an energy alert
     if (
-      batteryLevel < 20 &&
+      newBatteryLevel?.value < 20 &&
       oldBatteryLevel?.data?.value < 20 &&
       new Date(oldBatteryLevel?.data?.lastUpdated).getTime() <
         Date.now() - 1000 * 60 * 60 * 8