dt-common-device 1.0.20 → 1.2.1

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

@@ -0,0 +1,9 @@
+export declare class PropertyRepository {
+    private readonly postgres;
+    constructor();
+    getPropertyPreferences(propertyId: string): Promise<{
+        id: string;
+        propertyId: string;
+        settings: string;
+    } | null>;
+}

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

@@ -0,0 +1,81 @@
+"use strict";
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PropertyRepository = void 0;
+const db_1 = require("../../../db");
+const typedi_1 = require("typedi");
+let PropertyRepository = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var PropertyRepository = _classThis = class {
+        constructor() {
+            this.postgres = (0, db_1.getPostgresClient)();
+        }
+        async getPropertyPreferences(propertyId) {
+            try {
+                const propertyPreferences = await this.postgres.query("SELECT * FROM dt_property_settings WHERE propertyId = $1", [propertyId]);
+                if (propertyPreferences.rows.length > 0) {
+                    return {
+                        id: propertyPreferences.rows[0].id,
+                        propertyId: propertyPreferences.rows[0].propertyId,
+                        settings: JSON.parse(propertyPreferences.rows[0].settings),
+                    };
+                }
+                return null;
+            }
+            catch (error) {
+                console.log(error);
+                throw new Error("Failed to get property preferences");
+            }
+        }
+    };
+    __setFunctionName(_classThis, "PropertyRepository");
+    (() => {
+        const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+        __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+        PropertyRepository = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return PropertyRepository = _classThis;
+})();
+exports.PropertyRepository = PropertyRepository;

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

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

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

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalConnectionService = void 0;
-const db_1 = require("../../../db");
+const typedi_1 = require("typedi");
+const Connection_repository_1 = require("../repository/Connection.repository");
 class LocalConnectionService {
     constructor() {
-        this.pool = (0, db_1.getPostgresClient)();
+        this.connectionRepository = typedi_1.Container.get(Connection_repository_1.ConnectionRepository);
     }
     async getConnection(connectionId) {
-        const result = await this.pool.query("SELECT * FROM dt_connections WHERE id = $1", [connectionId]);
-        return result.rows[0];
+        return await this.connectionRepository.getConnectionById(connectionId);
+    }
+    async updateConnection(connectionId, data) {
+        return await this.connectionRepository.updateConnection(connectionId, data);
     }
 }
 exports.LocalConnectionService = LocalConnectionService;

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

