homebridge-melcloud-control 4.2.3-beta.2 → 4.2.3-beta.21

package/homebridge-ui/server.js

@@ -1,5 +1,6 @@
 import { HomebridgePluginUiServer } from '@homebridge/plugin-ui-utils';
 import MelCloud from '../src/melcloud.js';
+import MelCloudHome from '../src/melcloudhome.js';
 
 class PluginUiServer extends HomebridgePluginUiServer {
   constructor() {
@@ -17,7 +18,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const accountFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Account`;
     const buildingsFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Buildings`;
     const devicesFile = `${this.homebridgeStoragePath}/melcloud/${accountName}_Devices`;
-    const melCloud = new MelCloud(account, accountFile, buildingsFile, devicesFile);
+    const melCloud = account.type === 'melcloud' ? new MelCloud(account, accountFile, buildingsFile, devicesFile) : new MelCloudHome(account, accountFile, buildingsFile, devicesFile);
 
     try {
       const accountInfo = await melCloud.connect();

package/index.js

@@ -1,6 +1,7 @@
 import { join } from 'path';
 import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import MelCloud from './src/melcloud.js';
+import MelCloudHome from './src/melcloudhome.js';
 import DeviceAta from './src/deviceata.js';
 import DeviceAtw from './src/deviceatw.js';
 import DeviceErv from './src/deviceerv.js';
@@ -84,8 +85,8 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(account, accountFile, buildingsFile, devicesFile, true)
-									.on('success', (msg) => logLevel.success && log.success(`${accountName}, ${msg}`))
+								const melCloud = account.type === 'melcloud' ? new MelCloud(account, accountFile, buildingsFile, devicesFile, true) : new MelCloudHome(account, accountFile, buildingsFile, devicesFile, true);
+								melCloud.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}`))
 									.on('warn', (msg) => logLevel.warn && log.warn(`${accountName}, ${msg}`))
@@ -203,7 +204,7 @@ class MelCloudPlatform {
 										//start impulse generators\
 										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 1800000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
 										await melCloud.impulseGenerator.state(true, timmers, false);
-										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval + 500 }]);
+										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 
 										//stop impulse generator
 										await impulseGenerator.state(false);

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.2.3-beta.2",
+  "version": "4.2.3-beta.21",
   "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",
@@ -163,3 +164,32 @@ export const AccessLevel = {
     Quest: 3,
     Owner: 4
 };
+
+export const LanguageLocaleMap = {
+    "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

@@ -334,8 +334,6 @@ class DeviceAta extends EventEmitter {
                             return state;
                         })
                         .onSet(async (state) => {
-                            if (!!state === this.accessory.power) return;
-
                             try {
                                 deviceData.Device.Power = state ? true : false;
                                 await this.melCloudAta.send(this.accountType, this.displayType, deviceData, AirConditioner.EffectiveFlags.Power);
@@ -1211,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}`);
@@ -1219,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();
@@ -1331,7 +1329,7 @@ class DeviceAta extends EventEmitter {
                         maxTempHeat: maxTempHeat,
                         minTempCoolDryAuto: minTempCoolDryAuto,
                         maxTempCoolDryAuto: maxTempCoolDryAuto,
-                        power: power ? 1 : 0,
+                        power: power,
                         inStandbyMode: inStandbyMode,
                         operationMode: operationMode,
                         currentOperationMode: 0,
@@ -1427,7 +1425,7 @@ class DeviceAta extends EventEmitter {
 
                             //update characteristics
                             this.melCloudService
-                                ?.updateCharacteristic(Characteristic.Active, power ? 1 : 0)
+                                ?.updateCharacteristic(Characteristic.Active, power)
                                 .updateCharacteristic(Characteristic.CurrentHeaterCoolerState, obj.currentOperationMode)
                                 .updateCharacteristic(Characteristic.TargetHeaterCoolerState, obj.targetOperationMode)
                                 .updateCharacteristic(Characteristic.CurrentTemperature, roomTemperature)

package/src/deviceatw.js

@@ -340,8 +340,6 @@ class DeviceAtw extends EventEmitter {
                                     return state;
                                 })
                                 .onSet(async (state) => {
-                                    if (!!state === this.accessory.power) return;
-
                                     try {
                                         switch (i) {
                                             case 0: //Heat Pump
@@ -1340,8 +1338,15 @@ class DeviceAtw extends EventEmitter {
                                             effectiveFlags = HeatPump.EffectiveFlags.Power + HeatPump.EffectiveFlags.OperationMode;
                                             break;
                                         case 3: //HOLIDAY
-                                            deviceData.Device.HolidayMode = state;
-                                            effectiveFlags = HeatPump.EffectiveFlags.HolidayMode;
+                                            if (this.accountType === 'melcloud') {
+                                                deviceData.Device.HolidayMode = state;
+                                                effectiveFlags = HeatPump.EffectiveFlags.HolidayMode;
+                                            }
+
+                                            if (this.accountType === 'melcloudhome') {
+                                                deviceData.Device.HolidayMode.Enabled = state;
+                                                effectiveFlags = 'holidaymode';
+                                            }
                                             break;
                                         case 10: //ALL ZONES PHYSICAL LOCK CONTROL
                                             deviceData.Device.ProhibitZone1 = state;
@@ -1471,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}`);
@@ -1479,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'}`);
@@ -1489,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();
@@ -1510,7 +1515,8 @@ class DeviceAtw extends EventEmitter {
                     const scheduleEnabled = deviceData.ScheduleEnabled;
                     const schedulesOnServer = deviceData.Schedule ?? [];
                     const presetsOnServer = deviceData.Presets ?? [];
-                    const holidayModeEnabled = deviceData.HolidayMode?.Enabled;
+                    const holidayMode = deviceData.Device.HolidayMode;
+                    const holidayModeEnabled = accountTypeMelcloud ? holidayMode : deviceData.HolidayMode?.Enabled;
                     const holidayModeActive = deviceData.HolidayMode?.Active ?? false;
 
                     //device info
@@ -1545,12 +1551,11 @@ class DeviceAtw extends EventEmitter {
 
                     //heat pump
                     const heatPumpName = 'Heat Pump';
-                    const power = deviceData.Device.Power ?? false;
+                    const power = deviceData.Device.Power;
                     const inStandbyMode = deviceData.Device.InStandbyMode;
                     const unitStatus = deviceData.Device.UnitStatus ?? 0;
                     const operationMode = deviceData.Device.OperationMode;
                     const outdoorTemperature = deviceData.Device.OutdoorTemperature;
-                    const holidayMode = deviceData.Device.HolidayMode ?? false;
                     const flowTemperatureHeatPump = deviceData.Device.FlowTemperature;
                     const returnTemperatureHeatPump = deviceData.Device.ReturnTemperature;
                     const isConnected = accountTypeMelcloud ? !deviceData.Device[connectKey] : deviceData.Device[connectKey];
@@ -1594,7 +1599,7 @@ class DeviceAtw extends EventEmitter {
                     const obj = {
                         presets: presetsOnServer,
                         schedules: schedulesOnServer,
-                        power: power ? 1 : 0,
+                        power: power,
                         inStandbyMode: inStandbyMode,
                         unitStatus: unitStatus,
                         idleZone1: idleZone1,
@@ -2065,7 +2070,7 @@ class DeviceAtw extends EventEmitter {
                                     button.state = power ? (operationMode === 1) : false;
                                     break;
                                 case 53: //HOLIDAY
-                                    button.state = power ? (holidayMode === true) : false;
+                                    button.state = power ? (holidayModeEnabled === true) : false;
                                     break;
                                 case 10: //ALL ZONES PHYSICAL LOCK CONTROL
                                     button.state = power ? (prohibitZone1 === true && prohibitHotWater === true && prohibitZone2 === true) : false;

package/src/deviceerv.js

@@ -305,8 +305,6 @@ class DeviceErv extends EventEmitter {
                             return state;
                         })
                         .onSet(async (state) => {
-                            if (!!state === this.accessory.power) return;
-
                             try {
                                 deviceData.Device.Power = state ? true : false;
                                 await this.melCloudErv.send(this.accountType, this.displayType, deviceData, Ventilation.EffectiveFlags.Power);
@@ -1023,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}`);
@@ -1031,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();
@@ -1136,7 +1134,7 @@ class DeviceErv extends EventEmitter {
                         actualVentilationMode: actualVentilationMode,
                         numberOfFanSpeeds: numberOfFanSpeeds,
                         supportsFanSpeed: supportsFanSpeed,
-                        power: power ? 1 : 0,
+                        power: power,
                         inStandbyMode: inStandbyMode,
                         operationMode: operationMode,
                         currentOperationMode: 0,