@alexgyver/ble 1.0.4 → 1.0.7

package/ble.js

@@ -1,4 +1,4 @@
-import { sleep, ShiftBuffer, StreamSplitter } from "@alexgyver/utils";
+import { sleep, SerialExecutor } from "@alexgyver/utils";
 
 export default class BLEJS {
     static State = {
@@ -8,36 +8,30 @@ export default class BLEJS {
         Closing: 'closing',
     };
 
-    //#region handlers
-    onbin = null;
     ontext = null;
-
+    onbin(b) { }
     onopen() { }
     onclose() { }
     onchange(s) { }
     onselect(name) { }
     onerror(e) { }
 
-    //#region constructor
     constructor(params = {}) {
         const def = {
-            eol: /\r?\n/,
             serviceUUID: '0000ffe0-0000-1000-8000-00805f9b34fb',
-            charxUUID: '0000ffe1-0000-1000-8000-00805f9b34fb',
+            rxUUID: '0000ffe1-0000-1000-8000-00805f9b34fb',
+            txUUID: '0000ffe2-0000-1000-8000-00805f9b34fb',
             auto_open: false,
-            max_tx: 20,
             reconnect: 1000,
+            chunkSize: 500,
+            chunkDelay: 0,
         };
-        this.cfg = { ...def, ...params };
 
-        this.splitter = new StreamSplitter(this.cfg.eol);
-        this.splitter.ontext = (t) => this.ontext(t);
+        this.cfg = { ...def, ...params };
     }
 
-    //#region methods
     config(params = {}) {
         this.cfg = { ...this.cfg, ...params };
-        this.splitter.eol = this.cfg.eol;
     }
 
     static supported() {
@@ -59,113 +53,222 @@ 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) 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);
-            this._charx = await service.getCharacteristic(this.cfg.charxUUID);
-            await this._charx.startNotifications();
-            this._charx.addEventListener("characteristicvaluechanged", this._data_h);
-            this._buffer.clear();
+
+            this._rx = await service.getCharacteristic(this.cfg.rxUUID);
+            this._tx = await service.getCharacteristic(this.cfg.txUUID);
+
+            await this._tx.startNotifications();
+            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.opened()) 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 { this._device.gatt.disconnect(); }
-        catch (e) { this._error(e); }
+
+        try {
+            if (this._device?.gatt?.connected) {
+                this._device.gatt.disconnect();
+            } else {
+                await this._disconnect();
+            }
+        } catch (e) {
+            this._error(e);
+            await this._disconnect();
+        }
     }
 
