app-builder-lib 27.0.0-alpha.11 → 27.0.0-alpha.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (254) hide show
  1. package/dist/asar/asarUtil.js +1 -1
  2. package/dist/asar/asarUtil.js.map +1 -1
  3. package/dist/codeSign/certInfo.d.ts +4 -1
  4. package/dist/codeSign/certInfo.d.ts.map +1 -1
  5. package/dist/codeSign/certInfo.js +5 -3
  6. package/dist/codeSign/certInfo.js.map +1 -1
  7. package/dist/codeSign/forceCodeSigning.d.ts +22 -0
  8. package/dist/codeSign/forceCodeSigning.d.ts.map +1 -0
  9. package/dist/codeSign/forceCodeSigning.js +18 -0
  10. package/dist/codeSign/forceCodeSigning.js.map +1 -0
  11. package/dist/codeSign/mac/macCodeSign.d.ts +13 -1
  12. package/dist/codeSign/mac/macCodeSign.d.ts.map +1 -1
  13. package/dist/codeSign/mac/macCodeSign.js +29 -2
  14. package/dist/codeSign/mac/macCodeSign.js.map +1 -1
  15. package/dist/codeSign/mac/macSignatureVerifier.d.ts +23 -0
  16. package/dist/codeSign/mac/macSignatureVerifier.d.ts.map +1 -0
  17. package/dist/codeSign/mac/macSignatureVerifier.js +96 -0
  18. package/dist/codeSign/mac/macSignatureVerifier.js.map +1 -0
  19. package/dist/codeSign/win/authenticodeSignature.d.ts +83 -0
  20. package/dist/codeSign/win/authenticodeSignature.d.ts.map +1 -0
  21. package/dist/codeSign/win/authenticodeSignature.js +289 -0
  22. package/dist/codeSign/win/authenticodeSignature.js.map +1 -0
  23. package/dist/codeSign/win/pkcs11SignManager.d.ts.map +1 -1
  24. package/dist/codeSign/win/pkcs11SignManager.js +4 -3
  25. package/dist/codeSign/win/pkcs11SignManager.js.map +1 -1
  26. package/dist/codeSign/win/publisherName.d.ts +31 -0
  27. package/dist/codeSign/win/publisherName.d.ts.map +1 -0
  28. package/dist/codeSign/win/publisherName.js +78 -0
  29. package/dist/codeSign/win/publisherName.js.map +1 -0
  30. package/dist/codeSign/win/signtoolBaseSignManager.d.ts +27 -9
  31. package/dist/codeSign/win/signtoolBaseSignManager.d.ts.map +1 -1
  32. package/dist/codeSign/win/signtoolBaseSignManager.js +80 -49
  33. package/dist/codeSign/win/signtoolBaseSignManager.js.map +1 -1
  34. package/dist/codeSign/win/verifyUpdatePublisher.d.ts +25 -0
  35. package/dist/codeSign/win/verifyUpdatePublisher.d.ts.map +1 -0
  36. package/dist/codeSign/win/verifyUpdatePublisher.js +101 -0
  37. package/dist/codeSign/win/verifyUpdatePublisher.js.map +1 -0
  38. package/dist/codeSign/win/windowsSignAzureManager.d.ts +1 -1
  39. package/dist/codeSign/win/windowsSignAzureManager.d.ts.map +1 -1
  40. package/dist/codeSign/win/windowsSignAzureManager.js +24 -6
  41. package/dist/codeSign/win/windowsSignAzureManager.js.map +1 -1
  42. package/dist/configuration.d.ts +56 -12
  43. package/dist/configuration.d.ts.map +1 -1
  44. package/dist/configuration.js.map +1 -1
  45. package/dist/electron/ElectronFramework.d.ts +15 -0
  46. package/dist/electron/ElectronFramework.d.ts.map +1 -1
  47. package/dist/electron/ElectronFramework.js +33 -2
  48. package/dist/electron/ElectronFramework.js.map +1 -1
  49. package/dist/electron/mac/asarIntegrityDigest.d.ts +10 -0
  50. package/dist/electron/mac/asarIntegrityDigest.d.ts.map +1 -0
  51. package/dist/electron/mac/asarIntegrityDigest.js +122 -0
  52. package/dist/electron/mac/asarIntegrityDigest.js.map +1 -0
  53. package/dist/electron/mac/electronMac.js +1 -28
  54. package/dist/electron/mac/electronMac.js.map +1 -1
  55. package/dist/electron/mac/electronMacUtils.d.ts +9 -0
  56. package/dist/electron/mac/electronMacUtils.d.ts.map +1 -1
  57. package/dist/electron/mac/electronMacUtils.js +37 -0
  58. package/dist/electron/mac/electronMacUtils.js.map +1 -1
  59. package/dist/fileMatcher.d.ts +34 -11
  60. package/dist/fileMatcher.d.ts.map +1 -1
  61. package/dist/fileMatcher.js +125 -36
  62. package/dist/fileMatcher.js.map +1 -1
  63. package/dist/forge-maker.d.ts +64 -0
  64. package/dist/forge-maker.d.ts.map +1 -1
  65. package/dist/forge-maker.js +104 -2
  66. package/dist/forge-maker.js.map +1 -1
  67. package/dist/index.d.ts +2 -2
  68. package/dist/index.d.ts.map +1 -1
  69. package/dist/index.js +5 -4
  70. package/dist/index.js.map +1 -1
  71. package/dist/indexInternal.d.ts +9 -3
  72. package/dist/indexInternal.d.ts.map +1 -1
  73. package/dist/indexInternal.js +8 -3
  74. package/dist/indexInternal.js.map +1 -1
  75. package/dist/linuxPackager.js +1 -1
  76. package/dist/linuxPackager.js.map +1 -1
  77. package/dist/macPackager.d.ts +32 -0
  78. package/dist/macPackager.d.ts.map +1 -1
  79. package/dist/macPackager.js +215 -13
  80. package/dist/macPackager.js.map +1 -1
  81. package/dist/options/FuseOptionsV1.d.ts +4 -0
  82. package/dist/options/FuseOptionsV1.d.ts.map +1 -1
  83. package/dist/options/FuseOptionsV1.js.map +1 -1
  84. package/dist/options/PlatformSpecificBuildOptions.d.ts +93 -21
  85. package/dist/options/PlatformSpecificBuildOptions.d.ts.map +1 -1
  86. package/dist/options/PlatformSpecificBuildOptions.js.map +1 -1
  87. package/dist/options/SquirrelWindowsOptions.d.ts +3 -0
  88. package/dist/options/SquirrelWindowsOptions.d.ts.map +1 -1
  89. package/dist/options/SquirrelWindowsOptions.js.map +1 -1
  90. package/dist/options/macOptions.d.ts +22 -3
  91. package/dist/options/macOptions.d.ts.map +1 -1
  92. package/dist/options/macOptions.js.map +1 -1
  93. package/dist/options/winOptions.d.ts +68 -19
  94. package/dist/options/winOptions.d.ts.map +1 -1
  95. package/dist/options/winOptions.js +20 -0
  96. package/dist/options/winOptions.js.map +1 -1
  97. package/dist/packager.d.ts +3 -0
  98. package/dist/packager.d.ts.map +1 -1
  99. package/dist/packager.js +11 -2
  100. package/dist/packager.js.map +1 -1
  101. package/dist/platformPackager.d.ts +18 -7
  102. package/dist/platformPackager.d.ts.map +1 -1
  103. package/dist/platformPackager.js +56 -15
  104. package/dist/platformPackager.js.map +1 -1
  105. package/dist/publish/PublishManager.d.ts +4 -0
  106. package/dist/publish/PublishManager.d.ts.map +1 -1
  107. package/dist/publish/PublishManager.js +106 -28
  108. package/dist/publish/PublishManager.js.map +1 -1
  109. package/dist/publish/manifestUploadCheck.d.ts +10 -0
  110. package/dist/publish/manifestUploadCheck.d.ts.map +1 -0
  111. package/dist/publish/manifestUploadCheck.js +75 -0
  112. package/dist/publish/manifestUploadCheck.js.map +1 -0
  113. package/dist/publish/updateInfoBuilder.d.ts.map +1 -1
  114. package/dist/publish/updateInfoBuilder.js +51 -17
  115. package/dist/publish/updateInfoBuilder.js.map +1 -1
  116. package/dist/publish/updateManifestVerifier.d.ts +22 -0
  117. package/dist/publish/updateManifestVerifier.d.ts.map +1 -0
  118. package/dist/publish/updateManifestVerifier.js +65 -0
  119. package/dist/publish/updateManifestVerifier.js.map +1 -0
  120. package/dist/targets/ArchiveTarget.d.ts.map +1 -1
  121. package/dist/targets/ArchiveTarget.js +6 -2
  122. package/dist/targets/ArchiveTarget.js.map +1 -1
  123. package/dist/targets/archive.d.ts +6 -0
  124. package/dist/targets/archive.d.ts.map +1 -1
  125. package/dist/targets/archive.js +15 -5
  126. package/dist/targets/archive.js.map +1 -1
  127. package/dist/targets/differentialUpdateInfoBuilder.d.ts.map +1 -1
  128. package/dist/targets/differentialUpdateInfoBuilder.js +4 -0
  129. package/dist/targets/differentialUpdateInfoBuilder.js.map +1 -1
  130. package/dist/targets/linux/FlatpakTarget.js +5 -5
  131. package/dist/targets/linux/FlatpakTarget.js.map +1 -1
  132. package/dist/targets/linux/FpmTarget.d.ts.map +1 -1
  133. package/dist/targets/linux/FpmTarget.js +12 -17
  134. package/dist/targets/linux/FpmTarget.js.map +1 -1
  135. package/dist/targets/linux/LinuxTargetHelper.js +1 -1
  136. package/dist/targets/linux/LinuxTargetHelper.js.map +1 -1
  137. package/dist/targets/linux/appimage/AppImageTarget.d.ts.map +1 -1
  138. package/dist/targets/linux/appimage/AppImageTarget.js +6 -1
  139. package/dist/targets/linux/appimage/AppImageTarget.js.map +1 -1
  140. package/dist/targets/linux/appimage/appImageUtil.js +9 -9
  141. package/dist/targets/linux/appimage/appImageUtil.js.map +1 -1
  142. package/dist/targets/linux/flatpakBundle.d.ts.map +1 -1
  143. package/dist/targets/linux/flatpakBundle.js +25 -20
  144. package/dist/targets/linux/flatpakBundle.js.map +1 -1
  145. package/dist/targets/linux/snap/core24.d.ts.map +1 -1
  146. package/dist/targets/linux/snap/core24.js +2 -9
  147. package/dist/targets/linux/snap/core24.js.map +1 -1
  148. package/dist/targets/linux/snap/coreLegacy.d.ts.map +1 -1
  149. package/dist/targets/linux/snap/coreLegacy.js +22 -6
  150. package/dist/targets/linux/snap/coreLegacy.js.map +1 -1
  151. package/dist/targets/linux/snap/snapPlugs.d.ts +2 -2
  152. package/dist/targets/linux/snap/snapPlugs.d.ts.map +1 -1
  153. package/dist/targets/linux/snap/snapPlugs.js +1 -1
  154. package/dist/targets/linux/snap/snapPlugs.js.map +1 -1
  155. package/dist/targets/linux/snap/snapcraftBuilder.d.ts.map +1 -1
  156. package/dist/targets/linux/snap/snapcraftBuilder.js +19 -17
  157. package/dist/targets/linux/snap/snapcraftBuilder.js.map +1 -1
  158. package/dist/targets/mac/MacTargetHelper.d.ts +21 -3
  159. package/dist/targets/mac/MacTargetHelper.d.ts.map +1 -1
  160. package/dist/targets/mac/MacTargetHelper.js +140 -13
  161. package/dist/targets/mac/MacTargetHelper.js.map +1 -1
  162. package/dist/targets/mac/pkg.d.ts.map +1 -1
  163. package/dist/targets/mac/pkg.js +8 -5
  164. package/dist/targets/mac/pkg.js.map +1 -1
  165. package/dist/targets/win/nsis/NsisTarget.d.ts.map +1 -1
  166. package/dist/targets/win/nsis/NsisTarget.js +15 -3
  167. package/dist/targets/win/nsis/NsisTarget.js.map +1 -1
  168. package/dist/targets/win/nsis/nsisOptions.d.ts +1 -1
  169. package/dist/targets/win/nsis/nsisOptions.js.map +1 -1
  170. package/dist/toolsets/nsis.js +1 -1
  171. package/dist/toolsets/nsis.js.map +1 -1
  172. package/dist/toolsets/winCodeSign.d.ts +14 -1
  173. package/dist/toolsets/winCodeSign.d.ts.map +1 -1
  174. package/dist/toolsets/winCodeSign.js +14 -1
  175. package/dist/toolsets/winCodeSign.js.map +1 -1
  176. package/dist/toolsets/wine.d.ts +3 -0
  177. package/dist/toolsets/wine.d.ts.map +1 -1
  178. package/dist/toolsets/wine.js +14 -5
  179. package/dist/toolsets/wine.js.map +1 -1
  180. package/dist/util/appFileCopier.d.ts.map +1 -1
  181. package/dist/util/appFileCopier.js +15 -11
  182. package/dist/util/appFileCopier.js.map +1 -1
  183. package/dist/util/buildOutputVerifier.d.ts +40 -0
  184. package/dist/util/buildOutputVerifier.d.ts.map +1 -0
  185. package/dist/util/buildOutputVerifier.js +420 -0
  186. package/dist/util/buildOutputVerifier.js.map +1 -0
  187. package/dist/util/config/config.d.ts.map +1 -1
  188. package/dist/util/config/config.js +9 -1
  189. package/dist/util/config/config.js.map +1 -1
  190. package/dist/util/config/fileOptions.d.ts +22 -0
  191. package/dist/util/config/fileOptions.d.ts.map +1 -1
  192. package/dist/util/config/fileOptions.js +92 -2
  193. package/dist/util/config/fileOptions.js.map +1 -1
  194. package/dist/util/config/legacyConfigGuard.d.ts.map +1 -1
  195. package/dist/util/config/legacyConfigGuard.js +2 -2
  196. package/dist/util/config/legacyConfigGuard.js.map +1 -1
  197. package/dist/util/config/legacyOptions.d.ts +9 -2
  198. package/dist/util/config/legacyOptions.d.ts.map +1 -1
  199. package/dist/util/config/legacyOptions.js +20 -2
  200. package/dist/util/config/legacyOptions.js.map +1 -1
  201. package/dist/util/electronGet.d.ts.map +1 -1
  202. package/dist/util/electronGet.js +3 -1
  203. package/dist/util/electronGet.js.map +1 -1
  204. package/dist/util/flags.d.ts.map +1 -1
  205. package/dist/util/flags.js +3 -9
  206. package/dist/util/flags.js.map +1 -1
  207. package/dist/util/mac/macosIconComposer.d.ts.map +1 -1
  208. package/dist/util/mac/macosIconComposer.js +6 -5
  209. package/dist/util/mac/macosIconComposer.js.map +1 -1
  210. package/dist/util/macroExpander.js +1 -1
  211. package/dist/util/macroExpander.js.map +1 -1
  212. package/dist/util/nativeBinaryVerifier.d.ts.map +1 -1
  213. package/dist/util/nativeBinaryVerifier.js +3 -1
  214. package/dist/util/nativeBinaryVerifier.js.map +1 -1
  215. package/dist/util/packageMetadata.js +1 -1
  216. package/dist/util/packageMetadata.js.map +1 -1
  217. package/dist/util/removedEnvVars.d.ts +2 -0
  218. package/dist/util/removedEnvVars.d.ts.map +1 -1
  219. package/dist/util/removedEnvVars.js +15 -1
  220. package/dist/util/removedEnvVars.js.map +1 -1
  221. package/dist/util/streamSpawnToFile.d.ts +3 -1
  222. package/dist/util/streamSpawnToFile.d.ts.map +1 -1
  223. package/dist/util/streamSpawnToFile.js +6 -2
  224. package/dist/util/streamSpawnToFile.js.map +1 -1
  225. package/dist/version.d.ts +1 -1
  226. package/dist/version.js +1 -1
  227. package/dist/version.js.map +1 -1
  228. package/dist/vm/ParallelsVm.d.ts +10 -0
  229. package/dist/vm/ParallelsVm.d.ts.map +1 -1
  230. package/dist/vm/ParallelsVm.js +22 -8
  231. package/dist/vm/ParallelsVm.js.map +1 -1
  232. package/dist/vm/PwshVm.d.ts +0 -1
  233. package/dist/vm/PwshVm.d.ts.map +1 -1
  234. package/dist/vm/PwshVm.js +10 -15
  235. package/dist/vm/PwshVm.js.map +1 -1
  236. package/dist/vm/WineVm.d.ts.map +1 -1
  237. package/dist/vm/WineVm.js +4 -4
  238. package/dist/vm/WineVm.js.map +1 -1
  239. package/dist/vm/vm.d.ts +9 -3
  240. package/dist/vm/vm.d.ts.map +1 -1
  241. package/dist/vm/vm.js +40 -32
  242. package/dist/vm/vm.js.map +1 -1
  243. package/dist/winPackager.d.ts +16 -1
  244. package/dist/winPackager.d.ts.map +1 -1
  245. package/dist/winPackager.js +77 -19
  246. package/dist/winPackager.js.map +1 -1
  247. package/package.json +12 -10
  248. package/scheme.json +662 -50
  249. package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +14 -9
  250. package/templates/nsis/installSection.nsh +5 -0
  251. package/dist/vm/MonoVm.d.ts +0 -9
  252. package/dist/vm/MonoVm.d.ts.map +0 -1
  253. package/dist/vm/MonoVm.js +0 -16
  254. package/dist/vm/MonoVm.js.map +0 -1
