Update TypeScript examples

Author: thegecko

examples/daplink-flash/common.js

@@ -135,7 +135,7 @@ const selectDevice = async (devices) => {
         if (input === '\u0003') {
             process.exit();
         } else if (input !== null) {
-            let index = parseInt(input);
+            const index = parseInt(input);
             if (index <= devices.length) {
                 resolve(devices[index - 1]);
             }

examples/daplink-serial/common.js

@@ -60,7 +60,7 @@ const selectDevice = async (devices) => {
         if (input === '\u0003') {
             process.exit();
         } else if (input !== null) {
-            let index = parseInt(input);
+            const index = parseInt(input);
             if (index <= devices.length) {
                 resolve(devices[index - 1]);
             }

examples/execute/common.js

@@ -61,7 +61,7 @@ const selectDevice = async (devices) => {
         if (input === '\u0003') {
             process.exit();
         } else if (input !== null) {
-            let index = parseInt(input);
+            const index = parseInt(input);
             if (index <= devices.length) {
                 resolve(devices[index - 1]);
             }

examples/read-registers/common.js

@@ -60,7 +60,7 @@ const selectDevice = async (devices) => {
         if (input === '\u0003') {
             process.exit();
         } else if (input !== null) {
-            let index = parseInt(input);
+            const index = parseInt(input);
             if (index <= devices.length) {
                 resolve(devices[index - 1]);
             }

examples/typescript/node.ts

@@ -20,38 +20,71 @@
 * SOFTWARE.
 */
 
-import { Registers } from "./registers";
-import { USB, USBDevice } from "webusb";
-import { stdin } from "process";
-
-const devicesFound = (devices: USBDevice[], selectFn?: (device: USBDevice) => void) => {
-    stdin.setRawMode!(true);
-    stdin.setEncoding("utf8");
-    stdin.on("readable", () => {
-        const input = process.stdin.read().toString();
-        if (input === "\u0003") {
+import { stdin } from 'process';
+import { USB } from 'webusb';
+import { Registers } from './registers';
+
+// Handle single character input from the user
+const readHandler = <T>(inputHandler: (input: string, onResolve: (result: T) => void) => void, stream: NodeJS.ReadStream = stdin): Promise<T> => {
+    return new Promise(resolve => {
+        stream.setRawMode!(true);
+        stream.setEncoding('utf8');
+
+        const onResolve = (result: T) => {
+            stream.removeListener('readable', read);
+            stream.setRawMode!(false);
+            resolve(result);
+        };
+
+        const read = () => {
+            let input: string | Buffer;
+            while (input = stream.read()) {
+                if (input) {
+                    inputHandler(input.toString(), onResolve);
+                }
+            }
+        };
+
+        stream.addListener('readable', read);
+    });
+};
+
+// Select a device from the list
+const devicesFound = async (devices: USBDevice[]): Promise<USBDevice | undefined> => {
+    if (devices.length === 0) {
+        throw new Error('No devices found');
+    }
+
+    console.log('Select a device to read registers:');
+    devices.forEach((device, index) => {
+        console.log(`${index + 1}: ${device.productName || device.serialNumber}`);
+    });
+
+    const device = await readHandler<USBDevice>((input, resolve) => {
+        if (input === '\u0003') {
             process.exit();
         } else {
             const index = parseInt(input);
             if (index && index <= devices.length) {
-                stdin.setRawMode!(false);
-                selectFn!(devices[index - 1]);
+                resolve(devices[index - 1]);
             }
         }
     });
 
-    console.log("select a device to see it's active configuration:");
-    devices.forEach((device, index) => {
-        console.log(`${index + 1}: ${device.productName || device.serialNumber}`);
-    });
+    return device;
 };
 
 const usb = new USB({ devicesFound });
 const registers = new Registers(usb);
 
 (async () => {
-    const values = await registers.read(16);
-    values.forEach((register, index) => {
-        console.log(`R${index}: ${register}`);
-    });
+    try {
+        const values = await registers.read(16);
+        values.forEach((register, index) => {
+            console.log(`R${index}: ${register}`);
+        });
+    } catch(error) {
+        console.error(error.message || error);
+    }
+    process.exit();
 })();

examples/typescript/package.json

@@ -12,6 +12,6 @@
     "dapjs": "next",
     "tsify": "^4.0.1",
     "typescript": "^3.4.5",
-    "webusb": "^1.2.2"
+    "webusb": "^2.0.2"
   }
 }

examples/typescript/registers.ts

@@ -20,7 +20,7 @@
 * SOFTWARE.
 */
 
-import { WebUSB, CortexM } from "dapjs";
+import { WebUSB, CortexM } from 'dapjs';
 
 export interface USB {
     requestDevice(options?: USBDeviceRequestOptions): Promise<USBDevice>;
@@ -48,7 +48,7 @@ export class Registers {
         await processor.resume();
         await processor.disconnect();
 
-        const result = values.map(register => ("00000000" + register.toString(16)).slice(-8));
+        const result = values.map(register => ('00000000' + register.toString(16)).slice(-8));
         return result;
     }
 }

examples/typescript/web.html

@@ -24,23 +24,22 @@
     <button id="read">Read Registers</button>
     <script src="bundle.js"></script>
     <script>
-        var count = 16
+        const count = 16
 
-        document.getElementById("read").onclick = function() {
-            var registers = new app.Registers();
-            registers.read(count)
-            .then(values => {
-                values.forEach(function(value, index) {
-                    var registerEl = document.getElementById("r" + index);
-                    registerEl.innerHTML = "Register " + index + ": " + value;
-                });
+        document.getElementById("read").onclick = async () => {
+            const registers = new app.Registers();
+            const values = await registers.read(count);
+
+            values.forEach((value, index) => {
+                const registerEl = document.getElementById(`r${index}`);
+                registerEl.innerHTML = `Register ${index}: ${value}`;
             });
         };
 
-        for (var index = 0; index < count; index++) {
-            var registerEl = document.createElement("div");
-            registerEl.id = "r" + index;
-            registerEl.innerHTML = "Register " + index + ": None";
+        for (let index = 0; index < count; index++) {
+            const registerEl = document.createElement("div");
+            registerEl.id = `r${index}`;
+            registerEl.innerHTML = `Register ${index}: None`;
             document.body.appendChild(registerEl);
         }
     </script>

package-lock.json

@@ -62,6 +62,6 @@
     "typedoc": "^0.17.4",
     "typescript": "^3.8.3",
     "usb": "^1.6.3",
-    "webusb": "^2.0.1"
+    "webusb": "^2.0.2"
   }
 }