homebridge-melcloud-control 4.0.0-beta.56 → 4.0.0-beta.58

package/package.json

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

package/src/melcloud.js

@@ -194,7 +194,7 @@ class MelCloud extends EventEmitter {
             await this.functions.saveData(this.buildingsFile, buildingsList);
             if (this.logDebug) this.emit('debug', `Buildings list saved`);
 
-            const allDevices = buildingsList.flatMap(building => {
+            const devices = buildingsList.flatMap(building => {
                 const capitalizeKeys = obj =>
                     Object.fromEntries(
                         Object.entries(obj).map(([key, value]) => [
@@ -203,63 +203,47 @@ class MelCloud extends EventEmitter {
                         ])
                     );
 
-                return [
-                    ...(building.airToAirUnits || []).map(device => ({ ...capitalizeKeys(device), Type: 0 })),
-                    ...(building.airToWaterUnits || []).map(device => ({ ...capitalizeKeys(device), Type: 1 })),
-                    ...(building.airToVentilationUnits || []).map(device => ({ ...capitalizeKeys(device), Type: 3 }))
-                ];
-            });
-
-            const devicesCount = allDevices.length;
-            if (devicesCount === 0) {
-                if (this.logWarn) this.emit('warn', `No devices found`);
-                return null;
-            }
-
-            const devices = allDevices.map(device => {
-                const settingsArray = device.Settings || device.settings || [];
+                const createDevice = (device, type) => {
+                    const settingsArray = device.Settings || [];
 
-                // Konwersja tablicy [{ name, value }] → { Name: Value } z poprawnym typem
-                const settingsObject = Object.fromEntries(
-                    settingsArray.map(({ name, value }) => {
-                        let parsedValue = value;
+                    const settingsObject = Object.fromEntries(
+                        settingsArray.map(({ name, value }) => {
+                            let parsedValue = value;
+                            if (value === "True") parsedValue = true;
+                            else if (value === "False") parsedValue = false;
+                            else if (!isNaN(value) && value !== "") parsedValue = Number(value);
 
-                        if (value === "True") parsedValue = true;
-                        else if (value === "False") parsedValue = false;
-                        else if (!isNaN(value) && value !== "") parsedValue = Number(value);
-
-                        const key = name.charAt(0).toUpperCase() + name.slice(1);
-                        return [key, parsedValue];
-                    })
-                );
+                            // W tym miejscu nie musimy już kapitalizować, bo w allDevices klucze są z dużej litery
+                            return [name, parsedValue];
+                        })
+                    );
 
-                // Scal Capabilities + Settings w Device + dodaj DeviceType
-                const deviceObject = {
-                    ...Object.fromEntries(
-                        Object.entries(device.Capabilities || {}).map(([key, value]) => [
-                            key.charAt(0).toUpperCase() + key.slice(1),
-                            value
-                        ])
-                    ),
-                    ...settingsObject,
-                    DeviceType: device.Type
+                    // Device = Capabilities + Settings + DeviceType
+                    const deviceObject = {
+                        ...device.Capabilities,  // już kapitalizowane w allDevices
+                        ...settingsObject,
+                        DeviceType: type
+                    };
+
+                    const { Settings, settings, Capabilities, Id, GivenDisplayName, ...rest } = device;
+
+                    return {
+                        ...rest,
+                        DeviceID: Id,
+                        DeviceName: GivenDisplayName,
+                        Device: deviceObject
+                    };
                 };
 
-                // Usuń stare pola Settings i Capabilities
-                const { Settings, settings, Capabilities, Id, ...rest } = device;
-
-                return {
-                    ...rest,
-                    DeviceID: Id,              // <-- zmiana na DeviceID
-                    DeviceName: device.GivenDisplayName,
-                    Device: deviceObject
-                };
+                return [
+                    ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
+                    ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
+                    ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
+                ];
             });
 
-
-
             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) {
@@ -351,7 +335,7 @@ class MelCloud extends EventEmitter {
                 return devices
             case "melcloudhome":
                 devices = await this.checkMelcloudHomeDevicesList(contextKey);
-                return devices
+                return devices;
             default:
                 return devices;
         }