dt-common-device 1.0.14 → 1.0.16

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

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

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

@@ -2,5 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudDeviceService = void 0;
 class CloudDeviceService {
+    async getConnection(deviceId) {
+        throw new Error("Method not implemented.");
+    }
 }
 exports.CloudDeviceService = CloudDeviceService;

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

@@ -39,13 +39,13 @@ export interface IConnectionConnectParams {
     propertyId?: string;
     [key: string]: unknown;
 }
-export interface ConnectionProvider {
-    DEVICETHREAD: "Devicethread";
-    SMARTTHINGS: "Smartthings";
-    SALTOKS: "SaltoKS";
-    TUYA: "Tuya";
-    TTLOCK: "TTLock";
-    SCHLAGE: "Schlage";
-    YALEWIFI: "YaleWifi";
-    SENSIBO: "Sensibo";
+export declare enum ConnectionProvider {
+    Smartthings = "Smartthings",
+    SaltoKS = "SaltoKS",
+    TTLock = "TTLock",
+    Tuya = "Tuya",
+    Schlage = "Schlage",
+    YaleWifi = "YaleWifi",
+    Sensibo = "Sensibo",
+    Devicethread = "Devicethread"
 }

package/dist/device/cloud/types.js

@@ -1,3 +1,15 @@
 "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["Smartthings"] = "Smartthings";
+    ConnectionProvider["SaltoKS"] = "SaltoKS";
+    ConnectionProvider["TTLock"] = "TTLock";
+    ConnectionProvider["Tuya"] = "Tuya";
+    ConnectionProvider["Schlage"] = "Schlage";
+    ConnectionProvider["YaleWifi"] = "YaleWifi";
+    ConnectionProvider["Sensibo"] = "Sensibo";
+    ConnectionProvider["Devicethread"] = "Devicethread";
+})(ConnectionProvider || (exports.ConnectionProvider = ConnectionProvider = {}));

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

@@ -1,5 +1,6 @@
-export declare class ConnectionService {
+import { IConnection } from "../interfaces/IConnection";
+export declare class LocalConnectionService {
     private readonly pool;
     constructor();
-    getConnection(connectionId: string): Promise<any>;
+    getConnection(connectionId: string): Promise<IConnection>;
 }

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionService = void 0;
+exports.LocalConnectionService = void 0;
 const db_1 = require("../../../db");
-class ConnectionService {
+class LocalConnectionService {
     constructor() {
         this.pool = (0, db_1.getPostgresClient)();
     }
@@ -11,4 +11,4 @@ class ConnectionService {
         return result.rows[0];
     }
 }
-exports.ConnectionService = ConnectionService;
+exports.LocalConnectionService = LocalConnectionService;

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

@@ -4,7 +4,6 @@ export declare class LocalDeviceService {
     private readonly source;
     private readonly eventHandler;
     private readonly alertService;
-    private readonly redis;
     private readonly postgres;
     constructor();
     createDevice(body: IDevice): Promise<void>;

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

@@ -19,7 +19,7 @@ class LocalDeviceService {
         if (!DEVICE_SERVICE) {
             throw new Error("DEVICE_SERVICE is not configured. Call initialize() first with DEVICE_SERVICE.");
         }
-        this.redis = (0, db_1.getRedisClient)();
+        // this.redis = getRedisClient();
         this.postgres = (0, db_1.getPostgresClient)();
         this.baseUrl = DEVICE_SERVICE;
         (0, config_1.checkAwsEnv)();
@@ -137,17 +137,9 @@ class LocalDeviceService {
     }
     async getDeviceByZone(zoneId) {
         try {
-            // 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
@@ -160,16 +152,9 @@ class LocalDeviceService {
     }
     async getDevicesByAccessGroup(accessGroupId) {
         try {
-            // 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]);
+            const result = await this.postgres.query("SELECT * FROM dt_group 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;
@@ -181,18 +166,11 @@ class LocalDeviceService {
     }
     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;
+            const propertyPreferences = await this.postgres.query("SELECT * FROM dt_property_settings WHERE propertyId = $1", [propertyId]);
+            if (propertyPreferences.rows.length > 0) {
+                return propertyPreferences.rows[0];
             }
+            return null;
         }
         catch (error) {
             console.log(error);

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

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

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionService = exports.LocalHubService = exports.LocalDeviceService = void 0;
+exports.LocalConnectionService = 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.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; } });
+Object.defineProperty(exports, "LocalConnectionService", { enumerable: true, get: function () { return Connection_service_1.LocalConnectionService; } });

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, ConnectionService, } from "./device/local/services";
+export { LocalDeviceService, LocalHubService, LocalConnectionService, } 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.ConnectionService = exports.LocalHubService = exports.LocalDeviceService = exports.DeviceFactory = exports.CloudDevice = exports.CloudConnectionService = exports.CloudDeviceService = void 0;
+exports.getConfig = exports.initialize = exports.LocalConnectionService = 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,7 +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; } });
+Object.defineProperty(exports, "LocalConnectionService", { enumerable: true, get: function () { return services_2.LocalConnectionService; } });
 __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.14",
+  "version": "1.0.16",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -40,7 +40,6 @@
     "dt-pub-sub": "^1.0.0",
     "ioredis": "5.6.1",
     "lodash": "^4.17.21",
-    "pg": "8.16.3",
-    "redis": "5.5.6"
+    "pg": "8.16.3"
   }
 }

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

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

