chore: refactoring and separation of suggestUdevInstaller into @trezor/utils

Author: peter-sanderson

packages/connect-web/src/module/index.ts

@@ -1,6 +1,5 @@
 import { config } from '@trezor/connect/src/data/config';
 import { suggestBridgeInstaller } from '@trezor/connect/src/data/transportInfo';
-import { suggestUdevInstaller } from '@trezor/connect/src/data/udevInfo';
 import {
     CoreEventMessage,
     CoreRequestMessage,
@@ -14,7 +13,7 @@ import { CoreInModule } from '@trezor/connect/src/impl/core-in-module';
 import { TrezorConnectDynamic } from '@trezor/connect/src/impl/dynamic';
 import type { ConnectSettingsPublic } from '@trezor/connect/src/types';
 import { getInstallerPackage } from '@trezor/connect-common';
-import { cloneObject } from '@trezor/utils';
+import { cloneObject, suggestUdevInstaller } from '@trezor/utils';
 
 interface ConnectWebDynamicImplementation
     extends ConnectFactoryDependencies<ConnectSettingsPublic> {

packages/connect/src/data/udevInfo.ts

@@ -13,22 +13,22 @@ const info: UdevInfo = {
             name: 'DEB package',
             platform: ['deb32', 'deb64'],
             url: '/udev/trezor-udev_2_all.deb',
+            preferred: true, // DEB package is the most common
         },
     ],
 };
 
-export const suggestUdevInstaller = (platform?: string) => {
-    const info2 = info;
-    // check if preferred field was already added
-    if (!info2.packages.find(p => p.preferred)) {
-        if (platform) {
-            // override UdevInfo packages, add preferred field
-            info2.packages = info2.packages.map(p => ({
-                ...p,
-                preferred: p.platform.indexOf(platform) >= 0,
-            }));
-        }
+export const suggestUdevInstaller = (platform?: string): UdevInfo => {
+    // `platform` is not available on the desktop, in that case we assume the preferred as DEB
+
+    if (platform !== undefined) {
+        return {
+            packages: info.packages.map(it => ({
+                ...it,
+                preferred: it.platform.indexOf(platform) >= 0,
+            })),
+        };
     }
 
-    return info2;
+    return info;
 };

packages/connect/src/events/transport.ts

@@ -1,15 +1,16 @@
 import type { Transport } from '@trezor/transport';
 import { TRANSPORT } from '@trezor/transport/src/constants';
+import { suggestUdevInstaller } from '@trezor/utils';
 
 import { serializeError } from '../constants/errors';
 import { suggestBridgeInstaller } from '../data/transportInfo';
-import { suggestUdevInstaller } from '../data/udevInfo';
 import { ConnectSettings } from '../exports';
 import type { MessageFactoryFn } from '../types/utils';
 
 export { TRANSPORT } from '@trezor/transport/src/constants';
 
 export const TRANSPORT_EVENT = 'TRANSPORT_EVENT';
+
 export interface BridgeInfo {
     version: number[];
     packages: {

packages/suite/src/components/suite/UdevDownload.tsx

@@ -50,14 +50,11 @@ interface Installer {
 export const UdevDownload = () => {
     const udev = useSelector(selectUdevInstaller);
 
-    const hasPreferred = udev !== undefined && udev.packages.some(p => p.preferred);
-
     const installers: Installer[] = udev
         ? udev.packages.map(p => ({
               label: p.name,
               value: DATA_URL + p.url.substring(1),
-              // preferred is not available on the desktop, so we fallback on the DEB package as it is the most common
-              preferred: hasPreferred ? p.preferred : p.name === 'DEB package',
+              preferred: p.preferred,
           }))
         : [];
 

packages/utils/src/index.ts

@@ -56,3 +56,4 @@ export * from './typedEventEmitter';
 export * from './typedObjectKeys';
 export * from './urlToOnion';
 export * from './zip';
+export { suggestUdevInstaller } from './suggestUdevInstaller';