-    async sendText(text) {
-        await this.sendBin((new TextEncoder()).encode(text));
+    async sendText(text, fast = true) {
+        await this.sendBin((new TextEncoder()).encode(text), fast);
     }
 
-    async sendBin(data) {
-        this._buffer.push(data);
-        this._send();
+    async sendBin(data, fast = true) {
+        if (!this.opened() || !this._rx) return false;
+
+        return this._sender.runNothrow(async () => {
+            if (!this.opened() || !this._rx) return false;
+
+            const chunkSize = this.cfg.chunkSize;
+            const bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
+
+            for (let i = 0; i < bytes.length; i += chunkSize) {
+                if (!this.opened() || !this._rx) return false;
+
+                const chunk = bytes.slice(i, i + chunkSize);
+
+                if (fast) {
+                    await this._rx.writeValueWithoutResponse(chunk);
+                } else {
+                    await this._rx.writeValueWithResponse(chunk);
+                }
+
+                if (this.cfg.chunkDelay > 0) {
+                    await sleep(this.cfg.chunkDelay);
+                }
+            }
+
+            return true;
+        });
     }
 
-    //#region private    
-    _device = null;
-    _charx = null;
     _state = BLEJS.State.Closed;
-    _buffer = new ShiftBuffer();
-    _decoder = new TextDecoder();
+    _device = null;
+    _rx = null;
+    _tx = null;
+
+    retry = false;
+
+    _sender = new SerialExecutor();
+    _lifecycle = new SerialExecutor();
 
     async _disconnect(e) {
+        this._sender.reset();
+
+        if (this._tx) {
+            try {
+                this._tx.removeEventListener(
+                    'characteristicvaluechanged',
+                    this._data_h
+                );
+            } catch (e) { }
+        }
+
+        this._rx = null;
+        this._tx = null;
+
         this._change(BLEJS.State.Closed);
-        if (this._charx) this._charx.removeEventListener('characteristicvaluechanged', this._data_h);
-        this._charx = null;
-        if (this.retry) sleep(this.cfg.reconnect).then(() => this._open());
+
+        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);
-        if (this.ontext) this.splitter.write(this._decoder.decode(value, { stream: true }));
-    }
-    _data_h = this._data.bind(this);
+        try {
+            const dv = e.target.value;
+            const value = new Uint8Array(
+                dv.buffer,
+                dv.byteOffset,
+                dv.byteLength
+            );
 
-    async _send() {
-        if (this._busy) return;
-        this._busy = true;
-        while (this._buffer.length && this._charx) {
-            let d = this._buffer.shift(this.cfg.max_tx);
-            try {
-                if (d.length) await this._charx.writeValueWithoutResponse(d);
-            } catch (e) { }
+            this.onbin(value);
+            if (this.ontext) this.ontext(new TextDecoder().decode(value));
+        } catch (e) {
+            this._error(e);
         }
-        this._busy = false;
     }
 
+    _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;
         }
     }
 }

package/ble.min.js

