homebridge-melcloud-control 4.0.0-beta.21 → 4.0.0-beta.210

package/index.js

@@ -1,5 +1,5 @@
 import { join } from 'path';
-import { mkdirSync } from 'fs';
+import { mkdirSync, existsSync, writeFileSync } from 'fs';
 import MelCloud from './src/melcloud.js';
 import DeviceAta from './src/deviceata.js';
 import DeviceAtw from './src/deviceatw.js';
@@ -30,6 +30,9 @@ class MelCloudPlatform {
 		api.on('didFinishLaunching', async () => {
 			//loop through accounts
 			for (const account of config.accounts) {
+				const accountType = account.type || 'disabled';
+				if (accountType === 'disabled') continue;
+
 				const accountName = account.name;
 				const user = account.user;
 				const passwd = account.passwd;
@@ -64,7 +67,7 @@ class MelCloudPlatform {
 						passwd: 'removed',
 						mqtt: {
 							auth: {
-								...device.mqtt?.auth,
+								...account.mqtt?.auth,
 								passwd: 'removed',
 							}
 						},
@@ -76,8 +79,6 @@ class MelCloudPlatform {
 				const accountFile = `${prefDir}/${accountName}_Account`;
 				const buildingsFile = `${prefDir}/${accountName}_Buildings`;
 				const devicesFile = `${prefDir}/${accountName}_Devices`;
-				const cookiesFile = `${prefDir}/${accountName}_Cookies`;
-
 
 				//set account refresh interval
 				const refreshInterval = (account.refreshInterval ?? 120) * 1000
@@ -88,31 +89,26 @@ class MelCloudPlatform {
 						.on('start', async () => {
 							try {
 								//melcloud account
-								const melCloud = new MelCloud(user, passwd, language, accountFile, buildingsFile, devicesFile, cookiesFile, logLevel.warn, logLevel.debug, false)
+								const melCloud = new MelCloud(accountType, user, passwd, language, accountFile, buildingsFile, devicesFile, logLevel.warn, logLevel.debug, false)
 									.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}`))
 									.on('error', (msg) => logLevel.error && log.error(`${accountName}, ${msg}`));
 
-								await melCloud.connectHomeCookies();
-								return;
-
-
 								//connect
-								let response;
+								let accountInfo;
 								try {
-									response = await melCloud.connect();
+									accountInfo = await melCloud.connect();
 								} catch (error) {
 									if (logLevel.error) log.error(`${accountName}, Connect error: ${error.message ?? error}`);
 									return;
 								}
 
-								const accountInfo = response.accountInfo ?? false;
-								const contextKey = response.contextKey ?? false;
-								const useFahrenheit = response.useFahrenheit ?? false;
+								const contextKey = accountInfo.ContextKey;
+								const useFahrenheit = accountInfo.UseFahrenheit;
 
-								if (contextKey === false) {
+								if (!contextKey) {
 									return;
 								}
 
@@ -135,10 +131,9 @@ class MelCloudPlatform {
 
 								for (const device of devices) {
 									//chack device from config exist on melcloud
-									const deviceId = device.id;
-									const displayMode = device.displayMode > 0;
-									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === deviceId);
-									if (!deviceExistInMelCloud || !displayMode) {
+									const displayType = device.displayType > 0;
+									const deviceExistInMelCloud = devicesInMelcloud.some(dev => dev.DeviceID === device.id);
+									if (!deviceExistInMelCloud || !displayType) {
 										continue;
 									}
 
@@ -146,19 +141,39 @@ class MelCloudPlatform {
 									const deviceType = device.type;
 									const deviceTypeText = device.typeString;
 									const deviceRefreshInterval = (device.refreshInterval ?? 5) * 1000;
+									const defaultTempsFile = `${prefDir}/${accountName}_${device.id}_Temps`;
+
+									if (accountType === 'melcloudhome') {
+										try {
+											const temps = {
+												defaultCoolingSetTemperature: 24,
+												defaultHeatingSetTemperature: 20
+											};
+
+											if (!existsSync(defaultTempsFile)) {
+												writeFileSync(defaultTempsFile, JSON.stringify(temps, null, 2));
+												if (logLevel.debug) log.debug(`Default temperature file created: ${defaultTempsFile}`);
+											}
+										} catch (error) {
+											if (logLevel.error) {
+												log.error(`Device: ${host} ${deviceName}, File init error: ${error.message}`);
+											}
+											continue;
+										}
+									}
 
 									let configuredDevice;
 									switch (deviceType) {
 										case 0: //ATA
-											configuredDevice = new DeviceAta(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceAta(api, account, device, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										case 1: //ATW
-											configuredDevice = new DeviceAtw(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceAtw(api, account, device, contextKey, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										case 2:
 											break;
 										case 3: //ERV
-											configuredDevice = new DeviceErv(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
+											configuredDevice = new DeviceErv(api, account, device, contextKey, devicesFile, defaultTempsFile, useFahrenheit, restFul, mqtt);
 											break;
 										default:
 											if (logLevel.warn) log.warn(`${accountName}, ${deviceTypeText}, ${deviceName}, unknown device: ${deviceType}.`);
@@ -185,8 +200,9 @@ class MelCloudPlatform {
 										api.publishExternalAccessories(PluginName, [accessory]);
 										if (logLevel.success) log.success(`${accountName}, ${deviceTypeText}, ${deviceName}, Published as external accessory.`);
 
-										//start impulse generators
-										await melCloud.impulseGenerator.state(true, [{ name: 'checkDevicesList', sampling: refreshInterval }]);
+										//start impulse generators\
+										const timmers = accountType === 'melcloudhome' ? [{ name: 'connect', sampling: 150000 }, { name: 'checkDevicesList', sampling: deviceRefreshInterval }] : [{ name: 'checkDevicesList', sampling: refreshInterval }];
+										await melCloud.impulseGenerator.state(true, timmers);
 										await configuredDevice.startStopImpulseGenerator(true, [{ name: 'checkState', sampling: deviceRefreshInterval }]);
 
 										//stop impulse generator

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "MELCloud Control",
   "name": "homebridge-melcloud-control",
-  "version": "4.0.0-beta.21",
+  "version": "4.0.0-beta.210",
   "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -39,7 +39,7 @@
     "async-mqtt": "^2.6.3",
     "axios": "^1.12.2",
     "express": "^5.1.0",
-    "puppeteer": "^24.26.0"
+    "puppeteer": "^24.26.1"
   },
   "keywords": [
     "homebridge",

package/src/constants.js

@@ -18,8 +18,7 @@ export const ApiUrls = {
 };
 
 export const ApiUrlsHome = {
-    LoginUrl:"https://live-melcloudhome.auth.eu-west-1.amazoncognito.com/login?client_id=3g4d5l5kivuqi7oia68gib7uso&redirect_uri=https%3A%2F%2Fauth.melcloudhome.com%2Fsignin-oidc-meu&response_type=code&scope=openid%20profile&response_mode=form_post",
-    BaseURL: 'https://melcloudhome.com',
+    BaseURL: "https://melcloudhome.com",
     GetUserContext: "/api/user/context",
     SetAta: "/api/ataunit/deviceid",
     SetAtw: "/api/atwunit/deviceid",
@@ -36,25 +35,19 @@ export const DeviceType = [
 export const TemperatureDisplayUnits = ["°C", "°F"];
 
 export const AirConditioner = {
-    System: ["AIR CONDITIONER OFF", "AIR CONDITIONER ON", "AIR CONDITIONER OFFLINE"],
-    DriveMode: [
-        "0", "HEAT", "DRY", "COOL", "4", "5", "6", "FAN", "AUTO",
-        "ISEE HEAT", "ISEE DRY", "ISEE COOL"
-    ],
-    VerticalVane: ["AUTO", "1", "2", "3", "4", "5", "6", "SWING"],
-    HorizontalVane: [
-        "AUTO", "LL", "L", "C", "R", "RR", "6", "7",
-        "SPLIT", "9", "10", "11", "SWING"
-    ],
-    AirDirection: ["AUTO", "SWING"],
-    FanSpeed: [
-        "AUTO", "1", "QUIET", "WEAK", "4",
-        "STRONG", "VERY STRONG", "OFF"
-    ],
-    CurrentOperationModeHeatherCooler: [
-        "INACTIVE", "IDLE", "HEATING", "COOLING"
-    ],
-    CurrentOperationModeThermostat: ["INACTIVE", "HEATING", "COOLING"],
+    SystemMapEnumToString: { 0: "Air Conditioner Off", 1: "ir Conditioner On", 2: "ir Conditioner Offline" },
+    AirDirectionMapEnumToString: { 0: "Auto", 1: "Swing" },
+    CurrentOperationModeHeatherCoolerMapEnumToString: { 0: "Inactive", 1: "Idle", 2: "Heating", 3: "Cooling" },
+    CurrentOperationModeThermostatMapEnumToString: { 0: "Inactive", 1: "Heating", 2: "Cooling" },
+    OperationModeMapStringToEnum: { "0": 0, "Heat": 1, "Dry": 2, "Cool": 3, "4": 4, "5": 5, "6": 6, "Fan": 7, "Automatic": 8, "Isee Heat": 9, "Isee Dry": 10, "Isee Cool": 11 },
+    OperationModeMapEnumToString: { 0: "0", 1: "Heat", 2: "Dry", 3: "Cool", 4: "4", 5: "5", 6: "6", 7: "Fan", 8: "Automatic", 9: "Isee Heat", 10: "Isee Dry", 11: "Isee Cool" },
+    FanSpeedMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5 },
+    FanSpeedMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    FanSpeedCurrentMapEnumToString: { 0: "Quiet", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five" },
+    VaneVerticalDirectionMapStringToEnum: { "Auto": 0, "One": 1, "Two": 2, "Three": 3, "Four": 4, "Five": 5, "Six": 6, "Swing": 7 },
+    VaneVerticalDirectionMapEnumToString: { 0: "Auto", 1: "One", 2: "Two", 3: "Three", 4: "Four", 5: "Five", 6: "Six", 7: "Swing" },
+    VaneHorizontalDirectionMapStringToEnum: { "Auto": 0, "Left": 1, "LeftCentre": 2, "Centre": 3, "RightCentre": 4, "Right": 5, "Six": 6, "Seven": 7, "Split": 8, "Nine": 9, "Ten": 10, "Eleven": 11, "Swing": 12 },
+    VaneHorizontalDirectionMapEnumToString: { 0: "Auto", 1: "Left", 2: "LeftCentre", 3: "Centre", 4: "RightCentre", 5: "Right", 6: "Six", 7: "Seven", 8: "Split", 9: "Nine", 10: "Ten", 11: "Eleven", 12: "Swing" },
     EffectiveFlags: {
         Power: 1,
         OperationMode: 2,
@@ -74,7 +67,7 @@ export const AirConditioner = {
         Presets: 287,
         HolidayMode: 131072,
         All: 281483566710825
-    }
+    },
 };
 
 export const HeatPump = {