fdb2 1.0.23 → 1.0.26

package/electron/main.js

@@ -0,0 +1,269 @@
+/**
+ * @file Electron 主进程入口
+ * @description 创建桌面窗口，通过 IPC 直接处理数据库 API 请求（无需 HTTP 服务）
+ *
+ * 生产模式：加载本地 HTML，API 通过主进程 IPC 通信
+ * 开发模式：连接 Vite 开发服务器（API 走 HTTP）
+ */
+
+const { app, BrowserWindow, shell, ipcMain, protocol, net, Menu } = require('electron');
+const path = require('path');
+const fs = require('fs');
+const { initAutoUpdater } = require('./updater');
+
+// ========== 日志输出到文件（生产模式调试用） ==========
+// 打包后 __dirname 指向 app.asar 内部（只读），日志须写到用户数据目录
+const logDir = app.isPackaged
+  ? path.join(app.getPath('userData'), 'logs')
+  : path.join(__dirname, '..', 'logs');
+try { if (!fs.existsSync(logDir)) fs.mkdirSync(logDir, { recursive: true }); } catch (e) { /* ignore */ }
+const logFile = path.join(logDir, 'electron.log');
+const logStream = (() => {
+  try {
+    return fs.createWriteStream(logFile, { flags: 'w' });
+  } catch (e) { return null; }
+})();
+const origLog = console.log;
+const origError = console.error;
+const origWarn = console.warn;
+function ts() { return new Date().toISOString(); }
+console.log = function(...args) {
+  origLog.apply(console, args);
+  if (logStream) logStream.write(`[${ts()}] LOG ${args.map(a => typeof a === 'string' ? a : JSON.stringify(a)).join(' ')}\n`);
+};
+console.error = function(...args) {
+  origError.apply(console, args);
+  if (logStream) logStream.write(`[${ts()}] ERR ${args.map(a => typeof a === 'string' ? a : (a instanceof Error ? a.message + '\n' + a.stack : JSON.stringify(a))).join(' ')}\n`);
+};
+console.warn = function(...args) {
+  origWarn.apply(console, args);
+  if (logStream) logStream.write(`[${ts()}] WRN ${args.map(a => typeof a === 'string' ? a : JSON.stringify(a)).join(' ')}\n`);
+};
+console.log(`[Electron] Log file: ${logFile}`);
+console.log(`[Electron] App starting, packaged: ${app.isPackaged}, platform: ${process.platform}, arch: ${process.arch}`);
+console.log(`[Electron] __dirname: ${__dirname}, cwd: ${process.cwd()}`);
+
+// ========== 注册自定义协议（必须在 app.whenReady 之前） ==========
+// 解决 file:// 协议下绝对路径（/public/xxx.js）无法加载的问题
+protocol.registerSchemesAsPrivileged([
+  { scheme: 'app', privileges: { standard: true, secure: true, supportFetchAPI: true } },
+]);
+
+// 解析命令行参数
+const args = process.argv.slice(app.isPackaged ? 1 : 2);
+const devUrl = args.find(a => a.startsWith('--dev-url='))?.split('=')[1];
+const isDev = !!devUrl;
+
+let mainWindow = null;
+
+// ========== 服务实例（延迟加载） ==========
+let _serverModule = null;
+
+function getServerModule() {
+  if (_serverModule) return _serverModule;
+  if (isDev) {
+    console.warn('[Electron] Dev mode: services are provided by Vite dev server, IPC disabled');
+    return null;
+  }
+  try {
+    // 生产模式下，__dirname 指向 app.asar/electron/
+    // 需要加载 app.asar/dist/server/index.js
+    const serverPath = path.join(__dirname, '..', 'dist', 'server', 'index.js');
+    console.log(`[Electron] Loading server module from: ${serverPath}`);
+    console.log(`[Electron] __dirname: ${__dirname}`);
+    console.log(`[Electron] File exists: ${require('fs').existsSync(serverPath)}`);
+    
+    // 在 asar 包内，需要使用 require 直接加载，而不是先检查文件是否存在
+    _serverModule = require(serverPath);
+    console.log(`[Electron] Server module loaded, keys: ${Object.keys(_serverModule).join(', ')}`);
+    return _serverModule;
+  } catch (e) {
+    console.error(`[Electron] Failed to load server module: ${e.message}`);
+    console.error(e.stack);
+    return null;
+  }
+}
+
+// ========== API IPC 处理（替代渲染进程 HTTP 请求） ==========
+
+function setupApiIPC() {
+  ipcMain.handle('api:request', async (_event, payload) => {
+    const serverModule = getServerModule();
+    if (!serverModule) {
+      return { ret: 500, msg: 'Services not available (dev mode - use Vite HTTP server instead)' };
+    }
+    try {
+      const pathname = String(payload?.pathname || '');
+      if (!pathname.startsWith('/api/')) {
+        return { ret: 400, msg: 'Invalid API path' };
+      }
+      const data = await serverModule.handleDatabaseRoutes(pathname, payload?.body || {});
+      // 确保返回数据可被 structured clone 序列化（去除 TypeORM 实体等复杂对象）
+      let safeData;
+      try {
+        safeData = JSON.parse(JSON.stringify(data));
+      } catch (e) {
+        safeData = data;
+      }
+      return { ret: 0, msg: 'success', data: safeData };
+    } catch (err) {
+      console.error('[IPC] API request failed:', err);
+      return { ret: 500, msg: err.message || 'Internal error' };
+    }
+  });
+}
+
+// ========== 创建窗口 ==========
+
+function createWindow(loadTarget) {
+  mainWindow = new BrowserWindow({
+    width: 1200,
+    height: 800,
+    minWidth: 800,
+    minHeight: 600,
+    show: false,
+    title: 'FDB2 - 数据库管理工具',
+    icon: path.join(__dirname, '..', 'public', process.platform === 'darwin' || process.platform === 'win32' ? 'favicon.ico' : 'favicon.png'),
+    webPreferences: {
+      preload: path.join(__dirname, 'preload.js'),
+      nodeIntegration: false,
+      contextIsolation: true,
+      sandbox: true,
+    },
+  });
+
+  mainWindow.once('ready-to-show', () => {
+    mainWindow.show();
+  });
+
+  mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+    if (url.startsWith('http')) shell.openExternal(url);
+    return { action: 'deny' };
+  });
+
+  if (loadTarget.startsWith('http')) {
+    mainWindow.loadURL(loadTarget);
+  } else if (loadTarget.startsWith('app://')) {
+    mainWindow.loadURL(loadTarget);
+  } else {
+    mainWindow.loadFile(loadTarget);
+  }
+
+  mainWindow.on('closed', () => {
+    mainWindow = null;
+  });
+
+  if (isDev) {
+    mainWindow.webContents.openDevTools({ mode: 'detach' });
+  }
+
+  // 生产模式下可通过快捷键打开 DevTools 调试
+  mainWindow.webContents.on('before-input-event', (event, input) => {
+    if ((input.meta || input.control) && input.shift && input.key.toLowerCase() === 'i') {
+      mainWindow.webContents.toggleDevTools();
+    }
+  });
+}
+
+// ========== 应用菜单 ==========
+
+function setupMenu() {
+  const template = [
+    {
+      label: 'Edit',
+      submenu: [
+        { role: 'undo' },
+        { role: 'redo' },
+        { type: 'separator' },
+        { role: 'cut' },
+        { role: 'copy' },
+        { role: 'paste' },
+        { role: 'selectAll' },
+      ],
+    },
+    {
+      label: 'Help',
+      submenu: [
+        { label: 'About FDB2', click: () => shell.openExternal('https://github.com/fefeding/fdb2') },
+        { type: 'separator' },
+        { label: 'Check for Updates...', click: () => {
+          if (mainWindow && !mainWindow.isDestroyed()) {
+            mainWindow.webContents.send('menu:action', 'check-update');
+          }
+        }},
+      ],
+    },
+  ];
+
+  // macOS 需要添加 app 菜单
+  if (process.platform === 'darwin') {
+    template.unshift({
+      label: app.name,
+      submenu: [
+        { label: 'About FDB2', click: () => shell.openExternal('https://github.com/fefeding/fdb2') },
+        { type: 'separator' },
+        { role: 'hide' },
+        { role: 'hideOthers' },
+        { role: 'unhide' },
+        { type: 'separator' },
+        { role: 'quit' },
+      ],
+    });
+  }
+
+  const menu = Menu.buildFromTemplate(template);
+  Menu.setApplicationMenu(menu);
+}
+
+// ========== 应用生命周期 ==========
+
+app.whenReady().then(() => {
+  // 注册 app:// 协议处理器（生产模式加载本地文件）
+  protocol.handle('app', (request) => {
+    const { pathname } = new URL(request.url);
+    // app://local/xxx → 项目根目录/dist/xxx
+    const filePath = path.join(__dirname, '..', 'dist', pathname);
+    return net.fetch('file://' + filePath);
+  });
+
+  setupApiIPC();
+  setupMenu();
+
+  // 初始化服务（仅生产模式加载模块，开发模式由 Vite 提供）
+  try {
+    const serverModule = getServerModule();
+    if (serverModule) {
+      console.log('[Electron] Server module initialized (production mode)');
+    } else {
+      console.log('[Electron] Server module skipped (dev mode - using Vite dev server)');
+    }
+  } catch (e) {
+    console.error('[Electron] Failed to initialize server module:', e.message);
+  }
+
+  let target;
+  if (isDev) {
+    target = devUrl;
+    console.log(`[Electron] Dev mode, connecting to ${target}`);
+  } else {
+    target = 'app://local/view/index.html';
+    console.log(`[Electron] Production mode, loading ${target}`);
+  }
+
+  createWindow(target);
+
+  // 初始化自动更新（生产模式启用，开发模式自动禁用）
+  initAutoUpdater({ isDev });
+
+  app.on('activate', () => {
+    if (BrowserWindow.getAllWindows().length === 0) {
+      createWindow(target);
+    }
+  });
+});
+
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});

