fdb2 1.0.15 → 1.0.17

package/bin/fdb2.js

@@ -57,6 +57,10 @@ switch (command) {
   case 'restart':
     restartProject();
     break;
+  case '-v':
+  case '--version':
+    showVersion();
+    break;
   default:
     showHelp();
     break;
@@ -307,6 +311,12 @@ function restartProject() {
   startProject();
 }
 
+// 显示版本号
+function showVersion() {
+  const pkg = JSON.parse(fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'));
+  console.log(pkg.version);
+}
+
 // 显示帮助信息
 function showHelp() {
   console.log('FDB2 Database Tool');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fdb2",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "private": false,
   "type": "commonjs",
   "main": "view/index.html",
@@ -8,6 +8,7 @@
     "bin/",
     "public/",
     "view/",
+    "scripts/",
     "server.js",
     "package.json",
     "README.md"
@@ -26,7 +27,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 --",

package/scripts/nw-build.js

@@ -0,0 +1,136 @@
+const nwbuilder = require('nw-builder');
+const { resolve, join } = require('path');
+const { copyFileSync, existsSync, readdirSync } = require('fs');
+
+const projectRoot = resolve(__dirname, '..');
+
+const args = process.argv.slice(2);
+const targetPlatform = args.find(arg => arg.startsWith('--platform='))?.split('=')[1];
+
+const supportedPlatforms = ['win', 'osx', 'linux'];
+
+function getCurrentPlatform() {
+  const platform = process.platform;
+  if (platform === 'darwin') return ['osx'];
+  if (platform === 'linux') return ['linux'];
+  return ['win', 'linux'];
+}
+
+function getAppConfig(platform) {
+  const config = {
+    icon: resolve(projectRoot, 'dist', 'public', 'favicon.ico')
+  };
+
+  if (platform === 'osx') {
+    config.LSApplicationCategoryType = 'public.app-category.productivity';
+    config.NSHumanReadableCopyright = 'Copyright © 2025';
+    config.NSLocalNetworkUsageDescription = '需要网络访问以连接数据库';
+    config.CFBundleIdentifier = 'com.fdb.database';
+    config.CFBundleName = '数据库管理工具';
+    config.CFBundleDisplayName = '数据库管理工具';
+    config.CFBundleShortVersionString = '1.0.1';
+    config.CFBundleVersion = '1.0.1';
+  }
+
+  return config;
+}
+
+async function buildPlatform(platform) {
+  const outDir = resolve(projectRoot, `release/fdb2-${platform}`);
+  console.log(`\n========================================`);
+  console.log(`开始构建 ${platform} 平台...`);
+  console.log(`========================================`);
+
+  const buildOptions = {
+    mode: 'build',
+    srcDir: resolve(projectRoot, 'dist'),
+    version: '0.78.1',
+    flavor: 'normal',
+    platform: platform,
+    arch: 'x64',
+    outDir: outDir,
+    cacheDir: resolve(projectRoot, 'nw-cache'),
+    downloadUrl: 'https://github.com/nwjs/nw.js/releases/download/v0.78.1',
+    zip: false,
+    logLevel: 'info',
+    glob: false,
+    app: getAppConfig(platform)
+  };
+
+  await nwbuilder.default(buildOptions);
+
+  const packagedPath = join(outDir, platform, 'x64', 'package.nw', 'node_modules');
+  if (existsSync(packagedPath)) {
+    console.log(`✅ ${platform} 应用程序已包含 node_modules 目录 (${readdirSync(packagedPath).length} 个包)`);
+  } else {
+    console.log(`⚠️  ${platform} 应用程序不包含 node_modules 目录`);
+  }
+
+  console.log(`✅ ${platform} 平台构建完成 -> ${outDir}`);
+}
+
+async function build() {
+  try {
+    console.log('开始构建 NW.js 应用...\n');
+
+    console.log('1. 构建 Vue 应用...');
+    const { execSync } = require('child_process');
+    execSync('npm run build', { stdio: 'inherit', cwd: projectRoot });
+
+    console.log('\n2. 复制 package.json 到 dist 目录...');
+    copyFileSync(
+      join(projectRoot, 'package.json'),
+      join(projectRoot, 'dist', 'package.json')
+    );
+
+    console.log('\n3. 安装 npm 依赖到 dist 目录...');
+    const distPath = resolve(projectRoot, 'dist');
+    execSync('pnpm install --only=production', {
+      stdio: 'inherit',
+      cwd: distPath
+    });
+
+    if (!existsSync(join(distPath, 'node_modules'))) {
+      throw new Error('npm install 失败');
+    }
+    console.log('npm 依赖安装成功\n');
+
+    console.log('4. 配置 NW.js 构建参数...');
+
+    let platformsToBuild = [];
+
+    if (targetPlatform) {
+      if (targetPlatform === 'all') {
+        platformsToBuild = supportedPlatforms;
+        console.log(`构建所有支持平台: ${supportedPlatforms.join(', ')}`);
+      } else if (supportedPlatforms.includes(targetPlatform)) {
+        platformsToBuild = [targetPlatform];
+        console.log(`构建指定平台: ${targetPlatform}`);
+      } else {
+        console.error(`不支持的平台: ${targetPlatform}`);
+        console.log(`支持的平台: ${supportedPlatforms.join(', ')} 或 all`);
+        process.exit(1);
+      }
+    } else {
+      platformsToBuild = getCurrentPlatform();
+      console.log(`未指定平台，自动使用当前平台: ${platformsToBuild}`);
+    }
+
+    console.log(`输出目录: ${resolve(projectRoot, 'release')}`);
+
+    for (const platform of platformsToBuild) {
+      await buildPlatform(platform);
+    }
+
+    console.log('\n========================================');
+    console.log('🎉 所有平台构建完成！');
+    console.log('========================================');
+    console.log(`输出目录: ${resolve(projectRoot, 'release')}`);
+
+  } catch (error) {
+    console.error('构建过程中出错:', error);
+    process.exit(1);
+  }
+}
+
+build();

package/scripts/nw-dev.js

@@ -0,0 +1,67 @@
+const { exec } = require('child_process');
+const { createServer } = require('http');
+const { join, resolve } = require('path');
+
+const projectRoot = resolve(__dirname, '..');
+
+// 启动 Vite 开发服务器
+const viteProcess = exec('npm run dev', { cwd: projectRoot }, (error, stdout, stderr) => {
+  if (error) {
+    console.error(`执行 npm run dev 时出错: ${error}`);
+    return;
+  }
+  console.log(`stdout: ${stdout}`);
+  console.error(`stderr: ${stderr}`);
+});
+
+viteProcess.stdout.on('data', (data) => {
+  console.log(data);
+  // 当 Vite 服务器启动成功后，启动 NW.js
+  if (data.includes('ready')) {
+    setTimeout(() => {
+      console.log('starting NW.js...', 'npx nw . --url=http://localhost:9300');
+      const nwProcess = exec('npx nw . --url=http://localhost:9300', { cwd: projectRoot }, (error, stdout, stderr) => {
+        if (error) {
+          console.error(`启动 NW.js 时出错: ${error}`);
+          return;
+        }
+        console.log(`stdout: ${stdout}`);
+        console.error(`stderr: ${stderr}`);
+      });
+
+      nwProcess.stdout.on('data', (data) => {
+        console.log(data);
+      });
+
+      nwProcess.stderr.on('data', (data) => {
+        console.error(data);
+      });
+
+      nwProcess.on('close', (code) => {
+        console.log(`NW.js 进程退出，代码: ${code}`);
+        viteProcess.kill();
+      });
+
+      // 处理退出信号
+      process.on('SIGINT', () => {
+        nwProcess.kill();
+        viteProcess.kill();
+        process.exit();
+      });
+
+      process.on('SIGTERM', () => {
+        nwProcess.kill();
+        viteProcess.kill();
+        process.exit();
+      });
+    }, 2000);
+  }
+});
+
+viteProcess.stderr.on('data', (data) => {
+  console.error(data);
+});
+
+viteProcess.on('close', (code) => {
+  console.log(`Vite 进程退出，代码: ${code}`);
+});

package/scripts/preinstall.js

@@ -0,0 +1,112 @@
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+const os = require('os');
+
+console.log('Checking for running fdb2 instances...');
+
+try {
+  let pid = null;
+
+  // 检查当前目录的 PID 文件
+  const currentDirPidPath = path.join(process.cwd(), 'fdb2.server.pid');
+  if (fs.existsSync(currentDirPidPath)) {
+    try {
+      pid = parseInt(fs.readFileSync(currentDirPidPath, 'utf8'));
+      process.kill(pid, 0);
+      console.log('Found running fdb2 instance with PID:', pid);
+    } catch (error) {
+      if (error.code !== 'ESRCH') {
+        throw error;
+      }
+    }
+  }
+
+  // 如果没有找到，尝试从全局安装目录查找
+  if (!pid) {
+    try {
+      const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+      
+      if (fs.existsSync(globalPidPath)) {
+        try {
+          pid = parseInt(fs.readFileSync(globalPidPath, 'utf8'));
+          process.kill(pid, 0);
+          console.log('Found running fdb2 instance with PID:', pid);
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+    } catch (error) {
+      // 忽略全局路径查找失败
+    }
+  }
+
+  // 如果找到了运行中的进程，尝试停止它
+  if (pid) {
+    console.log('Stopping fdb2...');
+    
+    try {
+      if (os.platform() === 'win32') {
+        // Windows: 使用 taskkill
+        execSync(`taskkill /F /PID ${pid}`, { stdio: 'inherit' });
+      } else {
+        // Unix-like: 使用 kill
+        process.kill(pid, 'SIGTERM');
+        
+        // 等待进程结束
+        let attempts = 0;
+        while (attempts < 10) {
+          try {
+            process.kill(pid, 0);
+            attempts++;
+            // 等待 100ms
+            Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);
+          } catch (error) {
+            if (error.code === 'ESRCH') {
+              // 进程已结束
+              break;
+            }
+          }
+        }
+        
+        // 如果进程还在运行，强制终止
+        try {
+          process.kill(pid, 0);
+          process.kill(pid, 'SIGKILL');
+        } catch (error) {
+          if (error.code !== 'ESRCH') {
+            throw error;
+          }
+        }
+      }
+      
+      console.log('fdb2 stopped successfully');
+    } catch (stopError) {
+      console.warn('Failed to stop fdb2:', stopError.message);
+      console.warn('Please manually stop the fdb2 process before installation');
+    }
+  } else {
+    console.log('No running fdb2 instance found');
+  }
+
+  // 清理 PID 文件
+  if (fs.existsSync(currentDirPidPath)) {
+    fs.unlinkSync(currentDirPidPath);
+  }
+  
+  try {
+    const globalPath = execSync('npm root -g', { encoding: 'utf8' }).trim();
+    const globalPidPath = path.join(globalPath, 'fdb2', 'fdb2.server.pid');
+    if (fs.existsSync(globalPidPath)) {
+      fs.unlinkSync(globalPidPath);
+    }
+  } catch (error) {
+    // 忽略全局路径清理失败
+  }
+
+} catch (error) {
+  console.warn('Pre-install check failed:', error.message);
+}