@flun/desktop-builder 1.0.3 → 1.0.4

package/CHANGELOG.md

@@ -1,13 +1,16 @@
 # 变更日志
 
+## [1.0.4] - 2026-07-05 17:17
+### 紧急修复
+- **修复依赖安装失败问题**：因 `node` 包安装脚本报错（`Cannot find module 'node-win-x64/package.json'`）导致安装中断，现通过 `--ignore-scripts` 和 `npm_config_ignore_scripts=true` 强制跳过脚本执行，确保依赖安装顺利完成。
+
+### 优化
+- **优化依赖清理逻辑**：因 Electron 已内置 Node.js 运行时，无需在应用内额外保留 `node` 包及其平台特定二进制目录（如 `node-win-x64`、`node-darwin-x64` 等）。现主动清理这些冗余目录，减小应用体积，同时避免与 Electron 内置运行时产生潜在冲突。注意：此优化不影响 `bcrypt` 等原生模块正常工作，因为所需依赖（如 `node-gyp-build`、`node-addon-api` 等）仍被保留。
+
 ## [1.0.3] - 2026-07-04 21:32
 ### 修复
 - 修复 Windows 环境下 `npx desktop-builder build` 命令无任何输出的问题（入口判断逻辑改用 `pathToFileURL` 统一路径格式）。
 
 ## [1.0.2] - 2026-07-03 10:43
 ### 优化
-- 简化使用示例；
-
-## [1.0.1] - 2026-07-03 10:38
-### 首发
-- 将任意 Node.js 网站一键打包为当前桌面应用（'win', 'mac', 'linux'）（基于 Electron），支持高度自定义配置；
+- 简化使用示例;

package/electron-main.js

@@ -13,7 +13,6 @@ import { createRequire } from 'module';
 let mainWindow = null, serverProcess = null, windowCreationPromise = null, loadRetryCount = 0;
 const require = createRequire(import.meta.url),
   __dirname = path.dirname(fileURLToPath(import.meta.url)), execPromise = promisify(exec),
-  // 配置注入
   CONFIG = {
     APP_URL: JSON.parse('__APP_URL__'),
     WINDOW_CONFIG: JSON.parse('__WINDOW_CONFIG__'),
@@ -23,15 +22,10 @@ const require = createRequire(import.meta.url),
     LOGGING_ENABLED: JSON.parse('__LOGGING_ENABLED__'),
     MENU_TEMPLATE: __MENU_TEMPLATE__,
   }, TARGET_URL = CONFIG.APP_URL,
-  // 命令行开关
   switches = ['no-sandbox', 'ignore-certificate-errors', 'allow-insecure-localhost'],
-
-  // --------------------- 函数声明 ---------------------
-  // 日志（根据配置决定是否写入）
+  // --------------------- 工具函数 ---------------------
   writeLog = (filePath, msg) => {
-    try {
-      fs.appendFileSync(filePath, new Date().toISOString() + ' ' + msg + '\n');
-    } catch (_) { }
+    try { fs.appendFileSync(filePath, new Date().toISOString() + ' ' + msg + '\n'); } catch (_) { }
   },
   log = msg => {
     if (!CONFIG.LOGGING_ENABLED) return;
@@ -41,7 +35,6 @@ const require = createRequire(import.meta.url),
     if (!CONFIG.LOGGING_ENABLED) return;
     writeLog(path.join(process.cwd(), 'myapp_emergency.log'), msg);
   },
-  // 服务器管理
   killServerProcess = () => {
     if (!serverProcess) return;
     try {
@@ -50,7 +43,6 @@ const require = createRequire(import.meta.url),
     } catch (_) { }
     serverProcess = null;
   },
