@alexgyver/ble 1.0.1 → 1.0.2

package/ble2light.js

@@ -1,3 +1,5 @@
+import { sleep, SerialExecutor } from "@alexgyver/utils";
+
 export default class BLEJS {
     static State = {
         Closed: 'closed',
@@ -6,16 +8,13 @@ export default class BLEJS {
         Closing: 'closing',
     };
 
-    //#region handlers
-    onbin = null;
-
+    onbin(b) { }
     onopen() { }
     onclose() { }
     onchange(s) { }
     onselect(name) { }
     onerror(e) { }
 
-    //#region constructor
     constructor(params = {}) {
         const def = {
             serviceUUID: '0000ffe0-0000-1000-8000-00805f9b34fb',
@@ -24,10 +23,10 @@ export default class BLEJS {
             auto_open: false,
             reconnect: 1000,
         };
+
         this.cfg = { ...def, ...params };
     }
 
-    //#region methods
     config(params = {}) {
         this.cfg = { ...this.cfg, ...params };
     }
@@ -51,37 +50,57 @@ export default class BLEJS {
     async select() {
         try {
             await this.close();
-            if (this._device) this._device.removeEventListener('gattserverdisconnected', this._disconnect_h);
+
+            if (this._device) {
+                this._device.removeEventListener(
+                    'gattserverdisconnected',
+                    this._disconnect_h
+                );
+            }
+
             this._device = await navigator.bluetooth.requestDevice({
                 filters: [{ services: [this.cfg.serviceUUID] }],
-                optionalServices: [this.cfg.serviceUUID]
+                optionalServices: [this.cfg.serviceUUID],
             });
-            this._device.addEventListener("gattserverdisconnected", this._disconnect_h);
+
+            this._device.addEventListener(
+                'gattserverdisconnected',
+                this._disconnect_h
+            );
         } catch (e) {
             this._error(e);
             this._device = null;
         }
 
         this.onselect(this.getName());
+
         if (this.cfg.auto_open) this.open();
+
         return this.selected();
     }
 
     async open() {
-        if (!this._device) {
-            this._error("No device");
-            return;
-        }
-        if (this.opened()) return;
+        return this._lifecycle.runNothrow(async () => {
+            if (!this._device) {
+                this._error('No device');
+                return false;
+            }
+
+            if (this.opened()) return true;
+
+            if (this.cfg.reconnect) this.retry = true;
+
+            await this._open();
 
-        if (this.cfg.reconnect) this.retry = true;
-        await this._open();
+            return this.opened();
+        });
     }
 
     async _open() {
-        if (this._state != BLEJS.State.Closed) return;
+        if (this._state !== BLEJS.State.Closed) return;
 
         this._change(BLEJS.State.Opening);
+
         try {
             const server = await this._device.gatt.connect();
             const service = await server.getPrimaryService(this.cfg.serviceUUID);
@@ -90,76 +109,145 @@ export default class BLEJS {
             this._tx = await service.getCharacteristic(this.cfg.txUUID);
 
             await this._tx.startNotifications();
-            this._tx.addEventListener("characteristicvaluechanged", this._data_h);
+            this._tx.addEventListener(
+                'characteristicvaluechanged',
+                this._data_h
+            );
 
+            this._sender.reset();
             this._change(BLEJS.State.Open);
         } catch (e) {
             this._error(e);
+            this._sender.reset();
             this._change(BLEJS.State.Closed);
-            if (this.retry) sleep(this.cfg.reconnect).then(() => this._open());
+
+            if (this.retry) {
+                sleep(this.cfg.reconnect).then(() => {
+                    this._lifecycle.runNothrow(() => this._open());
+                });
+            }
         }
     }
 
     async close() {
-        this.retry = false;
-        if (this._device?.gatt?.connected) await this._close();
+        return this._lifecycle.runNothrow(async () => {
+            this.retry = false;
+            this._sender.reset();
+
+            if (this._state !== BLEJS.State.Closed) {
+                await this._close();
+            }
+
+            return true;
+        });
     }
 
     async _close() {
+        if (this._state === BLEJS.State.Closed) return;
+
         this._change(BLEJS.State.Closing);
+
         try {
-            if (this._device?.gatt?.connected) this._device.gatt.disconnect();
-            else this._disconnect();
+            if (this._device?.gatt?.connected) {
+                this._device.gatt.disconnect();
+            } else {
+                await this._disconnect();
+            }
         } catch (e) {
             this._error(e);
+            await this._disconnect();
         }
     }
 
     async sendBin(data, fast = true) {
-        try {
-            if (fast) await this._rx.writeValueWithoutResponse(data);
-            else await this._rx.writeValueWithResponse(data);
-        } catch (e) {
-            this._error(e);
-        }
+        if (!this.opened() || !this._rx) return false;
+
+        return this._sender.runNothrow(async () => {
+            if (!this.opened() || !this._rx) return false;
+
+            if (fast) {
+                await this._rx.writeValueWithoutResponse(data);
+            } else {
+                await this._rx.writeValueWithResponse(data);
+            }
+
+            return true;
+        });
     }
 
-    //#region private    
     _state = BLEJS.State.Closed;
     _device = null;
     _rx = null;
     _tx = null;
 
+    retry = false;
+
+    _sender = new SerialExecutor();
+    _lifecycle = new SerialExecutor();
+
     async _disconnect(e) {
-        this._change(BLEJS.State.Closed);
-        if (this._tx) this._tx.removeEventListener('characteristicvaluechanged', this._data_h);
+        this._sender.reset();
+
+        if (this._tx) {
+            try {
+                this._tx.removeEventListener(
+                    'characteristicvaluechanged',
+                    this._data_h
+                );
+            } catch (e) { }
+        }
 
         this._rx = null;
         this._tx = null;
 
-        if (this.retry) sleep(this.cfg.reconnect).then(() => this._open());
+        this._change(BLEJS.State.Closed);
+
+        if (this.retry) {
+            sleep(this.cfg.reconnect).then(() => {
+                this._lifecycle.runNothrow(() => this._open());
+            });
+        }
+
         await sleep(50);
     }
+
     _disconnect_h = this._disconnect.bind(this);
 
     _data(e) {
-        const dv = e.target.value;
-        const value = new Uint8Array(dv.buffer, dv.byteOffset, dv.byteLength);
-        if (this.onbin) this.onbin(value);
+        try {
+            const dv = e.target.value;
+            const value = new Uint8Array(
+                dv.buffer,
+                dv.byteOffset,
+                dv.byteLength
+            );
+
+            this.onbin(value);
+        } catch (e) {
+            this._error(e);
+        }
     }
+
     _data_h = this._data.bind(this);
 
     _error(e) {
         this.onerror('[BLE] ' + e);
     }
+
     _change(s) {
+        if (this._state === s) return;
+
         this._state = s;
         this.onchange(s);
+
         switch (s) {
-            case BLEJS.State.Open: this.onopen(); break;
-            case BLEJS.State.Closed: this.onclose(); break;
+            case BLEJS.State.Open:
+                this.onopen();
+                break;
+
+            case BLEJS.State.Closed:
+                this.onclose();
+                break;
         }
     }
-}
-
-const sleep = (ms) => new Promise(r => setTimeout(r, ms));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexgyver/ble",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Web BLE Serial",
   "main": "./ble.js",
   "module": "./ble.js",
@@ -14,14 +14,14 @@
     "url": "git+https://github.com/GyverLibs/ble.js.git"
   },
   "devDependencies": {
-    "css-loader": "^7.1.3",
+    "css-loader": "^7.1.4",
     "style-loader": "^4.0.0",
-    "webpack": "^5.105.1",
-    "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.3"
+    "webpack": "^5.106.2",
+    "webpack-cli": "^7.0.2",
+    "webpack-dev-server": "^5.2.4"
   },
   "dependencies": {
-    "@alexgyver/utils": "^1.2.4"
+    "@alexgyver/utils": "^1.2.6"
   },
   "author": "AlexGyver <alex@alexgyver.ru>",
   "license": "MIT"