improve WebHID receive packet handling

tidepool-org · Oct 20, 2022 · 5d0a59e · 5d0a59e
1 parent 7ad3074
commit 5d0a59e
Showing 1 changed file with 21 additions and 11 deletions.
diff --git a/lib/hidDevice.js b/lib/hidDevice.js
@@ -69,10 +69,14 @@ module.exports = (config) => {
     if (packets.length > 0) {
       return cb(null, packets.shift());
     }
-    
+
     const response = new Promise((resolve) => {
       webHid.addEventListener('data', () => {
-        resolve(packets.shift());
+        if (packets.length === 0) {
+          return resolve([]);
+        } else {
+          return resolve(packets.shift());
+        }
       }, { once: true });
     });
 
@@ -81,20 +85,26 @@ module.exports = (config) => {
   }
 
   async function receiveTimeout(timeout) {
-    const abortTimer = setTimeout(() => {
-      return([]);
-    }, timeout);
-
     if (packets.length > 0) {
-      clearTimeout(abortTimer);
-      return(Array.from(packets.shift()));
+      return Array.from(packets.shift());
     }
 
     const response = new Promise((resolve) => {
-      webHid.addEventListener('data', () => {
+      const getData = () => {
         clearTimeout(abortTimer);
-        resolve(Array.from(packets.shift()));
-      }, { once: true });
+        if (packets.length === 0) {
+          return resolve([]);
+        } else {
+          return resolve(Array.from(packets.shift()));
+        }
+      };
+
+      const abortTimer = setTimeout(() => {
+        webHid.removeEventListener('data', getData);
+        return resolve([]);
+      }, timeout);
+
+      webHid.addEventListener('data', getData, { once: true });
     });
 
     // no packet yet, let's wait