@@ -1 +1 @@
-const t=t=>new Promise(e=>setTimeout(e,t));class e{ontext=null;constructor(t=/\r?\n/,e=!1){this.eol=t,this.skip=e}reset(){this._buf=""}write(t){if(!this.ontext)return;if(!this.eol)return void this.ontext(t);this._buf+=t;let e=this._buf.split(this.eol);1!=e.length&&(e[e.length-1].length?this._buf=e.pop():(this._buf="",e.pop()),this.skip&&(e.shift(),this.skip=!1),e.forEach(t=>this.ontext(t)))}_buf=""}class s{constructor(){this.chunks=[],this.length=0}clear(){this.chunks=[],this.length=0}push(t){return!(!t||0===t.length||(this.chunks.push(t),this.length+=t.length,0))}shift(t){if(!this.length||!t)return new Uint8Array(0);t>this.length&&(t=this.length);const e=new Uint8Array(t);let s=0;for(;s<t&&this.chunks.length>0;){const i=this.chunks[0];if(!i||0===i.length){this.chunks.shift();continue}const h=Math.min(i.length,t-s);e.set(i.subarray(0,h),s),s+=h,h===i.length?this.chunks.shift():this.chunks[0]=i.subarray(h),this.length-=h}return e}shiftAll(){return this.shift(this.length)}}class i{static State={Closed:"closed",Opening:"opening",Open:"open",Closing:"closing"};onbin=null;ontext=null;onopen(){}onclose(){}onchange(t){}onselect(t){}onerror(t){}constructor(t={}){this.cfg={eol:/\r?\n/,serviceUUID:"0000ffe0-0000-1000-8000-00805f9b34fb",charxUUID:"0000ffe1-0000-1000-8000-00805f9b34fb",auto_open:!1,max_tx:20,reconnect:1e3,...t},this.splitter=new e(this.cfg.eol),this.splitter.ontext=t=>this.ontext(t)}config(t={}){this.cfg={...this.cfg,...t},this.splitter.eol=this.cfg.eol}static supported(){return"bluetooth"in navigator}opened(){return this._state===i.State.Open}selected(){return!!this._device}getName(){return this._device?this._device.name:null}async select(){try{await this.close(),this._device&&this._device.removeEventListener("gattserverdisconnected",this._disconnect_h),this._device=await navigator.bluetooth.requestDevice({filters:[{services:[this.cfg.serviceUUID]}],optionalServices:[this.cfg.serviceUUID]}),this._device.addEventListener("gattserverdisconnected",this._disconnect_h)}catch(t){this._error(t),this._device=null}return this.onselect(this.getName()),this.cfg.auto_open&&this.open(),this.selected()}async open(){this._device&&(this.opened()||(this.cfg.reconnect&&(this.retry=!0),await this._open()))}async _open(){if(this._state==i.State.Closed){this._change(i.State.Opening);try{const t=await this._device.gatt.connect(),e=await t.getPrimaryService(this.cfg.serviceUUID);this._charx=await e.getCharacteristic(this.cfg.charxUUID),await this._charx.startNotifications(),this._charx.addEventListener("characteristicvaluechanged",this._data_h),this._buffer.clear(),this._change(i.State.Open)}catch(e){this._error(e),this._change(i.State.Closed),this.retry&&t(this.cfg.reconnect).then(()=>this._open())}}}async close(){this.retry=!1,this.opened()&&await this._close()}async _close(){this._change(i.State.Closing);try{this._device.gatt.disconnect()}catch(t){this._error(t)}}async sendText(t){await this.sendBin((new TextEncoder).encode(t))}async sendBin(t){this._buffer.push(t),this._send()}_device=null;_charx=null;_state=i.State.Closed;_buffer=new s;_decoder=new TextDecoder;async _disconnect(e){this._change(i.State.Closed),this._charx&&this._charx.removeEventListener("characteristicvaluechanged",this._data_h),this._charx=null,this.retry&&t(this.cfg.reconnect).then(()=>this._open()),await t(50)}_disconnect_h=this._disconnect.bind(this);_data(t){const e=t.target.value,s=new Uint8Array(e.buffer,e.byteOffset,e.byteLength);this.onbin&&this.onbin(s),this.ontext&&this.splitter.write(this._decoder.decode(s,{stream:!0}))}_data_h=this._data.bind(this);async _send(){if(!this._busy){for(this._busy=!0;this._buffer.length&&this._charx;){let t=this._buffer.shift(this.cfg.max_tx);try{t.length&&await this._charx.writeValueWithoutResponse(t)}catch(t){}}this._busy=!1}}_error(t){this.onerror("[BLE] "+t)}_change(t){switch(this._state=t,this.onchange(t),t){case i.State.Open:this.onopen();break;case i.State.Closed:this.onclose()}}}export{i as default};
+const t=t=>new Promise(e=>setTimeout(e,t));class e{constructor(){this._session=0,this.reset()}run(t){const e=this._session,s=this._queue.then(()=>{if(e!==this._session)throw new Error("Queue empty");return t()});return this._queue=s.catch(()=>{}),s}runNothrow(t){return this.run(t).catch(()=>null)}reset(){this._session++,this._queue=Promise.resolve()}}class s{static State={Closed:"closed",Opening:"opening",Open:"open",Closing:"closing"};ontext=null;onbin(t){}onopen(){}onclose(){}onchange(t){}onselect(t){}onerror(t){}constructor(t={}){this.cfg={serviceUUID:"0000ffe0-0000-1000-8000-00805f9b34fb",rxUUID:"0000ffe1-0000-1000-8000-00805f9b34fb",txUUID:"0000ffe2-0000-1000-8000-00805f9b34fb",auto_open:!1,reconnect:1e3,chunkSize:500,chunkDelay:0,...t}}config(t={}){this.cfg={...this.cfg,...t}}static supported(){return"bluetooth"in navigator}opened(){return this._state===s.State.Open}selected(){return!!this._device}getName(){return this._device?this._device.name:null}async select(){try{await this.close(),this._device&&this._device.removeEventListener("gattserverdisconnected",this._disconnect_h),this._device=await navigator.bluetooth.requestDevice({filters:[{services:[this.cfg.serviceUUID]}],optionalServices:[this.cfg.serviceUUID]}),this._device.addEventListener("gattserverdisconnected",this._disconnect_h)}catch(t){this._error(t),this._device=null}return this.onselect(this.getName()),this.cfg.auto_open&&this.open(),this.selected()}async open(){return this._lifecycle.runNothrow(async()=>this._device?!!this.opened()||(this.cfg.reconnect&&(this.retry=!0),await this._open(),this.opened()):(this._error("No device"),!1))}async _open(){if(this._state===s.State.Closed){this._change(s.State.Opening);try{const t=await this._device.gatt.connect(),e=await t.getPrimaryService(this.cfg.serviceUUID);this._rx=await e.getCharacteristic(this.cfg.rxUUID),this._tx=await e.getCharacteristic(this.cfg.txUUID),await this._tx.startNotifications(),this._tx.addEventListener("characteristicvaluechanged",this._data_h),this._sender.reset(),this._change(s.State.Open)}catch(e){this._error(e),this._sender.reset(),this._change(s.State.Closed),this.retry&&t(this.cfg.reconnect).then(()=>{this._lifecycle.runNothrow(()=>this._open())})}}}async close(){return this._lifecycle.runNothrow(async()=>(this.retry=!1,this._sender.reset(),this._state!==s.State.Closed&&await this._close(),!0))}async _close(){if(this._state!==s.State.Closed){this._change(s.State.Closing);try{this._device?.gatt?.connected?this._device.gatt.disconnect():await this._disconnect()}catch(t){this._error(t),await this._disconnect()}}}async sendText(t,e=!0){await this.sendBin((new TextEncoder).encode(t),e)}async sendBin(e,s=!0){return!(!this.opened()||!this._rx)&&this._sender.runNothrow(async()=>{if(!this.opened()||!this._rx)return!1;const i=this.cfg.chunkSize,n=e instanceof Uint8Array?e:new Uint8Array(e);for(let e=0;e<n.length;e+=i){if(!this.opened()||!this._rx)return!1;const c=n.slice(e,e+i);s?await this._rx.writeValueWithoutResponse(c):await this._rx.writeValueWithResponse(c),this.cfg.chunkDelay>0&&await t(this.cfg.chunkDelay)}return!0})}_state=s.State.Closed;_device=null;_rx=null;_tx=null;retry=!1;_sender=new e;_lifecycle=new e;async _disconnect(e){if(this._sender.reset(),this._tx)try{this._tx.removeEventListener("characteristicvaluechanged",this._data_h)}catch(e){}this._rx=null,this._tx=null,this._change(s.State.Closed),this.retry&&t(this.cfg.reconnect).then(()=>{this._lifecycle.runNothrow(()=>this._open())}),await t(50)}_disconnect_h=this._disconnect.bind(this);_data(t){try{const e=t.target.value,s=new Uint8Array(e.buffer,e.byteOffset,e.byteLength);this.onbin(s),this.ontext&&this.ontext((new TextDecoder).decode(s))}catch(t){this._error(t)}}_data_h=this._data.bind(this);_error(t){this.onerror("[BLE] "+t)}_change(t){if(this._state!==t)switch(this._state=t,this.onchange(t),t){case s.State.Open:this.onopen();break;case s.State.Closed:this.onclose()}}}export{s as default};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexgyver/ble",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "Web BLE Serial",
   "main": "./ble.js",
   "module": "./ble.js",
