homebridge-melcloud-control 4.0.0-beta.46 → 4.0.0-beta.48

package/homebridge-ui/public/index.html

@@ -118,7 +118,7 @@
 
         button.addEventListener('click', async () => {
           for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-secondary' : 'btn btn-primary');
+            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-primary' : 'btn btn-secondary');
           }
 
           const acc = pluginConfig[0].accounts[i];
@@ -157,7 +157,7 @@
       configButton.addEventListener('click', () => {
         configButtonState = !configButtonState;
         homebridge[configButtonState ? 'showSchemaForm' : 'hideSchemaForm']();
-        configButton.className = configButtonState ? 'btn btn-secondary' : 'btn btn-primary';
+        configButton.className = configButtonState ? 'btn btn-primary' : 'btn btn-secondary';
       });
 
       // Password toggle

package/homebridge-ui/server.js

@@ -24,8 +24,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const melCloud = new MelCloud(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
 
     try {
-      const response = await melCloud.connect();
-      const devices = await melCloud.checkDevicesList(response.contextKey);
+      const accountInfo = await melCloud.connect();
+      const devices = await melCloud.checkDevicesList(accountInfo.contextKey);
       return devices;
     } catch (error) {
       throw new Error(`MELCloud error: ${error.message ?? error}.`);

package/index.js

@@ -98,17 +98,16 @@ class MelCloudPlatform {
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
 								//connect
-								let response;
+								let accountInfo;
 								try {
-									response = await melCloud.connect();
+									accountInfo = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
-								const accountInfo = response.accountInfo;
-								const contextKey = response.contextKey;
-								const useFahrenheit = response.useFahrenheit;
+								const contextKey = accountInfo.contextKey;
+								const useFahrenheit = accountInfo.useFahrenheit;
 
 								if (!contextKey) {
 									return;

package/package.json

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

package/src/melcloud.js

@@ -123,7 +123,6 @@ class MelCloud extends EventEmitter {
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo?.ContextKey;
-            const useFahrenheit = accountInfo?.UseFahrenheit ?? false;
             this.contextKey = contextKey;
 
             const debugData = {
@@ -153,10 +152,9 @@ class MelCloud extends EventEmitter {
             });
 
             await this.functions.saveData(this.accountFile, accountInfo);
-
             this.emit('success', `Connect to MELCloud Success`);
 
-            return { accountInfo, contextKey, useFahrenheit };
+            return accountInfo
         } catch (error) {
             throw new Error(`Connect to MELCloud error: ${error.message}`);
         }
@@ -196,17 +194,43 @@ class MelCloud extends EventEmitter {
             await this.functions.saveData(this.buildingsFile, buildingsList);
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
-            const devices = buildingsList.flatMap(building => [
-                ...(building.airToAirUnits || []),
-                ...(building.airToWaterUnits || [])
+            const allDevices = buildingsList.flatMap(building => [
+                ...(building.airToAirUnits || []).map(device => ({
+                    ...Object.fromEntries(
+                        Object.entries(device).map(([key, value]) => [key.charAt(0).toUpperCase() + key.slice(1), value])
+                    ),
+                    Type: 0
+                })),
+                ...(building.airToWaterUnits || []).map(device => ({
+                    ...Object.fromEntries(
+                        Object.entries(device).map(([key, value]) => [key.charAt(0).toUpperCase() + key.slice(1), value])
+                    ),
+                    Type: 1
+                })),
+                ...(building.airToVentilationUnits || []).map(device => ({
+                    ...Object.fromEntries(
+                        Object.entries(device).map(([key, value]) => [key.charAt(0).toUpperCase() + key.slice(1), value])
+                    ),
+                    Type: 3
+                }))
             ]);
 
-            const devicesCount = devices.length;
+            const devicesCount = allDevices.length;
             if (devicesCount === 0) {
                 if (this.logWarn) this.emit('warn', `No devices found`);
                 return null;
             }
 
+            const devices = [];
+            for (const device of allDevices) {
+                devices.push({
+                    DeviceID: device.Id,
+                    DeviceName: device.GivenDisplayName,
+                    Settings: Object.fromEntries(device.Settings.map(({ Name, Value }) => [Name, Value])),
+                    Device: device.Capabilities
+                });
+            }
+
             await this.functions.saveData(this.devicesFile, devices);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
 
@@ -263,14 +287,14 @@ class MelCloud extends EventEmitter {
                 return null;
             }
 
-            const accountInfo = {};
             const contextKey = ['__Secure-monitorandcontrol=chunks-2', `__Secure-monitorandcontrolC1=${c1}`, `__Secure-monitorandcontrolC2=${c2}`,].join('; ');
-            const useFahrenheit = false;
+            const accountInfo = { ContextKey: contextKey, UseFahrenheit: false };
             this.contextKey = contextKey;
 
+            await this.functions.saveData(this.accountFile, accountInfo);
             this.emit('success', `Connect to MELCloud Home Success`);
 
-            return { accountInfo, contextKey, useFahrenheit };
+            return accountInfo;
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         } finally {