fdb2 1.0.8 → 1.0.10

package/packages/vscode/src/typings/connection.ts

@@ -1,90 +1,90 @@
-/**
- * 数据库连接配置
- */
-export interface DatabaseConnection {
-    id: string;
-    name: string;
-    type: DatabaseType;
-    host: string;
-    port: number;
-    database?: string;
-    username?: string;
-    password?: string;
-    ssl?: boolean;
-    charset?: string;
-    timezone?: string;
-    connectionTimeout?: number;
-    createdAt?: number;
-    updatedAt?: number;
-}
-
-/**
- * 支持的数据库类型
- */
-export type DatabaseType =
-    | 'mysql'
-    | 'postgresql'
-    | 'sqlite'
-    | 'sqlserver'
-    | 'oracle'
-    | 'cockroachdb'
-    | 'mongodb'
-    | 'sap_hana';
-
-/**
- * 数据库类型配置
- */
-export interface DatabaseTypeConfig {
-    type: DatabaseType;
-    name: string;
-    defaultPort: number;
-    icon: string;
-    driver: string;
-    supports: string[];
-}
-
-/**
- * 查询结果
- */
-export interface QueryResult {
-    columns: string[];
-    rows: any[];
-    rowCount: number;
-    executionTime: number;
-}
-
-/**
- * 表信息
- */
-export interface TableInfo {
-    name: string;
-    type: 'table' | 'view' | 'system';
-    engine?: string;
-    rows?: number;
-    size?: string;
-    comment?: string;
-}
-
-/**
- * 列信息
- */
-export interface ColumnInfo {
-    name: string;
-    type: string;
-    nullable: boolean;
-    key: string;
-    default?: any;
-    extra?: string;
-    comment?: string;
-}
-
-/**
- * 数据库信息
- */
-export interface DatabaseInfo {
-    name: string;
-    size?: string;
-    tables?: number;
-    charset?: string;
-    collation?: string;
-}
+/**
+ * 数据库连接配置
+ */
+export interface DatabaseConnection {
+    id: string;
+    name: string;
+    type: DatabaseType;
+    host: string;
+    port: number;
+    database?: string;
+    username?: string;
+    password?: string;
+    ssl?: boolean;
+    charset?: string;
+    timezone?: string;
+    connectionTimeout?: number;
+    createdAt?: number;
+    updatedAt?: number;
+}
+
+/**
+ * 支持的数据库类型
+ */
+export type DatabaseType =
+    | 'mysql'
+    | 'postgresql'
+    | 'sqlite'
+    | 'sqlserver'
+    | 'oracle'
+    | 'cockroachdb'
+    | 'mongodb'
+    | 'sap_hana';
+
+/**
+ * 数据库类型配置
+ */
+export interface DatabaseTypeConfig {
+    type: DatabaseType;
+    name: string;
+    defaultPort: number;
+    icon: string;
+    driver: string;
+    supports: string[];
+}
+
+/**
+ * 查询结果
+ */
+export interface QueryResult {
+    columns: string[];
+    rows: any[];
+    rowCount: number;
+    executionTime: number;
+}
+
+/**
+ * 表信息
+ */
+export interface TableInfo {
+    name: string;
+    type: 'table' | 'view' | 'system';
+    engine?: string;
+    rows?: number;
+    size?: string;
+    comment?: string;
+}
+
+/**
+ * 列信息
+ */
+export interface ColumnInfo {
+    name: string;
+    type: string;
+    nullable: boolean;
+    key: string;
+    default?: any;
+    extra?: string;
+    comment?: string;
+}
+
+/**
+ * 数据库信息
+ */
+export interface DatabaseInfo {
+    name: string;
+    size?: string;
+    tables?: number;
+    charset?: string;
+    collation?: string;
+}

package/packages/vscode/tsconfig.json

