Testing disconnect before manual reload.

ubidefeo · ubidefeo · commit afadd3fa9ea7 · 2024-12-10T12:54:37.000+01:00
Signed-off-by: ubi de feo &lt;me@ubidefeo.com&gt;
diff --git a/backend/ipc.js b/backend/ipc.js
@@ -139,4 +139,9 @@ module.exports = function registerIPCHandlers(win, ipcMain, app, dialog) {
     event.preventDefault()
     win.webContents.send('check-before-close')
   })
+
+  // handle disconnection before reload
+  ipcMain.handle('prepare-reload', async (event) => {
+    return win.webContents.send('before-reload')
+  })
 }
diff --git a/backend/menu.js b/backend/menu.js
@@ -86,7 +86,20 @@ module.exports = function registerMenu(win, state = {}) {
     {
       label: 'View',
       submenu: [
-        { role: 'reload', accelerator: '' },
+        { 
+          label: 'Reload',
+          accelerator: '',
+          click: async () => {
+            try {
+              win.webContents.send('cleanup-before-reload')
+              setTimeout(() => {
+                win.reload()
+              }, 500)
+            } catch(e) {
+              console.error('Reload from menu failed:', e)
+            }
+          }
+        },
         { role: 'toggleDevTools', accelerator: ''},
         { type: 'separator' },
         { role: 'resetZoom' },
diff --git a/index.js b/index.js
@@ -49,6 +49,24 @@ function createWindow () {
     win.show()
   })
 
+  win.webContents.on('before-reload', async (event) => {
+    // Prevent the default reload behavior
+    event.preventDefault()
+    
+    try {
+      // Tell renderer to do cleanup
+      win.webContents.send('cleanup-before-reload')
+      
+      // Wait for cleanup then reload
+      setTimeout(() => {
+        // This will trigger a page reload, but won't trigger 'before-reload' again
+        win.reload()
+      }, 500)
+    } catch(e) {
+      console.error('Reload preparation failed:', e)
+    }
+  })
+
   const initialMenuState = {
     isConnected: false,
     view: 'editor'
diff --git a/preload.js b/preload.js
@@ -174,6 +174,15 @@ const Window = {
     })
   },
 
+  onBeforeReload: (callback) => {
+    ipcRenderer.on('cleanup-before-reload', async () => {
+      try {
+        await callback()
+      } catch(e) {
+        console.error('Cleanup before reload failed:', e)
+      }
+    })
+  },
 
   beforeClose: (callback) => ipcRenderer.on('check-before-close', callback),
   confirmClose: () => ipcRenderer.invoke('confirm-close'),
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -1364,6 +1364,18 @@ async function store(state, emitter) {
     emitter.emit('render')
   })
 
+  win.onBeforeReload(async () => {
+    // Perform any cleanup needed
+    if (state.isConnected) {
+      await serial.disconnect()
+      state.isConnected = false
+      state.panelHeight = PANEL_CLOSED
+      state.boardFiles = []
+      state.boardNavigationPath = '/'
+    }
+    // Any other cleanup needed
+  })
+
   win.beforeClose(async () => {
     const hasChanges = !!state.openFiles.find(f => f.hasChanges)
     if (hasChanges) {