@@ -21,7 +21,7 @@
     "webpack-dev-server": "^5.2.4"
   },
   "dependencies": {
-    "@alexgyver/utils": "^1.2.7"
+    "@alexgyver/utils": "^1.2.8"
   },
   "author": "AlexGyver <alex@alexgyver.ru>",
   "license": "MIT"

package/test/script.js

@@ -1,5 +1,5 @@
-import BLEJS from "https://gyverlibs.github.io/BLE.js/ble.min.js";
-// import BLEJS from "../ble2light.js";
+// import BLEJS from "https://gyverlibs.github.io/BLE.js/ble.min.js";
+import BLEJS from "../ble.js";
 
 let i = 0;
 let ble = new BLEJS({ auto_open: true });
@@ -8,14 +8,15 @@ let ble = new BLEJS({ auto_open: true });
 select_b.onclick = () => ble.select();
 open_b.onclick = () => ble.open();
 close_b.onclick = () => ble.close();
+
 send_b.onclick = async () => {
     ble.sendBin(new TextEncoder().encode('Hello ' + i++));
 }
 
-async function send(hex) {
-    const data = new Uint8Array(hex.trim().split(/\s+/).map(x => parseInt(x, 16)));
-    await ble.sendBin(data);
-}
+// async function send(hex) {
+//     const data = new Uint8Array(hex.trim().split(/\s+/).map(x => parseInt(x, 16)));
+//     await ble.sendBin(data);
+// }
 
 // read
 ble.onbin = b => console.log(new TextDecoder().decode(b));

