dt-common-device 1.2.5 → 1.2.6

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

@@ -1,7 +1,7 @@
 import { IDevice } from "../../local/interfaces";
 import { ICloudDevice } from "../interfaces/ICloudDevice";
 import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
-import { IConnection } from "../types";
+import { IConnection } from "../../local/interfaces/IConnection";
 export declare abstract class CloudDevice implements ICloudDevice {
     deviceId: string;
     localDevice?: IDevice;

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

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

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

@@ -1,4 +1,3 @@
 export * from "./CloudDevice";
 export * from "./DeviceFactory";
-export * from "./CloudConnection";
 export * from "./CloudDeviceService";

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

@@ -16,5 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./CloudDevice"), exports);
 __exportStar(require("./DeviceFactory"), exports);
-__exportStar(require("./CloudConnection"), exports);
 __exportStar(require("./CloudDeviceService"), exports);

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

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

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

@@ -1,3 +1,3 @@
-export * from "./ICloudConnection";
 export * from "./ICloudDevice";
 export * from "./ICloudDeviceService";
+export * from "./IDeviceFactory";

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

@@ -14,6 +14,6 @@ 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("./ICloudConnection"), exports);
 __exportStar(require("./ICloudDevice"), exports);
 __exportStar(require("./ICloudDeviceService"), exports);
+__exportStar(require("./IDeviceFactory"), exports);

package/dist/device/local/events/EventHandler.d.ts

@@ -7,4 +7,5 @@ export declare class EventHandler {
     onStateChange(deviceId: string, state: any): Promise<void>;
     onStatusChange(deviceId: string, status: any): Promise<void>;
     onBatteryLevelChange(deviceId: string, batteryLevel: number): Promise<void>;
+    onDeviceMetaChange(deviceId: string, metaData: Record<string, any>): Promise<void>;
 }

package/dist/device/local/events/EventHandler.js

@@ -71,5 +71,16 @@ class EventHandler {
         };
         await (0, dt_audit_library_1.publishAudit)(payload);
     }
+    async onDeviceMetaChange(deviceId, metaData) {
+        await dt_pub_sub_1.eventDispatcher.publishEvent(Events_1.DeviceEvents.DEVICE_META_DATA_SET, { deviceId, metaData }, this.source);
+        const payload = {
+            eventType: Events_1.DeviceEvents.DEVICE_META_DATA_SET,
+            properties: {
+                deviceId,
+                metaData,
+            },
+        };
+        await (0, dt_audit_library_1.publishAudit)(payload);
+    }
 }
 exports.EventHandler = EventHandler;

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

