Code cleaning

Author: JonAlexandra

src/App.svelte

@@ -29,7 +29,7 @@
   import BottomBarMenuView from './views/BottomBarMenuView.svelte';
   import CookieBanner from './components/cookie-bannner/CookieBanner.svelte';
   import { fade } from 'svelte/transition';
-  import { compatibility, state } from './script/stores/uiStore';
+  import { state } from './script/stores/uiStore';
   import LoadingSpinner from './components/LoadingSpinner.svelte';
   import { checkCompatibility } from './script/compatibility/CompatibilityChecker';
   import IncompatiblePlatformView from './views/IncompatiblePlatformView.svelte';

src/components/connection-prompt/usb/FindUsbDialog.svelte

@@ -9,7 +9,8 @@
   function onFindUsbClick() {
     Microbits.linkMicrobit()
       .then(() => onFoundUsb())
-      .catch(() => {
+      .catch((e: Error) => {
+        console.log(e)
         onUsbLinkError();
       });
   }

src/script/compatibility/CompatibilityChecker.ts

@@ -13,12 +13,11 @@ export type CompatibilityStatus = {
   usb: boolean;
   platformAllowed: boolean;
   webGL: boolean,
-  webUSB: boolean
 };
 
 export function checkCompatibility(): CompatibilityStatus {
   if (localStorage.getItem('isTesting')) {
-    return { bluetooth: true, usb: true, platformAllowed: true, webGL: true, webUSB: true };
+    return { bluetooth: true, usb: true, platformAllowed: true, webGL: true };
   }
   const browser = Bowser.getParser(window.navigator.userAgent);
   const browserName = browser.getBrowser().name ?? 'unknown';
@@ -28,17 +27,9 @@ export function checkCompatibility(): CompatibilityStatus {
   // TODO: Handle webgl1 vs webgl2 in relation to threejs
   const webGL = canvas.getContext("webgl") instanceof WebGLRenderingContext
 
-  const webUSB = false // Check for this is async, so another function is used
-  // try {
-  //   await navigator.usb.getDevices()
-  //   webUSB = true
-  // } catch {
-  //   webUSB = false
-  // }
-
   const browserVersion = browser.getBrowserVersion();
   if (!browserVersion) {
-    return { bluetooth: false, usb: false, platformAllowed: true, webGL: webGL, webUSB };
+    return { bluetooth: false, usb: false, platformAllowed: true, webGL: webGL };
   }
   const majorVersion = browser.getBrowserVersion().split('.')[0];
   const minorVersion = browser.getBrowserVersion().split('.')[1];
@@ -60,18 +51,6 @@ export function checkCompatibility(): CompatibilityStatus {
     usb: isUsbSupported,
     platformAllowed: isPlatformAllowed,
     webGL: webGL,
-    webUSB: webUSB
   };
 }
 
-export async function checkUSBCompatibility(): Promise<boolean> {
-  try {
-    await navigator.usb.getDevices()
-    return true
-  } catch {
-    return false
-  }
-}
-// }
-
-// export default CompatibilityChecker;

src/script/stores/uiStore.ts

@@ -1,9 +1,5 @@
 import { get, writable } from 'svelte/store';
-import { 
-  type CompatibilityStatus, 
-  checkCompatibility, 
-  checkUSBCompatibility 
-} from '../compatibility/CompatibilityChecker';
+import { type CompatibilityStatus, checkCompatibility} from '../compatibility/CompatibilityChecker';
 import { t } from '../../i18n';
 import { gestures } from './mlStore';
 import { DeviceRequestStates } from './connectDialogStore';
@@ -17,13 +13,6 @@ export const compatibility = writable<CompatibilityStatus>(
   checkCompatibility(),
 );
 
-void checkUSBCompatibility().then(webUSB => 
-  compatibility.update(old => {
-    old.webUSB = webUSB
-    return old
-  })
-)
-
 export const isBluetoothWarningDialogOpen = writable<boolean>(
   get(compatibility) ? !get(compatibility).bluetooth : false,
 );