dt-common-device 1.0.12 → 1.0.13

package/dist/device/cloud/entities/CloudDevice.d.ts

@@ -0,0 +1,10 @@
+import { ICloudDevice } from "../interfaces/ICloudDevice";
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+export declare abstract class CloudDevice implements ICloudDevice {
+    deviceId: string;
+    connection: IConnection;
+    cloudDeviceService: ICloudDeviceService;
+    constructor(deviceId: string, cloudDeviceService: ICloudDeviceService);
+    getConnection(deviceId: string): IConnection;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudDevice = void 0;
+class CloudDevice {
+    constructor(deviceId, cloudDeviceService) {
+        this.deviceId = deviceId;
+        this.cloudDeviceService = cloudDeviceService;
+        this.connection = this.getConnection(deviceId);
+    }
+    getConnection(deviceId) {
+        return this.cloudDeviceService.getConnection(deviceId);
+    }
+}
+exports.CloudDevice = CloudDevice;

package/dist/device/cloud/entities/DeviceFactory.d.ts

@@ -0,0 +1,6 @@
+import { IDevice } from "../../local/interfaces";
+export declare class DeviceFactory {
+    private readonly localDeviceService;
+    constructor();
+    getDevice(deviceId: string): Promise<IDevice>;
+}

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceFactory = void 0;
+const Device_service_1 = require("../../local/services/Device.service");
+class DeviceFactory {
+    constructor() {
+        this.localDeviceService = new Device_service_1.DeviceService();
+    }
+    async getDevice(deviceId) {
+        return await this.localDeviceService.getDevice(deviceId);
+    }
+}
+exports.DeviceFactory = DeviceFactory;

package/dist/device/cloud/entities/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./CloudDevice";
+export * from "./DeviceFactory";

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

@@ -0,0 +1,18 @@
+"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("./CloudDevice"), exports);
+__exportStar(require("./DeviceFactory"), exports);

package/dist/device/cloud/interfaces/ICloudDevice.d.ts

@@ -0,0 +1,5 @@
+import { ICloudDeviceService } from "./ICloudDeviceService";
+export interface ICloudDevice {
+    deviceId: string;
+    cloudDeviceService: ICloudDeviceService;
+}

package/dist/device/cloud/interfaces/ICloudDevice.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/device/cloud/interfaces/ICloudDeviceService.d.ts

@@ -0,0 +1,4 @@
+import { IConnection } from "../types";
+export interface ICloudDeviceService {
+    getConnection(deviceId: string): IConnection;
+}

package/dist/device/cloud/interfaces/ICloudDeviceService.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/device/cloud/interfaces/index.d.ts

@@ -1,3 +1,5 @@
 export * from "./IConnectionService";
 export * from "./IDeviceService";
 export * from "./IHubService";
+export * from "./ICloudDevice";
+export * from "./ICloudDeviceService";

package/dist/device/cloud/interfaces/index.js

@@ -17,3 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IConnectionService"), exports);
 __exportStar(require("./IDeviceService"), exports);
 __exportStar(require("./IHubService"), exports);
+__exportStar(require("./ICloudDevice"), exports);
+__exportStar(require("./ICloudDeviceService"), exports);

package/dist/device/cloud/services/CloudDevice.service.d.ts

@@ -0,0 +1,5 @@
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+export declare class CloudDeviceService implements ICloudDeviceService {
+    getConnection(deviceId: string): IConnection;
+}

package/dist/device/cloud/services/CloudDevice.service.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudDeviceService = void 0;
+class CloudDeviceService {
+    getConnection(deviceId) {
+        throw new Error("Method not implemented.");
+    }
+}
+exports.CloudDeviceService = CloudDeviceService;

package/dist/device/cloud/services/index.d.ts

@@ -1,3 +1,2 @@
-export { DeviceService as CloudDeviceService } from "./Device.service";
-export { ConnectionService as CloudConnectionService } from "./Connection.service";
-export { HubService as CloudHubService } from "./Hub.service";
+export * from "./CloudDevice.service";
+export * from "./Connection.service";

package/dist/device/cloud/services/index.js

@@ -1,10 +1,18 @@
 "use strict";
-// Device Cloud Services - Export all service classes
+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 });
-exports.CloudHubService = exports.CloudConnectionService = exports.CloudDeviceService = void 0;
-var Device_service_1 = require("./Device.service");
-Object.defineProperty(exports, "CloudDeviceService", { enumerable: true, get: function () { return Device_service_1.DeviceService; } });
-var Connection_service_1 = require("./Connection.service");
-Object.defineProperty(exports, "CloudConnectionService", { enumerable: true, get: function () { return Connection_service_1.ConnectionService; } });
-var Hub_service_1 = require("./Hub.service");
-Object.defineProperty(exports, "CloudHubService", { enumerable: true, get: function () { return Hub_service_1.HubService; } });
+__exportStar(require("./CloudDevice.service"), exports);
+__exportStar(require("./Connection.service"), exports);

