dt-common-device 1.0.12 → 1.0.14

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

@@ -3,25 +3,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceService = void 0;
-//TODO: Import Redis
+exports.LocalDeviceService = void 0;
 const axios_1 = __importDefault(require("axios"));
 const config_1 = require("../../../config/config");
 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");
-class DeviceService {
+const Alert_service_1 = require("./Alert.service");
+const db_1 = require("../../../db");
+class LocalDeviceService {
     constructor() {
         this.source = "dt-common-device";
         const { DEVICE_SERVICE } = (0, config_1.getConfig)();
         if (!DEVICE_SERVICE) {
             throw new Error("DEVICE_SERVICE is not configured. Call initialize() first with DEVICE_SERVICE.");
         }
+        this.redis = (0, db_1.getRedisClient)();
+        this.postgres = (0, db_1.getPostgresClient)();
         this.baseUrl = DEVICE_SERVICE;
         (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 +75,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 +88,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`);
@@ -121,11 +137,21 @@ 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 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
+            // Step 1: Check if zone data is available in Redis
+            let cached = await this.redis.get(`zone:${zoneId}`);
+            if (cached) {
+                // Parse if stored as JSON string
+                return typeof cached === "string" ? JSON.parse(cached) : cached;
+            }
+            // If not available, fetch from PostgreSQL DB
+            const result = await this.postgres.query("SELECT * FROM dt_devices WHERE zoneId = $1", [zoneId]);
+            if (result.rows.length > 0) {
+                // Store in Redis as JSON string
+                await this.redis.set(`zone:${zoneId}`, JSON.stringify(result.rows[0]));
+                return result.rows[0];
+            }
+            // If data is not available, return null
+            return null;
         }
         catch (error) {
             console.log(error);
@@ -134,16 +160,44 @@ 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 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
+            // Try to get from Redis
+            let cached = await this.redis.get(`accessGroup:${accessGroupId}`);
+            if (cached) {
+                return typeof cached === "string" ? JSON.parse(cached) : cached;
+            }
+            // Fetch from Postgres if not in cache
+            const result = await this.postgres.query("SELECT * FROM access_groups WHERE id = $1", [accessGroupId]);
+            if (result.rows.length > 0) {
+                // Cache in Redis as JSON string
+                await this.redis.set(`accessGroup:${accessGroupId}`, JSON.stringify(result.rows[0]));
+                return result.rows[0];
+            }
+            return null;
         }
         catch (error) {
             console.log(error);
             throw new Error("Failed to get devices by access group");
         }
     }
+    async getPropertyPreferences(propertyId) {
+        try {
+            const propertyPreferences = await this.redis.get(`propertyPreferences:${propertyId}`);
+            if (!propertyPreferences) {
+                const propertyPreferences = await this.postgres.query("SELECT * FROM property_preferences WHERE property_id = $1", [propertyId]);
+                if (propertyPreferences.rows.length > 0) {
+                    await this.redis.set(`propertyPreferences:${propertyId}`, propertyPreferences.rows[0]);
+                    return propertyPreferences.rows[0];
+                }
+                return null;
+            }
+            else {
+                return propertyPreferences;
+            }
+        }
+        catch (error) {
+            console.log(error);
+            throw new Error("Failed to get property preferences");
+        }
+    }
 }
-exports.DeviceService = DeviceService;
+exports.LocalDeviceService = LocalDeviceService;

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

@@ -1,2 +1,3 @@
-export { DeviceService as LocalDeviceService } from "./Device.service";
+export { LocalDeviceService } from "./Device.service";
 export { HubService as LocalHubService } from "./Hub.service";
+export { ConnectionService } from "./Connection.service";

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalHubService = exports.LocalDeviceService = void 0;
+exports.ConnectionService = exports.LocalHubService = exports.LocalDeviceService = void 0;
 var Device_service_1 = require("./Device.service");
-Object.defineProperty(exports, "LocalDeviceService", { enumerable: true, get: function () { return Device_service_1.DeviceService; } });
+Object.defineProperty(exports, "LocalDeviceService", { enumerable: true, get: function () { return Device_service_1.LocalDeviceService; } });
 var Hub_service_1 = require("./Hub.service");
 Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: function () { return Hub_service_1.HubService; } });
+var Connection_service_1 = require("./Connection.service");
+Object.defineProperty(exports, "ConnectionService", { enumerable: true, get: function () { return Connection_service_1.ConnectionService; } });

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-export { CloudDeviceService, CloudHubService, CloudConnectionService, } from "./device/cloud/services";
-export { LocalDeviceService, LocalHubService } from "./device/local/services";
-export * as cloudInterfaces from "./device/cloud/interfaces";
+export { CloudDeviceService, ConnectionService as CloudConnectionService, } from "./device/cloud/services";
+export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
+export { LocalDeviceService, LocalHubService, ConnectionService, } from "./device/local/services";
+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,26 @@ 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.ConnectionService = 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"));
+Object.defineProperty(exports, "ConnectionService", { enumerable: true, get: function () { return services_2.ConnectionService; } });
+__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.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -30,19 +30,17 @@
   "devDependencies": {
     "@types/lodash": "^4.17.19",
     "@types/node": "^20.0.0",
+    "@types/pg": "8.15.4",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "axios": "^1.10.0",
+    "axios": "1.10.0",
     "dt-audit-library": "^1.0.3",
     "dt-pub-sub": "^1.0.0",
-    "lodash": "^4.17.21"
-  },
-  "peerDependencies": {
-    "axios": ">=1.0.0"
-  },
-  "overrides": {
-    "axios": "^1.10.0"
+    "ioredis": "5.6.1",
+    "lodash": "^4.17.21",
+    "pg": "8.16.3",
+    "redis": "5.5.6"
   }
 }

package/src/config/config.ts

@@ -1,5 +1,7 @@
 import { DeviceConfig } from "../types";
 import { initializeAudit } from "dt-audit-library";
+import dotenv from "dotenv";
+dotenv.config();
 
 let config: DeviceConfig | null = null;
 let auditInitialized = false;
@@ -61,3 +63,32 @@ export function ensureAuditInitialized() {
   initializeAudit(apiKey, host);
   auditInitialized = true;
 }
+
+/**
+ * Returns the PostgreSQL DB URI from environment variables.
+ * Throws an error if not set.
+ */
+export function getPostgresDbUri(): string {
+  const uri = process.env.DATABASE_URL;
+  if (!uri) {
+    throw new Error(
+      "dt-common-device: POSTGRESQL_DB_URI must be set in environment variables or .env file"
+    );
+  }
+  return uri;
+}
+
+/**
+ * Returns the Redis DB Host and port from environment variables.
+ * Throws an error if not set.
+ */
+export function getRedisDbHostAndPort(): { host: string; port: number } {
+  const host = process.env.REDIS_HOST;
+  const port = process.env.REDIS_PORT;
+  if (!host || !port) {
+    throw new Error(
+      "dt-common-device: REDIS_HOST and REDIS_PORT must be set in environment variables"
+    );
+  }
+  return { host, port: Number(port) };
+}

package/src/db/db.ts

@@ -0,0 +1,15 @@
+import { Pool } from "pg";
+import { getPostgresDbUri } from "../config/config";
+
+const dbUri = getPostgresDbUri();
+
+let pool: Pool | null = null;
+
+export function getPostgresClient() {
+  if (!pool) {
+    pool = new Pool({
+      connectionString: dbUri,
+    });
+  }
+  return pool;
+}

package/src/db/index.ts

@@ -0,0 +1,2 @@
+export * from "./db";
+export * from "./redis";

package/src/db/redis.ts

@@ -0,0 +1,18 @@
+import { getRedisDbHostAndPort } from "../config/config";
+import Redis from "ioredis";
+
+let redisClient: Redis | null = null;
+
+export function getRedisClient() {
+  if (!redisClient) {
+    const { host, port } = getRedisDbHostAndPort();
+    redisClient = new Redis({
+      host,
+      port,
+    });
+    redisClient.on("error", (error) => {
+      console.error("Redis error:", error);
+    });
+  }
+  return redisClient;
+}

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

@@ -0,0 +1,56 @@
+import { IDevice } from "../../local/interfaces";
+import { ICloudDevice } from "../interfaces/ICloudDevice";
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+
+export abstract class CloudDevice implements ICloudDevice {
+  deviceId: string;
+  localDevice?: IDevice;
+  connection?: IConnection;
+  cloudDeviceService: ICloudDeviceService;
+
+  constructor(device: IDevice, cloudDeviceService: ICloudDeviceService) {
+    this.deviceId = device.deviceId;
+    this.localDevice = device;
+    this.cloudDeviceService = cloudDeviceService;
+  }
+
+  async getDevice(
+    connectionId: string,
+    deviceId: string
+  ): Promise<Record<string, any>> {
+    throw new Error("Method not implemented in Super Class.");
+  }
+
+  async getBattery(deviceId: string): Promise<number | string> {
+    throw new Error("Method not implemented in Super Class.");
+  }
+
+  async getState(deviceId: string): Promise<string> {
+    throw new Error("Method not implemented in Super Class.");
+  }
+
+  async getStatus(connectionId: string, deviceId: string): Promise<string> {
+    throw new Error("Method not implemented in Super Class.");
+  }
+}
+
+/*
+Usage Example:
+
+// When extending CloudDevice, you can now do:
+class MyCloudDevice extends CloudDevice {
+  constructor(device: IDevice, cloudDeviceService: ICloudDeviceService) {
+    super(device, cloudDeviceService);
+    // Additional initialization if needed
+  }
+}
+
+// Create and initialize in one step:
+const device = await MyCloudDevice.create(device, cloudDeviceService);
+// The device is now fully initialized with connection and localDevice loaded
+
+// Or if you need to create without auto-initialization:
+const device = new MyCloudDevice(device, cloudDeviceService);
+await device.initialize(); // Manual initialization
+*/

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

@@ -0,0 +1,14 @@
+import { IDevice } from "../../local/interfaces";
+import { LocalDeviceService } from "../../local/services/Device.service";
+
+export class DeviceFactory {
+  private readonly localDeviceService: LocalDeviceService;
+
+  constructor() {
+    this.localDeviceService = new LocalDeviceService();
+  }
+
+  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,15 @@
+// CloudDevice interface
+import { ICloudDeviceService } from "./ICloudDeviceService";
+
+export interface ICloudDevice {
+  deviceId: string;
+  cloudDeviceService: ICloudDeviceService;
+
+  getDevice(
+    connectionId: string,
+    deviceId: string
+  ): Promise<Record<string, any>>;
+  getBattery(deviceId: string): Promise<number | string>;
+  getState(deviceId: string): Promise<string>;
+  getStatus(connectionId: string, deviceId: string): Promise<string>;
+}

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

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

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

@@ -1,5 +1,3 @@
-// Device Cloud Class Interface for DeviceThread Common Library
-
 import {
   IConnection,
   IConnectionConnectParams,

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,6 @@
+import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
+import { IConnection } from "../types";
+
+export abstract class CloudDeviceService implements ICloudDeviceService {
+  abstract getConnection(deviceId: string): Promise<IConnection>;
+}

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

@@ -1,9 +1,9 @@
 // Device Cloud Service - Class Implementation
 import { IConnectionService } from "../interfaces";
 import {
-  IConnection,
   IDeviceAccountResponse,
   IConnectionConnectParams,
+  IConnection,
 } from "../types";
 
 export abstract class ConnectionService implements IConnectionService {

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,60 +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.
  * WARNING: Do not log or expose connection_access_token.
@@ -99,13 +45,13 @@ export interface IConnectionConnectParams {
   [key: string]: unknown;
 }
 
-export enum ConnectionProvider {
-  Devicethread = "Devicethread",
-  Smartthings = "Smartthings",
-  SaltoKS = "SaltoKS",
-  Tuya = "Tuya",
-  TTLock = "TTLock",
-  Schlage = "Schlage",
-  YaleWifi = "YaleWifi",
-  Sensibo = "Sensibo",
+export interface ConnectionProvider {
+  DEVICETHREAD: "Devicethread";
+  SMARTTHINGS: "Smartthings";
+  SALTOKS: "SaltoKS";
+  TUYA: "Tuya";
+  TTLOCK: "TTLock";
+  SCHLAGE: "Schlage";
+  YALEWIFI: "YaleWifi";
+  SENSIBO: "Sensibo";
 }

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

@@ -0,0 +1,17 @@
+import { ConnectionProvider } from "../../cloud/types";
+
+export interface IConnection {
+  id?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  isDeleted?: boolean;
+  connectionName: string;
+  connectionRefId: string;
+  propertyId: string;
+  connectionProvider: ConnectionProvider;
+  accessToken?: string;
+  clientId?: string;
+  clientSecret?: string;
+  isActive?: boolean;
+  metaData?: any;
+}

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

@@ -28,6 +28,10 @@ export interface IDevice {
     };
     accountId?: string;
   };
+  account: {
+    id: string;
+    name: string;
+  };
   deviceType: {
     id: string;
     type: string;

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

@@ -1,2 +1,2 @@
 export * from "./IDevice";
-export * from "./IHub";
+export * from "./IHub";