@@ -1,21 +1,21 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "ES2020",
-    "outDir": "out",
-    "lib": ["ES2020"],
-    "sourceMap": true,
-    "rootDir": "src",
-    "strict": false,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "moduleResolution": "node",
-    "types": ["node", "vscode"],
-    "baseUrl": ".",
-    "noErrorTruncation": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", ".vscode-test"]
-}
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "ES2020",
+    "outDir": "out",
+    "lib": ["ES2020"],
+    "sourceMap": true,
+    "rootDir": "src",
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "moduleResolution": "node",
+    "types": ["node", "vscode"],
+    "baseUrl": ".",
+    "noErrorTruncation": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", ".vscode-test"]
+}

package/public/index.html

@@ -1,9 +1,9 @@
-<!DOCTYPE html>
-<html lang="en">
-{% include "./modules/header.tpl" %}
-  <body>
-    <div id="app" class="min-vh-100"></div>
-    <script type="module" lang="ts" src="{{prefix}}/src/platform/index.ts">      
-    </script>
-  </body>
-</html>
+<!DOCTYPE html>
+<html lang="en">
+{% include "./modules/header.tpl" %}
+  <body>
+    <div id="app" class="min-vh-100"></div>
+    <script type="module" lang="ts" src="{{prefix}}/src/platform/index.ts">      
+    </script>
+  </body>
+</html>

package/public/modules/header.tpl

@@ -1,14 +1,14 @@
-  <head>
-    <meta charset="UTF-8" />
-    <base href="{{viteTarget}}" />
-    {% include "./initial_state.tpl" %}   
-    <link rel="icon" href="{{prefix}}/public/favicon.png" />    
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>数据库管理</title>
-    <meta name="description" content="{{description}}">
-    <script>
-      window.addEventListener('vite:preloadError', function (event) {
-        console.error(event);
-      });
-    </script> 
+  <head>
+    <meta charset="UTF-8" />
+    <base href="{{viteTarget}}" />
+    {% include "./initial_state.tpl" %}   
+    <link rel="icon" href="{{prefix}}/public/favicon.png" />    
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>数据库管理</title>
+    <meta name="description" content="{{description}}">
+    <script>
+      window.addEventListener('vite:preloadError', function (event) {
+        console.error(event);
+      });
+    </script> 
   </head>

package/public/modules/initial_state.tpl

