@switchbot/homebridge-switchbot 3.5.0-beta.5 → 3.5.0-beta.51
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 +2 -0
- package/config.schema.json +120 -17
- package/dist/device/blindtilt.d.ts +21 -94
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +352 -757
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +25 -71
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +588 -761
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +13 -67
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +214 -588
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +13 -74
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +256 -634
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +14 -65
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +209 -532
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +17 -86
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +340 -787
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +59 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +682 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +51 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +505 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +15 -59
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +247 -597
- package/dist/device/hub.js.map +1 -1
- package/dist/device/humidifier.d.ts +10 -65
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +218 -579
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +11 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +179 -585
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +10 -68
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +257 -569
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +15 -62
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +215 -543
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +13 -63
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +175 -578
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +13 -64
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +164 -578
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +13 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +142 -520
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +9 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +87 -453
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +11 -62
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +145 -452
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +9 -70
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +126 -665
- package/dist/device/waterdetector.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +2 -2
- package/dist/index.js +1 -1
- package/dist/irdevice/airconditioner.d.ts +8 -48
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +309 -419
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts +7 -38
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +72 -304
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts +6 -35
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +34 -278
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +6 -39
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +67 -311
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +40 -0
- package/dist/irdevice/irdevice.d.ts.map +1 -0
- package/dist/irdevice/irdevice.js +512 -0
- package/dist/irdevice/irdevice.js.map +1 -0
- package/dist/irdevice/light.d.ts +6 -34
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +23 -272
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts +18 -47
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +352 -546
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts +7 -39
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +82 -321
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts +6 -35
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +41 -284
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts +6 -35
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +42 -287
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.d.ts +14 -1
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +291 -147
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +41 -11
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +0 -552
- package/dist/settings.js.map +1 -1
- package/dist/utils.d.ts +77 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +638 -1
- package/dist/utils.js.map +1 -1
- package/eslint.config.js +87 -0
- package/package.json +16 -15
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +378 -783
- package/src/device/bot.ts +621 -845
- package/src/device/ceilinglight.ts +227 -608
- package/src/device/colorbulb.ts +269 -657
- package/src/device/contact.ts +235 -555
- package/src/device/curtain.ts +360 -811
- package/src/device/device.ts +710 -0
- package/src/device/fan.ts +554 -0
- package/src/device/hub.ts +274 -625
- package/src/device/humidifier.ts +246 -624
- package/src/device/iosensor.ts +205 -611
- package/src/device/lightstrip.ts +278 -597
- package/src/device/lock.ts +252 -583
- package/src/device/meter.ts +200 -601
- package/src/device/meterplus.ts +189 -603
- package/src/device/motion.ts +161 -542
- package/src/device/plug.ts +97 -481
- package/src/device/robotvacuumcleaner.ts +166 -478
- package/src/device/waterdetector.ts +143 -689
- package/src/homebridge-ui/public/index.html +2 -2
- package/src/index.ts +1 -1
- package/src/irdevice/airconditioner.ts +330 -446
- package/src/irdevice/airpurifier.ts +89 -321
- package/src/irdevice/camera.ts +42 -293
- package/src/irdevice/fan.ts +78 -327
- package/src/irdevice/irdevice.ts +528 -0
- package/src/irdevice/light.ts +32 -287
- package/src/irdevice/other.ts +396 -615
- package/src/irdevice/tv.ts +100 -339
- package/src/irdevice/vacuumcleaner.ts +49 -305
- package/src/irdevice/waterheater.ts +50 -310
- package/src/platform.ts +301 -155
- package/src/settings.ts +57 -566
- package/src/utils.ts +642 -1
package/dist/device/lock.js
CHANGED
|
@@ -1,151 +1,98 @@
|
|
|
1
1
|
import { request } from 'undici';
|
|
2
|
-
import {
|
|
2
|
+
import { deviceBase } from './device.js';
|
|
3
3
|
import { interval, Subject } from 'rxjs';
|
|
4
4
|
import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
|
|
5
5
|
import { Devices } from '../settings.js';
|
|
6
|
-
export class Lock {
|
|
6
|
+
export class Lock extends deviceBase {
|
|
7
7
|
platform;
|
|
8
|
-
accessory;
|
|
9
|
-
device;
|
|
10
|
-
api;
|
|
11
|
-
log;
|
|
12
|
-
config;
|
|
13
|
-
hap;
|
|
14
8
|
// Services
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
// Characteristic Values
|
|
20
|
-
BatteryLevel;
|
|
21
|
-
LockTargetState;
|
|
22
|
-
LockCurrentState;
|
|
23
|
-
FirmwareRevision;
|
|
24
|
-
StatusLowBattery;
|
|
25
|
-
ContactSensorState;
|
|
26
|
-
// OpenAPI Status
|
|
27
|
-
OpenAPI_BatteryLevel;
|
|
28
|
-
OpenAPI_FirmwareRevision;
|
|
29
|
-
OpenAPI_LockCurrentState;
|
|
30
|
-
OpenAPI_ContactSensorState;
|
|
31
|
-
// BLE Status
|
|
32
|
-
BLE_BatteryLevel;
|
|
33
|
-
BLE_LockCurrentState;
|
|
34
|
-
BLE_Calibration;
|
|
35
|
-
BLE_ContactSensorState;
|
|
36
|
-
// BLE Others
|
|
37
|
-
BLE_IsConnected;
|
|
38
|
-
// Config
|
|
39
|
-
scanDuration;
|
|
40
|
-
deviceLogging;
|
|
41
|
-
deviceRefreshRate;
|
|
9
|
+
LockMechanism;
|
|
10
|
+
Battery;
|
|
11
|
+
ContactSensor;
|
|
12
|
+
Switch;
|
|
42
13
|
// Updates
|
|
43
14
|
lockUpdateInProgress;
|
|
44
15
|
doLockUpdate;
|
|
45
|
-
// Connection
|
|
46
|
-
OpenAPI;
|
|
47
|
-
BLE;
|
|
48
16
|
constructor(platform, accessory, device) {
|
|
17
|
+
super(platform, accessory, device);
|
|
49
18
|
this.platform = platform;
|
|
50
|
-
this.accessory = accessory;
|
|
51
|
-
this.device = device;
|
|
52
|
-
this.api = this.platform.api;
|
|
53
|
-
this.log = this.platform.log;
|
|
54
|
-
this.config = this.platform.config;
|
|
55
|
-
this.hap = this.api.hap;
|
|
56
|
-
// Connection
|
|
57
|
-
this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
|
|
58
|
-
this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
|
|
59
|
-
// default placeholders
|
|
60
|
-
this.deviceLogs(device);
|
|
61
|
-
this.scan(device);
|
|
62
|
-
this.refreshRate(device);
|
|
63
|
-
this.deviceContext();
|
|
64
|
-
this.deviceConfig(device);
|
|
65
19
|
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
66
20
|
this.doLockUpdate = new Subject();
|
|
67
21
|
this.lockUpdateInProgress = false;
|
|
22
|
+
// Initialize LockMechanism property
|
|
23
|
+
this.LockMechanism = {
|
|
24
|
+
Service: accessory.getService(this.hap.Service.LockMechanism),
|
|
25
|
+
LockTargetState: accessory.context.LockTargetState || this.hap.Characteristic.LockTargetState.SECURED,
|
|
26
|
+
LockCurrentState: accessory.context.LockCurrentState || this.hap.Characteristic.LockCurrentState.SECURED,
|
|
27
|
+
};
|
|
28
|
+
// Initialize Battery property
|
|
29
|
+
this.Battery = {
|
|
30
|
+
Service: accessory.getService(this.hap.Service.Battery),
|
|
31
|
+
BatteryLevel: accessory.context.BatteryLevel || 100,
|
|
32
|
+
StatusLowBattery: accessory.context.StatusLowBattery || this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
|
|
33
|
+
};
|
|
34
|
+
// Initialize ContactSensor property
|
|
35
|
+
if (!this.device.lock?.hide_contactsensor) {
|
|
36
|
+
this.ContactSensor = {
|
|
37
|
+
Service: accessory.getService(this.hap.Service.ContactSensor),
|
|
38
|
+
ContactSensorState: accessory.context.ContactSensorState || this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED,
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
// Initialize Latch Button Service
|
|
42
|
+
if (device.lock?.activate_latchbutton) {
|
|
43
|
+
this.Switch = {
|
|
44
|
+
Service: accessory.getService(this.hap.Service.Switch),
|
|
45
|
+
On: accessory.context.On || false,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
68
48
|
// Retrieve initial values and updateHomekit
|
|
69
49
|
this.refreshStatus();
|
|
70
|
-
// set accessory information
|
|
71
|
-
accessory
|
|
72
|
-
.getService(this.hap.Service.AccessoryInformation)
|
|
73
|
-
.setCharacteristic(this.hap.Characteristic.Manufacturer, 'SwitchBot')
|
|
74
|
-
.setCharacteristic(this.hap.Characteristic.Model, 'W1601700')
|
|
75
|
-
.setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
|
|
76
|
-
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
|
|
77
50
|
// get the LockMechanism service if it exists, otherwise create a new LockMechanism service
|
|
78
51
|
// you can create multiple services for each accessory
|
|
79
|
-
const
|
|
80
|
-
(this.
|
|
81
|
-
|| accessory.addService(this.hap.Service.LockMechanism)),
|
|
82
|
-
this.
|
|
83
|
-
|
|
84
|
-
this.lockService.addCharacteristic(this.hap.Characteristic.ConfiguredName, accessory.displayName);
|
|
85
|
-
}
|
|
86
|
-
// each service must implement at-minimum the "required characteristics" for the given service type
|
|
87
|
-
// see https://developers.homebridge.io/#/service/LockMechanism
|
|
88
|
-
// create handlers for required characteristics
|
|
89
|
-
this.lockService.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.LockTargetStateSet.bind(this));
|
|
52
|
+
const LockMechanismService = `${accessory.displayName} ${device.deviceType}`;
|
|
53
|
+
(this.LockMechanism.Service = accessory.getService(this.hap.Service.LockMechanism)
|
|
54
|
+
|| accessory.addService(this.hap.Service.LockMechanism)), LockMechanismService;
|
|
55
|
+
this.LockMechanism.Service.setCharacteristic(this.hap.Characteristic.Name, accessory.displayName);
|
|
56
|
+
this.LockMechanism.Service.getCharacteristic(this.hap.Characteristic.LockTargetState).onSet(this.LockTargetStateSet.bind(this));
|
|
90
57
|
// Latch Button Service
|
|
91
58
|
if (device.lock?.activate_latchbutton === false) { // remove the service when this variable is false
|
|
92
59
|
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Latch Button Service`);
|
|
93
|
-
this.
|
|
94
|
-
|
|
95
|
-
accessory.removeService(this.latchButtonService);
|
|
96
|
-
this.latchButtonService = undefined; // Reset the service variable to undefined
|
|
97
|
-
}
|
|
60
|
+
this.Switch.Service = accessory.getService(this.hap.Service.Switch);
|
|
61
|
+
accessory.removeService(this.Switch.Service);
|
|
98
62
|
}
|
|
99
|
-
else if (!this.
|
|
63
|
+
else if (!this.Switch.Service && device.lock?.activate_latchbutton === true) {
|
|
100
64
|
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Adding Latch Button Service`);
|
|
101
65
|
const latchServiceName = `${accessory.displayName} Latch`;
|
|
102
|
-
this.
|
|
103
|
-
|| accessory.addService(this.hap.Service.Switch, latchServiceName, '
|
|
104
|
-
this.
|
|
105
|
-
|
|
106
|
-
this.latchButtonService.addCharacteristic(this.hap.Characteristic.On);
|
|
107
|
-
}
|
|
108
|
-
this.latchButtonService.getCharacteristic(this.hap.Characteristic.On)
|
|
109
|
-
.on('set', (value, callback) => {
|
|
110
|
-
if (typeof value === 'boolean') {
|
|
111
|
-
this.handleLatchCharacteristic(value, callback);
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
callback(new Error('Wrong characteristic value type'));
|
|
115
|
-
}
|
|
116
|
-
});
|
|
66
|
+
this.Switch.Service = accessory.getService(this.hap.Service.Switch)
|
|
67
|
+
|| accessory.addService(this.hap.Service.Switch, latchServiceName, 'Switch.ServiceIdentifier');
|
|
68
|
+
this.Switch.Service.setCharacteristic(this.hap.Characteristic.Name, latchServiceName);
|
|
69
|
+
this.Switch.Service.getCharacteristic(this.hap.Characteristic.On).onSet(this.OnSet.bind(this));
|
|
117
70
|
}
|
|
118
71
|
else {
|
|
119
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Latch Button Service
|
|
72
|
+
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Latch Button Service Not Added`);
|
|
120
73
|
}
|
|
121
74
|
// Contact Sensor Service
|
|
122
75
|
if (device.lock?.hide_contactsensor) {
|
|
123
76
|
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Contact Sensor Service`);
|
|
124
|
-
this.
|
|
125
|
-
accessory.removeService(this.
|
|
77
|
+
this.ContactSensor.Service = this.accessory.getService(this.hap.Service.ContactSensor);
|
|
78
|
+
accessory.removeService(this.ContactSensor.Service);
|
|
126
79
|
}
|
|
127
|
-
else if (!this.
|
|
80
|
+
else if (!this.ContactSensor?.Service) {
|
|
128
81
|
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Contact Sensor Service`);
|
|
129
|
-
const
|
|
130
|
-
(this.
|
|
131
|
-
|| this.accessory.addService(this.hap.Service.ContactSensor)),
|
|
132
|
-
this.
|
|
133
|
-
if (!this.contactSensorService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
134
|
-
this.contactSensorService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Contact Sensor`);
|
|
135
|
-
}
|
|
82
|
+
const ContactSensorService = `${accessory.displayName} Contact Sensor`;
|
|
83
|
+
(this.ContactSensor.Service = this.accessory.getService(this.hap.Service.ContactSensor)
|
|
84
|
+
|| this.accessory.addService(this.hap.Service.ContactSensor)), ContactSensorService;
|
|
85
|
+
this.ContactSensor.Service.setCharacteristic(this.hap.Characteristic.Name, ContactSensorService);
|
|
136
86
|
}
|
|
137
87
|
else {
|
|
138
88
|
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Contact Sensor Service Not Added`);
|
|
139
89
|
}
|
|
140
90
|
// Battery Service
|
|
141
|
-
const
|
|
142
|
-
(this.
|
|
143
|
-
|| accessory.addService(this.hap.Service.Battery)),
|
|
144
|
-
this.
|
|
145
|
-
|
|
146
|
-
this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
|
|
147
|
-
}
|
|
148
|
-
this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
|
|
91
|
+
const BatteryService = `${accessory.displayName} Battery`;
|
|
92
|
+
(this.Battery.Service = this.accessory.getService(this.hap.Service.Battery)
|
|
93
|
+
|| accessory.addService(this.hap.Service.Battery)), BatteryService;
|
|
94
|
+
this.Battery.Service.setCharacteristic(this.hap.Characteristic.Name, BatteryService);
|
|
95
|
+
this.Battery.Service.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
|
|
149
96
|
// Update Homekit
|
|
150
97
|
this.updateHomeKitCharacteristics();
|
|
151
98
|
// Start an update interval
|
|
@@ -155,18 +102,18 @@ export class Lock {
|
|
|
155
102
|
await this.refreshStatus();
|
|
156
103
|
});
|
|
157
104
|
//regisiter webhook event handler
|
|
158
|
-
if (
|
|
159
|
-
this.
|
|
105
|
+
if (device.webhook) {
|
|
106
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
160
107
|
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
161
108
|
try {
|
|
162
109
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
163
110
|
const { lockState } = context;
|
|
164
|
-
const { LockCurrentState } = this;
|
|
111
|
+
const { LockCurrentState } = this.LockMechanism;
|
|
165
112
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
166
113
|
'(lockState) = ' +
|
|
167
114
|
`Webhook:(${lockState}), ` +
|
|
168
115
|
`current:(${LockCurrentState})`);
|
|
169
|
-
this.LockCurrentState = lockState === 'LOCKED' ? 1 : 0;
|
|
116
|
+
this.LockMechanism.LockCurrentState = lockState === 'LOCKED' ? 1 : 0;
|
|
170
117
|
this.updateHomeKitCharacteristics();
|
|
171
118
|
}
|
|
172
119
|
catch (e) {
|
|
@@ -193,123 +140,85 @@ export class Lock {
|
|
|
193
140
|
this.lockUpdateInProgress = false;
|
|
194
141
|
});
|
|
195
142
|
}
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
*/
|
|
199
|
-
async handleLatchCharacteristic(value, callback) {
|
|
200
|
-
this.debugLog(`handleLatchCharacteristic called with value: ${value}`);
|
|
201
|
-
if (value) {
|
|
202
|
-
this.debugLog('Attempting to open the latch');
|
|
203
|
-
this.openAPIpushChanges(value).then(() => {
|
|
204
|
-
this.debugLog('Latch opened successfully');
|
|
205
|
-
this.debugLog(`LatchButtonService is: ${this.latchButtonService ? 'available' : 'not available'}`);
|
|
206
|
-
// simulate button press to turn the switch back off
|
|
207
|
-
if (this.latchButtonService) {
|
|
208
|
-
const latchButtonService = this.latchButtonService;
|
|
209
|
-
// Simulate a button press by waiting a short period before turning the switch off
|
|
210
|
-
setTimeout(() => {
|
|
211
|
-
latchButtonService.getCharacteristic(this.hap.Characteristic.On).updateValue(false);
|
|
212
|
-
this.debugLog('Latch button switched off automatically.');
|
|
213
|
-
}, 500); // 500 ms delay
|
|
214
|
-
}
|
|
215
|
-
callback(null);
|
|
216
|
-
}).catch((error) => {
|
|
217
|
-
// Log the error if the operation failed
|
|
218
|
-
this.debugLog(`Error opening latch: ${error}`);
|
|
219
|
-
// Ensure we turn the switch back off even in case of an error
|
|
220
|
-
if (this.latchButtonService) {
|
|
221
|
-
this.latchButtonService.getCharacteristic(this.hap.Characteristic.On).updateValue(false);
|
|
222
|
-
this.debugLog('Latch button switched off after an error.');
|
|
223
|
-
}
|
|
224
|
-
callback(error);
|
|
225
|
-
});
|
|
226
|
-
}
|
|
227
|
-
else {
|
|
228
|
-
this.debugLog('Switch is off, nothing to do');
|
|
229
|
-
callback(null);
|
|
230
|
-
}
|
|
231
|
-
}
|
|
232
|
-
/**
|
|
233
|
-
* Parse the device status from the SwitchBot api
|
|
234
|
-
*/
|
|
235
|
-
async parseStatus() {
|
|
236
|
-
if (!this.device.enableCloudService && this.OpenAPI) {
|
|
237
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
|
|
238
|
-
/* } else if (this.BLE) {
|
|
239
|
-
await this.BLEparseStatus();*/
|
|
240
|
-
}
|
|
241
|
-
else if (this.OpenAPI && this.platform.config.credentials?.token) {
|
|
242
|
-
await this.openAPIparseStatus();
|
|
243
|
-
}
|
|
244
|
-
else {
|
|
245
|
-
await this.offlineOff();
|
|
246
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
|
|
247
|
-
}
|
|
248
|
-
}
|
|
249
|
-
async BLEparseStatus() {
|
|
143
|
+
async BLEparseStatus(serviceData) {
|
|
144
|
+
// BLE Status
|
|
250
145
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
251
|
-
switch (
|
|
146
|
+
switch (serviceData.status) {
|
|
252
147
|
case 'locked':
|
|
253
|
-
this.LockCurrentState = this.hap.Characteristic.LockCurrentState.SECURED;
|
|
254
|
-
this.LockTargetState = this.hap.Characteristic.LockTargetState.SECURED;
|
|
148
|
+
this.LockMechanism.LockCurrentState = this.hap.Characteristic.LockCurrentState.SECURED;
|
|
149
|
+
this.LockMechanism.LockTargetState = this.hap.Characteristic.LockTargetState.SECURED;
|
|
255
150
|
break;
|
|
256
151
|
default:
|
|
257
|
-
this.LockCurrentState = this.hap.Characteristic.LockCurrentState.UNSECURED;
|
|
258
|
-
this.LockTargetState = this.hap.Characteristic.LockTargetState.UNSECURED;
|
|
152
|
+
this.LockMechanism.LockCurrentState = this.hap.Characteristic.LockCurrentState.UNSECURED;
|
|
153
|
+
this.LockMechanism.LockTargetState = this.hap.Characteristic.LockTargetState.UNSECURED;
|
|
259
154
|
}
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
155
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
156
|
+
+ ` LockTargetState: ${this.LockMechanism.LockTargetState}, LockCurrentState: ${this.LockMechanism.LockCurrentState}`);
|
|
157
|
+
// Contact Sensor
|
|
158
|
+
if (!this.device.lock?.hide_contactsensor) {
|
|
159
|
+
switch (serviceData.door_open) {
|
|
160
|
+
case 'opened':
|
|
161
|
+
this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
162
|
+
break;
|
|
163
|
+
default:
|
|
164
|
+
this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
165
|
+
}
|
|
166
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
|
|
266
167
|
}
|
|
267
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockTargetState}`);
|
|
268
168
|
// Battery
|
|
269
|
-
this.BatteryLevel = Number(
|
|
270
|
-
if (this.BatteryLevel < 10) {
|
|
271
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
169
|
+
this.Battery.BatteryLevel = Number(serviceData.battery);
|
|
170
|
+
if (this.Battery.BatteryLevel < 10) {
|
|
171
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
272
172
|
}
|
|
273
173
|
else {
|
|
274
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
174
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
275
175
|
}
|
|
276
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
176
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
177
|
+
+ ` BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
277
178
|
}
|
|
278
|
-
async openAPIparseStatus() {
|
|
179
|
+
async openAPIparseStatus(deviceStatus) {
|
|
279
180
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
280
|
-
switch (
|
|
181
|
+
switch (deviceStatus.body.lockState) {
|
|
281
182
|
case 'locked':
|
|
282
|
-
this.LockCurrentState = this.hap.Characteristic.LockCurrentState.SECURED;
|
|
283
|
-
this.LockTargetState = this.hap.Characteristic.LockTargetState.SECURED;
|
|
183
|
+
this.LockMechanism.LockCurrentState = this.hap.Characteristic.LockCurrentState.SECURED;
|
|
184
|
+
this.LockMechanism.LockTargetState = this.hap.Characteristic.LockTargetState.SECURED;
|
|
284
185
|
break;
|
|
285
186
|
default:
|
|
286
|
-
this.LockCurrentState = this.hap.Characteristic.LockCurrentState.UNSECURED;
|
|
287
|
-
this.LockTargetState = this.hap.Characteristic.LockTargetState.UNSECURED;
|
|
187
|
+
this.LockMechanism.LockCurrentState = this.hap.Characteristic.LockCurrentState.UNSECURED;
|
|
188
|
+
this.LockMechanism.LockTargetState = this.hap.Characteristic.LockTargetState.UNSECURED;
|
|
288
189
|
}
|
|
289
|
-
switch (
|
|
190
|
+
switch (deviceStatus.body.doorState) {
|
|
290
191
|
case 'opened':
|
|
291
|
-
this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
192
|
+
this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
292
193
|
break;
|
|
293
194
|
default:
|
|
294
|
-
this.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
195
|
+
this.ContactSensor.ContactSensorState = this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
295
196
|
}
|
|
296
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockTargetState}`);
|
|
197
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LockMechanism.LockTargetState}`);
|
|
297
198
|
// Battery
|
|
298
|
-
this.BatteryLevel = Number(
|
|
299
|
-
if (this.BatteryLevel < 10) {
|
|
300
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
199
|
+
this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
|
|
200
|
+
if (this.Battery.BatteryLevel < 10) {
|
|
201
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
301
202
|
}
|
|
302
203
|
else {
|
|
303
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
204
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
205
|
+
}
|
|
206
|
+
if (Number.isNaN(this.Battery.BatteryLevel)) {
|
|
207
|
+
this.Battery.BatteryLevel = 100;
|
|
304
208
|
}
|
|
305
|
-
|
|
306
|
-
this.
|
|
209
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
|
|
210
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
211
|
+
// Firmware Version
|
|
212
|
+
const version = deviceStatus.body.version?.toString();
|
|
213
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
214
|
+
if (deviceStatus.body.version) {
|
|
215
|
+
this.accessory.context.version = version?.replace(/^V|-.*$/g, '');
|
|
216
|
+
this.accessory
|
|
217
|
+
.getService(this.hap.Service.AccessoryInformation)
|
|
218
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, this.accessory.context.version)
|
|
219
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
220
|
+
.updateValue(this.accessory.context.version);
|
|
307
221
|
}
|
|
308
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
|
|
309
|
-
+ ` StatusLowBattery: ${this.StatusLowBattery}`);
|
|
310
|
-
// FirmwareRevision
|
|
311
|
-
this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
|
|
312
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
313
222
|
}
|
|
314
223
|
/**
|
|
315
224
|
* Asks the SwitchBot API for the latest device information
|
|
@@ -343,103 +252,42 @@ export class Lock {
|
|
|
343
252
|
// Start to monitor advertisement packets
|
|
344
253
|
(async () => {
|
|
345
254
|
// Start to monitor advertisement packets
|
|
346
|
-
await switchbot.startScan({
|
|
347
|
-
model: 'o',
|
|
348
|
-
id: this.device.bleMac,
|
|
349
|
-
});
|
|
255
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
350
256
|
// Set an event handler
|
|
351
257
|
switchbot.onadvertisement = (ad) => {
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
258
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
259
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
260
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
355
261
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
356
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
357
|
-
this.BLE_Calibration = ad.serviceData.calibration;
|
|
358
|
-
this.BLE_LockCurrentState = ad.serviceData.status;
|
|
359
|
-
this.BLE_ContactSensorState = ad.serviceData.door_open;
|
|
360
262
|
}
|
|
361
263
|
else {
|
|
362
264
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
363
265
|
}
|
|
364
266
|
};
|
|
365
|
-
// Wait
|
|
267
|
+
// Wait 10 seconds
|
|
366
268
|
await switchbot.wait(this.scanDuration * 1000);
|
|
367
269
|
// Stop to monitor
|
|
368
270
|
await switchbot.stopScan();
|
|
369
271
|
// Update HomeKit
|
|
370
|
-
await this.BLEparseStatus();
|
|
272
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
371
273
|
await this.updateHomeKitCharacteristics();
|
|
372
274
|
})();
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
model: 'o',
|
|
377
|
-
id: this.device.bleMac,
|
|
378
|
-
})
|
|
379
|
-
.then(async () => {
|
|
380
|
-
// Set an event handler
|
|
381
|
-
switchbot.onadvertisement = async (ad: ad) => {
|
|
382
|
-
this.debugLog(
|
|
383
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
|
|
384
|
-
` BLE Address Found: ${ad.address}`,
|
|
385
|
-
);
|
|
386
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
387
|
-
this.BLE_Calibration = ad.serviceData.calibration;
|
|
388
|
-
this.BLE_LockCurrentState = ad.serviceData.status;
|
|
389
|
-
this.BLE_ContactSensorState = ad.serviceData.door_open;
|
|
390
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
391
|
-
this.debugLog(
|
|
392
|
-
`${this.device.deviceType}: ${this.accessory.displayName} battery: ${ad.serviceData.battery}, ` +
|
|
393
|
-
`calibration: ${ad.serviceData.calibration}, status: ${ad.serviceData.status}, battery: ${ad.serviceData.battery}, ` +
|
|
394
|
-
`door_open: ${ad.serviceData.door_open}`,
|
|
395
|
-
);
|
|
396
|
-
|
|
397
|
-
if (ad.serviceData) {
|
|
398
|
-
this.BLE_IsConnected = true;
|
|
399
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
400
|
-
await this.stopScanning(switchbot);
|
|
401
|
-
} else {
|
|
402
|
-
this.BLE_IsConnected = false;
|
|
403
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
404
|
-
}
|
|
405
|
-
};
|
|
406
|
-
// Wait
|
|
407
|
-
return await sleep(this.scanDuration * 1000);
|
|
408
|
-
})
|
|
409
|
-
.then(async () => {
|
|
410
|
-
// Stop to monitor
|
|
411
|
-
await this.stopScanning(switchbot);
|
|
412
|
-
})
|
|
413
|
-
.catch(async (e: any) => {
|
|
414
|
-
this.apiError(e);
|
|
415
|
-
this.errorLog(
|
|
416
|
-
`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
|
|
417
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`,
|
|
418
|
-
);
|
|
419
|
-
await this.BLERefreshConnection(switchbot);
|
|
420
|
-
});
|
|
421
|
-
} else {
|
|
422
|
-
await this.BLERefreshConnection(switchbot);
|
|
423
|
-
}*/
|
|
275
|
+
if (switchbot === undefined) {
|
|
276
|
+
await this.BLERefreshConnection(switchbot);
|
|
277
|
+
}
|
|
424
278
|
}
|
|
425
279
|
async openAPIRefreshStatus() {
|
|
426
280
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
427
281
|
try {
|
|
428
|
-
const { body, statusCode } = await
|
|
429
|
-
headers: this.platform.generateHeaders(),
|
|
430
|
-
});
|
|
282
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
431
283
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
432
284
|
const deviceStatus = await body.json();
|
|
433
285
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
434
286
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
435
287
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
436
|
-
this.
|
|
288
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
437
289
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
438
|
-
this.
|
|
439
|
-
this.OpenAPI_ContactSensorState = deviceStatus.body.doorState;
|
|
440
|
-
this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
|
|
441
|
-
this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
|
|
442
|
-
this.openAPIparseStatus();
|
|
290
|
+
this.openAPIparseStatus(deviceStatus);
|
|
443
291
|
this.updateHomeKitCharacteristics();
|
|
444
292
|
}
|
|
445
293
|
else {
|
|
@@ -482,8 +330,8 @@ export class Lock {
|
|
|
482
330
|
}
|
|
483
331
|
async BLEpushChanges() {
|
|
484
332
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
|
|
485
|
-
if (this.LockTargetState !== this.accessory.context.LockTargetState) {
|
|
486
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges LockTargetState: ${this.LockTargetState}` +
|
|
333
|
+
if (this.LockMechanism.LockTargetState !== this.accessory.context.LockTargetState) {
|
|
334
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges LockTargetState: ${this.LockMechanism.LockTargetState}` +
|
|
487
335
|
` LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
|
|
488
336
|
const switchbot = await this.platform.connectBLE();
|
|
489
337
|
// Convert to BLE Address
|
|
@@ -499,7 +347,9 @@ export class Lock {
|
|
|
499
347
|
})
|
|
500
348
|
.then(() => {
|
|
501
349
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
502
|
-
this.
|
|
350
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
351
|
+
+ `LockTargetState: ${this.LockMechanism.LockTargetState} sent over BLE, sent successfully`);
|
|
352
|
+
this.LockMechanism.LockTargetState = this.hap.Characteristic.LockTargetState.SECURED;
|
|
503
353
|
})
|
|
504
354
|
.catch(async (e) => {
|
|
505
355
|
this.apiError(e);
|
|
@@ -510,20 +360,20 @@ export class Lock {
|
|
|
510
360
|
}
|
|
511
361
|
else {
|
|
512
362
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No BLEpushChanges.` +
|
|
513
|
-
`LockTargetState: ${this.LockTargetState}, ` +
|
|
363
|
+
`LockTargetState: ${this.LockMechanism.LockTargetState}, ` +
|
|
514
364
|
`LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
|
|
515
365
|
}
|
|
516
366
|
}
|
|
517
367
|
async openAPIpushChanges(LatchUnlock) {
|
|
518
368
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
|
|
519
|
-
if ((this.LockTargetState !== this.accessory.context.LockTargetState) || LatchUnlock) {
|
|
369
|
+
if ((this.LockMechanism.LockTargetState !== this.accessory.context.LockTargetState) || LatchUnlock) {
|
|
520
370
|
// Determine the command based on the LockTargetState or the forceUnlock parameter
|
|
521
371
|
let command = '';
|
|
522
372
|
if (LatchUnlock) {
|
|
523
373
|
command = 'unlock';
|
|
524
374
|
}
|
|
525
375
|
else {
|
|
526
|
-
command = this.LockTargetState ? 'lock' : 'unlock';
|
|
376
|
+
command = this.LockMechanism.LockTargetState ? 'lock' : 'unlock';
|
|
527
377
|
}
|
|
528
378
|
const bodyChange = JSON.stringify({
|
|
529
379
|
command: `${command}`,
|
|
@@ -545,6 +395,8 @@ export class Lock {
|
|
|
545
395
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
546
396
|
this.debugErrorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
547
397
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
398
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
399
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(deviceStatus)} sent successfully`);
|
|
548
400
|
}
|
|
549
401
|
else {
|
|
550
402
|
this.statusCode(statusCode);
|
|
@@ -559,7 +411,7 @@ export class Lock {
|
|
|
559
411
|
}
|
|
560
412
|
else {
|
|
561
413
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.` +
|
|
562
|
-
`LockTargetState: ${this.LockTargetState}, ` +
|
|
414
|
+
`LockTargetState: ${this.LockMechanism.LockTargetState}, ` +
|
|
563
415
|
`LockTargetStateCached: ${this.accessory.context.LockTargetState}`);
|
|
564
416
|
}
|
|
565
417
|
}
|
|
@@ -567,84 +419,98 @@ export class Lock {
|
|
|
567
419
|
* Handle requests to set the value of the "On" characteristic
|
|
568
420
|
*/
|
|
569
421
|
async LockTargetStateSet(value) {
|
|
570
|
-
if (this.LockTargetState === this.accessory.context.LockTargetState) {
|
|
422
|
+
if (this.LockMechanism.LockTargetState === this.accessory.context.LockTargetState) {
|
|
571
423
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set LockTargetState: ${value}`);
|
|
572
424
|
}
|
|
573
425
|
else {
|
|
574
426
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set LockTargetState: ${value}`);
|
|
575
427
|
}
|
|
576
|
-
this.LockTargetState = value;
|
|
428
|
+
this.LockMechanism.LockTargetState = value;
|
|
429
|
+
this.doLockUpdate.next();
|
|
430
|
+
}
|
|
431
|
+
/**
|
|
432
|
+
* Handle requests to set the value of the "On" characteristic
|
|
433
|
+
*/
|
|
434
|
+
async OnSet(value) {
|
|
435
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Latch Button Set On: ${value}`);
|
|
436
|
+
if (value) {
|
|
437
|
+
this.debugLog('Attempting to open the latch');
|
|
438
|
+
this.openAPIpushChanges(value).then(() => {
|
|
439
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Latch opened successfully`);
|
|
440
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
441
|
+
+ ` SwitchService is: ${this.Switch.Service ? 'available' : 'not available'}`);
|
|
442
|
+
// simulate button press to turn the switch back off
|
|
443
|
+
if (this.Switch.Service) {
|
|
444
|
+
const SwitchService = this.Switch.Service;
|
|
445
|
+
// Simulate a button press by waiting a short period before turning the switch off
|
|
446
|
+
setTimeout(() => {
|
|
447
|
+
SwitchService.getCharacteristic(this.hap.Characteristic.On).updateValue(false);
|
|
448
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Latch button switched off automatically.`);
|
|
449
|
+
}, 500); // 500 ms delay
|
|
450
|
+
}
|
|
451
|
+
}).catch((e) => {
|
|
452
|
+
// Log the error if the operation failed
|
|
453
|
+
this.debugLog(`Error opening latch: ${e}`);
|
|
454
|
+
// Ensure we turn the switch back off even in case of an error
|
|
455
|
+
if (this.Switch.Service) {
|
|
456
|
+
this.Switch.Service.getCharacteristic(this.hap.Characteristic.On).updateValue(false);
|
|
457
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Latch button switched off after an error.`);
|
|
458
|
+
}
|
|
459
|
+
});
|
|
460
|
+
}
|
|
461
|
+
else {
|
|
462
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Switch is off, nothing to do`);
|
|
463
|
+
}
|
|
464
|
+
this.Switch.On = value;
|
|
577
465
|
this.doLockUpdate.next();
|
|
578
466
|
}
|
|
579
467
|
async updateHomeKitCharacteristics() {
|
|
580
468
|
if (!this.device.lock?.hide_contactsensor) {
|
|
581
|
-
if (this.ContactSensorState === undefined) {
|
|
582
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensorState}`);
|
|
469
|
+
if (this.ContactSensor.ContactSensorState === undefined) {
|
|
470
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
|
|
583
471
|
}
|
|
584
472
|
else {
|
|
585
|
-
this.accessory.context.ContactSensorState = this.ContactSensorState;
|
|
586
|
-
this.
|
|
587
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic
|
|
473
|
+
this.accessory.context.ContactSensorState = this.ContactSensor.ContactSensorState;
|
|
474
|
+
this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.ContactSensor.ContactSensorState);
|
|
475
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
476
|
+
+ ` ContactSensorState: ${this.ContactSensor.ContactSensorState}`);
|
|
588
477
|
}
|
|
589
478
|
}
|
|
590
|
-
if (this.LockTargetState === undefined) {
|
|
591
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockTargetState: ${this.LockTargetState}`);
|
|
592
|
-
}
|
|
593
|
-
else {
|
|
594
|
-
this.accessory.context.LockTargetState = this.LockTargetState;
|
|
595
|
-
this.lockService.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.LockTargetState);
|
|
596
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic LockTargetState: ${this.LockTargetState}`);
|
|
597
|
-
}
|
|
598
|
-
if (this.LockCurrentState === undefined) {
|
|
599
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockCurrentState: ${this.LockCurrentState}`);
|
|
479
|
+
if (this.LockMechanism.LockTargetState === undefined) {
|
|
480
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockTargetState: ${this.LockMechanism.LockTargetState}`);
|
|
600
481
|
}
|
|
601
482
|
else {
|
|
602
|
-
this.accessory.context.
|
|
603
|
-
this.
|
|
604
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic
|
|
483
|
+
this.accessory.context.LockTargetState = this.LockMechanism.LockTargetState;
|
|
484
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.LockMechanism.LockTargetState);
|
|
485
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
486
|
+
+ ` LockTargetState: ${this.LockMechanism.LockTargetState}`);
|
|
605
487
|
}
|
|
606
|
-
if (this.
|
|
607
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
488
|
+
if (this.LockMechanism.LockCurrentState === undefined) {
|
|
489
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} LockCurrentState: ${this.LockMechanism.LockCurrentState}`);
|
|
608
490
|
}
|
|
609
491
|
else {
|
|
610
|
-
this.accessory.context.
|
|
611
|
-
this.
|
|
612
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic
|
|
492
|
+
this.accessory.context.LockCurrentState = this.LockMechanism.LockCurrentState;
|
|
493
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.LockMechanism.LockCurrentState);
|
|
494
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
495
|
+
+ ` LockCurrentState: ${this.LockMechanism.LockCurrentState}`);
|
|
613
496
|
}
|
|
614
|
-
if (this.
|
|
615
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
497
|
+
if (this.Battery.BatteryLevel === undefined) {
|
|
498
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
616
499
|
}
|
|
617
500
|
else {
|
|
618
|
-
this.accessory.context.
|
|
619
|
-
this.
|
|
620
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic
|
|
501
|
+
this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
|
|
502
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
|
|
503
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
504
|
+
+ ` BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
621
505
|
}
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
switchbot.stopScan();
|
|
625
|
-
if (this.BLE_IsConnected) {
|
|
626
|
-
await this.BLEparseStatus();
|
|
627
|
-
await this.updateHomeKitCharacteristics();
|
|
506
|
+
if (this.Battery.StatusLowBattery === undefined) {
|
|
507
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
628
508
|
}
|
|
629
509
|
else {
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
|
|
635
|
-
(async () => {
|
|
636
|
-
// Start to monitor advertisement packets
|
|
637
|
-
await switchbot.startScan({
|
|
638
|
-
model: 'c',
|
|
639
|
-
});
|
|
640
|
-
// Set an event handler
|
|
641
|
-
switchbot.onadvertisement = (ad) => {
|
|
642
|
-
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
|
|
643
|
-
};
|
|
644
|
-
await sleep(10000);
|
|
645
|
-
// Stop to monitor
|
|
646
|
-
switchbot.stopScan();
|
|
647
|
-
})();
|
|
510
|
+
this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
|
|
511
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
|
|
512
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
513
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
648
514
|
}
|
|
649
515
|
}
|
|
650
516
|
async BLEPushConnection() {
|
|
@@ -661,215 +527,21 @@ export class Lock {
|
|
|
661
527
|
await this.openAPIRefreshStatus();
|
|
662
528
|
}
|
|
663
529
|
}
|
|
664
|
-
async scan(device) {
|
|
665
|
-
if (device.scanDuration) {
|
|
666
|
-
this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
|
|
667
|
-
if (this.BLE) {
|
|
668
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
|
|
669
|
-
}
|
|
670
|
-
}
|
|
671
|
-
else {
|
|
672
|
-
this.scanDuration = this.accessory.context.scanDuration = 1;
|
|
673
|
-
if (this.BLE) {
|
|
674
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
|
|
675
|
-
}
|
|
676
|
-
}
|
|
677
|
-
}
|
|
678
|
-
async statusCode(statusCode) {
|
|
679
|
-
switch (statusCode) {
|
|
680
|
-
case 151:
|
|
681
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
|
|
682
|
-
break;
|
|
683
|
-
case 152:
|
|
684
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
|
|
685
|
-
break;
|
|
686
|
-
case 160:
|
|
687
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
|
|
688
|
-
break;
|
|
689
|
-
case 161:
|
|
690
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
|
|
691
|
-
this.offlineOff();
|
|
692
|
-
break;
|
|
693
|
-
case 171:
|
|
694
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
|
|
695
|
-
`Hub: ${this.device.hubDeviceId}`);
|
|
696
|
-
this.offlineOff();
|
|
697
|
-
break;
|
|
698
|
-
case 190:
|
|
699
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
|
|
700
|
-
` Or command format is invalid, statusCode: ${statusCode}`);
|
|
701
|
-
break;
|
|
702
|
-
case 100:
|
|
703
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
|
|
704
|
-
break;
|
|
705
|
-
case 200:
|
|
706
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
|
|
707
|
-
break;
|
|
708
|
-
case 400:
|
|
709
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
|
|
710
|
-
+ `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
|
|
711
|
-
break;
|
|
712
|
-
case 401:
|
|
713
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
|
|
714
|
-
+ `but the request has not been authenticated, statusCode: ${statusCode}`);
|
|
715
|
-
break;
|
|
716
|
-
case 403:
|
|
717
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
|
|
718
|
-
+ `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
|
|
719
|
-
break;
|
|
720
|
-
case 404:
|
|
721
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
|
|
722
|
-
+ `statusCode: ${statusCode}`);
|
|
723
|
-
break;
|
|
724
|
-
case 406:
|
|
725
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
|
|
726
|
-
+ `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
|
|
727
|
-
break;
|
|
728
|
-
case 415:
|
|
729
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
|
|
730
|
-
+ `header that is not supported by the server, statusCode: ${statusCode}`);
|
|
731
|
-
break;
|
|
732
|
-
case 422:
|
|
733
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
|
|
734
|
-
+ `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
|
|
735
|
-
break;
|
|
736
|
-
case 429:
|
|
737
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
|
|
738
|
-
+ `requests allowed for a given time window, statusCode: ${statusCode}`);
|
|
739
|
-
break;
|
|
740
|
-
case 500:
|
|
741
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
|
|
742
|
-
+ `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
|
|
743
|
-
break;
|
|
744
|
-
default:
|
|
745
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
|
|
746
|
-
`${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
|
|
747
|
-
}
|
|
748
|
-
}
|
|
749
530
|
async offlineOff() {
|
|
750
531
|
if (this.device.offline) {
|
|
751
|
-
|
|
752
|
-
|
|
532
|
+
if (!this.device.lock?.hide_contactsensor) {
|
|
533
|
+
this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, this.hap.Characteristic.ContactSensorState.CONTACT_DETECTED);
|
|
534
|
+
}
|
|
535
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, this.hap.Characteristic.LockTargetState.SECURED);
|
|
536
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, this.hap.Characteristic.LockCurrentState.SECURED);
|
|
753
537
|
}
|
|
754
538
|
}
|
|
755
539
|
async apiError(e) {
|
|
756
540
|
if (!this.device.lock?.hide_contactsensor) {
|
|
757
|
-
this.
|
|
758
|
-
}
|
|
759
|
-
this.lockService.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
|
|
760
|
-
this.lockService.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
|
|
761
|
-
}
|
|
762
|
-
async deviceContext() {
|
|
763
|
-
if (this.LockTargetState === undefined) {
|
|
764
|
-
this.LockTargetState = false;
|
|
765
|
-
}
|
|
766
|
-
else {
|
|
767
|
-
this.LockTargetState = this.accessory.context.On;
|
|
541
|
+
this.ContactSensor.Service.updateCharacteristic(this.hap.Characteristic.ContactSensorState, e);
|
|
768
542
|
}
|
|
769
|
-
|
|
770
|
-
|
|
771
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
772
|
-
}
|
|
773
|
-
}
|
|
774
|
-
async refreshRate(device) {
|
|
775
|
-
if (device.refreshRate) {
|
|
776
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
|
|
777
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
|
|
778
|
-
}
|
|
779
|
-
else if (this.platform.config.options.refreshRate) {
|
|
780
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
|
|
781
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
|
|
782
|
-
}
|
|
783
|
-
}
|
|
784
|
-
async deviceConfig(device) {
|
|
785
|
-
let config = {};
|
|
786
|
-
if (device.lock) {
|
|
787
|
-
config = device.lock;
|
|
788
|
-
}
|
|
789
|
-
if (device.connectionType !== undefined) {
|
|
790
|
-
config['connectionType'] = device.connectionType;
|
|
791
|
-
}
|
|
792
|
-
if (device.external !== undefined) {
|
|
793
|
-
config['external'] = device.external;
|
|
794
|
-
}
|
|
795
|
-
if (device.logging !== undefined) {
|
|
796
|
-
config['logging'] = device.logging;
|
|
797
|
-
}
|
|
798
|
-
if (device.refreshRate !== undefined) {
|
|
799
|
-
config['refreshRate'] = device.refreshRate;
|
|
800
|
-
}
|
|
801
|
-
if (device.scanDuration !== undefined) {
|
|
802
|
-
config['scanDuration'] = device.scanDuration;
|
|
803
|
-
}
|
|
804
|
-
if (device.webhook !== undefined) {
|
|
805
|
-
config['webhook'] = device.webhook;
|
|
806
|
-
}
|
|
807
|
-
if (Object.entries(config).length !== 0) {
|
|
808
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
809
|
-
}
|
|
810
|
-
}
|
|
811
|
-
async deviceLogs(device) {
|
|
812
|
-
if (this.platform.debugMode) {
|
|
813
|
-
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
814
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
815
|
-
}
|
|
816
|
-
else if (device.logging) {
|
|
817
|
-
this.deviceLogging = this.accessory.context.logging = device.logging;
|
|
818
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
|
|
819
|
-
}
|
|
820
|
-
else if (this.platform.config.options?.logging) {
|
|
821
|
-
this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
|
|
822
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
|
|
823
|
-
}
|
|
824
|
-
else {
|
|
825
|
-
this.deviceLogging = this.accessory.context.logging = 'standard';
|
|
826
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
|
|
827
|
-
}
|
|
828
|
-
}
|
|
829
|
-
/**
|
|
830
|
-
* Logging for Device
|
|
831
|
-
*/
|
|
832
|
-
infoLog(...log) {
|
|
833
|
-
if (this.enablingDeviceLogging()) {
|
|
834
|
-
this.platform.log.info(String(...log));
|
|
835
|
-
}
|
|
836
|
-
}
|
|
837
|
-
warnLog(...log) {
|
|
838
|
-
if (this.enablingDeviceLogging()) {
|
|
839
|
-
this.platform.log.warn(String(...log));
|
|
840
|
-
}
|
|
841
|
-
}
|
|
842
|
-
debugWarnLog(...log) {
|
|
843
|
-
if (this.enablingDeviceLogging()) {
|
|
844
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
845
|
-
this.platform.log.warn('[DEBUG]', String(...log));
|
|
846
|
-
}
|
|
847
|
-
}
|
|
848
|
-
}
|
|
849
|
-
errorLog(...log) {
|
|
850
|
-
if (this.enablingDeviceLogging()) {
|
|
851
|
-
this.platform.log.error(String(...log));
|
|
852
|
-
}
|
|
853
|
-
}
|
|
854
|
-
debugErrorLog(...log) {
|
|
855
|
-
if (this.enablingDeviceLogging()) {
|
|
856
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
857
|
-
this.platform.log.error('[DEBUG]', String(...log));
|
|
858
|
-
}
|
|
859
|
-
}
|
|
860
|
-
}
|
|
861
|
-
debugLog(...log) {
|
|
862
|
-
if (this.enablingDeviceLogging()) {
|
|
863
|
-
if (this.deviceLogging === 'debug') {
|
|
864
|
-
this.platform.log.info('[DEBUG]', String(...log));
|
|
865
|
-
}
|
|
866
|
-
else {
|
|
867
|
-
this.platform.log.debug(String(...log));
|
|
868
|
-
}
|
|
869
|
-
}
|
|
870
|
-
}
|
|
871
|
-
enablingDeviceLogging() {
|
|
872
|
-
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
543
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockTargetState, e);
|
|
544
|
+
this.LockMechanism.Service.updateCharacteristic(this.hap.Characteristic.LockCurrentState, e);
|
|
873
545
|
}
|
|
874
546
|
}
|
|
875
547
|
//# sourceMappingURL=lock.js.map
|