fdb2 1.0.11 → 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();
       }
     }
   }
@@ -147,11 +179,7 @@ async function startProject() {
   child.unref();
   
   // 保存 PID 到文件
-  try {
-    fs.writeFileSync(pidFilePath, child.pid.toString());
-  } catch (error) {
-    console.warn(`Failed to write PID file ${pidFilePath}: ${error.message}`);
-  }
+  writePid(child.pid);
   
   if (logFileFd) {
     console.log('Logs are written to:', logFilePath);
@@ -167,17 +195,15 @@ 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}`);
     
     // 发送终止信号 - 尝试不同的信号
@@ -240,28 +266,13 @@ function stopProject() {
     }
     
     // 删除 PID 文件
-    try {
-      fs.unlinkSync(pidFilePath);
-      console.log('PID file removed');
-    } catch (unlinkError) {
-      console.warn(`Failed to remove PID file: ${unlinkError.message}`);
-    }
-    
+    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)) {
-        try {
-          fs.unlinkSync(pidFilePath);
-        } catch (e) {
-          // 忽略删除失败
-        }
-      }
-    } else if (error.code === 'EPERM') {
-      // 权限不足的错误已经在上面处理过
-      console.error('Cannot stop server due to insufficient permissions');
+      deletePid();
     } else {
       console.error('Failed to stop server:', error.message);
     }
@@ -285,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 毫秒