add connection test before establish connection

Signed-off-by: seven <[email protected]>
geek-fun · Dec 26, 2023 · cdd515c · cdd515c
1 parent 13e62b7
commit cdd515c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 20 deletions.
diff --git a/src/store/connectionStore.ts b/src/store/connectionStore.ts
@@ -25,21 +25,19 @@ export const useConnectionStore = defineStore('connectionStore', {
       this.connections = await storeAPI.get('connections', []);
     },
     async testConnection({ host, port }: Connection) {
-      {
-        try {
-          const result = await fetch(`${host}:${port}`, {
-            method: 'GET',
-          });
-          if (!result.ok) new CustomError(result.status, await result.json());
-        } catch (e) {
-          if (e instanceof CustomError) {
-            throw new CustomError(e.status, e.details);
-          }
-          if (e instanceof Error) {
-            throw new CustomError(500, e.message);
-          }
-          throw new CustomError(500, `unknown error, trace: ${JSON.stringify(e)}`);
+      try {
+        const result = await fetch(`${host}:${port}`, {
+          method: 'GET',
+        });
+        if (!result.ok) new CustomError(result.status, await result.json());
+      } catch (e) {
+        if (e instanceof CustomError) {
+          throw new CustomError(e.status, e.details);
         }
+        if (e instanceof Error) {
+          throw new CustomError(500, e.message);
+        }
+        throw new CustomError(500, `unknown error, trace: ${JSON.stringify(e)}`);
       }
     },
     saveConnection(connection: Connection) {

diff --git a/src/views/connect/components/connect-list.vue b/src/views/connect/components/connect-list.vue
@@ -36,6 +36,8 @@ import { MoreOutlined } from '@vicons/antd';
 import { storeToRefs } from 'pinia';
 import { useLang } from '../../../lang';
 import { Connection, useConnectionStore } from '../../../store';
+import { debug } from '../../../common/debug';
+import { CustomError } from 'src/common/customError';
 
 const emits = defineEmits(['edit-connect']);
 
@@ -49,7 +51,7 @@ const options = reactive([
   { key: 3, label: lang.t('connection.operations.remove') },
 ]);
 const connectionStore = useConnectionStore();
-const { fetchConnections, removeConnection, establishConnection } = connectionStore;
+const { fetchConnections, removeConnection, establishConnection, testConnection } = connectionStore;
 const { connections, established } = storeToRefs(connectionStore);
 fetchConnections();
 
@@ -67,11 +69,19 @@ const handleSelect = (key: number, connection: Connection) => {
   }
 };
 
-// TODO:connect to the item
-const establishConnect = (connection: Connection) => {
-  establishConnection(connection);
-  // eslint-disable-next-line no-console
-  console.log(connection);
+const establishConnect = async (connection: Connection) => {
+  try {
+    await testConnection(connection);
+    establishConnection(connection);
+  } catch (err) {
+    const error = err as CustomError;
+    message.error(`status: ${error.status}, details: ${error.details}`, {
+      closable: true,
+      keepAliveOnHover: true,
+      duration: 36000000,
+    });
+    debug('connect error');
+  }
 };
 
 // edit connect info