homebridge-melcloud-control 4.0.0-beta.34 → 4.0.0-beta.36

package/homebridge-ui/public/index.html

@@ -76,6 +76,15 @@
           </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="0">None/Disabled</option>
+            <option value="1">MELCloud</option>
+            <option value="2">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>
@@ -119,7 +128,8 @@
           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);
+          document.getElementById('accountType').value = acc.displaytype || '';
+          document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language && acc.displaytype);
           this.deviceIndex = i;
         });
 
@@ -134,8 +144,9 @@
         acc.user = document.querySelector('#user').value;
         acc.passwd = document.querySelector('#passwd').value;
         acc.language = document.querySelector('#language').value;
+        acc.displaytype = document.querySelector('#accountType').value;
 
-        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.language);
+        document.getElementById('logIn').disabled = !(acc.name && acc.user && acc.passwd && acc.languaged && acc.displaytype);
 
         await homebridge.updatePluginConfig(pluginConfig);
         await homebridge.savePluginConfig(pluginConfig);
@@ -192,7 +203,7 @@
 
         try {
           const acc = pluginConfig[0].accounts[this.deviceIndex];
-          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language };
+          const payload = { accountName: acc.name, user: acc.user, passwd: acc.passwd, language: acc.language, accountType: acc.displaytype };
           const devicesInMelCloud = await homebridge.request('/connect', payload);
 
           // Initialize devices arrays

package/homebridge-ui/server.js

@@ -17,10 +17,11 @@ 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();

package/index.js

@@ -107,10 +107,10 @@ class MelCloudPlatform {
 								}
 
 								const accountInfo = response.accountInfo ?? false;
-								const contextKey = displayType === 1 ? response.contextKey : response;
+								const contextKey = response.contextKey;
 								const useFahrenheit = response.useFahrenheit ?? false;
 
-								if (contextKey === false) {
+								if (!contextKey) {
 									return;
 								}
 

package/package.json

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

package/src/melcloud.js

@@ -163,8 +163,6 @@ class MelCloud extends EventEmitter {
     }
 
     async checkMelcloudHomeDevicesList(cookies) {
-        if (this.logDebug) this.emit('debug', `Connecting to MELCloud Home`);
-
         try {
             const c1 = cookies.c1.trim();
             const c2 = cookies.c2.trim();
@@ -177,7 +175,7 @@ class MelCloud extends EventEmitter {
 
             const axiosInstance = axios.create({
                 baseURL: ApiUrlsHome.BaseURL,
-                timeout: 10000,
+                timeout: 20000,
                 httpsAgent: new Agent({
                     keepAlive: false,
                     rejectUnauthorized: false
@@ -276,12 +274,15 @@ class MelCloud extends EventEmitter {
                 if (this.logWarn) this.emit('warn', `Cookies C1/C2 missing`);
                 return null;
             }
-            const cookies = { c1, c2 };
-            this.contextKey = cookies;
+
+            const accountInfo = {};
+            const contextKey = { c1, c2 };
+            const useFahrenheit = false;
+            this.contextKey = contextKey;
 
             this.emit('success', `Connect to MELCloud Home Success`);
 
-            return cookies;
+            return { accountInfo, contextKey, useFahrenheit };
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         } finally {