node-switchbot 4.0.0-beta.16 → 4.0.0-beta.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/devices/base.d.ts +52 -1
- package/dist/devices/base.d.ts.map +1 -1
- package/dist/devices/base.js +85 -1
- package/dist/devices/base.js.map +1 -1
- package/dist/devices/sequence-device.d.ts +16 -0
- package/dist/devices/sequence-device.d.ts.map +1 -1
- package/dist/devices/sequence-device.js +16 -0
- package/dist/devices/sequence-device.js.map +1 -1
- package/dist/devices/wo-ai-hub.d.ts +1 -1
- package/dist/devices/wo-ai-hub.d.ts.map +1 -1
- package/dist/devices/wo-ai-hub.js +17 -33
- package/dist/devices/wo-ai-hub.js.map +1 -1
- package/dist/devices/wo-air-purifier-pm25.d.ts +1 -1
- package/dist/devices/wo-air-purifier-pm25.d.ts.map +1 -1
- package/dist/devices/wo-air-purifier-pm25.js +35 -50
- package/dist/devices/wo-air-purifier-pm25.js.map +1 -1
- package/dist/devices/wo-air-purifier.d.ts +1 -1
- package/dist/devices/wo-air-purifier.d.ts.map +1 -1
- package/dist/devices/wo-air-purifier.js +39 -53
- package/dist/devices/wo-air-purifier.js.map +1 -1
- package/dist/devices/wo-blind-tilt.d.ts +2 -17
- package/dist/devices/wo-blind-tilt.d.ts.map +1 -1
- package/dist/devices/wo-blind-tilt.js +128 -94
- package/dist/devices/wo-blind-tilt.js.map +1 -1
- package/dist/devices/wo-bulb.d.ts +1 -1
- package/dist/devices/wo-bulb.d.ts.map +1 -1
- package/dist/devices/wo-bulb.js +35 -49
- package/dist/devices/wo-bulb.js.map +1 -1
- package/dist/devices/wo-candle-warmer-lamp.d.ts +1 -1
- package/dist/devices/wo-candle-warmer-lamp.d.ts.map +1 -1
- package/dist/devices/wo-candle-warmer-lamp.js +14 -30
- package/dist/devices/wo-candle-warmer-lamp.js.map +1 -1
- package/dist/devices/wo-contact.d.ts +1 -1
- package/dist/devices/wo-contact.d.ts.map +1 -1
- package/dist/devices/wo-contact.js +19 -35
- package/dist/devices/wo-contact.js.map +1 -1
- package/dist/devices/wo-curtain.d.ts.map +1 -1
- package/dist/devices/wo-curtain.js +40 -52
- package/dist/devices/wo-curtain.js.map +1 -1
- package/dist/devices/wo-hand.d.ts +4 -4
- package/dist/devices/wo-hand.d.ts.map +1 -1
- package/dist/devices/wo-hand.js +24 -37
- package/dist/devices/wo-hand.js.map +1 -1
- package/dist/devices/wo-hub2.d.ts +1 -1
- package/dist/devices/wo-hub2.d.ts.map +1 -1
- package/dist/devices/wo-hub2.js +17 -33
- package/dist/devices/wo-hub2.js.map +1 -1
- package/dist/devices/wo-humi.d.ts +1 -1
- package/dist/devices/wo-humi.d.ts.map +1 -1
- package/dist/devices/wo-humi.js +21 -37
- package/dist/devices/wo-humi.js.map +1 -1
- package/dist/devices/wo-keypad.d.ts +1 -1
- package/dist/devices/wo-keypad.d.ts.map +1 -1
- package/dist/devices/wo-keypad.js +14 -30
- package/dist/devices/wo-keypad.js.map +1 -1
- package/dist/devices/wo-leak.d.ts +1 -1
- package/dist/devices/wo-leak.d.ts.map +1 -1
- package/dist/devices/wo-leak.js +15 -31
- package/dist/devices/wo-leak.js.map +1 -1
- package/dist/devices/wo-lock-pro.d.ts +1 -1
- package/dist/devices/wo-lock-pro.d.ts.map +1 -1
- package/dist/devices/wo-lock-pro.js +19 -35
- package/dist/devices/wo-lock-pro.js.map +1 -1
- package/dist/devices/wo-lock.d.ts +1 -1
- package/dist/devices/wo-lock.d.ts.map +1 -1
- package/dist/devices/wo-lock.js +18 -34
- package/dist/devices/wo-lock.js.map +1 -1
- package/dist/devices/wo-pan-tilt-cam-plus-3k.d.ts +1 -1
- package/dist/devices/wo-pan-tilt-cam-plus-3k.d.ts.map +1 -1
- package/dist/devices/wo-pan-tilt-cam-plus-3k.js +16 -28
- package/dist/devices/wo-pan-tilt-cam-plus-3k.js.map +1 -1
- package/dist/devices/wo-plug-mini-us.d.ts +1 -1
- package/dist/devices/wo-plug-mini-us.d.ts.map +1 -1
- package/dist/devices/wo-plug-mini-us.js +23 -33
- package/dist/devices/wo-plug-mini-us.js.map +1 -1
- package/dist/devices/wo-presence.d.ts +1 -1
- package/dist/devices/wo-presence.d.ts.map +1 -1
- package/dist/devices/wo-presence.js +17 -33
- package/dist/devices/wo-presence.js.map +1 -1
- package/dist/devices/wo-relay-switch-1.d.ts +1 -1
- package/dist/devices/wo-relay-switch-1.d.ts.map +1 -1
- package/dist/devices/wo-relay-switch-1.js +19 -40
- package/dist/devices/wo-relay-switch-1.js.map +1 -1
- package/dist/devices/wo-remote-with-screen.d.ts +1 -1
- package/dist/devices/wo-remote-with-screen.d.ts.map +1 -1
- package/dist/devices/wo-remote-with-screen.js +14 -30
- package/dist/devices/wo-remote-with-screen.js.map +1 -1
- package/dist/devices/wo-remote.d.ts +1 -1
- package/dist/devices/wo-remote.d.ts.map +1 -1
- package/dist/devices/wo-remote.js +13 -29
- package/dist/devices/wo-remote.js.map +1 -1
- package/dist/devices/wo-rgbic-bulb.d.ts +1 -1
- package/dist/devices/wo-rgbic-bulb.js +1 -1
- package/dist/devices/wo-rgbic-neon-wire-rope-light.d.ts +1 -1
- package/dist/devices/wo-rgbic-neon-wire-rope-light.d.ts.map +1 -1
- package/dist/devices/wo-rgbic-neon-wire-rope-light.js +18 -34
- package/dist/devices/wo-rgbic-neon-wire-rope-light.js.map +1 -1
- package/dist/devices/wo-sensor-th.d.ts +1 -1
- package/dist/devices/wo-sensor-th.d.ts.map +1 -1
- package/dist/devices/wo-sensor-th.js +18 -34
- package/dist/devices/wo-sensor-th.js.map +1 -1
- package/dist/devices/wo-vacuum.d.ts +3 -3
- package/dist/devices/wo-vacuum.d.ts.map +1 -1
- package/dist/devices/wo-vacuum.js +69 -43
- package/dist/devices/wo-vacuum.js.map +1 -1
- package/dist/devices/wo-water-detector.d.ts +1 -1
- package/dist/devices/wo-water-detector.d.ts.map +1 -1
- package/dist/devices/wo-water-detector.js +12 -28
- package/dist/devices/wo-water-detector.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/switchbot.d.ts +1 -0
- package/dist/switchbot.d.ts.map +1 -1
- package/dist/switchbot.js +43 -30
- package/dist/switchbot.js.map +1 -1
- package/dist/types/index.d.ts +18 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/utils/index.d.ts +6 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +23 -0
- package/dist/utils/index.js.map +1 -1
- package/docs/assets/hierarchy.js +1 -1
- package/docs/assets/highlight.css +7 -0
- package/docs/assets/search.js +1 -1
- package/docs/classes/APIError.html +2 -2
- package/docs/classes/APINotAvailableError.html +2 -2
- package/docs/classes/BLEConnection.html +10 -10
- package/docs/classes/BLENotAvailableError.html +2 -2
- package/docs/classes/BLEScanner.html +9 -9
- package/docs/classes/CommandFailedError.html +2 -2
- package/docs/classes/ConnectionTimeoutError.html +2 -2
- package/docs/classes/DeviceManager.html +13 -13
- package/docs/classes/DeviceNotFoundError.html +2 -2
- package/docs/classes/DeviceOverrideStateDuringConnection.html +33 -34
- package/docs/classes/DiscoveryError.html +2 -2
- package/docs/classes/OpenAPIClient.html +24 -24
- package/docs/classes/SequenceDevice.html +42 -35
- package/docs/classes/SwitchBot.html +11 -11
- package/docs/classes/SwitchBotDevice.html +68 -36
- package/docs/classes/SwitchBotError.html +2 -2
- package/docs/classes/ValidationError.html +2 -2
- package/docs/classes/WoAIHub.html +69 -36
- package/docs/classes/WoAirPurifier.html +40 -40
- package/docs/classes/WoAirPurifierPM25.html +73 -40
- package/docs/classes/WoAirPurifierTable.html +40 -40
- package/docs/classes/WoArtFrame.html +43 -43
- package/docs/classes/WoBlindTilt.html +35 -42
- package/docs/classes/WoBulb.html +43 -43
- package/docs/classes/WoCandleWarmerLamp.html +72 -39
- package/docs/classes/WoCeilingLight.html +43 -43
- package/docs/classes/WoCirculatorFan.html +40 -40
- package/docs/classes/WoClimatePanel.html +40 -40
- package/docs/classes/WoContact.html +34 -34
- package/docs/classes/WoCurtain.html +39 -40
- package/docs/classes/WoFloorLamp.html +43 -43
- package/docs/classes/WoGarageDoorOpener.html +39 -39
- package/docs/classes/WoHand.html +43 -43
- package/docs/classes/WoHub2.html +34 -34
- package/docs/classes/WoHub3.html +34 -34
- package/docs/classes/WoHubMiniMatter.html +34 -34
- package/docs/classes/WoHumi.html +41 -41
- package/docs/classes/WoHumi2.html +41 -41
- package/docs/classes/WoIOSensorTH.html +34 -34
- package/docs/classes/WoKeypad.html +34 -34
- package/docs/classes/WoKeypadVision.html +34 -34
- package/docs/classes/WoKeypadVisionPro.html +34 -34
- package/docs/classes/WoLeak.html +34 -34
- package/docs/classes/WoPanTiltCamPlus3K.html +72 -39
- package/docs/classes/WoPlugMiniJP.html +37 -37
- package/docs/classes/WoPlugMiniUS.html +37 -37
- package/docs/classes/WoPresence.html +34 -34
- package/docs/classes/WoRGBICBulb.html +45 -45
- package/docs/classes/WoRGBICNeonWireRopeLight.html +74 -41
- package/docs/classes/WoRGBICWWFloorLamp.html +45 -45
- package/docs/classes/WoRGBICWWStripLight.html +45 -45
- package/docs/classes/WoRelaySwitch1.html +39 -39
- package/docs/classes/WoRelaySwitch1PM.html +39 -39
- package/docs/classes/WoRelaySwitch2PM.html +41 -41
- package/docs/classes/WoRemote.html +34 -34
- package/docs/classes/WoRemoteWithScreen.html +69 -36
- package/docs/classes/WoRollerShade.html +39 -40
- package/docs/classes/WoSensorTH.html +34 -34
- package/docs/classes/WoSensorTHPlus.html +34 -34
- package/docs/classes/WoSensorTHPro.html +34 -34
- package/docs/classes/WoSensorTHProCO2.html +34 -34
- package/docs/classes/WoSmartLock.html +37 -37
- package/docs/classes/WoSmartLockLite.html +37 -37
- package/docs/classes/WoSmartLockPro.html +39 -39
- package/docs/classes/WoSmartLockProWiFi.html +39 -39
- package/docs/classes/WoSmartLockVision.html +37 -37
- package/docs/classes/WoSmartLockVisionPro.html +39 -39
- package/docs/classes/WoSmartThermostatRadiator.html +40 -40
- package/docs/classes/WoStrip.html +43 -43
- package/docs/classes/WoStripLight3.html +43 -43
- package/docs/classes/WoVacuum.html +42 -42
- package/docs/classes/WoVacuumK10Plus.html +42 -42
- package/docs/classes/WoVacuumK10Pro.html +42 -42
- package/docs/classes/WoVacuumK10ProCombo.html +42 -42
- package/docs/classes/WoVacuumK11Plus.html +42 -42
- package/docs/classes/WoVacuumK20.html +42 -42
- package/docs/classes/WoVacuumS10.html +42 -42
- package/docs/classes/WoVacuumS20.html +42 -42
- package/docs/classes/WoWaterDetector.html +69 -36
- package/docs/enums/LogLevel.html +2 -2
- package/docs/enums/SwitchBotBLEModel.html +2 -2
- package/docs/enums/SwitchBotBLEModelName.html +2 -2
- package/docs/functions/updateBaseURL.html +1 -1
- package/docs/hierarchy.html +1 -1
- package/docs/interfaces/APICommandRequest.html +2 -2
- package/docs/interfaces/APICommandResponse.html +2 -2
- package/docs/interfaces/APIDevice.html +2 -2
- package/docs/interfaces/APIDeviceStatus.html +2 -2
- package/docs/interfaces/APIErrorResponse.html +2 -2
- package/docs/interfaces/APIResponse.html +2 -2
- package/docs/interfaces/AirPurifierCommands.html +2 -2
- package/docs/interfaces/AirPurifierServiceData.html +14 -14
- package/docs/interfaces/AirPurifierStatus.html +7 -7
- package/docs/interfaces/BLEAdvertisement.html +5 -5
- package/docs/interfaces/BLEScanOptions.html +5 -5
- package/docs/interfaces/BLEServiceData.html +14 -14
- package/docs/interfaces/BlindTiltCommands.html +2 -2
- package/docs/interfaces/BlindTiltServiceData.html +14 -14
- package/docs/interfaces/BlindTiltStatus.html +6 -6
- package/docs/interfaces/BotCommands.html +2 -2
- package/docs/interfaces/BotServiceData.html +14 -14
- package/docs/interfaces/BotStatus.html +6 -6
- package/docs/interfaces/BulbCommands.html +2 -2
- package/docs/interfaces/BulbServiceData.html +14 -14
- package/docs/interfaces/BulbStatus.html +6 -6
- package/docs/interfaces/CeilingLightCommands.html +2 -2
- package/docs/interfaces/CeilingLightServiceData.html +14 -14
- package/docs/interfaces/CeilingLightStatus.html +6 -6
- package/docs/interfaces/CommandResult.html +6 -6
- package/docs/interfaces/ContactServiceData.html +14 -14
- package/docs/interfaces/ContactStatus.html +6 -6
- package/docs/interfaces/CurtainCommands.html +2 -2
- package/docs/interfaces/CurtainExtendedInfo.html +2 -2
- package/docs/interfaces/CurtainServiceData.html +14 -14
- package/docs/interfaces/CurtainStatus.html +6 -6
- package/docs/interfaces/DeviceInfo.html +18 -18
- package/docs/interfaces/DeviceListResponse.html +2 -2
- package/docs/interfaces/DeviceStatus.html +6 -6
- package/docs/interfaces/DiscoveryOptions.html +7 -7
- package/docs/interfaces/HubServiceData.html +14 -14
- package/docs/interfaces/HubStatus.html +6 -6
- package/docs/interfaces/HumidifierCommands.html +2 -2
- package/docs/interfaces/HumidifierServiceData.html +15 -15
- package/docs/interfaces/HumidifierStatus.html +6 -6
- package/docs/interfaces/KeypadStatus.html +6 -6
- package/docs/interfaces/LeakServiceData.html +14 -14
- package/docs/interfaces/LeakStatus.html +6 -6
- package/docs/interfaces/LockCommands.html +2 -2
- package/docs/interfaces/LockServiceData.html +15 -15
- package/docs/interfaces/LockStatus.html +6 -6
- package/docs/interfaces/MeterServiceData.html +14 -14
- package/docs/interfaces/MeterStatus.html +6 -6
- package/docs/interfaces/MotionServiceData.html +14 -14
- package/docs/interfaces/MotionStatus.html +6 -6
- package/docs/interfaces/PlugCommands.html +2 -2
- package/docs/interfaces/PlugServiceData.html +14 -14
- package/docs/interfaces/PlugStatus.html +6 -6
- package/docs/interfaces/PresenceServiceData.html +14 -14
- package/docs/interfaces/PresenceStatus.html +6 -6
- package/docs/interfaces/RelaySwitchCommands.html +2 -2
- package/docs/interfaces/RelaySwitchServiceData.html +14 -14
- package/docs/interfaces/RelaySwitchStatus.html +6 -6
- package/docs/interfaces/RemoteStatus.html +6 -6
- package/docs/interfaces/SceneListResponse.html +2 -2
- package/docs/interfaces/StripCommands.html +2 -2
- package/docs/interfaces/StripServiceData.html +14 -14
- package/docs/interfaces/StripStatus.html +6 -6
- package/docs/interfaces/SwitchBotConfig.html +25 -16
- package/docs/interfaces/VacuumCommands.html +2 -2
- package/docs/interfaces/VacuumStatus.html +6 -6
- package/docs/interfaces/WebhookConfig.html +2 -2
- package/docs/interfaces/WebhookDetails.html +2 -2
- package/docs/interfaces/WebhookQueryResponse.html +2 -2
- package/docs/interfaces/WebhookSetupResponse.html +2 -2
- package/docs/types/ConnectionType.html +1 -1
- package/docs/types/PhysicalDeviceType.html +1 -1
- package/docs/types/VirtualDeviceType.html +1 -1
- package/docs/variables/urls.html +1 -1
- package/package.json +3 -4
- package/todo/todo.md +14 -10
- package/todo/PYSWITCHBOT_COMPARISON.md +0 -479
- package/todo/README.md +0 -68
- package/todo/completed.md +0 -549
|
@@ -2,38 +2,22 @@ import { Buffer } from 'node:buffer';
|
|
|
2
2
|
import { SwitchBotDevice } from './base.js';
|
|
3
3
|
export class WoCandleWarmerLamp extends SwitchBotDevice {
|
|
4
4
|
/**
|
|
5
|
-
* Get device status (BLE
|
|
5
|
+
* Get device status (BLE-first, API-fallback)
|
|
6
6
|
*/
|
|
7
7
|
async getStatus() {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (this.hasAPI()) {
|
|
22
|
-
const apiStatus = await this.getAPIStatus();
|
|
23
|
-
return {
|
|
24
|
-
deviceId: this.info.id,
|
|
25
|
-
connectionType: 'api',
|
|
26
|
-
updatedAt: new Date(),
|
|
27
|
-
power: apiStatus.power,
|
|
28
|
-
brightness: typeof apiStatus.brightness === 'number' ? apiStatus.brightness : undefined,
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
throw new Error('No connection method available');
|
|
32
|
-
}
|
|
33
|
-
catch (error) {
|
|
34
|
-
this.logger.error('Failed to get status', error);
|
|
35
|
-
throw error;
|
|
36
|
-
}
|
|
8
|
+
return this.getStatusWithFallback(bleData => ({
|
|
9
|
+
deviceId: this.info.id,
|
|
10
|
+
connectionType: 'ble',
|
|
11
|
+
updatedAt: new Date(),
|
|
12
|
+
power: bleData.state ? 'on' : 'off',
|
|
13
|
+
brightness: typeof bleData.brightness === 'number' ? bleData.brightness : undefined,
|
|
14
|
+
}), apiStatus => ({
|
|
15
|
+
deviceId: this.info.id,
|
|
16
|
+
connectionType: 'api',
|
|
17
|
+
updatedAt: new Date(),
|
|
18
|
+
power: apiStatus.power,
|
|
19
|
+
brightness: typeof apiStatus.brightness === 'number' ? apiStatus.brightness : undefined,
|
|
20
|
+
}));
|
|
37
21
|
}
|
|
38
22
|
/**
|
|
39
23
|
* Turn on the candle warmer lamp
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-candle-warmer-lamp.js","sourceRoot":"","sources":["../../src/devices/wo-candle-warmer-lamp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAO3C,MAAM,OAAO,kBAAmB,SAAQ,eAAe;IACrD;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"wo-candle-warmer-lamp.js","sourceRoot":"","sources":["../../src/devices/wo-candle-warmer-lamp.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-contact.d.ts","sourceRoot":"","sources":["../../src/devices/wo-contact.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,SAAU,SAAQ,eAAe;IAC5C;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"wo-contact.d.ts","sourceRoot":"","sources":["../../src/devices/wo-contact.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,SAAU,SAAQ,eAAe;IAC5C;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC;CAuB1C"}
|
|
@@ -8,43 +8,27 @@ import { SwitchBotDevice } from './base.js';
|
|
|
8
8
|
*/
|
|
9
9
|
export class WoContact extends SwitchBotDevice {
|
|
10
10
|
/**
|
|
11
|
-
* Get device status
|
|
11
|
+
* Get device status (BLE-first, API-fallback)
|
|
12
12
|
*/
|
|
13
13
|
async getStatus() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return {
|
|
33
|
-
deviceId: this.info.id,
|
|
34
|
-
connectionType: 'ble',
|
|
35
|
-
openState: bleData.position || 'closed',
|
|
36
|
-
moveDetected: bleData.movement,
|
|
37
|
-
brightness: bleData.lightLevel,
|
|
38
|
-
battery: bleData.battery,
|
|
39
|
-
updatedAt: new Date(),
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
throw new Error('No connection method available');
|
|
43
|
-
}
|
|
44
|
-
catch (error) {
|
|
45
|
-
this.logger.error('Failed to get status', error);
|
|
46
|
-
throw error;
|
|
47
|
-
}
|
|
14
|
+
return this.getStatusWithFallback(bleData => ({
|
|
15
|
+
deviceId: this.info.id,
|
|
16
|
+
connectionType: 'ble',
|
|
17
|
+
openState: bleData.position || 'closed',
|
|
18
|
+
moveDetected: bleData.movement,
|
|
19
|
+
brightness: bleData.lightLevel,
|
|
20
|
+
battery: bleData.battery,
|
|
21
|
+
updatedAt: new Date(),
|
|
22
|
+
}), apiStatus => ({
|
|
23
|
+
deviceId: this.info.id,
|
|
24
|
+
connectionType: 'api',
|
|
25
|
+
openState: apiStatus.openState || 'closed',
|
|
26
|
+
moveDetected: apiStatus.moveDetected,
|
|
27
|
+
brightness: apiStatus.brightness,
|
|
28
|
+
battery: apiStatus.battery,
|
|
29
|
+
version: apiStatus.version,
|
|
30
|
+
updatedAt: new Date(),
|
|
31
|
+
}));
|
|
48
32
|
}
|
|
49
33
|
}
|
|
50
34
|
//# sourceMappingURL=wo-contact.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-contact.js","sourceRoot":"","sources":["../../src/devices/wo-contact.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"wo-contact.js","sourceRoot":"","sources":["../../src/devices/wo-contact.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,qBAAqB,CAC/B,OAAO,CAAC,EAAE,CAAC,CAAC;YACV,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YACtB,cAAc,EAAE,KAAK;YACrB,SAAS,EAAE,OAAO,CAAC,QAAQ,IAAI,QAAQ;YACvC,YAAY,EAAE,OAAO,CAAC,QAAQ;YAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,EACF,SAAS,CAAC,EAAE,CAAC,CAAC;YACZ,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YACtB,cAAc,EAAE,KAAK;YACrB,SAAS,EAAE,SAAS,CAAC,SAAS,IAAI,QAAQ;YAC1C,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,CACH,CAAA;IACH,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-curtain.d.ts","sourceRoot":"","sources":["../../src/devices/wo-curtain.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAM7F,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,SAAU,SAAQ,eAAgB,YAAW,eAAe;IACvE;;OAEG;IACG,IAAI,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzC;;OAEG;IACG,KAAK,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B;;OAEG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAelE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEhB,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"wo-curtain.d.ts","sourceRoot":"","sources":["../../src/devices/wo-curtain.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAM7F,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,SAAU,SAAQ,eAAgB,YAAW,eAAe;IACvE;;OAEG;IACG,IAAI,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzC;;OAEG;IACG,KAAK,CAAC,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1C;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ/B;;OAEG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAelE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEhB,SAAS,IAAI,OAAO,CAAC,aAAa,CAAC;IAiDzC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAkCrD;;;OAGG;IACG,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;IAkBpF;;;OAGG;IACG,oBAAoB,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;CAmBtF"}
|
|
@@ -49,63 +49,51 @@ export class WoCurtain extends SwitchBotDevice {
|
|
|
49
49
|
*/
|
|
50
50
|
_lastPosition;
|
|
51
51
|
async getStatus() {
|
|
52
|
-
|
|
52
|
+
return this.getStatusWithFallback((bleData) => {
|
|
53
53
|
let direction;
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
if (
|
|
60
|
-
|
|
61
|
-
direction = 'opening';
|
|
62
|
-
}
|
|
63
|
-
else if (position < this._lastPosition) {
|
|
64
|
-
direction = 'closing';
|
|
65
|
-
}
|
|
54
|
+
const position = typeof bleData.position === 'number' ? bleData.position : 0;
|
|
55
|
+
if (typeof this._lastPosition === 'number') {
|
|
56
|
+
if (position > this._lastPosition) {
|
|
57
|
+
direction = 'opening';
|
|
58
|
+
}
|
|
59
|
+
else if (position < this._lastPosition) {
|
|
60
|
+
direction = 'closing';
|
|
66
61
|
}
|
|
67
|
-
this._lastPosition = position;
|
|
68
|
-
return {
|
|
69
|
-
deviceId: this.info.id,
|
|
70
|
-
connectionType: 'api',
|
|
71
|
-
position,
|
|
72
|
-
direction,
|
|
73
|
-
calibrated: apiStatus.calibrate,
|
|
74
|
-
moving: apiStatus.moving,
|
|
75
|
-
battery: apiStatus.battery,
|
|
76
|
-
version: apiStatus.version,
|
|
77
|
-
updatedAt: new Date(),
|
|
78
|
-
};
|
|
79
62
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
63
|
+
this._lastPosition = position;
|
|
64
|
+
return {
|
|
65
|
+
deviceId: this.info.id,
|
|
66
|
+
connectionType: 'ble',
|
|
67
|
+
position,
|
|
68
|
+
direction,
|
|
69
|
+
calibrated: bleData.calibration,
|
|
70
|
+
battery: bleData.battery,
|
|
71
|
+
updatedAt: new Date(),
|
|
72
|
+
};
|
|
73
|
+
}, (apiStatus) => {
|
|
74
|
+
let direction;
|
|
75
|
+
const position = typeof apiStatus.slidePosition === 'number' ? apiStatus.slidePosition : 0;
|
|
76
|
+
if (typeof this._lastPosition === 'number') {
|
|
77
|
+
if (position > this._lastPosition) {
|
|
78
|
+
direction = 'opening';
|
|
79
|
+
}
|
|
80
|
+
else if (position < this._lastPosition) {
|
|
81
|
+
direction = 'closing';
|
|
91
82
|
}
|
|
92
|
-
this._lastPosition = position;
|
|
93
|
-
return {
|
|
94
|
-
deviceId: this.info.id,
|
|
95
|
-
connectionType: 'ble',
|
|
96
|
-
position,
|
|
97
|
-
direction,
|
|
98
|
-
calibrated: bleData.calibration,
|
|
99
|
-
battery: bleData.battery,
|
|
100
|
-
updatedAt: new Date(),
|
|
101
|
-
};
|
|
102
83
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
84
|
+
this._lastPosition = position;
|
|
85
|
+
return {
|
|
86
|
+
deviceId: this.info.id,
|
|
87
|
+
connectionType: 'api',
|
|
88
|
+
position,
|
|
89
|
+
direction,
|
|
90
|
+
calibrated: apiStatus.calibrate,
|
|
91
|
+
moving: apiStatus.moving,
|
|
92
|
+
battery: apiStatus.battery,
|
|
93
|
+
version: apiStatus.version,
|
|
94
|
+
updatedAt: new Date(),
|
|
95
|
+
};
|
|
96
|
+
});
|
|
109
97
|
}
|
|
110
98
|
/**
|
|
111
99
|
* Get extended device information (Curtain 3)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-curtain.js","sourceRoot":"","sources":["../../src/devices/wo-curtain.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C;;OAEG;IACH,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG;QACpB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC,EACtD,aAAa,EACb,KAAK,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CACpD,CAAA;QACD,OAAO,MAAM,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,GAAG;QACrB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QACzC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,EACxD,aAAa,EACb,KAAK,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CACtD,CAAA;QACD,OAAO,MAAM,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,eAAe,CAAC,OAAO,CAAC,KAAK,EAC7B,OAAO,CACR,CAAA;QACD,OAAO,MAAM,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,QAAgB,EAAE,KAAK,GAAG,GAAG;QAC7C,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,CAAA;QAEzC,4CAA4C;QAC5C,MAAM,UAAU,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;QAEvF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CACnC,UAAU,EACV,aAAa,EACb,KAAK,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,eAAe,EAAE,CACrE,CAAA;QACD,OAAO,MAAM,CAAC,OAAO,CAAA;IACvB,CAAC;IAED;;OAEG;IACH,aAAa,CAAS;IAEtB,KAAK,CAAC,SAAS;QACb,
|
|
1
|
+
{"version":3,"file":"wo-curtain.js","sourceRoot":"","sources":["../../src/devices/wo-curtain.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,10 @@ import { DeviceOverrideStateDuringConnection } from './device-override-state-dur
|
|
|
8
8
|
* Supports optional BLE password protection
|
|
9
9
|
*/
|
|
10
10
|
export declare class WoHand extends DeviceOverrideStateDuringConnection implements BotCommands {
|
|
11
|
+
/**
|
|
12
|
+
* Get device status (BLE-first, API-fallback)
|
|
13
|
+
*/
|
|
14
|
+
getStatus(): Promise<BotStatus>;
|
|
11
15
|
private password?;
|
|
12
16
|
constructor(info: DeviceInfo, options?: {
|
|
13
17
|
bleConnection?: BLEConnection;
|
|
@@ -67,9 +71,5 @@ export declare class WoHand extends DeviceOverrideStateDuringConnection implemen
|
|
|
67
71
|
* Check if password is configured
|
|
68
72
|
*/
|
|
69
73
|
hasPassword(): boolean;
|
|
70
|
-
/**
|
|
71
|
-
* Get device status
|
|
72
|
-
*/
|
|
73
|
-
getStatus(): Promise<BotStatus>;
|
|
74
74
|
}
|
|
75
75
|
//# sourceMappingURL=wo-hand.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-hand.d.ts","sourceRoot":"","sources":["../../src/devices/wo-hand.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAInD,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAA;AAElG;;;GAGG;AACH,qBAAa,MAAO,SAAQ,mCAAoC,YAAW,WAAW;IACpF,OAAO,CAAC,QAAQ,CAAC,CAAQ;gBAGvB,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE;QACP,aAAa,CAAC,EAAE,aAAa,CAAA;QAC7B,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,mBAAmB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;QACnC,4BAA4B,CAAC,EAAE,OAAO,CAAA;QACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;QAC9B,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;KACb;IAiBR;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAchC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAcjC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAc/B;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,mBAAmB,EAAE,aAAa,CAAC;IAS3F;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAQhC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAQlC;;;;OAIG;YACW,sBAAsB;IAmCpC;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMnC;;OAEG;IACH,aAAa,IAAI,IAAI;IAKrB;;OAEG;IACH,WAAW,IAAI,OAAO;
|
|
1
|
+
{"version":3,"file":"wo-hand.d.ts","sourceRoot":"","sources":["../../src/devices/wo-hand.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAInD,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAA;AAElG;;;GAGG;AACH,qBAAa,MAAO,SAAQ,mCAAoC,YAAW,WAAW;IACpF;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC;IAyBrC,OAAO,CAAC,QAAQ,CAAC,CAAQ;gBAGvB,IAAI,EAAE,UAAU,EAChB,OAAO,GAAE;QACP,aAAa,CAAC,EAAE,aAAa,CAAA;QAC7B,SAAS,CAAC,EAAE,aAAa,CAAA;QACzB,cAAc,CAAC,EAAE,OAAO,CAAA;QACxB,mBAAmB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAA;QACnC,4BAA4B,CAAC,EAAE,OAAO,CAAA;QACtC,oBAAoB,CAAC,EAAE,OAAO,CAAA;QAC9B,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;QACjB,QAAQ,CAAC,EAAE,MAAM,CAAA;KACb;IAiBR;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAchC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAcjC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC;IAc/B;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,mBAAmB,EAAE,aAAa,CAAC;IAS3F;;OAEG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAQhC;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAQlC;;;;OAIG;YACW,sBAAsB;IAmCpC;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAMnC;;OAEG;IACH,aAAa,IAAI,IAAI;IAKrB;;OAEG;IACH,WAAW,IAAI,OAAO;CAOvB"}
|
package/dist/devices/wo-hand.js
CHANGED
|
@@ -10,6 +10,30 @@ import { DeviceOverrideStateDuringConnection } from './device-override-state-dur
|
|
|
10
10
|
* Supports optional BLE password protection
|
|
11
11
|
*/
|
|
12
12
|
export class WoHand extends DeviceOverrideStateDuringConnection {
|
|
13
|
+
/**
|
|
14
|
+
* Get device status (BLE-first, API-fallback)
|
|
15
|
+
*/
|
|
16
|
+
async getStatus() {
|
|
17
|
+
return this.getStatusWithFallback(bleData => ({
|
|
18
|
+
deviceId: this.info.id,
|
|
19
|
+
connectionType: 'ble',
|
|
20
|
+
power: bleData.state ? 'on' : 'off',
|
|
21
|
+
state: bleData.state,
|
|
22
|
+
mode: bleData.mode,
|
|
23
|
+
battery: bleData.battery,
|
|
24
|
+
version: bleData.version,
|
|
25
|
+
updatedAt: new Date(),
|
|
26
|
+
}), apiStatus => ({
|
|
27
|
+
deviceId: this.info.id,
|
|
28
|
+
connectionType: 'api',
|
|
29
|
+
power: apiStatus.power || 'off',
|
|
30
|
+
state: apiStatus.state,
|
|
31
|
+
mode: apiStatus.mode,
|
|
32
|
+
battery: apiStatus.battery,
|
|
33
|
+
version: apiStatus.version,
|
|
34
|
+
updatedAt: new Date(),
|
|
35
|
+
}));
|
|
36
|
+
}
|
|
13
37
|
password;
|
|
14
38
|
constructor(info, options = {}) {
|
|
15
39
|
super(info, options);
|
|
@@ -146,42 +170,5 @@ export class WoHand extends DeviceOverrideStateDuringConnection {
|
|
|
146
170
|
hasPassword() {
|
|
147
171
|
return !!this.password;
|
|
148
172
|
}
|
|
149
|
-
/**
|
|
150
|
-
* Get device status
|
|
151
|
-
*/
|
|
152
|
-
async getStatus() {
|
|
153
|
-
try {
|
|
154
|
-
// Try API first if available
|
|
155
|
-
if (this.hasAPI()) {
|
|
156
|
-
const apiStatus = await this.getAPIStatus();
|
|
157
|
-
return {
|
|
158
|
-
deviceId: this.info.id,
|
|
159
|
-
connectionType: 'api',
|
|
160
|
-
power: apiStatus.power || 'off',
|
|
161
|
-
mode: apiStatus.mode || 'press',
|
|
162
|
-
battery: apiStatus.battery,
|
|
163
|
-
version: apiStatus.version,
|
|
164
|
-
updatedAt: new Date(),
|
|
165
|
-
};
|
|
166
|
-
}
|
|
167
|
-
// Fallback to BLE
|
|
168
|
-
if (this.hasBLE()) {
|
|
169
|
-
const bleData = await this.getBLEStatus().catch(() => this.normalizeBLEStatusData(undefined));
|
|
170
|
-
return {
|
|
171
|
-
deviceId: this.info.id,
|
|
172
|
-
connectionType: 'ble',
|
|
173
|
-
power: bleData.state ? 'on' : 'off',
|
|
174
|
-
mode: bleData.mode,
|
|
175
|
-
battery: bleData.battery,
|
|
176
|
-
updatedAt: new Date(),
|
|
177
|
-
};
|
|
178
|
-
}
|
|
179
|
-
throw new Error('No connection method available');
|
|
180
|
-
}
|
|
181
|
-
catch (error) {
|
|
182
|
-
this.logger.error('Failed to get status', error);
|
|
183
|
-
throw error;
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
173
|
}
|
|
187
174
|
//# sourceMappingURL=wo-hand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-hand.js","sourceRoot":"","sources":["../../src/devices/wo-hand.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACjH,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAA;AAElG;;;GAGG;AACH,MAAM,OAAO,MAAO,SAAQ,mCAAmC;
|
|
1
|
+
{"version":3,"file":"wo-hand.js","sourceRoot":"","sources":["../../src/devices/wo-hand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-hub2.d.ts","sourceRoot":"","sources":["../../src/devices/wo-hub2.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,MAAO,SAAQ,eAAe;IACzC;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"wo-hub2.d.ts","sourceRoot":"","sources":["../../src/devices/wo-hub2.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,MAAO,SAAQ,eAAe;IACzC;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC;CAqBtC"}
|
package/dist/devices/wo-hub2.js
CHANGED
|
@@ -8,41 +8,25 @@ import { SwitchBotDevice } from './base.js';
|
|
|
8
8
|
*/
|
|
9
9
|
export class WoHub2 extends SwitchBotDevice {
|
|
10
10
|
/**
|
|
11
|
-
* Get device status
|
|
11
|
+
* Get device status (BLE-first, API-fallback)
|
|
12
12
|
*/
|
|
13
13
|
async getStatus() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const bleData = await this.getBLEStatus();
|
|
31
|
-
return {
|
|
32
|
-
deviceId: this.info.id,
|
|
33
|
-
connectionType: 'ble',
|
|
34
|
-
temperature: bleData.temperature,
|
|
35
|
-
humidity: bleData.humidity,
|
|
36
|
-
lightLevel: bleData.lightLevel,
|
|
37
|
-
updatedAt: new Date(),
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
throw new Error('No connection method available');
|
|
41
|
-
}
|
|
42
|
-
catch (error) {
|
|
43
|
-
this.logger.error('Failed to get status', error);
|
|
44
|
-
throw error;
|
|
45
|
-
}
|
|
14
|
+
return this.getStatusWithFallback(bleData => ({
|
|
15
|
+
deviceId: this.info.id,
|
|
16
|
+
connectionType: 'ble',
|
|
17
|
+
temperature: bleData.temperature,
|
|
18
|
+
humidity: bleData.humidity,
|
|
19
|
+
lightLevel: bleData.lightLevel,
|
|
20
|
+
updatedAt: new Date(),
|
|
21
|
+
}), apiStatus => ({
|
|
22
|
+
deviceId: this.info.id,
|
|
23
|
+
connectionType: 'api',
|
|
24
|
+
temperature: apiStatus.temperature,
|
|
25
|
+
humidity: apiStatus.humidity,
|
|
26
|
+
lightLevel: apiStatus.lightLevel,
|
|
27
|
+
version: apiStatus.version,
|
|
28
|
+
updatedAt: new Date(),
|
|
29
|
+
}));
|
|
46
30
|
}
|
|
47
31
|
}
|
|
48
32
|
//# sourceMappingURL=wo-hub2.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-hub2.js","sourceRoot":"","sources":["../../src/devices/wo-hub2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,MAAM,OAAO,MAAO,SAAQ,eAAe;IACzC;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"wo-hub2.js","sourceRoot":"","sources":["../../src/devices/wo-hub2.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,MAAM,OAAO,MAAO,SAAQ,eAAe;IACzC;;OAEG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,qBAAqB,CAC/B,OAAO,CAAC,EAAE,CAAC,CAAC;YACV,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YACtB,cAAc,EAAE,KAAK;YACrB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,EACF,SAAS,CAAC,EAAE,CAAC,CAAC;YACZ,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;YACtB,cAAc,EAAE,KAAK;YACrB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CAAC,CACH,CAAA;IACH,CAAC;CACF"}
|
|
@@ -25,7 +25,7 @@ export declare class WoHumi extends SwitchBotDevice implements HumidifierCommand
|
|
|
25
25
|
*/
|
|
26
26
|
setLevel(level: number): Promise<boolean>;
|
|
27
27
|
/**
|
|
28
|
-
* Get device status
|
|
28
|
+
* Get device status (BLE-first/API-fallback, centralized)
|
|
29
29
|
*/
|
|
30
30
|
getStatus(): Promise<HumidifierStatus>;
|
|
31
31
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wo-humi.d.ts","sourceRoot":"","sources":["../../src/devices/wo-humi.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAI9E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,MAAO,SAAQ,eAAgB,YAAW,kBAAkB;IACvE;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAQhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAQjC;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,mBAAmB,EAAE,aAAa,CAAC;IAY1F;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBpD;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/C;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"wo-humi.d.ts","sourceRoot":"","sources":["../../src/devices/wo-humi.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAI9E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAA;AAE3C;;GAEG;AACH,qBAAa,MAAO,SAAQ,eAAgB,YAAW,kBAAkB;IACvE;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAQhC;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAQjC;;OAEG;IACG,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,OAAO,mBAAmB,EAAE,aAAa,CAAC;IAY1F;;OAEG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAiBpD;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/C;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA0B5C;;OAEG;IAEG,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAKjC;;OAEG;IAEG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAKnC;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAiBpD"}
|
package/dist/devices/wo-humi.js
CHANGED
|
@@ -53,45 +53,29 @@ export class WoHumi extends SwitchBotDevice {
|
|
|
53
53
|
return this.setEfficiency(clampedLevel);
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
56
|
-
* Get device status
|
|
56
|
+
* Get device status (BLE-first/API-fallback, centralized)
|
|
57
57
|
*/
|
|
58
58
|
async getStatus() {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
return {
|
|
80
|
-
deviceId: this.info.id,
|
|
81
|
-
connectionType: 'ble',
|
|
82
|
-
power: bleData.onState ? 'on' : 'off',
|
|
83
|
-
mode: bleData.autoMode ? 'auto' : 'manual',
|
|
84
|
-
nebulizationEfficiency: bleData.percentage,
|
|
85
|
-
lackWater: bleData.lackWater,
|
|
86
|
-
updatedAt: new Date(),
|
|
87
|
-
};
|
|
88
|
-
}
|
|
89
|
-
throw new Error('No connection method available');
|
|
90
|
-
}
|
|
91
|
-
catch (error) {
|
|
92
|
-
this.logger.error('Failed to get status', error);
|
|
93
|
-
throw error;
|
|
94
|
-
}
|
|
59
|
+
return this.getStatusWithFallback(bleData => ({
|
|
60
|
+
deviceId: this.info.id,
|
|
61
|
+
connectionType: 'ble',
|
|
62
|
+
power: bleData.onState ? 'on' : 'off',
|
|
63
|
+
mode: bleData.autoMode ? 'auto' : 'manual',
|
|
64
|
+
nebulizationEfficiency: bleData.percentage,
|
|
65
|
+
lackWater: bleData.lackWater,
|
|
66
|
+
updatedAt: new Date(),
|
|
67
|
+
}), apiStatus => ({
|
|
68
|
+
deviceId: this.info.id,
|
|
69
|
+
connectionType: 'api',
|
|
70
|
+
power: apiStatus.power || 'off',
|
|
71
|
+
humidity: apiStatus.humidity,
|
|
72
|
+
mode: apiStatus.auto ? 'auto' : 'manual',
|
|
73
|
+
nebulizationEfficiency: apiStatus.nebulizationEfficiency,
|
|
74
|
+
lackWater: apiStatus.lackWater,
|
|
75
|
+
temperature: apiStatus.temperature,
|
|
76
|
+
version: apiStatus.version,
|
|
77
|
+
updatedAt: new Date(),
|
|
78
|
+
}));
|
|
95
79
|
}
|
|
96
80
|
/**
|
|
97
81
|
* Set auto mode
|