homebridge-melcloud-control 4.0.0-beta.31 → 4.0.0-beta.310

package/homebridge-ui/public/index.html

@@ -76,19 +76,28 @@
           </select>
         </div>
 
+        <div class="mb-2">
+          <label for="accountType" class="form-label">Account Type</label>
+          <select id="accountType" name="accountType" class="form-control">
+            <option value="disabled">None/Disabled</option>
+            <option value="melcloud">MELCloud</option>
+            <option value="melcloudhome">MELCloud Home</option>
+          </select>
+        </div>
+
         <div class="text-center">
           <button id="logIn" type="button" class="btn btn-secondary">Connect to MELCloud</button>
           <button id="configButton" type="button" class="btn btn-secondary"><i class="fas fa-gear"></i></button>
         </div>
       </form>
+      <div id="accountButton" class="d-flex flex-wrap justify-content-center gap-1 mt-3"></div>
     </div>
-
-    <div id="accountButton" class="mt-2"></div>
   </div>
 
   <script>
     (async () => {
       const pluginConfig = await homebridge.getPluginConfig();
+
       if (!pluginConfig.length) {
         pluginConfig.push({});
         await homebridge.updatePluginConfig(pluginConfig);
@@ -96,52 +105,79 @@
         return;
       }
 
-      this.deviceIndex = 0;
-
-      const accountsCount = pluginConfig[0].accounts.length;
-      for (let i = 0; i < accountsCount; i++) {
+      this.accountIndex = 0;
+      const accounts = pluginConfig[0].accounts || [];
+      const accountsCount = accounts.length;
+
+      const container = document.getElementById("accountButton");
+      container.style.display = 'flex';
+      container.style.flexWrap = 'wrap';
+      container.style.justifyContent = 'center';
+      container.style.gap = '0.25rem';
+      container.style.alignItems = 'center';
+
+      const formElements = {
+        name: document.getElementById('name'),
+        user: document.getElementById('user'),
+        passwd: document.getElementById('passwd'),
+        language: document.getElementById('language'),
+        accountType: document.getElementById('accountType'),
+        logIn: document.getElementById('logIn'),
+        accountName: document.getElementById('accountName')
+      };
+
+      // Tworzenie przycisków
+      accounts.forEach((account, i) => {
         const button = document.createElement("button");
         button.type = "button";
         button.id = `button${i}`;
         button.className = "btn btn-primary";
         button.style.textTransform = 'none';
-        button.innerText = pluginConfig[0].accounts[i].name;
-        document.getElementById("accountButton").appendChild(button);
+        button.innerText = account.name || `Account ${i + 1}`;
+        container.appendChild(button);
 
         button.addEventListener('click', async () => {
-          for (let j = 0; j < accountsCount; j++) {
-            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-secondary' : 'btn btn-primary');
-          }
+          this.accountIndex = i;
+
+          // Zmieniamy klasę wszystkich przycisków
+          accounts.forEach((_, j) => {
+            document.getElementById(`button${j}`).className = (j === i ? 'btn btn-primary' : 'btn btn-secondary');
+          });
 
-          const acc = pluginConfig[0].accounts[i];
-          document.getElementById('accountName').innerText = acc.name || '';
-          document.getElementById('name').value = acc.name || '';
-          document.getElementById('user').value = acc.user || '';
-          document.getElementById('passwd').value = acc.passwd || '';
-          document.getElementById('language').value = acc.language || '';
-          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
-          this.deviceIndex = i;
+          // Ustawiamy formularz
+          formElements.accountName.innerText = account.name || '';
+          formElements.name.value = account.name || '';
+          formElements.user.value = account.user || '';
+          formElements.passwd.value = account.passwd || '';
+          formElements.language.value = account.language || '0';
+          formElements.accountType.value = account.type || 'disabled';
+          formElements.logIn.disabled = !(account.name && account.user && account.passwd && account.language && account.type);
         });
+      });
 
-        if (i === accountsCount - 1) document.getElementById(`button0`).click();
-      }
-
-      document.getElementById('melCloudAccount').style.display = 'block';
+      // Klikamy pierwszy przycisk po zakończeniu pętli
+      if (accountsCount > 0) document.getElementById('button0').click();
 
+      // Jeden listener input dla całego formularza
       document.getElementById('configForm').addEventListener('input', async () => {
-        const acc = pluginConfig[0].accounts[this.deviceIndex];
-        acc.name = document.querySelector('#name').value;
-        acc.user = document.querySelector('#user').value;
-        acc.passwd = document.querySelector('#passwd').value;
-        acc.language = document.querySelector('#language').value;
+        const account = accounts[this.accountIndex];
+        if (!account) return;
+
+        account.name = formElements.name.value;
+        account.user = formElements.user.value;
+        account.passwd = formElements.passwd.value;
+        account.language = formElements.language.value;
+        account.type = formElements.accountType.value;
 
-        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
+        formElements.logIn.disabled = !(account.name && account.user && account.passwd && account.language && account.type);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
       });
 
-      // --- Config Button Toggle ---
+      document.getElementById('melCloudAccount').style.display = 'block';
+
+      // Config Button Toggle
       const configButton = document.getElementById('configButton');
       let configButtonState = false;
       configButton.addEventListener('click', () => {
@@ -163,13 +199,14 @@
         }
       });
 
-      // --- Device Handling & Login Logic ---
+      // Device Handling & Login Logic
       function removeStaleDevices(configDevices, melcloudDevices) {
         const melcloudIds = melcloudDevices.map(d => d.DeviceID);
         const removedDevices = [];
+
         for (let i = configDevices.length - 1; i >= 0; i--) {
           const device = configDevices[i];
-          if (device.id !== 0 && !melcloudIds.includes(device.id)) {
+          if (device.id !== "0" && !melcloudIds.includes(device.id)) {
             removedDevices.push(device);
             configDevices.splice(i, 1);
           }
@@ -186,13 +223,14 @@
       }
 
       document.getElementById('logIn').addEventListener('click', async () => {
-        homebridge.showSpinner();
         document.getElementById(`logIn`).className = "btn btn-primary";
+
         updateInfo('info', 'Connecting...', 'yellow');
+        homebridge.showSpinner();
 
         try {
-          const acc = pluginConfig[0].accounts[this.deviceIndex];
-          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
+          const acc = pluginConfig[0].accounts[this.accountIndex];
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language, accountType: acc.type };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
           // Initialize devices arrays
@@ -213,24 +251,36 @@
           const removedAtw = removeStaleDevices(acc.atwDevices, devicesByType.atw);
           const removedErv = removeStaleDevices(acc.ervDevices, devicesByType.erv);
 
-          // Function to handle device & presets
           const handleDevices = (devicesInCloud, devicesInConfig, typeString, newArr, newPresets) => {
             devicesInCloud.forEach(device => {
               const { DeviceID: id, Type: type, DeviceName: name, Presets: presets = [] } = device;
-              const devObj = { id, type, typeString, name, displayMode: 1, presets: [], buttonsSensors: [] };
+              const devObj = structuredClone({
+                id,
+                type,
+                typeString,
+                name,
+                displayType: 0,
+                presets: [],
+                buttonsSensors: []
+              });
+
               if (!devicesInConfig.some(d => d.id === id)) {
                 devicesInConfig.push(devObj);
-                newArr.push(devObj);
+                newArr.push(structuredClone(devObj));
               }
-              presets.forEach(p => {
-                p.id = p.ID;
-                p.name = p.NumberDescription;
-                p.displayType = 0;
-                p.namePrefix = false;
+
+              presets.forEach(preset => {
+                const p = structuredClone({
+                  id: preset.ID,
+                  name: preset.NumberDescription,
+                  displayType: 0,
+                  namePrefix: false
+                });
+
                 const devConfig = devicesInConfig.find(d => d.id === id);
-                if (devConfig && !devConfig.presets.some(x => x.id === p.ID)) {
+                if (devConfig && !devConfig.presets.some(x => x.id === p.id)) {
                   devConfig.presets.push(p);
-                  newPresets.push(p);
+                  newPresets.push(structuredClone(p));
                 }
               });
             });
@@ -238,9 +288,8 @@
 
           handleDevices(devicesByType.ata, acc.ataDevices, "Air Conditioner", newDevices.ata, newDevices.ataPresets);
           handleDevices(devicesByType.atw, acc.atwDevices, "Heat Pump", newDevices.atw, newDevices.atwPresets);
-          handleDevices(devicesByType.erv, acc.ervDevices, "Energy Recovery ventiltion", newDevices.erv, newDevices.ervPresets);
+          handleDevices(devicesByType.erv, acc.ervDevices, "Energy Recovery Ventilation", newDevices.erv, newDevices.ervPresets);
 
-          // Display summary
           const newDevicesCount = newDevices.ata.length + newDevices.atw.length + newDevices.erv.length;
           const newPresetsCount = newDevices.ataPresets.length + newDevices.atwPresets.length + newDevices.ervPresets.length;
           const removedDevicesCount = removedAta.length + removedAtw.length + removedErv.length;
@@ -248,9 +297,12 @@
           if (!newDevicesCount && !newPresetsCount && !removedDevicesCount) {
             updateInfo('info', 'No changes detected.', 'white');
           } else {
-            if (newDevicesCount) updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
-            if (newPresetsCount) updateInfo('info1', `Found new presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
-            if (removedDevicesCount) updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
+            if (newDevicesCount)
+              updateInfo('info', `Found new devices: ATA: ${newDevices.ata.length}, ATW: ${newDevices.atw.length}, ERV: ${newDevices.erv.length}.`, 'green');
+            if (newPresetsCount)
+              updateInfo('info1', `Found new presets: ATA: ${newDevices.ataPresets.length}, ATW: ${newDevices.atwPresets.length}, ERV: ${newDevices.ervPresets.length}.`, 'green');
+            if (removedDevicesCount)
+              updateInfo('info2', `Removed devices: ATA: ${removedAta.length}, ATW: ${removedAtw.length}, ERV: ${removedErv.length}.`, 'orange');
           }
 
           await homebridge.updatePluginConfig(pluginConfig);
@@ -259,7 +311,7 @@
 
         } catch (error) {
           updateInfo('info', 'Check Your credentials data and try again.', 'yellow');
-          updateInfo('info1', `Error: ${error}`, 'red');
+          updateInfo('info1', `Error: ${JSON.stringify(error)}`, 'red');
           document.getElementById('logIn').className = "btn btn-secondary";
         } finally {
           homebridge.hideSpinner();

package/homebridge-ui/server.js

@@ -17,14 +17,15 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const user = payload.user;
     const passwd = payload.passwd;
     const language = payload.language;
+    const accountType = payload.accountType;
     const accountFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
     const devicesFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Devices`;
-    const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, false, true);
+    const melCloud = new MelCloud(accountType, 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

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { mkdirSync } from 'fs';
+import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import MelCloud from './src/melcloud.js';
 import DeviceAta from './src/deviceata.js';
 import DeviceAtw from './src/deviceatw.js';
@@ -30,6 +30,9 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
+				const accountType = account.type || 'disabled';
+				if (accountType === 'disabled') continue;
+
 				const accountName = account.name;
 				const user = account.user;
 				const passwd = account.passwd;
@@ -76,8 +79,6 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
-				const cookiesFile = `${prefDir}/${accountName}_Cookies`;
-
 
 				//set account refresh interval
 				const refreshInterval = (account.refreshInterval ?? 120) * 1000
@@ -88,7 +89,7 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
 									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
 									.on('info', (msg) => logLevel.info && log.info(`${accountName}, ${msg}`))
 									.on('debug', (msg) => logLevel.debug && log.info(`${accountName}, debug: ${msg}`))
@@ -96,20 +97,18 @@ class MelCloudPlatform {
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
 								//connect
-								let response;
+								let accountInfo;
 								try {
-									response = await melCloud.connect('home');
-									return;
+									accountInfo = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
-								const accountInfo = response.accountInfo ?? false;
-								const contextKey = response.contextKey ?? false;
-								const useFahrenheit = response.useFahrenheit ?? false;
+								const contextKey = accountInfo.ContextKey;
+								const useFahrenheit = accountInfo.UseFahrenheit;
 
-								if (contextKey === false) {
+								if (!contextKey) {
 									return;
 								}
 
@@ -132,10 +131,9 @@ class MelCloudPlatform {
 
 								for (const device of devices) {
 									//chack device from config exist on melcloud
-									const deviceId = device.id;
-									const displayMode = device.displayMode > 0;
-									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === deviceId);
-									if (!deviceExistInMelCloud || !displayMode) {
+									const displayType = device.displayType > 0;
+									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === device.id);
+									if (!deviceExistInMelCloud || !displayType) {
 										continue;
 									}
 
@@ -143,19 +141,39 @@ class MelCloudPlatform {
 									const deviceType = device.type;
 									const deviceTypeText = device.typeString;
 									const deviceRefreshInterval = (device.refreshInterval ?? 5) * 1000;
+									const defaultTempsFile = `${prefDir}/${accountName}_${device.id}_Temps`;
+
+									if (accountType === 'melcloudhome') {
+										try {
+											const temps = {
+												defaultCoolingSetTemperature: 24,
+												defaultHeatingSetTemperature: 20
+											};
+
+											if (!existsSync(defaultTempsFile)) {
+												writeFileSync(defaultTempsFile, JSON.stringify(temps, null, 2));
+												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}`);
+											}
+											continue;
+										}
+									}
 
 									let configuredDevice;
 									switch (deviceType) {
 										case 0: //ATA
-											configuredDevice = new DeviceAta(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceAta(api, account, device, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										case 1: //ATW
-											configuredDevice = new DeviceAtw(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceAtw(api, account, device, contextKey, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										case 2:
 											break;
 										case 3: //ERV
-											configuredDevice = new DeviceErv(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceErv(api, account, device, contextKey, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										default:
 											if (logLevel.warn) log.warn(`${accountName}, ${deviceTypeText}, ${deviceName}, unknown device: ${deviceType}.`);
@@ -182,8 +200,9 @@ class MelCloudPlatform {
 										api.publishExternalAccessories(PluginName, [accessory]);
 										if (logLevel.success) log.success(`${accountName}, ${deviceTypeText}, ${deviceName}, Published as external accessory.`);
 
-										//start impulse generators
-										await melCloud.impulseGenerator.state(true, [{ name: 'checkDevicesList', sampling: refreshInterval }]);
+										//start impulse generators\
+										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 150000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
+										await melCloud.impulseGenerator.state(true, timmers);
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 
 										//stop impulse generator

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.31",
+  "version": "4.0.0-beta.310",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -39,7 +39,10 @@
     "async-mqtt": "^2.6.3",
     "axios": "^1.12.2",
     "express": "^5.1.0",
-    "puppeteer": "^24.26.0"
+    "puppeteer": "^24.26.1",
+    "axios-cookiejar-support": "^6.0.4",
+    "tough-cookie": "^6.0.0",
+    "cheerio": "^1.1.2"
   },
   "keywords": [
     "homebridge",

package/src/constants.js

@@ -18,8 +18,7 @@ export const ApiUrls = {
 };
 
 export const ApiUrlsHome = {
-    LoginUrl:"https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login?client_id=3g4d5l5kivuqi7oia68gib7uso&redirect_uri=https%3A%2F%2Fauth.melcloudhome.com%2Fsignin-oidc-meu&response_type=code&scope=openid%20profile&response_mode=form_post",
-    BaseURL: 'https://melcloudhome.com',
+    BaseURL: "https://melcloudhome.com",
     GetUserContext: "/api/user/context",
     SetAta: "/api/ataunit/deviceid",
     SetAtw: "/api/atwunit/deviceid",
@@ -36,25 +35,19 @@ export const DeviceType = [
 export const TemperatureDisplayUnits = ["°C", "°F"];
 
 export const AirConditioner = {
-    System: ["AIR CONDITIONER OFF", "AIR CONDITIONER ON", "AIR CONDITIONER OFFLINE"],
-    DriveMode: [
-        "0", "HEAT", "DRY", "COOL", "4", "5", "6", "FAN", "AUTO",
-        "ISEE HEAT", "ISEE DRY", "ISEE COOL"
-    ],
-    VerticalVane: ["AUTO", "1", "2", "3", "4", "5", "6", "SWING"],
-    HorizontalVane: [
-        "AUTO", "LL", "L", "C", "R", "RR", "6", "7",
-        "SPLIT", "9", "10", "11", "SWING"
-    ],
-    AirDirection: ["AUTO", "SWING"],
-    FanSpeed: [
-        "AUTO", "1", "QUIET", "WEAK", "4",
-        "STRONG", "VERY STRONG", "OFF"
-    ],
-    CurrentOperationModeHeatherCooler: [
-        "INACTIVE", "IDLE", "HEATING", "COOLING"
-    ],
-    CurrentOperationModeThermostat: ["INACTIVE", "HEATING", "COOLING"],
+    SystemMapEnumToString: { 0: "Air Conditioner Off", 1: "ir Conditioner On", 2: "ir Conditioner Offline" },
+    AirDirectionMapEnumToString: { 0: "Auto", 1: "Swing" },
+    CurrentOperationModeHeatherCoolerMapEnumToString: { 0: "Inactive", 1: "Idle", 2: "Heating", 3: "Cooling" },
+    CurrentOperationModeThermostatMapEnumToString: { 0: "Inactive", 1: "Heating", 2: "Cooling" },
+    OperationModeMapStringToEnum: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 4, "5": 5, "6": 6, "Fan": 7, "Automatic": 8, "Isee Heat": 9, "Isee Dry": 10, "Isee Cool": 11 },
+    OperationModeMapEnumToString: { 0: "0", 1: "Heat", 2: "Dry", 3: "Cool", 4: "4", 5: "5", 6: "6", 7: "Fan", 8: "Automatic", 9: "Isee Heat", 10: "Isee Dry", 11: "Isee Cool" },
+    FanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5 },
+    FanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    FanSpeedCurrentMapEnumToString: { 0: "Quiet", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    VaneVerticalDirectionMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "Six": 6, "Swing": 7 },
+    VaneVerticalDirectionMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five", 6: "Six", 7: "Swing" },
+    VaneHorizontalDirectionMapStringToEnum: { "Auto": 0, "Left": 1, "LeftCentre": 2, "Centre": 3, "RightCentre": 4, "Right": 5, "Six": 6, "Seven": 7, "Split": 8, "Nine": 9, "Ten": 10, "Eleven": 11, "Swing": 12 },
+    VaneHorizontalDirectionMapEnumToString: { 0: "Auto", 1: "Left", 2: "LeftCentre", 3: "Centre", 4: "RightCentre", 5: "Right", 6: "Six", 7: "Seven", 8: "Split", 9: "Nine", 10: "Ten", 11: "Eleven", 12: "Swing" },
     EffectiveFlags: {
         Power: 1,
         OperationMode: 2,
@@ -74,7 +67,7 @@ export const AirConditioner = {
         Presets: 287,
         HolidayMode: 131072,
         All: 281483566710825
-    }
+    },
 };
 
 export const HeatPump = {