app-builder-lib 27.0.0-alpha.2 → 27.0.0-alpha.4

package/dist/util/config/schemaValidator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schemaValidator.d.ts","sourceRoot":"","sources":["../../../src/util/config/schemaValidator.ts"],"names":[],"mappings":"AAAA,OAAY,EAAE,WAAW,EAAoB,MAAM,KAAK,CAAA;AAExD,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,KAAK,MAAM,CAAA;AAElF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;AAaD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAE,gBAAqB,GAAG,IAAI,CA8BlG"}
+{"version":3,"file":"schemaValidator.d.ts","sourceRoot":"","sources":["../../../src/util/config/schemaValidator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,WAAW,EAAoB,MAAM,KAAK,CAAA;AAExD,MAAM,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,KAAK,MAAM,CAAA;AAElF,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,CAAC,EAAE,aAAa,CAAA;CAC9B;AAaD,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAE,gBAAqB,GAAG,IAAI,CA8BlG"}

package/dist/util/config/schemaValidator.js

@@ -1,4 +1,4 @@
-import Ajv from "ajv";
+import { Ajv } from "ajv";
 const ajv = new Ajv({
     allErrors: true,
     verbose: true,

package/dist/util/config/schemaValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemaValidator.js","sourceRoot":"","sources":["../../../src/util/config/schemaValidator.ts"],"names":[],"mappings":"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","sourcesContent":["import Ajv, { ErrorObject, ValidateFunction } from \"ajv\"\n\nexport type PostFormatter = (formattedError: string, error: ErrorObject) => string\n\nexport interface ValidationConfig {\n  name?: string\n  postFormatter?: PostFormatter\n}\n\nconst ajv = new Ajv({\n  allErrors: true,\n  verbose: true,\n  coerceTypes: true,\n  strict: false,\n})\n\n// Cache the compiled validator for the canonical scheme.json so it is only\n// compiled once per process lifetime.\nlet _cachedValidate: ValidateFunction | undefined\n\nexport function validateSchema(schema: unknown, data: unknown, config: ValidationConfig = {}): void {\n  if (_cachedValidate == null || _cachedValidate.schema !== schema) {\n    _cachedValidate = ajv.compile(schema as object)\n  }\n  const validate = _cachedValidate\n\n  if (validate(data)) {\n    return\n  }\n\n  const errors = validate.errors ?? []\n  const baseDataPath = \"configuration\"\n  const name = config.name ?? \"Object\"\n\n  const relevant = filterRelevantErrors(errors)\n  const formatted = relevant.map(error => {\n    let msg = formatError(error, baseDataPath)\n    if (config.postFormatter != null) {\n      msg = config.postFormatter(msg, error)\n    }\n    return ` - ${indentNewlines(msg, \"   \")}`\n  })\n\n  const header = `Invalid configuration object. ${name} has been initialized using a configuration object that does not match the API schema.`\n  const guidance = [\n    `Please check the documentation to ensure that your configuration matches the expected schema: https://www.electron.build/configuration`,\n    `If you recently upgraded electron-builder to v27, please run \\`electron-builder migrate-schema\\` to automatically update your configuration.`,\n    `Check the release notes for breaking changes: https://www.electron.build/docs/migration/v26-to-v27`,\n  ]\n  throw new Error(`${header}\\n${formatted.join(\"\\n\")}\\n${guidance.join(\"\\n\")}`)\n}\n\n/**\n * Filters the flat list of ajv errors to the most actionable subset.\n * Composite keywords (anyOf/oneOf/if) are suppressed when more specific\n * errors exist at the same or deeper paths.  When all errors share the\n * same instancePath and a composite parent for that path exists, the\n * parent is kept instead so the user sees a single \"should be one of\"\n * message rather than every failed branch listed separately.\n */\nfunction filterRelevantErrors(errors: ErrorObject[]): ErrorObject[] {\n  const compositeKeywords = new Set([\"anyOf\", \"oneOf\", \"if\"])\n  const specific = errors.filter(e => !compositeKeywords.has(e.keyword))\n\n  if (specific.length === 0) {\n    return errors.filter(e => compositeKeywords.has(e.keyword))\n  }\n\n  // Group specific errors by instancePath\n  const byPath = new Map<string, ErrorObject[]>()\n  for (const e of specific) {\n    const list = byPath.get(e.instancePath)\n    if (list != null) {\n      list.push(e)\n    } else {\n      byPath.set(e.instancePath, [e])\n    }\n  }\n\n  const result: ErrorObject[] = []\n  for (const [path, group] of byPath) {\n    if (group.length > 1) {\n      // additionalProperties errors are the most actionable (\"has unknown\n      // property X\") — prefer them over anyOf-parent collapse or type noise.\n      const additionalProps = group.filter(e => e.keyword === \"additionalProperties\")\n      if (additionalProps.length > 0) {\n        result.push(...additionalProps)\n        continue\n      }\n      // For other multi-error groups, prefer the anyOf parent (one concise\n      // \"should be one of these\" message).\n      const parent = errors.find(e => e.instancePath === path && compositeKeywords.has(e.keyword))\n      if (parent != null) {\n        result.push(parent)\n        continue\n      }\n    }\n    result.push(...group)\n  }\n  return result\n}\n\n/** Decodes a single RFC 6901 JSON Pointer segment (`~1` → `/`, `~0` → `~`). */\nfunction decodePointerSegment(segment: string): string {\n  return segment.replace(/~1/g, \"/\").replace(/~0/g, \"~\")\n}\n\nfunction instancePathToLabel(instancePath: string, baseDataPath: string): string {\n  if (!instancePath) {\n    return baseDataPath\n  }\n  const segments = instancePath.split(\"/\").filter(Boolean).map(decodePointerSegment)\n  return [baseDataPath, ...segments].join(\".\")\n}\n\nfunction formatError(error: ErrorObject, baseDataPath: string): string {\n  const label = instancePathToLabel(error.instancePath, baseDataPath)\n  const params = error.params as Record<string, unknown>\n  const parentSchema = (error as ErrorObject & { parentSchema?: Record<string, unknown> }).parentSchema\n\n  switch (error.keyword) {\n    case \"additionalProperties\":\n      return `${label} has an unknown property '${params.additionalProperty}'`\n\n    case \"required\": {\n      const missingProp = String(params.missingProperty).replace(/^\\./, \"\")\n      return `${label} misses the property '${missingProp}'`\n    }\n\n    case \"type\": {\n      const type = params.type\n      if (Array.isArray(type)) {\n        const typeList = (type as string[]).join(\" | \")\n        const desc = descriptionSuffix(parentSchema)\n        return `${label} should be:\\n${typeList}${desc}`\n      }\n      return `${label} should be a ${type}`\n    }\n\n    case \"enum\": {\n      const enumVals = (parentSchema?.enum as unknown[] | undefined) ?? []\n      if (enumVals.length === 1) {\n        return `${label} should be ${JSON.stringify(enumVals[0])}`\n      }\n      return `${label} should be one of these:\\n${enumVals.map(v => JSON.stringify(v)).join(\" | \")}`\n    }\n\n    case \"anyOf\":\n    case \"oneOf\": {\n      const schemaText = formatSchemaType(parentSchema)\n      return `${label} should be one of these:\\n${schemaText}`\n    }\n\n    default:\n      return `${label} ${error.message}`\n  }\n}\n\nfunction descriptionSuffix(schema: Record<string, unknown> | undefined): string {\n  return typeof schema?.description === \"string\" ? `\\n-> ${schema.description}` : \"\"\n}\n\nfunction formatSchemaType(schema: Record<string, unknown> | undefined): string {\n  if (schema == null) {\n    return \"\"\n  }\n  if (Array.isArray(schema.type)) {\n    return (schema.type as string[]).join(\" | \")\n  }\n  if (typeof schema.type === \"string\") {\n    return schema.type\n  }\n  if (Array.isArray(schema.anyOf)) {\n    return (schema.anyOf as Array<Record<string, unknown>>)\n      .map(s => {\n        if (Array.isArray(s.type)) {\n          return (s.type as string[]).join(\" | \")\n        }\n        return typeof s.type === \"string\" ? s.type : \"\"\n      })\n      .filter(Boolean)\n      .join(\" | \")\n  }\n  return JSON.stringify(schema)\n}\n\nfunction indentNewlines(str: string, prefix: string): string {\n  return str.replace(/\\n(?!$)/g, `\\n${prefix}`)\n}\n"]}
+{"version":3,"file":"schemaValidator.js","sourceRoot":"","sources":["../../../src/util/config/schemaValidator.ts"],"names":[],"mappings":"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","sourcesContent":["import { Ajv, ErrorObject, ValidateFunction } from \"ajv\"\n\nexport type PostFormatter = (formattedError: string, error: ErrorObject) => string\n\nexport interface ValidationConfig {\n  name?: string\n  postFormatter?: PostFormatter\n}\n\nconst ajv = new Ajv({\n  allErrors: true,\n  verbose: true,\n  coerceTypes: true,\n  strict: false,\n})\n\n// Cache the compiled validator for the canonical scheme.json so it is only\n// compiled once per process lifetime.\nlet _cachedValidate: ValidateFunction | undefined\n\nexport function validateSchema(schema: unknown, data: unknown, config: ValidationConfig = {}): void {\n  if (_cachedValidate == null || _cachedValidate.schema !== schema) {\n    _cachedValidate = ajv.compile(schema as object)\n  }\n  const validate = _cachedValidate\n\n  if (validate(data)) {\n    return\n  }\n\n  const errors = validate.errors ?? []\n  const baseDataPath = \"configuration\"\n  const name = config.name ?? \"Object\"\n\n  const relevant = filterRelevantErrors(errors)\n  const formatted = relevant.map(error => {\n    let msg = formatError(error, baseDataPath)\n    if (config.postFormatter != null) {\n      msg = config.postFormatter(msg, error)\n    }\n    return ` - ${indentNewlines(msg, \"   \")}`\n  })\n\n  const header = `Invalid configuration object. ${name} has been initialized using a configuration object that does not match the API schema.`\n  const guidance = [\n    `Please check the documentation to ensure that your configuration matches the expected schema: https://www.electron.build/configuration`,\n    `If you recently upgraded electron-builder to v27, please run \\`electron-builder migrate-schema\\` to automatically update your configuration.`,\n    `Check the release notes for breaking changes: https://www.electron.build/docs/migration/v26-to-v27`,\n  ]\n  throw new Error(`${header}\\n${formatted.join(\"\\n\")}\\n${guidance.join(\"\\n\")}`)\n}\n\n/**\n * Filters the flat list of ajv errors to the most actionable subset.\n * Composite keywords (anyOf/oneOf/if) are suppressed when more specific\n * errors exist at the same or deeper paths.  When all errors share the\n * same instancePath and a composite parent for that path exists, the\n * parent is kept instead so the user sees a single \"should be one of\"\n * message rather than every failed branch listed separately.\n */\nfunction filterRelevantErrors(errors: ErrorObject[]): ErrorObject[] {\n  const compositeKeywords = new Set([\"anyOf\", \"oneOf\", \"if\"])\n  const specific = errors.filter(e => !compositeKeywords.has(e.keyword))\n\n  if (specific.length === 0) {\n    return errors.filter(e => compositeKeywords.has(e.keyword))\n  }\n\n  // Group specific errors by instancePath\n  const byPath = new Map<string, ErrorObject[]>()\n  for (const e of specific) {\n    const list = byPath.get(e.instancePath)\n    if (list != null) {\n      list.push(e)\n    } else {\n      byPath.set(e.instancePath, [e])\n    }\n  }\n\n  const result: ErrorObject[] = []\n  for (const [path, group] of byPath) {\n    if (group.length > 1) {\n      // additionalProperties errors are the most actionable (\"has unknown\n      // property X\") — prefer them over anyOf-parent collapse or type noise.\n      const additionalProps = group.filter(e => e.keyword === \"additionalProperties\")\n      if (additionalProps.length > 0) {\n        result.push(...additionalProps)\n        continue\n      }\n      // For other multi-error groups, prefer the anyOf parent (one concise\n      // \"should be one of these\" message).\n      const parent = errors.find(e => e.instancePath === path && compositeKeywords.has(e.keyword))\n      if (parent != null) {\n        result.push(parent)\n        continue\n      }\n    }\n    result.push(...group)\n  }\n  return result\n}\n\n/** Decodes a single RFC 6901 JSON Pointer segment (`~1` → `/`, `~0` → `~`). */\nfunction decodePointerSegment(segment: string): string {\n  return segment.replace(/~1/g, \"/\").replace(/~0/g, \"~\")\n}\n\nfunction instancePathToLabel(instancePath: string, baseDataPath: string): string {\n  if (!instancePath) {\n    return baseDataPath\n  }\n  const segments = instancePath.split(\"/\").filter(Boolean).map(decodePointerSegment)\n  return [baseDataPath, ...segments].join(\".\")\n}\n\nfunction formatError(error: ErrorObject, baseDataPath: string): string {\n  const label = instancePathToLabel(error.instancePath, baseDataPath)\n  const params = error.params as Record<string, unknown>\n  const parentSchema = (error as ErrorObject & { parentSchema?: Record<string, unknown> }).parentSchema\n\n  switch (error.keyword) {\n    case \"additionalProperties\":\n      return `${label} has an unknown property '${params.additionalProperty}'`\n\n    case \"required\": {\n      const missingProp = String(params.missingProperty).replace(/^\\./, \"\")\n      return `${label} misses the property '${missingProp}'`\n    }\n\n    case \"type\": {\n      const type = params.type\n      if (Array.isArray(type)) {\n        const typeList = (type as string[]).join(\" | \")\n        const desc = descriptionSuffix(parentSchema)\n        return `${label} should be:\\n${typeList}${desc}`\n      }\n      return `${label} should be a ${type}`\n    }\n\n    case \"enum\": {\n      const enumVals = (parentSchema?.enum as unknown[] | undefined) ?? []\n      if (enumVals.length === 1) {\n        return `${label} should be ${JSON.stringify(enumVals[0])}`\n      }\n      return `${label} should be one of these:\\n${enumVals.map(v => JSON.stringify(v)).join(\" | \")}`\n    }\n\n    case \"anyOf\":\n    case \"oneOf\": {\n      const schemaText = formatSchemaType(parentSchema)\n      return `${label} should be one of these:\\n${schemaText}`\n    }\n\n    default:\n      return `${label} ${error.message}`\n  }\n}\n\nfunction descriptionSuffix(schema: Record<string, unknown> | undefined): string {\n  return typeof schema?.description === \"string\" ? `\\n-> ${schema.description}` : \"\"\n}\n\nfunction formatSchemaType(schema: Record<string, unknown> | undefined): string {\n  if (schema == null) {\n    return \"\"\n  }\n  if (Array.isArray(schema.type)) {\n    return (schema.type as string[]).join(\" | \")\n  }\n  if (typeof schema.type === \"string\") {\n    return schema.type\n  }\n  if (Array.isArray(schema.anyOf)) {\n    return (schema.anyOf as Array<Record<string, unknown>>)\n      .map(s => {\n        if (Array.isArray(s.type)) {\n          return (s.type as string[]).join(\" | \")\n        }\n        return typeof s.type === \"string\" ? s.type : \"\"\n      })\n      .filter(Boolean)\n      .join(\" | \")\n  }\n  return JSON.stringify(schema)\n}\n\nfunction indentNewlines(str: string, prefix: string): string {\n  return str.replace(/\\n(?!$)/g, `\\n${prefix}`)\n}\n"]}

package/dist/util/electronGet.d.ts

@@ -1,42 +1,25 @@
 import { ElectronPlatformArtifactDetails, MirrorOptions } from "@electron/get";
-import { ElectronPlatformName } from "../electron/ElectronFramework.js";
-export type ElectronGetOptions = Omit<ElectronPlatformArtifactDetails, "platform" | "arch" | "version" | "artifactName" | "artifactSuffix" | "customFilename" | "tempDirectory" | "downloader" | "cacheMode" | "cacheRoot" | "downloadOptions" | "isGeneric" | "mirrorOptions"> & {
+export interface ElectronGetOptions extends Omit<ElectronPlatformArtifactDetails, "platform" | "arch" | "version" | "artifactName" | "artifactSuffix" | "customFilename" | "tempDirectory" | "downloader" | "cacheMode" | "cacheRoot" | "downloadOptions" | "isGeneric" | "mirrorOptions"> {
     mirrorOptions?: Omit<MirrorOptions, "customDir" | "customFilename" | "customVersion">;
-};
+}
 export type ArtifactDownloadOptions = {
-    electronDownload?: ElectronGetOptions | ElectronDownloadOptions | null;
+    options?: ElectronGetOptions | null;
     artifactName: string;
     platformName: string;
     arch: string;
     version: string;
     cacheDir?: string;
 };
-export interface ElectronDownloadOptions {
-    version?: string;
-    /**
-     * The [cache location](https://github.com/electron-userland/electron-download#cache-location).
-     */
-    cache?: string | null;
-    /**
-     * The mirror.
-     */
-    mirror?: string | null;
-    /** @private */
-    customDir?: string | null;
-    /** @private */
-    customFilename?: string | null;
-    /** @private */
-    strictSSL?: boolean;
-    /** @private */
-    isVerifyChecksum?: boolean;
-    platform?: ElectronPlatformName;
-    arch?: string;
-}
 export declare function getCacheDirectory(options: {
     isAvoidSystemOnWindows?: boolean;
     allowEnvVarOverride: boolean;
 }): string;
 export declare function extractArchive(file: string, dir: string): Promise<void>;
+/**
+ * Forces undici's global proxy dispatcher to re-read the current HTTP(S)_PROXY / NO_PROXY env vars,
+ * bypassing the once-guard in initializeProxyOnce(). Exported for integration testing only.
+ */
+export declare function reinitializeProxy(): void;
 /**
  * Copies a remote artifact to a specific output path on disk.
  * Unlike downloadBuilderToolset, this does not extract archives — it copies the raw file.

package/dist/util/electronGet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electronGet.d.ts","sourceRoot":"","sources":["../../src/util/electronGet.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,+BAA+B,EAE/B,aAAa,EACd,MAAM,eAAe,CAAA;AActB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAIvE,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,+BAA+B,EAC7B,UAAU,GACV,MAAM,GACN,SAAS,GACT,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,eAAe,GACf,YAAY,GACZ,WAAW,GACX,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,eAAe,CAClB,GAAG;IACF,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,gBAAgB,GAAG,eAAe,CAAC,CAAA;CACtF,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,gBAAgB,CAAC,EAAE,kBAAkB,GAAG,uBAAuB,GAAG,IAAI,CAAA;IACtE,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,WAAW,uBAAuB;IAGtC,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAErB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAEtB,eAAe;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,eAAe;IACf,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAE9B,eAAe;IACf,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,eAAe;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAE1B,QAAQ,CAAC,EAAE,oBAAoB,CAAA;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAYD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CA2BrH;AAyDD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBA2E7D;AA0ND;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnG;AA0CD;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAkClB;AA0DD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7F;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAShG;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAclE"}
+{"version":3,"file":"electronGet.d.ts","sourceRoot":"","sources":["../../src/util/electronGet.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,+BAA+B,EAE/B,aAAa,EACd,MAAM,eAAe,CAAA;AAiBtB,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAC9C,+BAA+B,EAC7B,UAAU,GACV,MAAM,GACN,SAAS,GACT,cAAc,GACd,gBAAgB,GAChB,gBAAgB,GAChB,eAAe,GACf,YAAY,GACZ,WAAW,GACX,WAAW,GACX,iBAAiB,GACjB,WAAW,GACX,eAAe,CAClB;IACC,aAAa,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,gBAAgB,GAAG,eAAe,CAAC,CAAA;CACtF;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAA;IACnC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAYD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAAC,mBAAmB,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CA2BrH;AAgFD,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBA2E7D;AAUD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAExC;AA6OD;;;;GAIG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBnG;AA0CD;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE;IACpD,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAA;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAClC,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoClB;AAoBD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7F;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAShG;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAclE"}

package/dist/util/electronGet.js

@@ -1,18 +1,18 @@
 import * as get from "@electron/get";
 import { ElectronDownloadCacheMode, } from "@electron/get";
-import { buildGotProxyAgent, exec, exists, log, PADDING, parseValidEnvVarUrl, sanitizeDirPath, to7zaOutputSwitch } from "builder-util";
-import { getPath7za } from "../toolsets/7zip.js";
+import { exec, exists, log, PADDING, parseValidEnvVarUrl, sanitizeDirPath, to7zaOutputSwitch, ensureDir, moveDirAtomic } from "builder-util";
+import { HttpError, retry, sleep } from "builder-util-runtime";
+import * as crypto from "crypto";
 import { MultiProgress } from "electron-publish";
 import { createReadStream, createWriteStream } from "fs";
 import * as fs from "fs/promises";
-import * as crypto from "crypto";
 import * as os from "os";
 import * as path from "path";
 import * as lockfile from "proper-lockfile";
 import { pipeline } from "stream/promises";
 import * as tar from "tar";
 import * as unzipper from "unzipper";
-import { HttpError, retry, sleep } from "builder-util-runtime";
+import { getPath7za } from "../toolsets/7zip.js";
 import { CacheState, cleanupCacheDirectory, computeCacheMetadata, readCacheStateFile, validateCacheDirectory, writeCacheState } from "./cacheState.js";
 function hashUrlSafe(input, length = 6) {
     let hash = 5381;
@@ -58,6 +58,21 @@ function resolveCacheMode() {
     }
     return ElectronDownloadCacheMode.ReadWrite;
 }
+/**
+ * Returns true when `destPath` is safely contained within `dir` (direct child or deeper).
+ * On Windows the filesystem is case-insensitive so the comparison is normalised to lowercase.
+ * @internal exported for unit testing
+ */
+export function isSafeExtractPath(destPath, dir) {
+    const normalizedDest = path.resolve(destPath);
+    const normalizedDir = path.resolve(dir);
+    if (process.platform === "win32") {
+        const d = normalizedDest.toLowerCase();
+        const b = normalizedDir.toLowerCase();
+        return d.startsWith(b + path.sep) || d === b;
+    }
+    return normalizedDest.startsWith(normalizedDir + path.sep) || normalizedDest === normalizedDir;
+}
 async function extractZipStreaming(file, dir) {
     // Pass 1: read central directory once to collect Unix modes (one seek to EOF)
     const zipDir = await unzipper.Open.file(file);
@@ -69,38 +84,46 @@ async function extractZipStreaming(file, dir) {
         }
     }
     const isSymlink = (mode) => (mode & 0o170000) === 0o120000;
-    // Pass 2: stream from byte 0 — no per-entry seeks, no Docker hang
-    const entries = createReadStream(file).pipe(unzipper.Parse({ forceStream: true }));
-    for await (const entry of entries) {
-        const destPath = path.resolve(dir, entry.path);
-        if (!destPath.startsWith(dir + path.sep) && destPath !== dir) {
-            throw new Error(`Path traversal blocked: ${entry.path}`);
-        }
-        const mode = entryModes.get(entry.path) ?? 0;
-        if (mode > 0 && isSymlink(mode)) {
-            const target = (await entry.buffer()).toString();
-            if (path.isAbsolute(target)) {
-                throw new Error(`Absolute symlink target blocked: ${target}`);
+    // Pass 2: stream from byte 0 — no per-entry seeks, no Docker hang.
+    // Destroy the read stream in a finally block so the file handle is always released,
+    // including when the loop exits early due to a thrown error.
+    const readStream = createReadStream(file);
+    try {
+        const entries = readStream.pipe(unzipper.Parse({ forceStream: true }));
+        for await (const entry of entries) {
+            const destPath = path.resolve(dir, entry.path);
+            if (!isSafeExtractPath(destPath, dir)) {
+                throw new Error(`Path traversal blocked: ${entry.path}`);
             }
-            const resolvedTarget = path.resolve(path.dirname(destPath), target);
-            if (!resolvedTarget.startsWith(dir + path.sep) && resolvedTarget !== dir) {
-                throw new Error(`Symlink target escapes extraction dir: ${target}`);
+            const mode = entryModes.get(entry.path) ?? 0;
+            if (mode > 0 && isSymlink(mode)) {
+                const target = (await entry.buffer()).toString();
+                if (path.isAbsolute(target)) {
+                    throw new Error(`Absolute symlink target blocked: ${target}`);
+                }
+                const resolvedTarget = path.resolve(path.dirname(destPath), target);
+                if (!isSafeExtractPath(resolvedTarget, dir)) {
+                    throw new Error(`Symlink target escapes extraction dir: ${target}`);
+                }
+                await fs.mkdir(path.dirname(destPath), { recursive: true });
+                await fs.symlink(target, destPath);
             }
-            await fs.mkdir(path.dirname(destPath), { recursive: true });
-            await fs.symlink(target, destPath);
-        }
-        else if (entry.type === "Directory") {
-            await fs.mkdir(destPath, { recursive: true });
-            entry.autodrain();
-        }
-        else {
-            await fs.mkdir(path.dirname(destPath), { recursive: true });
-            await pipeline(entry, createWriteStream(destPath));
-            if (mode > 0) {
-                await fs.chmod(destPath, mode & 0o7777);
+            else if (entry.type === "Directory") {
+                await fs.mkdir(destPath, { recursive: true });
+                entry.autodrain();
+            }
+            else {
+                await fs.mkdir(path.dirname(destPath), { recursive: true });
+                await pipeline(entry, createWriteStream(destPath));
+                if (mode > 0) {
+                    await fs.chmod(destPath, mode & 0o7777);
+                }
             }
         }
     }
+    finally {
+        readStream.destroy();
+    }
 }
 export async function extractArchive(file, dir) {
     const tmpDir = `${dir}.tmp`;
@@ -157,7 +180,7 @@ export async function extractArchive(file, dir) {
                 // Check if extraction actually failed or just had benign warnings
                 const files = await fs.readdir(tmpDir);
                 if (files.length === 0) {
-                    log.warn({ file, tmpDir, error: e.message }, "7z extraction produced no output");
+                    log.warn({ file: log.filePath(file), tmpDir: log.filePath(tmpDir), error: e.message }, "7z extraction produced no output");
                     throw new Error(`7z extraction failed for ${file}: ${e.message}`);
                 }
                 // If files were extracted despite the error, log and continue
@@ -173,20 +196,37 @@ export async function extractArchive(file, dir) {
             throw new Error(`Extraction of ${path.basename(file)} produced no files`);
         }
         await fs.rm(dir, { recursive: true, force: true });
-        await fs.rename(tmpDir, dir);
+        await moveDirAtomic(tmpDir, dir);
     }
     finally {
         await release().catch(err => log.warn({ err }, "failed to release lockfile"));
     }
 }
+let proxyInitialized = false;
+function initializeProxyOnce() {
+    if (!proxyInitialized) {
+        reinitializeProxy();
+        proxyInitialized = true;
+    }
+}
+/**
+ * Forces undici's global proxy dispatcher to re-read the current HTTP(S)_PROXY / NO_PROXY env vars,
+ * bypassing the once-guard in initializeProxyOnce(). Exported for integration testing only.
+ */
+export function reinitializeProxy() {
+    get.initializeProxy();
+}
 async function downloadArtifactToFile(config, label) {
     // Serialize concurrent downloads of the same artifact across vitest workers to prevent @electron/get's
     // non-atomic putFileInCache (remove + move) from racing with a concurrent reader.
-    const artifactLockKey = crypto
-        .createHash("sha256")
-        .update(JSON.stringify({ v: config.version, p: config.platform, a: config.arch, n: config.artifactName }))
-        .digest("hex")
-        .slice(0, 20);
+    const key = {
+        p: config.platform,
+        a: config.arch,
+        v: config.version,
+        n: config.artifactName,
+        g: config.isGeneric,
+    };
+    const artifactLockKey = crypto.createHash("sha256").update(JSON.stringify(key)).digest("hex").slice(0, 20);
     const artifactLockPath = path.join(os.tmpdir(), `eb-dl-${artifactLockKey}.lock`);
     // This lock is taken even for cache hits (the cache-hit check lives inside @electron/get), so under
     // heavy concurrency many builds serialize here. 30 retries (~137s of backoff) is too few — waiters
@@ -200,10 +240,12 @@ async function downloadArtifactToFile(config, label) {
     });
     let lastLoggedMilestone = -1;
     const state = { bar: undefined };
+    // @electron/get v5 downloads via fetch, whose proxy support comes from undici's global dispatcher.
+    // initializeProxy() wires that up from HTTP(S)_PROXY/NO_PROXY env vars (replaces the got proxy agent).
+    initializeProxyOnce();
     const downloadOptions = {
-        timeout: { request: 10 * 60 * 1000 }, // prevent indefinite hang on stalled connections
+        signal: AbortSignal.timeout(10 * 60 * 1000), // prevent indefinite hang on stalled connections
         ...config.downloadOptions,
-        agent: config.downloadOptions?.agent ?? buildGotProxyAgent(),
         getProgressCallback: info => {
             // @electron/get passes downloadOptions (including this callback) to its internal
             // SHASUMS256.txt validation download. That file is tiny (<1 MB) and fires at 100%
@@ -310,9 +352,14 @@ async function persistToArchiveCache(sourcePath, archiveCachePath) {
  * Both public download functions delegate here after building their respective configs.
  */
 async function downloadAndExtract(config, extractDir, label, archiveCachePath) {
-    await fs.mkdir(extractDir, { recursive: true });
-    // Pre-lock fast path: only short-circuit for a definitively complete and valid cache.
-    // Do NOT clean up here — concurrent processes could race to delete under each other.
+    // Create only the PARENT dir (e.g. <cache>/fpm@2.2.1), never extractDir itself, before locking.
+    // The parent is stable — cleanup only ever removes extractDir and its .state/.tmp/.lock siblings —
+    // so extractDir's whole lifecycle (mkdir, rm, re-mkdir) stays inside the lock. ensureDir absorbs
+    // the concurrent-recursive-mkdir ENOENT/EEXIST race while peers populate the cold cache tree.
+    await ensureDir(path.dirname(extractDir));
+    // Pre-lock fast path: read-only short-circuit for a definitively complete and valid cache.
+    // Safe unlocked — the cache-state helpers return null/false for a missing or half-written dir,
+    // so a racing read only ever falls through to take the lock. Do NOT mutate the dir here.
     const stateData = await readCacheStateFile(extractDir);
     if (stateData?.state === CacheState.complete) {
         const isValid = await validateCacheDirectory(extractDir, stateData.fileCount);
@@ -327,6 +374,13 @@ async function downloadAndExtract(config, extractDir, label, archiveCachePath) {
     // patience of withToolsetLock. proper-lockfile's update heartbeat keeps a live holder's lock fresh,
     // so increasing waiter retries never falsely steals an in-progress extraction.
     const release = await lockfile.lock(extractDir, {
+        // realpath:false so proper-lockfile creates <extractDir>.lock in the (already-created) parent
+        // WITHOUT calling fs.realpath(extractDir) first — which would throw ENOENT now that extractDir
+        // is created lazily inside the lock. This filesystem lock serializes peers both across worker
+        // processes AND within a single process (a second lock() for the same path retries until the
+        // first releases), so no in-process promise cache is needed — and one wouldn't help across the
+        // separate test worker processes anyway.
+        realpath: false,
         retries: { retries: 100, minTimeout: 1000, maxTimeout: 5000 },
         stale: 120000,
     });
@@ -347,7 +401,7 @@ async function downloadAndExtract(config, extractDir, label, archiveCachePath) {
         }
         // Cleanup inside the lock — skip lock files since we currently hold them
         await cleanupCacheDirectory(extractDir, { skipLockFiles: true });
-        await fs.mkdir(extractDir, { recursive: true });
+        await ensureDir(extractDir);
         // Check electron-builder's own archive cache before touching @electron/get.
         // The cache lives alongside the extract dir: <cacheDir>/<releaseName>/<filename>.
         // This lets repeated builds (or offline environments) skip the download entirely once
@@ -453,7 +507,9 @@ export async function downloadBuilderToolset(options) {
     const fullUrl = resolveBuilderBinaryUrl(releaseName, filenameWithExt, baseUrl, overrideUrl);
     const suffix = hashUrlSafe(fullUrl, 5);
     const folderName = `${filenameWithExt.replace(/\.(tar\.gz|tgz|tar\.xz|txz|zip|7z)$/, "")}-${suffix}`;
-    const extractDir = path.join(getCacheDirectory({ allowEnvVarOverride: true }), releaseName, folderName);
+    // releaseName is library input; enforce cache-dir containment (rejects traversal, clears taint into shell extraction)
+    const cacheDir = getCacheDirectory({ allowEnvVarOverride: true });
+    const extractDir = sanitizeDirPath(path.join(cacheDir, releaseName, folderName), cacheDir);
     // Use resolveAssetURL so @electron/get's ELECTRON_MIRROR env var check cannot override
     // the builder-binaries URL we've already resolved (see getArtifactRemoteURL in @electron/get).
     const mirrorOptions = {
@@ -462,7 +518,7 @@ export async function downloadBuilderToolset(options) {
     // Predictable archive cache: <cacheDir>/<releaseName>/<filename>, next to the extract dir.
     // downloadAndExtract checks here before touching @electron/get and persists the archive here
     // after every successful download, so subsequent builds never need a network round-trip.
-    const archiveCachePath = path.join(getCacheDirectory({ allowEnvVarOverride: true }), releaseName, filenameWithExt);
+    const archiveCachePath = sanitizeDirPath(path.join(cacheDir, releaseName, filenameWithExt), cacheDir);
     const config = {
         version: "9.9.9", // must be >1.3.2 to bypass @electron/get validation shortcut
         artifactName: filenameWithExt,
@@ -474,52 +530,16 @@ export async function downloadBuilderToolset(options) {
     };
     return downloadAndExtract(config, extractDir, filenameWithExt, archiveCachePath);
 }
-// Keys present in ElectronGetOptions but absent from ElectronDownloadOptions.
-// Used to discriminate between the two config shapes at runtime.
-const ELECTRON_GET_EXCLUSIVE_KEYS = ["mirrorOptions", "force", "unsafelyDisableChecksums"];
-function isElectronGetOptions(dl) {
-    return ELECTRON_GET_EXCLUSIVE_KEYS.some(k => Object.hasOwnProperty.call(dl, k));
-}
 /**
  * Downloads and extracts an electron platform artifact (e.g. ffmpeg) using @electron/get.
  * Deduplicates concurrent calls for the same artifact within the same process.
  */
-function buildElectronArtifactConfig(options) {
-    const { electronDownload, arch, version, platformName: platform, artifactName, cacheDir: cacheRoot } = options;
-    let artifactConfig = { cacheRoot, platform, arch, version, artifactName };
-    if (electronDownload != null) {
-        if (isElectronGetOptions(electronDownload)) {
-            const { mirrorOptions, ...rest } = electronDownload;
-            artifactConfig = { ...artifactConfig, ...rest, cacheRoot, mirrorOptions };
-        }
-        else {
-            const { mirror, customDir, cache, customFilename, isVerifyChecksum, strictSSL, platform: overridePlatform, arch: overrideArch } = electronDownload;
-            // strictSSL: false disables TLS certificate validation for all
-            // electron/tool downloads.  This option exists only for air-gapped or
-            // self-signed-cert environments; ensure your build network is fully trusted.
-            if (strictSSL === false) {
-                log.warn({ option: "electronDownload.strictSSL" }, "strictSSL is false — TLS certificate validation is DISABLED for Electron downloads. Only use this option in a trusted, isolated build environment.");
-            }
-            artifactConfig = {
-                ...artifactConfig,
-                unsafelyDisableChecksums: isVerifyChecksum === false,
-                cacheRoot: cache ?? cacheRoot,
-                mirrorOptions: {
-                    mirror: mirror || undefined,
-                    customDir: customDir || undefined,
-                    customFilename: customFilename || undefined,
-                },
-                ...(strictSSL === false ? { downloadOptions: { https: { rejectUnauthorized: false } } } : {}),
-            };
-            if (overridePlatform != null) {
-                artifactConfig.platform = overridePlatform;
-            }
-            if (overrideArch != null) {
-                artifactConfig.arch = overrideArch;
-            }
-        }
+function buildElectronArtifactConfig(artifactOptions) {
+    const { options, arch, version, platformName: platform, artifactName, cacheDir: cacheRoot } = artifactOptions;
+    if (options?.unsafelyDisableChecksums) {
+        log.warn({ artifactName }, "electronGet.unsafelyDisableChecksums is enabled — downloaded artifacts will NOT be verified.txt; a compromised mirror can serve malicious binaries undetected");
     }
-    artifactConfig.cacheMode = resolveCacheMode();
+    const artifactConfig = { ...options, cacheRoot, platform, arch, version, artifactName, cacheMode: resolveCacheMode() };
     return artifactConfig;
 }
 /**