fdb2 1.0.23 → 1.0.26

package/scripts/electron-build.js

@@ -0,0 +1,145 @@
+/**
+ * @file Electron 构建脚本
+ * @description 构建前端 + 服务端，然后使用 electron-builder 打包桌面应用
+ *
+ * 用法:
+ *   node scripts/electron-build.js                  # 当前平台
+ *   node scripts/electron-build.js --platform=win   # Windows
+ *   node scripts/electron-build.js --platform=mac   # macOS
+ *   node scripts/electron-build.js --platform=linux # Linux
+ *   node scripts/electron-build.js --platform=all   # 所有平台
+ */
+
+const path = require('path');
+const { execSync } = require('child_process');
+
+const projectRoot = path.resolve(__dirname, '..');
+
+// Use Chinese mirror for local builds (outside CI). GitHub Actions runners can access GitHub directly.
+if (!process.env.CI) {
+  if (!process.env.ELECTRON_MIRROR) {
+    process.env.ELECTRON_MIRROR = 'https://npmmirror.com/mirrors/electron/';
+  }
+  if (!process.env.ELECTRON_BUILDER_BINARIES_MIRROR) {
+    process.env.ELECTRON_BUILDER_BINARIES_MIRROR = 'https://npmmirror.com/mirrors/electron-builder-binaries/';
+  }
+}
+
+const args = process.argv.slice(2);
+const targetPlatform = args.find(arg => arg.startsWith('--platform='))?.split('=')[1];
+
+function getCurrentPlatform() {
+  switch (process.platform) {
+    case 'darwin': return 'mac';
+    case 'win32': return 'win';
+    default: return 'linux';
+  }
+}
+
+async function build() {
+  try {
+    console.log('Building FDB2 Electron app...\n');
+
+    // 1. 构建前端 + 服务端
+    console.log('1. Building Vue app + server...');
+    execSync('npm run build', { stdio: 'inherit', cwd: projectRoot });
+
+    // 2. Rebuild native modules for Electron
+    console.log('\n2. Rebuilding native modules for Electron...');
+    try {
+      // macOS 26+ 的 C++ 头文件在 SDK 内部，需要额外 -isystem 路径
+      const env = { ...process.env };
+      if (process.platform === 'darwin') {
+        try {
+          const sdkPath = execSync('xcrun --show-sdk-path', { encoding: 'utf-8' }).trim();
+          env.CXXFLAGS = (env.CXXFLAGS || '') + ` -isystem ${sdkPath}/usr/include/c++/v1`;
+          console.log(`macOS SDK: ${sdkPath}`);
+        } catch (e) { /* ignore */ }
+      }
+
+      const electronVersion = require('electron/package.json').version;
+      const nodedir = path.join(require('os').homedir(), '.electron-gyp', electronVersion);
+      const arch = process.arch;
+      const gypArgs = `--target=${electronVersion} --arch=${arch} --nodedir=${nodedir}`;
+
+      // 确保 Electron headers 已下载
+      try {
+        require('fs').accessSync(nodedir);
+      } catch {
+        console.log('Downloading Electron headers...');
+        execSync(`npx node-gyp install ${gypArgs}`, { stdio: 'inherit', cwd: projectRoot, env });
+      }
+
+      // 逐个编译原生模块
+      const nativeModules = ['better-sqlite3'];
+      for (const mod of nativeModules) {
+        let modDir;
+        try {
+          modDir = execSync(`node -p "require.resolve('${mod}/package.json').replace('/package.json','')"`, { encoding: 'utf-8', cwd: projectRoot }).trim();
+        } catch (e) {
+          console.warn(`  Warning: Cannot resolve ${mod}, skipping`);
+          continue;
+        }
+        console.log(`Building ${mod} at ${modDir}...`);
+        try {
+          execSync(`npx node-gyp configure ${gypArgs}`, { stdio: 'inherit', cwd: modDir, env });
+          // macOS: 修复过时的 deployment target (10.7 → 11.0)
+          if (process.platform === 'darwin') {
+            execSync(`find build -name "*.mk" -exec sed -i '' 's/-mmacosx-version-min=10\\.7/-mmacosx-version-min=11.0/g' {} +`, { cwd: modDir });
+          }
+          execSync(`make -C build`, { stdio: 'inherit', cwd: modDir, env });
+          console.log(`  OK: ${mod} built successfully`);
+        } catch (e) {
+          console.warn(`  Warning: ${mod} build failed (non-fatal):`, e.message);
+        }
+      }
+    } catch (e) {
+      console.warn('Native module rebuild failed (non-fatal):', e.message);
+    }
+
+    // 3. 使用 electron-builder 打包
+    console.log('\n3. Packaging with electron-builder...');
+
+    const builder = require('electron-builder');
+    const platform = targetPlatform || getCurrentPlatform();
+
+    const platformMap = {
+      mac: builder.Platform.MAC.createTarget(),
+      win: builder.Platform.WINDOWS.createTarget(),
+      linux: builder.Platform.LINUX.createTarget(),
+    };
+
+    let targets;
+    if (platform === 'all') {
+      targets = {
+        ...platformMap.mac,
+        ...platformMap.win,
+        ...platformMap.linux,
+      };
+    } else if (platformMap[platform]) {
+      targets = platformMap[platform];
+    } else {
+      console.error(`Unsupported platform: ${platform}`);
+      console.error('Supported: mac, win, linux, all');
+      process.exit(1);
+    }
+
+    await builder.build({
+      targets,
+      config: {
+        ...require(path.resolve(projectRoot, 'electron-builder.json')),
+        // In CI, enable native module rebuild (build tools available)
+        npmRebuild: !!process.env.CI,
+      },
+      projectDir: projectRoot,
+      publish: 'never',
+    });
+
+    console.log('\nBuild complete! Check the release/ directory.');
+  } catch (error) {
+    console.error('Build failed:', error);
+    process.exit(1);
+  }
+}
+
+build();

