fsevents 1.2.4 → 1.2.9

package/node_modules/needle/test/post_data_spec.js

@@ -10,7 +10,7 @@ multiparts.push(['Content-Disposition: form-data; name=\"foo\"'])
 multiparts.push(['\r\nbar\r\n----------------------NODENEEDLEHTTPCLIENT--'])
 // multiparts.push(['Content-Disposition: form-data; name=\"test\"'])
 // multiparts.push(['\r\næµè¯\r\n----------------------NODENEEDLEHTTPCLIENT--'])
-// multiparts.push(['\r\n' + new Buffer('测试').toString() + '\r\n----------------------NODENEEDLEHTTPCLIENT--'])
+// multiparts.push(['\r\n' + Buffer.from('测试').toString() + '\r\n----------------------NODENEEDLEHTTPCLIENT--'])
 
 
 describe('post data (e.g. request body)', function() {
@@ -150,7 +150,7 @@ describe('post data (e.g. request body)', function() {
             spy.called.should.be.true;
 
             spy.args[0][0].should.be.an.instanceof(String);
-            new Buffer(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
+            Buffer.from(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
             done();
           })
         })
@@ -187,7 +187,7 @@ describe('post data (e.g. request body)', function() {
           post({ foo: 'bar', test: '测试' }, { multipart: true }, function(err, resp) {
             spy.called.should.be.true;
             spy.args[0][0].should.be.an.instanceof(String);
-            new Buffer(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
+            Buffer.from(spy.args[0][0]).toString('hex').should.eql('2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d22666f6f220d0a0d0a6261720d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e540d0a436f6e74656e742d446973706f736974696f6e3a20666f726d2d646174613b206e616d653d2274657374220d0a0d0ac3a6c2b5c28bc3a8c2afc2950d0a2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d2d4e4f44454e4545444c4548545450434c49454e542d2d')
             done();
           })
         })
@@ -761,14 +761,14 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               check_request('get');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // should.not.exist(resp.body.headers['content-type']);
               resp.body.headers['content-type'].should.equal('application/x-www-form-urlencoded');
 
@@ -777,7 +777,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('doesnt change default Accept header', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // resp.body contains 'header' and 'body', mirroring what we sent
               resp.body.headers['accept'].should.equal('*/*');
               done();
@@ -785,7 +785,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('writes as buffer', function(done) {
-            get(new Buffer('foobar'), { json: false }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: false }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].should.be.an.instanceof(Buffer);
               spy.args[0][0].toString().should.equal('foobar');
@@ -801,28 +801,28 @@ describe('post data (e.g. request body)', function() {
           it('sends request, without setting a querystring', function(done) {
             spystub_request();
 
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               check_request('get');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/json; charset=utf-8');
               done();
             })
           })
 
           it('set Accept header to application/json', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['accept'].should.equal('application/json');
               done();
             })
           })
 
           it('writes JSON.stringify version of object', function(done) {
-            get(new Buffer('foobar'), { json: true }, function(err, resp) {
+            get(Buffer.from('foobar'), { json: true }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].toString().should.eql('foobar')
               resp.body.body.should.eql('foobar');
@@ -841,21 +841,21 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               check_request('post');
               done();
             })
           })
 
           it('sets Content-Type header to www-form-urlencoded', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/x-www-form-urlencoded');
               done();
             })
           })
 
           it('doesnt change default Accept header', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               // resp.body contains 'header' and 'body', mirroring what we sent
               resp.body.headers['accept'].should.equal('*/*');
               done();
@@ -863,7 +863,7 @@ describe('post data (e.g. request body)', function() {
           })
 
           it('writes as buffer', function(done) {
-            post(new Buffer('foobar'), { json: false }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: false }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].should.be.an.instanceof(Buffer);
               spy.args[0][0].toString().should.equal('foobar');
@@ -879,28 +879,28 @@ describe('post data (e.g. request body)', function() {
           it('sends request', function(done) {
             spystub_request();
 
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               check_request('post');
               done();
             })
           })
 
           it('sets Content-Type header', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['content-type'].should.equal('application/json; charset=utf-8');
               done();
             })
           })
 
           it('set Accept header to application/json', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               resp.body.headers['accept'].should.equal('application/json');
               done();
             })
           })
 
           it('passes raw buffer (assuming its a JSON string beneath)', function(done) {
-            post(new Buffer('foobar'), { json: true }, function(err, resp) {
+            post(Buffer.from('foobar'), { json: true }, function(err, resp) {
               spy.called.should.be.true;
               spy.args[0][0].toString().should.eql('foobar')
               resp.body.body.should.eql('foobar');
@@ -1018,4 +1018,4 @@ describe('post data (e.g. request body)', function() {
 
   })
 
-})
+})

package/node_modules/needle/test/proxy_spec.js

@@ -51,7 +51,7 @@ describe('proxy option', function() {
 
   function get_auth(header) {
     var token  = header.split(/\s+/).pop();
-    return token && new Buffer(token, 'base64').toString().split(':');
+    return token && Buffer.from(token, 'base64').toString().split(':');
   }
 
   function no_proxy_auth(done) {

package/node_modules/needle/test/url_spec.js

@@ -38,10 +38,18 @@ describe('urls', function() {
       url = 'foo://google.com/what'
     })
 
-    it('fails', function(done) {
-      send_request(function(err){
+    it('does not throw', function(done) {
+      (function() {
+        send_request(function(err) { 
+          done();
+        })
+      }).should.not.throw()
+    })
+
+    it('returns an error', function(done) {
+      send_request(function(err) {
         err.should.be.an.Error;
-        err.code.should.eql('ENOTFOUND');
+        err.code.should.match(/ENOTFOUND|EADDRINFO|EAI_AGAIN/)
         done();
       })
     })

package/node_modules/needle/test/utils/test.js

@@ -46,7 +46,7 @@ function multipart_post(url){
 	var data = 'Plain text data.\nLorem ipsum dolor sit amet.\nBla bla bla.\n';
 	fs.writeFileSync(filename, data);
 
-	var black_pixel = new Buffer("data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=".replace(/^data:image\/\w+;base64,/, ""), "base64");
+	var black_pixel = Buffer.from("data:image/gif;base64,R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs=".replace(/^data:image\/\w+;base64,/, ""), "base64");
 
 	var data = {
 		foo: 'bar',

package/node_modules/node-pre-gyp/CHANGELOG.md

@@ -1,5 +1,28 @@
 # node-pre-gyp changelog
 
+## 0.12.0
+
+- Fixed double-build problem with node v10 (https://github.com/mapbox/node-pre-gyp/pull/428)
+- Added node 11 support in the local database (https://github.com/mapbox/node-pre-gyp/pull/422)
+
+## 0.11.0
+
+- Fixed double-install problem with node v10
+- Significant N-API improvements (https://github.com/mapbox/node-pre-gyp/pull/405)
+
+## 0.10.3
+
+- Now will use `request` over `needle` if request is installed. By default `needle` is used for `https`. This should unbreak proxy support that regressed in v0.9.0
+
+## 0.10.2
+
+- Fixed rc/deep-extent security vulnerability
+- Fixed broken reinstall script do to incorrectly named get_best_napi_version
+
+## 0.10.1
+
+- Fix needle error event (@medns)
+
 ## 0.10.0
 
 - Allow for a single-level module path when packing @allenluce (https://github.com/mapbox/node-pre-gyp/pull/371)

package/node_modules/node-pre-gyp/README.md

@@ -82,7 +82,7 @@ Both `--build-from-source` and `--fallback-to-build` can be passed alone or they
 
 For example: `npm install --build-from-source=myapp`. This is useful if:
 
- - `myapp` is referenced in the package.json of a larger app and therefore `myapp` is being installed as a dependent with `npm install`.
+ - `myapp` is referenced in the package.json of a larger app and therefore `myapp` is being installed as a dependency with `npm install`.
  - The larger app also depends on other modules installed with `node-pre-gyp`
  - You only want to trigger a source compile for `myapp` and the other modules.
 
@@ -106,7 +106,6 @@ This looks like:
     "devDependencies": {
       "aws-sdk": "2.x"
     }
-    "bundledDependencies":["node-pre-gyp"],
     "scripts": {
         "install": "node-pre-gyp install --fallback-to-build"
     },
@@ -123,12 +122,10 @@ Let's break this down:
 
  - Dependencies need to list `node-pre-gyp`
  - Your devDependencies should list `aws-sdk` so that you can run `node-pre-gyp publish` locally or a CI system. We recommend using `devDependencies` only since `aws-sdk` is large and not needed for `node-pre-gyp install` since it only uses http to fetch binaries
- - You should add `"bundledDependencies":["node-pre-gyp"]`. This ensures that when you publish your module that the correct version of node-pre-gyp will be included in the `node_modules` folder during publishing. Then when uses install your module `node-pre-gyp` will already be present. Without this your module will not be safely installable for downstream applications that have a depedency on node-pre-gyp in the npm tree (without bundling npm deduping might break the install when node-pre-gyp is moved in flight)
- - Your `scripts` section should optionally add `"prepublishOnly": "npm ls"` to ensure the right node-pre-gyp version is bundled before publishing your module. If node-pre-gyp is missing or an old version is present then this will catch that error before you publish a broken package.
  - Your `scripts` section should override the `install` target with `"install": "node-pre-gyp install --fallback-to-build"`. This allows node-pre-gyp to be used instead of the default npm behavior of always source compiling with `node-gyp` directly.
  - Your package.json should contain a `binary` section describing key properties you provide to allow node-pre-gyp to package optimally. They are detailed below.
 
-Note: in the past we recommended using `"preinstall": "npm install node-pre-gyp"` as an alternative method to avoid needing to bundle. But this does not behave predictably across all npm versions - see https://github.com/mapbox/node-pre-gyp/issues/260 for the details. So we do not recommend using `preinstall` to install `node-pre-gyp`. Instead we recommend bundling. More history on this at https://github.com/strongloop/fsevents/issues/157#issuecomment-265545908.
+Note: in the past we recommended putting `node-pre-gyp` in the `bundledDependencies`, but we no longer recommend this. In the past there were npm bugs (with node versions 0.10.x) that could lead to node-pre-gyp not being available at the right time during install (unless we bundled). This should no longer be the case. Also, for a time we recommended using `"preinstall": "npm install node-pre-gyp"` as an alternative method to avoid needing to bundle. But this did not behave predictably across all npm versions - see https://github.com/mapbox/node-pre-gyp/issues/260 for the details. So we do not recommend using `preinstall` to install `node-pre-gyp`. More history on this at https://github.com/strongloop/fsevents/issues/157#issuecomment-265545908.
 
 ##### The `binary` object has three required properties
 
@@ -156,7 +153,7 @@ It is highly recommended that you use Amazon S3. The reasons are:
   - S3 is a very solid hosting platform for distributing large files.
   - We provide detail documentation for using [S3 hosting](#s3-hosting) with node-pre-gyp.
 
-Why then not require S3? Because while some applications using node-pre-gyp need to distribute binaries as large as 20-30 MB, others might have very small binaries and might wish to store them in a GitHub repo. This is not recommended, but if an author really wants to host in a non-s3 location then it should be possible.
+Why then not require S3? Because while some applications using node-pre-gyp need to distribute binaries as large as 20-30 MB, others might have very small binaries and might wish to store them in a GitHub repo. This is not recommended, but if an author really wants to host in a non-S3 location then it should be possible.
 
 It should also be mentioned that there is an optional and entirely separate npm module called [node-pre-gyp-github](https://github.com/bchr02/node-pre-gyp-github) which is intended to complement node-pre-gyp and be installed along with it. It provides the ability to store and publish your binaries within your repositories GitHub Releases if you would rather not use S3 directly. Installation and usage instructions can be found [here](https://github.com/bchr02/node-pre-gyp-github), but the basic premise is that instead of using the ```node-pre-gyp publish``` command you would use ```node-pre-gyp-github publish```.
 
@@ -312,30 +309,32 @@ When the `napi_versions` array property is present, `node-pre-gyp` fires off mul
 
 ### The `napi_build_version` value
 
-For each of the N-API module operations `node-pre-gyp` initiates, it insures that the `napi_build_version` is set appropriately.
+For each of the N-API module operations `node-pre-gyp` initiates, it ensures that the `napi_build_version` is set appropriately.
 
 This value is of importance in two areas:
 
 1. The C/C++ code which needs to know against which N-API version it should compile.
 2. `node-pre-gyp` itself which must assign appropriate path and file names to avoid collisions.
 
-### Defining `NAPI_BUILD_VERSION` for the C/C++ code
+### Defining `NAPI_VERSION` for the C/C++ code
 
 The `napi_build_version` value is communicated to the C/C++ code by adding this code to the `binding.gyp` file:
 
 ```
 "defines": [
-    "NAPI_BUILD_VERSION=<(napi_build_version)",
+    "NAPI_VERSION=<(napi_build_version)",
 ]
 ```
 
-This insures that `NAPI_BUILD_VERSION`, an integer value, is declared appropriately to the C/C++ code for each build.
+This ensures that `NAPI_VERSION`, an integer value, is declared appropriately to the C/C++ code for each build.
+
+> Note that earlier versions of this document recommended defining the symbol `NAPI_BUILD_VERSION`. `NAPI_VERSION` is prefered because it used by the N-API C/C++ headers to configure the specific N-API veriosn being requested. 
 
 ### Path and file naming requirements in `package.json`
 
 Since `node-pre-gyp` fires off multiple operations for each request, it is essential that path and file names be created in such a way as to avoid collisions. This is accomplished by imposing additional path and file naming requirements.
 
-Specifically, when performing N-API builds, the `{napi_build_version}` text substitution string  *must* be present in the `module_path` property. In addition, the `{napi_build_version}` text substitution string  *must* be present in either the `remote_path` or `package_name` property. (No problem if it's in both.)
+Specifically, when performing N-API builds, the `{napi_build_version}` text configuration value  *must* be present in the `module_path` property. In addition, the `{napi_build_version}` text configuration value  *must* be present in either the `remote_path` or `package_name` property. (No problem if it's in both.)
 
 Here's an example:
 
@@ -350,9 +349,42 @@ Here's an example:
   }
 ```
 
+## Supporting both N-API and NAN builds
+
+You may have a legacy native add-on that you wish to continue supporting for those versions of Node that do not support N-API, as you add N-API support for later Node versions. This can be accomplished by specifying the `node_napi_label` configuration value in the package.json `binary.package_name` property. 
+
+Placing the configuration value `node_napi_label` in the package.json `binary.package_name` property instructs `node-pre-gyp` to build all viable N-API binaries supported by the current Node instance. If the current Node instance does not support N-API, `node-pre-gyp` will request a traditional, non-N-API build. 
+
+The configuration value `node_napi_label` is set by `node-pre-gyp` to the type of build created, `napi` or `node`, and the version number. For N-API builds, the string contains the N-API version nad has values like `napi-v3`. For traditional, non-N-API builds, the string contains the ABI version with values like `node-v46`.
+
+Here's how the `binary` configuration above might be changed to support both N-API and NAN builds:
+
+```js
+"binary": {
+    "module_name": "your_module",
+    "module_path": "./lib/binding/{node_napi_label}",
+    "remote_path": "./{module_name}/v{version}/{configuration}/",
+    "package_name": "{platform}-{arch}-{node_napi_label}.tar.gz",
+    "host": "https://your_bucket.s3-us-west-1.amazonaws.com",
+    "napi_versions": [1,3]
+  }
+```
+
+The C/C++ symbol `NAPI_VERSION` can be used to distinguish N-API and non-N-API builds. The value of `NAPI_VERSION` is set to the integer N-API version for N-API builds and is set to `0` for non-N-API builds. 
+
+For example:
+ 
+```C
+#if NAPI_VERSION
+// N-API code goes here
+#else
+// NAN code goes here
+#endif
+```
+
 ### Two additional configuration values
 
-For those who need them in legacy projects, two additional configuration values are available for all builds.
+The following two configuration values, which were implemented in previous versions of `node-pre-gyp`, continue to exist, but have been replaced by the `node_napi_label` configuration value described above.
 
 1. `napi_version` If N-API is supported by the currently executing Node instance, this value is the N-API version number supported by Node. If N-API is not supported, this value is an empty string.
 

package/node_modules/node-pre-gyp/appveyor.yml

@@ -3,8 +3,6 @@ os: Visual Studio 2015
 environment:
   matrix:
     - nodejs_version: 6
-    - nodejs_version: 8
-    - nodejs_version: 9
     - nodejs_version: 10
 
 platform:

package/node_modules/node-pre-gyp/lib/build.js

@@ -21,7 +21,7 @@ function do_build(gyp,argv,callback) {
             napi.swap_build_dir_in(result.opts.napi_build_version);
         }
         compile.run_gyp(final_args,result.opts,function(err) {
-            if (!err && result.opts.napi_build_version) {
+            if (result.opts.napi_build_version) {
                 napi.swap_build_dir_out(result.opts.napi_build_version);
             }
             return callback(err);

package/node_modules/node-pre-gyp/lib/install.js

@@ -19,6 +19,21 @@ try {
     npgVersion = JSON.parse(ownPackageJSON).version;
 } catch (e) {}
 
+var http_get = {
+    impl: undefined,
+    type: undefined
+};
+
+try {
+  http_get.impl = require('request');
+  http_get.type = 'request';
+  log.warn("Using request for node-pre-gyp https download");
+} catch (e) {
+  http_get.impl = require('needle');
+  http_get.type = 'needle';
+  log.warn("Using needle for node-pre-gyp https download");
+}
+
 function download(uri,opts,callback) {
     log.http('GET', uri);
 
@@ -59,7 +74,7 @@ function download(uri,opts,callback) {
       }
     }
     try {
-        req = require('needle').get(requestOpts.uri, requestOpts);
+        req = http_get.impl.get(requestOpts.uri, requestOpts);
     } catch (e) {
         return callback(e);
     }
@@ -77,6 +92,7 @@ function place_binary(from,to,opts,callback) {
         if (!req) return callback(new Error("empty req"));
         var badDownload = false;
         var extractCount = 0;
+        var hasResponse = false;
         var tar = require('tar');
 
         function afterTarball(err) {
@@ -94,23 +110,41 @@ function place_binary(from,to,opts,callback) {
             extractCount++;
         }
 
+        // for request compatibility
         req.on('error', function(err) {
             badDownload = true;
-            return callback(err);
+            if (!hasResponse) {
+                hasResponse = true;
+                return callback(err);
+            }
+        });
+
+        // for needle compatibility
+        req.on('err', function(err) {
+            badDownload = true;
+            if (!hasResponse) {
+                hasResponse = true;
+                return callback(err);
+            }
         });
 
         req.on('close', function () {
-            if (extractCount === 0) {
+            if (!hasResponse) {
+                hasResponse = true;
                 return callback(new Error('Connection closed while downloading tarball file'));
             }
         });
 
       req.on('response', function(res) {
-           // ignore redirects, needle handles these automatically.
-           if (res.headers.hasOwnProperty('location') && res.headers.location !== '') {
-             return;
-           }
-           if (res.statusCode !== 200) {
+            // ignore redirects, needle handles these automatically.
+            if (http_get.type === 'needle' && res.headers.hasOwnProperty('location') && res.headers.location !== '') {
+                return;
+            }
+            if (hasResponse) {
+                return;
+            }
+            hasResponse = true;
+            if (res.statusCode !== 200) {
                 badDownload = true;
                 var err = new Error(res.statusCode + ' status code downloading tarball ' + from);
                 err.statusCode = res.statusCode;

package/node_modules/node-pre-gyp/lib/node-pre-gyp.js

@@ -135,7 +135,7 @@ proto.parseArgv = function parseOpts (argv) {
   if (dir == null) dir = process.cwd();
   var package_json = JSON.parse(fs.readFileSync(path.join(dir,'package.json')));
 
-  this.todo = napi.expand_commands (package_json, commands);
+  this.todo = napi.expand_commands (package_json, this.opts, commands);
 
   // support for inheriting config env variables from npm
   var npm_config_prefix = 'npm_config_';

package/node_modules/node-pre-gyp/lib/pre-binding.js

@@ -9,8 +9,8 @@ module.exports = exports;
 
 exports.usage = 'Finds the require path for the node-pre-gyp installed module';
 
-exports.validate = function(package_json) {
-    versioning.validate_config(package_json);
+exports.validate = function(package_json,opts) {
+    versioning.validate_config(package_json,opts);
 };
 
 exports.find = function(package_json_path,opts) {
@@ -18,10 +18,10 @@ exports.find = function(package_json_path,opts) {
         throw new Error("package.json does not exist at " + package_json_path);
    }
    var package_json = require(package_json_path);
-   versioning.validate_config(package_json);
+   versioning.validate_config(package_json,opts);
    var napi_build_version;
-   if (napi.get_napi_build_versions (package_json)) {
-       napi_build_version = napi.get_best_napi_build_version(package_json);
+   if (napi.get_napi_build_versions (package_json, opts)) {
+       napi_build_version = napi.get_best_napi_build_version(package_json, opts);
    }
    opts = opts || {};
    if (!opts.module_root) opts.module_root = path.dirname(package_json_path);

package/node_modules/node-pre-gyp/lib/rebuild.js

@@ -13,7 +13,7 @@ function rebuild (gyp, argv, callback) {
     { name: 'clean', args: [] },
     { name: 'build', args: ['rebuild'] }
     ];
-  commands = napi.expand_commands(package_json, commands);
+  commands = napi.expand_commands(package_json, gyp.opts, commands);
   for (var i = commands.length; i !== 0; i--) {
     gyp.todo.unshift(commands[i-1]);
   }

package/node_modules/node-pre-gyp/lib/reinstall.js

@@ -10,7 +10,7 @@ var napi = require('./util/napi.js');
 function rebuild (gyp, argv, callback) {
   var package_json = JSON.parse(fs.readFileSync('./package.json'));
   var installArgs = [];
-  var napi_build_version = napi.get_best_napi_version(package_json);
+  var napi_build_version = napi.get_best_napi_build_version(package_json, gyp.opts);
   if (napi_build_version != null) installArgs = [ napi.get_command_arg (napi_build_version) ];
   gyp.todo.unshift(
       { name: 'clean', args: [] },

package/node_modules/node-pre-gyp/lib/util/abi_crosswalk.json

@@ -1499,6 +1499,14 @@
     "node_abi": 48,
     "v8": "5.1"
   },
+  "6.14.3": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
+  "6.14.4": {
+    "node_abi": 48,
+    "v8": "5.1"
+  },
   "7.0.0": {
     "node_abi": 51,
     "v8": "5.4"
@@ -1659,6 +1667,22 @@
     "node_abi": 57,
     "v8": "6.2"
   },
+  "8.11.2": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
+  "8.11.3": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
+  "8.11.4": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
+  "8.12.0": {
+    "node_abi": 57,
+    "v8": "6.2"
+  },
   "9.0.0": {
     "node_abi": 59,
     "v8": "6.2"
@@ -1727,8 +1751,80 @@
     "node_abi": 59,
     "v8": "6.2"
   },
+  "9.11.2": {
+    "node_abi": 59,
+    "v8": "6.2"
+  },
   "10.0.0": {
     "node_abi": 64,
     "v8": "6.6"
+  },
+  "10.1.0": {
+    "node_abi": 64,
+    "v8": "6.6"
+  },
+  "10.2.0": {
+    "node_abi": 64,
+    "v8": "6.6"
+  },
+  "10.2.1": {
+    "node_abi": 64,
+    "v8": "6.6"
+  },
+  "10.3.0": {
+    "node_abi": 64,
+    "v8": "6.6"
+  },
+  "10.4.0": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.4.1": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.5.0": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.6.0": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.7.0": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.8.0": {
+    "node_abi": 64,
+    "v8": "6.7"
+  },
+  "10.9.0": {
+    "node_abi": 64,
+    "v8": "6.8"
+  },
+  "10.10.0": {
+    "node_abi": 64,
+    "v8": "6.8"
+  },
+  "10.11.0": {
+    "node_abi": 64,
+    "v8": "6.8"
+  },
+  "10.12.0": {
+    "node_abi": 64,
+    "v8": "6.8"
+  },
+  "10.13.0": {
+    "node_abi": 64,
+    "v8": "6.8"
+  },
+  "11.0.0": {
+    "node_abi": 67,
+    "v8": "7.0"
+  },
+  "11.1.0": {
+    "node_abi": 67,
+    "v8": "7.0"
   }
 }