update ui deprecated part and remove usb-detection

app-shell/src/system-info/index.ts

@@ -10,9 +10,10 @@ import {
   getActiveInterfaces,
 } from './network-interfaces'
 
+import type { WebUSBDevice } from 'usb'
 import type { UsbDevice } from '@opentrons/app/src/redux/system-info/types'
 import type { Action, Dispatch } from '../types'
-import type { UsbDeviceMonitor, Device } from './usb-devices'
+import type { UsbDeviceMonitor } from './usb-devices'
 import type {
   NetworkInterface,
   NetworkInterfaceMonitor,
@@ -21,13 +22,19 @@ import type {
 export { createNetworkInterfaceMonitor }
 export type { NetworkInterface, NetworkInterfaceMonitor }
 
+type Device = Partial<WebUSBDevice>
+
 const RE_REALTEK = /realtek/i
 const IFACE_POLL_INTERVAL_MS = 30000
 
 const log = createLogger('system-info')
 
-const addDriverVersion = (device: Device): Promise<UsbDevice> => {
-  if (isWindows() && RE_REALTEK.test(device.manufacturer)) {
+const addDriverVersion = (device: WebUSBDevice): Promise<WebUSBDevice> => {
+  if (
+    isWindows() &&
+    device.manufacturerName != null &&
+    RE_REALTEK.test(device.manufacturerName)
+  ) {
     return getWindowsDriverVersion(device).then(windowsDriverVersion => ({
       ...device,
       windowsDriverVersion,

app-shell/src/system-info/usb-devices.ts

@@ -1,10 +1,10 @@
 import assert from 'assert'
 import execa from 'execa'
-import usbDetection from 'usb-detection'
+import { usb } from 'usb'
 import { isWindows } from '../os'
 import { createLogger } from '../log'
 
-import type { Device } from 'usb-detection'
+import type { Device } from 'usb'
 
 export type { Device }
 
@@ -14,7 +14,7 @@ export type UsbDeviceMonitorOptions = Partial<{
 }>
 
 export interface UsbDeviceMonitor {
-  getAllDevices: () => Promise<Device[]>
+  getAllDevices: () => Device[]
   stop: () => void
 }
 
@@ -24,27 +24,25 @@ export function createUsbDeviceMonitor(
   options: UsbDeviceMonitorOptions = {}
 ): UsbDeviceMonitor {
   const { onDeviceAdd, onDeviceRemove } = options
-  usbDetection.startMonitoring()
 
   if (typeof onDeviceAdd === 'function') {
-    usbDetection.on('add', onDeviceAdd)
+    usb.on('attach', onDeviceAdd)
   }
 
   if (typeof onDeviceRemove === 'function') {
-    usbDetection.on('remove', onDeviceRemove)
+    usb.off('detach', onDeviceRemove)
   }
 
   return {
-    getAllDevices: () => usbDetection.find(),
+    getAllDevices: () => usb.getDeviceList(),
     stop: () => {
       if (typeof onDeviceAdd === 'function') {
-        usbDetection.off('add', onDeviceAdd)
+        usb.off('attach', onDeviceAdd)
       }
       if (typeof onDeviceRemove === 'function') {
-        usbDetection.off('remove', onDeviceRemove)
+        usb.off('detach', onDeviceRemove)
       }
 
-      usbDetection.stopMonitoring()
       log.debug('usb detection monitoring stopped')
     },
   }
@@ -54,7 +52,7 @@ const decToHex = (number: number): string =>
   number.toString(16).toUpperCase().padStart(4, '0')
 
 export function getWindowsDriverVersion(
-  device: Device
+  device: USBDevice
 ): Promise<string | null> {
   const { vendorId: vidDecimal, productId: pidDecimal, serialNumber } = device
   const [vid, pid] = [decToHex(vidDecimal), decToHex(pidDecimal)]

app-shell/src/ui.ts

@@ -52,11 +52,14 @@ export function createUi(): BrowserWindow {
   mainWindow.loadURL(url, { extraHeaders: 'pragma: no-cache\n' })
 
   // open new windows (<a target="_blank" ...) in browser windows
-  mainWindow.webContents.on('new-window', (event, url) => {
-    log.debug('Opening external link', { url })
-    event.preventDefault()
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    shell.openExternal(url)
+  mainWindow.webContents.setWindowOpenHandler(({ url, disposition }) => {
+    if (disposition === 'new-window' && url === 'about:blank') {
+      // eslint-disable-next-line no-void
+      void shell.openExternal(url)
+      return { action: 'deny' }
+    } else {
+      return { action: 'allow' }
+    }
   })
 
   return mainWindow