homebridge-melcloud-control 4.0.0-beta.415 → 4.0.0-beta.417

package/index.js

@@ -89,7 +89,7 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.error, logLevel.debug, false)
+								const melCloud = new MelCloud(account, accountFile, buildingsFile, devicesFile, 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}`))

package/package.json

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

package/src/melcloud.js

@@ -9,35 +9,24 @@ import Functions from './functions.js';
 import { ApiUrls, ApiUrlsHome } from './constants.js';
 
 class MelCloud extends EventEmitter {
-    constructor(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logWarn, logError, logDebug, requestConfig) {
+    constructor(account, accountFile, buildingsFile, devicesFile, requestConfig) {
         super();
-        this.accountType = accountType;
-        this.user = user;
-        this.passwd = passwd;
-        this.language = language;
+        this.accountType = account.type;
+        this.user = account.user;
+        this.passwd = account.passwd;
+        this.language = account.language;
+        this.logWarn = account.log?.warn;
+        this.logError = account.log?.error;
+        this.logDebug = account.log?.debug;
         this.accountFile = accountFile;
         this.buildingsFile = buildingsFile;
         this.devicesFile = devicesFile;
-        this.logWarn = logWarn;
-        this.logError= logError;
-        this.logDebug = logDebug;
         this.requestConfig = requestConfig;
         this.devicesId = [];
         this.contextKey = '';
         this.functions = new Functions();
-
         this.tokens = null;
 
-        this.loginData = {
-            Email: user,
-            Password: passwd,
-            Language: language,
-            AppVersion: '1.34.12',
-            CaptchaChallenge: '',
-            CaptchaResponse: '',
-            Persist: true
-        };
-
         if (!requestConfig) {
             this.impulseGenerator = new ImpulseGenerator()
                 .on('connect', async () => {
@@ -155,7 +144,17 @@ class MelCloud extends EventEmitter {
                 timeout: 15000,
             });
 
-            const accountData = await axiosInstanceLogin(ApiUrls.ClientLogin, { data: this.loginData });
+            const loginData = {
+                Email: this.user,
+                Password: this.passwd,
+                Language: this.language,
+                AppVersion: '1.34.12',
+                CaptchaChallenge: '',
+                CaptchaResponse: '',
+                Persist: true
+            };
+
+            const accountData = await axiosInstanceLogin(ApiUrls.ClientLogin, { data: loginData });
             const account = accountData.data;
             const accountInfo = account.LoginData;
             const contextKey = accountInfo?.ContextKey;
@@ -307,6 +306,7 @@ class MelCloud extends EventEmitter {
                 passwd: this.passwd,
                 logWarn: this.logWarn,
                 logError: this.logError,
+                logDebug: this.logDebug,
             })
                 .on('success', message => this.emit('success', message))
                 .on('warn', warn => this.emit('warn', warn))