@alexgyver/serial 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexgyver/serial",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Web Serial API wrapper",
   "main": "./serial.js",
   "module": "./serial.js",

package/serial.js

@@ -8,14 +8,17 @@ export default class SerialJS {
         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/,
@@ -23,21 +26,20 @@ export default class SerialJS {
             auto_open: false,
             reconnect: 1000,
         };
-
         this.cfg = { ...def, ...params };
 
+        this._setLastPort().then(() => this.onselect(this.getName()));
         this.splitter = new StreamSplitter(this.cfg.eol);
         this.splitter.ontext = (t) => {
             try {
-                if (this.ontext) this.ontext(t);
+                this.ontext?.(t);
             } catch (e) {
                 this._error(e);
             }
         };
-
-        this._setLastPort().then(() => this.onselect(this.getName()));
     }
 
+    //#region methods
     config(params = {}) {
         this.cfg = { ...this.cfg, ...params };
         this.splitter.eol = this.cfg.eol;
@@ -48,7 +50,7 @@ export default class SerialJS {
     }
 
     opened() {
-        return this._state === SerialJS.State.Open;
+        return this._state == SerialJS.State.Open;
     }
 
     selected() {
@@ -56,7 +58,7 @@ export default class SerialJS {
     }
 
     getName() {
-        if (!this._port) return null;
+        if (!this._port) return 'None';
 
         switch (this._port.getInfo().usbProductId) {
             case 0x55d3: return 'CH343';
@@ -66,62 +68,56 @@ export default class SerialJS {
             case 0x0402: case 0x0403: case 0x0404: case 0x0405: case 0x6001: case 0x0602: case 0x6010: return 'FT232';
             case 0x9500: case 0x0102: case 0x0501: case 0x80a9: case 0xea60: case 0xea61: case 0xea63: return 'CP210x';
         }
-
         return 'Unknown';
     }
 
     async select() {
         try {
             await this.close();
-
             this._port = null;
-
-            const ports = await navigator.serial.getPorts();
-            for (const p of ports) await p.forget();
-
+            let ports = await navigator.serial.getPorts();
+            for (let p of ports) await p.forget();
             await sleep(50);
             await navigator.serial.requestPort();
             await this._setLastPort();
         } catch (e) {
             this._error(e);
         }
-
         this.onselect(this.getName());
-
         if (this.cfg.auto_open) this.open();
-
         return this.selected();
     }
 
     async open() {
-        return this._lifecycle.runNothrow(async () => {
-            const ports = await navigator.serial.getPorts();
-            if (!ports.length) return false;
-
-            if (this.cfg.reconnect) this.retry = true;
+        const ports = await navigator.serial.getPorts();
+        if (!ports.length) return false;
 
-            await this._open();
+        if (this.cfg.reconnect) this.retry = true;
 
-            return this.opened();
-        });
+        this._open();
+        return true;
     }
-
     async _open() {
-        if (this.opened() || this._state === SerialJS.State.Opening) return;
+        if (this._state !== SerialJS.State.Closed) return;
 
         this._change(SerialJS.State.Opening);
 
         try {
-            await this._close();
             await this._setLastPort();
 
             if (!this._port) {
-                this._change(SerialJS.State.Closed);
-                return;
+                throw new Error('No port');
             }
 
+            if (this._state === SerialJS.State.Closing) return;
+
             await this._port.open({ baudRate: this.cfg.baud });
 
+            if (this._state === SerialJS.State.Closing) {
+                await this._port.close();
+                return;
+            }
+
             this.writer = this._port.writable.getWriter();
             this.reader = this._port.readable.getReader();
 
@@ -135,7 +131,7 @@ export default class SerialJS {
 
                 if (value) {
                     try {
-                        this.onbin(value);
+                        this.onbin?.(value);
                     } catch (e) {
                         this._error(e);
                     }
@@ -153,10 +149,6 @@ export default class SerialJS {
 
         this._sender.reset();
 
-        if (this._state !== SerialJS.State.Closing) {
-            this._change(SerialJS.State.Closing);
-        }
-
         try {
             if (this.reader) this.reader.releaseLock();
         } catch (e) { }
@@ -175,25 +167,27 @@ export default class SerialJS {
         this._change(SerialJS.State.Closed);
 
         if (this.retry) {
-            setTimeout(() => this._lifecycle.runNothrow(() => this._open()), this.cfg.reconnect);
+            setTimeout(() => {
+                if (this.retry) this._open();
+            }, this.cfg.reconnect);
         }
     }
 
     async close() {
-        return this._lifecycle.runNothrow(async () => {
-            this.retry = false;
-            this._sender.reset();
-            await this._close();
-            return true;
-        });
+        this.retry = false;
+        this._sender.reset();
+        await this._close();
+        return true;
     }
-
     async _close() {
         switch (this._state) {
             case SerialJS.State.Closed:
                 return;
 
             case SerialJS.State.Opening:
+                this._change(SerialJS.State.Closing);
+                break;
+
             case SerialJS.State.Open:
                 this._change(SerialJS.State.Closing);
 
@@ -204,13 +198,9 @@ export default class SerialJS {
                 }
 
                 break;
-
-            case SerialJS.State.Closing:
-                break;
         }
 
         let i = 0;
-
         while (this._state === SerialJS.State.Closing) {
             await sleep(10);
 
@@ -231,32 +221,25 @@ export default class SerialJS {
 
         return this._sender.runNothrow(async () => {
             if (!this.opened() || !this.writer) return false;
-
             await this.writer.write(data);
             return true;
         });
     }
 
+    //#region private
     _port = null;
-    _state = SerialJS.State.Closed;
-
-    reader = null;
-    writer = null;
-    retry = false;
-
     _decoder = new TextDecoder();
     _sender = new SerialExecutor();
-    _lifecycle = new SerialExecutor();
+    _state = SerialJS.State.Closed;
 
     async _setLastPort() {
-        const ports = await navigator.serial.getPorts();
+        let ports = await navigator.serial.getPorts();
         this._port = ports.length ? ports[0] : null;
     }
 
     _error(e) {
         this.onerror('[SerialJS] ' + e);
     }
-
     _change(s) {
         if (this._state === s) return;
 
@@ -264,13 +247,8 @@ export default class SerialJS {
         this.onchange(s);
 
         switch (s) {
-            case SerialJS.State.Open:
-                this.onopen();
-                break;
-
-            case SerialJS.State.Closed:
-                this.onclose();
-                break;
+            case SerialJS.State.Open: this.onopen(); break;
+            case SerialJS.State.Closed: this.onclose(); break;
         }
     }
 }

package/serial.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._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 r{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={eol:/\r?\n/,baud:115200,auto_open:!1,reconnect:1e3,...t},this.splitter=new e(this.cfg.eol),this.splitter.ontext=t=>{try{this.ontext&&this.ontext(t)}catch(t){this._error(t)}},this._setLastPort().then(()=>this.onselect(this.getName()))}config(t={}){this.cfg={...this.cfg,...t},this.splitter.eol=this.cfg.eol}static supported(){return"serial"in navigator}opened(){return this._state===r.State.Open}selected(){return!!this._port}getName(){if(!this._port)return null;switch(this._port.getInfo().usbProductId){case 21971:return"CH343";case 30084:return"CH340S";case 29986:case 29987:return"CH340";case 21778:case 21795:case 21892:return"CH341";case 1026:case 1027:case 1028:case 1029:case 24577:case 1538:case 24592:return"FT232";case 38144:case 258:case 1281:case 32937:case 6e4:case 60001:case 60003:return"CP210x"}return"Unknown"}async select(){try{await this.close(),this._port=null;const e=await navigator.serial.getPorts();for(const t of e)await t.forget();await t(50),await navigator.serial.requestPort(),await this._setLastPort()}catch(t){this._error(t)}return this.onselect(this.getName()),this.cfg.auto_open&&this.open(),this.selected()}async open(){return this._lifecycle.runNothrow(async()=>!!(await navigator.serial.getPorts()).length&&(this.cfg.reconnect&&(this.retry=!0),await this._open(),this.opened()))}async _open(){if(!this.opened()&&this._state!==r.State.Opening){this._change(r.State.Opening);try{if(await this._close(),await this._setLastPort(),!this._port)return void this._change(r.State.Closed);for(await this._port.open({baudRate:this.cfg.baud}),this.writer=this._port.writable.getWriter(),this.reader=this._port.readable.getReader(),this._sender.reset(),this._change(r.State.Open);this._state===r.State.Open;){const{value:t,done:e}=await this.reader.read();if(e)break;if(t){try{this.onbin(t)}catch(t){this._error(t)}this.ontext&&this.splitter.write(this._decoder.decode(t,{stream:!0}))}}}catch(t){this._error(t)}this._sender.reset(),this._state!==r.State.Closing&&this._change(r.State.Closing);try{this.reader&&this.reader.releaseLock()}catch(t){}try{this.writer&&this.writer.releaseLock()}catch(t){}this.reader=null,this.writer=null;try{this._port&&await this._port.close()}catch(t){}this._change(r.State.Closed),this.retry&&setTimeout(()=>this._lifecycle.runNothrow(()=>this._open()),this.cfg.reconnect)}}async close(){return this._lifecycle.runNothrow(async()=>(this.retry=!1,this._sender.reset(),await this._close(),!0))}async _close(){switch(this._state){case r.State.Closed:return;case r.State.Opening:case r.State.Open:if(this._change(r.State.Closing),this.reader)try{await this.reader.cancel()}catch(t){}case r.State.Closing:}let e=0;for(;this._state===r.State.Closing;)if(await t(10),++e>200){this._error("Close timeout"),this._change(r.State.Closed);break}}async sendText(t){return this.sendBin((new TextEncoder).encode(t))}async sendBin(t){return!(!this.opened()||!this.writer)&&this._sender.runNothrow(async()=>!(!this.opened()||!this.writer||(await this.writer.write(t),0)))}_port=null;_state=r.State.Closed;reader=null;writer=null;retry=!1;_decoder=new TextDecoder;_sender=new s;_lifecycle=new s;async _setLastPort(){const t=await navigator.serial.getPorts();this._port=t.length?t[0]:null}_error(t){this.onerror("[SerialJS] "+t)}_change(t){if(this._state!==t)switch(this._state=t,this.onchange(t),t){case r.State.Open:this.onopen();break;case r.State.Closed:this.onclose()}}}export{r as default};
+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._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 r{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/,baud:115200,auto_open:!1,reconnect:1e3,...t},this._setLastPort().then(()=>this.onselect(this.getName())),this.splitter=new e(this.cfg.eol),this.splitter.ontext=t=>{try{this.ontext?.(t)}catch(t){this._error(t)}}}config(t={}){this.cfg={...this.cfg,...t},this.splitter.eol=this.cfg.eol}static supported(){return"serial"in navigator}opened(){return this._state==r.State.Open}selected(){return!!this._port}getName(){if(!this._port)return"None";switch(this._port.getInfo().usbProductId){case 21971:return"CH343";case 30084:return"CH340S";case 29986:case 29987:return"CH340";case 21778:case 21795:case 21892:return"CH341";case 1026:case 1027:case 1028:case 1029:case 24577:case 1538:case 24592:return"FT232";case 38144:case 258:case 1281:case 32937:case 6e4:case 60001:case 60003:return"CP210x"}return"Unknown"}async select(){try{await this.close(),this._port=null;let e=await navigator.serial.getPorts();for(let t of e)await t.forget();await t(50),await navigator.serial.requestPort(),await this._setLastPort()}catch(t){this._error(t)}return this.onselect(this.getName()),this.cfg.auto_open&&this.open(),this.selected()}async open(){return!!(await navigator.serial.getPorts()).length&&(this.cfg.reconnect&&(this.retry=!0),this._open(),!0)}async _open(){if(this._state===r.State.Closed){this._change(r.State.Opening);try{if(await this._setLastPort(),!this._port)throw new Error("No port");if(this._state===r.State.Closing)return;if(await this._port.open({baudRate:this.cfg.baud}),this._state===r.State.Closing)return void await this._port.close();for(this.writer=this._port.writable.getWriter(),this.reader=this._port.readable.getReader(),this._sender.reset(),this._change(r.State.Open);this._state===r.State.Open;){const{value:t,done:e}=await this.reader.read();if(e)break;if(t){try{this.onbin?.(t)}catch(t){this._error(t)}this.ontext&&this.splitter.write(this._decoder.decode(t,{stream:!0}))}}}catch(t){this._error(t)}this._sender.reset();try{this.reader&&this.reader.releaseLock()}catch(t){}try{this.writer&&this.writer.releaseLock()}catch(t){}this.reader=null,this.writer=null;try{this._port&&await this._port.close()}catch(t){}this._change(r.State.Closed),this.retry&&setTimeout(()=>{this.retry&&this._open()},this.cfg.reconnect)}}async close(){return this.retry=!1,this._sender.reset(),await this._close(),!0}async _close(){switch(this._state){case r.State.Closed:return;case r.State.Opening:this._change(r.State.Closing);break;case r.State.Open:if(this._change(r.State.Closing),this.reader)try{await this.reader.cancel()}catch(t){}}let e=0;for(;this._state===r.State.Closing;)if(await t(10),++e>200){this._error("Close timeout"),this._change(r.State.Closed);break}}async sendText(t){return this.sendBin((new TextEncoder).encode(t))}async sendBin(t){return!(!this.opened()||!this.writer)&&this._sender.runNothrow(async()=>!(!this.opened()||!this.writer||(await this.writer.write(t),0)))}_port=null;_decoder=new TextDecoder;_sender=new s;_state=r.State.Closed;async _setLastPort(){let t=await navigator.serial.getPorts();this._port=t.length?t[0]:null}_error(t){this.onerror("[SerialJS] "+t)}_change(t){if(this._state!==t)switch(this._state=t,this.onchange(t),t){case r.State.Open:this.onopen();break;case r.State.Closed:this.onclose()}}}export{r as default};