support to open server on the external broswer

Author: LinuxSuRen

console/atest-desktop/index.html

@@ -12,6 +12,7 @@
 <div style="margin: 5px; display: flex; justify-content: center">
   <div>
     <div>Server Status</div>
+      <div id="address"></div>
       <table>
           <tr>
               <td>
@@ -29,6 +30,14 @@
                   <input name="extension-registry" id="extension-registry" type="text"/>
               </td>
           </tr>
+          <tr>
+              <td>
+                  <label for="download-timeout">Download timeout</label>
+              </td>
+              <td>
+                  <input name="download-timeout" id="download-timeout" type="text"/>
+              </td>
+          </tr>
           <tr>
               <td>Log</td>
               <td>
@@ -41,6 +50,7 @@
               </td>
               <td>
                   <button type="button" id="open-server-page">Open Server Page</button>
+                  <button type="button" id="open-from-browser">Open from Browser</button>
               </td>
           </tr>
       </table>
@@ -61,6 +71,15 @@
     }
 })
 
+document.getElementById('open-from-browser').addEventListener('click', async (e) => {
+  const address = await window.electronAPI.getHomePage();
+  if (address) {
+    await window.electronAPI.openWithExternalBrowser(address);
+  } else {
+    alert('Please start the server first!');
+  }
+})
+
 const openServerBut = document.getElementById('open-server-page');
 openServerBut.addEventListener('click', async (e) => {
   window.location = await window.electronAPI.getHomePage()
@@ -91,13 +110,20 @@
 
 const extensionRegistry = document.getElementById('extension-registry');
 extensionRegistry.addEventListener("input", function(e) {
-  console.log('setExtensionRegistry', extensionRegistry.value)
   window.electronAPI.setExtensionRegistry(extensionRegistry.value)
 });
 
+const downloadTimeout = document.getElementById('download-timeout');
+downloadTimeout.addEventListener("input", function(e) {
+  window.electronAPI.setDownloadTimeout(downloadTimeout.value)
+});
+
 (async function() {
   portInput.value = await window.electronAPI.getPort()
   extensionRegistry.value = await window.electronAPI.getExtensionRegistry()
+  downloadTimeout.value = await window.electronAPI.getDownloadTimeout()
+
+  document.getElementById('address').innerText = await window.electronAPI.getHomePage();
 })();
 </script>
 </body>

console/atest-desktop/main.js

@@ -119,6 +119,7 @@ Menu.setApplicationMenu(menu)
 let serverProcess;
 let serverPort = 7788;
 let extensionRegistry = "ghcr.io";
+let downloadTimeout = "1m";
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
@@ -127,26 +128,33 @@ app.whenReady().then(() => {
   ipcMain.on('openLogDir', () => {
     shell.openExternal('file://' + server.getLogfile())
   })
+  ipcMain.handle('openWithExternalBrowser', (e, address) => {
+    shell.openExternal(address)
+  })
   ipcMain.on('startServer', startServer)
   ipcMain.on('stopServer', stopServer)
   ipcMain.on('control', (e, okCallback, errCallback) => {
     server.control(okCallback, errCallback)
   })
+  ipcMain.handle('getPort', () => {
+    return serverPort
+  })
   ipcMain.handle('setPort', (e, port) => {
-    console.log('setPort', port)
     serverPort = port;
   })
+  ipcMain.handle('getExtensionRegistry', () => {
+    return extensionRegistry
+  })
   ipcMain.handle('setExtensionRegistry', (e, registry) => {
-    console.log('setExtensionRegistry', registry)
     extensionRegistry = registry
   })
-  ipcMain.handle('getExtensionRegistry', () => {
-    return extensionRegistry
+  ipcMain.handle('getDownloadTimeout', () => {
+    return downloadTimeout
   })
-  ipcMain.handle('getHomePage', server.getHomePage)
-  ipcMain.handle('getPort', () => {
-    return serverPort
+  ipcMain.handle('setDownloadTimeout', (e, timeout) => {
+    downloadTimeout = timeout
   })
+  ipcMain.handle('getHomePage', server.getHomePage)
   ipcMain.handle('getHealthzUrl', server.getHealthzUrl)
 
   startServer()
@@ -195,6 +203,7 @@ const startServer = () => {
     "server",
     `--http-port=${serverPort}`,
     "--port=0",
+    `--download-timeout=${downloadTimeout}`,
     `--extension-registry=${extensionRegistry}`,
     "--local-storage", path.join(homeData, "*.yaml")
   ])

console/atest-desktop/preload.js

@@ -31,6 +31,7 @@ window.addEventListener('DOMContentLoaded', () => {
 
 contextBridge.exposeInMainWorld('electronAPI', {
   openLogDir: () => ipcRenderer.send('openLogDir'),
+  openWithExternalBrowser: (address) => ipcRenderer.invoke('openWithExternalBrowser', address),
   startServer: () => ipcRenderer.send('startServer'),
   stopServer: () => ipcRenderer.send('stopServer'),
   control: (okCallback, errCallback) => ipcRenderer.send('control', okCallback, errCallback),
@@ -39,5 +40,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   setPort: (port) => ipcRenderer.invoke('setPort', port),
   setExtensionRegistry: (registry) => ipcRenderer.invoke('setExtensionRegistry', registry),
   getExtensionRegistry: () => ipcRenderer.invoke('getExtensionRegistry'),
+  getDownloadTimeout: () => ipcRenderer.invoke('getDownloadTimeout'),
+  setDownloadTimeout: (timeout) => ipcRenderer.invoke('setDownloadTimeout', timeout),
   getHealthzUrl: () => ipcRenderer.invoke('getHealthzUrl'),
 })

pkg/server/store_ext_manager.go

@@ -160,13 +160,24 @@ func (s *storeExtManager) StopAll() error {
 	serverLogger.Info("stop", "extensions", len(s.processs))
 	for _, p := range s.processs {
 		if p != nil {
-			p.Signal(syscall.SIGTERM)
+			// Use Kill on Windows, Signal on other platforms
+			if isWindows() {
+				p.Kill()
+			} else {
+				p.Signal(syscall.SIGTERM)
+			}
 		}
 	}
 	s.stopSingal <- struct{}{}
 	return nil
 }
 
+// isWindows returns true if the program is running on Windows OS.
+func isWindows() bool {
+	return strings.Contains(strings.ToLower(os.Getenv("OS")), "windows") ||
+		(strings.Contains(strings.ToLower(os.Getenv("GOOS")), "windows"))
+}
+
 func (s *storeExtManager) WithDownloader(ociDownloader downloader.PlatformAwareOCIDownloader) {
 	s.ociDownloader = ociDownloader
 }

pkg/server/store_ext_manager_test.go

@@ -44,6 +44,7 @@ func TestStoreExtManager(t *testing.T) {
 		err = mgr.Start("go", "")
 		assert.NoError(t, err)
 
+		time.Sleep(time.Microsecond * 100)
 		err = mgr.StopAll()
 		assert.NoError(t, err)
 	})