Merge pull request #143 from jumpserver/pr@dev@perf_windows_display

Pr@dev@perf windows display

Author: Halo1236

go-client/config.json

@@ -108,7 +108,7 @@
           "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere."
         },
         "download_url": "",
-        "type": "windows",
+        "type": "remotedesktop",
         "path": "mstsc.exe",
         "arg_format": "{file}",
         "match_first": [
@@ -484,7 +484,7 @@
           "en": "Microsoft Remote Desktop is a powerful Microsoft remote connection tool that can connect to remote PCs and your work resources from almost anywhere.\n\n!!!Manually download and install, click Save to activate!!!"
         },
         "download_url": "",
-        "type": "windows",
+        "type": "remotedesktop",
         "path": "/Applications/Microsoft Remote Desktop.app",
         "arg_format": "{file}",
         "match_first": [
@@ -651,7 +651,7 @@
           "en": "Remmina is a remote desktop client developed using GTK+, providing support for remote connection protocols such as RDP, VNC, XDMCP, and SSH."
         },
         "download_url": "https://remmina.org/how-to-install-remmina/",
-        "type": "windows",
+        "type": "remotedesktop",
         "path": "remmina",
         "arg_format": "{file}",
         "match_first": [],
@@ -670,7 +670,7 @@
           "en": "FreeRDP is a free implementation of the Remote Desktop Protocol (RDP), released under the Apache License.\nInstallation command\nsudo apt-get install freerdp\nsudo yum install freerdp"
         },
         "download_url": "https://github.com/FreeRDP/FreeRDP",
-        "type": "windows",
+        "type": "remotedesktop",
         "path": "xfreerdp",
         "arg_format": "{file} /cert-ignore /d: /p:",
         "match_first": [],

go-client/pkg/awaken/awaken_linux.go