package/ble2.js

@@ -1,192 +0,0 @@
-import { sleep, ShiftBuffer, StreamSplitter } from "@alexgyver/utils";
-
-export default class BLEJS {
-    static State = {
-        Closed: 'closed',
-        Opening: 'opening',
-        Open: 'open',
-        Closing: 'closing',
-    };
-
-    //#region handlers
-    onbin = null;
-    ontext = null;
-
-    onopen() { }
-    onclose() { }
-    onchange(s) { }
-    onselect(name) { }
-    onerror(e) { }
-
-    //#region constructor
-    constructor(params = {}) {
-        const def = {
-            eol: /\r?\n/,
-            serviceUUID: '0000ffe0-0000-1000-8000-00805f9b34fb',
-            rxUUID: '0000ffe1-0000-1000-8000-00805f9b34fb',
-            txUUID: '0000ffe2-0000-1000-8000-00805f9b34fb',
-            auto_open: false,
-            max_tx: 20,
-            reconnect: 1000,
-        };
-        this.cfg = { ...def, ...params };
-
-        this.splitter = new StreamSplitter(this.cfg.eol);
-        this.splitter.ontext = (t) => this.ontext && this.ontext(t);
-    }
-
-    //#region methods
-    config(params = {}) {
-        this.cfg = { ...this.cfg, ...params };
-        this.splitter.eol = this.cfg.eol;
-    }
-
-    static supported() {
-        return 'bluetooth' in navigator;
-    }
-
-    opened() {
-        return this._state === BLEJS.State.Open;
-    }
-
-    selected() {
-        return !!this._device;
-    }
-
-    getName() {
-        return this._device ? this._device.name : null;
-    }
-
-    async select() {
-        try {
-            await this.close();
-            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]
-            });
-            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) return;
-        if (this.opened()) return;
-
-        if (this.cfg.reconnect) this.retry = true;
-        await this._open();
-    }
-
-    async _open() {
-        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);
-
-            this._rx = await service.getCharacteristic(this.cfg.rxUUID);
-            this._tx = await service.getCharacteristic(this.cfg.txUUID);
-
-            await this._tx.startNotifications();
-            this._tx.addEventListener("characteristicvaluechanged", this._data_h);
-
-            this._buffer.clear();
-            this._change(BLEJS.State.Open);
-            this._decoder = new TextDecoder();
-            this.splitter.reset();
-        } catch (e) {
-            this._error(e);
-            this._change(BLEJS.State.Closed);
-            if (this.retry) sleep(this.cfg.reconnect).then(() => this._open());
-        }
-    }
-
-    async close() {
-        this.retry = false;
-        if (this._device?.gatt?.connected) await this._close();
-    }
-
-    async _close() {
-        this._change(BLEJS.State.Closing);
-        try {
-            if (this._device?.gatt?.connected) this._device.gatt.disconnect();
-            else this._disconnect();
-        } catch (e) {
-            this._error(e);
-        }
-    }
-
-    async sendText(text) {
-        await this.sendBin((new TextEncoder()).encode(text));
-    }
-
-    async sendBin(data) {
-        this._buffer.push(data);
-        this._send();
-    }
-
-    //#region private    
-    _device = null;
-    _rx = null;
-    _tx = null;
-    _state = BLEJS.State.Closed;
-    _buffer = new ShiftBuffer();
-    _decoder = new TextDecoder();
-
-    async _disconnect(e) {
-        this._change(BLEJS.State.Closed);
-        if (this._tx) this._tx.removeEventListener('characteristicvaluechanged', this._data_h);
-
-        this._rx = null;
-        this._tx = null;
-
-        if (this.retry) sleep(this.cfg.reconnect).then(() => 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);
-        if (this.ontext) this.splitter.write(this._decoder.decode(value, { stream: true }));
-    }
-    _data_h = this._data.bind(this);
-
-    async _send() {
-        if (this._busy) return;
-        this._busy = true;
-
-        while (this._buffer.length && this._rx) {
-            let d = this._buffer.shift(this.cfg.max_tx);
-
-            try {
-                if (d.length) await this._rx.writeValueWithoutResponse(d);
-                // await this._rx.writeValueWithResponse(d);
-            } catch (e) {
-                this._error(e);
-            }
-        }
-
-        this._busy = false;
-    }
-
-    _error(e) {
-        this.onerror('[BLE] ' + e);
-    }
-    _change(s) {
-        this._state = s;
-        this.onchange(s);
-        switch (s) {
-            case BLEJS.State.Open: this.onopen(); break;
-            case BLEJS.State.Closed: this.onclose(); break;
-        }
-    }
-}

