@switchbot/homebridge-switchbot 1.12.0 → 1.12.1
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.
- package/CHANGELOG.md +7 -0
- package/config.schema.json +9 -3
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +8 -15
- package/dist/device/bot.js.map +1 -1
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +8 -26
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +4 -10
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +7 -22
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +9 -30
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +4 -10
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +4 -10
- package/dist/device/meter.js.map +1 -1
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +4 -10
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +4 -10
- package/dist/device/plug.js.map +1 -1
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +3 -6
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +3 -6
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +3 -6
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +3 -6
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +3 -6
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +4 -7
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +3 -6
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +3 -6
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +3 -6
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.js +5 -5
- package/dist/platform.js.map +1 -1
- package/package.json +4 -4
- package/src/device/bot.ts +8 -15
- package/src/device/colorbulb.ts +8 -36
- package/src/device/contact.ts +4 -12
- package/src/device/curtain.ts +7 -22
- package/src/device/humidifier.ts +9 -30
- package/src/device/lock.ts +4 -10
- package/src/device/meter.ts +4 -10
- package/src/device/motion.ts +4 -12
- package/src/device/plug.ts +4 -10
- package/src/irdevice/airconditioner.ts +3 -6
- package/src/irdevice/airpurifier.ts +3 -6
- package/src/irdevice/camera.ts +3 -6
- package/src/irdevice/fan.ts +3 -6
- package/src/irdevice/light.ts +3 -6
- package/src/irdevice/other.ts +4 -7
- package/src/irdevice/tv.ts +3 -8
- package/src/irdevice/vacuumcleaner.ts +3 -6
- package/src/irdevice/waterheater.ts +3 -6
- package/src/platform.ts +5 -5
package/src/device/curtain.ts
CHANGED
|
@@ -184,12 +184,9 @@ export class Curtain {
|
|
|
184
184
|
await this.pushChanges();
|
|
185
185
|
} catch (e: any) {
|
|
186
186
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges`);
|
|
187
|
-
if (this.deviceLogging
|
|
187
|
+
if (this.deviceLogging.includes('debug')) {
|
|
188
188
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
189
189
|
}
|
|
190
|
-
if (this.platform.debugMode) {
|
|
191
|
-
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
|
|
192
|
-
}
|
|
193
190
|
this.apiError(e);
|
|
194
191
|
}
|
|
195
192
|
this.curtainUpdateInProgress = false;
|
|
@@ -425,14 +422,11 @@ export class Curtain {
|
|
|
425
422
|
})
|
|
426
423
|
.catch(async (e: any) => {
|
|
427
424
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
|
|
428
|
-
if (this.deviceLogging
|
|
425
|
+
if (this.deviceLogging.includes('debug')) {
|
|
429
426
|
this.errorLog(
|
|
430
427
|
`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
431
428
|
);
|
|
432
429
|
}
|
|
433
|
-
if (this.platform.debugMode) {
|
|
434
|
-
this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
435
|
-
}
|
|
436
430
|
if (this.platform.config.credentials?.openToken) {
|
|
437
431
|
this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
438
432
|
this.SwitchToOpenAPI = true;
|
|
@@ -467,14 +461,11 @@ export class Curtain {
|
|
|
467
461
|
this.updateHomeKitCharacteristics();
|
|
468
462
|
} catch (e: any) {
|
|
469
463
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
470
|
-
if (this.deviceLogging
|
|
464
|
+
if (this.deviceLogging.includes('debug')) {
|
|
471
465
|
this.errorLog(
|
|
472
466
|
`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
473
467
|
);
|
|
474
468
|
}
|
|
475
|
-
if (this.platform.debugMode) {
|
|
476
|
-
this.errorLog(`Curtain: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
477
|
-
}
|
|
478
469
|
this.apiError(e);
|
|
479
470
|
}
|
|
480
471
|
}
|
|
@@ -516,14 +507,11 @@ export class Curtain {
|
|
|
516
507
|
})
|
|
517
508
|
.catch(async (e: any) => {
|
|
518
509
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
|
|
519
|
-
if (this.deviceLogging
|
|
510
|
+
if (this.deviceLogging.includes('debug')) {
|
|
520
511
|
this.errorLog(
|
|
521
512
|
`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
522
513
|
);
|
|
523
514
|
}
|
|
524
|
-
if (this.platform.debugMode) {
|
|
525
|
-
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
526
|
-
}
|
|
527
515
|
if (this.platform.config.credentials?.openToken) {
|
|
528
516
|
this.warnLog(`Curtain: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
529
517
|
await this.openAPIpushChanges();
|
|
@@ -575,14 +563,11 @@ export class Curtain {
|
|
|
575
563
|
}
|
|
576
564
|
} catch (e: any) {
|
|
577
565
|
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
578
|
-
if (this.deviceLogging
|
|
566
|
+
if (this.deviceLogging.includes('debug')) {
|
|
579
567
|
this.errorLog(
|
|
580
568
|
`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
581
569
|
);
|
|
582
570
|
}
|
|
583
|
-
if (this.platform.debugMode) {
|
|
584
|
-
this.errorLog(`Curtain: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
585
|
-
}
|
|
586
571
|
this.apiError(e);
|
|
587
572
|
}
|
|
588
573
|
}
|
|
@@ -747,7 +732,7 @@ export class Curtain {
|
|
|
747
732
|
config['scanDuration'] = device.scanDuration;
|
|
748
733
|
}
|
|
749
734
|
if (Object.entries(config).length !== 0) {
|
|
750
|
-
this.
|
|
735
|
+
this.infoLog(`Curtain: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
751
736
|
}
|
|
752
737
|
}
|
|
753
738
|
|
|
@@ -869,6 +854,6 @@ export class Curtain {
|
|
|
869
854
|
}
|
|
870
855
|
|
|
871
856
|
enablingDeviceLogging(): boolean {
|
|
872
|
-
return this.deviceLogging
|
|
857
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
873
858
|
}
|
|
874
859
|
}
|
package/src/device/humidifier.ts
CHANGED
|
@@ -176,12 +176,9 @@ export class Humidifier {
|
|
|
176
176
|
await this.pushChanges();
|
|
177
177
|
} catch (e: any) {
|
|
178
178
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges`);
|
|
179
|
-
if (this.deviceLogging
|
|
179
|
+
if (this.deviceLogging.includes('debug')) {
|
|
180
180
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
181
181
|
}
|
|
182
|
-
if (this.platform.debugMode) {
|
|
183
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
|
|
184
|
-
}
|
|
185
182
|
this.apiError(e);
|
|
186
183
|
}
|
|
187
184
|
this.humidifierUpdateInProgress = false;
|
|
@@ -333,14 +330,11 @@ export class Humidifier {
|
|
|
333
330
|
})
|
|
334
331
|
.catch(async (e: any) => {
|
|
335
332
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
|
|
336
|
-
if (this.deviceLogging
|
|
333
|
+
if (this.deviceLogging.includes('debug')) {
|
|
337
334
|
this.errorLog(
|
|
338
335
|
`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
339
336
|
);
|
|
340
337
|
}
|
|
341
|
-
if (this.platform.debugMode) {
|
|
342
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
343
|
-
}
|
|
344
338
|
if (this.platform.config.credentials?.openToken) {
|
|
345
339
|
this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
346
340
|
await this.openAPIRefreshStatus();
|
|
@@ -380,15 +374,12 @@ export class Humidifier {
|
|
|
380
374
|
}
|
|
381
375
|
} catch (e: any) {
|
|
382
376
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
383
|
-
if (this.deviceLogging
|
|
377
|
+
if (this.deviceLogging.includes('debug')) {
|
|
384
378
|
this.errorLog(
|
|
385
379
|
`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
|
|
386
380
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
387
381
|
);
|
|
388
382
|
}
|
|
389
|
-
if (this.platform.debugMode) {
|
|
390
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
391
|
-
}
|
|
392
383
|
this.apiError(e);
|
|
393
384
|
}
|
|
394
385
|
}
|
|
@@ -432,14 +423,11 @@ export class Humidifier {
|
|
|
432
423
|
})
|
|
433
424
|
.catch(async (e: any) => {
|
|
434
425
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection`);
|
|
435
|
-
if (this.deviceLogging
|
|
426
|
+
if (this.deviceLogging.includes('debug')) {
|
|
436
427
|
this.errorLog(
|
|
437
428
|
`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
438
429
|
);
|
|
439
430
|
}
|
|
440
|
-
if (this.platform.debugMode) {
|
|
441
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
442
|
-
}
|
|
443
431
|
if (this.platform.config.credentials?.openToken) {
|
|
444
432
|
this.warnLog(`Humidifier: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
445
433
|
await this.openAPIpushChanges();
|
|
@@ -481,15 +469,12 @@ export class Humidifier {
|
|
|
481
469
|
this.statusCode(push);
|
|
482
470
|
} catch (e: any) {
|
|
483
471
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
484
|
-
if (this.deviceLogging
|
|
472
|
+
if (this.deviceLogging.includes('debug')) {
|
|
485
473
|
this.errorLog(
|
|
486
474
|
`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
|
|
487
475
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
488
476
|
);
|
|
489
477
|
}
|
|
490
|
-
if (this.platform.debugMode) {
|
|
491
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
492
|
-
}
|
|
493
478
|
this.apiError(e);
|
|
494
479
|
}
|
|
495
480
|
} else if (
|
|
@@ -531,15 +516,12 @@ export class Humidifier {
|
|
|
531
516
|
}
|
|
532
517
|
} catch (e: any) {
|
|
533
518
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection`);
|
|
534
|
-
if (this.deviceLogging
|
|
519
|
+
if (this.deviceLogging.includes('debug')) {
|
|
535
520
|
this.errorLog(
|
|
536
521
|
`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` +
|
|
537
522
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
538
523
|
);
|
|
539
524
|
}
|
|
540
|
-
if (this.platform.debugMode) {
|
|
541
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushAutoChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
542
|
-
}
|
|
543
525
|
this.apiError(e);
|
|
544
526
|
}
|
|
545
527
|
}
|
|
@@ -569,15 +551,12 @@ export class Humidifier {
|
|
|
569
551
|
}
|
|
570
552
|
} catch (e: any) {
|
|
571
553
|
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection`);
|
|
572
|
-
if (this.deviceLogging
|
|
554
|
+
if (this.deviceLogging.includes('debug')) {
|
|
573
555
|
this.errorLog(
|
|
574
556
|
`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` +
|
|
575
557
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
576
558
|
);
|
|
577
559
|
}
|
|
578
|
-
if (this.platform.debugMode) {
|
|
579
|
-
this.errorLog(`Humidifier: ${this.accessory.displayName} failed pushActiveChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
580
|
-
}
|
|
581
560
|
this.apiError(e);
|
|
582
561
|
}
|
|
583
562
|
}
|
|
@@ -763,7 +742,7 @@ export class Humidifier {
|
|
|
763
742
|
config['offline'] = device.offline;
|
|
764
743
|
}
|
|
765
744
|
if (Object.entries(config).length !== 0) {
|
|
766
|
-
this.
|
|
745
|
+
this.infoLog(`Humidifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
767
746
|
}
|
|
768
747
|
}
|
|
769
748
|
|
|
@@ -848,6 +827,6 @@ export class Humidifier {
|
|
|
848
827
|
}
|
|
849
828
|
|
|
850
829
|
enablingDeviceLogging(): boolean {
|
|
851
|
-
return this.deviceLogging
|
|
830
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
852
831
|
}
|
|
853
832
|
}
|
package/src/device/lock.ts
CHANGED
|
@@ -98,12 +98,9 @@ export class Lock {
|
|
|
98
98
|
await this.pushChanges();
|
|
99
99
|
} catch (e: any) {
|
|
100
100
|
this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges`);
|
|
101
|
-
if (this.deviceLogging
|
|
101
|
+
if (this.deviceLogging.includes('debug')) {
|
|
102
102
|
this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
103
103
|
}
|
|
104
|
-
if (this.platform.debugMode) {
|
|
105
|
-
this.errorLog(`Lock: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
|
|
106
|
-
}
|
|
107
104
|
this.apiError(e);
|
|
108
105
|
}
|
|
109
106
|
this.lockUpdateInProgress = false;
|
|
@@ -133,14 +130,11 @@ export class Lock {
|
|
|
133
130
|
this.updateHomeKitCharacteristics();
|
|
134
131
|
} catch (e: any) {
|
|
135
132
|
this.errorLog(`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
136
|
-
if (this.deviceLogging
|
|
133
|
+
if (this.deviceLogging.includes('debug')) {
|
|
137
134
|
this.errorLog(
|
|
138
135
|
`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
139
136
|
);
|
|
140
137
|
}
|
|
141
|
-
if (this.platform.debugMode) {
|
|
142
|
-
this.errorLog(`Lock: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
143
|
-
}
|
|
144
138
|
this.apiError(e);
|
|
145
139
|
}
|
|
146
140
|
}
|
|
@@ -264,7 +258,7 @@ export class Lock {
|
|
|
264
258
|
config['scanDuration'] = device.scanDuration;
|
|
265
259
|
}
|
|
266
260
|
if (Object.entries(config).length !== 0) {
|
|
267
|
-
this.
|
|
261
|
+
this.infoLog(`Lock: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
268
262
|
}
|
|
269
263
|
}
|
|
270
264
|
|
|
@@ -340,6 +334,6 @@ export class Lock {
|
|
|
340
334
|
}
|
|
341
335
|
|
|
342
336
|
enablingDeviceLogging(): boolean {
|
|
343
|
-
return this.deviceLogging
|
|
337
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
344
338
|
}
|
|
345
339
|
}
|
package/src/device/meter.ts
CHANGED
|
@@ -283,14 +283,11 @@ export class Meter {
|
|
|
283
283
|
})
|
|
284
284
|
.catch(async (e: any) => {
|
|
285
285
|
this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
|
|
286
|
-
if (this.deviceLogging
|
|
286
|
+
if (this.deviceLogging.includes('debug')) {
|
|
287
287
|
this.errorLog(
|
|
288
288
|
`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
289
289
|
);
|
|
290
290
|
}
|
|
291
|
-
if (this.platform.debugMode) {
|
|
292
|
-
this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
293
|
-
}
|
|
294
291
|
if (this.platform.config.credentials?.openToken) {
|
|
295
292
|
this.warnLog(`Meter: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
296
293
|
this.SwitchToOpenAPI = true;
|
|
@@ -324,14 +321,11 @@ export class Meter {
|
|
|
324
321
|
this.updateHomeKitCharacteristics();
|
|
325
322
|
} catch (e: any) {
|
|
326
323
|
this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
327
|
-
if (this.deviceLogging
|
|
324
|
+
if (this.deviceLogging.includes('debug')) {
|
|
328
325
|
this.errorLog(
|
|
329
326
|
`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
330
327
|
);
|
|
331
328
|
}
|
|
332
|
-
if (this.platform.debugMode) {
|
|
333
|
-
this.errorLog(`Meter: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
334
|
-
}
|
|
335
329
|
this.apiError(e);
|
|
336
330
|
}
|
|
337
331
|
}
|
|
@@ -417,7 +411,7 @@ export class Meter {
|
|
|
417
411
|
config['scanDuration'] = device.scanDuration;
|
|
418
412
|
}
|
|
419
413
|
if (Object.entries(config).length !== 0) {
|
|
420
|
-
this.
|
|
414
|
+
this.infoLog(`Meter: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
421
415
|
}
|
|
422
416
|
}
|
|
423
417
|
|
|
@@ -493,6 +487,6 @@ export class Meter {
|
|
|
493
487
|
}
|
|
494
488
|
|
|
495
489
|
enablingDeviceLogging(): boolean {
|
|
496
|
-
return this.deviceLogging
|
|
490
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
497
491
|
}
|
|
498
492
|
}
|
package/src/device/motion.ts
CHANGED
|
@@ -261,15 +261,12 @@ export class Motion {
|
|
|
261
261
|
})
|
|
262
262
|
.catch(async (e: any) => {
|
|
263
263
|
this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection`);
|
|
264
|
-
if (this.deviceLogging
|
|
264
|
+
if (this.deviceLogging.includes('debug')) {
|
|
265
265
|
this.errorLog(
|
|
266
266
|
`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` +
|
|
267
267
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
268
268
|
);
|
|
269
269
|
}
|
|
270
|
-
if (this.platform.debugMode) {
|
|
271
|
-
this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with BLE Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
272
|
-
}
|
|
273
270
|
if (this.platform.config.credentials?.openToken) {
|
|
274
271
|
this.warnLog(`Motion Sensor: ${this.accessory.displayName} Using OpenAPI Connection`);
|
|
275
272
|
this.SwitchToOpenAPI = true;
|
|
@@ -306,17 +303,12 @@ export class Motion {
|
|
|
306
303
|
this.updateHomeKitCharacteristics();
|
|
307
304
|
} catch (e: any) {
|
|
308
305
|
this.errorLog(`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
309
|
-
if (this.deviceLogging
|
|
306
|
+
if (this.deviceLogging.includes('debug')) {
|
|
310
307
|
this.errorLog(
|
|
311
308
|
`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` +
|
|
312
309
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
313
310
|
);
|
|
314
311
|
}
|
|
315
|
-
if (this.platform.debugMode) {
|
|
316
|
-
this.errorLog(
|
|
317
|
-
`Motion Sensor: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
|
|
318
|
-
);
|
|
319
|
-
}
|
|
320
312
|
this.apiError(e);
|
|
321
313
|
}
|
|
322
314
|
}
|
|
@@ -387,7 +379,7 @@ export class Motion {
|
|
|
387
379
|
config['offline'] = device.offline;
|
|
388
380
|
}
|
|
389
381
|
if (Object.entries(config).length !== 0) {
|
|
390
|
-
this.
|
|
382
|
+
this.infoLog(`Motion Sensor: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
391
383
|
}
|
|
392
384
|
}
|
|
393
385
|
|
|
@@ -481,6 +473,6 @@ export class Motion {
|
|
|
481
473
|
}
|
|
482
474
|
|
|
483
475
|
enablingDeviceLogging(): boolean {
|
|
484
|
-
return this.deviceLogging
|
|
476
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
485
477
|
}
|
|
486
478
|
}
|
package/src/device/plug.ts
CHANGED
|
@@ -95,12 +95,9 @@ export class Plug {
|
|
|
95
95
|
await this.pushChanges();
|
|
96
96
|
} catch (e: any) {
|
|
97
97
|
this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges`);
|
|
98
|
-
if (this.deviceLogging
|
|
98
|
+
if (this.deviceLogging.includes('debug')) {
|
|
99
99
|
this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
100
100
|
}
|
|
101
|
-
if (this.platform.debugMode) {
|
|
102
|
-
this.errorLog(`Plug: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
|
|
103
|
-
}
|
|
104
101
|
this.apiError(e);
|
|
105
102
|
}
|
|
106
103
|
this.plugUpdateInProgress = false;
|
|
@@ -127,14 +124,11 @@ export class Plug {
|
|
|
127
124
|
this.updateHomeKitCharacteristics();
|
|
128
125
|
} catch (e: any) {
|
|
129
126
|
this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection`);
|
|
130
|
-
if (this.deviceLogging
|
|
127
|
+
if (this.deviceLogging.includes('debug')) {
|
|
131
128
|
this.errorLog(
|
|
132
129
|
`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
133
130
|
);
|
|
134
131
|
}
|
|
135
|
-
if (this.platform.debugMode) {
|
|
136
|
-
this.errorLog(`Plug: ${this.accessory.displayName} failed refreshStatus with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
137
|
-
}
|
|
138
132
|
this.apiError(e);
|
|
139
133
|
}
|
|
140
134
|
}
|
|
@@ -278,7 +272,7 @@ export class Plug {
|
|
|
278
272
|
config['offline'] = device.offline;
|
|
279
273
|
}
|
|
280
274
|
if (Object.entries(config).length !== 0) {
|
|
281
|
-
this.
|
|
275
|
+
this.infoLog(`Plug: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
282
276
|
}
|
|
283
277
|
}
|
|
284
278
|
|
|
@@ -354,6 +348,6 @@ export class Plug {
|
|
|
354
348
|
}
|
|
355
349
|
|
|
356
350
|
enablingDeviceLogging(): boolean {
|
|
357
|
-
return this.deviceLogging
|
|
351
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
358
352
|
}
|
|
359
353
|
}
|
|
@@ -269,12 +269,9 @@ export class AirConditioner {
|
|
|
269
269
|
this.updateHomeKitCharacteristics();
|
|
270
270
|
} catch (e: any) {
|
|
271
271
|
this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges`);
|
|
272
|
-
if (this.deviceLogging
|
|
272
|
+
if (this.deviceLogging.includes('debug')) {
|
|
273
273
|
this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error Message: ${JSON.stringify(e.message)}`);
|
|
274
274
|
}
|
|
275
|
-
if (this.platform.debugMode) {
|
|
276
|
-
this.errorLog(`Air Conditioner: ${this.accessory.displayName} failed pushChanges,` + ` Error: ${JSON.stringify(e)}`);
|
|
277
|
-
}
|
|
278
275
|
this.apiError(e);
|
|
279
276
|
}
|
|
280
277
|
}
|
|
@@ -590,7 +587,7 @@ export class AirConditioner {
|
|
|
590
587
|
config['logging'] = device.logging;
|
|
591
588
|
}
|
|
592
589
|
if (Object.entries(config).length !== 0) {
|
|
593
|
-
this.
|
|
590
|
+
this.infoLog(`Air Conditioner: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
594
591
|
}
|
|
595
592
|
}
|
|
596
593
|
|
|
@@ -651,6 +648,6 @@ export class AirConditioner {
|
|
|
651
648
|
}
|
|
652
649
|
|
|
653
650
|
enablingDeviceLogging(): boolean {
|
|
654
|
-
return this.deviceLogging
|
|
651
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
655
652
|
}
|
|
656
653
|
}
|
|
@@ -228,14 +228,11 @@ export class AirPurifier {
|
|
|
228
228
|
this.accessory.context.CurrentTemperature = this.CurrentTemperatureCached;
|
|
229
229
|
} catch (e: any) {
|
|
230
230
|
this.errorLog(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
231
|
-
if (this.deviceLogging
|
|
231
|
+
if (this.deviceLogging.includes('debug')) {
|
|
232
232
|
this.errorLog(
|
|
233
233
|
`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
234
234
|
);
|
|
235
235
|
}
|
|
236
|
-
if (this.platform.debugMode) {
|
|
237
|
-
this.errorLog(`Air Purifier: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
238
|
-
}
|
|
239
236
|
this.apiError(e);
|
|
240
237
|
}
|
|
241
238
|
}
|
|
@@ -288,7 +285,7 @@ export class AirPurifier {
|
|
|
288
285
|
config['logging'] = device.logging;
|
|
289
286
|
}
|
|
290
287
|
if (Object.entries(config).length !== 0) {
|
|
291
|
-
this.
|
|
288
|
+
this.infoLog(`Air Purifier: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
292
289
|
}
|
|
293
290
|
}
|
|
294
291
|
|
|
@@ -340,6 +337,6 @@ export class AirPurifier {
|
|
|
340
337
|
}
|
|
341
338
|
|
|
342
339
|
enablingDeviceLogging(): boolean {
|
|
343
|
-
return this.deviceLogging
|
|
340
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
344
341
|
}
|
|
345
342
|
}
|
package/src/irdevice/camera.ts
CHANGED
|
@@ -120,14 +120,11 @@ export class Camera {
|
|
|
120
120
|
this.accessory.context.On = this.OnCached;
|
|
121
121
|
} catch (e: any) {
|
|
122
122
|
this.errorLog(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
123
|
-
if (this.deviceLogging
|
|
123
|
+
if (this.deviceLogging.includes('debug')) {
|
|
124
124
|
this.errorLog(
|
|
125
125
|
`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
126
126
|
);
|
|
127
127
|
}
|
|
128
|
-
if (this.platform.debugMode) {
|
|
129
|
-
this.errorLog(`Camera: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
130
|
-
}
|
|
131
128
|
this.apiError(e);
|
|
132
129
|
}
|
|
133
130
|
}
|
|
@@ -177,7 +174,7 @@ export class Camera {
|
|
|
177
174
|
config['logging'] = device.logging;
|
|
178
175
|
}
|
|
179
176
|
if (Object.entries(config).length !== 0) {
|
|
180
|
-
this.
|
|
177
|
+
this.infoLog(`Camera: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
181
178
|
}
|
|
182
179
|
}
|
|
183
180
|
|
|
@@ -229,6 +226,6 @@ export class Camera {
|
|
|
229
226
|
}
|
|
230
227
|
|
|
231
228
|
enablingDeviceLogging(): boolean {
|
|
232
|
-
return this.deviceLogging
|
|
229
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
233
230
|
}
|
|
234
231
|
}
|
package/src/irdevice/fan.ts
CHANGED
|
@@ -245,14 +245,11 @@ export class Fan {
|
|
|
245
245
|
this.updateHomeKitCharacteristics();
|
|
246
246
|
} catch (e: any) {
|
|
247
247
|
this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
248
|
-
if (this.deviceLogging
|
|
248
|
+
if (this.deviceLogging.includes('debug')) {
|
|
249
249
|
this.errorLog(
|
|
250
250
|
`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
251
251
|
);
|
|
252
252
|
}
|
|
253
|
-
if (this.platform.debugMode) {
|
|
254
|
-
this.errorLog(`Fan: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
255
|
-
}
|
|
256
253
|
this.apiError(e);
|
|
257
254
|
}
|
|
258
255
|
}
|
|
@@ -304,7 +301,7 @@ export class Fan {
|
|
|
304
301
|
config['logging'] = device.logging;
|
|
305
302
|
}
|
|
306
303
|
if (Object.entries(config).length !== 0) {
|
|
307
|
-
this.
|
|
304
|
+
this.infoLog(`Fan: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
308
305
|
}
|
|
309
306
|
}
|
|
310
307
|
|
|
@@ -356,6 +353,6 @@ export class Fan {
|
|
|
356
353
|
}
|
|
357
354
|
|
|
358
355
|
enablingDeviceLogging(): boolean {
|
|
359
|
-
return this.deviceLogging
|
|
356
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
360
357
|
}
|
|
361
358
|
}
|
package/src/irdevice/light.ts
CHANGED
|
@@ -153,14 +153,11 @@ export class Light {
|
|
|
153
153
|
this.updateHomeKitCharacteristics();
|
|
154
154
|
} catch (e: any) {
|
|
155
155
|
this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
156
|
-
if (this.deviceLogging
|
|
156
|
+
if (this.deviceLogging.includes('debug')) {
|
|
157
157
|
this.errorLog(
|
|
158
158
|
`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
159
159
|
);
|
|
160
160
|
}
|
|
161
|
-
if (this.platform.debugMode) {
|
|
162
|
-
this.errorLog(`Light: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
163
|
-
}
|
|
164
161
|
this.apiError(e);
|
|
165
162
|
}
|
|
166
163
|
}
|
|
@@ -210,7 +207,7 @@ export class Light {
|
|
|
210
207
|
config['logging'] = device.logging;
|
|
211
208
|
}
|
|
212
209
|
if (Object.entries(config).length !== 0) {
|
|
213
|
-
this.
|
|
210
|
+
this.infoLog(`Light: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
214
211
|
}
|
|
215
212
|
}
|
|
216
213
|
|
|
@@ -262,6 +259,6 @@ export class Light {
|
|
|
262
259
|
}
|
|
263
260
|
|
|
264
261
|
enablingDeviceLogging(): boolean {
|
|
265
|
-
return this.deviceLogging
|
|
262
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
266
263
|
}
|
|
267
264
|
}
|
package/src/irdevice/other.ts
CHANGED
|
@@ -152,14 +152,11 @@ export class Others {
|
|
|
152
152
|
this.updateHomeKitCharacteristics();
|
|
153
153
|
} catch (e: any) {
|
|
154
154
|
this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
155
|
-
if (this.deviceLogging
|
|
155
|
+
if (this.deviceLogging.includes('debug')) {
|
|
156
156
|
this.errorLog(
|
|
157
157
|
`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error Message: ${JSON.stringify(e.message)}`,
|
|
158
158
|
);
|
|
159
159
|
}
|
|
160
|
-
if (this.platform.debugMode) {
|
|
161
|
-
this.errorLog(`Other: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`);
|
|
162
|
-
}
|
|
163
160
|
this.apiError(e);
|
|
164
161
|
}
|
|
165
162
|
}
|
|
@@ -203,7 +200,7 @@ export class Others {
|
|
|
203
200
|
async deviceType(device: irdevice & irDevicesConfig): Promise<void> {
|
|
204
201
|
if (device.other?.deviceType) {
|
|
205
202
|
this.otherDeviceType = this.accessory.context.deviceType = device.other.deviceType;
|
|
206
|
-
if (this.deviceLogging
|
|
203
|
+
if (this.deviceLogging.includes('debug') || this.deviceLogging === 'standard') {
|
|
207
204
|
this.warnLog(`Other: ${this.accessory.displayName} Using Device Type: ${this.otherDeviceType}`);
|
|
208
205
|
}
|
|
209
206
|
} else {
|
|
@@ -220,7 +217,7 @@ export class Others {
|
|
|
220
217
|
config['logging'] = device.logging;
|
|
221
218
|
}
|
|
222
219
|
if (Object.entries(config).length !== 0) {
|
|
223
|
-
this.
|
|
220
|
+
this.infoLog(`Other: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
224
221
|
}
|
|
225
222
|
}
|
|
226
223
|
|
|
@@ -272,6 +269,6 @@ export class Others {
|
|
|
272
269
|
}
|
|
273
270
|
|
|
274
271
|
enablingDeviceLogging(): boolean {
|
|
275
|
-
return this.deviceLogging
|
|
272
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
276
273
|
}
|
|
277
274
|
}
|
package/src/irdevice/tv.ts
CHANGED
|
@@ -348,17 +348,12 @@ export class TV {
|
|
|
348
348
|
this.updateHomeKitCharacteristics();
|
|
349
349
|
} catch (e: any) {
|
|
350
350
|
this.errorLog(`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection`);
|
|
351
|
-
if (this.deviceLogging
|
|
351
|
+
if (this.deviceLogging.includes('debug')) {
|
|
352
352
|
this.errorLog(
|
|
353
353
|
`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` +
|
|
354
354
|
` Error Message: ${JSON.stringify(e.message)}`,
|
|
355
355
|
);
|
|
356
356
|
}
|
|
357
|
-
if (this.platform.debugMode) {
|
|
358
|
-
this.errorLog(
|
|
359
|
-
`${this.device.remoteType}: ${this.accessory.displayName} failed pushChanges with OpenAPI Connection,` + ` Error: ${JSON.stringify(e)}`,
|
|
360
|
-
);
|
|
361
|
-
}
|
|
362
357
|
this.apiError(e);
|
|
363
358
|
}
|
|
364
359
|
}
|
|
@@ -410,7 +405,7 @@ export class TV {
|
|
|
410
405
|
config['logging'] = device.logging;
|
|
411
406
|
}
|
|
412
407
|
if (Object.entries(config).length !== 0) {
|
|
413
|
-
this.
|
|
408
|
+
this.infoLog(`${this.device.remoteType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
414
409
|
}
|
|
415
410
|
}
|
|
416
411
|
|
|
@@ -462,6 +457,6 @@ export class TV {
|
|
|
462
457
|
}
|
|
463
458
|
|
|
464
459
|
enablingDeviceLogging(): boolean {
|
|
465
|
-
return this.deviceLogging
|
|
460
|
+
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
466
461
|
}
|
|
467
462
|
}
|