@@ -1,6 +1,6 @@
1
1
  import asyncPool from "tiny-async-pool";
2
- import { Arch, createUpdateManifestSignatures, log, safeStringifyJson, serializeToYaml } from "builder-util";
3
- import { deepAssign } from "builder-util-runtime";
2
+ import { Arch, createUpdateManifestSignatures, derivePublicKeyPem, log, safeStringifyJson, serializeToYaml } from "builder-util";
3
+ import { computeUpdateManifestKeyId, deepAssign } from "builder-util-runtime";
4
4
  import fsExtra from "fs-extra";
5
5
  import { Lazy } from "lazy-val";
6
6
  import * as path from "path";
@@ -8,6 +8,7 @@ import * as semver from "semver";
8
8
  import { Platform } from "../core.js";
9
9
  import { hashFile } from "../util/hash.js";
10
10
  import { computeDownloadUrl, getPublishConfigsForUpdateInfo } from "./PublishManager.js";
11
+ import { verifyUpdateManifestContent } from "./updateManifestVerifier.js";
11
12
  async function getReleaseInfo(packager) {
12
13
  const releaseInfo = { ...(packager.platformOptions.releaseInfo || packager.config.releaseInfo) };
13
14
  if (releaseInfo.releaseNotes == null) {
@@ -64,7 +65,7 @@ function warnAboutSuffixedChannelExpansion(currentChannel, suffix, channels) {
64
65
  solution: "set generateUpdatesFilesForAllChannels: false to keep publishing a single file per suffixed channel",
65
66
  }, `the suffixed channel "${currentChannel}" now expands to its lower channels — electron-builder <= 26 wrote only one file for suffixed channels. ` +
66
67
  "A later publish on a higher channel will overwrite these in the same bucket, changing what existing pre-release users are offered. " +
67
- "See https://www.electron.build/docs/migration/v27-breaking-changes#suffixed-update-channels-now-expand-to-lower-channels");
68
+ "See https://www.electron.build/docs/migration/v27-build-changes#suffixed-update-channels-now-expand-to-lower-channels");
68
69
  return channels;
69
70
  }
70
71
  function getUpdateInfoFileName(channel, packager, arch) {
@@ -179,8 +180,17 @@ async function createUpdateInfo(version, event, releaseInfo) {
179
180
  }
180
181
  }
181
182
  }
183
+ // win.allowCatalogSignature: read by electron-updater from the update info of an NSIS update, and honored only when the manifest
184
+ // signature is verified (it is covered by that signature)
185
+ if (event.packager.platform === Platform.WINDOWS && isNsisUpdateTarget(event.target) && event.packager.platformOptions.allowCatalogSignature === true) {
186
+ const windowsResult = { ...result, allowCatalogSignature: true };
187
+ return windowsResult;
188
+ }
182
189
  return result;
183
190
  }
191
+ function isNsisUpdateTarget(target) {
192
+ return target != null && (target.name === "nsis" || target.name === "nsis-web");
193
+ }
184
194
  export async function writeUpdateInfoFiles(updateInfoFileTasks, packager, isPublish = false) {
185
195
  // zip must be first and zip info must be used for old path/sha512 properties in the update info
186
196
  // universal installer (arch === null) must precede arch-specific ones so path:/sha512: point to the right artifact
@@ -208,24 +218,18 @@ export async function writeUpdateInfoFiles(updateInfoFileTasks, packager, isPubl
208
218
  }
209
219
  const releaseDate = new Date().toISOString();
210
220
  const tasks = Array.from(updateChannelFileToInfo.values());
211
- // Resolve (and, when publishing, enforce) the signing keys before writing anything, so a missing key fails the
212
- // build instead of leaving some manifests written and others not. MemoLazy and the one-shot warning make the
213
- // per-task calls below free after this. Tasks with `publishAutoUpdate: false` are skipped for the same reason
214
- // the loop skips them: they emit no manifest.
221
+ // Phase 1: resolve (and enforce) the signing keys, sign, serialize and read back every manifest before anything is
222
+ // written, so a missing key or a manifest that does not verify fails the build instead of leaving some manifests
223
+ // written - and uploaded - and others not.
224
+ const manifests = [];
215
225
  for (const task of tasks) {
216
- if (task.publishConfiguration.publishAutoUpdate !== false) {
217
- await task.packager.requireUpdateSigningKeys(isPublish);
218
- }
219
- }
220
- const concurrency = 4;
221
- await asyncPool(concurrency, tasks, async (task) => {
222
226
  const publishConfig = task.publishConfiguration;
223
227
  if (publishConfig.publishAutoUpdate === false) {
224
228
  log.debug({
225
229
  provider: publishConfig.provider,
226
230
  reason: "publishAutoUpdate is set to false",
227
231
  }, "auto update metadata file not published");
228
- return;
232
+ continue;
229
233
  }
230
234
  if (task.info.releaseDate == null) {
231
235
  task.info.releaseDate = releaseDate;
@@ -240,12 +244,21 @@ export async function writeUpdateInfoFiles(updateInfoFileTasks, packager, isPubl
240
244
  const signingKeys = await task.packager.requireUpdateSigningKeys(isPublish);
241
245
  let info = task.info;
242
246
  // empty only when signing is opted out of with `updateManifest: false`, or on a build without a publish
243
- // policy that has no key configured - both of which have already warned
247
+ // policy or forceCodeSigning that has no key configured - both of which have already warned
244
248
  if (signingKeys.length > 0) {
245
249
  const signatures = createUpdateManifestSignatures(task.info, signingKeys);
246
250
  info = { ...task.info, signature: signatures[0].signature, signatures };
247
251
  }
252
+ else if ("allowCatalogSignature" in info && info.allowCatalogSignature === true) {
253
+ log.warn({ file: log.filePath(task.file), reason: "electron-updater honors it only in an update manifest whose signature it verified" }, "win.allowCatalogSignature has no effect: the update manifest is not signed");
254
+ }
248
255
  const fileContent = Buffer.from(serializeToYaml(info, false, true));
256
+ verifySerializedManifest(task.file, fileContent, signingKeys);
257
+ manifests.push({ task, fileContent });
258
+ }
259
+ // Phase 2: write and emit (which schedules the upload of) exactly the bytes that were verified
260
+ const concurrency = 4;
261
+ await asyncPool(concurrency, manifests, async ({ task, fileContent }) => {
249
262
  await fsExtra.outputFile(task.file, fileContent);
250
263
  await packager.emitArtifactCreated({
251
264
  file: task.file,
@@ -253,10 +266,31 @@ export async function writeUpdateInfoFiles(updateInfoFileTasks, packager, isPubl
253
266
  arch: null,
254
267
  packager: task.packager,
255
268
  target: null,
256
- publishConfig,
269
+ publishConfig: task.publishConfiguration,
257
270
  });
258
271
  });
259
272
  }
273
+ /**
274
+ * Reads a signed manifest back from the bytes about to be written, the way electron-updater parses it, and checks that
275
+ * every signing key verifies it. It is checked against the signing keys' own public keys, not `updateManifest.publicKey`,
276
+ * so a deliberate `allowSigningKeyOutsideTrustList` cutover keeps working. A failure means serialization changed what
277
+ * was signed, which is a bug: every install would reject the manifest.
278
+ */
279
+ function verifySerializedManifest(file, fileContent, signingKeys) {
280
+ if (signingKeys.length === 0) {
281
+ return;
282
+ }
283
+ const content = fileContent.toString("utf8");
284
+ for (const key of signingKeys) {
285
+ const publicKey = derivePublicKeyPem(key);
286
+ const result = verifyUpdateManifestContent(content, [publicKey]);
287
+ if (!result.ok) {
288
+ throw new Error(`Internal error: ${log.filePath(file)} does not verify with update-manifest signing key ${computeUpdateManifestKeyId(publicKey)} after serialization (${result.reason}). ` +
289
+ "No update manifest was written or uploaded (installers of a publishing build may already be uploaded). " +
290
+ "Please report it at https://github.com/electron-userland/electron-builder/issues");
291
+ }
292
+ }
293
+ }
260
294
  // backward compatibility - write json file
261
295
  async function writeOldMacInfo(publishConfig, outDir, dir, channel, createdFiles, version, packager) {
262
296
  const isGitHub = publishConfig.provider === "github";
@@ -292,6 +326,6 @@ function warnAboutLegacyUpdaterCompatibility(electronUpdaterCompatibility, needs
292
326
  .warn({ electronUpdaterCompatibility, solution: 'drop the pin (the default is ">=2.16") unless you still ship apps embedding electron-updater 1.x-2.15' }, "electronUpdaterCompatibility includes electron-updater versions below 2.16.0, so the deprecated top-level path/sha512 descriptor is still written to latest*.yml " +
293
327
  "(and, on Windows, the legacy SHA-256 sha2 checksum). Metadata validated only by sha2 is deprecated and v28 will reject it. " +
294
328
  "Every electron-updater since 2.16.0 reads files[] and ignores these fields. " +
295
- "See https://www.electron.build/docs/migration/v27-breaking-changes#latestyml-drops-legacy-top-level-pathsha512");
329
+ "See https://www.electron.build/docs/migration/v27-build-changes#latestyml-drops-legacy-top-level-pathsha512");
296
330
  }
297
331
  //# sourceMappingURL=updateInfoBuilder.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"updateInfoBuilder.js","sourceRoot":"","sources":["../../src/publish/updateInfoBuilder.ts"],"names":[],"mappings":"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","sourcesContent":["import asyncPool from \"tiny-async-pool\"\nimport { Arch, createUpdateManifestSignatures, log, safeStringifyJson, serializeToYaml } from \"builder-util\"\nimport { deepAssign, GenericServerOptions, PublishConfiguration, UpdateInfo, WindowsUpdateInfo } from \"builder-util-runtime\"\nimport fsExtra from \"fs-extra\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport * as semver from \"semver\"\nimport { Platform } from \"../core.js\"\nimport { ReleaseInfo } from \"../options/PlatformSpecificBuildOptions.js\"\nimport { Packager } from \"../packager.js\"\nimport { ArtifactCreated } from \"../packagerApi.js\"\nimport { PlatformPackager } from \"../platformPackager.js\"\nimport { hashFile } from \"../util/hash.js\"\nimport { computeDownloadUrl, getPublishConfigsForUpdateInfo } from \"./PublishManager.js\"\n\nasync function getReleaseInfo(packager: PlatformPackager<any>) {\n const releaseInfo: ReleaseInfo = { ...(packager.platformOptions.releaseInfo || packager.config.releaseInfo) }\n if (releaseInfo.releaseNotes == null) {\n const releaseNotesFile = await packager.getResource(\n releaseInfo.releaseNotesFile,\n `release-notes-${packager.platform.buildConfigurationKey}.md`,\n `release-notes-${packager.platform.name}.md`,\n `release-notes-${packager.platform.nodeName}.md`,\n \"release-notes.md\"\n )\n const releaseNotes = releaseNotesFile == null ? null : await fsExtra.readFile(releaseNotesFile, \"utf-8\")\n // to avoid undefined in the file, check for null\n if (releaseNotes != null) {\n releaseInfo.releaseNotes = releaseNotes\n }\n }\n delete releaseInfo.releaseNotesFile\n return releaseInfo\n}\n\nfunction isGenerateUpdatesFilesForAllChannels(packager: PlatformPackager<any>) {\n const value = packager.platformOptions.generateUpdatesFilesForAllChannels\n return value == null ? packager.config.generateUpdatesFilesForAllChannels : value\n}\n\n/**\n if this is an \"alpha\" version, we need to generate only the \"alpha\" .yml file\n if this is a \"beta\" version, we need to generate both the \"alpha\" and \"beta\" .yml file\n if this is a \"stable\" version, we need to generate all the \"alpha\", \"beta\" and \"stable\" .yml file\n */\nfunction computeChannelNames(packager: PlatformPackager<any>, publishConfig: PublishConfiguration): Array<string> {\n const currentChannel: string = (publishConfig as GenericServerOptions).channel || \"latest\"\n const baseChannel = [\"alpha\", \"beta\", \"latest\"].find(name => currentChannel === name || currentChannel.startsWith(`${name}-`)) || currentChannel\n const suffix = currentChannel.slice(baseChannel.length)\n // for GitHub should be pre-release way be used\n if (baseChannel === \"alpha\" || publishConfig.provider === \"github\" || !isGenerateUpdatesFilesForAllChannels(packager)) {\n return [currentChannel]\n }\n\n switch (baseChannel) {\n case \"beta\":\n return warnAboutSuffixedChannelExpansion(currentChannel, suffix, [currentChannel, `alpha${suffix}`])\n\n case \"latest\":\n return warnAboutSuffixedChannelExpansion(currentChannel, suffix, [currentChannel, `alpha${suffix}`, `beta${suffix}`])\n\n default:\n return [currentChannel]\n }\n}\n\n/**\n * v26 only expanded a channel to its lower channels when the name was exactly alpha/beta/latest, so a\n * suffixed channel (the per-arch `${channel}-${arch}` pattern) published a single file. v27 reads the\n * base channel off the front and reattaches the suffix, which means a `latest-x64` publish now\n * overwrites `beta-x64.yml` in the same bucket — changing what live beta-x64 users are offered.\n */\nfunction warnAboutSuffixedChannelExpansion(currentChannel: string, suffix: string, channels: Array<string>): Array<string> {\n if (suffix.length === 0) {\n return channels\n }\n // once per suffixed channel — computeChannelNames runs per artifact\n log.once(`suffixed-channel-expansion:${currentChannel}`).warn(\n {\n channel: currentChannel,\n writes: channels.map(it => `${it}.yml`).join(\", \"),\n solution: \"set generateUpdatesFilesForAllChannels: false to keep publishing a single file per suffixed channel\",\n },\n `the suffixed channel \"${currentChannel}\" now expands to its lower channels — electron-builder <= 26 wrote only one file for suffixed channels. ` +\n \"A later publish on a higher channel will overwrite these in the same bucket, changing what existing pre-release users are offered. \" +\n \"See https://www.electron.build/docs/migration/v27-breaking-changes#suffixed-update-channels-now-expand-to-lower-channels\"\n )\n return channels\n}\n\nfunction getUpdateInfoFileName(channel: string, packager: PlatformPackager<any>, arch: Arch | null): string {\n const osSuffix = packager.platform === Platform.WINDOWS ? \"\" : `-${packager.platform.buildConfigurationKey}`\n return `${channel}${osSuffix}${getArchPrefixForUpdateFile(arch, packager)}.yml`\n}\n\nfunction getArchPrefixForUpdateFile(arch: Arch | null, packager: PlatformPackager<any>) {\n if (arch == null || arch === Arch.x64 || packager.platform !== Platform.LINUX) {\n return \"\"\n }\n return arch === Arch.armv7l ? \"-arm\" : `-${Arch[arch]}`\n}\n\nexport interface UpdateInfoFileTask {\n readonly file: string\n readonly info: UpdateInfo\n readonly publishConfiguration: PublishConfiguration\n readonly packager: PlatformPackager<any>\n readonly arch?: Arch | null\n}\n\nexport async function createUpdateInfoTasks(event: ArtifactCreated, _publishConfigs: Array<PublishConfiguration>): Promise<Array<UpdateInfoFileTask>> {\n const packager = event.packager\n const publishConfigs = await getPublishConfigsForUpdateInfo(packager, _publishConfigs, event.arch)\n if (publishConfigs == null || publishConfigs.length === 0) {\n return []\n }\n\n const outDir = event.target!.outDir\n const version = packager.appInfo.version\n const sha2 = new Lazy<string>(() => hashFile(event.file, \"sha256\", \"hex\"))\n const isMac = packager.platform === Platform.MAC\n const createdFiles = new Set<string>()\n const sharedInfo = await createUpdateInfo(version, event, await getReleaseInfo(packager))\n const tasks: Array<UpdateInfoFileTask> = []\n const electronUpdaterCompatibility = packager.platformOptions.electronUpdaterCompatibility || packager.config.electronUpdaterCompatibility || \">=2.16\"\n // electron-updater < 2.16.0 predates the files[] array and reads the top-level path/sha512 (and Windows sha2) fields instead\n // (do not pass includePrerelease — it would make the default \">=2.16\" intersect \"<2.16.0\" at the 2.16.0-0 prerelease point)\n const needsLegacyPathSha512 = semver.intersects(electronUpdaterCompatibility, \"<2.16.0\")\n // electron-updater < 2.0.0 on macOS reads the legacy <channel>-mac.json instead of <channel>-mac.yml\n const needsLegacyMacJsonCompatibility = semver.intersects(electronUpdaterCompatibility, \"<2.0.0\")\n warnAboutLegacyUpdaterCompatibility(electronUpdaterCompatibility, needsLegacyPathSha512)\n for (const publishConfiguration of publishConfigs) {\n let dir = outDir\n if (publishConfigs.length > 1 && publishConfiguration !== publishConfigs[0]) {\n dir = path.join(outDir, publishConfiguration.provider)\n }\n\n let needsLegacyMacJson = needsLegacyMacJsonCompatibility\n\n let info = sharedInfo\n // noinspection JSDeprecatedSymbols\n if (needsLegacyPathSha512) {\n // legacy top-level path/sha512 (and Windows sha2) for electron-updater 1.x – 2.15.0; modern clients read files[]\n info = {\n ...info,\n path: info.files[0].url,\n sha512: info.files[0].sha512,\n }\n if (packager.platform === Platform.WINDOWS) {\n // noinspection JSDeprecatedSymbols\n ;(info as WindowsUpdateInfo).sha2 = await sha2.value\n }\n }\n\n if (event.safeArtifactName != null && publishConfiguration.provider === \"github\") {\n // copy the file entries (not just the array) — `info` is shared across publish configurations,\n // so mutating an entry here would leak the GitHub-safe artifact name into other providers' update info\n const newFiles = info.files.map(file => ({ ...file }))\n newFiles[0].url = event.safeArtifactName\n info = {\n ...info,\n files: newFiles,\n // legacy top-level path mirrors files[0].url; only emitted for pre-2.16 compatibility\n ...(needsLegacyPathSha512 ? { path: event.safeArtifactName } : {}),\n }\n }\n\n for (const channel of computeChannelNames(packager, publishConfiguration)) {\n if (isMac && needsLegacyMacJson && event.file.endsWith(\".zip\")) {\n // write only for first channel (generateUpdatesFilesForAllChannels is a new functionality, no need to generate old mac update info file)\n needsLegacyMacJson = false\n await writeOldMacInfo(publishConfiguration, outDir, dir, channel, createdFiles, version, packager)\n }\n\n const updateInfoFile = path.join(dir, getUpdateInfoFileName(channel, packager, event.arch))\n if (createdFiles.has(updateInfoFile)) {\n continue\n }\n\n createdFiles.add(updateInfoFile)\n\n // artifact should be uploaded only to designated publish provider\n tasks.push({\n file: updateInfoFile,\n info,\n publishConfiguration,\n packager,\n arch: event.arch,\n })\n }\n }\n return tasks\n}\n\nasync function createUpdateInfo(version: string, event: ArtifactCreated, releaseInfo: ReleaseInfo): Promise<UpdateInfo> {\n const customUpdateInfo = event.updateInfo\n const url = path.basename(event.file)\n const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await hashFile(event.file))\n const files = [{ url, sha512 }]\n const result: UpdateInfo = {\n // @ts-ignore\n version,\n // @ts-ignore\n files,\n ...(releaseInfo as UpdateInfo),\n }\n\n if (customUpdateInfo != null) {\n // file info or nsis web installer packages info\n if (\"sha512\" in customUpdateInfo) {\n deepAssign(files[0], customUpdateInfo)\n } else {\n const { isAdminRightsRequired, ...packagesInfo } = customUpdateInfo\n deepAssign(result, packagesInfo)\n // electron-updater reads isAdminRightsRequired from the file entry of the installer\n if (isAdminRightsRequired != null) {\n deepAssign(files[0], { isAdminRightsRequired })\n }\n }\n }\n return result\n}\n\nexport async function writeUpdateInfoFiles(updateInfoFileTasks: Array<UpdateInfoFileTask>, packager: Packager, isPublish = false) {\n // zip must be first and zip info must be used for old path/sha512 properties in the update info\n // universal installer (arch === null) must precede arch-specific ones so path:/sha512: point to the right artifact\n updateInfoFileTasks.sort((a, b) => {\n const zipDiff = (a.info.files[0].url.endsWith(\".zip\") ? 0 : 100) - (b.info.files[0].url.endsWith(\".zip\") ? 0 : 100)\n if (zipDiff !== 0) {\n return zipDiff\n }\n // universal (arch === null) before arch-specific; tie-break by Arch enum value for full determinism\n // undefined arch (external callers predating this field) treated as arch-specific via strict === null check\n const aArch = a.arch === null ? -1 : (a.arch ?? Number.MAX_SAFE_INTEGER)\n const bArch = b.arch === null ? -1 : (b.arch ?? Number.MAX_SAFE_INTEGER)\n return aArch - bArch\n })\n\n const updateChannelFileToInfo = new Map<string, UpdateInfoFileTask>()\n for (const task of updateInfoFileTasks) {\n // https://github.com/electron-userland/electron-builder/pull/2994\n const key = `${task.file}@${safeStringifyJson(task.publishConfiguration, new Set([\"releaseType\"]))}`\n const existingTask = updateChannelFileToInfo.get(key)\n if (existingTask == null) {\n updateChannelFileToInfo.set(key, task)\n continue\n }\n\n existingTask.info.files.push(...task.info.files)\n }\n\n const releaseDate = new Date().toISOString()\n\n const tasks = Array.from(updateChannelFileToInfo.values())\n\n // Resolve (and, when publishing, enforce) the signing keys before writing anything, so a missing key fails the\n // build instead of leaving some manifests written and others not. MemoLazy and the one-shot warning make the\n // per-task calls below free after this. Tasks with `publishAutoUpdate: false` are skipped for the same reason\n // the loop skips them: they emit no manifest.\n for (const task of tasks) {\n if (task.publishConfiguration.publishAutoUpdate !== false) {\n await task.packager.requireUpdateSigningKeys(isPublish)\n }\n }\n\n const concurrency = 4\n await asyncPool<UpdateInfoFileTask, void>(concurrency, tasks, async task => {\n const publishConfig = task.publishConfiguration\n if (publishConfig.publishAutoUpdate === false) {\n log.debug(\n {\n provider: publishConfig.provider,\n reason: \"publishAutoUpdate is set to false\",\n },\n \"auto update metadata file not published\"\n )\n return\n }\n\n if (task.info.releaseDate == null) {\n task.info.releaseDate = releaseDate\n }\n\n // Sign last: the signatures must cover the final version/files/packages/stagingPercentage/minimumSystemVersion.\n // releaseDate is excluded from the signed payload, so setting it above does not affect them.\n // The keys are resolved per task (not once for the batch) so each manifest is signed iff that\n // platform's config requires it, matching the per-platform public-key embedding in PublishManager.\n // Every configured key signs (dual-signing during key rotation): `signatures` holds one tagged entry\n // per key and the legacy single `signature` field repeats the first key's signature, so the manifest\n // shape is the same whether one or several keys are configured.\n const signingKeys = await task.packager.requireUpdateSigningKeys(isPublish)\n let info: UpdateInfo = task.info\n // empty only when signing is opted out of with `updateManifest: false`, or on a build without a publish\n // policy that has no key configured - both of which have already warned\n if (signingKeys.length > 0) {\n const signatures = createUpdateManifestSignatures(task.info, signingKeys)\n info = { ...task.info, signature: signatures[0].signature, signatures }\n }\n\n const fileContent = Buffer.from(serializeToYaml(info, false, true))\n await fsExtra.outputFile(task.file, fileContent)\n await packager.emitArtifactCreated({\n file: task.file,\n fileContent,\n arch: null,\n packager: task.packager,\n target: null,\n publishConfig,\n })\n })\n}\n\n// backward compatibility - write json file\nasync function writeOldMacInfo(\n publishConfig: PublishConfiguration,\n outDir: string,\n dir: string,\n channel: string,\n createdFiles: Set<string>,\n version: string,\n packager: PlatformPackager<any>\n) {\n const isGitHub = publishConfig.provider === \"github\"\n const updateInfoFile = isGitHub && outDir === dir ? path.join(dir, \"github\", `${channel}-mac.json`) : path.join(dir, `${channel}-mac.json`)\n if (!createdFiles.has(updateInfoFile)) {\n createdFiles.add(updateInfoFile)\n await fsExtra.outputJson(\n updateInfoFile,\n {\n version,\n releaseDate: new Date().toISOString(),\n url: computeDownloadUrl(publishConfig, packager.generateName2(\"zip\", \"mac\", isGitHub), packager),\n },\n { spaces: 2 }\n )\n\n await packager.emitArtifactCreated({\n file: updateInfoFile,\n arch: null,\n packager,\n target: null,\n publishConfig,\n })\n }\n}\n\n/**\n * The default `electronUpdaterCompatibility` moved to \">=2.16\", which is what stops the deprecated\n * top-level path/sha512 descriptor from being written. A range pinned below that keeps emitting it —\n * along with the SHA-256 `sha2` checksum on Windows, which v28 will reject outright. Nothing said so.\n */\nfunction warnAboutLegacyUpdaterCompatibility(electronUpdaterCompatibility: string, needsLegacyPathSha512: boolean): void {\n if (!needsLegacyPathSha512) {\n return\n }\n // once per process — createUpdateInfoTasks runs per artifact\n log\n .once(\"legacy-updater-compatibility\")\n .warn(\n { electronUpdaterCompatibility, solution: 'drop the pin (the default is \">=2.16\") unless you still ship apps embedding electron-updater 1.x-2.15' },\n \"electronUpdaterCompatibility includes electron-updater versions below 2.16.0, so the deprecated top-level path/sha512 descriptor is still written to latest*.yml \" +\n \"(and, on Windows, the legacy SHA-256 sha2 checksum). Metadata validated only by sha2 is deprecated and v28 will reject it. \" +\n \"Every electron-updater since 2.16.0 reads files[] and ignores these fields. \" +\n \"See https://www.electron.build/docs/migration/v27-breaking-changes#latestyml-drops-legacy-top-level-pathsha512\"\n )\n}\n"]}
1
+ {"version":3,"file":"updateInfoBuilder.js","sourceRoot":"","sources":["../../src/publish/updateInfoBuilder.ts"],"names":[],"mappings":"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","sourcesContent":["import asyncPool from \"tiny-async-pool\"\nimport { Arch, createUpdateManifestSignatures, derivePublicKeyPem, log, safeStringifyJson, serializeToYaml } from \"builder-util\"\nimport { computeUpdateManifestKeyId, deepAssign, GenericServerOptions, PublishConfiguration, UpdateInfo, WindowsUpdateInfo } from \"builder-util-runtime\"\nimport type { KeyObject } from \"crypto\"\nimport fsExtra from \"fs-extra\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport * as semver from \"semver\"\nimport { Platform, Target } from \"../core.js\"\nimport { ReleaseInfo } from \"../options/PlatformSpecificBuildOptions.js\"\nimport { Packager } from \"../packager.js\"\nimport { ArtifactCreated } from \"../packagerApi.js\"\nimport { PlatformPackager } from \"../platformPackager.js\"\nimport { hashFile } from \"../util/hash.js\"\nimport { computeDownloadUrl, getPublishConfigsForUpdateInfo } from \"./PublishManager.js\"\nimport { verifyUpdateManifestContent } from \"./updateManifestVerifier.js\"\n\nasync function getReleaseInfo(packager: PlatformPackager<any>) {\n const releaseInfo: ReleaseInfo = { ...(packager.platformOptions.releaseInfo || packager.config.releaseInfo) }\n if (releaseInfo.releaseNotes == null) {\n const releaseNotesFile = await packager.getResource(\n releaseInfo.releaseNotesFile,\n `release-notes-${packager.platform.buildConfigurationKey}.md`,\n `release-notes-${packager.platform.name}.md`,\n `release-notes-${packager.platform.nodeName}.md`,\n \"release-notes.md\"\n )\n const releaseNotes = releaseNotesFile == null ? null : await fsExtra.readFile(releaseNotesFile, \"utf-8\")\n // to avoid undefined in the file, check for null\n if (releaseNotes != null) {\n releaseInfo.releaseNotes = releaseNotes\n }\n }\n delete releaseInfo.releaseNotesFile\n return releaseInfo\n}\n\nfunction isGenerateUpdatesFilesForAllChannels(packager: PlatformPackager<any>) {\n const value = packager.platformOptions.generateUpdatesFilesForAllChannels\n return value == null ? packager.config.generateUpdatesFilesForAllChannels : value\n}\n\n/**\n if this is an \"alpha\" version, we need to generate only the \"alpha\" .yml file\n if this is a \"beta\" version, we need to generate both the \"alpha\" and \"beta\" .yml file\n if this is a \"stable\" version, we need to generate all the \"alpha\", \"beta\" and \"stable\" .yml file\n */\nfunction computeChannelNames(packager: PlatformPackager<any>, publishConfig: PublishConfiguration): Array<string> {\n const currentChannel: string = (publishConfig as GenericServerOptions).channel || \"latest\"\n const baseChannel = [\"alpha\", \"beta\", \"latest\"].find(name => currentChannel === name || currentChannel.startsWith(`${name}-`)) || currentChannel\n const suffix = currentChannel.slice(baseChannel.length)\n // for GitHub should be pre-release way be used\n if (baseChannel === \"alpha\" || publishConfig.provider === \"github\" || !isGenerateUpdatesFilesForAllChannels(packager)) {\n return [currentChannel]\n }\n\n switch (baseChannel) {\n case \"beta\":\n return warnAboutSuffixedChannelExpansion(currentChannel, suffix, [currentChannel, `alpha${suffix}`])\n\n case \"latest\":\n return warnAboutSuffixedChannelExpansion(currentChannel, suffix, [currentChannel, `alpha${suffix}`, `beta${suffix}`])\n\n default:\n return [currentChannel]\n }\n}\n\n/**\n * v26 only expanded a channel to its lower channels when the name was exactly alpha/beta/latest, so a\n * suffixed channel (the per-arch `${channel}-${arch}` pattern) published a single file. v27 reads the\n * base channel off the front and reattaches the suffix, which means a `latest-x64` publish now\n * overwrites `beta-x64.yml` in the same bucket — changing what live beta-x64 users are offered.\n */\nfunction warnAboutSuffixedChannelExpansion(currentChannel: string, suffix: string, channels: Array<string>): Array<string> {\n if (suffix.length === 0) {\n return channels\n }\n // once per suffixed channel — computeChannelNames runs per artifact\n log.once(`suffixed-channel-expansion:${currentChannel}`).warn(\n {\n channel: currentChannel,\n writes: channels.map(it => `${it}.yml`).join(\", \"),\n solution: \"set generateUpdatesFilesForAllChannels: false to keep publishing a single file per suffixed channel\",\n },\n `the suffixed channel \"${currentChannel}\" now expands to its lower channels — electron-builder <= 26 wrote only one file for suffixed channels. ` +\n \"A later publish on a higher channel will overwrite these in the same bucket, changing what existing pre-release users are offered. \" +\n \"See https://www.electron.build/docs/migration/v27-build-changes#suffixed-update-channels-now-expand-to-lower-channels\"\n )\n return channels\n}\n\nfunction getUpdateInfoFileName(channel: string, packager: PlatformPackager<any>, arch: Arch | null): string {\n const osSuffix = packager.platform === Platform.WINDOWS ? \"\" : `-${packager.platform.buildConfigurationKey}`\n return `${channel}${osSuffix}${getArchPrefixForUpdateFile(arch, packager)}.yml`\n}\n\nfunction getArchPrefixForUpdateFile(arch: Arch | null, packager: PlatformPackager<any>) {\n if (arch == null || arch === Arch.x64 || packager.platform !== Platform.LINUX) {\n return \"\"\n }\n return arch === Arch.armv7l ? \"-arm\" : `-${Arch[arch]}`\n}\n\nexport interface UpdateInfoFileTask {\n readonly file: string\n readonly info: UpdateInfo\n readonly publishConfiguration: PublishConfiguration\n readonly packager: PlatformPackager<any>\n readonly arch?: Arch | null\n}\n\nexport async function createUpdateInfoTasks(event: ArtifactCreated, _publishConfigs: Array<PublishConfiguration>): Promise<Array<UpdateInfoFileTask>> {\n const packager = event.packager\n const publishConfigs = await getPublishConfigsForUpdateInfo(packager, _publishConfigs, event.arch)\n if (publishConfigs == null || publishConfigs.length === 0) {\n return []\n }\n\n const outDir = event.target!.outDir\n const version = packager.appInfo.version\n const sha2 = new Lazy<string>(() => hashFile(event.file, \"sha256\", \"hex\"))\n const isMac = packager.platform === Platform.MAC\n const createdFiles = new Set<string>()\n const sharedInfo = await createUpdateInfo(version, event, await getReleaseInfo(packager))\n const tasks: Array<UpdateInfoFileTask> = []\n const electronUpdaterCompatibility = packager.platformOptions.electronUpdaterCompatibility || packager.config.electronUpdaterCompatibility || \">=2.16\"\n // electron-updater < 2.16.0 predates the files[] array and reads the top-level path/sha512 (and Windows sha2) fields instead\n // (do not pass includePrerelease — it would make the default \">=2.16\" intersect \"<2.16.0\" at the 2.16.0-0 prerelease point)\n const needsLegacyPathSha512 = semver.intersects(electronUpdaterCompatibility, \"<2.16.0\")\n // electron-updater < 2.0.0 on macOS reads the legacy <channel>-mac.json instead of <channel>-mac.yml\n const needsLegacyMacJsonCompatibility = semver.intersects(electronUpdaterCompatibility, \"<2.0.0\")\n warnAboutLegacyUpdaterCompatibility(electronUpdaterCompatibility, needsLegacyPathSha512)\n for (const publishConfiguration of publishConfigs) {\n let dir = outDir\n if (publishConfigs.length > 1 && publishConfiguration !== publishConfigs[0]) {\n dir = path.join(outDir, publishConfiguration.provider)\n }\n\n let needsLegacyMacJson = needsLegacyMacJsonCompatibility\n\n let info = sharedInfo\n // noinspection JSDeprecatedSymbols\n if (needsLegacyPathSha512) {\n // legacy top-level path/sha512 (and Windows sha2) for electron-updater 1.x – 2.15.0; modern clients read files[]\n info = {\n ...info,\n path: info.files[0].url,\n sha512: info.files[0].sha512,\n }\n if (packager.platform === Platform.WINDOWS) {\n // noinspection JSDeprecatedSymbols\n ;(info as WindowsUpdateInfo).sha2 = await sha2.value\n }\n }\n\n if (event.safeArtifactName != null && publishConfiguration.provider === \"github\") {\n // copy the file entries (not just the array) — `info` is shared across publish configurations,\n // so mutating an entry here would leak the GitHub-safe artifact name into other providers' update info\n const newFiles = info.files.map(file => ({ ...file }))\n newFiles[0].url = event.safeArtifactName\n info = {\n ...info,\n files: newFiles,\n // legacy top-level path mirrors files[0].url; only emitted for pre-2.16 compatibility\n ...(needsLegacyPathSha512 ? { path: event.safeArtifactName } : {}),\n }\n }\n\n for (const channel of computeChannelNames(packager, publishConfiguration)) {\n if (isMac && needsLegacyMacJson && event.file.endsWith(\".zip\")) {\n // write only for first channel (generateUpdatesFilesForAllChannels is a new functionality, no need to generate old mac update info file)\n needsLegacyMacJson = false\n await writeOldMacInfo(publishConfiguration, outDir, dir, channel, createdFiles, version, packager)\n }\n\n const updateInfoFile = path.join(dir, getUpdateInfoFileName(channel, packager, event.arch))\n if (createdFiles.has(updateInfoFile)) {\n continue\n }\n\n createdFiles.add(updateInfoFile)\n\n // artifact should be uploaded only to designated publish provider\n tasks.push({\n file: updateInfoFile,\n info,\n publishConfiguration,\n packager,\n arch: event.arch,\n })\n }\n }\n return tasks\n}\n\nasync function createUpdateInfo(version: string, event: ArtifactCreated, releaseInfo: ReleaseInfo): Promise<UpdateInfo> {\n const customUpdateInfo = event.updateInfo\n const url = path.basename(event.file)\n const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await hashFile(event.file))\n const files = [{ url, sha512 }]\n const result: UpdateInfo = {\n // @ts-ignore\n version,\n // @ts-ignore\n files,\n ...(releaseInfo as UpdateInfo),\n }\n\n if (customUpdateInfo != null) {\n // file info or nsis web installer packages info\n if (\"sha512\" in customUpdateInfo) {\n deepAssign(files[0], customUpdateInfo)\n } else {\n const { isAdminRightsRequired, ...packagesInfo } = customUpdateInfo\n deepAssign(result, packagesInfo)\n // electron-updater reads isAdminRightsRequired from the file entry of the installer\n if (isAdminRightsRequired != null) {\n deepAssign(files[0], { isAdminRightsRequired })\n }\n }\n }\n\n // win.allowCatalogSignature: read by electron-updater from the update info of an NSIS update, and honored only when the manifest\n // signature is verified (it is covered by that signature)\n if (event.packager.platform === Platform.WINDOWS && isNsisUpdateTarget(event.target) && event.packager.platformOptions.allowCatalogSignature === true) {\n const windowsResult: WindowsUpdateInfo = { ...result, allowCatalogSignature: true }\n return windowsResult\n }\n return result\n}\n\nfunction isNsisUpdateTarget(target: Target | null): boolean {\n return target != null && (target.name === \"nsis\" || target.name === \"nsis-web\")\n}\n\nexport async function writeUpdateInfoFiles(updateInfoFileTasks: Array<UpdateInfoFileTask>, packager: Packager, isPublish = false) {\n // zip must be first and zip info must be used for old path/sha512 properties in the update info\n // universal installer (arch === null) must precede arch-specific ones so path:/sha512: point to the right artifact\n updateInfoFileTasks.sort((a, b) => {\n const zipDiff = (a.info.files[0].url.endsWith(\".zip\") ? 0 : 100) - (b.info.files[0].url.endsWith(\".zip\") ? 0 : 100)\n if (zipDiff !== 0) {\n return zipDiff\n }\n // universal (arch === null) before arch-specific; tie-break by Arch enum value for full determinism\n // undefined arch (external callers predating this field) treated as arch-specific via strict === null check\n const aArch = a.arch === null ? -1 : (a.arch ?? Number.MAX_SAFE_INTEGER)\n const bArch = b.arch === null ? -1 : (b.arch ?? Number.MAX_SAFE_INTEGER)\n return aArch - bArch\n })\n\n const updateChannelFileToInfo = new Map<string, UpdateInfoFileTask>()\n for (const task of updateInfoFileTasks) {\n // https://github.com/electron-userland/electron-builder/pull/2994\n const key = `${task.file}@${safeStringifyJson(task.publishConfiguration, new Set([\"releaseType\"]))}`\n const existingTask = updateChannelFileToInfo.get(key)\n if (existingTask == null) {\n updateChannelFileToInfo.set(key, task)\n continue\n }\n\n existingTask.info.files.push(...task.info.files)\n }\n\n const releaseDate = new Date().toISOString()\n\n const tasks = Array.from(updateChannelFileToInfo.values())\n\n // Phase 1: resolve (and enforce) the signing keys, sign, serialize and read back every manifest before anything is\n // written, so a missing key or a manifest that does not verify fails the build instead of leaving some manifests\n // written - and uploaded - and others not.\n const manifests: Array<{ task: UpdateInfoFileTask; fileContent: Buffer }> = []\n for (const task of tasks) {\n const publishConfig = task.publishConfiguration\n if (publishConfig.publishAutoUpdate === false) {\n log.debug(\n {\n provider: publishConfig.provider,\n reason: \"publishAutoUpdate is set to false\",\n },\n \"auto update metadata file not published\"\n )\n continue\n }\n\n if (task.info.releaseDate == null) {\n task.info.releaseDate = releaseDate\n }\n\n // Sign last: the signatures must cover the final version/files/packages/stagingPercentage/minimumSystemVersion.\n // releaseDate is excluded from the signed payload, so setting it above does not affect them.\n // The keys are resolved per task (not once for the batch) so each manifest is signed iff that\n // platform's config requires it, matching the per-platform public-key embedding in PublishManager.\n // Every configured key signs (dual-signing during key rotation): `signatures` holds one tagged entry\n // per key and the legacy single `signature` field repeats the first key's signature, so the manifest\n // shape is the same whether one or several keys are configured.\n const signingKeys = await task.packager.requireUpdateSigningKeys(isPublish)\n let info: UpdateInfo = task.info\n // empty only when signing is opted out of with `updateManifest: false`, or on a build without a publish\n // policy or forceCodeSigning that has no key configured - both of which have already warned\n if (signingKeys.length > 0) {\n const signatures = createUpdateManifestSignatures(task.info, signingKeys)\n info = { ...task.info, signature: signatures[0].signature, signatures }\n } else if (\"allowCatalogSignature\" in info && info.allowCatalogSignature === true) {\n log.warn(\n { file: log.filePath(task.file), reason: \"electron-updater honors it only in an update manifest whose signature it verified\" },\n \"win.allowCatalogSignature has no effect: the update manifest is not signed\"\n )\n }\n\n const fileContent = Buffer.from(serializeToYaml(info, false, true))\n verifySerializedManifest(task.file, fileContent, signingKeys)\n manifests.push({ task, fileContent })\n }\n\n // Phase 2: write and emit (which schedules the upload of) exactly the bytes that were verified\n const concurrency = 4\n await asyncPool(concurrency, manifests, async ({ task, fileContent }) => {\n await fsExtra.outputFile(task.file, fileContent)\n await packager.emitArtifactCreated({\n file: task.file,\n fileContent,\n arch: null,\n packager: task.packager,\n target: null,\n publishConfig: task.publishConfiguration,\n })\n })\n}\n\n/**\n * Reads a signed manifest back from the bytes about to be written, the way electron-updater parses it, and checks that\n * every signing key verifies it. It is checked against the signing keys' own public keys, not `updateManifest.publicKey`,\n * so a deliberate `allowSigningKeyOutsideTrustList` cutover keeps working. A failure means serialization changed what\n * was signed, which is a bug: every install would reject the manifest.\n */\nfunction verifySerializedManifest(file: string, fileContent: Buffer, signingKeys: ReadonlyArray<KeyObject>): void {\n if (signingKeys.length === 0) {\n return\n }\n const content = fileContent.toString(\"utf8\")\n for (const key of signingKeys) {\n const publicKey = derivePublicKeyPem(key)\n const result = verifyUpdateManifestContent(content, [publicKey])\n if (!result.ok) {\n throw new Error(\n `Internal error: ${log.filePath(file)} does not verify with update-manifest signing key ${computeUpdateManifestKeyId(publicKey)} after serialization (${result.reason}). ` +\n \"No update manifest was written or uploaded (installers of a publishing build may already be uploaded). \" +\n \"Please report it at https://github.com/electron-userland/electron-builder/issues\"\n )\n }\n }\n}\n\n// backward compatibility - write json file\nasync function writeOldMacInfo(\n publishConfig: PublishConfiguration,\n outDir: string,\n dir: string,\n channel: string,\n createdFiles: Set<string>,\n version: string,\n packager: PlatformPackager<any>\n) {\n const isGitHub = publishConfig.provider === \"github\"\n const updateInfoFile = isGitHub && outDir === dir ? path.join(dir, \"github\", `${channel}-mac.json`) : path.join(dir, `${channel}-mac.json`)\n if (!createdFiles.has(updateInfoFile)) {\n createdFiles.add(updateInfoFile)\n await fsExtra.outputJson(\n updateInfoFile,\n {\n version,\n releaseDate: new Date().toISOString(),\n url: computeDownloadUrl(publishConfig, packager.generateName2(\"zip\", \"mac\", isGitHub), packager),\n },\n { spaces: 2 }\n )\n\n await packager.emitArtifactCreated({\n file: updateInfoFile,\n arch: null,\n packager,\n target: null,\n publishConfig,\n })\n }\n}\n\n/**\n * The default `electronUpdaterCompatibility` moved to \">=2.16\", which is what stops the deprecated\n * top-level path/sha512 descriptor from being written. A range pinned below that keeps emitting it —\n * along with the SHA-256 `sha2` checksum on Windows, which v28 will reject outright. Nothing said so.\n */\nfunction warnAboutLegacyUpdaterCompatibility(electronUpdaterCompatibility: string, needsLegacyPathSha512: boolean): void {\n if (!needsLegacyPathSha512) {\n return\n }\n // once per process — createUpdateInfoTasks runs per artifact\n log\n .once(\"legacy-updater-compatibility\")\n .warn(\n { electronUpdaterCompatibility, solution: 'drop the pin (the default is \">=2.16\") unless you still ship apps embedding electron-updater 1.x-2.15' },\n \"electronUpdaterCompatibility includes electron-updater versions below 2.16.0, so the deprecated top-level path/sha512 descriptor is still written to latest*.yml \" +\n \"(and, on Windows, the legacy SHA-256 sha2 checksum). Metadata validated only by sha2 is deprecated and v28 will reject it. \" +\n \"Every electron-updater since 2.16.0 reads files[] and ignores these fields. \" +\n \"See https://www.electron.build/docs/migration/v27-build-changes#latestyml-drops-legacy-top-level-pathsha512\"\n )\n}\n"]}
@@ -0,0 +1,22 @@
1
+ import { KeyObject } from "crypto";
2
+ /**
3
+ * The platform of an update manifest, by its file name: `latest-mac.yml`, `beta-linux-arm64.yml`, or `latest.yml` (Windows). What
4
+ * `/-mac\.ya?ml$/` and then `/-linux(-[^.]+)?\.ya?ml$/` match, parsed in linear time: the second pattern backtracks polynomially on
5
+ * a name with many `-linux` (the name comes from the output folder or the command line).
6
+ */
7
+ export declare function updateManifestPlatform(file: string): "mac" | "win" | "linux";
8
+ export type UpdateManifestVerification = {
9
+ readonly ok: true;
10
+ readonly keyId: string;
11
+ } | {
12
+ readonly ok: false;
13
+ readonly reason: string;
14
+ };
15
+ /**
16
+ * Verifies the bytes of an update manifest (`latest*.yml`) the way electron-updater does: parsed with js-yaml's
17
+ * `load` (as `Provider.parseUpdateInfo`), refused when it carries no signature (`ERR_UPDATER_MANIFEST_NOT_SIGNED`), and
18
+ * accepted when any of `trustedKeys` validates one of its signatures. Invalid YAML, a manifest of the wrong shape and a
19
+ * malformed key are reported as a failure, never thrown.
20
+ */
21
+ export declare function verifyUpdateManifestContent(content: string, trustedKeys: Array<string | KeyObject>): UpdateManifestVerification;
22
+ //# sourceMappingURL=updateManifestVerifier.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"updateManifestVerifier.d.ts","sourceRoot":"","sources":["../../src/publish/updateManifestVerifier.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAMlC;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,CAmB5E;AAED,MAAM,MAAM,0BAA0B,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAA;AAExI;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GAAG,0BAA0B,CA0B/H"}
@@ -0,0 +1,65 @@
1
+ import { collectManifestSignatures, verifyManifestSignatures } from "builder-util-runtime";
2
+ import { load } from "js-yaml";
3
+ import * as path from "path";
4
+ const LINUX_MARKER = "-linux";
5
+ /**
6
+ * The platform of an update manifest, by its file name: `latest-mac.yml`, `beta-linux-arm64.yml`, or `latest.yml` (Windows). What
7
+ * `/-mac\.ya?ml$/` and then `/-linux(-[^.]+)?\.ya?ml$/` match, parsed in linear time: the second pattern backtracks polynomially on
8
+ * a name with many `-linux` (the name comes from the output folder or the command line).
9
+ */
10
+ export function updateManifestPlatform(file) {
11
+ const name = path.basename(file);
12
+ const extension = name.endsWith(".yml") ? ".yml" : name.endsWith(".yaml") ? ".yaml" : null;
13
+ if (extension == null) {
14
+ return "win";
15
+ }
16
+ const stem = name.substring(0, name.length - extension.length);
17
+ if (stem.endsWith("-mac")) {
18
+ return "mac";
19
+ }
20
+ // "-linux", then nothing, or "-" and at least one more character, with no "." up to the extension
21
+ const tail = stem.substring(stem.lastIndexOf(".") + 1);
22
+ for (let index = tail.indexOf(LINUX_MARKER); index !== -1; index = tail.indexOf(LINUX_MARKER, index + 1)) {
23
+ const end = index + LINUX_MARKER.length;
24
+ if (end === tail.length || (tail[end] === "-" && tail.length - end >= 2)) {
25
+ return "linux";
26
+ }
27
+ }
28
+ return "win";
29
+ }
30
+ /**
31
+ * Verifies the bytes of an update manifest (`latest*.yml`) the way electron-updater does: parsed with js-yaml's
32
+ * `load` (as `Provider.parseUpdateInfo`), refused when it carries no signature (`ERR_UPDATER_MANIFEST_NOT_SIGNED`), and
33
+ * accepted when any of `trustedKeys` validates one of its signatures. Invalid YAML, a manifest of the wrong shape and a
34
+ * malformed key are reported as a failure, never thrown.
35
+ */
36
+ export function verifyUpdateManifestContent(content, trustedKeys) {
37
+ let info;
38
+ try {
39
+ const parsed = load(content);
40
+ if (parsed == null || typeof parsed !== "object") {
41
+ return { ok: false, reason: "the manifest is not a YAML mapping" };
42
+ }
43
+ info = parsed;
44
+ }
45
+ catch (e) {
46
+ return { ok: false, reason: `the manifest is not valid YAML: ${e.message || e}` };
47
+ }
48
+ if (collectManifestSignatures(info).length === 0) {
49
+ return { ok: false, reason: "the manifest is not signed" };
50
+ }
51
+ if (trustedKeys.length === 0) {
52
+ return { ok: false, reason: "no trusted public key to verify the manifest with" };
53
+ }
54
+ try {
55
+ const result = verifyManifestSignatures(info, trustedKeys);
56
+ if (result.ok && result.keyId != null) {
57
+ return { ok: true, keyId: result.keyId };
58
+ }
59
+ return { ok: false, reason: result.reason ?? "no trusted key validates any of its signatures" };
60
+ }
61
+ catch (e) {
62
+ return { ok: false, reason: `cannot verify the manifest: ${e.message || e}` };
63
+ }
64
+ }
65
+ //# sourceMappingURL=updateManifestVerifier.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"updateManifestVerifier.js","sourceRoot":"","sources":["../../src/publish/updateManifestVerifier.ts"],"names":[],"mappings":"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","sourcesContent":["import { collectManifestSignatures, UpdateInfo, verifyManifestSignatures } from \"builder-util-runtime\"\nimport { KeyObject } from \"crypto\"\nimport { load } from \"js-yaml\"\nimport * as path from \"path\"\n\nconst LINUX_MARKER = \"-linux\"\n\n/**\n * The platform of an update manifest, by its file name: `latest-mac.yml`, `beta-linux-arm64.yml`, or `latest.yml` (Windows). What\n * `/-mac\\.ya?ml$/` and then `/-linux(-[^.]+)?\\.ya?ml$/` match, parsed in linear time: the second pattern backtracks polynomially on\n * a name with many `-linux` (the name comes from the output folder or the command line).\n */\nexport function updateManifestPlatform(file: string): \"mac\" | \"win\" | \"linux\" {\n const name = path.basename(file)\n const extension = name.endsWith(\".yml\") ? \".yml\" : name.endsWith(\".yaml\") ? \".yaml\" : null\n if (extension == null) {\n return \"win\"\n }\n const stem = name.substring(0, name.length - extension.length)\n if (stem.endsWith(\"-mac\")) {\n return \"mac\"\n }\n // \"-linux\", then nothing, or \"-\" and at least one more character, with no \".\" up to the extension\n const tail = stem.substring(stem.lastIndexOf(\".\") + 1)\n for (let index = tail.indexOf(LINUX_MARKER); index !== -1; index = tail.indexOf(LINUX_MARKER, index + 1)) {\n const end = index + LINUX_MARKER.length\n if (end === tail.length || (tail[end] === \"-\" && tail.length - end >= 2)) {\n return \"linux\"\n }\n }\n return \"win\"\n}\n\nexport type UpdateManifestVerification = { readonly ok: true; readonly keyId: string } | { readonly ok: false; readonly reason: string }\n\n/**\n * Verifies the bytes of an update manifest (`latest*.yml`) the way electron-updater does: parsed with js-yaml's\n * `load` (as `Provider.parseUpdateInfo`), refused when it carries no signature (`ERR_UPDATER_MANIFEST_NOT_SIGNED`), and\n * accepted when any of `trustedKeys` validates one of its signatures. Invalid YAML, a manifest of the wrong shape and a\n * malformed key are reported as a failure, never thrown.\n */\nexport function verifyUpdateManifestContent(content: string, trustedKeys: Array<string | KeyObject>): UpdateManifestVerification {\n let info: UpdateInfo\n try {\n const parsed: unknown = load(content)\n if (parsed == null || typeof parsed !== \"object\") {\n return { ok: false, reason: \"the manifest is not a YAML mapping\" }\n }\n info = parsed as UpdateInfo\n } catch (e: any) {\n return { ok: false, reason: `the manifest is not valid YAML: ${e.message || e}` }\n }\n if (collectManifestSignatures(info).length === 0) {\n return { ok: false, reason: \"the manifest is not signed\" }\n }\n if (trustedKeys.length === 0) {\n return { ok: false, reason: \"no trusted public key to verify the manifest with\" }\n }\n try {\n const result = verifyManifestSignatures(info, trustedKeys)\n if (result.ok && result.keyId != null) {\n return { ok: true, keyId: result.keyId }\n }\n return { ok: false, reason: result.reason ?? \"no trusted key validates any of its signatures\" }\n } catch (e: any) {\n return { ok: false, reason: `cannot verify the manifest: ${e.message || e}` }\n }\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"ArchiveTarget.d.ts","sourceRoot":"","sources":["../../src/targets/ArchiveTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAyB,MAAM,cAAc,CAAA;AAE1D,OAAO,EAAY,MAAM,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAKzD,qBAAa,aAAc,SAAQ,MAAM;IAKrC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpC,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;gBAGrC,IAAI,EAAE,MAAM,EACH,MAAM,EAAE,MAAM,EACN,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAC/B,iBAAiB,UAAQ;IAM5C,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAEK,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;CA2FzD"}
1
+ {"version":3,"file":"ArchiveTarget.d.ts","sourceRoot":"","sources":["../../src/targets/ArchiveTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAyB,MAAM,cAAc,CAAA;AAE1D,OAAO,EAAY,MAAM,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAEpE,OAAO,EAAE,gBAAgB,EAAiB,MAAM,wBAAwB,CAAA;AAKxE,qBAAa,aAAc,SAAQ,MAAM;IAKrC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpC,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;gBAGrC,IAAI,EAAE,MAAM,EACH,MAAM,EAAE,MAAM,EACN,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAC/B,iBAAiB,UAAQ;IAM5C,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAEK,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;CA8FzD"}
@@ -2,6 +2,7 @@ import { defaultArchFromString } from "builder-util";
2
2
  import * as path from "path";
3
3
  import { Platform, Target } from "../core.js";
4
4
  import { copyFiles, getFileMatchers } from "../fileMatcher.js";
5
+ import { trackPackWork } from "../platformPackager.js";
5
6
  import { archive, shouldPreserveSymlinks, tar } from "./archive.js";
6
7
  import { appendBlockmap, createBlockmap } from "./differentialUpdateInfoBuilder.js";
7
8
  import { getTrustedSourceRoots } from "../util/trustedSourceRoots.js";
@@ -30,7 +31,7 @@ export class ArchiveTarget extends Target {
30
31
  // tslint:disable-next-line:no-invalid-template-strings
31
32
  defaultPattern = "${productName}-${version}" + (arch === defaultArch ? "" : "-${arch}") + "-${os}.${ext}";
32
33
  }
33
- this.buildQueueManager.add(async () => {
34
+ const work = (async () => {
34
35
  const artifactName = packager.expandArtifactNamePattern(this.options, format, arch, defaultPattern, false);
35
36
  const artifactPath = path.join(this.outDir, artifactName);
36
37
  await packager.emitArtifactBuildStarted({
@@ -95,7 +96,10 @@ export class ArchiveTarget extends Target {
95
96
  packager,
96
97
  isWriteUpdateInfo: this.isWriteUpdateInfo,
97
98
  });
98
- });
99
+ })();
100
+ this.buildQueueManager.addTask(work);
101
+ // a target writing into appOutDir (Squirrel.Windows) waits for the archive
102
+ trackPackWork(packager, appOutDir, work);
99
103
  return Promise.resolve();
100
104
  }
101
105
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ArchiveTarget.js","sourceRoot":"","sources":["../../src/targets/ArchiveTarget.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, defaultArchFromString } from \"builder-util\"\nimport * as path from \"path\"\nimport { Platform, Target, TargetSpecificOptions } from \"../core.js\"\nimport { copyFiles, getFileMatchers } from \"../fileMatcher.js\"\nimport { PlatformPackager } from \"../platformPackager.js\"\nimport { archive, shouldPreserveSymlinks, tar } from \"./archive.js\"\nimport { appendBlockmap, createBlockmap } from \"./differentialUpdateInfoBuilder.js\"\nimport { getTrustedSourceRoots } from \"../util/trustedSourceRoots.js\"\n\nexport class ArchiveTarget extends Target {\n readonly options: TargetSpecificOptions\n\n constructor(\n name: string,\n readonly outDir: string,\n private readonly packager: PlatformPackager<any>,\n private readonly isWriteUpdateInfo = false\n ) {\n super(name)\n this.options = (this.packager.config as any)[this.name]\n }\n\n get writesUpdateInfo(): boolean {\n return this.isWriteUpdateInfo\n }\n\n async build(appOutDir: string, arch: Arch): Promise<any> {\n const packager = this.packager\n const isMac = packager.platform === Platform.MAC\n const format = this.name\n\n let defaultPattern: string\n const defaultArch: Arch = defaultArchFromString(packager.platformOptions.defaultArch)\n if (packager.platform === Platform.LINUX) {\n // tslint:disable-next-line:no-invalid-template-strings\n defaultPattern = \"${name}-${version}\" + (arch === defaultArch ? \"\" : \"-${arch}\") + \".${ext}\"\n } else {\n // tslint:disable-next-line:no-invalid-template-strings\n defaultPattern = \"${productName}-${version}\" + (arch === defaultArch ? \"\" : \"-${arch}\") + \"-${os}.${ext}\"\n }\n\n this.buildQueueManager.add(async () => {\n const artifactName = packager.expandArtifactNamePattern(this.options, format, arch, defaultPattern, false)\n const artifactPath = path.join(this.outDir, artifactName)\n\n await packager.emitArtifactBuildStarted({\n targetPresentableName: `${isMac ? \"macOS \" : \"\"}${format}`,\n file: artifactPath,\n arch,\n })\n let updateInfo: any = null\n if (format.startsWith(\"tar.\")) {\n await tar({\n compression: packager.compression,\n format,\n outFile: artifactPath,\n dirToArchive: appOutDir,\n isMacApp: isMac,\n tempDirManager: packager.tempDirManager,\n linuxToolsMac: packager.config.toolsets?.linuxToolsMac,\n buildResourcesDir: packager.buildResourcesDir,\n })\n } else {\n let withoutDir = !isMac\n let dirToArchive = appOutDir\n if (isMac) {\n dirToArchive = path.dirname(appOutDir)\n const fileMatchers = getFileMatchers(packager.config, \"extraDistFiles\", dirToArchive, packager.createGetFileMatchersOptions(this.outDir, arch, packager.platformOptions))\n if (fileMatchers == null) {\n dirToArchive = appOutDir\n } else {\n await copyFiles(fileMatchers, null, true, {\n roots: [dirToArchive, this.outDir],\n allowedSymlinkRoots: await getTrustedSourceRoots(packager),\n externalLinks: await packager.getExternalLinkPolicy(),\n })\n withoutDir = true\n }\n }\n\n const archiveOptions = {\n compression: packager.compression,\n withoutDir,\n preserveSymlinks: shouldPreserveSymlinks(packager.platform),\n externalLinks: await packager.getExternalLinkPolicy(),\n }\n await archive(format, artifactPath, dirToArchive, archiveOptions)\n\n if (this.isWriteUpdateInfo && format === \"zip\") {\n if (isMac) {\n updateInfo = await createBlockmap(artifactPath, this, packager, artifactName, arch)\n } else {\n updateInfo = await appendBlockmap(artifactPath)\n }\n }\n }\n\n await packager.emitArtifactBuildCompleted({\n updateInfo,\n file: artifactPath,\n // tslint:disable-next-line:no-invalid-template-strings\n safeArtifactName: packager.computeSafeArtifactName(\n artifactName,\n format,\n arch,\n false,\n packager.platformOptions.defaultArch,\n defaultPattern.replace(\"${productName}\", \"${name}\")\n ),\n target: this,\n arch,\n packager,\n isWriteUpdateInfo: this.isWriteUpdateInfo,\n })\n })\n return Promise.resolve()\n }\n}\n"]}
1
+ {"version":3,"file":"ArchiveTarget.js","sourceRoot":"","sources":["../../src/targets/ArchiveTarget.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, defaultArchFromString } from \"builder-util\"\nimport * as path from \"path\"\nimport { Platform, Target, TargetSpecificOptions } from \"../core.js\"\nimport { copyFiles, getFileMatchers } from \"../fileMatcher.js\"\nimport { PlatformPackager, trackPackWork } from \"../platformPackager.js\"\nimport { archive, shouldPreserveSymlinks, tar } from \"./archive.js\"\nimport { appendBlockmap, createBlockmap } from \"./differentialUpdateInfoBuilder.js\"\nimport { getTrustedSourceRoots } from \"../util/trustedSourceRoots.js\"\n\nexport class ArchiveTarget extends Target {\n readonly options: TargetSpecificOptions\n\n constructor(\n name: string,\n readonly outDir: string,\n private readonly packager: PlatformPackager<any>,\n private readonly isWriteUpdateInfo = false\n ) {\n super(name)\n this.options = (this.packager.config as any)[this.name]\n }\n\n get writesUpdateInfo(): boolean {\n return this.isWriteUpdateInfo\n }\n\n async build(appOutDir: string, arch: Arch): Promise<any> {\n const packager = this.packager\n const isMac = packager.platform === Platform.MAC\n const format = this.name\n\n let defaultPattern: string\n const defaultArch: Arch = defaultArchFromString(packager.platformOptions.defaultArch)\n if (packager.platform === Platform.LINUX) {\n // tslint:disable-next-line:no-invalid-template-strings\n defaultPattern = \"${name}-${version}\" + (arch === defaultArch ? \"\" : \"-${arch}\") + \".${ext}\"\n } else {\n // tslint:disable-next-line:no-invalid-template-strings\n defaultPattern = \"${productName}-${version}\" + (arch === defaultArch ? \"\" : \"-${arch}\") + \"-${os}.${ext}\"\n }\n\n const work = (async () => {\n const artifactName = packager.expandArtifactNamePattern(this.options, format, arch, defaultPattern, false)\n const artifactPath = path.join(this.outDir, artifactName)\n\n await packager.emitArtifactBuildStarted({\n targetPresentableName: `${isMac ? \"macOS \" : \"\"}${format}`,\n file: artifactPath,\n arch,\n })\n let updateInfo: any = null\n if (format.startsWith(\"tar.\")) {\n await tar({\n compression: packager.compression,\n format,\n outFile: artifactPath,\n dirToArchive: appOutDir,\n isMacApp: isMac,\n tempDirManager: packager.tempDirManager,\n linuxToolsMac: packager.config.toolsets?.linuxToolsMac,\n buildResourcesDir: packager.buildResourcesDir,\n })\n } else {\n let withoutDir = !isMac\n let dirToArchive = appOutDir\n if (isMac) {\n dirToArchive = path.dirname(appOutDir)\n const fileMatchers = getFileMatchers(packager.config, \"extraDistFiles\", dirToArchive, packager.createGetFileMatchersOptions(this.outDir, arch, packager.platformOptions))\n if (fileMatchers == null) {\n dirToArchive = appOutDir\n } else {\n await copyFiles(fileMatchers, null, true, {\n roots: [dirToArchive, this.outDir],\n allowedSymlinkRoots: await getTrustedSourceRoots(packager),\n externalLinks: await packager.getExternalLinkPolicy(),\n })\n withoutDir = true\n }\n }\n\n const archiveOptions = {\n compression: packager.compression,\n withoutDir,\n preserveSymlinks: shouldPreserveSymlinks(packager.platform),\n externalLinks: await packager.getExternalLinkPolicy(),\n }\n await archive(format, artifactPath, dirToArchive, archiveOptions)\n\n if (this.isWriteUpdateInfo && format === \"zip\") {\n if (isMac) {\n updateInfo = await createBlockmap(artifactPath, this, packager, artifactName, arch)\n } else {\n updateInfo = await appendBlockmap(artifactPath)\n }\n }\n }\n\n await packager.emitArtifactBuildCompleted({\n updateInfo,\n file: artifactPath,\n // tslint:disable-next-line:no-invalid-template-strings\n safeArtifactName: packager.computeSafeArtifactName(\n artifactName,\n format,\n arch,\n false,\n packager.platformOptions.defaultArch,\n defaultPattern.replace(\"${productName}\", \"${name}\")\n ),\n target: this,\n arch,\n packager,\n isWriteUpdateInfo: this.isWriteUpdateInfo,\n })\n })()\n this.buildQueueManager.addTask(work)\n // a target writing into appOutDir (Squirrel.Windows) waits for the archive\n trackPackWork(packager, appOutDir, work)\n return Promise.resolve()\n }\n}\n"]}
@@ -15,6 +15,12 @@ export interface ArchiveOptions {
15
15
  */
16
16
  isArchiveHeaderCompressed?: boolean;
17
17
  dictSize?: number;
18
+ /**
19
+ * 7z only: LZMA2 block size in MB. Without it, 7-Zip splits LZMA2 into independent blocks only when it compresses with
20
+ * several block threads, so the archive bytes depend on the build host's CPU count. A fixed size makes them identical
21
+ * on any host. Ignored when storing, and when `method` names another codec.
22
+ */
23
+ blockSize?: number;
18
24
  excluded?: Array<string> | null;
19
25
  method?: "Copy" | "LZMA" | "Deflate" | "DEFAULT";
20
26
  isRegularFile?: boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../src/targets/archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,kBAAkB,EAAmC,MAAM,cAAc,CAAA;AAKhI,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAiEvD,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAErC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAG/B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;IAEhD,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAE1B;;;OAGG;IACH,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAA;IAEzC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAElC;;;;;;;;;OASG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElE;AAkBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,YA2EjF"}
1
+ {"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../src/targets/archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6D,kBAAkB,EAAmC,MAAM,cAAc,CAAA;AAK7I,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAiEvD,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;IAErC;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf;;OAEG;IACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;IAEnC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAG/B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAA;IAEhD,aAAa,CAAC,EAAE,OAAO,CAAA;IAEvB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAE1B;;;OAGG;IACH,aAAa,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAA;IAEzC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAA;IAElC;;;;;;;;;OASG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAA;CAC/B;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAElE;AAkBD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,YAoFjF"}
@@ -1,4 +1,4 @@
1
- import { assertNoSymlinkLeaves, debug7z, exec, exists, log, statOrNull, unlinkIfExists } from "builder-util";
1
+ import { assertNoSymlinkLeaves, debug7z, exec, Executables, exists, log, statOrNull, unlinkIfExists } from "builder-util";
2
2
  import * as path from "path";
3
3
  import { create } from "tar";
4
4
  import { Platform } from "../core.js";
@@ -36,7 +36,7 @@ export async function tar({ compression, format, outFile, dirToArchive, isMacApp
36
36
  unlinkIfExists(outFile),
37
37
  ]);
38
38
  if (format === "tar.lz") {
39
- const lzipPath = process.platform === "darwin" ? (await getLinuxToolsMacToolset(linuxToolsMac, buildResourcesDir)).lzip : "lzip";
39
+ const lzipPath = process.platform === "darwin" ? (await getLinuxToolsMacToolset(linuxToolsMac, buildResourcesDir)).lzip : Executables.resolve("lzip");
40
40
  await exec(lzipPath, [compression === "store" ? "-1" : "-9", "--keep" /* keep (don't delete) input files */, tarFile]);
41
41
  // lzip creates the output file in the same directory as the input with a .lz suffix
42
42
  await move(`${tarFile}.lz`, outFile);
@@ -94,14 +94,24 @@ export function compute7zCompressArgs(format, options = {}) {
94
94
  args.push("-mfb=258", "-mpass=15");
95
95
  }
96
96
  }
97
- if (options.dictSize != null) {
97
+ const { blockSize } = options;
98
+ const is7z = format === "7z" || format.endsWith(".7z");
99
+ // -mx=0 with an explicit -m0=LZMA2 would compress instead of store, so the block size is only pinned when compressing
100
+ const pinBlockSize = is7z && typeof blockSize === "number" && !storeOnly && compressionLevel !== "0" && (options.method == null || options.method === "DEFAULT");
101
+ if (pinBlockSize) {
102
+ if (!Number.isInteger(blockSize) || blockSize <= 0) {
103
+ throw new Error(`blockSize must be a positive integer (MB), got ${blockSize}`);
104
+ }
105
+ args.push(`-m0=LZMA2${options.dictSize != null ? `:d=${options.dictSize}m` : ""}:c=${blockSize}m`);
106
+ }
107
+ else if (options.dictSize != null) {
98
108
  args.push(`-md=${options.dictSize}m`);
99
109
  }
100
110
  // Disable NTFS timestamps for reproducible archives
101
111
  if (!options.isRegularFile) {
102
112
  args.push("-mtc=off");
103
113
  }
104
- if (format === "7z" || format.endsWith(".7z")) {
114
+ if (is7z) {
105
115
  if (options.solid === false) {
106
116
  args.push("-ms=off");
107
117
  }
@@ -244,7 +254,7 @@ export async function archive(format, outFile, dirToArchive, options = {}) {
244
254
  await unlinkIfExists(outFile);
245
255
  args.push(outFile, options.withoutDir ? "." : path.basename(dirToArchive));
246
256
  args.push(...buildExcludeArgs(options.excluded, "-x"));
247
- await exec("zip", args, { cwd: options.withoutDir ? dirToArchive : path.dirname(dirToArchive) }, debug7z.enabled);
257
+ await exec(Executables.resolve("zip"), args, { cwd: options.withoutDir ? dirToArchive : path.dirname(dirToArchive) }, debug7z.enabled);
248
258
  }
249
259
  return outFile;
250
260
  }