Merge pull request #185 from cloudflare/fix-npm-install

fixes to npm package

Cargo.toml

@@ -27,6 +27,7 @@ toml = "0.5.0"
 uuid = "0.7"
 which = "2.0.1"
 rand = "0.6.5"
+fs2 = "0.4.3"
 
 [dev-dependencies]
 assert_cmd = "0.11.1"

npm/install-wrangler.js

@@ -40,6 +40,8 @@ function downloadAsset(asset) {
   }
   mkdirSync(dest);
 
+  console.log("Downloading release", asset.browser_download_url);
+
   return axios({
     url: asset.browser_download_url,
     responseType: "stream"
@@ -66,7 +68,7 @@ getLatestRelease()
     return downloadAsset(compatibleAssets);
   })
   .then(() => {
-    console.log("wrangler was installed.");
+    console.log("Wrangler has been installed!");
   })
   .catch(err => {
     throw err;

npm/package.json

@@ -5,10 +5,10 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "node ./install-wrangler.js"
+    "postinstall": "node install-wrangler.js"
   },
   "bin": {
-    "wrangler": "./out/wrangler"
+    "wrangler": "./run-wrangler.js"
   },
   "repository": {
     "type": "git",

npm/run-wrangler.js

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+
+const { join, resolve } = require("path");
+const { spawnSync } = require("child_process");
+
+const cwd = join(process.cwd(), "node_modules", "@cloudflare", "wrangler");
+const bin = join(cwd, "out", "wrangler");
+const [, , ...args] = process.argv;
+
+const opts = {
+  cwd: process.cwd(),
+  stdio: "inherit"
+};
+spawnSync(bin, args, opts);

src/wranglerjs/mod.rs

@@ -1,6 +1,7 @@
 use crate::commands::publish::package::Package;
 use crate::install;
 use binary_install::Cache;
+use fs2::FileExt;
 use log::info;
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
@@ -191,6 +192,11 @@ pub fn run_build(
 // Run {npm install} in the specified directory. Skips the install if a
 // {node_modules} is found in the directory.
 pub fn run_npm_install(dir: PathBuf) -> Result<(), failure::Error> {
+    let flock_path = dir.join(&".install.lock");
+    let flock = File::create(&flock_path)?;
+    // avoid running multiple {npm install} at the same time (eg. in tests)
+    flock.lock_exclusive()?;
+
     if dir.join("node_modules").exists() {
         info!("skipping npm install because node_modules exists");
         return Ok(());
@@ -202,6 +208,10 @@ pub fn run_npm_install(dir: PathBuf) -> Result<(), failure::Error> {
     info!("Running {:?} in directory {:?}", command, dir);
 
     let status = command.status()?;
+
+    flock.unlock()?;
+    fs::remove_file(&flock_path)?;
+
     if status.success() {
         Ok(())
     } else {