@switchbot/homebridge-switchbot 0.1.2-beta.0 → 0.1.2-beta.4
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/.github/workflows/issue-validate.yml +1 -1
- package/dist/devices/bots.d.ts +1 -0
- package/dist/devices/bots.d.ts.map +1 -1
- package/dist/devices/bots.js +70 -22
- package/dist/devices/bots.js.map +1 -1
- package/dist/devices/bulb.d.ts +10 -1
- package/dist/devices/bulb.d.ts.map +1 -1
- package/dist/devices/bulb.js +12 -1
- package/dist/devices/bulb.js.map +1 -1
- package/dist/devices/contact.d.ts +13 -3
- package/dist/devices/contact.d.ts.map +1 -1
- package/dist/devices/contact.js +77 -2
- package/dist/devices/contact.js.map +1 -1
- package/dist/devices/curtains.d.ts +19 -8
- package/dist/devices/curtains.d.ts.map +1 -1
- package/dist/devices/curtains.js +96 -19
- package/dist/devices/curtains.js.map +1 -1
- package/dist/devices/humidifiers.d.ts.map +1 -1
- package/dist/devices/humidifiers.js +2 -2
- package/dist/devices/humidifiers.js.map +1 -1
- package/dist/devices/meters.d.ts +13 -4
- package/dist/devices/meters.d.ts.map +1 -1
- package/dist/devices/meters.js +28 -9
- package/dist/devices/meters.js.map +1 -1
- package/dist/devices/motion.d.ts +11 -3
- package/dist/devices/motion.d.ts.map +1 -1
- package/dist/devices/motion.js +67 -1
- package/dist/devices/motion.js.map +1 -1
- package/dist/devices/plugs.d.ts +11 -1
- package/dist/devices/plugs.d.ts.map +1 -1
- package/dist/devices/plugs.js +67 -1
- package/dist/devices/plugs.js.map +1 -1
- package/dist/irdevices/airconditioners.js +2 -2
- package/dist/irdevices/airconditioners.js.map +1 -1
- package/dist/irdevices/airpurifiers.js +2 -2
- package/dist/irdevices/airpurifiers.js.map +1 -1
- package/dist/irdevices/cameras.js +1 -1
- package/dist/irdevices/cameras.js.map +1 -1
- package/dist/irdevices/fans.js +1 -1
- package/dist/irdevices/fans.js.map +1 -1
- package/dist/irdevices/lights.js +3 -3
- package/dist/irdevices/lights.js.map +1 -1
- package/dist/irdevices/others.js +1 -1
- package/dist/irdevices/others.js.map +1 -1
- package/dist/irdevices/tvs.d.ts.map +1 -1
- package/dist/irdevices/tvs.js +2 -3
- package/dist/irdevices/tvs.js.map +1 -1
- package/dist/irdevices/vacuumcleaners.js +1 -1
- package/dist/irdevices/vacuumcleaners.js.map +1 -1
- package/package.json +1 -1
- package/src/devices/bots.ts +85 -35
- package/src/devices/bulb.ts +32 -2
- package/src/devices/contact.ts +101 -9
- package/src/devices/curtains.ts +135 -35
- package/src/devices/humidifiers.ts +7 -2
- package/src/devices/meters.ts +50 -14
- package/src/devices/motion.ts +90 -7
- package/src/devices/plugs.ts +89 -4
- package/src/irdevices/airconditioners.ts +2 -2
- package/src/irdevices/airpurifiers.ts +2 -2
- package/src/irdevices/cameras.ts +1 -1
- package/src/irdevices/fans.ts +1 -1
- package/src/irdevices/lights.ts +3 -3
- package/src/irdevices/others.ts +1 -1
- package/src/irdevices/tvs.ts +2 -4
- package/src/irdevices/vacuumcleaners.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tvs.js","sourceRoot":"","sources":["../../src/irdevices/tvs.ts"],"names":[],"mappings":";;;AAGA,0CAAwE;AAExE;;;;GAIG;AACH,MAAa,EAAE;IAQb,YACmB,QAA2B,EACpC,SAA4B,EAC7B,MAAgB;QAFN,aAAQ,GAAR,QAAQ,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAU;QAEvB,4BAA4B;QAC5B,SAAS;aACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;aACjG,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aACzE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;aACxE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjF,6BAA6B;QAC7B,QAAQ,MAAM,CAAC,UAAU,EAAE;YACzB,KAAK,SAAS,CAAC;YACf,KAAK,aAAa;gBAChB,SAAS,CAAC,QAAQ,mBAA2C,CAAC;gBAC9D,MAAM;YACR,KAAK,MAAM,CAAC;YACZ,KAAK,UAAU;gBACb,SAAS,CAAC,QAAQ,8BAAsD,CAAC;gBACzE,MAAM;YACR,KAAK,KAAK,CAAC;YACX,KAAK,SAAS,CAAC;YACf,KAAK,aAAa,CAAC;YACnB,KAAK,iBAAiB;gBACpB,SAAS,CAAC,QAAQ,0BAAkD,CAAC;gBACrE,MAAM;YACR;gBACE,SAAS,CAAC,QAAQ,sBAA8C,CAAC;SACpE;QAED,qFAAqF;QACrF,sDAAsD;QACtD,CAAC,IAAI,CAAC,OAAO;YACX,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;gBACtD,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"tvs.js","sourceRoot":"","sources":["../../src/irdevices/tvs.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ class VacuumCleaner {
|
|
|
34
34
|
this.service.getCharacteristic(this.platform.Characteristic.On).onSet(this.OnSet.bind(this));
|
|
35
35
|
}
|
|
36
36
|
OnSet(value) {
|
|
37
|
-
this.platform.debug(
|
|
37
|
+
this.platform.debug(`${this.device.remoteType} ${this.accessory.displayName} Set On: ${value}`);
|
|
38
38
|
this.On = value;
|
|
39
39
|
if (this.On) {
|
|
40
40
|
this.pushOnChanges();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vacuumcleaners.js","sourceRoot":"","sources":["../../src/irdevices/vacuumcleaners.ts"],"names":[],"mappings":";;;AAGA,0CAAkD;AAElD;;;;GAIG;AACH,MAAa,aAAa;IAKxB,YACmB,QAA2B,EACpC,SAA4B,EAC7B,MAAgB;QAFN,aAAQ,GAAR,QAAQ,CAAmB;QACpC,cAAS,GAAT,SAAS,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAU;QAEvB,4BAA4B;QAC5B,SAAS;aACN,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAE;aACvD,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,WAAW,CAAC;aACzE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC;aACxE,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEjF,qFAAqF;QACrF,sDAAsD;QACtD,CAAC,IAAI,CAAC,OAAO;YACX,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC;gBAClD,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACrD,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QAE5C,+HAA+H;QAC/H,2HAA2H;QAC3H,sHAAsH;QAEtH,sFAAsF;QACtF,8GAA8G;QAC9G,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAC5B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EACjC,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,EAAE,CAC5C,CAAC;QAEF,qDAAqD;QACrD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/F,CAAC;IAEO,KAAK,CAAC,KAA0B;QACtC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"vacuumcleaners.js","sourceRoot":"","sources":["../../src/irdevices/vacuumcleaners.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge SwitchBot",
|
|
3
3
|
"name": "@switchbot/homebridge-switchbot",
|
|
4
|
-
"version": "0.1.2-beta.
|
|
4
|
+
"version": "0.1.2-beta.4",
|
|
5
5
|
"description": "The [Homebridge](https://homebridge.io) SwitchBot plugin allows you to access your [SwitchBot](https://www.switch-bot.com) device(s) from HomeKit.",
|
|
6
6
|
"author": "SwitchBot <support@wondertechlabs.com> (https://github.com/SwitchBot)",
|
|
7
7
|
"license": "ISC",
|
package/src/devices/bots.ts
CHANGED
|
@@ -19,18 +19,19 @@ export class Bot {
|
|
|
19
19
|
RunTimer!: NodeJS.Timeout;
|
|
20
20
|
ScanDuration: number;
|
|
21
21
|
TargetState;
|
|
22
|
-
switchbot!:{
|
|
22
|
+
switchbot!: {
|
|
23
23
|
discover: (
|
|
24
24
|
arg0:
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
25
|
+
{
|
|
26
|
+
duration: any;
|
|
27
|
+
model: string;
|
|
28
|
+
quick: boolean;
|
|
29
|
+
id: MacAddress;
|
|
30
|
+
}
|
|
31
|
+
) => Promise<any>;
|
|
31
32
|
wait: (
|
|
32
33
|
arg0: number
|
|
33
|
-
|
|
34
|
+
) => any;
|
|
34
35
|
};
|
|
35
36
|
|
|
36
37
|
botUpdateInProgress!: boolean;
|
|
@@ -79,11 +80,11 @@ export class Bot {
|
|
|
79
80
|
if (this.platform.config.options?.bot?.switch) {
|
|
80
81
|
(this.service =
|
|
81
82
|
accessory.getService(this.platform.Service.Switch) ||
|
|
82
|
-
accessory.addService(this.platform.Service.Switch)),
|
|
83
|
+
accessory.addService(this.platform.Service.Switch)), `${device.deviceName} ${device.deviceType}`;
|
|
83
84
|
} else {
|
|
84
85
|
(this.service =
|
|
85
86
|
accessory.getService(this.platform.Service.Outlet) ||
|
|
86
|
-
accessory.addService(this.platform.Service.Outlet)),
|
|
87
|
+
accessory.addService(this.platform.Service.Outlet)), `${device.deviceName} ${device.deviceType}`;
|
|
87
88
|
}
|
|
88
89
|
|
|
89
90
|
// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
|
|
@@ -158,29 +159,78 @@ export class Bot {
|
|
|
158
159
|
async refreshStatus() {
|
|
159
160
|
if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
|
|
160
161
|
this.platform.log.warn('BLE DEVICE-REFRESH');
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
hubDeviceId: this.device.hubDeviceId,
|
|
170
|
-
power: 'on',
|
|
171
|
-
},
|
|
172
|
-
message: 'success',
|
|
173
|
-
};
|
|
174
|
-
this.deviceStatus = deviceStatus;
|
|
175
|
-
this.parseStatus();
|
|
176
|
-
this.updateHomeKitCharacteristics();
|
|
177
|
-
} catch (e: any) {
|
|
178
|
-
this.platform.log.error(
|
|
179
|
-
`Bot - Failed to update status of ${this.device.deviceName}`,
|
|
180
|
-
JSON.stringify(e.message),
|
|
181
|
-
this.platform.debug(`Bot ${this.accessory.displayName} - ${JSON.stringify(e)}`));
|
|
182
|
-
this.apiError(e);
|
|
162
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
163
|
+
const Switchbot = require('node-switchbot');
|
|
164
|
+
const switchbot = new Switchbot();
|
|
165
|
+
const colon = this.device.deviceId!.match(/.{1,2}/g);
|
|
166
|
+
const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
|
|
167
|
+
this.device.bleMac = bleMac.toLowerCase();
|
|
168
|
+
if (this.platform.config.options.debug) {
|
|
169
|
+
this.platform.log.warn(this.device.bleMac!);
|
|
183
170
|
}
|
|
171
|
+
switchbot.onadvertisement = (ad: any) => {
|
|
172
|
+
this.platform.log.info(JSON.stringify(ad, null, ' '));
|
|
173
|
+
this.platform.log.warn('ad:', JSON.stringify(ad));
|
|
174
|
+
};
|
|
175
|
+
switchbot
|
|
176
|
+
.startScan({
|
|
177
|
+
id: this.device.bleMac,
|
|
178
|
+
})
|
|
179
|
+
.then(() => {
|
|
180
|
+
return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
|
|
181
|
+
})
|
|
182
|
+
.then(() => {
|
|
183
|
+
switchbot.stopScan();
|
|
184
|
+
})
|
|
185
|
+
.catch(async (error: any) => {
|
|
186
|
+
this.platform.log.error(error);
|
|
187
|
+
await this.openAPIRefreshStatus();
|
|
188
|
+
});
|
|
189
|
+
setInterval(() => {
|
|
190
|
+
this.platform.log.info('Start scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
|
|
191
|
+
switchbot
|
|
192
|
+
.startScan({
|
|
193
|
+
mode: 'T',
|
|
194
|
+
id: bleMac,
|
|
195
|
+
})
|
|
196
|
+
.then(() => {
|
|
197
|
+
return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
|
|
198
|
+
})
|
|
199
|
+
.then(() => {
|
|
200
|
+
switchbot.stopScan();
|
|
201
|
+
this.platform.log.info('Stop scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
|
|
202
|
+
})
|
|
203
|
+
.catch(async (error: any) => {
|
|
204
|
+
this.platform.log.error(error);
|
|
205
|
+
await this.openAPIRefreshStatus();
|
|
206
|
+
});
|
|
207
|
+
}, this.platform.config.options!.refreshRate! * 60000);
|
|
208
|
+
} else {
|
|
209
|
+
this.openAPIRefreshStatus();
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
private openAPIRefreshStatus() {
|
|
214
|
+
try {
|
|
215
|
+
const deviceStatus: deviceStatusResponse = {
|
|
216
|
+
statusCode: 100,
|
|
217
|
+
body: {
|
|
218
|
+
deviceId: this.device.deviceId!,
|
|
219
|
+
deviceType: this.device.deviceType!,
|
|
220
|
+
hubDeviceId: this.device.hubDeviceId,
|
|
221
|
+
power: 'on',
|
|
222
|
+
},
|
|
223
|
+
message: 'success',
|
|
224
|
+
};
|
|
225
|
+
this.deviceStatus = deviceStatus;
|
|
226
|
+
this.parseStatus();
|
|
227
|
+
this.updateHomeKitCharacteristics();
|
|
228
|
+
} catch (e: any) {
|
|
229
|
+
this.platform.log.error(
|
|
230
|
+
`Bot - Failed to update status of ${this.device.deviceName}`,
|
|
231
|
+
JSON.stringify(e.message),
|
|
232
|
+
this.platform.debug(`Bot ${this.accessory.displayName} - ${JSON.stringify(e)}`));
|
|
233
|
+
this.apiError(e);
|
|
184
234
|
}
|
|
185
235
|
}
|
|
186
236
|
|
|
@@ -230,14 +280,14 @@ export class Bot {
|
|
|
230
280
|
this.platform.log.info('Done.');
|
|
231
281
|
this.SwitchOn = this.TargetState;
|
|
232
282
|
this.RunTimer = setTimeout(() => {
|
|
233
|
-
this.service?.getCharacteristic(
|
|
283
|
+
this.service?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.SwitchOn);
|
|
234
284
|
}, 500);
|
|
235
285
|
this.platform.log.info('Bot state has been set to: ' + (this.SwitchOn ? 'ON' : 'OFF'));
|
|
236
286
|
})
|
|
237
287
|
.catch((error: any) => {
|
|
238
288
|
this.platform.log.error(error);
|
|
239
289
|
this.RunTimer = setTimeout(() => {
|
|
240
|
-
this.service?.getCharacteristic(
|
|
290
|
+
this.service?.getCharacteristic(this.platform.Characteristic.On).updateValue(this.SwitchOn);
|
|
241
291
|
}, 500);
|
|
242
292
|
this.platform.log.info('Bot state failed to be set to: ' + (this.TargetState ? 'ON' : 'OFF'));
|
|
243
293
|
});
|
|
@@ -359,7 +409,7 @@ export class Bot {
|
|
|
359
409
|
}
|
|
360
410
|
|
|
361
411
|
async retry(max: number, fn: { (): any; (): Promise<any>; }): Promise<null> {
|
|
362
|
-
return fn().catch(
|
|
412
|
+
return fn().catch(async (err: any) => {
|
|
363
413
|
if (max === 0) {
|
|
364
414
|
throw err;
|
|
365
415
|
}
|
package/src/devices/bulb.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
|
|
1
|
+
import { Service, PlatformAccessory, CharacteristicValue, MacAddress } from 'homebridge';
|
|
2
2
|
import { SwitchBotPlatform } from '../platform';
|
|
3
3
|
import { interval, Subject } from 'rxjs';
|
|
4
4
|
import { debounceTime, skipWhile, tap } from 'rxjs/operators';
|
|
@@ -11,13 +11,32 @@ import { AxiosResponse } from 'axios';
|
|
|
11
11
|
* Each accessory may expose multiple services of different service types.
|
|
12
12
|
*/
|
|
13
13
|
export class Bulb {
|
|
14
|
+
// Services
|
|
14
15
|
service!: Service;
|
|
15
16
|
|
|
17
|
+
// Characteristic Values
|
|
16
18
|
On!: CharacteristicValue;
|
|
17
19
|
Brightness!: CharacteristicValue;
|
|
18
20
|
ColorTemperature!: CharacteristicValue;
|
|
21
|
+
|
|
22
|
+
// Others
|
|
19
23
|
deviceStatus!: deviceStatusResponse;
|
|
24
|
+
switchbot!: {
|
|
25
|
+
discover: (
|
|
26
|
+
arg0:
|
|
27
|
+
{
|
|
28
|
+
duration: any;
|
|
29
|
+
model: string;
|
|
30
|
+
quick: boolean;
|
|
31
|
+
id: MacAddress;
|
|
32
|
+
}
|
|
33
|
+
) => Promise<any>;
|
|
34
|
+
wait: (
|
|
35
|
+
arg0: number
|
|
36
|
+
) => any;
|
|
37
|
+
};
|
|
20
38
|
|
|
39
|
+
// Updates
|
|
21
40
|
bulbUpdateInProgress!: boolean;
|
|
22
41
|
doBulbUpdate;
|
|
23
42
|
|
|
@@ -29,6 +48,17 @@ export class Bulb {
|
|
|
29
48
|
// default placeholders
|
|
30
49
|
this.On = false;
|
|
31
50
|
this.Brightness = 0;
|
|
51
|
+
if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
|
|
52
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
53
|
+
const SwitchBot = require('node-switchbot');
|
|
54
|
+
this.switchbot = new SwitchBot();
|
|
55
|
+
const colon = device.deviceId!.match(/.{1,2}/g);
|
|
56
|
+
const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
|
|
57
|
+
this.device.bleMac = bleMac.toLowerCase();
|
|
58
|
+
if (this.platform.config.options.debug) {
|
|
59
|
+
this.platform.log.warn(this.device.bleMac.toLowerCase());
|
|
60
|
+
}
|
|
61
|
+
}
|
|
32
62
|
|
|
33
63
|
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
34
64
|
this.doBulbUpdate = new Subject();
|
|
@@ -49,7 +79,7 @@ export class Bulb {
|
|
|
49
79
|
// you can create multiple services for each accessory
|
|
50
80
|
(this.service =
|
|
51
81
|
accessory.getService(this.platform.Service.Lightbulb) ||
|
|
52
|
-
accessory.addService(this.platform.Service.Lightbulb)),
|
|
82
|
+
accessory.addService(this.platform.Service.Lightbulb)), `${device.deviceName} ${device.deviceType}`;
|
|
53
83
|
|
|
54
84
|
// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
|
|
55
85
|
// when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
|
package/src/devices/contact.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
|
|
1
|
+
import { Service, PlatformAccessory, CharacteristicValue, MacAddress } from 'homebridge';
|
|
2
2
|
import { SwitchBotPlatform } from '../platform';
|
|
3
3
|
import { interval, Subject } from 'rxjs';
|
|
4
4
|
import { skipWhile } from 'rxjs/operators';
|
|
@@ -10,13 +10,32 @@ import { DeviceURL, device, deviceStatusResponse } from '../settings';
|
|
|
10
10
|
* Each accessory may expose multiple services of different service types.
|
|
11
11
|
*/
|
|
12
12
|
export class Contact {
|
|
13
|
+
// Services
|
|
13
14
|
private service: Service;
|
|
14
|
-
|
|
15
|
-
humidityservice?: Service;
|
|
15
|
+
motionService: Service;
|
|
16
16
|
|
|
17
|
+
// Characteristic Values
|
|
17
18
|
ContactSensorState!: CharacteristicValue;
|
|
18
|
-
|
|
19
|
+
MotionDetected!: CharacteristicValue;
|
|
19
20
|
|
|
21
|
+
// Others
|
|
22
|
+
deviceStatus!: deviceStatusResponse;
|
|
23
|
+
switchbot!: {
|
|
24
|
+
discover: (
|
|
25
|
+
arg0:
|
|
26
|
+
{
|
|
27
|
+
duration: any;
|
|
28
|
+
model: string;
|
|
29
|
+
quick: boolean;
|
|
30
|
+
id: MacAddress;
|
|
31
|
+
}
|
|
32
|
+
) => Promise<any>;
|
|
33
|
+
wait: (
|
|
34
|
+
arg0: number
|
|
35
|
+
) => any;
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
// Updates
|
|
20
39
|
contactUbpdateInProgress!: boolean;
|
|
21
40
|
doContactUpdate;
|
|
22
41
|
|
|
@@ -27,7 +46,17 @@ export class Contact {
|
|
|
27
46
|
) {
|
|
28
47
|
// default placeholders
|
|
29
48
|
this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
30
|
-
|
|
49
|
+
if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
|
|
50
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
51
|
+
const SwitchBot = require('node-switchbot');
|
|
52
|
+
this.switchbot = new SwitchBot();
|
|
53
|
+
const colon = device.deviceId!.match(/.{1,2}/g);
|
|
54
|
+
const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
|
|
55
|
+
this.device.bleMac = bleMac.toLowerCase();
|
|
56
|
+
if (this.platform.config.options.debug) {
|
|
57
|
+
this.platform.log.warn(this.device.bleMac.toLowerCase());
|
|
58
|
+
}
|
|
59
|
+
}
|
|
31
60
|
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
32
61
|
this.doContactUpdate = new Subject();
|
|
33
62
|
this.contactUbpdateInProgress = false;
|
|
@@ -46,7 +75,7 @@ export class Contact {
|
|
|
46
75
|
// you can create multiple services for each accessory
|
|
47
76
|
(this.service =
|
|
48
77
|
accessory.getService(this.platform.Service.ContactSensor) ||
|
|
49
|
-
accessory.addService(this.platform.Service.ContactSensor)),
|
|
78
|
+
accessory.addService(this.platform.Service.ContactSensor)), `${device.deviceName} ${device.deviceType}`;
|
|
50
79
|
|
|
51
80
|
// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
|
|
52
81
|
// when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
|
|
@@ -57,7 +86,10 @@ export class Contact {
|
|
|
57
86
|
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
58
87
|
|
|
59
88
|
// each service must implement at-minimum the "required characteristics" for the given service type
|
|
60
|
-
// see https://developers.homebridge.io/#/service/
|
|
89
|
+
// see https://developers.homebridge.io/#/service/MotionSensor
|
|
90
|
+
(this.motionService =
|
|
91
|
+
accessory.getService(this.platform.Service.MotionSensor) ||
|
|
92
|
+
accessory.addService(this.platform.Service.MotionSensor)), `${device.deviceName} ${device.deviceType}`;
|
|
61
93
|
|
|
62
94
|
// create handlers for required characteristics
|
|
63
95
|
//this.service.setCharacteristic(this.platform.Characteristic.ChargingState, 2);
|
|
@@ -83,12 +115,69 @@ export class Contact {
|
|
|
83
115
|
} else {
|
|
84
116
|
this.ContactSensorState = this.platform.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
85
117
|
}
|
|
118
|
+
this.MotionDetected = Boolean(this.deviceStatus.body.moveDetected);
|
|
119
|
+
this.platform.debug(`${this.accessory.displayName}
|
|
120
|
+
, ContactSensorState: ${this.ContactSensorState}, MotionDetected: ${this.MotionDetected}`);
|
|
86
121
|
}
|
|
87
122
|
|
|
88
123
|
/**
|
|
89
124
|
* Asks the SwitchBot API for the latest device information
|
|
90
125
|
*/
|
|
91
126
|
async refreshStatus() {
|
|
127
|
+
if (this.platform.config.options?.ble?.includes(this.device.deviceId!)) {
|
|
128
|
+
this.platform.log.warn('BLE DEVICE-REFRESH');
|
|
129
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
130
|
+
const Switchbot = require('node-switchbot');
|
|
131
|
+
const switchbot = new Switchbot();
|
|
132
|
+
const colon = this.device.deviceId!.match(/.{1,2}/g);
|
|
133
|
+
const bleMac = colon!.join(':'); //returns 1A:23:B4:56:78:9A;
|
|
134
|
+
this.device.bleMac = bleMac.toLowerCase();
|
|
135
|
+
if (this.platform.config.options.debug) {
|
|
136
|
+
this.platform.log.warn(this.device.bleMac!);
|
|
137
|
+
}
|
|
138
|
+
switchbot.onadvertisement = (ad: any) => {
|
|
139
|
+
this.platform.log.info(JSON.stringify(ad, null, ' '));
|
|
140
|
+
this.platform.log.warn('ad:', JSON.stringify(ad));
|
|
141
|
+
};
|
|
142
|
+
switchbot
|
|
143
|
+
.startScan({
|
|
144
|
+
id: this.device.bleMac,
|
|
145
|
+
})
|
|
146
|
+
.then(() => {
|
|
147
|
+
return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
|
|
148
|
+
})
|
|
149
|
+
.then(() => {
|
|
150
|
+
switchbot.stopScan();
|
|
151
|
+
})
|
|
152
|
+
.catch(async (error: any) => {
|
|
153
|
+
this.platform.log.error(error);
|
|
154
|
+
await this.openAPIRefreshStatus();
|
|
155
|
+
});
|
|
156
|
+
setInterval(() => {
|
|
157
|
+
this.platform.log.info('Start scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
|
|
158
|
+
switchbot
|
|
159
|
+
.startScan({
|
|
160
|
+
mode: 'C',
|
|
161
|
+
id: bleMac,
|
|
162
|
+
})
|
|
163
|
+
.then(() => {
|
|
164
|
+
return switchbot.wait(this.platform.config.options!.refreshRate! * 1000);
|
|
165
|
+
})
|
|
166
|
+
.then(() => {
|
|
167
|
+
switchbot.stopScan();
|
|
168
|
+
this.platform.log.info('Stop scan ' + this.device.deviceName + '(' + this.device.bleMac + ')');
|
|
169
|
+
})
|
|
170
|
+
.catch(async (error: any) => {
|
|
171
|
+
this.platform.log.error(error);
|
|
172
|
+
await this.openAPIRefreshStatus();
|
|
173
|
+
});
|
|
174
|
+
}, this.platform.config.options!.refreshRate! * 60000);
|
|
175
|
+
} else {
|
|
176
|
+
await this.openAPIRefreshStatus();
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
private async openAPIRefreshStatus() {
|
|
92
181
|
try {
|
|
93
182
|
const deviceStatus: deviceStatusResponse = (
|
|
94
183
|
await this.platform.axios.get(`${DeviceURL}/${this.device.deviceId}/status`)
|
|
@@ -105,8 +194,7 @@ export class Contact {
|
|
|
105
194
|
'Contact - Failed to update status of',
|
|
106
195
|
this.device.deviceName,
|
|
107
196
|
JSON.stringify(e.message),
|
|
108
|
-
this.platform.debug(`Contact ${this.accessory.displayName} - ${JSON.stringify(e)}`)
|
|
109
|
-
);
|
|
197
|
+
this.platform.debug(`Contact ${this.accessory.displayName} - ${JSON.stringify(e)}`));
|
|
110
198
|
this.apiError(e);
|
|
111
199
|
}
|
|
112
200
|
}
|
|
@@ -118,9 +206,13 @@ export class Contact {
|
|
|
118
206
|
if (this.ContactSensorState !== undefined) {
|
|
119
207
|
this.service.updateCharacteristic(this.platform.Characteristic.ContactSensorState, this.ContactSensorState);
|
|
120
208
|
}
|
|
209
|
+
if (this.MotionDetected !== undefined) {
|
|
210
|
+
this.motionService.updateCharacteristic(this.platform.Characteristic.MotionDetected, this.MotionDetected);
|
|
211
|
+
}
|
|
121
212
|
}
|
|
122
213
|
|
|
123
214
|
public apiError(e: any) {
|
|
124
215
|
this.service.updateCharacteristic(this.platform.Characteristic.ContactSensorState, e);
|
|
216
|
+
this.motionService.updateCharacteristic(this.platform.Characteristic.MotionDetected, e);
|
|
125
217
|
}
|
|
126
218
|
}
|