homebridge-melcloud-control 4.4.1-beta.36 → 4.4.1-beta.37

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 (6) hide show
  1. package/homebridge-ui/public/index.html +60 -58
  2. package/index.js +17 -5
  3. package/package.json +1 -1
  4. package/src/deviceata.js +4 -4
  5. package/src/deviceatw.js +4 -4
  6. package/src/deviceerv.js +4 -4
package/homebridge-ui/public/index.html CHANGED
@@ -284,70 +284,72 @@
284
284
  deviceTypeString,
285
285
  displayType: 0,
286
286
  name: device.DeviceName,
287
- presets: [],
288
- schedules: [],
289
- scenes: []
290
287
  };
291
288
  devicesInConfig.push(deviceInConfig);
292
289
  newDevices.push(deviceInConfig);
293
290
  configDevicesMap.set(deviceId, deviceInConfig);
294
291
  }
295
292
 
296
- // PRESETS
297
- deviceInConfig.presets = deviceInConfig.presets ?? [];
298
- const presetsInMelCloud = device.Presets || [];
299
- removedFromConfig.ataPresets.push(...removeStaleEntities(deviceInConfig.presets, presetsInMelCloud, p => p.id, p => p.ID));
300
- const presetIds = new Set(deviceInConfig.presets.map(p => String(p.id)));
301
- presetsInMelCloud.forEach((preset, index) => {
302
- const presetId = String(preset.ID);
303
- if (!presetIds.has(presetId)) {
304
- const presetObj = {
305
- id: presetId,
306
- displayType: 0,
307
- name: preset.NumberDescription || `Preset ${index}`,
308
- namePrefix: false
309
- };
310
- deviceInConfig.presets.push(presetObj);
311
- newPresets.push(presetObj);
312
- }
313
- });
314
-
315
- // SCHEDULES
316
- deviceInConfig.schedules = deviceInConfig.schedules ?? [];
317
- const schedulesInMelCloud = device.Schedule || [];
318
- removedFromConfig.ataSchedules.push(...removeStaleEntities(deviceInConfig.schedules, schedulesInMelCloud, s => s.id, s => s.Id));
319
- const scheduleIds = new Set(deviceInConfig.schedules.map(s => String(s.id)));
320
- schedulesInMelCloud.forEach((schedule, index) => {
321
- const scheduleId = String(schedule.Id);
322
- if (!scheduleIds.has(scheduleId)) {
323
- const scheduleObj = {
324
- id: scheduleId,
325
- displayType: 0,
326
- name: `Schedule ${index}`,
327
- namePrefix: false
328
- };
329
- deviceInConfig.schedules.push(scheduleObj);
330
- newSchedules.push(scheduleObj);
331
- }
332
- });
333
-
334
- // SCENES
335
- deviceInConfig.scenes = deviceInConfig.scenes ?? [];
336
- removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
337
- const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
338
- scenesInMelCloud.forEach((scene, index) => {
339
- const sceneId = String(scene.Id);
340
- if (!sceneIds.has(sceneId)) {
341
- const sceneObj = {
342
- id: sceneId,
343
- displayType: 0,
344
- name: scene.Name || `Scene ${index}`,
345
- namePrefix: false
346
- };
347
- deviceInConfig.scenes.push(sceneObj);
348
- newScenes.push(sceneObj);
349
- }
350
- });
293
+ //ONLY MELCLOUD - PRESETS
294
+ if (account.type === 'melcloud') {
295
+ deviceInConfig.presets = deviceInConfig.presets ?? [];
296
+ const presetsInMelCloud = device.Presets || [];
297
+ removedFromConfig.ataPresets.push(...removeStaleEntities(deviceInConfig.presets, presetsInMelCloud, p => p.id, p => p.ID));
298
+ const presetIds = new Set(deviceInConfig.presets.map(p => String(p.id)));
299
+ presetsInMelCloud.forEach((preset, index) => {
300
+ const presetId = String(preset.ID);
301
+ if (!presetIds.has(presetId)) {
302
+ const presetObj = {
303
+ id: presetId,
304
+ displayType: 0,
305
+ name: preset.NumberDescription || `Preset ${index}`,
306
+ namePrefix: false
307
+ };
308
+ deviceInConfig.presets.push(presetObj);
309
+ newPresets.push(presetObj);
310
+ }
311
+ });
312
+ }
313
+
314
+ //ONLY MELCLOUD HOME - SCHEDULES & SCENES
315
+ if (account.type === 'melcloudhome') {
316
+ // SCHEDULES
317
+ deviceInConfig.schedules = deviceInConfig.schedules ?? [];
318
+ const schedulesInMelCloud = device.Schedule || [];
319
+ removedFromConfig.ataSchedules.push(...removeStaleEntities(deviceInConfig.schedules, schedulesInMelCloud, s => s.id, s => s.Id));
320
+ const scheduleIds = new Set(deviceInConfig.schedules.map(s => String(s.id)));
321
+ schedulesInMelCloud.forEach((schedule, index) => {
322
+ const scheduleId = String(schedule.Id);
323
+ if (!scheduleIds.has(scheduleId)) {
324
+ const scheduleObj = {
325
+ id: scheduleId,
326
+ displayType: 0,
327
+ name: `Schedule ${index}`,
328
+ namePrefix: false
329
+ };
330
+ deviceInConfig.schedules.push(scheduleObj);
331
+ newSchedules.push(scheduleObj);
332
+ }
333
+ });
334
+
335
+ // SCENES
336
+ deviceInConfig.scenes = deviceInConfig.scenes ?? [];
337
+ removedFromConfig.scenes.push(...removeStaleEntities(deviceInConfig.scenes, scenesInMelCloud, s => s.id, s => s.Id));
338
+ const sceneIds = new Set(deviceInConfig.scenes.map(s => String(s.id)));
339
+ scenesInMelCloud.forEach((scene, index) => {
340
+ const sceneId = String(scene.Id);
341
+ if (!sceneIds.has(sceneId)) {
342
+ const sceneObj = {
343
+ id: sceneId,
344
+ displayType: 0,
345
+ name: scene.Name || `Scene ${index}`,
346
+ namePrefix: false
347
+ };
348
+ deviceInConfig.scenes.push(sceneObj);
349
+ newScenes.push(sceneObj);
350
+ }
351
+ });
352
+ }
351
353
  });