-
   focusMainWindow = () => {
     if (mainWindow && !mainWindow.isDestroyed()) {
       if (mainWindow.isMinimized()) mainWindow.restore();
@@ -59,7 +51,6 @@ const require = createRequire(import.meta.url),
     return false;
   },
   sleep = ms => new Promise(resolve => setTimeout(resolve, ms)),
-  // 依赖安装
   ensureDependencies = async () => {
     const nodeModulesPath = path.join(__dirname, 'node_modules');
     try {
@@ -94,20 +85,40 @@ const require = createRequire(import.meta.url),
         return log('写入 package.json 失败: ' + err.message), false;
       }
       try {
-        let cmd = 'npm install';
+        let cmd = 'npm install --ignore-scripts --no-optional --force --no-audit --no-fund';
         const lockPath = path.join(__dirname, 'package-lock.json');
         try {
-          await fs.promises.access(lockPath, fs.constants.F_OK);
-          log('找到 package-lock.json，使用 npm ci'), cmd = 'npm ci';
+          await fs.promises.access(lockPath, fs.constants.F_OK), log('找到 package-lock.json，使用 npm ci');
+          cmd = 'npm ci --ignore-scripts --no-optional --force --no-audit --no-fund';
         } catch {
           log('未找到 package-lock.json，使用 npm install');
         }
-        const { stdout, stderr } = await execPromise(cmd, { cwd: __dirname, env: process.env, timeout: 120000 });
-        if (stdout && stderr) log('依赖安装完成');
+
+        const env = { ...process.env, npm_config_ignore_scripts: 'true', npm_config_optional: 'false' },
+          { stdout, stderr } = await execPromise(cmd, { cwd: __dirname, env: env, timeout: 120000, });
+        log('依赖安装完成');
+
+        // 删除 node 和平台特定 node-* 目录
+        try {
+          const entries = await fs.promises.readdir(nodeModulesPath, { withFileTypes: true }), toDelete = [];
+          for (const entry of entries) {
+            if (!entry.isDirectory()) continue;
+            const name = entry.name;
+            if (name === 'node') toDelete.push(path.join(nodeModulesPath, name));
+            if (/^node-(win|darwin|linux|freebsd|sunos|aix)-/.test(name)) toDelete.push(path.join(nodeModulesPath, name));
+          }
+
+          for (const dir of toDelete) {
+            await fs.promises.rm(dir, { recursive: true, force: true }), log(`已删除问题目录: ${dir}`);
+          }
+        } catch (cleanErr) {
+          log('清理目录时出错（可忽略）: ' + cleanErr.message);
+        }
+
         try {
           return await fs.promises.access(nodeModulesPath, fs.constants.F_OK), true;
         } catch {
-          return log('安装 node_modules 失败'), false;
+          return log('安装后 node_modules 仍然不存在'), false;
         }
       } catch (error) {
         return log('依赖安装失败: ' + error.message), emergencyLog('依赖安装失败堆栈: ' + error.stack), false;
@@ -115,7 +126,6 @@ const require = createRequire(import.meta.url),
     }
   },
 
-  // 端口检查
   ensurePortFree = port => {
     return new Promise((resolve) => {
       const server = net.createServer();
@@ -137,7 +147,6 @@ const require = createRequire(import.meta.url),
     });
   },
 
-  // 等待服务器就绪
   waitForServer = (port, timeout = 30000) => {
     return new Promise((resolve) => {
       const start = Date.now(), protocol = new URL(CONFIG.APP_URL).protocol,
@@ -170,7 +179,6 @@ const require = createRequire(import.meta.url),
     }
   },
 
-  // 创建窗口
   createWindow = async () => {
     if (mainWindow && !mainWindow.isDestroyed()) return focusMainWindow(), mainWindow;
     if (windowCreationPromise) {
@@ -183,13 +191,9 @@ const require = createRequire(import.meta.url),
           ...CONFIG.WINDOW_CONFIG,
           webPreferences: {
             ...CONFIG.WINDOW_CONFIG.webPreferences,
-            webSecurity: true,
-            allowRunningInsecureContent: true,
-            enableWebAuthn: true,
-            plugins: true,
-            nodeIntegration: true,
-            sandbox: false,
-            contextIsolation: false,
+            webSecurity: true, allowRunningInsecureContent: true, enableWebAuthn: true,
+            plugins: true, nodeIntegration: true,
+            sandbox: false, contextIsolation: false,
           }
         };
         mainWindow = new BrowserWindow(winConfig);
@@ -223,7 +227,6 @@ const require = createRequire(import.meta.url),
     return windowCreationPromise;
   },
 
-  // 启动服务器
   startServer = async () => {
     if (!CONFIG.AUTO_START_SERVER) return;
     const serverPath = path.join(__dirname, CONFIG.SERVER_PATH);
@@ -250,7 +253,6 @@ const require = createRequire(import.meta.url),
     log('服务器启动失败,尝试重新加载窗口');
   },
 
-  // 菜单设置（处理特殊标记）
   setupMenu = () => {
     const template = CONFIG.MENU_TEMPLATE;
     if (!template || template.length === 0) return;
@@ -285,7 +287,7 @@ try {
   app.commandLine.appendSwitch('vmodule', 'webauthn*=3');
   log(`已映射 ${hostname} 到 127.0.0.1`);
 } catch (_) { }
-// 单例锁
+
 if (!app.requestSingleInstanceLock()) { log('已有另一个实例在运行,退出'); app.quit(); }
 else app.on('second-instance', () => focusMainWindow());
 app.on('certificate-error', (e, wc, url, err, cert, cb) => { e.preventDefault(), cb(true); });
@@ -294,7 +296,7 @@ app.whenReady().then(async () => {
   setupMenu();
 
   const depsOk = await ensureDependencies();
-  if (!depsOk) log('依赖安装失败，再次尝试启动服务器（可能失败）');
+  if (!depsOk) log('依赖安装失败,再次尝试启动服务器（可能失败）');
   await startServer(), await createWindow();
 });
 

package/lib/build.js

@@ -11,11 +11,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url)), require = create
     CACHE_DIR = path.join(os.homedir(), '.electron-builder-cache'), DEFAULT_ICON = path.join(__dirname, 'app.png'),
     DEFAULT_TARGETS = { win: ['nsis'], mac: ['dmg'], linux: ['AppImage'] },
     DEFAULT_INSTALLER_ICON = path.join(__dirname, 'setup.ico'), DEFAULT_UNINSTALLER_ICON = path.join(__dirname, 'un.ico');
-/**
- * 构建桌面应用程序
-* >查看定义:@see {@link build}
- * @returns {Promise<void>}
- */
+
 const build = async () => {
     const configPath = path.join(process.cwd(), 'desktopAppConfig.js');
     if (!(await fs.pathExists(configPath)))
@@ -37,7 +33,6 @@ const build = async () => {
     const projectRoot = path.resolve(process.cwd());
     console.log(chalk.blue('[信息] 正在复制项目文件从 ' + projectRoot + ' 到 ' + tempDir));
 
-    // 复制文件，应用 excludeFiles
     await fs.copy(projectRoot, tempDir, {
         filter: (src) => {
             const relative = path.relative(projectRoot, src);
@@ -65,7 +60,6 @@ const build = async () => {
         dereference: true,
     });
 
-    // 生成 main.mjs
     const mainTemplatePath = path.join(__dirname, '..', 'electron-main.js'),
         mainTemplate = await fs.readFile(mainTemplatePath, 'utf-8');
 
@@ -76,7 +70,7 @@ const build = async () => {
             return value;
         });
     }
-    else console.log(chalk.yellow('[警告] 未配置菜单，将使用默认英文菜单;'));
+    else console.log(chalk.yellow('[警告] 未配置菜单,将使用默认英文菜单;'));
 
     const windowConfig = {
         width: 1200, height: 800, minWidth: 800, minHeight: 600,
@@ -96,9 +90,8 @@ const build = async () => {
             .replace('__AUTO_KILL_SERVER__', JSON.stringify(advanced.autoKillServer))
             .replace('__MENU_TEMPLATE__', menuCode)
             .replace('__LOGGING_ENABLED__', JSON.stringify(enableLogging));
-
     await fs.writeFile(path.join(tempDir, 'main.mjs'), mainJs);
-    // 处理 package.json
+
     const origPkgPath = path.join(projectRoot, 'package.json');
     let allDeps = {}, pkgJson = {};
     if (await fs.pathExists(origPkgPath)) {
@@ -116,7 +109,6 @@ const build = async () => {
     await fs.writeJson(path.join(tempDir, 'deps.json'), allDeps, { spaces: 2 });
     console.log(chalk.blue('[信息] 成功写入 ' + Object.keys(allDeps).length + ' 个依赖包到 deps.json'));
 
-    // 图标处理
     const handleIcon = async (userPath, defaultPath, img, label) => {
         const resolved = userPath ? path.resolve(process.cwd(), userPath) : null;
         let src = (resolved && (await fs.pathExists(resolved))) ? resolved : defaultPath;
@@ -129,7 +121,6 @@ const build = async () => {
     await handleIcon(config.branding?.installerIcon, DEFAULT_INSTALLER_ICON, 'installer.ico', '安装');
     await handleIcon(config.branding?.uninstallerIcon, DEFAULT_UNINSTALLER_ICON, 'uninstaller.ico', '卸载');
 
-    // Electron 版本
     let electronVersion;
     try {
         const electronPkgPath = require.resolve('electron/package.json'), electronPkg = await fs.readJson(electronPkgPath);
@@ -138,7 +129,6 @@ const build = async () => {
         console.error(chalk.red('[错误] 未找到 electron 包，请先安装;')), process.exit(1);
     }
 
-    // 平台映射
     const platformInfo = {
         win32: { platform: 'win', arg: '--win' },
         darwin: { platform: 'mac', arg: '--mac' },
@@ -146,8 +136,6 @@ const build = async () => {
     },
         info = platformInfo[process.platform] || platformInfo.win32, currentPlatform = info.platform,
         platformArg = info.arg, buildConfig = config.build || {},
-        // ----- 构建 electron-builder 配置对象 -----
-        // 基础默认配置
         defaultNsis = {
             oneClick: false,
             perMachine: true,
@@ -178,8 +166,7 @@ const build = async () => {
     delete userBuild.nsis, delete userBuild.dmg, delete userBuild.outputDir, delete userBuild.appId;
     Object.assign(configObj, userBuild);
 
-    // 平台特定配置：根据当前平台补充默认 target（如果用户未提供该平台配置）
-    const platformKey = currentPlatform; // 'win', 'mac', 'linux'
+    const platformKey = currentPlatform;
     if (!configObj[platformKey]) configObj[platformKey] = { target: DEFAULT_TARGETS[platformKey] };
     else if (!configObj[platformKey].target) configObj[platformKey].target = DEFAULT_TARGETS[platformKey];
 
@@ -218,7 +205,7 @@ const build = async () => {
     }
 
     if (!success) console.error(chalk.red('[错误] 构建失败，已尝试 3 次:'), lastError), process.exit(1);
-    // 复制最终安装包,应用 excludeOutputs
+
     const tempDistDir = path.join(tempDir, 'dist'), userOutputDir = buildConfig.outputDir || './dist',
         targetDir = path.resolve(process.cwd(), userOutputDir);
 
@@ -247,12 +234,6 @@ const build = async () => {
     else console.warn(chalk.yellow('[警告] 未找到 dist 目录;'));
 };
 
-/**
- * 命令行入口
- * 解析 process.argv 并执行对应的构建命令
- * >查看定义:@see {@link runCLI}
- * @returns {Promise<void>}
- */
 const runCLI = async () => {
     const args = process.argv.slice(2), command = args[0];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flun/desktop-builder",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "将任意 Node.js 网站一键打包为当前桌面应用('win', 'mac', 'linux')（基于 Electron）,支持高度自定义配置;",
   "type": "module",
   "types": "index.d.ts",