electron-forge-maker-innosetup 0.3.3 → 1.0.0

package/dist/MakerInnosetup.js

@@ -32,324 +32,396 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InnoScriptParser = exports.InnoScriptGenerator = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const child_process_1 = require("child_process");
 const maker_base_1 = __importDefault(require("@electron-forge/maker-base"));
+const types_1 = require("./types");
 const generator_1 = require("./generator");
 const parser_1 = require("./parser");
+const errors_1 = require("./errors");
+const logger_1 = require("./logger");
+const path_1 = require("./utils/path");
+/** 默认编译超时时间（5 分钟） */
+const DEFAULT_COMPILE_TIMEOUT = 300000;
+/** 默认的 Inno Setup 编译器搜索路径 */
+const DEFAULT_COMPILER_PATHS = [
+    // 内置便携版（相对于 dist 目录）
+    path.join(__dirname, "..", "vendor", "innosetup", "ISCC.exe"),
+    path.join(__dirname, "..", "vendor", "ISCC.exe"),
+    // 内置便携版（相对于 src 目录 - 用于开发环境）
+    path.join(__dirname, "..", "..", "vendor", "innosetup", "ISCC.exe"),
+    path.join(__dirname, "..", "..", "vendor", "ISCC.exe"),
+    // 系统安装路径
+    "C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe",
+    "C:\\Program Files\\Inno Setup 6\\ISCC.exe",
+    "C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe",
+    "C:\\Program Files\\Inno Setup 5\\ISCC.exe",
+];
 /**
- * Electron Forge Maker for Innosetup
+ * Electron Forge 的 Inno Setup Maker
+ *
+ * 使用 Inno Setup 编译器（ISCC.exe）创建 Windows 安装程序
+ *
+ * @example
+ * ```typescript
+ * import { MakerInnosetup } from 'electron-forge-maker-innosetup';
+ *
+ * // 在 forge.config.ts 中
+ * const config: ForgeConfig = {
+ *   makers: [
+ *     new MakerInnosetup({
+ *       appName: 'My App',
+ *       appVersion: '1.0.0',
+ *       setupIconFile: './assets/icon.ico',
+ *       config: {
+ *         Setup: {
+ *           AppName: 'My App',
+ *           AppVersion: '1.0.0',
+ *           DefaultDirName: '{autopf}\\MyApp',
+ *           OutputDir: './out/installer',
+ *         },
+ *       },
+ *     }),
+ *   ],
+ * };
+ * ```
  */
 class MakerInnosetup extends maker_base_1.default {
     /**
-     * 获取项目根目录
+     * 从配置获取项目目录，若未配置则使用当前工作目录
      */
     getProjectDir() {
-        return this.config?.paths?.projectDir || process.cwd();
+        return this.config.paths?.projectDir ?? process.cwd();
     }
     /**
-     * 获取构建目录
+     * 从配置获取构建目录
      */
     getBuildDir() {
-        return this.config?.paths?.buildDir;
+        return this.config.paths?.buildDir;
     }
     /**
-     * 获取资源目录
+     * 从配置获取资源目录，若未配置则使用默认值 "assets"
      */
     getAssetsDir() {
-        return this.config?.paths?.assetsDir || "assets";
+        return this.config.paths?.assetsDir ?? "assets";
     }
     constructor(config = {}, platforms) {
         // 默认启用相对路径解析
-        if (config.resolveRelativePaths === undefined) {
-            config.resolveRelativePaths = true;
-        }
-        super(config, platforms);
+        const finalConfig = {
+            resolveRelativePaths: true,
+            ...config,
+        };
+        super(finalConfig, platforms);
         this.name = "innosetup";
         this.defaultPlatforms = ["win32"];
         this.scriptGenerator = new generator_1.InnoScriptGenerator();
     }
     /**
-     * 解析路径 - 支持相对路径转换为绝对路径
-     * @param pathStr 输入路径
-     * @param baseDir 基础目录（默认为 projectDir）
-     * @returns 解析后的绝对路径
+     * 从 ISS 文件创建 MakerInnosetupConfig
+     *
+     * @param issFilePath - ISS 文件路径
+     * @returns 解析后的配置对象
+     */
+    static fromIssFile(issFilePath) {
+        const config = parser_1.InnoScriptParser.parseFile(issFilePath);
+        return {
+            config,
+            scriptPath: issFilePath,
+        };
+    }
+    /**
+     * 从 ISS 内容字符串创建 MakerInnosetupConfig
+     *
+     * @param issContent - ISS 文件内容
+     * @returns 解析后的配置对象
+     */
+    static fromIssContent(issContent) {
+        const config = parser_1.InnoScriptParser.parse(issContent);
+        return { config };
+    }
+    /**
+     * 检查当前平台是否支持
+     *
+     * @returns 当前平台是否为 Windows
+     */
+    isSupportedOnCurrentPlatform() {
+        return process.platform === "win32";
+    }
+    /**
+     * 创建安装程序
+     *
+     * @param options - Electron Forge Maker 选项
+     * @returns 生成的安装程序文件路径数组
+     */
+    async make(options) {
+        const { appName, dir, makeDir, targetArch, packageJSON } = options;
+        const appVersion = packageJSON.version ?? "1.0.0";
+        const archId = (0, types_1.getArchIdentifier)(targetArch);
+        // 验证平台
+        if (!this.isSupportedOnCurrentPlatform()) {
+            throw new errors_1.PlatformNotSupportedError(process.platform);
+        }
+        // 设置构建目录用于路径解析
+        this.config.paths = {
+            ...this.config.paths,
+            buildDir: dir,
+        };
+        (0, logger_1.log)("正在创建 Inno Setup 安装程序: %s %s (%s)", appName, appVersion, targetArch);
+        (0, logger_1.logPath)("项目目录: %s", this.getProjectDir());
+        (0, logger_1.logPath)("构建目录: %s", this.getBuildDir());
+        // 查找编译器
+        const compilerPath = this.findInnosetupCompiler();
+        (0, logger_1.logCompile)("使用 Inno Setup 编译器: %s", compilerPath);
+        // 确定输出目录
+        const baseOutputDir = this.config.outputDir ?? path.join(makeDir, "innosetup.windows");
+        const outputDir = path.join(baseOutputDir, archId);
+        (0, path_1.ensureDir)(outputDir);
+        (0, logger_1.log)("输出目录: %s", outputDir);
+        // 生成或使用现有脚本
+        let scriptPath;
+        // actualOutputDir 用于查找生成的安装程序
+        let actualOutputDir = outputDir;
+        if (this.config.scriptPath) {
+            scriptPath = this.resolvePath(this.config.scriptPath, this.getProjectDir());
+            (0, logger_1.log)("使用自定义脚本: %s", scriptPath);
+            // 解析脚本以获取输出目录
+            try {
+                const parsedConfig = parser_1.InnoScriptParser.parseFile(scriptPath);
+                if (parsedConfig.Setup.OutputDir) {
+                    actualOutputDir = path.isAbsolute(parsedConfig.Setup.OutputDir)
+                        ? parsedConfig.Setup.OutputDir
+                        : path.resolve(path.dirname(scriptPath), parsedConfig.Setup.OutputDir);
+                    (0, logger_1.log)("脚本定义的 OutputDir: %s", actualOutputDir);
+                }
+            }
+            catch (err) {
+                (0, logger_1.logCompile)("解析脚本 OutputDir 失败: %s", err);
+            }
+        }
+        else {
+            // 生成脚本
+            const defaultConfig = this.generateDefaultConfig(dir, appName, appVersion, targetArch, outputDir);
+            const finalConfig = this.mergeConfig(defaultConfig, this.config.config);
+            // 解析配置中的路径
+            this.resolveConfigPaths(finalConfig, dir);
+            // 添加任务（桌面图标等）
+            this.addTasks(finalConfig, appName);
+            // 生成并保存脚本
+            const scriptContent = this.scriptGenerator.generate(finalConfig);
+            scriptPath = path.join(makeDir, `${appName}-setup.iss`);
+            this.scriptGenerator.saveToFile(scriptContent, scriptPath);
+            (0, logger_1.log)("已生成 Inno Setup 脚本: %s", scriptPath);
+            // 使用配置中的 OutputDir（如果有）
+            if (finalConfig.Setup.OutputDir) {
+                actualOutputDir = finalConfig.Setup.OutputDir;
+            }
+        }
+        // 编译
+        (0, logger_1.logCompile)("正在编译安装程序...");
+        await this.compileScript(scriptPath, compilerPath);
+        // 查找生成的安装程序
+        const installerPaths = this.findInstaller(actualOutputDir, appName, appVersion, archId);
+        // 输出成功信息
+        (0, logger_1.log)("✓ 安装程序创建成功!");
+        for (const installerPath of installerPaths) {
+            const stats = fs.statSync(installerPath);
+            const sizeMB = (stats.size / 1024 / 1024).toFixed(2);
+            (0, logger_1.log)("  文件: %s", installerPath);
+            (0, logger_1.log)("  大小: %s MB", sizeMB);
+        }
+        return installerPaths;
+    }
+    /**
+     * 查找 Inno Setup 编译器
+     *
+     * 按以下顺序查找：
+     * 1. 配置中指定的路径
+     * 2. 环境变量 INNOSETUP_PATH
+     * 3. 默认搜索路径
+     *
+     * @returns 编译器路径
+     * @throws CompilerNotFoundError 如果找不到编译器
      */
-    resolvePath(pathStr, baseDir) {
-        if (!pathStr) {
-            return undefined;
+    findInnosetupCompiler() {
+        // 首先检查配置路径
+        if (this.config.innosetupPath) {
+            if ((0, path_1.fileExists)(this.config.innosetupPath)) {
+                return this.config.innosetupPath;
+            }
         }
-        // 如果禁用了相对路径解析，直接返回
-        if (this.config?.resolveRelativePaths === false) {
-            return pathStr;
+        // 检查环境变量
+        const envPath = process.env.INNOSETUP_PATH;
+        if (envPath && (0, path_1.fileExists)(envPath)) {
+            return envPath;
         }
-        // 如果已经是绝对路径，直接返回
-        if (path.isAbsolute(pathStr)) {
-            return pathStr;
+        // 搜索默认路径
+        for (const searchPath of DEFAULT_COMPILER_PATHS) {
+            if ((0, path_1.fileExists)(searchPath)) {
+                (0, logger_1.logCompile)("找到内置 Inno Setup: %s", searchPath);
+                return searchPath;
+            }
         }
-        // 使用提供的 baseDir 或默认的 projectDir
-        const base = baseDir || this.getProjectDir();
-        return path.resolve(base, pathStr);
+        throw new errors_1.CompilerNotFoundError([this.config.innosetupPath, process.env.INNOSETUP_PATH, ...DEFAULT_COMPILER_PATHS].filter(Boolean));
     }
     /**
-     * 解析配置中的路径占位符
-     * 支持：{project}, {assets}, {build}, {app}
-     * @param pathStr 包含占位符的路径字符串
-     * @returns 解析后的路径
+     * 解析相对于基础目录的路径
+     *
+     * @param input - 输入路径
+     * @param baseDir - 基础目录
+     * @returns 解析后的绝对路径
      */
-    resolvePathPlaceholders(pathStr) {
-        if (!pathStr) {
-            return undefined;
+    resolvePath(input, baseDir) {
+        if (!input) {
+            return "";
         }
-        let resolved = pathStr;
+        // 如果禁用了相对路径解析则直接返回
+        if (this.config.resolveRelativePaths === false) {
+            return input;
+        }
+        // 已经是绝对路径，规范化分隔符
+        if (path.isAbsolute(input)) {
+            return path.normalize(input);
+        }
+        // 解析相对路径并规范化
+        return path.normalize(path.resolve(baseDir, input));
+    }
+    /**
+     * 解析字符串中的路径占位符
+     *
+     * 支持的占位符：
+     * - {project} - 项目根目录
+     * - {build} - 构建输出目录
+     * - {assets} - 资源文件目录
+     *
+     * @param input - 输入字符串
+     * @returns 替换占位符后的字符串
+     */
+    resolvePathPlaceholders(input) {
+        let result = input;
         const projectDir = this.getProjectDir();
         const buildDir = this.getBuildDir();
         const assetsDir = this.getAssetsDir();
         // {project} - 项目根目录
-        resolved = resolved.replace(/\{project\}/g, projectDir);
+        result = result.replace(/\{project\}/g, projectDir);
         // {build} - 构建输出目录
         if (buildDir) {
-            resolved = resolved.replace(/\{build\}/g, buildDir);
+            result = result.replace(/\{build\}/g, buildDir);
         }
         // {assets} - 资源目录
         const assetsPath = path.resolve(projectDir, assetsDir);
-        resolved = resolved.replace(/\{assets\}/g, assetsPath);
-        return resolved;
+        result = result.replace(/\{assets\}/g, assetsPath);
+        return result;
     }
     /**
-     * 处理配置对象中的所有路径
-     * @param config Innosetup 配置对象
-     * @param appDir 应用目录
+     * 解析配置中的所有路径
+     *
+     * @param config - Inno Setup 配置
+     * @param appDir - 应用目录
      */
     resolveConfigPaths(config, appDir) {
-        if (this.config?.resolveRelativePaths === false) {
+        if (this.config.resolveRelativePaths === false) {
             return;
         }
         const projectDir = this.getProjectDir();
-        // 解析 Setup 部分的路径
+        // 解析 Setup 节中的路径字段
         if (config.Setup) {
-            // SetupIconFile
-            if (config.Setup.SetupIconFile) {
-                config.Setup.SetupIconFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.SetupIconFile), projectDir);
-            }
-            // LicenseFile
-            if (config.Setup.LicenseFile) {
-                config.Setup.LicenseFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.LicenseFile), projectDir);
-            }
-            // InfoBeforeFile
-            if (config.Setup.InfoBeforeFile) {
-                config.Setup.InfoBeforeFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.InfoBeforeFile), projectDir);
-            }
-            // InfoAfterFile
-            if (config.Setup.InfoAfterFile) {
-                config.Setup.InfoAfterFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.InfoAfterFile), projectDir);
-            }
-            // WizardImageFile
-            if (config.Setup.WizardImageFile) {
-                config.Setup.WizardImageFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.WizardImageFile), projectDir);
-            }
-            // WizardSmallImageFile
-            if (config.Setup.WizardSmallImageFile) {
-                config.Setup.WizardSmallImageFile = this.resolvePath(this.resolvePathPlaceholders(config.Setup.WizardSmallImageFile), projectDir);
+            const pathFields = [
+                "SetupIconFile",
+                "LicenseFile",
+                "InfoBeforeFile",
+                "InfoAfterFile",
+                "WizardImageFile",
+                "WizardSmallImageFile",
+            ];
+            for (const field of pathFields) {
+                const value = config.Setup[field];
+                if (value && typeof value === "string") {
+                    const resolved = this.resolvePathPlaceholders(value);
+                    config.Setup = {
+                        ...config.Setup,
+                        [field]: this.resolvePath(resolved, projectDir),
+                    };
+                }
             }
         }
