fdb2 1.0.10 → 1.0.12

package/bin/fdb2.js

@@ -4,10 +4,43 @@ const { exec, spawn, execSync, spawnSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const net = require('net');
+const os = require('os');
 
 // 项目根目录
 const projectRoot = path.resolve(__dirname, '..');
 
+// 获取 PID 文件路径
+function getPidFilePath() {
+  const dataDir = process.env.DB_TOOL_DATA_DIR || path.join(os.homedir(), '.fdb2');
+  if (!fs.existsSync(dataDir)) {
+    fs.mkdirSync(dataDir, { recursive: true });
+  }
+  return path.join(dataDir, 'fdb2.server.pid');
+}
+
+// 读取 PID
+function readPid() {
+  const pidFilePath = getPidFilePath();
+  if (fs.existsSync(pidFilePath)) {
+    return parseInt(fs.readFileSync(pidFilePath, 'utf8'));
+  }
+  return null;
+}
+
+// 写入 PID
+function writePid(pid) {
+  const pidFilePath = getPidFilePath();
+  fs.writeFileSync(pidFilePath, pid.toString());
+}
+
+// 删除 PID
+function deletePid() {
+  const pidFilePath = getPidFilePath();
+  if (fs.existsSync(pidFilePath)) {
+    fs.unlinkSync(pidFilePath);
+  }
+}
+
 // 解析命令行参数
 const args = process.argv.slice(2);
 const command = args[0] || 'help';
@@ -74,17 +107,16 @@ async function startProject() {
   console.log('Starting FDB2 project...');
   
   // 检查 PID 文件是否存在，如果存在则说明服务器已经在运行
-  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
-  if (fs.existsSync(pidFilePath)) {
+  const pid = readPid();
+  if (pid) {
     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);
+        deletePid();
       }
     }
   }
@@ -120,24 +152,40 @@ async function startProject() {
   // 日志文件路径
   const logFilePath = path.join(projectRoot, 'server.log');
   
-  // 创建日志文件的写入流
-  const out = fs.openSync(logFilePath, 'a');
-  const err = fs.openSync(logFilePath, 'a');
+  // 安全地创建日志文件写入流，忽略错误
+  function createLogFileStream(logFilePath) {
+    try {
+      const fd = fs.openSync(logFilePath, 'a');
+      console.log(`Log file created: ${logFilePath}`);
+      return fd;
+    } catch (error) {
+      console.warn(`Failed to create log file ${logFilePath}: ${error.message}`);
+      console.warn('Logs will only be written to console.');
+      return null;
+    }
+  }
+  
+  // 创建日志文件流
+  const logFileFd = createLogFileStream(logFilePath);
   
   // 使用 node 命令启动服务器（异步，后台运行）
   const child = spawn(cmd, args, {
     cwd: projectRoot,
     detached: true,
-    stdio: ['ignore', out, err]
+    stdio: ['ignore', logFileFd || 'inherit', logFileFd || 'inherit']
   });
   
   // 解除父子进程关联，让子进程在后台独立运行
   child.unref();
   
   // 保存 PID 到文件
-  fs.writeFileSync(pidFilePath, child.pid.toString());
+  writePid(child.pid);
   
-  console.log('Logs are written to:', logFilePath);
+  if (logFileFd) {
+    console.log('Logs are written to:', logFilePath);
+  } else {
+    console.log('Logs are written to console only');
+  }
   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}`);
@@ -147,32 +195,84 @@ async function startProject() {
 function stopProject() {
   console.log('Stopping FDB2 project...');
   
-  // 读取 PID 文件
-  const pidFilePath = path.join(projectRoot, 'fdb2.server.pid');
+  // 读取 PID
+  const pid = readPid();
   
-  if (!fs.existsSync(pidFilePath)) {
+  if (!pid) {
     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);
+    // 发送终止信号 - 尝试不同的信号
+    try {
+      // 首先尝试 SIGTERM (15) - 正常终止
+      process.kill(pid, 'SIGTERM');
+      console.log('SIGTERM signal sent');
+      
+      // 等待一段时间（2秒）
+      const startTime = Date.now();
+      const maxWaitTime = 2000; // 2秒
+      let processExists = true;
+      
+      while (Date.now() - startTime < maxWaitTime) {
+        try {
+          // 检查进程是否还存在
+          process.kill(pid, 0);
+          Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100); // 等待100ms
+        } catch (err) {
+          if (err.code === 'ESRCH') {
+            processExists = false;
+            break;
+          }
+        }
+      }
+      
+      // 如果进程仍然存在，尝试 SIGKILL (9) - 强制终止
+      if (processExists) {
+        console.log('Process still exists, sending SIGKILL...');
+        try {
+          process.kill(pid, 'SIGKILL');
+          console.log('SIGKILL signal sent');
+          
+          // 再等待500ms
+          Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 500);
+        } catch (killErr) {
+          // SIGKILL 失败可能表示我们没有权限
+          if (killErr.code === 'EPERM') {
+            console.error('Insufficient permissions to kill process');
+            console.error('Try running with sudo or manually kill the process:');
+            console.error(`  sudo kill -9 ${pid}`);
+          }
+          throw killErr;
+        }
+      }
+    } catch (killError) {
+      // 如果 kill 操作失败，检查错误类型
+      if (killError.code === 'EPERM') {
+        // 权限不足
+        console.error('Insufficient permissions to kill process');
+        console.error('Try running with sudo or manually kill the process:');
+        console.error(`  sudo kill -9 ${pid}`);
+        throw killError;
+      } else if (killError.code === 'ESRCH') {
+        // 进程不存在
+        console.log('Process not found');
+      } else {
+        throw killError;
+      }
+    }
     
     // 删除 PID 文件
-    fs.unlinkSync(pidFilePath);
+    deletePid();
     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);
-      }
+      deletePid();
     } else {
       console.error('Failed to stop server:', error.message);
     }
@@ -196,8 +296,7 @@ function restartProject() {
   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)) {
+    if (!readPid()) {
       break;
     }
     // 等待 100 毫秒