node-switchbot 2.5.0-beta.3 → 2.5.0-beta.31

package/dist/device/wocurtain.d.ts

@@ -1,11 +1,50 @@
+import type { SwitchBotBLE } from '../switchbot-ble.js';
 import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
+/**
+ * Class representing a WoCurtain device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/curtain.md
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/curtain3.md
+ */
 export declare class WoCurtain extends SwitchbotDevice {
-    static parseServiceData(serviceData: Buffer, manufacturerData: Buffer, onlog: ((message: string) => void) | undefined, reverse?: boolean): Promise<object | null>;
+    static switchBotBLE: SwitchBotBLE;
+    /**
+     * Parses the service data for WoCurtain.
+     * @param {Buffer} serviceData - The service data buffer.
+     * @param {Buffer} manufacturerData - The manufacturer data buffer.
+     * @param {boolean} [reverse] - Whether to reverse the position.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static parseServiceData(serviceData: Buffer, manufacturerData: Buffer, reverse?: boolean): Promise<object | null>;
+    /**
+     * Opens the curtain.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
     open(mode?: number): Promise<void>;
+    /**
+     * Closes the curtain.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
     close(mode?: number): Promise<void>;
+    /**
+     * Pauses the curtain.
+     * @returns {Promise<void>}
+     */
     pause(): Promise<void>;
+    /**
+     * Runs the curtain to the target position.
+     * @param {number} percent - The percentage of the target position.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
     runToPos(percent: number, mode?: number): Promise<void>;
+    /**
+     * Sends a command to the curtain.
+     * @param {number[]} bytes - The command bytes.
+     * @returns {Promise<void>}
+     */
     operateCurtain(bytes: number[]): Promise<void>;
 }
 //# sourceMappingURL=wocurtain.d.ts.map

