qfix: Desktop should recover on network lose (#9967)

Signed-off-by: Andrey Sobolev <[email protected]>

Author: haiodo

desktop/src/ui/preload.ts

@@ -1,7 +1,7 @@
 // preload.js
 
 import { contextBridge, ipcRenderer } from 'electron'
-import { BrandingMap, Config, IPCMainExposed, MenuBarAction, NotificationParams, JumpListSpares } from './types'
+import { BrandingMap, Config, IPCMainExposed, JumpListSpares, MenuBarAction, NotificationParams } from './types'
 
 /**
  * @public
@@ -18,27 +18,23 @@ export function concatLink (host: string, path: string): string {
 }
 
 async function loadServerConfig (url: string): Promise<any> {
-  let retries = 5
+  let retries = 1
   let res: Response | undefined
 
-  do {
+  while (true) {
     try {
       res = await fetch(url, {
         keepalive: true
       })
+      if (res === undefined) {
+        // In theory should never get here
+        throw new Error('Failed to load server config')
+      }
       break
     } catch (e) {
-      retries--
-      if (retries === 0) {
-        throw new Error(`Failed to load server config: ${e}`)
-      }
-      await new Promise((resolve) => setTimeout(resolve, 1000 * (5 - retries)))
+      retries++
+      await new Promise((resolve) => setTimeout(resolve, 1000 * Math.min(5, retries)))
     }
-  } while (retries > 0)
-
-  if (res === undefined) {
-    // In theory should never get here
-    throw new Error('Failed to load server config')
   }
 
   return await res.json()

plugins/workbench-resources/src/connect.ts

@@ -366,8 +366,13 @@ export async function connect (title: string): Promise<Client | undefined> {
                 const frontUrl = getMetadata(presentation.metadata.FrontUrl) ?? ''
                 const currentFrontVersion = getMetadata(presentation.metadata.FrontVersion)
                 if (currentFrontVersion !== undefined) {
-                  const frontConfig = await loadServerConfig(concatLink(frontUrl, '/config.json'))
-                  if (frontConfig?.version !== undefined && frontConfig.version !== currentFrontVersion) {
+                  try {
+                    const frontConfig = await loadServerConfig(concatLink(frontUrl, '/config.json'))
+                    if (frontConfig?.version !== undefined && frontConfig.version !== currentFrontVersion) {
+                      location.reload()
+                    }
+                  } catch (err: any) {
+                    // Failed to load server config, reload location
                     location.reload()
                   }
                 }