@@ -1,10 +1,9 @@
 import { IDevice } from "../interfaces";
 export declare class LocalDeviceService {
-    private readonly baseUrl;
     private readonly source;
     private readonly eventHandler;
     private readonly alertService;
-    private readonly postgres;
+    private readonly deviceRepository;
     constructor();
     createDevice(body: IDevice): Promise<void>;
     getDevice(deviceId: string, withHubDetails?: boolean): Promise<IDevice>;
@@ -12,15 +11,14 @@ export declare class LocalDeviceService {
     getPropertyDevices(propertyId: string, withHubDetails?: boolean): Promise<IDevice[]>;
     updateDevice(deviceId: string, body: any): Promise<any>;
     deleteDevice(deviceId: string): Promise<any>;
-    getState(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
+    getState(deviceId: string): Promise<any>;
     setState(deviceId: string, newState: any): Promise<void>;
-    getStatus(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
+    getStatus(deviceId: string): Promise<Record<string, any>>;
     setStatus(deviceId: string, newStatus: any): Promise<void>;
-    getBatteryLevel(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
+    getBatteryLevel(deviceId: string): Promise<Record<string, any>>;
     setBatteryLevel(deviceId: string, newBatteryLevel: any): Promise<void>;
-    getMetaData(deviceId: string): Promise<import("axios").AxiosResponse<any, any>>;
+    getMetaData(deviceId: string): Promise<any>;
     setMetaData(deviceId: string, metaData: Record<string, any>): Promise<void>;
-    getDeviceByZone(zoneId: string): Promise<any>;
-    getDevicesByAccessGroup(accessGroupId: string): Promise<any>;
-    getPropertyPreferences(propertyId: string): Promise<any>;
+    getDevicesByZone(zoneId: string): Promise<import("../interfaces/IDtDevice").IDtDevice[]>;
+    getDevicesByAccessGroup(accessGroupId: string): Promise<import("../interfaces/IDtDevice").IDtDevice[]>;
 }

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

@@ -4,82 +4,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalDeviceService = void 0;
-const axios_1 = __importDefault(require("axios"));
 const config_1 = require("../../../config/config");
 const dt_pub_sub_1 = require("dt-pub-sub");
 const dt_audit_library_1 = require("dt-audit-library");
-const EventHandler_1 = require("../handler/EventHandler");
+const EventHandler_1 = require("../events/EventHandler");
 const lodash_1 = require("lodash");
 const Alert_service_1 = require("./Alert.service");
-const db_1 = require("../../../db");
+const Device_repository_1 = require("../repository/Device.repository");
+const typedi_1 = __importDefault(require("typedi"));
 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 = getRedisClient();
-        this.postgres = (0, db_1.getPostgresClient)();
-        this.baseUrl = DEVICE_SERVICE;
         (0, config_1.checkAwsEnv)();
         (0, config_1.ensureAuditInitialized)();
         this.eventHandler = new EventHandler_1.EventHandler();
         this.alertService = new Alert_service_1.AlertService();
+        this.deviceRepository = typedi_1.default.get(Device_repository_1.DeviceRepository);
     }
     async createDevice(body) {
-        await dt_pub_sub_1.eventDispatcher.publishEvent("device.created", body, this.source);
-        const payload = {
-            eventType: "device.created",
-            properties: {
-                ...body,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
+        return await this.eventHandler.onDeviceCreate(body);
     }
     async getDevice(deviceId, withHubDetails = false) {
-        try {
-            const response = await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}?withHubDetails=${withHubDetails} `);
-            return response.data;
-        }
-        catch (error) {
-            console.log(error);
-            throw new Error(`Failed to get device: ${error.message}`);
-        }
+        return await this.deviceRepository.getDevice(deviceId, withHubDetails);
     }
     async getDevices(deviceIds, withHubDetails = false) {
-        return await axios_1.default.get(`${this.baseUrl}/devices`, {
-            params: { deviceIds, withHubDetails },
-        });
+        return await this.deviceRepository.getDevices(deviceIds, withHubDetails);
     }
     async getPropertyDevices(propertyId, withHubDetails = false) {
-        return await axios_1.default.get(`${this.baseUrl}/devices`, {
-            params: { propertyId, withHubDetails },
-        });
+        return await this.deviceRepository.getPropertyDevices(propertyId, withHubDetails);
     }
     async updateDevice(deviceId, body) {
-        //return await axios.put(`${this.baseUrl}/devices/${deviceId}`, body);
-        await dt_pub_sub_1.eventDispatcher.publishEvent("device.updated", { deviceId, body }, this.source);
-        const payload = {
-            eventType: "device.updated",
-            properties: {
-                ...body,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
+        return await this.eventHandler.onDeviceUpdate(deviceId, body);
     }
     async deleteDevice(deviceId) {
-        await dt_pub_sub_1.eventDispatcher.publishEvent("device.deleted", { deviceId }, this.source);
-        const payload = {
-            eventType: "device.deleted",
-            properties: {
-                deviceId,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
+        return await this.eventHandler.onDeviceDelete(deviceId);
     }
     async getState(deviceId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/state`);
+        return await this.deviceRepository.getState(deviceId);
     }
     async setState(deviceId, newState) {
         // If old state and new state are different
@@ -90,7 +52,7 @@ class LocalDeviceService {
         }
     }
     async getStatus(deviceId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/status`);
+        return await this.deviceRepository.getStatus(deviceId);
     }
     async setStatus(deviceId, newStatus) {
         // If old status and new status are different
@@ -113,7 +75,7 @@ class LocalDeviceService {
         }
     }
     async getBatteryLevel(deviceId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/battery-level`);
+        return await this.deviceRepository.getBatteryLevel(deviceId);
     }
     async setBatteryLevel(deviceId, newBatteryLevel) {
         // If old battery level and new battery level are different
@@ -132,7 +94,7 @@ class LocalDeviceService {
         }
     }
     async getMetaData(deviceId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/${deviceId}/metaData`);
+        return await this.deviceRepository.getMetaData(deviceId);
     }
     async setMetaData(deviceId, metaData) {
         await dt_pub_sub_1.eventDispatcher.publishEvent("device.metaData.set", { deviceId, metaData }, this.source);
@@ -145,47 +107,11 @@ class LocalDeviceService {
         };
         await (0, dt_audit_library_1.publishAudit)(payload);
     }
-    async getDeviceByZone(zoneId) {
-        try {
-            // 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) {
-                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");
-        }
+    async getDevicesByZone(zoneId) {
+        return await this.deviceRepository.getDevicesByZone(zoneId);
     }
     async getDevicesByAccessGroup(accessGroupId) {
-        try {
-            // Fetch from Postgres if not in cache
-            const result = await this.postgres.query("SELECT * FROM dt_group WHERE id = $1", [accessGroupId]);
-            if (result.rows.length > 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.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);
-            throw new Error("Failed to get property preferences");
-        }
+        return await this.deviceRepository.getDevicesByAccessGroup(accessGroupId);
     }
 }
 exports.LocalDeviceService = LocalDeviceService;

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

@@ -1,11 +1,11 @@
-import { IHub } from "../interfaces";
-export declare class HubService {
-    private readonly baseUrl;
+import { IDevice } from "../interfaces";
+export declare class LocalHubService {
+    private readonly hubRepository;
     constructor();
-    addHub(body: IHub): Promise<any>;
-    getHubs(hubIds: string[]): Promise<IHub[]>;
-    getHub(hubId: string): Promise<IHub>;
-    updateHub(hubId: string, body: any): Promise<any>;
+    addHub(body: IDevice): Promise<IDevice>;
+    getHubs(hubIds: string[]): Promise<IDevice[]>;
+    getHub(hubId: string): Promise<IDevice>;
+    updateHub(hubId: string, body: Partial<IDevice>): Promise<IDevice>;
     getStatus(hubId: string): Promise<any>;
     deleteHub(hubId: string): Promise<any>;
     deleteAllHubs(hubIds: string[]): Promise<any>;

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

@@ -3,41 +3,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HubService = void 0;
-const axios_1 = __importDefault(require("axios"));
-const config_1 = require("../../../config/config");
-class HubService {
+exports.LocalHubService = void 0;
+const Hub_repository_1 = require("../repository/Hub.repository");
+const typedi_1 = __importDefault(require("typedi"));
+class LocalHubService {
     constructor() {
-        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.baseUrl = DEVICE_SERVICE;
+        this.hubRepository = typedi_1.default.get(Hub_repository_1.HubRepository);
     }
     async addHub(body) {
-        return await axios_1.default.post(`${this.baseUrl}/devices/hubs`, body);
+        return await this.hubRepository.addHub(body);
     }
-    //get hubs takes an array of hub ids as query params
     async getHubs(hubIds) {
-        const query = hubIds && hubIds.length ? `?ids=${hubIds.join(",")}` : "";
-        return await axios_1.default.get(`${this.baseUrl}/devices/hubs${query}`);
+        return await this.hubRepository.getHubs(hubIds);
     }
-    //get hub takes a hub id in params
     async getHub(hubId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/hubs/${hubId}`);
+        return await this.hubRepository.getHub(hubId);
     }
     async updateHub(hubId, body) {
-        return await axios_1.default.put(`${this.baseUrl}/devices/hubs/${hubId}`, body);
+        return await this.hubRepository.updateHub(hubId, body);
     }
     async getStatus(hubId) {
-        return await axios_1.default.get(`${this.baseUrl}/devices/hubs/${hubId}/status`);
+        return await this.hubRepository.getStatus(hubId);
     }
     async deleteHub(hubId) {
-        return await axios_1.default.delete(`${this.baseUrl}/devices/hubs/${hubId}`);
+        return await this.hubRepository.deleteHub(hubId);
     }
     async deleteAllHubs(hubIds) {
-        const query = hubIds.length ? `?ids=${hubIds.join(",")}` : "";
-        return await axios_1.default.delete(`${this.baseUrl}/devices/hubs${query}`);
+        return await this.hubRepository.deleteAllHubs(hubIds);
     }
 }
-exports.HubService = HubService;
+exports.LocalHubService = LocalHubService;

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

@@ -0,0 +1,9 @@
+export declare class LocalPropertyService {
+    private readonly propertyRepository;
+    constructor();
+    getPropertyPreferences(propertyId: string): Promise<{
+        id: string;
+        propertyId: string;
+        settings: string;
+    } | null>;
+}

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocalPropertyService = void 0;
+const Property_repository_1 = require("../repository/Property.repository");
+class LocalPropertyService {
+    constructor() {
+        this.propertyRepository = new Property_repository_1.PropertyRepository();
+    }
+    async getPropertyPreferences(propertyId) {
+        return await this.propertyRepository.getPropertyPreferences(propertyId);
+    }
+}
+exports.LocalPropertyService = LocalPropertyService;

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

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

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocalConnectionService = exports.LocalHubService = exports.LocalDeviceService = void 0;
+exports.LocalPropertyService = 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; } });
+Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: function () { return Hub_service_1.LocalHubService; } });
 var Connection_service_1 = require("./Connection.service");
 Object.defineProperty(exports, "LocalConnectionService", { enumerable: true, get: function () { return Connection_service_1.LocalConnectionService; } });