package/dist/device/wocurtain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wocurtain.d.ts","sourceRoot":"","sources":["../../src/device/wocurtain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,qBAAa,SAAU,SAAQ,eAAe;WAC/B,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,EAClD,OAAO,GAAE,OAAe,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAiEnB,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM;IAelB,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM;IAenB,KAAK;IAgBL,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAO;IAkBrC,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE;CAerC"}
+{"version":3,"file":"wocurtain.d.ts","sourceRoot":"","sources":["../../src/device/wocurtain.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,YAAY,EAAE,YAAY,CAAA;IACjC;;;;;;OAMG;WACU,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,OAAO,GAAE,OAAe,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA8CzB;;;;OAIG;IACG,IAAI,CAAC,IAAI,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C;;;;OAIG;IACG,KAAK,CAAC,IAAI,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQnE;;;;OAIG;IACU,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAS5D"}

package/dist/device/wocurtain.js

@@ -1,148 +1,110 @@
 import { Buffer } from 'node:buffer';
-/* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * wocurtain.ts: Switchbot BLE API registration.
- */
 import { SwitchbotDevice } from '../device.js';
 import { SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
+/**
+ * Class representing a WoCurtain device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/curtain.md
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/curtain3.md
+ */
 export class WoCurtain extends SwitchbotDevice {
-    static async parseServiceData(serviceData, manufacturerData, onlog, reverse = false) {
-        if (serviceData.length !== 5 && serviceData.length !== 6) {
-            if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceDataForWoCurtain] Buffer length ${serviceData.length} !== 5 or 6!`);
-            }
+    static switchBotBLE;
+    /**
+     * Parses the service data for WoCurtain.
+     * @param {Buffer} serviceData - The service data buffer.
+     * @param {Buffer} manufacturerData - The manufacturer data buffer.
+     * @param {boolean} [reverse] - Whether to reverse the position.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static async parseServiceData(serviceData, manufacturerData, reverse = false) {
+        if (![5, 6].includes(serviceData.length)) {
+            this.switchBotBLE.emitLog('error', `[parseServiceDataForWoCurtain] Buffer length ${serviceData.length} !== 5 or 6!`);
             return null;
         }
         const byte1 = serviceData.readUInt8(1);
         const byte2 = serviceData.readUInt8(2);
-        // const byte3 = serviceData.readUInt8(3)
-        // const byte4 = serviceData.readUInt8(4)
         let deviceData;
         let batteryData = null;
-        if (manufacturerData && manufacturerData.length >= 13) { // Curtain 3
+        if (manufacturerData.length >= 13) {
             deviceData = manufacturerData.subarray(8, 11);
             batteryData = manufacturerData.readUInt8(12);
         }
-        else if (manufacturerData && manufacturerData.length >= 11) {
+        else if (manufacturerData.length >= 11) {
             deviceData = manufacturerData.subarray(8, 11);
-            batteryData = serviceData ? byte2 : null;
-        }
-        else if (serviceData) {
-            deviceData = serviceData.subarray(3, 6);
             batteryData = byte2;
         }
         else {
-            return {};
+            deviceData = serviceData.subarray(3, 6);
+            batteryData = byte2;
         }
         const model = serviceData.subarray(0, 1).toString('utf8');
         const modelName = model === 'c' ? SwitchBotBLEModelName.Curtain : SwitchBotBLEModelName.Curtain3;
         const modelFriendlyName = model === 'c' ? SwitchBotBLEModelFriendlyName.Curtain : SwitchBotBLEModelFriendlyName.Curtain3;
-        const calibration = serviceData ? Boolean(byte1 & 0b01000000) : null; // Whether the calibration is compconsted /*OLD*/ const calibration = !!(byte1 & 0b01000000)
-        const position = Math.max(Math.min(deviceData.readUInt8(0) & 0b01111111, 100), 0); // current positon % /*OLD*/ const currPosition = byte3 & 0b01111111 // current positon %
-        const inMotion = Boolean(deviceData.readUInt8(0) & 0b10000000); //* OLD*/ const inMotion = !!(byte3 & 0b10000000)
-        const lightLevel = (deviceData.readUInt8(1) >> 4) & 0b00001111; // light sensor level (1-10) /*OLD*/ const lightLevel = (byte4 >> 4) & 0b00001111
-        const deviceChain = deviceData.readUInt8(1) & 0b00000111; //* OLD*/ const deviceChain = byte4 & 0b00000111
-        const battery = batteryData !== null ? batteryData & 0b01111111 : null; //* OLD*/ const battery = byte2 & 0b01111111 // %
-        const data = {
+        const calibration = Boolean(byte1 & 0b01000000);
+        const position = Math.max(Math.min(deviceData.readUInt8(0) & 0b01111111, 100), 0);
+        const inMotion = Boolean(deviceData.readUInt8(0) & 0b10000000);
+        const lightLevel = (deviceData.readUInt8(1) >> 4) & 0b00001111;
+        const deviceChain = deviceData.readUInt8(1) & 0b00000111;
+        const battery = batteryData !== null ? batteryData & 0b01111111 : null;
+        return {
             model,
             modelName,
             modelFriendlyName,
             calibration,
             battery,
             inMotion,
-            position: reverse ? 100 - position : position, //* OLD*/ currPosition,
+            position: reverse ? 100 - position : position,
             lightLevel,
             deviceChain,
         };
-        return data;
     }
-    /* ------------------------------------------------------------------
-     * open()
-     * - Open the curtain
-     *
-     * [Arguments]
-     * - mode | number | Optional | runing mode (0x01 = QuietDrift, 0xff = Default)
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
-    async open(mode) {
-        return await this.runToPos(0, mode);
+    /**
+     * Opens the curtain.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
+    async open(mode = 0xFF) {
+        await this.runToPos(0, mode);
     }
-    /* ------------------------------------------------------------------
-     * close()
-     * - close the curtain
-     *
-     * [Arguments]
-     * - mode | number | Optional | runing mode (0x01 = QuietDrift, 0xff = Default)
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
-    async close(mode) {
-        return await this.runToPos(100, mode);
+    /**
+     * Closes the curtain.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
+    async close(mode = 0xFF) {
+        await this.runToPos(100, mode);
     }
-    /* ------------------------------------------------------------------
-     * pause()
-     * - pause the curtain
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Pauses the curtain.
+     * @returns {Promise<void>}
+     */
     async pause() {
-        return await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x00, 0xFF]);
+        await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x00, 0xFF]);
     }
-    /* ------------------------------------------------------------------
-     * runToPos()
-     * - run to the target position
-     *
-     * [Arguments]
-     * - percent | number | Required  | the percentage of target position
-     * - mode    | number | Optional | runing mode (0x01 = QuietDrift, 0xff = Default)
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Runs the curtain to the target position.
+     * @param {number} percent - The percentage of the target position.
+     * @param {number} [mode] - Running mode (0x01 = QuietDrift, 0xFF = Default).
+     * @returns {Promise<void>}
+     */
     async runToPos(percent, mode = 0xFF) {
-        if (typeof percent !== 'number') {
-            throw new TypeError(`The type of target position percentage is incorrect: ${typeof percent}`);
+        if (typeof percent !== 'number' || typeof mode !== 'number') {
+            throw new TypeError('Invalid type for percent or mode');
         }
-        if (typeof mode !== 'number') {
-            throw new TypeError(`The type of running mode is incorrect: ${typeof mode}`);
-        }
-        if (mode > 1) {
-            mode = 0xFF;
-        }
-        if (percent > 100) {
-            percent = 100;
-        }
-        else if (percent < 0) {
-            percent = 0;
-        }
-        return await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, mode, percent]);
+        percent = Math.max(0, Math.min(100, percent));
+        await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, mode, percent]);
     }
+    /**
+     * Sends a command to the curtain.
+     * @param {number[]} bytes - The command bytes.
+     * @returns {Promise<void>}
+     */
     async operateCurtain(bytes) {
-        const req_buf = Buffer.from(bytes);
-        await this.command(req_buf)
-            .then((res_buf) => {
-            const code = res_buf.readUInt8(0);
-            if (res_buf.length === 3 && code === 0x01) {
-                // Intentionally left empty
-            }
-            else {
-                throw new Error(`The device returned an error: 0x${res_buf.toString('hex')}`);
-            }
-        })
-            .catch((error) => {
-            throw error;
-        });
+        const reqBuf = Buffer.from(bytes);
+        const resBuf = await this.command(reqBuf);
+        const code = resBuf.readUInt8(0);
+        if (resBuf.length !== 3 || code !== 0x01) {
+            throw new Error(`The device returned an error: 0x${resBuf.toString('hex')}`);
+        }
     }
 }
 //# sourceMappingURL=wocurtain.js.map

package/dist/device/wocurtain.js.map

@@ -1 +1 @@
-{"version":3,"file":"wocurtain.js","sourceRoot":"","sources":["../../src/device/wocurtain.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wocurtain.js","sourceRoot":"","sources":["../../src/device/wocurtain.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAExF;;;;GAIG;AACH,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,YAAY,CAAc;IACjC;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,WAAmB,EACnB,gBAAwB,EACxB,UAAmB,KAAK;QAExB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,gDAAgD,WAAW,CAAC,MAAM,cAAc,CAAC,CAAA;YACpH,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAEtC,IAAI,UAAkB,CAAA;QACtB,IAAI,WAAW,GAAkB,IAAI,CAAA;QAErC,IAAI,gBAAgB,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YAClC,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YAC7C,WAAW,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC9C,CAAC;aAAM,IAAI,gBAAgB,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YACzC,UAAU,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YAC7C,WAAW,GAAG,KAAK,CAAA;QACrB,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YACvC,WAAW,GAAG,KAAK,CAAA;QACrB,CAAC;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACzD,MAAM,SAAS,GAAG,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAA;QAChG,MAAM,iBAAiB,GAAG,KAAK,KAAK,GAAG,CAAC,CAAC,CAAC,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B,CAAC,QAAQ,CAAA;QACxH,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,CAAA;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA;QACjF,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAA;QAC9D,MAAM,UAAU,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,UAAU,CAAA;QAC9D,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,CAAA;QACxD,MAAM,OAAO,GAAG,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAA;QAEtE,OAAO;YACL,KAAK;YACL,SAAS;YACT,iBAAiB;YACjB,WAAW;YACX,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ;YAC7C,UAAU;YACV,WAAW;SACZ,CAAA;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,OAAe,IAAI;QAC5B,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAK,CAAC,OAAe,IAAI;QAC7B,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAChC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACjE,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,OAAe,IAAI;QACjD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5D,MAAM,IAAI,SAAS,CAAC,kCAAkC,CAAC,CAAA;QACzD,CAAC;QACD,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;QAC7C,MAAM,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;IAC1E,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CAAC,KAAe;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC9E,CAAC;IACH,CAAC;CACF"}

package/dist/device/wohand.d.ts

@@ -1,12 +1,48 @@
+import type { SwitchBotBLE } from '../switchbot-ble.js';
 import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
+/**
+ * Class representing a WoHand device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/bot.md
+ */
 export declare class WoHand extends SwitchbotDevice {
-    static parseServiceData(serviceData: Buffer, onlog: ((message: string) => void) | undefined): Promise<object | null>;
+    static switchBotBLE: SwitchBotBLE;
+    /**
+     * Parses the service data for WoHand.
+     * @param {Buffer} serviceData - The service data buffer.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static parseServiceData(serviceData: Buffer): Promise<object | null>;
+    /**
+     * Sends a command to the bot.
+     * @param {number[]} bytes - The command bytes.
+     * @returns {Promise<void>}
+     */
+    private operateBot;
+    /**
+     * Presses the bot.
+     * @returns {Promise<void>}
+     */
     press(): Promise<void>;
+    /**
+     * Turns on the bot.
+     * @returns {Promise<void>}
+     */
     turnOn(): Promise<void>;
+    /**
+     * Turns off the bot.
+     * @returns {Promise<void>}
+     */
     turnOff(): Promise<void>;
+    /**
+     * Moves the bot down.
+     * @returns {Promise<void>}
+     */
     down(): Promise<void>;
+    /**
+     * Moves the bot up.
+     * @returns {Promise<void>}
+     */
     up(): Promise<void>;
-    operateBot(bytes: number[]): Promise<void>;
 }
 //# sourceMappingURL=wohand.d.ts.map

package/dist/device/wohand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wohand.d.ts","sourceRoot":"","sources":["../../src/device/wohand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,qBAAa,MAAO,SAAQ,eAAe;WAC5B,gBAAgB,CAC3B,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,GAC7C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAoCnB,KAAK;IAeL,MAAM;IAeN,OAAO;IAeP,IAAI;IAeJ,EAAE;IAIF,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE;CAejC"}
+{"version":3,"file":"wohand.d.ts","sourceRoot":"","sources":["../../src/device/wohand.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C;;;GAGG;AACH,qBAAa,MAAO,SAAQ,eAAe;IACzC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAA;IACjC;;;;OAIG;WACU,gBAAgB,CAC3B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAmBzB;;;;OAIG;YACW,UAAU;IAUxB;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;OAGG;IACG,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC;CAG1B"}

package/dist/device/wohand.js

@@ -1,118 +1,80 @@
 import { Buffer } from 'node:buffer';
-/* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * wohand.ts: Switchbot BLE API registration.
- */
 import { SwitchbotDevice } from '../device.js';
 import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
+/**
+ * Class representing a WoHand device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/bot.md
+ */
 export class WoHand extends SwitchbotDevice {
-    static async parseServiceData(serviceData, onlog) {
+    static switchBotBLE;
+    /**
+     * Parses the service data for WoHand.
+     * @param {Buffer} serviceData - The service data buffer.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static async parseServiceData(serviceData) {
         if (serviceData.length !== 3) {
-            if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceData] Buffer length ${serviceData.length} !== 3!`);
-            }
+            this.switchBotBLE.emitLog('error', `[parseServiceData] Buffer length ${serviceData.length} !== 3!`);
             return null;
         }
         const byte1 = serviceData.readUInt8(1);
         const byte2 = serviceData.readUInt8(2);
-        const mode = !!(byte1 & 0b10000000); // Whether the light switch Add-on is used or not. 0 = press, 1 = switch
-        const state = !(byte1 & 0b01000000); // Whether the switch status is ON or OFF. 0 = on, 1 = off
-        const battery = byte2 & 0b01111111; // %
-        const data = {
+        return {
             model: SwitchBotBLEModel.Bot,
             modelName: SwitchBotBLEModelName.Bot,
             modelFriendlyName: SwitchBotBLEModelFriendlyName.Bot,
-            mode,
-            state,
-            battery,
+            mode: !!(byte1 & 0b10000000), // Whether the light switch Add-on is used or not. 0 = press, 1 = switch
+            state: !(byte1 & 0b01000000), // Whether the switch status is ON or OFF. 0 = on, 1 = off
+            battery: byte2 & 0b01111111, // %
         };
-        return data;
     }
-    /* ------------------------------------------------------------------
-     * press()
-     * - Press
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Sends a command to the bot.
+     * @param {number[]} bytes - The command bytes.
+     * @returns {Promise<void>}
+     */
+    async operateBot(bytes) {
+        const reqBuf = Buffer.from(bytes);
+        const resBuf = await this.command(reqBuf);
+        const code = resBuf.readUInt8(0);
+        if (resBuf.length !== 3 || (code !== 0x01 && code !== 0x05)) {
+            throw new Error(`The device returned an error: 0x${resBuf.toString('hex')}`);
+        }
+    }
+    /**
+     * Presses the bot.
+     * @returns {Promise<void>}
+     */
     async press() {
-        return await this.operateBot([0x57, 0x01, 0x00]);
+        await this.operateBot([0x57, 0x01, 0x00]);
     }
-    /* ------------------------------------------------------------------
-     * turnOn()
-     * - Turn on
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Turns on the bot.
+     * @returns {Promise<void>}
+     */
     async turnOn() {
-        return await this.operateBot([0x57, 0x01, 0x01]);
+        await this.operateBot([0x57, 0x01, 0x01]);
     }
-    /* ------------------------------------------------------------------
-     * turnOff()
-     * - Turn off
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Turns off the bot.
+     * @returns {Promise<void>}
+     */
     async turnOff() {
-        return await this.operateBot([0x57, 0x01, 0x02]);
+        await this.operateBot([0x57, 0x01, 0x02]);
     }
-    /* ------------------------------------------------------------------
-     * down()
-     * - Down
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Moves the bot down.
+     * @returns {Promise<void>}
+     */
     async down() {
-        return await this.operateBot([0x57, 0x01, 0x03]);
+        await this.operateBot([0x57, 0x01, 0x03]);
     }
-    /* ------------------------------------------------------------------
-     * up()
-     * - Up
-     *
-     * [Arguments]
-     * - none
-     *
-     * [Return value]
-     * - Promise object
-     *   Nothing will be passed to the `resolve()`.
-     * ---------------------------------------------------------------- */
+    /**
+     * Moves the bot up.
+     * @returns {Promise<void>}
+     */
     async up() {
-        return await this.operateBot([0x57, 0x01, 0x04]);
-    }
-    async operateBot(bytes) {
-        const req_buf = Buffer.from(bytes);
-        await this.command(req_buf)
-            .then((res_buf) => {
-            const code = res_buf.readUInt8(0);
-            if (res_buf.length === 3 && (code === 0x01 || code === 0x05)) {
-                // Successful operation, no further action needed
-            }
-            else {
-                throw new Error(`The device returned an error: 0x${res_buf.toString('hex')}`);
-            }
-        })
-            .catch((error) => {
-            throw error;
-        });
+        await this.operateBot([0x57, 0x01, 0x04]);
     }
 }
 //# sourceMappingURL=wohand.js.map