@@ -1,55 +1,55 @@
-<script type="text/template" id="__INITIAL_STATE__">
-    {{ data | dump | safe }}
-</script>
-<script type="text/template" id="__DEFAULTINITIAL_STATE__">
-  {{ __DEFAULTINITIAL_STATE__ }}
-</script>
-<script>
-  function __get_templateJson(id) {
-    try { 
-        var tag = document.getElementById(id);
-        var obj = JSON.parse(tag.innerHTML);
-        return obj;
-    }
-    catch (e) {    
-      return null;
-    }
-  }
-  var __INITIAL_STATE__ = __get_templateJson('__INITIAL_STATE__');
-  if(!__INITIAL_STATE__) __INITIAL_STATE__ = __get_templateJson('__DEFAULTINITIAL_STATE__');
-  // 动态加载入口
-  function __vitejs_load_entry(url, type) {        
-        if(!url) return;
-        if(url.indexOf('/') !== 0) url = '/' + url;
-        var prefix = (window.__INITIAL_STATE__ && window.__INITIAL_STATE__.config && window.__INITIAL_STATE__.config.prefix) || '';
-        if(prefix && url.indexOf(prefix) !== 0) {
-          url = prefix + url;
-        }   
-        var nodeObj; 
-        switch(type) {
-          case 'script': {
-            // 检查是否已加载过
-            var existing = document.querySelector(`script[src="${url}"]`);   
-            if(existing) return; 
-            nodeObj = document.createElement('script');
-            nodeObj.src = url;
-            nodeObj.type = 'module';
-            break;
-          }
-          case 'stylesheet': 
-          case 'modulepreload':
-          case 'icon':  {
-            // 检查是否已加载过
-            var existing = document.querySelector(`link[href="${url}"]`);   
-            if(existing) return; 
-            nodeObj = document.createElement('link');
-            nodeObj.href = url;
-            nodeObj.rel = type;
-            break;
-          }
-        }  
-        if(!nodeObj) return;     
-        nodeObj.crossOrigin = 'crossorigin';
-        document.head.appendChild(nodeObj);
-      }
+<script type="text/template" id="__INITIAL_STATE__">
+    {{ data | dump | safe }}
+</script>
+<script type="text/template" id="__DEFAULTINITIAL_STATE__">
+  {{ __DEFAULTINITIAL_STATE__ }}
+</script>
+<script>
+  function __get_templateJson(id) {
+    try { 
+        var tag = document.getElementById(id);
+        var obj = JSON.parse(tag.innerHTML);
+        return obj;
+    }
+    catch (e) {    
+      return null;
+    }
+  }
+  var __INITIAL_STATE__ = __get_templateJson('__INITIAL_STATE__');
+  if(!__INITIAL_STATE__) __INITIAL_STATE__ = __get_templateJson('__DEFAULTINITIAL_STATE__');
+  // 动态加载入口
+  function __vitejs_load_entry(url, type) {        
+        if(!url) return;
+        if(url.indexOf('/') !== 0) url = '/' + url;
+        var prefix = (window.__INITIAL_STATE__ && window.__INITIAL_STATE__.config && window.__INITIAL_STATE__.config.prefix) || '';
+        if(prefix && url.indexOf(prefix) !== 0) {
+          url = prefix + url;
+        }   
+        var nodeObj; 
+        switch(type) {
+          case 'script': {
+            // 检查是否已加载过
+            var existing = document.querySelector(`script[src="${url}"]`);   
+            if(existing) return; 
+            nodeObj = document.createElement('script');
+            nodeObj.src = url;
+            nodeObj.type = 'module';
+            break;
+          }
+          case 'stylesheet': 
+          case 'modulepreload':
+          case 'icon':  {
+            // 检查是否已加载过
+            var existing = document.querySelector(`link[href="${url}"]`);   
+            if(existing) return; 
+            nodeObj = document.createElement('link');
+            nodeObj.href = url;
+            nodeObj.rel = type;
+            break;
+          }
+        }  
+        if(!nodeObj) return;     
+        nodeObj.crossOrigin = 'crossorigin';
+        document.head.appendChild(nodeObj);
+      }
 </script>

package/scripts/preinstall.js

