@fastybird/smart-panel-backend 0.11.0-alpha.0 → 1.0.0-beta.2

package/dist/plugins/devices-shelly-v1/services/shellies-adapter.service.js

@@ -20,14 +20,18 @@ const logger_1 = require("../../../common/logger");
 const config_service_1 = require("../../../modules/config/services/config.service");
 const devices_shelly_v1_constants_1 = require("../devices-shelly-v1.constants");
 const shellies_1 = __importDefault(require("../lib/shellies"));
+const shelly_v1_http_client_service_1 = require("./shelly-v1-http-client.service");
 let ShelliesAdapterService = class ShelliesAdapterService {
-    constructor(configService) {
+    constructor(configService, httpClient) {
         this.configService = configService;
+        this.httpClient = httpClient;
         this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_v1_constants_1.DEVICES_SHELLY_V1_PLUGIN_NAME, 'ShelliesAdapterService');
         this.shellies = null;
         this.isStarted = false;
         this.pluginConfig = null;
+        this.statusCheckRunning = false;
         this.devicesRegistry = new Map();
+        this.addSubscribers = new Set();
         this.callbacks = {};
     }
     setCallbacks(callbacks) {
@@ -45,6 +49,9 @@ let ShelliesAdapterService = class ShelliesAdapterService {
             shellies_1.default.staleTimeout = this.config.timeouts.staleTimeout * 1000;
             const deviceDiscoveredHandler = (device) => this.handleDeviceDiscovered(device);
             this.shellies.on('add', deviceDiscoveredHandler);
+            for (const handler of this.addSubscribers) {
+                this.shellies.on('add', handler);
+            }
             this.logger.log('Shellies library initialized, starting discovery');
             const networkInterface = await this.getNetworkInterface();
             this.shellies.start(networkInterface);
@@ -66,11 +73,18 @@ let ShelliesAdapterService = class ShelliesAdapterService {
         }
         try {
             this.logger.log('Stopping Shellies adapter');
+            for (const registeredDevice of this.devicesRegistry.values()) {
+                const device = this.shellies.getDevice(registeredDevice.type, registeredDevice.id);
+                if (device) {
+                    device.removeAllListeners();
+                }
+            }
             this.shellies.removeAllListeners();
             this.shellies.stop();
             this.devicesRegistry.clear();
             this.shellies = null;
             this.isStarted = false;
+            this.statusCheckRunning = false;
             this.logger.log('Shellies adapter stopped successfully');
         }
         catch (error) {
@@ -93,6 +107,27 @@ let ShelliesAdapterService = class ShelliesAdapterService {
     getRegisteredDevice(deviceId) {
         return this.devicesRegistry.get(deviceId);
     }
+    getKnownDevices() {
+        const devices = [];
+        if (!this.shellies) {
+            return devices;
+        }
+        for (const registered of this.devicesRegistry.values()) {
+            const device = this.shellies.getDevice(registered.type, registered.id);
+            if (device) {
+                devices.push(device);
+            }
+        }
+        return devices;
+    }
+    subscribeToAddedDevice(handler) {
+        this.addSubscribers.add(handler);
+        this.shellies?.on('add', handler);
+        return () => {
+            this.addSubscribers.delete(handler);
+            this.shellies?.off('add', handler);
+        };
+    }
     updateDeviceEnabledStatus(deviceId, enabled) {
         const device = this.devicesRegistry.get(deviceId);
         if (device) {
@@ -173,37 +208,74 @@ let ShelliesAdapterService = class ShelliesAdapterService {
         }
         return this.pluginConfig;
     }
-    checkDevicesStatus() {
-        if (!this.isStarted || !this.shellies) {
+    async checkDevicesStatus() {
+        if (!this.isStarted || !this.shellies || this.statusCheckRunning) {
             return;
         }
-        const now = Date.now();
-        const staleTimeout = this.config.timeouts.staleTimeout * 1000;
-        for (const registeredDevice of this.devicesRegistry.values()) {
-            try {
+        this.statusCheckRunning = true;
+        try {
+            const now = Date.now();
+            const staleTimeout = this.config.timeouts.staleTimeout * 1000;
+            const staleCandidates = [];
+            for (const registeredDevice of this.devicesRegistry.values()) {
                 const device = this.shellies.getDevice(registeredDevice.type, registeredDevice.id);
                 if (!device) {
-                    this.logger.warn(`Device ${registeredDevice.id} not found in shellies library`, {
-                        resource: registeredDevice.id,
-                    });
                     continue;
                 }
                 if (device.lastSeen && typeof device.lastSeen === 'number') {
                     const timeSinceLastSeen = now - device.lastSeen;
                     if (timeSinceLastSeen > staleTimeout && device.online) {
-                        this.logger.warn(`Device ${device.id} is stale (${Math.round(timeSinceLastSeen / 1000)}s since last seen, threshold: ${this.config.timeouts.staleTimeout}s), marking as offline`, { resource: device.id });
-                        this.handleDeviceOffline(device);
-                        device.online = false;
+                        staleCandidates.push({ device, host: registeredDevice.host });
                     }
                 }
             }
-            catch (error) {
-                this.logger.error(`Error checking device status for ${registeredDevice.id}`, {
-                    message: error instanceof Error ? error.message : String(error),
-                    resource: registeredDevice.id,
-                });
+            if (staleCandidates.length === 0) {
+                return;
+            }
+            const results = await Promise.all(staleCandidates.map(async ({ device, host }) => {
+                const alive = await this.pingDevice(host);
+                return { device, alive };
+            }));
+            const recheckNow = Date.now();
+            for (const { device, alive } of results) {
+                if (!device.online) {
+                    continue;
+                }
+                if (device.lastSeen && typeof device.lastSeen === 'number' && recheckNow - device.lastSeen <= staleTimeout) {
+                    continue;
+                }
+                if (alive) {
+                    this.logger.debug(`Device ${device.id} CoAP stale but HTTP OK, keeping online`, {
+                        resource: device.id,
+                    });
+                    device.lastSeen = Date.now();
+                }
+                else {
+                    this.logger.warn(`Device ${device.id} is stale and unreachable via HTTP, marking as offline`, {
+                        resource: device.id,
+                    });
+                    this.handleDeviceOffline(device);
+                    device.online = false;
+                }
             }
         }
+        catch (error) {
+            this.logger.error('Error during device status check', {
+                message: error instanceof Error ? error.message : String(error),
+            });
+        }
+        finally {
+            this.statusCheckRunning = false;
+        }
+    }
+    async pingDevice(host) {
+        try {
+            await this.httpClient.getDeviceInfo(host, 3_000);
+            return true;
+        }
+        catch {
+            return false;
+        }
     }
     async getNetworkInterface() {
         const iface = this.config.discovery.interface;
@@ -228,10 +300,11 @@ __decorate([
     (0, schedule_1.Cron)(schedule_1.CronExpression.EVERY_5_SECONDS),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
+    __metadata("design:returntype", Promise)
 ], ShelliesAdapterService.prototype, "checkDevicesStatus", null);
 exports.ShelliesAdapterService = ShelliesAdapterService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_service_1.ConfigService])
+    __metadata("design:paramtypes", [config_service_1.ConfigService,
+        shelly_v1_http_client_service_1.ShellyV1HttpClientService])
 ], ShelliesAdapterService);
 //# sourceMappingURL=shellies-adapter.service.js.map

package/dist/plugins/devices-shelly-v1/services/shellies-adapter.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"shellies-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-v1/services/shellies-adapter.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"shellies-adapter.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-v1/services/shellies-adapter.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0EAA0D;AAE1D,2CAA4C;AAC5C,+CAAwD;AAExD,mDAAuF;AACvF,oFAAgF;AAChF,gFAA+E;AAS/E,+DAAuC;AAGvC,mFAA4E;AAGrE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IA2BlC,YACkB,aAA4B,EAC5B,UAAqC;QADrC,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAA2B;QA5BtC,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,wBAAwB,CACxB,CAAC;QAEM,aAAQ,GAA2B,IAAI,CAAC;QACxC,cAAS,GAAG,KAAK,CAAC;QAElB,iBAAY,GAA+B,IAAI,CAAC;QAChD,uBAAkB,GAAG,KAAK,CAAC;QAMlB,oBAAe,GAAG,IAAI,GAAG,EAA4B,CAAC;QAOtD,mBAAc,GAAG,IAAI,GAAG,EAAkC,CAAC;QAEpE,cAAS,GAA6B,EAAE,CAAC;IAK9C,CAAC;IAKJ,YAAY,CAAC,SAAmC;QAC/C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC5B,CAAC;IAKD,KAAK,CAAC,KAAK;QACV,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;YAErD,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;YAG/D,IAAI,CAAC,QAAQ,GAAG,kBAAQ,CAAC;YAEzB,kBAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;YACrE,kBAAQ,CAAC,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;YAGjE,MAAM,uBAAuB,GAAG,CAAC,MAAoB,EAAQ,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAGpG,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,uBAAuB,CAAC,CAAC;YAKjD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC3C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAClC,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kDAAkD,CAAC,CAAC;YAGpE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAG1D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YAEtC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAEtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;gBACrD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC/D,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;aACvD,CAAC,CAAC;YAEH,KAAK,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAEzF,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAKD,IAAI;QACH,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAI7C,KAAK,MAAM,gBAAgB,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAEnF,IAAI,MAAM,EAAE,CAAC;oBACZ,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,CAAC;YACF,CAAC;YAGD,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAGnC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAGrB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;YAE7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;YAEhC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE;gBACpD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;gBAC/D,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;aACvD,CAAC,CAAC;YAEH,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAKD,SAAS,CAAC,IAAY,EAAE,EAAU;QACjC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAKD,oBAAoB;QACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAKD,mBAAmB,CAAC,QAAgB;QACnC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAOD,eAAe;QACd,MAAM,OAAO,GAAmB,EAAE,CAAC;QAEnC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC;QAChB,CAAC;QAED,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;YAEvE,IAAI,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC;QACF,CAAC;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAWD,sBAAsB,CAAC,OAAuC;QAC7D,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAElC,OAAO,GAAG,EAAE;YACX,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACpC,CAAC,CAAC;IACH,CAAC;IAKD,yBAAyB,CAAC,QAAgB,EAAE,OAAgB;QAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAElD,IAAI,MAAM,EAAE,CAAC;YACZ,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;YACzB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;IACF,CAAC;IAKD,wBAAwB,CAAC,UAAkB,EAAE,QAAgB,EAAE,QAAgB,EAAE,QAAgB;QAChG,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpD,IAAI,MAAM,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACzC,MAAM,CAAC,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mDAAmD,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzG,CAAC;IACF,CAAC;IAKO,sBAAsB,CAAC,MAAoB;QAElD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;YACnC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,IAAI;SACb,CAAC,CAAC;QAGH,MAAM,CAAC,EAAE,CACR,QAAQ,EACR,CAAC,QAAgB,EAAE,QAAmC,EAAE,QAA0C,EAAE,EAAE;YACrG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC/D,CAAC,CACD,CAAC;QAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACzB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAE7B,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAGH,MAAM,eAAe,GAA0B;YAC9C,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;SACrB,CAAC;QACF,KAAK,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC,eAAe,CAAC,CAAC;IAC3D,CAAC;IAKO,kBAAkB,CACzB,MAAoB,EACpB,QAAgB,EAChB,QAAmC,EACnC,QAA0C;QAE1C,MAAM,eAAe,GAAgC;YACpD,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,QAAQ;YACR,QAAQ;YACR,QAAQ;SACR,CAAC;QAEF,KAAK,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC;IAKO,mBAAmB,CAAC,MAAoB;QAC/C,MAAM,eAAe,GAA0B;YAC9C,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,KAAK;SACb,CAAC;QAEF,KAAK,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC;IAKO,kBAAkB,CAAC,MAAoB;QAC9C,MAAM,eAAe,GAA0B;YAC9C,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,IAAI;SACZ,CAAC;QAEF,KAAK,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC,eAAe,CAAC,CAAC;IACvD,CAAC;IAKO,mBAAmB,CAAC,MAAoB;QAE/C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,IAAY,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAsB,2DAA6B,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC1B,CAAC;IAWK,AAAN,KAAK,CAAC,kBAAkB;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAClE,OAAO;QACR,CAAC;QAED,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAE/B,IAAI,CAAC;YACJ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;YAG9D,MAAM,eAAe,GAAkD,EAAE,CAAC;YAE1E,KAAK,MAAM,gBAAgB,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;gBAC9D,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;gBAEnF,IAAI,CAAC,MAAM,EAAE,CAAC;oBACb,SAAS;gBACV,CAAC;gBAED,IAAI,MAAM,CAAC,QAAQ,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC5D,MAAM,iBAAiB,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;oBAEhD,IAAI,iBAAiB,GAAG,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;wBACvD,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC/D,CAAC;gBACF,CAAC;YACF,CAAC;YAED,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClC,OAAO;YACR,CAAC;YAGD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE;gBAC9C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAE1C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YAC1B,CAAC,CAAC,CACF,CAAC;YAEF,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE9B,KAAK,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,OAAO,EAAE,CAAC;gBAEzC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;oBACpB,SAAS;gBACV,CAAC;gBAGD,IAAI,MAAM,CAAC,QAAQ,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,IAAI,UAAU,GAAG,MAAM,CAAC,QAAQ,IAAI,YAAY,EAAE,CAAC;oBAC5G,SAAS;gBACV,CAAC;gBAED,IAAI,KAAK,EAAE,CAAC;oBACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,MAAM,CAAC,EAAE,yCAAyC,EAAE;wBAC/E,QAAQ,EAAE,MAAM,CAAC,EAAE;qBACnB,CAAC,CAAC;oBAEH,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC9B,CAAC;qBAAM,CAAC;oBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,EAAE,wDAAwD,EAAE;wBAC7F,QAAQ,EAAE,MAAM,CAAC,EAAE;qBACnB,CAAC,CAAC;oBAEH,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;oBACjC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;gBACvB,CAAC;YACF,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;gBACrD,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC/D,CAAC,CAAC;QACJ,CAAC;gBAAS,CAAC;YACV,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC;QACjC,CAAC;IACF,CAAC;IAMO,KAAK,CAAC,UAAU,CAAC,IAAY;QACpC,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEjD,OAAO,IAAI,CAAC;QACb,CAAC;QAAC,MAAM,CAAC;YACR,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;IAMD,KAAK,CAAC,mBAAmB;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC;QAE9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,iBAAiB,GAA8C,MAAM,2BAAE,CAAC,iBAAiB,EAAE,CAAC;QAGlG,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QAE3E,IAAI,eAAe,EAAE,CAAC;YAErB,OAAO,eAAe,CAAC,GAAG,IAAI,IAAI,CAAC;QACpC,CAAC;QAGD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,CAAC;QAE5E,IAAI,kBAAkB,EAAE,CAAC;YAExB,OAAO,kBAAkB,CAAC,GAAG,CAAC;QAC/B,CAAC;QAGD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAC;QAEjF,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA3dY,wDAAsB;AA2V5B;IADL,IAAA,eAAI,EAAC,yBAAc,CAAC,eAAe,CAAC;;;;gEA+EpC;iCAzaW,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCA6BqB,8BAAa;QAChB,yDAAyB;GA7B3C,sBAAsB,CA2dlC"}

package/dist/plugins/devices-shelly-v1/services/shelly-v1-discovery.service.d.ts

@@ -0,0 +1,62 @@
+import { DeviceCategory } from '../../../modules/devices/devices.constants';
+import { DevicesService } from '../../../modules/devices/services/devices.service';
+import { ShelliesAdapterService } from './shellies-adapter.service';
+import { ShellyV1HttpClientService } from './shelly-v1-http-client.service';
+export type ShellyV1DiscoverySessionStatus = 'running' | 'finished' | 'failed';
+export type ShellyV1DiscoveryDeviceStatus = 'checking' | 'ready' | 'needs_password' | 'already_registered' | 'unsupported' | 'failed';
+export type ShellyV1DiscoveryDeviceSource = 'mdns' | 'manual';
+export interface ShellyV1DiscoveryDeviceSnapshot {
+    identifier: string | null;
+    hostname: string;
+    name: string | null;
+    model: string | null;
+    displayName: string | null;
+    firmware: string | null;
+    status: ShellyV1DiscoveryDeviceStatus;
+    source: ShellyV1DiscoveryDeviceSource;
+    categories: DeviceCategory[];
+    suggestedCategory: DeviceCategory | null;
+    authentication: {
+        enabled: boolean;
+        valid: boolean | null;
+    };
+    registeredDeviceId: string | null;
+    registeredDeviceName: string | null;
+    registeredDeviceCategory: DeviceCategory | null;
+    error: string | null;
+    lastSeenAt: string;
+}
+export interface ShellyV1DiscoverySessionSnapshot {
+    id: string;
+    status: ShellyV1DiscoverySessionStatus;
+    startedAt: string;
+    expiresAt: string;
+    remainingSeconds: number;
+    devices: ShellyV1DiscoveryDeviceSnapshot[];
+}
+export declare class ShellyV1DiscoveryService {
+    private readonly shelliesAdapter;
+    private readonly devicesService;
+    private readonly httpClient;
+    private static readonly FINISHED_SESSION_TTL_MS;
+    private readonly logger;
+    private readonly sessions;
+    constructor(shelliesAdapter: ShelliesAdapterService, devicesService: DevicesService, httpClient: ShellyV1HttpClientService);
+    start({ duration }: {
+        duration: number;
+    }): ShellyV1DiscoverySessionSnapshot;
+    get(id: string): ShellyV1DiscoverySessionSnapshot | null;
+    manual(id: string, { hostname, password }: {
+        hostname: string;
+        password?: string | null;
+    }): Promise<ShellyV1DiscoverySessionSnapshot | null>;
+    private finish;
+    private unsubscribeFromAdded;
+    private scheduleCleanup;
+    private clearTimer;
+    private clearCleanupTimer;
+    private handleLibDevice;
+    private inspectDevice;
+    private buildIdentifier;
+    private toSnapshot;
+}

package/dist/plugins/devices-shelly-v1/services/shelly-v1-discovery.service.js

@@ -0,0 +1,314 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ShellyV1DiscoveryService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellyV1DiscoveryService = void 0;
+const crypto_1 = require("crypto");
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const devices_service_1 = require("../../../modules/devices/services/devices.service");
+const devices_shelly_v1_constants_1 = require("../devices-shelly-v1.constants");
+const descriptor_utils_1 = require("../utils/descriptor.utils");
+const shellies_adapter_service_1 = require("./shellies-adapter.service");
+const shelly_v1_http_client_service_1 = require("./shelly-v1-http-client.service");
+let ShellyV1DiscoveryService = ShellyV1DiscoveryService_1 = class ShellyV1DiscoveryService {
+    constructor(shelliesAdapter, devicesService, httpClient) {
+        this.shelliesAdapter = shelliesAdapter;
+        this.devicesService = devicesService;
+        this.httpClient = httpClient;
+        this.logger = (0, logger_1.createExtensionLogger)(devices_shelly_v1_constants_1.DEVICES_SHELLY_V1_PLUGIN_NAME, 'ShellyV1DiscoveryService');
+        this.sessions = new Map();
+    }
+    start({ duration }) {
+        for (const existing of this.sessions.values()) {
+            if (existing.status === 'running') {
+                void this.finish(existing.id);
+            }
+        }
+        const id = (0, crypto_1.randomUUID)();
+        const startedAt = new Date();
+        const expiresAt = new Date(startedAt.getTime() + duration * 1_000);
+        const session = {
+            id,
+            status: 'running',
+            startedAt,
+            expiresAt,
+            devices: new Map(),
+        };
+        session.unsubscribeAdded = this.shelliesAdapter.subscribeToAddedDevice((device) => {
+            void this.handleLibDevice(session, device);
+        });
+        session.timer = setTimeout(() => {
+            void this.finish(id);
+        }, duration * 1_000);
+        this.sessions.set(id, session);
+        void Promise.allSettled(this.shelliesAdapter.getKnownDevices().map((device) => this.handleLibDevice(session, device)));
+        return this.toSnapshot(session);
+    }
+    get(id) {
+        const session = this.sessions.get(id);
+        if (session === undefined) {
+            return null;
+        }
+        return this.toSnapshot(session);
+    }
+    async manual(id, { hostname, password }) {
+        const session = this.sessions.get(id);
+        if (session === undefined) {
+            return null;
+        }
+        await this.inspectDevice(session, hostname, 'manual', password ?? null);
+        return this.toSnapshot(session);
+    }
+    async finish(id) {
+        const session = this.sessions.get(id);
+        if (session === undefined || session.status !== 'running') {
+            return;
+        }
+        session.status = 'finished';
+        this.clearTimer(session);
+        this.unsubscribeFromAdded(session);
+        this.scheduleCleanup(session);
+        await Promise.resolve();
+    }
+    unsubscribeFromAdded(session) {
+        if (typeof session.unsubscribeAdded === 'function') {
+            try {
+                session.unsubscribeAdded();
+            }
+            catch (error) {
+                const err = error;
+                this.logger.warn('Failed to detach Shelly V1 discovery listener', {
+                    session: session.id,
+                    message: err.message,
+                    stack: err.stack,
+                });
+            }
+            session.unsubscribeAdded = undefined;
+        }
+    }
+    scheduleCleanup(session) {
+        this.clearCleanupTimer(session);
+        session.cleanupTimer = setTimeout(() => {
+            this.sessions.delete(session.id);
+        }, ShellyV1DiscoveryService_1.FINISHED_SESSION_TTL_MS);
+    }
+    clearTimer(session) {
+        if (session.timer !== undefined) {
+            clearTimeout(session.timer);
+            session.timer = undefined;
+        }
+    }
+    clearCleanupTimer(session) {
+        if (session.cleanupTimer !== undefined) {
+            clearTimeout(session.cleanupTimer);
+            session.cleanupTimer = undefined;
+        }
+    }
+    async handleLibDevice(session, device) {
+        const hostname = device.host;
+        if (typeof hostname !== 'string' || hostname.length === 0) {
+            return;
+        }
+        const existing = session.devices.get(hostname);
+        if (existing && existing.source === 'manual') {
+            return;
+        }
+        try {
+            const registeredDevice = await this.devicesService.findOneBy('identifier', device.id, devices_shelly_v1_constants_1.DEVICES_SHELLY_V1_TYPE);
+            const descriptor = (0, descriptor_utils_1.findShellyV1Descriptor)(device.type);
+            const categories = descriptor?.categories ?? [];
+            let status;
+            if (registeredDevice !== null) {
+                status = 'already_registered';
+            }
+            else if (descriptor === null) {
+                status = 'unsupported';
+            }
+            else {
+                status = 'ready';
+            }
+            let firmware = null;
+            let authEnabled = false;
+            try {
+                const shellyInfo = await this.httpClient.getDeviceInfo(hostname, 3_000);
+                firmware = shellyInfo.fw ?? null;
+                authEnabled = Boolean(shellyInfo.auth);
+                if (authEnabled && status === 'ready') {
+                    status = 'needs_password';
+                }
+            }
+            catch {
+            }
+            const snapshot = {
+                identifier: device.id,
+                hostname,
+                name: null,
+                model: device.type,
+                displayName: descriptor?.name ?? device.type,
+                firmware,
+                status,
+                source: 'mdns',
+                categories,
+                suggestedCategory: categories.length > 0 ? categories[0] : null,
+                authentication: { enabled: authEnabled, valid: null },
+                registeredDeviceId: registeredDevice?.id ?? null,
+                registeredDeviceName: registeredDevice?.name ?? null,
+                registeredDeviceCategory: registeredDevice?.category ?? null,
+                error: null,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, snapshot);
+        }
+        catch (error) {
+            const err = error;
+            this.logger.warn('Failed to build discovery snapshot for device from main connector', {
+                session: session.id,
+                hostname,
+                message: err.message,
+                stack: err.stack,
+            });
+            session.devices.set(hostname, {
+                identifier: device.id,
+                hostname,
+                name: null,
+                model: device.type,
+                displayName: device.type,
+                firmware: null,
+                status: 'failed',
+                source: 'mdns',
+                categories: [],
+                suggestedCategory: null,
+                authentication: { enabled: false, valid: null },
+                registeredDeviceId: null,
+                registeredDeviceName: null,
+                registeredDeviceCategory: null,
+                error: err.message,
+                lastSeenAt: new Date().toISOString(),
+            });
+        }
+    }
+    async inspectDevice(session, hostname, source, password) {
+        if (hostname.length === 0) {
+            return null;
+        }
+        const existing = session.devices.get(hostname);
+        session.devices.set(hostname, {
+            identifier: existing?.identifier ?? null,
+            hostname,
+            name: existing?.name ?? null,
+            model: existing?.model ?? null,
+            displayName: existing?.displayName ?? null,
+            firmware: existing?.firmware ?? null,
+            status: 'checking',
+            source,
+            categories: existing?.categories ?? [],
+            suggestedCategory: existing?.suggestedCategory ?? null,
+            authentication: existing?.authentication ?? { enabled: false, valid: null },
+            registeredDeviceId: existing?.registeredDeviceId ?? null,
+            registeredDeviceName: existing?.registeredDeviceName ?? null,
+            registeredDeviceCategory: existing?.registeredDeviceCategory ?? null,
+            error: null,
+            lastSeenAt: new Date().toISOString(),
+        });
+        try {
+            const shellyInfo = await this.httpClient.getDeviceInfo(hostname);
+            const descriptor = (0, descriptor_utils_1.findShellyV1Descriptor)(shellyInfo.type);
+            const identifier = this.buildIdentifier(shellyInfo.mac);
+            const registeredDevice = identifier
+                ? await this.devicesService.findOneBy('identifier', identifier, devices_shelly_v1_constants_1.DEVICES_SHELLY_V1_TYPE)
+                : null;
+            const categories = descriptor?.categories ?? [];
+            let authValid = null;
+            if (shellyInfo.auth && password !== null) {
+                try {
+                    await this.httpClient.getDeviceStatus(hostname, undefined, devices_shelly_v1_constants_1.SHELLY_AUTH_USERNAME, password);
+                    authValid = true;
+                }
+                catch (error) {
+                    authValid = false;
+                    this.logger.warn(`Auth credentials invalid for ${hostname}: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
+            let status = 'ready';
+            if (registeredDevice !== null) {
+                status = 'already_registered';
+            }
+            else if (descriptor === null) {
+                status = 'unsupported';
+            }
+            else if (shellyInfo.auth && (password === null || authValid === false)) {
+                status = 'needs_password';
+            }
+            const discoveredDevice = {
+                identifier,
+                hostname,
+                name: existing?.name ?? null,
+                model: shellyInfo.type,
+                displayName: descriptor?.name ?? shellyInfo.type,
+                firmware: shellyInfo.fw ?? null,
+                status,
+                source,
+                categories,
+                suggestedCategory: categories.length > 0 ? categories[0] : null,
+                authentication: { enabled: Boolean(shellyInfo.auth), valid: authValid },
+                registeredDeviceId: registeredDevice?.id ?? null,
+                registeredDeviceName: registeredDevice?.name ?? null,
+                registeredDeviceCategory: registeredDevice?.category ?? null,
+                error: null,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, discoveredDevice);
+            return discoveredDevice;
+        }
+        catch (error) {
+            const err = error;
+            const currentDevice = session.devices.get(hostname);
+            if (currentDevice === undefined) {
+                return null;
+            }
+            const failedDevice = {
+                ...currentDevice,
+                status: 'failed',
+                source,
+                error: err.message,
+                lastSeenAt: new Date().toISOString(),
+            };
+            session.devices.set(hostname, failedDevice);
+            return failedDevice;
+        }
+    }
+    buildIdentifier(mac) {
+        if (typeof mac !== 'string' || mac.length === 0) {
+            return null;
+        }
+        return mac.replace(/[^a-zA-Z0-9]/g, '').toUpperCase();
+    }
+    toSnapshot(session) {
+        return {
+            id: session.id,
+            status: session.status,
+            startedAt: session.startedAt.toISOString(),
+            expiresAt: session.expiresAt.toISOString(),
+            remainingSeconds: Math.max(0, Math.ceil((session.expiresAt.getTime() - Date.now()) / 1_000)),
+            devices: Array.from(session.devices.values()),
+        };
+    }
+};
+exports.ShellyV1DiscoveryService = ShellyV1DiscoveryService;
+ShellyV1DiscoveryService.FINISHED_SESSION_TTL_MS = 5 * 60_000;
+exports.ShellyV1DiscoveryService = ShellyV1DiscoveryService = ShellyV1DiscoveryService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [shellies_adapter_service_1.ShelliesAdapterService,
+        devices_service_1.DevicesService,
+        shelly_v1_http_client_service_1.ShellyV1HttpClientService])
+], ShellyV1DiscoveryService);
+//# sourceMappingURL=shelly-v1-discovery.service.js.map

package/dist/plugins/devices-shelly-v1/services/shelly-v1-discovery.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shelly-v1-discovery.service.js","sourceRoot":"","sources":["../../../../src/plugins/devices-shelly-v1/services/shelly-v1-discovery.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,mCAAoC;AAEpC,2CAA4C;AAE5C,mDAAuF;AAEvF,uFAAmF;AACnF,gFAIwC;AAGxC,gEAAmE;AAEnE,yEAAoE;AACpE,mFAA4E;AAyDrE,IAAM,wBAAwB,gCAA9B,MAAM,wBAAwB;IAUpC,YACkB,eAAuC,EACvC,cAA8B,EAC9B,UAAqC;QAFrC,oBAAe,GAAf,eAAe,CAAwB;QACvC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAA2B;QAVtC,WAAM,GAA2B,IAAA,8BAAqB,EACtE,2DAA6B,EAC7B,0BAA0B,CAC1B,CAAC;QAEe,aAAQ,GAAG,IAAI,GAAG,EAAoC,CAAC;IAMrE,CAAC;IAEJ,KAAK,CAAC,EAAE,QAAQ,EAAwB;QAMvC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;YAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACnC,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC;QACF,CAAC;QAED,MAAM,EAAE,GAAG,IAAA,mBAAU,GAAE,CAAC;QACxB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,QAAQ,GAAG,KAAK,CAAC,CAAC;QAEnE,MAAM,OAAO,GAA6B;YACzC,EAAE;YACF,MAAM,EAAE,SAAS;YACjB,SAAS;YACT,SAAS;YACT,OAAO,EAAE,IAAI,GAAG,EAAE;SAClB,CAAC;QAWF,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,EAAE;YACjF,KAAK,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAIH,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACtB,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,CAAC;QAErB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAO/B,KAAK,OAAO,CAAC,UAAU,CACtB,IAAI,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAC7F,CAAC;QAEF,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,EAAU;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CACX,EAAU,EACV,EAAE,QAAQ,EAAE,QAAQ,EAAkD;QAEtE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC;QAExE,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,EAAU;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEtC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC3D,OAAO;QACR,CAAC;QAED,OAAO,CAAC,MAAM,GAAG,UAAU,CAAC;QAE5B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAEnC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAE9B,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAEO,oBAAoB,CAAC,OAAiC;QAC7D,IAAI,OAAO,OAAO,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;YACpD,IAAI,CAAC;gBACJ,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,KAAc,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE;oBACjE,OAAO,EAAE,OAAO,CAAC,EAAE;oBACnB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBAChB,CAAC,CAAC;YACJ,CAAC;YAED,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACtC,CAAC;IACF,CAAC;IAEO,eAAe,CAAC,OAAiC;QACxD,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEhC,OAAO,CAAC,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;YACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAClC,CAAC,EAAE,0BAAwB,CAAC,uBAAuB,CAAC,CAAC;IACtD,CAAC;IAEO,UAAU,CAAC,OAAiC;QACnD,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YACjC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;QAC3B,CAAC;IACF,CAAC;IAEO,iBAAiB,CAAC,OAAiC;QAC1D,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACxC,YAAY,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YACnC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;QAClC,CAAC;IACF,CAAC;IASO,KAAK,CAAC,eAAe,CAAC,OAAiC,EAAE,MAAoB;QACpF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC;QAE7B,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3D,OAAO;QACR,CAAC;QAID,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/C,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YACJ,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAC3D,YAAY,EACZ,MAAM,CAAC,EAAE,EACT,oDAAsB,CACtB,CAAC;YAEF,MAAM,UAAU,GAAG,IAAA,yCAAsB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;YAEhD,IAAI,MAAqC,CAAC;YAE1C,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAC/B,MAAM,GAAG,oBAAoB,CAAC;YAC/B,CAAC;iBAAM,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBAChC,MAAM,GAAG,aAAa,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACP,MAAM,GAAG,OAAO,CAAC;YAClB,CAAC;YAKD,IAAI,QAAQ,GAAkB,IAAI,CAAC;YACnC,IAAI,WAAW,GAAG,KAAK,CAAC;YAExB,IAAI,CAAC;gBACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBACxE,QAAQ,GAAG,UAAU,CAAC,EAAE,IAAI,IAAI,CAAC;gBACjC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAKvC,IAAI,WAAW,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;oBACvC,MAAM,GAAG,gBAAgB,CAAC;gBAC3B,CAAC;YACF,CAAC;YAAC,MAAM,CAAC;YAGT,CAAC;YAED,MAAM,QAAQ,GAAoC;gBACjD,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrB,QAAQ;gBACR,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,MAAM,CAAC,IAAI;gBAClB,WAAW,EAAE,UAAU,EAAE,IAAI,IAAI,MAAM,CAAC,IAAI;gBAC5C,QAAQ;gBACR,MAAM;gBACN,MAAM,EAAE,MAAM;gBACd,UAAU;gBAKV,iBAAiB,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC/D,cAAc,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE;gBACrD,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,IAAI,IAAI;gBAChD,oBAAoB,EAAE,gBAAgB,EAAE,IAAI,IAAI,IAAI;gBACpD,wBAAwB,EAAE,gBAAgB,EAAE,QAAQ,IAAI,IAAI;gBAC5D,KAAK,EAAE,IAAI;gBACX,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;YAEF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAKhB,MAAM,GAAG,GAAG,KAAc,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mEAAmE,EAAE;gBACrF,OAAO,EAAE,OAAO,CAAC,EAAE;gBACnB,QAAQ;gBACR,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;aAChB,CAAC,CAAC;YAEH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;gBAC7B,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrB,QAAQ;gBACR,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,MAAM,CAAC,IAAI;gBAClB,WAAW,EAAE,MAAM,CAAC,IAAI;gBACxB,QAAQ,EAAE,IAAI;gBACd,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,EAAE;gBACd,iBAAiB,EAAE,IAAI;gBACvB,cAAc,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;gBAC/C,kBAAkB,EAAE,IAAI;gBACxB,oBAAoB,EAAE,IAAI;gBAC1B,wBAAwB,EAAE,IAAI;gBAC9B,KAAK,EAAE,GAAG,CAAC,OAAO;gBAClB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,OAAiC,EACjC,QAAgB,EAChB,MAAqC,EACrC,QAAuB;QAEvB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QACb,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE/C,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC7B,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,IAAI;YACxC,QAAQ;YACR,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,IAAI;YAC5B,KAAK,EAAE,QAAQ,EAAE,KAAK,IAAI,IAAI;YAC9B,WAAW,EAAE,QAAQ,EAAE,WAAW,IAAI,IAAI;YAC1C,QAAQ,EAAE,QAAQ,EAAE,QAAQ,IAAI,IAAI;YACpC,MAAM,EAAE,UAAU;YAClB,MAAM;YACN,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,EAAE;YACtC,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,IAAI,IAAI;YACtD,cAAc,EAAE,QAAQ,EAAE,cAAc,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;YAC3E,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,IAAI,IAAI;YACxD,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB,IAAI,IAAI;YAC5D,wBAAwB,EAAE,QAAQ,EAAE,wBAAwB,IAAI,IAAI;YACpE,KAAK,EAAE,IAAI;YACX,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SACpC,CAAC,CAAC;QAEH,IAAI,CAAC;YACJ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACjE,MAAM,UAAU,GAAG,IAAA,yCAAsB,EAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YAG3D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACxD,MAAM,gBAAgB,GAAG,UAAU;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAuB,YAAY,EAAE,UAAU,EAAE,oDAAsB,CAAC;gBAC7G,CAAC,CAAC,IAAI,CAAC;YACR,MAAM,UAAU,GAAG,UAAU,EAAE,UAAU,IAAI,EAAE,CAAC;YAEhD,IAAI,SAAS,GAAmB,IAAI,CAAC;YAGrC,IAAI,UAAU,CAAC,IAAI,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBAC1C,IAAI,CAAC;oBACJ,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,QAAQ,EAAE,SAAS,EAAE,kDAAoB,EAAE,QAAQ,CAAC,CAAC;oBAC3F,SAAS,GAAG,IAAI,CAAC;gBAClB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,SAAS,GAAG,KAAK,CAAC;oBAElB,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,gCAAgC,QAAQ,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACrG,CAAC;gBACH,CAAC;YACF,CAAC;YAED,IAAI,MAAM,GAAkC,OAAO,CAAC;YAEpD,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;gBAC/B,MAAM,GAAG,oBAAoB,CAAC;YAC/B,CAAC;iBAAM,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;gBAChC,MAAM,GAAG,aAAa,CAAC;YACxB,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,IAAI,SAAS,KAAK,KAAK,CAAC,EAAE,CAAC;gBAC1E,MAAM,GAAG,gBAAgB,CAAC;YAC3B,CAAC;YAED,MAAM,gBAAgB,GAAoC;gBACzD,UAAU;gBACV,QAAQ;gBACR,IAAI,EAAE,QAAQ,EAAE,IAAI,IAAI,IAAI;gBAC5B,KAAK,EAAE,UAAU,CAAC,IAAI;gBACtB,WAAW,EAAE,UAAU,EAAE,IAAI,IAAI,UAAU,CAAC,IAAI;gBAChD,QAAQ,EAAE,UAAU,CAAC,EAAE,IAAI,IAAI;gBAC/B,MAAM;gBACN,MAAM;gBACN,UAAU;gBACV,iBAAiB,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC/D,cAAc,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE;gBACvE,kBAAkB,EAAE,gBAAgB,EAAE,EAAE,IAAI,IAAI;gBAChD,oBAAoB,EAAE,gBAAgB,EAAE,IAAI,IAAI,IAAI;gBACpD,wBAAwB,EAAE,gBAAgB,EAAE,QAAQ,IAAI,IAAI;gBAC5D,KAAK,EAAE,IAAI;gBACX,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;YAEF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;YAEhD,OAAO,gBAAgB,CAAC;QACzB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG,KAAc,CAAC;YAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEpD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBACjC,OAAO,IAAI,CAAC;YACb,CAAC;YAED,MAAM,YAAY,GAAoC;gBACrD,GAAG,aAAa;gBAChB,MAAM,EAAE,QAAQ;gBAChB,MAAM;gBACN,KAAK,EAAE,GAAG,CAAC,OAAO;gBAClB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;YAEF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YAE5C,OAAO,YAAY,CAAC;QACrB,CAAC;IACF,CAAC;IAQO,eAAe,CAAC,GAA8B;QACrD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,CAAC;IAEO,UAAU,CAAC,OAAiC;QACnD,OAAO;YACN,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1C,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE;YAC1C,gBAAgB,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC;YAC5F,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;SAC7C,CAAC;IACH,CAAC;;AA7ZW,4DAAwB;AACZ,gDAAuB,GAAG,CAAC,GAAG,MAAM,AAAb,CAAc;mCADjD,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAYuB,iDAAsB;QACvB,gCAAc;QAClB,yDAAyB;GAb3C,wBAAwB,CA8ZpC"}

package/dist/plugins/devices-shelly-v1/services/shelly-v1.service.d.ts

@@ -3,11 +3,12 @@ import { ChannelsPropertiesService } from '../../../modules/devices/services/cha
 import { ChannelsService } from '../../../modules/devices/services/channels.service';
 import { DeviceConnectivityService } from '../../../modules/devices/services/device-connectivity.service';
 import { DevicesService } from '../../../modules/devices/services/devices.service';
-import { ConfigChangeResult, IManagedPluginService, ServiceState } from '../../../modules/extensions/services/managed-plugin-service.interface';
+import { BaseManagedPluginService } from '../../../modules/extensions/services/base-managed-plugin.service';
+import { ConfigChangeResult } from '../../../modules/extensions/services/managed-plugin-service.interface';
 import { DeviceMapperService } from './device-mapper.service';
 import { ShelliesAdapterService } from './shellies-adapter.service';
 import { ShellyV1HttpClientService } from './shelly-v1-http-client.service';
-export declare class ShellyV1Service implements IManagedPluginService {
+export declare class ShellyV1Service extends BaseManagedPluginService {
     private readonly configService;
     private readonly shelliesAdapter;
     private readonly deviceMapper;
@@ -20,12 +21,9 @@ export declare class ShellyV1Service implements IManagedPluginService {
     readonly pluginName = "devices-shelly-v1-plugin";
     readonly serviceId = "connector";
     private pluginConfig;
-    private state;
-    private startStopLock;
     constructor(configService: ConfigService, shelliesAdapter: ShelliesAdapterService, deviceMapper: DeviceMapperService, devicesService: DevicesService, channelsService: ChannelsService, channelsPropertiesService: ChannelsPropertiesService, deviceConnectivityService: DeviceConnectivityService, httpClient: ShellyV1HttpClientService);
     start(): Promise<void>;
     stop(): Promise<void>;
-    getState(): ServiceState;
     onConfigChanged(): Promise<ConfigChangeResult>;
     private handleDeviceDiscovered;
     private handleDeviceChanged;
@@ -35,7 +33,6 @@ export declare class ShellyV1Service implements IManagedPluginService {
     private findDescriptor;
     private handleAdapterError;
     private get config();
-    private withLock;
     private waitUntil;
     private initializeDeviceStates;
     private updateDevicesSignalStrength;