homebridge-melcloud-control 4.0.0-beta.115 → 4.0.0-beta.116

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/index.js +1 -1
  2. package/package.json +1 -1
  3. package/src/deviceata.js +2 -3
  4. package/src/melcloud.js +5 -4
  5. package/src/melcloudata.js +34 -34
package/index.js CHANGED
@@ -146,7 +146,7 @@ class MelCloudPlatform {
146
146
  let configuredDevice;
147
147
  switch (deviceType) {
148
148
  case 0: //ATA
149
- configuredDevice = new DeviceAta(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
149
+ configuredDevice = new DeviceAta(api, account, device, devicesFile, useFahrenheit, restFul, mqtt);
150
150
  break;
151
151
  case 1: //ATW
152
152
  configuredDevice = new DeviceAtw(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "MELCloud Control",
3
3
  "name": "homebridge-melcloud-control",
4
- "version": "4.0.0-beta.115",
4
+ "version": "4.0.0-beta.116",
5
5
  "description": "Homebridge plugin to control Mitsubishi Air Conditioner, Heat Pump and Energy Recovery Ventilation.",
6
6
  "license": "MIT",
7
7
  "author": "grzegorz914",
package/src/deviceata.js CHANGED
@@ -6,7 +6,7 @@ import { TemperatureDisplayUnits, AirConditioner, ApiUrlsHome } from './constant
6
6
  let Accessory, Characteristic, Service, Categories, AccessoryUUID;
7
7
 
8
8
  class DeviceAta extends EventEmitter {
9
- constructor(api, account, device, contextKey, devicesFile, useFahrenheit, restFul, mqtt) {
9
+ constructor(api, account, device, devicesFile, useFahrenheit, restFul, mqtt) {
10
10
  super();
11
11
 
12
12
  Accessory = api.platformAccessory;
@@ -31,7 +31,6 @@ class DeviceAta extends EventEmitter {
31
31
  this.logInfo = account.log?.info || false;
32
32
  this.logWarn = account.log?.warn || false;
33
33
  this.logDebug = account.log?.debug || false;
34
- this.contextKey = contextKey;
35
34
  this.accountName = account.name;
36
35
  this.deviceId = device.id;
37
36
  this.deviceName = device.name;
@@ -920,7 +919,7 @@ class DeviceAta extends EventEmitter {
920
919
  async start() {
921
920
  try {
922
921
  //melcloud device
923
- this.melCloudAta = new MelCloudAta(this.device, this.contextKey, this.devicesFile)
922
+ this.melCloudAta = new MelCloudAta(this.device, this.devicesFile)
924
923
  .on('deviceInfo', (manufacturer, modelIndoor, modelOutdoor, serialNumber, firmwareAppVersion) => {
925
924
  if (this.logDeviceInfo && this.displayDeviceInfo) {
926
925
  this.emit('devInfo', `---- ${this.deviceTypeText}: ${this.deviceName} ----`);
package/src/melcloud.js CHANGED
@@ -220,7 +220,7 @@ class MelCloud extends EventEmitter {
220
220
  );
221
221
 
222
222
  // Funkcja tworząca finalny obiekt Device
223
- const createDevice = (device, type) => {
223
+ const createDevice = (device, type, contextKey) => {
224
224
  // Settings już kapitalizowane w nazwach
225
225
  const settingsArray = device.Settings || [];
226
226
 
@@ -248,6 +248,7 @@ class MelCloud extends EventEmitter {
248
248
 
249
249
  return {
250
250
  ...rest,
251
+ ContextKey: contextKey,
251
252
  Type: type,
252
253
  DeviceID: Id,
253
254
  DeviceName: GivenDisplayName,
@@ -256,9 +257,9 @@ class MelCloud extends EventEmitter {
256
257
  };
257
258
 
258
259
  return [
259
- ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0)),
260
- ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1)),
261
- ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3))
260
+ ...(building.airToAirUnits || []).map(d => createDevice(capitalizeKeys(d), 0, this.contextKey)),
261
+ ...(building.airToWaterUnits || []).map(d => createDevice(capitalizeKeys(d), 1, this.contextKey)),
262
+ ...(building.airToVentilationUnits || []).map(d => createDevice(capitalizeKeys(d), 3, this.contextKey))
262
263
  ];
263
264
  });
264
265
 
package/src/melcloudata.js CHANGED
@@ -6,7 +6,7 @@ import Functions from './functions.js';
6
6
  import { ApiUrls, ApiUrlsHome, AirConditioner } from './constants.js';
7
7
 
8
8
  class MelCloudAta extends EventEmitter {
9
- constructor(device, contextKey, devicesFile) {
9
+ constructor(device, devicesFile) {
10
10
  super();
11
11
  this.accountType = device.displayType
12
12
  this.deviceId = device.id;
@@ -26,37 +26,7 @@ class MelCloudAta extends EventEmitter {
26
26
  keepAlive: false,
27
27
  rejectUnauthorized: false
28
28
  })
29
- };
30
-
31
- this.axiosInstancePost = axios.create({
32
- method: 'POST',
33
- baseURL: ApiUrls.BaseURL,
34
- headers: {
35
- 'X-MitsContextKey': contextKey,
36
- 'content-type': 'application/json'
37
- },
38
- withCredentials: true,
39
- ...this.axiosDefaults
40
- });
41
-
42
- this.axiosInstancePut = axios.create({
43
- method: 'PUT',
44
- baseURL: ApiUrlsHome.BaseURL,
45
- headers: {
46
- 'Accept': '*/*',
47
- 'Accept-Language': 'en-US,en;q=0.9',
48
- 'Cookie': contextKey,
49
- 'User-Agent': 'homebridge-melcloud-control/4.0.0',
50
- 'DNT': '1',
51
- 'Origin': 'https://melcloudhome.com',
52
- 'Referer': 'https://melcloudhome.com/dashboard',
53
- 'Sec-Fetch-Dest': 'empty',
54
- 'Sec-Fetch-Mode': 'cors',
55
- 'Sec-Fetch-Site': 'same-origin',
56
- 'X-CSRF': '1'
57
- },
58
- ...this.axiosDefaults
59
- });
29
+ };;
60
30
 
61
31
  //lock flags
62
32
  this.locks = {
@@ -241,6 +211,17 @@ class MelCloudAta extends EventEmitter {
241
211
  switch (accountType) {
242
212
  case "melcloud":
243
213
  try {
214
+ const axiosInstancePost = axios.create({
215
+ method: 'POST',
216
+ baseURL: ApiUrls.BaseURL,
217
+ headers: {
218
+ 'X-MitsContextKey': deviceData.ContextKey,
219
+ 'content-type': 'application/json'
220
+ },
221
+ withCredentials: true,
222
+ ...this.axiosDefaults
223
+ });
224
+
244
225
  //set target temp based on display mode and operation mode
245
226
  switch (displayMode) {
246
227
  case 1: //Heather/Cooler
@@ -297,7 +278,7 @@ class MelCloudAta extends EventEmitter {
297
278
  }
298
279
  }
299
280
 
300
- await this.axiosInstancePost(ApiUrls.SetAta, payload);
281
+ await axiosInstancePost(ApiUrls.SetAta, payload);
301
282
  this.updateData(deviceData);
302
283
  return true;
303
284
  } catch (error) {
@@ -305,6 +286,25 @@ class MelCloudAta extends EventEmitter {
305
286
  };
306
287
  case "melcloudhome":
307
288
  try {
289
+ const axiosInstancePut = axios.create({
290
+ method: 'PUT',
291
+ baseURL: ApiUrlsHome.BaseURL,
292
+ headers: {
293
+ 'Accept': '*/*',
294
+ 'Accept-Language': 'en-US,en;q=0.9',
295
+ 'Cookie': deviceData.ContextKey,
296
+ 'User-Agent': 'homebridge-melcloud-control/4.0.0',
297
+ 'DNT': '1',
298
+ 'Origin': 'https://melcloudhome.com',
299
+ 'Referer': 'https://melcloudhome.com/dashboard',
300
+ 'Sec-Fetch-Dest': 'empty',
301
+ 'Sec-Fetch-Mode': 'cors',
302
+ 'Sec-Fetch-Site': 'same-origin',
303
+ 'X-CSRF': '1'
304
+ },
305
+ ...this.axiosDefaults
306
+ });
307
+
308
308
  //set target temp based on display mode and operation mode
309
309
  switch (displayMode) {
310
310
  case 1: //Heather/Cooler
@@ -354,7 +354,7 @@ class MelCloudAta extends EventEmitter {
354
354
  this.emit('warn', JSON.stringify(deviceData.Device, null, 2));
355
355
  this.emit('warn', JSON.stringify(payload, null, 2));
356
356
  const path = ApiUrlsHome.SetAta.replace('deviceid', deviceData.DeviceID);
357
- await this.axiosInstancePut(path, payload);
357
+ await axiosInstancePut(path, payload);
358
358
  this.updateData(deviceData);
359
359
  return true;
360
360
  } catch (error) {