@@ -1,112 +1,112 @@
-const { execSync } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-
-console.log('Checking for running fdb2 instances...');
-
-try {
-  let pid = null;
-
-  // 检查当前目录的 PID 文件
-  const currentDirPidPath = path.join(process.cwd(), 'fdb2.server.pid');
-  if (fs.existsSync(currentDirPidPath)) {
-    try {
-      pid = parseInt(fs.readFileSync(currentDirPidPath, 'utf8'));
-      process.kill(pid, 0);
-      console.log('Found running fdb2 instance with PID:', pid);
-    } catch (error) {
-      if (error.code !== 'ESRCH') {
-        throw error;
-      }
-    }
-  }
-
-  // 如果没有找到，尝试从全局安装目录查找
-  if (!pid) {
-    try {
-      const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
-      const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
-      
-      if (fs.existsSync(globalPidPath)) {
-        try {
-          pid = parseInt(fs.readFileSync(globalPidPath, 'utf8'));
-          process.kill(pid, 0);
-          console.log('Found running fdb2 instance with PID:', pid);
-        } catch (error) {
-          if (error.code !== 'ESRCH') {
-            throw error;
-          }
-        }
-      }
-    } catch (error) {
-      // 忽略全局路径查找失败
-    }
-  }
-
-  // 如果找到了运行中的进程，尝试停止它
-  if (pid) {
-    console.log('Stopping fdb2...');
-    
-    try {
-      if (os.platform() === 'win32') {
-        // Windows: 使用 taskkill
-        execSync(`taskkill /F /PID ${pid}`, { stdio: 'inherit' });
-      } else {
-        // Unix-like: 使用 kill
-        process.kill(pid, 'SIGTERM');
-        
-        // 等待进程结束
-        let attempts = 0;
-        while (attempts < 10) {
-          try {
-            process.kill(pid, 0);
-            attempts++;
-            // 等待 100ms
-            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
-          } catch (error) {
-            if (error.code === 'ESRCH') {
-              // 进程已结束
-              break;
-            }
-          }
-        }
-        
-        // 如果进程还在运行，强制终止
-        try {
-          process.kill(pid, 0);
-          process.kill(pid, 'SIGKILL');
-        } catch (error) {
-          if (error.code !== 'ESRCH') {
-            throw error;
-          }
-        }
-      }
-      
-      console.log('fdb2 stopped successfully');
-    } catch (stopError) {
-      console.warn('Failed to stop fdb2:', stopError.message);
-      console.warn('Please manually stop the fdb2 process before installation');
-    }
-  } else {
-    console.log('No running fdb2 instance found');
-  }
-
-  // 清理 PID 文件
-  if (fs.existsSync(currentDirPidPath)) {
-    fs.unlinkSync(currentDirPidPath);
-  }
-  
-  try {
-    const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
-    const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
-    if (fs.existsSync(globalPidPath)) {
-      fs.unlinkSync(globalPidPath);
-    }
-  } catch (error) {
-    // 忽略全局路径清理失败
-  }
-
-} catch (error) {
-  console.warn('Pre-install check failed:', error.message);
-}
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+console.log('Checking for running fdb2 instances...');
+
+try {
+  let pid = null;
+
+  // 检查当前目录的 PID 文件
+  const currentDirPidPath = path.join(process.cwd(), 'fdb2.server.pid');
+  if (fs.existsSync(currentDirPidPath)) {
+    try {
+      pid = parseInt(fs.readFileSync(currentDirPidPath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Found running fdb2 instance with PID:', pid);
+    } catch (error) {
+      if (error.code !== 'ESRCH') {
+        throw error;
+      }
+    }
+  }
+
+  // 如果没有找到，尝试从全局安装目录查找
+  if (!pid) {
+    try {
+      const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+      
+      if (fs.existsSync(globalPidPath)) {
+        try {
+          pid = parseInt(fs.readFileSync(globalPidPath, 'utf8'));
+          process.kill(pid, 0);
+          console.log('Found running fdb2 instance with PID:', pid);
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+    } catch (error) {
+      // 忽略全局路径查找失败
+    }
+  }
+
+  // 如果找到了运行中的进程，尝试停止它
+  if (pid) {
+    console.log('Stopping fdb2...');
+    
+    try {
+      if (os.platform() === 'win32') {
+        // Windows: 使用 taskkill
+        execSync(`taskkill /F /PID ${pid}`, { stdio: 'inherit' });
+      } else {
+        // Unix-like: 使用 kill
+        process.kill(pid, 'SIGTERM');
+        
+        // 等待进程结束
+        let attempts = 0;
+        while (attempts < 10) {
+          try {
+            process.kill(pid, 0);
+            attempts++;
+            // 等待 100ms
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+          } catch (error) {
+            if (error.code === 'ESRCH') {
+              // 进程已结束
+              break;
+            }
+          }
+        }
+        
+        // 如果进程还在运行，强制终止
+        try {
+          process.kill(pid, 0);
+          process.kill(pid, 'SIGKILL');
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+      
+      console.log('fdb2 stopped successfully');
+    } catch (stopError) {
+      console.warn('Failed to stop fdb2:', stopError.message);
+      console.warn('Please manually stop the fdb2 process before installation');
+    }
+  } else {
+    console.log('No running fdb2 instance found');
+  }
+
+  // 清理 PID 文件
+  if (fs.existsSync(currentDirPidPath)) {
+    fs.unlinkSync(currentDirPidPath);
+  }
+  
+  try {
+    const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+    const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+    if (fs.existsSync(globalPidPath)) {
+      fs.unlinkSync(globalPidPath);
+    }
+  } catch (error) {
+    // 忽略全局路径清理失败
+  }
+
+} catch (error) {
+  console.warn('Pre-install check failed:', error.message);
+}