From c2c85f43fa6a197f2d3fae8b794ef8f9201e5757 Mon Sep 17 00:00:00 2001
From: Drew Bednar <drew@runcible.io>
Date: Fri, 9 Aug 2024 01:38:47 +0000
Subject: [PATCH] Fix disconnect button (#3)

This PR fixes #2

Co-authored-by: Drew Bednar <drew@androiddrew.com>
Reviewed-on: https://git.runcible.io/androiddrew/webserial/pulls/3
---
 .dockerignore |  3 +++
 Dockerfile    |  2 ++
 README.md     |  2 +-
 script.js     | 68 +++++++++++++++++++++++++++++++++++++--------------
 4 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ffa7578
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+Dockerfile
+Makefile
+README.md
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..5343fbf
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+COPY . /usr/share/nginx/html
diff --git a/README.md b/README.md
index df79f9f..b8deb42 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Web Serial Console
 
-Serial console access in the browser! This project uses an [experimental Web Serial API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API) available, as of 08/06/2024, on Chrome 89+, Edge 89+, or Opera 75+.
+Serial console access in the browser! This project uses an [experimental Web Serial API](https://wicg.github.io/serial/) available, as of 08/06/2024, on Chrome 89+, Edge 89+, or Opera 75+.
 
 This is a work in progress and a learning experiment. Feel free to file an issue if you encounter one.
 
diff --git a/script.js b/script.js
index 0ec1a23..16c945e 100644
--- a/script.js
+++ b/script.js
@@ -9,6 +9,8 @@ const refreshPorts = document.getElementById('refresh-ports');
 const scrollableElement = document.getElementById('scrollable-element');
 const select = document.getElementById('serial-select');
 
+let isPortConnected = false;
+let controller;
 let autoscroll = true;
 let serialPorts = [];
 let reader;
@@ -36,26 +38,33 @@ clearButton.addEventListener('click', () => {
 connectButton.addEventListener('click', async () => {
     const selectedPort = serialPorts[select.selectedIndex]
     const baudRate = Math.round(baud.value)
-    if (selectedPort) {
+    if (!isPortConnected) {
         await connectToSerialPort(selectedPort, baudRate);
+    } else {
+        isPortConnected = false;
     }
 });
 
 refreshPorts.addEventListener('click', async () => {
-    while (select.children.length > 1) {
-        select.removeChild(select.lastChild);
-    }
-
     ports = await navigator.serial.getPorts();
-
-    console.log(ports)
-    ports.forEach(port => {
-        const option = buildPortOption(port)
-        select.appendChild(option);
-    });
+    serialPorts = ports
+    updateSerialSelect(ports)
 });
 
 // Functions
+function onPortConnect() {
+    connectButton.classList.remove('bg-emerald-500', 'hover:bg-emerald-600', 'focus:ring-emerald-500');
+    connectButton.classList.add('bg-red-500', 'hover:bg-red-600', 'focus:ring-red-500');
+    connectButton.textContent = 'Disconnect';
+}
+
+function onPortDisconnect() {
+    connectButton.classList.remove('bg-red-500', 'hover:bg-red-600', 'focus:ring-red-500');
+    connectButton.classList.add('bg-emerald-500', 'hover:bg-emerald-600', 'focus:ring-emerald-500');
+    connectButton.textContent = 'Connect';
+}
+
+
 function buildPortOption(port) {
     const option = document.createElement('option');
     option.value = port;
@@ -94,14 +103,20 @@ function scrollToBottom() {
 // Async Functions
 async function connectToSerialPort(port, baud) {
     await port.open({ baudRate: baud });
+    onPortConnect()
+
     let buffer = ''
+    // The TextDecoderStream interface of the Encoding API converts a stream of text in a binary encoding,
+    // such as UTF-8 etc., to a stream of strings
     const textDecoder = new TextDecoderStream();
     const readableStreamClosed = port.readable.pipeTo(textDecoder.writable);
-    const reader = textDecoder.readable.getReader();
-
+    reader = textDecoder.readable.getReader();
+    controller = new AbortController();
+    const signal = controller.signal;
     try {
-        while (true) {
-            const { value, done } = await reader.read();
+        isPortConnected = true;
+        while (isPortConnected) {
+            const { value, done } = await reader.read({ signal });
             if (done) {
                 break;
             }
@@ -119,9 +134,26 @@ async function connectToSerialPort(port, baud) {
     } catch (error) {
         console.error('Error reading data from serial port:', error);
     } finally {
+        controller.abort();
+
         reader.releaseLock();
-        await readableStreamClosed.catch(() => { });
-        await port.close();
+        try {
+            await textDecoder.readable.cancel();
+        } catch (error) {
+            console.error("Error encountered in readableStreamClosed:", error);
+        }
+
+        try {
+            await readableStreamClosed;
+        } catch (error) {
+        }
+
+        try {
+            await port.close();
+        } catch (error) {
+            console.error("Error encountered closing port:", error);
+        }
+        onPortDisconnect()
     }
 }
 
@@ -133,9 +165,9 @@ async function updateSerialSelect(ports) {
         select.appendChild(option)
         return;
     }
+    select.innerHTML = ''
     ports.forEach(port => {
         const option = buildPortOption(port)
         select.appendChild(option);
     });
-    select.removeChild(select.firstElementChild);
 }
\ No newline at end of file