352
354
 
353
355
  return devicesInConfig;
package/index.js CHANGED
@@ -137,12 +137,24 @@ class MelCloudPlatform {
137
137
  }
138
138
 
139
139
  //chack device from config exist on melcloud
140
- const deviceExistInMelCloud = melcloudDevicesList.Devices.some(dev => dev.DeviceID === device.id);
141
- if (!deviceExistInMelCloud) {
140
+ const deviceInMelCloud = melcloudDevicesList.Devices.find(d => d.DeviceID === device.id);
141
+ if (!deviceInMelCloud) {
142
142
  if (logLevel.warn) log.warn(`${name}, ${deviceTypeString}, ${deviceName}, not exist on server, please login to MELCLoud from plugin UI to fix this issue.`);
143
143
  continue;
144
144
  }
145
145
 
146
+ //presets
147
+ const presetIds = (deviceInMelCloud.Presets ?? []).map(p => String(p.ID));
148
+ const presets = account.type === 'melcloud' ? (device.presets || []).filter(p => (p.displayType ?? 0) > 0 && p.id !== '0' && presetIds.includes(p.id)) : [];
149
+
150
+ //schedules
151
+ const schedulesIds = (deviceInMelCloud.Schedule ?? []).map(s => String(s.Id));
152
+ const schedules = account.type === 'melcloudhome' ? (device.schedules || []).filter(s => (s.displayType ?? 0) > 0 && s.id !== '0' && schedulesIds.includes(s.id)) : [];
153
+
154
+ //scenes
155
+ const scenesIds = (melcloudDevicesList.Scenes ?? []).map(s => String(s.Id));
156
+ const scenes = account.type === 'melcloudhome' ? (device.scenes || []).filter(s => (s.displayType ?? 0) > 0 && s.id !== '0' && scenesIds.includes(s.id)) : [];
157
+
146
158
  // set rest ful port
147
159
  account.restFul.port = (device.id).slice(-4).replace(/^0/, '9');
148
160
 
@@ -168,15 +180,15 @@ class MelCloudPlatform {
168
180
  let configuredDevice;
169
181
  switch (deviceType) {
170
182
  case 0: //ATA
171
- configuredDevice = new DeviceAta(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
183
+ configuredDevice = new DeviceAta(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
172
184
  break;
173
185
  case 1: //ATW
174
- configuredDevice = new DeviceAtw(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
186
+ configuredDevice = new DeviceAtw(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
175
187
  break;
176
188
  case 2:
177
189
  break;
178
190
  case 3: //ERV
179
- configuredDevice = new DeviceErv(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
191
+ configuredDevice = new DeviceErv(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList);
180
192
  break;
181
193
  default:
182
194
  if (logLevel.warn) log.warn(`${name}, ${deviceTypeString}, ${deviceName}, unknown device: ${deviceType}.`);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "displayName": "MELCloud Control",
3
3
  "name": "homebridge-melcloud-control",
4
- "version": "4.4.1-beta.36",
4
+ "version": "4.4.1-beta.37",
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
@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, AirConditioner } from './constants.js';
7
7
  let Accessory, Characteristic, Service, Categories, AccessoryUUID;
8
8
 
9
9
  class DeviceAta extends EventEmitter {
10
- constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
10
+ constructor(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
11
11
  super();
12
12
 
13
13
  Accessory = api.platformAccessory;
@@ -44,9 +44,9 @@ class DeviceAta extends EventEmitter {
44
44
  this.frostProtectionSupport = device.frostProtectionSupport || false;
45
45
  this.overheatProtectionSupport = device.overheatProtectionSupport || false;
46
46
  this.holidayModeSupport = device.holidayModeSupport || false;
47
- this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
48
- this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
49
- this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
47
+ this.presets = presets;
48
+ this.schedules = schedules;
49
+ this.scenes = scenes;
50
50
  this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
51
51
 
52
52
  //files
package/src/deviceatw.js CHANGED
@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, HeatPump } from './constants.js';
7
7
  let Accessory, Characteristic, Service, Categories, AccessoryUUID;
8
8
 
9
9
  class DeviceAtw extends EventEmitter {
10
- constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
10
+ constructor(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
11
11
  super();
12
12
 
13
13
  Accessory = api.platformAccessory;
@@ -48,9 +48,9 @@ class DeviceAtw extends EventEmitter {
48
48
  this.errorSensor = device.errorSensor || false;
49
49
  this.frostProtectionSupport = device.frostProtectionSupport || false;
50
50
  this.holidayModeSupport = device.holidayModeSupport || false;
51
- this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
52
- this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
53
- this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
51
+ this.presets = presets;
52
+ this.schedules = schedules;
53
+ this.scenes = scenes;
54
54
  this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
55
55
 
56
56
  //files
package/src/deviceerv.js CHANGED
@@ -7,7 +7,7 @@ import { TemperatureDisplayUnits, Ventilation } from './constants.js';
7
7
  let Accessory, Characteristic, Service, Categories, AccessoryUUID;
8
8
 
9
9
  class DeviceErv extends EventEmitter {
10
- constructor(api, account, device, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
10
+ constructor(api, account, device, presets, schedules, scenes, defaultTempsFile, accountInfo, accountFile, melcloud, melcloudDevicesList) {
11
11
  super();
12
12
 
13
13
  Accessory = api.platformAccessory;
@@ -40,9 +40,9 @@ class DeviceErv extends EventEmitter {
40
40
  this.connectSensor = device.connectSensor || false;
41
41
  this.errorSensor = device.errorSensor || false;
42
42
  this.holidayModeSupport = device.holidayModeSupport || false;
43
- this.presets = this.accountType === 'melcloud' ? (device.presets || []).filter(preset => (preset.displayType ?? 0) > 0 && preset.id !== '0') : [];
44
- this.schedules = this.accountType === 'melcloudhome' ? (device.schedules || []).filter(schedule => (schedule.displayType ?? 0) > 0 && schedule.id !== '0') : [];
45
- this.scenes = this.accountType === 'melcloudhome' ? (device.scenes || []).filter(scene => (scene.displayType ?? 0) > 0 && scene.id !== '0') : [];
43
+ this.presets = presets;
44
+ this.schedules = schedules;
45
+ this.scenes = scenes;
46
46
  this.buttons = (device.buttonsSensors || []).filter(button => (button.displayType ?? 0) > 0);
47
47
 
48
48
  //files