package/electron/preload.js

@@ -0,0 +1,59 @@
+/**
+ * @file Electron 预加载脚本
+ * @description 通过 contextBridge 向渲染进程暴露最小 IPC 通信接口
+ */
+
+const { contextBridge, ipcRenderer, clipboard } = require('electron');
+
+// 自动更新 API
+const updater = {
+  /** 手动检查更新 */
+  checkForUpdates() {
+    return ipcRenderer.invoke('update:check');
+  },
+  /** 获取当前更新状态 */
+  getStatus() {
+    return ipcRenderer.invoke('update:status');
+  },
+  /** 安装更新并重启 */
+  install() {
+    return ipcRenderer.invoke('update:install');
+  },
+  /** 监听更新事件（available, progress, downloaded, error） */
+  onEvent(callback) {
+    const handler = (_event, msg) => callback(msg);
+    ipcRenderer.on('update:event', handler);
+    return () => ipcRenderer.removeListener('update:event', handler);
+  },
+  /** 监听菜单操作（如 check-update） */
+  onMenuAction(callback) {
+    const handler = (_event, action) => callback(action);
+    ipcRenderer.on('menu:action', handler);
+    return () => ipcRenderer.removeListener('menu:action', handler);
+  },
+};
+
+const api = {
+  request(pathname, body) {
+    return ipcRenderer.invoke('api:request', { pathname, body });
+  },
+};
+
+// 剪贴板操作（contextIsolation 下渲染进程无法直接访问 navigator.clipboard）
+const clip = {
+  writeText(text) {
+    clipboard.writeText(text);
+  },
+  readText() {
+    return clipboard.readText();
+  },
+};
+
+contextBridge.exposeInMainWorld('electronAPI', {
+  isElectron: true,
+  isPackaged: !process.env.ELECTRON_DEV,
+  platform: process.platform,
+  api,
+  clipboard: clip,
+  updater,
+});

