@switchbot/homebridge-switchbot 3.7.1-beta.1 → 3.7.1-beta.2
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/dist/device/device.d.ts.map +1 -1
- package/dist/device/device.js +247 -394
- package/dist/device/device.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts.map +1 -1
- package/dist/irdevice/irdevice.js +30 -133
- package/dist/irdevice/irdevice.js.map +1 -1
- package/package.json +1 -1
- package/src/device/device.ts +283 -395
- package/src/irdevice/irdevice.ts +54 -134
package/dist/device/device.js
CHANGED
|
@@ -141,114 +141,9 @@ export class deviceBase {
|
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
async getDeviceConfigSettings(device) {
|
|
144
|
-
const deviceConfig = {};
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
}
|
|
148
|
-
if (device.refreshRate !== 0) {
|
|
149
|
-
deviceConfig['refreshRate'] = device.refreshRate;
|
|
150
|
-
}
|
|
151
|
-
if (device.updateRate !== 0) {
|
|
152
|
-
deviceConfig['updateRate'] = device.updateRate;
|
|
153
|
-
}
|
|
154
|
-
if (device.scanDuration !== 0) {
|
|
155
|
-
deviceConfig['scanDuration'] = device.scanDuration;
|
|
156
|
-
}
|
|
157
|
-
if (device.offline === true) {
|
|
158
|
-
deviceConfig['offline'] = device.offline;
|
|
159
|
-
}
|
|
160
|
-
if (device.maxRetry !== 0) {
|
|
161
|
-
deviceConfig['maxRetry'] = device.maxRetry;
|
|
162
|
-
}
|
|
163
|
-
if (device.webhook === true) {
|
|
164
|
-
deviceConfig['webhook'] = device.webhook;
|
|
165
|
-
}
|
|
166
|
-
if (device.connectionType !== '') {
|
|
167
|
-
deviceConfig['connectionType'] = device.connectionType;
|
|
168
|
-
}
|
|
169
|
-
if (device.external === true) {
|
|
170
|
-
deviceConfig['external'] = device.external;
|
|
171
|
-
}
|
|
172
|
-
if (device.mqttURL !== '') {
|
|
173
|
-
deviceConfig['mqttURL'] = device.mqttURL;
|
|
174
|
-
}
|
|
175
|
-
if (device.mqttOptions) {
|
|
176
|
-
deviceConfig['mqttOptions'] = device.mqttOptions;
|
|
177
|
-
}
|
|
178
|
-
if (device.mqttPubOptions) {
|
|
179
|
-
deviceConfig['mqttPubOptions'] = device.mqttPubOptions;
|
|
180
|
-
}
|
|
181
|
-
if (device.maxRetries !== 0) {
|
|
182
|
-
deviceConfig['maxRetries'] = device.maxRetries;
|
|
183
|
-
}
|
|
184
|
-
if (device.delayBetweenRetries !== 0) {
|
|
185
|
-
deviceConfig['delayBetweenRetries'] = device.delayBetweenRetries;
|
|
186
|
-
}
|
|
187
|
-
let botConfig = {};
|
|
188
|
-
if (device.bot) {
|
|
189
|
-
botConfig = device.bot;
|
|
190
|
-
}
|
|
191
|
-
let lockConfig = {};
|
|
192
|
-
if (device.lock) {
|
|
193
|
-
lockConfig = device.lock;
|
|
194
|
-
}
|
|
195
|
-
let ceilinglightConfig = {};
|
|
196
|
-
if (device.ceilinglight) {
|
|
197
|
-
ceilinglightConfig = device.ceilinglight;
|
|
198
|
-
}
|
|
199
|
-
let colorbulbConfig = {};
|
|
200
|
-
if (device.colorbulb) {
|
|
201
|
-
colorbulbConfig = device.colorbulb;
|
|
202
|
-
}
|
|
203
|
-
let contactConfig = {};
|
|
204
|
-
if (device.contact) {
|
|
205
|
-
contactConfig = device.contact;
|
|
206
|
-
}
|
|
207
|
-
let motionConfig = {};
|
|
208
|
-
if (device.motion) {
|
|
209
|
-
motionConfig = device.motion;
|
|
210
|
-
}
|
|
211
|
-
let curtainConfig = {};
|
|
212
|
-
if (device.curtain) {
|
|
213
|
-
curtainConfig = device.curtain;
|
|
214
|
-
}
|
|
215
|
-
let hubConfig = {};
|
|
216
|
-
if (device.hub) {
|
|
217
|
-
hubConfig = device.hub;
|
|
218
|
-
}
|
|
219
|
-
let waterdetectorConfig = {};
|
|
220
|
-
if (device.waterdetector) {
|
|
221
|
-
waterdetectorConfig = device.waterdetector;
|
|
222
|
-
}
|
|
223
|
-
let humidifierConfig = {};
|
|
224
|
-
if (device.humidifier) {
|
|
225
|
-
humidifierConfig = device.humidifier;
|
|
226
|
-
}
|
|
227
|
-
let meterConfig = {};
|
|
228
|
-
if (device.meter) {
|
|
229
|
-
meterConfig = device.meter;
|
|
230
|
-
}
|
|
231
|
-
let iosensorConfig = {};
|
|
232
|
-
if (device.iosensor) {
|
|
233
|
-
iosensorConfig = device.iosensor;
|
|
234
|
-
}
|
|
235
|
-
let striplightConfig = {};
|
|
236
|
-
if (device.striplight) {
|
|
237
|
-
striplightConfig = device.striplight;
|
|
238
|
-
}
|
|
239
|
-
let plugConfig = {};
|
|
240
|
-
if (device.plug) {
|
|
241
|
-
plugConfig = device.plug;
|
|
242
|
-
}
|
|
243
|
-
let blindTiltConfig = {};
|
|
244
|
-
if (device.blindTilt) {
|
|
245
|
-
if (device.blindTilt?.mode === undefined) {
|
|
246
|
-
blindTiltConfig['mode'] = BlindTiltMappingMode.OnlyUp;
|
|
247
|
-
}
|
|
248
|
-
blindTiltConfig = device.blindTilt;
|
|
249
|
-
}
|
|
250
|
-
const config = Object.assign({}, deviceConfig, botConfig, curtainConfig, waterdetectorConfig, striplightConfig, plugConfig, iosensorConfig, meterConfig, humidifierConfig, hubConfig, lockConfig, ceilinglightConfig, colorbulbConfig, contactConfig, motionConfig, blindTiltConfig);
|
|
251
|
-
if (Object.entries(config).length !== 0) {
|
|
144
|
+
const deviceConfig = Object.assign({}, device.logging !== 'standard' && { logging: device.logging }, device.refreshRate !== 0 && { refreshRate: device.refreshRate }, device.updateRate !== 0 && { updateRate: device.updateRate }, device.scanDuration !== 0 && { scanDuration: device.scanDuration }, device.offline === true && { offline: device.offline }, device.maxRetry !== 0 && { maxRetry: device.maxRetry }, device.webhook === true && { webhook: device.webhook }, device.connectionType !== '' && { connectionType: device.connectionType }, device.external === true && { external: device.external }, device.mqttURL !== '' && { mqttURL: device.mqttURL }, device.mqttOptions && { mqttOptions: device.mqttOptions }, device.mqttPubOptions && { mqttPubOptions: device.mqttPubOptions }, device.maxRetries !== 0 && { maxRetries: device.maxRetries }, device.delayBetweenRetries !== 0 && { delayBetweenRetries: device.delayBetweenRetries });
|
|
145
|
+
const config = Object.assign({}, deviceConfig, device.bot, device.lock, device.ceilinglight, device.colorbulb, device.contact, device.motion, device.curtain, device.hub, device.waterdetector, device.humidifier, device.meter, device.iosensor, device.striplight, device.plug, device.blindTilt?.mode === undefined ? { mode: BlindTiltMappingMode.OnlyUp } : {}, device.blindTilt);
|
|
146
|
+
if (Object.keys(config).length !== 0) {
|
|
252
147
|
this.debugSuccessLog(`Config: ${JSON.stringify(config)}`);
|
|
253
148
|
}
|
|
254
149
|
}
|
|
@@ -413,224 +308,225 @@ export class deviceBase {
|
|
|
413
308
|
}
|
|
414
309
|
}
|
|
415
310
|
async getDeviceContext(accessory, device) {
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
483
|
-
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
|
|
513
|
-
|
|
514
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
}
|
|
311
|
+
const deviceMapping = {
|
|
312
|
+
'Humidifier': {
|
|
313
|
+
model: SwitchBotModel.Humidifier,
|
|
314
|
+
bleModel: SwitchBotBLEModel.Humidifier,
|
|
315
|
+
bleModelName: SwitchBotBLEModelName.Humidifier,
|
|
316
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Humidifier,
|
|
317
|
+
},
|
|
318
|
+
'Hub Mini': {
|
|
319
|
+
model: SwitchBotModel.HubMini,
|
|
320
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
321
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
322
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
323
|
+
},
|
|
324
|
+
'Hub Plus': {
|
|
325
|
+
model: SwitchBotModel.HubPlus,
|
|
326
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
327
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
328
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
329
|
+
},
|
|
330
|
+
'Hub 2': {
|
|
331
|
+
model: SwitchBotModel.Hub2,
|
|
332
|
+
bleModel: SwitchBotBLEModel.Hub2,
|
|
333
|
+
bleModelName: SwitchBotBLEModelName.Hub2,
|
|
334
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Hub2,
|
|
335
|
+
},
|
|
336
|
+
'Bot': {
|
|
337
|
+
model: SwitchBotModel.Bot,
|
|
338
|
+
bleModel: SwitchBotBLEModel.Bot,
|
|
339
|
+
bleModelName: SwitchBotBLEModelName.Bot,
|
|
340
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Bot,
|
|
341
|
+
},
|
|
342
|
+
'Meter': {
|
|
343
|
+
model: SwitchBotModel.Meter,
|
|
344
|
+
bleModel: SwitchBotBLEModel.Meter,
|
|
345
|
+
bleModelName: SwitchBotBLEModelName.Meter,
|
|
346
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Meter,
|
|
347
|
+
},
|
|
348
|
+
'MeterPlus': {
|
|
349
|
+
model: SwitchBotModel.MeterPlusUS,
|
|
350
|
+
bleModel: SwitchBotBLEModel.MeterPlus,
|
|
351
|
+
bleModelName: SwitchBotBLEModelName.MeterPlus,
|
|
352
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.MeterPlus,
|
|
353
|
+
},
|
|
354
|
+
'Meter Plus (JP)': {
|
|
355
|
+
model: SwitchBotModel.MeterPlusJP,
|
|
356
|
+
bleModel: SwitchBotBLEModel.MeterPlus,
|
|
357
|
+
bleModelName: SwitchBotBLEModelName.MeterPlus,
|
|
358
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.MeterPlus,
|
|
359
|
+
},
|
|
360
|
+
'WoIOSensor': {
|
|
361
|
+
model: SwitchBotModel.OutdoorMeter,
|
|
362
|
+
bleModel: SwitchBotBLEModel.OutdoorMeter,
|
|
363
|
+
bleModelName: SwitchBotBLEModelName.OutdoorMeter,
|
|
364
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.OutdoorMeter,
|
|
365
|
+
},
|
|
366
|
+
'Water Detector': {
|
|
367
|
+
model: SwitchBotModel.WaterDetector,
|
|
368
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
369
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
370
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
371
|
+
},
|
|
372
|
+
'Motion Sensor': {
|
|
373
|
+
model: SwitchBotModel.MotionSensor,
|
|
374
|
+
bleModel: SwitchBotBLEModel.MotionSensor,
|
|
375
|
+
bleModelName: SwitchBotBLEModelName.MotionSensor,
|
|
376
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.MotionSensor,
|
|
377
|
+
},
|
|
378
|
+
'Contact Sensor': {
|
|
379
|
+
model: SwitchBotModel.ContactSensor,
|
|
380
|
+
bleModel: SwitchBotBLEModel.ContactSensor,
|
|
381
|
+
bleModelName: SwitchBotBLEModelName.ContactSensor,
|
|
382
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.ContactSensor,
|
|
383
|
+
},
|
|
384
|
+
'Curtain': {
|
|
385
|
+
model: SwitchBotModel.Curtain,
|
|
386
|
+
bleModel: SwitchBotBLEModel.Curtain,
|
|
387
|
+
bleModelName: SwitchBotBLEModelName.Curtain,
|
|
388
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Curtain,
|
|
389
|
+
},
|
|
390
|
+
'Curtain3': {
|
|
391
|
+
model: SwitchBotModel.Curtain3,
|
|
392
|
+
bleModel: SwitchBotBLEModel.Curtain3,
|
|
393
|
+
bleModelName: SwitchBotBLEModelName.Curtain3,
|
|
394
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Curtain3,
|
|
395
|
+
},
|
|
396
|
+
'Blind Tilt': {
|
|
397
|
+
model: SwitchBotModel.BlindTilt,
|
|
398
|
+
bleModel: SwitchBotBLEModel.BlindTilt,
|
|
399
|
+
bleModelName: SwitchBotBLEModelName.BlindTilt,
|
|
400
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.BlindTilt,
|
|
401
|
+
},
|
|
402
|
+
'Plug': {
|
|
403
|
+
model: SwitchBotModel.Plug,
|
|
404
|
+
bleModel: SwitchBotBLEModel.PlugMiniUS,
|
|
405
|
+
bleModelName: SwitchBotBLEModelName.PlugMini,
|
|
406
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.PlugMini,
|
|
407
|
+
},
|
|
408
|
+
'Plug Mini (US)': {
|
|
409
|
+
model: SwitchBotModel.PlugMiniUS,
|
|
410
|
+
bleModel: SwitchBotBLEModel.PlugMiniUS,
|
|
411
|
+
bleModelName: SwitchBotBLEModelName.PlugMini,
|
|
412
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.PlugMini,
|
|
413
|
+
},
|
|
414
|
+
'Plug Mini (JP)': {
|
|
415
|
+
model: SwitchBotModel.PlugMiniJP,
|
|
416
|
+
bleModel: SwitchBotBLEModel.PlugMiniJP,
|
|
417
|
+
bleModelName: SwitchBotBLEModelName.PlugMini,
|
|
418
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.PlugMini,
|
|
419
|
+
},
|
|
420
|
+
'Smart Lock': {
|
|
421
|
+
model: SwitchBotModel.Lock,
|
|
422
|
+
bleModel: SwitchBotBLEModel.Lock,
|
|
423
|
+
bleModelName: SwitchBotBLEModelName.Lock,
|
|
424
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Lock,
|
|
425
|
+
},
|
|
426
|
+
'Smart Lock Pro': {
|
|
427
|
+
model: SwitchBotModel.LockPro,
|
|
428
|
+
bleModel: SwitchBotBLEModel.LockPro,
|
|
429
|
+
bleModelName: SwitchBotBLEModelName.LockPro,
|
|
430
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.LockPro,
|
|
431
|
+
},
|
|
432
|
+
'Color Bulb': {
|
|
433
|
+
model: SwitchBotModel.ColorBulb,
|
|
434
|
+
bleModel: SwitchBotBLEModel.ColorBulb,
|
|
435
|
+
bleModelName: SwitchBotBLEModelName.ColorBulb,
|
|
436
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.ColorBulb,
|
|
437
|
+
},
|
|
438
|
+
'K10+': {
|
|
439
|
+
model: SwitchBotModel.K10,
|
|
440
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
441
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
442
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
443
|
+
},
|
|
444
|
+
'WoSweeper': {
|
|
445
|
+
model: SwitchBotModel.WoSweeper,
|
|
446
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
447
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
448
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
449
|
+
},
|
|
450
|
+
'WoSweeperMini': {
|
|
451
|
+
model: SwitchBotModel.WoSweeperMini,
|
|
452
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
453
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
454
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
455
|
+
},
|
|
456
|
+
'Robot Vacuum Cleaner S1': {
|
|
457
|
+
model: SwitchBotModel.RobotVacuumCleanerS1,
|
|
458
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
459
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
460
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
461
|
+
},
|
|
462
|
+
'Robot Vacuum Cleaner S1 Plus': {
|
|
463
|
+
model: SwitchBotModel.RobotVacuumCleanerS1Plus,
|
|
464
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
465
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
466
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
467
|
+
},
|
|
468
|
+
'Robot Vacuum Cleaner S10': {
|
|
469
|
+
model: SwitchBotModel.RobotVacuumCleanerS10,
|
|
470
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
471
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
472
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
473
|
+
},
|
|
474
|
+
'Ceiling Light': {
|
|
475
|
+
model: SwitchBotModel.CeilingLight,
|
|
476
|
+
bleModel: SwitchBotBLEModel.CeilingLight,
|
|
477
|
+
bleModelName: SwitchBotBLEModelName.CeilingLight,
|
|
478
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.CeilingLight,
|
|
479
|
+
},
|
|
480
|
+
'Ceiling Light Pro': {
|
|
481
|
+
model: SwitchBotModel.CeilingLightPro,
|
|
482
|
+
bleModel: SwitchBotBLEModel.CeilingLightPro,
|
|
483
|
+
bleModelName: SwitchBotBLEModelName.CeilingLightPro,
|
|
484
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.CeilingLightPro,
|
|
485
|
+
},
|
|
486
|
+
'Strip Light': {
|
|
487
|
+
model: SwitchBotModel.StripLight,
|
|
488
|
+
bleModel: SwitchBotBLEModel.StripLight,
|
|
489
|
+
bleModelName: SwitchBotBLEModelName.StripLight,
|
|
490
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.StripLight,
|
|
491
|
+
},
|
|
492
|
+
'Indoor Cam': {
|
|
493
|
+
model: SwitchBotModel.IndoorCam,
|
|
494
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
495
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
496
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
497
|
+
},
|
|
498
|
+
'Remote': {
|
|
499
|
+
model: SwitchBotModel.Remote,
|
|
500
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
501
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
502
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
503
|
+
},
|
|
504
|
+
'remote with screen+': {
|
|
505
|
+
model: SwitchBotModel.UniversalRemote,
|
|
506
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
507
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
508
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
509
|
+
},
|
|
510
|
+
'Battery Circulator Fan': {
|
|
511
|
+
model: SwitchBotModel.BatteryCirculatorFan,
|
|
512
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
513
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
514
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
515
|
+
},
|
|
516
|
+
};
|
|
517
|
+
const defaultDevice = {
|
|
518
|
+
model: SwitchBotModel.Unknown,
|
|
519
|
+
bleModel: SwitchBotBLEModel.Unknown,
|
|
520
|
+
bleModelName: SwitchBotBLEModelName.Unknown,
|
|
521
|
+
bleModelFriendlyName: SwitchBotBLEModelFriendlyName.Unknown,
|
|
522
|
+
};
|
|
523
|
+
const deviceConfig = deviceMapping[device.deviceType] || defaultDevice;
|
|
524
|
+
device.model = deviceConfig.model;
|
|
525
|
+
device.bleModel = deviceConfig.bleModel;
|
|
526
|
+
device.bleModelName = deviceConfig.bleModelName;
|
|
527
|
+
device.bleModelFriednlyName = deviceConfig.bleModelFriednlyName;
|
|
628
528
|
await this.debugLog(`Model: ${device.model}, BLE Model: ${device.bleModel}, BLE Model Name: ${device.bleModelName}, `
|
|
629
529
|
+ `BLE Model Friendly Name: ${device.bleModelFriednlyName}`);
|
|
630
|
-
accessory.context.model = device.model;
|
|
631
|
-
accessory.context.bleModel = device.bleModel;
|
|
632
|
-
accessory.context.bleModelName = device.bleModelName;
|
|
633
|
-
accessory.context.bleModelFriednlyName = device.bleModelFriednlyName;
|
|
634
530
|
const deviceFirmwareVersion = device.firmware ?? device.version ?? accessory.context.version ?? this.platform.version ?? '0.0.0';
|
|
635
531
|
const version = deviceFirmwareVersion.toString();
|
|
636
532
|
this.debugLog(`Firmware Version: ${version.replace(/^V|-.*$/g, '')}`);
|
|
@@ -655,76 +551,33 @@ export class deviceBase {
|
|
|
655
551
|
this.debugSuccessLog(`version: ${accessory.context.version}`);
|
|
656
552
|
}
|
|
657
553
|
async statusCode(statusCode) {
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
|
|
685
|
-
case 190:
|
|
686
|
-
this.errorLog('Device internal error due to device states not synchronized with server, or command format is invalid,'
|
|
687
|
-
+ ` statusCode: ${statusCode}`);
|
|
688
|
-
break;
|
|
689
|
-
case 100:
|
|
690
|
-
this.debugLog(`Command successfully sent, statusCode: ${statusCode}`);
|
|
691
|
-
break;
|
|
692
|
-
case 200:
|
|
693
|
-
this.debugLog(`Request successful, statusCode: ${statusCode}`);
|
|
694
|
-
break;
|
|
695
|
-
case 400:
|
|
696
|
-
this.errorLog(`Bad Request, an invalid payload request, statusCode: ${statusCode}`);
|
|
697
|
-
break;
|
|
698
|
-
case 401:
|
|
699
|
-
this.errorLog(`Unauthorized, Authorization for the API is required, but the request has not been authenticated, statusCode: ${statusCode}`);
|
|
700
|
-
break;
|
|
701
|
-
case 403:
|
|
702
|
-
this.errorLog('Forbidden, The request has been authenticated but does not have appropriate permissions,'
|
|
703
|
-
+ ` or a requested resource is not found, statusCode: ${statusCode}`);
|
|
704
|
-
break;
|
|
705
|
-
case 404:
|
|
706
|
-
this.errorLog(`Not Found, Specifies the requested path does not exist, statusCode: ${statusCode}`);
|
|
707
|
-
break;
|
|
708
|
-
case 406:
|
|
709
|
-
this.errorLog('Not Acceptable, a MIME type has been requested via the Accept header for a value not supported by the server,'
|
|
710
|
-
+ ` statusCode: ${statusCode}`);
|
|
711
|
-
break;
|
|
712
|
-
case 415:
|
|
713
|
-
this.errorLog(`Unsupported Media Type, a contentType header has been defined that is not supported by the server, statusCode: ${statusCode}`);
|
|
714
|
-
break;
|
|
715
|
-
case 422:
|
|
716
|
-
this.errorLog('Unprocessable Entity, a valid request has been made, but the server cannot process it. '
|
|
717
|
-
+ `This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
|
|
718
|
-
break;
|
|
719
|
-
case 429:
|
|
720
|
-
this.errorLog(`Too Many Requests, exceeded the number of requests allowed for a given time window, statusCode: ${statusCode}`);
|
|
721
|
-
break;
|
|
722
|
-
case 500:
|
|
723
|
-
this.errorLog(`Internal Server Error, An unexpected error occurred. These errors should be rare, statusCode: ${statusCode}`);
|
|
724
|
-
break;
|
|
725
|
-
default:
|
|
726
|
-
this.infoLog(`Unknown statusCode: ${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`);
|
|
727
|
-
}
|
|
554
|
+
const statusMessages = {
|
|
555
|
+
151: 'Command not supported by this deviceType',
|
|
556
|
+
152: 'Device not found',
|
|
557
|
+
160: 'Command is not supported',
|
|
558
|
+
161: 'Device is offline',
|
|
559
|
+
171: `Hub Device is offline. Hub: ${this.device.hubDeviceId}`,
|
|
560
|
+
190: 'Device internal error due to device states not synchronized with server, or command format is invalid',
|
|
561
|
+
100: 'Command successfully sent',
|
|
562
|
+
200: 'Request successful',
|
|
563
|
+
400: 'Bad Request, an invalid payload request',
|
|
564
|
+
401: 'Unauthorized, Authorization for the API is required, but the request has not been authenticated',
|
|
565
|
+
403: 'Forbidden, The request has been authenticated but does not have appropriate permissions, or a requested resource is not found',
|
|
566
|
+
404: 'Not Found, Specifies the requested path does not exist',
|
|
567
|
+
406: 'Not Acceptable, a MIME type has been requested via the Accept header for a value not supported by the server',
|
|
568
|
+
415: 'Unsupported Media Type, a contentType header has been defined that is not supported by the server',
|
|
569
|
+
422: 'Unprocessable Entity: The server cannot process the request, often due to exceeded API limits.',
|
|
570
|
+
429: 'Too Many Requests, exceeded the number of requests allowed for a given time window',
|
|
571
|
+
500: 'Internal Server Error, An unexpected error occurred. These errors should be rare',
|
|
572
|
+
};
|
|
573
|
+
if (statusCode === 171 && (this.device.hubDeviceId === this.device.deviceId || this.device.hubDeviceId === '000000000000')) {
|
|
574
|
+
this.debugErrorLog(`statusCode 171 changed to 161: hubDeviceId ${this.device.hubDeviceId} matches deviceId`
|
|
575
|
+
+ ` ${this.device.deviceId}, device is its own hub.`);
|
|
576
|
+
statusCode = 161;
|
|
577
|
+
}
|
|
578
|
+
const logMessage = statusMessages[statusCode] || `Unknown statusCode: ${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`;
|
|
579
|
+
const logMethod = [100, 200].includes(statusCode) ? 'debugLog' : statusMessages[statusCode] ? 'errorLog' : 'infoLog';
|
|
580
|
+
this[logMethod](`${logMessage}, statusCode: ${statusCode}`);
|
|
728
581
|
}
|
|
729
582
|
/**
|
|
730
583
|
* Logging for Device
|