package/dist/device/cloud/types.d.ts

@@ -21,65 +21,6 @@ export interface IConnectionPagination {
     page: number;
     limit: number;
 }
-/**
- * Represents a device in the system.
- * All date fields must be ISO 8601 strings.
- */
-export interface IDevice {
-    deviceId: string;
-    propertyId: string;
-    name: string;
-    hubId: string[];
-    specifications?: {
-        manufacturer?: string;
-        model?: string;
-        firmware?: {
-            version?: string;
-            newVersionAvailable?: boolean;
-            newVersion?: string;
-            mandatoryUpdate?: boolean;
-        };
-    };
-    protocol?: {
-        location?: {
-            id?: string;
-            name?: string;
-            city?: string;
-        };
-        name?: string;
-        room?: {
-            id?: string;
-            name?: string;
-        };
-        accountId?: string;
-    };
-    deviceType: {
-        id: string;
-        type: string;
-    };
-    status: {
-        online: boolean;
-        error?: {
-            type?: string;
-            message?: string;
-        };
-        lastUpdated?: string;
-    };
-    state?: Record<string, any>;
-    metaData?: Record<string, any>;
-    createdAt?: Date;
-    updatedAt?: Date;
-    isDeleted?: boolean;
-    hubDeviceDetails?: IDevice[];
-    parentZones?: {
-        id: string;
-        name: string;
-    }[];
-    zone?: {
-        id: string;
-        name: string;
-    };
-}
 /**
  * Device account response from provider.
  * WARNING: Do not log or expose connection_access_token.

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

@@ -3,6 +3,7 @@ export declare class DeviceService {
     private readonly baseUrl;
     private readonly source;
     private readonly eventHandler;
+    private readonly alertService;
     constructor();
     createDevice(body: IDevice): Promise<void>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;

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

@@ -11,6 +11,7 @@ const dt_pub_sub_1 = require("dt-pub-sub");
 const dt_audit_library_1 = require("dt-audit-library");
 const EventHandler_1 = require("../handler/EventHandler");
 const lodash_1 = require("lodash");
+const Alert_service_1 = require("./Alert.service");
 class DeviceService {
     constructor() {
         this.source = "dt-common-device";
@@ -22,6 +23,7 @@ class DeviceService {
         (0, config_1.checkAwsEnv)();
         (0, config_1.ensureAuditInitialized)();
         this.eventHandler = new EventHandler_1.EventHandler();
+        this.alertService = new Alert_service_1.AlertService();
     }
     async createDevice(body) {
         await dt_pub_sub_1.eventDispatcher.publishEvent("device.created", body, this.source);
@@ -71,14 +73,11 @@ class DeviceService {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/state`);
     }
     async setState(deviceId, state) {
-        // If old status and new status are different
+        // If old state and new state are different
         const oldState = await this.getState(deviceId);
-        if (!(0, lodash_1.isEqual)(oldState, state)) {
-            this.eventHandler.onStateChange(deviceId, state);
+        if (!(0, lodash_1.isEqual)(oldState?.data?.state, state)) {
+            return await this.eventHandler.onStateChange(deviceId, state);
         }
-        // If offline, check the time difference between the last offline status and current time
-        // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
-        //deviceAlertService.raiseOperationalAlert();
     }
     async getStatus(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/status`);
@@ -87,23 +86,38 @@ class DeviceService {
         // If old status and new status are different
         const oldStatus = await this.getStatus(deviceId);
         if (!(0, lodash_1.isEqual)(oldStatus, status)) {
-            this.eventHandler.onStatusChange(deviceId, status);
+            return await this.eventHandler.onStatusChange(deviceId, status);
+        }
+        // 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) {
+            const lastOfflineTime = new Date(oldStatus?.data?.lastUpdated).getTime();
+            const currentTime = Date.now();
+            const timeDifference = currentTime - lastOfflineTime;
+            // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
+            if (timeDifference > 1000 * 60 * 60 * 24) {
+                return await this.alertService.raiseOperationsAlert();
+            }
         }
-        // If offline, check the time difference between the last offline status and current time
-        // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
-        //deviceAlertService.raiseOperationalAlert();
     }
     async getBatteryLevel(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/battery-level`);
     }
     async setBatteryLevel(deviceId, batteryLevel) {
-        // If old status and new status are different
-        // and the last battery level received time more than 8 hours {
-        this.eventHandler.onBatteryLevelChange(deviceId, batteryLevel);
-        //       if(batteryLevel < propertySettingBatteryThreshold) {
-        //            deviceAlertService.raiseEnergyAlert({});
-        //       }
-        //  }
+        // 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);
+        }
+        // If current battery level is less than 20% and lsat updated time is more than 8 hours, raise an energy alert
+        if (batteryLevel < 20 &&
+            oldBatteryLevel?.data?.value < 20 &&
+            new Date(oldBatteryLevel?.data?.lastUpdated).getTime() <
+                Date.now() - 1000 * 60 * 60 * 8) {
+            //TODO: Raise an energy alert
+            await this.alertService.raiseEnergyAlert();
+        }
     }
     async getMetaData(deviceId) {
         return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/metaData`);
@@ -122,7 +136,7 @@ class DeviceService {
     async getDeviceByZone(zoneId) {
         try {
             //Step 1: Check if zone data available in redis
-            //Step 2: If not available, fetch uaing smart-cloud-node zone api
+            //Step 2: If not available, fetch using postgresql db
             //Step 3: Store the zone data in redis
             //Step 4: Return the zone data
             //Step 5: If zone data is available in redis, return the zone data
@@ -135,7 +149,7 @@ class DeviceService {
     async getDevicesByAccessGroup(accessGroupId) {
         try {
             //Step 1: Check if access group data available in redis
-            //Step 2: If not available, fetch using smart-cloud-node access-group api
+            //Step 2: If not available, fetch from postgresql db
             //Step 3: Store the access group data in redis
             //Step 4: Return the access group data
             //Step 5: If access group data is available in redis, return the access group data

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-export { CloudDeviceService, CloudHubService, CloudConnectionService, } from "./device/cloud/services";
+export { CloudDeviceService, ConnectionService as CloudConnectionService, } from "./device/cloud/services";
+export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
 export { LocalDeviceService, LocalHubService } from "./device/local/services";
-export * as cloudInterfaces from "./device/cloud/interfaces";
+export * from "./device/cloud/interfaces";
 export * from "./device/cloud/types";
-export * as localInterfaces from "./device/local/interfaces";
+export * from "./device/local/interfaces";
 export { initialize, getConfig } from "./config/config";

package/dist/index.js

@@ -11,45 +11,25 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     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 __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 __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 });
-exports.getConfig = exports.initialize = exports.localInterfaces = exports.cloudInterfaces = exports.LocalHubService = exports.LocalDeviceService = exports.CloudConnectionService = exports.CloudHubService = exports.CloudDeviceService = void 0;
+exports.getConfig = exports.initialize = exports.LocalHubService = exports.LocalDeviceService = exports.DeviceFactory = exports.CloudDevice = exports.CloudConnectionService = exports.CloudDeviceService = void 0;
 // Cloud exports
 var services_1 = require("./device/cloud/services");
 Object.defineProperty(exports, "CloudDeviceService", { enumerable: true, get: function () { return services_1.CloudDeviceService; } });
-Object.defineProperty(exports, "CloudHubService", { enumerable: true, get: function () { return services_1.CloudHubService; } });
-Object.defineProperty(exports, "CloudConnectionService", { enumerable: true, get: function () { return services_1.CloudConnectionService; } });
+Object.defineProperty(exports, "CloudConnectionService", { enumerable: true, get: function () { return services_1.ConnectionService; } });
+var entities_1 = require("./device/cloud/entities");
+Object.defineProperty(exports, "CloudDevice", { enumerable: true, get: function () { return entities_1.CloudDevice; } });
+Object.defineProperty(exports, "DeviceFactory", { enumerable: true, get: function () { return entities_1.DeviceFactory; } });
 var services_2 = require("./device/local/services");
 Object.defineProperty(exports, "LocalDeviceService", { enumerable: true, get: function () { return services_2.LocalDeviceService; } });
 Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: function () { return services_2.LocalHubService; } });
-exports.cloudInterfaces = __importStar(require("./device/cloud/interfaces"));
+__exportStar(require("./device/cloud/interfaces"), exports);
 __exportStar(require("./device/cloud/types"), exports);
 // Local exports
-exports.localInterfaces = __importStar(require("./device/local/interfaces"));
+__exportStar(require("./device/local/interfaces"), exports);
 //initialize export
 var config_1 = require("./config/config");
 Object.defineProperty(exports, "initialize", { enumerable: true, get: function () { return config_1.initialize; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

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

@@ -0,0 +1,19 @@
+import { ICloudDevice } from "../interfaces/ICloudDevice";
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+
+export abstract class CloudDevice implements ICloudDevice {
+  deviceId: string;
+  connection: IConnection;
+  cloudDeviceService: ICloudDeviceService;
+
+  constructor(deviceId: string, cloudDeviceService: ICloudDeviceService) {
+    this.deviceId = deviceId;
+    this.cloudDeviceService = cloudDeviceService;
+    this.connection = this.getConnection(deviceId);
+  }
+
+  getConnection(deviceId: string): IConnection {
+    return this.cloudDeviceService.getConnection(deviceId);
+  }
+}

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

@@ -0,0 +1,14 @@
+import { IDevice } from "../../local/interfaces";
+import { DeviceService } from "../../local/services/Device.service";
+
+export class DeviceFactory {
+  private readonly localDeviceService: DeviceService;
+
+  constructor() {
+    this.localDeviceService = new DeviceService();
+  }
+
+  async getDevice(deviceId: string): Promise<IDevice> {
+    return await this.localDeviceService.getDevice(deviceId);
+  }
+}

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

@@ -0,0 +1,2 @@
+export * from "./CloudDevice";
+export * from "./DeviceFactory";

package/src/device/cloud/interfaces/ICloudDevice.ts

@@ -0,0 +1,7 @@
+// CloudDevice interface
+import { ICloudDeviceService } from "./ICloudDeviceService";
+
+export interface ICloudDevice {
+  deviceId: string;
+  cloudDeviceService: ICloudDeviceService;
+}

package/src/device/cloud/interfaces/ICloudDeviceService.ts

@@ -0,0 +1,6 @@
+// Interface for CloudDeviceService
+import { IConnection } from "../types";
+
+export interface ICloudDeviceService {
+  getConnection(deviceId: string): IConnection;
+}

package/src/device/cloud/interfaces/index.ts

@@ -1,3 +1,5 @@
 export * from "./IConnectionService";
 export * from "./IDeviceService";
 export * from "./IHubService";
+export * from "./ICloudDevice";
+export * from "./ICloudDeviceService";

package/src/device/cloud/services/CloudDevice.service.ts

@@ -0,0 +1,8 @@
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+
+export class CloudDeviceService implements ICloudDeviceService {
+  getConnection(deviceId: string): IConnection {
+    throw new Error("Method not implemented.");
+  }
+}

package/src/device/cloud/services/index.ts

@@ -1,5 +1,2 @@
-// Device Cloud Services - Export all service classes
-
-export { DeviceService as CloudDeviceService } from "./Device.service";
-export { ConnectionService as CloudConnectionService } from "./Connection.service";
-export { HubService as CloudHubService } from "./Hub.service";
+export * from "./CloudDevice.service";
+export * from "./Connection.service";

package/src/device/cloud/types.ts

@@ -25,59 +25,6 @@ export interface IConnectionPagination {
   limit: number;
 }
 
-/**
- * Represents a device in the system.
- * All date fields must be ISO 8601 strings.
- */
-export interface IDevice {
-  deviceId: string;
-  propertyId: string;
-  name: string;
-  hubId: string[];
-  specifications?: {
-    manufacturer?: string;
-    model?: string;
-    firmware?: {
-      version?: string;
-      newVersionAvailable?: boolean;
-      newVersion?: string;
-      mandatoryUpdate?: boolean;
-    };
-  };
-  protocol?: {
-    location?: {
-      id?: string;
-      name?: string;
-      city?: string;
-    };
-    name?: string;
-    room?: {
-      id?: string;
-      name?: string;
-    };
-    accountId?: string;
-  };
-  deviceType: {
-    id: string;
-    type: string;
-  };
-  status: {
-    online: boolean;
-    error?: {
-      type?: string;
-      message?: string;
-    };
-    lastUpdated?: string;
-  };
-  state?: Record<string, any>;
-  metaData?: Record<string, any>;
-  createdAt?: Date;
-  updatedAt?: Date;
-  isDeleted?: boolean;
-  hubDeviceDetails?: IDevice[];
-  parentZones?: { id: string; name: string }[];
-  zone?: { id: string; name: string };
-}
 
 /**
  * Device account response from provider.

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

@@ -10,11 +10,13 @@ import { eventDispatcher } from "dt-pub-sub";
 import { publishAudit } from "dt-audit-library";
 import { EventHandler } from "../handler/EventHandler";
 import { isEqual } from "lodash";
+import { AlertService } from "./Alert.service";
 
 export class DeviceService {
   private readonly baseUrl: string;
   private readonly source = "dt-common-device";
   private readonly eventHandler: EventHandler;
+  private readonly alertService: AlertService;
 
   constructor() {
     const { DEVICE_SERVICE } = getConfig();
@@ -27,6 +29,7 @@ export class DeviceService {
     checkAwsEnv();
     ensureAuditInitialized();
     this.eventHandler = new EventHandler();
+    this.alertService = new AlertService();
   }
 
   async createDevice(body: IDevice): Promise<void> {
@@ -103,14 +106,11 @@ export class DeviceService {
   }
 
   async setState(deviceId: string, state: any) {
-    // If old status and new status are different
+    // If old state and new state are different
     const oldState = await this.getState(deviceId);
-    if (!isEqual(oldState, state)) {
-      this.eventHandler.onStateChange(deviceId, state);
+    if (!isEqual(oldState?.data?.state, state)) {
+      return await this.eventHandler.onStateChange(deviceId, state);
     }
-    // If offline, check the time difference between the last offline status and current time
-    // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
-    //deviceAlertService.raiseOperationalAlert();
   }
 
   async getStatus(deviceId: string) {
@@ -121,25 +121,43 @@ export class DeviceService {
     // If old status and new status are different
     const oldStatus = await this.getStatus(deviceId);
     if (!isEqual(oldStatus, status)) {
-      this.eventHandler.onStatusChange(deviceId, status);
+      return await this.eventHandler.onStatusChange(deviceId, status);
+    }
+    // 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
+    ) {
+      const lastOfflineTime = new Date(oldStatus?.data?.lastUpdated).getTime();
+      const currentTime = Date.now();
+      const timeDifference = currentTime - lastOfflineTime;
+      // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
+      if (timeDifference > 1000 * 60 * 60 * 24) {
+        return await this.alertService.raiseOperationsAlert();
+      }
     }
-    // If offline, check the time difference between the last offline status and current time
-    // Compare it with the baseline profile time of the device. If the difference is higher, then raise an operational alert
-    //deviceAlertService.raiseOperationalAlert();
   }
 
   async getBatteryLevel(deviceId: string) {
     return await axios.get(`${this.baseUrl}/devices/${deviceId}/battery-level`);
   }
   async setBatteryLevel(deviceId: string, batteryLevel: number) {
-    // If old status and new status are different
-
-    // and the last battery level received time more than 8 hours {
-    this.eventHandler.onBatteryLevelChange(deviceId, batteryLevel);
-    //       if(batteryLevel < propertySettingBatteryThreshold) {
-    //            deviceAlertService.raiseEnergyAlert({});
-    //       }
-    //  }
+    // 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);
+    }
+    // If current battery level is less than 20% and lsat updated time is more than 8 hours, raise an energy alert
+    if (
+      batteryLevel < 20 &&
+      oldBatteryLevel?.data?.value < 20 &&
+      new Date(oldBatteryLevel?.data?.lastUpdated).getTime() <
+        Date.now() - 1000 * 60 * 60 * 8
+    ) {
+      //TODO: Raise an energy alert
+      await this.alertService.raiseEnergyAlert();
+    }
   }
   async getMetaData(deviceId: string) {
     return await axios.get(`${this.baseUrl}/devices/${deviceId}/metaData`);
@@ -163,7 +181,7 @@ export class DeviceService {
   async getDeviceByZone(zoneId: string) {
     try {
       //Step 1: Check if zone data available in redis
-      //Step 2: If not available, fetch uaing smart-cloud-node zone api
+      //Step 2: If not available, fetch using postgresql db
       //Step 3: Store the zone data in redis
       //Step 4: Return the zone data
       //Step 5: If zone data is available in redis, return the zone data
@@ -176,7 +194,7 @@ export class DeviceService {
   async getDevicesByAccessGroup(accessGroupId: string) {
     try {
       //Step 1: Check if access group data available in redis
-      //Step 2: If not available, fetch using smart-cloud-node access-group api
+      //Step 2: If not available, fetch from postgresql db
       //Step 3: Store the access group data in redis
       //Step 4: Return the access group data
       //Step 5: If access group data is available in redis, return the access group data

package/src/index.ts

@@ -3,16 +3,16 @@
 // Cloud exports
 export {
   CloudDeviceService,
-  CloudHubService,
-  CloudConnectionService,
+  ConnectionService as CloudConnectionService,
 } from "./device/cloud/services";
+export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
 export { LocalDeviceService, LocalHubService } from "./device/local/services";
 
-export * as cloudInterfaces from "./device/cloud/interfaces";
+export * from "./device/cloud/interfaces";
 export * from "./device/cloud/types";
 
 // Local exports
-export * as localInterfaces from "./device/local/interfaces";
+export * from "./device/local/interfaces";
 
 //initialize export
 export { initialize, getConfig } from "./config/config";

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

@@ -1,41 +0,0 @@
-import { IDeviceService } from "../interfaces";
-import { IConnection, IDevice } from "../types";
-
-export abstract class DeviceService implements IDeviceService {
-  // IDevice properties
-  deviceId!: string;
-  propertyId!: string;
-  name!: string;
-  hubId!: string[];
-  deviceType!: {
-    id: string;
-    type: string;
-  };
-  status!: {
-    online: boolean;
-    error?: {
-      type?: string;
-      message?: string;
-    };
-    lastUpdated?: string;
-  };
-  state?: Record<string, any>;
-  metaData?: Record<string, any>;
-  zone?: {
-    id: string;
-    name: string;
-    zoneType: string;
-    parentZone?: { id: string; name: string; zoneType: string };
-  };
-  connection!: IConnection;
-
-  constructor(device: IDevice) {
-    Object.assign(this, device);
-  }
-
-  abstract getDevices(connection: IConnection): Promise<Record<string, any>[]>;
-  abstract getDevice(connectionId: string, deviceId: string): Promise<any>;
-  abstract getBattery(deviceId: string): Promise<number | string>;
-  abstract getStatus(connectionId: string, deviceId: string): Promise<string>;
-  abstract getState(deviceId: string): Promise<string>;
-}

package/src/device/cloud/services/Hub.service.ts

@@ -1,34 +0,0 @@
-import { IHubService } from "../interfaces";
-import { IConnection, IDevice } from "../types";
-
-export abstract class HubService implements IHubService {
-  // IDevice properties
-  deviceId!: string;
-  propertyId!: string;
-  name!: string;
-  deviceType!: {
-    id: string;
-    type: string;
-  };
-  status!: {
-    online: boolean;
-    error?: {
-      type?: string;
-      message?: string;
-    };
-    lastUpdated?: string;
-  };
-  metaData?: Record<string, any>;
-  connection!: IConnection;
-
-  constructor(hub: IDevice) {
-    Object.assign(this, hub);
-  }
-  
-  abstract getHubs(connectionId: string): Promise<any[] | null>;
-  abstract getHub(
-    connectionId: string,
-    hubId: string
-  ): Promise<Record<string, any>>;
-  abstract getStatus(connectionId: string, hubId: string): Promise<string>;
-}