chore(connect): remove bowser dep

trezor · Mar 22, 2023 · c4ede0d · c4ede0d
1 parent a246eae
commit c4ede0d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 318 deletions.
diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -56,7 +56,6 @@
         "@trezor/utxo-lib": "workspace:^1.0.4",
         "bignumber.js": "^9.1.1",
         "blakejs": "^1.2.1",
-        "bowser": "^2.11.0",
         "cross-fetch": "^3.1.5",
         "events": "^3.3.0",
         "parse-uri": "1.0.7",

diff --git a/packages/connect/src/data/connectSettings.ts b/packages/connect/src/data/connectSettings.ts
@@ -23,8 +23,6 @@ const initialSettings: ConnectSettings = {
     webusbSrc: `${DEFAULT_DOMAIN}webusb.html`,
     transports: undefined,
     pendingTransportEvent: true,
-    supportedBrowser:
-        typeof navigator !== 'undefined' ? !/Trident|MSIE|Edge/.test(navigator.userAgent) : true, // TODO: https://github.com/trezor/trezor-suite/issues/5319
     env: 'node',
     lazyLoad: false,
     timestamp: new Date().getTime(),

diff --git a/packages/connect/src/data/transportInfo.ts b/packages/connect/src/data/transportInfo.ts
@@ -29,3 +29,18 @@ export const parseBridgeJSON = (json: any) => {
 };
 
 export const getBridgeInfo = (): BridgeInfo => info;
+
+export const suggestBridgeInstaller = (platform?: string) => {
+    const info = getBridgeInfo();
+    // check if preferred field was already added
+    if (!info.packages.find(p => p.preferred)) {
+        if (platform) {
+            // override BridgeInfo packages, add preferred field
+            info.packages = info.packages.map(p => ({
+                ...p,
+                preferred: p.platform.indexOf(platform) >= 0,
+            }));
+        }
+    }
+    return info;
+};
diff --git a/packages/connect/src/data/udevInfo.ts b/packages/connect/src/data/udevInfo.ts
@@ -22,3 +22,18 @@ const info: UdevInfo = {
 };
 
 export const getUdevInfo = () => info;
+
+export const suggestUdevInstaller = (platform?: string) => {
+    const info = getUdevInfo();
+    // check if preferred field was already added
+    if (!info.packages.find(p => p.preferred)) {
+        if (platform) {
+            // override UdevInfo packages, add preferred field
+            info.packages = info.packages.map(p => ({
+                ...p,
+                preferred: p.platform.indexOf(platform) >= 0,
+            }));
+        }
+    }
+    return info;
+};
diff --git a/packages/connect/src/types/settings.ts b/packages/connect/src/types/settings.ts
@@ -30,7 +30,6 @@ export interface ConnectSettings {
     version: string;
     priority: number;
     trustedHost: boolean;
-    supportedBrowser?: boolean;
     extension?: string;
     env: 'node' | 'web' | 'webextension' | 'electron' | 'react-native';
     timestamp: number;

diff --git a/packages/connect/src/utils/__tests__/browserUtils.test.ts b/packages/connect/src/utils/__tests__/browserUtils.test.ts
diff --git a/packages/connect/src/utils/browserUtils.ts b/packages/connect/src/utils/browserUtils.ts
diff --git a/yarn.lock b/yarn.lock
@@ -7742,7 +7742,6 @@ __metadata:
     "@types/randombytes": ^2.0.0
     bignumber.js: ^9.1.1
     blakejs: ^1.2.1
-    bowser: ^2.11.0
     cross-fetch: ^3.1.5
     events: ^3.3.0
     jest: ^26.6.3
@@ -12028,13 +12027,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bowser@npm:^2.11.0":
-  version: 2.11.0
-  resolution: "bowser@npm:2.11.0"
-  checksum: 29c3f01f22e703fa6644fc3b684307442df4240b6e10f6cfe1b61c6ca5721073189ca97cdeedb376081148c8518e33b1d818a57f781d70b0b70e1f31fb48814f
-  languageName: node
-  linkType: hard
-
 "boxen@npm:^5.1.2":
   version: 5.1.2
   resolution: "boxen@npm:5.1.2"