package/ble2light.js

@@ -1,253 +0,0 @@
-import { sleep, SerialExecutor } from "@alexgyver/utils";
-
-export default class BLEJS {
-    static State = {
-        Closed: 'closed',
-        Opening: 'opening',
-        Open: 'open',
-        Closing: 'closing',
-    };
-
-    onbin(b) { }
-    onopen() { }
-    onclose() { }
-    onchange(s) { }
-    onselect(name) { }
-    onerror(e) { }
-
-    constructor(params = {}) {
-        const def = {
-            serviceUUID: '0000ffe0-0000-1000-8000-00805f9b34fb',
-            rxUUID: '0000ffe1-0000-1000-8000-00805f9b34fb',
-            txUUID: '0000ffe2-0000-1000-8000-00805f9b34fb',
-            auto_open: false,
-            reconnect: 1000,
-        };
-
-        this.cfg = { ...def, ...params };
-    }
-
-    config(params = {}) {
-        this.cfg = { ...this.cfg, ...params };
-    }
-
-    static supported() {
-        return 'bluetooth' in navigator;
-    }
-
-    opened() {
-        return this._state === BLEJS.State.Open;
-    }
-
-    selected() {
-        return !!this._device;
-    }
-
-    getName() {
-        return this._device ? this._device.name : null;
-    }
-
-    async select() {
-        try {
-            await this.close();
-
-            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],
-            });
-
-            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() {
-        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();
-
-            return this.opened();
-        });
-    }
-
-    async _open() {
-        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);
-
-            this._rx = await service.getCharacteristic(this.cfg.rxUUID);
-            this._tx = await service.getCharacteristic(this.cfg.txUUID);
-
-            await this._tx.startNotifications();
-            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._lifecycle.runNothrow(() => this._open());
-                });
-            }
-        }
-    }
-
-    async 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 {
-                await this._disconnect();
-            }
-        } catch (e) {
-            this._error(e);
-            await this._disconnect();
-        }
-    }
-
-    async sendBin(data, fast = true) {
-        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;
-        });
-    }
-
-    _state = BLEJS.State.Closed;
-    _device = null;
-    _rx = null;
-    _tx = null;
-
-    retry = false;
-
-    _sender = new SerialExecutor();
-    _lifecycle = new SerialExecutor();
-
-    async _disconnect(e) {
-        this._sender.reset();
-
-        if (this._tx) {
-            try {
-                this._tx.removeEventListener(
-                    'characteristicvaluechanged',
-                    this._data_h
-                );
-            } catch (e) { }
-        }
-
-        this._rx = null;
-        this._tx = null;
-
-        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) {
-        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;
-        }
-    }
-}