package/scripts/electron-dev.js

@@ -0,0 +1,116 @@
+/**
+ * @file Electron 开发模式启动脚本
+ * @description 启动 Vite 开发服务器，然后启动 Electron 窗口指向 Vite
+ *
+ * 用法: node scripts/electron-dev.js
+ */
+
+const { exec, spawn } = require('child_process');
+const { resolve } = require('path');
+const os = require('os');
+
+const projectRoot = resolve(__dirname, '..');
+const preferredPort = process.env.VITE_PORT || 9800;
+const isWindows = os.platform() === 'win32';
+let viteUrl = null;
+let electronProcess = null;
+
+// 启动 Vite 开发服务器（加大 maxBuffer 避免长时间运行溢出）
+const viteProcess = exec('npm run dev', {
+  cwd: projectRoot,
+  maxBuffer: 10 * 1024 * 1024,
+  env: { ...process.env, VITE_PORT: String(preferredPort) },
+});
+
+let readyTimer = null;
+
+// 去除 ANSI 转义码，避免干扰正则匹配
+function stripAnsi(str) {
+  return str.replace(/\x1b\[[0-9;]*m/g, '').replace(/\x1b\][^\x07]*\x07/g, '');
+}
+
+// 同时监听 stdout 和 stderr，Vite v8 可能将 URL 信息输出到 stderr
+function handleOutput(data) {
+  const raw = data.toString();
+  console.log(raw);
+
+  const output = stripAnsi(raw);
+
+  // 从 Vite 输出中解析实际端口（如 "Local: http://localhost:9804/"）
+  const localMatch = output.match(/Local:\s+https?:\/\/localhost:(\d+)/);
+  if (localMatch) {
+    viteUrl = `http://localhost:${localMatch[1]}`;
+    console.log(`[electron-dev] Detected Vite URL: ${viteUrl}`);
+    // 延迟启动 Electron，等 Vite 完全就绪
+    if (!readyTimer) {
+      readyTimer = setTimeout(() => {
+        console.log(`[electron-dev] Starting Electron...`);
+        startElectron();
+      }, 1500);
+    }
+  }
+}
+
+viteProcess.stdout.on('data', handleOutput);
+viteProcess.stderr.on('data', handleOutput);
+viteProcess.on('close', (code) => console.log(`[electron-dev] Vite exited: ${code}`));
+
+// 超时兜底：30秒内未匹配到 Vite URL，尝试使用默认端口
+const FALLBACK_TIMEOUT = 30000;
+const fallbackTimer = setTimeout(() => {
+  if (!viteUrl && !readyTimer) {
+    console.warn(`[electron-dev] Timeout: Vite URL not detected after ${FALLBACK_TIMEOUT / 1000}s, falling back to port ${preferredPort}`);
+    viteUrl = `http://localhost:${preferredPort}`;
+    console.log(`[electron-dev] Starting Electron with fallback URL: ${viteUrl}`);
+    startElectron();
+  }
+}, FALLBACK_TIMEOUT);
+
+function startElectron() {
+  if (electronProcess || !viteUrl) return; // 避免重复启动或 URL 未就绪
+
+  const electronBin = require('electron');
+  const mainScript = resolve(projectRoot, 'electron', 'main.js');
+
+  electronProcess = spawn(electronBin, [mainScript, `--dev-url=${viteUrl}`], {
+    cwd: projectRoot,
+    stdio: 'inherit',
+    env: { ...process.env, ELECTRON_DISABLE_SECURITY_WARNINGS: 'true', ELECTRON_DEV: '1' },
+  });
+
+  electronProcess.on('close', (code) => {
+    console.log(`[electron-dev] Electron exited: ${code}`);
+    killProcessTree(viteProcess);
+    process.exit(code || 0);
+  });
+
+  electronProcess.on('error', (err) => {
+    console.error('[electron-dev] Failed to start Electron:', err);
+    killProcessTree(viteProcess);
+    process.exit(1);
+  });
+}
+
+// 杀进程树（Windows 下需要 taskkill 清理子进程，避免端口残留）
+function killProcessTree(proc) {
+  if (!proc || proc.killed) return;
+  if (isWindows && proc.pid) {
+    try {
+      exec(`taskkill /pid ${proc.pid} /T /F`, { timeout: 5000 });
+    } catch (e) { /* ignore */ }
+  } else {
+    proc.kill('SIGTERM');
+  }
+}
+
+// 信号处理
+function cleanup() {
+  clearTimeout(fallbackTimer);
+  clearTimeout(readyTimer);
+  if (electronProcess) killProcessTree(electronProcess);
+  killProcessTree(viteProcess);
+  process.exit();
+}
+
+process.on('SIGINT', cleanup);
+process.on('SIGTERM', cleanup);

