fdb2 1.0.3 → 1.0.5

package/bin/fdb2.js

@@ -3,6 +3,7 @@
 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, '..');
@@ -28,8 +29,48 @@ switch (command) {
     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} 次`);
+}
+
 // 启动项目
-function startProject() {
+async function startProject() {
   console.log('Starting FDB2 project...');
   
   // 检查 PID 文件是否存在，如果存在则说明服务器已经在运行
@@ -48,12 +89,31 @@ function startProject() {
     }
   }
   
+  // 解析端口参数
+  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 命令启动服务器
+  // 直接使用 node 命令启动服务器，传递端口参数
   cmd = 'node';
-  args = ['server.js', ...commandArgs];
+  args = ['server.js', '-p', port.toString()];
   
   console.log('Executing:', cmd, args);
   
@@ -77,9 +137,10 @@ function startProject() {
   // 保存 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('Logs are written to:', logFilePath);
+  console.log(`Server is running at http://localhost:${port}`);
 }
 
 // 停止项目

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",
@@ -16,6 +16,7 @@
     "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 --",

package/scripts/preinstall.js

@@ -0,0 +1,38 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+console.log('Checking for running fdb2 instances...');
+
+try {
+  const projectRoot = path.resolve(__dirname, '..');
+  const pidFilePath = path.join(projectRoot, 'server.pid');
+
+  if (fs.existsSync(pidFilePath)) {
+    try {
+      const pid = parseInt(fs.readFileSync(pidFilePath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Found running fdb2 instance with PID:', pid);
+      console.log('Stopping fdb2...');
+
+      try {
+        execSync('node bin/fdb2.js stop', {
+          cwd: projectRoot,
+          stdio: 'inherit'
+        });
+        console.log('fdb2 stopped successfully');
+      } catch (stopError) {
+        console.warn('Failed to stop fdb2:', stopError.message);
+      }
+    } catch (error) {
+      if (error.code === 'ESRCH') {
+        console.log('Cleaning up stale PID file...');
+        fs.unlinkSync(pidFilePath);
+      }
+    }
+  } else {
+    console.log('No running fdb2 instance found');
+  }
+} catch (error) {
+  console.warn('Pre-install check failed:', error.message);
+}

package/server.pid

@@ -1 +0,0 @@
-7684