Merge branch 'edge' into refactor-shell-notify-subscriptions

app-shell-odd/src/notify.ts

@@ -35,7 +35,7 @@ const pendingUnsubs = new Set<NotifyTopic>()
 const log = createLogger('notify')
 // MQTT is somewhat particular about the clientId format and will connect erratically if an unexpected string is supplied.
 // This clientId is derived from the mqttjs library.
-const CLIENT_ID = 'odd-' + Math.random().toString(16).slice(2, 8)
+const CLIENT_ID = 'app-' + Math.random().toString(16).slice(2, 8)
 
 const connectOptions: mqtt.IClientOptions = {
  clientId: CLIENT_ID,
@@ -209,12 +209,7 @@ function subscribe(notifyParams: NotifyParams): Promise<void> {
  if (counter === MAX_RETRIES) {
  clearInterval(intervalId)
  // log.warn(`Failed to subscribe on ${hostname} to topic: ${topic}`)
- sendToBrowserDeserialized({
- browserWindow,
- hostname,
- topic,
- message: FAILURE_STATUSES.ECONNFAILED,
- })
+ reject(new Error('Maximum subscription retries exceeded.'))
  }
  }, CHECK_CONNECTION_INTERVAL)
  })

app-shell/src/notify.ts

@@ -205,12 +205,7 @@ function subscribe(notifyParams: NotifyParams): Promise<void> {
  if (counter === MAX_RETRIES) {
  clearInterval(intervalId)
  // log.warn(`Failed to subscribe on ${hostname} to topic: ${topic}`)
- sendToBrowserDeserialized({
- browserWindow,
- hostname,
- topic,
- message: FAILURE_STATUSES.ECONNFAILED,
- })
+ reject(new Error('Maximum subscription retries exceeded.'))
  }
  }, CHECK_CONNECTION_INTERVAL)
  })

app/src/redux/shell/__tests__/actions.test.ts

@@ -1,4 +1,9 @@
-import { uiInitialized, notifySubscribeAction } from '../actions'
+import { describe, it, expect } from 'vitest'
+
+import {
+ uiInitialized,
+ notifySubscribeAction,
+} from '../actions'
 
 import type { NotifyTopic } from '../types'