@@ -70,17 +70,29 @@ func awakenSSHCommand(r *Rouse, cfg *config.AppConfig) *exec.Cmd {
 		currentPath := filepath.Dir(os.Args[0])
 		commands := getCommandFromArgs(connectMap, appItem.ArgFormat)
 		clientPath := filepath.Join(currentPath, "client")
-		out, _ := exec.Command("bash", "-c", "echo $XDG_CURRENT_DESKTOP").CombinedOutput()
-		currentDesktop := strings.ToLower(strings.Trim(string(out), "\n"))
+		out, err := exec.Command("bash", "-c", "echo $XDG_CURRENT_DESKTOP").CombinedOutput()
+		if err != nil {
+			global.LOG.Error(fmt.Sprintf("Failed to detect desktop environment: %v", err))
+			return nil
+		}
+
+		currentDesktop := strings.ToLower(strings.TrimSpace(string(out)))
 
 		switch currentDesktop {
-		case "gnome", "ubuntu:gnome", "ukui":
-			cmd = exec.Command(
-				"gnome-terminal", "--", "bash", "-c",
+		case "gnome", "ubuntu:gnome", "ukui", "cinnamon":
+			cmd = exec.Command("gnome-terminal", "--", "bash", "-c",
 				fmt.Sprintf("%s %s; exec bash -i", clientPath, commands),
 			)
+		case "unity":
+			cmd = exec.Command("x-terminal-emulator", "-e", fmt.Sprintf("%s %s", clientPath, commands))
 		case "deepin":
 			cmd = exec.Command("deepin-terminal", "--keep-open", "-C", fmt.Sprintf("%s %s", clientPath, commands))
+		case "kde":
+			cmd = exec.Command("konsole", "--noclose", "-e", "bash", "-c", fmt.Sprintf("%s %s", clientPath, commands))
+		case "xfce":
+			cmd = exec.Command("xfce4-terminal", "--hold", "-e", fmt.Sprintf("%s %s", clientPath, commands))
+		case "lxde":
+			cmd = exec.Command("lxterminal", "-e", fmt.Sprintf("%s %s", clientPath, commands))
 		default:
 			msg := fmt.Sprintf("Not yet supported %s desktop system", currentDesktop)
 			global.LOG.Info(msg)

ui/electron-builder.yml

@@ -50,6 +50,10 @@ linux:
       arch:
         - x64
         - arm64
+    - target: AppImage
+      arch:
+        - x64
+        - arm64
   maintainer: electronjs.org
   category: Utility
 deb:

ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "jumpserver-client",
   "author": "Fit2Cloud Technology Co., Ltd.; <[email protected]>",
-  "version": "v3.0.2",
+  "version": "v3.0.3",
   "homepage": "https://jumpserver.org",
   "main": "./out/main/index.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "axios": "^1.7.7",
     "clipboard-polyfill": "^4.1.0",
     "electron-conf": "^1.2.1",
+    "electron-log": "^5.3.3",
     "electron-store": "^10.0.0",
     "electron-updater": "^6.1.7",
     "lucide-vue-next": "^0.468.0",

ui/src/main/index.ts

@@ -1,6 +1,6 @@
 import path, { join, resolve } from 'path';
 import { Conf, useConf } from 'electron-conf/main';
-
+import log from 'electron-log';
 import { app, BrowserWindow, ipcMain, session, shell } from 'electron';
 
 import { execFile } from 'child_process';
@@ -22,9 +22,13 @@ let defaults = {
     language: 'en'
   }
 };
+
 let mainWindow: BrowserWindow | null = null;
 
-const platform = process.platform === 'win32' ? 'windows' : process.platform === 'darwin' ? 'macos' : 'linux';
+let openMainWindow: boolean = true;
+
+const platform =
+  process.platform === 'win32' ? 'windows' : process.platform === 'darwin' ? 'macos' : 'linux';
 const configFilePath = path.join(app.getPath('userData'), 'config.json');
 
 if (!existsSync(configFilePath)) {
@@ -56,21 +60,23 @@ const handleUrl = (url: string) => {
 
   if (token) {
     const decodedTokenJson = Buffer.from(token, 'base64').toString('utf-8');
-
     try {
       const decodedToken = JSON.parse(decodedTokenJson);
       if ('bearer_token' in decodedToken) {
+        openMainWindow = true;
         mainWindow?.webContents.send('set-token', decodedToken.bearer_token);
       } else {
+        openMainWindow = false;
         handleClientPullUp(url);
       }
+      log.info('handleUrl:', openMainWindow);
     } catch (error) {
-      console.error('Failed to parse decoded token:', error);
+      log.error('Failed to parse decoded token:', error);
     }
   }
 };
 
-const handleArgv = (argv: any) => {
+const handleArgv = (argv: string[]) => {
   const offset = app.isPackaged ? 1 : 2;
   const url = argv.find((arg, i) => i >= offset && arg.startsWith('jms'));
   if (url) handleUrl(url);
@@ -97,7 +103,7 @@ const handleClientPullUp = (url: string) => {
     } else {
       subPath += '/windows';
     }
-    let exeFilePath = path.join(subPath, 'JumpServerClient');
+    const exeFilePath = path.join(subPath, 'JumpServerClient');
     execFile(exeFilePath, [url], error => {
       if (error) {
         console.log(error);
@@ -107,7 +113,8 @@ const handleClientPullUp = (url: string) => {
 };
 
 const createWindow = async (): Promise<void> => {
-  const windowBounds = (conf.get('windowBounds') as { width: number; height: number }) || defaults.windowBounds;
+  const windowBounds =
+    (conf.get('windowBounds') as { width: number; height: number }) || defaults.windowBounds;
 
   mainWindow = new BrowserWindow({
     width: windowBounds.width,
@@ -132,7 +139,11 @@ const createWindow = async (): Promise<void> => {
   });
 
   mainWindow.webContents.setWindowOpenHandler(details => {
-    shell.openExternal(details.url);
+    try {
+      shell.openExternal(details.url);
+    } catch (err) {
+      log.error('Failed to open external URL:', err);
+    }
     return { action: 'deny' };
   });
 
@@ -179,6 +190,24 @@ const createWindow = async (): Promise<void> => {
   }
 };
 
+// @ts-ignore
+app.on('second-instance', (_event: Event, argv: string[]) => {
+  log.info('second-instance');
+  if (process.platform === 'win32' || process.platform === 'linux') {
+    handleArgv(argv);
+  }
+  if (mainWindow && openMainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.focus();
+  }
+});
+
+// @ts-ignore
+app.on('open-url', (_event: Event, url: string) => {
+  log.info('open-url');
+  handleUrl(url);
+});
+
 !app.requestSingleInstanceLock() ? app.quit() : '';
 
 app.whenReady().then(async () => {
@@ -200,21 +229,25 @@ app.whenReady().then(async () => {
   conf.registerRendererListener();
   useConf();
 
-  await createWindow();
   setDefaultProtocol();
 
-  setTitleBar(conf.get('defaultSetting.theme') as string);
-
-  if (process.platform === 'win32') {
+  if (process.platform === 'win32' || process.platform === 'linux') {
     handleArgv(process.argv);
   }
+  log.info('whenReady: ', openMainWindow);
+  if (openMainWindow) {
+    await createWindow();
+    setTitleBar(conf.get('defaultSetting.theme') as string);
+  } else {
+    app.quit();
+  }
 
   app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow();
+    if (BrowserWindow.getAllWindows().length === 0 && openMainWindow) createWindow();
   });
 
   if (is.dev) {
-    if (process.platform === 'win32') {
+    if (process.platform === 'win32' || process.platform === 'linux') {
       process.on('message', data => {
         if (data === 'graceful-exit') {
           app.quit();
@@ -231,26 +264,7 @@ app.whenReady().then(async () => {
 // 除外 macOS 外，关闭所有窗口时退出 app
 app.on('window-all-closed', () => {
   // mainWindow 可能已经被销毁，所以不要再尝试访问它
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});
-
-// @ts-ignore
-app.on('second-instance', (_event: Event, argv: string) => {
-  if (process.platform === 'win32') {
-    handleArgv(argv);
-  }
-  if (mainWindow) {
-    if (mainWindow.isMinimized()) mainWindow.restore();
-    mainWindow.focus();
-  }
-});
-
-// 从 web 唤起 Client
-// @ts-ignore
-app.on('open-url', (_event: Event, url: string) => {
-  handleUrl(url);
+  app.quit();
 });
 
 const setTitleBar = (theme: string) => {

ui/src/renderer/components.d.ts

@@ -9,7 +9,6 @@ declare module 'vue' {
   export interface GlobalComponents {
     Drawer: typeof import('./src/components/Drawer/index.vue')['default']
     ListContainer: typeof import('./src/components/ListContainer/index.vue')['default']
-    ListItem: typeof import('./src/components/ListItem/index.vue')['default']
     LoginModal: typeof import('./src/components/LoginModal/index.vue')['default']
     MainSection: typeof import('./src/components/MainSection/index.vue')['default']
     NA: typeof import('naive-ui')['NA']
@@ -19,56 +18,39 @@ declare module 'vue' {
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
-    NDataTable: typeof import('naive-ui')['NDataTable']
-    NDescriptions: typeof import('naive-ui')['NDescriptions']
-    NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem']
     NDivider: typeof import('naive-ui')['NDivider']
     NDrawer: typeof import('naive-ui')['NDrawer']
     NDrawerContent: typeof import('naive-ui')['NDrawerContent']
     NDropdown: typeof import('naive-ui')['NDropdown']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
     NEmpty: typeof import('naive-ui')['NEmpty']
-    NFl: typeof import('naive-ui')['NFl']
     NFlex: typeof import('naive-ui')['NFlex']
-    NFlexl: typeof import('naive-ui')['NFlexl']
-    NFom: typeof import('naive-ui')['NFom']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
     NGi: typeof import('naive-ui')['NGi']
     NGrid: typeof import('naive-ui')['NGrid']
-    NGridForm: typeof import('naive-ui')['NGridForm']
     NGridItem: typeof import('naive-ui')['NGridItem']
     NH3: typeof import('naive-ui')['NH3']
-    NHighlight: typeof import('naive-ui')['NHighlight']
     NIcon: typeof import('naive-ui')['NIcon']
     NInfiniteScroll: typeof import('naive-ui')['NInfiniteScroll']
     NInput: typeof import('naive-ui')['NInput']
     NInputGroup: typeof import('naive-ui')['NInputGroup']
-    NIocn: typeof import('naive-ui')['NIocn']
     NLayout: typeof import('naive-ui')['NLayout']
     NLayoutContent: typeof import('naive-ui')['NLayoutContent']
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
-    NList: typeof import('naive-ui')['NList']
-    NListItem: typeof import('naive-ui')['NListItem']
     NLoadingBarProvider: typeof import('naive-ui')['NLoadingBarProvider']
     NMenu: typeof import('naive-ui')['NMenu']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
     NModal: typeof import('naive-ui')['NModal']
     NModalProvider: typeof import('naive-ui')['NModalProvider']
-    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
-    NResult: typeof import('naive-ui')['NResult']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
     NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
-    NTabPane: typeof import('naive-ui')['NTabPane']
-    NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
-    NTex: typeof import('naive-ui')['NTex']
     NText: typeof import('naive-ui')['NText']
-    NTooltip: typeof import('naive-ui')['NTooltip']
     RenderList: typeof import('./src/components/RenderList/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']

ui/src/renderer/src/App.vue

@@ -32,7 +32,7 @@ import { useElectronConfig } from './hooks/useElectronConfig';
 import { getIconImage, getAvatarImage } from './utils/common';
 
 import type { ConfigProviderProps } from 'naive-ui';
-
+import { useRouter } from 'vue-router';
 import mittBus from './eventBus';
 import LoginModal from './components/LoginModal/index.vue';
 
@@ -48,6 +48,7 @@ const {
 } = useUserAccount();
 
 const userStore = useUserStore();
+const router = useRouter();
 
 const defaultLang = ref('');
 const defaultTheme = ref('');
@@ -135,6 +136,9 @@ onMounted(async () => {
   if (!userStore.token || (userStore.userInfo && userStore.userInfo.length <= 0)) {
     handleModalOpacity();
   }
+  if (userStore.userInfo.length > 0) {
+    router.push({ name: 'Linux' });
+  }
 
   window.electron.ipcRenderer.on('set-token', (_e, token: string) => handleTokenReceived(token));
 

ui/src/renderer/src/router/index.ts

@@ -6,6 +6,7 @@ const routes: RouteRecordRaw[] = [
     path: '/',
     name: 'homePage',
     component: () => import('../layouts/index.vue'),
+    redirect: '',
     children: [
       {
         path: 'linux',