+var Property_service_1 = require("./Property.service");
+Object.defineProperty(exports, "LocalPropertyService", { enumerable: true, get: function () { return Property_service_1.LocalPropertyService; } });

package/dist/index.d.ts

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

package/dist/index.js

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

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "dt-common-device",
-  "version": "1.0.20",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc ",
+    "build": "tsc",
     "patch": "npm version patch && npm run build",
     "minor": "npm version minor && npm run build",
     "major": "npm version major && npm run build",
@@ -43,6 +43,7 @@
     "dt-pub-sub": "^1.0.0",
     "ioredis": "5.6.1",
     "lodash": "^4.17.21",
-    "pg": "8.16.3"
+    "pg": "8.16.3",
+    "typedi": "0.10.0"
   }
 }

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

@@ -0,0 +1,13 @@
+// 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/entities/CloudDevice.ts

@@ -33,24 +33,4 @@ export abstract class CloudDevice implements ICloudDevice {
   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,7 +1,8 @@
 import { IDevice } from "../../local/interfaces";
 import { LocalDeviceService } from "../../local/services/Device.service";
+import { IDeviceFactory } from "../interfaces/IDeviceFactory";
 
-export class DeviceFactory {
+export class DeviceFactory implements IDeviceFactory {
   private readonly localDeviceService: LocalDeviceService;
 
   constructor() {

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

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

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

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

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

@@ -4,7 +4,6 @@ import { ICloudDeviceService } from "./ICloudDeviceService";
 export interface ICloudDevice {
   deviceId: string;
   cloudDeviceService: ICloudDeviceService;
-
   getDevice(
     connectionId: string,
     deviceId: string

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

@@ -0,0 +1,5 @@
+import { IDevice } from "../../local/interfaces";
+
+export interface IDeviceFactory {
+  getDevice(deviceId: string): Promise<IDevice>;
+}

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

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

package/src/device/cloud/types.ts

@@ -15,7 +15,7 @@ export interface IConnection {
   connectionProvider: ConnectionProvider;
   accessToken?: string;
   clientId?: string;
-  clientSecret?: string;
+  clientSecret: string;
   isActive?: boolean;
   metaData?: any;
 }