dugite 3.0.0-rc0 → 3.0.0-rc10

package/build/lib/ignore-closed-input-stream.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ignoreClosedInputStream = void 0;
+/**
+ * Prevent errors originating from the stdin stream related
+ * to the child process closing the pipe from bubbling up and
+ * causing an unhandled exception when no error handler is
+ * attached to the input stream.
+ *
+ * The common scenario where this happens is if the consumer
+ * is writing data to the stdin stream of a child process and
+ * the child process for one reason or another decides to either
+ * terminate or simply close its standard input. Imagine this
+ * scenario
+ *
+ *  cat /dev/zero | head -c 1
+ *
+ * The 'head' command would close its standard input (by terminating)
+ * the moment it has read one byte. In the case of Git this could
+ * happen if you for example pass badly formed input to apply-patch.
+ *
+ * Since consumers of dugite using the `exec` api are unable to get
+ * a hold of the stream until after we've written data to it they're
+ * unable to fix it themselves so we'll just go ahead and ignore the
+ * error for them. By supressing the stream error we can pick up on
+ * the real error when the process exits when we parse the exit code
+ * and the standard error.
+ *
+ * See https://github.com/desktop/desktop/pull/4027#issuecomment-366213276
+ */
+function ignoreClosedInputStream({ stdin }) {
+    // If Node fails to spawn due to a runtime error (EACCESS, EAGAIN, etc)
+    // it will not setup the stdio streams, see
+    // https://github.com/nodejs/node/blob/v10.16.0/lib/internal/child_process.js#L342-L354
+    // The error itself will be emitted asynchronously but we're still in
+    // the synchronous path so if we attempts to call `.on` on `.stdin`
+    // (which is undefined) that error would be thrown before the underlying
+    // error.
+    if (!stdin) {
+        return;
+    }
+    stdin.on('error', err => {
+        const code = 'code' in err && typeof err.code === 'string' ? err.code : undefined;
+        // Is the error one that we'd expect from the input stream being
+        // closed, i.e. EPIPE on macOS and EOF on Windows. We've also
+        // seen ECONNRESET failures on Linux hosts so let's throw that in
+        // there for good measure.
+        if (code === 'EPIPE' || code === 'EOF' || code === 'ECONNRESET') {
+            return;
+        }
+        // Nope, this is something else. Are there any other error listeners
+        // attached than us? If not we'll have to mimic the behavior of
+        // EventEmitter.
+        //
+        // See https://nodejs.org/api/errors.html#errors_error_propagation_and_interception
+        //
+        // "For all EventEmitter objects, if an 'error' event handler is not
+        //  provided, the error will be thrown"
+        if (stdin.listeners('error').length <= 1) {
+            throw err;
+        }
+    });
+}
+exports.ignoreClosedInputStream = ignoreClosedInputStream;
+//# sourceMappingURL=ignore-closed-input-stream.js.map

package/build/lib/ignore-closed-input-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ignore-closed-input-stream.js","sourceRoot":"","sources":["../../lib/ignore-closed-input-stream.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,uBAAuB,CAAC,EAAE,KAAK,EAAgB;IAC7D,uEAAuE;IACvE,2CAA2C;IAC3C,uFAAuF;IACvF,qEAAqE;IACrE,mEAAmE;IACnE,wEAAwE;IACxE,SAAS;IACT,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAM;IACR,CAAC;IAED,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE;QACtB,MAAM,IAAI,GACR,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAA;QAEtE,gEAAgE;QAChE,6DAA6D;QAC7D,iEAAiE;QACjE,0BAA0B;QAC1B,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YAChE,OAAM;QACR,CAAC;QAED,oEAAoE;QACpE,+DAA+D;QAC/D,gBAAgB;QAChB,EAAE;QACF,mFAAmF;QACnF,EAAE;QACF,oEAAoE;QACpE,uCAAuC;QACvC,IAAI,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACzC,MAAM,GAAG,CAAA;QACX,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AApCD,0DAoCC"}

package/build/lib/index.d.ts