-        // 解析 Languages 部分的路径
+        // 解析 Languages 节中的路径
         if (config.Languages) {
-            config.Languages.forEach((lang) => {
-                if (lang.LicenseFile && !lang.LicenseFile.startsWith("compiler:")) {
-                    lang.LicenseFile = this.resolvePath(this.resolvePathPlaceholders(lang.LicenseFile), projectDir);
-                }
-                if (lang.InfoBeforeFile &&
-                    !lang.InfoBeforeFile.startsWith("compiler:")) {
-                    lang.InfoBeforeFile = this.resolvePath(this.resolvePathPlaceholders(lang.InfoBeforeFile), projectDir);
-                }
-                if (lang.InfoAfterFile && !lang.InfoAfterFile.startsWith("compiler:")) {
-                    lang.InfoAfterFile = this.resolvePath(this.resolvePathPlaceholders(lang.InfoAfterFile), projectDir);
+            config.Languages = config.Languages.map((lang) => {
+                const resolved = { ...lang };
+                const langPathFields = ["LicenseFile", "InfoBeforeFile", "InfoAfterFile"];
+                for (const field of langPathFields) {
+                    const value = resolved[field];
+                    if (value && !value.startsWith("compiler:")) {
+                        const resolvedPath = this.resolvePathPlaceholders(value);
+                        resolved[field] = this.resolvePath(resolvedPath, projectDir);
+                    }
                 }
+                return resolved;
             });
         }
-        // 解析 Files 部分的路径
+        // 解析 Files 节中的路径
         if (config.Files) {
-            config.Files.forEach((file) => {
-                // Source 路径处理
-                if (file.Source) {
-                    // 首先替换我们自定义的占位符
-                    let sourcePath = this.resolvePathPlaceholders(file.Source);
-                    // 如果替换后不是 Inno Setup 内置常量（如 {app}, {tmp}），则解析为绝对路径
-                    // Inno Setup 常量通常以 {app}, {tmp}, {src}, {win}, {sys} 等开头
-                    const isInnoConstant = sourcePath?.match(/^\{(app|tmp|src|win|sys|pf|cf|dao|fonts|userappdata|localappdata|group|autoprograms|autodesktop|commondocs)/i);
-                    if (sourcePath && !isInnoConstant) {
-                        // 如果包含 * 通配符，需要特殊处理
-                        if (sourcePath.includes("*")) {
-                            const basePath = sourcePath.split("*")[0];
-                            const wildcard = sourcePath.substring(basePath.length);
-                            const resolvedBase = this.resolvePath(basePath, appDir);
-                            sourcePath = resolvedBase ? resolvedBase + wildcard : sourcePath;
-                        }
-                        else {
-                            sourcePath = this.resolvePath(sourcePath, appDir);
-                        }
-                        file.Source = sourcePath;
-                    }
-                    else if (sourcePath) {
-                        // 是 Inno Setup 常量，保持不变
-                        file.Source = sourcePath;
-                    }
+            config.Files = config.Files.map((file) => {
+                if (!file.Source)
+                    return file;
+                const sourcePath = this.resolvePathPlaceholders(file.Source);
+                // 跳过 Inno Setup 常量
+                if ((0, path_1.isInnoSetupConstant)(sourcePath)) {
+                    return { ...file, Source: sourcePath };
+                }
+                // 处理通配符
+                if (sourcePath.includes("*") || sourcePath.includes("?")) {
+                    const { basePath, wildcard } = (0, path_1.splitWildcardPath)(sourcePath);
+                    const resolvedBase = this.resolvePath(basePath, appDir);
+                    return { ...file, Source: resolvedBase + wildcard };
                 }
+                return { ...file, Source: this.resolvePath(sourcePath, appDir) };
             });
         }
     }
     /**
-     * 从 ISS 文件解析配置
-     * @param issFilePath ISS 文件路径
-     * @returns MakerInnosetupConfig 配置对象
-     */
-    static fromIssFile(issFilePath) {
-        const config = parser_1.InnoScriptParser.parseFile(issFilePath);
-        return {
-            config: config,
-            scriptPath: issFilePath,
-        };
-    }
-    /**
-     * 从 ISS 脚本内容解析配置
-     * @param issContent ISS 脚本内容
-     * @returns MakerInnosetupConfig 配置对象
-     */
-    static fromIssContent(issContent) {
-        const config = parser_1.InnoScriptParser.parse(issContent);
-        return {
-            config: config,
-        };
-    }
-    /**
-     * 检查是否支持当前平台
-     */
-    isSupportedOnCurrentPlatform() {
-        return process.platform === "win32";
-    }
-    /**
-     * 查找 Innosetup 编译器路径
-     */
-    findInnosetupCompiler() {
-        if (this.config.innosetupPath) {
-            return this.config.innosetupPath;
-        }
-        // 1. 优先查找内置的便携版（相对于包的位置）
-        const builtinPaths = [
-            // 相对于 dist 目录
-            path.join(__dirname, "..", "vendor", "innosetup", "ISCC.exe"),
-            path.join(__dirname, "..", "vendor", "ISCC.exe"),
-            // 相对于 src 目录
-            path.join(__dirname, "..", "..", "vendor", "innosetup", "ISCC.exe"),
-            path.join(__dirname, "..", "..", "vendor", "ISCC.exe"),
-        ];
-        for (const builtinPath of builtinPaths) {
-            if (fs.existsSync(builtinPath)) {
-                console.log(`Using bundled Innosetup: ${builtinPath}`);
-                return builtinPath;
-            }
-        }
-        // 2. 尝试从环境变量中查找
-        if (process.env.INNOSETUP_PATH &&
-            fs.existsSync(process.env.INNOSETUP_PATH)) {
-            return process.env.INNOSETUP_PATH;
-        }
-        // 3. 查找系统安装的 Innosetup
-        const systemPaths = [
-            "C:\\Program Files (x86)\\Inno Setup 6\\ISCC.exe",
-            "C:\\Program Files\\Inno Setup 6\\ISCC.exe",
-            "C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe",
-            "C:\\Program Files\\Inno Setup 5\\ISCC.exe",
-        ];
-        for (const systemPath of systemPaths) {
-            if (fs.existsSync(systemPath)) {
-                return systemPath;
-            }
-        }
-        throw new Error("Innosetup compiler not found. Please:\n" +
-            "1. Place Innosetup portable in vendor/innosetup/ directory, or\n" +
-            "2. Install Innosetup to system, or\n" +
-            "3. Set INNOSETUP_PATH environment variable, or\n" +
-            "4. Set innosetupPath in config.");
-    }
-    /**
-     * 根据架构获取架构标识符
-     */
-    getArchIdentifier(arch) {
-        switch (arch) {
-            case "x64":
-                return "x64";
-            case "ia32":
-            case "x86":
-                return "x86";
-            case "arm64":
-                return "arm64";
-            default:
-                return arch;
-        }
-    }
-    /**
-     * 根据架构获取 ArchitecturesAllowed 配置
-     */
-    getArchitecturesAllowed(arch) {
-        switch (arch) {
-            case "x64":
-                return "x64compatible";
-            case "ia32":
-            case "x86":
-                return "x86compatible";
-            case "arm64":
-                return "arm64";
-            default:
-                return arch;
-        }
-    }
-    /**
-     * 生成默认配置
+     * 生成默认的 Inno Setup 配置
+     *
+     * @param appDir - 应用目录
+     * @param appName - 应用名称
+     * @param appVersion - 应用版本
+     * @param arch - 目标架构
+     * @param outputDir - 输出目录
+     * @returns 默认配置对象
      */
     generateDefaultConfig(appDir, appName, appVersion, arch, outputDir) {
         const exeName = `${appName}.exe`;
-        const archId = this.getArchIdentifier(arch);
+        const archId = (0, types_1.getArchIdentifier)(arch);
         const outputName = `${appName}-${appVersion}-${archId}-setup`;
+        const setup = {
+            AppName: this.config.appName ?? appName,
+            AppVersion: this.config.appVersion ?? appVersion,
+            AppPublisher: this.config.appPublisher ?? "",
+            AppId: this.config.appId ?? `{{${appName}}}`,
+            DefaultDirName: `{autopf}\\${appName}`,
+            DefaultGroupName: appName,
+            OutputDir: outputDir,
+            OutputBaseFilename: outputName,
+            Compression: "lzma2",
+            SolidCompression: true,
+            ArchitecturesAllowed: (0, types_1.getArchitecturesAllowed)(arch),
+            ArchitecturesInstallIn64BitMode: arch === "x64" ? "x64compatible" : "",
+            SetupIconFile: this.config.setupIconFile ?? "",
+            UninstallDisplayIcon: `{app}\\${exeName}`,
+            LicenseFile: this.config.licenseFile ?? "",
+            PrivilegesRequired: "admin",
+            WizardStyle: "modern",
+        };
         return {
-            Setup: {
-                AppName: this.config.appName || appName,
-                AppVersion: this.config.appVersion || appVersion,
-                AppPublisher: this.config.appPublisher || "",
-                AppId: this.config.appId || `{{${appName}}}`,
-                DefaultDirName: `{autopf}\\${appName}`,
-                DefaultGroupName: appName,
-                OutputDir: outputDir,
-                OutputBaseFilename: outputName,
-                Compression: "lzma2",
-                SolidCompression: true,
-                ArchitecturesAllowed: this.getArchitecturesAllowed(arch),
-                ArchitecturesInstallIn64BitMode: arch === "x64" ? "x64compatible" : "",
-                SetupIconFile: this.config.setupIconFile || "",
-                UninstallDisplayIcon: `{app}\\${exeName}`,
-                LicenseFile: this.config.licenseFile || "",
-                PrivilegesRequired: "admin",
-                WizardStyle: "modern",
-            },
+            Setup: setup,
             Languages: [
-                {
-                    Name: "english",
-                    MessagesFile: "compiler:Default.isl",
-                },
-                {
-                    Name: "chinesesimplified",
-                    MessagesFile: "compiler:Languages\\ChineseSimplified.isl",
-                },
+                { Name: "english", MessagesFile: "compiler:Default.isl" },
+                { Name: "chinesesimplified", MessagesFile: "compiler:Languages\\ChineseSimplified.isl" },
             ],
             Tasks: [],
             Files: [
@@ -360,103 +432,102 @@ class MakerInnosetup extends maker_base_1.default {
                 },
             ],
             Icons: [
-                {
-                    Name: `{group}\\${appName}`,
-                    Filename: `{app}\\${exeName}`,
-                },
-                {
-                    Name: `{group}\\Uninstall ${appName}`,
-                    Filename: "{uninstallexe}",
-                },
+                { Name: `{group}\\${appName}`, Filename: `{app}\\${exeName}` },
+                { Name: `{group}\\卸载 ${appName}`, Filename: "{uninstallexe}" },
             ],
             Run: [
                 {
                     Filename: `{app}\\${exeName}`,
-                    Description: `Launch ${appName}`,
+                    Description: `启动 ${appName}`,
                     Flags: "nowait postinstall skipifsilent",
                 },
             ],
         };
     }
     /**
-     * 合并用户配置和默认配置
+     * 合并用户配置与默认配置
+     *
+     * @param defaultConfig - 默认配置
+     * @param userConfig - 用户配置
+     * @returns 合并后的配置
      */
     mergeConfig(defaultConfig, userConfig) {
         if (!userConfig) {
             return defaultConfig;
         }
         return {
-            Defines: userConfig.Defines || defaultConfig.Defines,
+            Defines: userConfig.Defines ?? defaultConfig.Defines,
             Setup: { ...defaultConfig.Setup, ...userConfig.Setup },
-            Languages: userConfig.Languages || defaultConfig.Languages,
-            Tasks: userConfig.Tasks || defaultConfig.Tasks,
-            Types: userConfig.Types || defaultConfig.Types,
-            Components: userConfig.Components || defaultConfig.Components,
-            Files: userConfig.Files || defaultConfig.Files,
-            Dirs: userConfig.Dirs || defaultConfig.Dirs,
-            Icons: userConfig.Icons || defaultConfig.Icons,
-            INI: userConfig.INI || defaultConfig.INI,
-            InstallDelete: userConfig.InstallDelete || defaultConfig.InstallDelete,
-            UninstallDelete: userConfig.UninstallDelete || defaultConfig.UninstallDelete,
-            Registry: userConfig.Registry || defaultConfig.Registry,
-            Run: userConfig.Run || defaultConfig.Run,
-            UninstallRun: userConfig.UninstallRun || defaultConfig.UninstallRun,
-            Messages: userConfig.Messages || defaultConfig.Messages,
-            CustomMessages: userConfig.CustomMessages || defaultConfig.CustomMessages,
-            Code: userConfig.Code || defaultConfig.Code,
+            Languages: userConfig.Languages ?? defaultConfig.Languages,
+            Tasks: userConfig.Tasks ?? defaultConfig.Tasks,
+            Types: userConfig.Types ?? defaultConfig.Types,
+            Components: userConfig.Components ?? defaultConfig.Components,
+            Files: userConfig.Files ?? defaultConfig.Files,
+            Dirs: userConfig.Dirs ?? defaultConfig.Dirs,
+            Icons: userConfig.Icons ?? defaultConfig.Icons,
+            INI: userConfig.INI ?? defaultConfig.INI,
+            InstallDelete: userConfig.InstallDelete ?? defaultConfig.InstallDelete,
+            UninstallDelete: userConfig.UninstallDelete ?? defaultConfig.UninstallDelete,
+            Registry: userConfig.Registry ?? defaultConfig.Registry,
+            Run: userConfig.Run ?? defaultConfig.Run,
+            UninstallRun: userConfig.UninstallRun ?? defaultConfig.UninstallRun,
+            Messages: userConfig.Messages ?? defaultConfig.Messages,
+            CustomMessages: userConfig.CustomMessages ?? defaultConfig.CustomMessages,
+            Code: userConfig.Code ?? defaultConfig.Code,
         };
     }
     /**
-     * 添加任务（桌面图标、快速启动等）
+     * 添加桌面图标和快速启动任务
+     *
+     * @param config - Inno Setup 配置
+     * @param appName - 应用名称
      */
     addTasks(config, appName) {
-        if (!config.Tasks) {
-            config.Tasks = [];
-        }
-        // 检查用户是否已经自定义了桌面图标任务
-        const hasDesktopTask = config.Tasks.some((task) => task.Name === "desktopicon");
-        const hasDesktopIcon = config.Icons?.some((icon) => icon.Name?.includes("{autodesktop}") && icon.Tasks === "desktopicon");
-        if (this.config.createDesktopIcon !== false &&
-            !hasDesktopTask &&
-            !hasDesktopIcon) {
-            config.Tasks.push({
+        const tasks = [...(config.Tasks ?? [])];
+        const icons = [...(config.Icons ?? [])];
+        // 检查是否已存在桌面图标任务
+        const hasDesktopTask = tasks.some((t) => t.Name === "desktopicon");
+        const hasDesktopIcon = icons.some((i) => i.Name.includes("{autodesktop}") && i.Tasks === "desktopicon");
+        if (this.config.createDesktopIcon !== false && !hasDesktopTask && !hasDesktopIcon) {
+            tasks.push({
                 Name: "desktopicon",
-                Description: "Create a &desktop icon",
-                GroupDescription: "Additional icons:",
+                Description: "创建桌面图标(&D)",
+                GroupDescription: "附加图标:",
                 Flags: "unchecked",
             });
-            if (config.Icons) {
-                config.Icons.push({
-                    Name: "{autodesktop}\\" + appName,
-                    Filename: `{app}\\${appName}.exe`,
-                    Tasks: "desktopicon",
-                });
-            }
+            icons.push({
+                Name: `{autodesktop}\\${appName}`,
+                Filename: `{app}\\${appName}.exe`,
+                Tasks: "desktopicon",
+            });
         }
-        // 检查用户是否已经自定义了快速启动任务
-        const hasQuickLaunchTask = config.Tasks.some((task) => task.Name === "quicklaunchicon");
-        const hasQuickLaunchIcon = config.Icons?.some((icon) => icon.Name?.includes("Quick Launch") && icon.Tasks === "quicklaunchicon");
-        if (this.config.createQuickLaunchIcon &&
-            !hasQuickLaunchTask &&
-            !hasQuickLaunchIcon) {
-            config.Tasks.push({
+        // 检查是否已存在快速启动任务
+        const hasQuickLaunchTask = tasks.some((t) => t.Name === "quicklaunchicon");
+        const hasQuickLaunchIcon = icons.some((i) => i.Name.includes("Quick Launch") && i.Tasks === "quicklaunchicon");
+        if (this.config.createQuickLaunchIcon && !hasQuickLaunchTask && !hasQuickLaunchIcon) {
+            tasks.push({
                 Name: "quicklaunchicon",
-                Description: "Create a &Quick Launch icon",
-                GroupDescription: "Additional icons:",
+                Description: "创建快速启动图标(&Q)",
+                GroupDescription: "附加图标:",
                 Flags: "unchecked",
             });
-            if (config.Icons) {
-                config.Icons.push({
-                    Name: "{userappdata}\\Microsoft\\Internet Explorer\\Quick Launch\\" +
-                        appName,
-                    Filename: `{app}\\${appName}.exe`,
-                    Tasks: "quicklaunchicon",
-                });
-            }
+            icons.push({
+                Name: `{userappdata}\\Microsoft\\Internet Explorer\\Quick Launch\\${appName}`,
+                Filename: `{app}\\${appName}.exe`,
+                Tasks: "quicklaunchicon",
+            });
         }
+        config.Tasks = tasks;
+        config.Icons = icons;
     }
     /**
-     * 执行 Innosetup 编译
+     * 编译 ISS 脚本
+     *
+     * @param scriptPath - 脚本文件路径
+     * @param compilerPath - 编译器路径
+     * @returns 编译输出
+     * @throws CompilationError 编译失败
+     * @throws CompilationTimeoutError 编译超时
      */
     async compileScript(scriptPath, compilerPath) {
         return new Promise((resolve, reject) => {
@@ -464,44 +535,45 @@ class MakerInnosetup extends maker_base_1.default {
             if (this.config.isccOptions) {
                 args.push(...this.config.isccOptions);
             }
-            const iscc = (0, child_process_1.spawn)(compilerPath, args, {
-                stdio: "pipe",
-            });
+            const timeout = this.config.compileTimeout ?? DEFAULT_COMPILE_TIMEOUT;
             let output = "";
             let errorOutput = "";
             let isResolved = false;
-            const timeout = this.config.compileTimeout || 300000;
-            const timeoutHandle = setTimeout(() => {
-                if (!isResolved) {
-                    isResolved = false;
-                    console.error("Innosetup compilation timeout, killing process...");
+            let iscc = null;
+            const cleanup = () => {
+                if (iscc && !iscc.killed) {
                     try {
                         iscc.kill("SIGKILL");
                     }
-                    catch (e) {
-                        console.error("Failed to kill process", e);
+                    catch {
+                        // 忽略终止进程时的错误
                     }
-                    reject(new Error(`Innosetup compilation timeout after ${timeout} ms`));
+                }
+            };
+            const timeoutHandle = setTimeout(() => {
+                if (!isResolved) {
+                    isResolved = true;
+                    cleanup();
+                    reject(new errors_1.CompilationTimeoutError(timeout));
                 }
             }, timeout);
-            const cleanup = () => {
+            try {
+                iscc = (0, child_process_1.spawn)(compilerPath, args, { stdio: "pipe" });
+            }
+            catch (err) {
                 clearTimeout(timeoutHandle);
-                try {
-                    if (iscc && !iscc.killed) {
-                        iscc.kill("SIGKILL");
-                    }
-                }
-                catch (e) { }
-            };
-            iscc.stdout.on("data", (data) => {
+                reject(new Error(`启动 Inno Setup 编译器失败: ${err instanceof Error ? err.message : String(err)}`));
+                return;
+            }
+            iscc.stdout?.on("data", (data) => {
                 const text = data.toString();
                 output += text;
-                console.log(text);
+                (0, logger_1.logCompile)("%s", text.trim());
             });
-            iscc.stderr.on("data", (data) => {
+            iscc.stderr?.on("data", (data) => {
                 const text = data.toString();
                 errorOutput += text;
-                console.error(text);
+                (0, logger_1.logCompile)("错误: %s", text.trim());
             });
             iscc.on("close", (code) => {
                 if (isResolved)
@@ -513,121 +585,69 @@ class MakerInnosetup extends maker_base_1.default {
                 }
                 else {
                     cleanup();
-                    reject(new Error(`Innosetup compilation failed with code ${code}\n${errorOutput}`));
+                    reject(new errors_1.CompilationError(code ?? 1, errorOutput || output));
                 }
             });
             iscc.on("error", (err) => {
                 if (isResolved)
                     return;
                 isResolved = true;
+                clearTimeout(timeoutHandle);
                 cleanup();
-                reject(new Error(`Failed to start Innosetup compiler: ${err.message}`));
+                reject(new Error(`运行 Inno Setup 编译器失败: ${err.message}`));
             });
-            // 处理进程意外退出
-            process.on("exit", cleanup);
-            process.on("SIGINT", cleanup);
-            process.on("SIGTERM", cleanup);
         });
     }
     /**
-     * 制作安装包
+     * 查找生成的安装程序文件
+     *
+     * @param searchDir - 搜索目录
+     * @param appName - 应用名称
+     * @param appVersion - 应用版本
+     * @param archId - 架构标识
+     * @returns 安装程序文件路径数组
+     * @throws InstallerNotFoundError 如果找不到安装程序
      */
-    async make(options) {
-        const { appName, dir, makeDir, targetArch, packageJSON } = options;
-        this.config.paths = {
-            buildDir: dir,
-            ...this.config.config,
-        };
-        // 设置默认构建目录
-        const appVersion = packageJSON.version || "1.0.0";
-        const archId = this.getArchIdentifier(targetArch);
-        console.log(`Creating Innosetup installer for ${appName} ${appVersion} (${targetArch})...`);
-        console.log(`Project directory: ${this.getProjectDir()}`);
-        console.log(`Build directory: ${this.getBuildDir()}`);
-        // 查找编译器
-        const compilerPath = this.findInnosetupCompiler();
-        console.log(`Using Innosetup compiler: ${compilerPath}`);
-        // 确定输出目录：根据架构生成子目录
-        // 格式: makeDir/innosetup.windows/x64 或 makeDir/innosetup.windows/arm64
-        const baseOutputDir = this.config.outputDir || path.join(makeDir, "innosetup.windows");
-        const outputDir = path.join(baseOutputDir, archId);
-        // 确保输出目录存在
-        if (!fs.existsSync(outputDir)) {
-            fs.mkdirSync(outputDir, { recursive: true });
-        }
-        console.log(`Output directory: ${outputDir}`);
-        // 生成或使用脚本
-        let scriptPath;
-        let finalConfig;
-        let actualOutputDir = outputDir; // 实际的输出目录
-        if (this.config.scriptPath) {
-            // 使用用户提供的脚本
-            scriptPath = this.resolvePath(this.config.scriptPath, this.getProjectDir());
-            console.log(`Using custom script: ${scriptPath}`);
-            // 解析脚本以获取实际的输出目录
-            try {
-                const parsedConfig = parser_1.InnoScriptParser.parseFile(scriptPath);
-                if (parsedConfig.Setup?.OutputDir) {
-                    // 如果脚本中定义了输出目录，使用绝对路径
-                    const scriptOutputDir = parsedConfig.Setup.OutputDir;
-                    actualOutputDir = path.isAbsolute(scriptOutputDir)
-                        ? scriptOutputDir
-                        : path.resolve(path.dirname(scriptPath), scriptOutputDir);
-                    console.log(`Script defines OutputDir: ${actualOutputDir}`);
-                }
-            }
-            catch (err) {
-                console.warn(`Failed to parse script for OutputDir: ${err}`);
-                // 继续使用默认的 outputDir
+    findInstaller(searchDir, appName, appVersion, archId) {
+        (0, logger_1.log)("在目录中搜索安装程序: %s", searchDir);
+        // 尝试预期的文件名格式
+        const expectedNames = [
+            `${appName}-${appVersion}-${archId}-setup.exe`, // 默认格式
+            `${appName}_${appVersion}.exe`, // 用户自定义格式
+            `${appName}-${appVersion}.exe`, // 无架构格式
+        ];
+        for (const expectedName of expectedNames) {
+            const expectedPath = path.join(searchDir, expectedName);
+            if ((0, path_1.fileExists)(expectedPath)) {
+                (0, logger_1.log)("找到安装程序: %s", expectedPath);
+                return [expectedPath];
             }
         }
-        else {
-            // 生成脚本
-            const defaultConfig = this.generateDefaultConfig(dir, appName, appVersion, targetArch, outputDir);
-            finalConfig = this.mergeConfig(defaultConfig, this.config.config);
-            // 解析配置中的路径
-            this.resolveConfigPaths(finalConfig, dir);
-            // 添加任务
-            this.addTasks(finalConfig, appName);
-            // 生成脚本内容
-            const scriptContent = this.scriptGenerator.generate(finalConfig);
-            // 保存脚本
-            scriptPath = path.join(makeDir, `${appName}-setup.iss`);
-            this.scriptGenerator.saveToFile(scriptContent, scriptPath);
-            console.log(`Generated Innosetup script: ${scriptPath}`);
-        }
-        // 编译安装包
-        console.log("Compiling installer...");
-        await this.compileScript(scriptPath, compilerPath);
-        // 查找生成的安装包
-        // 如果使用自定义脚本，在实际输出目录中查找
-        const searchDir = actualOutputDir;
-        console.log(`Searching for installer in: ${searchDir}`);
-        // 尝试匹配输出文件名模式
-        const outputPattern = `${appName}-${appVersion}-${archId}-setup.exe`;
-        const outputPath = path.join(searchDir, outputPattern);
-        if (fs.existsSync(outputPath)) {
-            console.log(`Installer created successfully: ${outputPath}`);
-            return [outputPath];
-        }
-        // 如果没找到，尝试查找所有 exe 文件
-        if (fs.existsSync(searchDir)) {
-            const files = fs.readdirSync(searchDir);
-            const exeFiles = files
-                .filter((f) => f.endsWith(".exe"))
-                .map((f) => path.join(searchDir, f));
+        // 搜索目录中的 .exe 文件
+        const searchInDir = (dir) => {
+            if (!(0, path_1.fileExists)(dir))
+                return [];
+            const files = fs.readdirSync(dir);
+            return files.filter((f) => f.endsWith(".exe")).map((f) => path.join(dir, f));
+        };
+        // 先在当前目录搜索
+        let exeFiles = searchInDir(searchDir);
+        // 如果没找到，尝试搜索子目录 (如 innosetup.windows/x64)
+        if (exeFiles.length === 0) {
+            const subDir = path.join(searchDir, "innosetup.windows", archId);
+            (0, logger_1.log)("尝试搜索子目录: %s", subDir);
+            exeFiles = searchInDir(subDir);
             if (exeFiles.length > 0) {
-                console.log(`Installer created: ${exeFiles[0]}`);
+                (0, logger_1.log)("在子目录中找到安装程序: %s", exeFiles[0]);
                 return exeFiles;
             }
         }
-        throw new Error(`Failed to find generated installer in ${searchDir}`);
+        else {
+            (0, logger_1.log)("找到安装程序: %s", exeFiles[0]);
+            return exeFiles;
+        }
+        throw new errors_1.InstallerNotFoundError(searchDir);
     }
 }
 exports.default = MakerInnosetup;
-// 导出类型
-__exportStar(require("./types"), exports);
-var generator_2 = require("./generator");
-Object.defineProperty(exports, "InnoScriptGenerator", { enumerable: true, get: function () { return generator_2.InnoScriptGenerator; } });
-var parser_2 = require("./parser");
-Object.defineProperty(exports, "InnoScriptParser", { enumerable: true, get: function () { return parser_2.InnoScriptParser; } });
+//# sourceMappingURL=MakerInnosetup.js.map