refactor(app-shell): Migrate desktop app notify connectivity to discovery-client

app-shell/src/__tests__/discovery.test.ts

@@ -27,6 +27,7 @@ vi.mock('../log', () => {
     },
   }
 })
+vi.mock('../notify')
 
 let mockGet = vi.fn(property => {
   return []

app-shell/src/config/actions.ts

@@ -76,7 +76,6 @@ import {
   VALUE_UPDATED,
   VIEW_PROTOCOL_SOURCE_FOLDER,
   NOTIFY_SUBSCRIBE,
-  NOTIFY_UNSUBSCRIBE,
   ROBOT_MASS_STORAGE_DEVICE_ADDED,
   ROBOT_MASS_STORAGE_DEVICE_ENUMERATED,
   ROBOT_MASS_STORAGE_DEVICE_REMOVED,
@@ -99,7 +98,6 @@ import type {
   AppRestartAction,
   NotifySubscribeAction,
   NotifyTopic,
-  NotifyUnsubscribeAction,
   ReloadUiAction,
   RobotMassStorageDeviceAdded,
   RobotMassStorageDeviceEnumerated,
@@ -421,15 +419,3 @@ export const notifySubscribeAction = (
   },
   meta: { shell: true },
 })
-
-export const notifyUnsubscribeAction = (
-  hostname: string,
-  topic: NotifyTopic
-): NotifyUnsubscribeAction => ({
-  type: NOTIFY_UNSUBSCRIBE,
-  payload: {
-    hostname,
-    topic,
-  },
-  meta: { shell: true },
-})

app-shell/src/constants.ts

@@ -225,8 +225,6 @@ export const ROBOT_MASS_STORAGE_DEVICE_ENUMERATED: 'shell:ROBOT_MASS_STORAGE_DEV
   'shell:ROBOT_MASS_STORAGE_DEVICE_ENUMERATED'
 export const NOTIFY_SUBSCRIBE: 'shell:NOTIFY_SUBSCRIBE' =
   'shell:NOTIFY_SUBSCRIBE'
-export const NOTIFY_UNSUBSCRIBE: 'shell:NOTIFY_UNSUBSCRIBE' =
-  'shell:NOTIFY_UNSUBSCRIBE'
 
 // copy
 // TODO(mc, 2020-05-11): i18n
@@ -247,3 +245,8 @@ export const DISCOVERY_UPDATE_LIST: DISCOVERY_UPDATE_LIST_TYPE =
 export const DISCOVERY_REMOVE: DISCOVERY_REMOVE_TYPE = 'discovery:REMOVE'
 
 export const CLEAR_CACHE: CLEAR_CACHE_TYPE = 'discovery:CLEAR_CACHE'
+export const HEALTH_STATUS_OK: 'ok' = 'ok'
+export const FAILURE_STATUSES = {
+  ECONNREFUSED: 'ECONNREFUSED',
+  ECONNFAILED: 'ECONNFAILED',
+} as const

app-shell/src/discovery.ts

@@ -9,15 +9,18 @@ import {
   DEFAULT_PORT,
 } from '@opentrons/discovery-client'
 import {
-  CLEAR_CACHE,
-  DISCOVERY_FINISH,
-  DISCOVERY_REMOVE,
-  DISCOVERY_START,
-  OPENTRONS_USB,
   UI_INITIALIZED,
   USB_HTTP_REQUESTS_START,
   USB_HTTP_REQUESTS_STOP,
-} from './constants'
+} from '@opentrons/app/src/redux/shell/actions'
+import {
+  DISCOVERY_START,
+  DISCOVERY_FINISH,
+  DISCOVERY_REMOVE,
+  CLEAR_CACHE,
+} from '@opentrons/app/src/redux/discovery/actions'
+import { OPENTRONS_USB } from '@opentrons/app/src/redux/discovery/constants'
+import { handleNotificationConnectionsFor } from './notify'
 
 import { getFullConfig, handleConfigChange } from './config'
 import { createLogger } from './log'
@@ -199,6 +202,7 @@ export function registerDiscovery(
 
   function handleRobots(): void {
     const robots = client.getRobots()
+    handleNotificationConnectionsFor(robots)
 
     if (!disableCache) store.set('robots', robots)