package/server.js

@@ -6,6 +6,7 @@ const fs = require('fs');
 
 // 预加载 better-sqlite3 模块，确保原生绑定文件能够正确加载
 // 并将其缓存到全局模块缓存中，以便 dist/server/index.js 可以使用
+const { getDataPath } = require('./dist/server/utils/data-dir');
 try {
   const betterSqlite3 = require('better-sqlite3');
   console.log('better-sqlite3 module preloaded successfully');
@@ -26,8 +27,11 @@ try {
   console.error('Warning: Failed to preload better-sqlite3 module:', error.message);
 }
 
-// 日志文件路径 - 使用绝对路径
-const logFilePath = path.resolve(__dirname, 'server.log');
+// 日志文件路径 - 使用统一数据目录
+const logFilePath = getDataPath('server.log');
+
+// PID 文件路径 - 使用统一数据目录
+const pidFilePath = getDataPath('fdb2.server.pid');
 
 // 重定向控制台输出到日志文件
 const logStream = fs.createWriteStream(logFilePath, { flags: 'a' });
@@ -122,7 +126,6 @@ const PORT = portFromArgs || process.env.PORT || 9800;
 app.listen(PORT, () => {
   
   // 将 PID 写入 PID 文件
-  const pidFilePath = path.join(__dirname, 'fdb2.server.pid');
   fs.writeFileSync(pidFilePath, process.pid.toString());
   console.log(`PID ${process.pid} written to ${pidFilePath}`);
   

package/dist/package.json

@@ -1,139 +0,0 @@
-{
-  "name": "fdb2",
-  "version": "1.0.17",
-  "private": false,
-  "type": "commonjs",
-  "main": "view/index.html",
-  "files": [
-    "bin/",
-    "public/",
-    "view/",
-    "scripts/",
-    "server.js",
-    "package.json",
-    "README.md"
-  ],
-  "homepage": "https://surl.fit/tools/tools/fdb2",
-  "icon": "public/favicon.ico",
-  "window": {
-    "title": "数据库管理工具",
-    "width": 1200,
-    "height": 800,
-    "min_width": 800,
-    "min_height": 600,
-    "resizable": true,
-    "show_in_taskbar": true,
-    "frame": true,
-    "icon": "public/favicon.ico"
-  },
-  "scripts": {
-    "start": "pm2 start server.js --name fdb2-server --disable-logs --",
-    "restart": "pm2 restart fdb2-server --disable-logs --",
-    "stop": "pm2 stop fdb2-server --",
-    "dev": "vite",
-    "build": "npm run build-only",
-    "preview": "vite preview",
-    "test:unit": "vitest",
-    "build-only": "vite build && npm run build-server",
-    "build-server": "tsc -p tsconfig.server.json",
-    "build:vscode": "vite build --config vite.config.vscode.ts",
-    "build:vscode:extension": "cd packages/vscode && npm run compile",
-    "build:all": "npm run build && npm run build:vscode && npm run build:vscode:extension",
-    "move-assets": "node move-assets.cjs",
-    "type-check": "vue-tsc --noEmit --composite false",
-    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
-    "nw:dev": "node scripts/nw-dev.js",
-    "nw:build": "node scripts/nw-build.js",
-    "nw:build:win": "node scripts/nw-build.js --platform=win",
-    "nw:build:osx": "node scripts/nw-build.js --platform=osx",
-    "nw:build:linux": "node scripts/nw-build.js --platform=linux",
-    "pkg:server": "cd d:/code/ycnull/db_tool && pkg dist/server/index.js -t node18-win-x64 -o dist/server/server.exe",
-    "build:server:pkg": "ncc build server/index.ts -o dist/server/pkg",
-    "vscode:dev": "cd packages/vscode && npm run watch",
-    "vscode:package": "cd packages/vscode && vsce package"
-  },
-  "dependencies": {
-    "@fefeding/common": "^1.0.58",
-    "axios": "^1.15.0",
-    "dayjs": "^1.11.20",
-    "express": "^5.2.1",
-    "mysql2": "^3.22.1",
-    "oracledb": "^6.10.0",
-    "pg": "^8.20.0",
-    "reflect-metadata": "^0.2.2",
-    "typeorm": "^0.3.28"
-  },
-  "optionalDependencies": {
-    "better-sqlite3": "^11.10.0"
-  },
-  "devDependencies": {
-    "@codemirror/commands": "^6.10.3",
-    "@codemirror/fold": "^0.19.4",
-    "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-sql": "^6.10.0",
-    "@codemirror/language": "^6.12.3",
-    "@codemirror/state": "^6.6.0",
-    "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.41.0",
-    "@fefeding/eventemitter": "^1.0.5",
-    "@fefeding/vite-nunjucks-plugin": "^1.0.2",
-    "@popperjs/core": "^2.11.8",
-    "@rollup/pluginutils": "^5.3.0",
-    "@types/bootstrap": "^5.2.10",
-    "@types/jsdom": "^21.1.7",
-    "@types/node": "^24.12.2",
-    "@types/vue": "^2.0.0",
-    "@vitejs/plugin-vue": "^6.0.6",
-    "@vitejs/plugin-vue-jsx": "^5.1.5",
-    "@vue/tsconfig": "^0.8.1",
-    "@vueuse/core": "^13.9.0",
-    "@zumer/snapdom": "^1.9.14",
-    "autoprefixer": "^10.5.0",
-    "bootstrap": "^5.3.8",
-    "bootstrap-icons": "^1.13.1",
-    "codemirror": "^6.0.2",
-    "dotenv": "^17.4.2",
-    "echarts": "^6.0.0",
-    "exceljs": "^4.4.0",
-    "js-cookie": "^3.0.5",
-    "jsdom": "^26.1.0",
-    "jszip": "^3.10.1",
-    "nw": "^0.107.0",
-    "nw-builder": "^4.17.7",
-    "pinia": "^3.0.4",
-    "pinia-plugin-persistedstate": "^4.7.1",
-    "postcss": "^8.5.10",
-    "sass": "^1.99.0",
-    "tailwindcss": "^3.4.19",
-    "typescript": "^5.9.3",
-    "vconsole": "^3.15.1",
-    "vite": "latest",
-    "vite-plugin-files-copy": "^3.8.0",
-    "vitest": "^3.2.4",
-    "vue": "^3.5.32",
-    "vue-router": "^4.6.4",
-    "vue-tsc": "^3.2.6",
-    "vuex": "^4.1.0",
-    "xlsx": "^0.18.5"
-  },
-  "bin": {
-    "fdb2": "bin/fdb2.js"
-  },
-  "pkg": {
-    "scripts": [
-      "dist/server/**/*.js"
-    ],
-    "assets": [
-      "dist/node_modules/**/*",
-      "dist/client/**/*"
-    ]
-  },
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "better-sqlite3"
-    ]
-  }
-}