@@ -1,3 +1,7 @@
-export { GitProcess, IGitResult, IGitExecutionOptions, IGitTask, GitTaskCancelResult, } from './git-process';
-export { GitError, RepositoryDoesNotExistErrorCode, GitNotFoundErrorCode, } from './errors';
+export * from './exec';
+export * from './spawn';
+export * from './parse-error';
+export * from './parse-bad-config-value-error-info';
+export { GitError, ExecError } from './errors';
 export * from './git-environment';
+export * from './ignore-closed-input-stream';

package/build/lib/index.js

@@ -14,13 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GitNotFoundErrorCode = exports.RepositoryDoesNotExistErrorCode = exports.GitError = exports.GitTaskCancelResult = exports.GitProcess = void 0;
-var git_process_1 = require("./git-process");
-Object.defineProperty(exports, "GitProcess", { enumerable: true, get: function () { return git_process_1.GitProcess; } });
-Object.defineProperty(exports, "GitTaskCancelResult", { enumerable: true, get: function () { return git_process_1.GitTaskCancelResult; } });
+exports.ExecError = exports.GitError = void 0;
+__exportStar(require("./exec"), exports);
+__exportStar(require("./spawn"), exports);
+__exportStar(require("./parse-error"), exports);
+__exportStar(require("./parse-bad-config-value-error-info"), exports);
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "GitError", { enumerable: true, get: function () { return errors_1.GitError; } });
-Object.defineProperty(exports, "RepositoryDoesNotExistErrorCode", { enumerable: true, get: function () { return errors_1.RepositoryDoesNotExistErrorCode; } });
-Object.defineProperty(exports, "GitNotFoundErrorCode", { enumerable: true, get: function () { return errors_1.GitNotFoundErrorCode; } });
+Object.defineProperty(exports, "ExecError", { enumerable: true, get: function () { return errors_1.ExecError; } });
 __exportStar(require("./git-environment"), exports);
+__exportStar(require("./ignore-closed-input-stream"), exports);
 //# sourceMappingURL=index.js.map

package/build/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAMsB;AALpB,yGAAA,UAAU,OAAA;AAIV,kHAAA,mBAAmB,OAAA;AAErB,mCAIiB;AAHf,kGAAA,QAAQ,OAAA;AACR,yHAAA,+BAA+B,OAAA;AAC/B,8GAAA,oBAAoB,OAAA;AAEtB,oDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,0CAAuB;AACvB,gDAA6B;AAC7B,sEAAmD;AACnD,mCAA8C;AAArC,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAC5B,oDAAiC;AACjC,+DAA4C"}

package/build/lib/parse-bad-config-value-error-info.d.ts

@@ -0,0 +1,4 @@
+export declare function parseBadConfigValueErrorInfo(stderr: string): {
+    key: string;
+    value: string;
+} | null;

package/build/lib/parse-bad-config-value-error-info.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBadConfigValueErrorInfo = void 0;
+const errors_1 = require("./errors");
+function parseBadConfigValueErrorInfo(stderr) {
+    const errorEntry = Object.entries(errors_1.GitErrorRegexes).find(([_, v]) => v === errors_1.GitError.BadConfigValue);
+    if (errorEntry === undefined) {
+        return null;
+    }
+    const m = stderr.match(errorEntry[0]);
+    if (m === null) {
+        return null;
+    }
+    if (!m[1] || !m[2]) {
+        return null;
+    }
+    return { key: m[2], value: m[1] };
+}
+exports.parseBadConfigValueErrorInfo = parseBadConfigValueErrorInfo;
+//# sourceMappingURL=parse-bad-config-value-error-info.js.map

package/build/lib/parse-bad-config-value-error-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-bad-config-value-error-info.js","sourceRoot":"","sources":["../../lib/parse-bad-config-value-error-info.ts"],"names":[],"mappings":";;;AAAA,qCAAoD;AAEpD,SAAgB,4BAA4B,CAC1C,MAAc;IAEd,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,wBAAe,CAAC,CAAC,IAAI,CACrD,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,iBAAQ,CAAC,cAAc,CAC1C,CAAA;IAED,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;IAErC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;AACnC,CAAC;AAtBD,oEAsBC"}

