homebridge-melcloud-control 4.0.0-beta.411 → 4.0.0-beta.412

package/package.json

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

package/src/melcloud.js

@@ -62,20 +62,28 @@ class MelCloud extends EventEmitter {
     // MELCloud
     async checkMelcloudDevicesList(contextKey) {
         try {
-            const axiosInstanceGet = axios.create({
-                method: 'GET',
+            const axiosInstance = axios.create({
                 baseURL: ApiUrls.BaseURL,
                 timeout: 15000,
                 headers: { 'X-MitsContextKey': contextKey }
             });
 
-            if (this.logDebug) this.emit('debug', `Scanning for devices`);
-            const listDevicesData = await axiosInstanceGet(ApiUrls.ListDevices);
+            if (this.logDebug) this.emit('debug', `Scanning for devices...`);
+
+            const listDevicesData = await axiosInstance.get(ApiUrls.ListDevices);
+
+            if (!listDevicesData || !listDevicesData.data) {
+                this.emit('warn', `Invalid or empty response from MELCloud API`);
+                return null;
+            }
+
             const buildingsList = listDevicesData.data;
-            if (this.logDebug) this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
 
-            if (!buildingsList) {
-                if (this.logWarn) this.emit('warn', `No building found`);
+            if (this.logDebug)
+                this.emit('debug', `Buildings: ${JSON.stringify(buildingsList, null, 2)}`);
+
+            if (!Array.isArray(buildingsList) || buildingsList.length === 0) {
+                this.emit('warn', `No buildings found in MELCloud account`);
                 return null;
             }
 
@@ -83,42 +91,59 @@ class MelCloud extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
             const devices = [];
+
             for (const building of buildingsList) {
-                const buildingStructure = building.Structure;
-                const allDevices = [
-                    ...buildingStructure.Floors.flatMap(floor => [
-                        ...floor.Areas.flatMap(area => area.Devices),
-                        ...floor.Devices
-                    ]),
-                    ...buildingStructure.Areas.flatMap(area => area.Devices),
-                    ...buildingStructure.Devices
-                ];
+                if (!building.Structure) {
+                    this.emit(
+                        'warn',
+                        `Building missing structure: ${building.BuildingName || 'Unnamed'}`
+                    );
+                    continue;
+                }
 
-                // Zamiana DeviceID na string
+                const { Structure } = building;
+
+                const allDevices = [
+                    ...(Structure.Floors?.flatMap(floor => [
+                        ...(floor.Areas?.flatMap(area => area.Devices || []) || []),
+                        ...(floor.Devices || [])
+                    ]) || []),
+                    ...(Structure.Areas?.flatMap(area => area.Devices || []) || []),
+                    ...(Structure.Devices || [])
+                ].filter(d => d != null);
+
+                // Zamiana ID na string
                 allDevices.forEach(device => {
-                    if (device.DeviceID !== undefined && device.DeviceID !== null) {
-                        device.DeviceID = device.DeviceID.toString();
-                    }
+                    if (device.DeviceID != null) device.DeviceID = String(device.DeviceID);
                 });
 
+                if (this.logDebug) {
+                    const count = allDevices.length;
+                    this.emit(
+                        'debug',
+                        `Found ${count} devices in building: ${building.BuildingName || 'Unnamed'}`
+                    );
+                }
+
                 devices.push(...allDevices);
             }
 
-            const devicesCount = devices.length;
-            if (devicesCount === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found`);
+            if (devices.length === 0) {
+                this.emit('warn', `No devices found in any building`);
                 return null;
             }
 
             await this.functions.saveData(this.devicesFile, devices);
-            if (this.logDebug) this.emit('debug', `${devicesCount} devices saved`);
+            if (this.logDebug) this.emit('debug', `${devices.length} devices saved`);
 
             return devices;
         } catch (error) {
-            throw new Error(`Check devices list error: ${error.message}`);
+            const msg = error.response ? `HTTP ${error.response.status}: ${error.response.statusText}` : error.message;
+            throw new Error(`Check devices list error: ${msg}`);
         }
     }
 
+
     async connectToMelCloud() {
         if (this.logDebug) this.emit('debug', `Connecting to MELCloud`);
 
@@ -166,7 +191,7 @@ class MelCloud extends EventEmitter {
 
             return accountInfo
         } catch (error) {
-            throw new Error(`Connect to MELCloud error: ${error.message}`);
+            throw new Error(`Connect error: ${error.message}`);
         }
     }
 
@@ -270,7 +295,7 @@ class MelCloud extends EventEmitter {
 
             return devices;
         } catch (error) {
-            throw new Error(`Connect to MELCloud Home error: ${error.message}`);
+            throw new Error(`Check devices list error: ${error.message}`);
         }
     }
 
@@ -394,7 +419,6 @@ class MelCloud extends EventEmitter {
             if (!refresh) this.emit('success', `Connect to MELCloud Home Success`);
 
             return accountInfo;
-
         } catch (error) {
             // Handle Puppeteer system dependency errors
             if (error.message.includes('libnspr4.so') || error.message.includes('Failed to launch the browser process')) {
@@ -422,8 +446,7 @@ class MelCloud extends EventEmitter {
             }
 
             // Generic Puppeteer error
-            throw new Error(`MELCloud connection failed: ${error.message}`);
-
+            throw new Error(`Connect error: ${error.message}`);
         } finally {
             if (browser) {
                 try {
@@ -435,7 +458,6 @@ class MelCloud extends EventEmitter {
         }
     }
 
-
     async checkDevicesList(contextKey) {
         let devices = [];
         switch (this.accountType) {