-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: move doGetBin implementation to app-builder
- Loading branch information
Showing
9 changed files
with
178 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,45 @@ | ||
| import { path7za } from "7zip-bin" | ||
| import { appBuilderPath } from "app-builder-bin" | ||
| import { emptyDir, rename, unlink } from "fs-extra-p" | ||
| import * as path from "path" | ||
| import { getTempName } from "temp-file" | ||
| import { statOrNull } from "./fs" | ||
| import { debug7zArgs, getCacheDirectory, log, spawn } from "./util" | ||
| import { spawn } from "./util" | ||
|
|
||
| const versionToPromise = new Map<string, Promise<string>>() | ||
|
|
||
| export function download(url: string, output: string, checksum?: string | null): Promise<void> { | ||
| const args = ["download", "--url", url, "--output", output] | ||
| if (checksum != null) { | ||
| args.push("--sha512", checksum) | ||
| } | ||
| return spawn(appBuilderPath, args) | ||
| } | ||
|
|
||
| export function getBinFromGithub(name: string, version: string, checksum: string): Promise<string> { | ||
| const dirName = `${name}-${version}` | ||
| return getBin(name, dirName, `https://github.com/electron-userland/electron-builder-binaries/releases/download/${dirName}/${dirName}.7z`, checksum) | ||
| return getBin(dirName, `https://github.com/electron-userland/electron-builder-binaries/releases/download/${dirName}/${dirName}.7z`, checksum) | ||
| } | ||
|
|
||
| export function getBin(name: string, dirName: string, url: string, checksum: string): Promise<string> { | ||
| let promise = versionToPromise.get(dirName) | ||
| export function getBin(name: string, url: string, checksum: string): Promise<string> { | ||
| let promise = versionToPromise.get(name) | ||
| // if rejected, we will try to download again | ||
| if (promise != null) { | ||
| return promise | ||
| } | ||
|
|
||
| promise = doGetBin(name, dirName, url, checksum) | ||
| versionToPromise.set(dirName, promise) | ||
| promise = doGetBin(name, url, checksum) | ||
| versionToPromise.set(name, promise) | ||
| return promise | ||
| } | ||
|
|
||
| export function download(url: string, output: string, checksum?: string | null): Promise<void> { | ||
| const args = ["download", "--url", url, "--output", output] | ||
| function doGetBin(name: string, url: string, checksum: string): Promise<string> { | ||
| const args = ["download-artifact", "--url", url, "--name", name] | ||
| if (checksum != null) { | ||
| args.push("--sha512", checksum) | ||
| } | ||
| return spawn(appBuilderPath, args) | ||
| } | ||
|
|
||
| // we cache in the global location - in the home dir, not in the node_modules/.cache (https://www.npmjs.com/package/find-cache-dir) because | ||
| // * don't need to find node_modules | ||
| // * don't pollute user project dir (important in case of 1-package.json project structure) | ||
| // * simplify/speed-up tests (don't download fpm for each test project) | ||
| async function doGetBin(name: string, dirName: string, url: string, checksum: string): Promise<string> { | ||
| const cachePath = path.join(getCacheDirectory(), name) | ||
| const dirPath = path.join(cachePath, dirName) | ||
|
|
||
| const logFlags = {path: dirPath} | ||
|
|
||
| const dirStat = await statOrNull(dirPath) | ||
| if (dirStat != null && dirStat.isDirectory()) { | ||
| log.debug(logFlags, "found existing") | ||
| return dirPath | ||
| } | ||
|
|
||
| log.info({...logFlags, url}, "downloading") | ||
|
|
||
| // 7z cannot be extracted from the input stream, temp file is required | ||
| const tempUnpackDir = path.join(cachePath, getTempName()) | ||
| const archiveName = `${tempUnpackDir}.7z` | ||
| // 7z doesn't create out dir, so, we don't create dir in parallel to download - dir creation will create parent dirs for archive file also | ||
| await emptyDir(tempUnpackDir) | ||
| await download(url, archiveName, checksum) | ||
| await spawn(path7za, debug7zArgs("x").concat(archiveName, `-o${tempUnpackDir}`), { | ||
| cwd: cachePath, | ||
| return spawn(appBuilderPath, args, { | ||
| env: { | ||
| ...process.env, | ||
| SZA_PATH: path7za, | ||
| }, | ||
| stdio: ["ignore", "pipe", "inherit"] | ||
| }) | ||
|
|
||
| await Promise.all([ | ||
| rename(tempUnpackDir, dirPath) | ||
| .catch(e => log.debug({...logFlags, tempUnpackDir, e}, `cannot move downloaded into final location (another process downloaded faster?)`)), | ||
| unlink(archiveName), | ||
| ]) | ||
|
|
||
| log.debug(logFlags, `downloaded`) | ||
| return dirPath | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.