package/electron/updater.js

@@ -0,0 +1,181 @@
+/**
+ * @file Electron 自动更新模块
+ * @description 使用 electron-updater 检测、下载和安装应用更新
+ *
+ * 更新流程：
+ * 1. 应用启动时自动检查更新
+ * 2. 发现新版本 → 通知渲染进程显示提示
+ * 3. 后台下载更新（利用 blockmap 增量下载）
+ * 4. 下载完成 → 通知渲染进程显示"重启安装"按钮
+ * 5. 用户确认后重启并安装
+ */
+
+const { autoUpdater } = require('electron-updater');
+const { BrowserWindow, ipcMain, app } = require('electron');
+
+// 更新状态
+let updateAvailable = null;
+let updateDownloaded = false;
+let downloadProgress = null;
+
+/**
+ * 向所有窗口广播更新事件
+ */
+function broadcastUpdate(event, data) {
+  BrowserWindow.getAllWindows().forEach((win) => {
+    if (!win.isDestroyed()) {
+      win.webContents.send('update:event', { event, data });
+    }
+  });
+}
+
+/**
+ * 初始化自动更新
+ * @param {object} options - 配置选项
+ * @param {boolean} options.isDev - 是否开发模式
+ */
+function initAutoUpdater(options = {}) {
+  // 开发模式下禁用自动更新
+  if (options.isDev) {
+    console.log('[Updater] Disabled in dev mode');
+    return;
+  }
+
+  // 未打包时禁用（如通过 npm start 运行的 Web 模式）
+  if (!app.isPackaged) {
+    console.log('[Updater] Disabled: app is not packaged');
+    return;
+  }
+
+  // 配置 autoUpdater
+  autoUpdater.autoDownload = true;
+  autoUpdater.autoInstallOnAppQuit = true;
+
+  // 事件监听
+  autoUpdater.on('checking-for-update', () => {
+    console.log('[Updater] Checking for updates...');
+    broadcastUpdate('checking', null);
+  });
+
+  autoUpdater.on('update-available', (info) => {
+    console.log(`[Updater] Update available: v${info.version}`);
+    updateAvailable = info;
+    updateDownloaded = false;
+    broadcastUpdate('available', {
+      version: info.version,
+      releaseDate: info.releaseDate,
+      releaseNotes: info.releaseNotes,
+    });
+  });
+
+  autoUpdater.on('update-not-available', (info) => {
+    console.log(`[Updater] Already up to date: v${info.version}`);
+    updateAvailable = null;
+    updateDownloaded = false;
+    broadcastUpdate('not-available', { version: info.version });
+  });
+
+  autoUpdater.on('download-progress', (progress) => {
+    downloadProgress = {
+      percent: Math.round(progress.percent),
+      bytesPerSecond: progress.bytesPerSecond,
+      transferred: progress.transferred,
+      total: progress.total,
+    };
+    // 每 10% 广播一次，避免过于频繁
+    if (downloadProgress.percent % 10 === 0) {
+      broadcastUpdate('progress', downloadProgress);
+    }
+  });
+
+  autoUpdater.on('update-downloaded', (info) => {
+    console.log(`[Updater] Update downloaded: v${info.version}`);
+    updateDownloaded = true;
+    broadcastUpdate('downloaded', {
+      version: info.version,
+      releaseDate: info.releaseDate,
+      releaseNotes: info.releaseNotes,
+    });
+  });
+
+  autoUpdater.on('error', (error) => {
+    console.error('[Updater] Error:', error.message);
+    updateAvailable = null;
+    updateDownloaded = false;
+    downloadProgress = null;
+    // 静默处理网络错误，不打扰用户
+    if (!error.message.includes('net::') && !error.message.includes('ENOTFOUND')) {
+      broadcastUpdate('error', { message: error.message });
+    }
+  });
+
+  // 注册 IPC 处理器
+  setupUpdateIPC();
+
+  // 延迟 3 秒后检查更新（避免启动时太卡）
+  setTimeout(() => {
+    checkForUpdates();
+  }, 3000);
+
+  // 每小时检查一次更新
+  setInterval(() => {
+    checkForUpdates();
+  }, 60 * 60 * 1000);
+}
+
+/**
+ * 检查更新
+ */
+async function checkForUpdates() {
+  try {
+    await autoUpdater.checkForUpdates();
+  } catch (err) {
+    console.error('[Updater] Check failed:', err.message);
+  }
+}
+
+/**
+ * 安装更新并重启
+ */
+function quitAndInstall() {
+  if (updateDownloaded) {
+    autoUpdater.quitAndInstall();
+  }
+}
+
+/**
+ * 注册更新相关的 IPC 通道
+ */
+function setupUpdateIPC() {
+  // 渲染进程请求检查更新
+  ipcMain.handle('update:check', async () => {
+    await checkForUpdates();
+    return { checking: true };
+  });
+
+  // 渲染进程请求获取当前更新状态
+  ipcMain.handle('update:status', () => {
+    return {
+      updateAvailable: updateAvailable
+        ? {
+            version: updateAvailable.version,
+            releaseDate: updateAvailable.releaseDate,
+          }
+        : null,
+      updateDownloaded,
+      downloadProgress,
+    };
+  });
+
+  // 渲染进程请求安装更新
+  ipcMain.handle('update:install', () => {
+    quitAndInstall();
+    return { installing: true };
+  });
+}
+
+module.exports = {
+  initAutoUpdater,
+  checkForUpdates,
+  quitAndInstall,
+};

