fdb2 1.0.8 → 1.0.9

package/bin/fdb2.js

@@ -1,220 +1,220 @@
-#!/usr/bin/env node
-
-const { exec, spawn, execSync, spawnSync } = require('child_process');
-const path = require('path');
-const fs = require('fs');
-const net = require('net');
-
-// 项目根目录
-const projectRoot = path.resolve(__dirname, '..');
-
-// 解析命令行参数
-const args = process.argv.slice(2);
-const command = args[0] || 'help';
-const commandArgs = args.slice(1); // 获取除了命令之外的所有参数
-
-// 处理不同的命令
-switch (command) {
-  case 'start':
-    startProject();
-    break;
-  case 'stop':
-    stopProject();
-    break;
-  case 'restart':
-    restartProject();
-    break;
-  default:
-    showHelp();
-    break;
-}
-
-// 检查端口是否可用
-function isPortAvailable(port) {
-  return new Promise((resolve) => {
-    const server = net.createServer();
-    
-    server.once('error', (err) => {
-      if (err.code === 'EADDRINUSE') {
-        resolve(false);
-      } else {
-        resolve(false);
-      }
-    });
-    
-    server.once('listening', () => {
-      server.close();
-      resolve(true);
-    });
-    
-    server.listen(port);
-  });
-}
-
-// 查找可用端口
-async function findAvailablePort(startPort) {
-  let port = startPort;
-  let attempts = 0;
-  const maxAttempts = 100;
-  
-  while (attempts < maxAttempts) {
-    const available = await isPortAvailable(port);
-    if (available) {
-      return port;
-    }
-    attempts++;
-    port++;
-  }
-  
-  throw new Error(`无法找到可用端口，已尝试 ${maxAttempts} 次`);
-}
-
-// 启动项目
-async function startProject() {
-  console.log('Starting FDB2 project...');
-  
-  // 检查 PID 文件是否存在，如果存在则说明服务器已经在运行
-  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
-  if (fs.existsSync(pidFilePath)) {
-    try {
-      const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
-      process.kill(pid, 0);
-      console.log('Server is already running with PID:', pid);
-      return;
-    } catch (error) {
-      if (error.code === 'ESRCH') {
-        console.log('Cleaning up stale PID file...');
-        fs.unlinkSync(pidFilePath);
-      }
-    }
-  }
-  
-  // 解析端口参数
-  let port = 9800;
-  const portIndex = commandArgs.findIndex(arg => arg === '-p' || arg === '--port');
-  if (portIndex !== -1 && commandArgs[portIndex + 1]) {
-    port = parseInt(commandArgs[portIndex + 1]);
-  }
-  
-  // 查找可用端口
-  console.log(`Checking port ${port} availability...`);
-  try {
-    port = await findAvailablePort(port);
-    if (port !== parseInt(commandArgs[portIndex + 1] || 9800)) {
-      console.log(`Port ${commandArgs[portIndex + 1] || 9800} is in use, using port ${port} instead`);
-    }
-  } catch (error) {
-    console.error('Error:', error.message);
-    process.exit(1);
-  }
-  
-  // 命令和参数
-  let cmd, args;
-  
-  // 直接使用 node 命令启动服务器，传递端口参数
-  cmd = 'node';
-  args = ['server.js', '-p', port.toString()];
-  
-  console.log('Executing:', cmd, args);
-  
-  // 日志文件路径
-  const logFilePath = path.join(projectRoot, 'server.log');
-  
-  // 创建日志文件的写入流
-  const out = fs.openSync(logFilePath, 'a');
-  const err = fs.openSync(logFilePath, 'a');
-  
-  // 使用 node 命令启动服务器（异步，后台运行）
-  const child = spawn(cmd, args, {
-    cwd: projectRoot,
-    detached: true,
-    stdio: ['ignore', out, err]
-  });
-  
-  // 解除父子进程关联，让子进程在后台独立运行
-  child.unref();
-  
-  // 保存 PID 到文件
-  fs.writeFileSync(pidFilePath, child.pid.toString());
-  
-  console.log('Logs are written to:', logFilePath);
-  console.log('Server started successfully with PID:', child.pid);
-  console.log('Server is running in the background');
-  console.log(`Server is running at http://localhost:${port}`);
-}
-
-// 停止项目
-function stopProject() {
-  console.log('Stopping FDB2 project...');
-  
-  // 读取 PID 文件
-  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
-  
-  if (!fs.existsSync(pidFilePath)) {
-    console.log('No server process found (PID file not exists)');
-    return;
-  }
-  
-  try {
-    // 读取 PID
-    const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
-    console.log(`Stopping server process with PID: ${pid}`);
-    
-    // 发送终止信号
-    process.kill(pid);
-    
-    // 删除 PID 文件
-    fs.unlinkSync(pidFilePath);
-    console.log('Server stopped successfully');
-  } catch (error) {
-    // 如果进程不存在（ESRCH 错误），也删除 PID 文件
-    if (error.code === 'ESRCH') {
-      console.log('Server process not found, cleaning up PID file');
-      if (fs.existsSync(pidFilePath)) {
-        fs.unlinkSync(pidFilePath);
-      }
-    } else {
-      console.error('Failed to stop server:', error.message);
-    }
-  }
-}
-
-// 重启项目
-function restartProject() {
-  console.log('Restarting FDB2 project...');
-  
-  // 先停止当前运行的进程
-  try {
-    stopProject();
-  } catch (error) {
-    // 即使停止失败，也继续尝试启动新的进程
-    console.log('Continuing to start new server process...');
-  }
-  
-  // 等待一段时间，确保进程已经停止
-  // 使用同步的方式等待
-  console.log('Waiting for server process to stop...');
-  for (let i = 0; i < 10; i++) {
-    // 检查 PID 文件是否存在
-    const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
-    if (!fs.existsSync(pidFilePath)) {
-      break;
-    }
-    // 等待 100 毫秒
-    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
-  }
-  
-  // 启动新的进程
-  startProject();
-}
-
-// 显示帮助信息
-function showHelp() {
-  console.log('FDB2 Database Tool');
-  console.log('');
-  console.log('Usage:');
-  console.log('  fdb2 start    Start the project');
-  console.log('  fdb2 stop     Stop the project');
-  console.log('  fdb2 restart  Restart the project');
-  console.log('');
-}
+#!/usr/bin/env node
+
+const { exec, spawn, execSync, spawnSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const net = require('net');
+
+// 项目根目录
+const projectRoot = path.resolve(__dirname, '..');
+
+// 解析命令行参数
+const args = process.argv.slice(2);
+const command = args[0] || 'help';
+const commandArgs = args.slice(1); // 获取除了命令之外的所有参数
+
+// 处理不同的命令
+switch (command) {
+  case 'start':
+    startProject();
+    break;
+  case 'stop':
+    stopProject();
+    break;
+  case 'restart':
+    restartProject();
+    break;
+  default:
+    showHelp();
+    break;
+}
+
+// 检查端口是否可用
+function isPortAvailable(port) {
+  return new Promise((resolve) => {
+    const server = net.createServer();
+    
+    server.once('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        resolve(false);
+      } else {
+        resolve(false);
+      }
+    });
+    
+    server.once('listening', () => {
+      server.close();
+      resolve(true);
+    });
+    
+    server.listen(port);
+  });
+}
+
+// 查找可用端口
+async function findAvailablePort(startPort) {
+  let port = startPort;
+  let attempts = 0;
+  const maxAttempts = 100;
+  
+  while (attempts < maxAttempts) {
+    const available = await isPortAvailable(port);
+    if (available) {
+      return port;
+    }
+    attempts++;
+    port++;
+  }
+  
+  throw new Error(`无法找到可用端口，已尝试 ${maxAttempts} 次`);
+}
+
+// 启动项目
+async function startProject() {
+  console.log('Starting FDB2 project...');
+  
+  // 检查 PID 文件是否存在，如果存在则说明服务器已经在运行
+  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
+  if (fs.existsSync(pidFilePath)) {
+    try {
+      const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Server is already running with PID:', pid);
+      return;
+    } catch (error) {
+      if (error.code === 'ESRCH') {
+        console.log('Cleaning up stale PID file...');
+        fs.unlinkSync(pidFilePath);
+      }
+    }
+  }
+  
+  // 解析端口参数
+  let port = 9800;
+  const portIndex = commandArgs.findIndex(arg => arg === '-p' || arg === '--port');
+  if (portIndex !== -1 && commandArgs[portIndex + 1]) {
+    port = parseInt(commandArgs[portIndex + 1]);
+  }
+  
+  // 查找可用端口
+  console.log(`Checking port ${port} availability...`);
+  try {
+    port = await findAvailablePort(port);
+    if (port !== parseInt(commandArgs[portIndex + 1] || 9800)) {
+      console.log(`Port ${commandArgs[portIndex + 1] || 9800} is in use, using port ${port} instead`);
+    }
+  } catch (error) {
+    console.error('Error:', error.message);
+    process.exit(1);
+  }
+  
+  // 命令和参数
+  let cmd, args;
+  
+  // 直接使用 node 命令启动服务器，传递端口参数
+  cmd = 'node';
+  args = ['server.js', '-p', port.toString()];
+  
+  console.log('Executing:', cmd, args);
+  
+  // 日志文件路径
+  const logFilePath = path.join(projectRoot, 'server.log');
+  
+  // 创建日志文件的写入流
+  const out = fs.openSync(logFilePath, 'a');
+  const err = fs.openSync(logFilePath, 'a');
+  
+  // 使用 node 命令启动服务器（异步，后台运行）
+  const child = spawn(cmd, args, {
+    cwd: projectRoot,
+    detached: true,
+    stdio: ['ignore', out, err]
+  });
+  
+  // 解除父子进程关联，让子进程在后台独立运行
+  child.unref();
+  
+  // 保存 PID 到文件
+  fs.writeFileSync(pidFilePath, child.pid.toString());
+  
+  console.log('Logs are written to:', logFilePath);
+  console.log('Server started successfully with PID:', child.pid);
+  console.log('Server is running in the background');
+  console.log(`Server is running at http://localhost:${port}`);
+}
+
+// 停止项目
+function stopProject() {
+  console.log('Stopping FDB2 project...');
+  
+  // 读取 PID 文件
+  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
+  
+  if (!fs.existsSync(pidFilePath)) {
+    console.log('No server process found (PID file not exists)');
+    return;
+  }
+  
+  try {
+    // 读取 PID
+    const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
+    console.log(`Stopping server process with PID: ${pid}`);
+    
+    // 发送终止信号
+    process.kill(pid);
+    
+    // 删除 PID 文件
+    fs.unlinkSync(pidFilePath);
+    console.log('Server stopped successfully');
+  } catch (error) {
+    // 如果进程不存在（ESRCH 错误），也删除 PID 文件
+    if (error.code === 'ESRCH') {
+      console.log('Server process not found, cleaning up PID file');
+      if (fs.existsSync(pidFilePath)) {
+        fs.unlinkSync(pidFilePath);
+      }
+    } else {
+      console.error('Failed to stop server:', error.message);
+    }
+  }
+}
+
+// 重启项目
+function restartProject() {
+  console.log('Restarting FDB2 project...');
+  
+  // 先停止当前运行的进程
+  try {
+    stopProject();
+  } catch (error) {
+    // 即使停止失败，也继续尝试启动新的进程
+    console.log('Continuing to start new server process...');
+  }
+  
+  // 等待一段时间，确保进程已经停止
+  // 使用同步的方式等待
+  console.log('Waiting for server process to stop...');
+  for (let i = 0; i < 10; i++) {
+    // 检查 PID 文件是否存在
+    const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
+    if (!fs.existsSync(pidFilePath)) {
+      break;
+    }
+    // 等待 100 毫秒
+    Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+  }
+  
+  // 启动新的进程
+  startProject();
+}
+
+// 显示帮助信息
+function showHelp() {
+  console.log('FDB2 Database Tool');
+  console.log('');
+  console.log('Usage:');
+  console.log('  fdb2 start    Start the project');
+  console.log('  fdb2 stop     Stop the project');
+  console.log('  fdb2 restart  Restart the project');
+  console.log('');
+}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.6",
+  "version": "1.0.0",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",
@@ -16,7 +16,6 @@
     "icon": "public/favicon.ico"
   },
   "scripts": {
-    "preinstall": "node scripts/preinstall.js",
     "start": "pm2 start server.js --name fdb2-server --disable-logs --",
     "restart": "pm2 restart fdb2-server --disable-logs --",
     "stop": "pm2 stop fdb2-server --",
@@ -39,42 +38,33 @@
   },
   "dependencies": {
     "@fefeding/common": "^1.0.58",
-    "axios": "^1.13.4",
+    "axios": "^1.13.2",
     "dayjs": "^1.11.19",
     "express": "^5.2.1",
-    "mysql2": "^3.16.3",
-    "oracledb": "^6.10.0",
-    "pg": "^8.18.0",
+    "mysql2": "^3.15.3",
+    "pg": "^8.16.3",
+    "pm2": "^6.0.14",
     "reflect-metadata": "^0.2.2",
     "sqlite3": "^5.1.7",
-    "typeorm": "^0.3.28"
+    "typeorm": "^0.3.27"
   },
   "devDependencies": {
-    "@codemirror/commands": "^6.10.1",
-    "@codemirror/fold": "^0.19.4",
-    "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-sql": "^6.10.0",
-    "@codemirror/language": "^6.12.1",
-    "@codemirror/state": "^6.5.4",
-    "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.39.12",
-    "@fefeding/eventemitter": "^1.0.5",
-    "@fefeding/vite-nunjucks-plugin": "^1.0.2",
+    "@fefeding/eventemitter": "^1.0.4",
+    "@fefeding/vite-nunjucks-plugin": "^1.0.1",
     "@popperjs/core": "^2.11.8",
     "@rollup/pluginutils": "^5.3.0",
     "@types/bootstrap": "^5.2.10",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^24.10.10",
+    "@types/node": "^24.10.1",
     "@types/vue": "^2.0.0",
-    "@vitejs/plugin-vue": "^6.0.4",
-    "@vitejs/plugin-vue-jsx": "^5.1.4",
+    "@vitejs/plugin-vue": "^6.0.2",
+    "@vitejs/plugin-vue-jsx": "^5.1.2",
     "@vue/tsconfig": "^0.8.1",
     "@vueuse/core": "^13.9.0",
     "@zumer/snapdom": "^1.9.14",
-    "autoprefixer": "^10.4.24",
+    "autoprefixer": "^10.4.22",
     "bootstrap": "^5.3.8",
     "bootstrap-icons": "^1.13.1",
-    "codemirror": "^6.0.2",
     "dotenv": "^17.2.3",
     "echarts": "^6.0.0",
     "exceljs": "^4.4.0",
@@ -82,22 +72,32 @@
     "jsdom": "^26.1.0",
     "jszip": "^3.10.1",
     "nw": "^0.107.0",
-    "nw-builder": "^4.17.2",
+    "nw-builder": "^4.17.0",
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "postcss": "^8.5.6",
-    "sass": "^1.97.3",
-    "tailwindcss": "^3.4.19",
+    "sass": "^1.94.2",
+    "tailwindcss": "^3.4.18",
     "typescript": "^5.9.3",
-    "vconsole": "^3.15.1",
     "vite": "latest",
     "vite-plugin-files-copy": "^3.8.0",
     "vitest": "^3.2.4",
-    "vue": "^3.5.27",
+    "vue": "^3.5.25",
     "vue-json-pretty": "^2.6.0",
-    "vue-router": "^4.6.4",
-    "vue-tsc": "^3.2.4",
+    "vue-router": "^4.6.3",
+    "vue-tsc": "^3.1.5",
     "vuex": "^4.1.0",
+    
+    "@codemirror/commands": "^6.10.1",
+    "@codemirror/fold": "^0.19.4",
+    "@codemirror/lang-json": "^6.0.2",
+    "@codemirror/lang-sql": "^6.10.0",
+    "@codemirror/language": "^6.12.1",
+    "@codemirror/state": "^6.5.4",
+    "@codemirror/theme-one-dark": "^6.1.3",
+    "@codemirror/view": "^6.39.11",
+    "codemirror": "^6.0.2",
+    "vconsole": "^3.15.1",
     "xlsx": "^0.18.5"
   },
   "bin": {