package/build/lib/parse-error.d.ts

@@ -0,0 +1,2 @@
+/** Try to parse an error type from stderr. */
+export declare const parseError: (stderr: string) => import("./errors").GitError | null;

package/build/lib/parse-error.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseError = void 0;
+const errors_1 = require("./errors");
+/** Try to parse an error type from stderr. */
+const parseError = (stderr) => Object.entries(errors_1.GitErrorRegexes).find(([re]) => stderr.match(re))?.[1] ?? null;
+exports.parseError = parseError;
+//# sourceMappingURL=parse-error.js.map

package/build/lib/parse-error.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-error.js","sourceRoot":"","sources":["../../lib/parse-error.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,8CAA8C;AACvC,MAAM,UAAU,GAAG,CAAC,MAAc,EAAE,EAAE,CAC3C,MAAM,CAAC,OAAO,CAAC,wBAAe,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAA;AADlE,QAAA,UAAU,cACwD"}

package/build/lib/spawn.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="node" />
+/**
+ * A set of configuration options that can be passed when
+ * executing a streaming Git command.
+ */
+export interface IGitSpawnOptions {
+    /**
+     * An optional collection of key-value pairs which will be
+     * set as environment variables before executing the git
+     * process.
+     */
+    readonly env?: Record<string, string | undefined>;
+}
+/**
+ * Execute a command and interact with the process outputs directly.
+ *
+ * The returned promise will reject when the git executable fails to launch,
+ * in which case the thrown Error will have a string `code` property. See
+ * `errors.ts` for some of the known error codes.
+ */
+export declare function spawn(args: string[], path: string, opts?: IGitSpawnOptions): import("child_process").ChildProcessWithoutNullStreams;

package/build/lib/spawn.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spawn = void 0;
+const ignore_closed_input_stream_1 = require("./ignore-closed-input-stream");
+const git_environment_1 = require("./git-environment");
+const child_process_1 = require("child_process");
+/**
+ * Execute a command and interact with the process outputs directly.
+ *
+ * The returned promise will reject when the git executable fails to launch,
+ * in which case the thrown Error will have a string `code` property. See
+ * `errors.ts` for some of the known error codes.
+ */
+function spawn(args, path, opts) {
+    const { env, gitLocation } = (0, git_environment_1.setupEnvironment)(opts?.env ?? {});
+    const spawnedProcess = (0, child_process_1.spawn)(gitLocation, args, { env, cwd: path });
+    (0, ignore_closed_input_stream_1.ignoreClosedInputStream)(spawnedProcess);
+    return spawnedProcess;
+}
+exports.spawn = spawn;
+//# sourceMappingURL=spawn.js.map

package/build/lib/spawn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../lib/spawn.ts"],"names":[],"mappings":";;;AAAA,6EAAsE;AACtE,uDAAoD;AACpD,iDAA+C;AAe/C;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,IAAc,EAAE,IAAY,EAAE,IAAuB;IACzE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAA,kCAAgB,EAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;IAC9D,MAAM,cAAc,GAAG,IAAA,qBAAM,EAAC,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAA;IAEpE,IAAA,oDAAuB,EAAC,cAAc,CAAC,CAAA;IAEvC,OAAO,cAAc,CAAA;AACvB,CAAC;AAPD,sBAOC"}

package/package.json

