node-switchbot 3.1.2-beta.3 → 3.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.
|
@@ -7,27 +7,10 @@ import { SwitchbotDevice } from '../device.js';
|
|
|
7
7
|
* @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/meter.md
|
|
8
8
|
*/
|
|
9
9
|
export declare class WoSensorTH extends SwitchbotDevice {
|
|
10
|
-
|
|
11
|
-
* Parses the service data for WoSensorTH.
|
|
12
|
-
* @param {Buffer} serviceData - The service data buffer.
|
|
13
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
14
|
-
* @returns {Promise<meterServiceData | null>} - Parsed service data or null if invalid.
|
|
15
|
-
*/
|
|
10
|
+
constructor(peripheral: NobleTypes['peripheral'], noble: NobleTypes['noble']);
|
|
16
11
|
static parseServiceData(serviceData: Buffer, emitLog: (level: string, message: string) => void): Promise<meterServiceData | null>;
|
|
17
|
-
/**
|
|
18
|
-
* Parses the service data for WoSensorTH Plus.
|
|
19
|
-
* @param {Buffer} serviceData - The service data buffer.
|
|
20
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
21
|
-
* @returns {Promise<meterPlusServiceData | null>} - Parsed service data or null if invalid.
|
|
22
|
-
*/
|
|
23
12
|
static parseServiceData_Plus(serviceData: Buffer, emitLog: (level: string, message: string) => void): Promise<meterPlusServiceData | null>;
|
|
24
|
-
/**
|
|
25
|
-
* Parses the service data for WoSensorTH Plus.
|
|
26
|
-
* @param {Buffer} serviceData - The service data buffer.
|
|
27
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
28
|
-
* @returns {Promise<meterProServiceData | null>} - Parsed service data or null if invalid.
|
|
29
|
-
*/
|
|
30
13
|
static parseServiceData_Pro(serviceData: Buffer, emitLog: (level: string, message: string) => void): Promise<meterProServiceData | null>;
|
|
31
|
-
|
|
14
|
+
private static parseServiceDataCommon;
|
|
32
15
|
}
|
|
33
16
|
//# sourceMappingURL=wosensorth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wosensorth.d.ts","sourceRoot":"","sources":["../../src/device/wosensorth.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eAAe;
|
|
1
|
+
{"version":3,"file":"wosensorth.d.ts","sourceRoot":"","sources":["../../src/device/wosensorth.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9G,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eAAe;gBACjC,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC;WAI/D,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAChD,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;WAItB,qBAAqB,CAChC,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAChD,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC;WAI1B,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,GAChD,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;mBAIjB,sBAAsB;CA4C5C"}
|
|
@@ -5,86 +5,52 @@ import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName
|
|
|
5
5
|
* @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/meter.md
|
|
6
6
|
*/
|
|
7
7
|
export class WoSensorTH extends SwitchbotDevice {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
12
|
-
* @returns {Promise<meterServiceData | null>} - Parsed service data or null if invalid.
|
|
13
|
-
*/
|
|
8
|
+
constructor(peripheral, noble) {
|
|
9
|
+
super(peripheral, noble);
|
|
10
|
+
}
|
|
14
11
|
static async parseServiceData(serviceData, emitLog) {
|
|
15
|
-
|
|
16
|
-
emitLog('debugerror', `[parseServiceDataForWoSensorTH] Buffer length ${serviceData.length} !== 6!`);
|
|
17
|
-
return null;
|
|
18
|
-
}
|
|
19
|
-
const [byte2, byte3, byte4, byte5] = [serviceData.readUInt8(2), serviceData.readUInt8(3), serviceData.readUInt8(4), serviceData.readUInt8(5)];
|
|
20
|
-
const tempSign = byte4 & 0b10000000 ? 1 : -1;
|
|
21
|
-
const tempC = tempSign * ((byte4 & 0b01111111) + (byte3 & 0b00001111) / 10);
|
|
22
|
-
const tempF = Math.round(((tempC * 9 / 5) + 32) * 10) / 10;
|
|
23
|
-
return {
|
|
24
|
-
model: SwitchBotBLEModel.Meter,
|
|
25
|
-
modelName: SwitchBotBLEModelName.Meter,
|
|
26
|
-
modelFriendlyName: SwitchBotBLEModelFriendlyName.Meter,
|
|
27
|
-
celsius: tempC,
|
|
28
|
-
fahrenheit: tempF,
|
|
29
|
-
fahrenheit_mode: !!(byte5 & 0b10000000),
|
|
30
|
-
humidity: byte5 & 0b01111111,
|
|
31
|
-
battery: byte2 & 0b01111111,
|
|
32
|
-
};
|
|
12
|
+
return this.parseServiceDataCommon(serviceData, emitLog, SwitchBotBLEModel.Meter, SwitchBotBLEModelName.Meter, SwitchBotBLEModelFriendlyName.Meter);
|
|
33
13
|
}
|
|
34
|
-
/**
|
|
35
|
-
* Parses the service data for WoSensorTH Plus.
|
|
36
|
-
* @param {Buffer} serviceData - The service data buffer.
|
|
37
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
38
|
-
* @returns {Promise<meterPlusServiceData | null>} - Parsed service data or null if invalid.
|
|
39
|
-
*/
|
|
40
14
|
static async parseServiceData_Plus(serviceData, emitLog) {
|
|
41
|
-
|
|
42
|
-
emitLog('debugerror', `[parseServiceDataForWoSensorTHPlus] Buffer length ${serviceData.length} !== 6!`);
|
|
43
|
-
return null;
|
|
44
|
-
}
|
|
45
|
-
const [byte2, byte3, byte4, byte5] = [serviceData.readUInt8(2), serviceData.readUInt8(3), serviceData.readUInt8(4), serviceData.readUInt8(5)];
|
|
46
|
-
const tempSign = byte4 & 0b10000000 ? 1 : -1;
|
|
47
|
-
const tempC = tempSign * ((byte4 & 0b01111111) + (byte3 & 0b00001111) / 10);
|
|
48
|
-
const tempF = Math.round(((tempC * 9 / 5) + 32) * 10) / 10;
|
|
49
|
-
return {
|
|
50
|
-
model: SwitchBotBLEModel.MeterPlus,
|
|
51
|
-
modelName: SwitchBotBLEModelName.MeterPlus,
|
|
52
|
-
modelFriendlyName: SwitchBotBLEModelFriendlyName.MeterPlus,
|
|
53
|
-
celsius: tempC,
|
|
54
|
-
fahrenheit: tempF,
|
|
55
|
-
fahrenheit_mode: !!(byte5 & 0b10000000),
|
|
56
|
-
humidity: byte5 & 0b01111111,
|
|
57
|
-
battery: byte2 & 0b01111111,
|
|
58
|
-
};
|
|
15
|
+
return this.parseServiceDataCommon(serviceData, emitLog, SwitchBotBLEModel.MeterPlus, SwitchBotBLEModelName.MeterPlus, SwitchBotBLEModelFriendlyName.MeterPlus);
|
|
59
16
|
}
|
|
60
|
-
/**
|
|
61
|
-
* Parses the service data for WoSensorTH Plus.
|
|
62
|
-
* @param {Buffer} serviceData - The service data buffer.
|
|
63
|
-
* @param {Function} emitLog - The function to emit log messages.
|
|
64
|
-
* @returns {Promise<meterProServiceData | null>} - Parsed service data or null if invalid.
|
|
65
|
-
*/
|
|
66
17
|
static async parseServiceData_Pro(serviceData, emitLog) {
|
|
18
|
+
return this.parseServiceDataCommon(serviceData, emitLog, SwitchBotBLEModel.MeterPro, SwitchBotBLEModelName.MeterPro, SwitchBotBLEModelFriendlyName.MeterPro);
|
|
19
|
+
}
|
|
20
|
+
static async parseServiceDataCommon(serviceData, emitLog, model, modelName, modelFriendlyName) {
|
|
67
21
|
if (serviceData.length !== 6) {
|
|
68
|
-
emitLog('debugerror', `[
|
|
22
|
+
emitLog('debugerror', `[parseServiceDataCommon] Buffer length ${serviceData.length} !== 6!`);
|
|
69
23
|
return null;
|
|
70
24
|
}
|
|
71
|
-
const [byte2, byte3, byte4, byte5] = [
|
|
25
|
+
const [byte2, byte3, byte4, byte5] = [
|
|
26
|
+
serviceData.readUInt8(2),
|
|
27
|
+
serviceData.readUInt8(3),
|
|
28
|
+
serviceData.readUInt8(4),
|
|
29
|
+
serviceData.readUInt8(5),
|
|
30
|
+
];
|
|
72
31
|
const tempSign = byte4 & 0b10000000 ? 1 : -1;
|
|
73
32
|
const tempC = tempSign * ((byte4 & 0b01111111) + (byte3 & 0b00001111) / 10);
|
|
74
|
-
const tempF = Math.round(((tempC * 9 / 5
|
|
75
|
-
|
|
76
|
-
model
|
|
77
|
-
modelName
|
|
78
|
-
modelFriendlyName
|
|
33
|
+
const tempF = Math.round(((tempC * 9) / 5 + 32) * 10) / 10;
|
|
34
|
+
const data = {
|
|
35
|
+
model,
|
|
36
|
+
modelName,
|
|
37
|
+
modelFriendlyName,
|
|
79
38
|
celsius: tempC,
|
|
80
39
|
fahrenheit: tempF,
|
|
81
40
|
fahrenheit_mode: !!(byte5 & 0b10000000),
|
|
82
41
|
humidity: byte5 & 0b01111111,
|
|
83
42
|
battery: byte2 & 0b01111111,
|
|
84
43
|
};
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
44
|
+
if (model === SwitchBotBLEModel.Meter) {
|
|
45
|
+
return data;
|
|
46
|
+
}
|
|
47
|
+
if (model === SwitchBotBLEModel.MeterPlus) {
|
|
48
|
+
return data;
|
|
49
|
+
}
|
|
50
|
+
if (model === SwitchBotBLEModel.MeterPro) {
|
|
51
|
+
return data;
|
|
52
|
+
}
|
|
53
|
+
return null;
|
|
88
54
|
}
|
|
89
55
|
}
|
|
90
56
|
//# sourceMappingURL=wosensorth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wosensorth.js","sourceRoot":"","sources":["../../src/device/wosensorth.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE3G;;;GAGG;AACH,MAAM,OAAO,UAAW,SAAQ,eAAe;IAC7C
|
|
1
|
+
{"version":3,"file":"wosensorth.js","sourceRoot":"","sources":["../../src/device/wosensorth.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "node-switchbot",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "3.1.2-beta.
|
|
4
|
+
"version": "3.1.2-beta.4",
|
|
5
5
|
"description": "The node-switchbot is a Node.js module which allows you to control your Switchbot Devices through Bluetooth (BLE).",
|
|
6
6
|
"author": "OpenWonderLabs (https://github.com/OpenWonderLabs)",
|
|
7
7
|
"license": "MIT",
|