@@ -1,4 +1,3 @@
-import { ConnectionProvider } from "../../cloud/types";
 export interface IConnection {
     id?: string;
     createdAt?: Date;
@@ -9,8 +8,19 @@ export interface IConnection {
     propertyId: string;
     connectionProvider: ConnectionProvider;
     accessToken?: string;
+    refreshToken?: string;
     clientId?: string;
     clientSecret: string;
     isActive?: boolean;
     metaData?: any;
 }
+export declare enum ConnectionProvider {
+    Smartthings = "Smartthings",
+    SaltoKS = "SaltoKS",
+    TTLock = "TTLock",
+    Tuya = "Tuya",
+    Schlage = "Schlage",
+    YaleWifi = "YaleWifi",
+    Sensibo = "Sensibo",
+    Devicethread = "Devicethread"
+}

package/dist/device/local/interfaces/IConnection.js

@@ -1,2 +1,14 @@
 "use strict";
 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/repository/Connection.repository.d.ts

@@ -1,7 +1,8 @@
-import { IConnection } from "../../cloud/types";
+import { IConnection } from "../interfaces/IConnection";
 export declare class ConnectionRepository {
     private readonly pool;
     constructor();
+    createConnection(data: Partial<IConnection>): Promise<IConnection>;
     getConnectionById(connectionId: string): Promise<IConnection>;
     updateConnection(connectionId: string, data: Partial<IConnection>): Promise<any>;
 }

package/dist/device/local/repository/Connection.repository.js

@@ -50,6 +50,21 @@ let ConnectionRepository = (() => {
         constructor() {
             this.pool = (0, db_1.getPostgresClient)();
         }
+        async createConnection(data) {
+            const result = await this.pool.query("INSERT INTO dt_connections (connectionName, connectionRefId, propertyId, connectionProvider, accessToken, refreshToken, clientId, clientSecret, isActive, metaData) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *", [
+                data.connectionName,
+                data.connectionRefId,
+                data.propertyId,
+                data.connectionProvider,
+                data.accessToken,
+                data.refreshToken,
+                data.clientId,
+                data.clientSecret,
+                data.isActive,
+                data.metaData,
+            ]);
+            return result.rows[0];
+        }
         async getConnectionById(connectionId) {
             const result = await this.pool.query("SELECT * FROM dt_connections WHERE id = $1", [connectionId]);
             return result.rows[0];

package/dist/device/local/repository/Device.repository.d.ts

@@ -6,7 +6,7 @@ export declare class DeviceRepository {
     constructor();
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;
     getDevices(deviceIds: string[], withHubDetails?: boolean): Promise<IDevice[]>;
-    getPropertyDevices(propertyId: string, withHubDetails?: boolean): Promise<IDevice[]>;
+    getPropertyDevices(propertyId: string, selectDeviceId?: boolean, type?: string, withHubDetails?: boolean): Promise<IDevice[]>;
     getState(deviceId: string): Promise<any>;
     getStatus(deviceId: string): Promise<Record<string, any>>;
     getBatteryLevel(deviceId: string): Promise<Record<string, any>>;

package/dist/device/local/repository/Device.repository.js

@@ -75,9 +75,9 @@ let DeviceRepository = (() => {
                 params: { deviceIds, withHubDetails },
             });
         }
-        async getPropertyDevices(propertyId, withHubDetails = false) {
+        async getPropertyDevices(propertyId, selectDeviceId = false, type, withHubDetails = false) {
             return await axios_1.default.get(`${this.baseUrl}/devices`, {
-                params: { propertyId, withHubDetails },
+                params: { propertyId, selectDeviceId, type, withHubDetails },
             });
         }
         async getState(deviceId) {

package/dist/device/local/repository/Hub.repository.d.ts

@@ -3,7 +3,7 @@ export declare class HubRepository {
     private readonly baseUrl;
     private readonly postgres;
     constructor();
-    addHub(body: any): Promise<IDevice>;
+    addHub(body: Partial<IDevice>): Promise<IDevice>;
     getHubs(hubIds: string[]): Promise<IDevice[]>;
     getHub(hubId: string): Promise<IDevice>;
     updateHub(hubId: string, body: any): Promise<IDevice>;

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

@@ -1,7 +1,8 @@
-import { IConnection } from "../../cloud/types";
+import { IConnection } from "../interfaces/IConnection";
 export declare class LocalConnectionService {
     private readonly connectionRepository;
     constructor();
+    createConnection(data: Partial<IConnection>): Promise<IConnection>;
     getConnection(connectionId: string): Promise<IConnection>;
-    updateConnection(connectionId: string, data: any): Promise<any>;
+    updateConnection(connectionId: string, data: Partial<IConnection>): Promise<IConnection>;
 }

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

@@ -7,10 +7,25 @@ class LocalConnectionService {
     constructor() {
         this.connectionRepository = typedi_1.Container.get(Connection_repository_1.ConnectionRepository);
     }
+    async createConnection(data) {
+        if (!data.connectionName ||
+            !data.connectionRefId ||
+            !data.propertyId ||
+            !data.connectionProvider) {
+            throw new Error("Missing required fields");
+        }
+        return await this.connectionRepository.createConnection(data);
+    }
     async getConnection(connectionId) {
+        if (!connectionId) {
+            throw new Error("Connection ID is required");
+        }
         return await this.connectionRepository.getConnectionById(connectionId);
     }
     async updateConnection(connectionId, data) {
+        if (!connectionId) {
+            throw new Error("Connection ID is required");
+        }
         return await this.connectionRepository.updateConnection(connectionId, data);
     }
 }

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

@@ -1,6 +1,5 @@
 import { IDevice } from "../interfaces";
 export declare class LocalDeviceService {
-    private readonly source;
     private readonly eventHandler;
     private readonly alertService;
     private readonly deviceRepository;
@@ -8,7 +7,7 @@ export declare class LocalDeviceService {
     createDevice(body: IDevice): Promise<void>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;
     getDevices(deviceIds: string[], withHubDetails?: boolean): Promise<IDevice[]>;
-    getPropertyDevices(propertyId: string, withHubDetails?: boolean): Promise<IDevice[]>;
+    getPropertyDevices(propertyId: string, selectDeviceId?: boolean, type?: string, withHubDetails?: boolean): Promise<IDevice[]>;
     updateDevice(deviceId: string, body: any): Promise<any>;
     deleteDevice(deviceId: string): Promise<any>;
     getState(deviceId: string): Promise<any>;

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

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalDeviceService = void 0;
 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("../events/EventHandler");
 const lodash_1 = require("lodash");
 const Alert_service_1 = require("./Alert.service");
@@ -14,8 +12,6 @@ const Device_repository_1 = require("../repository/Device.repository");
 const typedi_1 = __importDefault(require("typedi"));
 class LocalDeviceService {
     constructor() {
-        this.source = "dt-common-device";
-        // this.redis = getRedisClient();
         (0, config_1.checkAwsEnv)();
         (0, config_1.ensureAuditInitialized)();
         this.eventHandler = new EventHandler_1.EventHandler();
@@ -26,24 +22,45 @@ class LocalDeviceService {
         return await this.eventHandler.onDeviceCreate(body);
     }
     async getDevice(deviceId, withHubDetails = false) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.deviceRepository.getDevice(deviceId, withHubDetails);
     }
     async getDevices(deviceIds, withHubDetails = false) {
+        if (!deviceIds.length) {
+            throw new Error("At least one device ID is required");
+        }
         return await this.deviceRepository.getDevices(deviceIds, withHubDetails);
     }
-    async getPropertyDevices(propertyId, withHubDetails = false) {
-        return await this.deviceRepository.getPropertyDevices(propertyId, withHubDetails);
+    async getPropertyDevices(propertyId, selectDeviceId = false, type, withHubDetails = false) {
+        if (!propertyId) {
+            throw new Error("Property ID is required");
+        }
+        return await this.deviceRepository.getPropertyDevices(propertyId, selectDeviceId, type, withHubDetails);
     }
     async updateDevice(deviceId, body) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.eventHandler.onDeviceUpdate(deviceId, body);
     }
     async deleteDevice(deviceId) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.eventHandler.onDeviceDelete(deviceId);
     }
     async getState(deviceId) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.deviceRepository.getState(deviceId);
     }
     async setState(deviceId, newState) {
+        if (!deviceId || !newState) {
+            throw new Error("Device ID and new state are required");
+        }
         // If old state and new state are different
         const oldState = (await this.getState(deviceId))?.data?.state || {};
         const changedKeys = Object.keys(newState).filter((key) => !(0, lodash_1.isEqual)(oldState[key], newState[key]));
@@ -52,9 +69,15 @@ class LocalDeviceService {
         }
     }
     async getStatus(deviceId) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.deviceRepository.getStatus(deviceId);
     }
     async setStatus(deviceId, newStatus) {
+        if (!deviceId || !newStatus) {
+            throw new Error("Device ID and new status are required");
+        }
         // If old status and new status are different
         const oldStatus = await this.getStatus(deviceId);
         const changedKeys = Object.keys(newStatus).filter((key) => !(0, lodash_1.isEqual)(oldStatus?.data?.[key], newStatus?.[key]));
@@ -75,9 +98,15 @@ class LocalDeviceService {
         }
     }
     async getBatteryLevel(deviceId) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.deviceRepository.getBatteryLevel(deviceId);
     }
     async setBatteryLevel(deviceId, newBatteryLevel) {
+        if (!deviceId || !newBatteryLevel) {
+            throw new Error("Device ID and new battery level are required");
+        }
         // If old battery level and new battery level are different
         const oldBatteryLevel = await this.getBatteryLevel(deviceId);
         const changedKeys = Object.keys(newBatteryLevel).filter((key) => !(0, lodash_1.isEqual)(oldBatteryLevel?.data?.[key], newBatteryLevel?.[key]));
@@ -94,23 +123,27 @@ class LocalDeviceService {
         }
     }
     async getMetaData(deviceId) {
+        if (!deviceId) {
+            throw new Error("Device ID is required");
+        }
         return await this.deviceRepository.getMetaData(deviceId);
     }
     async setMetaData(deviceId, metaData) {
-        await dt_pub_sub_1.eventDispatcher.publishEvent("device.metaData.set", { deviceId, metaData }, this.source);
-        const payload = {
-            eventType: "device.metaData.set",
-            properties: {
-                deviceId,
-                metaData,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
+        if (!deviceId || !metaData) {
+            throw new Error("Device ID and meta data are required");
+        }
+        return await this.eventHandler.onDeviceMetaChange(deviceId, metaData);
     }
     async getDevicesByZone(zoneId) {
+        if (!zoneId) {
+            throw new Error("Zone ID is required");
+        }
         return await this.deviceRepository.getDevicesByZone(zoneId);
     }
     async getDevicesByAccessGroup(accessGroupId) {
+        if (!accessGroupId) {
+            throw new Error("Access Group ID is required");
+        }
         return await this.deviceRepository.getDevicesByAccessGroup(accessGroupId);
     }
 }

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

@@ -2,7 +2,7 @@ import { IDevice } from "../interfaces";
 export declare class LocalHubService {
     private readonly hubRepository;
     constructor();
-    addHub(body: IDevice): Promise<IDevice>;
+    addHub(body: Partial<IDevice>): Promise<IDevice>;
     getHubs(hubIds: string[]): Promise<IDevice[]>;
     getHub(hubId: string): Promise<IDevice>;
     updateHub(hubId: string, body: Partial<IDevice>): Promise<IDevice>;

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

@@ -14,21 +14,39 @@ class LocalHubService {
         return await this.hubRepository.addHub(body);
     }
     async getHubs(hubIds) {
+        if (!hubIds.length) {
+            throw new Error("At least one hub ID is required");
+        }
         return await this.hubRepository.getHubs(hubIds);
     }
     async getHub(hubId) {
+        if (!hubId) {
+            throw new Error("Hub ID is required");
+        }
         return await this.hubRepository.getHub(hubId);
     }
     async updateHub(hubId, body) {
+        if (!hubId) {
+            throw new Error("Hub ID is required");
+        }
         return await this.hubRepository.updateHub(hubId, body);
     }
     async getStatus(hubId) {
+        if (!hubId) {
+            throw new Error("Hub ID is required");
+        }
         return await this.hubRepository.getStatus(hubId);
     }
     async deleteHub(hubId) {
+        if (!hubId) {
+            throw new Error("Hub ID is required");
+        }
         return await this.hubRepository.deleteHub(hubId);
     }
     async deleteAllHubs(hubIds) {
+        if (!hubIds.length) {
+            throw new Error("At least one hub ID is required");
+        }
         return await this.hubRepository.deleteAllHubs(hubIds);
     }
 }

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

@@ -7,12 +7,21 @@ class LocalPropertyService {
         this.propertyRepository = new Property_repository_1.PropertyRepository();
     }
     async getPropertyPreferences(propertyId) {
+        if (!propertyId) {
+            throw new Error("Property ID is required");
+        }
         return await this.propertyRepository.getPropertyPreferences(propertyId);
     }
     async getProperty(propertyId) {
+        if (!propertyId) {
+            throw new Error("Property ID is required");
+        }
         return await this.propertyRepository.getProperty(propertyId);
     }
     async getPropertyTimeZone(propertyId) {
+        if (!propertyId) {
+            throw new Error("Property ID is required");
+        }
         const property = await this.propertyRepository.getProperty(propertyId);
         if (!property) {
             throw new Error("Property not found");

package/dist/index.d.ts

@@ -1,6 +1,5 @@
-export { CloudDevice, DeviceFactory, CloudConnection, CloudDeviceService, } from "./device/cloud/entities";
+export { CloudDevice, CloudDeviceService, DeviceFactory, } from "./device/cloud/entities";
 export { LocalDeviceService, LocalHubService, LocalConnectionService, LocalPropertyService, LocalScheduleService, } from "./device/local/services";
 export * from "./device/cloud/interfaces";
-export * from "./device/cloud/types";
 export * from "./device/local/interfaces";
 export { initialize, getConfig } from "./config/config";

package/dist/index.js

@@ -15,13 +15,12 @@ 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.LocalScheduleService = exports.LocalPropertyService = exports.LocalConnectionService = exports.LocalHubService = exports.LocalDeviceService = exports.CloudDeviceService = exports.CloudConnection = exports.DeviceFactory = exports.CloudDevice = void 0;
+exports.getConfig = exports.initialize = exports.LocalScheduleService = exports.LocalPropertyService = exports.LocalConnectionService = exports.LocalHubService = exports.LocalDeviceService = exports.DeviceFactory = exports.CloudDeviceService = exports.CloudDevice = void 0;
 // Cloud exports
 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; } });
-Object.defineProperty(exports, "CloudConnection", { enumerable: true, get: function () { return entities_1.CloudConnection; } });
 Object.defineProperty(exports, "CloudDeviceService", { enumerable: true, get: function () { return entities_1.CloudDeviceService; } });
+Object.defineProperty(exports, "DeviceFactory", { enumerable: true, get: function () { return entities_1.DeviceFactory; } });
 var services_1 = require("./device/local/services");
 Object.defineProperty(exports, "LocalDeviceService", { enumerable: true, get: function () { return services_1.LocalDeviceService; } });
 Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: function () { return services_1.LocalHubService; } });
@@ -29,7 +28,6 @@ Object.defineProperty(exports, "LocalConnectionService", { enumerable: true, get
 Object.defineProperty(exports, "LocalPropertyService", { enumerable: true, get: function () { return services_1.LocalPropertyService; } });
 Object.defineProperty(exports, "LocalScheduleService", { enumerable: true, get: function () { return services_1.LocalScheduleService; } });
 __exportStar(require("./device/cloud/interfaces"), exports);
-__exportStar(require("./device/cloud/types"), exports);
 // Local exports
 __exportStar(require("./device/local/interfaces"), exports);
 //initialize export

package/package.json

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

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

@@ -1,7 +1,7 @@
 import { IDevice } from "../../local/interfaces";
 import { ICloudDevice } from "../interfaces/ICloudDevice";
 import { ICloudDeviceService } from "../interfaces/ICloudDeviceService";
-import { IConnection } from "../types";
+import { IConnection } from "../../local/interfaces/IConnection";
 
 export abstract class CloudDevice implements ICloudDevice {
   deviceId: string;

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

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

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

@@ -1,4 +1,3 @@
 export * from "./CloudDevice";
 export * from "./DeviceFactory";
-export * from "./CloudConnection";
 export * from "./CloudDeviceService";

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

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

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

@@ -1,3 +1,3 @@
-export * from "./ICloudConnection";
 export * from "./ICloudDevice";
 export * from "./ICloudDeviceService";
+export * from "./IDeviceFactory";

package/src/device/local/events/EventHandler.ts

@@ -98,4 +98,20 @@ export class EventHandler {
     };
     await publishAudit(payload);
   }
+
+  async onDeviceMetaChange(deviceId: string, metaData: Record<string, any>) {
+    await eventDispatcher.publishEvent(
+      DeviceEvents.DEVICE_META_DATA_SET,
+      { deviceId, metaData },
+      this.source
+    );
+    const payload = {
+      eventType: DeviceEvents.DEVICE_META_DATA_SET,
+      properties: {
+        deviceId,
+        metaData,
+      },
+    };
+    await publishAudit(payload);
+  }
 }

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

@@ -0,0 +1,27 @@
+export interface IConnection {
+  id?: string;
+  createdAt?: Date;
+  updatedAt?: Date;
+  isDeleted?: boolean;
+  connectionName: string;
+  connectionRefId: string;
+  propertyId: string;
+  connectionProvider: ConnectionProvider;
+  accessToken?: string;
+  refreshToken?: string;
+  clientId?: string;
+  clientSecret: string;
+  isActive?: boolean;
+  metaData?: any;
+}
+
+export enum ConnectionProvider {
+  Smartthings = "Smartthings",
+  SaltoKS = "SaltoKS",
+  TTLock = "TTLock",
+  Tuya = "Tuya",
+  Schlage = "Schlage",
+  YaleWifi = "YaleWifi",
+  Sensibo = "Sensibo",
+  Devicethread = "Devicethread",
+}

package/src/device/local/repository/Connection.repository.ts

@@ -1,5 +1,5 @@
 import { getPostgresClient } from "../../../db";
-import { IConnection } from "../../cloud/types";
+import { IConnection } from "../interfaces/IConnection";
 import { Service } from "typedi";
 
 @Service()
@@ -8,6 +8,26 @@ export class ConnectionRepository {
   constructor() {
     this.pool = getPostgresClient();
   }
+
+  async createConnection(data: Partial<IConnection>): Promise<IConnection> {
+    const result = await this.pool.query(
+      "INSERT INTO dt_connections (connectionName, connectionRefId, propertyId, connectionProvider, accessToken, refreshToken, clientId, clientSecret, isActive, metaData) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *",
+      [
+        data.connectionName,
+        data.connectionRefId,
+        data.propertyId,
+        data.connectionProvider,
+        data.accessToken,
+        data.refreshToken,
+        data.clientId,
+        data.clientSecret,
+        data.isActive,
+        data.metaData,
+      ]
+    );
+    return result.rows[0];
+  }
+
   async getConnectionById(connectionId: string): Promise<IConnection> {
     const result = await this.pool.query(
       "SELECT * FROM dt_connections WHERE id = $1",

package/src/device/local/repository/Device.repository.ts

@@ -46,10 +46,12 @@ export class DeviceRepository {
 
   async getPropertyDevices(
     propertyId: string,
+    selectDeviceId: boolean = false,
+    type?: string,
     withHubDetails: boolean = false
   ): Promise<IDevice[]> {
     return await axios.get(`${this.baseUrl}/devices`, {
-      params: { propertyId, withHubDetails },
+      params: { propertyId, selectDeviceId, type, withHubDetails },
     });
   }
 

package/src/device/local/repository/Hub.repository.ts

@@ -19,7 +19,7 @@ export class HubRepository {
     this.postgres = getPostgresClient();
   }
 
-  async addHub(body: any): Promise<IDevice> {
+  async addHub(body: Partial<IDevice>): Promise<IDevice> {
     return await axios.post(`${this.baseUrl}/devices/hubs`, body);
   }
 

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

@@ -1,6 +1,6 @@
 import { Container } from "typedi";
-import { IConnection } from "../../cloud/types";
 import { ConnectionRepository } from "../repository/Connection.repository";
+import { IConnection } from "../interfaces/IConnection";
 
 export class LocalConnectionService {
   private readonly connectionRepository: ConnectionRepository;
@@ -8,11 +8,32 @@ export class LocalConnectionService {
     this.connectionRepository = Container.get(ConnectionRepository);
   }
 
+  async createConnection(data: Partial<IConnection>): Promise<IConnection> {
+    if (
+      !data.connectionName ||
+      !data.connectionRefId ||
+      !data.propertyId ||
+      !data.connectionProvider
+    ) {
+      throw new Error("Missing required fields");
+    }
+    return await this.connectionRepository.createConnection(data);
+  }
+
   async getConnection(connectionId: string): Promise<IConnection> {
+    if (!connectionId) {
+      throw new Error("Connection ID is required");
+    }
     return await this.connectionRepository.getConnectionById(connectionId);
   }
 
-  async updateConnection(connectionId: string, data: any) {
+  async updateConnection(
+    connectionId: string,
+    data: Partial<IConnection>
+  ): Promise<IConnection> {
+    if (!connectionId) {
+      throw new Error("Connection ID is required");
+    }
     return await this.connectionRepository.updateConnection(connectionId, data);
   }
 }

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

@@ -1,27 +1,16 @@
-import axios from "axios";
-import {
-  getConfig,
-  checkAwsEnv,
-  ensureAuditInitialized,
-} from "../../../config/config";
+import { checkAwsEnv, ensureAuditInitialized } from "../../../config/config";
 import { IDevice } from "../interfaces";
-import { eventDispatcher } from "dt-pub-sub";
-import { publishAudit } from "dt-audit-library";
 import { EventHandler } from "../events/EventHandler";
 import { isEqual } from "lodash";
 import { AlertService } from "./Alert.service";
-import { getPostgresClient } from "../../../db";
 import { DeviceRepository } from "../repository/Device.repository";
 import Container from "typedi";
 
 export class LocalDeviceService {
-  private readonly source = "dt-common-device";
   private readonly eventHandler: EventHandler;
   private readonly alertService: AlertService;
-  //private readonly redis;
   private readonly deviceRepository: DeviceRepository;
   constructor() {
-    // this.redis = getRedisClient();
     checkAwsEnv();
     ensureAuditInitialized();
     this.eventHandler = new EventHandler();
@@ -37,6 +26,9 @@ export class LocalDeviceService {
     deviceId: string,
     withHubDetails: boolean = false
   ): Promise<IDevice> {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.deviceRepository.getDevice(deviceId, withHubDetails);
   }
 
@@ -44,32 +36,54 @@ export class LocalDeviceService {
     deviceIds: string[],
     withHubDetails: boolean = false
   ): Promise<IDevice[]> {
+    if (!deviceIds.length) {
+      throw new Error("At least one device ID is required");
+    }
     return await this.deviceRepository.getDevices(deviceIds, withHubDetails);
   }
 
   async getPropertyDevices(
     propertyId: string,
+    selectDeviceId: boolean = false,
+    type?: string,
     withHubDetails: boolean = false
   ): Promise<IDevice[]> {
+    if (!propertyId) {
+      throw new Error("Property ID is required");
+    }
     return await this.deviceRepository.getPropertyDevices(
       propertyId,
+      selectDeviceId,
+      type,
       withHubDetails
     );
   }
 
   async updateDevice(deviceId: string, body: any): Promise<any> {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.eventHandler.onDeviceUpdate(deviceId, body);
   }
 
   async deleteDevice(deviceId: string): Promise<any> {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.eventHandler.onDeviceDelete(deviceId);
   }
 
   async getState(deviceId: string) {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.deviceRepository.getState(deviceId);
   }
 
   async setState(deviceId: string, newState: any) {
+    if (!deviceId || !newState) {
+      throw new Error("Device ID and new state are required");
+    }
     // If old state and new state are different
     const oldState = (await this.getState(deviceId))?.data?.state || {};
     const changedKeys = Object.keys(newState).filter(
@@ -81,10 +95,16 @@ export class LocalDeviceService {
   }
 
   async getStatus(deviceId: string) {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.deviceRepository.getStatus(deviceId);
   }
 
   async setStatus(deviceId: string, newStatus: any) {
+    if (!deviceId || !newStatus) {
+      throw new Error("Device ID and new status are required");
+    }
     // If old status and new status are different
     const oldStatus = await this.getStatus(deviceId);
     const changedKeys = Object.keys(newStatus).filter(
@@ -110,9 +130,15 @@ export class LocalDeviceService {
   }
 
   async getBatteryLevel(deviceId: string) {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.deviceRepository.getBatteryLevel(deviceId);
   }
   async setBatteryLevel(deviceId: string, newBatteryLevel: any) {
+    if (!deviceId || !newBatteryLevel) {
+      throw new Error("Device ID and new battery level are required");
+    }
     // If old battery level and new battery level are different
     const oldBatteryLevel = await this.getBatteryLevel(deviceId);
     const changedKeys = Object.keys(newBatteryLevel).filter(
@@ -136,29 +162,29 @@ export class LocalDeviceService {
     }
   }
   async getMetaData(deviceId: string) {
+    if (!deviceId) {
+      throw new Error("Device ID is required");
+    }
     return await this.deviceRepository.getMetaData(deviceId);
   }
   async setMetaData(deviceId: string, metaData: Record<string, any>) {
-    await eventDispatcher.publishEvent(
-      "device.metaData.set",
-      { deviceId, metaData },
-      this.source
-    );
-    const payload = {
-      eventType: "device.metaData.set",
-      properties: {
-        deviceId,
-        metaData,
-      },
-    };
-    await publishAudit(payload);
+    if (!deviceId || !metaData) {
+      throw new Error("Device ID and meta data are required");
+    }
+    return await this.eventHandler.onDeviceMetaChange(deviceId, metaData);
   }
 
   async getDevicesByZone(zoneId: string) {
+    if (!zoneId) {
+      throw new Error("Zone ID is required");
+    }
     return await this.deviceRepository.getDevicesByZone(zoneId);
   }
 
   async getDevicesByAccessGroup(accessGroupId: string) {
+    if (!accessGroupId) {
+      throw new Error("Access Group ID is required");
+    }
     return await this.deviceRepository.getDevicesByAccessGroup(accessGroupId);
   }
 }

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

@@ -8,31 +8,50 @@ export class LocalHubService {
     this.hubRepository = Container.get(HubRepository);
   }
 
-  async addHub(body: IDevice): Promise<IDevice> {
+  async addHub(body: Partial<IDevice>): Promise<IDevice> {
     return await this.hubRepository.addHub(body);
   }
 
   async getHubs(hubIds: string[]): Promise<IDevice[]> {
+    if (!hubIds.length) {
+      throw new Error("At least one hub ID is required");
+    }
     return await this.hubRepository.getHubs(hubIds);
   }
 
   async getHub(hubId: string): Promise<IDevice> {
+    if (!hubId) {
+      throw new Error("Hub ID is required");
+    }
     return await this.hubRepository.getHub(hubId);
   }
 
   async updateHub(hubId: string, body: Partial<IDevice>): Promise<IDevice> {
+    if (!hubId) {
+      throw new Error("Hub ID is required");
+    }
     return await this.hubRepository.updateHub(hubId, body);
   }
 
   async getStatus(hubId: string): Promise<any> {
+    if (!hubId) {
+      throw new Error("Hub ID is required");
+    }
     return await this.hubRepository.getStatus(hubId);
   }
 
   async deleteHub(hubId: string): Promise<any> {
+    if (!hubId) {
+      throw new Error("Hub ID is required");
+    }
     return await this.hubRepository.deleteHub(hubId);
   }
 
+
   async deleteAllHubs(hubIds: string[]): Promise<any> {
+    if (!hubIds.length) {
+      throw new Error("At least one hub ID is required");
+    }
     return await this.hubRepository.deleteAllHubs(hubIds);
   }
 }

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

@@ -7,14 +7,23 @@ export class LocalPropertyService {
   }
 
   async getPropertyPreferences(propertyId: string) {
+    if (!propertyId) {
+      throw new Error("Property ID is required");
+    }
     return await this.propertyRepository.getPropertyPreferences(propertyId);
   }
 
   async getProperty(propertyId: string) {
+    if (!propertyId) {
+      throw new Error("Property ID is required");
+    }
     return await this.propertyRepository.getProperty(propertyId);
   }
 
   async getPropertyTimeZone(propertyId: string) {
+    if (!propertyId) {
+      throw new Error("Property ID is required");
+    }
     const property = await this.propertyRepository.getProperty(propertyId);
     if (!property) {
       throw new Error("Property not found");

package/src/index.ts

@@ -3,9 +3,8 @@
 // Cloud exports
 export {
   CloudDevice,
-  DeviceFactory,
-  CloudConnection,
   CloudDeviceService,
+  DeviceFactory,
 } from "./device/cloud/entities";
 export {
   LocalDeviceService,
@@ -16,7 +15,6 @@ export {
 } from "./device/local/services";
 
 export * from "./device/cloud/interfaces";
-export * from "./device/cloud/types";
 
 // Local exports
 export * from "./device/local/interfaces";

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

@@ -1,13 +0,0 @@
-// Device Cloud Service - Class Implementation
-import { ICloudConnection } from "../interfaces";
-import { IDeviceAccountResponse, IConnection } from "../types";
-
-export abstract class CloudConnection implements ICloudConnection {
-  abstract createConnection(
-    data: IConnection,
-    userId: string
-  ): Promise<IConnection>;
-  abstract getDeviceAccount(
-    connection: IConnection
-  ): Promise<IDeviceAccountResponse>;
-}

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

@@ -1,6 +0,0 @@
-import { IConnection, IDeviceAccountResponse } from "../types";
-
-export interface ICloudConnection {
-  createConnection(data: IConnection, userId: string): Promise<IConnection>;
-  getDeviceAccount(connection: IConnection): Promise<IDeviceAccountResponse>;
-}

package/src/device/cloud/types.ts

@@ -1,58 +0,0 @@
-// Device Cloud Type Interfaces for DeviceThread Common Library
-
-/**
- * Represents a connection to a device provider.
- * WARNING: Do not log or expose sensitive fields (accessToken, clientSecret).
- */
-export interface IConnection {
-  id?: string;
-  createdAt?: Date;
-  updatedAt?: Date;
-  isDeleted?: boolean;
-  connectionName: string;
-  connectionRefId: string;
-  propertyId: string;
-  connectionProvider: ConnectionProvider;
-  accessToken?: string;
-  refreshToken?: string;
-  clientId?: string;
-  clientSecret: string;
-  isActive?: boolean;
-  metaData?: any;
-}
-
-export interface IConnectionPagination {
-  page: number;
-  limit: number;
-}
-
-/**
- * Device account response from provider.
- * WARNING: Do not log or expose connection_access_token.
- */
-export interface IDeviceAccountResponse {
-  id: string;
-  connection_name: string;
-  connection_access_token: string;
-  connection_provider: string;
-  totalDevices: number;
-  connection_ref_id: string;
-  isActive: boolean;
-}
-
-export interface IConnectionConnectParams {
-  code?: string;
-  propertyId?: string;
-  [key: string]: unknown;
-}
-
-export enum ConnectionProvider {
-  Smartthings = "Smartthings",
-  SaltoKS = "SaltoKS",
-  TTLock = "TTLock",
-  Tuya = "Tuya",
-  Schlage = "Schlage",
-  YaleWifi = "YaleWifi",
-  Sensibo = "Sensibo",
-  Devicethread = "Devicethread",
-}