node-switchbot 2.4.0 → 2.5.0-beta.0

package/dist/device/woceilinglight.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"woceilinglight.test.d.ts","sourceRoot":"","sources":["../../src/device/woceilinglight.test.ts"],"names":[],"mappings":""}

package/dist/device/woceilinglight.test.js

@@ -0,0 +1,63 @@
+import { Buffer } from 'node:buffer';
+import * as Noble from '@stoprocent/noble';
+/* eslint-disable no-console */
+import { WoCeilingLight } from './woceilinglight.js';
+describe('woCeilingLight', () => {
+    let ceilingLight;
+    beforeEach(() => {
+        const peripheral = {}; // Replace with the actual peripheral object (e.g. from Noble)
+        ceilingLight = new WoCeilingLight(peripheral, Noble);
+    });
+    it('parseServiceData should return null for incorrect buffer length', async () => {
+        const manufacturerData = Buffer.alloc(10);
+        const result = await WoCeilingLight.parseServiceData(manufacturerData, console.log);
+        expect(result).toBeNull();
+    });
+    it('parseServiceData should return correct data for valid buffer', async () => {
+        const manufacturerData = Buffer.from([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]);
+        const result = await WoCeilingLight.parseServiceData(manufacturerData, console.log);
+        expect(result).toEqual({
+            model: 'CeilingLight',
+            modelName: 'CeilingLight',
+            modelFriendlyName: 'CeilingLight',
+            color_temperature: 6,
+            power: 1,
+            state: false,
+            red: 3,
+            green: 4,
+            blue: 5,
+            brightness: 7,
+            delay: 128,
+            preset: 8,
+            color_mode: 0,
+            speed: 9,
+            loop_index: 10,
+        });
+    });
+    it('turnOn should call setState with correct parameters', async () => {
+        const setStateSpy = jest.spyOn(ceilingLight, 'setState').mockResolvedValue(undefined);
+        await ceilingLight.turnOn();
+        expect(setStateSpy).toHaveBeenCalledWith([0x01, 0x01]);
+    });
+    it('turnOff should call setState with correct parameters', async () => {
+        const setStateSpy = jest.spyOn(ceilingLight, 'setState').mockResolvedValue(undefined);
+        await ceilingLight.turnOff();
+        expect(setStateSpy).toHaveBeenCalledWith([0x01, 0x02]);
+    });
+    it('setBrightness should call setState with correct parameters', async () => {
+        const setStateSpy = jest.spyOn(ceilingLight, 'setState').mockResolvedValue(undefined);
+        await ceilingLight.setBrightness(50);
+        expect(setStateSpy).toHaveBeenCalledWith([0x02, 0x14]);
+    });
+    it('setColorTemperature should call setState with correct parameters', async () => {
+        const setStateSpy = jest.spyOn(ceilingLight, 'setState').mockResolvedValue(undefined);
+        await ceilingLight.setColorTemperature(50);
+        expect(setStateSpy).toHaveBeenCalledWith([0x02, 0x17, 50]);
+    });
+    it('setRGB should call setState with correct parameters', async () => {
+        const setStateSpy = jest.spyOn(ceilingLight, 'setState').mockResolvedValue(undefined);
+        await ceilingLight.setRGB(50, 100, 150, 200);
+        expect(setStateSpy).toHaveBeenCalledWith([0x02, 0x12, 50, 100, 150, 200]);
+    });
+});
+//# sourceMappingURL=woceilinglight.test.js.map

package/dist/device/woceilinglight.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"woceilinglight.test.js","sourceRoot":"","sources":["../../src/device/woceilinglight.test.ts"],"names":[],"mappings":"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"}

package/dist/device/wocontact.d.ts

