dt-common-device 1.0.13 → 1.0.14

package/README.md

@@ -20,6 +20,20 @@ npm install dt-common-device
 - `dt-common-device` will automatically initialize audit logging using these environment variables when you create a local device service.
 - If either variable is missing, the library will throw a clear error at runtime.
 
+## Environment Variables
+
+This library requires the following environment variable to be set in your project's environment or in a `.env` file:
+
+- `POSTGRESQL_DB_URI`: The connection URI for your PostgreSQL database.
+
+Example `.env` file:
+
+```
+POSTGRESQL_DB_URI=postgres://username:password@host:port/database
+```
+
+The library will throw an error if this variable is not set when attempting to connect to the database.
+
 ---
 
 ## Initialization (Required)
@@ -176,38 +190,4 @@ import { IDevice, IHub, IConnection } from "dt-common-device";
 
 - You **must** call `initialize()` before using any service. If not, you will get a runtime error.
 - **You must set `POSTHOG_API_KEY` and `POSTHOG_HOST` in your environment before using any local device service.**
-- You do **not** need to call `initializeAudit()`; the library will handle audit initialization automatically.
-- Cloud service methods are stubs and must be implemented by the consuming project.
-- All types are strongly typed for TypeScript support.
-
----
-
-## Example Usage
-
-```ts
-import {
-  initialize,
-  CloudDeviceService,
-  LocalDeviceService,
-  IDevice,
-} from "dt-common-device";
-
-initialize({
-  DEVICE_SERVICE: "https://api.example.com/device",
-});
-
-const cloudService = new CloudDeviceService();
-const localService = new LocalDeviceService();
-
-async function main() {
-  // Example: get devices from cloud (must implement in your project)
-  // const devices: IDevice[] = await cloudService.getDevices(connection);
-
-  // Example: create a device locally
-  await localService.createDevice({
-    /* device params */
-  });
-}
-
-main();
-```
+- You do **not** need to call `initializeAudit()`

package/dist/config/config.d.ts

@@ -3,3 +3,16 @@ export declare function initialize(cfg: DeviceConfig): void;
 export declare function getConfig(): DeviceConfig;
 export declare function checkAwsEnv(): void;
 export declare function ensureAuditInitialized(): void;
+/**
+ * Returns the PostgreSQL DB URI from environment variables.
+ * Throws an error if not set.
+ */
+export declare function getPostgresDbUri(): string;
+/**
+ * Returns the Redis DB Host and port from environment variables.
+ * Throws an error if not set.
+ */
+export declare function getRedisDbHostAndPort(): {
+    host: string;
+    port: number;
+};

package/dist/config/config.js

@@ -1,10 +1,17 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initialize = initialize;
 exports.getConfig = getConfig;
 exports.checkAwsEnv = checkAwsEnv;
 exports.ensureAuditInitialized = ensureAuditInitialized;
+exports.getPostgresDbUri = getPostgresDbUri;
+exports.getRedisDbHostAndPort = getRedisDbHostAndPort;
 const dt_audit_library_1 = require("dt-audit-library");