package/package.json

@@ -1,32 +1,21 @@
 {
   "name": "fdb2",
-  "version": "1.0.23",
+  "version": "1.0.26",
   "private": false,
   "type": "commonjs",
-  "main": "view/index.html",
+  "main": "electron/main.js",
   "files": [
     "bin/",
     "public/",
     "view/",
     "dist/",
+    "electron/",
     "scripts/",
     "server.js",
+    "bootstrap.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 --",
@@ -43,11 +32,11 @@
     "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",
+    "electron:dev": "node scripts/electron-dev.js",
+    "electron:build": "node scripts/electron-build.js",
+    "electron:build:win": "node scripts/electron-build.js --platform=win",
+    "electron:build:mac": "node scripts/electron-build.js --platform=mac",
+    "electron:build:linux": "node scripts/electron-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",
@@ -55,15 +44,16 @@
   },
   "dependencies": {
     "@fefeding/common": "^1.0.60",
-    "axios": "^1.16.1",
-    "dayjs": "^1.11.20",
+    "axios": "^1.17.0",
+    "dayjs": "^1.11.21",
+    "electron-updater": "^6.8.3",
     "express": "^5.2.1",
-    "mysql2": "^3.22.3",
+    "mysql2": "^3.22.5",
     "oracledb": "^6.10.0",
     "pg": "^8.21.0",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^0.3.30",
-    "vue-i18n": "^11.4.4"
+    "vue-i18n": "^11.4.5"
   },
   "optionalDependencies": {
     "better-sqlite3": "^11.10.0"
@@ -76,14 +66,15 @@
     "@codemirror/language": "^6.12.3",
     "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.43.0",
+    "@codemirror/view": "^6.43.1",
+    "@electron/rebuild": "^4.0.4",
     "@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",
+    "@rollup/pluginutils": "^5.4.0",
+    "@types/bootstrap": "^5.2.11",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^24.12.4",
+    "@types/node": "^24.13.2",
     "@types/vue": "^2.0.0",
     "@vitejs/plugin-vue": "^6.0.7",
     "@vitejs/plugin-vue-jsx": "^5.1.5",
@@ -96,12 +87,13 @@
     "codemirror": "^6.0.2",
     "dotenv": "^17.4.2",
     "echarts": "^6.1.0",
+    "electron": "^35.5.1",
+    "electron-builder": "^26.0.12",
+    "electron-updater": "^6.8.3",
     "exceljs": "^4.4.0",
-    "js-cookie": "^3.0.7",
+    "js-cookie": "^3.0.8",
     "jsdom": "^26.1.0",
     "jszip": "^3.10.1",
-    "nw": "^0.107.0",
-    "nw-builder": "^4.17.10",
     "pinia": "^3.0.4",
     "pinia-plugin-persistedstate": "^4.7.1",
     "postcss": "^8.5.15",
@@ -111,10 +103,10 @@
     "vconsole": "^3.15.1",
     "vite": "latest",
     "vite-plugin-files-copy": "^3.8.0",
-    "vitest": "^3.2.4",
-    "vue": "^3.5.34",
+    "vitest": "^3.2.6",
+    "vue": "^3.5.37",
     "vue-router": "^4.6.4",
-    "vue-tsc": "^3.3.2",
+    "vue-tsc": "^3.3.4",
     "vuex": "^4.1.0",
     "xlsx": "^0.18.5"
   },
@@ -135,7 +127,8 @@
   },
   "pnpm": {
     "onlyBuiltDependencies": [
-      "better-sqlite3"
+      "better-sqlite3",
+      "electron"
     ]
   }
 }