homebridge-melcloud-control 3.0.7-beta.18 → 3.0.7-beta.2

package/config.schema.json

@@ -1437,13 +1437,22 @@
       "type": "tabarray",
       "title": "{{ value.name || 'account' }}",
       "items": [
-        "accounts[].name",
-        "accounts[].user",
         {
-          "key": "accounts[].passwd",
-          "type": "password"
+          "key": "accounts[]",
+          "type": "section",
+          "title": "MELCloud Credentials",
+          "expandable": true,
+          "expanded": false,
+          "items": [
+            "accounts[].name",
+            "accounts[].user",
+            {
+              "key": "accounts[].passwd",
+              "type": "password"
+            },
+            "accounts[].language"
+          ]
         },
-        "accounts[].language",
         {
           "key": "accounts[]",
           "type": "tabarray",
@@ -1651,72 +1660,50 @@
                   ]
                 }
               ]
-            }
-          ]
-        },
-        {
-          "key": "accounts[]",
-          "type": "section",
-          "title": "Advanced Settings",
-          "expandable": true,
-          "expanded": false,
-          "items": [
+            },
             {
               "key": "accounts[]",
-              "type": "tabarray",
-              "title": "{{ value.name }}",
+              "title": "System",
+              "items": [
+                "accounts[].enableDebugMode",
+                "accounts[].disableLogInfo",
+                "accounts[].disableLogDeviceInfo",
+                "accounts[].refreshInterval",
+                "accounts[].deviceRefreshInterval"
+              ]
+            },
+            {
+              "key": "accounts[]",
+              "title": "External Integrations",
               "items": [
                 {
                   "key": "accounts[]",
-                  "title": "Data Refresh",
-                  "items": [
-                    "accounts[].refreshInterval",
-                    "accounts[].deviceRefreshInterval"
-                  ]
-                },
-                {
-                  "key": "accounts[]",
-                  "title": "Log",
-                  "items": [
-                    "accounts[].enableDebugMode",
-                    "accounts[].disableLogInfo",
-                    "accounts[].disableLogDeviceInfo"
-                  ]
-                },
-                {
-                  "key": "accounts[]",
-                  "title": "External Integrations",
+                  "type": "tabarray",
+                  "title": "{{ value.title }}",
                   "items": [
                     {
-                      "key": "accounts[]",
-                      "type": "tabarray",
-                      "title": "{{ value.title }}",
+                      "key": "accounts[].restFul",
+                      "title": "RESTFul",
                       "items": [
+                        "accounts[].restFul.enable",
+                        "accounts[].restFul.debug"
+                      ]
+                    },
+                    {
+                      "key": "accounts[].mqtt",
+                      "title": "MQTT",
+                      "items": [
+                        "accounts[].mqtt.enable",
+                        "accounts[].mqtt.debug",
+                        "accounts[].mqtt.host",
+                        "accounts[].mqtt.port",
+                        "accounts[].mqtt.clientId",
+                        "accounts[].mqtt.prefix",
+                        "accounts[].mqtt.auth",
+                        "accounts[].mqtt.user",
                         {
-                          "key": "accounts[].restFul",
-                          "title": "RESTFul",
-                          "items": [
-                            "accounts[].restFul.enable",
-                            "accounts[].restFul.debug"
-                          ]
-                        },
-                        {
-                          "key": "accounts[].mqtt",
-                          "title": "MQTT",
-                          "items": [
-                            "accounts[].mqtt.enable",
-                            "accounts[].mqtt.debug",
-                            "accounts[].mqtt.host",
-                            "accounts[].mqtt.port",
-                            "accounts[].mqtt.clientId",
-                            "accounts[].mqtt.prefix",
-                            "accounts[].mqtt.auth",
-                            "accounts[].mqtt.user",
-                            {
-                              "key": "accounts[].mqtt.passwd",
-                              "type": "password"
-                            }
-                          ]
+                          "key": "accounts[].mqtt.passwd",
+                          "type": "password"
                         }
                       ]
                     }

package/homebridge-ui/public/index.html

@@ -1,5 +1,5 @@
-<div style="text-align: center;"></divstyle>
-  <img src="homebridge-melcloud-control.png" alt="Image" height="150" />
+<div>
+  <img src="homebridge-melcloud-control.png" style="text-align: center;" height="150" />
 </div>
 <div id="accounts">
 </div>
@@ -75,7 +75,7 @@
       button.setAttribute("id", `button${i}`);
       button.setAttribute("class", "btn btn-primary");
       button.innerText = pluginConfig[0].accounts[i].name;
-      document.getElementById("melCloudAccount").appendChild(button);
+      document.getElementById("accounts").appendChild(button);
 
       //get actuall value on account select
       document.getElementById(`button${i}`).addEventListener('click', async () => {
@@ -147,23 +147,15 @@
         const info = response.info ?? '';
         const status = response.status;
         const devices = response.data ?? [];
-        const newDevices = {
-          ata: [],
-          atw: [],
-          erv: []
-        };
-        let textAta = 'ATA: 0';
-        let textAtw = 'ATW: 0';
-        let textErv = 'ERV: 0';
+        const newDevices = [];
 
         switch (status) {
           case 0:
             //get device info fom devices
-            devices.forEach((device, index) => {
-              const deviceType = device.Type;
-              const deviceId = device.DeviceID;
-              const deviceName = device.DeviceName;
-              const deviceTypeText = ["Air Conditioner", "Heat Pump", "Unknown", "Energy Recovery Ventilation"][device.Type];
+            devices.forEach((deviceInfo, index) => {
+              const deviceType = deviceInfo.Type;
+              const deviceId = deviceInfo.DeviceID;
+              const deviceName = deviceInfo.DeviceName;
 
               //config account keys
               const accountKeys = Object.keys(pluginConfig[0].accounts[this.deviceIndex]);
@@ -173,7 +165,7 @@
                 const deviceAta = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceTypeText,
+                  type: deviceType,
                   displayMode: 0,
                   heatDryFanMode: 0,
                   coolDryFanMode: 0,
@@ -188,9 +180,7 @@
                 const ataDevices = ataDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ataDevices : pluginConfig[0].accounts[this.deviceIndex].ataDevices = [];
                 const ataDeviceIdExist = ataDevices.some(device => device.id === deviceId);
                 const pushTypeAta = ataDeviceIdExist ? false : ataDevices.push(deviceAta);
-                const pushNewDevice = ataDeviceIdExist ? false : newDevices.ata.push(device);
-                const devicesCount = newDevices.ata.length;
-                textAta = `ATA: ${devicesCount}`
+                const pushNewDevice = ataDeviceIdExist ? false : newDevices.push(deviceId);
               };
 
               //devices atw
@@ -198,7 +188,7 @@
                 const deviceAtw = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceTypeText,
+                  type: deviceType,
                   displayMode: 0,
                   temperatureSensor: false,
                   temperatureSensorFlow: false,
@@ -218,9 +208,7 @@
                 const atwDevices = atwDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].atwDevices : pluginConfig[0].accounts[this.deviceIndex].atwDevices = [];
                 const atwDeviceIdExist = atwDevices.some(device => device.id === deviceId);
                 const pushTypeatw = atwDeviceIdExist ? false : atwDevices.push(deviceAtw);
-                const pushNewDevice = atwDeviceIdExist ? false : newDevices.atw.push(device);
-                const devicesCount = newDevices.ata.length;
-                textAtw = `ATW: ${devicesCount}`
+                const pushNewDevice = atwDeviceIdExist ? false : newDevices.push(deviceId);
               };
 
               //devices erv
@@ -228,7 +216,7 @@
                 const deviceErv = {
                   name: deviceName,
                   id: deviceId,
-                  type: deviceTypeText,
+                  type: deviceType,
                   displayMode: 0,
                   temperatureSensor: false,
                   temperatureSensorOutdoor: false,
@@ -242,14 +230,12 @@
                 const ervDevices = ervDevicesExist ? pluginConfig[0].accounts[this.deviceIndex].ervDevices : pluginConfig[0].accounts[this.deviceIndex].ervDevices = [];
                 const ervDeviceIdExist = ervDevices.some(device => device.id === deviceId);
                 const pushTypeerv = ervDeviceIdExist ? false : ervDevices.push(deviceErv);
-                const pushNewDevice = ervDeviceIdExist ? false : newDevices.erv.push(device);
-                const devicesCount = newDevices.ata.length;
-                textErv = `ERV: ${devicesCount}`
+                const pushNewDevice = ervDeviceIdExist ? false : newDevices.push(deviceId);
               };
             });
 
-            const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
-            document.getElementById('info').innerHTML = `Found in MELCloud, ${textAta}, ${textAtw}, ${textErv}. ${newDevicesCount === 0 ? '' : 'Now You can start to configure it.'}`;
+            const devicesCount = newDevices.length;
+            document.getElementById('info').innerHTML = `Check devices complete, found ${devicesCount} ${devicesCount !== 1 ? 'new devices' : 'new device'}. ${devicesCount === 0 ? '' : 'Now You can start to configure it.'}`;
             document.getElementById('info').style.color = 'green';
 
             await homebridge.updatePluginConfig(pluginConfig);

package/homebridge-ui/server.js

@@ -38,8 +38,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
     } catch (error) {
       return data = {
         info: error,
-        status: 1,
-        data: data
+        status: 1
       };
     };
   };

package/package.json

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