+const dotenv_1 = __importDefault(require("dotenv"));
+dotenv_1.default.config();
 let config = null;
 let auditInitialized = false;
 function initialize(cfg) {
@@ -50,3 +57,26 @@ function ensureAuditInitialized() {
     (0, dt_audit_library_1.initializeAudit)(apiKey, host);
     auditInitialized = true;
 }
+/**
+ * Returns the PostgreSQL DB URI from environment variables.
+ * Throws an error if not set.
+ */
+function getPostgresDbUri() {
+    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.
+ */
+function getRedisDbHostAndPort() {
+    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/dist/db/db.d.ts

@@ -0,0 +1,2 @@
+import { Pool } from "pg";
+export declare function getPostgresClient(): Pool;

package/dist/db/db.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPostgresClient = getPostgresClient;
+const pg_1 = require("pg");
+const config_1 = require("../config/config");
+const dbUri = (0, config_1.getPostgresDbUri)();
+let pool = null;
+function getPostgresClient() {
+    if (!pool) {
+        pool = new pg_1.Pool({
+            connectionString: dbUri,
+        });
+    }
+    return pool;
+}

package/dist/db/index.d.ts

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

package/dist/db/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("./db"), exports);
+__exportStar(require("./redis"), exports);

package/dist/db/redis.d.ts

@@ -0,0 +1,2 @@
+import Redis from "ioredis";
+export declare function getRedisClient(): Redis;

package/dist/db/redis.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRedisClient = getRedisClient;
+const config_1 = require("../config/config");
+const ioredis_1 = __importDefault(require("ioredis"));
+let redisClient = null;
+function getRedisClient() {
+    if (!redisClient) {
+        const { host, port } = (0, config_1.getRedisDbHostAndPort)();
+        redisClient = new ioredis_1.default({
+            host,
+            port,
+        });
+        redisClient.on("error", (error) => {
+            console.error("Redis error:", error);
+        });
+    }
+    return redisClient;
+}

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

@@ -1,10 +1,15 @@
+import { IDevice } from "../../local/interfaces";
 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;
+    localDevice?: IDevice;
+    connection?: IConnection;
     cloudDeviceService: ICloudDeviceService;
-    constructor(deviceId: string, cloudDeviceService: ICloudDeviceService);
-    getConnection(deviceId: string): IConnection;
+    constructor(device: IDevice, 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/dist/device/cloud/entities/CloudDevice.js

@@ -2,13 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudDevice = void 0;
 class CloudDevice {
-    constructor(deviceId, cloudDeviceService) {
-        this.deviceId = deviceId;
+    constructor(device, cloudDeviceService) {
+        this.deviceId = device.deviceId;
+        this.localDevice = device;
         this.cloudDeviceService = cloudDeviceService;
-        this.connection = this.getConnection(deviceId);
     }
-    getConnection(deviceId) {
-        return this.cloudDeviceService.getConnection(deviceId);
+    async getDevice(connectionId, deviceId) {
+        throw new Error("Method not implemented in Super Class.");
+    }
+    async getBattery(deviceId) {
+        throw new Error("Method not implemented in Super Class.");
+    }
+    async getState(deviceId) {
+        throw new Error("Method not implemented in Super Class.");
+    }
+    async getStatus(connectionId, deviceId) {
+        throw new Error("Method not implemented in Super Class.");
     }
 }
 exports.CloudDevice = CloudDevice;
+/*
+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/dist/device/cloud/entities/DeviceFactory.js

@@ -4,7 +4,7 @@ exports.DeviceFactory = void 0;
 const Device_service_1 = require("../../local/services/Device.service");
 class DeviceFactory {
     constructor() {
-        this.localDeviceService = new Device_service_1.DeviceService();
+        this.localDeviceService = new Device_service_1.LocalDeviceService();
     }
     async getDevice(deviceId) {
         return await this.localDeviceService.getDevice(deviceId);

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

@@ -2,4 +2,8 @@ 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/dist/device/cloud/interfaces/ICloudDeviceService.d.ts

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

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

@@ -1,3 +1,2 @@
 "use strict";
-// Device Cloud Class Interface for DeviceThread Common Library
 Object.defineProperty(exports, "__esModule", { value: true });

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

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

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

@@ -2,8 +2,5 @@
 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/Connection.service.d.ts

@@ -1,5 +1,5 @@
 import { IConnectionService } from "../interfaces";
-import { IConnection, IDeviceAccountResponse, IConnectionConnectParams } from "../types";
+import { IDeviceAccountResponse, IConnectionConnectParams, IConnection } from "../types";
 export declare abstract class ConnectionService implements IConnectionService {
     abstract createConnection(data: IConnection, userId: string): Promise<any>;
     abstract getDeviceAccount(connection: IConnection): Promise<IDeviceAccountResponse>;

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

@@ -39,13 +39,13 @@ export interface IConnectionConnectParams {
     propertyId?: string;
     [key: string]: unknown;
 }
-export declare 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/dist/device/cloud/types.js

@@ -1,15 +1,3 @@
 "use strict";
 // Device Cloud Type Interfaces for DeviceThread Common Library
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionProvider = void 0;
-var ConnectionProvider;
-(function (ConnectionProvider) {
-    ConnectionProvider["Devicethread"] = "Devicethread";
-    ConnectionProvider["Smartthings"] = "Smartthings";
-    ConnectionProvider["SaltoKS"] = "SaltoKS";
-    ConnectionProvider["Tuya"] = "Tuya";
-    ConnectionProvider["TTLock"] = "TTLock";
-    ConnectionProvider["Schlage"] = "Schlage";
-    ConnectionProvider["YaleWifi"] = "YaleWifi";
-    ConnectionProvider["Sensibo"] = "Sensibo";
-})(ConnectionProvider || (exports.ConnectionProvider = ConnectionProvider = {}));

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

@@ -0,0 +1,16 @@
+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/dist/device/local/interfaces/IConnection.js

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

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

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

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

@@ -0,0 +1,5 @@
+export declare class ConnectionService {
+    private readonly pool;
+    constructor();
+    getConnection(connectionId: string): Promise<any>;
+}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectionService = void 0;
+const db_1 = require("../../../db");
+class ConnectionService {
+    constructor() {
+        this.pool = (0, db_1.getPostgresClient)();
+    }
+    async getConnection(connectionId) {
+        const result = await this.pool.query("SELECT * FROM dt_connections WHERE id = $1", [connectionId]);
+        return result.rows[0];
+    }
+}
+exports.ConnectionService = ConnectionService;

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

@@ -1,9 +1,11 @@
 import { IDevice } from "../interfaces";
-export declare class DeviceService {
+export declare class LocalDeviceService {
     private readonly baseUrl;
     private readonly source;
     private readonly eventHandler;
     private readonly alertService;
+    private readonly redis;
+    private readonly postgres;
     constructor();
     createDevice(body: IDevice): Promise<void>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;
@@ -19,6 +21,7 @@ export declare class DeviceService {
     setBatteryLevel(deviceId: string, batteryLevel: number): Promise<void>;
     getMetaData(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
     setMetaData(deviceId: string, metaData: Record<string, any>): Promise<void>;
-    getDeviceByZone(zoneId: string): Promise<void>;
-    getDevicesByAccessGroup(accessGroupId: string): Promise<void>;
+    getDeviceByZone(zoneId: string): Promise<any>;
+    getDevicesByAccessGroup(accessGroupId: string): Promise<any>;
+    getPropertyPreferences(propertyId: string): Promise<any>;
 }

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

@@ -3,8 +3,7 @@ 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");
@@ -12,13 +11,16 @@ 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 {
+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)();
@@ -135,11 +137,21 @@ class DeviceService {
     }
     async getDeviceByZone(zoneId) {
         try {
-            //Step 1: Check if zone data available in redis
-            //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
+            // 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);
@@ -148,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 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
+            // 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,6 @@
 export { CloudDeviceService, ConnectionService as CloudConnectionService, } from "./device/cloud/services";
 export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
-export { LocalDeviceService, LocalHubService } from "./device/local/services";
+export { LocalDeviceService, LocalHubService, ConnectionService, } from "./device/local/services";
 export * from "./device/cloud/interfaces";
 export * from "./device/cloud/types";
 export * from "./device/local/interfaces";

package/dist/index.js

@@ -15,7 +15,7 @@ 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.LocalHubService = exports.LocalDeviceService = exports.DeviceFactory = exports.CloudDevice = exports.CloudConnectionService = 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; } });
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "DeviceFactory", { enumerable: true, get: functio
 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; } });
+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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dt-common-device",
-  "version": "1.0.13",
+  "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

@@ -1,19 +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;
-  connection: IConnection;
+  localDevice?: IDevice;
+  connection?: IConnection;
   cloudDeviceService: ICloudDeviceService;
 
-  constructor(deviceId: string, cloudDeviceService: ICloudDeviceService) {
-    this.deviceId = deviceId;
+  constructor(device: IDevice, cloudDeviceService: ICloudDeviceService) {
+    this.deviceId = device.deviceId;
+    this.localDevice = device;
     this.cloudDeviceService = cloudDeviceService;
-    this.connection = this.getConnection(deviceId);
   }
 
-  getConnection(deviceId: string): IConnection {
-    return this.cloudDeviceService.getConnection(deviceId);
+  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

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

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

@@ -4,4 +4,12 @@ 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

@@ -2,5 +2,5 @@
 import { IConnection } from "../types";
 
 export interface ICloudDeviceService {
-  getConnection(deviceId: string): IConnection;
+  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/services/CloudDevice.service.ts

@@ -1,8 +1,6 @@
 import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
 import { IConnection } from "../types";
 
-export class CloudDeviceService implements ICloudDeviceService {
-  getConnection(deviceId: string): IConnection {
-    throw new Error("Method not implemented.");
-  }
+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/types.ts

@@ -25,7 +25,6 @@ export interface IConnectionPagination {
   limit: number;
 }
 
-
 /**
  * Device account response from provider.
  * WARNING: Do not log or expose connection_access_token.
@@ -46,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";

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

@@ -0,0 +1,15 @@
+import { getPostgresClient } from "../../../db";
+export class ConnectionService {
+  private readonly pool;
+  constructor() {
+    this.pool = getPostgresClient();
+  }
+
+  async getConnection(connectionId: string) {
+    const result = await this.pool.query(
+      "SELECT * FROM dt_connections WHERE id = $1",
+      [connectionId]
+    );
+    return result.rows[0];
+  }
+}

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

@@ -1,4 +1,3 @@
-//TODO: Import Redis
 import axios from "axios";
 import {
   getConfig,
@@ -11,13 +10,15 @@ 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";
 
-export class DeviceService {
+export class LocalDeviceService {
   private readonly baseUrl: string;
   private readonly source = "dt-common-device";
   private readonly eventHandler: EventHandler;
   private readonly alertService: AlertService;
-
+  private readonly redis;
+  private readonly postgres;
   constructor() {
     const { DEVICE_SERVICE } = getConfig();
     if (!DEVICE_SERVICE) {
@@ -25,6 +26,8 @@ export class DeviceService {
         "DEVICE_SERVICE is not configured. Call initialize() first with DEVICE_SERVICE."
       );
     }
+    this.redis = getRedisClient();
+    this.postgres = getPostgresClient();
     this.baseUrl = DEVICE_SERVICE;
     checkAwsEnv();
     ensureAuditInitialized();
@@ -180,11 +183,25 @@ export class DeviceService {
 
   async getDeviceByZone(zoneId: string) {
     try {
-      //Step 1: Check if zone data available in redis
-      //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
+      // 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);
       throw new Error("Failed to get device by zone");
@@ -193,14 +210,55 @@ export class DeviceService {
 
   async getDevicesByAccessGroup(accessGroupId: string) {
     try {
-      //Step 1: Check if access group data available in redis
-      //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
+      // 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: string) {
+    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");
+    }
+  }
 }

package/src/device/local/services/index.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/src/index.ts

@@ -6,7 +6,11 @@ export {
   ConnectionService as CloudConnectionService,
 } from "./device/cloud/services";
 export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
-export { LocalDeviceService, LocalHubService } from "./device/local/services";
+export {
+  LocalDeviceService,
+  LocalHubService,
+  ConnectionService,
+} from "./device/local/services";
 
 export * from "./device/cloud/interfaces";
 export * from "./device/cloud/types";