homebridge-melcloud-control 4.0.0-beta.33 → 4.0.0-beta.35

package/index.js

@@ -90,7 +90,7 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(displayType, 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}`))
@@ -100,24 +100,24 @@ class MelCloudPlatform {
 								//connect
 								let response;
 								try {
-									response = await melCloud.connect(displayType);
+									response = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
 								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;
 								}
 
 								//check devices list
 								let devicesInMelcloud;
 								try {
-									devicesInMelcloud = await melCloud.checkDevicesList(displayType, contextKey);
+									devicesInMelcloud = await melCloud.checkDevicesList(contextKey);
 									return
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);

package/package.json

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

package/src/melcloud.js

@@ -7,8 +7,9 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 class MelCloud extends EventEmitter {
-    constructor(user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
+    constructor(displayType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logDebug, requestConfig) {
         super();
+        this.displayType = displayType;
         this.user = user;
         this.passwd = passwd;
         this.language = language;
@@ -162,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();
@@ -176,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,9 +275,14 @@ class MelCloud extends EventEmitter {
                 return null;
             }
 
+            const accountInfo = {};
+            const contextKey = { c1, c2 };
+            const useFahrenheit = false;
+            this.contextKey = contextKey;
+
             this.emit('success', `Connect to MELCloud Home Success`);
 
-            return { c1, c2 };
+            return { accountInfo, contextKey, useFahrenheit };
         } catch (error) {
             throw new Error(`Connect to MELCloud Home error: ${error.message}`);
         } finally {
@@ -286,9 +290,9 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async connect(type) {
+    async connect() {
         let response = null;
-        switch (type) {
+        switch (this.displayType) {
             case 1:
                 response = await this.connectToMelCloud();
                 return response
@@ -300,9 +304,9 @@ class MelCloud extends EventEmitter {
         }
     }
 
-    async checkDevicesList(type, key) {
+    async checkDevicesList(key) {
         let devices = null;
-        switch (type) {
+        switch (this.displayType) {
             case 1:
                 devices = await this.checkMelcloudDevicesList(key);
                 return devices