@@ -1,19 +1,6 @@
 import type { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
 export declare class WoContact extends SwitchbotDevice {
-    static parseServiceData(buf: Buffer, onlog: ((message: string) => void) | undefined): {
-        model: SwitchBotBLEModel;
-        modelName: SwitchBotBLEModelName;
-        modelFriendlyName: SwitchBotBLEModelFriendlyName;
-        movement: boolean;
-        tested: number;
-        battery: number;
-        contact_open: boolean;
-        contact_timeout: boolean;
-        lightLevel: string;
-        button_count: number;
-        doorState: string;
-    } | null;
+    static parseServiceData(serviceData: Buffer, onlog: ((message: string) => void) | undefined): Promise<object | null>;
 }
 //# sourceMappingURL=wocontact.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"wocontact.d.ts","sourceRoot":"","sources":["../../src/device/wocontact.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEzC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAErG,qBAAa,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS;;;;;;;;;;;;;CA6CpF"}
+{"version":3,"file":"wocontact.d.ts","sourceRoot":"","sources":["../../src/device/wocontact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAMzC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,qBAAa,SAAU,SAAQ,eAAe;WAC/B,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;CAsC1B"}

package/dist/device/wocontact.js

@@ -1,17 +1,21 @@
+/* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
+ *
+ * wocontact.ts: Switchbot BLE API registration.
+ */
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
+import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
 export class WoContact extends SwitchbotDevice {
-    static parseServiceData(buf, onlog) {
-        if (buf.length !== 9) {
+    static async parseServiceData(serviceData, onlog) {
+        if (serviceData.length !== 9) {
             if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceDataForWoContact] Buffer length ${buf.length} !== 9!`);
+                onlog(`[parseServiceDataForWoContact] Buffer length ${serviceData.length} !== 9!`);
             }
             return null;
         }
-        const byte1 = buf.readUInt8(1);
-        const byte2 = buf.readUInt8(2);
-        const byte3 = buf.readUInt8(3);
-        const byte8 = buf.readUInt8(8);
+        const byte1 = serviceData.readUInt8(1);
+        const byte2 = serviceData.readUInt8(2);
+        const byte3 = serviceData.readUInt8(3);
+        const byte8 = serviceData.readUInt8(8);
         const hallState = (byte3 >> 1) & 0b00000011;
         const tested = byte1 & 0b10000000;
         const movement = !!(byte1 & 0b01000000); // 1 - Movement detected
@@ -31,11 +35,7 @@ export class WoContact extends SwitchbotDevice {
             contact_timeout,
             lightLevel: lightLevel === 0 ? 'dark' : 'bright',
             button_count,
-            doorState: hallState === 0
-                ? 'close'
-                : hallState === 1
-                    ? 'open'
-                    : 'timeout no closed',
+            doorState: hallState === 0 ? 'close' : hallState === 1 ? 'open' : 'timeout no closed',
         };
         return data;
     }

package/dist/device/wocontact.js.map

@@ -1 +1 @@
-{"version":3,"file":"wocontact.js","sourceRoot":"","sources":["../../src/device/wocontact.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAErG,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,gBAAgB,CAAC,GAAW,EAAE,KAA8C;QACjF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;gBACzC,KAAK,CACH,gDAAgD,GAAG,CAAC,MAAM,SAAS,CACpE,CAAA;YACH,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAE9B,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,UAAU,CAAA;QAC3C,MAAM,MAAM,GAAG,KAAK,GAAG,UAAU,CAAA;QACjC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,CAAA,CAAC,wBAAwB;QAChE,MAAM,OAAO,GAAG,KAAK,GAAG,UAAU,CAAA,CAAC,IAAI;QACvC,MAAM,YAAY,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,UAAU,CAAA;QACxD,MAAM,eAAe,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,UAAU,CAAA;QAC3D,MAAM,UAAU,GAAG,KAAK,GAAG,UAAU,CAAA;QACrC,MAAM,YAAY,GAAG,KAAK,GAAG,UAAU,CAAA;QAEvC,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,iBAAiB,CAAC,aAAa;YACtC,SAAS,EAAE,qBAAqB,CAAC,aAAa;YAC9C,iBAAiB,EAAE,6BAA6B,CAAC,aAAa;YAC9D,QAAQ;YACR,MAAM;YACN,OAAO;YACP,YAAY;YACZ,eAAe;YACf,UAAU,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;YAChD,YAAY;YACZ,SAAS,EACP,SAAS,KAAK,CAAC;gBACb,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,SAAS,KAAK,CAAC;oBACf,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,mBAAmB;SAC5B,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
+{"version":3,"file":"wocontact.js","sourceRoot":"","sources":["../../src/device/wocontact.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAE3G,MAAM,OAAO,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,WAAmB,EACnB,KAA8C;QAE9C,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;gBACzC,KAAK,CAAC,gDAAgD,WAAW,CAAC,MAAM,SAAS,CAAC,CAAA;YACpF,CAAC;YACD,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;QACtC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QACtC,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;QAEtC,MAAM,SAAS,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,UAAU,CAAA;QAC3C,MAAM,MAAM,GAAG,KAAK,GAAG,UAAU,CAAA;QACjC,MAAM,QAAQ,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,CAAA,CAAC,wBAAwB;QAChE,MAAM,OAAO,GAAG,KAAK,GAAG,UAAU,CAAA,CAAC,IAAI;QACvC,MAAM,YAAY,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,UAAU,CAAA;QACxD,MAAM,eAAe,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,UAAU,CAAA;QAC3D,MAAM,UAAU,GAAG,KAAK,GAAG,UAAU,CAAA;QACrC,MAAM,YAAY,GAAG,KAAK,GAAG,UAAU,CAAA;QAEvC,MAAM,IAAI,GAAG;YACX,KAAK,EAAE,iBAAiB,CAAC,aAAa;YACtC,SAAS,EAAE,qBAAqB,CAAC,aAAa;YAC9C,iBAAiB,EAAE,6BAA6B,CAAC,aAAa;YAC9D,QAAQ;YACR,MAAM;YACN,OAAO;YACP,YAAY;YACZ,eAAe;YACf,UAAU,EAAE,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;YAChD,YAAY;YACZ,SAAS,EAAE,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,mBAAmB;SACtF,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}

package/dist/device/wocontact.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=wocontact.test.d.ts.map

package/dist/device/wocontact.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wocontact.test.d.ts","sourceRoot":"","sources":["../../src/device/wocontact.test.ts"],"names":[],"mappings":""}

package/dist/device/wocontact.test.js

@@ -0,0 +1,34 @@
+import { Buffer } from 'node:buffer';
+/* eslint-disable no-console */
+import { WoContact } from './wocontact.js';
+describe('woContact', () => {
+    it('parseServiceData should return null for incorrect buffer length', async () => {
+        const serviceData = Buffer.alloc(8); // Incorrect length
+        const result = await WoContact.parseServiceData(serviceData, console.log);
+        expect(result).toBeNull();
+    });
+    it('parseServiceData should return correct data for valid buffer', async () => {
+        const serviceData = Buffer.from([0, 0b11000000, 0b01111111, 0b00000111, 0, 0, 0, 0, 0b00001111]);
+        const result = await WoContact.parseServiceData(serviceData, console.log);
+        expect(result).toEqual({
+            model: 'ContactSensor',
+            modelName: 'ContactSensor',
+            modelFriendlyName: 'ContactSensor',
+            movement: true,
+            tested: 128,
+            battery: 127,
+            contact_open: true,
+            contact_timeout: true,
+            lightLevel: 'bright',
+            button_count: 15,
+            doorState: 'timeout no closed',
+        });
+    });
+    it('parseServiceData should log message for incorrect buffer length', async () => {
+        const serviceData = Buffer.alloc(8); // Incorrect length
+        const logSpy = jest.fn();
+        await WoContact.parseServiceData(serviceData, logSpy);
+        expect(logSpy).toHaveBeenCalledWith('[parseServiceDataForWoContact] Buffer length 8 !== 9!');
+    });
+});
+//# sourceMappingURL=wocontact.test.js.map

package/dist/device/wocontact.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wocontact.test.js","sourceRoot":"","sources":["../../src/device/wocontact.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,+BAA+B;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,mBAAmB;QACvD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC3B,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAA;QAChG,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QACzE,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,eAAe;YAC1B,iBAAiB,EAAE,eAAe;YAClC,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,GAAG;YACZ,YAAY,EAAE,IAAI;YAClB,eAAe,EAAE,IAAI;YACrB,UAAU,EAAE,QAAQ;YACpB,YAAY,EAAE,EAAE;YAChB,SAAS,EAAE,mBAAmB;SAC/B,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;QAC/E,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA,CAAC,mBAAmB;QACvD,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAA;QACxB,MAAM,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QACrD,MAAM,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,uDAAuD,CAAC,CAAA;IAC9F,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/device/wocurtain.d.ts

@@ -1,22 +1,11 @@
 import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
 export declare class WoCurtain extends SwitchbotDevice {
-    static parseServiceData(buf: Buffer, onlog: ((message: string) => void) | undefined): {
-        model: string;
-        modelName: SwitchBotBLEModelName;
-        modelFriendlyName: SwitchBotBLEModelFriendlyName;
-        calibration: boolean;
-        battery: number;
-        inMotion: boolean;
-        position: number;
-        lightLevel: number;
-        deviceChain: number;
-    } | null;
-    open(mode?: number): Promise<unknown>;
-    close(mode?: number): Promise<unknown>;
+    static parseServiceData(serviceData: Buffer, manufacturerData: Buffer, onlog: ((message: string) => void) | undefined, reverse?: boolean): Promise<object | null>;
+    open(mode?: number): Promise<void>;
+    close(mode?: number): Promise<void>;
     pause(): Promise<void>;
-    runToPos(percent: number, mode?: number): Promise<unknown>;
-    _operateCurtain(bytes: number[]): Promise<void>;
+    runToPos(percent: number, mode?: number): 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":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAA;AAElF,qBAAa,SAAU,SAAQ,eAAe;IAC5C,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS;;;;;;;;;;;IAkDnF,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM;IAelB,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM;IAenB,KAAK;IAgBL,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,SAAO;IA4BrC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE;CAqBhC"}
+{"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"}

package/dist/device/wocurtain.js

@@ -1,31 +1,48 @@
+import { Buffer } from 'node:buffer';
 /* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
  *
  * wocurtain.ts: Switchbot BLE API registration.
  */
-import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
+import { SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
 export class WoCurtain extends SwitchbotDevice {
-    static parseServiceData(buf, onlog) {
-        if (buf.length !== 5 && buf.length !== 6) {
+    static async parseServiceData(serviceData, manufacturerData, onlog, reverse = false) {
+        if (serviceData.length !== 5 && serviceData.length !== 6) {
             if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceDataForWoCurtain] Buffer length ${buf.length} !== 5 or 6!`);
+                onlog(`[parseServiceDataForWoCurtain] Buffer length ${serviceData.length} !== 5 or 6!`);
             }
             return null;
         }
-        const byte1 = buf.readUInt8(1);
-        const byte2 = buf.readUInt8(2);
-        const byte3 = buf.readUInt8(3);
-        const byte4 = buf.readUInt8(4);
-        const calibration = !!(byte1 & 0b01000000); // Whether the calibration is compconsted
-        const battery = byte2 & 0b01111111; // %
-        const inMotion = !!(byte3 & 0b10000000);
-        const currPosition = byte3 & 0b01111111; // current positon %
-        const lightLevel = (byte4 >> 4) & 0b00001111; // light sensor level (1-10)
-        const deviceChain = byte4 & 0b00000111;
-        const model = buf.subarray(0, 1).toString('utf8');
+        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
+            deviceData = manufacturerData.subarray(8, 11);
+            batteryData = manufacturerData.readUInt8(12);
+        }
+        else if (manufacturerData && manufacturerData.length >= 11) {
+            deviceData = manufacturerData.subarray(8, 11);
+            batteryData = serviceData ? byte2 : null;
+        }
+        else if (serviceData) {
+            deviceData = serviceData.subarray(3, 6);
+            batteryData = byte2;
+        }
+        else {
+            return {};
+        }
+        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 = {
             model,
             modelName,
@@ -33,7 +50,7 @@ export class WoCurtain extends SwitchbotDevice {
             calibration,
             battery,
             inMotion,
-            position: currPosition,
+            position: reverse ? 100 - position : position, //* OLD*/ currPosition,
             lightLevel,
             deviceChain,
         };
@@ -50,8 +67,8 @@ export class WoCurtain extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    open(mode) {
-        return this.runToPos(0, mode);
+    async open(mode) {
+        return await this.runToPos(0, mode);
     }
     /* ------------------------------------------------------------------
      * close()
@@ -64,8 +81,8 @@ export class WoCurtain extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    close(mode) {
-        return this.runToPos(100, mode);
+    async close(mode) {
+        return await this.runToPos(100, mode);
     }
     /* ------------------------------------------------------------------
      * pause()
@@ -78,8 +95,8 @@ export class WoCurtain extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    pause() {
-        return this._operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x00, 0xFF]);
+    async pause() {
+        return await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x00, 0xFF]);
     }
     /* ------------------------------------------------------------------
      * runToPos()
@@ -93,16 +110,12 @@ export class WoCurtain extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    runToPos(percent, mode = 0xFF) {
+    async runToPos(percent, mode = 0xFF) {
         if (typeof percent !== 'number') {
-            return new Promise((resolve, reject) => {
-                reject(new Error(`The type of target position percentage is incorrect: ${typeof percent}`));
-            });
+            throw new TypeError(`The type of target position percentage is incorrect: ${typeof percent}`);
         }
         if (typeof mode !== 'number') {
-            return new Promise((resolve, reject) => {
-                reject(new Error(`The type of running mode is incorrect: ${typeof mode}`));
-            });
+            throw new TypeError(`The type of running mode is incorrect: ${typeof mode}`);
         }
         if (mode > 1) {
             mode = 0xFF;
@@ -113,24 +126,22 @@ export class WoCurtain extends SwitchbotDevice {
         else if (percent < 0) {
             percent = 0;
         }
-        return this._operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, mode, percent]);
+        return await this.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, mode, percent]);
     }
-    _operateCurtain(bytes) {
-        return new Promise((resolve, reject) => {
-            const req_buf = Buffer.from(bytes);
-            this._command(req_buf)
-                .then((res_buf) => {
-                const code = res_buf.readUInt8(0);
-                if (res_buf.length === 3 && code === 0x01) {
-                    resolve();
-                }
-                else {
-                    reject(new Error(`The device returned an error: 0x${res_buf.toString('hex')}`));
-                }
-            })
-                .catch((error) => {
-                reject(error);
-            });
+    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;
         });
     }
 }

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":"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"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=wocurtain.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"wocurtain.test.d.ts","sourceRoot":"","sources":["../../src/device/wocurtain.test.ts"],"names":[],"mappings":""}

package/dist/device/wocurtain.test.js

@@ -0,0 +1,33 @@
+import { Buffer } from 'node:buffer';
+import * as Noble from '@stoprocent/noble';
+import { WoCurtain } from './wocurtain.js';
+describe('woCurtain', () => {
+    let curtain;
+    beforeEach(() => {
+        const peripheral = {}; // Replace with the actual peripheral object (e.g. from Noble)
+        curtain = new WoCurtain(peripheral, Noble);
+        curtain.command = jest.fn().mockResolvedValue(Buffer.from([0x01, 0x00, 0x00]));
+    });
+    it('runToPos should throw error for incorrect percent type', async () => {
+        await expect(curtain.runToPos('50')).rejects.toThrow('The type of target position percentage is incorrect: string');
+    });
+    it('runToPos should throw error for incorrect mode type', async () => {
+        await expect(curtain.runToPos(50, '0xff')).rejects.toThrow('The type of running mode is incorrect: string');
+    });
+    it('runToPos should set percent to 100 if greater than 100', async () => {
+        await curtain.runToPos(150);
+        expect(curtain.command).toHaveBeenCalledWith(Buffer.from([0x57, 0x0F, 0x45, 0x01, 0x05, 0xFF, 100]));
+    });
+    it('runToPos should set percent to 0 if less than 0', async () => {
+        await curtain.runToPos(-10);
+        expect(curtain.command).toHaveBeenCalledWith(Buffer.from([0x57, 0x0F, 0x45, 0x01, 0x05, 0xFF, 0]));
+    });
+    it('operateCurtain should throw error for incorrect response', async () => {
+        curtain.command = jest.fn().mockResolvedValue(Buffer.from([0x02, 0x00, 0x00]));
+        await expect(curtain.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, 0xFF, 50])).rejects.toThrow('The device returned an error: 0x020000');
+    });
+    it('operateCurtain should not throw error for correct response', async () => {
+        await expect(curtain.operateCurtain([0x57, 0x0F, 0x45, 0x01, 0x05, 0xFF, 50])).resolves.not.toThrow();
+    });
+});
+//# sourceMappingURL=wocurtain.test.js.map

package/dist/device/wocurtain.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wocurtain.test.js","sourceRoot":"","sources":["../../src/device/wocurtain.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAE1C,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,IAAI,OAAkB,CAAA;IAEtB,UAAU,CAAC,GAAG,EAAE;QACd,MAAM,UAAU,GAAG,EAAE,CAAA,CAAC,8DAA8D;QACpF,OAAO,GAAG,IAAI,SAAS,CAAC,UAA8B,EAAE,KAAK,CAAC,CAAA;QAC9D,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IAChF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAA;IAC5H,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,+CAA+C,CAAC,CAAA;IACpH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QAC3B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;IACtG,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;QAC/D,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAA;QAC3B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACpG,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;QAC9E,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAA;IAC1I,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;QAC1E,MAAM,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,CAAA;IACvG,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/dist/device/wohand.d.ts

@@ -1,20 +1,12 @@
 import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
 export declare class WoHand extends SwitchbotDevice {
-    static parseServiceData(buf: Buffer, onlog: ((message: string) => void) | undefined): {
-        model: SwitchBotBLEModel;
-        modelName: SwitchBotBLEModelName;
-        modelFriendlyName: SwitchBotBLEModelFriendlyName;
-        mode: boolean;
-        state: boolean;
-        battery: number;
-    } | null;
+    static parseServiceData(serviceData: Buffer, onlog: ((message: string) => void) | undefined): Promise<object | null>;
     press(): Promise<void>;
     turnOn(): Promise<void>;
     turnOff(): Promise<void>;
     down(): Promise<void>;
     up(): Promise<void>;
-    _operateBot(bytes: number[]): 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":"AAIA,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,aAAa,CAAA;AAErG,qBAAa,MAAO,SAAQ,eAAe;IACzC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS;;;;;;;;IAsCnF,KAAK;IAeL,MAAM;IAeN,OAAO;IAeP,IAAI;IAeJ,EAAE;IAIF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE;CAqB5B"}
+{"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"}

package/dist/device/wohand.js

@@ -1,20 +1,20 @@
+import { Buffer } from 'node:buffer';
 /* Copyright(C) 2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
  *
  * wohand.ts: Switchbot BLE API registration.
  */
-import { Buffer } from 'node:buffer';
 import { SwitchbotDevice } from '../device.js';
-import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types.js';
+import { SwitchBotBLEModel, SwitchBotBLEModelFriendlyName, SwitchBotBLEModelName } from '../types/types.js';
 export class WoHand extends SwitchbotDevice {
-    static parseServiceData(buf, onlog) {
-        if (buf.length !== 3) {
+    static async parseServiceData(serviceData, onlog) {
+        if (serviceData.length !== 3) {
             if (onlog && typeof onlog === 'function') {
-                onlog(`[parseServiceData] Buffer length ${buf.length} !== 3!`);
+                onlog(`[parseServiceData] Buffer length ${serviceData.length} !== 3!`);
             }
             return null;
         }
-        const byte1 = buf.readUInt8(1);
-        const byte2 = buf.readUInt8(2);
+        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; // %
@@ -39,8 +39,8 @@ export class WoHand extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    press() {
-        return this._operateBot([0x57, 0x01, 0x00]);
+    async press() {
+        return await this.operateBot([0x57, 0x01, 0x00]);
     }
     /* ------------------------------------------------------------------
      * turnOn()
@@ -53,8 +53,8 @@ export class WoHand extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    turnOn() {
-        return this._operateBot([0x57, 0x01, 0x01]);
+    async turnOn() {
+        return await this.operateBot([0x57, 0x01, 0x01]);
     }
     /* ------------------------------------------------------------------
      * turnOff()
@@ -67,8 +67,8 @@ export class WoHand extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    turnOff() {
-        return this._operateBot([0x57, 0x01, 0x02]);
+    async turnOff() {
+        return await this.operateBot([0x57, 0x01, 0x02]);
     }
     /* ------------------------------------------------------------------
      * down()
@@ -81,8 +81,8 @@ export class WoHand extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    down() {
-        return this._operateBot([0x57, 0x01, 0x03]);
+    async down() {
+        return await this.operateBot([0x57, 0x01, 0x03]);
     }
     /* ------------------------------------------------------------------
      * up()
@@ -95,25 +95,23 @@ export class WoHand extends SwitchbotDevice {
      * - Promise object
      *   Nothing will be passed to the `resolve()`.
      * ---------------------------------------------------------------- */
-    up() {
-        return this._operateBot([0x57, 0x01, 0x04]);
+    async up() {
+        return await this.operateBot([0x57, 0x01, 0x04]);
     }
-    _operateBot(bytes) {
-        return new Promise((resolve, reject) => {
-            const req_buf = Buffer.from(bytes);
-            this._command(req_buf)
-                .then((res_buf) => {
-                const code = res_buf.readUInt8(0);
-                if (res_buf.length === 3 && (code === 0x01 || code === 0x05)) {
-                    resolve();
-                }
-                else {
-                    reject(new Error(`The device returned an error: 0x${res_buf.toString('hex')}`));
-                }
-            })
-                .catch((error) => {
-                reject(error);
-            });
+    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;
         });
     }
 }