package/src/device/cloud/types.ts

@@ -45,13 +45,13 @@ export interface IConnectionConnectParams {
   [key: string]: unknown;
 }
 
-export interface ConnectionProvider {
-  DEVICETHREAD: "Devicethread";
-  SMARTTHINGS: "Smartthings";
-  SALTOKS: "SaltoKS";
-  TUYA: "Tuya";
-  TTLOCK: "TTLock";
-  SCHLAGE: "Schlage";
-  YALEWIFI: "YaleWifi";
-  SENSIBO: "Sensibo";
-}
+export enum ConnectionProvider {
+  Smartthings = "Smartthings",
+  SaltoKS = "SaltoKS",
+  TTLock = "TTLock",
+  Tuya = "Tuya",
+  Schlage = "Schlage",
+  YaleWifi = "YaleWifi",
+  Sensibo = "Sensibo",
+  Devicethread = "Devicethread",
+}

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

@@ -1,11 +1,12 @@
 import { getPostgresClient } from "../../../db";
-export class ConnectionService {
+import { IConnection } from "../interfaces/IConnection";
+export class LocalConnectionService {
   private readonly pool;
   constructor() {
     this.pool = getPostgresClient();
   }
 
-  async getConnection(connectionId: string) {
+  async getConnection(connectionId: string): Promise<IConnection> {
     const result = await this.pool.query(
       "SELECT * FROM dt_connections WHERE id = $1",
       [connectionId]

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

@@ -17,7 +17,7 @@ export class LocalDeviceService {
   private readonly source = "dt-common-device";
   private readonly eventHandler: EventHandler;
   private readonly alertService: AlertService;
-  private readonly redis;
+  //private readonly redis;
   private readonly postgres;
   constructor() {
     const { DEVICE_SERVICE } = getConfig();
@@ -26,7 +26,7 @@ export class LocalDeviceService {
         "DEVICE_SERVICE is not configured. Call initialize() first with DEVICE_SERVICE."
       );
     }
-    this.redis = getRedisClient();
+    // this.redis = getRedisClient();
     this.postgres = getPostgresClient();
     this.baseUrl = DEVICE_SERVICE;
     checkAwsEnv();
@@ -183,21 +183,12 @@ export class LocalDeviceService {
 
   async getDeviceByZone(zoneId: string) {
     try {
-      // 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
@@ -210,22 +201,12 @@ export class LocalDeviceService {
 
   async getDevicesByAccessGroup(accessGroupId: string) {
     try {
-      // 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",
+        "SELECT * FROM dt_group 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;
@@ -237,25 +218,14 @@ export class LocalDeviceService {
 
   async getPropertyPreferences(propertyId: string) {
     try {
-      const propertyPreferences = await this.redis.get(
-        `propertyPreferences:${propertyId}`
+      const propertyPreferences = await this.postgres.query(
+        "SELECT * FROM dt_property_settings WHERE propertyId = $1",
+        [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;
+      if (propertyPreferences.rows.length > 0) {
+        return propertyPreferences.rows[0];
       }
+      return null;
     } catch (error) {
       console.log(error);
       throw new Error("Failed to get property preferences");

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

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

package/src/index.ts

@@ -9,7 +9,7 @@ export { CloudDevice, DeviceFactory } from "./device/cloud/entities";
 export {
   LocalDeviceService,
   LocalHubService,
-  ConnectionService,
+  LocalConnectionService,
 } from "./device/local/services";
 
 export * from "./device/cloud/interfaces";