Skip to content

Commit 044e7e0

Browse files
mjhuffCarlos-fernandez
authored andcommitted
refactor(app-shell-odd): Utilize robot-server unsubscribe flags (#14724)
Closes EXEC-319 This is the app-shell-odd equivalent of the app-shell refactor, #14648. It's similar to the app-shell logic, but significantly simpler, since we don't have to manage multiple robots, worry about localhost port blocking, and multiple IPs per robot. The real change lies in the initial connect and final disconnect on app shutdown. Otherwise, the changes are primarily in the ConnectionStore. Because the app no longer utilizes unsubscribe actions in any capacity, we can safely remove those references.
1 parent 84b7e77 commit 044e7e0

File tree

7 files changed

+48
-455
lines changed

7 files changed

+48
-455
lines changed

app-shell-odd/src/constants.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,13 @@ export const ROBOT_MASS_STORAGE_DEVICE_ENUMERATED: 'shell:ROBOT_MASS_STORAGE_DEV
226226
export const NOTIFY_SUBSCRIBE: 'shell:NOTIFY_SUBSCRIBE' =
227227
'shell:NOTIFY_SUBSCRIBE'
228228
<<<<<<< HEAD
229+
<<<<<<< HEAD
229230
=======
230231
export const NOTIFY_UNSUBSCRIBE: 'shell:NOTIFY_UNSUBSCRIBE' =
231232
'shell:NOTIFY_UNSUBSCRIBE'
232233
>>>>>>> 9359adf484 (chore(monorepo): migrate frontend bundling from webpack to vite (#14405))
234+
=======
235+
>>>>>>> 1ba616651c (refactor(app-shell-odd): Utilize robot-server unsubscribe flags (#14724))
233236

234237
// copy
235238
// TODO(mc, 2020-05-11): i18n
@@ -256,10 +259,16 @@ export const HTTP_API_VERSION: 3 = 3
256259
export const SEND_READY_STATUS: 'shell:SEND_READY_STATUS' =
257260
'shell:SEND_READY_STATUS'
258261
<<<<<<< HEAD
262+
<<<<<<< HEAD
263+
=======
264+
>>>>>>> 1ba616651c (refactor(app-shell-odd): Utilize robot-server unsubscribe flags (#14724))
259265

260266
export const FAILURE_STATUSES = {
261267
ECONNREFUSED: 'ECONNREFUSED',
262268
ECONNFAILED: 'ECONNFAILED',
263269
} as const
270+
<<<<<<< HEAD
264271
=======
265272
>>>>>>> 9359adf484 (chore(monorepo): migrate frontend bundling from webpack to vite (#14405))
273+
=======
274+
>>>>>>> 1ba616651c (refactor(app-shell-odd): Utilize robot-server unsubscribe flags (#14724))

app-shell-odd/src/notifications/deserialize.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ import type {
1212
import { FAILURE_STATUSES } from '../constants'
1313

1414
const VALID_NOTIFY_RESPONSES: [NotifyRefetchData, NotifyUnsubscribeData] = [
15+
<<<<<<< HEAD
1516
{ refetch: true },
17+
=======
18+
{ refetchUsingHTTP: true },
19+
>>>>>>> 1ba616651c (refactor(app-shell-odd): Utilize robot-server unsubscribe flags (#14724))
1620
{ unsubscribe: true },
1721
]
1822

0 commit comments

Comments
 (0)