Merge branch 'master' into taylorlee/r2-bindings-and-subcommands

.cargo/audit.toml

@@ -0,0 +1,6 @@
+[advisories]
+# See https://github.com/cloudflare/wrangler/issues/2117
+ignore = [
+    "RUSTSEC-2020-0159", # Potential segfault in `localtime_r` invocations
+    "RUSTSEC-2020-0071", # Potential segfault in the time crate
+]

.github/workflows/audit.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - "**/Cargo.toml"
       - "**/Cargo.lock"
+      - ".cargo/audit.toml"
       - "**/package-lock.json"
       - "**/npm-shrinkwrap.json"
   schedule:

npm/binary-install.js

@@ -92,7 +92,21 @@ class Binary {
 
         return axios({ url: this.url, responseType: "stream" })
             .then(res => {
-                res.data.pipe(tar.x({ strip: 1, C: this.binaryDirectory }));
+                const writer = tar.x({ strip: 1, C: this.binaryDirectory });
+
+                return new Promise((resolve, reject) => {
+                    res.data.pipe(writer);
+                    let error = null;
+                    writer.on('error', err => {
+                      error = err;
+                      reject(err);
+                    });
+                    writer.on('close', () => {
+                      if (!error) {
+                        resolve(true);
+                      }
+                    });
+                })
             })
             .then(() => {
                 console.log(

npm/package.json

@@ -7,7 +7,8 @@
     "postinstall": "node ./install-wrangler.js"
   },
   "bin": {
-    "wrangler": "./run-wrangler.js"
+    "wrangler": "./run-wrangler.js",
+    "wrangler1": "./run-wrangler.js"
   },
   "repository": {
     "type": "git",

src/main.rs

@@ -22,7 +22,6 @@ fn main() -> Result<()> {
     }
     env_logger::init();
 
-    let latest_version_receiver = background_check_for_updates();
     if let Ok(me) = env::current_exe() {
         // If we're actually running as the installer then execute our
         // self-installation, otherwise just continue as usual.
@@ -36,7 +35,7 @@ fn main() -> Result<()> {
         }
     }
     run()?;
-    if let Ok(latest_version) = latest_version_receiver.try_recv() {
+    if let Ok(latest_version) = background_check_for_updates().try_recv() {
         let latest_version = styles::highlight(latest_version.to_string());
         let new_version_available = format!(
             "A new version of Wrangler ({}) is available!",