chore: improve availability checker

estkme-group · Oct 24, 2024 · 778fd35 · 778fd35
1 parent 56b7ad7
commit 778fd35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/backends/WebBLEBackend.ts b/src/backends/WebBLEBackend.ts
@@ -27,8 +27,9 @@ export class WebBLEBackend implements EventListenerObject, Backend {
   }
 
   static async getAvailability(bluetooth = navigator.bluetooth) {
-    if (!bluetooth) return false
-    if (!('getAvailability' in bluetooth)) return false
+    if (bluetooth === undefined || bluetooth === null) return false
+    if (typeof bluetooth.requestDevice !== 'function') return false
+    if (typeof bluetooth.getAvailability !== 'function') return true
     return bluetooth.getAvailability()
   }
 

diff --git a/src/backends/WebUSBBackend.ts b/src/backends/WebUSBBackend.ts
@@ -18,7 +18,9 @@ export class WebUSBBackend implements Backend {
   }
 
   static async getAvailability(usb = navigator.usb) {
-    return usb !== undefined
+    if (usb === undefined || usb === null) return false
+    if (typeof usb.requestDevice !== 'function') return false
+    return true
   }
 
   static async open(device: USBDevice, options?: WebUSBBackend.Options): Promise<WebUSBBackend> {