package/dist/device/wohand.js.map

@@ -1 +1 @@
-{"version":3,"file":"wohand.js","sourceRoot":"","sources":["../../src/device/wohand.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wohand.js","sourceRoot":"","sources":["../../src/device/wohand.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE3G;;;GAGG;AACH,MAAM,OAAO,MAAO,SAAQ,eAAe;IACzC,MAAM,CAAC,YAAY,CAAc;IACjC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,WAAmB;QAEnB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,oCAAoC,WAAW,CAAC,MAAM,SAAS,CAAC,CAAA;YACnG,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAEtC,OAAO;YACL,KAAK,EAAE,iBAAiB,CAAC,GAAG;YAC5B,SAAS,EAAE,qBAAqB,CAAC,GAAG;YACpC,iBAAiB,EAAE,6BAA6B,CAAC,GAAG;YACpD,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,wEAAwE;YACtG,KAAK,EAAE,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,EAAE,0DAA0D;YACxF,OAAO,EAAE,KAAK,GAAG,UAAU,EAAE,IAAI;SAClC,CAAA;IACH,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,UAAU,CAAC,KAAe;QACtC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACzC,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAEhC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QAC9E,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,EAAE;QACN,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;CACF"}

package/dist/device/wohub2.d.ts

@@ -1,6 +1,17 @@
 import type { Buffer } from 'node:buffer';
+import type { SwitchBotBLE } from '../switchbot-ble.js';
 import { SwitchbotDevice } from '../device.js';
+/**
+ * Class representing a WoHub2 device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/meter.md
+ */
 export declare class WoHub2 extends SwitchbotDevice {
-    static parseServiceData(manufacturerData: Buffer, onlog: ((message: string) => void) | undefined): Promise<object | null>;
+    static switchBotBLE: SwitchBotBLE;
+    /**
+     * Parses the service data for WoHub2.
+     * @param {Buffer} manufacturerData - The manufacturer data buffer.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static parseServiceData(manufacturerData: Buffer): Promise<object | null>;
 }
 //# sourceMappingURL=wohub2.d.ts.map

package/dist/device/wohub2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wohub2.d.ts","sourceRoot":"","sources":["../../src/device/wohub2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,qBAAa,MAAO,SAAQ,eAAe;WAC5B,gBAAgB,CAC3B,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,GAC7C,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAsC1B"}
+{"version":3,"file":"wohub2.d.ts","sourceRoot":"","sources":["../../src/device/wohub2.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C;;;GAGG;AACH,qBAAa,MAAO,SAAQ,eAAe;IACzC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAA;IACjC;;;;OAIG;WACU,gBAAgB,CAC3B,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAwB1B"}

package/dist/device/wohub2.js

@@ -1,44 +1,36 @@
-/* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
- *
- * wohub2.ts: Switchbot BLE API registration.
- */
 import { SwitchbotDevice } from '../device.js';
 import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
+/**
+ * Class representing a WoHub2 device.
+ * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/meter.md
+ */
 export class WoHub2 extends SwitchbotDevice {
-    static async parseServiceData(manufacturerData, onlog) {
+    static switchBotBLE;
+    /**
+     * Parses the service data for WoHub2.
+     * @param {Buffer} manufacturerData - The manufacturer data buffer.
+     * @returns {Promise<object | null>} - Parsed service data or null if invalid.
+     */
+    static async parseServiceData(manufacturerData) {
         if (manufacturerData.length !== 16) {
-            if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceDataForWoSensorTH] Buffer length ${manufacturerData.length} !== 16!`);
-            }
+            this.switchBotBLE.emitLog('error', `[parseServiceDataForWoHub2] Buffer length ${manufacturerData.length} !== 16!`);
             return null;
         }
-        const byte0 = manufacturerData.readUInt8(0);
-        const byte1 = manufacturerData.readUInt8(1);
-        const byte2 = manufacturerData.readUInt8(2);
-        const byte12 = manufacturerData.readUInt8(12);
-        const temp_sign = byte1 & 0b10000000 ? 1 : -1;
-        const temp_c = temp_sign * ((byte1 & 0b01111111) + (byte0 & 0b00001111) / 10);
-        const temp_f = Math.round(((temp_c * 9 / 5) + 32) * 10) / 10;
-        const light_level = byte12 & 0b11111;
-        const data = {
+        const [byte0, byte1, byte2, , , , , , , , , , byte12] = manufacturerData;
+        const tempSign = byte1 & 0b10000000 ? 1 : -1;
+        const tempC = tempSign * ((byte1 & 0b01111111) + (byte0 & 0b00001111) / 10);
+        const tempF = Math.round(((tempC * 9) / 5 + 32) * 10) / 10;
+        const lightLevel = byte12 & 0b11111;
+        return {
             model: SwitchBotBLEModel.Hub2,
             modelName: SwitchBotBLEModelName.Hub2,
             modelFriendlyName: SwitchBotBLEModelFriendlyName.Hub2,
-            /**
-             * @deprecated The `temperature` object is deprecated and will be removed in future versions.
-             * Use the `celsius` and `fahrenheit` properties directly instead.
-             */
-            temperature: {
-                c: temp_c,
-                f: temp_f,
-            },
-            celsius: temp_c,
-            fahrenheit: temp_f,
+            celsius: tempC,
+            fahrenheit: tempF,
             fahrenheit_mode: !!(byte2 & 0b10000000),
             humidity: byte2 & 0b01111111,
-            lightLevel: light_level,
+            lightLevel,
         };
-        return data;
     }
 }
 //# sourceMappingURL=wohub2.js.map