diff options
author | Rebecca Turner <me@re-becca.org> | 2017-06-27 02:14:29 +0300 |
---|---|---|
committer | Rebecca Turner <me@re-becca.org> | 2017-06-27 02:14:29 +0300 |
commit | d04a23de21dd9991b32029d839b71e10e07b400d (patch) | |
tree | 606808f7377402a09f6bd0ac18f24d9fdd4e7bb9 /node_modules | |
parent | 696a07f841145b5255d1d55d54910af9adbfa260 (diff) |
pacote@2.7.36
Diffstat (limited to 'node_modules')
19 files changed, 237 insertions, 147 deletions
diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md index 6f49016c2..af742ce05 100644 --- a/node_modules/pacote/CHANGELOG.md +++ b/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +<a name="2.7.36"></a> +## [2.7.36](https://github.com/zkat/pacote/compare/v2.7.35...v2.7.36) (2017-06-10) + + +### Bug Fixes + +* **deps:** update tar-fs with the special characters patch (#102) ([ed43aa3](https://github.com/zkat/pacote/commit/ed43aa3)) + + + +<a name="2.7.35"></a> +## [2.7.35](https://github.com/zkat/pacote/compare/v2.7.34...v2.7.35) (2017-06-09) + + +### Bug Fixes + +* **registry:** only print one 199 warning (#100) ([b395138](https://github.com/zkat/pacote/commit/b395138)) + + + <a name="2.7.34"></a> ## [2.7.34](https://github.com/zkat/pacote/compare/v2.7.33...v2.7.34) (2017-06-09) diff --git a/node_modules/pacote/lib/fetchers/registry/check-warning-header.js b/node_modules/pacote/lib/fetchers/registry/check-warning-header.js index 446b1eebc..b17a233d4 100644 --- a/node_modules/pacote/lib/fetchers/registry/check-warning-header.js +++ b/node_modules/pacote/lib/fetchers/registry/check-warning-header.js @@ -21,11 +21,12 @@ function checkWarnings (res, registry, opts) { } }) BAD_HOSTS.set(registry, true) - if (warnings['199'] && warnings['199'].message.match(/ENOTFOUND/)) { - opts.log.warn('registry', `Using stale data from ${registry} because the host is inaccessible -- are you offline?`) - } if (warnings['199']) { - opts.log.warn('registry', `Unexpected warning for ${registry}: ${warnings['199'].message}`) + if (warnings['199'].message.match(/ENOTFOUND/)) { + opts.log.warn('registry', `Using stale data from ${registry} because the host is inaccessible -- are you offline?`) + } else { + opts.log.warn('registry', `Unexpected warning for ${registry}: ${warnings['199'].message}`) + } } if (warnings['111']) { // 111 Revalidation failed -- we're using stale data diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/History.md b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/History.md index 4a133da46..5b2e58a4a 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/History.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/History.md @@ -1,4 +1,16 @@ +3.3.0 / 2017-06-20 +================== + + * feat: add statusChanged getter (#51) + * chore: format License + +3.2.0 / 2017-06-10 +================== + + * feat: add expiring active sockets + * test: add node 8 (#49) + 3.1.0 / 2017-02-20 ================== diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/README.md b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/README.md index 0dd51c728..c8d8d2f3b 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/README.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/README.md @@ -59,6 +59,9 @@ $ npm install agentkeepalive --save * `maxFreeSockets` {Number} Maximum number of sockets to leave open in a free state. Only relevant if `keepAlive` is set to `true`. Default = `256`. + * `socketActiveTTL` {Number} Sets the socket active time to live, even if it's in use. + If not setted the behaviour continues the same (the socket will be released only when free) + Default = `null`. ## Usage @@ -95,11 +98,17 @@ req.on('error', e => { req.end(); setTimeout(() => { - console.log('agent status: %j', keepaliveAgent.getCurrentStatus()); + if (keepaliveAgent.statusChanged) { + console.log('[%s] agent status changed: %j', Date(), keepaliveAgent.getCurrentStatus()); + } }, 2000); ``` +### `getter agent.statusChanged` + +counters have change or not after last checkpoint. + ### `agent.getCurrentStatus()` `agent.getCurrentStatus()` will return a object to show the status of this agent: @@ -212,10 +221,11 @@ Socket created: ## License +``` (The MIT License) -Copyright(c) 2012 - 2015 fengmk2 <fengmk2@gmail.com> Copyright(c) node-modules and other contributors. +Copyright(c) 2012 - 2015 fengmk2 <fengmk2@gmail.com> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -235,3 +245,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +``` diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/_http_agent.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/_http_agent.js index 8b42294a9..57723d9c9 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/_http_agent.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/_http_agent.js @@ -68,6 +68,8 @@ function Agent(options) { self.freeSocketKeepAliveTimeout = self.options.freeSocketKeepAliveTimeout || 0; // working socket timeout. By default working socket do not have a timeout. self.timeout = self.options.timeout || 0; + // the socket active time to live, even if it's in use + this.socketActiveTTL = this.options.socketActiveTTL || null; // [patch end] self.on('free', function(socket, options) { @@ -163,6 +165,20 @@ Agent.prototype.getName = function getName(options) { return name; }; +// [patch start] +function handleSocketCreation(req) { + return function(err, newSocket) { + if (err) { + process.nextTick(function() { + req.emit('error', err); + }); + return; + } + req.onSocket(newSocket); + } +} +// [patch end] + Agent.prototype.addRequest = function addRequest(req, options) { // Legacy API: addRequest(req, host, port, localAddress) if (typeof options === 'string') { @@ -202,6 +218,12 @@ Agent.prototype.addRequest = function addRequest(req, options) { socket.removeListener('error', freeSocketErrorListener); // restart the default timer socket.setTimeout(this.timeout); + + if (this.socketActiveTTL && Date.now() - socket.createdTime > this.socketActiveTTL) { + debug(`socket ${socket.createdTime} expired`); + socket.destroy(); + return this.createSocket(req, options, handleSocketCreation(req)); + } // [patch end] // don't leak @@ -214,15 +236,9 @@ Agent.prototype.addRequest = function addRequest(req, options) { } else if (sockLen < this.maxSockets) { debug('call onSocket', sockLen, freeLen); // If we are under maxSockets create a new one. - this.createSocket(req, options, function(err, newSocket) { - if (err) { - process.nextTick(function() { - req.emit('error', err); - }); - return; - } - req.onSocket(newSocket); - }); + // [patch start] + this.createSocket(req, options, handleSocketCreation(req)); + // [patch end] } else { debug('wait for socket'); // We are over limit so we'll add it to the queue. @@ -253,8 +269,11 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) { options.encoding = null; var called = false; const newSocket = self.createConnection(options, oncreate); - if (newSocket) - oncreate(null, newSocket); + // [patch start] + if (newSocket) { + oncreate(null, Object.assign(newSocket, { createdTime: Date.now() })); + } + // [patch end] function oncreate(err, s) { if (called) return; diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/agent.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/agent.js index 3c8d98493..a51ad597b 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/agent.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/lib/agent.js @@ -39,12 +39,24 @@ class Agent extends OriginalAgent { super(options); this.createSocketCount = 0; + this.createSocketCountLastCheck = 0; + this.createSocketErrorCount = 0; + this.createSocketErrorCountLastCheck = 0; + this.closeSocketCount = 0; + this.closeSocketCountLastCheck = 0; + // socket error event count this.errorSocketCount = 0; + this.errorSocketCountLastCheck = 0; + this.requestCount = 0; + this.requestCountLastCheck = 0; + this.timeoutSocketCount = 0; + this.timeoutSocketCountLastCheck = 0; + this.on('free', s => { this.requestCount++; // last enter free queue timestamp @@ -77,6 +89,24 @@ class Agent extends OriginalAgent { }); } + get statusChanged() { + const changed = this.createSocketCount !== this.createSocketCountLastCheck || + this.createSocketErrorCount !== this.createSocketErrorCountLastCheck || + this.closeSocketCount !== this.closeSocketCountLastCheck || + this.errorSocketCount !== this.errorSocketCountLastCheck || + this.timeoutSocketCount !== this.timeoutSocketCountLastCheck || + this.requestCount !== this.requestCountLastCheck; + if (changed) { + this.createSocketCountLastCheck = this.createSocketCount; + this.createSocketErrorCountLastCheck = this.createSocketErrorCount; + this.closeSocketCountLastCheck = this.closeSocketCount; + this.errorSocketCountLastCheck = this.errorSocketCount; + this.timeoutSocketCountLastCheck = this.timeoutSocketCount; + this.requestCountLastCheck = this.requestCount; + } + return changed; + } + getCurrentStatus() { return { createSocketCount: this.createSocketCount, diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/package.json b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/package.json index d591433a7..2468ecf35 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/agentkeepalive/package.json @@ -1,7 +1,8 @@ { "_from": "agentkeepalive@^3.1.0", - "_id": "agentkeepalive@3.1.0", - "_integrity": "sha1-A5Ok8eaPhdNViHwucWgbKPO33zU=", + "_id": "agentkeepalive@3.3.0", + "_inBundle": false, + "_integrity": "sha512-9yhcpXti2ZQE7bxuCsjjWNIZoQOd9sZ1ZBovHG0YeCRohFv73SLvcm73PC9T3olM4GyozaQb+4MGdQpcD8m7NQ==", "_location": "/pacote/make-fetch-happen/agentkeepalive", "_phantomChildren": {}, "_requested": { @@ -17,36 +18,35 @@ "_requiredBy": [ "/pacote/make-fetch-happen" ], - "_resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.1.0.tgz", - "_shasum": "0393a4f1e68f85d355887c2e71681b28f3b7df35", - "_shrinkwrap": null, + "_resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.3.0.tgz", + "_shasum": "6d5de5829afd3be2712201a39275fd11c651857c", "_spec": "agentkeepalive@^3.1.0", - "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen", + "_where": "/Users/rebecca/code/npm/node_modules/pacote/node_modules/make-fetch-happen", "author": { "name": "fengmk2", "email": "fengmk2@gmail.com", "url": "https://fengmk2.com" }, - "bin": null, "browser": "browser.js", "bugs": { "url": "https://github.com/node-modules/agentkeepalive/issues" }, "bundleDependencies": false, "ci": { - "version": "4.3.2, 4, 6, 7" + "version": "4.3.2, 4, 6, 7, 8" }, "dependencies": { - "humanize-ms": "^1.2.0" + "humanize-ms": "^1.2.1" }, "deprecated": false, "description": "Missing keepalive http.Agent", "devDependencies": { - "egg-bin": "^1.9.1", - "egg-ci": "^1.1.0", - "eslint": "^3.12.2", - "eslint-config-egg": "^3.2.0", - "pedding": "1" + "autod": "^2.8.0", + "egg-bin": "^1.10.3", + "egg-ci": "^1.7.0", + "eslint": "^3.19.0", + "eslint-config-egg": "^4.2.0", + "pedding": "^1.1.0" }, "engines": { "node": ">= 4.0.0" @@ -67,17 +67,16 @@ "license": "MIT", "main": "index.js", "name": "agentkeepalive", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/node-modules/agentkeepalive.git" }, "scripts": { + "autod": "autod", "ci": "npm run lint && npm run cov", "cov": "egg-bin cov", "lint": "eslint lib test index.js", "test": "egg-bin test" }, - "version": "3.1.0" + "version": "3.3.0" } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/.travis.yml b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/.travis.yml index 0e82b1e83..3eab7fdb3 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/.travis.yml +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/.travis.yml @@ -7,6 +7,7 @@ - "iojs" - "4" - "6" + - "8" - "node" diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/Changelog.md b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/Changelog.md index 6dcc346ba..afe205028 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/Changelog.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/Changelog.md @@ -1,4 +1,9 @@ +# 0.4.18 / 2017-06-13 + + * Fixed CESU-8 regression in Node v8. + + # 0.4.17 / 2017-04-22 * Updated typescript definition file to support Angular 2 AoT mode (#153 by @larssn) diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/encodings/internal.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/encodings/internal.js index cea067c17..4223a980f 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/encodings/internal.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/encodings/internal.js @@ -35,7 +35,7 @@ function InternalCodec(codecOptions, iconv) { this.encoder = InternalEncoderCesu8; // Add decoder for versions of Node not supporting CESU-8 - if (new Buffer("eda080", 'hex').toString().length == 3) { + if (new Buffer('eda0bdedb2a9', 'hex').toString() !== '💩') { this.decoder = InternalDecoderCesu8; this.defaultCharUnicode = iconv.defaultCharUnicode; } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/package.json b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/package.json index 9dfb46a96..3ec29a66e 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding/node_modules/iconv-lite/package.json @@ -1,36 +1,27 @@ { - "_args": [ - [ - { - "type": "remote", - "raw": "iconv-lite@https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "name": "iconv-lite", - "escapedName": "iconv-lite", - "rawSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "saveSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "fetchSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz" - }, - "/Users/zkat/Documents/code/npm" - ] - ], - "_from": "iconv-lite@https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "_id": "iconv-lite@0.4.17", - "_integrity": "sha1-T9qjs4rLwsAxsEXQ7c3+HsqxjI0=", + "_from": "iconv-lite@~0.4.13", + "_id": "iconv-lite@0.4.18", + "_inBundle": false, + "_integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==", "_location": "/pacote/make-fetch-happen/node-fetch-npm/encoding/iconv-lite", "_phantomChildren": {}, "_requested": { - "type": "remote", - "raw": "iconv-lite@https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", + "type": "range", + "registry": true, + "raw": "iconv-lite@~0.4.13", "name": "iconv-lite", "escapedName": "iconv-lite", - "rawSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "saveSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "fetchSpec": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz" + "rawSpec": "~0.4.13", + "saveSpec": null, + "fetchSpec": "~0.4.13" }, - "_requiredBy": [], - "_resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "_spec": "iconv-lite@https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.17.tgz", - "_where": "/Users/zkat/Documents/code/npm", + "_requiredBy": [ + "/pacote/make-fetch-happen/node-fetch-npm/encoding" + ], + "_resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "_shasum": "23d8656b16aae6742ac29732ea8f0336a4789cf2", + "_spec": "iconv-lite@~0.4.13", + "_where": "/Users/rebecca/code/npm/node_modules/pacote/node_modules/make-fetch-happen/node_modules/node-fetch-npm/node_modules/encoding", "author": { "name": "Alexander Shtuchkin", "email": "ashtuchkin@gmail.com" @@ -42,6 +33,7 @@ "bugs": { "url": "https://github.com/ashtuchkin/iconv-lite/issues" }, + "bundleDependencies": false, "contributors": [ { "name": "Jinwu Zhan", @@ -92,7 +84,7 @@ "url": "https://github.com/nleush" } ], - "dependencies": {}, + "deprecated": false, "description": "Convert character encodings in pure javascript.", "devDependencies": { "async": "*", @@ -117,7 +109,6 @@ "license": "MIT", "main": "./lib/index.js", "name": "iconv-lite", - "optionalDependencies": {}, "repository": { "type": "git", "url": "git://github.com/ashtuchkin/iconv-lite.git" @@ -128,5 +119,5 @@ "test": "mocha --reporter spec --grep ." }, "typings": "./lib/index.d.ts", - "version": "0.4.17" + "version": "0.4.18" } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/History.md b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/History.md index 7c464a63d..3c77655be 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/History.md +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/History.md @@ -1,4 +1,11 @@ +2.1.1 / 2017-06-13 +================== + + * fix a bug where `close` would emit before `end` + * use "raw-body" module for tests + * prettier + 2.1.0 / 2017-05-24 ================== diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/package.json b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/package.json index ff492a278..b9b02b64d 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/package.json +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/package.json @@ -1,27 +1,27 @@ { - "_from": "socks-proxy-agent@^2.0.0", - "_id": "socks-proxy-agent@2.1.0", + "_from": "socks-proxy-agent@^2.1.0", + "_id": "socks-proxy-agent@2.1.1", "_inBundle": false, - "_integrity": "sha1-3fsBtdvqX8h5SQyjiiX+h9PRWRI=", + "_integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==", "_location": "/pacote/make-fetch-happen/socks-proxy-agent", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "socks-proxy-agent@^2.0.0", + "raw": "socks-proxy-agent@^2.1.0", "name": "socks-proxy-agent", "escapedName": "socks-proxy-agent", - "rawSpec": "^2.0.0", + "rawSpec": "^2.1.0", "saveSpec": null, - "fetchSpec": "^2.0.0" + "fetchSpec": "^2.1.0" }, "_requiredBy": [ "/pacote/make-fetch-happen" ], - "_resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.0.tgz", - "_shasum": "ddfb01b5dbea5fc879490ca38a25fe87d3d15912", - "_spec": "socks-proxy-agent@^2.0.0", - "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/make-fetch-happen", + "_resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz", + "_shasum": "86ebb07193258637870e13b7bd99f26c663df3d3", + "_spec": "socks-proxy-agent@^2.1.0", + "_where": "/Users/rebecca/code/npm/node_modules/pacote/node_modules/make-fetch-happen", "author": { "name": "Nathan Rajlich", "email": "nathan@tootallnate.net", @@ -40,6 +40,7 @@ "description": "A SOCKS proxy `http.Agent` implementation for HTTP and HTTPS", "devDependencies": { "mocha": "2", + "raw-body": "^2.2.0", "socksv5": "0.0.6" }, "homepage": "https://github.com/TooTallNate/node-socks-proxy-agent#readme", @@ -62,5 +63,5 @@ "scripts": { "test": "mocha --reporter spec" }, - "version": "2.1.0" + "version": "2.1.1" } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/socks-proxy-agent.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/socks-proxy-agent.js index c1f769e24..d93448543 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/socks-proxy-agent.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/socks-proxy-agent.js @@ -1,4 +1,3 @@ - /** * Module dependencies. */ @@ -23,10 +22,13 @@ module.exports = SocksProxyAgent; * @api public */ -function SocksProxyAgent (opts) { +function SocksProxyAgent(opts) { if (!(this instanceof SocksProxyAgent)) return new SocksProxyAgent(opts); if ('string' == typeof opts) opts = url.parse(opts); - if (!opts) throw new Error('a SOCKS proxy server `host` and `port` must be specified!'); + if (!opts) + throw new Error( + 'a SOCKS proxy server `host` and `port` must be specified!' + ); Agent.call(this, connect); var proxy = extend({}, opts); @@ -52,24 +54,26 @@ function SocksProxyAgent (opts) { switch (proxy.protocol) { case 'socks4:': proxy.lookup = true; - // pass through + // pass through case 'socks4a:': proxy.version = 4; break; case 'socks5:': proxy.lookup = true; - // pass through + // pass through case 'socks:': // no version specified, default to 5h case 'socks5h:': proxy.version = 5; break; default: - throw new TypeError('A "socks" protocol must be specified! Got: ' + proxy.protocol); + throw new TypeError( + 'A "socks" protocol must be specified! Got: ' + proxy.protocol + ); } if (proxy.auth) { var auth = proxy.auth.split(':'); - proxy.authentication = {username: auth[0], password: auth[1]}; + proxy.authentication = { username: auth[0], password: auth[1] }; proxy.userid = auth[0]; } this.proxy = proxy; @@ -83,12 +87,11 @@ inherits(SocksProxyAgent, Agent); * @api public */ -function connect (req, opts, fn) { - +function connect(req, opts, fn) { var proxy = this.proxy; // called once the SOCKS proxy has connected to the specified remote endpoint - function onhostconnect (err, socket) { + function onhostconnect(err, socket) { if (err) return fn(err); var s = socket; if (opts.secureEndpoint) { @@ -101,13 +104,13 @@ function connect (req, opts, fn) { opts.hostname = null; opts.port = null; s = tls.connect(opts); - socket.resume(); } + socket.resume(); fn(null, s); } // called for the `dns.lookup()` callback - function onlookup (err, ip) { + function onlookup(err, ip) { if (err) return fn(err); options.target.host = ip; SocksClient.createConnection(options, onhostconnect); @@ -134,6 +137,6 @@ function connect (req, opts, fn) { dns.lookup(opts.host, onlookup); } else { // proxy hostname DNS resolution for "4a" and "5h" socks proxy servers - onlookup(null, opts.host) + onlookup(null, opts.host); } } diff --git a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/test/test.js b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/test/test.js index cc3375334..968ef650f 100644 --- a/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/test/test.js +++ b/node_modules/pacote/node_modules/make-fetch-happen/node_modules/socks-proxy-agent/test/test.js @@ -9,6 +9,7 @@ var http = require('http'); var https = require('https'); var assert = require('assert'); var socks = require('socksv5'); +var getRawBody = require('raw-body'); var SocksProxyAgent = require('../'); describe('SocksProxyAgent', function () { @@ -102,13 +103,9 @@ describe('SocksProxyAgent', function () { opts.headers = { foo: 'bar' }; var req = http.get(opts, function (res) { assert.equal(404, res.statusCode); - var data = ''; - res.setEncoding('utf8'); - res.on('data', function (b) { - data += b; - }); - res.on('end', function () { - data = JSON.parse(data); + getRawBody(res, 'utf8', function (err, buf) { + if (err) return done(err); + var data = JSON.parse(buf); assert.equal('bar', data.foo); done(); }); @@ -133,13 +130,9 @@ describe('SocksProxyAgent', function () { opts.headers = { foo: 'bar' }; var req = https.get(opts, function (res) { assert.equal(404, res.statusCode); - var data = ''; - res.setEncoding('utf8'); - res.on('data', function (b) { - data += b; - }); - res.on('end', function () { - data = JSON.parse(data); + getRawBody(res, 'utf8', function (err, buf) { + if (err) return done(err); + var data = JSON.parse(buf); assert.equal('bar', data.foo); done(); }); diff --git a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js index e8d858702..1685a7629 100644 --- a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js +++ b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js @@ -1,3 +1,4 @@ +'use strict'; module.exports = balanced; function balanced(a, b, str) { if (a instanceof RegExp) a = maybeMatch(a, str); diff --git a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json index ef83da07d..afa90581d 100644 --- a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json +++ b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json @@ -1,33 +1,32 @@ { - "_from": "balanced-match@^0.4.1", - "_id": "balanced-match@0.4.2", - "_integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "_from": "balanced-match@^1.0.0", + "_id": "balanced-match@1.0.0", + "_inBundle": false, + "_integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "_location": "/pacote/minimatch/brace-expansion/balanced-match", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "balanced-match@^0.4.1", + "raw": "balanced-match@^1.0.0", "name": "balanced-match", "escapedName": "balanced-match", - "rawSpec": "^0.4.1", + "rawSpec": "^1.0.0", "saveSpec": null, - "fetchSpec": "^0.4.1" + "fetchSpec": "^1.0.0" }, "_requiredBy": [ "/pacote/minimatch/brace-expansion" ], - "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838", - "_shrinkwrap": null, - "_spec": "balanced-match@^0.4.1", - "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion", + "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "_shasum": "89b4d199ab2bee49de164ea02b89ce462d71b767", + "_spec": "balanced-match@^1.0.0", + "_where": "/Users/rebecca/code/npm/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion", "author": { "name": "Julian Gruber", "email": "mail@juliangruber.com", "url": "http://juliangruber.com" }, - "bin": null, "bugs": { "url": "https://github.com/juliangruber/balanced-match/issues" }, @@ -36,6 +35,7 @@ "deprecated": false, "description": "Match balanced character pairs, like \"{\" and \"}\"", "devDependencies": { + "matcha": "^0.7.0", "tape": "^4.6.0" }, "homepage": "https://github.com/juliangruber/balanced-match", @@ -49,13 +49,12 @@ "license": "MIT", "main": "index.js", "name": "balanced-match", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/juliangruber/balanced-match.git" }, "scripts": { + "bench": "make bench", "test": "make test" }, "testling": { @@ -74,5 +73,5 @@ "android-browser/4.2..latest" ] }, - "version": "0.4.2" + "version": "1.0.0" } diff --git a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/package.json b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/package.json index f744d7e66..c245d54c9 100644 --- a/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/package.json +++ b/node_modules/pacote/node_modules/minimatch/node_modules/brace-expansion/package.json @@ -1,39 +1,38 @@ { - "_from": "brace-expansion@^1.0.0", - "_id": "brace-expansion@1.1.7", - "_integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=", + "_from": "brace-expansion@^1.1.7", + "_id": "brace-expansion@1.1.8", + "_inBundle": false, + "_integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "_location": "/pacote/minimatch/brace-expansion", "_phantomChildren": {}, "_requested": { "type": "range", "registry": true, - "raw": "brace-expansion@^1.0.0", + "raw": "brace-expansion@^1.1.7", "name": "brace-expansion", "escapedName": "brace-expansion", - "rawSpec": "^1.0.0", + "rawSpec": "^1.1.7", "saveSpec": null, - "fetchSpec": "^1.0.0" + "fetchSpec": "^1.1.7" }, "_requiredBy": [ "/pacote/minimatch" ], - "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", - "_shasum": "3effc3c50e000531fb720eaff80f0ae8ef23cf59", - "_shrinkwrap": null, - "_spec": "brace-expansion@^1.0.0", - "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote/node_modules/minimatch", + "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "_shasum": "c07b211c7c952ec1f8efd51a77ef0d1d3990a292", + "_spec": "brace-expansion@^1.1.7", + "_where": "/Users/rebecca/code/npm/node_modules/pacote/node_modules/minimatch", "author": { "name": "Julian Gruber", "email": "mail@juliangruber.com", "url": "http://juliangruber.com" }, - "bin": null, "bugs": { "url": "https://github.com/juliangruber/brace-expansion/issues" }, "bundleDependencies": false, "dependencies": { - "balanced-match": "^0.4.1", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" }, "deprecated": false, @@ -47,8 +46,6 @@ "license": "MIT", "main": "index.js", "name": "brace-expansion", - "optionalDependencies": {}, - "peerDependencies": {}, "repository": { "type": "git", "url": "git://github.com/juliangruber/brace-expansion.git" @@ -74,5 +71,5 @@ "android-browser/4.2..latest" ] }, - "version": "1.1.7" + "version": "1.1.8" } diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index 6e666f3a4..fc90c6bb7 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,13 +1,13 @@ { - "_from": "pacote@2.7.34", - "_id": "pacote@2.7.34", + "_from": "pacote@2.7.36", + "_id": "pacote@2.7.36", "_inBundle": false, - "_integrity": "sha512-7ckPYopKYndv/7KLMrEFzRZtNI008JsyxH6h8vVMgdnpCW1dDEie1iUqxoP/Ln0nWSPHEWA789YUBsiGx4p2NQ==", + "_integrity": "sha512-AW6ADkLBsOd5vCLC7FAmIldmOuL1/wKpSvrKKqrm2QyFne07Eho6g3hJQWp6zSKML7wNwODf5hZWJ7Vq8S9rAA==", "_location": "/pacote", "_phantomChildren": { - "cacache": "9.2.8", + "cacache": "9.2.9", "chownr": "1.0.1", - "lru-cache": "4.0.2", + "lru-cache": "4.1.1", "mississippi": "1.3.0", "mkdirp": "0.5.1", "npm-package-arg": "5.1.2", @@ -21,21 +21,21 @@ "_requested": { "type": "version", "registry": true, - "raw": "pacote@2.7.34", + "raw": "pacote@2.7.36", "name": "pacote", "escapedName": "pacote", - "rawSpec": "2.7.34", + "rawSpec": "2.7.36", "saveSpec": null, - "fetchSpec": "2.7.34" + "fetchSpec": "2.7.36" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.34.tgz", - "_shasum": "57d316284901d1830833137d51dc148be3efbfcc", - "_spec": "pacote@2.7.34", - "_where": "/Users/zkat/Documents/code/npm", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.36.tgz", + "_shasum": "837734ad2e545123b8b8fe5caa5076c92b5c7b5c", + "_spec": "pacote@2.7.36", + "_where": "/Users/rebecca/code/npm", "author": { "name": "Kat Marchán", "email": "kzm@sykosomatic.org" @@ -72,7 +72,7 @@ "safe-buffer": "^5.1.0", "semver": "^5.3.0", "ssri": "^4.1.5", - "tar-fs": "^1.15.1", + "tar-fs": "^1.15.3", "tar-stream": "^1.5.4", "unique-filename": "^1.1.0", "which": "^1.2.12" @@ -120,5 +120,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "2.7.34" + "version": "2.7.36" } |