@@ -1,26 +1,23 @@
 {
   "name": "dugite",
-  "version": "3.0.0-rc0",
+  "version": "3.0.0-rc10",
   "description": "Elegant bindings for Git",
   "main": "./build/lib/index.js",
   "typings": "./build/lib/index.d.ts",
   "scripts": {
-    "clean": "rimraf build",
+    "clean": "node script/clean.js",
     "build": "yarn clean && tsc -p ./tsconfig.json && tsc -p ./examples/tsconfig.json",
     "prepack": "yarn build && yarn test",
     "postpublish": "git push --follow-tags",
-    "test": "yarn test:fast && yarn test:slow && yarn test:external",
-    "test:fast": "cross-env LOCAL_GIT_DIRECTORY=./git/ jest --runInBand --silent --config ./jest.fast.config.js",
-    "test:slow": "cross-env LOCAL_GIT_DIRECTORY=./git/ jest --runInBand --silent --config ./jest.slow.config.js",
-    "test:external": "jest --runInBand --silent --config ./jest.external.config.js",
+    "test": "node script/test.mjs",
     "download-git": "node ./script/download-git.js",
     "postinstall": "node ./script/download-git.js",
-    "prettify": "prettier \"{examples,lib,script,test}/**/*.ts\" --write",
-    "is-it-pretty": "prettier --check \"{examples,lib,script,test}/**/*.ts\"",
+    "prettify": "prettier \"{examples,lib,script,test}/**/*.{ts,js,mjs}\" --write",
+    "is-it-pretty": "prettier \"{examples,lib,script,test}/**/*.{ts,js,mjs}\" --check",
     "update-embedded-git": "node ./script/update-embedded-git.js"
   },
   "engines": {
-    "node": ">= 18"
+    "node": ">= 20"
   },
   "repository": {
     "type": "git",
@@ -34,21 +31,14 @@
   "homepage": "https://github.com/desktop/dugite#readme",
   "dependencies": {
     "progress": "^2.0.3",
-    "tar": "^6.1.11"
+    "tar-stream": "^3.1.7"
   },
   "devDependencies": {
-    "@types/jest": "^28.1.7",
-    "@types/node": "18",
+    "@types/node": "20",
     "@types/progress": "^2.0.1",
-    "@types/rimraf": "2.0.2",
-    "@types/tar": "^6.1.2",
-    "cross-env": "^5.2.0",
-    "find-git-exec": "^0.0.4",
-    "jest": "^28.1.3",
-    "prettier": "^2.7.1",
-    "rimraf": "^2.5.4",
-    "temp": "^0.9.0",
-    "ts-jest": "^28.0.8",
+    "node-test-github-reporter": "^1.2.0",
+    "prettier": "^3.3.1",
+    "tsx": "^4.10.5",
     "typescript": "^5.4.5"
   }
 }

package/script/clean.js

@@ -0,0 +1,6 @@
+const { rm } = require('fs/promises')
+const { join } = require('path')
+
+rm(join(__dirname, '..', 'build'), { recursive: true, force: true }).catch(
+  console.error
+)

package/script/config.js

@@ -11,22 +11,16 @@ function getConfig() {
     source: '',
     checksum: '',
     fileName: '',
-    tempFile: ''
+    tempFile: '',
   }
 
   // Possible values are ‘x64’, ‘arm’, ‘arm64’, ‘s390’, ‘s390x’, ‘mipsel’, ‘ia32’, ‘mips’, ‘ppc’ and ‘ppc64’
-  let arch = os.arch();
+  let arch = os.arch()
 
   if (process.env.npm_config_arch) {
     // If a specific npm_config_arch is set, we use that one instead of the OS arch (to support cross compilation)
-    console.log('npm_config_arch detected: ' + process.env.npm_config_arch);
-    arch = process.env.npm_config_arch;
-  }
-
-  if (process.platform === 'win32' && arch === 'arm64') {
-    // Use the Dugite Native ia32 package for Windows arm64 (arm64 can run 32-bit code through emulation)
-    console.log('Downloading 32-bit Dugite Native for Windows arm64');
-    arch = 'ia32';
+    console.log('npm_config_arch detected: ' + process.env.npm_config_arch)
+    arch = process.env.npm_config_arch
   }
 
   const key = `${process.platform}-${arch}`
@@ -37,7 +31,9 @@ function getConfig() {
     config.checksum = entry.checksum
     config.source = entry.url
   } else {
-    console.log(`No embedded Git found for ${process.platform} and architecture ${arch}`)
+    console.log(
+      `No embedded Git found for ${process.platform} and architecture ${arch}`
+    )
   }
 
   if (config.source !== '') {

package/script/download-git.js

@@ -1,132 +1,131 @@
-const fs = require('fs')
-
 const ProgressBar = require('progress')
-const tar = require('tar')
-const https = require('https')
 const { createHash } = require('crypto')
-const { rm, rmSync, mkdir, createReadStream, createWriteStream, existsSync } = require('fs')
+const { createReadStream, createWriteStream } = require('fs')
+const { rm, mkdir, access, symlink } = require('fs/promises')
+const { extract } = require('tar-stream')
+const { createGunzip } = require('zlib')
+const { join } = require('path')
+const assert = require('node:assert')
+/**
+ * Returns a value indicating whether or not the provided path exists (as in
+ * whether it's visible to the current process or not).
+ */
+const pathExists = path =>
+  access(path).then(
+    () => true,
+    () => false
+  )
 
-const config = require('./config')()
+const { Readable } = require('stream')
 
-const verifyFile = function(file, callback) {
-  const h = createHash('sha256').on('finish', () => {
-    const hash = h.digest('hex')
-    const match = hash === config.checksum
-    if (!match) {
-      console.log(`Validation failed. Expected '${config.checksum}' but got '${hash}'`)
-    }
-    callback(match)
-  })
+const config = require('./config')()
 
-  createReadStream(file).pipe(h)
-}
+const verifyFile = function (file, callback) {
+  return new Promise((resolve, reject) => {
+    const h = createHash('sha256')
+      .on('error', reject)
+      .on('finish', () => {
+        const hash = h.digest('hex')
+        if (hash !== config.checksum) {
+          reject(
+            new Error(
+              `Validation failed. Expected '${config.checksum}' but got '${hash}'`
+            )
+          )
+        } else {
+          resolve()
+        }
+      })
 
-const unpackFile = function(file) {
-  tar.x({ cwd: config.outputPath, file }).catch(e => {
-    console.log('Unable to extract archive, aborting...', error)
-    process.exit(1)
+    createReadStream(file).pipe(h).on('error', reject)
   })
 }
 
-const downloadAndUnpack = (url, isFollowingRedirect) => {
-  if (!isFollowingRedirect) {
-    console.log(`Downloading Git from: ${url}`)
-  }
+const unpackFile = file =>
+  new Promise((resolve, reject) => {
+    createReadStream(file)
+      .pipe(new createGunzip())
+      .pipe(extract())
+      .on('entry', ({ type, name, mode, linkname }, stream, next) => {
+        if (name.includes('..')) {
+          throw new Error(`invalid file name: ${name}`)
+        }
+        const p = join(config.outputPath, name)
+        if (type === 'file') {
+          stream.pipe(createWriteStream(p, { mode })).on('finish', next)
+        } else if (type === 'directory') {
+          mkdir(p).then(next)
+        } else if (type === 'symlink') {
+          symlink(linkname, p).then(next)
+        } else {
+          throw new Error(`unknown file type: ${type}`)
+        }
+      })
+      .on('error', reject)
+      .on('finish', resolve)
+  })
 
-  const options = {
+const downloadAndUnpack = async url => {
+  const res = await fetch(url, {
     headers: {
       Accept: 'application/octet-stream',
-      'User-Agent': 'dugite'
+      'User-Agent': 'dugite',
     },
-    secureProtocol: 'TLSv1_2_method'
-  }
-
-  const req = https.get(url, options)
-
-  req.on('error', function(error) {
-    if (error.code === 'ETIMEDOUT') {
-      console.log(
-        `A timeout has occurred while downloading '${url}' - check ` +
-          `your internet connection and try again. If you are using a proxy, ` +
-          `make sure that the HTTP_PROXY and HTTPS_PROXY environment variables are set.`,
-        error
-      )
-    } else {
-      console.log(`Error raised while downloading ${url}`, error)
-    }
+  }).catch(e => {
+    console.log('Unable to download archive, aborting...', e)
     process.exit(1)
   })
 
-  req.on('response', function(res) {
-    if ([301, 302].includes(res.statusCode) && res.headers['location']) {
-      downloadAndUnpack(res.headers.location, true)
-      return
-    }
-
-    if (res.statusCode !== 200) {
-      console.log(`Non-200 response returned from ${url} - (${res.statusCode})`)
-      process.exit(1)
-    }
-
-    const len = parseInt(res.headers['content-length'], 10)
+  if (!res.ok) {
+    console.log(`Got ${res.status} trying to download archive, aborting...`)
+    process.exit(1)
+  }
 
-    const bar = new ProgressBar('Downloading Git [:bar] :percent :etas', {
-      complete: '=',
-      incomplete: ' ',
-      width: 50,
-      total: len
-    })
+  const len = parseInt(res.headers.get('content-length'), 10)
 
-    res.pipe(createWriteStream(config.tempFile))
+  const bar = new ProgressBar('Downloading Git [:bar] :percent :etas', {
+    complete: '=',
+    incomplete: ' ',
+    width: 50,
+    total: len,
+  })
 
-    res.on('data', c => bar.tick(c.length))
-    res.on('end', function() {
-      verifyFile(config.tempFile, valid => {
-        if (valid) {
-          unpackFile(config.tempFile)
-        } else {
-          console.log(`checksum verification failed, refusing to unpack...`)
-          process.exit(1)
-        }
-      })
-    })
+  await new Promise((resolve, reject) => {
+    Readable.fromWeb(res.body)
+      .on('data', c => bar.tick(c.length))
+      .pipe(createWriteStream(config.tempFile))
+      .on('error', reject)
+      .on('finish', resolve)
   })
+  await verifyFile(config.tempFile)
+  await unpackFile(config.tempFile)
 }
 
-if (config.source === '') {
-  console.log(
-    `Skipping downloading embedded Git as platform '${process.platform}' is not supported.`
-  )
-  console.log(`To learn more about using dugite with a system Git: https://git.io/vF5oj`)
-  process.exit(0)
-}
+;(async function run() {
+  if (config.source === '') {
+    console.log(
+      `Skipping downloading embedded Git as platform '${process.platform}' is not supported.`
+    )
+    console.log(
+      `To learn more about using dugite with a system Git: https://git.io/vF5oj`
+    )
+    process.exit(0)
+  }
 
-rm(config.outputPath, { recursive: true, force: true }, error => {
-  if (error) {
+  await rm(config.outputPath, { recursive: true, force: true }).catch(error => {
     console.log(`Unable to clean directory at ${config.outputPath}`, error)
     process.exit(1)
-  }
-
-  mkdir(config.outputPath, { recursive: true }, function(error) {
-    if (error) {
-      console.log(`Unable to create directory at ${config.outputPath}`, error)
-      process.exit(1)
-    }
-
-    const tempFile = config.tempFile
+  })
 
-    if (existsSync(tempFile)) {
-      verifyFile(tempFile, valid => {
-        if (valid) {
-          unpackFile(tempFile)
-        } else {
-          rmSync(tempFile)
-          downloadAndUnpack(config.source)
-        }
-      })
-      return
-    }
+  const tempFile = config.tempFile
 
-    downloadAndUnpack(config.source)
-  })
-})
+  if (await pathExists(tempFile)) {
+    await verifyFile(tempFile).catch(e => {
+      console.log('Unable to verify cached archive, removing...', e)
+      return rm(tempFile)
+    })
+    await unpackFile(tempFile)
+  } else {
+    await downloadAndUnpack(config.source)
+  }
+})()

package/script/embedded-git.json

@@ -1,42 +1,47 @@
 {
   "win32-x64": {
-    "name": "dugite-native-v2.43.4-1074931-windows-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-windows-x64.tar.gz",
-    "checksum": "a1ce9ad3243a44b7b4b86056bfbc2238514faaaa8fad5da12d4483491347aace"
+    "name": "dugite-native-v2.47.1-8d348e6-windows-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-windows-x64.tar.gz",
+    "checksum": "bca0fb95b136ec4227452ee603eb5b8bf5213f9a8c99b72a617db654046c17c7"
   },
   "win32-ia32": {
-    "name": "dugite-native-v2.43.4-1074931-windows-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-windows-x86.tar.gz",
-    "checksum": "6edd41d81bee1ad11dfa9db84bce74afafa59edd27fcd8cf836b761193a30a59"
+    "name": "dugite-native-v2.47.1-8d348e6-windows-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-windows-x86.tar.gz",
+    "checksum": "f938bc2ef0ae702479b53bb0838b5cfeea14d35c4215757e1a6df95dea52cad4"
+  },
+  "win32-arm64": {
+    "name": "dugite-native-v2.47.1-8d348e6-windows-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-windows-arm64.tar.gz",
+    "checksum": "4a3f4d77f3fec67b1c3235a6a82c3e259eb8eb4babd868da5a3e5d5ac309c590"
   },
   "darwin-x64": {
-    "name": "dugite-native-v2.43.4-1074931-macOS-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-macOS-x64.tar.gz",
-    "checksum": "a7e2e4009ad119869792131b54475d3691b11a9ca2e66222be8232a9f7e323ab"
+    "name": "dugite-native-v2.47.1-8d348e6-macOS-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-macOS-x64.tar.gz",
+    "checksum": "475040cf643a3962d557aad9b91e861eace6d6bb28c01bb54535544c43e19459"
   },
   "darwin-arm64": {
-    "name": "dugite-native-v2.43.4-1074931-macOS-arm64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-macOS-arm64.tar.gz",
-    "checksum": "bc385fa42d5b01513b5c9da6ee04a4868f30b60a42bd144b5ab8b993780aef7f"
+    "name": "dugite-native-v2.47.1-8d348e6-macOS-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-macOS-arm64.tar.gz",
+    "checksum": "451dc41889a4deef06e2d3495364f74f6416bda8234b876144f5c254874b306d"
   },
   "linux-x64": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-x64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-x64.tar.gz",
-    "checksum": "fbff97763ca9cedbf87a196015f4dbffaa102681fd25103f99c40a7d561b8338"
+    "name": "dugite-native-v2.47.1-8d348e6-ubuntu-x64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-ubuntu-x64.tar.gz",
+    "checksum": "0e6b3a0776e92ddef3a3fdc966d960fbf150b3f5bb74632576c0bdfbcb638042"
   },
   "linux-ia32": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-x86.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-x86.tar.gz",
-    "checksum": "458e00694dbc94a691e25c67546d93c5df58877c805d300a1d6c8ad440c56aaf"
+    "name": "dugite-native-v2.47.1-8d348e6-ubuntu-x86.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-ubuntu-x86.tar.gz",
+    "checksum": "7263bed583503808a11a5e3b5e259e63fe66e08d8c8c3934bef3bc6ca42f1e2e"
   },
   "linux-arm": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-arm.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-arm.tar.gz",
-    "checksum": "03e25333ce52cccf32e6b4335978f4cd53ada2ad06dd3b424132edd9f5668357"
+    "name": "dugite-native-v2.47.1-8d348e6-ubuntu-arm.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-ubuntu-arm.tar.gz",
+    "checksum": "a89292d44106150037932b95ddc233e09c6faf7489b44672c93d801838f496cd"
   },
   "linux-arm64": {
-    "name": "dugite-native-v2.43.4-1074931-ubuntu-arm64.tar.gz",
-    "url": "https://github.com/desktop/dugite-native/releases/download/v2.43.4-1/dugite-native-v2.43.4-1074931-ubuntu-arm64.tar.gz",
-    "checksum": "1d71732200951803dd55d2b943b322d0cfab8c36a9ecd859d08f840daf95a270"
+    "name": "dugite-native-v2.47.1-8d348e6-ubuntu-arm64.tar.gz",
+    "url": "https://github.com/desktop/dugite-native/releases/download/v2.47.1/dugite-native-v2.47.1-8d348e6-ubuntu-arm64.tar.gz",
+    "checksum": "b9fcc671557a86259408b31875badaedd43408c9ef1fd4d502386d2bd36923ef"
   }
 }