homebridge-melcloud-control 4.0.0-beta.516 → 4.0.0-beta.518

package/homebridge-ui/public/index.html

@@ -241,7 +241,7 @@
           const newDevices = { ata: [], ataPresets: [], atw: [], atwPresets: [], erv: [], ervPresets: [] };
           const devicesByType = { ata: [], atw: [], erv: [] };
 
-          response.forEach(d => {
+          response.Devices.forEach(d => {
             if (d.Type === 0) devicesByType.ata.push(d);
             if (d.Type === 1) devicesByType.atw.push(d);
             if (d.Type === 3) devicesByType.erv.push(d);

package/index.js

@@ -59,7 +59,6 @@ class MelCloudPlatform {
 					debug: account.log?.debug
 				};
 
-
 				if (logLevel.debug) {
 					log.info(`${accountName}, debug: did finish launching.`);
 					const safeConfig = {
@@ -109,6 +108,7 @@ class MelCloudPlatform {
 									if (logLevel.warn) log.warn(`${accountName}, ${accountInfo.Info}`);
 									return;
 								}
+								if (logLevel.success) log.success(accountInfo.Info);
 								const useFahrenheit = accountInfo.UseFahrenheit;
 
 								//check devices list
@@ -125,9 +125,9 @@ class MelCloudPlatform {
 								}
 
 								//configured devices
-								const ataDevices = account.ataDevices ?? [];
-								const atwDevices = account.atwDevices ?? [];
-								const ervDevices = account.ervDevices ?? [];
+								const ataDevices = (account.ataDevices || []).filter(device => (device.id ?? '0') !== '0');
+								const atwDevices = (account.atwDevices || []).filter(device => (device.id ?? '0') !== '0');
+								const ervDevices = (account.ervDevices || []).filter(device => (device.id ?? '0') !== '0');
 								const devices = [...ataDevices, ...atwDevices, ...ervDevices];
 								if (logLevel.debug) log.info(`Found configured devices ATA: ${ataDevices.length}, ATW: ${atwDevices.length}, ERV: ${ervDevices.length}.`);
 
@@ -135,9 +135,7 @@ class MelCloudPlatform {
 									//chack device from config exist on melcloud
 									const displayType = device.displayType > 0;
 									const deviceExistInMelCloud = devicesList.Devices.some(dev => dev.DeviceID === device.id);
-									if (!deviceExistInMelCloud || !displayType) {
-										continue;
-									}
+									if (!deviceExistInMelCloud || !displayType) continue;
 
 									const deviceName = device.name;
 									const deviceType = device.type;
@@ -157,9 +155,7 @@ class MelCloudPlatform {
 												if (logLevel.debug) log.debug(`Default temperature file created: ${defaultTempsFile}`);
 											}
 										} catch (error) {
-											if (logLevel.error) {
-												log.error(`Device: ${host} ${deviceName}, File init error: ${error.message}`);
-											}
+											if (logLevel.error) log.error(`Device: ${host} ${deviceName}, File init error: ${error.message}`);
 											continue;
 										}
 									}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.516",
+  "version": "4.0.0-beta.518",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/melcloud.js

@@ -115,11 +115,7 @@ class MelCloud extends EventEmitter {
                     if (device.DeviceID != null) device.DeviceID = String(device.DeviceID);
                 });
 
-                if (this.logDebug) {
-                    const count = allDevices.length;
-                    this.emit('debug', `Found ${count} devices in building: ${building.Name || 'Unnamed'}`);
-                }
-
+                if (this.logDebug) this.emit('debug', `Found ${allDevices.length} devices in building: ${building.Name || 'Unnamed'}`);
                 devicesList.Devices.push(...allDevices);
             }
 
@@ -187,12 +183,10 @@ class MelCloud extends EventEmitter {
             this.contextKey = contextKey;
 
             accountInfo.State = true;
-            accountInfo.Info = 'Connect success';
+            accountInfo.Info = 'Connect to MELCloud Success';
             accountInfo.LoginData = loginData;
             accountInfo.ContextKey = contextKey;
-
             await this.functions.saveData(this.accountFile, accountInfo);
-            this.emit('success', `Connect to MELCloud Success`);
 
             return accountInfo
         } catch (error) {
@@ -310,7 +304,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connectToMelCloudHome(refresh = false) {
+    async connectToMelCloudHome() {
         if (this.logDebug) this.emit('debug', 'Connecting to MELCloud Home');
         const GLOBAL_TIMEOUT = 45000;
 
@@ -436,14 +430,11 @@ class MelCloud extends EventEmitter {
             this.contextKey = contextKey;
 
             accountInfo.State = true;
-            accountInfo.Info = 'Connect success';
+            accountInfo.Info = 'Connect to MELCloud Home Success';
             accountInfo.ContextKey = contextKey;
-
             await this.functions.saveData(this.accountFile, accountInfo);
 
-            if (!refresh) this.emit('success', 'Connect to MELCloud Home Success');
             return accountInfo;
-
         } catch (error) {
             throw new Error(`Connect error: ${error.message}`);
         } finally {
@@ -454,7 +445,6 @@ class MelCloud extends EventEmitter {
         }
     }
 
-
     async checkDevicesList() {
         const TIMEOUT_MS = 30000; // 30 seconds timeout
         try {
@@ -478,7 +468,7 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect(refresh) {
+    async connect() {
         const TIMEOUT_MS = 60000;
 
         try {
@@ -488,7 +478,7 @@ class MelCloud extends EventEmitter {
                         case "melcloud":
                             return await this.connectToMelCloud();
                         case "melcloudhome":
-                            return await this.connectToMelCloudHome(refresh);
+                            return await this.connectToMelCloudHome();
                         default:
                             return {};
                     }