homebridge-melcloud-control 4.0.0-beta.514 → 4.0.0-beta.516

package/index.js

@@ -112,14 +112,17 @@ class MelCloudPlatform {
 								const useFahrenheit = accountInfo.UseFahrenheit;
 
 								//check devices list
-								let devicesInMelcloud;
+								let devicesList;
 								try {
-									devicesInMelcloud = await melCloud.checkDevicesList();
+									devicesList = await melCloud.checkDevicesList();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Check devices list error: ${error.message ?? error}`);
 									return;
 								}
-								if (!devicesInMelcloud || !Array.isArray(devicesInMelcloud)) return;
+								if (!devicesList.State) {
+									if (logLevel.warn) log.warn(`${accountName}, ${devicesList.Info}`);
+									return;
+								}
 
 								//configured devices
 								const ataDevices = account.ataDevices ?? [];
@@ -131,7 +134,7 @@ class MelCloudPlatform {
 								for (const device of devices) {
 									//chack device from config exist on melcloud
 									const displayType = device.displayType > 0;
-									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === device.id);
+									const deviceExistInMelCloud = devicesList.Devices.some(dev => dev.DeviceID === device.id);
 									if (!deviceExistInMelCloud || !displayType) {
 										continue;
 									}

package/package.json

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

package/src/melcloud.js

@@ -63,6 +63,7 @@ class MelCloud extends EventEmitter {
     // MELCloud
     async checkMelcloudDevicesList() {
         try {
+            const devicesList = { State: false, Info: null, Devices: [] }
             const axiosInstance = axios.create({
                 method: 'GET',
                 baseURL: ApiUrls.BaseURL,
@@ -92,8 +93,6 @@ class MelCloud extends EventEmitter {
             await this.functions.saveData(this.buildingsFile, buildingsList);
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
-            const devices = [];
-
             for (const building of buildingsList) {
                 if (!building.Structure) {
                     this.emit('warn', `Building missing structure: ${building.BuildingName || 'Unnamed'}`);
@@ -121,18 +120,22 @@ class MelCloud extends EventEmitter {
                     this.emit('debug', `Found ${count} devices in building: ${building.Name || 'Unnamed'}`);
                 }
 
-                devices.push(...allDevices);
+                devicesList.Devices.push(...allDevices);
             }
 
-            if (devices.length === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found in any building`);
-                return null;
+            const devicesCount = devicesList.Devices.length;
+            if (devicesCount === 0) {
+                devicesList.State = false;
+                devicesList.Info = 'No devices found'
+                return devicesList;
             }
 
-            await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devices.length} devices saved`);
+            await this.functions.saveData(this.devicesFile, devicesList.Devices);
+            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
 
-            return devices;
+            devicesList.State = true;
+            devicesList.Info = `Found ${devicesCount} devices`;
+            return devicesList;
         } catch (error) {
             const msg = error.response ? `HTTP ${error.response.status}: ${error.response.statusText}` : error.message;
             throw new Error(`Check devices list error: ${msg}`);
@@ -200,6 +203,7 @@ class MelCloud extends EventEmitter {
     // MELCloud Home
     async checkMelcloudHomeDevicesList() {
         try {
+            const devicesList = { State: false, Info: null, Devices: [] }
             const axiosInstance = axios.create({
                 method: 'GET',
                 baseURL: ApiUrlsHome.BaseURL,
@@ -225,8 +229,9 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
             if (!buildingsList) {
-                if (this.logWarn) this.emit('warn', `No building found`);
-                return null;
+                devicesList.State = false;
+                devicesList.Info = 'No building found'
+                return devicesList;
             }
 
             await this.functions.saveData(this.buildingsFile, buildingsList);
@@ -288,14 +293,18 @@ class MelCloud extends EventEmitter {
 
             const devicesCount = devices.length;
             if (devicesCount === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found`);
-                return null;
+                devicesList.State = false;
+                devicesList.Info = 'No devices found'
+                return devicesList;
             }
 
             await this.functions.saveData(this.devicesFile, devices);
             if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
 
-            return devices;
+            devicesList.State = true;
+            devicesList.Info = `Found ${devicesCount} devices`;
+            devicesList.Devices = devices;
+            return devicesList;
         } catch (error) {
             throw new Error(`Check devices list error: ${error.message}`);
         }