node-switchbot 3.6.0-beta.1 → 3.6.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +19 -0
- package/dist/device.d.ts +158 -53
- package/dist/device.d.ts.map +1 -1
- package/dist/device.js +319 -100
- package/dist/device.js.map +1 -1
- package/dist/device.test.d.ts +2 -0
- package/dist/device.test.d.ts.map +1 -0
- package/dist/device.test.js +152 -0
- package/dist/device.test.js.map +1 -0
- package/dist/index.d.ts +4 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -7
- package/dist/index.js.map +1 -1
- package/dist/parameter-checker.d.ts +1 -0
- package/dist/parameter-checker.d.ts.map +1 -1
- package/dist/parameter-checker.js +19 -11
- package/dist/parameter-checker.js.map +1 -1
- package/dist/parameter-checker.test.d.ts +2 -0
- package/dist/parameter-checker.test.d.ts.map +1 -0
- package/dist/parameter-checker.test.js +56 -0
- package/dist/parameter-checker.test.js.map +1 -0
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +21 -16
- package/dist/settings.js.map +1 -1
- package/dist/settings.test.js +13 -1
- package/dist/settings.test.js.map +1 -1
- package/dist/switchbot-ble.d.ts +7 -4
- package/dist/switchbot-ble.d.ts.map +1 -1
- package/dist/switchbot-ble.js +77 -37
- package/dist/switchbot-ble.js.map +1 -1
- package/dist/switchbot-ble.test.d.ts +2 -0
- package/dist/switchbot-ble.test.d.ts.map +1 -0
- package/dist/switchbot-ble.test.js +32 -0
- package/dist/switchbot-ble.test.js.map +1 -0
- package/dist/switchbot-openapi.d.ts +4 -7
- package/dist/switchbot-openapi.d.ts.map +1 -1
- package/dist/switchbot-openapi.js +19 -10
- package/dist/switchbot-openapi.js.map +1 -1
- package/dist/switchbot-openapi.test.d.ts +2 -0
- package/dist/switchbot-openapi.test.d.ts.map +1 -0
- package/dist/switchbot-openapi.test.js +36 -0
- package/dist/switchbot-openapi.test.js.map +1 -0
- package/dist/types/ble-guards.d.ts +12 -0
- package/dist/types/ble-guards.d.ts.map +1 -0
- package/dist/types/ble-guards.js +10 -0
- package/dist/types/ble-guards.js.map +1 -0
- package/dist/types/ble-guards.test.d.ts +2 -0
- package/dist/types/ble-guards.test.d.ts.map +1 -0
- package/dist/types/ble-guards.test.js +62 -0
- package/dist/types/ble-guards.test.js.map +1 -0
- package/dist/types/{bledevicestatus.d.ts → ble.d.ts} +97 -116
- package/dist/types/ble.d.ts.map +1 -0
- package/dist/types/ble.js +2 -0
- package/dist/types/ble.js.map +1 -0
- package/dist/types/openapi.d.ts +560 -0
- package/dist/types/openapi.d.ts.map +1 -0
- package/dist/types/openapi.js +3 -0
- package/dist/types/openapi.js.map +1 -0
- package/docs/assets/hierarchy.js +1 -1
- package/docs/assets/navigation.js +1 -1
- package/docs/assets/search.js +1 -1
- package/docs/classes/Advertising.html +4 -4
- package/docs/classes/ErrorUtils.html +25 -0
- package/docs/classes/ParameterChecker.html +69 -0
- package/docs/classes/SwitchBotBLE.html +8 -10
- package/docs/classes/SwitchBotOpenAPI.html +9 -9
- package/docs/classes/SwitchbotDevice.html +12 -12
- package/docs/classes/ValidationUtils.html +51 -0
- package/docs/classes/WoBlindTilt.html +22 -22
- package/docs/classes/WoBulb.html +20 -20
- package/docs/classes/WoCeilingLight.html +24 -24
- package/docs/classes/WoContact.html +14 -14
- package/docs/classes/WoCurtain.html +19 -19
- package/docs/classes/WoHand.html +19 -19
- package/docs/classes/WoHub2.html +14 -14
- package/docs/classes/WoHumi.html +21 -21
- package/docs/classes/WoHumi2.html +21 -21
- package/docs/classes/WoIOSensorTH.html +14 -14
- package/docs/classes/WoKeypad.html +14 -14
- package/docs/classes/WoLeak.html +14 -14
- package/docs/classes/WoPlugMiniJP.html +19 -19
- package/docs/classes/WoPlugMiniUS.html +19 -19
- package/docs/classes/WoPresence.html +14 -14
- package/docs/classes/WoRelaySwitch1.html +16 -16
- package/docs/classes/WoRelaySwitch1PM.html +16 -16
- package/docs/classes/WoRemote.html +14 -14
- package/docs/classes/WoSensorTH.html +12 -12
- package/docs/classes/WoSensorTHPlus.html +12 -12
- package/docs/classes/WoSensorTHPro.html +12 -12
- package/docs/classes/WoSensorTHProCO2.html +12 -12
- package/docs/classes/WoSmartLock.html +24 -24
- package/docs/classes/WoSmartLockPro.html +24 -24
- package/docs/classes/WoStrip.html +21 -21
- package/docs/enums/LogLevel.html +2 -2
- package/docs/enums/SwitchBotBLEModel.html +2 -2
- package/docs/enums/SwitchBotBLEModelFriendlyName.html +2 -2
- package/docs/enums/SwitchBotBLEModelName.html +2 -2
- package/docs/enums/SwitchBotModel.html +2 -2
- package/docs/functions/updateBaseURL.html +3 -0
- package/docs/hierarchy.html +1 -1
- package/docs/interfaces/AdvertisementData.html +2 -2
- package/docs/interfaces/Chars.html +2 -2
- package/docs/interfaces/ColorLightServiceDataBase.html +17 -0
- package/docs/interfaces/Device.html +7 -0
- package/docs/interfaces/DeviceList.html +2 -0
- package/docs/interfaces/ErrorObject.html +2 -2
- package/docs/interfaces/LockBaseServiceData.html +15 -0
- package/docs/interfaces/NobleTypes.html +2 -2
- package/docs/interfaces/Params.html +2 -2
- package/docs/interfaces/PlugMiniServiceDataBase.html +12 -0
- package/docs/interfaces/PushRequest.html +5 -0
- package/docs/interfaces/{pushResponse.html → PushResponse.html} +3 -2
- package/docs/interfaces/PushResponseBody.html +3 -0
- package/docs/interfaces/Rule.html +2 -2
- package/docs/interfaces/ServiceData.html +2 -2
- package/docs/interfaces/SwitchBotBLEDevice.html +2 -2
- package/docs/interfaces/SwitchBotScanner.html +6 -0
- package/docs/interfaces/TemperatureServiceDataBase.html +10 -0
- package/docs/interfaces/WebhookDetail.html +2 -2
- package/docs/interfaces/ad.html +2 -2
- package/docs/interfaces/body.html +2 -2
- package/docs/interfaces/deleteWebhookResponse.html +2 -2
- package/docs/interfaces/deviceStatus.html +2 -2
- package/docs/interfaces/deviceStatusRequest.html +2 -2
- package/docs/interfaces/deviceWebhook.html +2 -2
- package/docs/interfaces/deviceWebhookContext.html +2 -2
- package/docs/interfaces/devices.html +2 -2
- package/docs/interfaces/infraredRemoteList.html +2 -2
- package/docs/interfaces/irdevice.html +2 -2
- package/docs/interfaces/queryWebhookResponse.html +2 -2
- package/docs/interfaces/setupWebhookResponse.html +2 -2
- package/docs/interfaces/updateWebhookResponse.html +2 -2
- package/docs/interfaces/webhookRequest.html +2 -2
- package/docs/modules.html +1 -1
- package/docs/types/BLEDeviceServiceData.html +1 -0
- package/docs/types/BatteryCirculatorFan.html +1 -0
- package/docs/types/BatteryCirculatorFanServiceData.html +1 -0
- package/docs/types/{batteryCirculatorFanStatus.html → BatteryCirculatorFanStatus.html} +1 -1
- package/docs/types/{blindTilt.html → BlindTilt.html} +1 -1
- package/docs/types/BlindTiltServiceData.html +1 -0
- package/docs/types/{blindTiltStatus.html → BlindTiltStatus.html} +1 -1
- package/docs/types/{bot.html → Bot.html} +1 -1
- package/docs/types/BotServiceData.html +1 -0
- package/docs/types/{ceilingLight.html → CeilingLight.html} +1 -1
- package/docs/types/{ceilingLightPro.html → CeilingLightPro.html} +1 -1
- package/docs/types/CeilingLightProServiceData.html +1 -0
- package/docs/types/CeilingLightServiceData.html +1 -0
- package/docs/types/{circulatorFanStatus.html → CirculatorFanStatus.html} +1 -1
- package/docs/types/{colorBulb.html → ColorBulb.html} +1 -1
- package/docs/types/ColorBulbServiceData.html +1 -0
- package/docs/types/CommandType.html +2 -0
- package/docs/types/{contactSensor.html → ContactSensor.html} +1 -1
- package/docs/types/ContactSensorServiceData.html +1 -0
- package/docs/types/{curtain.html → Curtain.html} +1 -1
- package/docs/types/{curtain3.html → Curtain3.html} +1 -1
- package/docs/types/Curtain3ServiceData.html +1 -0
- package/docs/types/CurtainServiceData.html +1 -0
- package/docs/types/{floorCleaningRobotS10.html → FloorCleaningRobotS10.html} +1 -1
- package/docs/types/{hub2.html → Hub2.html} +1 -1
- package/docs/types/Hub2ServiceData.html +1 -0
- package/docs/types/{hub2Status.html → Hub2Status.html} +1 -1
- package/docs/types/{stripLight.html → Humidifier.html} +1 -1
- package/docs/types/Humidifier2ServiceData.html +1 -0
- package/docs/types/{humidifier2Status.html → Humidifier2Status.html} +1 -1
- package/docs/types/HumidifierServiceData.html +1 -0
- package/docs/types/{humidifierStatus.html → HumidifierStatus.html} +1 -1
- package/docs/types/{indoorCam.html → IndoorCam.html} +1 -1
- package/docs/types/{keypad.html → Keypad.html} +1 -1
- package/docs/types/KeypadDetectorServiceData.html +1 -0
- package/docs/types/{keypadTouch.html → KeypadTouch.html} +1 -1
- package/docs/types/{lock.html → Lock.html} +1 -1
- package/docs/types/{lockPro.html → LockPro.html} +1 -1
- package/docs/types/LockProServiceData.html +1 -0
- package/docs/types/LockServiceData.html +1 -0
- package/docs/types/MacAddress.html +1 -1
- package/docs/types/{meter.html → Meter.html} +1 -1
- package/docs/types/{meterPlus.html → MeterPlus.html} +1 -1
- package/docs/types/MeterPlusServiceData.html +1 -0
- package/docs/types/{meterPro.html → MeterPro.html} +1 -1
- package/docs/types/MeterProCO2ServiceData.html +1 -0
- package/docs/types/MeterProServiceData.html +1 -0
- package/docs/types/MeterServiceData.html +1 -0
- package/docs/types/{motionSensor.html → MotionSensor.html} +1 -1
- package/docs/types/MotionSensorServiceData.html +1 -0
- package/docs/types/{outdoorMeter.html → OutdoorMeter.html} +1 -1
- package/docs/types/OutdoorMeterServiceData.html +1 -0
- package/docs/types/{humidifier.html → PantiltCam.html} +1 -1
- package/docs/types/{pantiltCam2k.html → PantiltCam2k.html} +1 -1
- package/docs/types/{plug.html → Plug.html} +1 -1
- package/docs/types/{plugMini.html → PlugMini.html} +1 -1
- package/docs/types/PlugMiniJPServiceData.html +1 -0
- package/docs/types/PlugMiniUSServiceData.html +1 -0
- package/docs/types/RelaySwitch1PMServiceData.html +1 -0
- package/docs/types/RelaySwitch1ServiceData.html +1 -0
- package/docs/types/{remote.html → Remote.html} +1 -1
- package/docs/types/RemoteServiceData.html +1 -0
- package/docs/types/RobotVacuumCleanerS1.html +1 -0
- package/docs/types/{robotVacuumCleanerS1Plus.html → RobotVacuumCleanerS1Plus.html} +1 -1
- package/docs/types/RobotVacuumCleanerServiceData.html +1 -0
- package/docs/types/{pantiltCam.html → StripLight.html} +1 -1
- package/docs/types/StripLightServiceData.html +1 -0
- package/docs/types/{waterLeakDetector.html → WaterLeakDetector.html} +1 -1
- package/docs/types/WaterLeakDetectorServiceData.html +1 -0
- package/docs/types/batteryCirculatorFanWebhookContext.html +1 -1
- package/docs/types/blindTiltWebhookContext.html +1 -1
- package/docs/types/botStatus.html +1 -1
- package/docs/types/botWebhookContext.html +1 -1
- package/docs/types/ceilingLightProStatus.html +1 -1
- package/docs/types/ceilingLightProWebhookContext.html +1 -1
- package/docs/types/ceilingLightStatus.html +1 -1
- package/docs/types/ceilingLightWebhookContext.html +1 -1
- package/docs/types/circulatorFanWebhookContext.html +1 -1
- package/docs/types/colorBulbStatus.html +1 -1
- package/docs/types/colorBulbWebhookContext.html +1 -1
- package/docs/types/contactSensorStatus.html +1 -1
- package/docs/types/contactSensorWebhookContext.html +1 -1
- package/docs/types/curtain3WebhookContext.html +1 -1
- package/docs/types/curtainStatus.html +1 -1
- package/docs/types/curtainWebhookContext.html +1 -1
- package/docs/types/floorCleaningRobotS10Status.html +1 -1
- package/docs/types/floorCleaningRobotS10WebhookContext.html +1 -1
- package/docs/types/hub2WebhookContext.html +1 -1
- package/docs/types/humidifier2WebhookContext.html +1 -1
- package/docs/types/humidifierWebhookContext.html +1 -1
- package/docs/types/indoorCameraWebhookContext.html +1 -1
- package/docs/types/keypadTouchWebhookContext.html +1 -1
- package/docs/types/keypadWebhookContext.html +1 -1
- package/docs/types/lockProStatus.html +1 -1
- package/docs/types/lockProWebhookContext.html +1 -1
- package/docs/types/lockStatus.html +1 -1
- package/docs/types/lockWebhookContext.html +1 -1
- package/docs/types/meterPlusStatus.html +1 -1
- package/docs/types/meterPlusWebhookContext.html +1 -1
- package/docs/types/meterProCO2Status.html +1 -1
- package/docs/types/meterProCO2WebhookContext.html +1 -1
- package/docs/types/meterProStatus.html +1 -1
- package/docs/types/meterProWebhookContext.html +1 -1
- package/docs/types/meterStatus.html +1 -1
- package/docs/types/meterWebhookContext.html +1 -1
- package/docs/types/motionSensorStatus.html +1 -1
- package/docs/types/motionSensorWebhookContext.html +1 -1
- package/docs/types/onadvertisement.html +1 -1
- package/docs/types/ondiscover.html +1 -1
- package/docs/types/outdoorMeterStatus.html +1 -1
- package/docs/types/outdoorMeterWebhookContext.html +1 -1
- package/docs/types/panTiltCamWebhookContext.html +1 -1
- package/docs/types/plugMiniJPWebhookContext.html +1 -1
- package/docs/types/plugMiniStatus.html +1 -1
- package/docs/types/plugMiniUSWebhookContext.html +1 -1
- package/docs/types/plugStatus.html +1 -1
- package/docs/types/plugWebhookContext.html +1 -1
- package/docs/types/relaySwitch1Context.html +1 -1
- package/docs/types/relaySwitch1PMContext.html +1 -1
- package/docs/types/relaySwitch1PMStatus.html +1 -1
- package/docs/types/relaySwitch1Status.html +1 -1
- package/docs/types/robotVacuumCleanerS1PlusStatus.html +1 -1
- package/docs/types/robotVacuumCleanerS1PlusWebhookContext.html +1 -1
- package/docs/types/robotVacuumCleanerS1Status.html +1 -1
- package/docs/types/robotVacuumCleanerS1WebhookContext.html +1 -1
- package/docs/types/stripLightStatus.html +1 -1
- package/docs/types/stripLightWebhookContext.html +1 -1
- package/docs/types/waterLeakDetectorStatus.html +1 -1
- package/docs/types/waterLeakDetectorWebhookContext.html +1 -1
- package/docs/variables/parameterChecker.html +1 -0
- package/docs/variables/urls.html +1 -0
- package/package.json +6 -6
- package/dist/types/bledevicestatus.d.ts.map +0 -1
- package/dist/types/bledevicestatus.js +0 -2
- package/dist/types/bledevicestatus.js.map +0 -1
- package/dist/types/devicelist.d.ts +0 -90
- package/dist/types/devicelist.d.ts.map +0 -1
- package/dist/types/devicelist.js +0 -2
- package/dist/types/devicelist.js.map +0 -1
- package/dist/types/devicepush.d.ts +0 -13
- package/dist/types/devicepush.d.ts.map +0 -1
- package/dist/types/devicepush.js +0 -2
- package/dist/types/devicepush.js.map +0 -1
- package/dist/types/deviceresponse.d.ts +0 -12
- package/dist/types/deviceresponse.d.ts.map +0 -1
- package/dist/types/deviceresponse.js +0 -2
- package/dist/types/deviceresponse.js.map +0 -1
- package/dist/types/devicestatus.d.ts +0 -194
- package/dist/types/devicestatus.d.ts.map +0 -1
- package/dist/types/devicestatus.js +0 -3
- package/dist/types/devicestatus.js.map +0 -1
- package/dist/types/devicewebhookstatus.d.ts +0 -236
- package/dist/types/devicewebhookstatus.d.ts.map +0 -1
- package/dist/types/devicewebhookstatus.js +0 -2
- package/dist/types/devicewebhookstatus.js.map +0 -1
- package/dist/types/irdevicelist.d.ts +0 -10
- package/dist/types/irdevicelist.d.ts.map +0 -1
- package/dist/types/irdevicelist.js +0 -2
- package/dist/types/irdevicelist.js.map +0 -1
- package/docs/interfaces/bodyChange.html +0 -4
- package/docs/interfaces/device.html +0 -7
- package/docs/interfaces/deviceList.html +0 -2
- package/docs/interfaces/switchbot.html +0 -3
- package/docs/types/batteryCirculatorFan.html +0 -1
- package/docs/types/batteryCirculatorFanServiceData.html +0 -1
- package/docs/types/blindTiltServiceData.html +0 -1
- package/docs/types/botServiceData.html +0 -1
- package/docs/types/ceilingLightProServiceData.html +0 -1
- package/docs/types/ceilingLightServiceData.html +0 -1
- package/docs/types/colorBulbServiceData.html +0 -1
- package/docs/types/contactSensorServiceData.html +0 -1
- package/docs/types/curtain3ServiceData.html +0 -1
- package/docs/types/curtainServiceData.html +0 -1
- package/docs/types/hub2ServiceData.html +0 -1
- package/docs/types/humidifier2ServiceData.html +0 -1
- package/docs/types/humidifierServiceData.html +0 -1
- package/docs/types/keypadDetectorServiceData.html +0 -1
- package/docs/types/lockProServiceData.html +0 -1
- package/docs/types/lockServiceData.html +0 -1
- package/docs/types/meterPlusServiceData.html +0 -1
- package/docs/types/meterProCO2ServiceData.html +0 -1
- package/docs/types/meterProServiceData.html +0 -1
- package/docs/types/meterServiceData.html +0 -1
- package/docs/types/motionSensorServiceData.html +0 -1
- package/docs/types/outdoorMeterServiceData.html +0 -1
- package/docs/types/plugMiniJPServiceData.html +0 -1
- package/docs/types/plugMiniUSServiceData.html +0 -1
- package/docs/types/relaySwitch1PMServiceData.html +0 -1
- package/docs/types/relaySwitch1ServiceData.html +0 -1
- package/docs/types/remoteServiceData.html +0 -1
- package/docs/types/robotVacuumCleanerS1.html +0 -1
- package/docs/types/robotVacuumCleanerServiceData.html +0 -1
- package/docs/types/stripLightServiceData.html +0 -1
- package/docs/types/waterLeakDetectorServiceData.html +0 -1
- package/jest.config.js +0 -3
|
@@ -2,6 +2,7 @@ import type { ErrorObject, Rule } from './device.js';
|
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
3
|
export declare class ParameterChecker extends EventEmitter {
|
|
4
4
|
private _error;
|
|
5
|
+
private readonly typeCheckers;
|
|
5
6
|
/**
|
|
6
7
|
* Emits a log event with the specified log level and message.
|
|
7
8
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-checker.d.ts","sourceRoot":"","sources":["../src/parameter-checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAOpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,MAAM,CAA2B;IAEzC;;;;;OAKG;
|
|
1
|
+
{"version":3,"file":"parameter-checker.d.ts","sourceRoot":"","sources":["../src/parameter-checker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAOpD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,MAAM,CAA2B;IAEzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAO5B;IAED;;;;;OAKG;IACH,OAAO,CAAC,OAAO;IAIf;;;;OAIG;IACH,IAAI,KAAK,IAAI,WAAW,GAAG,IAAI,CAE9B;IAED;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IAIpC;;;;;;;OAOG;IACG,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,QAAQ,GAAE,OAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAmDnH;;;;;;;OAOG;IACG,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8BnF;;;;;;;OAOG;IACG,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAerF;;;;;;;OAOG;IACG,SAAS,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAerF;;;;;;;OAOG;IACG,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAepF;;;;;;;OAOG;IACG,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBnF;;;;;;;OAOG;IACG,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,GAAE,MAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAkDrF;AAED,eAAO,MAAM,gBAAgB,kBAAyB,CAAA"}
|
|
@@ -6,13 +6,22 @@ import { Buffer } from 'node:buffer';
|
|
|
6
6
|
import { EventEmitter } from 'node:events';
|
|
7
7
|
export class ParameterChecker extends EventEmitter {
|
|
8
8
|
_error = null;
|
|
9
|
+
// Mapping of type names to checker methods
|
|
10
|
+
typeCheckers = {
|
|
11
|
+
float: this.isFloat.bind(this),
|
|
12
|
+
integer: this.isInteger.bind(this),
|
|
13
|
+
boolean: this.isBoolean.bind(this),
|
|
14
|
+
array: this.isArray.bind(this),
|
|
15
|
+
object: this.isObject.bind(this),
|
|
16
|
+
string: this.isString.bind(this),
|
|
17
|
+
};
|
|
9
18
|
/**
|
|
10
19
|
* Emits a log event with the specified log level and message.
|
|
11
20
|
*
|
|
12
21
|
* @param level - The severity level of the log (e.g., 'info', 'warn', 'error').
|
|
13
22
|
* @param message - The log message to be emitted.
|
|
14
23
|
*/
|
|
15
|
-
|
|
24
|
+
emitLog(level, message) {
|
|
16
25
|
this.emit('log', { level, message });
|
|
17
26
|
}
|
|
18
27
|
/**
|
|
@@ -63,25 +72,24 @@ export class ParameterChecker extends EventEmitter {
|
|
|
63
72
|
}
|
|
64
73
|
continue;
|
|
65
74
|
}
|
|
66
|
-
const
|
|
67
|
-
float: this.isFloat.bind(this),
|
|
68
|
-
integer: this.isInteger.bind(this),
|
|
69
|
-
boolean: this.isBoolean.bind(this),
|
|
70
|
-
array: this.isArray.bind(this),
|
|
71
|
-
object: this.isObject.bind(this),
|
|
72
|
-
string: this.isString.bind(this),
|
|
73
|
-
};
|
|
74
|
-
const checker = rule.type && typeCheckers[rule.type];
|
|
75
|
+
const checker = rule.type && this.typeCheckers[rule.type];
|
|
75
76
|
if (checker) {
|
|
76
77
|
if (!(await checker(value, rule, name))) {
|
|
77
78
|
return false;
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
else {
|
|
81
|
-
|
|
82
|
+
// Unknown type specified in rule
|
|
83
|
+
this.emitLog('error', `Unknown type "${rule.type}" in rule for parameter "${name}"`);
|
|
84
|
+
this._error = { code: 'TYPE_UNKNOWN', message: `Unknown type "${rule.type}" for parameter "${name}"` };
|
|
82
85
|
return false;
|
|
83
86
|
}
|
|
84
87
|
}
|
|
88
|
+
// Warn about extra parameters not defined in rules
|
|
89
|
+
const extra = Object.keys(obj).filter(key => !(key in rules));
|
|
90
|
+
if (extra.length) {
|
|
91
|
+
this.emitLog('warn', `Ignoring extra parameters: ${extra.join(', ')}`);
|
|
92
|
+
}
|
|
85
93
|
this.emitLog('debug', 'All checks passed.');
|
|
86
94
|
return true;
|
|
87
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parameter-checker.js","sourceRoot":"","sources":["../src/parameter-checker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC;;;GAGG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,OAAO,gBAAiB,SAAQ,YAAY;IACxC,MAAM,GAAuB,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"parameter-checker.js","sourceRoot":"","sources":["../src/parameter-checker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parameter-checker.test.d.ts","sourceRoot":"","sources":["../src/parameter-checker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { ParameterChecker } from './parameter-checker.js';
|
|
3
|
+
describe('parameterChecker', () => {
|
|
4
|
+
it('should pass with empty rules and no required object', async () => {
|
|
5
|
+
const checker = new ParameterChecker();
|
|
6
|
+
const result = await checker.check({}, {}, false);
|
|
7
|
+
expect(result).toBe(true);
|
|
8
|
+
expect(checker.error).toBeNull();
|
|
9
|
+
});
|
|
10
|
+
it('should fail when required object is missing', async () => {
|
|
11
|
+
const checker = new ParameterChecker();
|
|
12
|
+
const result = await checker.check(undefined, {}, true);
|
|
13
|
+
expect(result).toBe(false);
|
|
14
|
+
expect(checker.error?.code).toBe('MISSING_REQUIRED');
|
|
15
|
+
});
|
|
16
|
+
it('should fail when required field is missing', async () => {
|
|
17
|
+
const checker = new ParameterChecker();
|
|
18
|
+
const rules = {
|
|
19
|
+
name: { type: 'string', required: true },
|
|
20
|
+
};
|
|
21
|
+
const result = await checker.check({}, rules);
|
|
22
|
+
expect(result).toBe(false);
|
|
23
|
+
expect(checker.error?.code).toBe('MISSING_REQUIRED');
|
|
24
|
+
});
|
|
25
|
+
it('should fail on type mismatch for integer', async () => {
|
|
26
|
+
const checker = new ParameterChecker();
|
|
27
|
+
const rules = {
|
|
28
|
+
age: { type: 'integer', required: true },
|
|
29
|
+
};
|
|
30
|
+
const result = await checker.check({ age: 25.5 }, rules);
|
|
31
|
+
expect(result).toBe(false);
|
|
32
|
+
expect(checker.error?.code).toBe('TYPE_INVALID');
|
|
33
|
+
});
|
|
34
|
+
it('should enforce float min and max', async () => {
|
|
35
|
+
const checker = new ParameterChecker();
|
|
36
|
+
const rules = {
|
|
37
|
+
temperature: { type: 'float', min: 0, max: 100 },
|
|
38
|
+
};
|
|
39
|
+
let result = await checker.check({ temperature: -5 }, rules);
|
|
40
|
+
expect(result).toBe(false);
|
|
41
|
+
expect(checker.error?.code).toBe('VALUE_UNDERFLOW');
|
|
42
|
+
result = await checker.check({ temperature: 150 }, rules);
|
|
43
|
+
expect(result).toBe(false);
|
|
44
|
+
expect(checker.error?.code).toBe('VALUE_OVERFLOW');
|
|
45
|
+
});
|
|
46
|
+
it('should ignore extra parameters', async () => {
|
|
47
|
+
const checker = new ParameterChecker();
|
|
48
|
+
const rules = {
|
|
49
|
+
id: { type: 'integer' },
|
|
50
|
+
};
|
|
51
|
+
const result = await checker.check({ id: 1, extra: 'ignored' }, rules);
|
|
52
|
+
expect(result).toBe(true);
|
|
53
|
+
expect(checker.error).toBeNull();
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
//# sourceMappingURL=parameter-checker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parameter-checker.test.js","sourceRoot":"","sources":["../src/parameter-checker.test.ts"],"names":[],"mappings":"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"}
|
package/dist/settings.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAEtD;AAED,eAAO,MAAM,IAAI;;;;;;;CAmBhB,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,iBAAiB,qCAAqC,CAAA;AACnE,eAAO,MAAM,eAAe,qCAAqC,CAAA;AACjE,eAAO,MAAM,gBAAgB,qCAAqC,CAAA;AAClE,eAAO,MAAM,gBAAgB,SAAS,CAAA;AAEtC,eAAO,MAAM,iBAAiB,OAAO,CAAA;AACrC,eAAO,MAAM,kBAAkB,OAAO,CAAA;AACtC,eAAO,MAAM,oBAAoB,OAAO,CAAA;AAExC,eAAO,MAAM,0BAA0B,OAAO,CAAA;AAC9C,eAAO,MAAM,yBAAyB,SAAK,CAAA;AAE3C,oBAAY,sBAAsB;IAChC,QAAQ,aAAa;IACrB,SAAS,eAAe;IACxB,MAAM,qBAAqB;IAC3B,iBAAiB,qBAAqB;IACtC,IAAI,qBAAqB;IACzB,oBAAoB,uBAAuB;IAC3C,qBAAqB,WAAW;CACjC;AAED,oBAAY,mBAAmB;IAC7B,QAAQ,aAAa;IACrB,SAAS,eAAe;IACxB,MAAM,mBAAmB;IACzB,iBAAiB,mBAAmB;IACpC,IAAI,mBAAmB;IACvB,oBAAoB,uBAAuB;IAC3C,qBAAqB,WAAW;CACjC"}
|
package/dist/settings.js
CHANGED
|
@@ -4,30 +4,35 @@
|
|
|
4
4
|
* © 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
|
|
5
5
|
*/
|
|
6
6
|
let baseURL = 'https://api.switch-bot.com';
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
let updateWebhook = `${baseURL}/v1.1/webhook/updateWebhook`;
|
|
11
|
-
let deleteWebhook = `${baseURL}/v1.1/webhook/deleteWebhook`;
|
|
7
|
+
// API version used for endpoint paths
|
|
8
|
+
const API_VERSION = '/v1.1';
|
|
9
|
+
// URLs are generated dynamically via getters below
|
|
12
10
|
/**
|
|
13
11
|
* Updates the base URL for the SwitchBot API endpoints.
|
|
14
12
|
* @param {string} newBaseURL - The new base URL to use.
|
|
15
13
|
*/
|
|
16
14
|
export function updateBaseURL(newBaseURL) {
|
|
17
15
|
baseURL = newBaseURL;
|
|
18
|
-
devicesURL = `${baseURL}/v1.1/devices`;
|
|
19
|
-
setupWebhook = `${baseURL}/v1.1/webhook/setupWebhook`;
|
|
20
|
-
queryWebhook = `${baseURL}/v1.1/webhook/queryWebhook`;
|
|
21
|
-
updateWebhook = `${baseURL}/v1.1/webhook/updateWebhook`;
|
|
22
|
-
deleteWebhook = `${baseURL}/v1.1/webhook/deleteWebhook`;
|
|
23
16
|
}
|
|
24
17
|
export const urls = {
|
|
25
|
-
get baseURL() {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
get
|
|
29
|
-
|
|
30
|
-
|
|
18
|
+
get baseURL() {
|
|
19
|
+
return baseURL;
|
|
20
|
+
},
|
|
21
|
+
get devicesURL() {
|
|
22
|
+
return `${baseURL}${API_VERSION}/devices`;
|
|
23
|
+
},
|
|
24
|
+
get setupWebhook() {
|
|
25
|
+
return `${baseURL}${API_VERSION}/webhook/setupWebhook`;
|
|
26
|
+
},
|
|
27
|
+
get queryWebhook() {
|
|
28
|
+
return `${baseURL}${API_VERSION}/webhook/queryWebhook`;
|
|
29
|
+
},
|
|
30
|
+
get updateWebhook() {
|
|
31
|
+
return `${baseURL}${API_VERSION}/webhook/updateWebhook`;
|
|
32
|
+
},
|
|
33
|
+
get deleteWebhook() {
|
|
34
|
+
return `${baseURL}${API_VERSION}/webhook/deleteWebhook`;
|
|
35
|
+
},
|
|
31
36
|
};
|
|
32
37
|
/**
|
|
33
38
|
* constants used to access SwitchBot BLE API
|
package/dist/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,IAAI,OAAO,GAAG,4BAA4B,CAAA;AAE1C,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,IAAI,OAAO,GAAG,4BAA4B,CAAA;AAE1C,sCAAsC;AACtC,MAAM,WAAW,GAAG,OAAO,CAAA;AAE3B,mDAAmD;AAEnD;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,UAAkB;IAC9C,OAAO,GAAG,UAAU,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,IAAI,OAAO;QACT,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,GAAG,OAAO,GAAG,WAAW,UAAU,CAAA;IAC3C,CAAC;IACD,IAAI,YAAY;QACd,OAAO,GAAG,OAAO,GAAG,WAAW,uBAAuB,CAAA;IACxD,CAAC;IACD,IAAI,YAAY;QACd,OAAO,GAAG,OAAO,GAAG,WAAW,uBAAuB,CAAA;IACxD,CAAC;IACD,IAAI,aAAa;QACf,OAAO,GAAG,OAAO,GAAG,WAAW,wBAAwB,CAAA;IACzD,CAAC;IACD,IAAI,aAAa;QACf,OAAO,GAAG,OAAO,GAAG,WAAW,wBAAwB,CAAA;IACzD,CAAC;CACF,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,kCAAkC,CAAA;AACnE,MAAM,CAAC,MAAM,eAAe,GAAG,kCAAkC,CAAA;AACjE,MAAM,CAAC,MAAM,gBAAgB,GAAG,kCAAkC,CAAA;AAClE,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAA;AAEtC,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,CAAA;AACrC,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,CAAA;AACtC,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAA;AAExC,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAA;AAC9C,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAA;AAE3C,MAAM,CAAN,IAAY,sBAQX;AARD,WAAY,sBAAsB;IAChC,+CAAqB,CAAA;IACrB,kDAAwB,CAAA;IACxB,qDAA2B,CAAA;IAC3B,gEAAsC,CAAA;IACtC,mDAAyB,CAAA;IACzB,qEAA2C,CAAA;IAC3C,0DAAgC,CAAA;AAClC,CAAC,EARW,sBAAsB,KAAtB,sBAAsB,QAQjC;AAED,MAAM,CAAN,IAAY,mBAQX;AARD,WAAY,mBAAmB;IAC7B,4CAAqB,CAAA;IACrB,+CAAwB,CAAA;IACxB,gDAAyB,CAAA;IACzB,2DAAoC,CAAA;IACpC,8CAAuB,CAAA;IACvB,kEAA2C,CAAA;IAC3C,uDAAgC,CAAA;AAClC,CAAC,EARW,mBAAmB,KAAnB,mBAAmB,QAQ9B"}
|
package/dist/settings.test.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vitest';
|
|
2
|
-
import { CHAR_UUID_DEVICE, CHAR_UUID_NOTIFY, CHAR_UUID_WRITE, COMMAND_TIMEOUT_MSEC, READ_TIMEOUT_MSEC, SERV_UUID_PRIMARY, urls, WoSmartLockCommands, WoSmartLockProCommands, WRITE_TIMEOUT_MSEC, } from './settings.js';
|
|
2
|
+
import { CHAR_UUID_DEVICE, CHAR_UUID_NOTIFY, CHAR_UUID_WRITE, COMMAND_TIMEOUT_MSEC, READ_TIMEOUT_MSEC, SERV_UUID_PRIMARY, updateBaseURL, urls, WoSmartLockCommands, WoSmartLockProCommands, WRITE_TIMEOUT_MSEC, } from './settings.js';
|
|
3
3
|
describe('switchBot API Settings', () => {
|
|
4
4
|
it('should have correct Devices URL', () => {
|
|
5
5
|
expect(urls.devicesURL).toBe('https://api.switch-bot.com/v1.1/devices');
|
|
@@ -45,5 +45,17 @@ describe('switchBot API Settings', () => {
|
|
|
45
45
|
expect(WoSmartLockCommands.ENABLE_NOTIFICATIONS).toBe('570e01001e00008101');
|
|
46
46
|
expect(WoSmartLockCommands.DISABLE_NOTIFICATIONS).toBe('570e00');
|
|
47
47
|
});
|
|
48
|
+
it('should update URLs when baseURL is changed', () => {
|
|
49
|
+
const original = urls.baseURL;
|
|
50
|
+
const custom = 'https://custom.api';
|
|
51
|
+
updateBaseURL(custom);
|
|
52
|
+
expect(urls.devicesURL).toBe(`${custom}/v1.1/devices`);
|
|
53
|
+
expect(urls.setupWebhook).toBe(`${custom}/v1.1/webhook/setupWebhook`);
|
|
54
|
+
expect(urls.queryWebhook).toBe(`${custom}/v1.1/webhook/queryWebhook`);
|
|
55
|
+
expect(urls.updateWebhook).toBe(`${custom}/v1.1/webhook/updateWebhook`);
|
|
56
|
+
expect(urls.deleteWebhook).toBe(`${custom}/v1.1/webhook/deleteWebhook`);
|
|
57
|
+
// restore original baseURL
|
|
58
|
+
updateBaseURL(original);
|
|
59
|
+
});
|
|
48
60
|
});
|
|
49
61
|
//# sourceMappingURL=settings.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.test.js","sourceRoot":"","sources":["../src/settings.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings.test.js","sourceRoot":"","sources":["../src/settings.test.ts"],"names":[],"mappings":"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"}
|
package/dist/switchbot-ble.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { onadvertisement, ondiscover, Params } from './device.js';
|
|
2
2
|
import { EventEmitter } from 'node:events';
|
|
3
|
-
import { SwitchbotDevice } from './device.js';
|
|
3
|
+
import { LogLevel, SwitchbotDevice } from './device.js';
|
|
4
4
|
/**
|
|
5
5
|
* SwitchBotBLE class to interact with SwitchBot devices.
|
|
6
6
|
*/
|
|
@@ -21,7 +21,10 @@ export declare class SwitchBotBLE extends EventEmitter {
|
|
|
21
21
|
* @param level - The severity level of the log (e.g., 'info', 'warn', 'error').
|
|
22
22
|
* @param message - The log message to be emitted.
|
|
23
23
|
*/
|
|
24
|
-
|
|
24
|
+
/**
|
|
25
|
+
* Emits a log event with a defined LogLevel.
|
|
26
|
+
*/
|
|
27
|
+
log(level: LogLevel, message: string): void;
|
|
25
28
|
/**
|
|
26
29
|
* Initializes the noble object.
|
|
27
30
|
*
|
|
@@ -44,7 +47,7 @@ export declare class SwitchBotBLE extends EventEmitter {
|
|
|
44
47
|
*/
|
|
45
48
|
private waitForPowerOn;
|
|
46
49
|
/**
|
|
47
|
-
* Discovers Switchbot devices.
|
|
50
|
+
* Discovers Switchbot devices with enhanced error handling and logging.
|
|
48
51
|
* @param params The discovery parameters.
|
|
49
52
|
* @returns A Promise that resolves with an array of discovered Switchbot devices.
|
|
50
53
|
*/
|
|
@@ -88,5 +91,5 @@ export declare class SwitchBotBLE extends EventEmitter {
|
|
|
88
91
|
*/
|
|
89
92
|
wait(msec: number): Promise<void>;
|
|
90
93
|
}
|
|
91
|
-
export { SwitchbotDevice };
|
|
94
|
+
export { LogLevel, SwitchbotDevice };
|
|
92
95
|
//# sourceMappingURL=switchbot-ble.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchbot-ble.d.ts","sourceRoot":"","sources":["../src/switchbot-ble.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,eAAe,EAAE,UAAU,EAAE,MAAM,EAAQ,MAAM,aAAa,CAAA;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,
|
|
1
|
+
{"version":3,"file":"switchbot-ble.d.ts","sourceRoot":"","sources":["../src/switchbot-ble.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,eAAe,EAAE,UAAU,EAAE,MAAM,EAAQ,MAAM,aAAa,CAAA;AAE5F,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAe,QAAQ,EAAqB,eAAe,EAAqT,MAAM,aAAa,CAAA;AAI1Y;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAY;IACrC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;IACpB,KAAK,EAAE,GAAG,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,eAAe,CAAC,EAAE,eAAe,CAAA;IAEjC;;;;OAIG;gBACS,MAAM,CAAC,EAAE,MAAM;IAK3B;;;;;OAKG;IACH;;OAEG;IACI,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAKlD;;;;;OAKG;YACW,UAAU;IAYxB;;;;;;OAMG;IACU,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQrF;;;;OAIG;YACW,cAAc;IA4B5B;;;;OAIG;IACU,QAAQ,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA8GtE;;;;;;;OAOG;YACW,YAAY;IAqC1B;;;;;;;OAOG;YACW,QAAQ;IAatB;;;;;OAKG;IACU,SAAS,CAAC,MAAM,GAAE,MAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA4C1D;;;;OAIG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IActC;;;;;OAKG;IACU,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAO/C;AAED,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAA"}
|
package/dist/switchbot-ble.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
|
-
import { Advertising, SwitchBotBLEModel, SwitchbotDevice, WoBlindTilt, WoBulb, WoCeilingLight, WoContact, WoCurtain, WoHand, WoHub2, WoHumi, WoHumi2, WoIOSensorTH, WoKeypad, WoLeak, WoPlugMiniJP, WoPlugMiniUS, WoPresence, WoRelaySwitch1, WoRelaySwitch1PM, WoRemote, WoSensorTH, WoSensorTHPlus, WoSensorTHPro, WoSensorTHProCO2, WoSmartLock, WoSmartLockPro, WoStrip } from './device.js';
|
|
2
|
+
import { Advertising, LogLevel, SwitchBotBLEModel, SwitchbotDevice, WoBlindTilt, WoBulb, WoCeilingLight, WoContact, WoCurtain, WoHand, WoHub2, WoHumi, WoHumi2, WoIOSensorTH, WoKeypad, WoLeak, WoPlugMiniJP, WoPlugMiniUS, WoPresence, WoRelaySwitch1, WoRelaySwitch1PM, WoRemote, WoSensorTH, WoSensorTHPlus, WoSensorTHPro, WoSensorTHProCO2, WoSmartLock, WoSmartLockPro, WoStrip } from './device.js';
|
|
3
3
|
import { parameterChecker } from './parameter-checker.js';
|
|
4
4
|
import { DEFAULT_DISCOVERY_DURATION, PRIMARY_SERVICE_UUID_LIST } from './settings.js';
|
|
5
5
|
/**
|
|
@@ -25,8 +25,12 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
25
25
|
* @param level - The severity level of the log (e.g., 'info', 'warn', 'error').
|
|
26
26
|
* @param message - The log message to be emitted.
|
|
27
27
|
*/
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
/**
|
|
29
|
+
* Emits a log event with a defined LogLevel.
|
|
30
|
+
*/
|
|
31
|
+
log(level, message) {
|
|
32
|
+
// Emit log events asynchronously with level and message as separate args
|
|
33
|
+
setTimeout(() => this.emit('log', level, message), 0);
|
|
30
34
|
}
|
|
31
35
|
/**
|
|
32
36
|
* Initializes the noble object.
|
|
@@ -44,7 +48,7 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
50
|
catch (e) {
|
|
47
|
-
this.log(
|
|
51
|
+
this.log(LogLevel.ERROR, `Failed to import noble: ${JSON.stringify(e.message ?? e)}`);
|
|
48
52
|
}
|
|
49
53
|
}
|
|
50
54
|
/**
|
|
@@ -57,7 +61,7 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
57
61
|
async validate(params, schema) {
|
|
58
62
|
const valid = parameterChecker.check(params, schema, false);
|
|
59
63
|
if (!valid) {
|
|
60
|
-
this.log(
|
|
64
|
+
this.log(LogLevel.ERROR, `parameterChecker: ${JSON.stringify(parameterChecker.error.message)}`);
|
|
61
65
|
throw new Error(parameterChecker.error.message);
|
|
62
66
|
}
|
|
63
67
|
}
|
|
@@ -93,7 +97,7 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
93
97
|
});
|
|
94
98
|
}
|
|
95
99
|
/**
|
|
96
|
-
* Discovers Switchbot devices.
|
|
100
|
+
* Discovers Switchbot devices with enhanced error handling and logging.
|
|
97
101
|
* @param params The discovery parameters.
|
|
98
102
|
* @returns A Promise that resolves with an array of discovered Switchbot devices.
|
|
99
103
|
*/
|
|
@@ -107,7 +111,7 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
107
111
|
});
|
|
108
112
|
await this.waitForPowerOn();
|
|
109
113
|
if (!this.noble) {
|
|
110
|
-
throw new Error('
|
|
114
|
+
throw new Error('Noble BLE library failed to initialize properly');
|
|
111
115
|
}
|
|
112
116
|
const p = {
|
|
113
117
|
duration: params.duration ?? DEFAULT_DISCOVERY_DURATION,
|
|
@@ -115,9 +119,15 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
115
119
|
id: params.id ?? '',
|
|
116
120
|
quick: !!params.quick,
|
|
117
121
|
};
|
|
122
|
+
this.log(LogLevel.DEBUG, `Starting discovery with parameters: ${JSON.stringify(p)}`);
|
|
118
123
|
const peripherals = {};
|
|
119
124
|
let timer;
|
|
125
|
+
let isDiscoveryActive = true;
|
|
120
126
|
const finishDiscovery = async () => {
|
|
127
|
+
if (!isDiscoveryActive) {
|
|
128
|
+
return Object.values(peripherals);
|
|
129
|
+
}
|
|
130
|
+
isDiscoveryActive = false;
|
|
121
131
|
if (timer) {
|
|
122
132
|
clearTimeout(timer);
|
|
123
133
|
}
|
|
@@ -125,45 +135,65 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
125
135
|
this.noble.removeAllListeners('discover');
|
|
126
136
|
try {
|
|
127
137
|
await this.noble.stopScanningAsync();
|
|
128
|
-
this.log(
|
|
138
|
+
this.log(LogLevel.DEBUG, 'Successfully stopped scanning for SwitchBot BLE devices');
|
|
129
139
|
}
|
|
130
140
|
catch (e) {
|
|
131
|
-
this.log(
|
|
141
|
+
this.log(LogLevel.ERROR, `Failed to stop scanning: ${JSON.stringify(e.message ?? e)}`);
|
|
132
142
|
}
|
|
133
143
|
}
|
|
134
144
|
const devices = Object.values(peripherals);
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
}
|
|
145
|
+
const deviceCount = devices.length;
|
|
146
|
+
this.log(deviceCount > 0 ? LogLevel.INFO : LogLevel.WARN, `Discovery completed. Found ${deviceCount} device${deviceCount !== 1 ? 's' : ''}`);
|
|
138
147
|
return devices;
|
|
139
148
|
};
|
|
140
149
|
return new Promise((resolve, reject) => {
|
|
141
150
|
this.noble.on('discover', async (peripheral) => {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
151
|
+
try {
|
|
152
|
+
const device = await this.createDevice(peripheral, p.id, p.model);
|
|
153
|
+
if (!device) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
if (peripherals[device.id]) {
|
|
157
|
+
this.log(LogLevel.DEBUG, `Device ${device.id} already discovered, skipping duplicate`);
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
peripherals[device.id] = device;
|
|
161
|
+
this.log(LogLevel.DEBUG, `Discovered device: ${device.friendlyName} (${device.id}) at ${device.address}`);
|
|
162
|
+
if (this.ondiscover) {
|
|
163
|
+
try {
|
|
164
|
+
await this.ondiscover(device);
|
|
165
|
+
}
|
|
166
|
+
catch (e) {
|
|
167
|
+
this.log(LogLevel.ERROR, `Error in ondiscover callback: ${e.message ?? e}`);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
if (p.quick) {
|
|
171
|
+
this.log(LogLevel.DEBUG, 'Quick discovery mode: stopping after first device found');
|
|
172
|
+
resolve(await finishDiscovery());
|
|
173
|
+
}
|
|
149
174
|
}
|
|
150
|
-
|
|
151
|
-
|
|
175
|
+
catch (e) {
|
|
176
|
+
this.log(LogLevel.ERROR, `Error processing discovered device: ${e.message ?? e}`);
|
|
152
177
|
}
|
|
153
178
|
});
|
|
179
|
+
// Start scanning with timeout handling
|
|
154
180
|
this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, false)
|
|
155
181
|
.then(() => {
|
|
182
|
+
this.log(LogLevel.DEBUG, `Started scanning for ${p.duration}ms`);
|
|
156
183
|
timer = setTimeout(async () => {
|
|
157
184
|
const result = await finishDiscovery();
|
|
158
185
|
if (result.length === 0) {
|
|
159
|
-
reject(new Error(
|
|
186
|
+
reject(new Error(`No SwitchBot devices found after ${p.duration}ms discovery timeout`));
|
|
160
187
|
}
|
|
161
188
|
else {
|
|
162
189
|
resolve(result);
|
|
163
190
|
}
|
|
164
191
|
}, p.duration);
|
|
165
192
|
})
|
|
166
|
-
.catch(
|
|
193
|
+
.catch((error) => {
|
|
194
|
+
this.log(LogLevel.ERROR, `Failed to start scanning: ${error.message ?? error}`);
|
|
195
|
+
reject(new Error(`Failed to start BLE scanning: ${error.message ?? error}`));
|
|
196
|
+
});
|
|
167
197
|
});
|
|
168
198
|
}
|
|
169
199
|
/**
|
|
@@ -175,7 +205,7 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
175
205
|
* @returns {Promise<SwitchbotDevice | null>} - The device object or null.
|
|
176
206
|
*/
|
|
177
207
|
async createDevice(peripheral, id, model) {
|
|
178
|
-
const ad = await Advertising.parse(peripheral, this.log
|
|
208
|
+
const ad = await Advertising.parse(peripheral, (level, message) => this.log(level, message));
|
|
179
209
|
if (ad && await this.filterAd(ad, id, model) && this.noble) {
|
|
180
210
|
switch (ad.serviceData.model) {
|
|
181
211
|
case SwitchBotBLEModel.Bot: return new WoHand(peripheral, this.noble);
|
|
@@ -248,23 +278,33 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
248
278
|
}
|
|
249
279
|
const p = { model: params.model || '', id: params.id || '' };
|
|
250
280
|
this.noble.on('discover', async (peripheral) => {
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
this.
|
|
257
|
-
|
|
258
|
-
this.onadvertisement
|
|
281
|
+
try {
|
|
282
|
+
const ad = await Advertising.parse(peripheral, (level, message) => this.log(level, message));
|
|
283
|
+
this.log(LogLevel.DEBUG, `Advertisement: ${JSON.stringify(ad)}`);
|
|
284
|
+
this.log(LogLevel.DEBUG, `Filter ID: ${p.id}`);
|
|
285
|
+
this.log(LogLevel.DEBUG, `Filter Model: ${p.model}`);
|
|
286
|
+
if (ad && await this.filterAd(ad, p.id, p.model)) {
|
|
287
|
+
this.log(LogLevel.DEBUG, `Advertisement passed filter: ${JSON.stringify(ad)}`);
|
|
288
|
+
if (this.onadvertisement) {
|
|
289
|
+
try {
|
|
290
|
+
await this.onadvertisement(ad);
|
|
291
|
+
}
|
|
292
|
+
catch (e) {
|
|
293
|
+
this.log(LogLevel.ERROR, `Error in onadvertisement callback: ${e.message ?? e}`);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
259
296
|
}
|
|
260
297
|
}
|
|
298
|
+
catch (e) {
|
|
299
|
+
this.log(LogLevel.ERROR, `Error parsing advertisement: ${e.message ?? e}`);
|
|
300
|
+
}
|
|
261
301
|
});
|
|
262
302
|
try {
|
|
263
303
|
await this.noble.startScanningAsync(PRIMARY_SERVICE_UUID_LIST, true);
|
|
264
|
-
this.log(
|
|
304
|
+
this.log(LogLevel.DEBUG, 'Started Scanning for SwitchBot BLE devices.');
|
|
265
305
|
}
|
|
266
306
|
catch (e) {
|
|
267
|
-
this.log(
|
|
307
|
+
this.log(LogLevel.ERROR, `startScanningAsync error: ${JSON.stringify(e.message ?? e)}`);
|
|
268
308
|
}
|
|
269
309
|
}
|
|
270
310
|
/**
|
|
@@ -279,10 +319,10 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
279
319
|
this.noble.removeAllListeners('discover');
|
|
280
320
|
try {
|
|
281
321
|
await this.noble.stopScanningAsync();
|
|
282
|
-
this.log(
|
|
322
|
+
this.log(LogLevel.DEBUG, 'Stopped Scanning for SwitchBot BLE devices.');
|
|
283
323
|
}
|
|
284
324
|
catch (e) {
|
|
285
|
-
this.log(
|
|
325
|
+
this.log(LogLevel.ERROR, `stopScanningAsync error: ${JSON.stringify(e.message ?? e)}`);
|
|
286
326
|
}
|
|
287
327
|
}
|
|
288
328
|
/**
|
|
@@ -298,5 +338,5 @@ export class SwitchBotBLE extends EventEmitter {
|
|
|
298
338
|
return new Promise(resolve => setTimeout(resolve, msec));
|
|
299
339
|
}
|
|
300
340
|
}
|
|
301
|
-
export { SwitchbotDevice };
|
|
341
|
+
export { LogLevel, SwitchbotDevice };
|
|
302
342
|
//# sourceMappingURL=switchbot-ble.js.map
|