fixed：Fixed connection timeout shareable issue

jumpserver · Aug 28, 2024 · b4cd25d · b4cd25d
1 parent 7bdd243
commit b4cd25d
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/ui/components.d.ts b/ui/components.d.ts
@@ -37,6 +37,7 @@ declare module 'vue' {
     NList: typeof import('naive-ui')['NList']
     NListItem: typeof import('naive-ui')['NListItem']
     NMessageProvider: typeof import('naive-ui')['NMessageProvider']
+    NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NPopover: typeof import('naive-ui')['NPopover']
     NResult: typeof import('naive-ui')['NResult']
     NScrollbar: typeof import('naive-ui')['NScrollbar']

diff --git a/ui/package.json b/ui/package.json
@@ -4,6 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "dev": "vite",
     "serve": "vite",
     "build": "vue-tsc -b && vite build",
     "preview": "vite preview",

diff --git a/ui/src/App.vue b/ui/src/App.vue
@@ -1,9 +1,11 @@
 <template>
     <n-config-provider :theme="darkTheme" :locale="zhCN" :date-locale="dateZhCN">
         <n-dialog-provider>
-            <n-message-provider>
-                <router-view v-if="i18nLoaded" />
-            </n-message-provider>
+            <n-notification-provider>
+                <n-message-provider>
+                    <router-view v-if="i18nLoaded" />
+                </n-message-provider>
+            </n-notification-provider>
         </n-dialog-provider>
     </n-config-provider>
     <n-float-button :right="20" :bottom="20" shape="circle">

diff --git a/ui/src/components/Kubernetes/MainContent/index.vue b/ui/src/components/Kubernetes/MainContent/index.vue
@@ -63,7 +63,7 @@ import CustomTerminal from '@/components/CustomTerminal/index.vue';
 // import TabSuffix from '@/components/Kubernetes/MainContent/components/TabSuffix/index.vue';
 
 // 引入 type
-import { NMessageProvider, TabPaneProps, useDialog } from 'naive-ui';
+import { NMessageProvider, TabPaneProps, useDialog, useNotification } from 'naive-ui';
 
 import type { Ref } from 'vue';
 import type { ISettingProp, shareUser } from '@/views/interface';
@@ -90,6 +90,8 @@ const treeStore = useTreeStore();
 
 const { t } = useI18n();
 const dialog = useDialog();
+const notification = useNotification();
+
 const paramsStore = useParamsStore();
 const terminalStore = useTerminalStore();
 
@@ -268,8 +270,11 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
             break;
         }
         case 'CLOSE': {
-            sessionId.value = '';
-            message.error(t('TerminalClosed'));
+            enableShare.value = false;
+            notification.error({
+                content: t('TerminalClosed'),
+                duration: 50000
+            });
             break;
         }
         default:

diff --git a/ui/src/hooks/helper/index.ts b/ui/src/hooks/helper/index.ts
@@ -322,11 +322,11 @@ export const generateWsURL = () => {
 export const onWebsocketWrong = (event: Event, type: string, terminal?: Terminal) => {
     switch (type) {
         case 'error': {
-            terminal ? terminal.write('Connection Websocket Error') : message.error('Error');
+            terminal ? terminal.write('Connection Websocket Error') : '';
             break;
         }
         case 'disconnected': {
-            terminal ? terminal.write('Connection Websocket Closed') : message.error('Disconnected');
+            terminal ? terminal.write('Connection Websocket Closed') : '';
             break;
         }
     }

diff --git a/ui/src/hooks/useK8s.ts b/ui/src/hooks/useK8s.ts
@@ -206,8 +206,6 @@ export const useK8s = () => {
             }
             case 'CLOSE':
             case 'ERROR': {
-                message.error('Receive Connection Closed');
-
                 socket.close();
                 break;
             }

diff --git a/ui/src/hooks/useTerminal.ts b/ui/src/hooks/useTerminal.ts
@@ -113,7 +113,6 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'CLOSE': {
-                terminal?.writeln('Receive Connection closed');
                 socket.close();
                 sendEventToLuna('CLOSE', '');
                 break;
@@ -273,7 +272,6 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'TERMINAL_ERROR': {
-                message.error(`Socket Error ${socketData.err}`);
                 terminal?.write(socketData.err);
                 break;
             }

diff --git a/ui/src/views/Connection/index.vue b/ui/src/views/Connection/index.vue
@@ -19,6 +19,7 @@ import { useTerminalStore } from '@/store/modules/terminal.ts';
 import { Terminal } from '@xterm/xterm';
 
 import { storeToRefs } from 'pinia';
+import { useNotification } from 'naive-ui';
 import { NMessageProvider } from 'naive-ui';
 import { computed, h, markRaw, nextTick, reactive, ref } from 'vue';
 
@@ -50,6 +51,7 @@ const { setting } = storeToRefs(paramsStore);
 
 const dialog = useDialog();
 const message = useMessage();
+const notification = useNotification();
 
 const terminalType = ref<string>('common');
 const sessionId = ref<string>('');
@@ -237,9 +239,12 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
             message.info(`${data.user} ${t('ResumeSession')}`);
             break;
         }
-        case 'ClOSE': {
-            sessionId.value = '';
-            message.error(t('TerminalClosed'));
+        case 'CLOSE': {
+            enableShare.value = false;
+            notification.error({
+                content: t('TerminalClosed'),
+                duration: 50000
+            });
             break;
         }
         default: