app-builder-lib 27.0.0-alpha.0 → 27.0.0-alpha.10

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 (458) hide show
  1. package/dist/Framework.d.ts +2 -0
  2. package/dist/Framework.d.ts.map +1 -1
  3. package/dist/Framework.js.map +1 -1
  4. package/dist/appInfo.d.ts +1 -1
  5. package/dist/appInfo.d.ts.map +1 -1
  6. package/dist/appInfo.js +3 -3
  7. package/dist/appInfo.js.map +1 -1
  8. package/dist/asar/asar.js +1 -1
  9. package/dist/asar/asar.js.map +1 -1
  10. package/dist/asar/asarFileChecker.d.ts +4 -2
  11. package/dist/asar/asarFileChecker.d.ts.map +1 -1
  12. package/dist/asar/asarFileChecker.js +2 -3
  13. package/dist/asar/asarFileChecker.js.map +1 -1
  14. package/dist/asar/asarUtil.js +21 -11
  15. package/dist/asar/asarUtil.js.map +1 -1
  16. package/dist/codeSign/certInfo.d.ts +14 -0
  17. package/dist/codeSign/certInfo.d.ts.map +1 -1
  18. package/dist/codeSign/certInfo.js +49 -0
  19. package/dist/codeSign/certInfo.js.map +1 -1
  20. package/dist/codeSign/mac/macCodeSign.d.ts +3 -3
  21. package/dist/codeSign/mac/macCodeSign.d.ts.map +1 -1
  22. package/dist/codeSign/mac/macCodeSign.js +50 -25
  23. package/dist/codeSign/mac/macCodeSign.js.map +1 -1
  24. package/dist/codeSign/signResult.d.ts +26 -0
  25. package/dist/codeSign/signResult.d.ts.map +1 -0
  26. package/dist/codeSign/signResult.js +12 -0
  27. package/dist/codeSign/signResult.js.map +1 -0
  28. package/dist/codeSign/win/hsmSignManager.d.ts +10 -0
  29. package/dist/codeSign/win/hsmSignManager.d.ts.map +1 -0
  30. package/dist/codeSign/win/hsmSignManager.js +50 -0
  31. package/dist/codeSign/win/hsmSignManager.js.map +1 -0
  32. package/dist/codeSign/win/pkcs11SignManager.d.ts +14 -0
  33. package/dist/codeSign/win/pkcs11SignManager.d.ts.map +1 -0
  34. package/dist/codeSign/win/pkcs11SignManager.js +82 -0
  35. package/dist/codeSign/win/pkcs11SignManager.js.map +1 -0
  36. package/dist/codeSign/win/signManager.d.ts +17 -0
  37. package/dist/codeSign/win/signManager.d.ts.map +1 -0
  38. package/dist/codeSign/win/signManager.js +19 -0
  39. package/dist/codeSign/win/signManager.js.map +1 -0
  40. package/dist/codeSign/win/signtoolBaseSignManager.d.ts +95 -0
  41. package/dist/codeSign/win/signtoolBaseSignManager.d.ts.map +1 -0
  42. package/dist/codeSign/win/signtoolBaseSignManager.js +507 -0
  43. package/dist/codeSign/win/signtoolBaseSignManager.js.map +1 -0
  44. package/dist/codeSign/win/windowsCodeSign.d.ts +2 -1
  45. package/dist/codeSign/win/windowsCodeSign.d.ts.map +1 -1
  46. package/dist/codeSign/win/windowsCodeSign.js +22 -8
  47. package/dist/codeSign/win/windowsCodeSign.js.map +1 -1
  48. package/dist/codeSign/win/windowsSignAzureManager.d.ts +11 -4
  49. package/dist/codeSign/win/windowsSignAzureManager.d.ts.map +1 -1
  50. package/dist/codeSign/win/windowsSignAzureManager.js +142 -37
  51. package/dist/codeSign/win/windowsSignAzureManager.js.map +1 -1
  52. package/dist/codeSign/win/windowsSignToolManager.d.ts +1 -58
  53. package/dist/codeSign/win/windowsSignToolManager.d.ts.map +1 -1
  54. package/dist/codeSign/win/windowsSignToolManager.js +3 -363
  55. package/dist/codeSign/win/windowsSignToolManager.js.map +1 -1
  56. package/dist/configuration.d.ts +228 -163
  57. package/dist/configuration.d.ts.map +1 -1
  58. package/dist/configuration.js +11 -1
  59. package/dist/configuration.js.map +1 -1
  60. package/dist/core.d.ts +14 -0
  61. package/dist/core.d.ts.map +1 -1
  62. package/dist/core.js +11 -0
  63. package/dist/core.js.map +1 -1
  64. package/dist/electron/ElectronFramework.d.ts +3 -3
  65. package/dist/electron/ElectronFramework.d.ts.map +1 -1
  66. package/dist/electron/ElectronFramework.js +60 -61
  67. package/dist/electron/ElectronFramework.js.map +1 -1
  68. package/dist/electron/electronArchSupport.d.ts +12 -0
  69. package/dist/electron/electronArchSupport.d.ts.map +1 -0
  70. package/dist/electron/electronArchSupport.js +58 -0
  71. package/dist/electron/electronArchSupport.js.map +1 -0
  72. package/dist/electron/electronVersion.d.ts.map +1 -1
  73. package/dist/electron/electronVersion.js +1 -11
  74. package/dist/electron/electronVersion.js.map +1 -1
  75. package/dist/electron/injectFFMPEG.js +2 -2
  76. package/dist/electron/injectFFMPEG.js.map +1 -1
  77. package/dist/electron/mac/electronMac.js +24 -35
  78. package/dist/electron/mac/electronMac.js.map +1 -1
  79. package/dist/electron/mac/electronMacUtils.d.ts +24 -0
  80. package/dist/electron/mac/electronMacUtils.d.ts.map +1 -0
  81. package/dist/electron/mac/electronMacUtils.js +42 -0
  82. package/dist/electron/mac/electronMacUtils.js.map +1 -0
  83. package/dist/electron/win/electronWin.js +2 -2
  84. package/dist/electron/win/electronWin.js.map +1 -1
  85. package/dist/fileMatcher.d.ts +42 -2
  86. package/dist/fileMatcher.d.ts.map +1 -1
  87. package/dist/fileMatcher.js +246 -18
  88. package/dist/fileMatcher.js.map +1 -1
  89. package/dist/index.d.ts +11 -5
  90. package/dist/index.d.ts.map +1 -1
  91. package/dist/index.js +17 -1
  92. package/dist/index.js.map +1 -1
  93. package/dist/indexInternal.d.ts +19 -8
  94. package/dist/indexInternal.d.ts.map +1 -1
  95. package/dist/indexInternal.js +18 -7
  96. package/dist/indexInternal.js.map +1 -1
  97. package/dist/linuxPackager.d.ts.map +1 -1
  98. package/dist/linuxPackager.js +19 -1
  99. package/dist/linuxPackager.js.map +1 -1
  100. package/dist/macPackager.d.ts +31 -14
  101. package/dist/macPackager.d.ts.map +1 -1
  102. package/dist/macPackager.js +236 -147
  103. package/dist/macPackager.js.map +1 -1
  104. package/dist/node-module-collector/index.d.ts.map +1 -1
  105. package/dist/node-module-collector/index.js +47 -16
  106. package/dist/node-module-collector/index.js.map +1 -1
  107. package/dist/node-module-collector/moduleManager.d.ts +11 -2
  108. package/dist/node-module-collector/moduleManager.d.ts.map +1 -1
  109. package/dist/node-module-collector/moduleManager.js +34 -14
  110. package/dist/node-module-collector/moduleManager.js.map +1 -1
  111. package/dist/node-module-collector/nodeModulesCollector.d.ts +47 -26
  112. package/dist/node-module-collector/nodeModulesCollector.d.ts.map +1 -1
  113. package/dist/node-module-collector/nodeModulesCollector.js +157 -142
  114. package/dist/node-module-collector/nodeModulesCollector.js.map +1 -1
  115. package/dist/node-module-collector/packageManager.js +1 -1
  116. package/dist/node-module-collector/packageManager.js.map +1 -1
  117. package/dist/node-module-collector/pnpmNodeModulesCollector.d.ts +90 -1
  118. package/dist/node-module-collector/pnpmNodeModulesCollector.d.ts.map +1 -1
  119. package/dist/node-module-collector/pnpmNodeModulesCollector.js +325 -25
  120. package/dist/node-module-collector/pnpmNodeModulesCollector.js.map +1 -1
  121. package/dist/node-module-collector/types.d.ts +4 -0
  122. package/dist/node-module-collector/types.d.ts.map +1 -1
  123. package/dist/node-module-collector/types.js.map +1 -1
  124. package/dist/options/FuseOptionsV1.d.ts +137 -0
  125. package/dist/options/FuseOptionsV1.d.ts.map +1 -0
  126. package/dist/options/FuseOptionsV1.js +2 -0
  127. package/dist/options/FuseOptionsV1.js.map +1 -0
  128. package/dist/options/MsixOptions.d.ts +126 -0
  129. package/dist/options/MsixOptions.d.ts.map +1 -0
  130. package/dist/options/MsixOptions.js +2 -0
  131. package/dist/options/MsixOptions.js.map +1 -0
  132. package/dist/options/PlatformSpecificBuildOptions.d.ts +55 -9
  133. package/dist/options/PlatformSpecificBuildOptions.d.ts.map +1 -1
  134. package/dist/options/PlatformSpecificBuildOptions.js.map +1 -1
  135. package/dist/options/SnapOptions.d.ts +23 -17
  136. package/dist/options/SnapOptions.d.ts.map +1 -1
  137. package/dist/options/SnapOptions.js.map +1 -1
  138. package/dist/options/SquirrelWindowsOptions.d.ts +0 -5
  139. package/dist/options/SquirrelWindowsOptions.d.ts.map +1 -1
  140. package/dist/options/SquirrelWindowsOptions.js.map +1 -1
  141. package/dist/options/linuxOptions.d.ts +8 -12
  142. package/dist/options/linuxOptions.d.ts.map +1 -1
  143. package/dist/options/linuxOptions.js.map +1 -1
  144. package/dist/options/macOptions.d.ts +113 -131
  145. package/dist/options/macOptions.d.ts.map +1 -1
  146. package/dist/options/macOptions.js.map +1 -1
  147. package/dist/options/pkgOptions.d.ts +1 -1
  148. package/dist/options/pkgOptions.js.map +1 -1
  149. package/dist/options/winOptions.d.ts +282 -70
  150. package/dist/options/winOptions.d.ts.map +1 -1
  151. package/dist/options/winOptions.js +12 -1
  152. package/dist/options/winOptions.js.map +1 -1
  153. package/dist/packager.d.ts +6 -1
  154. package/dist/packager.d.ts.map +1 -1
  155. package/dist/packager.js +121 -40
  156. package/dist/packager.js.map +1 -1
  157. package/dist/packagerApi.d.ts +10 -1
  158. package/dist/packagerApi.d.ts.map +1 -1
  159. package/dist/packagerApi.js.map +1 -1
  160. package/dist/platformPackager.d.ts +49 -3
  161. package/dist/platformPackager.d.ts.map +1 -1
  162. package/dist/platformPackager.js +130 -17
  163. package/dist/platformPackager.js.map +1 -1
  164. package/dist/publish/PublishManager.d.ts +36 -2
  165. package/dist/publish/PublishManager.d.ts.map +1 -1
  166. package/dist/publish/PublishManager.js +387 -23
  167. package/dist/publish/PublishManager.js.map +1 -1
  168. package/dist/publish/updateInfoBuilder.d.ts +1 -1
  169. package/dist/publish/updateInfoBuilder.d.ts.map +1 -1
  170. package/dist/publish/updateInfoBuilder.js +110 -32
  171. package/dist/publish/updateInfoBuilder.js.map +1 -1
  172. package/dist/targets/ArchiveTarget.d.ts +1 -0
  173. package/dist/targets/ArchiveTarget.d.ts.map +1 -1
  174. package/dist/targets/ArchiveTarget.js +6 -3
  175. package/dist/targets/ArchiveTarget.js.map +1 -1
  176. package/dist/targets/archive.d.ts +33 -2
  177. package/dist/targets/archive.d.ts.map +1 -1
  178. package/dist/targets/archive.js +109 -29
  179. package/dist/targets/archive.js.map +1 -1
  180. package/dist/targets/blockmap/blockmap.d.ts +43 -3
  181. package/dist/targets/blockmap/blockmap.d.ts.map +1 -1
  182. package/dist/targets/blockmap/blockmap.js +141 -15
  183. package/dist/targets/blockmap/blockmap.js.map +1 -1
  184. package/dist/targets/blockmap/verbatimRange.d.ts +44 -0
  185. package/dist/targets/blockmap/verbatimRange.d.ts.map +1 -0
  186. package/dist/targets/blockmap/verbatimRange.js +117 -0
  187. package/dist/targets/blockmap/verbatimRange.js.map +1 -0
  188. package/dist/targets/differentialUpdateInfoBuilder.d.ts +28 -2
  189. package/dist/targets/differentialUpdateInfoBuilder.d.ts.map +1 -1
  190. package/dist/targets/differentialUpdateInfoBuilder.js +75 -6
  191. package/dist/targets/differentialUpdateInfoBuilder.js.map +1 -1
  192. package/dist/targets/linux/FlatpakTarget.d.ts.map +1 -1
  193. package/dist/targets/linux/FlatpakTarget.js +13 -3
  194. package/dist/targets/linux/FlatpakTarget.js.map +1 -1
  195. package/dist/targets/linux/FpmTarget.d.ts +14 -0
  196. package/dist/targets/linux/FpmTarget.d.ts.map +1 -1
  197. package/dist/targets/linux/FpmTarget.js +86 -10
  198. package/dist/targets/linux/FpmTarget.js.map +1 -1
  199. package/dist/targets/linux/LinuxTargetHelper.d.ts +15 -0
  200. package/dist/targets/linux/LinuxTargetHelper.d.ts.map +1 -1
  201. package/dist/targets/linux/LinuxTargetHelper.js +54 -59
  202. package/dist/targets/linux/LinuxTargetHelper.js.map +1 -1
  203. package/dist/targets/linux/appimage/AppImageTarget.d.ts +2 -0
  204. package/dist/targets/linux/appimage/AppImageTarget.d.ts.map +1 -1
  205. package/dist/targets/linux/appimage/AppImageTarget.js +16 -15
  206. package/dist/targets/linux/appimage/AppImageTarget.js.map +1 -1
  207. package/dist/targets/linux/appimage/appImageUtil.d.ts +5 -1
  208. package/dist/targets/linux/appimage/appImageUtil.d.ts.map +1 -1
  209. package/dist/targets/linux/appimage/appImageUtil.js +14 -7
  210. package/dist/targets/linux/appimage/appImageUtil.js.map +1 -1
  211. package/dist/targets/linux/appimage/appLauncher.d.ts.map +1 -1
  212. package/dist/targets/linux/appimage/appLauncher.js +5 -11
  213. package/dist/targets/linux/appimage/appLauncher.js.map +1 -1
  214. package/dist/targets/linux/launcherScript.d.ts +32 -0
  215. package/dist/targets/linux/launcherScript.d.ts.map +1 -0
  216. package/dist/targets/linux/launcherScript.js +24 -0
  217. package/dist/targets/linux/launcherScript.js.map +1 -0
  218. package/dist/targets/linux/snap/SnapTarget.d.ts +1 -1
  219. package/dist/targets/linux/snap/SnapTarget.d.ts.map +1 -1
  220. package/dist/targets/linux/snap/SnapTarget.js +23 -1
  221. package/dist/targets/linux/snap/SnapTarget.js.map +1 -1
  222. package/dist/targets/linux/snap/core24.d.ts +30 -1
  223. package/dist/targets/linux/snap/core24.d.ts.map +1 -1
  224. package/dist/targets/linux/snap/core24.js +146 -70
  225. package/dist/targets/linux/snap/core24.js.map +1 -1
  226. package/dist/targets/linux/snap/coreCustom.d.ts +1 -1
  227. package/dist/targets/linux/snap/coreCustom.d.ts.map +1 -1
  228. package/dist/targets/linux/snap/coreCustom.js +2 -2
  229. package/dist/targets/linux/snap/coreCustom.js.map +1 -1
  230. package/dist/targets/linux/snap/coreLegacy.d.ts +3 -3
  231. package/dist/targets/linux/snap/coreLegacy.d.ts.map +1 -1
  232. package/dist/targets/linux/snap/coreLegacy.js +12 -12
  233. package/dist/targets/linux/snap/coreLegacy.js.map +1 -1
  234. package/dist/targets/linux/snap/snapCommand.d.ts +13 -0
  235. package/dist/targets/linux/snap/snapCommand.d.ts.map +1 -0
  236. package/dist/targets/linux/snap/snapCommand.js +21 -0
  237. package/dist/targets/linux/snap/snapCommand.js.map +1 -0
  238. package/dist/targets/linux/snap/snapcraft.d.ts +190 -0
  239. package/dist/targets/linux/snap/snapcraft.d.ts.map +1 -0
  240. package/dist/targets/linux/snap/snapcraft.js +11 -0
  241. package/dist/targets/linux/snap/snapcraft.js.map +1 -0
  242. package/dist/targets/linux/snap/snapcraftBuilder.d.ts +7 -1
  243. package/dist/targets/linux/snap/snapcraftBuilder.d.ts.map +1 -1
  244. package/dist/targets/linux/snap/snapcraftBuilder.js +57 -20
  245. package/dist/targets/linux/snap/snapcraftBuilder.js.map +1 -1
  246. package/dist/targets/mac/MacTargetHelper.d.ts +146 -14
  247. package/dist/targets/mac/MacTargetHelper.d.ts.map +1 -1
  248. package/dist/targets/mac/MacTargetHelper.js +485 -91
  249. package/dist/targets/mac/MacTargetHelper.js.map +1 -1
  250. package/dist/targets/mac/pkg.d.ts +16 -0
  251. package/dist/targets/mac/pkg.d.ts.map +1 -1
  252. package/dist/targets/mac/pkg.js +31 -5
  253. package/dist/targets/mac/pkg.js.map +1 -1
  254. package/dist/targets/targetFactory.d.ts +7 -0
  255. package/dist/targets/targetFactory.d.ts.map +1 -1
  256. package/dist/targets/targetFactory.js +28 -0
  257. package/dist/targets/targetFactory.js.map +1 -1
  258. package/dist/targets/win/AppxTarget.d.ts +1 -2
  259. package/dist/targets/win/AppxTarget.d.ts.map +1 -1
  260. package/dist/targets/win/AppxTarget.js +37 -314
  261. package/dist/targets/win/AppxTarget.js.map +1 -1
  262. package/dist/targets/win/MsiTarget.d.ts.map +1 -1
  263. package/dist/targets/win/MsiTarget.js +13 -13
  264. package/dist/targets/win/MsiTarget.js.map +1 -1
  265. package/dist/targets/win/MsixTarget.d.ts +22 -0
  266. package/dist/targets/win/MsixTarget.d.ts.map +1 -0
  267. package/dist/targets/win/MsixTarget.js +214 -0
  268. package/dist/targets/win/MsixTarget.js.map +1 -0
  269. package/dist/targets/win/nsis/Defines.d.ts +3 -0
  270. package/dist/targets/win/nsis/Defines.d.ts.map +1 -1
  271. package/dist/targets/win/nsis/Defines.js.map +1 -1
  272. package/dist/targets/win/nsis/NsisTarget.d.ts +57 -3
  273. package/dist/targets/win/nsis/NsisTarget.d.ts.map +1 -1
  274. package/dist/targets/win/nsis/NsisTarget.js +252 -113
  275. package/dist/targets/win/nsis/NsisTarget.js.map +1 -1
  276. package/dist/targets/win/nsis/WebInstallerTarget.d.ts.map +1 -1
  277. package/dist/targets/win/nsis/WebInstallerTarget.js +23 -12
  278. package/dist/targets/win/nsis/WebInstallerTarget.js.map +1 -1
  279. package/dist/targets/win/nsis/nsisOptions.d.ts +56 -48
  280. package/dist/targets/win/nsis/nsisOptions.d.ts.map +1 -1
  281. package/dist/targets/win/nsis/nsisOptions.js.map +1 -1
  282. package/dist/targets/win/nsis/nsisScriptGenerator.d.ts.map +1 -1
  283. package/dist/targets/win/nsis/nsisScriptGenerator.js +4 -3
  284. package/dist/targets/win/nsis/nsisScriptGenerator.js.map +1 -1
  285. package/dist/targets/win/nsis/nsisUtil.d.ts +17 -2
  286. package/dist/targets/win/nsis/nsisUtil.d.ts.map +1 -1
  287. package/dist/targets/win/nsis/nsisUtil.js +143 -41
  288. package/dist/targets/win/nsis/nsisUtil.js.map +1 -1
  289. package/dist/targets/win/nsis/progId.d.ts +21 -0
  290. package/dist/targets/win/nsis/progId.d.ts.map +1 -0
  291. package/dist/targets/win/nsis/progId.js +60 -0
  292. package/dist/targets/win/nsis/progId.js.map +1 -0
  293. package/dist/targets/win/winAppUtil.d.ts +115 -0
  294. package/dist/targets/win/winAppUtil.d.ts.map +1 -0
  295. package/dist/targets/win/winAppUtil.js +407 -0
  296. package/dist/targets/win/winAppUtil.js.map +1 -0
  297. package/dist/toolsets/7zip.d.ts +32 -0
  298. package/dist/toolsets/7zip.d.ts.map +1 -1
  299. package/dist/toolsets/7zip.js +39 -11
  300. package/dist/toolsets/7zip.js.map +1 -1
  301. package/dist/toolsets/appimage.d.ts +3 -3
  302. package/dist/toolsets/appimage.d.ts.map +1 -1
  303. package/dist/toolsets/appimage.js +9 -6
  304. package/dist/toolsets/appimage.js.map +1 -1
  305. package/dist/toolsets/custom.d.ts +2 -3
  306. package/dist/toolsets/custom.d.ts.map +1 -1
  307. package/dist/toolsets/custom.js +67 -149
  308. package/dist/toolsets/custom.js.map +1 -1
  309. package/dist/toolsets/fpm.d.ts.map +1 -1
  310. package/dist/toolsets/fpm.js +11 -5
  311. package/dist/toolsets/fpm.js.map +1 -1
  312. package/dist/toolsets/icons.d.ts.map +1 -1
  313. package/dist/toolsets/icons.js +17 -3
  314. package/dist/toolsets/icons.js.map +1 -1
  315. package/dist/toolsets/linuxToolsMac.d.ts.map +1 -1
  316. package/dist/toolsets/linuxToolsMac.js +17 -4
  317. package/dist/toolsets/linuxToolsMac.js.map +1 -1
  318. package/dist/toolsets/nsis.d.ts +5 -0
  319. package/dist/toolsets/nsis.d.ts.map +1 -1
  320. package/dist/toolsets/nsis.js +20 -4
  321. package/dist/toolsets/nsis.js.map +1 -1
  322. package/dist/toolsets/version.d.ts +12 -0
  323. package/dist/toolsets/version.d.ts.map +1 -0
  324. package/dist/toolsets/version.js +13 -0
  325. package/dist/toolsets/version.js.map +1 -0
  326. package/dist/toolsets/winCodeSign.d.ts +56 -3
  327. package/dist/toolsets/winCodeSign.d.ts.map +1 -1
  328. package/dist/toolsets/winCodeSign.js +125 -42
  329. package/dist/toolsets/winCodeSign.js.map +1 -1
  330. package/dist/toolsets/wine.d.ts +2 -1
  331. package/dist/toolsets/wine.d.ts.map +1 -1
  332. package/dist/toolsets/wine.js +31 -15
  333. package/dist/toolsets/wine.js.map +1 -1
  334. package/dist/util/NodeModuleCopyHelper.js +14 -6
  335. package/dist/util/NodeModuleCopyHelper.js.map +1 -1
  336. package/dist/util/appFileCopier.d.ts +52 -0
  337. package/dist/util/appFileCopier.d.ts.map +1 -1
  338. package/dist/util/appFileCopier.js +221 -21
  339. package/dist/util/appFileCopier.js.map +1 -1
  340. package/dist/util/archCompatibility.d.ts +42 -0
  341. package/dist/util/archCompatibility.d.ts.map +1 -0
  342. package/dist/util/archCompatibility.js +202 -0
  343. package/dist/util/archCompatibility.js.map +1 -0
  344. package/dist/util/checksum.d.ts +36 -0
  345. package/dist/util/checksum.d.ts.map +1 -0
  346. package/dist/util/checksum.js +48 -0
  347. package/dist/util/checksum.js.map +1 -0
  348. package/dist/util/config/config.d.ts +1 -0
  349. package/dist/util/config/config.d.ts.map +1 -1
  350. package/dist/util/config/config.js +8 -1
  351. package/dist/util/config/config.js.map +1 -1
  352. package/dist/util/config/legacyConfigGuard.d.ts +7 -0
  353. package/dist/util/config/legacyConfigGuard.d.ts.map +1 -0
  354. package/dist/util/config/legacyConfigGuard.js +187 -0
  355. package/dist/util/config/legacyConfigGuard.js.map +1 -0
  356. package/dist/util/config/legacyOptions.d.ts +75 -0
  357. package/dist/util/config/legacyOptions.d.ts.map +1 -0
  358. package/dist/util/config/legacyOptions.js +399 -0
  359. package/dist/util/config/legacyOptions.js.map +1 -0
  360. package/dist/util/config/load.d.ts +2 -2
  361. package/dist/util/config/load.d.ts.map +1 -1
  362. package/dist/util/config/load.js +3 -12
  363. package/dist/util/config/load.js.map +1 -1
  364. package/dist/util/config/schemaValidator.d.ts.map +1 -1
  365. package/dist/util/config/schemaValidator.js +26 -3
  366. package/dist/util/config/schemaValidator.js.map +1 -1
  367. package/dist/util/electronGet.d.ts +30 -32
  368. package/dist/util/electronGet.d.ts.map +1 -1
  369. package/dist/util/electronGet.js +359 -129
  370. package/dist/util/electronGet.js.map +1 -1
  371. package/dist/util/flags.d.ts +5 -5
  372. package/dist/util/flags.d.ts.map +1 -1
  373. package/dist/util/flags.js +124 -16
  374. package/dist/util/flags.js.map +1 -1
  375. package/dist/util/hash.d.ts +1 -1
  376. package/dist/util/hash.d.ts.map +1 -1
  377. package/dist/util/hash.js +1 -15
  378. package/dist/util/hash.js.map +1 -1
  379. package/dist/util/installOrRebuild.d.ts +44 -0
  380. package/dist/util/installOrRebuild.d.ts.map +1 -0
  381. package/dist/util/installOrRebuild.js +276 -0
  382. package/dist/util/installOrRebuild.js.map +1 -0
  383. package/dist/util/langs.d.ts.map +1 -1
  384. package/dist/util/langs.js +1 -0
  385. package/dist/util/langs.js.map +1 -1
  386. package/dist/util/license.d.ts.map +1 -1
  387. package/dist/util/license.js +4 -1
  388. package/dist/util/license.js.map +1 -1
  389. package/dist/util/mac/macosIconComposer.d.ts +2 -1
  390. package/dist/util/mac/macosIconComposer.d.ts.map +1 -1
  391. package/dist/util/mac/macosIconComposer.js +41 -59
  392. package/dist/util/mac/macosIconComposer.js.map +1 -1
  393. package/dist/util/mac/macosVersion.d.ts +0 -1
  394. package/dist/util/mac/macosVersion.d.ts.map +1 -1
  395. package/dist/util/mac/macosVersion.js +0 -3
  396. package/dist/util/mac/macosVersion.js.map +1 -1
  397. package/dist/util/mac/plist.d.ts +1 -1
  398. package/dist/util/mac/plist.d.ts.map +1 -1
  399. package/dist/util/mac/plist.js +6 -1
  400. package/dist/util/mac/plist.js.map +1 -1
  401. package/dist/util/nativeBinaryVerifier.d.ts +40 -0
  402. package/dist/util/nativeBinaryVerifier.d.ts.map +1 -0
  403. package/dist/util/nativeBinaryVerifier.js +381 -0
  404. package/dist/util/nativeBinaryVerifier.js.map +1 -0
  405. package/dist/util/packageMetadata.js +57 -31
  406. package/dist/util/packageMetadata.js.map +1 -1
  407. package/dist/util/repositoryInfo.js +6 -3
  408. package/dist/util/repositoryInfo.js.map +1 -1
  409. package/dist/util/resolve.js +1 -1
  410. package/dist/util/resolve.js.map +1 -1
  411. package/dist/util/streamSpawnToFile.d.ts +47 -0
  412. package/dist/util/streamSpawnToFile.d.ts.map +1 -0
  413. package/dist/util/streamSpawnToFile.js +110 -0
  414. package/dist/util/streamSpawnToFile.js.map +1 -0
  415. package/dist/util/toolsetLock.d.ts +2 -0
  416. package/dist/util/toolsetLock.d.ts.map +1 -1
  417. package/dist/util/toolsetLock.js +31 -5
  418. package/dist/util/toolsetLock.js.map +1 -1
  419. package/dist/version.d.ts +1 -1
  420. package/dist/version.d.ts.map +1 -1
  421. package/dist/version.js +1 -1
  422. package/dist/version.js.map +1 -1
  423. package/dist/vm/ParallelsVm.d.ts.map +1 -1
  424. package/dist/vm/ParallelsVm.js +29 -3
  425. package/dist/vm/ParallelsVm.js.map +1 -1
  426. package/dist/vm/vm.d.ts +2 -0
  427. package/dist/vm/vm.d.ts.map +1 -1
  428. package/dist/vm/vm.js +29 -6
  429. package/dist/vm/vm.js.map +1 -1
  430. package/dist/winPackager.d.ts +6 -5
  431. package/dist/winPackager.d.ts.map +1 -1
  432. package/dist/winPackager.js +45 -39
  433. package/dist/winPackager.js.map +1 -1
  434. package/package.json +19 -18
  435. package/scheme.json +1731 -961
  436. package/templates/appx/appxmanifest.xml +2 -3
  437. package/templates/entitlements.mac.adhoc.plist +15 -0
  438. package/templates/entitlements.mac.plist +9 -6
  439. package/templates/msix/appxmanifest.xml +45 -0
  440. package/templates/nsis/assistedMessages.yml +17 -0
  441. package/templates/nsis/common.nsh +2 -2
  442. package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh +96 -13
  443. package/templates/nsis/include/extractAppPackage.nsh +5 -2
  444. package/templates/nsis/include/installUtil.nsh +2 -2
  445. package/templates/nsis/include/installer.nsh +88 -50
  446. package/templates/nsis/include/webPackage.nsh +52 -27
  447. package/templates/nsis/installSection.nsh +29 -0
  448. package/templates/nsis/installer.nsi +1 -1
  449. package/templates/nsis/messages.yml +5 -0
  450. package/templates/nsis/multiUserUi.nsh +1 -1
  451. package/dist/codeSign/signManager.d.ts +0 -14
  452. package/dist/codeSign/signManager.d.ts.map +0 -1
  453. package/dist/codeSign/signManager.js +0 -2
  454. package/dist/codeSign/signManager.js.map +0 -1
  455. package/dist/util/yarn.d.ts +0 -23
  456. package/dist/util/yarn.d.ts.map +0 -1
  457. package/dist/util/yarn.js +0 -153
  458. package/dist/util/yarn.js.map +0 -1
@@ -0,0 +1,117 @@
1
+ import { createHash } from "crypto";
2
+ import { createReadStream } from "fs";
3
+ import { open, stat } from "fs/promises";
4
+ /** Bytes of the needle used as the cheap scan probe; a full hash comparison confirms every probe hit. */
5
+ const PROBE_SIZE = 64 * 1024;
6
+ /** Haystack read granularity. Peak memory ≈ READ_CHUNK_SIZE + PROBE_SIZE, independent of file sizes. */
7
+ const READ_CHUNK_SIZE = 1024 * 1024;
8
+ async function hashRange(file, start, size) {
9
+ const hash = createHash("sha256");
10
+ await new Promise((resolve, reject) => {
11
+ createReadStream(file, { start, end: start + size - 1 })
12
+ .on("data", chunk => hash.update(chunk))
13
+ .on("end", resolve)
14
+ .on("error", reject);
15
+ });
16
+ return hash.digest("hex");
17
+ }
18
+ /**
19
+ * Reads what `findPreparedVerbatimRange` needs to know about `needleFile`.
20
+ * @throws when the needle is empty — an empty range is meaningless as a blockmap region.
21
+ */
22
+ export async function prepareVerbatimNeedle(needleFile) {
23
+ const size = (await stat(needleFile)).size;
24
+ if (size === 0) {
25
+ throw new Error(`Cannot locate an empty file (${needleFile}) inside another file`);
26
+ }
27
+ const probeSize = Math.min(PROBE_SIZE, size);
28
+ const probe = Buffer.allocUnsafe(probeSize);
29
+ const needleHandle = await open(needleFile, "r");
30
+ try {
31
+ const { bytesRead } = await needleHandle.read(probe, 0, probeSize, 0);
32
+ if (bytesRead !== probeSize) {
33
+ throw new Error(`Short read of ${needleFile}: expected ${probeSize} bytes, got ${bytesRead}`);
34
+ }
35
+ }
36
+ finally {
37
+ await needleHandle.close();
38
+ }
39
+ return { file: needleFile, size, hash: await hashRange(needleFile, 0, size), probe };
40
+ }
41
+ /**
42
+ * Finds the first byte range of `haystackFile` whose contents are exactly the contents of `needleFile`
43
+ * (e.g. the location of an archive member stored with `Copy` inside an installer that embeds the archive).
44
+ *
45
+ * Streams the haystack in `READ_CHUNK_SIZE` reads (never loads it whole), scanning for the first
46
+ * `min(PROBE_SIZE, needle size)` bytes of the needle — with a `probe.length - 1` byte overlap between
47
+ * reads so a probe straddling a chunk boundary is still seen — and confirms each probe hit by hashing the
48
+ * candidate haystack range against the needle's hash. False-positive probe hits are skipped and the scan
49
+ * continues; the first confirmed match at or after `startOffset` is returned. Passing the end of an
50
+ * earlier match as `startOffset` finds the next occurrence, which is how identical members (e.g. the
51
+ * same asar packaged for several archs) are each given their own range.
52
+ *
53
+ * Reads the needle on every call; a caller searching for the same needle repeatedly should prepare it
54
+ * once with `prepareVerbatimNeedle` and use `findPreparedVerbatimRange`.
55
+ *
56
+ * @returns the confirmed range, or `null` when the needle does not occur verbatim at or after
57
+ * `startOffset` (including when it is larger than the haystack).
58
+ * @throws when the needle is empty — an empty range is meaningless as a blockmap region.
59
+ */
60
+ export async function findVerbatimRange(haystackFile, needleFile, startOffset = 0) {
61
+ return findPreparedVerbatimRange(haystackFile, await prepareVerbatimNeedle(needleFile), startOffset);
62
+ }
63
+ /** `findVerbatimRange` for a needle prepared with `prepareVerbatimNeedle`. */
64
+ export async function findPreparedVerbatimRange(haystackFile, needle, startOffset = 0) {
65
+ if (!Number.isSafeInteger(startOffset) || startOffset < 0) {
66
+ throw new Error(`startOffset must be a non-negative integer, got ${String(startOffset)}`);
67
+ }
68
+ const { size: needleSize, probe, hash: needleHash } = needle;
69
+ const probeSize = probe.length;
70
+ const haystackSize = (await stat(haystackFile)).size;
71
+ if (startOffset + needleSize > haystackSize) {
72
+ return null;
73
+ }
74
+ const haystackHandle = await open(haystackFile, "r");
75
+ try {
76
+ const readBuffer = Buffer.allocUnsafe(READ_CHUNK_SIZE);
77
+ // `carry` holds the last `probe.length - 1` bytes of the previous window so a probe occurrence that
78
+ // straddles two reads is found; a probe can never fit entirely inside the carry, so no hit is reported twice.
79
+ let carry = Buffer.alloc(0);
80
+ // Absolute haystack offset of window[0].
81
+ let windowOffset = startOffset;
82
+ let readPosition = startOffset;
83
+ while (readPosition < haystackSize) {
84
+ const { bytesRead } = await haystackHandle.read(readBuffer, 0, READ_CHUNK_SIZE, readPosition);
85
+ if (bytesRead === 0) {
86
+ break;
87
+ }
88
+ readPosition += bytesRead;
89
+ const window = carry.length === 0 ? readBuffer.subarray(0, bytesRead) : Buffer.concat([carry, readBuffer.subarray(0, bytesRead)]);
90
+ let searchFrom = 0;
91
+ while (searchFrom <= window.length - probeSize) {
92
+ const index = window.indexOf(probe, searchFrom);
93
+ if (index === -1) {
94
+ break;
95
+ }
96
+ const offset = windowOffset + index;
97
+ if (offset + needleSize > haystackSize) {
98
+ // no later candidate can fit either
99
+ return null;
100
+ }
101
+ if ((await hashRange(haystackFile, offset, needleSize)) === needleHash) {
102
+ return { offset, size: needleSize };
103
+ }
104
+ searchFrom = index + 1;
105
+ }
106
+ const carrySize = Math.min(probeSize - 1, window.length);
107
+ // copy: `window` may alias `readBuffer`, which the next read overwrites
108
+ carry = Buffer.from(window.subarray(window.length - carrySize));
109
+ windowOffset += window.length - carrySize;
110
+ }
111
+ }
112
+ finally {
113
+ await haystackHandle.close();
114
+ }
115
+ return null;
116
+ }
117
+ //# sourceMappingURL=verbatimRange.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"verbatimRange.js","sourceRoot":"","sources":["../../../src/targets/blockmap/verbatimRange.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"crypto\"\nimport { createReadStream } from \"fs\"\nimport { open, stat } from \"fs/promises\"\n\n/** Bytes of the needle used as the cheap scan probe; a full hash comparison confirms every probe hit. */\nconst PROBE_SIZE = 64 * 1024\n/** Haystack read granularity. Peak memory ≈ READ_CHUNK_SIZE + PROBE_SIZE, independent of file sizes. */\nconst READ_CHUNK_SIZE = 1024 * 1024\n\nexport interface VerbatimRange {\n offset: number\n size: number\n}\n\nasync function hashRange(file: string, start: number, size: number): Promise<string> {\n const hash = createHash(\"sha256\")\n await new Promise<void>((resolve, reject) => {\n createReadStream(file, { start, end: start + size - 1 })\n .on(\"data\", chunk => hash.update(chunk))\n .on(\"end\", resolve)\n .on(\"error\", reject)\n })\n return hash.digest(\"hex\")\n}\n\n/**\n * A needle prepared for `findPreparedVerbatimRange`: its scan probe and full hash, computed once so a\n * needle searched for several times (e.g. resumed past an earlier occurrence) is read only once.\n */\nexport interface VerbatimNeedle {\n readonly file: string\n readonly size: number\n /** sha256 of the whole needle; also what identifies byte-identical needles. */\n readonly hash: string\n /** the first `min(PROBE_SIZE, size)` bytes */\n readonly probe: Buffer\n}\n\n/**\n * Reads what `findPreparedVerbatimRange` needs to know about `needleFile`.\n * @throws when the needle is empty — an empty range is meaningless as a blockmap region.\n */\nexport async function prepareVerbatimNeedle(needleFile: string): Promise<VerbatimNeedle> {\n const size = (await stat(needleFile)).size\n if (size === 0) {\n throw new Error(`Cannot locate an empty file (${needleFile}) inside another file`)\n }\n const probeSize = Math.min(PROBE_SIZE, size)\n const probe = Buffer.allocUnsafe(probeSize)\n const needleHandle = await open(needleFile, \"r\")\n try {\n const { bytesRead } = await needleHandle.read(probe, 0, probeSize, 0)\n if (bytesRead !== probeSize) {\n throw new Error(`Short read of ${needleFile}: expected ${probeSize} bytes, got ${bytesRead}`)\n }\n } finally {\n await needleHandle.close()\n }\n return { file: needleFile, size, hash: await hashRange(needleFile, 0, size), probe }\n}\n\n/**\n * Finds the first byte range of `haystackFile` whose contents are exactly the contents of `needleFile`\n * (e.g. the location of an archive member stored with `Copy` inside an installer that embeds the archive).\n *\n * Streams the haystack in `READ_CHUNK_SIZE` reads (never loads it whole), scanning for the first\n * `min(PROBE_SIZE, needle size)` bytes of the needle — with a `probe.length - 1` byte overlap between\n * reads so a probe straddling a chunk boundary is still seen — and confirms each probe hit by hashing the\n * candidate haystack range against the needle's hash. False-positive probe hits are skipped and the scan\n * continues; the first confirmed match at or after `startOffset` is returned. Passing the end of an\n * earlier match as `startOffset` finds the next occurrence, which is how identical members (e.g. the\n * same asar packaged for several archs) are each given their own range.\n *\n * Reads the needle on every call; a caller searching for the same needle repeatedly should prepare it\n * once with `prepareVerbatimNeedle` and use `findPreparedVerbatimRange`.\n *\n * @returns the confirmed range, or `null` when the needle does not occur verbatim at or after\n * `startOffset` (including when it is larger than the haystack).\n * @throws when the needle is empty — an empty range is meaningless as a blockmap region.\n */\nexport async function findVerbatimRange(haystackFile: string, needleFile: string, startOffset = 0): Promise<VerbatimRange | null> {\n return findPreparedVerbatimRange(haystackFile, await prepareVerbatimNeedle(needleFile), startOffset)\n}\n\n/** `findVerbatimRange` for a needle prepared with `prepareVerbatimNeedle`. */\nexport async function findPreparedVerbatimRange(haystackFile: string, needle: VerbatimNeedle, startOffset = 0): Promise<VerbatimRange | null> {\n if (!Number.isSafeInteger(startOffset) || startOffset < 0) {\n throw new Error(`startOffset must be a non-negative integer, got ${String(startOffset)}`)\n }\n const { size: needleSize, probe, hash: needleHash } = needle\n const probeSize = probe.length\n const haystackSize = (await stat(haystackFile)).size\n if (startOffset + needleSize > haystackSize) {\n return null\n }\n\n const haystackHandle = await open(haystackFile, \"r\")\n try {\n const readBuffer = Buffer.allocUnsafe(READ_CHUNK_SIZE)\n // `carry` holds the last `probe.length - 1` bytes of the previous window so a probe occurrence that\n // straddles two reads is found; a probe can never fit entirely inside the carry, so no hit is reported twice.\n let carry: Buffer = Buffer.alloc(0)\n // Absolute haystack offset of window[0].\n let windowOffset = startOffset\n let readPosition = startOffset\n while (readPosition < haystackSize) {\n const { bytesRead } = await haystackHandle.read(readBuffer, 0, READ_CHUNK_SIZE, readPosition)\n if (bytesRead === 0) {\n break\n }\n readPosition += bytesRead\n const window = carry.length === 0 ? readBuffer.subarray(0, bytesRead) : Buffer.concat([carry, readBuffer.subarray(0, bytesRead)])\n\n let searchFrom = 0\n while (searchFrom <= window.length - probeSize) {\n const index = window.indexOf(probe, searchFrom)\n if (index === -1) {\n break\n }\n const offset = windowOffset + index\n if (offset + needleSize > haystackSize) {\n // no later candidate can fit either\n return null\n }\n if ((await hashRange(haystackFile, offset, needleSize)) === needleHash) {\n return { offset, size: needleSize }\n }\n searchFrom = index + 1\n }\n\n const carrySize = Math.min(probeSize - 1, window.length)\n // copy: `window` may alias `readBuffer`, which the next read overwrites\n carry = Buffer.from(window.subarray(window.length - carrySize))\n windowOffset += window.length - carrySize\n }\n } finally {\n await haystackHandle.close()\n }\n return null\n}\n"]}
@@ -1,8 +1,34 @@
1
+ import { Arch } from "builder-util";
1
2
  import { BlockMapDataHolder, PackageFileInfo } from "builder-util-runtime";
2
3
  import { Target } from "../core.js";
3
4
  import { PlatformPackager } from "../platformPackager.js";
4
5
  import { ArchiveOptions } from "./archive.js";
6
+ import { BlockMapRegion, BuildBlockMapOptions, ChunkerParams } from "./blockmap/blockmap.js";
5
7
  export declare const BLOCK_MAP_FILE_SUFFIX = ".blockmap";
8
+ /**
9
+ * Chunker parameters for a stored (`Copy`) archive member — e.g. `resources/app.asar` when
10
+ * `nsis.differentialPackage` is `"store-asar"` — whose bytes sit verbatim in the artifact. Such a member
11
+ * changes in small, localized ways between releases, so it is chunked finer than the surrounding
12
+ * compressed streams to keep the differential download proportional to the change.
13
+ *
14
+ * Set by benchmark (`test/src/differentialOneLineBenchTest.ts`, 32 MB asar / 3,001 files): 4/8/16 KiB
15
+ * minimizes download bytes + new-blockmap bytes for a one-line edit (−5 % same-length, −17 % length-changing
16
+ * vs. the 8/16/32 default); anything finer is a net loss because the v2 blockmap (~22 B per block, re-downloaded
17
+ * in full on every update) grows faster than the block savings. `avg` must stay a power of two.
18
+ */
19
+ export declare const STORED_MEMBER_CHUNKER: ChunkerParams;
20
+ /**
21
+ * Locates each of `memberFiles` (absolute paths of files stored verbatim inside `artifact`) and returns
22
+ * a `STORED_MEMBER_CHUNKER` blockmap region per located file, sorted by offset. The regions never
23
+ * overlap: byte-identical members (a pure-JS app packaged for x64 + arm64 has the same asar twice in
24
+ * the universal installer) are each matched to their own copy, and a copy already claimed by an
25
+ * earlier member is skipped. A member file that does not exist, or that cannot be found verbatim, is
26
+ * logged at warn and skipped — the blockmap then falls back to the default chunker for those bytes;
27
+ * it never fails the build.
28
+ */
29
+ export declare function locateStoredMemberRegions(artifact: string, memberFiles: Array<string>): Promise<Array<BlockMapRegion>>;
30
+ /** `BuildBlockMapOptions` for `regions`, or `undefined` when there are none so the default chunker path is taken unchanged. */
31
+ export declare function toBlockMapOptions(regions: Array<BlockMapRegion>): BuildBlockMapOptions | undefined;
6
32
  export declare function createNsisWebDifferentialUpdateInfo(artifactPath: string, packageFiles: {
7
33
  [arch: string]: PackageFileInfo;
8
34
  }): {
@@ -11,6 +37,6 @@ export declare function createNsisWebDifferentialUpdateInfo(artifactPath: string
11
37
  };
12
38
  } | null;
13
39
  export declare function configureDifferentialAwareArchiveOptions(archiveOptions: ArchiveOptions): ArchiveOptions;
14
- export declare function appendBlockmap(file: string): Promise<BlockMapDataHolder>;
15
- export declare function createBlockmap(file: string, target: Target, packager: PlatformPackager<any>, safeArtifactName: string | null): Promise<BlockMapDataHolder>;
40
+ export declare function appendBlockmap(file: string, options?: BuildBlockMapOptions): Promise<BlockMapDataHolder>;
41
+ export declare function createBlockmap(file: string, target: Target, packager: PlatformPackager<any>, safeArtifactName: string | null, arch?: Arch | null, options?: BuildBlockMapOptions): Promise<BlockMapDataHolder>;
16
42
  //# sourceMappingURL=differentialUpdateInfoBuilder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"differentialUpdateInfoBuilder.d.ts","sourceRoot":"","sources":["../../src/targets/differentialUpdateInfoBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAG7C,eAAO,MAAM,qBAAqB,cAAc,CAAA;AAEhD,wBAAgB,mCAAmC,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE;;;;SAsB1H;AAED,wBAAgB,wCAAwC,CAAC,cAAc,EAAE,cAAc,GAAG,cAAc,CA4BvG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAG9E;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAAE,gBAAgB,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAahK"}
1
+ {"version":3,"file":"differentialUpdateInfoBuilder.d.ts","sourceRoot":"","sources":["../../src/targets/differentialUpdateInfoBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE1E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAiB,oBAAoB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAG3G,eAAO,MAAM,qBAAqB,cAAc,CAAA;AAEhD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAoD,CAAA;AAExF;;;;;;;;GAQG;AACH,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAyB5H;AAuBD,+HAA+H;AAC/H,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,cAAc,CAAC,GAAG,oBAAoB,GAAG,SAAS,CAElG;AAED,wBAAgB,mCAAmC,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE;IAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;CAAE;;;;SAsB1H;AAED,wBAAgB,wCAAwC,CAAC,cAAc,EAAE,cAAc,GAAG,cAAc,CA4BvG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAG9G;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,EAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,EAC/B,IAAI,GAAE,IAAI,GAAG,IAAW,EACxB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,kBAAkB,CAAC,CAa7B"}
@@ -1,7 +1,76 @@
1
- import { log } from "builder-util";
1
+ import { exists, log } from "builder-util";
2
2
  import * as path from "path";
3
3
  import { buildBlockMap } from "./blockmap/blockmap.js";
4
+ import { findPreparedVerbatimRange, prepareVerbatimNeedle } from "./blockmap/verbatimRange.js";
4
5
  export const BLOCK_MAP_FILE_SUFFIX = ".blockmap";
6
+ /**
7
+ * Chunker parameters for a stored (`Copy`) archive member — e.g. `resources/app.asar` when
8
+ * `nsis.differentialPackage` is `"store-asar"` — whose bytes sit verbatim in the artifact. Such a member
9
+ * changes in small, localized ways between releases, so it is chunked finer than the surrounding
10
+ * compressed streams to keep the differential download proportional to the change.
11
+ *
12
+ * Set by benchmark (`test/src/differentialOneLineBenchTest.ts`, 32 MB asar / 3,001 files): 4/8/16 KiB
13
+ * minimizes download bytes + new-blockmap bytes for a one-line edit (−5 % same-length, −17 % length-changing
14
+ * vs. the 8/16/32 default); anything finer is a net loss because the v2 blockmap (~22 B per block, re-downloaded
15
+ * in full on every update) grows faster than the block savings. `avg` must stay a power of two.
16
+ */
17
+ export const STORED_MEMBER_CHUNKER = { min: 4096, avg: 8192, max: 16384 };
18
+ /**
19
+ * Locates each of `memberFiles` (absolute paths of files stored verbatim inside `artifact`) and returns
20
+ * a `STORED_MEMBER_CHUNKER` blockmap region per located file, sorted by offset. The regions never
21
+ * overlap: byte-identical members (a pure-JS app packaged for x64 + arm64 has the same asar twice in
22
+ * the universal installer) are each matched to their own copy, and a copy already claimed by an
23
+ * earlier member is skipped. A member file that does not exist, or that cannot be found verbatim, is
24
+ * logged at warn and skipped — the blockmap then falls back to the default chunker for those bytes;
25
+ * it never fails the build.
26
+ */
27
+ export async function locateStoredMemberRegions(artifact, memberFiles) {
28
+ const regions = [];
29
+ // Byte-identical members have identical occurrences, and the copies are claimed in ascending order,
30
+ // so the scan for the next member with the same content resumes where its previous copy ended instead
31
+ // of rescanning (and re-confirming every earlier copy) from the start of the artifact.
32
+ const resumeOffsetByHash = new Map();
33
+ for (const memberFile of memberFiles) {
34
+ if (!(await exists(memberFile))) {
35
+ log.warn({ artifact: log.filePath(artifact), member: log.filePath(memberFile) }, "stored member file does not exist; no block map region for it");
36
+ continue;
37
+ }
38
+ const needle = await prepareVerbatimNeedle(memberFile);
39
+ const range = await findUnclaimedVerbatimRange(artifact, needle, regions, resumeOffsetByHash.get(needle.hash) ?? 0);
40
+ if (range == null) {
41
+ log.warn({ artifact: log.filePath(artifact), member: log.filePath(memberFile) }, "stored member not found verbatim in artifact; its bytes will be chunked with the default block map parameters");
42
+ continue;
43
+ }
44
+ resumeOffsetByHash.set(needle.hash, range.offset + range.size);
45
+ log.info({ artifact: log.filePath(artifact), member: log.filePath(memberFile), offset: range.offset, size: range.size }, "located stored member region for block map");
46
+ regions.push({ ...range, chunker: STORED_MEMBER_CHUNKER });
47
+ }
48
+ return regions.sort((a, b) => a.offset - b.offset);
49
+ }
50
+ /**
51
+ * The first occurrence of `needle` in `artifact` at or after `startOffset` that does not overlap a
52
+ * range in `claimed`. An occurrence that overlaps a claimed range is another member's copy (or part of
53
+ * one), so the scan resumes right after that range — every candidate start before its end would
54
+ * overlap it too.
55
+ */
56
+ async function findUnclaimedVerbatimRange(artifact, needle, claimed, startOffset) {
57
+ for (;;) {
58
+ const range = await findPreparedVerbatimRange(artifact, needle, startOffset);
59
+ if (range == null) {
60
+ return null;
61
+ }
62
+ const rangeEnd = range.offset + range.size;
63
+ const clash = claimed.find(it => range.offset < it.offset + it.size && it.offset < rangeEnd);
64
+ if (clash == null) {
65
+ return range;
66
+ }
67
+ startOffset = clash.offset + clash.size;
68
+ }
69
+ }
70
+ /** `BuildBlockMapOptions` for `regions`, or `undefined` when there are none so the default chunker path is taken unchanged. */
71
+ export function toBlockMapOptions(regions) {
72
+ return regions.length === 0 ? undefined : { regions };
73
+ }
5
74
  export function createNsisWebDifferentialUpdateInfo(artifactPath, packageFiles) {
6
75
  if (packageFiles == null) {
7
76
  return null;
@@ -52,19 +121,19 @@ export function configureDifferentialAwareArchiveOptions(archiveOptions) {
52
121
  archiveOptions.compression = "normal";
53
122
  return archiveOptions;
54
123
  }
55
- export async function appendBlockmap(file) {
124
+ export async function appendBlockmap(file, options) {
56
125
  log.info({ file: log.filePath(file) }, "building embedded block map");
57
- return buildBlockMap(file, "deflate");
126
+ return buildBlockMap(file, "deflate", undefined, options);
58
127
  }
59
- export async function createBlockmap(file, target, packager, safeArtifactName) {
128
+ export async function createBlockmap(file, target, packager, safeArtifactName, arch = null, options) {
60
129
  const blockMapFile = `${file}${BLOCK_MAP_FILE_SUFFIX}`;
61
130
  log.info({ blockMapFile: log.filePath(blockMapFile) }, "building block map");
62
- const updateInfo = await buildBlockMap(file, "gzip", blockMapFile);
131
+ const updateInfo = await buildBlockMap(file, "gzip", blockMapFile, options);
63
132
  await packager.emitArtifactBuildCompleted({
64
133
  file: blockMapFile,
65
134
  safeArtifactName: safeArtifactName == null ? null : `${safeArtifactName}${BLOCK_MAP_FILE_SUFFIX}`,
66
135
  target,
67
- arch: null,
136
+ arch,
68
137
  packager,
69
138
  updateInfo,
70
139
  });
@@ -1 +1 @@
1
- {"version":3,"file":"differentialUpdateInfoBuilder.js","sourceRoot":"","sources":["../../src/targets/differentialUpdateInfoBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAElC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAI5B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAEtD,MAAM,CAAC,MAAM,qBAAqB,GAAG,WAAW,CAAA;AAEhD,MAAM,UAAU,mCAAmC,CAAC,YAAoB,EAAE,YAAiD;IACzH,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACtC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,QAAQ,GAAwC,EAAE,CAAA;IACxD,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,eAAe,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChD,QAAQ,CAAC,IAAI,CAAC,GAAG;YACf,GAAG,eAAe;YAClB,IAAI,EAAE,IAAI;YACV,oEAAoE;YACpE,IAAI;SACE,CAAA;IACV,CAAC;IACD,OAAO,EAAE,QAAQ,EAAE,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,wCAAwC,CAAC,cAA8B;IACrF;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,cAAc,CAAC,QAAQ,GAAG,CAAC,CAAA;IAC3B,qDAAqD;IACrD,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;IAC5B,uEAAuE;IACvE,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAA;IACrC,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY;IAC/C,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,6BAA6B,CAAC,CAAA;IACrE,OAAO,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,MAAc,EAAE,QAA+B,EAAE,gBAA+B;IACjI,MAAM,YAAY,GAAG,GAAG,IAAI,GAAG,qBAAqB,EAAE,CAAA;IACtD,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,oBAAoB,CAAC,CAAA;IAC5E,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAA;IAClE,MAAM,QAAQ,CAAC,0BAA0B,CAAC;QACxC,IAAI,EAAE,YAAY;QAClB,gBAAgB,EAAE,gBAAgB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,gBAAgB,GAAG,qBAAqB,EAAE;QACjG,MAAM;QACN,IAAI,EAAE,IAAI;QACV,QAAQ;QACR,UAAU;KACX,CAAC,CAAA;IACF,OAAO,UAAU,CAAA;AACnB,CAAC","sourcesContent":["import { log } from \"builder-util\"\nimport { BlockMapDataHolder, PackageFileInfo } from \"builder-util-runtime\"\nimport * as path from \"path\"\nimport { Target } from \"../core.js\"\nimport { PlatformPackager } from \"../platformPackager.js\"\nimport { ArchiveOptions } from \"./archive.js\"\nimport { buildBlockMap } from \"./blockmap/blockmap.js\"\n\nexport const BLOCK_MAP_FILE_SUFFIX = \".blockmap\"\n\nexport function createNsisWebDifferentialUpdateInfo(artifactPath: string, packageFiles: { [arch: string]: PackageFileInfo }) {\n if (packageFiles == null) {\n return null\n }\n\n const keys = Object.keys(packageFiles)\n if (keys.length <= 0) {\n return null\n }\n\n const packages: { [arch: string]: PackageFileInfo } = {}\n for (const arch of keys) {\n const packageFileInfo = packageFiles[arch]\n const file = path.basename(packageFileInfo.path)\n packages[arch] = {\n ...packageFileInfo,\n path: file,\n // https://github.com/electron-userland/electron-builder/issues/2583\n file,\n } as any\n }\n return { packages }\n}\n\nexport function configureDifferentialAwareArchiveOptions(archiveOptions: ArchiveOptions): ArchiveOptions {\n /*\n * dict size 64 MB: Full: 33,744.88 KB, To download: 17,630.3 KB (52%)\n * dict size 16 MB: Full: 33,936.84 KB, To download: 16,175.9 KB (48%)\n * dict size 8 MB: Full: 34,187.59 KB, To download: 8,229.9 KB (24%)\n * dict size 4 MB: Full: 34,628.73 KB, To download: 3,782.97 KB (11%)\n\n as we can see, if file changed in one place, all block is invalidated (and update size approximately equals to dict size)\n\n 1 MB is used:\n\n 1MB:\n\n 2018/01/11 11:54:41:0045 File has 59 changed blocks\n 2018/01/11 11:54:41:0050 Full: 71,588.59 KB, To download: 1,243.39 KB (2%)\n\n 4MB:\n\n 2018/01/11 11:31:43:0440 Full: 70,303.55 KB, To download: 4,843.27 KB (7%)\n 2018/01/11 11:31:43:0435 File has 234 changed blocks\n\n */\n archiveOptions.dictSize = 1\n // solid compression leads to a lot of changed blocks\n archiveOptions.solid = false\n // do not allow to change compression level to avoid different packages\n archiveOptions.compression = \"normal\"\n return archiveOptions\n}\n\nexport async function appendBlockmap(file: string): Promise<BlockMapDataHolder> {\n log.info({ file: log.filePath(file) }, \"building embedded block map\")\n return buildBlockMap(file, \"deflate\")\n}\n\nexport async function createBlockmap(file: string, target: Target, packager: PlatformPackager<any>, safeArtifactName: string | null): Promise<BlockMapDataHolder> {\n const blockMapFile = `${file}${BLOCK_MAP_FILE_SUFFIX}`\n log.info({ blockMapFile: log.filePath(blockMapFile) }, \"building block map\")\n const updateInfo = await buildBlockMap(file, \"gzip\", blockMapFile)\n await packager.emitArtifactBuildCompleted({\n file: blockMapFile,\n safeArtifactName: safeArtifactName == null ? null : `${safeArtifactName}${BLOCK_MAP_FILE_SUFFIX}`,\n target,\n arch: null,\n packager,\n updateInfo,\n })\n return updateInfo\n}\n"]}
1
+ {"version":3,"file":"differentialUpdateInfoBuilder.js","sourceRoot":"","sources":["../../src/targets/differentialUpdateInfoBuilder.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, exists, log } from \"builder-util\"\nimport { BlockMapDataHolder, PackageFileInfo } from \"builder-util-runtime\"\nimport * as path from \"path\"\nimport { Target } from \"../core.js\"\nimport { PlatformPackager } from \"../platformPackager.js\"\nimport { ArchiveOptions } from \"./archive.js\"\nimport { BlockMapRegion, buildBlockMap, BuildBlockMapOptions, ChunkerParams } from \"./blockmap/blockmap.js\"\nimport { findPreparedVerbatimRange, prepareVerbatimNeedle, VerbatimNeedle, VerbatimRange } from \"./blockmap/verbatimRange.js\"\n\nexport const BLOCK_MAP_FILE_SUFFIX = \".blockmap\"\n\n/**\n * Chunker parameters for a stored (`Copy`) archive member — e.g. `resources/app.asar` when\n * `nsis.differentialPackage` is `\"store-asar\"` — whose bytes sit verbatim in the artifact. Such a member\n * changes in small, localized ways between releases, so it is chunked finer than the surrounding\n * compressed streams to keep the differential download proportional to the change.\n *\n * Set by benchmark (`test/src/differentialOneLineBenchTest.ts`, 32 MB asar / 3,001 files): 4/8/16 KiB\n * minimizes download bytes + new-blockmap bytes for a one-line edit (−5 % same-length, −17 % length-changing\n * vs. the 8/16/32 default); anything finer is a net loss because the v2 blockmap (~22 B per block, re-downloaded\n * in full on every update) grows faster than the block savings. `avg` must stay a power of two.\n */\nexport const STORED_MEMBER_CHUNKER: ChunkerParams = { min: 4096, avg: 8192, max: 16384 }\n\n/**\n * Locates each of `memberFiles` (absolute paths of files stored verbatim inside `artifact`) and returns\n * a `STORED_MEMBER_CHUNKER` blockmap region per located file, sorted by offset. The regions never\n * overlap: byte-identical members (a pure-JS app packaged for x64 + arm64 has the same asar twice in\n * the universal installer) are each matched to their own copy, and a copy already claimed by an\n * earlier member is skipped. A member file that does not exist, or that cannot be found verbatim, is\n * logged at warn and skipped — the blockmap then falls back to the default chunker for those bytes;\n * it never fails the build.\n */\nexport async function locateStoredMemberRegions(artifact: string, memberFiles: Array<string>): Promise<Array<BlockMapRegion>> {\n const regions: Array<BlockMapRegion> = []\n // Byte-identical members have identical occurrences, and the copies are claimed in ascending order,\n // so the scan for the next member with the same content resumes where its previous copy ended instead\n // of rescanning (and re-confirming every earlier copy) from the start of the artifact.\n const resumeOffsetByHash = new Map<string, number>()\n for (const memberFile of memberFiles) {\n if (!(await exists(memberFile))) {\n log.warn({ artifact: log.filePath(artifact), member: log.filePath(memberFile) }, \"stored member file does not exist; no block map region for it\")\n continue\n }\n const needle = await prepareVerbatimNeedle(memberFile)\n const range = await findUnclaimedVerbatimRange(artifact, needle, regions, resumeOffsetByHash.get(needle.hash) ?? 0)\n if (range == null) {\n log.warn(\n { artifact: log.filePath(artifact), member: log.filePath(memberFile) },\n \"stored member not found verbatim in artifact; its bytes will be chunked with the default block map parameters\"\n )\n continue\n }\n resumeOffsetByHash.set(needle.hash, range.offset + range.size)\n log.info({ artifact: log.filePath(artifact), member: log.filePath(memberFile), offset: range.offset, size: range.size }, \"located stored member region for block map\")\n regions.push({ ...range, chunker: STORED_MEMBER_CHUNKER })\n }\n return regions.sort((a, b) => a.offset - b.offset)\n}\n\n/**\n * The first occurrence of `needle` in `artifact` at or after `startOffset` that does not overlap a\n * range in `claimed`. An occurrence that overlaps a claimed range is another member's copy (or part of\n * one), so the scan resumes right after that range — every candidate start before its end would\n * overlap it too.\n */\nasync function findUnclaimedVerbatimRange(artifact: string, needle: VerbatimNeedle, claimed: Array<BlockMapRegion>, startOffset: number): Promise<VerbatimRange | null> {\n for (;;) {\n const range = await findPreparedVerbatimRange(artifact, needle, startOffset)\n if (range == null) {\n return null\n }\n const rangeEnd = range.offset + range.size\n const clash = claimed.find(it => range.offset < it.offset + it.size && it.offset < rangeEnd)\n if (clash == null) {\n return range\n }\n startOffset = clash.offset + clash.size\n }\n}\n\n/** `BuildBlockMapOptions` for `regions`, or `undefined` when there are none so the default chunker path is taken unchanged. */\nexport function toBlockMapOptions(regions: Array<BlockMapRegion>): BuildBlockMapOptions | undefined {\n return regions.length === 0 ? undefined : { regions }\n}\n\nexport function createNsisWebDifferentialUpdateInfo(artifactPath: string, packageFiles: { [arch: string]: PackageFileInfo }) {\n if (packageFiles == null) {\n return null\n }\n\n const keys = Object.keys(packageFiles)\n if (keys.length <= 0) {\n return null\n }\n\n const packages: { [arch: string]: PackageFileInfo } = {}\n for (const arch of keys) {\n const packageFileInfo = packageFiles[arch]\n const file = path.basename(packageFileInfo.path)\n packages[arch] = {\n ...packageFileInfo,\n path: file,\n // https://github.com/electron-userland/electron-builder/issues/2583\n file,\n } as any\n }\n return { packages }\n}\n\nexport function configureDifferentialAwareArchiveOptions(archiveOptions: ArchiveOptions): ArchiveOptions {\n /*\n * dict size 64 MB: Full: 33,744.88 KB, To download: 17,630.3 KB (52%)\n * dict size 16 MB: Full: 33,936.84 KB, To download: 16,175.9 KB (48%)\n * dict size 8 MB: Full: 34,187.59 KB, To download: 8,229.9 KB (24%)\n * dict size 4 MB: Full: 34,628.73 KB, To download: 3,782.97 KB (11%)\n\n as we can see, if file changed in one place, all block is invalidated (and update size approximately equals to dict size)\n\n 1 MB is used:\n\n 1MB:\n\n 2018/01/11 11:54:41:0045 File has 59 changed blocks\n 2018/01/11 11:54:41:0050 Full: 71,588.59 KB, To download: 1,243.39 KB (2%)\n\n 4MB:\n\n 2018/01/11 11:31:43:0440 Full: 70,303.55 KB, To download: 4,843.27 KB (7%)\n 2018/01/11 11:31:43:0435 File has 234 changed blocks\n\n */\n archiveOptions.dictSize = 1\n // solid compression leads to a lot of changed blocks\n archiveOptions.solid = false\n // do not allow to change compression level to avoid different packages\n archiveOptions.compression = \"normal\"\n return archiveOptions\n}\n\nexport async function appendBlockmap(file: string, options?: BuildBlockMapOptions): Promise<BlockMapDataHolder> {\n log.info({ file: log.filePath(file) }, \"building embedded block map\")\n return buildBlockMap(file, \"deflate\", undefined, options)\n}\n\nexport async function createBlockmap(\n file: string,\n target: Target,\n packager: PlatformPackager<any>,\n safeArtifactName: string | null,\n arch: Arch | null = null,\n options?: BuildBlockMapOptions\n): Promise<BlockMapDataHolder> {\n const blockMapFile = `${file}${BLOCK_MAP_FILE_SUFFIX}`\n log.info({ blockMapFile: log.filePath(blockMapFile) }, \"building block map\")\n const updateInfo = await buildBlockMap(file, \"gzip\", blockMapFile, options)\n await packager.emitArtifactBuildCompleted({\n file: blockMapFile,\n safeArtifactName: safeArtifactName == null ? null : `${safeArtifactName}${BLOCK_MAP_FILE_SUFFIX}`,\n target,\n arch,\n packager,\n updateInfo,\n })\n return updateInfo\n}\n"]}
@@ -1 +1 @@
1
- {"version":3,"file":"FlatpakTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/linux/FlatpakTarget.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA+B,MAAM,cAAc,CAAA;AAGhE,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAM1D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,MAAM;IAK7C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM;IACd,QAAQ,CAAC,MAAM,EAAE,MAAM;IANzB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAA+D;gBAG7F,IAAI,EAAE,MAAM,EACK,QAAQ,EAAE,aAAa,EAChC,MAAM,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM;IAKzB,IAAI,KAAK,IAAI,MAAM,CAElB;IAEK,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;YA2B1C,eAAe;YAQf,uBAAuB;YAOvB,iBAAiB;YAMjB,eAAe;YAQf,SAAS;IAiBvB,OAAO,CAAC,wBAAwB;CA8BjC"}
1
+ {"version":3,"file":"FlatpakTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/linux/FlatpakTarget.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAwD,MAAM,cAAc,CAAA;AAGzF,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAO1D,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,MAAM;IAK7C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM;IACd,QAAQ,CAAC,MAAM,EAAE,MAAM;IANzB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAA+D;gBAG7F,IAAI,EAAE,MAAM,EACK,QAAQ,EAAE,aAAa,EAChC,MAAM,EAAE,iBAAiB,EACxB,MAAM,EAAE,MAAM;IAKzB,IAAI,KAAK,IAAI,MAAM,CAElB;IAEK,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;YA2B1C,eAAe;YAQf,uBAAuB;YAOvB,iBAAiB;YAMjB,eAAe;YAQf,SAAS;IAiBvB,OAAO,CAAC,wBAAwB;CAmCjC"}
@@ -1,8 +1,9 @@
1
1
  import { bundle as bundleFlatpak } from "@malept/flatpak-bundler";
2
- import { copyFile, toLinuxArchString } from "builder-util";
2
+ import { copyFile, toLinuxArchString, validateShellEmbeddable } from "builder-util";
3
3
  import * as path from "path";
4
4
  import { Target } from "../../core.js";
5
5
  import { getNotLocalizedLicenseFile } from "../../util/license.js";
6
+ import { shellQuote } from "./launcherScript.js";
6
7
  import { createStageDir } from "../targetUtil.js";
7
8
  import _fsExtra from "fs-extra";
8
9
  const { chmod, outputFile } = _fsExtra;
@@ -92,13 +93,17 @@ export default class FlatpakTarget extends Target {
92
93
  branch: this.options.branch,
93
94
  modules: this.options.modules,
94
95
  };
96
+ // `this.options` is `linux` deep-merged with `flatpak`, and deepAssign concatenates arrays, so the
97
+ // shared `linux.files` globs (string | FileSet | array of either) would leak into this [src, dest] tuple
98
+ // list. Read the flatpak-specific list from the raw config instead of the merged options.
99
+ const extraFiles = this.packager.config.flatpak?.files ?? [];
95
100
  const buildOptions = {
96
101
  baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,
97
102
  runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,
98
103
  sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,
99
104
  arch: flatpakArch,
100
105
  bundlePath: path.join(this.outDir, artifactName),
101
- files: [[stageDir, "/"], [appOutDir, path.join("/lib", appIdentifier)], ...(this.options.files || [])],
106
+ files: [[stageDir, "/"], [appOutDir, path.join("/lib", appIdentifier)], ...extraFiles],
102
107
  symlinks: [[path.join("/lib", appIdentifier, executableName), path.join("/bin", executableName)], ...(this.options.symlinks || [])],
103
108
  };
104
109
  return { manifest, buildOptions };
@@ -128,7 +133,12 @@ const flatpakBuilderDefaults = {
128
133
  ],
129
134
  };
130
135
  function getElectronWrapperScript(executableName, executableArgs, useWaylandFlags) {
131
- const stringifiedExecutableArgs = executableArgs?.join(" ") || "";
136
+ // executableName is interpolated into the generated POSIX wrapper script below; reject shell
137
+ // metacharacters (matches the snap and AppImage targets) so it cannot inject shell commands.
138
+ validateShellEmbeddable(executableName, "executableName");
139
+ // Single-quote each arg so embedded characters (spaces, =, quotes) are passed literally,
140
+ // consistent with the other Linux launcher entrypoints.
141
+ const stringifiedExecutableArgs = (executableArgs ?? []).map(shellQuote).join(" ");
132
142
  if (useWaylandFlags) {
133
143
  return `#!/bin/sh
134
144
 
@@ -1 +1 @@
1
- {"version":3,"file":"FlatpakTarget.js","sourceRoot":"","sources":["../../../src/targets/linux/FlatpakTarget.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleFlatpak, FlatpakBundlerBuildOptions, FlatpakManifest } from \"@malept/flatpak-bundler\"\nimport { Arch, copyFile, toLinuxArchString } from \"builder-util\"\n\nimport * as path from \"path\"\nimport { Target } from \"../../core.js\"\nimport { LinuxPackager } from \"../../linuxPackager.js\"\nimport { FlatpakOptions } from \"../../options/linuxOptions.js\"\nimport { getNotLocalizedLicenseFile } from \"../../util/license.js\"\nimport { LinuxTargetHelper } from \"./LinuxTargetHelper.js\"\nimport { createStageDir, StageDir } from \"../targetUtil.js\"\nimport { Nullish } from \"builder-util-runtime\"\nimport _fsExtra from \"fs-extra\"\nconst { chmod, outputFile } = _fsExtra\n\nexport default class FlatpakTarget extends Target {\n readonly options: FlatpakOptions = this.packager.getOptionsForTarget<FlatpakOptions>(this.name)\n\n constructor(\n name: string,\n private readonly packager: LinuxPackager,\n private helper: LinuxTargetHelper,\n readonly outDir: string\n ) {\n super(name)\n }\n\n get appId(): string {\n return filterFlatpakAppIdentifier(this.packager.appInfo.id)\n }\n\n async build(appOutDir: string, arch: Arch): Promise<any> {\n const { packager, options } = this\n const artifactName = packager.expandArtifactNamePattern(options, \"flatpak\", arch, undefined, false)\n const artifactPath = path.join(this.outDir, artifactName)\n await packager.emitArtifactBuildStarted({\n targetPresentableName: \"flatpak\",\n file: artifactPath,\n arch,\n })\n\n const stageDir = await this.prepareStageDir(arch)\n\n const { manifest, buildOptions } = this.getFlatpakBuilderOptions(appOutDir, stageDir.dir, artifactName, arch)\n await bundleFlatpak(manifest, buildOptions)\n\n await stageDir.cleanup()\n\n await packager.emitArtifactBuildCompleted({\n file: artifactPath,\n safeArtifactName: packager.computeSafeArtifactName(artifactName, \"flatpak\", arch, false),\n target: this,\n arch,\n packager,\n isWriteUpdateInfo: false,\n })\n }\n\n private async prepareStageDir(arch: Arch): Promise<StageDir> {\n const stageDir = await createStageDir(this, this.packager, arch)\n\n await Promise.all([this.createSandboxBinWrapper(stageDir), this.createDesktopFile(stageDir), this.copyLicenseFile(stageDir), this.copyIcons(stageDir)])\n\n return stageDir\n }\n\n private async createSandboxBinWrapper(stageDir: StageDir) {\n const useWaylandFlags = !!this.options.useWaylandFlags\n const electronWrapperPath = stageDir.getTempFile(path.join(\"bin\", \"electron-wrapper\"))\n await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, this.options.executableArgs, useWaylandFlags))\n await chmod(electronWrapperPath, 0o755)\n }\n\n private async createDesktopFile(stageDir: StageDir) {\n const appIdentifier = this.appId\n const desktopFile = stageDir.getTempFile(path.join(\"share\", \"applications\", `${appIdentifier}.desktop`))\n await this.helper.writeDesktopEntry(this.options, \"electron-wrapper %U\", desktopFile, { Icon: appIdentifier })\n }\n\n private async copyLicenseFile(stageDir: StageDir) {\n const licenseSrc = await getNotLocalizedLicenseFile(this.options.license, this.packager, [\"txt\", \"html\"])\n if (licenseSrc) {\n const licenseDst = stageDir.getTempFile(path.join(\"share\", \"doc\", this.appId, \"copyright\"))\n await copyFile(licenseSrc, licenseDst)\n }\n }\n\n private async copyIcons(stageDir: StageDir) {\n const icons = await this.helper.icons\n const copyIcons = icons.map(async icon => {\n if (icon.size > 512) {\n // Flatpak does not allow icons larger than 512 pixels\n return Promise.resolve()\n }\n const extWithDot = path.extname(icon.file)\n const sizeName = extWithDot === \".svg\" ? \"scalable\" : `${icon.size}x${icon.size}`\n const iconDst = stageDir.getTempFile(path.join(\"share\", \"icons\", \"hicolor\", sizeName, \"apps\", `${this.appId}${extWithDot}`))\n\n return copyFile(icon.file, iconDst)\n })\n\n await Promise.all(copyIcons)\n }\n\n private getFlatpakBuilderOptions(appOutDir: string, stageDir: string, artifactName: string, arch: Arch): { manifest: FlatpakManifest; buildOptions: FlatpakBundlerBuildOptions } {\n const appIdentifier = this.appId\n const { executableName } = this.packager\n const flatpakArch = toLinuxArchString(arch, \"flatpak\")\n\n const manifest: FlatpakManifest = {\n id: appIdentifier,\n command: \"electron-wrapper\",\n runtime: this.options.runtime || flatpakBuilderDefaults.runtime,\n runtimeVersion: this.options.runtimeVersion || flatpakBuilderDefaults.runtimeVersion,\n sdk: this.options.sdk || flatpakBuilderDefaults.sdk,\n base: this.options.base || flatpakBuilderDefaults.base,\n baseVersion: this.options.baseVersion || flatpakBuilderDefaults.baseVersion,\n finishArgs: this.options.finishArgs || flatpakBuilderDefaults.finishArgs,\n branch: this.options.branch,\n modules: this.options.modules,\n }\n\n const buildOptions: FlatpakBundlerBuildOptions = {\n baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,\n runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,\n sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,\n arch: flatpakArch as any,\n bundlePath: path.join(this.outDir, artifactName),\n files: [[stageDir, \"/\"], [appOutDir, path.join(\"/lib\", appIdentifier)], ...(this.options.files || [])],\n symlinks: [[path.join(\"/lib\", appIdentifier, executableName), path.join(\"/bin\", executableName)], ...(this.options.symlinks || [])],\n }\n\n return { manifest, buildOptions }\n }\n}\n\nconst flatpakBuilderDefaults: Omit<FlatpakManifest, \"id\" | \"command\"> = {\n runtime: \"org.freedesktop.Platform\",\n runtimeVersion: \"20.08\",\n sdk: \"org.freedesktop.Sdk\",\n base: \"org.electronjs.Electron2.BaseApp\",\n baseVersion: \"20.08\",\n finishArgs: [\n // Wayland/X11 Rendering\n \"--socket=wayland\",\n \"--socket=x11\",\n \"--share=ipc\",\n // Open GL\n \"--device=dri\",\n // Audio output\n \"--socket=pulseaudio\",\n // Read/write home directory access\n \"--filesystem=home\",\n // Allow communication with network\n \"--share=network\",\n // System notifications with libnotify\n \"--talk-name=org.freedesktop.Notifications\",\n ],\n}\n\nfunction getElectronWrapperScript(executableName: string, executableArgs: string[] | Nullish, useWaylandFlags: boolean): string {\n const stringifiedExecutableArgs = executableArgs?.join(\" \") || \"\"\n if (useWaylandFlags) {\n return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nif [ \"\\${XDG_SESSION_TYPE}\" == \"wayland\" ]; then\n zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} --enable-features=UseOzonePlatform --ozone-platform=wayland \"$@\"\nelse\n zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\nfi\n`\n }\n return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nzypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\n`\n}\n\nfunction filterFlatpakAppIdentifier(identifier: string) {\n // Remove special characters and allow only alphanumeric (A-Z,a-z,0-9), underscore (_), and period (.)\n // Flatpak documentation: https://docs.flatpak.org/en/latest/conventions.html#application-ids\n return identifier.replace(/-/g, \"_\").replace(/[^a-zA-Z0-9._]/g, \"\")\n}\n"]}
1
+ {"version":3,"file":"FlatpakTarget.js","sourceRoot":"","sources":["../../../src/targets/linux/FlatpakTarget.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundle as bundleFlatpak, FlatpakBundlerBuildOptions, FlatpakManifest } from \"@malept/flatpak-bundler\"\nimport { Arch, copyFile, toLinuxArchString, validateShellEmbeddable } from \"builder-util\"\n\nimport * as path from \"path\"\nimport { Target } from \"../../core.js\"\nimport { LinuxPackager } from \"../../linuxPackager.js\"\nimport { FlatpakOptions } from \"../../options/linuxOptions.js\"\nimport { getNotLocalizedLicenseFile } from \"../../util/license.js\"\nimport { LinuxTargetHelper } from \"./LinuxTargetHelper.js\"\nimport { shellQuote } from \"./launcherScript.js\"\nimport { createStageDir, StageDir } from \"../targetUtil.js\"\nimport { Nullish } from \"builder-util-runtime\"\nimport _fsExtra from \"fs-extra\"\nconst { chmod, outputFile } = _fsExtra\n\nexport default class FlatpakTarget extends Target {\n readonly options: FlatpakOptions = this.packager.getOptionsForTarget<FlatpakOptions>(this.name)\n\n constructor(\n name: string,\n private readonly packager: LinuxPackager,\n private helper: LinuxTargetHelper,\n readonly outDir: string\n ) {\n super(name)\n }\n\n get appId(): string {\n return filterFlatpakAppIdentifier(this.packager.appInfo.id)\n }\n\n async build(appOutDir: string, arch: Arch): Promise<any> {\n const { packager, options } = this\n const artifactName = packager.expandArtifactNamePattern(options, \"flatpak\", arch, undefined, false)\n const artifactPath = path.join(this.outDir, artifactName)\n await packager.emitArtifactBuildStarted({\n targetPresentableName: \"flatpak\",\n file: artifactPath,\n arch,\n })\n\n const stageDir = await this.prepareStageDir(arch)\n\n const { manifest, buildOptions } = this.getFlatpakBuilderOptions(appOutDir, stageDir.dir, artifactName, arch)\n await bundleFlatpak(manifest, buildOptions)\n\n await stageDir.cleanup()\n\n await packager.emitArtifactBuildCompleted({\n file: artifactPath,\n safeArtifactName: packager.computeSafeArtifactName(artifactName, \"flatpak\", arch, false),\n target: this,\n arch,\n packager,\n isWriteUpdateInfo: false,\n })\n }\n\n private async prepareStageDir(arch: Arch): Promise<StageDir> {\n const stageDir = await createStageDir(this, this.packager, arch)\n\n await Promise.all([this.createSandboxBinWrapper(stageDir), this.createDesktopFile(stageDir), this.copyLicenseFile(stageDir), this.copyIcons(stageDir)])\n\n return stageDir\n }\n\n private async createSandboxBinWrapper(stageDir: StageDir) {\n const useWaylandFlags = !!this.options.useWaylandFlags\n const electronWrapperPath = stageDir.getTempFile(path.join(\"bin\", \"electron-wrapper\"))\n await outputFile(electronWrapperPath, getElectronWrapperScript(this.packager.executableName, this.options.executableArgs, useWaylandFlags))\n await chmod(electronWrapperPath, 0o755)\n }\n\n private async createDesktopFile(stageDir: StageDir) {\n const appIdentifier = this.appId\n const desktopFile = stageDir.getTempFile(path.join(\"share\", \"applications\", `${appIdentifier}.desktop`))\n await this.helper.writeDesktopEntry(this.options, \"electron-wrapper %U\", desktopFile, { Icon: appIdentifier })\n }\n\n private async copyLicenseFile(stageDir: StageDir) {\n const licenseSrc = await getNotLocalizedLicenseFile(this.options.license, this.packager, [\"txt\", \"html\"])\n if (licenseSrc) {\n const licenseDst = stageDir.getTempFile(path.join(\"share\", \"doc\", this.appId, \"copyright\"))\n await copyFile(licenseSrc, licenseDst)\n }\n }\n\n private async copyIcons(stageDir: StageDir) {\n const icons = await this.helper.icons\n const copyIcons = icons.map(async icon => {\n if (icon.size > 512) {\n // Flatpak does not allow icons larger than 512 pixels\n return Promise.resolve()\n }\n const extWithDot = path.extname(icon.file)\n const sizeName = extWithDot === \".svg\" ? \"scalable\" : `${icon.size}x${icon.size}`\n const iconDst = stageDir.getTempFile(path.join(\"share\", \"icons\", \"hicolor\", sizeName, \"apps\", `${this.appId}${extWithDot}`))\n\n return copyFile(icon.file, iconDst)\n })\n\n await Promise.all(copyIcons)\n }\n\n private getFlatpakBuilderOptions(appOutDir: string, stageDir: string, artifactName: string, arch: Arch): { manifest: FlatpakManifest; buildOptions: FlatpakBundlerBuildOptions } {\n const appIdentifier = this.appId\n const { executableName } = this.packager\n const flatpakArch = toLinuxArchString(arch, \"flatpak\")\n\n const manifest: FlatpakManifest = {\n id: appIdentifier,\n command: \"electron-wrapper\",\n runtime: this.options.runtime || flatpakBuilderDefaults.runtime,\n runtimeVersion: this.options.runtimeVersion || flatpakBuilderDefaults.runtimeVersion,\n sdk: this.options.sdk || flatpakBuilderDefaults.sdk,\n base: this.options.base || flatpakBuilderDefaults.base,\n baseVersion: this.options.baseVersion || flatpakBuilderDefaults.baseVersion,\n finishArgs: this.options.finishArgs || flatpakBuilderDefaults.finishArgs,\n branch: this.options.branch,\n modules: this.options.modules,\n }\n\n // `this.options` is `linux` deep-merged with `flatpak`, and deepAssign concatenates arrays, so the\n // shared `linux.files` globs (string | FileSet | array of either) would leak into this [src, dest] tuple\n // list. Read the flatpak-specific list from the raw config instead of the merged options.\n const extraFiles = this.packager.config.flatpak?.files ?? []\n\n const buildOptions: FlatpakBundlerBuildOptions = {\n baseFlatpakref: `app/${manifest.base}/${flatpakArch}/${manifest.baseVersion}`,\n runtimeFlatpakref: `runtime/${manifest.runtime}/${flatpakArch}/${manifest.runtimeVersion}`,\n sdkFlatpakref: `runtime/${manifest.sdk}/${flatpakArch}/${manifest.runtimeVersion}`,\n arch: flatpakArch as any,\n bundlePath: path.join(this.outDir, artifactName),\n files: [[stageDir, \"/\"], [appOutDir, path.join(\"/lib\", appIdentifier)], ...extraFiles],\n symlinks: [[path.join(\"/lib\", appIdentifier, executableName), path.join(\"/bin\", executableName)], ...(this.options.symlinks || [])],\n }\n\n return { manifest, buildOptions }\n }\n}\n\nconst flatpakBuilderDefaults: Omit<FlatpakManifest, \"id\" | \"command\"> = {\n runtime: \"org.freedesktop.Platform\",\n runtimeVersion: \"20.08\",\n sdk: \"org.freedesktop.Sdk\",\n base: \"org.electronjs.Electron2.BaseApp\",\n baseVersion: \"20.08\",\n finishArgs: [\n // Wayland/X11 Rendering\n \"--socket=wayland\",\n \"--socket=x11\",\n \"--share=ipc\",\n // Open GL\n \"--device=dri\",\n // Audio output\n \"--socket=pulseaudio\",\n // Read/write home directory access\n \"--filesystem=home\",\n // Allow communication with network\n \"--share=network\",\n // System notifications with libnotify\n \"--talk-name=org.freedesktop.Notifications\",\n ],\n}\n\nfunction getElectronWrapperScript(executableName: string, executableArgs: string[] | Nullish, useWaylandFlags: boolean): string {\n // executableName is interpolated into the generated POSIX wrapper script below; reject shell\n // metacharacters (matches the snap and AppImage targets) so it cannot inject shell commands.\n validateShellEmbeddable(executableName, \"executableName\")\n // Single-quote each arg so embedded characters (spaces, =, quotes) are passed literally,\n // consistent with the other Linux launcher entrypoints.\n const stringifiedExecutableArgs = (executableArgs ?? []).map(shellQuote).join(\" \")\n if (useWaylandFlags) {\n return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nif [ \"\\${XDG_SESSION_TYPE}\" == \"wayland\" ]; then\n zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} --enable-features=UseOzonePlatform --ozone-platform=wayland \"$@\"\nelse\n zypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\nfi\n`\n }\n return `#!/bin/sh\n\nexport TMPDIR=\"$XDG_RUNTIME_DIR/app/$FLATPAK_ID\"\n\nzypak-wrapper \"${executableName}\" ${stringifiedExecutableArgs} \"$@\"\n`\n}\n\nfunction filterFlatpakAppIdentifier(identifier: string) {\n // Remove special characters and allow only alphanumeric (A-Z,a-z,0-9), underscore (_), and period (.)\n // Flatpak documentation: https://docs.flatpak.org/en/latest/conventions.html#application-ids\n return identifier.replace(/-/g, \"_\").replace(/[^a-zA-Z0-9._]/g, \"\")\n}\n"]}
@@ -14,8 +14,22 @@ export default class FpmTarget extends Target {
14
14
  checkOptions(): Promise<any>;
15
15
  private computeFpmMetaInfoOptions;
16
16
  build(appOutDir: string, arch: Arch): Promise<any>;
17
+ /**
18
+ * Generate the launcher entrypoint script installed alongside the app binary. The launcher execs
19
+ * the real binary with the configured `executableArgs` (single-quoted) and forwards `"$@"` so the
20
+ * desktop launcher's field-code expansions (e.g. opened files/URLs) still reach the app.
21
+ */
22
+ private createLauncherScript;
17
23
  private executeFpm;
24
+ get writesUpdateInfo(): boolean;
18
25
  private supportsAutoUpdate;
26
+ /**
27
+ * Expand the `"default"` keyword in a user-provided `depends` array to the target's default
28
+ * depends list, so extras can be appended without repeating (and having to keep in sync) the
29
+ * defaults — same convention as the snap target's `plugs`/`stagePackages`/`buildPackages`.
30
+ * The result is deduplicated while preserving order.
31
+ */
32
+ private expandDependsDefaults;
19
33
  private getDefaultDepends;
20
34
  private getDefaultRecommends;
21
35
  private configureTargetSpecificOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"FpmTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/linux/FpmTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA6H,MAAM,cAAc,CAAA;AAQ9J,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAc,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAUtF,OAAO,EAAiB,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAgBzE,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,MAAM;IAOzC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM;IARzB,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAA2E;IAEvH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;gBAGhD,IAAI,EAAE,MAAM,EACK,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,iBAAiB,EACjC,MAAM,EAAE,MAAM;YAOX,aAAa;IAoD3B,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC;YAId,yBAAyB;IA+BjC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;YAoL1C,UAAU;IAmDxB,OAAO,CAAC,kBAAkB;IAI1B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,8BAA8B;CAWvC"}
1
+ {"version":3,"file":"FpmTarget.d.ts","sourceRoot":"","sources":["../../../src/targets/linux/FpmTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAuI,MAAM,cAAc,CAAA;AAQxK,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAc,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAWtF,OAAO,EAAiB,iBAAiB,EAAwB,MAAM,wBAAwB,CAAA;AAgB/F,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,MAAM;IAOzC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM;IARzB,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAA2E;IAEvH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;gBAGhD,IAAI,EAAE,MAAM,EACK,QAAQ,EAAE,aAAa,EACvB,MAAM,EAAE,iBAAiB,EACjC,MAAM,EAAE,MAAM;YAOX,aAAa;IAoD3B,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC;YAId,yBAAyB;IA+BjC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC;IAwMxD;;;;OAIG;YACW,oBAAoB;YAcpB,UAAU;IAoDxB,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,OAAO,CAAC,kBAAkB;IAI1B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,8BAA8B;CAWvC"}