homebridge-melcloud-control 4.2.3-beta.16 → 4.2.3-beta.18

package/package.json

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

package/src/constants.js

@@ -19,6 +19,7 @@ export const ApiUrls = {
 
 export const ApiUrlsHome = {
     BaseURL: "https://melcloudhome.com",
+    Dashboard: "https://melcloudhome.com/dashboard",
     GetUserContext: "/api/user/context",
     SetAta: "/api/ataunit/deviceid",
     SetAtw: "/api/atwunit/deviceid",
@@ -165,30 +166,30 @@ export const AccessLevel = {
 };
 
 export const LanguageLocaleMap = {
-    "0": "en-US,en",
-    "1": "bg-BG,bg",
-    "2": "cs-CZ,cz",
-    "3": "da-DK,da",
-    "4": "de-DE,de",
-    "5": "et-EE,et",
-    "6": "es-ES,es",
-    "7": "fr-FR,fr",
-    "8": "hy-AM,hy",
-    "9": "lv-LV,lv",
-    "10": "lt-LT,lt",
-    "11": "hu-HU,hu",
-    "12": "nl-NL,nl",
-    "13": "no-NO,no",
-    "14": "pl-PL,pl",
-    "15": "pt-PT,pt",
-    "16": "ru-RU,ru",
-    "17": "fi-FI,fi",
-    "18": "sv-SE,sv",
-    "19": "it-IT,it",
-    "20": "uk-UA,uk",
-    "21": "tr-TR,tr",
-    "22": "el-GR,el",
-    "23": "hr-HR,hr",
-    "24": "ro-RO,ro",
-    "25": "sl-SI,sl"
+    "0": "en-US,en;q=0.9",
+    "1": "bg-BG,bg;q=0.9",
+    "2": "cs-CZ,cs;q=0.9",
+    "3": "da-DK,da;q=0.9",
+    "4": "de-DE,de;q=0.9",
+    "5": "et-EE,et;q=0.9",
+    "6": "es-ES,es;q=0.9",
+    "7": "fr-FR,fr;q=0.9",
+    "8": "hy-AM,hy;q=0.9",
+    "9": "lv-LV,lv;q=0.9",
+    "10": "lt-LT,lt;q=0.9",
+    "11": "hu-HU,hu;q=0.9",
+    "12": "nl-NL,nl;q=0.9",
+    "13": "no-NO,no;q=0.9",
+    "14": "pl-PL,pl;q=0.9",
+    "15": "pt-PT,pt;q=0.9",
+    "16": "ru-RU,ru;q=0.9",
+    "17": "fi-FI,fi;q=0.9",
+    "18": "sv-SE,sv;q=0.9",
+    "19": "it-IT,it;q=0.9",
+    "20": "uk-UA,uk;q=0.9",
+    "21": "tr-TR,tr;q=0.9",
+    "22": "el-GR,el;q=0.9",
+    "23": "hr-HR,hr;q=0.9",
+    "24": "ro-RO,ro;q=0.9",
+    "25": "sl-SI,sl;q=0.9"
 };

package/src/deviceata.js

@@ -1209,7 +1209,7 @@ class DeviceAta extends EventEmitter {
         try {
             //melcloud device
             this.melCloudAta = new MelCloudAta(this.account, this.device, this.devicesFile, this.defaultTempsFile)
-                .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
+                .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);
                         this.emit('devInfo', `Account: ${this.accountName}`);
@@ -1217,13 +1217,13 @@ class DeviceAta extends EventEmitter {
                         if (modelOutdoor) this.emit('devInfo', `Outdoor: ${modelOutdoor}`);
                         if (serialNumber) this.emit('devInfo', `Serial: ${serialNumber}`);
                         if (firmwareAppVersion) this.emit('devInfo', `Firmware: ${firmwareAppVersion}`);
-                        this.emit('devInfo', `Manufacturer: ${manufacturer}`);
+                        this.emit('devInfo', `Manufacturer: Mitsubishi`);
                         this.emit('devInfo', '----------------------------------');
                         this.displayDeviceInfo = false;
                     }
 
                     //accessory info
-                    this.manufacturer = manufacturer;
+                    this.manufacturer = 'Mitsubishi';
                     this.model = modelIndoor ? modelIndoor : modelOutdoor ? modelOutdoor : `${this.deviceTypeText}`;
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();

package/src/deviceatw.js

@@ -1476,7 +1476,7 @@ class DeviceAtw extends EventEmitter {
         try {
             //melcloud device
             this.melCloudAtw = new MelCloudAtw(this.account, this.device, this.devicesFile, this.defaultTempsFile)
-                .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, supportsHotWaterTank, supportsZone2) => {
+                .on('deviceInfo', ( modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion, supportsHotWaterTank, supportsZone2) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);
                         this.emit('devInfo', `Account: ${this.accountName}`);
@@ -1484,7 +1484,7 @@ class DeviceAtw extends EventEmitter {
                         if (modelOutdoor) this.emit('devInfo', `Outdoor: ${modelOutdoor}`);
                         this.emit('devInfo', `Serial: ${serialNumber}`)
                         this.emit('devInfo', `Firmware: ${firmwareAppVersion}`);
-                        this.emit('devInfo', `Manufacturer: ${manufacturer}`);
+                        this.emit('devInfo', `Manufacturer: Mitsubishi`);
                         this.emit('devInfo', '----------------------------------');
                         this.emit('devInfo', `Zone 1: Yes`);
                         this.emit('devInfo', `Hot Water Tank: ${supportsHotWaterTank ? 'Yes' : 'No'}`);
@@ -1494,7 +1494,7 @@ class DeviceAtw extends EventEmitter {
                     }
 
                     //accessory info
-                    this.manufacturer = manufacturer;
+                    this.manufacturer = 'Mitsubishi';
                     this.model = modelIndoor ? modelIndoor : modelOutdoor ? modelOutdoor : `${this.deviceTypeText} ${this.deviceId}`;
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();

package/src/deviceerv.js

@@ -1021,7 +1021,7 @@ class DeviceErv extends EventEmitter {
         try {
             //melcloud device
             this.melCloudErv = new MelCloudErv(this.account, this.device, this.devicesFile, this.defaultTempsFile)
-                .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
+                .on('deviceInfo', (modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
                     if (this.logDeviceInfo && this.displayDeviceInfo) {
                         this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);
                         this.emit('devInfo', `Account: ${this.accountName}`);
@@ -1029,13 +1029,13 @@ class DeviceErv extends EventEmitter {
                         if (modelOutdoor) this.emit('devInfo', `Outdoor: ${modelOutdoor}`);
                         this.emit('devInfo', `Serial: ${serialNumber}`);
                         this.emit('devInfo', `Firmware: ${firmwareAppVersion}`);
-                        this.emit('devInfo', `Manufacturer: ${manufacturer}`);
+                        this.emit('devInfo', `Manufacturer: Mitsubishi`);
                         this.emit('devInfo', '----------------------------------');
                         this.displayDeviceInfo = false;
                     }
 
                     //accessory info
-                    this.manufacturer = manufacturer;
+                    this.manufacturer = 'Mitsubishi';
                     this.model = modelIndoor ? modelIndoor : modelOutdoor ? modelOutdoor : `${this.deviceTypeText} ${this.deviceId}`;
                     this.serialNumber = serialNumber.toString();
                     this.firmwareRevision = firmwareAppVersion.toString();

package/src/melcloudata.js

@@ -55,8 +55,6 @@ class MelCloudAta extends EventEmitter {
             const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.SerialNumber = deviceData.DeviceID || '4.0.0';
-                deviceData.Device.FirmwareAppVersion = deviceData.ConnectedInterfaceIdentifier || '4.0.0';
                 deviceData.Device.OperationMode = AirConditioner.OperationModeMapStringToEnum[deviceData.Device.OperationMode] ?? deviceData.Device.OperationMode;
                 deviceData.Device.ActualFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.ActualFanSpeed] ?? deviceData.Device.ActualFanSpeed;
                 deviceData.Device.SetFanSpeed = AirConditioner.FanSpeedMapStringToEnum[deviceData.Device.SetFanSpeed] ?? deviceData.Device.SetFanSpeed;
@@ -76,13 +74,12 @@ class MelCloudAta extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(safeConfig, null, 2)}`);
 
             //device
-            const serialNumber = deviceData.SerialNumber;
-            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion;
+            const serialNumber = deviceData.SerialNumber || '4.0.0';
+            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion || '4.0.0';
 
             //units
             const units = Array.isArray(deviceData.Device?.Units) ? deviceData.Device?.Units : [];
             const unitsCount = units.length;
-            const manufacturer = 'Mitsubishi';
 
             const { indoor, outdoor } = units.reduce((acc, unit) => {
                 const target = unit.IsIndoor ? 'indoor' : 'outdoor';
@@ -118,7 +115,7 @@ class MelCloudAta extends EventEmitter {
             this.deviceData = deviceData;
 
             //emit info
-            this.emit('deviceInfo', manufacturer, indoor.model, outdoor.model, serialNumber, firmwareAppVersion);
+            this.emit('deviceInfo', indoor.model, outdoor.model, serialNumber, firmwareAppVersion);
 
             //emit state
             this.emit('deviceState', deviceData);

package/src/melcloudatw.js

@@ -55,9 +55,8 @@ class MelCloudAtw extends EventEmitter {
             const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.SerialNumber = deviceData.DeviceID || '4.0.0';
-                deviceData.Device.FirmwareAppVersion = deviceData.ConnectedInterfaceIdentifier || '4.0.0';
             }
+            
             const safeConfig = {
                 ...deviceData,
                 Headers: 'removed',
@@ -65,15 +64,15 @@ class MelCloudAtw extends EventEmitter {
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(safeConfig, null, 2)}`);
 
             //device
-            const serialNumber = deviceData.SerialNumber;
+            //device
+            const serialNumber = deviceData.SerialNumber || '4.0.0';
+            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion || '4.0.0';
             const hasHotWaterTank = deviceData.Device?.HasHotWaterTank;
-            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion;
             const hasZone2 = deviceData.Device?.HasZone2;
 
             //units
             const units = Array.isArray(deviceData.Device?.Units) ? deviceData.Device?.Units : [];
             const unitsCount = units.length;
-            const manufacturer = 'Mitsubishi';
 
             const { indoor, outdoor } = units.reduce((acc, unit) => {
                 const target = unit.IsIndoor ? 'indoor' : 'outdoor';
@@ -105,11 +104,11 @@ class MelCloudAtw extends EventEmitter {
 
             //check state changes
             const deviceDataHasNotChanged = JSON.stringify(devicesData) === JSON.stringify(this.devicesData);
-            if (deviceDataHasNotChanged)  return;
+            if (deviceDataHasNotChanged) return;
             this.devicesData = devicesData;
 
             //emit info
-            this.emit('deviceInfo', manufacturer, indoor.model, outdoor.model, serialNumber, firmwareAppVersion, hasHotWaterTank, hasZone2);
+            this.emit('deviceInfo', indoor.model, outdoor.model, serialNumber, firmwareAppVersion, hasHotWaterTank, hasZone2);
 
             //emit state
             this.emit('deviceState', deviceData);

package/src/melclouderv.js

@@ -55,28 +55,25 @@ class MelCloudErv extends EventEmitter {
             const deviceData = devicesData.find(device => device.DeviceID === this.deviceId);
 
             if (this.accountType === 'melcloudhome') {
-                deviceData.SerialNumber = deviceData.DeviceID || '4.0.0';
-                deviceData.Device.FirmwareAppVersion = deviceData.ConnectedInterfaceIdentifier || '4.0.0';
-
                 //read default temps
                 const temps = await this.functions.readData(this.defaultTempsFile, true);
                 deviceData.Device.DefaultHeatingSetTemperature = temps?.defaultHeatingSetTemperature ?? 20;
                 deviceData.Device.DefaultCoolingSetTemperature = temps?.defaultCoolingSetTemperature ?? 24;
             }
+
             const safeConfig = {
                 ...deviceData,
                 Headers: 'removed',
             };
             if (this.logDebug) this.emit('debug', `Device Data: ${JSON.stringify(safeConfig, null, 2)}`);
 
-            //presets
-            const serialNumber = deviceData.SerialNumber;
-            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion;
+            //device
+            const serialNumber = deviceData.SerialNumber || '4.0.0';
+            const firmwareAppVersion = deviceData.Device?.FirmwareAppVersion || '4.0.0';
 
             //units
             const units = Array.isArray(deviceData.Device?.Units) ? deviceData.Device?.Units : [];
             const unitsCount = units.length;
-            const manufacturer = 'Mitsubishi';
 
             const { indoor, outdoor } = units.reduce((acc, unit) => {
                 const target = unit.IsIndoor ? 'indoor' : 'outdoor';
@@ -112,7 +109,7 @@ class MelCloudErv extends EventEmitter {
             this.devicesData = devicesData;
 
             //emit info
-            this.emit('deviceInfo', manufacturer, indoor.model, outdoor.model, serialNumber, firmwareAppVersion);
+            this.emit('deviceInfo', indoor.model, outdoor.model, serialNumber, firmwareAppVersion);
 
             //emit state 
             this.emit('deviceState', deviceData);

package/src/melcloudhome.js

@@ -67,11 +67,10 @@ class MelCloud extends EventEmitter {
             const headers = {
                 'Accept': '*/*',
                 'Accept-Encoding': 'gzip, deflate, br',
-                'Accept-Language': `${LanguageLocaleMap[this.language]};q=0.9`,
+                'Accept-Language': LanguageLocaleMap[this.language],
                 'Cookie': this.contextKey,
-                'DNT': '1',
                 'Priority': 'u=3, i',
-                'Referer': 'https://melcloudhome.com/dashboard',
+                'Referer': ApiUrlsHome.Dashboard,
                 'Sec-Fetch-Dest': 'empty',
                 'Sec-Fetch-Mode': 'cors',
                 'Sec-Fetch-Site': 'same-origin',
@@ -142,6 +141,7 @@ class MelCloud extends EventEmitter {
                         ...capitalizeKeys(device.Capabilities || {}),
                         ...settingsObject,
                         DeviceType: type,
+                        FirmvareAppVersion: device.ConnectedInterfaceIdentifier,
                         IsConnected: device.IsConnected
                     };
 
@@ -159,6 +159,7 @@ class MelCloud extends EventEmitter {
                         Type: type,
                         DeviceID: Id,
                         DeviceName: GivenDisplayName,
+                        SerialNumber: Id,
                         Device: deviceObject,
                         Headers: headers
                     };