@mmote/niimblue-node 0.0.10 → 0.0.12

package/README.md

@@ -33,7 +33,7 @@ Global (for cli usage):
 npm i -g @mmote/niimblue-node
 ```
 
-[node-gyp](https://www.npmjs.com/package/node-gyp) is required to install [noble](https://www.npmjs.com/package/@abandonware/noble) dependency.
+[node-gyp](https://www.npmjs.com/package/node-gyp) is required to install [noble](https://www.npmjs.com/package/@mmote/niimblue-node) dependency.
 It requires working compiler installed on your system.
 
 Windows requirements:

package/dist/client/headless_ble_impl.d.ts

@@ -10,7 +10,6 @@ export declare class NiimbotHeadlessBleClient extends NiimbotAbstractClient {
     constructor();
     /** Set device mac address or name for connect */
     setAddress(address: string): void;
-    static waitAdapterReady(): Promise<void>;
     static scan(timeoutMs?: number): Promise<ScanItem[]>;
     private getDevice;
     private connectToDevice;

package/dist/client/headless_ble_impl.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NiimbotHeadlessBleClient = void 0;
-const noble_1 = __importDefault(require("@abandonware/noble"));
+const noble_1 = __importDefault(require("@stoprocent/noble"));
 const niimbluelib_1 = require("@mmote/niimbluelib");
 class NiimbotHeadlessBleClient extends niimbluelib_1.NiimbotAbstractClient {
     constructor() {
@@ -15,51 +15,21 @@ class NiimbotHeadlessBleClient extends niimbluelib_1.NiimbotAbstractClient {
     setAddress(address) {
         this.addr = address;
     }
-    static async waitAdapterReady() {
-        if (noble_1.default._state === "poweredOn") {
-            return;
-        }
-        return new Promise((resolve, reject) => {
-            let timer;
-            noble_1.default.on("stateChange", async (state) => {
-                clearTimeout(timer);
-                if (state === "poweredOn") {
-                    resolve();
-                }
-                else {
-                    reject(new Error(`BLE state is ${state}`));
-                }
-            });
-            timer = setTimeout(() => {
-                reject(new Error("Can't init BLE"));
-            }, 5000);
-        });
-    }
     static async scan(timeoutMs = 5000) {
-        await NiimbotHeadlessBleClient.waitAdapterReady();
-        return new Promise((resolve, reject) => {
-            const peripherals = [];
-            let timer;
-            noble_1.default.on("discover", async (peripheral) => {
-                peripherals.push({
-                    address: peripheral.address,
-                    name: peripheral.advertisement.localName || "unknown",
-                });
+        const items = [];
+        await noble_1.default.waitForPoweredOnAsync(5000);
+        await noble_1.default.startScanningAsync([], false);
+        setTimeout(() => noble_1.default.stopScanningAsync(), timeoutMs ?? 5000);
+        for await (const peripheral of noble_1.default.discoverAsync()) {
+            items.push({
+                address: peripheral.address,
+                name: peripheral.advertisement.localName || "unknown",
             });
-            noble_1.default.startScanning([], false, (error) => {
-                if (error) {
-                    clearTimeout(timer);
-                    reject(error);
-                }
-            });
-            timer = setTimeout(() => {
-                noble_1.default.stopScanning();
-                resolve(peripherals);
-            }, timeoutMs ?? 5000);
-        });
+        }
+        return items;
     }
     async getDevice(address, timeoutMs = 5000) {
-        await NiimbotHeadlessBleClient.waitAdapterReady();
+        await noble_1.default.waitForPoweredOnAsync(5000);
         return new Promise((resolve, reject) => {
             let timer;
             noble_1.default.on("discover", async (peripheral) => {
@@ -105,11 +75,11 @@ class NiimbotHeadlessBleClient extends niimbluelib_1.NiimbotAbstractClient {
             this.device = undefined;
             this.channel = undefined;
         });
-        channelCharacteristic.on("read", (data, isNotification) => {
+        channelCharacteristic.on("data", (data, isNotification) => {
             if (isNotification)
                 this.processRawPacket(new Uint8Array(data));
         });
-        channelCharacteristic.subscribeAsync();
+        await channelCharacteristic.subscribeAsync();
         this.channel = channelCharacteristic;
         this.device = periph;
     }
@@ -141,7 +111,6 @@ class NiimbotHeadlessBleClient extends niimbluelib_1.NiimbotAbstractClient {
         this.stopHeartbeat();
         if (this.device !== undefined) {
             await this.device.disconnectAsync();
-            this.emit("disconnect", new niimbluelib_1.DisconnectEvent());
         }
         this.device = undefined;
         this.channel = undefined;
@@ -150,7 +119,7 @@ class NiimbotHeadlessBleClient extends niimbluelib_1.NiimbotAbstractClient {
         const send = async () => {
             if (!this.isConnected()) {
                 this.disconnect();
-                throw new Error("Disconnected");
+                throw new Error("Not connected");
             }
             await niimbluelib_1.Utils.sleep(this.packetIntervalMs);
             await this.channel.writeAsync(Buffer.from(data), true);

package/dist/client/headless_serial_impl.js

@@ -78,7 +78,18 @@ class NiimbotHeadlessSerialClient extends niimbluelib_1.NiimbotAbstractClient {
     }
     async disconnect() {
         this.stopHeartbeat();
-        this.device?.close();
+        if (this.device) {
+            return new Promise((resolve, reject) => {
+                this.device.close((e) => {
+                    if (e) {
+                        reject(e);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        }
     }
     isConnected() {
         return this.isOpen;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mmote/niimblue-node",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Headless clients for niimbluelib. Command line interface, simple REST server are also included.",
   "keywords": [
     "command-line",
@@ -38,9 +38,9 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@abandonware/noble": "^1.9.2-26",
     "@commander-js/extra-typings": "^12.1.0",
-    "@mmote/niimbluelib": "0.0.1-alpha.29",
+    "@mmote/niimbluelib": "0.0.1-alpha.32",
+    "@stoprocent/noble": "^2.3.10",
     "async-mutex": "^0.5.0",
     "commander": "^12.1.0",
     "serialport": "^12.0.0",