fdb2 1.0.10 → 1.0.11

package/bin/fdb2.js

@@ -120,24 +120,44 @@ 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());
+  try {
+    fs.writeFileSync(pidFilePath, child.pid.toString());
+  } catch (error) {
+    console.warn(`Failed to write PID file ${pidFilePath}: ${error.message}`);
+  }
   
-  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}`);
@@ -160,19 +180,88 @@ function stopProject() {
     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);
+    try {
+      fs.unlinkSync(pidFilePath);
+      console.log('PID file removed');
+    } catch (unlinkError) {
+      console.warn(`Failed to remove PID file: ${unlinkError.message}`);
+    }
+    
     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);
+        try {
+          fs.unlinkSync(pidFilePath);
+        } catch (e) {
+          // 忽略删除失败
+        }
       }
+    } else if (error.code === 'EPERM') {
+      // 权限不足的错误已经在上面处理过
+      console.error('Cannot stop server due to insufficient permissions');
     } else {
       console.error('Failed to stop server:', error.message);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",

package/server.pid

@@ -1 +0,0 @@
-43286