dt-common-device 3.1.0 → 3.1.2

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

@@ -1,4 +1,42 @@
 "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 });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,48 +44,64 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalHubService = void 0;
 const Hub_repository_1 = require("../repository/Hub.repository");
 const typedi_1 = __importDefault(require("typedi"));
-class LocalHubService {
-    constructor() {
-        this.hubRepository = typedi_1.default.get(Hub_repository_1.HubRepository);
-    }
-    async addHub(body) {
-        return await this.hubRepository.addHub(body);
-    }
-    async getHubs(hubIds) {
-        if (!hubIds.length) {
-            throw new Error("At least one hub ID is required");
+const typedi_2 = require("typedi");
+let LocalHubService = (() => {
+    let _classDecorators = [(0, typedi_2.Service)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var LocalHubService = _classThis = class {
+        constructor() {
+            this.hubRepository = typedi_1.default.get(Hub_repository_1.HubRepository);
         }
-        return await this.hubRepository.getHubs(hubIds);
-    }
-    async getHub(hubId) {
-        if (!hubId) {
-            throw new Error("Hub ID is required");
+        async addHub(body) {
+            return await this.hubRepository.addHub(body);
         }
-        return await this.hubRepository.getHub(hubId);
-    }
-    async updateHub(hubId, body) {
-        if (!hubId) {
-            throw new Error("Hub ID is required");
+        async getHubs(hubIds) {
+            if (!hubIds.length) {
+                throw new Error("At least one hub ID is required");
+            }
+            return await this.hubRepository.getHubs(hubIds);
         }
-        return await this.hubRepository.updateHub(hubId, body);
-    }
-    async getStatus(hubId) {
-        if (!hubId) {
-            throw new Error("Hub ID is required");
+        async getHub(hubId) {
+            if (!hubId) {
+                throw new Error("Hub ID is required");
+            }
+            return await this.hubRepository.getHub(hubId);
         }
-        return await this.hubRepository.getStatus(hubId);
-    }
-    async deleteHub(hubId) {
-        if (!hubId) {
-            throw new Error("Hub ID is required");
+        async updateHub(hubId, body) {
+            if (!hubId) {
+                throw new Error("Hub ID is required");
+            }
+            return await this.hubRepository.updateHub(hubId, body);
         }
-        return await this.hubRepository.deleteHub(hubId);
-    }
-    async deleteAllHubs(hubIds) {
-        if (!hubIds.length) {
-            throw new Error("At least one hub ID is required");
+        async getStatus(hubId) {
+            if (!hubId) {
+                throw new Error("Hub ID is required");
+            }
+            return await this.hubRepository.getStatus(hubId);
         }
-        return await this.hubRepository.deleteAllHubs(hubIds);
-    }
-}
+        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);
+        }
+    };
+    __setFunctionName(_classThis, "LocalHubService");
+    (() => {
+        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);
+        LocalHubService = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return LocalHubService = _classThis;
+})();
 exports.LocalHubService = LocalHubService;

package/dist/events/BaseEventHandler.js

@@ -1,14 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseEventHandler = void 0;
 const config_1 = require("../config/config");
 const Device_service_1 = require("../device/local/services/Device.service");
+const typedi_1 = __importDefault(require("typedi"));
 class BaseEventHandler {
     constructor(supportedEventTypes, priority = 100) {
         this.supportedEventTypes = supportedEventTypes;
         this.priority = priority;
         this.logger = (0, config_1.getConfig)().LOGGER;
-        this.localDeviceService = new Device_service_1.LocalDeviceService();
+        // Use dependency injection instead of creating new instance
+        this.localDeviceService = typedi_1.default.get(Device_service_1.LocalDeviceService);
     }
     /**
      * Handle a single event - to be implemented by specific handlers

package/dist/events/DeviceEventHandler.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceEventHandler = void 0;
 const constants_1 = require("../constants");
 const Event_1 = require("../constants/Event");
 const services_1 = require("../device/local/services");
 const BaseEventHandler_1 = require("./BaseEventHandler");
+const typedi_1 = __importDefault(require("typedi"));
 class DeviceEventHandler extends BaseEventHandler_1.BaseEventHandler {
     constructor() {
         super([
@@ -15,7 +19,8 @@ class DeviceEventHandler extends BaseEventHandler_1.BaseEventHandler {
             Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.LOW,
             Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.CHANGED,
         ], 100);
-        this.localHubService = new services_1.LocalHubService();
+        // Use dependency injection instead of creating new instance
+        this.localHubService = typedi_1.default.get(services_1.LocalHubService);
     }
     async onEvent(event) {
         this.logger.info("[DT | CDL]:[DeviceEventHandler]: Processing event", {

package/dist/events/EventHandler.js

@@ -1,111 +1,165 @@
 "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.EventHandler = void 0;
 const dt_pub_sub_1 = require("dt-pub-sub");
 const dt_audit_library_1 = require("dt-audit-library");
 const Event_1 = require("../constants/Event");
-class EventHandler {
-    constructor() {
-        this.source = "dt-common-device";
-    }
-    async onDeviceCreate(body) {
-        // TODO: For Future Consumption
-        // await eventDispatcher.publishEvent(
-        //   DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
-        //   body,
-        //   this.source
-        // );
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
-            properties: {
-                ...body,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onDeviceUpdate(deviceId, body) {
-        await dt_pub_sub_1.eventDispatcher.publishEvent(Event_1.DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS, { deviceId, body }, this.source);
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS,
-            properties: {
-                ...body,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onDeviceDelete(deviceId) {
-        await dt_pub_sub_1.eventDispatcher.publishEvent(Event_1.DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS, { deviceId }, this.source);
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS,
-            properties: {
-                deviceId,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onStateChange(deviceId, state) {
-        // TODO: For Future Consumption
-        /* await eventDispatcher.publishEvent(
-          DT_EVENT_TYPES.DEVICE.STATE.SET,
-          { deviceId, state },
-          this.source
-        ); */
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATE.SET,
-            properties: {
-                deviceId,
-                state,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onStatusChange(deviceId, status) {
-        // TODO: For Future Consumption
-        /* await eventDispatcher.publishEvent(
-          DT_EVENT_TYPES.DEVICE.STATUS.SET,
-          { deviceId, status },
-          this.source
-        ); */
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATUS.SET,
-            properties: {
-                deviceId,
-                status,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onBatteryLevelChange(deviceId, batteryLevel) {
-        // TODO: For Future Consumption
-        /* await eventDispatcher.publishEvent(
-          DT_EVENT_TYPES.DEVICE.BATTERY.SET,
-          { deviceId, batteryLevel },
-          this.source
-        ); */
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.SET,
-            properties: {
-                deviceId,
-                batteryLevel,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-    async onDeviceMetaChange(deviceId, metaData) {
-        // TODO: For Future Consumption
-        /*  await eventDispatcher.publishEvent(
-          DT_EVENT_TYPES.DEVICE.META_DATA.SET,
-          { deviceId, metaData },
-          this.source
-        ); */
-        const payload = {
-            eventType: Event_1.DT_EVENT_TYPES.DEVICE.META_DATA.SET,
-            properties: {
-                deviceId,
-                metaData,
-            },
-        };
-        await (0, dt_audit_library_1.publishAudit)(payload);
-    }
-}
+const typedi_1 = require("typedi");
+let EventHandler = (() => {
+    let _classDecorators = [(0, typedi_1.Service)()];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    var EventHandler = _classThis = class {
+        constructor() {
+            this.source = "dt-common-device";
+        }
+        async onDeviceCreate(body) {
+            // TODO: For Future Consumption
+            // await eventDispatcher.publishEvent(
+            //   DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
+            //   body,
+            //   this.source
+            // );
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.CREATE.SUCCESS,
+                properties: {
+                    ...body,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onDeviceUpdate(deviceId, body) {
+            await dt_pub_sub_1.eventDispatcher.publishEvent(Event_1.DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS, { deviceId, body }, this.source);
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.UPDATE.SUCCESS,
+                properties: {
+                    ...body,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onDeviceDelete(deviceId) {
+            await dt_pub_sub_1.eventDispatcher.publishEvent(Event_1.DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS, { deviceId }, this.source);
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.DELETE.SUCCESS,
+                properties: {
+                    deviceId,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onStateChange(deviceId, state) {
+            // TODO: For Future Consumption
+            /* await eventDispatcher.publishEvent(
+              DT_EVENT_TYPES.DEVICE.STATE.SET,
+              { deviceId, state },
+              this.source
+            ); */
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATE.SET,
+                properties: {
+                    deviceId,
+                    state,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onStatusChange(deviceId, status) {
+            // TODO: For Future Consumption
+            /* await eventDispatcher.publishEvent(
+              DT_EVENT_TYPES.DEVICE.STATUS.SET,
+              { deviceId, status },
+              this.source
+            ); */
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.STATUS.SET,
+                properties: {
+                    deviceId,
+                    status,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onBatteryLevelChange(deviceId, batteryLevel) {
+            // TODO: For Future Consumption
+            /* await eventDispatcher.publishEvent(
+              DT_EVENT_TYPES.DEVICE.BATTERY.SET,
+              { deviceId, batteryLevel },
+              this.source
+            ); */
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.BATTERY.SET,
+                properties: {
+                    deviceId,
+                    batteryLevel,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+        async onDeviceMetaChange(deviceId, metaData) {
+            // TODO: For Future Consumption
+            /*  await eventDispatcher.publishEvent(
+              DT_EVENT_TYPES.DEVICE.META_DATA.SET,
+              { deviceId, metaData },
+              this.source
+            ); */
+            const payload = {
+                eventType: Event_1.DT_EVENT_TYPES.DEVICE.META_DATA.SET,
+                properties: {
+                    deviceId,
+                    metaData,
+                },
+            };
+            await (0, dt_audit_library_1.publishAudit)(payload);
+        }
+    };
+    __setFunctionName(_classThis, "EventHandler");
+    (() => {
+        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);
+        EventHandler = _classThis = _classDescriptor.value;
+        if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        __runInitializers(_classThis, _classExtraInitializers);
+    })();
+    return EventHandler = _classThis;
+})();
 exports.EventHandler = EventHandler;

package/dist/events/EventProcessingService.js

@@ -37,12 +37,16 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
     if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
     return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventProcessingService = void 0;
 const typedi_1 = require("typedi");
 const DeviceEventHandler_1 = require("./DeviceEventHandler");
 const config_1 = require("../config/config");
 const EventHandlerOrchestrator_1 = require("./EventHandlerOrchestrator");
+const typedi_2 = __importDefault(require("typedi"));
 let EventProcessingService = (() => {
     let _classDecorators = [(0, typedi_1.Service)()];
     let _classDescriptor;
@@ -53,7 +57,8 @@ let EventProcessingService = (() => {
             this.deviceEventTransformerFactory = deviceEventTransformerFactory;
             this.deviceHandlers = new Map();
             this.handlerOrchestrator = new EventHandlerOrchestrator_1.EventHandlerOrchestrator();
-            this.deviceEventHandler = new DeviceEventHandler_1.DeviceEventHandler();
+            // Use dependency injection instead of creating new instance
+            this.deviceEventHandler = typedi_2.default.get(DeviceEventHandler_1.DeviceEventHandler);
             this.logger = (0, config_1.getConfig)().LOGGER;
             this.initializeDeviceHandlers();
             this.initializeHandlers();
@@ -70,9 +75,9 @@ let EventProcessingService = (() => {
          */
         initializeHandlers() {
             try {
-                // Register generic handler for common events
+                // Register generic handler for common events - reuse existing instance
                 this.handlerOrchestrator.registerHandlers([
-                    new DeviceEventHandler_1.DeviceEventHandler(), // Priority 100 - handles common events first
+                    this.deviceEventHandler, // Use existing instance instead of creating new one
                 ]);
                 this.logger.info("Base event handlers initialized successfully");
             }

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { CloudDevice, CloudDeviceService, DeviceFactory, } from "./device/cloud/
 export { LocalDeviceService, LocalHubService, LocalScheduleService, } from "./device/local/services";
 export * from "./device/local/interfaces";
 export * from "./device/cloud/interfaces";
+export * from "./admin";
 export * from "./connection";
 export * from "./property";
 export * from "./events";

package/dist/index.js

@@ -31,6 +31,8 @@ Object.defineProperty(exports, "LocalHubService", { enumerable: true, get: funct
 Object.defineProperty(exports, "LocalScheduleService", { enumerable: true, get: function () { return services_1.LocalScheduleService; } });
 __exportStar(require("./device/local/interfaces"), exports);
 __exportStar(require("./device/cloud/interfaces"), exports);
+// ADMIN EXPORTS
+__exportStar(require("./admin"), exports);
 // CONNECTION EXPORTS
 __exportStar(require("./connection"), exports);
 // PROPERTY EXPORTS

package/dist/microservice/MicroServiceFactory.d.ts

@@ -2,7 +2,7 @@ import { SERVICE_NAME } from "../constants";
 import { DeviceType } from "../device/cloud/interfaces";
 export declare class MicroServiceFactory {
     private readonly deviceType;
-    private static instance;
+    private static instances;
     constructor(deviceType: DeviceType);
     getMicroService(): SERVICE_NAME;
     static getInstance(deviceType: DeviceType): MicroServiceFactory;

package/dist/microservice/MicroServiceFactory.js

@@ -22,10 +22,12 @@ class MicroServiceFactory {
         }
     }
     static getInstance(deviceType) {
-        if (!MicroServiceFactory.instance) {
-            MicroServiceFactory.instance = new MicroServiceFactory(deviceType);
+        // Use device type as key to allow multiple instances for different device types
+        if (!MicroServiceFactory.instances.has(deviceType)) {
+            MicroServiceFactory.instances.set(deviceType, new MicroServiceFactory(deviceType));
         }
-        return MicroServiceFactory.instance;
+        return MicroServiceFactory.instances.get(deviceType);
     }
 }
 exports.MicroServiceFactory = MicroServiceFactory;
+MicroServiceFactory.instances = new Map();