Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Renner <zarenner@microsoft.com>2016-07-20 03:44:23 +0300
committerRebecca Turner <me@re-becca.org>2016-08-12 01:30:46 +0300
commit9b88cb89f138443f324094685f4de073f33ecef0 (patch)
tree19dfe2ecb90d81d6b8e7a20928c5d4c72ad13d83 /node_modules/request
parent7e0cdff04714709f6dc056b19422d3f937502f1c (diff)
request@2.74.0
Update request library to at least 2.73 to fix: npm install failed - Cannot read property 'emit' of null Fixes: #9984 PR-URL: https://github.com/npm/npm/pull/13432 Credit: @zarenner Reviewed-By: @iarna
Diffstat (limited to 'node_modules/request')
-rw-r--r--node_modules/request/.travis.yml4
-rw-r--r--node_modules/request/CHANGELOG.md38
-rw-r--r--node_modules/request/README.md5
-rw-r--r--node_modules/request/codecov.yml2
-rw-r--r--node_modules/request/node_modules/aws-sign2/package.json87
-rw-r--r--node_modules/request/node_modules/aws4/aws4.js2
-rw-r--r--node_modules/request/node_modules/aws4/lru.js96
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/LICENSE15
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/README.md142
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/lib/lru-cache.js469
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/LICENSE15
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/README.md60
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/map.js9
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/package.json77
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/pseudomap.js113
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/test/basic.js86
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.npmignore4
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.travis.yml7
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/CONTRIBUTING.md4
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/LICENSE15
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/README.md204
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/package.json77
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/test/basic.js188
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/yallist.js360
-rw-r--r--node_modules/request/node_modules/aws4/node_modules/lru-cache/package.json95
-rw-r--r--node_modules/request/node_modules/aws4/package.json49
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json33
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json37
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js39
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json47
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json35
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json33
-rw-r--r--node_modules/request/node_modules/bl/node_modules/readable-stream/package.json35
-rw-r--r--node_modules/request/node_modules/bl/package.json27
-rw-r--r--node_modules/request/node_modules/caseless/package.json95
-rw-r--r--node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json100
-rw-r--r--node_modules/request/node_modules/combined-stream/package.json99
-rw-r--r--node_modules/request/node_modules/extend/package.json116
-rw-r--r--node_modules/request/node_modules/forever-agent/package.json92
-rw-r--r--node_modules/request/node_modules/form-data/README.md (renamed from node_modules/request/node_modules/form-data/Readme.md)0
-rw-r--r--node_modules/request/node_modules/form-data/node_modules/async/package.json55
-rw-r--r--node_modules/request/node_modules/form-data/package.json53
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json25
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json31
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json115
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json112
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/chalk/package.json31
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json87
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/commander/package.json106
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json95
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json97
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json95
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json104
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json55
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json37
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json27
-rw-r--r--node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json25
-rw-r--r--node_modules/request/node_modules/har-validator/package.json35
-rw-r--r--node_modules/request/node_modules/hawk/node_modules/boom/package.json25
-rw-r--r--node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json106
-rw-r--r--node_modules/request/node_modules/hawk/node_modules/hoek/package.json105
-rw-r--r--node_modules/request/node_modules/hawk/node_modules/sntp/package.json104
-rw-r--r--node_modules/request/node_modules/hawk/package.json37
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json29
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/CHANGES.md5
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/README.md17
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js14
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json25
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json25
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json25
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json47
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/.travis.yml6
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/README.md244
-rwxr-xr-xnode_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-conv16
-rwxr-xr-xnode_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-sign17
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js291
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js28
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js35
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js16
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js289
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js44
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js8
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js17
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js4
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js6
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js4
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js77
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js484
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js255
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js15
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js38
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js31
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js20
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js24
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js41
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json33
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/AUTHORS (renamed from node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/AUTHORS)0
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/CHANGES.md (renamed from node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/CHANGES.md)0
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/README.md (renamed from node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/README.md)0
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js (renamed from node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/assert.js)0
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json (renamed from node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/package.json)67
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js35
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/package.json53
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/ecc-jsbn/package.json39
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.npmignore8
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.travis.yml9
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/LICENSE18
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/README.md32
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/lib/index.js123
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/package.json91
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jodid25519/package.json37
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jsbn/package.json31
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/CHANGELOG.md53
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt9
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/README.md66
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js74
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js4
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js72
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js2
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json94
-rw-r--r--node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json96
-rw-r--r--node_modules/request/node_modules/http-signature/package.json21
-rw-r--r--node_modules/request/node_modules/is-typedarray/package.json29
-rw-r--r--node_modules/request/node_modules/isstream/package.json108
-rw-r--r--node_modules/request/node_modules/json-stringify-safe/package.json102
-rw-r--r--node_modules/request/node_modules/mime-types/HISTORY.md6
-rw-r--r--node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md21
-rw-r--r--node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json54
-rw-r--r--node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json75
-rw-r--r--node_modules/request/node_modules/mime-types/package.json65
-rw-r--r--node_modules/request/node_modules/node-uuid/package.json29
-rw-r--r--node_modules/request/node_modules/oauth-sign/package.json66
-rw-r--r--node_modules/request/node_modules/oauth-sign/test.js89
-rw-r--r--node_modules/request/node_modules/qs/.npmignore18
-rw-r--r--node_modules/request/node_modules/qs/.travis.yml69
-rw-r--r--node_modules/request/node_modules/qs/CHANGELOG.md17
-rw-r--r--node_modules/request/node_modules/qs/README.md41
-rw-r--r--node_modules/request/node_modules/qs/bower.json21
-rw-r--r--node_modules/request/node_modules/qs/component.json15
-rw-r--r--node_modules/request/node_modules/qs/dist/qs.js158
-rwxr-xr-xnode_modules/request/node_modules/qs/lib/parse.js82
-rwxr-xr-xnode_modules/request/node_modules/qs/lib/stringify.js66
-rwxr-xr-xnode_modules/request/node_modules/qs/lib/utils.js10
-rw-r--r--node_modules/request/node_modules/qs/package.json78
-rwxr-xr-xnode_modules/request/node_modules/qs/test/parse.js68
-rwxr-xr-xnode_modules/request/node_modules/qs/test/stringify.js54
-rw-r--r--node_modules/request/node_modules/stringstream/package.json33
-rw-r--r--node_modules/request/node_modules/tough-cookie/README.md20
-rw-r--r--node_modules/request/node_modules/tough-cookie/lib/cookie.js18
-rw-r--r--node_modules/request/node_modules/tough-cookie/package.json64
-rw-r--r--node_modules/request/node_modules/tunnel-agent/package.json50
-rw-r--r--node_modules/request/package.json96
-rw-r--r--node_modules/request/request.js32
153 files changed, 5580 insertions, 3911 deletions
diff --git a/node_modules/request/.travis.yml b/node_modules/request/.travis.yml
index e5d9bde26..6f2d753b6 100644
--- a/node_modules/request/.travis.yml
+++ b/node_modules/request/.travis.yml
@@ -1,13 +1,15 @@
+
language: node_js
node_js:
- node
+ - 4
- 0.12
- 0.10
after_script:
- npm run test-cov
- - cat ./coverage/lcov.info | codecov
+ - codecov
- cat ./coverage/lcov.info | coveralls
webhooks:
diff --git a/node_modules/request/CHANGELOG.md b/node_modules/request/CHANGELOG.md
index ce6826f2f..2b5d17765 100644
--- a/node_modules/request/CHANGELOG.md
+++ b/node_modules/request/CHANGELOG.md
@@ -1,5 +1,24 @@
## Change Log
+### v2.74.0 (2016/07/22)
+- [#2295](https://github.com/request/request/pull/2295) Update tough-cookie to 2.3.0 (@stash-sfdc)
+- [#2280](https://github.com/request/request/pull/2280) Update karma-tap to version 2.0.1 🚀 (@greenkeeperio-bot)
+
+### v2.73.0 (2016/07/09)
+- [#2240](https://github.com/request/request/pull/2240) Remove connectionErrorHandler to fix #1903 (@zarenner)
+- [#2251](https://github.com/request/request/pull/2251) tape@4.6.0 breaks build 🚨 (@greenkeeperio-bot)
+- [#2225](https://github.com/request/request/pull/2225) Update docs (@ArtskydJ)
+- [#2203](https://github.com/request/request/pull/2203) Update browserify to version 13.0.1 🚀 (@greenkeeperio-bot)
+- [#2275](https://github.com/request/request/pull/2275) Update karma to version 1.1.1 🚀 (@greenkeeperio-bot)
+- [#2204](https://github.com/request/request/pull/2204) Add codecov.yml and disable PR comments (@simov)
+- [#2212](https://github.com/request/request/pull/2212) Fix link to http.IncomingMessage documentation (@nazieb)
+- [#2208](https://github.com/request/request/pull/2208) Update to form-data RC4 and pass null values to it (@simov)
+- [#2207](https://github.com/request/request/pull/2207) Move aws4 require statement to the top (@simov)
+- [#2199](https://github.com/request/request/pull/2199) Update karma-coverage to version 1.0.0 🚀 (@greenkeeperio-bot)
+- [#2206](https://github.com/request/request/pull/2206) Update qs to version 6.2.0 🚀 (@greenkeeperio-bot)
+- [#2205](https://github.com/request/request/pull/2205) Use server-destory to close hanging sockets in tests (@simov)
+- [#2200](https://github.com/request/request/pull/2200) Update karma-cli to version 1.0.0 🚀 (@greenkeeperio-bot)
+
### v2.72.0 (2016/04/17)
- [#2176](https://github.com/request/request/pull/2176) Do not try to pipe Gzip responses with no body (@simov)
- [#2175](https://github.com/request/request/pull/2175) Add 'delete' alias for the 'del' API method (@simov, @MuhanZou)
@@ -53,7 +72,7 @@
- [#1902](https://github.com/request/request/pull/1902) node-uuid@1.4.7 breaks build 🚨 (@greenkeeperio-bot)
- [#1894](https://github.com/request/request/pull/1894) Fix tunneling after redirection from https (Original: #1881) (@simov, @falms)
- [#1893](https://github.com/request/request/pull/1893) Update eslint to version 1.9.0 🚀 (@greenkeeperio-bot)
-- [#1852](https://github.com/request/request/pull/1852) Update eslint to version 1.7.3 🚀 (@simov, @greenkeeperio-bot, @paulomcnally, @michelsalib, @arbaaz, @vladimirich, @LoicMahieu, @JoshWillik, @jzaefferer, @ryanwholey, @djchie, @thisconnect, @mgenereu, @acroca, @Sebmaster, @Bloutiouf)
+- [#1852](https://github.com/request/request/pull/1852) Update eslint to version 1.7.3 🚀 (@simov, @greenkeeperio-bot, @paulomcnally, @michelsalib, @arbaaz, @vladimirich, @LoicMahieu, @JoshWillik, @jzaefferer, @ryanwholey, @djchie, @thisconnect, @mgenereu, @acroca, @Sebmaster, @KoltesDigital)
- [#1876](https://github.com/request/request/pull/1876) Implement loose matching for har mime types (@simov)
- [#1875](https://github.com/request/request/pull/1875) Update bluebird to version 3.0.2 🚀 (@simov, @greenkeeperio-bot)
- [#1871](https://github.com/request/request/pull/1871) Update browserify to version 12.0.1 🚀 (@greenkeeperio-bot)
@@ -64,7 +83,7 @@
- [#1857](https://github.com/request/request/pull/1857) Fix Referer header to point to the original host name (@simov)
- [#1850](https://github.com/request/request/pull/1850) Update karma-coverage to version 0.5.3 🚀 (@greenkeeperio-bot)
- [#1847](https://github.com/request/request/pull/1847) Use node's latest version when building (@simov)
-- [#1836](https://github.com/request/request/pull/1836) Tunnel: fix wrong property name (@Bloutiouf)
+- [#1836](https://github.com/request/request/pull/1836) Tunnel: fix wrong property name (@KoltesDigital)
- [#1820](https://github.com/request/request/pull/1820) Set href as request.js uses it (@mgenereu)
- [#1840](https://github.com/request/request/pull/1840) Update http-signature to version 1.0.2 🚀 (@greenkeeperio-bot)
- [#1845](https://github.com/request/request/pull/1845) Update istanbul to version 0.4.0 🚀 (@greenkeeperio-bot)
@@ -114,8 +133,7 @@
- [#1687](https://github.com/request/request/pull/1687) Fix caseless bug - content-type not being set for multipart/form-data (@simov, @garymathews)
### v2.59.0 (2015/07/20)
-- [#1671](https://github.com/request/request/pull/1671) Add tests and docs for using the agent, agentClass, agentOptions and forever options.
- Forever option defaults to using http(s).Agent in node 0.12+ (@simov)
+- [#1671](https://github.com/request/request/pull/1671) Add tests and docs for using the agent, agentClass, agentOptions and forever options. Forever option defaults to using http(s).Agent in node 0.12+ (@simov)
- [#1679](https://github.com/request/request/pull/1679) Fix - do not remove OAuth param when using OAuth realm (@simov, @jhalickman)
- [#1668](https://github.com/request/request/pull/1668) updated dependencies (@deamme)
- [#1656](https://github.com/request/request/pull/1656) Fix form method (@simov)
@@ -182,7 +200,7 @@
- [#1460](https://github.com/request/request/pull/1460) localAddress or proxy config is lost when redirecting (@simov, @0x4139)
- [#1453](https://github.com/request/request/pull/1453) Test on Node.js 0.12 and io.js with allowed failures (@nicolasmccurdy, @demohi)
- [#1426](https://github.com/request/request/pull/1426) Fixing tests to pass on io.js and node 0.12 (only test-https.js stiff failing) (@mikeal)
-- [#1446](https://github.com/request/request/pull/1446) Missing HTTP referer header with redirects Fixes #1038 (@simov, @guimonz)
+- [#1446](https://github.com/request/request/pull/1446) Missing HTTP referer header with redirects Fixes #1038 (@simov, @guimon)
- [#1428](https://github.com/request/request/pull/1428) Deprecate Node v0.8.x (@nylen)
- [#1436](https://github.com/request/request/pull/1436) Add ability to set a requester without setting default options (@tikotzky)
- [#1435](https://github.com/request/request/pull/1435) dry up verb methods (@sethpollack)
@@ -310,7 +328,7 @@
- [#1131](https://github.com/request/request/pull/1131) Update pool documentation (@FredKSchott)
- [#1143](https://github.com/request/request/pull/1143) Rewrite all tests to use tape (@nylen)
- [#1137](https://github.com/request/request/pull/1137) Add ability to specifiy querystring lib in options. (@jgrund)
-- [#1138](https://github.com/request/request/pull/1138) allow hostname and port in place of host on uri (@cappslock)
+- [#1138](https://github.com/request/request/pull/1138) allow hostname and port in place of host on uri (@slimelabs)
- [#1134](https://github.com/request/request/pull/1134) Fix multiple redirects and `self.followRedirect` (@blakeembrey)
- [#1130](https://github.com/request/request/pull/1130) documentation fix: add note about npm test for contributing (@FredKSchott)
- [#1120](https://github.com/request/request/pull/1120) Support/refactor request setup tunnel (@seanstrom)
@@ -479,28 +497,20 @@
- [#596](https://github.com/request/request/pull/596) Global agent is being used when pool is specified (@Cauldrath)
- [#594](https://github.com/request/request/pull/594) Emit complete event when there is no callback (@RomainLK)
- [#601](https://github.com/request/request/pull/601) Fixed a small typo (@michalstanko)
-
-### v2.23.0 (2013/07/23)
- [#589](https://github.com/request/request/pull/589) Prevent setting headers after they are sent (@geek)
- [#587](https://github.com/request/request/pull/587) Global cookie jar disabled by default (@threepointone)
-
-### v2.22.0 (2013/07/05)
- [#544](https://github.com/request/request/pull/544) Update http-signature version. (@davidlehn)
- [#581](https://github.com/request/request/pull/581) Fix spelling of "ignoring." (@bigeasy)
- [#568](https://github.com/request/request/pull/568) use agentOptions to create agent when specified in request (@SamPlacette)
- [#564](https://github.com/request/request/pull/564) Fix redirections (@criloz)
- [#541](https://github.com/request/request/pull/541) The exported request function doesn't have an auth method (@tschaub)
- [#542](https://github.com/request/request/pull/542) Expose Request class (@regality)
-
-### v2.21.0 (2013/04/30)
- [#536](https://github.com/request/request/pull/536) Allow explicitly empty user field for basic authentication. (@mikeando)
- [#532](https://github.com/request/request/pull/532) fix typo (@fredericosilva)
- [#497](https://github.com/request/request/pull/497) Added redirect event (@Cauldrath)
- [#503](https://github.com/request/request/pull/503) Fix basic auth for passwords that contain colons (@tonistiigi)
- [#521](https://github.com/request/request/pull/521) Improving test-localAddress.js (@noway421)
- [#529](https://github.com/request/request/pull/529) dependencies versions bump (@jodaka)
-
-### v2.20.0 (2013/04/22)
- [#523](https://github.com/request/request/pull/523) Updating dependencies (@noway421)
- [#520](https://github.com/request/request/pull/520) Fixing test-tunnel.js (@noway421)
- [#519](https://github.com/request/request/pull/519) Update internal path state on post-creation QS changes (@jblebrun)
diff --git a/node_modules/request/README.md b/node_modules/request/README.md
index cf9072a21..81ecac509 100644
--- a/node_modules/request/README.md
+++ b/node_modules/request/README.md
@@ -67,7 +67,7 @@ Request can also `pipe` to itself. When doing so, `content-type` and `content-le
request.get('http://google.com/img.png').pipe(request.put('http://mysite.com/img.png'))
```
-Request emits a "response" event when a response is received. The `response` argument will be an instance of [http.IncomingMessage](http://nodejs.org/api/http.html#http_http_incomingmessage).
+Request emits a "response" event when a response is received. The `response` argument will be an instance of [http.IncomingMessage](https://nodejs.org/api/http.html#http_class_http_incomingmessage).
```js
request
@@ -601,7 +601,6 @@ var options = {
key: fs.readFileSync(keyFile),
passphrase: 'password',
ca: fs.readFileSync(caFile)
- }
};
request.get(options);
@@ -819,7 +818,7 @@ default in Linux can be anywhere from 20-120 seconds][linux-timeout]).
The callback argument gets 3 arguments:
1. An `error` when applicable (usually from [`http.ClientRequest`](http://nodejs.org/api/http.html#http_class_http_clientrequest) object)
-2. An [`http.IncomingMessage`](http://nodejs.org/api/http.html#http_http_incomingmessage) object
+2. An [`http.IncomingMessage`](https://nodejs.org/api/http.html#http_class_http_incomingmessage) object
3. The third is the `response` body (`String` or `Buffer`, or JSON object if the `json` option is supplied)
[back to top](#table-of-contents)
diff --git a/node_modules/request/codecov.yml b/node_modules/request/codecov.yml
new file mode 100644
index 000000000..acd3f33ce
--- /dev/null
+++ b/node_modules/request/codecov.yml
@@ -0,0 +1,2 @@
+
+comment: false
diff --git a/node_modules/request/node_modules/aws-sign2/package.json b/node_modules/request/node_modules/aws-sign2/package.json
index 0fe40d0b6..9ece6179c 100644
--- a/node_modules/request/node_modules/aws-sign2/package.json
+++ b/node_modules/request/node_modules/aws-sign2/package.json
@@ -1,49 +1,82 @@
{
+ "_args": [
+ [
+ {
+ "raw": "aws-sign2@~0.6.0",
+ "scope": null,
+ "escapedName": "aws-sign2",
+ "name": "aws-sign2",
+ "rawSpec": "~0.6.0",
+ "spec": ">=0.6.0 <0.7.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "aws-sign2@>=0.6.0 <0.7.0",
+ "_id": "aws-sign2@0.6.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/aws-sign2",
+ "_nodeVersion": "4.1.2",
+ "_npmUser": {
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
+ },
+ "_npmVersion": "2.14.4",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "aws-sign2@~0.6.0",
+ "scope": null,
+ "escapedName": "aws-sign2",
+ "name": "aws-sign2",
+ "rawSpec": "~0.6.0",
+ "spec": ">=0.6.0 <0.7.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request"
+ ],
+ "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+ "_shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
+ "_shrinkwrap": null,
+ "_spec": "aws-sign2@~0.6.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Mikeal Rogers",
"email": "mikeal.rogers@gmail.com",
"url": "http://www.futurealoof.com"
},
- "name": "aws-sign2",
- "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
- "version": "0.6.0",
- "repository": {
- "url": "git+https://github.com/mikeal/aws-sign.git"
+ "bugs": {
+ "url": "https://github.com/mikeal/aws-sign/issues"
},
- "license": "Apache-2.0",
- "main": "index.js",
"dependencies": {},
+ "description": "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.",
"devDependencies": {},
- "optionalDependencies": {},
+ "directories": {},
+ "dist": {
+ "shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
+ "tarball": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+ },
"engines": {
"node": "*"
},
"gitHead": "8554bdb41268fa295eb1ee300f4adaa9f7f07fec",
- "bugs": {
- "url": "https://github.com/mikeal/aws-sign/issues"
- },
"homepage": "https://github.com/mikeal/aws-sign#readme",
- "_id": "aws-sign2@0.6.0",
- "scripts": {},
- "_shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
- "_from": "aws-sign2@>=0.6.0 <0.7.0",
- "_npmVersion": "2.14.4",
- "_nodeVersion": "4.1.2",
- "_npmUser": {
- "name": "mikeal",
- "email": "mikeal.rogers@gmail.com"
- },
+ "license": "Apache-2.0",
+ "main": "index.js",
"maintainers": [
{
"name": "mikeal",
"email": "mikeal.rogers@gmail.com"
}
],
- "dist": {
- "shasum": "14342dd38dbcc94d0e5b87d763cd63612c0e794f",
- "tarball": "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+ "name": "aws-sign2",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "url": "git+https://github.com/mikeal/aws-sign.git"
},
- "directories": {},
- "_resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
- "readme": "ERROR: No README data found!"
+ "scripts": {},
+ "version": "0.6.0"
}
diff --git a/node_modules/request/node_modules/aws4/aws4.js b/node_modules/request/node_modules/aws4/aws4.js
index 71e08bbc1..cbe5dc904 100644
--- a/node_modules/request/node_modules/aws4/aws4.js
+++ b/node_modules/request/node_modules/aws4/aws4.js
@@ -2,7 +2,7 @@ var aws4 = exports,
url = require('url'),
querystring = require('querystring'),
crypto = require('crypto'),
- lru = require('lru-cache'),
+ lru = require('./lru'),
credentialsCache = lru(1000)
// http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
diff --git a/node_modules/request/node_modules/aws4/lru.js b/node_modules/request/node_modules/aws4/lru.js
new file mode 100644
index 000000000..333f66a44
--- /dev/null
+++ b/node_modules/request/node_modules/aws4/lru.js
@@ -0,0 +1,96 @@
+module.exports = function(size) {
+ return new LruCache(size)
+}
+
+function LruCache(size) {
+ this.capacity = size | 0
+ this.map = Object.create(null)
+ this.list = new DoublyLinkedList()
+}
+
+LruCache.prototype.get = function(key) {
+ var node = this.map[key]
+ if (node == null) return undefined
+ this.used(node)
+ return node.val
+}
+
+LruCache.prototype.set = function(key, val) {
+ var node = this.map[key]
+ if (node != null) {
+ node.val = val
+ } else {
+ if (!this.capacity) this.prune()
+ if (!this.capacity) return false
+ node = new DoublyLinkedNode(key, val)
+ this.map[key] = node
+ this.capacity--
+ }
+ this.used(node)
+ return true
+}
+
+LruCache.prototype.used = function(node) {
+ this.list.moveToFront(node)
+}
+
+LruCache.prototype.prune = function() {
+ var node = this.list.pop()
+ if (node != null) {
+ delete this.map[node.key]
+ this.capacity++
+ }
+}
+
+
+function DoublyLinkedList() {
+ this.firstNode = null
+ this.lastNode = null
+}
+
+DoublyLinkedList.prototype.moveToFront = function(node) {
+ if (this.firstNode == node) return
+
+ this.remove(node)
+
+ if (this.firstNode == null) {
+ this.firstNode = node
+ this.lastNode = node
+ node.prev = null
+ node.next = null
+ } else {
+ node.prev = null
+ node.next = this.firstNode
+ node.next.prev = node
+ this.firstNode = node
+ }
+}
+
+DoublyLinkedList.prototype.pop = function() {
+ var lastNode = this.lastNode
+ if (lastNode != null) {
+ this.remove(lastNode)
+ }
+ return lastNode
+}
+
+DoublyLinkedList.prototype.remove = function(node) {
+ if (this.firstNode == node) {
+ this.firstNode = node.next
+ } else if (node.prev != null) {
+ node.prev.next = node.next
+ }
+ if (this.lastNode == node) {
+ this.lastNode = node.prev
+ } else if (node.next != null) {
+ node.next.prev = node.prev
+ }
+}
+
+
+function DoublyLinkedNode(key, val) {
+ this.key = key
+ this.val = val
+ this.prev = null
+ this.next = null
+}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/LICENSE b/node_modules/request/node_modules/aws4/node_modules/lru-cache/LICENSE
deleted file mode 100644
index 19129e315..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/README.md b/node_modules/request/node_modules/aws4/node_modules/lru-cache/README.md
deleted file mode 100644
index 1bc7b03f3..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/README.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# lru cache
-
-A cache object that deletes the least-recently-used items.
-
-[![Build Status](https://travis-ci.org/isaacs/node-lru-cache.svg?branch=master)](https://travis-ci.org/isaacs/node-lru-cache) [![Coverage Status](https://coveralls.io/repos/isaacs/node-lru-cache/badge.svg?service=github)](https://coveralls.io/github/isaacs/node-lru-cache)
-
-## Usage:
-
-```javascript
-var LRU = require("lru-cache")
- , options = { max: 500
- , length: function (n, key) { return n * 2 + key.length }
- , dispose: function (key, n) { n.close() }
- , maxAge: 1000 * 60 * 60 }
- , cache = LRU(options)
- , otherCache = LRU(50) // sets just the max size
-
-cache.set("key", "value")
-cache.get("key") // "value"
-
-// non-string keys ARE fully supported
-var someObject = {}
-cache.set(someObject, 'a value')
-cache.set('[object Object]', 'a different value')
-assert.equal(cache.get(someObject), 'a value')
-
-cache.reset() // empty the cache
-```
-
-If you put more stuff in it, then items will fall out.
-
-If you try to put an oversized thing in it, then it'll fall out right
-away.
-
-## Options
-
-* `max` The maximum size of the cache, checked by applying the length
- function to all values in the cache. Not setting this is kind of
- silly, since that's the whole purpose of this lib, but it defaults
- to `Infinity`.
-* `maxAge` Maximum age in ms. Items are not pro-actively pruned out
- as they age, but if you try to get an item that is too old, it'll
- drop it and return undefined instead of giving it to you.
-* `length` Function that is used to calculate the length of stored
- items. If you're storing strings or buffers, then you probably want
- to do something like `function(n, key){return n.length}`. The default is
- `function(){return 1}`, which is fine if you want to store `max`
- like-sized things. They item is passed as the first argument, and
- the key is passed as the second argumnet.
-* `dispose` Function that is called on items when they are dropped
- from the cache. This can be handy if you want to close file
- descriptors or do other cleanup tasks when items are no longer
- accessible. Called with `key, value`. It's called *before*
- actually removing the item from the internal cache, so if you want
- to immediately put it back in, you'll have to do that in a
- `nextTick` or `setTimeout` callback or it won't do anything.
-* `stale` By default, if you set a `maxAge`, it'll only actually pull
- stale items out of the cache when you `get(key)`. (That is, it's
- not pre-emptively doing a `setTimeout` or anything.) If you set
- `stale:true`, it'll return the stale value before deleting it. If
- you don't set this, then it'll return `undefined` when you try to
- get a stale entry, as if it had already been deleted.
-
-## API
-
-* `set(key, value, maxAge)`
-* `get(key) => value`
-
- Both of these will update the "recently used"-ness of the key.
- They do what you think. `maxAge` is optional and overrides the
- cache `maxAge` option if provided.
-
- If the key is not found, `get()` will return `undefined`.
-
- The key and val can be any value.
-
-* `peek(key)`
-
- Returns the key value (or `undefined` if not found) without
- updating the "recently used"-ness of the key.
-
- (If you find yourself using this a lot, you *might* be using the
- wrong sort of data structure, but there are some use cases where
- it's handy.)
-
-* `del(key)`
-
- Deletes a key out of the cache.
-
-* `reset()`
-
- Clear the cache entirely, throwing away all values.
-
-* `has(key)`
-
- Check if a key is in the cache, without updating the recent-ness
- or deleting it for being stale.
-
-* `forEach(function(value,key,cache), [thisp])`
-
- Just like `Array.prototype.forEach`. Iterates over all the keys
- in the cache, in order of recent-ness. (Ie, more recently used
- items are iterated over first.)
-
-* `rforEach(function(value,key,cache), [thisp])`
-
- The same as `cache.forEach(...)` but items are iterated over in
- reverse order. (ie, less recently used items are iterated over
- first.)
-
-* `keys()`
-
- Return an array of the keys in the cache.
-
-* `values()`
-
- Return an array of the values in the cache.
-
-* `length`
-
- Return total length of objects in cache taking into account
- `length` options function.
-
-* `itemCount`
-
- Return total quantity of objects currently in cache. Note, that
- `stale` (see options) items are returned as part of this item
- count.
-
-* `dump()`
-
- Return an array of the cache entries ready for serialization and usage
- with 'destinationCache.load(arr)`.
-
-* `load(cacheEntriesArray)`
-
- Loads another cache entries array, obtained with `sourceCache.dump()`,
- into the cache. The destination cache is reset before loading new entries
-
-* `prune()`
-
- Manually iterates over the entire cache proactively pruning old entries
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/lib/lru-cache.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/lib/lru-cache.js
deleted file mode 100644
index e98ef78a5..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/lib/lru-cache.js
+++ /dev/null
@@ -1,469 +0,0 @@
-module.exports = LRUCache
-
-// This will be a proper iterable 'Map' in engines that support it,
-// or a fakey-fake PseudoMap in older versions.
-var Map = require('pseudomap')
-var util = require('util')
-
-// A linked list to keep track of recently-used-ness
-var Yallist = require('yallist')
-
-// use symbols if possible, otherwise just _props
-var symbols = {}
-var hasSymbol = typeof Symbol === 'function'
-var makeSymbol
-/* istanbul ignore if */
-if (hasSymbol) {
- makeSymbol = function (key) {
- return Symbol.for(key)
- }
-} else {
- makeSymbol = function (key) {
- return '_' + key
- }
-}
-
-function priv (obj, key, val) {
- var sym
- if (symbols[key]) {
- sym = symbols[key]
- } else {
- sym = makeSymbol(key)
- symbols[key] = sym
- }
- if (arguments.length === 2) {
- return obj[sym]
- } else {
- obj[sym] = val
- return val
- }
-}
-
-function naiveLength () { return 1 }
-
-// lruList is a yallist where the head is the youngest
-// item, and the tail is the oldest. the list contains the Hit
-// objects as the entries.
-// Each Hit object has a reference to its Yallist.Node. This
-// never changes.
-//
-// cache is a Map (or PseudoMap) that matches the keys to
-// the Yallist.Node object.
-function LRUCache (options) {
- if (!(this instanceof LRUCache)) {
- return new LRUCache(options)
- }
-
- if (typeof options === 'number') {
- options = { max: options }
- }
-
- if (!options) {
- options = {}
- }
-
- var max = priv(this, 'max', options.max)
- // Kind of weird to have a default max of Infinity, but oh well.
- if (!max ||
- !(typeof max === 'number') ||
- max <= 0) {
- priv(this, 'max', Infinity)
- }
-
- var lc = options.length || naiveLength
- if (typeof lc !== 'function') {
- lc = naiveLength
- }
- priv(this, 'lengthCalculator', lc)
-
- priv(this, 'allowStale', options.stale || false)
- priv(this, 'maxAge', options.maxAge || 0)
- priv(this, 'dispose', options.dispose)
- this.reset()
-}
-
-// resize the cache when the max changes.
-Object.defineProperty(LRUCache.prototype, 'max', {
- set: function (mL) {
- if (!mL || !(typeof mL === 'number') || mL <= 0) {
- mL = Infinity
- }
- priv(this, 'max', mL)
- trim(this)
- },
- get: function () {
- return priv(this, 'max')
- },
- enumerable: true
-})
-
-Object.defineProperty(LRUCache.prototype, 'allowStale', {
- set: function (allowStale) {
- priv(this, 'allowStale', !!allowStale)
- },
- get: function () {
- return priv(this, 'allowStale')
- },
- enumerable: true
-})
-
-Object.defineProperty(LRUCache.prototype, 'maxAge', {
- set: function (mA) {
- if (!mA || !(typeof mA === 'number') || mA < 0) {
- mA = 0
- }
- priv(this, 'maxAge', mA)
- trim(this)
- },
- get: function () {
- return priv(this, 'maxAge')
- },
- enumerable: true
-})
-
-// resize the cache when the lengthCalculator changes.
-Object.defineProperty(LRUCache.prototype, 'lengthCalculator', {
- set: function (lC) {
- if (typeof lC !== 'function') {
- lC = naiveLength
- }
- if (lC !== priv(this, 'lengthCalculator')) {
- priv(this, 'lengthCalculator', lC)
- priv(this, 'length', 0)
- priv(this, 'lruList').forEach(function (hit) {
- hit.length = priv(this, 'lengthCalculator').call(this, hit.value, hit.key)
- priv(this, 'length', priv(this, 'length') + hit.length)
- }, this)
- }
- trim(this)
- },
- get: function () { return priv(this, 'lengthCalculator') },
- enumerable: true
-})
-
-Object.defineProperty(LRUCache.prototype, 'length', {
- get: function () { return priv(this, 'length') },
- enumerable: true
-})
-
-Object.defineProperty(LRUCache.prototype, 'itemCount', {
- get: function () { return priv(this, 'lruList').length },
- enumerable: true
-})
-
-LRUCache.prototype.rforEach = function (fn, thisp) {
- thisp = thisp || this
- for (var walker = priv(this, 'lruList').tail; walker !== null;) {
- var prev = walker.prev
- forEachStep(this, fn, walker, thisp)
- walker = prev
- }
-}
-
-function forEachStep (self, fn, node, thisp) {
- var hit = node.value
- if (isStale(self, hit)) {
- del(self, node)
- if (!priv(self, 'allowStale')) {
- hit = undefined
- }
- }
- if (hit) {
- fn.call(thisp, hit.value, hit.key, self)
- }
-}
-
-LRUCache.prototype.forEach = function (fn, thisp) {
- thisp = thisp || this
- for (var walker = priv(this, 'lruList').head; walker !== null;) {
- var next = walker.next
- forEachStep(this, fn, walker, thisp)
- walker = next
- }
-}
-
-LRUCache.prototype.keys = function () {
- return priv(this, 'lruList').toArray().map(function (k) {
- return k.key
- }, this)
-}
-
-LRUCache.prototype.values = function () {
- return priv(this, 'lruList').toArray().map(function (k) {
- return k.value
- }, this)
-}
-
-LRUCache.prototype.reset = function () {
- if (priv(this, 'dispose') &&
- priv(this, 'lruList') &&
- priv(this, 'lruList').length) {
- priv(this, 'lruList').forEach(function (hit) {
- priv(this, 'dispose').call(this, hit.key, hit.value)
- }, this)
- }
-
- priv(this, 'cache', new Map()) // hash of items by key
- priv(this, 'lruList', new Yallist()) // list of items in order of use recency
- priv(this, 'length', 0) // length of items in the list
-}
-
-LRUCache.prototype.dump = function () {
- return priv(this, 'lruList').map(function (hit) {
- if (!isStale(this, hit)) {
- return {
- k: hit.key,
- v: hit.value,
- e: hit.now + (hit.maxAge || 0)
- }
- }
- }, this).toArray().filter(function (h) {
- return h
- })
-}
-
-LRUCache.prototype.dumpLru = function () {
- return priv(this, 'lruList')
-}
-
-LRUCache.prototype.inspect = function (n, opts) {
- var str = 'LRUCache {'
- var extras = false
-
- var as = priv(this, 'allowStale')
- if (as) {
- str += '\n allowStale: true'
- extras = true
- }
-
- var max = priv(this, 'max')
- if (max && max !== Infinity) {
- if (extras) {
- str += ','
- }
- str += '\n max: ' + util.inspect(max, opts)
- extras = true
- }
-
- var maxAge = priv(this, 'maxAge')
- if (maxAge) {
- if (extras) {
- str += ','
- }
- str += '\n maxAge: ' + util.inspect(maxAge, opts)
- extras = true
- }
-
- var lc = priv(this, 'lengthCalculator')
- if (lc && lc !== naiveLength) {
- if (extras) {
- str += ','
- }
- str += '\n length: ' + util.inspect(priv(this, 'length'), opts)
- extras = true
- }
-
- var didFirst = false
- priv(this, 'lruList').forEach(function (item) {
- if (didFirst) {
- str += ',\n '
- } else {
- if (extras) {
- str += ',\n'
- }
- didFirst = true
- str += '\n '
- }
- var key = util.inspect(item.key).split('\n').join('\n ')
- var val = { value: item.value }
- if (item.maxAge !== maxAge) {
- val.maxAge = item.maxAge
- }
- if (lc !== naiveLength) {
- val.length = item.length
- }
- if (isStale(this, item)) {
- val.stale = true
- }
-
- val = util.inspect(val, opts).split('\n').join('\n ')
- str += key + ' => ' + val
- })
-
- if (didFirst || extras) {
- str += '\n'
- }
- str += '}'
-
- return str
-}
-
-LRUCache.prototype.set = function (key, value, maxAge) {
- maxAge = maxAge || priv(this, 'maxAge')
-
- var now = maxAge ? Date.now() : 0
- var len = priv(this, 'lengthCalculator').call(this, value, key)
-
- if (priv(this, 'cache').has(key)) {
- if (len > priv(this, 'max')) {
- del(this, priv(this, 'cache').get(key))
- return false
- }
-
- var node = priv(this, 'cache').get(key)
- var item = node.value
-
- // dispose of the old one before overwriting
- if (priv(this, 'dispose')) {
- priv(this, 'dispose').call(this, key, item.value)
- }
-
- item.now = now
- item.maxAge = maxAge
- item.value = value
- priv(this, 'length', priv(this, 'length') + (len - item.length))
- item.length = len
- this.get(key)
- trim(this)
- return true
- }
-
- var hit = new Entry(key, value, len, now, maxAge)
-
- // oversized objects fall out of cache automatically.
- if (hit.length > priv(this, 'max')) {
- if (priv(this, 'dispose')) {
- priv(this, 'dispose').call(this, key, value)
- }
- return false
- }
-
- priv(this, 'length', priv(this, 'length') + hit.length)
- priv(this, 'lruList').unshift(hit)
- priv(this, 'cache').set(key, priv(this, 'lruList').head)
- trim(this)
- return true
-}
-
-LRUCache.prototype.has = function (key) {
- if (!priv(this, 'cache').has(key)) return false
- var hit = priv(this, 'cache').get(key).value
- if (isStale(this, hit)) {
- return false
- }
- return true
-}
-
-LRUCache.prototype.get = function (key) {
- return get(this, key, true)
-}
-
-LRUCache.prototype.peek = function (key) {
- return get(this, key, false)
-}
-
-LRUCache.prototype.pop = function () {
- var node = priv(this, 'lruList').tail
- if (!node) return null
- del(this, node)
- return node.value
-}
-
-LRUCache.prototype.del = function (key) {
- del(this, priv(this, 'cache').get(key))
-}
-
-LRUCache.prototype.load = function (arr) {
- // reset the cache
- this.reset()
-
- var now = Date.now()
- // A previous serialized cache has the most recent items first
- for (var l = arr.length - 1; l >= 0; l--) {
- var hit = arr[l]
- var expiresAt = hit.e || 0
- if (expiresAt === 0) {
- // the item was created without expiration in a non aged cache
- this.set(hit.k, hit.v)
- } else {
- var maxAge = expiresAt - now
- // dont add already expired items
- if (maxAge > 0) {
- this.set(hit.k, hit.v, maxAge)
- }
- }
- }
-}
-
-LRUCache.prototype.prune = function () {
- var self = this
- priv(this, 'cache').forEach(function (value, key) {
- get(self, key, false)
- })
-}
-
-function get (self, key, doUse) {
- var node = priv(self, 'cache').get(key)
- if (node) {
- var hit = node.value
- if (isStale(self, hit)) {
- del(self, node)
- if (!priv(self, 'allowStale')) hit = undefined
- } else {
- if (doUse) {
- priv(self, 'lruList').unshiftNode(node)
- }
- }
- if (hit) hit = hit.value
- }
- return hit
-}
-
-function isStale (self, hit) {
- if (!hit || (!hit.maxAge && !priv(self, 'maxAge'))) {
- return false
- }
- var stale = false
- var diff = Date.now() - hit.now
- if (hit.maxAge) {
- stale = diff > hit.maxAge
- } else {
- stale = priv(self, 'maxAge') && (diff > priv(self, 'maxAge'))
- }
- return stale
-}
-
-function trim (self) {
- if (priv(self, 'length') > priv(self, 'max')) {
- for (var walker = priv(self, 'lruList').tail;
- priv(self, 'length') > priv(self, 'max') && walker !== null;) {
- // We know that we're about to delete this one, and also
- // what the next least recently used key will be, so just
- // go ahead and set it now.
- var prev = walker.prev
- del(self, walker)
- walker = prev
- }
- }
-}
-
-function del (self, node) {
- if (node) {
- var hit = node.value
- if (priv(self, 'dispose')) {
- priv(self, 'dispose').call(this, hit.key, hit.value)
- }
- priv(self, 'length', priv(self, 'length') - hit.length)
- priv(self, 'cache').delete(hit.key)
- priv(self, 'lruList').removeNode(node)
- }
-}
-
-// classy, since V8 prefers predictable objects.
-function Entry (key, value, length, now, maxAge) {
- this.key = key
- this.value = value
- this.length = length
- this.now = now
- this.maxAge = maxAge || 0
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/LICENSE b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/LICENSE
deleted file mode 100644
index 19129e315..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/README.md b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/README.md
deleted file mode 100644
index 778bf01df..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/README.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# pseudomap
-
-A thing that is a lot like ES6 `Map`, but without iterators, for use
-in environments where `for..of` syntax and `Map` are not available.
-
-If you need iterators, or just in general a more faithful polyfill to
-ES6 Maps, check out [es6-map](http://npm.im/es6-map).
-
-If you are in an environment where `Map` is supported, then that will
-be returned instead, unless `process.env.TEST_PSEUDOMAP` is set.
-
-You can use any value as keys, and any value as data. Setting again
-with the identical key will overwrite the previous value.
-
-Internally, data is stored on an `Object.create(null)` style object.
-The key is coerced to a string to generate the key on the internal
-data-bag object. The original key used is stored along with the data.
-
-In the event of a stringified-key collision, a new key is generated by
-appending an increasing number to the stringified-key until finding
-either the intended key or an empty spot.
-
-Note that because object traversal order of plain objects is not
-guaranteed to be identical to insertion order, the insertion order
-guarantee of `Map.prototype.forEach` is not guaranteed in this
-implementation. However, in all versions of Node.js and V8 where this
-module works, `forEach` does traverse data in insertion order.
-
-## API
-
-Most of the [Map
-API](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map),
-with the following exceptions:
-
-1. A `Map` object is not an iterator.
-2. `values`, `keys`, and `entries` methods are not implemented,
- because they return iterators.
-3. The argument to the constructor can be an Array of `[key, value]`
- pairs, or a `Map` or `PseudoMap` object. But, since iterators
- aren't used, passing any plain-old iterator won't initialize the
- map properly.
-
-## USAGE
-
-Use just like a regular ES6 Map.
-
-```javascript
-var PseudoMap = require('pseudomap')
-
-// optionally provide a pseudomap, or an array of [key,value] pairs
-// as the argument to initialize the map with
-var myMap = new PseudoMap()
-
-myMap.set(1, 'number 1')
-myMap.set('1', 'string 1')
-var akey = {}
-var bkey = {}
-myMap.set(akey, { some: 'data' })
-myMap.set(bkey, { some: 'other data' })
-```
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/map.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/map.js
deleted file mode 100644
index 7db159946..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/map.js
+++ /dev/null
@@ -1,9 +0,0 @@
-if (process.env.npm_package_name === 'pseudomap' &&
- process.env.npm_lifecycle_script === 'test')
- process.env.TEST_PSEUDOMAP = 'true'
-
-if (typeof Map === 'function' && !process.env.TEST_PSEUDOMAP) {
- module.exports = Map
-} else {
- module.exports = require('./pseudomap')
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/package.json b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/package.json
deleted file mode 100644
index 8e1129b8d..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/package.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "_args": [
- [
- "pseudomap@^1.0.1",
- "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache"
- ]
- ],
- "_from": "pseudomap@>=1.0.1 <2.0.0",
- "_id": "pseudomap@1.0.2",
- "_inCache": true,
- "_installable": true,
- "_location": "/request/aws4/lru-cache/pseudomap",
- "_nodeVersion": "4.0.0",
- "_npmUser": {
- "email": "i@izs.me",
- "name": "isaacs"
- },
- "_npmVersion": "3.3.2",
- "_phantomChildren": {},
- "_requested": {
- "name": "pseudomap",
- "raw": "pseudomap@^1.0.1",
- "rawSpec": "^1.0.1",
- "scope": null,
- "spec": ">=1.0.1 <2.0.0",
- "type": "range"
- },
- "_requiredBy": [
- "/request/aws4/lru-cache"
- ],
- "_resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "_shasum": "f052a28da70e618917ef0a8ac34c1ae5a68286b3",
- "_shrinkwrap": null,
- "_spec": "pseudomap@^1.0.1",
- "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache",
- "author": {
- "email": "i@izs.me",
- "name": "Isaac Z. Schlueter",
- "url": "http://blog.izs.me/"
- },
- "bugs": {
- "url": "https://github.com/isaacs/pseudomap/issues"
- },
- "dependencies": {},
- "description": "A thing that is a lot like ES6 `Map`, but without iterators, for use in environments where `for..of` syntax and `Map` are not available.",
- "devDependencies": {
- "tap": "^2.3.1"
- },
- "directories": {
- "test": "test"
- },
- "dist": {
- "shasum": "f052a28da70e618917ef0a8ac34c1ae5a68286b3",
- "tarball": "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
- },
- "gitHead": "b6dc728207a0321ede6479e34506d3e0e13a940b",
- "homepage": "https://github.com/isaacs/pseudomap#readme",
- "license": "ISC",
- "main": "map.js",
- "maintainers": [
- {
- "email": "i@izs.me",
- "name": "isaacs"
- }
- ],
- "name": "pseudomap",
- "optionalDependencies": {},
- "readme": "ERROR: No README data found!",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/isaacs/pseudomap.git"
- },
- "scripts": {
- "test": "tap test/*.js"
- },
- "version": "1.0.2"
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/pseudomap.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/pseudomap.js
deleted file mode 100644
index 25a21d829..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/pseudomap.js
+++ /dev/null
@@ -1,113 +0,0 @@
-var hasOwnProperty = Object.prototype.hasOwnProperty
-
-module.exports = PseudoMap
-
-function PseudoMap (set) {
- if (!(this instanceof PseudoMap)) // whyyyyyyy
- throw new TypeError("Constructor PseudoMap requires 'new'")
-
- this.clear()
-
- if (set) {
- if ((set instanceof PseudoMap) ||
- (typeof Map === 'function' && set instanceof Map))
- set.forEach(function (value, key) {
- this.set(key, value)
- }, this)
- else if (Array.isArray(set))
- set.forEach(function (kv) {
- this.set(kv[0], kv[1])
- }, this)
- else
- throw new TypeError('invalid argument')
- }
-}
-
-PseudoMap.prototype.forEach = function (fn, thisp) {
- thisp = thisp || this
- Object.keys(this._data).forEach(function (k) {
- if (k !== 'size')
- fn.call(thisp, this._data[k].value, this._data[k].key)
- }, this)
-}
-
-PseudoMap.prototype.has = function (k) {
- return !!find(this._data, k)
-}
-
-PseudoMap.prototype.get = function (k) {
- var res = find(this._data, k)
- return res && res.value
-}
-
-PseudoMap.prototype.set = function (k, v) {
- set(this._data, k, v)
-}
-
-PseudoMap.prototype.delete = function (k) {
- var res = find(this._data, k)
- if (res) {
- delete this._data[res._index]
- this._data.size--
- }
-}
-
-PseudoMap.prototype.clear = function () {
- var data = Object.create(null)
- data.size = 0
-
- Object.defineProperty(this, '_data', {
- value: data,
- enumerable: false,
- configurable: true,
- writable: false
- })
-}
-
-Object.defineProperty(PseudoMap.prototype, 'size', {
- get: function () {
- return this._data.size
- },
- set: function (n) {},
- enumerable: true,
- configurable: true
-})
-
-PseudoMap.prototype.values =
-PseudoMap.prototype.keys =
-PseudoMap.prototype.entries = function () {
- throw new Error('iterators are not implemented in this version')
-}
-
-// Either identical, or both NaN
-function same (a, b) {
- return a === b || a !== a && b !== b
-}
-
-function Entry (k, v, i) {
- this.key = k
- this.value = v
- this._index = i
-}
-
-function find (data, k) {
- for (var i = 0, s = '_' + k, key = s;
- hasOwnProperty.call(data, key);
- key = s + i++) {
- if (same(data[key].key, k))
- return data[key]
- }
-}
-
-function set (data, k, v) {
- for (var i = 0, s = '_' + k, key = s;
- hasOwnProperty.call(data, key);
- key = s + i++) {
- if (same(data[key].key, k)) {
- data[key].value = v
- return
- }
- }
- data.size++
- data[key] = new Entry(k, v, key)
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/test/basic.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/test/basic.js
deleted file mode 100644
index 4378e4541..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/pseudomap/test/basic.js
+++ /dev/null
@@ -1,86 +0,0 @@
-var t = require('tap')
-
-process.env.TEST_PSEUDOMAP = 'true'
-
-var PM = require('../')
-runTests(PM)
-
-// if possible, verify that Map also behaves the same way
-if (typeof Map === 'function')
- runTests(Map)
-
-
-function runTests (Map) {
- t.throws(Map)
-
- var m = new Map()
-
- t.equal(m.size, 0)
-
- m.set(1, '1 string')
- t.equal(m.get(1), '1 string')
- t.equal(m.size, 1)
- m.size = 1000
- t.equal(m.size, 1)
- m.size = 0
- t.equal(m.size, 1)
-
- m = new Map([[1, 'number 1'], ['1', 'string 1']])
- t.equal(m.get(1), 'number 1')
- t.equal(m.get('1'), 'string 1')
- t.equal(m.size, 2)
-
- m = new Map(m)
- t.equal(m.get(1), 'number 1')
- t.equal(m.get('1'), 'string 1')
- t.equal(m.size, 2)
-
- var akey = {}
- var bkey = {}
- m.set(akey, { some: 'data' })
- m.set(bkey, { some: 'other data' })
- t.same(m.get(akey), { some: 'data' })
- t.same(m.get(bkey), { some: 'other data' })
- t.equal(m.size, 4)
-
- var x = /x/
- var y = /x/
- m.set(x, 'x regex')
- m.set(y, 'y regex')
- t.equal(m.get(x), 'x regex')
- m.set(x, 'x again')
- t.equal(m.get(x), 'x again')
- t.equal(m.size, 6)
-
- m.set(NaN, 'not a number')
- t.equal(m.get(NaN), 'not a number')
- m.set(NaN, 'it is a ' + typeof NaN)
- t.equal(m.get(NaN), 'it is a number')
- m.set('NaN', 'stringie nan')
- t.equal(m.get(NaN), 'it is a number')
- t.equal(m.get('NaN'), 'stringie nan')
- t.equal(m.size, 8)
-
- m.delete(NaN)
- t.equal(m.get(NaN), undefined)
- t.equal(m.size, 7)
-
- var expect = [
- { value: 'number 1', key: 1 },
- { value: 'string 1', key: '1' },
- { value: { some: 'data' }, key: {} },
- { value: { some: 'other data' }, key: {} },
- { value: 'x again', key: /x/ },
- { value: 'y regex', key: /x/ },
- { value: 'stringie nan', key: 'NaN' }
- ]
- var actual = []
-
- m.forEach(function (value, key) {
- actual.push({ value: value, key: key })
- })
- t.same(actual, expect)
-
- m.clear()
- t.equal(m.size, 0)
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.npmignore b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.npmignore
deleted file mode 100644
index 534108e3f..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.npmignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules/
-coverage/
-.nyc_output/
-nyc_output/
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.travis.yml b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.travis.yml
deleted file mode 100644
index 9c1a7b6cc..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-sudo: false
-language: node_js
-node_js:
- - '0.10'
- - '0.12'
- - '4'
- - '5'
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/CONTRIBUTING.md b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/CONTRIBUTING.md
deleted file mode 100644
index 5f51e6f1e..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/CONTRIBUTING.md
+++ /dev/null
@@ -1,4 +0,0 @@
-1. The whole API is public. No underscore-prefixed pretend-private
- things or hidden Object.create magic mumbo jumbo here. Plain old
- objects that are created from constructors.
-2. 100% test coverage must be maintained.
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/LICENSE b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/LICENSE
deleted file mode 100644
index 19129e315..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/README.md b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/README.md
deleted file mode 100644
index f58610186..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/README.md
+++ /dev/null
@@ -1,204 +0,0 @@
-# yallist
-
-Yet Another Linked List
-
-There are many doubly-linked list implementations like it, but this
-one is mine.
-
-For when an array would be too big, and a Map can't be iterated in
-reverse order.
-
-
-[![Build Status](https://travis-ci.org/isaacs/yallist.svg?branch=master)](https://travis-ci.org/isaacs/yallist) [![Coverage Status](https://coveralls.io/repos/isaacs/yallist/badge.svg?service=github)](https://coveralls.io/github/isaacs/yallist)
-
-## basic usage
-
-```javascript
-var yallist = require('yallist')
-var myList = yallist.create([1, 2, 3])
-myList.push('foo')
-myList.unshift('bar')
-// of course pop() and shift() are there, too
-console.log(myList.toArray()) // ['bar', 1, 2, 3, 'foo']
-myList.forEach(function (k) {
- // walk the list head to tail
-})
-myList.forEachReverse(function (k, index, list) {
- // walk the list tail to head
-})
-var myDoubledList = myList.map(function (k) {
- return k + k
-})
-// now myDoubledList contains ['barbar', 2, 4, 6, 'foofoo']
-// mapReverse is also a thing
-var myDoubledListReverse = myList.mapReverse(function (k) {
- return k + k
-}) // ['foofoo', 6, 4, 2, 'barbar']
-
-var reduced = myList.reduce(function (set, entry) {
- set += entry
- return set
-}, 'start')
-console.log(reduced) // 'startfoo123bar'
-```
-
-## api
-
-The whole API is considered "public".
-
-Functions with the same name as an Array method work more or less the
-same way.
-
-There's reverse versions of most things because that's the point.
-
-### Yallist
-
-Default export, the class that holds and manages a list.
-
-Call it with either a forEach-able (like an array) or a set of
-arguments, to initialize the list.
-
-The Array-ish methods all act like you'd expect. No magic length,
-though, so if you change that it won't automatically prune or add
-empty spots.
-
-### Yallist.create(..)
-
-Alias for Yallist function. Some people like factories.
-
-#### yallist.head
-
-The first node in the list
-
-#### yallist.tail
-
-The last node in the list
-
-#### yallist.length
-
-The number of nodes in the list. (Change this at your peril. It is
-not magic like Array length.)
-
-#### yallist.toArray()
-
-Convert the list to an array.
-
-#### yallist.forEach(fn, [thisp])
-
-Call a function on each item in the list.
-
-#### yallist.forEachReverse(fn, [thisp])
-
-Call a function on each item in the list, in reverse order.
-
-#### yallist.get(n)
-
-Get the data at position `n` in the list. If you use this a lot,
-probably better off just using an Array.
-
-#### yallist.getReverse(n)
-
-Get the data at position `n`, counting from the tail.
-
-#### yallist.map(fn, thisp)
-
-Create a new Yallist with the result of calling the function on each
-item.
-
-#### yallist.mapReverse(fn, thisp)
-
-Same as `map`, but in reverse.
-
-#### yallist.pop()
-
-Get the data from the list tail, and remove the tail from the list.
-
-#### yallist.push(item, ...)
-
-Insert one or more items to the tail of the list.
-
-#### yallist.reduce(fn, initialValue)
-
-Like Array.reduce.
-
-#### yallist.reduceReverse
-
-Like Array.reduce, but in reverse.
-
-#### yallist.reverse
-
-Reverse the list in place.
-
-#### yallist.shift()
-
-Get the data from the list head, and remove the head from the list.
-
-#### yallist.slice([from], [to])
-
-Just like Array.slice, but returns a new Yallist.
-
-#### yallist.sliceReverse([from], [to])
-
-Just like yallist.slice, but the result is returned in reverse.
-
-#### yallist.toArray()
-
-Create an array representation of the list.
-
-#### yallist.toArrayReverse()
-
-Create a reversed array representation of the list.
-
-#### yallist.unshift(item, ...)
-
-Insert one or more items to the head of the list.
-
-#### yallist.unshiftNode(node)
-
-Move a Node object to the front of the list. (That is, pull it out of
-wherever it lives, and make it the new head.)
-
-If the node belongs to a different list, then that list will remove it
-first.
-
-#### yallist.pushNode(node)
-
-Move a Node object to the end of the list. (That is, pull it out of
-wherever it lives, and make it the new tail.)
-
-If the node belongs to a list already, then that list will remove it
-first.
-
-#### yallist.removeNode(node)
-
-Remove a node from the list, preserving referential integrity of head
-and tail and other nodes.
-
-Will throw an error if you try to have a list remove a node that
-doesn't belong to it.
-
-### Yallist.Node
-
-The class that holds the data and is actually the list.
-
-Call with `var n = new Node(value, previousNode, nextNode)`
-
-Note that if you do direct operations on Nodes themselves, it's very
-easy to get into weird states where the list is broken. Be careful :)
-
-#### node.next
-
-The next node in the list.
-
-#### node.prev
-
-The previous node in the list.
-
-#### node.value
-
-The data the node contains.
-
-#### node.list
-
-The list to which this node belongs. (Null if it does not belong to
-any list.)
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/package.json b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/package.json
deleted file mode 100644
index a1c290b52..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/package.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "_args": [
- [
- "yallist@^2.0.0",
- "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache"
- ]
- ],
- "_from": "yallist@>=2.0.0 <3.0.0",
- "_id": "yallist@2.0.0",
- "_inCache": true,
- "_installable": true,
- "_location": "/request/aws4/lru-cache/yallist",
- "_nodeVersion": "4.0.0",
- "_npmUser": {
- "email": "i@izs.me",
- "name": "isaacs"
- },
- "_npmVersion": "3.3.2",
- "_phantomChildren": {},
- "_requested": {
- "name": "yallist",
- "raw": "yallist@^2.0.0",
- "rawSpec": "^2.0.0",
- "scope": null,
- "spec": ">=2.0.0 <3.0.0",
- "type": "range"
- },
- "_requiredBy": [
- "/request/aws4/lru-cache"
- ],
- "_resolved": "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz",
- "_shasum": "306c543835f09ee1a4cb23b7bce9ab341c91cdd4",
- "_shrinkwrap": null,
- "_spec": "yallist@^2.0.0",
- "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4/node_modules/lru-cache",
- "author": {
- "email": "i@izs.me",
- "name": "Isaac Z. Schlueter",
- "url": "http://blog.izs.me/"
- },
- "bugs": {
- "url": "https://github.com/isaacs/yallist/issues"
- },
- "dependencies": {},
- "description": "Yet Another Linked List",
- "devDependencies": {
- "tap": "^2.3.2"
- },
- "directories": {
- "test": "test"
- },
- "dist": {
- "shasum": "306c543835f09ee1a4cb23b7bce9ab341c91cdd4",
- "tarball": "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"
- },
- "gitHead": "702eaba87deefa9f8fc2f8e36cb225bc2141fdc3",
- "homepage": "https://github.com/isaacs/yallist#readme",
- "license": "ISC",
- "main": "yallist.js",
- "maintainers": [
- {
- "email": "i@izs.me",
- "name": "isaacs"
- }
- ],
- "name": "yallist",
- "optionalDependencies": {},
- "readme": "ERROR: No README data found!",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/isaacs/yallist.git"
- },
- "scripts": {
- "test": "tap test/*.js --cov"
- },
- "version": "2.0.0"
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/test/basic.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/test/basic.js
deleted file mode 100644
index 42a9eedca..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/test/basic.js
+++ /dev/null
@@ -1,188 +0,0 @@
-var t = require('tap')
-var Yallist = require('../yallist.js')
-
-var y = new Yallist(1,2,3,4,5)
-var z = new Yallist([1,2,3,4,5])
-t.similar(y, z, 'build from single list or args')
-
-function add10 (i) {
- return i + 10
-}
-t.similar(y.map(add10).toArray(), [11, 12, 13, 14, 15])
-t.similar(y.mapReverse(add10).toArray(), [15, 14, 13, 12, 11])
-
-t.similar(y.map(add10).toArrayReverse(), [15, 14, 13, 12, 11])
-t.isa(Yallist(1,2,3), 'Yallist')
-t.equal(y.push(6, 7, 8), 8)
-t.similar(y.toArray(), [1, 2, 3, 4, 5, 6, 7, 8])
-y.pop()
-y.shift()
-y.unshift(100)
-
-var expect = [100, 2, 3, 4, 5, 6, 7]
-var expectReverse = [ 7, 6, 5, 4, 3, 2, 100 ]
-
-t.similar(y.toArray(), expect)
-t.equal(y.length, y.toArray().length)
-
-t.test(function forEach (t) {
- t.plan(y.length * 2)
- y.forEach(function (item, i, list) {
- t.equal(item, expect[i])
- t.equal(list, y)
- })
-})
-
-t.test(function forEach (t) {
- t.plan(y.length * 5)
- var n = 0
- y.forEachReverse(function (item, i, list) {
- t.equal(item, expectReverse[n])
- t.equal(item, expect[i])
- t.equal(item, y.get(i))
- t.equal(item, y.getReverse(n))
- n += 1
- t.equal(list, y)
- })
-})
-
-t.equal(y.getReverse(100), undefined)
-
-t.equal(y.get(9999), undefined)
-
-
-function sum (a, b) { return a + b }
-t.equal(y.reduce(sum), 127)
-t.equal(y.reduce(sum, 100), 227)
-t.equal(y.reduceReverse(sum), 127)
-t.equal(y.reduceReverse(sum, 100), 227)
-
-t.equal(Yallist().pop(), undefined)
-t.equal(Yallist().shift(), undefined)
-
-var x = Yallist()
-x.unshift(1)
-t.equal(x.length, 1)
-t.similar(x.toArray(), [1])
-
-// verify that y.toArray() returns an array and if we create a
-// new Yallist from that array, we get a list matching
-t.similar(Yallist(y.toArray()), y)
-t.similar(Yallist.apply(null, y.toArray()), y)
-
-t.throws(function () {
- new Yallist().reduce(function () {})
-}, {}, new TypeError('Reduce of empty list with no initial value'))
-t.throws(function () {
- new Yallist().reduceReverse(function () {})
-}, {}, new TypeError('Reduce of empty list with no initial value'))
-
-var z = y.reverse()
-t.equal(z, y)
-t.similar(y.toArray(), expectReverse)
-y.reverse()
-t.similar(y.toArray(), expect)
-
-var a = Yallist(1,2,3,4,5,6)
-var cases = [
- [ [2, 4], [3, 4] ],
- [ [2, -4], [] ],
- [ [2, -2], [3, 4] ],
- [ [1, -2], [2, 3, 4] ],
- [ [-1, -2], [] ],
- [ [-5, -2], [2, 3, 4] ],
- [ [-99, 2], [1, 2] ],
- [ [5, 99], [6] ],
- [ [], [1,2,3,4,5,6] ]
-]
-t.test('slice', function (t) {
- t.plan(cases.length)
- cases.forEach(function (c) {
- t.test(JSON.stringify(c), function (t) {
- t.similar(a.slice.apply(a, c[0]), Yallist(c[1]))
- t.similar([].slice.apply(a.toArray(), c[0]), c[1])
- t.end()
- })
- })
-})
-
-t.test('sliceReverse', function (t) {
- t.plan(cases.length)
- cases.forEach(function (c) {
- var rev = c[1].slice().reverse()
- t.test(JSON.stringify([c[0], rev]), function (t) {
- t.similar(a.sliceReverse.apply(a, c[0]), Yallist(rev))
- t.similar([].slice.apply(a.toArray(), c[0]).reverse(), rev)
- t.end()
- })
- })
-})
-
-var inserter = Yallist(1,2,3,4,5)
-inserter.unshiftNode(inserter.head.next)
-t.similar(inserter.toArray(), [2,1,3,4,5])
-inserter.unshiftNode(inserter.tail)
-t.similar(inserter.toArray(), [5,2,1,3,4])
-inserter.unshiftNode(inserter.head)
-t.similar(inserter.toArray(), [5,2,1,3,4])
-
-var single = Yallist(1)
-single.unshiftNode(single.head)
-t.similar(single.toArray(), [1])
-
-inserter = Yallist(1,2,3,4,5)
-inserter.pushNode(inserter.tail.prev)
-t.similar(inserter.toArray(), [1,2,3,5,4])
-inserter.pushNode(inserter.head)
-t.similar(inserter.toArray(), [2,3,5,4,1])
-inserter.unshiftNode(inserter.head)
-t.similar(inserter.toArray(), [2,3,5,4,1])
-
-single = Yallist(1)
-single.pushNode(single.tail)
-t.similar(single.toArray(), [1])
-
-var swiped = Yallist(9,8,7)
-inserter.unshiftNode(swiped.head.next)
-t.similar(inserter.toArray(), [8,2,3,5,4,1])
-t.similar(swiped.toArray(), [9,7])
-
-swiped = Yallist(9,8,7)
-inserter.pushNode(swiped.head.next)
-t.similar(inserter.toArray(), [8,2,3,5,4,1,8])
-t.similar(swiped.toArray(), [9,7])
-
-swiped.unshiftNode(Yallist.Node(99))
-t.similar(swiped.toArray(), [99,9,7])
-swiped.pushNode(Yallist.Node(66))
-t.similar(swiped.toArray(), [99,9,7,66])
-
-var e = Yallist()
-e.unshiftNode(Yallist.Node(1))
-t.same(e.toArray(), [1])
-e = Yallist()
-e.pushNode(Yallist.Node(1))
-t.same(e.toArray(), [1])
-
-// steal them back, don't break the lists
-swiped.unshiftNode(inserter.head)
-t.same(swiped, Yallist(8,99,9,7,66))
-t.same(inserter, Yallist(2,3,5,4,1,8))
-swiped.unshiftNode(inserter.tail)
-t.same(inserter, Yallist(2,3,5,4,1))
-t.same(swiped, Yallist(8,8,99,9,7,66))
-
-
-t.throws(function remove_foreign_node () {
- e.removeNode(swiped.head)
-}, {}, new Error('removing node which does not belong to this list'))
-t.throws(function remove_unlisted_node () {
- e.removeNode(Yallist.Node('nope'))
-}, {}, new Error('removing node which does not belong to this list'))
-
-e = Yallist(1,2)
-e.removeNode(e.head)
-t.same(e, Yallist(2))
-e = Yallist(1,2)
-e.removeNode(e.tail)
-t.same(e, Yallist(1))
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/yallist.js b/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/yallist.js
deleted file mode 100644
index fb60fc287..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/node_modules/yallist/yallist.js
+++ /dev/null
@@ -1,360 +0,0 @@
-module.exports = Yallist
-
-Yallist.Node = Node
-Yallist.create = Yallist
-
-function Yallist (list) {
- var self = this
- if (!(self instanceof Yallist)) {
- self = new Yallist()
- }
-
- self.tail = null
- self.head = null
- self.length = 0
-
- if (list && typeof list.forEach === 'function') {
- list.forEach(function (item) {
- self.push(item)
- })
- } else if (arguments.length > 0) {
- for (var i = 0, l = arguments.length; i < l; i++) {
- self.push(arguments[i])
- }
- }
-
- return self
-}
-
-Yallist.prototype.removeNode = function (node) {
- if (node.list !== this) {
- throw new Error('removing node which does not belong to this list')
- }
-
- var next = node.next
- var prev = node.prev
-
- if (next) {
- next.prev = prev
- }
-
- if (prev) {
- prev.next = next
- }
-
- if (node === this.head) {
- this.head = next
- }
- if (node === this.tail) {
- this.tail = prev
- }
-
- node.list.length --
- node.next = null
- node.prev = null
- node.list = null
-}
-
-Yallist.prototype.unshiftNode = function (node) {
- if (node === this.head) {
- return
- }
-
- if (node.list) {
- node.list.removeNode(node)
- }
-
- var head = this.head
- node.list = this
- node.next = head
- if (head) {
- head.prev = node
- }
-
- this.head = node
- if (!this.tail) {
- this.tail = node
- }
- this.length ++
-}
-
-Yallist.prototype.pushNode = function (node) {
- if (node === this.tail) {
- return
- }
-
- if (node.list) {
- node.list.removeNode(node)
- }
-
- var tail = this.tail
- node.list = this
- node.prev = tail
- if (tail) {
- tail.next = node
- }
-
- this.tail = node
- if (!this.head) {
- this.head = node
- }
- this.length ++
-}
-
-Yallist.prototype.push = function () {
- for (var i = 0, l = arguments.length; i < l; i++) {
- push(this, arguments[i])
- }
- return this.length
-}
-
-Yallist.prototype.unshift = function () {
- for (var i = 0, l = arguments.length; i < l; i++) {
- unshift(this, arguments[i])
- }
- return this.length
-}
-
-Yallist.prototype.pop = function () {
- if (!this.tail)
- return undefined
-
- var res = this.tail.value
- this.tail = this.tail.prev
- this.tail.next = null
- this.length --
- return res
-}
-
-Yallist.prototype.shift = function () {
- if (!this.head)
- return undefined
-
- var res = this.head.value
- this.head = this.head.next
- this.head.prev = null
- this.length --
- return res
-}
-
-Yallist.prototype.forEach = function (fn, thisp) {
- thisp = thisp || this
- for (var walker = this.head, i = 0; walker !== null; i++) {
- fn.call(thisp, walker.value, i, this)
- walker = walker.next
- }
-}
-
-Yallist.prototype.forEachReverse = function (fn, thisp) {
- thisp = thisp || this
- for (var walker = this.tail, i = this.length - 1; walker !== null; i--) {
- fn.call(thisp, walker.value, i, this)
- walker = walker.prev
- }
-}
-
-Yallist.prototype.get = function (n) {
- for (var i = 0, walker = this.head; walker !== null && i < n; i++) {
- // abort out of the list early if we hit a cycle
- walker = walker.next
- }
- if (i === n && walker !== null) {
- return walker.value
- }
-}
-
-Yallist.prototype.getReverse = function (n) {
- for (var i = 0, walker = this.tail; walker !== null && i < n; i++) {
- // abort out of the list early if we hit a cycle
- walker = walker.prev
- }
- if (i === n && walker !== null) {
- return walker.value
- }
-}
-
-Yallist.prototype.map = function (fn, thisp) {
- thisp = thisp || this
- var res = new Yallist()
- for (var walker = this.head; walker !== null; ) {
- res.push(fn.call(thisp, walker.value, this))
- walker = walker.next
- }
- return res
-}
-
-Yallist.prototype.mapReverse = function (fn, thisp) {
- thisp = thisp || this
- var res = new Yallist()
- for (var walker = this.tail; walker !== null;) {
- res.push(fn.call(thisp, walker.value, this))
- walker = walker.prev
- }
- return res
-}
-
-Yallist.prototype.reduce = function (fn, initial) {
- var acc
- var walker = this.head
- if (arguments.length > 1) {
- acc = initial
- } else if (this.head) {
- walker = this.head.next
- acc = this.head.value
- } else {
- throw new TypeError('Reduce of empty list with no initial value')
- }
-
- for (var i = 0; walker !== null; i++) {
- acc = fn(acc, walker.value, i)
- walker = walker.next
- }
-
- return acc
-}
-
-Yallist.prototype.reduceReverse = function (fn, initial) {
- var acc
- var walker = this.tail
- if (arguments.length > 1) {
- acc = initial
- } else if (this.tail) {
- walker = this.tail.prev
- acc = this.tail.value
- } else {
- throw new TypeError('Reduce of empty list with no initial value')
- }
-
- for (var i = this.length - 1; walker !== null; i--) {
- acc = fn(acc, walker.value, i)
- walker = walker.prev
- }
-
- return acc
-}
-
-Yallist.prototype.toArray = function () {
- var arr = new Array(this.length)
- for (var i = 0, walker = this.head; walker !== null; i++) {
- arr[i] = walker.value
- walker = walker.next
- }
- return arr
-}
-
-Yallist.prototype.toArrayReverse = function () {
- var arr = new Array(this.length)
- for (var i = 0, walker = this.tail; walker !== null; i++) {
- arr[i] = walker.value
- walker = walker.prev
- }
- return arr
-}
-
-Yallist.prototype.slice = function (from, to) {
- to = to || this.length
- if (to < 0) {
- to += this.length
- }
- from = from || 0
- if (from < 0) {
- from += this.length
- }
- var ret = new Yallist()
- if (to < from || to < 0) {
- return ret
- }
- if (from < 0) {
- from = 0
- }
- if (to > this.length) {
- to = this.length
- }
- for (var i = 0, walker = this.head; walker !== null && i < from; i++) {
- walker = walker.next
- }
- for (; walker !== null && i < to; i++, walker = walker.next) {
- ret.push(walker.value)
- }
- return ret
-}
-
-Yallist.prototype.sliceReverse = function (from, to) {
- to = to || this.length
- if (to < 0) {
- to += this.length
- }
- from = from || 0
- if (from < 0) {
- from += this.length
- }
- var ret = new Yallist()
- if (to < from || to < 0) {
- return ret
- }
- if (from < 0) {
- from = 0
- }
- if (to > this.length) {
- to = this.length
- }
- for (var i = this.length, walker = this.tail; walker !== null && i > to; i--) {
- walker = walker.prev
- }
- for (; walker !== null && i > from; i--, walker = walker.prev) {
- ret.push(walker.value)
- }
- return ret
-}
-
-Yallist.prototype.reverse = function () {
- var head = this.head
- var tail = this.tail
- for (var walker = head; walker !== null; walker = walker.prev) {
- var p = walker.prev
- walker.prev = walker.next
- walker.next = p
- }
- this.head = tail
- this.tail = head
- return this
-}
-
-function push (self, item) {
- self.tail = new Node(item, self.tail, null, self)
- if (!self.head) {
- self.head = self.tail
- }
- self.length ++
-}
-
-function unshift (self, item) {
- self.head = new Node(item, null, self.head, self)
- if (!self.tail) {
- self.tail = self.head
- }
- self.length ++
-}
-
-function Node (value, prev, next, list) {
- if (!(this instanceof Node)) {
- return new Node(value, prev, next, list)
- }
-
- this.list = list
- this.value = value
-
- if (prev) {
- prev.next = this
- this.prev = prev
- } else {
- this.prev = null
- }
-
- if (next) {
- next.prev = this
- this.next = next
- } else {
- this.next = null
- }
-}
diff --git a/node_modules/request/node_modules/aws4/node_modules/lru-cache/package.json b/node_modules/request/node_modules/aws4/node_modules/lru-cache/package.json
deleted file mode 100644
index fafc088e7..000000000
--- a/node_modules/request/node_modules/aws4/node_modules/lru-cache/package.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
- "_args": [
- [
- "lru-cache@^4.0.0",
- "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4"
- ]
- ],
- "_from": "lru-cache@>=4.0.0 <5.0.0",
- "_id": "lru-cache@4.0.1",
- "_inCache": true,
- "_installable": true,
- "_location": "/request/aws4/lru-cache",
- "_nodeVersion": "5.6.0",
- "_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/lru-cache-4.0.1.tgz_1458667372415_0.8005518841091543"
- },
- "_npmUser": {
- "email": "i@izs.me",
- "name": "isaacs"
- },
- "_npmVersion": "3.7.3",
- "_phantomChildren": {},
- "_requested": {
- "name": "lru-cache",
- "raw": "lru-cache@^4.0.0",
- "rawSpec": "^4.0.0",
- "scope": null,
- "spec": ">=4.0.0 <5.0.0",
- "type": "range"
- },
- "_requiredBy": [
- "/request/aws4"
- ],
- "_resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
- "_shasum": "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be",
- "_shrinkwrap": null,
- "_spec": "lru-cache@^4.0.0",
- "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/aws4",
- "author": {
- "email": "i@izs.me",
- "name": "Isaac Z. Schlueter"
- },
- "bugs": {
- "url": "https://github.com/isaacs/node-lru-cache/issues"
- },
- "dependencies": {
- "pseudomap": "^1.0.1",
- "yallist": "^2.0.0"
- },
- "description": "A cache object that deletes the least-recently-used items.",
- "devDependencies": {
- "standard": "^5.4.1",
- "tap": "^5.1.1"
- },
- "directories": {},
- "dist": {
- "shasum": "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be",
- "tarball": "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"
- },
- "files": [
- "lib/lru-cache.js"
- ],
- "gitHead": "6cd8c8a43cf56c585bdb696faae94f9836cb9e28",
- "homepage": "https://github.com/isaacs/node-lru-cache#readme",
- "keywords": [
- "mru",
- "lru",
- "cache"
- ],
- "license": "ISC",
- "main": "lib/lru-cache.js",
- "maintainers": [
- {
- "email": "isaacs@npmjs.com",
- "name": "isaacs"
- },
- {
- "email": "ogd@aoaioxxysz.net",
- "name": "othiym23"
- }
- ],
- "name": "lru-cache",
- "optionalDependencies": {},
- "readme": "ERROR: No README data found!",
- "repository": {
- "type": "git",
- "url": "git://github.com/isaacs/node-lru-cache.git"
- },
- "scripts": {
- "posttest": "standard test/*.js lib/*.js",
- "test": "tap test --branches=100 --functions=100 --lines=100 --statements=100"
- },
- "version": "4.0.1"
-}
diff --git a/node_modules/request/node_modules/aws4/package.json b/node_modules/request/node_modules/aws4/package.json
index 5e7ae9de2..7151d7aae 100644
--- a/node_modules/request/node_modules/aws4/package.json
+++ b/node_modules/request/node_modules/aws4/package.json
@@ -1,53 +1,60 @@
{
"_args": [
[
- "aws4@^1.2.1",
+ {
+ "raw": "aws4@^1.2.1",
+ "scope": null,
+ "escapedName": "aws4",
+ "name": "aws4",
+ "rawSpec": "^1.2.1",
+ "spec": ">=1.2.1 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "aws4@>=1.2.1 <2.0.0",
- "_id": "aws4@1.3.2",
+ "_id": "aws4@1.4.1",
"_inCache": true,
"_installable": true,
"_location": "/request/aws4",
- "_nodeVersion": "4.3.1",
+ "_nodeVersion": "4.4.3",
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/aws4-1.3.2.tgz_1456871543899_0.13955276948399842"
+ "tmp": "tmp/aws4-1.4.1.tgz_1462643218465_0.6527479749638587"
},
"_npmUser": {
- "email": "michael.hart.au@gmail.com",
- "name": "hichaelmart"
+ "name": "hichaelmart",
+ "email": "michael.hart.au@gmail.com"
},
- "_npmVersion": "2.14.21",
+ "_npmVersion": "2.15.4",
"_phantomChildren": {},
"_requested": {
- "name": "aws4",
"raw": "aws4@^1.2.1",
- "rawSpec": "^1.2.1",
"scope": null,
+ "escapedName": "aws4",
+ "name": "aws4",
+ "rawSpec": "^1.2.1",
"spec": ">=1.2.1 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/request"
],
- "_resolved": "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz",
- "_shasum": "d39e0bee412ced0e8ed94a23e314f313a95b9fd1",
+ "_resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz",
+ "_shasum": "fde7d5292466d230e5ee0f4e038d9dfaab08fc61",
"_shrinkwrap": null,
"_spec": "aws4@^1.2.1",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "michael.hart.au@gmail.com",
"name": "Michael Hart",
+ "email": "michael.hart.au@gmail.com",
"url": "http://github.com/mhart"
},
"bugs": {
"url": "https://github.com/mhart/aws4/issues"
},
- "dependencies": {
- "lru-cache": "^4.0.0"
- },
+ "dependencies": {},
"description": "Signs and prepares requests using AWS Signature Version 4",
"devDependencies": {
"mocha": "^2.4.5",
@@ -55,10 +62,10 @@
},
"directories": {},
"dist": {
- "shasum": "d39e0bee412ced0e8ed94a23e314f313a95b9fd1",
- "tarball": "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz"
+ "shasum": "fde7d5292466d230e5ee0f4e038d9dfaab08fc61",
+ "tarball": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
},
- "gitHead": "e899db3aacbf2a034398f7dd483345dc793e8d72",
+ "gitHead": "f126d3ff80be1ddde0fc6b50bb51a7f199547e81",
"homepage": "https://github.com/mhart/aws4#readme",
"keywords": [
"amazon",
@@ -116,8 +123,8 @@
"main": "aws4.js",
"maintainers": [
{
- "email": "michael.hart.au@gmail.com",
- "name": "hichaelmart"
+ "name": "hichaelmart",
+ "email": "michael.hart.au@gmail.com"
}
],
"name": "aws4",
@@ -130,5 +137,5 @@
"scripts": {
"test": "mocha ./test/fast.js ./test/slow.js -b -t 100s -R list"
},
- "version": "1.3.2"
+ "version": "1.4.1"
}
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
index 1be49d90f..14b70d3d2 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/core-util-is/package.json
@@ -1,11 +1,15 @@
{
"_args": [
[
- "core-util-is@~1.0.0",
- "/Users/rebecca/code/npm/node_modules/readable-stream"
- ],
- [
- "core-util-is@~1.0.0",
+ {
+ "raw": "core-util-is@~1.0.0",
+ "scope": null,
+ "escapedName": "core-util-is",
+ "name": "core-util-is",
+ "rawSpec": "~1.0.0",
+ "spec": ">=1.0.0 <1.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream"
]
],
@@ -16,28 +20,31 @@
"_location": "/request/bl/readable-stream/core-util-is",
"_nodeVersion": "4.0.0",
"_npmUser": {
- "email": "i@izs.me",
- "name": "isaacs"
+ "name": "isaacs",
+ "email": "i@izs.me"
},
"_npmVersion": "3.3.2",
"_phantomChildren": {},
"_requested": {
- "name": "core-util-is",
"raw": "core-util-is@~1.0.0",
- "rawSpec": "~1.0.0",
"scope": null,
+ "escapedName": "core-util-is",
+ "name": "core-util-is",
+ "rawSpec": "~1.0.0",
"spec": ">=1.0.0 <1.1.0",
"type": "range"
},
"_requiredBy": [
"/request/bl/readable-stream"
],
+ "_resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "_shasum": "b5fd54220aa2bc5ab57aab7140c940754503c1a7",
"_shrinkwrap": null,
"_spec": "core-util-is@~1.0.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream",
"author": {
- "email": "i@izs.me",
"name": "Isaac Z. Schlueter",
+ "email": "i@izs.me",
"url": "http://blog.izs.me/"
},
"bugs": {
@@ -51,7 +58,7 @@
"directories": {},
"dist": {
"shasum": "b5fd54220aa2bc5ab57aab7140c940754503c1a7",
- "tarball": "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+ "tarball": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
},
"gitHead": "a177da234df5638b363ddc15fa324619a38577c8",
"homepage": "https://github.com/isaacs/core-util-is#readme",
@@ -70,8 +77,8 @@
"main": "lib/util.js",
"maintainers": [
{
- "email": "i@izs.me",
- "name": "isaacs"
+ "name": "isaacs",
+ "email": "i@izs.me"
}
],
"name": "core-util-is",
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
index b8f76c40e..6510f4eef 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
@@ -1,11 +1,15 @@
{
"_args": [
[
- "isarray@~1.0.0",
- "/Users/rebecca/code/npm/node_modules/readable-stream"
- ],
- [
- "isarray@~1.0.0",
+ {
+ "raw": "isarray@~1.0.0",
+ "scope": null,
+ "escapedName": "isarray",
+ "name": "isarray",
+ "rawSpec": "~1.0.0",
+ "spec": ">=1.0.0 <1.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream"
]
],
@@ -16,28 +20,31 @@
"_location": "/request/bl/readable-stream/isarray",
"_nodeVersion": "5.1.0",
"_npmUser": {
- "email": "julian@juliangruber.com",
- "name": "juliangruber"
+ "name": "juliangruber",
+ "email": "julian@juliangruber.com"
},
"_npmVersion": "3.3.12",
"_phantomChildren": {},
"_requested": {
- "name": "isarray",
"raw": "isarray@~1.0.0",
- "rawSpec": "~1.0.0",
"scope": null,
+ "escapedName": "isarray",
+ "name": "isarray",
+ "rawSpec": "~1.0.0",
"spec": ">=1.0.0 <1.1.0",
"type": "range"
},
"_requiredBy": [
"/request/bl/readable-stream"
],
+ "_resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "_shasum": "bb935d48582cba168c06834957a54a3e07124f11",
"_shrinkwrap": null,
"_spec": "isarray@~1.0.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream",
"author": {
- "email": "mail@juliangruber.com",
"name": "Julian Gruber",
+ "email": "mail@juliangruber.com",
"url": "http://juliangruber.com"
},
"bugs": {
@@ -51,7 +58,7 @@
"directories": {},
"dist": {
"shasum": "bb935d48582cba168c06834957a54a3e07124f11",
- "tarball": "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+ "tarball": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
},
"gitHead": "2a23a281f369e9ae06394c0fb4d2381355a6ba33",
"homepage": "https://github.com/juliangruber/isarray",
@@ -64,8 +71,8 @@
"main": "index.js",
"maintainers": [
{
- "email": "julian@juliangruber.com",
- "name": "juliangruber"
+ "name": "juliangruber",
+ "email": "julian@juliangruber.com"
}
],
"name": "isarray",
@@ -79,6 +86,7 @@
"test": "tape test.js"
},
"testling": {
+ "files": "test.js",
"browsers": [
"ie/8..latest",
"firefox/17..latest",
@@ -91,8 +99,7 @@
"ipad/6.0..latest",
"iphone/6.0..latest",
"android-browser/4.2..latest"
- ],
- "files": "test.js"
+ ]
},
"version": "1.0.0"
}
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
index 571c27678..a4f40f845 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/index.js
@@ -8,13 +8,36 @@ if (!process.version ||
module.exports = process.nextTick;
}
-function nextTick(fn) {
- var args = new Array(arguments.length - 1);
- var i = 0;
- while (i < args.length) {
- args[i++] = arguments[i];
+function nextTick(fn, arg1, arg2, arg3) {
+ if (typeof fn !== 'function') {
+ throw new TypeError('"callback" argument must be a function');
+ }
+ var len = arguments.length;
+ var args, i;
+ switch (len) {
+ case 0:
+ case 1:
+ return process.nextTick(fn);
+ case 2:
+ return process.nextTick(function afterTickOne() {
+ fn.call(null, arg1);
+ });
+ case 3:
+ return process.nextTick(function afterTickTwo() {
+ fn.call(null, arg1, arg2);
+ });
+ case 4:
+ return process.nextTick(function afterTickThree() {
+ fn.call(null, arg1, arg2, arg3);
+ });
+ default:
+ args = new Array(len - 1);
+ i = 0;
+ while (i < args.length) {
+ args[i++] = arguments[i];
+ }
+ return process.nextTick(function afterTick() {
+ fn.apply(null, args);
+ });
}
- process.nextTick(function afterTick() {
- fn.apply(null, args);
- });
}
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
index bae43acf2..e100c0e08 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/process-nextick-args/package.json
@@ -1,37 +1,48 @@
{
"_args": [
[
- "process-nextick-args@~1.0.6",
- "/Users/rebecca/code/npm/node_modules/readable-stream"
- ],
- [
- "process-nextick-args@~1.0.6",
+ {
+ "raw": "process-nextick-args@~1.0.6",
+ "scope": null,
+ "escapedName": "process-nextick-args",
+ "name": "process-nextick-args",
+ "rawSpec": "~1.0.6",
+ "spec": ">=1.0.6 <1.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream"
]
],
"_from": "process-nextick-args@>=1.0.6 <1.1.0",
- "_id": "process-nextick-args@1.0.6",
+ "_id": "process-nextick-args@1.0.7",
"_inCache": true,
"_installable": true,
"_location": "/request/bl/readable-stream/process-nextick-args",
- "_nodeVersion": "4.1.1",
+ "_nodeVersion": "5.11.0",
+ "_npmOperationalInternal": {
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/process-nextick-args-1.0.7.tgz_1462394251778_0.36989671061746776"
+ },
"_npmUser": {
- "email": "calvin.metcalf@gmail.com",
- "name": "cwmma"
+ "name": "cwmma",
+ "email": "calvin.metcalf@gmail.com"
},
- "_npmVersion": "2.14.4",
+ "_npmVersion": "3.8.6",
"_phantomChildren": {},
"_requested": {
- "name": "process-nextick-args",
"raw": "process-nextick-args@~1.0.6",
- "rawSpec": "~1.0.6",
"scope": null,
+ "escapedName": "process-nextick-args",
+ "name": "process-nextick-args",
+ "rawSpec": "~1.0.6",
"spec": ">=1.0.6 <1.1.0",
"type": "range"
},
"_requiredBy": [
"/request/bl/readable-stream"
],
+ "_resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+ "_shasum": "150e20b756590ad3f91093f25a4f2ad8bff30ba3",
"_shrinkwrap": null,
"_spec": "process-nextick-args@~1.0.6",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream",
@@ -46,17 +57,17 @@
},
"directories": {},
"dist": {
- "shasum": "0f96b001cea90b12592ce566edb97ec11e69bd05",
- "tarball": "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+ "shasum": "150e20b756590ad3f91093f25a4f2ad8bff30ba3",
+ "tarball": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
},
- "gitHead": "e85787b05a8c3c1adb714f332d822e9162699c78",
+ "gitHead": "5c00899ab01dd32f93ad4b5743da33da91404f39",
"homepage": "https://github.com/calvinmetcalf/process-nextick-args",
"license": "MIT",
"main": "index.js",
"maintainers": [
{
- "email": "calvin.metcalf@gmail.com",
- "name": "cwmma"
+ "name": "cwmma",
+ "email": "calvin.metcalf@gmail.com"
}
],
"name": "process-nextick-args",
@@ -69,5 +80,5 @@
"scripts": {
"test": "node test.js"
},
- "version": "1.0.6"
+ "version": "1.0.7"
}
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
index 977e5976d..a4cb8bc4a 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/string_decoder/package.json
@@ -1,11 +1,15 @@
{
"_args": [
[
- "string_decoder@~0.10.x",
- "/Users/rebecca/code/npm/node_modules/readable-stream"
- ],
- [
- "string_decoder@~0.10.x",
+ {
+ "raw": "string_decoder@~0.10.x",
+ "scope": null,
+ "escapedName": "string_decoder",
+ "name": "string_decoder",
+ "rawSpec": "~0.10.x",
+ "spec": ">=0.10.0 <0.11.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream"
]
],
@@ -15,22 +19,25 @@
"_installable": true,
"_location": "/request/bl/readable-stream/string_decoder",
"_npmUser": {
- "email": "rod@vagg.org",
- "name": "rvagg"
+ "name": "rvagg",
+ "email": "rod@vagg.org"
},
"_npmVersion": "1.4.23",
"_phantomChildren": {},
"_requested": {
- "name": "string_decoder",
"raw": "string_decoder@~0.10.x",
- "rawSpec": "~0.10.x",
"scope": null,
+ "escapedName": "string_decoder",
+ "name": "string_decoder",
+ "rawSpec": "~0.10.x",
"spec": ">=0.10.0 <0.11.0",
"type": "range"
},
"_requiredBy": [
"/request/bl/readable-stream"
],
+ "_resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "_shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
"_shrinkwrap": null,
"_spec": "string_decoder@~0.10.x",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream",
@@ -45,7 +52,7 @@
"directories": {},
"dist": {
"shasum": "62e203bc41766c6c28c9fc84301dab1c5310fa94",
- "tarball": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+ "tarball": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
},
"gitHead": "d46d4fd87cf1d06e031c23f1ba170ca7d4ade9a0",
"homepage": "https://github.com/rvagg/string_decoder",
@@ -59,12 +66,12 @@
"main": "index.js",
"maintainers": [
{
- "email": "mail@substack.net",
- "name": "substack"
+ "name": "substack",
+ "email": "mail@substack.net"
},
{
- "email": "rod@vagg.org",
- "name": "rvagg"
+ "name": "rvagg",
+ "email": "rod@vagg.org"
}
],
"name": "string_decoder",
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
index 63869c0e0..14eb7c631 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/util-deprecate/package.json
@@ -1,11 +1,15 @@
{
"_args": [
[
- "util-deprecate@~1.0.1",
- "/Users/rebecca/code/npm/node_modules/readable-stream"
- ],
- [
- "util-deprecate@~1.0.1",
+ {
+ "raw": "util-deprecate@~1.0.1",
+ "scope": null,
+ "escapedName": "util-deprecate",
+ "name": "util-deprecate",
+ "rawSpec": "~1.0.1",
+ "spec": ">=1.0.1 <1.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream"
]
],
@@ -16,28 +20,31 @@
"_location": "/request/bl/readable-stream/util-deprecate",
"_nodeVersion": "4.1.2",
"_npmUser": {
- "email": "nathan@tootallnate.net",
- "name": "tootallnate"
+ "name": "tootallnate",
+ "email": "nathan@tootallnate.net"
},
"_npmVersion": "2.14.4",
"_phantomChildren": {},
"_requested": {
- "name": "util-deprecate",
"raw": "util-deprecate@~1.0.1",
- "rawSpec": "~1.0.1",
"scope": null,
+ "escapedName": "util-deprecate",
+ "name": "util-deprecate",
+ "rawSpec": "~1.0.1",
"spec": ">=1.0.1 <1.1.0",
"type": "range"
},
"_requiredBy": [
"/request/bl/readable-stream"
],
+ "_resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "_shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
"_shrinkwrap": null,
"_spec": "util-deprecate@~1.0.1",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/bl/node_modules/readable-stream",
"author": {
- "email": "nathan@tootallnate.net",
"name": "Nathan Rajlich",
+ "email": "nathan@tootallnate.net",
"url": "http://n8.io/"
},
"browser": "browser.js",
@@ -50,7 +57,7 @@
"directories": {},
"dist": {
"shasum": "450d4dc9fa70de732762fbd2d4a28981419a0ccf",
- "tarball": "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+ "tarball": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
},
"gitHead": "475fb6857cd23fafff20c1be846c1350abf8e6d4",
"homepage": "https://github.com/TooTallNate/util-deprecate",
@@ -65,8 +72,8 @@
"main": "node.js",
"maintainers": [
{
- "email": "nathan@tootallnate.net",
- "name": "tootallnate"
+ "name": "tootallnate",
+ "email": "nathan@tootallnate.net"
}
],
"name": "util-deprecate",
diff --git a/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json b/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
index f818ebf1b..27ef41cb1 100644
--- a/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
+++ b/node_modules/request/node_modules/bl/node_modules/readable-stream/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "readable-stream@~2.0.5",
+ {
+ "raw": "readable-stream@~2.0.5",
+ "scope": null,
+ "escapedName": "readable-stream",
+ "name": "readable-stream",
+ "rawSpec": "~2.0.5",
+ "spec": ">=2.0.5 <2.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/bl"
]
],
@@ -16,16 +24,17 @@
"tmp": "tmp/readable-stream-2.0.6.tgz_1457893507709_0.369257491780445"
},
"_npmUser": {
- "email": "calvin.metcalf@gmail.com",
- "name": "cwmma"
+ "name": "cwmma",
+ "email": "calvin.metcalf@gmail.com"
},
"_npmVersion": "3.6.0",
"_phantomChildren": {},
"_requested": {
- "name": "readable-stream",
"raw": "readable-stream@~2.0.5",
- "rawSpec": "~2.0.5",
"scope": null,
+ "escapedName": "readable-stream",
+ "name": "readable-stream",
+ "rawSpec": "~2.0.5",
"spec": ">=2.0.5 <2.1.0",
"type": "range"
},
@@ -73,20 +82,20 @@
"main": "readable.js",
"maintainers": [
{
- "email": "isaacs@npmjs.com",
- "name": "isaacs"
+ "name": "isaacs",
+ "email": "isaacs@npmjs.com"
},
{
- "email": "nathan@tootallnate.net",
- "name": "tootallnate"
+ "name": "tootallnate",
+ "email": "nathan@tootallnate.net"
},
{
- "email": "rod@vagg.org",
- "name": "rvagg"
+ "name": "rvagg",
+ "email": "rod@vagg.org"
},
{
- "email": "calvin.metcalf@gmail.com",
- "name": "cwmma"
+ "name": "cwmma",
+ "email": "calvin.metcalf@gmail.com"
}
],
"name": "readable-stream",
diff --git a/node_modules/request/node_modules/bl/package.json b/node_modules/request/node_modules/bl/package.json
index 09ebb7b74..47862b0b6 100644
--- a/node_modules/request/node_modules/bl/package.json
+++ b/node_modules/request/node_modules/bl/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "bl@~1.1.2",
+ {
+ "raw": "bl@~1.1.2",
+ "scope": null,
+ "escapedName": "bl",
+ "name": "bl",
+ "rawSpec": "~1.1.2",
+ "spec": ">=1.1.2 <1.2.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
@@ -16,16 +24,19 @@
"tmp": "tmp/bl-1.1.2.tgz_1455246621698_0.6300242957659066"
},
"_npmUser": {
- "email": "rod@vagg.org",
- "name": "rvagg"
+ "name": "rvagg",
+ "email": "rod@vagg.org"
},
"_npmVersion": "3.3.12",
- "_phantomChildren": {},
+ "_phantomChildren": {
+ "inherits": "2.0.1"
+ },
"_requested": {
- "name": "bl",
"raw": "bl@~1.1.2",
- "rawSpec": "~1.1.2",
"scope": null,
+ "escapedName": "bl",
+ "name": "bl",
+ "rawSpec": "~1.1.2",
"spec": ">=1.1.2 <1.2.0",
"type": "range"
},
@@ -71,8 +82,8 @@
"main": "bl.js",
"maintainers": [
{
- "email": "rod@vagg.org",
- "name": "rvagg"
+ "name": "rvagg",
+ "email": "rod@vagg.org"
}
],
"name": "bl",
diff --git a/node_modules/request/node_modules/caseless/package.json b/node_modules/request/node_modules/caseless/package.json
index 2cd79ea01..747067823 100644
--- a/node_modules/request/node_modules/caseless/package.json
+++ b/node_modules/request/node_modules/caseless/package.json
@@ -1,43 +1,73 @@
{
- "name": "caseless",
- "version": "0.11.0",
- "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
- "main": "index.js",
- "scripts": {
- "test": "node test.js"
+ "_args": [
+ [
+ {
+ "raw": "caseless@~0.11.0",
+ "scope": null,
+ "escapedName": "caseless",
+ "name": "caseless",
+ "rawSpec": "~0.11.0",
+ "spec": ">=0.11.0 <0.12.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "caseless@>=0.11.0 <0.12.0",
+ "_id": "caseless@0.11.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/caseless",
+ "_nodeVersion": "1.8.1",
+ "_npmUser": {
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
},
- "repository": {
- "type": "git",
- "url": "git+https://github.com/mikeal/caseless.git"
+ "_npmVersion": "2.8.3",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "caseless@~0.11.0",
+ "scope": null,
+ "escapedName": "caseless",
+ "name": "caseless",
+ "rawSpec": "~0.11.0",
+ "spec": ">=0.11.0 <0.12.0",
+ "type": "range"
},
- "keywords": [
- "headers",
- "http",
- "caseless"
+ "_requiredBy": [
+ "/request"
],
- "test": "node test.js",
+ "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+ "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+ "_shrinkwrap": null,
+ "_spec": "caseless@~0.11.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Mikeal Rogers",
"email": "mikeal.rogers@gmail.com"
},
- "license": "Apache-2.0",
"bugs": {
"url": "https://github.com/mikeal/caseless/issues"
},
+ "dependencies": {},
+ "description": "Caseless object set/get/has, very useful when working with HTTP headers.",
"devDependencies": {
"tape": "^2.10.2"
},
+ "directories": {},
+ "dist": {
+ "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
+ "tarball": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+ },
"gitHead": "c578232a02cc2b46b6da8851caf57fdbfac89ff5",
"homepage": "https://github.com/mikeal/caseless#readme",
- "_id": "caseless@0.11.0",
- "_shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
- "_from": "caseless@>=0.11.0 <0.12.0",
- "_npmVersion": "2.8.3",
- "_nodeVersion": "1.8.1",
- "_npmUser": {
- "name": "mikeal",
- "email": "mikeal.rogers@gmail.com"
- },
+ "keywords": [
+ "headers",
+ "http",
+ "caseless"
+ ],
+ "license": "Apache-2.0",
+ "main": "index.js",
"maintainers": [
{
"name": "mikeal",
@@ -52,11 +82,16 @@
"email": "simeonvelichkov@gmail.com"
}
],
- "dist": {
- "shasum": "715b96ea9841593cc33067923f5ec60ebda4f7d7",
- "tarball": "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+ "name": "caseless",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/mikeal/caseless.git"
},
- "directories": {},
- "_resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
- "readme": "ERROR: No README data found!"
+ "scripts": {
+ "test": "node test.js"
+ },
+ "test": "node test.js",
+ "version": "0.11.0"
}
diff --git a/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json b/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
index 8ac66b814..cec426981 100644
--- a/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
+++ b/node_modules/request/node_modules/combined-stream/node_modules/delayed-stream/package.json
@@ -1,53 +1,79 @@
{
+ "_args": [
+ [
+ {
+ "raw": "delayed-stream@~1.0.0",
+ "scope": null,
+ "escapedName": "delayed-stream",
+ "name": "delayed-stream",
+ "rawSpec": "~1.0.0",
+ "spec": ">=1.0.0 <1.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/combined-stream"
+ ]
+ ],
+ "_from": "delayed-stream@>=1.0.0 <1.1.0",
+ "_id": "delayed-stream@1.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/combined-stream/delayed-stream",
+ "_nodeVersion": "1.6.4",
+ "_npmUser": {
+ "name": "apechimp",
+ "email": "apeherder@gmail.com"
+ },
+ "_npmVersion": "2.8.3",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "delayed-stream@~1.0.0",
+ "scope": null,
+ "escapedName": "delayed-stream",
+ "name": "delayed-stream",
+ "rawSpec": "~1.0.0",
+ "spec": ">=1.0.0 <1.1.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/combined-stream"
+ ],
+ "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
+ "_shrinkwrap": null,
+ "_spec": "delayed-stream@~1.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/combined-stream",
"author": {
"name": "Felix Geisendörfer",
"email": "felix@debuggable.com",
"url": "http://debuggable.com/"
},
+ "bugs": {
+ "url": "https://github.com/felixge/node-delayed-stream/issues"
+ },
"contributors": [
{
"name": "Mike Atkins",
"email": "apeherder@gmail.com"
}
],
- "name": "delayed-stream",
- "description": "Buffers events from a stream until you are ready to handle them.",
- "license": "MIT",
- "version": "1.0.0",
- "homepage": "https://github.com/felixge/node-delayed-stream",
- "repository": {
- "type": "git",
- "url": "git://github.com/felixge/node-delayed-stream.git"
- },
- "main": "./lib/delayed_stream",
- "engines": {
- "node": ">=0.4.0"
- },
- "scripts": {
- "test": "make test"
- },
"dependencies": {},
+ "description": "Buffers events from a stream until you are ready to handle them.",
"devDependencies": {
"fake": "0.2.0",
"far": "0.0.1"
},
- "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
- "bugs": {
- "url": "https://github.com/felixge/node-delayed-stream/issues"
- },
- "_id": "delayed-stream@1.0.0",
- "_shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
- "_from": "delayed-stream@>=1.0.0 <1.1.0",
- "_npmVersion": "2.8.3",
- "_nodeVersion": "1.6.4",
- "_npmUser": {
- "name": "apechimp",
- "email": "apeherder@gmail.com"
- },
+ "directories": {},
"dist": {
"shasum": "df3ae199acadfb7d440aaae0b29e2272b24ec619",
- "tarball": "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+ "tarball": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
},
+ "engines": {
+ "node": ">=0.4.0"
+ },
+ "gitHead": "07a9dc99fb8f1a488160026b9ad77493f766fb84",
+ "homepage": "https://github.com/felixge/node-delayed-stream",
+ "license": "MIT",
+ "main": "./lib/delayed_stream",
"maintainers": [
{
"name": "felixge",
@@ -58,7 +84,15 @@
"email": "apeherder@gmail.com"
}
],
- "directories": {},
- "_resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
- "readme": "ERROR: No README data found!"
+ "name": "delayed-stream",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/felixge/node-delayed-stream.git"
+ },
+ "scripts": {
+ "test": "make test"
+ },
+ "version": "1.0.0"
}
diff --git a/node_modules/request/node_modules/combined-stream/package.json b/node_modules/request/node_modules/combined-stream/package.json
index e0cd160ff..3dec78c0f 100644
--- a/node_modules/request/node_modules/combined-stream/package.json
+++ b/node_modules/request/node_modules/combined-stream/package.json
@@ -1,48 +1,75 @@
{
+ "_args": [
+ [
+ {
+ "raw": "combined-stream@~1.0.5",
+ "scope": null,
+ "escapedName": "combined-stream",
+ "name": "combined-stream",
+ "rawSpec": "~1.0.5",
+ "spec": ">=1.0.5 <1.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "combined-stream@>=1.0.5 <1.1.0",
+ "_id": "combined-stream@1.0.5",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/combined-stream",
+ "_nodeVersion": "0.12.4",
+ "_npmUser": {
+ "name": "alexindigo",
+ "email": "iam@alexindigo.com"
+ },
+ "_npmVersion": "2.10.1",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "combined-stream@~1.0.5",
+ "scope": null,
+ "escapedName": "combined-stream",
+ "name": "combined-stream",
+ "rawSpec": "~1.0.5",
+ "spec": ">=1.0.5 <1.1.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request",
+ "/request/form-data"
+ ],
+ "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+ "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
+ "_shrinkwrap": null,
+ "_spec": "combined-stream@~1.0.5",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Felix Geisendörfer",
"email": "felix@debuggable.com",
"url": "http://debuggable.com/"
},
- "name": "combined-stream",
- "description": "A stream that emits multiple other streams one after another.",
- "version": "1.0.5",
- "homepage": "https://github.com/felixge/node-combined-stream",
- "repository": {
- "type": "git",
- "url": "git://github.com/felixge/node-combined-stream.git"
- },
- "main": "./lib/combined_stream",
- "scripts": {
- "test": "node test/run.js"
- },
- "engines": {
- "node": ">= 0.8"
+ "bugs": {
+ "url": "https://github.com/felixge/node-combined-stream/issues"
},
"dependencies": {
"delayed-stream": "~1.0.0"
},
+ "description": "A stream that emits multiple other streams one after another.",
"devDependencies": {
"far": "~0.0.7"
},
- "license": "MIT",
- "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
- "bugs": {
- "url": "https://github.com/felixge/node-combined-stream/issues"
- },
- "_id": "combined-stream@1.0.5",
- "_shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
- "_from": "combined-stream@>=1.0.5 <1.1.0",
- "_npmVersion": "2.10.1",
- "_nodeVersion": "0.12.4",
- "_npmUser": {
- "name": "alexindigo",
- "email": "iam@alexindigo.com"
- },
+ "directories": {},
"dist": {
"shasum": "938370a57b4a51dea2c77c15d5c5fdf895164009",
- "tarball": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+ "tarball": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+ },
+ "engines": {
+ "node": ">= 0.8"
},
+ "gitHead": "cfc7b815d090a109bcedb5bb0f6713148d55a6b7",
+ "homepage": "https://github.com/felixge/node-combined-stream",
+ "license": "MIT",
+ "main": "./lib/combined_stream",
"maintainers": [
{
"name": "felixge",
@@ -61,7 +88,15 @@
"email": "apeherder@gmail.com"
}
],
- "directories": {},
- "_resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
- "readme": "ERROR: No README data found!"
+ "name": "combined-stream",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/felixge/node-combined-stream.git"
+ },
+ "scripts": {
+ "test": "node test/run.js"
+ },
+ "version": "1.0.5"
}
diff --git a/node_modules/request/node_modules/extend/package.json b/node_modules/request/node_modules/extend/package.json
index c8c7cac99..cbcd8ee4a 100644
--- a/node_modules/request/node_modules/extend/package.json
+++ b/node_modules/request/node_modules/extend/package.json
@@ -1,20 +1,54 @@
{
- "name": "extend",
+ "_args": [
+ [
+ {
+ "raw": "extend@~3.0.0",
+ "scope": null,
+ "escapedName": "extend",
+ "name": "extend",
+ "rawSpec": "~3.0.0",
+ "spec": ">=3.0.0 <3.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "extend@>=3.0.0 <3.1.0",
+ "_id": "extend@3.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/extend",
+ "_nodeVersion": "2.3.1",
+ "_npmUser": {
+ "name": "ljharb",
+ "email": "ljharb@gmail.com"
+ },
+ "_npmVersion": "2.11.3",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "extend@~3.0.0",
+ "scope": null,
+ "escapedName": "extend",
+ "name": "extend",
+ "rawSpec": "~3.0.0",
+ "spec": ">=3.0.0 <3.1.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request"
+ ],
+ "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
+ "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
+ "_shrinkwrap": null,
+ "_spec": "extend@~3.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Stefan Thomas",
"email": "justmoon@members.fsf.org",
"url": "http://www.justmoon.net"
},
- "version": "3.0.0",
- "description": "Port of jQuery.extend for node.js and the browser",
- "main": "index",
- "scripts": {
- "test": "npm run lint && node test/index.js && npm run coverage-quiet",
- "coverage": "covert test/index.js",
- "coverage-quiet": "covert test/index.js --quiet",
- "lint": "npm run jscs && npm run eslint",
- "jscs": "jscs *.js */*.js",
- "eslint": "eslint *.js */*.js"
+ "bugs": {
+ "url": "https://github.com/justmoon/node-extend/issues"
},
"contributors": [
{
@@ -22,41 +56,28 @@
"url": "https://github.com/ljharb"
}
],
- "keywords": [
- "extend",
- "clone",
- "merge"
- ],
- "repository": {
- "type": "git",
- "url": "git+https://github.com/justmoon/node-extend.git"
- },
"dependencies": {},
+ "description": "Port of jQuery.extend for node.js and the browser",
"devDependencies": {
- "tape": "^4.0.0",
"covert": "^1.1.0",
+ "eslint": "^0.24.0",
"jscs": "^1.13.1",
- "eslint": "^0.24.0"
- },
- "license": "MIT",
- "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
- "bugs": {
- "url": "https://github.com/justmoon/node-extend/issues"
- },
- "homepage": "https://github.com/justmoon/node-extend#readme",
- "_id": "extend@3.0.0",
- "_shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
- "_from": "extend@>=3.0.0 <3.1.0",
- "_npmVersion": "2.11.3",
- "_nodeVersion": "2.3.1",
- "_npmUser": {
- "name": "ljharb",
- "email": "ljharb@gmail.com"
+ "tape": "^4.0.0"
},
+ "directories": {},
"dist": {
"shasum": "5a474353b9f3353ddd8176dfd37b91c83a46f1d4",
- "tarball": "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+ "tarball": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
},
+ "gitHead": "148e7270cab2e9413af2cd0cab147070d755ed6d",
+ "homepage": "https://github.com/justmoon/node-extend#readme",
+ "keywords": [
+ "extend",
+ "clone",
+ "merge"
+ ],
+ "license": "MIT",
+ "main": "index",
"maintainers": [
{
"name": "justmoon",
@@ -67,7 +88,20 @@
"email": "ljharb@gmail.com"
}
],
- "directories": {},
- "_resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz",
- "readme": "ERROR: No README data found!"
+ "name": "extend",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/justmoon/node-extend.git"
+ },
+ "scripts": {
+ "coverage": "covert test/index.js",
+ "coverage-quiet": "covert test/index.js --quiet",
+ "eslint": "eslint *.js */*.js",
+ "jscs": "jscs *.js */*.js",
+ "lint": "npm run jscs && npm run eslint",
+ "test": "npm run lint && node test/index.js && npm run coverage-quiet"
+ },
+ "version": "3.0.0"
}
diff --git a/node_modules/request/node_modules/forever-agent/package.json b/node_modules/request/node_modules/forever-agent/package.json
index 1d672c1c9..58acb7700 100644
--- a/node_modules/request/node_modules/forever-agent/package.json
+++ b/node_modules/request/node_modules/forever-agent/package.json
@@ -1,31 +1,89 @@
{
+ "_args": [
+ [
+ {
+ "raw": "forever-agent@~0.6.1",
+ "scope": null,
+ "escapedName": "forever-agent",
+ "name": "forever-agent",
+ "rawSpec": "~0.6.1",
+ "spec": ">=0.6.1 <0.7.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "forever-agent@>=0.6.1 <0.7.0",
+ "_id": "forever-agent@0.6.1",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/forever-agent",
+ "_npmUser": {
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
+ },
+ "_npmVersion": "1.4.28",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "forever-agent@~0.6.1",
+ "scope": null,
+ "escapedName": "forever-agent",
+ "name": "forever-agent",
+ "rawSpec": "~0.6.1",
+ "spec": ">=0.6.1 <0.7.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request"
+ ],
+ "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
+ "_shrinkwrap": null,
+ "_spec": "forever-agent@~0.6.1",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Mikeal Rogers",
"email": "mikeal.rogers@gmail.com",
"url": "http://www.futurealoof.com"
},
- "name": "forever-agent",
- "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
- "version": "0.6.1",
- "license": "Apache-2.0",
- "repository": {
- "url": "git+https://github.com/mikeal/forever-agent.git"
+ "bugs": {
+ "url": "https://github.com/mikeal/forever-agent/issues"
},
- "main": "index.js",
"dependencies": {},
+ "description": "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.",
"devDependencies": {},
- "optionalDependencies": {},
+ "directories": {},
+ "dist": {
+ "shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
+ "tarball": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+ },
"engines": {
"node": "*"
},
- "readme": "forever-agent\n=============\n\nHTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.\n",
- "readmeFilename": "README.md",
- "bugs": {
- "url": "https://github.com/mikeal/forever-agent/issues"
+ "gitHead": "1b3b6163f2b3c2c4122bbfa288c1325c0df9871d",
+ "homepage": "https://github.com/mikeal/forever-agent",
+ "license": "Apache-2.0",
+ "main": "index.js",
+ "maintainers": [
+ {
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
+ },
+ {
+ "name": "nylen",
+ "email": "jnylen@gmail.com"
+ },
+ {
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
+ }
+ ],
+ "name": "forever-agent",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "url": "git+https://github.com/mikeal/forever-agent.git"
},
- "homepage": "https://github.com/mikeal/forever-agent#readme",
- "_id": "forever-agent@0.6.1",
- "_shasum": "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91",
- "_resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
- "_from": "forever-agent@>=0.6.1 <0.7.0"
+ "scripts": {},
+ "version": "0.6.1"
}
diff --git a/node_modules/request/node_modules/form-data/Readme.md b/node_modules/request/node_modules/form-data/README.md
index e857db6e2..e857db6e2 100644
--- a/node_modules/request/node_modules/form-data/Readme.md
+++ b/node_modules/request/node_modules/form-data/README.md
diff --git a/node_modules/request/node_modules/form-data/node_modules/async/package.json b/node_modules/request/node_modules/form-data/node_modules/async/package.json
index 97921ec00..88b1fa0c8 100644
--- a/node_modules/request/node_modules/form-data/node_modules/async/package.json
+++ b/node_modules/request/node_modules/form-data/node_modules/async/package.json
@@ -1,28 +1,37 @@
{
"_args": [
[
- "async@^1.4.0",
+ {
+ "raw": "async@^1.5.2",
+ "scope": null,
+ "escapedName": "async",
+ "name": "async",
+ "rawSpec": "^1.5.2",
+ "spec": ">=1.5.2 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/form-data"
]
],
- "_from": "async@>=1.4.0 <2.0.0",
+ "_from": "async@>=1.5.2 <2.0.0",
"_id": "async@1.5.2",
"_inCache": true,
"_installable": true,
"_location": "/request/form-data/async",
"_nodeVersion": "4.2.3",
"_npmUser": {
- "email": "alexander.early@gmail.com",
- "name": "aearly"
+ "name": "aearly",
+ "email": "alexander.early@gmail.com"
},
"_npmVersion": "3.5.2",
"_phantomChildren": {},
"_requested": {
- "name": "async",
- "raw": "async@^1.4.0",
- "rawSpec": "^1.4.0",
+ "raw": "async@^1.5.2",
"scope": null,
- "spec": ">=1.4.0 <2.0.0",
+ "escapedName": "async",
+ "name": "async",
+ "rawSpec": "^1.5.2",
+ "spec": ">=1.5.2 <2.0.0",
"type": "range"
},
"_requiredBy": [
@@ -31,7 +40,7 @@
"_resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"_shasum": "ec6a61ae56480c0c3cb241c95618e20892f9672a",
"_shrinkwrap": null,
- "_spec": "async@^1.4.0",
+ "_spec": "async@^1.5.2",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/form-data",
"author": {
"name": "Caolan McMahon"
@@ -69,31 +78,31 @@
"directories": {},
"dist": {
"shasum": "ec6a61ae56480c0c3cb241c95618e20892f9672a",
- "tarball": "http://registry.npmjs.org/async/-/async-1.5.2.tgz"
+ "tarball": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
},
"files": [
+ "lib",
"dist/async.js",
- "dist/async.min.js",
- "lib"
+ "dist/async.min.js"
],
"gitHead": "9ab5c67b7cb3a4c3dad4a2d4552a2f6775545d6c",
"homepage": "https://github.com/caolan/async#readme",
"jam": {
- "categories": [
- "Utilities"
- ],
+ "main": "lib/async.js",
"include": [
- "LICENSE",
+ "lib/async.js",
"README.md",
- "lib/async.js"
+ "LICENSE"
],
- "main": "lib/async.js"
+ "categories": [
+ "Utilities"
+ ]
},
"keywords": [
"async",
"callback",
- "module",
- "utility"
+ "utility",
+ "module"
],
"license": "MIT",
"main": "lib/async.js",
@@ -137,13 +146,13 @@
},
"version": "1.5.2",
"volo": {
+ "main": "lib/async.js",
"ignore": [
"**/.*",
- "bower_components",
"node_modules",
+ "bower_components",
"test",
"tests"
- ],
- "main": "lib/async.js"
+ ]
}
}
diff --git a/node_modules/request/node_modules/form-data/package.json b/node_modules/request/node_modules/form-data/package.json
index 8977f984e..5c4375edf 100644
--- a/node_modules/request/node_modules/form-data/package.json
+++ b/node_modules/request/node_modules/form-data/package.json
@@ -1,11 +1,19 @@
{
"_args": [
[
- "form-data@~1.0.0-rc3",
+ {
+ "raw": "form-data@~1.0.0-rc4",
+ "scope": null,
+ "escapedName": "form-data",
+ "name": "form-data",
+ "rawSpec": "~1.0.0-rc4",
+ "spec": ">=1.0.0-rc4 <1.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "form-data@>=1.0.0-rc3 <1.1.0",
+ "_from": "form-data@>=1.0.0-rc4 <1.1.0",
"_id": "form-data@1.0.0-rc4",
"_inCache": true,
"_installable": true,
@@ -16,17 +24,18 @@
"tmp": "tmp/form-data-1.0.0-rc4.tgz_1458059747097_0.14101114077493548"
},
"_npmUser": {
- "email": "iam@alexindigo.com",
- "name": "alexindigo"
+ "name": "alexindigo",
+ "email": "iam@alexindigo.com"
},
"_npmVersion": "2.14.9",
"_phantomChildren": {},
"_requested": {
- "name": "form-data",
- "raw": "form-data@~1.0.0-rc3",
- "rawSpec": "~1.0.0-rc3",
+ "raw": "form-data@~1.0.0-rc4",
"scope": null,
- "spec": ">=1.0.0-rc3 <1.1.0",
+ "escapedName": "form-data",
+ "name": "form-data",
+ "rawSpec": "~1.0.0-rc4",
+ "spec": ">=1.0.0-rc4 <1.1.0",
"type": "range"
},
"_requiredBy": [
@@ -35,11 +44,11 @@
"_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz",
"_shasum": "05ac6bc22227b43e4461f488161554699d4f8b5e",
"_shrinkwrap": null,
- "_spec": "form-data@~1.0.0-rc3",
+ "_spec": "form-data@~1.0.0-rc4",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "felix@debuggable.com",
"name": "Felix Geisendörfer",
+ "email": "felix@debuggable.com",
"url": "http://debuggable.com/"
},
"browser": "./lib/browser",
@@ -79,28 +88,28 @@
"main": "./lib/form_data",
"maintainers": [
{
- "email": "felix@debuggable.com",
- "name": "felixge"
+ "name": "felixge",
+ "email": "felix@debuggable.com"
},
{
- "email": "igor@buran.us",
- "name": "idralyuk"
+ "name": "idralyuk",
+ "email": "igor@buran.us"
},
{
- "email": "iam@alexindigo.com",
- "name": "alexindigo"
+ "name": "alexindigo",
+ "email": "iam@alexindigo.com"
},
{
- "email": "mikeal.rogers@gmail.com",
- "name": "mikeal"
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
},
{
- "email": "dtyree77@gmail.com",
- "name": "celer"
+ "name": "celer",
+ "email": "dtyree77@gmail.com"
},
{
- "email": "pierceydylan@gmail.com",
- "name": "dylanpiercey"
+ "name": "dylanpiercey",
+ "email": "pierceydylan@gmail.com"
}
],
"name": "form-data",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
index 98f458038..cfca2b929 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/ansi-styles/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "ansi-styles@^2.2.1",
+ {
+ "raw": "ansi-styles@^2.2.1",
+ "scope": null,
+ "escapedName": "ansi-styles",
+ "name": "ansi-styles",
+ "rawSpec": "^2.2.1",
+ "spec": ">=2.2.1 <3.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk"
]
],
@@ -16,16 +24,17 @@
"tmp": "tmp/ansi-styles-2.2.1.tgz_1459197317833_0.9694824463222176"
},
"_npmUser": {
- "email": "sindresorhus@gmail.com",
- "name": "sindresorhus"
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
},
"_npmVersion": "3.8.3",
"_phantomChildren": {},
"_requested": {
- "name": "ansi-styles",
"raw": "ansi-styles@^2.2.1",
- "rawSpec": "^2.2.1",
"scope": null,
+ "escapedName": "ansi-styles",
+ "name": "ansi-styles",
+ "rawSpec": "^2.2.1",
"spec": ">=2.2.1 <3.0.0",
"type": "range"
},
@@ -38,8 +47,8 @@
"_spec": "ansi-styles@^2.2.1",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk",
"author": {
- "email": "sindresorhus@gmail.com",
"name": "Sindre Sorhus",
+ "email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
"bugs": {
@@ -88,8 +97,8 @@
"license": "MIT",
"maintainers": [
{
- "email": "sindresorhus@gmail.com",
- "name": "sindresorhus"
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
}
],
"name": "ansi-styles",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
index 139993354..187d31266 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/escape-string-regexp/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "escape-string-regexp@^1.0.2",
+ {
+ "raw": "escape-string-regexp@^1.0.2",
+ "scope": null,
+ "escapedName": "escape-string-regexp",
+ "name": "escape-string-regexp",
+ "rawSpec": "^1.0.2",
+ "spec": ">=1.0.2 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk"
]
],
@@ -16,16 +24,17 @@
"tmp": "tmp/escape-string-regexp-1.0.5.tgz_1456059312074_0.7245344955008477"
},
"_npmUser": {
- "email": "jappelman@xebia.com",
- "name": "jbnicolai"
+ "name": "jbnicolai",
+ "email": "jappelman@xebia.com"
},
"_npmVersion": "2.14.12",
"_phantomChildren": {},
"_requested": {
- "name": "escape-string-regexp",
"raw": "escape-string-regexp@^1.0.2",
- "rawSpec": "^1.0.2",
"scope": null,
+ "escapedName": "escape-string-regexp",
+ "name": "escape-string-regexp",
+ "rawSpec": "^1.0.2",
"spec": ">=1.0.2 <2.0.0",
"type": "range"
},
@@ -38,8 +47,8 @@
"_spec": "escape-string-regexp@^1.0.2",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk",
"author": {
- "email": "sindresorhus@gmail.com",
"name": "Sindre Sorhus",
+ "email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
"bugs": {
@@ -54,7 +63,7 @@
"directories": {},
"dist": {
"shasum": "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4",
- "tarball": "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+ "tarball": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
},
"engines": {
"node": ">=0.8.0"
@@ -79,12 +88,12 @@
"license": "MIT",
"maintainers": [
{
- "email": "sindresorhus@gmail.com",
- "name": "sindresorhus"
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
},
{
- "email": "jappelman@xebia.com",
- "name": "jbnicolai"
+ "name": "jbnicolai",
+ "email": "jappelman@xebia.com"
}
],
"name": "escape-string-regexp",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
index 15f623780..8ecf94571 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/has-ansi/package.json
@@ -1,38 +1,75 @@
{
- "name": "has-ansi",
- "version": "2.0.0",
- "description": "Check if a string has ANSI escape codes",
- "license": "MIT",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/sindresorhus/has-ansi.git"
+ "_args": [
+ [
+ {
+ "raw": "has-ansi@^2.0.0",
+ "scope": null,
+ "escapedName": "has-ansi",
+ "name": "has-ansi",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk"
+ ]
+ ],
+ "_from": "has-ansi@>=2.0.0 <3.0.0",
+ "_id": "has-ansi@2.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/chalk/has-ansi",
+ "_nodeVersion": "0.12.5",
+ "_npmUser": {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ },
+ "_npmVersion": "2.11.2",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "has-ansi@^2.0.0",
+ "scope": null,
+ "escapedName": "has-ansi",
+ "name": "has-ansi",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
},
+ "_requiredBy": [
+ "/request/har-validator/chalk"
+ ],
+ "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+ "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
+ "_shrinkwrap": null,
+ "_spec": "has-ansi@^2.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk",
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
- "maintainers": [
- {
- "name": "Sindre Sorhus",
- "email": "sindresorhus@gmail.com",
- "url": "sindresorhus.com"
- },
- {
- "name": "Joshua Appelman",
- "email": "jappelman@xebia.com",
- "url": "jbnicolai.com"
- }
- ],
+ "bugs": {
+ "url": "https://github.com/sindresorhus/has-ansi/issues"
+ },
+ "dependencies": {
+ "ansi-regex": "^2.0.0"
+ },
+ "description": "Check if a string has ANSI escape codes",
+ "devDependencies": {
+ "ava": "0.0.4"
+ },
+ "directories": {},
+ "dist": {
+ "shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
+ "tarball": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+ },
"engines": {
"node": ">=0.10.0"
},
- "scripts": {
- "test": "node test.js"
- },
"files": [
"index.js"
],
+ "gitHead": "0722275e1bef139fcd09137da6e5550c3cd368b9",
+ "homepage": "https://github.com/sindresorhus/has-ansi",
"keywords": [
"ansi",
"styles",
@@ -57,20 +94,26 @@
"pattern",
"has"
],
- "dependencies": {
- "ansi-regex": "^2.0.0"
- },
- "devDependencies": {
- "ava": "0.0.4"
+ "license": "MIT",
+ "maintainers": [
+ {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ },
+ {
+ "name": "jbnicolai",
+ "email": "jappelman@xebia.com"
+ }
+ ],
+ "name": "has-ansi",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/sindresorhus/has-ansi.git"
},
- "readme": "# has-ansi [![Build Status](https://travis-ci.org/sindresorhus/has-ansi.svg?branch=master)](https://travis-ci.org/sindresorhus/has-ansi)\n\n> Check if a string has [ANSI escape codes](http://en.wikipedia.org/wiki/ANSI_escape_code)\n\n\n## Install\n\n```\n$ npm install --save has-ansi\n```\n\n\n## Usage\n\n```js\nvar hasAnsi = require('has-ansi');\n\nhasAnsi('\\u001b[4mcake\\u001b[0m');\n//=> true\n\nhasAnsi('cake');\n//=> false\n```\n\n\n## Related\n\n- [has-ansi-cli](https://github.com/sindresorhus/has-ansi-cli) - CLI for this module\n- [strip-ansi](https://github.com/sindresorhus/strip-ansi) - Strip ANSI escape codes\n- [ansi-regex](https://github.com/sindresorhus/ansi-regex) - Regular expression for matching ANSI escape codes\n- [chalk](https://github.com/sindresorhus/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
- "readmeFilename": "readme.md",
- "bugs": {
- "url": "https://github.com/sindresorhus/has-ansi/issues"
+ "scripts": {
+ "test": "node test.js"
},
- "homepage": "https://github.com/sindresorhus/has-ansi#readme",
- "_id": "has-ansi@2.0.0",
- "_shasum": "34f5049ce1ecdf2b0649af3ef24e45ed35416d91",
- "_resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
- "_from": "has-ansi@>=2.0.0 <3.0.0"
+ "version": "2.0.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
index c43b7aa8c..cd92886ca 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/chalk/node_modules/supports-color/package.json
@@ -1,38 +1,74 @@
{
- "name": "supports-color",
- "version": "2.0.0",
- "description": "Detect whether a terminal supports color",
- "license": "MIT",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/chalk/supports-color.git"
+ "_args": [
+ [
+ {
+ "raw": "supports-color@^2.0.0",
+ "scope": null,
+ "escapedName": "supports-color",
+ "name": "supports-color",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk"
+ ]
+ ],
+ "_from": "supports-color@>=2.0.0 <3.0.0",
+ "_id": "supports-color@2.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/chalk/supports-color",
+ "_nodeVersion": "0.12.5",
+ "_npmUser": {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ },
+ "_npmVersion": "2.11.2",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "supports-color@^2.0.0",
+ "scope": null,
+ "escapedName": "supports-color",
+ "name": "supports-color",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
},
+ "_requiredBy": [
+ "/request/har-validator/chalk"
+ ],
+ "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+ "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
+ "_shrinkwrap": null,
+ "_spec": "supports-color@^2.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/chalk",
"author": {
"name": "Sindre Sorhus",
"email": "sindresorhus@gmail.com",
"url": "sindresorhus.com"
},
- "maintainers": [
- {
- "name": "Sindre Sorhus",
- "email": "sindresorhus@gmail.com",
- "url": "sindresorhus.com"
- },
- {
- "name": "Joshua Appelman",
- "email": "jappelman@xebia.com",
- "url": "jbnicolai.com"
- }
- ],
+ "bugs": {
+ "url": "https://github.com/chalk/supports-color/issues"
+ },
+ "dependencies": {},
+ "description": "Detect whether a terminal supports color",
+ "devDependencies": {
+ "mocha": "*",
+ "require-uncached": "^1.0.2"
+ },
+ "directories": {},
+ "dist": {
+ "shasum": "535d045ce6b6363fa40117084629995e9df324c7",
+ "tarball": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+ },
"engines": {
"node": ">=0.8.0"
},
- "scripts": {
- "test": "mocha"
- },
"files": [
"index.js"
],
+ "gitHead": "8400d98ade32b2adffd50902c06d9e725a5c6588",
+ "homepage": "https://github.com/chalk/supports-color",
"keywords": [
"color",
"colour",
@@ -53,18 +89,26 @@
"capability",
"detect"
],
- "devDependencies": {
- "mocha": "*",
- "require-uncached": "^1.0.2"
+ "license": "MIT",
+ "maintainers": [
+ {
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
+ },
+ {
+ "name": "jbnicolai",
+ "email": "jappelman@xebia.com"
+ }
+ ],
+ "name": "supports-color",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/chalk/supports-color.git"
},
- "readme": "# supports-color [![Build Status](https://travis-ci.org/chalk/supports-color.svg?branch=master)](https://travis-ci.org/chalk/supports-color)\n\n> Detect whether a terminal supports color\n\n\n## Install\n\n```\n$ npm install --save supports-color\n```\n\n\n## Usage\n\n```js\nvar supportsColor = require('supports-color');\n\nif (supportsColor) {\n\tconsole.log('Terminal supports color');\n}\n```\n\nIt obeys the `--color` and `--no-color` CLI flags.\n\nFor situations where using `--color` is not possible, add an environment variable `FORCE_COLOR` with any value to force color. Trumps `--no-color`.\n\n\n## Related\n\n- [supports-color-cli](https://github.com/chalk/supports-color-cli) - CLI for this module\n- [chalk](https://github.com/chalk/chalk) - Terminal string styling done right\n\n\n## License\n\nMIT © [Sindre Sorhus](http://sindresorhus.com)\n",
- "readmeFilename": "readme.md",
- "bugs": {
- "url": "https://github.com/chalk/supports-color/issues"
+ "scripts": {
+ "test": "mocha"
},
- "homepage": "https://github.com/chalk/supports-color#readme",
- "_id": "supports-color@2.0.0",
- "_shasum": "535d045ce6b6363fa40117084629995e9df324c7",
- "_resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
- "_from": "supports-color@>=2.0.0 <3.0.0"
+ "version": "2.0.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json b/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
index cf2ae5bd3..a29160d3a 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/chalk/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "chalk@^1.1.1",
+ {
+ "raw": "chalk@^1.1.1",
+ "scope": null,
+ "escapedName": "chalk",
+ "name": "chalk",
+ "rawSpec": "^1.1.1",
+ "spec": ">=1.1.1 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator"
]
],
@@ -16,18 +24,19 @@
"tmp": "tmp/chalk-1.1.3.tgz_1459210604109_0.3892582862172276"
},
"_npmUser": {
- "email": "i.am.qix@gmail.com",
- "name": "qix"
+ "name": "qix",
+ "email": "i.am.qix@gmail.com"
},
"_npmVersion": "2.14.2",
"_phantomChildren": {
"ansi-regex": "2.0.0"
},
"_requested": {
- "name": "chalk",
"raw": "chalk@^1.1.1",
- "rawSpec": "^1.1.1",
"scope": null,
+ "escapedName": "chalk",
+ "name": "chalk",
+ "rawSpec": "^1.1.1",
"spec": ">=1.1.1 <2.0.0",
"type": "range"
},
@@ -99,16 +108,16 @@
"license": "MIT",
"maintainers": [
{
- "email": "i.am.qix@gmail.com",
- "name": "qix"
+ "name": "qix",
+ "email": "i.am.qix@gmail.com"
},
{
- "email": "sindresorhus@gmail.com",
- "name": "sindresorhus"
+ "name": "sindresorhus",
+ "email": "sindresorhus@gmail.com"
},
{
- "email": "sindresorhus+unicorn@gmail.com",
- "name": "unicorn"
+ "name": "unicorn",
+ "email": "sindresorhus+unicorn@gmail.com"
}
],
"name": "chalk",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json b/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
index 64d7d644d..19f11158e 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/commander/node_modules/graceful-readlink/package.json
@@ -1,31 +1,84 @@
{
- "name": "graceful-readlink",
- "version": "1.0.1",
- "description": "graceful fs.readlink",
- "main": "index.js",
- "repository": {
- "type": "git",
- "url": "git://github.com/zhiyelee/graceful-readlink.git"
+ "_args": [
+ [
+ {
+ "raw": "graceful-readlink@>= 1.0.0",
+ "scope": null,
+ "escapedName": "graceful-readlink",
+ "name": "graceful-readlink",
+ "rawSpec": ">= 1.0.0",
+ "spec": ">=1.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/commander"
+ ]
+ ],
+ "_from": "graceful-readlink@>=1.0.0",
+ "_id": "graceful-readlink@1.0.1",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/commander/graceful-readlink",
+ "_nodeVersion": "0.11.14",
+ "_npmUser": {
+ "name": "zhiyelee",
+ "email": "zhiyelee@gmail.com"
+ },
+ "_npmVersion": "2.1.17",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "graceful-readlink@>= 1.0.0",
+ "scope": null,
+ "escapedName": "graceful-readlink",
+ "name": "graceful-readlink",
+ "rawSpec": ">= 1.0.0",
+ "spec": ">=1.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/har-validator/commander"
+ ],
+ "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+ "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
+ "_shrinkwrap": null,
+ "_spec": "graceful-readlink@>= 1.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/commander",
+ "author": {
+ "name": "zhiyelee"
},
- "homepage": "https://github.com/zhiyelee/graceful-readlink",
"bugs": {
"url": "https://github.com/zhiyelee/graceful-readlink/issues"
},
+ "dependencies": {},
+ "description": "graceful fs.readlink",
+ "devDependencies": {},
+ "directories": {},
+ "dist": {
+ "shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
+ "tarball": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+ },
+ "gitHead": "f6655275bebef706fb63fd01b5f062a7052419a5",
+ "homepage": "https://github.com/zhiyelee/graceful-readlink",
"keywords": [
"fs.readlink",
"readlink"
],
- "author": {
- "name": "zhiyelee"
- },
"license": "MIT",
+ "main": "index.js",
+ "maintainers": [
+ {
+ "name": "zhiyelee",
+ "email": "zhiyelee@gmail.com"
+ }
+ ],
+ "name": "graceful-readlink",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/zhiyelee/graceful-readlink.git"
+ },
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
- "readme": "# graceful-readlink\n[![NPM Version](http://img.shields.io/npm/v/graceful-readlink.svg?style=flat)](https://www.npmjs.org/package/graceful-readlink)\n[![NPM Downloads](https://img.shields.io/npm/dm/graceful-readlink.svg?style=flat)](https://www.npmjs.org/package/graceful-readlink)\n\n\n## Usage\n\n```js\nvar readlinkSync = require('graceful-readlink').readlinkSync;\nconsole.log(readlinkSync(f));\n// output\n// the file pointed to when `f` is a symbolic link\n// the `f` itself when `f` is not a symbolic link\n```\n## Licence\n\nMIT License\n",
- "readmeFilename": "README.md",
- "_id": "graceful-readlink@1.0.1",
- "_shasum": "4cafad76bc62f02fa039b2f94e9a3dd3a391a725",
- "_resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
- "_from": "graceful-readlink@>=1.0.0"
+ "version": "1.0.1"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/commander/package.json b/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
index ccc77e036..591bfdf33 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/commander/package.json
@@ -1,56 +1,82 @@
{
- "name": "commander",
- "version": "2.9.0",
- "description": "the complete solution for node.js command-line programs",
- "keywords": [
- "command",
- "option",
- "parser"
+ "_args": [
+ [
+ {
+ "raw": "commander@^2.9.0",
+ "scope": null,
+ "escapedName": "commander",
+ "name": "commander",
+ "rawSpec": "^2.9.0",
+ "spec": ">=2.9.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator"
+ ]
],
+ "_from": "commander@>=2.9.0 <3.0.0",
+ "_id": "commander@2.9.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/commander",
+ "_nodeVersion": "0.12.7",
+ "_npmUser": {
+ "name": "zhiyelee",
+ "email": "zhiyelee@gmail.com"
+ },
+ "_npmVersion": "2.11.3",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "commander@^2.9.0",
+ "scope": null,
+ "escapedName": "commander",
+ "name": "commander",
+ "rawSpec": "^2.9.0",
+ "spec": ">=2.9.0 <3.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/har-validator"
+ ],
+ "_resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
+ "_shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
+ "_shrinkwrap": null,
+ "_spec": "commander@^2.9.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator",
"author": {
"name": "TJ Holowaychuk",
"email": "tj@vision-media.ca"
},
- "license": "MIT",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/tj/commander.js.git"
+ "bugs": {
+ "url": "https://github.com/tj/commander.js/issues"
+ },
+ "dependencies": {
+ "graceful-readlink": ">= 1.0.0"
},
+ "description": "the complete solution for node.js command-line programs",
"devDependencies": {
"should": ">= 0.0.1",
"sinon": ">=1.17.1"
},
- "scripts": {
- "test": "make test"
+ "directories": {},
+ "dist": {
+ "shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
+ "tarball": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
},
- "main": "index",
"engines": {
"node": ">= 0.6.x"
},
"files": [
"index.js"
],
- "dependencies": {
- "graceful-readlink": ">= 1.0.0"
- },
"gitHead": "b2aad7a8471d434593a85306aa73777a526e9f75",
- "bugs": {
- "url": "https://github.com/tj/commander.js/issues"
- },
"homepage": "https://github.com/tj/commander.js#readme",
- "_id": "commander@2.9.0",
- "_shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
- "_from": "commander@>=2.8.1 <3.0.0",
- "_npmVersion": "2.11.3",
- "_nodeVersion": "0.12.7",
- "_npmUser": {
- "name": "zhiyelee",
- "email": "zhiyelee@gmail.com"
- },
- "dist": {
- "shasum": "9c99094176e12240cb22d6c5146098400fe0f7d4",
- "tarball": "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
- },
+ "keywords": [
+ "command",
+ "option",
+ "parser"
+ ],
+ "license": "MIT",
+ "main": "index",
"maintainers": [
{
"name": "tjholowaychuk",
@@ -65,7 +91,15 @@
"email": "zhiyelee@gmail.com"
}
],
- "directories": {},
- "_resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
- "readme": "ERROR: No README data found!"
+ "name": "commander",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/tj/commander.js.git"
+ },
+ "scripts": {
+ "test": "make test"
+ },
+ "version": "2.9.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
index e2bc77284..329219aec 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-function/package.json
@@ -1,15 +1,64 @@
{
- "name": "generate-function",
- "version": "2.0.0",
+ "_args": [
+ [
+ {
+ "raw": "generate-function@^2.0.0",
+ "scope": null,
+ "escapedName": "generate-function",
+ "name": "generate-function",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid"
+ ]
+ ],
+ "_from": "generate-function@>=2.0.0 <3.0.0",
+ "_id": "generate-function@2.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/is-my-json-valid/generate-function",
+ "_npmUser": {
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
+ },
+ "_npmVersion": "1.4.23",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "generate-function@^2.0.0",
+ "scope": null,
+ "escapedName": "generate-function",
+ "name": "generate-function",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/har-validator/is-my-json-valid"
+ ],
+ "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+ "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
+ "_shrinkwrap": null,
+ "_spec": "generate-function@^2.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid",
+ "author": {
+ "name": "Mathias Buus"
+ },
+ "bugs": {
+ "url": "https://github.com/mafintosh/generate-function/issues"
+ },
+ "dependencies": {},
"description": "Module that helps you write generated functions in Node",
- "main": "index.js",
- "scripts": {
- "test": "tape test.js"
+ "devDependencies": {
+ "tape": "^2.13.4"
},
- "repository": {
- "type": "git",
- "url": "git+https://github.com/mafintosh/generate-function.git"
+ "directories": {},
+ "dist": {
+ "shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
+ "tarball": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
},
+ "gitHead": "3d5fc8de5859be95f58e3af9bfb5f663edd95149",
+ "homepage": "https://github.com/mafintosh/generate-function",
"keywords": [
"generate",
"code",
@@ -17,21 +66,23 @@
"function",
"performance"
],
- "author": {
- "name": "Mathias Buus"
- },
"license": "MIT",
- "bugs": {
- "url": "https://github.com/mafintosh/generate-function/issues"
+ "main": "index.js",
+ "maintainers": [
+ {
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
+ }
+ ],
+ "name": "generate-function",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/mafintosh/generate-function.git"
},
- "homepage": "https://github.com/mafintosh/generate-function",
- "devDependencies": {
- "tape": "^2.13.4"
+ "scripts": {
+ "test": "tape test.js"
},
- "readme": "# generate-function\n\nModule that helps you write generated functions in Node\n\n```\nnpm install generate-function\n```\n\n[![build status](http://img.shields.io/travis/mafintosh/generate-function.svg?style=flat)](http://travis-ci.org/mafintosh/generate-function)\n\n## Disclamer\n\nWriting code that generates code is hard.\nYou should only use this if you really, really, really need this for performance reasons (like schema validators / parsers etc).\n\n## Usage\n\n``` js\nvar genfun = require('generate-function')\n\nvar addNumber = function(val) {\n var fn = genfun()\n ('function add(n) {')\n ('return n + %d', val) // supports format strings to insert values\n ('}')\n\n return fn.toFunction() // will compile the function\n}\n\nvar add2 = addNumber(2)\n\nconsole.log('1+2=', add2(1))\nconsole.log(add2.toString()) // prints the generated function\n```\n\nIf you need to close over variables in your generated function pass them to `toFunction(scope)`\n\n``` js\nvar multiply = function(a, b) {\n return a * b\n}\n\nvar addAndMultiplyNumber = function(val) {\n var fn = genfun()\n ('function(n) {')\n ('if (typeof n !== \"number\") {') // ending a line with { will indent the source\n ('throw new Error(\"argument should be a number\")')\n ('}')\n ('var result = multiply(%d, n+%d)', val, val)\n ('return result')\n ('}')\n\n // use fn.toString() if you want to see the generated source\n\n return fn.toFunction({\n multiply: multiply\n })\n}\n\nvar addAndMultiply2 = addAndMultiplyNumber(2)\n\nconsole.log('(3 + 2) * 2 =', addAndMultiply2(3))\n```\n\n## Related\n\nSee [generate-object-property](https://github.com/mafintosh/generate-object-property) if you need to safely generate code that\ncan be used to reference an object property\n\n## License\n\nMIT",
- "readmeFilename": "README.md",
- "_id": "generate-function@2.0.0",
- "_shasum": "6858fe7c0969b7d4e9093337647ac79f60dfbe74",
- "_resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
- "_from": "generate-function@>=2.0.0 <3.0.0"
+ "version": "2.0.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
index 41225e266..13c59a348 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/node_modules/is-property/package.json
@@ -1,22 +1,67 @@
{
- "name": "is-property",
- "version": "1.0.2",
- "description": "Tests if a JSON property can be accessed using . syntax",
- "main": "is-property.js",
- "directories": {
- "test": "test"
+ "_args": [
+ [
+ {
+ "raw": "is-property@^1.0.0",
+ "scope": null,
+ "escapedName": "is-property",
+ "name": "is-property",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property"
+ ]
+ ],
+ "_from": "is-property@>=1.0.0 <2.0.0",
+ "_id": "is-property@1.0.2",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/is-my-json-valid/generate-object-property/is-property",
+ "_nodeVersion": "0.10.26",
+ "_npmUser": {
+ "name": "mikolalysenko",
+ "email": "mikolalysenko@gmail.com"
+ },
+ "_npmVersion": "2.1.4",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "is-property@^1.0.0",
+ "scope": null,
+ "escapedName": "is-property",
+ "name": "is-property",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/har-validator/is-my-json-valid/generate-object-property"
+ ],
+ "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+ "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
+ "_shrinkwrap": null,
+ "_spec": "is-property@^1.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property",
+ "author": {
+ "name": "Mikola Lysenko"
+ },
+ "bugs": {
+ "url": "https://github.com/mikolalysenko/is-property/issues"
},
"dependencies": {},
+ "description": "Tests if a JSON property can be accessed using . syntax",
"devDependencies": {
"tape": "~1.0.4"
},
- "scripts": {
- "test": "tap test/*.js"
+ "directories": {
+ "test": "test"
},
- "repository": {
- "type": "git",
- "url": "git://github.com/mikolalysenko/is-property.git"
+ "dist": {
+ "shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
+ "tarball": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
},
+ "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
+ "homepage": "https://github.com/mikolalysenko/is-property",
"keywords": [
"is",
"property",
@@ -26,19 +71,23 @@
".",
"[]"
],
- "author": {
- "name": "Mikola Lysenko"
- },
"license": "MIT",
- "readmeFilename": "README.md",
- "gitHead": "0a85ea5b6b1264ea1cdecc6e5cf186adbb3ffc50",
- "bugs": {
- "url": "https://github.com/mikolalysenko/is-property/issues"
+ "main": "is-property.js",
+ "maintainers": [
+ {
+ "name": "mikolalysenko",
+ "email": "mikolalysenko@gmail.com"
+ }
+ ],
+ "name": "is-property",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/mikolalysenko/is-property.git"
},
- "readme": "is-property\n===========\nTests if a property of a JavaScript object can be accessed using the dot (.) notation or if it must be enclosed in brackets, (ie use x[\" ... \"])\n\nExample\n-------\n\n```javascript\nvar isProperty = require(\"is-property\")\n\nconsole.log(isProperty(\"foo\")) //Prints true\nconsole.log(isProperty(\"0\")) //Prints false\n```\n\nInstall\n-------\n\n npm install is-property\n \n### `require(\"is-property\")(str)`\nChecks if str is a property\n\n* `str` is a string which we will test if it is a property or not\n\n**Returns** true or false depending if str is a property\n\n## Credits\n(c) 2013 Mikola Lysenko. MIT License",
- "homepage": "https://github.com/mikolalysenko/is-property#readme",
- "_id": "is-property@1.0.2",
- "_shasum": "57fe1c4e48474edd65b09911f26b1cd4095dda84",
- "_resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
- "_from": "is-property@>=1.0.0 <2.0.0"
+ "scripts": {
+ "test": "tap test/*.js"
+ },
+ "version": "1.0.2"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
index 0d018abfa..ad1db2fc7 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/generate-object-property/package.json
@@ -1,34 +1,85 @@
{
- "name": "generate-object-property",
- "version": "1.2.0",
- "description": "Generate safe JS code that can used to reference a object property",
- "repository": {
- "type": "git",
- "url": "git+https://github.com/mafintosh/generate-object-property.git"
+ "_args": [
+ [
+ {
+ "raw": "generate-object-property@^1.1.0",
+ "scope": null,
+ "escapedName": "generate-object-property",
+ "name": "generate-object-property",
+ "rawSpec": "^1.1.0",
+ "spec": ">=1.1.0 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid"
+ ]
+ ],
+ "_from": "generate-object-property@>=1.1.0 <2.0.0",
+ "_id": "generate-object-property@1.2.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/is-my-json-valid/generate-object-property",
+ "_nodeVersion": "2.0.1",
+ "_npmUser": {
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
},
- "devDependencies": {
- "tape": "^2.13.0"
+ "_npmVersion": "2.9.0",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "generate-object-property@^1.1.0",
+ "scope": null,
+ "escapedName": "generate-object-property",
+ "name": "generate-object-property",
+ "rawSpec": "^1.1.0",
+ "spec": ">=1.1.0 <2.0.0",
+ "type": "range"
},
- "scripts": {
- "test": "tape test.js"
+ "_requiredBy": [
+ "/request/har-validator/is-my-json-valid"
+ ],
+ "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+ "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
+ "_shrinkwrap": null,
+ "_spec": "generate-object-property@^1.1.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid",
+ "author": {
+ "name": "Mathias Buus",
+ "url": "@mafintosh"
+ },
+ "bugs": {
+ "url": "https://github.com/mafintosh/generate-object-property/issues"
},
"dependencies": {
"is-property": "^1.0.0"
},
- "bugs": {
- "url": "https://github.com/mafintosh/generate-object-property/issues"
+ "description": "Generate safe JS code that can used to reference a object property",
+ "devDependencies": {
+ "tape": "^2.13.0"
},
+ "directories": {},
+ "dist": {
+ "shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
+ "tarball": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+ },
+ "gitHead": "0dd7d411018de54b2eae63b424c15b3e50bd678c",
"homepage": "https://github.com/mafintosh/generate-object-property",
+ "license": "MIT",
"main": "index.js",
- "author": {
- "name": "Mathias Buus",
- "url": "@mafintosh"
+ "maintainers": [
+ {
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
+ }
+ ],
+ "name": "generate-object-property",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/mafintosh/generate-object-property.git"
},
- "license": "MIT",
- "readme": "# generate-object-property\n\nGenerate safe JS code that can used to reference a object property\n\n\tnpm install generate-object-property\n\n[![build status](http://img.shields.io/travis/mafintosh/generate-object-property.svg?style=flat)](http://travis-ci.org/mafintosh/generate-object-property)\n\n## Usage\n\n``` js\nvar gen = require('generate-object-property');\nconsole.log(gen('a','b')); // prints a.b\nconsole.log(gen('a', 'foo-bar')); // prints a[\"foo-bar\"]\n```\n\n## License\n\nMIT",
- "readmeFilename": "README.md",
- "_id": "generate-object-property@1.2.0",
- "_shasum": "9c0e1c40308ce804f4783618b937fa88f99d50d0",
- "_resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
- "_from": "generate-object-property@>=1.1.0 <2.0.0"
+ "scripts": {
+ "test": "tape test.js"
+ },
+ "version": "1.2.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
index 4b0677650..c90dcced7 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/jsonpointer/package.json
@@ -1,49 +1,75 @@
{
- "name": "jsonpointer",
- "description": "Simple JSON Addressing.",
- "tags": [
- "util",
- "simple",
- "util",
- "utility"
+ "_args": [
+ [
+ {
+ "raw": "jsonpointer@2.0.0",
+ "scope": null,
+ "escapedName": "jsonpointer",
+ "name": "jsonpointer",
+ "rawSpec": "2.0.0",
+ "spec": "2.0.0",
+ "type": "version"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid"
+ ]
+ ],
+ "_from": "jsonpointer@2.0.0",
+ "_id": "jsonpointer@2.0.0",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/har-validator/is-my-json-valid/jsonpointer",
+ "_nodeVersion": "0.10.36",
+ "_npmUser": {
+ "name": "marcbachmann",
+ "email": "marc.brookman@gmail.com"
+ },
+ "_npmVersion": "2.10.1",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "jsonpointer@2.0.0",
+ "scope": null,
+ "escapedName": "jsonpointer",
+ "name": "jsonpointer",
+ "rawSpec": "2.0.0",
+ "spec": "2.0.0",
+ "type": "version"
+ },
+ "_requiredBy": [
+ "/request/har-validator/is-my-json-valid"
],
- "version": "2.0.0",
+ "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
+ "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+ "_shrinkwrap": null,
+ "_spec": "jsonpointer@2.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid",
"author": {
"name": "Jan Lehnardt",
"email": "jan@apache.org"
},
+ "bugs": {
+ "url": "http://github.com/janl/node-jsonpointer/issues"
+ },
"contributors": [
{
"name": "Joe Hildebrand",
"email": "joe-github@cursive.net"
}
],
- "repository": {
- "type": "git",
- "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
- },
- "bugs": {
- "url": "http://github.com/janl/node-jsonpointer/issues"
+ "dependencies": {},
+ "description": "Simple JSON Addressing.",
+ "devDependencies": {},
+ "directories": {},
+ "dist": {
+ "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
+ "tarball": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
},
"engines": {
"node": ">=0.6.0"
},
- "main": "./jsonpointer",
- "scripts": {
- "test": "node test.js"
- },
- "license": "MIT",
"gitHead": "26ea4a5c0fcb6d9a2e87f733403791dd05637af8",
"homepage": "https://github.com/janl/node-jsonpointer#readme",
- "_id": "jsonpointer@2.0.0",
- "_shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
- "_from": "jsonpointer@2.0.0",
- "_npmVersion": "2.10.1",
- "_nodeVersion": "0.10.36",
- "_npmUser": {
- "name": "marcbachmann",
- "email": "marc.brookman@gmail.com"
- },
+ "license": "MIT",
+ "main": "./jsonpointer",
"maintainers": [
{
"name": "jan",
@@ -54,11 +80,21 @@
"email": "marc.brookman@gmail.com"
}
],
- "dist": {
- "shasum": "3af1dd20fe85463910d469a385e33017d2a030d9",
- "tarball": "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+ "name": "jsonpointer",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+ssh://git@github.com/janl/node-jsonpointer.git"
},
- "directories": {},
- "_resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz",
- "readme": "ERROR: No README data found!"
+ "scripts": {
+ "test": "node test.js"
+ },
+ "tags": [
+ "util",
+ "simple",
+ "util",
+ "utility"
+ ],
+ "version": "2.0.0"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
index f16c4235f..87e47bd4f 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/node_modules/xtend/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "xtend@^4.0.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid"
+ {
+ "raw": "xtend@^4.0.0",
+ "scope": null,
+ "escapedName": "xtend",
+ "name": "xtend",
+ "rawSpec": "^4.0.0",
+ "spec": ">=4.0.0 <5.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid"
]
],
"_from": "xtend@>=4.0.0 <5.0.0",
@@ -12,16 +20,17 @@
"_location": "/request/har-validator/is-my-json-valid/xtend",
"_nodeVersion": "0.10.32",
"_npmUser": {
- "email": "raynos2@gmail.com",
- "name": "raynos"
+ "name": "raynos",
+ "email": "raynos2@gmail.com"
},
"_npmVersion": "2.14.1",
"_phantomChildren": {},
"_requested": {
- "name": "xtend",
"raw": "xtend@^4.0.0",
- "rawSpec": "^4.0.0",
"scope": null,
+ "escapedName": "xtend",
+ "name": "xtend",
+ "rawSpec": "^4.0.0",
"spec": ">=4.0.0 <5.0.0",
"type": "range"
},
@@ -32,14 +41,14 @@
"_shasum": "a5c6d532be656e23db820efb943a1f04998d63af",
"_shrinkwrap": null,
"_spec": "xtend@^4.0.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid",
"author": {
- "email": "raynos2@gmail.com",
- "name": "Raynos"
+ "name": "Raynos",
+ "email": "raynos2@gmail.com"
},
"bugs": {
- "email": "raynos2@gmail.com",
- "url": "https://github.com/Raynos/xtend/issues"
+ "url": "https://github.com/Raynos/xtend/issues",
+ "email": "raynos2@gmail.com"
},
"contributors": [
{
@@ -57,7 +66,7 @@
"directories": {},
"dist": {
"shasum": "a5c6d532be656e23db820efb943a1f04998d63af",
- "tarball": "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+ "tarball": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
},
"engines": {
"node": ">=0.4"
@@ -65,12 +74,12 @@
"gitHead": "23dc302a89756da89c1897bc732a752317e35390",
"homepage": "https://github.com/Raynos/xtend",
"keywords": [
- "array",
"extend",
"merge",
- "object",
"options",
- "opts"
+ "opts",
+ "object",
+ "array"
],
"license": "MIT",
"main": "immutable",
@@ -91,19 +100,19 @@
"test": "node test"
},
"testling": {
+ "files": "test.js",
"browsers": [
- "chrome/22..latest",
- "chrome/canary",
+ "ie/7..latest",
"firefox/16..latest",
"firefox/nightly",
- "ie/7..latest",
- "ipad/6.0..latest",
- "iphone/6.0..latest",
+ "chrome/22..latest",
+ "chrome/canary",
"opera/12..latest",
"opera/next",
- "safari/5.1..latest"
- ],
- "files": "test.js"
+ "safari/5.1..latest",
+ "ipad/6.0..latest",
+ "iphone/6.0..latest"
+ ]
},
"version": "4.0.1"
}
diff --git a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
index 97fba32e7..aedffd103 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/is-my-json-valid/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "is-my-json-valid@^2.12.4",
+ {
+ "raw": "is-my-json-valid@^2.12.4",
+ "scope": null,
+ "escapedName": "is-my-json-valid",
+ "name": "is-my-json-valid",
+ "rawSpec": "^2.12.4",
+ "spec": ">=2.12.4 <3.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator"
]
],
@@ -16,16 +24,17 @@
"tmp": "tmp/is-my-json-valid-2.13.1.tgz_1456180270224_0.17748022079467773"
},
"_npmUser": {
- "email": "mathiasbuus@gmail.com",
- "name": "mafintosh"
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
},
"_npmVersion": "2.14.7",
"_phantomChildren": {},
"_requested": {
- "name": "is-my-json-valid",
"raw": "is-my-json-valid@^2.12.4",
- "rawSpec": "^2.12.4",
"scope": null,
+ "escapedName": "is-my-json-valid",
+ "name": "is-my-json-valid",
+ "rawSpec": "^2.12.4",
"spec": ">=2.12.4 <3.0.0",
"type": "range"
},
@@ -56,7 +65,7 @@
"directories": {},
"dist": {
"shasum": "d55778a82feb6b0963ff4be111d5d1684e890707",
- "tarball": "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
+ "tarball": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
},
"gitHead": "5bacc71441750bc6e79829abcfc21d4f2f0c4396",
"homepage": "https://github.com/mafintosh/is-my-json-valid",
@@ -70,20 +79,20 @@
"main": "index.js",
"maintainers": [
{
- "email": "freeall@gmail.com",
- "name": "freeall"
+ "name": "freeall",
+ "email": "freeall@gmail.com"
},
{
- "email": "mathiasbuus@gmail.com",
- "name": "mafintosh"
+ "name": "mafintosh",
+ "email": "mathiasbuus@gmail.com"
},
{
- "email": "w@tson.dk",
- "name": "watson"
+ "name": "watson",
+ "email": "w@tson.dk"
},
{
- "email": "i@yoshuawuyts.com",
- "name": "yoshuawuyts"
+ "name": "yoshuawuyts",
+ "email": "i@yoshuawuyts.com"
}
],
"name": "is-my-json-valid",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json b/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
index 8cebb11e4..c034b70c5 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/node_modules/pinkie/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "pinkie@^2.0.0",
+ {
+ "raw": "pinkie@^2.0.0",
+ "scope": null,
+ "escapedName": "pinkie",
+ "name": "pinkie",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise"
]
],
@@ -12,16 +20,17 @@
"_location": "/request/har-validator/pinkie-promise/pinkie",
"_nodeVersion": "4.2.4",
"_npmUser": {
- "email": "floatdrop@gmail.com",
- "name": "floatdrop"
+ "name": "floatdrop",
+ "email": "floatdrop@gmail.com"
},
"_npmVersion": "2.14.12",
"_phantomChildren": {},
"_requested": {
- "name": "pinkie",
"raw": "pinkie@^2.0.0",
- "rawSpec": "^2.0.0",
"scope": null,
+ "escapedName": "pinkie",
+ "name": "pinkie",
+ "rawSpec": "^2.0.0",
"spec": ">=2.0.0 <3.0.0",
"type": "range"
},
@@ -34,8 +43,8 @@
"_spec": "pinkie@^2.0.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise",
"author": {
- "email": "floatdrop@gmail.com",
"name": "Vsevolod Strukchinsky",
+ "email": "floatdrop@gmail.com",
"url": "github.com/floatdrop"
},
"bugs": {
@@ -54,7 +63,7 @@
"directories": {},
"dist": {
"shasum": "72556b80cfa0d48a974e80e77248e80ed4f7f870",
- "tarball": "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+ "tarball": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
},
"engines": {
"node": ">=0.10.0"
@@ -73,8 +82,8 @@
"license": "MIT",
"maintainers": [
{
- "email": "floatdrop@gmail.com",
- "name": "floatdrop"
+ "name": "floatdrop",
+ "email": "floatdrop@gmail.com"
}
],
"name": "pinkie",
diff --git a/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json b/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
index 438996b7e..b09c56001 100644
--- a/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
+++ b/node_modules/request/node_modules/har-validator/node_modules/pinkie-promise/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "pinkie-promise@^2.0.0",
+ {
+ "raw": "pinkie-promise@^2.0.0",
+ "scope": null,
+ "escapedName": "pinkie-promise",
+ "name": "pinkie-promise",
+ "rawSpec": "^2.0.0",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator"
]
],
@@ -16,16 +24,17 @@
"tmp": "tmp/pinkie-promise-2.0.1.tgz_1460309839126_0.3422858319245279"
},
"_npmUser": {
- "email": "floatdrop@gmail.com",
- "name": "floatdrop"
+ "name": "floatdrop",
+ "email": "floatdrop@gmail.com"
},
"_npmVersion": "2.14.20",
"_phantomChildren": {},
"_requested": {
- "name": "pinkie-promise",
"raw": "pinkie-promise@^2.0.0",
- "rawSpec": "^2.0.0",
"scope": null,
+ "escapedName": "pinkie-promise",
+ "name": "pinkie-promise",
+ "rawSpec": "^2.0.0",
"spec": ">=2.0.0 <3.0.0",
"type": "range"
},
@@ -38,8 +47,8 @@
"_spec": "pinkie-promise@^2.0.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/har-validator",
"author": {
- "email": "floatdrop@gmail.com",
"name": "Vsevolod Strukchinsky",
+ "email": "floatdrop@gmail.com",
"url": "github.com/floatdrop"
},
"bugs": {
@@ -76,8 +85,8 @@
"license": "MIT",
"maintainers": [
{
- "email": "floatdrop@gmail.com",
- "name": "floatdrop"
+ "name": "floatdrop",
+ "email": "floatdrop@gmail.com"
}
],
"name": "pinkie-promise",
diff --git a/node_modules/request/node_modules/har-validator/package.json b/node_modules/request/node_modules/har-validator/package.json
index 76f57480e..269c1490c 100644
--- a/node_modules/request/node_modules/har-validator/package.json
+++ b/node_modules/request/node_modules/har-validator/package.json
@@ -1,31 +1,40 @@
{
"_args": [
[
- "har-validator@~2.0.2",
+ {
+ "raw": "har-validator@~2.0.6",
+ "scope": null,
+ "escapedName": "har-validator",
+ "name": "har-validator",
+ "rawSpec": "~2.0.6",
+ "spec": ">=2.0.6 <2.1.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "har-validator@>=2.0.2 <2.1.0",
+ "_from": "har-validator@>=2.0.6 <2.1.0",
"_id": "har-validator@2.0.6",
"_inCache": true,
"_installable": true,
"_location": "/request/har-validator",
"_nodeVersion": "5.2.0",
"_npmUser": {
- "email": "ahmad@ahmadnassri.com",
- "name": "ahmadnassri"
+ "name": "ahmadnassri",
+ "email": "ahmad@ahmadnassri.com"
},
"_npmVersion": "3.3.12",
"_phantomChildren": {
"ansi-regex": "2.0.0",
- "strip-ansi": "3.0.0"
+ "strip-ansi": "3.0.1"
},
"_requested": {
- "name": "har-validator",
- "raw": "har-validator@~2.0.2",
- "rawSpec": "~2.0.2",
+ "raw": "har-validator@~2.0.6",
"scope": null,
- "spec": ">=2.0.2 <2.1.0",
+ "escapedName": "har-validator",
+ "name": "har-validator",
+ "rawSpec": "~2.0.6",
+ "spec": ">=2.0.6 <2.1.0",
"type": "range"
},
"_requiredBy": [
@@ -34,11 +43,11 @@
"_resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
"_shasum": "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d",
"_shrinkwrap": null,
- "_spec": "har-validator@~2.0.2",
+ "_spec": "har-validator@~2.0.6",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "ahmad@ahmadnassri.com",
"name": "Ahmad Nassri",
+ "email": "ahmad@ahmadnassri.com",
"url": "https://www.ahmadnassri.com/"
},
"bin": {
@@ -66,7 +75,7 @@
"directories": {},
"dist": {
"shasum": "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d",
- "tarball": "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
+ "tarball": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
},
"echint": {
"ignore": [
@@ -83,9 +92,9 @@
"gitHead": "92ccddad2e5d13e6e32c764e06c347d67805b211",
"homepage": "https://github.com/ahmadnassri/har-validator",
"keywords": [
- "archive",
"har",
"http",
+ "archive",
"validate",
"validator"
],
diff --git a/node_modules/request/node_modules/hawk/node_modules/boom/package.json b/node_modules/request/node_modules/hawk/node_modules/boom/package.json
index 42749188a..c95a8315c 100644
--- a/node_modules/request/node_modules/hawk/node_modules/boom/package.json
+++ b/node_modules/request/node_modules/hawk/node_modules/boom/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "boom@2.x.x",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/hawk"
+ {
+ "raw": "boom@2.x.x",
+ "scope": null,
+ "escapedName": "boom",
+ "name": "boom",
+ "rawSpec": "2.x.x",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk"
]
],
"_from": "boom@>=2.0.0 <3.0.0",
@@ -12,16 +20,17 @@
"_location": "/request/hawk/boom",
"_nodeVersion": "0.10.40",
"_npmUser": {
- "email": "arbretz@gmail.com",
- "name": "arb"
+ "name": "arb",
+ "email": "arbretz@gmail.com"
},
"_npmVersion": "2.11.1",
"_phantomChildren": {},
"_requested": {
- "name": "boom",
"raw": "boom@2.x.x",
- "rawSpec": "2.x.x",
"scope": null,
+ "escapedName": "boom",
+ "name": "boom",
+ "rawSpec": "2.x.x",
"spec": ">=2.0.0 <3.0.0",
"type": "range"
},
@@ -33,7 +42,7 @@
"_shasum": "39c8918ceff5799f83f9492a848f625add0c766f",
"_shrinkwrap": null,
"_spec": "boom@2.x.x",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/hawk",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk",
"bugs": {
"url": "https://github.com/hapijs/boom/issues"
},
@@ -48,7 +57,7 @@
"directories": {},
"dist": {
"shasum": "39c8918ceff5799f83f9492a848f625add0c766f",
- "tarball": "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+ "tarball": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
},
"engines": {
"node": ">=0.10.40"
diff --git a/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json b/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
index c65fd0940..6783bde46 100644
--- a/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
+++ b/node_modules/request/node_modules/hawk/node_modules/cryptiles/package.json
@@ -1,50 +1,75 @@
{
- "name": "cryptiles",
- "description": "General purpose crypto utilities",
- "version": "2.0.5",
- "repository": {
- "type": "git",
- "url": "git://github.com/hapijs/cryptiles.git"
+ "_args": [
+ [
+ {
+ "raw": "cryptiles@2.x.x",
+ "scope": null,
+ "escapedName": "cryptiles",
+ "name": "cryptiles",
+ "rawSpec": "2.x.x",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk"
+ ]
+ ],
+ "_from": "cryptiles@>=2.0.0 <3.0.0",
+ "_id": "cryptiles@2.0.5",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/hawk/cryptiles",
+ "_nodeVersion": "4.0.0",
+ "_npmUser": {
+ "name": "hueniverse",
+ "email": "eran@hammer.io"
},
- "main": "lib/index.js",
- "keywords": [
- "cryptography",
- "security",
- "utilites"
+ "_npmVersion": "2.14.2",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "cryptiles@2.x.x",
+ "scope": null,
+ "escapedName": "cryptiles",
+ "name": "cryptiles",
+ "rawSpec": "2.x.x",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/hawk"
],
- "engines": {
- "node": ">=0.10.40"
+ "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+ "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
+ "_shrinkwrap": null,
+ "_spec": "cryptiles@2.x.x",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk",
+ "bugs": {
+ "url": "https://github.com/hapijs/cryptiles/issues"
},
"dependencies": {
"boom": "2.x.x"
},
+ "description": "General purpose crypto utilities",
"devDependencies": {
"code": "1.x.x",
"lab": "5.x.x"
},
- "scripts": {
- "test": "lab -a code -t 100 -L",
- "test-cov-html": "lab -a code -r html -o coverage.html"
- },
- "license": "BSD-3-Clause",
- "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
- "bugs": {
- "url": "https://github.com/hapijs/cryptiles/issues"
- },
- "homepage": "https://github.com/hapijs/cryptiles#readme",
- "_id": "cryptiles@2.0.5",
- "_shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
- "_from": "cryptiles@>=2.0.0 <3.0.0",
- "_npmVersion": "2.14.2",
- "_nodeVersion": "4.0.0",
- "_npmUser": {
- "name": "hueniverse",
- "email": "eran@hammer.io"
- },
+ "directories": {},
"dist": {
"shasum": "3bdfecdc608147c1c67202fa291e7dca59eaa3b8",
- "tarball": "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+ "tarball": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+ },
+ "engines": {
+ "node": ">=0.10.40"
},
+ "gitHead": "9bc5a852f01cd51e615814e1cb255fe2df810649",
+ "homepage": "https://github.com/hapijs/cryptiles#readme",
+ "keywords": [
+ "cryptography",
+ "security",
+ "utilites"
+ ],
+ "license": "BSD-3-Clause",
+ "main": "lib/index.js",
"maintainers": [
{
"name": "hueniverse",
@@ -55,7 +80,16 @@
"email": "ceejceej@gmail.com"
}
],
- "directories": {},
- "_resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
- "readme": "ERROR: No README data found!"
+ "name": "cryptiles",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/hapijs/cryptiles.git"
+ },
+ "scripts": {
+ "test": "lab -a code -t 100 -L",
+ "test-cov-html": "lab -a code -r html -o coverage.html"
+ },
+ "version": "2.0.5"
}
diff --git a/node_modules/request/node_modules/hawk/node_modules/hoek/package.json b/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
index 6e76778c7..1dbb2af39 100644
--- a/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
+++ b/node_modules/request/node_modules/hawk/node_modules/hoek/package.json
@@ -1,36 +1,97 @@
{
- "name": "hoek",
- "description": "General purpose node utilities",
- "version": "2.16.3",
- "repository": {
- "type": "git",
- "url": "git://github.com/hapijs/hoek.git"
+ "_args": [
+ [
+ {
+ "raw": "hoek@2.x.x",
+ "scope": null,
+ "escapedName": "hoek",
+ "name": "hoek",
+ "rawSpec": "2.x.x",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk"
+ ]
+ ],
+ "_from": "hoek@>=2.0.0 <3.0.0",
+ "_id": "hoek@2.16.3",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/hawk/hoek",
+ "_nodeVersion": "4.1.0",
+ "_npmUser": {
+ "name": "nlf",
+ "email": "quitlahok@gmail.com"
},
- "main": "lib/index.js",
- "keywords": [
- "utilities"
+ "_npmVersion": "3.3.3",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "hoek@2.x.x",
+ "scope": null,
+ "escapedName": "hoek",
+ "name": "hoek",
+ "rawSpec": "2.x.x",
+ "spec": ">=2.0.0 <3.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/hawk",
+ "/request/hawk/boom",
+ "/request/hawk/sntp"
],
- "engines": {
- "node": ">=0.10.40"
+ "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+ "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
+ "_shrinkwrap": null,
+ "_spec": "hoek@2.x.x",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk",
+ "bugs": {
+ "url": "https://github.com/hapijs/hoek/issues"
},
"dependencies": {},
+ "description": "General purpose node utilities",
"devDependencies": {
"code": "1.x.x",
"lab": "5.x.x"
},
+ "directories": {},
+ "dist": {
+ "shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
+ "tarball": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+ },
+ "engines": {
+ "node": ">=0.10.40"
+ },
+ "gitHead": "20f36e85616264d4b73a64a374803175213a9121",
+ "homepage": "https://github.com/hapijs/hoek#readme",
+ "keywords": [
+ "utilities"
+ ],
+ "license": "BSD-3-Clause",
+ "main": "lib/index.js",
+ "maintainers": [
+ {
+ "name": "hueniverse",
+ "email": "eran@hueniverse.com"
+ },
+ {
+ "name": "wyatt",
+ "email": "wpreul@gmail.com"
+ },
+ {
+ "name": "nlf",
+ "email": "quitlahok@gmail.com"
+ }
+ ],
+ "name": "hoek",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/hapijs/hoek.git"
+ },
"scripts": {
"test": "lab -a code -t 100 -L",
"test-cov-html": "lab -a code -t 100 -L -r html -o coverage.html"
},
- "license": "BSD-3-Clause",
- "readme": "![hoek Logo](https://raw.github.com/hapijs/hoek/master/images/hoek.png)\n\nUtility methods for the hapi ecosystem. This module is not intended to solve every problem for everyone, but rather as a central place to store hapi-specific methods. If you're looking for a general purpose utility module, check out [lodash](https://github.com/lodash/lodash) or [underscore](https://github.com/jashkenas/underscore).\n\n[![Build Status](https://secure.travis-ci.org/hapijs/hoek.svg)](http://travis-ci.org/hapijs/hoek)\n\nLead Maintainer: [Nathan LaFreniere](https://github.com/nlf)\n\n# Table of Contents\n\n* [Introduction](#introduction \"Introduction\")\n* [Object](#object \"Object\")\n * [clone](#cloneobj \"clone\")\n * [cloneWithShallow](#clonewithshallowobj-keys \"cloneWithShallow\")\n * [merge](#mergetarget-source-isnulloverride-ismergearrays \"merge\")\n * [applyToDefaults](#applytodefaultsdefaults-options-isnulloverride \"applyToDefaults\")\n * [applyToDefaultsWithShallow](#applytodefaultswithshallowdefaults-options-keys \"applyToDefaultsWithShallow\")\n * [deepEqual](#deepequala-b \"deepEqual\")\n * [unique](#uniquearray-key \"unique\")\n * [mapToObject](#maptoobjectarray-key \"mapToObject\")\n * [intersect](#intersectarray1-array2 \"intersect\")\n * [contain](#containref-values-options \"contain\")\n * [flatten](#flattenarray-target \"flatten\")\n * [reach](#reachobj-chain-options \"reach\")\n * [reachTemplate](#reachtemplateobj-template-options \"reachTemplate\")\n * [transform](#transformobj-transform-options \"transform\")\n * [shallow](#shallowobj \"shallow\")\n * [stringify](#stringifyobj \"stringify\")\n* [Timer](#timer \"Timer\")\n* [Bench](#bench \"Bench\")\n* [Binary Encoding/Decoding](#binary-encodingdecoding \"Binary Encoding/Decoding\")\n * [base64urlEncode](#base64urlencodevalue \"binary64urlEncode\")\n * [base64urlDecode](#base64urldecodevalue \"binary64urlDecode\")\n* [Escaping Characters](#escaping-characters \"Escaping Characters\")\n * [escapeHtml](#escapehtmlstring \"escapeHtml\")\n * [escapeHeaderAttribute](#escapeheaderattributeattribute \"escapeHeaderAttribute\")\n * [escapeRegex](#escaperegexstring \"escapeRegex\")\n* [Errors](#errors \"Errors\")\n * [assert](#assertcondition-message \"assert\")\n * [abort](#abortmessage \"abort\")\n * [displayStack](#displaystackslice \"displayStack\")\n * [callStack](#callstackslice \"callStack\")\n* [Function](#function \"Function\")\n * [nextTick](#nexttickfn \"nextTick\")\n * [once](#oncefn \"once\")\n * [ignore](#ignore \"ignore\")\n* [Miscellaneous](#miscellaneous \"Miscellaneous\")\n * [uniqueFilename](#uniquefilenamepath-extension \"uniqueFilename\")\n * [isAbsolutePath](#isabsolutepathpath-platform \"isAbsolutePath\")\n * [isInteger](#isintegervalue \"isInteger\")\n\n\n\n# Introduction\n\nThe *Hoek* library contains some common functions used within the hapi ecosystem. It comes with useful methods for Arrays (clone, merge, applyToDefaults), Objects (removeKeys, copy), Asserting and more.\n\nFor example, to use Hoek to set configuration with default options:\n```javascript\nvar Hoek = require('hoek');\n\nvar default = {url : \"www.github.com\", port : \"8000\", debug : true};\n\nvar config = Hoek.applyToDefaults(default, {port : \"3000\", admin : true});\n\n// In this case, config would be { url: 'www.github.com', port: '3000', debug: true, admin: true }\n```\n\nUnder each of the sections (such as Array), there are subsections which correspond to Hoek methods. Each subsection will explain how to use the corresponding method. In each js excerpt below, the `var Hoek = require('hoek');` is omitted for brevity.\n\n## Object\n\nHoek provides several helpful methods for objects and arrays.\n\n### clone(obj)\n\nThis method is used to clone an object or an array. A *deep copy* is made (duplicates everything, including values that are objects, as well as non-enumerable properties).\n\n```javascript\n\nvar nestedObj = {\n w: /^something$/ig,\n x: {\n a: [1, 2, 3],\n b: 123456,\n c: new Date()\n },\n y: 'y',\n z: new Date()\n };\n\nvar copy = Hoek.clone(nestedObj);\n\ncopy.x.b = 100;\n\nconsole.log(copy.y); // results in 'y'\nconsole.log(nestedObj.x.b); // results in 123456\nconsole.log(copy.x.b); // results in 100\n```\n\n### cloneWithShallow(obj, keys)\nkeys is an array of key names to shallow copy\n\nThis method is also used to clone an object or array, however any keys listed in the `keys` array are shallow copied while those not listed are deep copied.\n\n```javascript\n\nvar nestedObj = {\n w: /^something$/ig,\n x: {\n a: [1, 2, 3],\n b: 123456,\n c: new Date()\n },\n y: 'y',\n z: new Date()\n };\n\nvar copy = Hoek.cloneWithShallow(nestedObj, ['x']);\n\ncopy.x.b = 100;\n\nconsole.log(copy.y); // results in 'y'\nconsole.log(nestedObj.x.b); // results in 100\nconsole.log(copy.x.b); // results in 100\n```\n\n### merge(target, source, isNullOverride, isMergeArrays)\nisNullOverride, isMergeArrays default to true\n\nMerge all the properties of source into target, source wins in conflict, and by default null and undefined from source are applied.\nMerge is destructive where the target is modified. For non destructive merge, use `applyToDefaults`.\n\n\n```javascript\n\nvar target = {a: 1, b : 2};\nvar source = {a: 0, c: 5};\nvar source2 = {a: null, c: 5};\n\nHoek.merge(target, source); // results in {a: 0, b: 2, c: 5}\nHoek.merge(target, source2); // results in {a: null, b: 2, c: 5}\nHoek.merge(target, source2, false); // results in {a: 1, b: 2, c: 5}\n\nvar targetArray = [1, 2, 3];\nvar sourceArray = [4, 5];\n\nHoek.merge(targetArray, sourceArray); // results in [1, 2, 3, 4, 5]\nHoek.merge(targetArray, sourceArray, true, false); // results in [4, 5]\n```\n\n### applyToDefaults(defaults, options, isNullOverride)\nisNullOverride defaults to false\n\nApply options to a copy of the defaults\n\n```javascript\n\nvar defaults = { host: \"localhost\", port: 8000 };\nvar options = { port: 8080 };\n\nvar config = Hoek.applyToDefaults(defaults, options); // results in { host: \"localhost\", port: 8080 }\n```\n\nApply options with a null value to a copy of the defaults\n\n```javascript\n\nvar defaults = { host: \"localhost\", port: 8000 };\nvar options = { host: null, port: 8080 };\n\nvar config = Hoek.applyToDefaults(defaults, options, true); // results in { host: null, port: 8080 }\n```\n\n### applyToDefaultsWithShallow(defaults, options, keys)\nkeys is an array of key names to shallow copy\n\nApply options to a copy of the defaults. Keys specified in the last parameter are shallow copied from options instead of merged.\n\n```javascript\n\nvar defaults = {\n server: {\n host: \"localhost\",\n port: 8000\n },\n name: 'example'\n };\n\nvar options = { server: { port: 8080 } };\n\nvar config = Hoek.applyToDefaultsWithShallow(defaults, options, ['server']); // results in { server: { port: 8080 }, name: 'example' }\n```\n\n### deepEqual(b, a, [options])\n\nPerforms a deep comparison of the two values including support for circular dependencies, prototype, and properties. To skip prototype comparisons, use `options.prototype = false`\n\n```javascript\nHoek.deepEqual({ a: [1, 2], b: 'string', c: { d: true } }, { a: [1, 2], b: 'string', c: { d: true } }); //results in true\nHoek.deepEqual(Object.create(null), {}, { prototype: false }); //results in true\nHoek.deepEqual(Object.create(null), {}); //results in false\n```\n\n### unique(array, key)\n\nRemove duplicate items from Array\n\n```javascript\n\nvar array = [1, 2, 2, 3, 3, 4, 5, 6];\n\nvar newArray = Hoek.unique(array); // results in [1,2,3,4,5,6]\n\narray = [{id: 1}, {id: 1}, {id: 2}];\n\nnewArray = Hoek.unique(array, \"id\"); // results in [{id: 1}, {id: 2}]\n```\n\n### mapToObject(array, key)\n\nConvert an Array into an Object\n\n```javascript\n\nvar array = [1,2,3];\nvar newObject = Hoek.mapToObject(array); // results in [{\"1\": true}, {\"2\": true}, {\"3\": true}]\n\narray = [{id: 1}, {id: 2}];\nnewObject = Hoek.mapToObject(array, \"id\"); // results in [{\"id\": 1}, {\"id\": 2}]\n```\n\n### intersect(array1, array2)\n\nFind the common unique items in two arrays\n\n```javascript\n\nvar array1 = [1, 2, 3];\nvar array2 = [1, 4, 5];\n\nvar newArray = Hoek.intersect(array1, array2); // results in [1]\n```\n\n### contain(ref, values, [options])\n\nTests if the reference value contains the provided values where:\n- `ref` - the reference string, array, or object.\n- `values` - a single or array of values to find within the `ref` value. If `ref` is an object, `values` can be a key name,\n an array of key names, or an object with key-value pairs to compare.\n- `options` - an optional object with the following optional settings:\n - `deep` - if `true`, performed a deep comparison of the values.\n - `once` - if `true`, allows only one occurrence of each value.\n - `only` - if `true`, does not allow values not explicitly listed.\n - `part` - if `true`, allows partial match of the values (at least one must always match).\n\nNote: comparing a string to overlapping values will result in failed comparison (e.g. `contain('abc', ['ab', 'bc'])`).\nAlso, if an object key's value does not match the provided value, `false` is returned even when `part` is specified.\n\n```javascript\nHoek.contain('aaa', 'a', { only: true });\t\t\t\t\t\t\t// true\nHoek.contain([{ a: 1 }], [{ a: 1 }], { deep: true });\t\t\t\t// true\nHoek.contain([1, 2, 2], [1, 2], { once: true });\t\t\t\t\t// false\nHoek.contain({ a: 1, b: 2, c: 3 }, { a: 1, d: 4 }, { part: true }); // true\n```\n\n### flatten(array, [target])\n\nFlatten an array\n\n```javascript\n\nvar array = [1, [2, 3]];\n\nvar flattenedArray = Hoek.flatten(array); // results in [1, 2, 3]\n\narray = [1, [2, 3]];\ntarget = [4, [5]];\n\nflattenedArray = Hoek.flatten(array, target); // results in [4, [5], 1, 2, 3]\n```\n\n### reach(obj, chain, [options])\n\nConverts an object key chain string to reference\n\n- `options` - optional settings\n - `separator` - string to split chain path on, defaults to '.'\n - `default` - value to return if the path or value is not present, default is `undefined`\n - `strict` - if `true`, will throw an error on missing member, default is `false`\n - `functions` - if `true` allow traversing functions for properties. `false` will throw an error if a function is part of the chain.\n\nA chain including negative numbers will work like negative indices on an\narray.\n\nIf chain is `null`, `undefined` or `false`, the object itself will be returned.\n\n```javascript\n\nvar chain = 'a.b.c';\nvar obj = {a : {b : { c : 1}}};\n\nHoek.reach(obj, chain); // returns 1\n\nvar chain = 'a.b.-1';\nvar obj = {a : {b : [2,3,6]}};\n\nHoek.reach(obj, chain); // returns 6\n```\n\n### reachTemplate(obj, template, [options])\n\nReplaces string parameters (`{name}`) with their corresponding object key values by applying the\n(`reach()`)[#reachobj-chain-options] method where:\n\n- `obj` - the context object used for key lookup.\n- `template` - a string containing `{}` parameters.\n- `options` - optional (`reach()`)[#reachobj-chain-options] options.\n\n```javascript\n\nvar chain = 'a.b.c';\nvar obj = {a : {b : { c : 1}}};\n\nHoek.reachTemplate(obj, '1+{a.b.c}=2'); // returns '1+1=2'\n```\n\n### transform(obj, transform, [options])\n\nTransforms an existing object into a new one based on the supplied `obj` and `transform` map. `options` are the same as the `reach` options. The first argument can also be an array of objects. In that case the method will return an array of transformed objects.\n\n```javascript\nvar source = {\n address: {\n one: '123 main street',\n two: 'PO Box 1234'\n },\n title: 'Warehouse',\n state: 'CA'\n};\n\nvar result = Hoek.transform(source, {\n 'person.address.lineOne': 'address.one',\n 'person.address.lineTwo': 'address.two',\n 'title': 'title',\n 'person.address.region': 'state'\n});\n// Results in\n// {\n// person: {\n// address: {\n// lineOne: '123 main street',\n// lineTwo: 'PO Box 1234',\n// region: 'CA'\n// }\n// },\n// title: 'Warehouse'\n// }\n```\n\n### shallow(obj)\n\nPerforms a shallow copy by copying the references of all the top level children where:\n- `obj` - the object to be copied.\n\n```javascript\nvar shallow = Hoek.shallow({ a: { b: 1 } });\n```\n\n### stringify(obj)\n\nConverts an object to string using the built-in `JSON.stringify()` method with the difference that any errors are caught\nand reported back in the form of the returned string. Used as a shortcut for displaying information to the console (e.g. in\nerror message) without the need to worry about invalid conversion.\n\n```javascript\nvar a = {};\na.b = a;\nHoek.stringify(a);\t\t// Returns '[Cannot display object: Converting circular structure to JSON]'\n```\n\n# Timer\n\nA Timer object. Initializing a new timer object sets the ts to the number of milliseconds elapsed since 1 January 1970 00:00:00 UTC.\n\n```javascript\n\nvar timerObj = new Hoek.Timer();\nconsole.log(\"Time is now: \" + timerObj.ts);\nconsole.log(\"Elapsed time from initialization: \" + timerObj.elapsed() + 'milliseconds');\n```\n\n\n# Bench\n\nSame as Timer with the exception that `ts` stores the internal node clock which is not related to `Date.now()` and cannot be used to display\nhuman-readable timestamps. More accurate for benchmarking or internal timers.\n\n# Binary Encoding/Decoding\n\n### base64urlEncode(value)\n\nEncodes value in Base64 or URL encoding\n\n### base64urlDecode(value)\n\nDecodes data in Base64 or URL encoding.\n# Escaping Characters\n\nHoek provides convenient methods for escaping html characters. The escaped characters are as followed:\n\n```javascript\n\ninternals.htmlEscaped = {\n '&': '&amp;',\n '<': '&lt;',\n '>': '&gt;',\n '\"': '&quot;',\n \"'\": '&#x27;',\n '`': '&#x60;'\n};\n```\n\n### escapeHtml(string)\n\n```javascript\n\nvar string = '<html> hey </html>';\nvar escapedString = Hoek.escapeHtml(string); // returns &lt;html&gt; hey &lt;/html&gt;\n```\n\n### escapeHeaderAttribute(attribute)\n\nEscape attribute value for use in HTTP header\n\n```javascript\n\nvar a = Hoek.escapeHeaderAttribute('I said \"go w\\\\o me\"'); //returns I said \\\"go w\\\\o me\\\"\n```\n\n\n### escapeRegex(string)\n\nEscape string for Regex construction\n\n```javascript\n\nvar a = Hoek.escapeRegex('4^f$s.4*5+-_?%=#!:@|~\\\\/`\"(>)[<]d{}s,'); // returns 4\\^f\\$s\\.4\\*5\\+\\-_\\?%\\=#\\!\\:@\\|~\\\\\\/`\"\\(>\\)\\[<\\]d\\{\\}s\\,\n```\n\n# Errors\n\n### assert(condition, message)\n\n```javascript\n\nvar a = 1, b = 2;\n\nHoek.assert(a === b, 'a should equal b'); // Throws 'a should equal b'\n```\n\nNote that you may also pass an already created Error object as the second parameter, and `assert` will throw that object.\n\n```javascript\n\nvar a = 1, b = 2;\n\nHoek.assert(a === b, new Error('a should equal b')); // Throws the given error object\n```\n\n### abort(message)\n\nFirst checks if `process.env.NODE_ENV === 'test'`, and if so, throws error message. Otherwise,\ndisplays most recent stack and then exits process.\n\n\n\n### displayStack(slice)\n\nDisplays the trace stack\n\n```javascript\n\nvar stack = Hoek.displayStack();\nconsole.log(stack); // returns something like:\n\n[ 'null (/Users/user/Desktop/hoek/test.js:4:18)',\n 'Module._compile (module.js:449:26)',\n 'Module._extensions..js (module.js:467:10)',\n 'Module.load (module.js:356:32)',\n 'Module._load (module.js:312:12)',\n 'Module.runMain (module.js:492:10)',\n 'startup.processNextTick.process._tickCallback (node.js:244:9)' ]\n```\n\n### callStack(slice)\n\nReturns a trace stack array.\n\n```javascript\n\nvar stack = Hoek.callStack();\nconsole.log(stack); // returns something like:\n\n[ [ '/Users/user/Desktop/hoek/test.js', 4, 18, null, false ],\n [ 'module.js', 449, 26, 'Module._compile', false ],\n [ 'module.js', 467, 10, 'Module._extensions..js', false ],\n [ 'module.js', 356, 32, 'Module.load', false ],\n [ 'module.js', 312, 12, 'Module._load', false ],\n [ 'module.js', 492, 10, 'Module.runMain', false ],\n [ 'node.js',\n 244,\n 9,\n 'startup.processNextTick.process._tickCallback',\n false ] ]\n```\n\n## Function\n\n### nextTick(fn)\n\nReturns a new function that wraps `fn` in `process.nextTick`.\n\n```javascript\n\nvar myFn = function () {\n console.log('Do this later');\n};\n\nvar nextFn = Hoek.nextTick(myFn);\n\nnextFn();\nconsole.log('Do this first');\n\n// Results in:\n//\n// Do this first\n// Do this later\n```\n\n### once(fn)\n\nReturns a new function that can be run multiple times, but makes sure `fn` is only run once.\n\n```javascript\n\nvar myFn = function () {\n console.log('Ran myFn');\n};\n\nvar onceFn = Hoek.once(myFn);\nonceFn(); // results in \"Ran myFn\"\nonceFn(); // results in undefined\n```\n\n### ignore\n\nA simple no-op function. It does nothing at all.\n\n## Miscellaneous\n\n### uniqueFilename(path, extension)\n`path` to prepend with the randomly generated file name. `extension` is the optional file extension, defaults to `''`.\n\nReturns a randomly generated file name at the specified `path`. The result is a fully resolved path to a file.\n\n```javascript\nvar result = Hoek.uniqueFilename('./test/modules', 'txt'); // results in \"full/path/test/modules/{random}.txt\"\n```\n\n### isAbsolutePath(path, [platform])\n\nDetermines whether `path` is an absolute path. Returns `true` or `false`.\n\n- `path` - A file path to test for whether it is absolute or not.\n- `platform` - An optional parameter used for specifying the platform. Defaults to `process.platform`.\n\n### isInteger(value)\n\nCheck `value` to see if it is an integer. Returns true/false.\n\n```javascript\nvar result = Hoek.isInteger('23')\n```\n",
- "readmeFilename": "README.md",
- "bugs": {
- "url": "https://github.com/hapijs/hoek/issues"
- },
- "homepage": "https://github.com/hapijs/hoek#readme",
- "_id": "hoek@2.16.3",
- "_shasum": "20bb7403d3cea398e91dc4710a8ff1b8274a25ed",
- "_resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
- "_from": "hoek@>=2.0.0 <3.0.0"
+ "version": "2.16.3"
}
diff --git a/node_modules/request/node_modules/hawk/node_modules/sntp/package.json b/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
index 9ae1b926e..08c207b1a 100644
--- a/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
+++ b/node_modules/request/node_modules/hawk/node_modules/sntp/package.json
@@ -1,49 +1,99 @@
{
- "name": "sntp",
- "description": "SNTP Client",
- "version": "1.0.9",
+ "_args": [
+ [
+ {
+ "raw": "sntp@1.x.x",
+ "scope": null,
+ "escapedName": "sntp",
+ "name": "sntp",
+ "rawSpec": "1.x.x",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk"
+ ]
+ ],
+ "_from": "sntp@>=1.0.0 <2.0.0",
+ "_id": "sntp@1.0.9",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/hawk/sntp",
+ "_npmUser": {
+ "name": "hueniverse",
+ "email": "eran@hueniverse.com"
+ },
+ "_npmVersion": "1.4.23",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "sntp@1.x.x",
+ "scope": null,
+ "escapedName": "sntp",
+ "name": "sntp",
+ "rawSpec": "1.x.x",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/hawk"
+ ],
+ "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+ "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
+ "_shrinkwrap": null,
+ "_spec": "sntp@1.x.x",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/hawk",
"author": {
"name": "Eran Hammer",
"email": "eran@hammer.io",
"url": "http://hueniverse.com"
},
- "contributors": [],
- "repository": {
- "type": "git",
- "url": "git://github.com/hueniverse/sntp.git"
- },
- "main": "index",
- "keywords": [
- "sntp",
- "ntp",
- "time"
- ],
- "engines": {
- "node": ">=0.8.0"
+ "bugs": {
+ "url": "https://github.com/hueniverse/sntp/issues"
},
+ "contributors": [],
"dependencies": {
"hoek": "2.x.x"
},
+ "description": "SNTP Client",
"devDependencies": {
"lab": "4.x.x"
},
- "scripts": {
- "test": "make test-cov"
+ "directories": {},
+ "dist": {
+ "shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
+ "tarball": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
},
+ "engines": {
+ "node": ">=0.8.0"
+ },
+ "gitHead": "ee2e35284f684609990681734d39010cd356d7da",
+ "homepage": "https://github.com/hueniverse/sntp",
+ "keywords": [
+ "sntp",
+ "ntp",
+ "time"
+ ],
"licenses": [
{
"type": "BSD",
"url": "http://github.com/hueniverse/sntp/raw/master/LICENSE"
}
],
- "readme": "# sntp\n\nAn SNTP v4 client (RFC4330) for node. Simpy connects to the NTP or SNTP server requested and returns the server time\nalong with the roundtrip duration and clock offset. To adjust the local time to the NTP time, add the returned `t` offset\nto the local time.\n\n[![Build Status](https://secure.travis-ci.org/hueniverse/sntp.png)](http://travis-ci.org/hueniverse/sntp)\n\n# Usage\n\n```javascript\nvar Sntp = require('sntp');\n\n// All options are optional\n\nvar options = {\n host: 'nist1-sj.ustiming.org', // Defaults to pool.ntp.org\n port: 123, // Defaults to 123 (NTP)\n resolveReference: true, // Default to false (not resolving)\n timeout: 1000 // Defaults to zero (no timeout)\n};\n\n// Request server time\n\nSntp.time(options, function (err, time) {\n\n if (err) {\n console.log('Failed: ' + err.message);\n process.exit(1);\n }\n\n console.log('Local clock is off by: ' + time.t + ' milliseconds');\n process.exit(0);\n});\n```\n\nIf an application needs to maintain continuous time synchronization, the module provides a stateful method for\nquerying the current offset only when the last one is too old (defaults to daily).\n\n```javascript\n// Request offset once\n\nSntp.offset(function (err, offset) {\n\n console.log(offset); // New (served fresh)\n\n // Request offset again\n\n Sntp.offset(function (err, offset) {\n\n console.log(offset); // Identical (served from cache)\n });\n});\n```\n\nTo set a background offset refresh, start the interval and use the provided now() method. If for any reason the\nclient fails to obtain an up-to-date offset, the current system clock is used.\n\n```javascript\nvar before = Sntp.now(); // System time without offset\n\nSntp.start(function () {\n\n var now = Sntp.now(); // With offset\n Sntp.stop();\n});\n```\n\n",
- "readmeFilename": "README.md",
- "bugs": {
- "url": "https://github.com/hueniverse/sntp/issues"
+ "main": "index",
+ "maintainers": [
+ {
+ "name": "hueniverse",
+ "email": "eran@hueniverse.com"
+ }
+ ],
+ "name": "sntp",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/hueniverse/sntp.git"
},
- "homepage": "https://github.com/hueniverse/sntp#readme",
- "_id": "sntp@1.0.9",
- "_shasum": "6541184cc90aeea6c6e7b35e2659082443c66198",
- "_resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
- "_from": "sntp@>=1.0.0 <2.0.0"
+ "scripts": {
+ "test": "make test-cov"
+ },
+ "version": "1.0.9"
}
diff --git a/node_modules/request/node_modules/hawk/package.json b/node_modules/request/node_modules/hawk/package.json
index 4bae96efe..fb9176edb 100644
--- a/node_modules/request/node_modules/hawk/package.json
+++ b/node_modules/request/node_modules/hawk/package.json
@@ -1,28 +1,37 @@
{
"_args": [
[
- "hawk@~3.1.0",
+ {
+ "raw": "hawk@~3.1.3",
+ "scope": null,
+ "escapedName": "hawk",
+ "name": "hawk",
+ "rawSpec": "~3.1.3",
+ "spec": ">=3.1.3 <3.2.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "hawk@>=3.1.0 <3.2.0",
+ "_from": "hawk@>=3.1.3 <3.2.0",
"_id": "hawk@3.1.3",
"_inCache": true,
"_installable": true,
"_location": "/request/hawk",
"_nodeVersion": "5.4.1",
"_npmUser": {
- "email": "eran@hammer.io",
- "name": "hueniverse"
+ "name": "hueniverse",
+ "email": "eran@hammer.io"
},
"_npmVersion": "3.3.12",
"_phantomChildren": {},
"_requested": {
- "name": "hawk",
- "raw": "hawk@~3.1.0",
- "rawSpec": "~3.1.0",
+ "raw": "hawk@~3.1.3",
"scope": null,
- "spec": ">=3.1.0 <3.2.0",
+ "escapedName": "hawk",
+ "name": "hawk",
+ "rawSpec": "~3.1.3",
+ "spec": ">=3.1.3 <3.2.0",
"type": "range"
},
"_requiredBy": [
@@ -31,11 +40,11 @@
"_resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
"_shasum": "078444bd7c1640b0fe540d2c9b73d59678e8e1c4",
"_shrinkwrap": null,
- "_spec": "hawk@~3.1.0",
+ "_spec": "hawk@~3.1.3",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "eran@hammer.io",
"name": "Eran Hammer",
+ "email": "eran@hammer.io",
"url": "http://hueniverse.com"
},
"browser": "./lib/browser.js",
@@ -57,7 +66,7 @@
"directories": {},
"dist": {
"shasum": "078444bd7c1640b0fe540d2c9b73d59678e8e1c4",
- "tarball": "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+ "tarball": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
},
"engines": {
"node": ">=0.10.32"
@@ -65,10 +74,10 @@
"gitHead": "2f0b93b34ed9b0ebc865838ef70c6a4035591430",
"homepage": "https://github.com/hueniverse/hawk#readme",
"keywords": [
- "authentication",
- "hawk",
"http",
- "scheme"
+ "authentication",
+ "scheme",
+ "hawk"
],
"license": "BSD-3-Clause",
"main": "lib/index.js",
diff --git a/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json b/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
index b596b28af..411084732 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/assert-plus/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "assert-plus@^0.2.0",
+ {
+ "raw": "assert-plus@^0.2.0",
+ "scope": null,
+ "escapedName": "assert-plus",
+ "name": "assert-plus",
+ "rawSpec": "^0.2.0",
+ "spec": ">=0.2.0 <0.3.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature"
]
],
@@ -12,23 +20,22 @@
"_location": "/request/http-signature/assert-plus",
"_nodeVersion": "0.10.36",
"_npmUser": {
- "email": "patrick.f.mooney@gmail.com",
- "name": "pfmooney"
+ "name": "pfmooney",
+ "email": "patrick.f.mooney@gmail.com"
},
"_npmVersion": "3.3.8",
"_phantomChildren": {},
"_requested": {
- "name": "assert-plus",
"raw": "assert-plus@^0.2.0",
- "rawSpec": "^0.2.0",
"scope": null,
+ "escapedName": "assert-plus",
+ "name": "assert-plus",
+ "rawSpec": "^0.2.0",
"spec": ">=0.2.0 <0.3.0",
"type": "range"
},
"_requiredBy": [
- "/request/http-signature",
- "/request/http-signature/sshpk",
- "/request/http-signature/sshpk/dashdash"
+ "/request/http-signature"
],
"_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
"_shasum": "d74e1b87e7affc0db8aadb7021f3fe48101ab234",
@@ -36,8 +43,8 @@
"_spec": "assert-plus@^0.2.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature",
"author": {
- "email": "mcavage@gmail.com",
- "name": "Mark Cavage"
+ "name": "Mark Cavage",
+ "email": "mcavage@gmail.com"
},
"bugs": {
"url": "https://github.com/mcavage/node-assert-plus/issues"
@@ -77,7 +84,7 @@
"directories": {},
"dist": {
"shasum": "d74e1b87e7affc0db8aadb7021f3fe48101ab234",
- "tarball": "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+ "tarball": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
},
"engines": {
"node": ">=0.8"
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/CHANGES.md b/node_modules/request/node_modules/http-signature/node_modules/jsprim/CHANGES.md
index 75bc4f025..ab3a66417 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/CHANGES.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/CHANGES.md
@@ -4,6 +4,11 @@
None yet.
+## v1.3.0 (2016-06-22)
+
+* #14 add safer version of hasOwnProperty()
+* #15 forEachKey() should ignore inherited properties
+
## v1.2.2 (2015-10-15)
* #11 NPM package shouldn't include any code that does `require('JSV')`
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/README.md b/node_modules/request/node_modules/http-signature/node_modules/jsprim/README.md
index b502b2d3a..7303642e0 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/README.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/README.md
@@ -19,14 +19,23 @@ Returns whether two objects are equal.
Returns true if the given object has no properties and false otherwise. This
is O(1) (unlike `Object.keys(obj).length === 0`, which is O(N)).
+### hasKey(obj, key)
+
+Returns true if the given object has an enumerable, non-inherited property
+called `key`. [For information on enumerability and ownership of properties, see
+the MDN
+documentation.](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Enumerability_and_ownership_of_properties)
### forEachKey(obj, callback)
-Like Array.forEach, but iterates properties of an object rather than elements
-of an array. Equivalent to:
+Like Array.forEach, but iterates enumerable, owned properties of an object
+rather than elements of an array. Equivalent to:
- for (var key in obj)
- callback(key, obj[key]);
+ for (var key in obj) {
+ if (Object.prototype.hasOwnProperty.call(obj, key)) {
+ callback(key, obj[key]);
+ }
+ }
### flattenObject(obj, depth)
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js b/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
index 5ee468892..26c3ba1c0 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/lib/jsprim.js
@@ -15,6 +15,7 @@ var mod_jsonschema = require('json-schema');
exports.deepCopy = deepCopy;
exports.deepEqual = deepEqual;
exports.isEmpty = isEmpty;
+exports.hasKey = hasKey;
exports.forEachKey = forEachKey;
exports.pluck = pluck;
exports.flattenObject = flattenObject;
@@ -122,10 +123,19 @@ function isEmpty(obj)
return (true);
}
+function hasKey(obj, key)
+{
+ mod_assert.equal(typeof (key), 'string');
+ return (Object.prototype.hasOwnProperty.call(obj, key));
+}
+
function forEachKey(obj, callback)
{
- for (var key in obj)
- callback(key, obj[key]);
+ for (var key in obj) {
+ if (hasKey(obj, key)) {
+ callback(key, obj[key]);
+ }
+ }
}
function pluck(obj, key)
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json
index 660308afc..2fd7273a9 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/extsprintf/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "extsprintf@1.0.2",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
+ {
+ "raw": "extsprintf@1.0.2",
+ "scope": null,
+ "escapedName": "extsprintf",
+ "name": "extsprintf",
+ "rawSpec": "1.0.2",
+ "spec": "1.0.2",
+ "type": "version"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
]
],
"_from": "extsprintf@1.0.2",
@@ -11,16 +19,17 @@
"_installable": true,
"_location": "/request/http-signature/jsprim/extsprintf",
"_npmUser": {
- "email": "dap@cs.brown.edu",
- "name": "dap"
+ "name": "dap",
+ "email": "dap@cs.brown.edu"
},
"_npmVersion": "1.1.65",
"_phantomChildren": {},
"_requested": {
- "name": "extsprintf",
"raw": "extsprintf@1.0.2",
- "rawSpec": "1.0.2",
"scope": null,
+ "escapedName": "extsprintf",
+ "name": "extsprintf",
+ "rawSpec": "1.0.2",
"spec": "1.0.2",
"type": "version"
},
@@ -32,7 +41,7 @@
"_shasum": "e1080e0658e300b06294990cc70e1502235fd550",
"_shrinkwrap": null,
"_spec": "extsprintf@1.0.2",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
"bugs": {
"url": "https://github.com/davepacheco/node-extsprintf/issues"
},
@@ -42,7 +51,7 @@
"directories": {},
"dist": {
"shasum": "e1080e0658e300b06294990cc70e1502235fd550",
- "tarball": "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+ "tarball": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
},
"engines": [
"node >=0.6.0"
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
index ff4eeb116..b77d8b346 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/json-schema/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "json-schema@0.2.2",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
+ {
+ "raw": "json-schema@0.2.2",
+ "scope": null,
+ "escapedName": "json-schema",
+ "name": "json-schema",
+ "rawSpec": "0.2.2",
+ "spec": "0.2.2",
+ "type": "version"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
]
],
"_from": "json-schema@0.2.2",
@@ -11,16 +19,17 @@
"_installable": true,
"_location": "/request/http-signature/jsprim/json-schema",
"_npmUser": {
- "email": "kriszyp@gmail.com",
- "name": "kriszyp"
+ "name": "kriszyp",
+ "email": "kriszyp@gmail.com"
},
"_npmVersion": "1.1.59",
"_phantomChildren": {},
"_requested": {
- "name": "json-schema",
"raw": "json-schema@0.2.2",
- "rawSpec": "0.2.2",
"scope": null,
+ "escapedName": "json-schema",
+ "name": "json-schema",
+ "rawSpec": "0.2.2",
"spec": "0.2.2",
"type": "version"
},
@@ -31,7 +40,7 @@
"_shasum": "50354f19f603917c695f70b85afa77c3b0f23506",
"_shrinkwrap": null,
"_spec": "json-schema@0.2.2",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
"author": {
"name": "Kris Zyp"
},
@@ -48,7 +57,7 @@
},
"dist": {
"shasum": "50354f19f603917c695f70b85afa77c3b0f23506",
- "tarball": "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+ "tarball": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
},
"homepage": "https://github.com/kriszyp/json-schema#readme",
"keywords": [
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json
index d1cd81287..888fea03e 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/node_modules/verror/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "verror@1.3.6",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
+ {
+ "raw": "verror@1.3.6",
+ "scope": null,
+ "escapedName": "verror",
+ "name": "verror",
+ "rawSpec": "1.3.6",
+ "spec": "1.3.6",
+ "type": "version"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim"
]
],
"_from": "verror@1.3.6",
@@ -11,16 +19,17 @@
"_installable": true,
"_location": "/request/http-signature/jsprim/verror",
"_npmUser": {
- "email": "dap@cs.brown.edu",
- "name": "dap"
+ "name": "dap",
+ "email": "dap@cs.brown.edu"
},
"_npmVersion": "1.1.65",
"_phantomChildren": {},
"_requested": {
- "name": "verror",
"raw": "verror@1.3.6",
- "rawSpec": "1.3.6",
"scope": null,
+ "escapedName": "verror",
+ "name": "verror",
+ "rawSpec": "1.3.6",
"spec": "1.3.6",
"type": "version"
},
@@ -31,7 +40,7 @@
"_shasum": "cff5df12946d297d2baaefaa2689e25be01c005c",
"_shrinkwrap": null,
"_spec": "verror@1.3.6",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/jsprim",
"bugs": {
"url": "https://github.com/davepacheco/node-verror/issues"
},
@@ -43,7 +52,7 @@
"directories": {},
"dist": {
"shasum": "cff5df12946d297d2baaefaa2689e25be01c005c",
- "tarball": "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+ "tarball": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
},
"engines": [
"node >=0.6.0"
diff --git a/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json b/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
index c172f6233..e7c324118 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/jsprim/package.json
@@ -1,38 +1,51 @@
{
"_args": [
[
- "jsprim@^1.2.2",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature"
+ {
+ "raw": "jsprim@^1.2.2",
+ "scope": null,
+ "escapedName": "jsprim",
+ "name": "jsprim",
+ "rawSpec": "^1.2.2",
+ "spec": ">=1.2.2 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature"
]
],
"_from": "jsprim@>=1.2.2 <2.0.0",
- "_id": "jsprim@1.2.2",
+ "_id": "jsprim@1.3.0",
"_inCache": true,
"_installable": true,
"_location": "/request/http-signature/jsprim",
- "_nodeVersion": "0.12.2",
+ "_nodeVersion": "0.12.7",
+ "_npmOperationalInternal": {
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/jsprim-1.3.0.tgz_1466708163640_0.5282344303559512"
+ },
"_npmUser": {
- "email": "dap@cs.brown.edu",
- "name": "dap"
+ "name": "dap",
+ "email": "dap@cs.brown.edu"
},
- "_npmVersion": "2.7.4",
+ "_npmVersion": "2.11.3",
"_phantomChildren": {},
"_requested": {
- "name": "jsprim",
"raw": "jsprim@^1.2.2",
- "rawSpec": "^1.2.2",
"scope": null,
+ "escapedName": "jsprim",
+ "name": "jsprim",
+ "rawSpec": "^1.2.2",
"spec": ">=1.2.2 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/request/http-signature"
],
- "_resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz",
- "_shasum": "f20c906ac92abd58e3b79ac8bc70a48832512da1",
+ "_resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz",
+ "_shasum": "ce2e1bef835204b4f3099928c602f8b6ae615650",
"_shrinkwrap": null,
"_spec": "jsprim@^1.2.2",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature",
"bugs": {
"url": "https://github.com/davepacheco/node-jsprim/issues"
},
@@ -45,14 +58,14 @@
"devDependencies": {},
"directories": {},
"dist": {
- "shasum": "f20c906ac92abd58e3b79ac8bc70a48832512da1",
- "tarball": "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"
+ "shasum": "ce2e1bef835204b4f3099928c602f8b6ae615650",
+ "tarball": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"
},
"engines": [
"node >=0.6.0"
],
- "gitHead": "0e709876c35eddfe4c1f95104ac3c4abfc9dab84",
- "homepage": "https://github.com/davepacheco/node-jsprim",
+ "gitHead": "694edcb22e2291c21f6c2a23907bf02e1edbfdf4",
+ "homepage": "https://github.com/davepacheco/node-jsprim#readme",
"license": "MIT",
"main": "./lib/jsprim.js",
"maintainers": [
@@ -69,5 +82,5 @@
"url": "git://github.com/davepacheco/node-jsprim.git"
},
"scripts": {},
- "version": "1.2.2"
+ "version": "1.3.0"
}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/.travis.yml b/node_modules/request/node_modules/http-signature/node_modules/sshpk/.travis.yml
index 54692343d..c3394c258 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/.travis.yml
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/.travis.yml
@@ -1,11 +1,11 @@
language: node_js
node_js:
- - "4.2"
+ - "5.10"
+ - "4.4"
- "4.1"
- "0.12"
- "0.10"
- - "0.8"
before_install:
- "make check"
after_success:
- - '[ "${TRAVIS_NODE_VERSION}" = "4.2" ] && make codecovio'
+ - '[ "${TRAVIS_NODE_VERSION}" = "4.4" ] && make codecovio'
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/README.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/README.md
index a17f0fd19..00a405520 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/README.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/README.md
@@ -111,7 +111,7 @@ Usage
## Public keys
-### `parseKey(data[, format = 'auto'[, name]])`
+### `parseKey(data[, format = 'auto'[, options]])`
Parses a key from a given data format and returns a new `Key` object.
@@ -126,8 +126,12 @@ Parameters
- `rfc4253`: raw OpenSSH wire format
- `openssh`: new post-OpenSSH 6.5 internal format, produced by
`ssh-keygen -o`
-- `name` -- Optional name for the key being parsed (eg. the filename that
- was opened). Used to generate Error messages
+- `options` -- Optional Object, extra options, with keys:
+ - `filename` -- Optional String, name for the key being parsed
+ (eg. the filename that was opened). Used to generate
+ Error messages
+ - `passphrase` -- Optional String, encryption passphrase used to decrypt an
+ encrypted PEM file
### `Key.isKey(obj)`
@@ -212,7 +216,7 @@ to call this function on other keys will yield an `Error`.
## Private keys
-### `parsePrivateKey(data[, format = 'auto'[, name]])`
+### `parsePrivateKey(data[, format = 'auto'[, options]])`
Parses a private key from a given data format and returns a new
`PrivateKey` object.
@@ -227,8 +231,12 @@ Parameters
`ssh-keygen -o`
- `pkcs1`, `pkcs8`: variants of `pem`
- `rfc4253`: raw OpenSSH wire format
-- `name` -- Optional name for the key being parsed (eg. the filename that
- was opened). Used to generate Error messages
+- `options` -- Optional Object, extra options, with keys:
+ - `filename` -- Optional String, name for the key being parsed
+ (eg. the filename that was opened). Used to generate
+ Error messages
+ - `passphrase` -- Optional String, encryption passphrase used to decrypt an
+ encrypted PEM file
### `PrivateKey.isPrivateKey(obj)`
@@ -393,6 +401,206 @@ Parameters
Same as `this.toBuffer(format).toString('base64')`.
+## Certificates
+
+`sshpk` includes basic support for parsing certificates in X.509 (PEM) format
+and the OpenSSH certificate format. This feature is intended to be used mainly
+to access basic metadata about certificates, extract public keys from them, and
+also to generate simple self-signed certificates from an existing key.
+
+Notably, there is no implementation of CA chain-of-trust verification, and no
+support for key usage restrictions (or other kinds of restrictions). Please do
+the security world a favour, and DO NOT use this code for certificate
+verification in the traditional X.509 CA chain style.
+
+### `parseCertificate(data, format)`
+
+Parameters
+
+ - `data` -- a Buffer or String
+ - `format` -- a String, format to use, one of `'openssh'`, `'pem'` (X.509 in a
+ PEM wrapper), or `'x509'` (raw DER encoded)
+
+### `createSelfSignedCertificate(subject, privateKey[, options])`
+
+Parameters
+
+ - `subject` -- an Identity, the subject of the certificate
+ - `privateKey` -- a PrivateKey, the key of the subject: will be used both to be
+ placed in the certificate and also to sign it (since this is
+ a self-signed certificate)
+ - `options` -- optional Object, with keys:
+ - `lifetime` -- optional Number, lifetime of the certificate from now in
+ seconds
+ - `validFrom`, `validUntil` -- optional Dates, beginning and end of
+ certificate validity period. If given
+ `lifetime` will be ignored
+ - `serial` -- optional Buffer, the serial number of the certificate
+
+### `createCertificate(subject, key, issuer, issuerKey[, options])`
+
+Parameters
+
+ - `subject` -- an Identity, the subject of the certificate
+ - `key` -- a Key, the public key of the subject
+ - `issuer` -- an Identity, the issuer of the certificate who will sign it
+ - `issuerKey` -- a PrivateKey, the issuer's private key for signing
+ - `options` -- optional Object, with keys:
+ - `lifetime` -- optional Number, lifetime of the certificate from now in
+ seconds
+ - `validFrom`, `validUntil` -- optional Dates, beginning and end of
+ certificate validity period. If given
+ `lifetime` will be ignored
+ - `serial` -- optional Buffer, the serial number of the certificate
+
+### `Certificate#subjects`
+
+Array of `Identity` instances describing the subject of this certificate.
+
+### `Certificate#issuer`
+
+The `Identity` of the Certificate's issuer (signer).
+
+### `Certificate#subjectKey`
+
+The public key of the subject of the certificate, as a `Key` instance.
+
+### `Certificate#issuerKey`
+
+The public key of the signing issuer of this certificate, as a `Key` instance.
+May be `undefined` if the issuer's key is unknown (e.g. on an X509 certificate).
+
+### `Certificate#serial`
+
+The serial number of the certificate. As this is normally a 64-bit or wider
+integer, it is returned as a Buffer.
+
+### `Certificate#isExpired([when])`
+
+Tests whether the Certificate is currently expired (i.e. the `validFrom` and
+`validUntil` dates specify a range of time that does not include the current
+time).
+
+Parameters
+
+ - `when` -- optional Date, if specified, tests whether the Certificate was or
+ will be expired at the specified time instead of now
+
+Returns a Boolean.
+
+### `Certificate#isSignedByKey(key)`
+
+Tests whether the Certificate was validly signed by the given (public) Key.
+
+Parameters
+
+ - `key` -- a Key instance
+
+Returns a Boolean.
+
+### `Certificate#isSignedBy(certificate)`
+
+Tests whether this Certificate was validly signed by the subject of the given
+certificate. Also tests that the issuer Identity of this Certificate and the
+subject Identity of the other Certificate are equivalent.
+
+Parameters
+
+ - `certificate` -- another Certificate instance
+
+Returns a Boolean.
+
+### `Certificate#fingerprint([hashAlgo])`
+
+Returns the X509-style fingerprint of the entire certificate (as a Fingerprint
+instance). This matches what a web-browser or similar would display as the
+certificate fingerprint and should not be confused with the fingerprint of the
+subject's public key.
+
+Parameters
+
+ - `hashAlgo` -- an optional String, any hash function name
+
+### `Certificate#toBuffer([format])`
+
+Serializes the Certificate to a Buffer and returns it.
+
+Parameters
+
+ - `format` -- an optional String, output format, one of `'openssh'`, `'pem'` or
+ `'x509'`. Defaults to `'x509'`.
+
+Returns a Buffer.
+
+### `Certificate#toString([format])`
+
+ - `format` -- an optional String, output format, one of `'openssh'`, `'pem'` or
+ `'x509'`. Defaults to `'pem'`.
+
+Returns a String.
+
+## Certificate identities
+
+### `identityForHost(hostname)`
+
+Constructs a host-type Identity for a given hostname.
+
+Parameters
+
+ - `hostname` -- the fully qualified DNS name of the host
+
+Returns an Identity instance.
+
+### `identityForUser(uid)`
+
+Constructs a user-type Identity for a given UID.
+
+Parameters
+
+ - `uid` -- a String, user identifier (login name)
+
+Returns an Identity instance.
+
+### `identityForEmail(email)`
+
+Constructs an email-type Identity for a given email address.
+
+Parameters
+
+ - `email` -- a String, email address
+
+Returns an Identity instance.
+
+### `identityFromDN(dn)`
+
+Parses an LDAP-style DN string (e.g. `'CN=foo, C=US'`) and turns it into an
+Identity instance.
+
+Parameters
+
+ - `dn` -- a String
+
+Returns an Identity instance.
+
+### `Identity#toString()`
+
+Returns the identity as an LDAP-style DN string.
+e.g. `'CN=foo, O=bar corp, C=us'`
+
+### `Identity#type`
+
+The type of identity. One of `'host'`, `'user'`, `'email'` or `'unknown'`
+
+### `Identity#hostname`
+### `Identity#uid`
+### `Identity#email`
+
+Set when `type` is `'host'`, `'user'`, or `'email'`, respectively. Strings.
+
+### `Identity#cn`
+
+The value of the first `CN=` in the DN, if any.
+
Errors
------
@@ -425,8 +633,30 @@ The key data given could not be parsed as a valid key.
Properties
-- `keyName` -- `name` that was given to `Key#parse`
+- `keyName` -- `filename` that was given to `parseKey`
+- `format` -- the `format` that was trying to parse the key (see `parseKey`)
+- `innerErr` -- the inner Error thrown by the format parser
+
+### `KeyEncryptedError`
+
+The key is encrypted with a symmetric key (ie, it is password protected). The
+parsing operation would succeed if it was given the `passphrase` option.
+
+Properties
+
+- `keyName` -- `filename` that was given to `parseKey`
+- `format` -- the `format` that was trying to parse the key (currently can only
+ be `"pem"`)
+
+### `CertificateParseError`
+
+The certificate data given could not be parsed as a valid certificate.
+
+Properties
+
+- `certName` -- `filename` that was given to `parseCertificate`
- `format` -- the `format` that was trying to parse the key
+ (see `parseCertificate`)
- `innerErr` -- the inner Error thrown by the format parser
Friends of sshpk
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-conv b/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-conv
index 8eec411ff..a1205a45d 100755
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-conv
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-conv
@@ -7,6 +7,9 @@ var dashdash = require('dashdash');
var sshpk = require('../lib/index');
var fs = require('fs');
var path = require('path');
+var tty = require('tty');
+var readline = require('readline');
+var getPassword = require('getpass').getPass;
var options = [
{
@@ -131,7 +134,9 @@ if (require.main === module) {
while ((data = inFile.read()))
bufs.push(data);
});
- inFile.on('end', function () {
+ var parseOpts = {};
+ parseOpts.filename = inFileName;
+ inFile.on('end', function processKey() {
var buf = Buffer.concat(bufs);
var fmt = 'auto';
if (opts.informat)
@@ -140,8 +145,15 @@ if (require.main === module) {
if (opts.private)
f = sshpk.parsePrivateKey;
try {
- var key = f(buf, fmt, inFileName);
+ var key = f(buf, fmt, parseOpts);
} catch (e) {
+ if (e.name === 'KeyEncryptedError') {
+ getPassword(function (err, pw) {
+ parseOpts.passphrase = pw;
+ processKey();
+ });
+ return;
+ }
console.error('sshpk-conv: ' +
e.name + ': ' + e.message);
process.exit(1);
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-sign b/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-sign
index c8b91932a..673fc9864 100755
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-sign
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/bin/sshpk-sign
@@ -7,6 +7,7 @@ var dashdash = require('dashdash');
var sshpk = require('../lib/index');
var fs = require('fs');
var path = require('path');
+var getPassword = require('getpass').getPass;
var options = [
{
@@ -51,6 +52,8 @@ var options = [
}
];
+var parseOpts = {};
+
if (require.main === module) {
var parser = dashdash.createParser({
options: options
@@ -79,11 +82,23 @@ if (require.main === module) {
}
var keyData = fs.readFileSync(opts.identity);
+ parseOpts.filename = opts.identity;
+
+ run();
+}
+function run() {
var key;
try {
- key = sshpk.parsePrivateKey(keyData);
+ key = sshpk.parsePrivateKey(keyData, 'auto', parseOpts);
} catch (e) {
+ if (e.name === 'KeyEncryptedError') {
+ getPassword(function (err, pw) {
+ parseOpts.passphrase = pw;
+ run();
+ });
+ return;
+ }
console.error('sshpk-sign: error loading private key "' +
opts.identity + '": ' + e.name + ': ' + e.message);
process.exit(1);
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js
new file mode 100644
index 000000000..4fbe6abad
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/certificate.js
@@ -0,0 +1,291 @@
+// Copyright 2016 Joyent, Inc.
+
+module.exports = Certificate;
+
+var assert = require('assert-plus');
+var algs = require('./algs');
+var crypto = require('crypto');
+var Fingerprint = require('./fingerprint');
+var Signature = require('./signature');
+var errs = require('./errors');
+var util = require('util');
+var utils = require('./utils');
+var Key = require('./key');
+var PrivateKey = require('./private-key');
+var Identity = require('./identity');
+
+var formats = {};
+formats['openssh'] = require('./formats/openssh-cert');
+formats['x509'] = require('./formats/x509');
+formats['pem'] = require('./formats/x509-pem');
+
+var CertificateParseError = errs.CertificateParseError;
+var InvalidAlgorithmError = errs.InvalidAlgorithmError;
+
+function Certificate(opts) {
+ assert.object(opts, 'options');
+ assert.arrayOfObject(opts.subjects, 'options.subjects');
+ utils.assertCompatible(opts.subjects[0], Identity, [1, 0],
+ 'options.subjects');
+ utils.assertCompatible(opts.subjectKey, Key, [1, 0],
+ 'options.subjectKey');
+ utils.assertCompatible(opts.issuer, Identity, [1, 0], 'options.issuer');
+ if (opts.issuerKey !== undefined) {
+ utils.assertCompatible(opts.issuerKey, Key, [1, 0],
+ 'options.issuerKey');
+ }
+ assert.object(opts.signatures, 'options.signatures');
+ assert.buffer(opts.serial, 'options.serial');
+ assert.date(opts.validFrom, 'options.validFrom');
+ assert.date(opts.validUntil, 'optons.validUntil');
+
+ this._hashCache = {};
+
+ this.subjects = opts.subjects;
+ this.issuer = opts.issuer;
+ this.subjectKey = opts.subjectKey;
+ this.issuerKey = opts.issuerKey;
+ this.signatures = opts.signatures;
+ this.serial = opts.serial;
+ this.validFrom = opts.validFrom;
+ this.validUntil = opts.validUntil;
+}
+
+Certificate.formats = formats;
+
+Certificate.prototype.toBuffer = function (format, options) {
+ if (format === undefined)
+ format = 'x509';
+ assert.string(format, 'format');
+ assert.object(formats[format], 'formats[format]');
+ assert.optionalObject(options, 'options');
+
+ return (formats[format].write(this, options));
+};
+
+Certificate.prototype.toString = function (format, options) {
+ if (format === undefined)
+ format = 'pem';
+ return (this.toBuffer(format, options).toString());
+};
+
+Certificate.prototype.fingerprint = function (algo) {
+ if (algo === undefined)
+ algo = 'sha256';
+ assert.string(algo, 'algorithm');
+ var opts = {
+ type: 'certificate',
+ hash: this.hash(algo),
+ algorithm: algo
+ };
+ return (new Fingerprint(opts));
+};
+
+Certificate.prototype.hash = function (algo) {
+ assert.string(algo, 'algorithm');
+ algo = algo.toLowerCase();
+ if (algs.hashAlgs[algo] === undefined)
+ throw (new InvalidAlgorithmError(algo));
+
+ if (this._hashCache[algo])
+ return (this._hashCache[algo]);
+
+ var hash = crypto.createHash(algo).
+ update(this.toBuffer('x509')).digest();
+ this._hashCache[algo] = hash;
+ return (hash);
+};
+
+Certificate.prototype.isExpired = function (when) {
+ if (when === undefined)
+ when = new Date();
+ return (!((when.getTime() >= this.validFrom.getTime()) &&
+ (when.getTime() < this.validUntil.getTime())));
+};
+
+Certificate.prototype.isSignedBy = function (issuerCert) {
+ utils.assertCompatible(issuerCert, Certificate, [1, 0], 'issuer');
+
+ if (!this.issuer.equals(issuerCert.subjects[0]))
+ return (false);
+
+ return (this.isSignedByKey(issuerCert.subjectKey));
+};
+
+Certificate.prototype.isSignedByKey = function (issuerKey) {
+ utils.assertCompatible(issuerKey, Key, [1, 2], 'issuerKey');
+
+ if (this.issuerKey !== undefined) {
+ return (this.issuerKey.
+ fingerprint('sha512').matches(issuerKey));
+ }
+
+ var fmt = Object.keys(this.signatures)[0];
+ var valid = formats[fmt].verify(this, issuerKey);
+ if (valid)
+ this.issuerKey = issuerKey;
+ return (valid);
+};
+
+Certificate.prototype.signWith = function (key) {
+ utils.assertCompatible(key, PrivateKey, [1, 2], 'key');
+ var fmts = Object.keys(formats);
+ var didOne = false;
+ for (var i = 0; i < fmts.length; ++i) {
+ if (fmts[i] !== 'pem') {
+ var ret = formats[fmts[i]].sign(this, key);
+ if (ret === true)
+ didOne = true;
+ }
+ }
+ if (!didOne) {
+ throw (new Error('Failed to sign the certificate for any ' +
+ 'available certificate formats'));
+ }
+};
+
+Certificate.createSelfSigned = function (subjectOrSubjects, key, options) {
+ var subjects;
+ if (Array.isArray(subjectOrSubjects))
+ subjects = subjectOrSubjects;
+ else
+ subjects = [subjectOrSubjects];
+
+ assert.arrayOfObject(subjects);
+ subjects.forEach(function (subject) {
+ utils.assertCompatible(subject, Identity, [1, 0], 'subject');
+ });
+
+ utils.assertCompatible(key, PrivateKey, [1, 2], 'private key');
+
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ assert.optionalObject(options.validFrom, 'options.validFrom');
+ assert.optionalObject(options.validUntil, 'options.validUntil');
+ var validFrom = options.validFrom;
+ var validUntil = options.validUntil;
+ if (validFrom === undefined)
+ validFrom = new Date();
+ if (validUntil === undefined) {
+ assert.optionalNumber(options.lifetime, 'options.lifetime');
+ var lifetime = options.lifetime;
+ if (lifetime === undefined)
+ lifetime = 10*365*24*3600;
+ validUntil = new Date();
+ validUntil.setTime(validUntil.getTime() + lifetime*1000);
+ }
+ assert.optionalBuffer(options.serial, 'options.serial');
+ var serial = options.serial;
+ if (serial === undefined)
+ serial = new Buffer('0000000000000001', 'hex');
+
+ var cert = new Certificate({
+ subjects: subjects,
+ issuer: subjects[0],
+ subjectKey: key.toPublic(),
+ issuerKey: key.toPublic(),
+ signatures: {},
+ serial: serial,
+ validFrom: validFrom,
+ validUntil: validUntil
+ });
+ cert.signWith(key);
+
+ return (cert);
+};
+
+Certificate.create =
+ function (subjectOrSubjects, key, issuer, issuerKey, options) {
+ var subjects;
+ if (Array.isArray(subjectOrSubjects))
+ subjects = subjectOrSubjects;
+ else
+ subjects = [subjectOrSubjects];
+
+ assert.arrayOfObject(subjects);
+ subjects.forEach(function (subject) {
+ utils.assertCompatible(subject, Identity, [1, 0], 'subject');
+ });
+
+ utils.assertCompatible(key, Key, [1, 0], 'key');
+ if (PrivateKey.isPrivateKey(key))
+ key = key.toPublic();
+ utils.assertCompatible(issuer, Identity, [1, 0], 'issuer');
+ utils.assertCompatible(issuerKey, PrivateKey, [1, 2], 'issuer key');
+
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ assert.optionalObject(options.validFrom, 'options.validFrom');
+ assert.optionalObject(options.validUntil, 'options.validUntil');
+ var validFrom = options.validFrom;
+ var validUntil = options.validUntil;
+ if (validFrom === undefined)
+ validFrom = new Date();
+ if (validUntil === undefined) {
+ assert.optionalNumber(options.lifetime, 'options.lifetime');
+ var lifetime = options.lifetime;
+ if (lifetime === undefined)
+ lifetime = 10*365*24*3600;
+ validUntil = new Date();
+ validUntil.setTime(validUntil.getTime() + lifetime*1000);
+ }
+ assert.optionalBuffer(options.serial, 'options.serial');
+ var serial = options.serial;
+ if (serial === undefined)
+ serial = new Buffer('0000000000000001', 'hex');
+
+ var cert = new Certificate({
+ subjects: subjects,
+ issuer: issuer,
+ subjectKey: key,
+ issuerKey: issuerKey.toPublic(),
+ signatures: {},
+ serial: serial,
+ validFrom: validFrom,
+ validUntil: validUntil
+ });
+ cert.signWith(issuerKey);
+
+ return (cert);
+};
+
+Certificate.parse = function (data, format, options) {
+ if (typeof (data) !== 'string')
+ assert.buffer(data, 'data');
+ if (format === undefined)
+ format = 'auto';
+ assert.string(format, 'format');
+ if (typeof (options) === 'string')
+ options = { filename: options };
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ assert.optionalString(options.filename, 'options.filename');
+ if (options.filename === undefined)
+ options.filename = '(unnamed)';
+
+ assert.object(formats[format], 'formats[format]');
+
+ try {
+ var k = formats[format].read(data, options);
+ return (k);
+ } catch (e) {
+ throw (new CertificateParseError(options.filename, format, e));
+ }
+};
+
+Certificate.isCertificate = function (obj, ver) {
+ return (utils.isCompatible(obj, Certificate, ver));
+};
+
+/*
+ * API versions for Certificate:
+ * [1,0] -- initial ver
+ */
+Certificate.prototype._sshpkApiVersion = [1, 0];
+
+Certificate._oldVersionDetect = function (obj) {
+ return ([1, 0]);
+};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js
index 3551c1071..1cc09ec71 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/errors.js
@@ -50,9 +50,35 @@ function SignatureParseError(type, format, innerErr) {
}
util.inherits(SignatureParseError, Error);
+function CertificateParseError(name, format, innerErr) {
+ if (Error.captureStackTrace)
+ Error.captureStackTrace(this, CertificateParseError);
+ this.name = 'CertificateParseError';
+ this.format = format;
+ this.certName = name;
+ this.innerErr = innerErr;
+ this.message = 'Failed to parse ' + name + ' as a valid ' + format +
+ ' format certificate: ' + innerErr.message;
+}
+util.inherits(CertificateParseError, Error);
+
+function KeyEncryptedError(name, format) {
+ if (Error.captureStackTrace)
+ Error.captureStackTrace(this, KeyEncryptedError);
+ this.name = 'KeyEncryptedError';
+ this.format = format;
+ this.keyName = name;
+ this.message = 'The ' + format + ' format key ' + name + ' is ' +
+ 'encrypted (password-protected), and no passphrase was ' +
+ 'provided in `options`';
+}
+util.inherits(KeyEncryptedError, Error);
+
module.exports = {
FingerprintFormatError: FingerprintFormatError,
InvalidAlgorithmError: InvalidAlgorithmError,
KeyParseError: KeyParseError,
- SignatureParseError: SignatureParseError
+ SignatureParseError: SignatureParseError,
+ KeyEncryptedError: KeyEncryptedError,
+ CertificateParseError: CertificateParseError
};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js
index c607330e7..7ed7e5130 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/fingerprint.js
@@ -7,6 +7,7 @@ var algs = require('./algs');
var crypto = require('crypto');
var errs = require('./errors');
var Key = require('./key');
+var Certificate = require('./certificate');
var utils = require('./utils');
var FingerprintFormatError = errs.FingerprintFormatError;
@@ -14,6 +15,7 @@ var InvalidAlgorithmError = errs.InvalidAlgorithmError;
function Fingerprint(opts) {
assert.object(opts, 'options');
+ assert.string(opts.type, 'options.type');
assert.buffer(opts.hash, 'options.hash');
assert.string(opts.algorithm, 'options.algorithm');
@@ -22,6 +24,7 @@ function Fingerprint(opts) {
throw (new InvalidAlgorithmError(this.algorithm));
this.hash = opts.hash;
+ this.type = opts.type;
}
Fingerprint.prototype.toString = function (format) {
@@ -44,11 +47,16 @@ Fingerprint.prototype.toString = function (format) {
}
};
-Fingerprint.prototype.matches = function (key) {
- assert.object(key, 'key');
- utils.assertCompatible(key, Key, [1, 0], 'key');
+Fingerprint.prototype.matches = function (other) {
+ assert.object(other, 'key or certificate');
+ if (this.type === 'key') {
+ utils.assertCompatible(other, Key, [1, 0], 'key');
+ } else {
+ utils.assertCompatible(other, Certificate, [1, 0],
+ 'certificate');
+ }
- var theirHash = key.hash(this.algorithm);
+ var theirHash = other.hash(this.algorithm);
var theirHash2 = crypto.createHash(this.algorithm).
update(theirHash).digest('base64');
@@ -59,10 +67,19 @@ Fingerprint.prototype.matches = function (key) {
return (this.hash2 === theirHash2);
};
-Fingerprint.parse = function (fp, enAlgs) {
+Fingerprint.parse = function (fp, options) {
assert.string(fp, 'fingerprint');
- var alg, hash;
+ var alg, hash, enAlgs;
+ if (Array.isArray(options)) {
+ enAlgs = options;
+ options = {};
+ }
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ if (options.enAlgs !== undefined)
+ enAlgs = options.enAlgs;
assert.optionalArrayOfString(enAlgs, 'algorithms');
var parts = fp.split(':');
@@ -105,7 +122,11 @@ Fingerprint.parse = function (fp, enAlgs) {
throw (new InvalidAlgorithmError(alg));
}
- return (new Fingerprint({algorithm: alg, hash: hash}));
+ return (new Fingerprint({
+ algorithm: alg,
+ hash: hash,
+ type: options.type || 'key'
+ }));
};
function addColons(s) {
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js
index 37c3cc813..973c03245 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/auto.js
@@ -14,24 +14,24 @@ var pem = require('./pem');
var ssh = require('./ssh');
var rfc4253 = require('./rfc4253');
-function read(buf) {
+function read(buf, options) {
if (typeof (buf) === 'string') {
if (buf.trim().match(/^[-]+[ ]*BEGIN/))
- return (pem.read(buf));
+ return (pem.read(buf, options));
if (buf.match(/^\s*ssh-[a-z]/))
- return (ssh.read(buf));
+ return (ssh.read(buf, options));
if (buf.match(/^\s*ecdsa-/))
- return (ssh.read(buf));
+ return (ssh.read(buf, options));
buf = new Buffer(buf, 'binary');
} else {
assert.buffer(buf);
if (findPEMHeader(buf))
- return (pem.read(buf));
+ return (pem.read(buf, options));
if (findSSHHeader(buf))
- return (ssh.read(buf));
+ return (ssh.read(buf, options));
}
if (buf.readUInt32BE(0) < buf.length)
- return (rfc4253.read(buf));
+ return (rfc4253.read(buf, options));
throw (new Error('Failed to auto-detect format of key'));
}
@@ -68,6 +68,6 @@ function findPEMHeader(buf) {
return (true);
}
-function write(key) {
+function write(key, options) {
throw (new Error('"auto" format cannot be used for writing'));
}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js
new file mode 100644
index 000000000..8ce7350fe
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/openssh-cert.js
@@ -0,0 +1,289 @@
+// Copyright 2016 Joyent, Inc.
+
+module.exports = {
+ read: read,
+ verify: verify,
+ sign: sign,
+ write: write,
+
+ /* Internal private API */
+ fromBuffer: fromBuffer,
+ toBuffer: toBuffer
+};
+
+var assert = require('assert-plus');
+var SSHBuffer = require('../ssh-buffer');
+var crypto = require('crypto');
+var algs = require('../algs');
+var Key = require('../key');
+var PrivateKey = require('../private-key');
+var Identity = require('../identity');
+var rfc4253 = require('./rfc4253');
+var Signature = require('../signature');
+var utils = require('../utils');
+var Certificate = require('../certificate');
+
+function verify(cert, key) {
+ /*
+ * We always give an issuerKey, so if our verify() is being called then
+ * there was no signature. Return false.
+ */
+ return (false);
+}
+
+var TYPES = {
+ 'user': 1,
+ 'host': 2
+};
+Object.keys(TYPES).forEach(function (k) { TYPES[TYPES[k]] = k; });
+
+var ECDSA_ALGO = /^ecdsa-sha2-([^@-]+)-cert-v01@openssh.com$/;
+
+function read(buf, options) {
+ if (Buffer.isBuffer(buf))
+ buf = buf.toString('ascii');
+ var parts = buf.trim().split(/[ \t\n]+/g);
+ if (parts.length < 2 || parts.length > 3)
+ throw (new Error('Not a valid SSH certificate line'));
+
+ var algo = parts[0];
+ var data = parts[1];
+
+ data = new Buffer(data, 'base64');
+ return (fromBuffer(data, algo));
+}
+
+function fromBuffer(data, algo, partial) {
+ var sshbuf = new SSHBuffer({ buffer: data });
+ var innerAlgo = sshbuf.readString();
+ if (algo !== undefined && innerAlgo !== algo)
+ throw (new Error('SSH certificate algorithm mismatch'));
+ if (algo === undefined)
+ algo = innerAlgo;
+
+ var cert = {};
+ cert.signatures = {};
+ cert.signatures.openssh = {};
+
+ cert.signatures.openssh.nonce = sshbuf.readBuffer();
+
+ var key = {};
+ var parts = (key.parts = []);
+ key.type = getAlg(algo);
+
+ var partCount = algs.info[key.type].parts.length;
+ while (parts.length < partCount)
+ parts.push(sshbuf.readPart());
+ assert.ok(parts.length >= 1, 'key must have at least one part');
+
+ var algInfo = algs.info[key.type];
+ if (key.type === 'ecdsa') {
+ var res = ECDSA_ALGO.exec(algo);
+ assert.ok(res !== null);
+ assert.strictEqual(res[1], parts[0].data.toString());
+ }
+
+ for (var i = 0; i < algInfo.parts.length; ++i) {
+ parts[i].name = algInfo.parts[i];
+ if (parts[i].name !== 'curve' &&
+ algInfo.normalize !== false) {
+ var p = parts[i];
+ p.data = utils.mpNormalize(p.data);
+ }
+ }
+
+ cert.subjectKey = new Key(key);
+
+ cert.serial = sshbuf.readInt64();
+
+ var type = TYPES[sshbuf.readInt()];
+ assert.string(type, 'valid cert type');
+
+ cert.signatures.openssh.keyId = sshbuf.readString();
+
+ var principals = [];
+ var pbuf = sshbuf.readBuffer();
+ var psshbuf = new SSHBuffer({ buffer: pbuf });
+ while (!psshbuf.atEnd())
+ principals.push(psshbuf.readString());
+ if (principals.length === 0)
+ principals = ['*'];
+
+ cert.subjects = principals.map(function (pr) {
+ if (type === 'user')
+ return (Identity.forUser(pr));
+ else if (type === 'host')
+ return (Identity.forHost(pr));
+ throw (new Error('Unknown identity type ' + type));
+ });
+
+ cert.validFrom = int64ToDate(sshbuf.readInt64());
+ cert.validUntil = int64ToDate(sshbuf.readInt64());
+
+ cert.signatures.openssh.critical = sshbuf.readBuffer();
+ cert.signatures.openssh.exts = sshbuf.readBuffer();
+
+ /* reserved */
+ sshbuf.readBuffer();
+
+ var signingKeyBuf = sshbuf.readBuffer();
+ cert.issuerKey = rfc4253.read(signingKeyBuf);
+
+ /*
+ * OpenSSH certs don't give the identity of the issuer, just their
+ * public key. So, we use an Identity that matches anything. The
+ * isSignedBy() function will later tell you if the key matches.
+ */
+ cert.issuer = Identity.forHost('**');
+
+ var sigBuf = sshbuf.readBuffer();
+ cert.signatures.openssh.signature =
+ Signature.parse(sigBuf, cert.issuerKey.type, 'ssh');
+
+ if (partial !== undefined) {
+ partial.remainder = sshbuf.remainder();
+ partial.consumed = sshbuf._offset;
+ }
+
+ return (new Certificate(cert));
+}
+
+function int64ToDate(buf) {
+ var i = buf.readUInt32BE(0) * 4294967296;
+ i += buf.readUInt32BE(4);
+ var d = new Date();
+ d.setTime(i * 1000);
+ d.sourceInt64 = buf;
+ return (d);
+}
+
+function dateToInt64(date) {
+ if (date.sourceInt64 !== undefined)
+ return (date.sourceInt64);
+ var i = Math.round(date.getTime() / 1000);
+ var upper = Math.floor(i / 4294967296);
+ var lower = Math.floor(i % 4294967296);
+ var buf = new Buffer(8);
+ buf.writeUInt32BE(upper, 0);
+ buf.writeUInt32BE(lower, 4);
+ return (buf);
+}
+
+function sign(cert, key) {
+ if (cert.signatures.openssh === undefined)
+ cert.signatures.openssh = {};
+ try {
+ var blob = toBuffer(cert, true);
+ } catch (e) {
+ delete (cert.signatures.openssh);
+ return (false);
+ }
+ var sig = cert.signatures.openssh;
+ var hashAlgo = undefined;
+ if (key.type === 'rsa' || key.type === 'dsa')
+ hashAlgo = 'sha1';
+ var signer = key.createSign(hashAlgo);
+ signer.write(blob);
+ sig.signature = signer.sign();
+ return (true);
+}
+
+function write(cert, options) {
+ if (options === undefined)
+ options = {};
+
+ var blob = toBuffer(cert);
+ var out = getCertType(cert.subjectKey) + ' ' + blob.toString('base64');
+ if (options.comment)
+ out = out + ' ' + options.comment;
+ return (out);
+}
+
+
+function toBuffer(cert, noSig) {
+ assert.object(cert.signatures.openssh, 'signature for openssh format');
+ var sig = cert.signatures.openssh;
+
+ if (sig.nonce === undefined)
+ sig.nonce = crypto.randomBytes(16);
+ var buf = new SSHBuffer({});
+ buf.writeString(getCertType(cert.subjectKey));
+ buf.writeBuffer(sig.nonce);
+
+ var key = cert.subjectKey;
+ var algInfo = algs.info[key.type];
+ algInfo.parts.forEach(function (part) {
+ buf.writePart(key.part[part]);
+ });
+
+ buf.writeInt64(cert.serial);
+
+ var type = cert.subjects[0].type;
+ assert.notStrictEqual(type, 'unknown');
+ cert.subjects.forEach(function (id) {
+ assert.strictEqual(id.type, type);
+ });
+ type = TYPES[type];
+ buf.writeInt(type);
+
+ if (sig.keyId === undefined) {
+ sig.keyId = cert.subjects[0].type + '_' +
+ (cert.subjects[0].uid || cert.subjects[0].hostname);
+ }
+ buf.writeString(sig.keyId);
+
+ var sub = new SSHBuffer({});
+ cert.subjects.forEach(function (id) {
+ if (type === TYPES.host)
+ sub.writeString(id.hostname);
+ else if (type === TYPES.user)
+ sub.writeString(id.uid);
+ });
+ buf.writeBuffer(sub.toBuffer());
+
+ buf.writeInt64(dateToInt64(cert.validFrom));
+ buf.writeInt64(dateToInt64(cert.validUntil));
+
+ if (sig.critical === undefined)
+ sig.critical = new Buffer(0);
+ buf.writeBuffer(sig.critical);
+
+ if (sig.exts === undefined)
+ sig.exts = new Buffer(0);
+ buf.writeBuffer(sig.exts);
+
+ /* reserved */
+ buf.writeBuffer(new Buffer(0));
+
+ sub = rfc4253.write(cert.issuerKey);
+ buf.writeBuffer(sub);
+
+ if (!noSig)
+ buf.writeBuffer(sig.signature.toBuffer('ssh'));
+
+ return (buf.toBuffer());
+}
+
+function getAlg(certType) {
+ if (certType === 'ssh-rsa-cert-v01@openssh.com')
+ return ('rsa');
+ if (certType === 'ssh-dss-cert-v01@openssh.com')
+ return ('dsa');
+ if (certType.match(ECDSA_ALGO))
+ return ('ecdsa');
+ if (certType === 'ssh-ed25519-cert-v01@openssh.com')
+ return ('ed25519');
+ throw (new Error('Unsupported cert type ' + certType));
+}
+
+function getCertType(key) {
+ if (key.type === 'rsa')
+ return ('ssh-rsa-cert-v01@openssh.com');
+ if (key.type === 'dsa')
+ return ('ssh-dss-cert-v01@openssh.com');
+ if (key.type === 'ecdsa')
+ return ('ecdsa-sha2-' + key.curve + '-cert-v01@openssh.com');
+ if (key.type === 'ed25519')
+ return ('ssh-ed25519-cert-v01@openssh.com');
+ throw (new Error('Unsupported key type ' + key.type));
+}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js
index 1d907607e..5318b3516 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pem.js
@@ -7,6 +7,7 @@ module.exports = {
var assert = require('assert-plus');
var asn1 = require('asn1');
+var crypto = require('crypto');
var algs = require('../algs');
var utils = require('../utils');
var Key = require('../key');
@@ -17,11 +18,13 @@ var pkcs8 = require('./pkcs8');
var sshpriv = require('./ssh-private');
var rfc4253 = require('./rfc4253');
+var errors = require('../errors');
+
/*
* For reading we support both PKCS#1 and PKCS#8. If we find a private key,
* we just take the public component of it and use that.
*/
-function read(buf, forceType) {
+function read(buf, options, forceType) {
var input = buf;
if (typeof (buf) !== 'string') {
assert.buffer(buf, 'buf');
@@ -58,12 +61,26 @@ function read(buf, forceType) {
break;
headers[m[1].toLowerCase()] = m[2];
}
+
+ var cipher, key, iv;
if (headers['proc-type']) {
var parts = headers['proc-type'].split(',');
if (parts[0] === '4' && parts[1] === 'ENCRYPTED') {
- throw (new Error('PEM key is encrypted ' +
- '(password-protected). Please use the ' +
- 'SSH agent or decrypt the key.'));
+ if (typeof (options.passphrase) === 'string') {
+ options.passphrase = new Buffer(
+ options.passphrase, 'utf-8');
+ }
+ if (!Buffer.isBuffer(options.passphrase)) {
+ throw (new errors.KeyEncryptedError(
+ options.filename, 'PEM'));
+ } else {
+ parts = headers['dek-info'].split(',');
+ assert.ok(parts.length === 2);
+ cipher = parts[0].toLowerCase();
+ iv = new Buffer(parts[1], 'hex');
+ key = utils.opensslKeyDeriv(cipher, iv,
+ options.passphrase, 1).key;
+ }
}
}
@@ -71,6 +88,23 @@ function read(buf, forceType) {
lines = lines.slice(0, -1).join('');
buf = new Buffer(lines, 'base64');
+ if (cipher && key && iv) {
+ var cipherStream = crypto.createDecipheriv(cipher, key, iv);
+ var chunk, chunks = [];
+ cipherStream.once('error', function (e) {
+ if (e.toString().indexOf('bad decrypt') !== -1) {
+ throw (new Error('Incorrect passphrase ' +
+ 'supplied, could not decrypt key'));
+ }
+ throw (e);
+ });
+ cipherStream.write(buf);
+ cipherStream.end();
+ while ((chunk = cipherStream.read()) !== null)
+ chunks.push(chunk);
+ buf = Buffer.concat(chunks);
+ }
+
/* The new OpenSSH internal format abuses PEM headers */
if (alg && alg.toLowerCase() === 'openssh')
return (sshpriv.readSSHPrivate(type, buf));
@@ -98,7 +132,7 @@ function read(buf, forceType) {
}
}
-function write(key, type) {
+function write(key, options, type) {
assert.object(key);
var alg = {'ecdsa': 'EC', 'rsa': 'RSA', 'dsa': 'DSA'}[key.type];
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js
index 6f9a24f11..a5676af6e 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs1.js
@@ -19,12 +19,12 @@ var pem = require('./pem');
var pkcs8 = require('./pkcs8');
var readECDSACurve = pkcs8.readECDSACurve;
-function read(buf) {
- return (pem.read(buf, 'pkcs1'));
+function read(buf, options) {
+ return (pem.read(buf, options, 'pkcs1'));
}
-function write(key) {
- return (pem.write(key, 'pkcs1'));
+function write(key, options) {
+ return (pem.write(key, options, 'pkcs1'));
}
/* Helper to read in a single mpint */
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js
index c57c85537..4ccbefcbe 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/pkcs8.js
@@ -18,12 +18,12 @@ var Key = require('../key');
var PrivateKey = require('../private-key');
var pem = require('./pem');
-function read(buf) {
- return (pem.read(buf, 'pkcs8'));
+function read(buf, options) {
+ return (pem.read(buf, options, 'pkcs8'));
}
-function write(key) {
- return (pem.write(key, 'pkcs8'));
+function write(key, options) {
+ return (pem.write(key, options, 'pkcs8'));
}
/* Helper to read in a single mpint */
@@ -42,10 +42,12 @@ function readPkcs8(alg, type, der) {
}
der.readSequence();
+ var next = der.offset + der.length;
var oid = der.readOID();
switch (oid) {
case '1.2.840.113549.1.1.1':
+ der._offset = next;
if (type === 'public')
return (readPkcs8RSAPublic(der));
else
@@ -66,10 +68,6 @@ function readPkcs8(alg, type, der) {
}
function readPkcs8RSAPublic(der) {
- // Null -- XXX this probably isn't good practice
- der.readByte();
- der.readByte();
-
// bit string sequence
der.readSequence(asn1.Ber.BitString);
der.readByte();
@@ -93,9 +91,6 @@ function readPkcs8RSAPublic(der) {
}
function readPkcs8RSAPrivate(der) {
- der.readByte();
- der.readByte();
-
der.readSequence(asn1.Ber.OctetString);
der.readSequence();
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js
index 3e0e286cd..9d436dd92 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/rfc4253.js
@@ -52,7 +52,7 @@ function keyTypeToAlg(key) {
throw (new Error('Unknown key type ' + key.type));
}
-function read(partial, type, buf) {
+function read(partial, type, buf, options) {
if (typeof (buf) === 'string')
buf = new Buffer(buf);
assert.buffer(buf, 'buf');
@@ -120,7 +120,7 @@ function read(partial, type, buf) {
return (new Constructor(key));
}
-function write(key) {
+function write(key, options) {
assert.object(key);
var alg = keyTypeToAlg(key);
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js
index 02d7c27e8..bfbdab527 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh-private.js
@@ -18,8 +18,8 @@ var pem = require('./pem');
var rfc4253 = require('./rfc4253');
var SSHBuffer = require('../ssh-buffer');
-function read(buf) {
- return (pem.read(buf));
+function read(buf, options) {
+ return (pem.read(buf, options));
}
var MAGIC = 'openssh-key-v1';
@@ -76,7 +76,7 @@ function readSSHPrivate(type, buf) {
return (key);
}
-function write(key) {
+function write(key, options) {
var pubKey;
if (PrivateKey.isPrivateKey(key))
pubKey = key.toPublic();
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js
index f7baa48cf..655c9eaf3 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/ssh.js
@@ -18,7 +18,7 @@ var SSHKEY_RE = /^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/]+[=]*)([\n \t]+([^\n]+))?$/;
/*JSSTYLED*/
var SSHKEY_RE2 = /^([a-z0-9-]+)[ \t]+([a-zA-Z0-9+\/ \t\n]+[=]*)(.*)$/;
-function read(buf) {
+function read(buf, options) {
if (typeof (buf) !== 'string') {
assert.buffer(buf, 'buf');
buf = buf.toString('ascii');
@@ -95,7 +95,7 @@ function read(buf) {
return (key);
}
-function write(key) {
+function write(key, options) {
assert.object(key);
if (!Key.isKey(key))
throw (new Error('Must be a public key'));
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js
new file mode 100644
index 000000000..c59c7d5ff
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509-pem.js
@@ -0,0 +1,77 @@
+// Copyright 2016 Joyent, Inc.
+
+var x509 = require('./x509');
+
+module.exports = {
+ read: read,
+ verify: x509.verify,
+ sign: x509.sign,
+ write: write
+};
+
+var assert = require('assert-plus');
+var asn1 = require('asn1');
+var algs = require('../algs');
+var utils = require('../utils');
+var Key = require('../key');
+var PrivateKey = require('../private-key');
+var pem = require('./pem');
+var Identity = require('../identity');
+var Signature = require('../signature');
+var Certificate = require('../certificate');
+
+function read(buf, options) {
+ if (typeof (buf) !== 'string') {
+ assert.buffer(buf, 'buf');
+ buf = buf.toString('ascii');
+ }
+
+ var lines = buf.trim().split(/[\r\n]+/g);
+
+ var m = lines[0].match(/*JSSTYLED*/
+ /[-]+[ ]*BEGIN CERTIFICATE[ ]*[-]+/);
+ assert.ok(m, 'invalid PEM header');
+
+ var m2 = lines[lines.length - 1].match(/*JSSTYLED*/
+ /[-]+[ ]*END CERTIFICATE[ ]*[-]+/);
+ assert.ok(m2, 'invalid PEM footer');
+
+ var headers = {};
+ while (true) {
+ lines = lines.slice(1);
+ m = lines[0].match(/*JSSTYLED*/
+ /^([A-Za-z0-9-]+): (.+)$/);
+ if (!m)
+ break;
+ headers[m[1].toLowerCase()] = m[2];
+ }
+
+ /* Chop off the first and last lines */
+ lines = lines.slice(0, -1).join('');
+ buf = new Buffer(lines, 'base64');
+
+ return (x509.read(buf, options));
+}
+
+function write(cert, options) {
+ var dbuf = x509.write(cert, options);
+
+ var header = 'CERTIFICATE';
+ var tmp = dbuf.toString('base64');
+ var len = tmp.length + (tmp.length / 64) +
+ 18 + 16 + header.length*2 + 10;
+ var buf = new Buffer(len);
+ var o = 0;
+ o += buf.write('-----BEGIN ' + header + '-----\n', o);
+ for (var i = 0; i < tmp.length; ) {
+ var limit = i + 64;
+ if (limit > tmp.length)
+ limit = tmp.length;
+ o += buf.write(tmp.slice(i, limit), o);
+ buf[o++] = 10;
+ i = limit;
+ }
+ o += buf.write('-----END ' + header + '-----\n', o);
+
+ return (buf.slice(0, o));
+}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js
new file mode 100644
index 000000000..a2975404a
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/formats/x509.js
@@ -0,0 +1,484 @@
+// Copyright 2016 Joyent, Inc.
+
+module.exports = {
+ read: read,
+ verify: verify,
+ sign: sign,
+ write: write
+};
+
+var assert = require('assert-plus');
+var asn1 = require('asn1');
+var algs = require('../algs');
+var utils = require('../utils');
+var Key = require('../key');
+var PrivateKey = require('../private-key');
+var pem = require('./pem');
+var Identity = require('../identity');
+var Signature = require('../signature');
+var Certificate = require('../certificate');
+var pkcs8 = require('./pkcs8');
+
+/*
+ * This file is based on RFC5280 (X.509).
+ */
+
+/* Helper to read in a single mpint */
+function readMPInt(der, nm) {
+ assert.strictEqual(der.peek(), asn1.Ber.Integer,
+ nm + ' is not an Integer');
+ return (utils.mpNormalize(der.readString(asn1.Ber.Integer, true)));
+}
+
+function verify(cert, key) {
+ var sig = cert.signatures.x509;
+ assert.object(sig, 'x509 signature');
+
+ var algParts = sig.algo.split('-');
+ if (algParts[0] !== key.type)
+ return (false);
+
+ var blob = sig.cache;
+ if (blob === undefined) {
+ var der = new asn1.BerWriter();
+ writeTBSCert(cert, der);
+ blob = der.buffer;
+ }
+
+ var verifier = key.createVerify(algParts[1]);
+ verifier.write(blob);
+ return (verifier.verify(sig.signature));
+}
+
+function Local(i) {
+ return (asn1.Ber.Context | asn1.Ber.Constructor | i);
+}
+
+function Context(i) {
+ return (asn1.Ber.Context | i);
+}
+
+var SIGN_ALGS = {
+ 'rsa-md5': '1.2.840.113549.1.1.4',
+ 'rsa-sha1': '1.2.840.113549.1.1.5',
+ 'rsa-sha256': '1.2.840.113549.1.1.11',
+ 'rsa-sha384': '1.2.840.113549.1.1.12',
+ 'rsa-sha512': '1.2.840.113549.1.1.13',
+ 'dsa-sha1': '1.2.840.10040.4.3',
+ 'dsa-sha256': '2.16.840.1.101.3.4.3.2',
+ 'ecdsa-sha1': '1.2.840.10045.4.1',
+ 'ecdsa-sha256': '1.2.840.10045.4.3.2',
+ 'ecdsa-sha384': '1.2.840.10045.4.3.3',
+ 'ecdsa-sha512': '1.2.840.10045.4.3.4'
+};
+Object.keys(SIGN_ALGS).forEach(function (k) {
+ SIGN_ALGS[SIGN_ALGS[k]] = k;
+});
+SIGN_ALGS['1.3.14.3.2.3'] = 'rsa-md5';
+SIGN_ALGS['1.3.14.3.2.29'] = 'rsa-sha1';
+
+var EXTS = {
+ 'issuerKeyId': '2.5.29.35',
+ 'altName': '2.5.29.17'
+};
+
+function read(buf, options) {
+ if (typeof (buf) === 'string') {
+ buf = new Buffer(buf, 'binary');
+ }
+ assert.buffer(buf, 'buf');
+
+ var der = new asn1.BerReader(buf);
+
+ der.readSequence();
+ if (Math.abs(der.length - der.remain) > 1) {
+ throw (new Error('DER sequence does not contain whole byte ' +
+ 'stream'));
+ }
+
+ var tbsStart = der.offset;
+ der.readSequence();
+ var sigOffset = der.offset + der.length;
+ var tbsEnd = sigOffset;
+
+ if (der.peek() === Local(0)) {
+ der.readSequence(Local(0));
+ var version = der.readInt();
+ assert.ok(version <= 3,
+ 'only x.509 versions up to v3 supported');
+ }
+
+ var cert = {};
+ cert.signatures = {};
+ var sig = (cert.signatures.x509 = {});
+ sig.extras = {};
+
+ cert.serial = readMPInt(der, 'serial');
+
+ der.readSequence();
+ var after = der.offset + der.length;
+ var certAlgOid = der.readOID();
+ var certAlg = SIGN_ALGS[certAlgOid];
+ if (certAlg === undefined)
+ throw (new Error('unknown signature algorithm ' + certAlgOid));
+
+ der._offset = after;
+ cert.issuer = Identity.parseAsn1(der);
+
+ der.readSequence();
+ cert.validFrom = readDate(der);
+ cert.validUntil = readDate(der);
+
+ cert.subjects = [Identity.parseAsn1(der)];
+
+ der.readSequence();
+ after = der.offset + der.length;
+ cert.subjectKey = pkcs8.readPkcs8(undefined, 'public', der);
+ der._offset = after;
+
+ /* issuerUniqueID */
+ if (der.peek() === Local(1)) {
+ der.readSequence(Local(1));
+ sig.extras.issuerUniqueID =
+ buf.slice(der.offset, der.offset + der.length);
+ der._offset += der.length;
+ }
+
+ /* subjectUniqueID */
+ if (der.peek() === Local(2)) {
+ der.readSequence(Local(2));
+ sig.extras.subjectUniqueID =
+ buf.slice(der.offset, der.offset + der.length);
+ der._offset += der.length;
+ }
+
+ /* extensions */
+ if (der.peek() === Local(3)) {
+ der.readSequence(Local(3));
+ var extEnd = der.offset + der.length;
+ der.readSequence();
+
+ while (der.offset < extEnd)
+ readExtension(cert, buf, der);
+
+ assert.strictEqual(der.offset, extEnd);
+ }
+
+ assert.strictEqual(der.offset, sigOffset);
+
+ der.readSequence();
+ after = der.offset + der.length;
+ var sigAlgOid = der.readOID();
+ var sigAlg = SIGN_ALGS[sigAlgOid];
+ if (sigAlg === undefined)
+ throw (new Error('unknown signature algorithm ' + sigAlgOid));
+ der._offset = after;
+
+ var sigData = der.readString(asn1.Ber.BitString, true);
+ if (sigData[0] === 0)
+ sigData = sigData.slice(1);
+ var algParts = sigAlg.split('-');
+
+ sig.signature = Signature.parse(sigData, algParts[0], 'asn1');
+ sig.signature.hashAlgorithm = algParts[1];
+ sig.algo = sigAlg;
+ sig.cache = buf.slice(tbsStart, tbsEnd);
+
+ return (new Certificate(cert));
+}
+
+function readDate(der) {
+ if (der.peek() === asn1.Ber.UTCTime) {
+ return (utcTimeToDate(der.readString(asn1.Ber.UTCTime)));
+ } else if (der.peek() === asn1.Ber.GeneralizedTime) {
+ return (gTimeToDate(der.readString(asn1.Ber.GeneralizedTime)));
+ } else {
+ throw (new Error('Unsupported date format'));
+ }
+}
+
+/* RFC5280, section 4.2.1.6 (GeneralName type) */
+var ALTNAME = {
+ OtherName: Local(0),
+ RFC822Name: Context(1),
+ DNSName: Context(2),
+ X400Address: Local(3),
+ DirectoryName: Local(4),
+ EDIPartyName: Local(5),
+ URI: Context(6),
+ IPAddress: Context(7),
+ OID: Context(8)
+};
+
+function readExtension(cert, buf, der) {
+ der.readSequence();
+ var after = der.offset + der.length;
+ var extId = der.readOID();
+ var id;
+ var sig = cert.signatures.x509;
+ sig.extras.exts = [];
+
+ var critical;
+ if (der.peek() === asn1.Ber.Boolean)
+ critical = der.readBoolean();
+
+ switch (extId) {
+ case (EXTS.altName):
+ der.readSequence(asn1.Ber.OctetString);
+ der.readSequence();
+ var aeEnd = der.offset + der.length;
+ while (der.offset < aeEnd) {
+ switch (der.peek()) {
+ case ALTNAME.OtherName:
+ case ALTNAME.EDIPartyName:
+ der.readSequence();
+ der._offset += der.length;
+ break;
+ case ALTNAME.OID:
+ der.readOID(ALTNAME.OID);
+ break;
+ case ALTNAME.RFC822Name:
+ /* RFC822 specifies email addresses */
+ var email = der.readString(ALTNAME.RFC822Name);
+ id = Identity.forEmail(email);
+ if (!cert.subjects[0].equals(id))
+ cert.subjects.push(id);
+ break;
+ case ALTNAME.DirectoryName:
+ der.readSequence(ALTNAME.DirectoryName);
+ id = Identity.parseAsn1(der);
+ if (!cert.subjects[0].equals(id))
+ cert.subjects.push(id);
+ break;
+ case ALTNAME.DNSName:
+ var host = der.readString(
+ ALTNAME.DNSName);
+ id = Identity.forHost(host);
+ if (!cert.subjects[0].equals(id))
+ cert.subjects.push(id);
+ break;
+ default:
+ der.readString(der.peek());
+ break;
+ }
+ }
+ sig.extras.exts.push({ oid: extId, critical: critical });
+ break;
+ default:
+ sig.extras.exts.push({
+ oid: extId,
+ critical: critical,
+ data: der.readString(asn1.Ber.OctetString, true)
+ });
+ break;
+ }
+
+ der._offset = after;
+}
+
+var UTCTIME_RE =
+ /^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
+function utcTimeToDate(t) {
+ var m = t.match(UTCTIME_RE);
+ assert.ok(m, 'timestamps must be in UTC');
+ var d = new Date();
+
+ var thisYear = d.getUTCFullYear();
+ var century = Math.floor(thisYear / 100) * 100;
+
+ var year = parseInt(m[1], 10);
+ if (thisYear % 100 < 50 && year >= 60)
+ year += (century - 1);
+ else
+ year += century;
+ d.setUTCFullYear(year, parseInt(m[2], 10) - 1, parseInt(m[3], 10));
+ d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
+ if (m[6] && m[6].length > 0)
+ d.setUTCSeconds(parseInt(m[6], 10));
+ return (d);
+}
+
+var GTIME_RE =
+ /^([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})?Z$/;
+function gTimeToDate(t) {
+ var m = t.match(GTIME_RE);
+ assert.ok(m);
+ var d = new Date();
+
+ d.setUTCFullYear(parseInt(m[1], 10), parseInt(m[2], 10) - 1,
+ parseInt(m[3], 10));
+ d.setUTCHours(parseInt(m[4], 10), parseInt(m[5], 10));
+ if (m[6] && m[6].length > 0)
+ d.setUTCSeconds(parseInt(m[6], 10));
+ return (d);
+}
+
+function zeroPad(n) {
+ var s = '' + n;
+ while (s.length < 2)
+ s = '0' + s;
+ return (s);
+}
+
+function dateToUTCTime(d) {
+ var s = '';
+ s += zeroPad(d.getUTCFullYear() % 100);
+ s += zeroPad(d.getUTCMonth() + 1);
+ s += zeroPad(d.getUTCDate());
+ s += zeroPad(d.getUTCHours());
+ s += zeroPad(d.getUTCMinutes());
+ s += zeroPad(d.getUTCSeconds());
+ s += 'Z';
+ return (s);
+}
+
+function sign(cert, key) {
+ if (cert.signatures.x509 === undefined)
+ cert.signatures.x509 = {};
+ var sig = cert.signatures.x509;
+
+ sig.algo = key.type + '-' + key.defaultHashAlgorithm();
+ if (SIGN_ALGS[sig.algo] === undefined)
+ return (false);
+
+ var der = new asn1.BerWriter();
+ writeTBSCert(cert, der);
+ var blob = der.buffer;
+ sig.cache = blob;
+
+ var signer = key.createSign();
+ signer.write(blob);
+ cert.signatures.x509.signature = signer.sign();
+
+ return (true);
+}
+
+function write(cert, options) {
+ var sig = cert.signatures.x509;
+ assert.object(sig, 'x509 signature');
+
+ var der = new asn1.BerWriter();
+ der.startSequence();
+ if (sig.cache) {
+ der._ensure(sig.cache.length);
+ sig.cache.copy(der._buf, der._offset);
+ der._offset += sig.cache.length;
+ } else {
+ writeTBSCert(cert, der);
+ }
+
+ der.startSequence();
+ der.writeOID(SIGN_ALGS[sig.algo]);
+ if (sig.algo.match(/^rsa-/))
+ der.writeNull();
+ der.endSequence();
+
+ var sigData = sig.signature.toBuffer('asn1');
+ var data = new Buffer(sigData.length + 1);
+ data[0] = 0;
+ sigData.copy(data, 1);
+ der.writeBuffer(data, asn1.Ber.BitString);
+ der.endSequence();
+
+ return (der.buffer);
+}
+
+function writeTBSCert(cert, der) {
+ var sig = cert.signatures.x509;
+ assert.object(sig, 'x509 signature');
+
+ der.startSequence();
+
+ der.startSequence(Local(0));
+ der.writeInt(2);
+ der.endSequence();
+
+ der.writeBuffer(utils.mpNormalize(cert.serial), asn1.Ber.Integer);
+
+ der.startSequence();
+ der.writeOID(SIGN_ALGS[sig.algo]);
+ der.endSequence();
+
+ cert.issuer.toAsn1(der);
+
+ der.startSequence();
+ der.writeString(dateToUTCTime(cert.validFrom), asn1.Ber.UTCTime);
+ der.writeString(dateToUTCTime(cert.validUntil), asn1.Ber.UTCTime);
+ der.endSequence();
+
+ var subject = cert.subjects[0];
+ var altNames = cert.subjects.slice(1);
+ subject.toAsn1(der);
+
+ pkcs8.writePkcs8(der, cert.subjectKey);
+
+ if (sig.extras && sig.extras.issuerUniqueID) {
+ der.writeBuffer(sig.extras.issuerUniqueID, Local(1));
+ }
+
+ if (sig.extras && sig.extras.subjectUniqueID) {
+ der.writeBuffer(sig.extras.subjectUniqueID, Local(2));
+ }
+
+ if (altNames.length > 0 || subject.type === 'host' ||
+ (sig.extras && sig.extras.exts)) {
+ der.startSequence(Local(3));
+ der.startSequence();
+
+ var exts = [
+ { oid: EXTS.altName }
+ ];
+ if (sig.extras && sig.extras.exts)
+ exts = sig.extras.exts;
+
+ for (var i = 0; i < exts.length; ++i) {
+ der.startSequence();
+ der.writeOID(exts[i].oid);
+
+ if (exts[i].critical !== undefined)
+ der.writeBoolean(exts[i].critical);
+
+ if (exts[i].oid === EXTS.altName) {
+ der.startSequence(asn1.Ber.OctetString);
+ der.startSequence();
+ if (subject.type === 'host') {
+ der.writeString(subject.hostname,
+ Context(2));
+ }
+ for (var j = 0; j < altNames.length; ++j) {
+ if (altNames[j].type === 'host') {
+ der.writeString(
+ altNames[j].hostname,
+ ALTNAME.DNSName);
+ } else if (altNames[j].type ===
+ 'email') {
+ der.writeString(
+ altNames[j].email,
+ ALTNAME.RFC822Name);
+ } else {
+ /*
+ * Encode anything else as a
+ * DN style name for now.
+ */
+ der.startSequence(
+ ALTNAME.DirectoryName);
+ altNames[j].toAsn1(der);
+ der.endSequence();
+ }
+ }
+ der.endSequence();
+ der.endSequence();
+ } else {
+ der.writeBuffer(exts[i].data,
+ asn1.Ber.OctetString);
+ }
+
+ der.endSequence();
+ }
+
+ der.endSequence();
+ der.endSequence();
+ }
+
+ der.endSequence();
+}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js
new file mode 100644
index 000000000..b4f5cd73e
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/identity.js
@@ -0,0 +1,255 @@
+// Copyright 2016 Joyent, Inc.
+
+module.exports = Identity;
+
+var assert = require('assert-plus');
+var algs = require('./algs');
+var crypto = require('crypto');
+var Fingerprint = require('./fingerprint');
+var Signature = require('./signature');
+var errs = require('./errors');
+var util = require('util');
+var utils = require('./utils');
+var asn1 = require('asn1');
+
+/*JSSTYLED*/
+var DNS_NAME_RE = /^([*]|[a-z0-9][a-z0-9\-]{0,62})(?:\.([*]|[a-z0-9][a-z0-9\-]{0,62}))*$/i;
+
+var oids = {};
+oids.cn = '2.5.4.3';
+oids.o = '2.5.4.10';
+oids.ou = '2.5.4.11';
+oids.l = '2.5.4.7';
+oids.s = '2.5.4.8';
+oids.c = '2.5.4.6';
+oids.sn = '2.5.4.4';
+oids.dc = '0.9.2342.19200300.100.1.25';
+oids.uid = '0.9.2342.19200300.100.1.1';
+oids.mail = '0.9.2342.19200300.100.1.3';
+
+var unoids = {};
+Object.keys(oids).forEach(function (k) {
+ unoids[oids[k]] = k;
+});
+
+function Identity(opts) {
+ var self = this;
+ assert.object(opts, 'options');
+ assert.arrayOfObject(opts.components, 'options.components');
+ this.components = opts.components;
+ this.componentLookup = {};
+ this.components.forEach(function (c) {
+ if (c.name && !c.oid)
+ c.oid = oids[c.name];
+ if (c.oid && !c.name)
+ c.name = unoids[c.oid];
+ if (self.componentLookup[c.name] === undefined)
+ self.componentLookup[c.name] = [];
+ self.componentLookup[c.name].push(c);
+ });
+ if (this.componentLookup.cn && this.componentLookup.cn.length > 0) {
+ this.cn = this.componentLookup.cn[0].value;
+ }
+ assert.optionalString(opts.type, 'options.type');
+ if (opts.type === undefined) {
+ if (this.components.length === 1 &&
+ this.componentLookup.cn &&
+ this.componentLookup.cn.length === 1 &&
+ this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+ this.type = 'host';
+ this.hostname = this.componentLookup.cn[0].value;
+
+ } else if (this.componentLookup.dc &&
+ this.components.length === this.componentLookup.dc.length) {
+ this.type = 'host';
+ this.hostname = this.componentLookup.dc.map(
+ function (c) {
+ return (c.value);
+ }).join('.');
+
+ } else if (this.componentLookup.uid &&
+ this.components.length ===
+ this.componentLookup.uid.length) {
+ this.type = 'user';
+ this.uid = this.componentLookup.uid[0].value;
+
+ } else if (this.componentLookup.cn &&
+ this.componentLookup.cn.length === 1 &&
+ this.componentLookup.cn[0].value.match(DNS_NAME_RE)) {
+ this.type = 'host';
+ this.hostname = this.componentLookup.cn[0].value;
+
+ } else if (this.componentLookup.uid &&
+ this.componentLookup.uid.length === 1) {
+ this.type = 'user';
+ this.uid = this.componentLookup.uid[0].value;
+
+ } else if (this.componentLookup.mail &&
+ this.componentLookup.mail.length === 1) {
+ this.type = 'email';
+ this.email = this.componentLookup.mail[0].value;
+
+ } else if (this.componentLookup.cn &&
+ this.componentLookup.cn.length === 1) {
+ this.type = 'user';
+ this.uid = this.componentLookup.cn[0].value;
+
+ } else {
+ this.type = 'unknown';
+ }
+ } else {
+ this.type = opts.type;
+ if (this.type === 'host')
+ this.hostname = opts.hostname;
+ else if (this.type === 'user')
+ this.uid = opts.uid;
+ else if (this.type === 'email')
+ this.email = opts.email;
+ else
+ throw (new Error('Unknown type ' + this.type));
+ }
+}
+
+Identity.prototype.toString = function () {
+ return (this.components.map(function (c) {
+ return (c.name.toUpperCase() + '=' + c.value);
+ }).join(', '));
+};
+
+Identity.prototype.toAsn1 = function (der, tag) {
+ der.startSequence(tag);
+ this.components.forEach(function (c) {
+ der.startSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+ der.startSequence();
+ der.writeOID(c.oid);
+ der.writeString(c.value, asn1.Ber.PrintableString);
+ der.endSequence();
+ der.endSequence();
+ });
+ der.endSequence();
+};
+
+function globMatch(a, b) {
+ if (a === '**' || b === '**')
+ return (true);
+ var aParts = a.split('.');
+ var bParts = b.split('.');
+ if (aParts.length !== bParts.length)
+ return (false);
+ for (var i = 0; i < aParts.length; ++i) {
+ if (aParts[i] === '*' || bParts[i] === '*')
+ continue;
+ if (aParts[i] !== bParts[i])
+ return (false);
+ }
+ return (true);
+}
+
+Identity.prototype.equals = function (other) {
+ if (!Identity.isIdentity(other, [1, 0]))
+ return (false);
+ if (other.components.length !== this.components.length)
+ return (false);
+ for (var i = 0; i < this.components.length; ++i) {
+ if (this.components[i].oid !== other.components[i].oid)
+ return (false);
+ if (!globMatch(this.components[i].value,
+ other.components[i].value)) {
+ return (false);
+ }
+ }
+ return (true);
+};
+
+Identity.forHost = function (hostname) {
+ assert.string(hostname, 'hostname');
+ return (new Identity({
+ type: 'host',
+ hostname: hostname,
+ components: [ { name: 'cn', value: hostname } ]
+ }));
+};
+
+Identity.forUser = function (uid) {
+ assert.string(uid, 'uid');
+ return (new Identity({
+ type: 'user',
+ uid: uid,
+ components: [ { name: 'uid', value: uid } ]
+ }));
+};
+
+Identity.forEmail = function (email) {
+ assert.string(email, 'email');
+ return (new Identity({
+ type: 'email',
+ email: email,
+ components: [ { name: 'mail', value: email } ]
+ }));
+};
+
+Identity.parseDN = function (dn) {
+ assert.string(dn, 'dn');
+ var parts = dn.split(',');
+ var cmps = parts.map(function (c) {
+ c = c.trim();
+ var eqPos = c.indexOf('=');
+ var name = c.slice(0, eqPos).toLowerCase();
+ var value = c.slice(eqPos + 1);
+ return ({ name: name, value: value });
+ });
+ return (new Identity({ components: cmps }));
+};
+
+Identity.parseAsn1 = function (der, top) {
+ var components = [];
+ der.readSequence(top);
+ var end = der.offset + der.length;
+ while (der.offset < end) {
+ der.readSequence(asn1.Ber.Constructor | asn1.Ber.Set);
+ var after = der.offset + der.length;
+ der.readSequence();
+ var oid = der.readOID();
+ var type = der.peek();
+ var value;
+ switch (type) {
+ case asn1.Ber.PrintableString:
+ case asn1.Ber.IA5String:
+ case asn1.Ber.OctetString:
+ case asn1.Ber.T61String:
+ value = der.readString(type);
+ break;
+ case asn1.Ber.Utf8String:
+ value = der.readString(type, true);
+ value = value.toString('utf8');
+ break;
+ case asn1.Ber.CharacterString:
+ case asn1.Ber.BMPString:
+ value = der.readString(type, true);
+ value = value.toString('utf16le');
+ break;
+ default:
+ throw (new Error('Unknown asn1 type ' + type));
+ }
+ components.push({ oid: oid, value: value });
+ der._offset = after;
+ }
+ der._offset = end;
+ return (new Identity({
+ components: components
+ }));
+};
+
+Identity.isIdentity = function (obj, ver) {
+ return (utils.isCompatible(obj, Identity, ver));
+};
+
+/*
+ * API versions for Identity:
+ * [1,0] -- initial ver
+ */
+Identity.prototype._sshpkApiVersion = [1, 0];
+
+Identity._oldVersionDetect = function (obj) {
+ return ([1, 0]);
+};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js
index 5cd962b31..96a138428 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/index.js
@@ -4,6 +4,8 @@ var Key = require('./key');
var Fingerprint = require('./fingerprint');
var Signature = require('./signature');
var PrivateKey = require('./private-key');
+var Certificate = require('./certificate');
+var Identity = require('./identity');
var errs = require('./errors');
module.exports = {
@@ -16,10 +18,21 @@ module.exports = {
parseSignature: Signature.parse,
PrivateKey: PrivateKey,
parsePrivateKey: PrivateKey.parse,
+ Certificate: Certificate,
+ parseCertificate: Certificate.parse,
+ createSelfSignedCertificate: Certificate.createSelfSigned,
+ createCertificate: Certificate.create,
+ Identity: Identity,
+ identityFromDN: Identity.parseDN,
+ identityForHost: Identity.forHost,
+ identityForUser: Identity.forUser,
+ identityForEmail: Identity.forEmail,
/* errors */
FingerprintFormatError: errs.FingerprintFormatError,
InvalidAlgorithmError: errs.InvalidAlgorithmError,
KeyParseError: errs.KeyParseError,
- SignatureParseError: errs.SignatureParseError
+ SignatureParseError: errs.SignatureParseError,
+ KeyEncryptedError: errs.KeyEncryptedError,
+ CertificateParseError: errs.CertificateParseError
};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js
index d140f0e54..ff5c36373 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/key.js
@@ -77,11 +77,12 @@ function Key(opts) {
Key.formats = formats;
-Key.prototype.toBuffer = function (format) {
+Key.prototype.toBuffer = function (format, options) {
if (format === undefined)
format = 'ssh';
assert.string(format, 'format');
assert.object(formats[format], 'formats[format]');
+ assert.optionalObject(options, 'options');
if (format === 'rfc4253') {
if (this._rfc4253Cache === undefined)
@@ -89,11 +90,11 @@ Key.prototype.toBuffer = function (format) {
return (this._rfc4253Cache);
}
- return (formats[format].write(this));
+ return (formats[format].write(this, options));
};
-Key.prototype.toString = function (format) {
- return (this.toBuffer(format).toString());
+Key.prototype.toString = function (format, options) {
+ return (this.toBuffer(format, options).toString());
};
Key.prototype.hash = function (algo) {
@@ -107,9 +108,6 @@ Key.prototype.hash = function (algo) {
var hash = crypto.createHash(algo).
update(this.toBuffer('rfc4253')).digest();
- /* Workaround for node 0.8 */
- if (typeof (hash) === 'string')
- hash = new Buffer(hash, 'binary');
this._hashCache[algo] = hash;
return (hash);
};
@@ -119,6 +117,7 @@ Key.prototype.fingerprint = function (algo) {
algo = 'sha256';
assert.string(algo, 'algorithm');
var opts = {
+ type: 'key',
hash: this.hash(algo),
algorithm: algo
};
@@ -158,10 +157,7 @@ Key.prototype.createVerify = function (hashAlgo) {
var v, nm, err;
try {
- nm = this.type.toUpperCase() + '-';
- if (this.type === 'ecdsa')
- nm = 'ecdsa-with-';
- nm += hashAlgo.toUpperCase();
+ nm = hashAlgo.toUpperCase();
v = crypto.createVerify(nm);
} catch (e) {
err = e;
@@ -213,26 +209,34 @@ Key.prototype.createDiffieHellman = function () {
};
Key.prototype.createDH = Key.prototype.createDiffieHellman;
-Key.parse = function (data, format, name) {
+Key.parse = function (data, format, options) {
if (typeof (data) !== 'string')
assert.buffer(data, 'data');
if (format === undefined)
format = 'auto';
assert.string(format, 'format');
- if (name === undefined)
- name = '(unnamed)';
+ if (typeof (options) === 'string')
+ options = { filename: options };
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ assert.optionalString(options.filename, 'options.filename');
+ if (options.filename === undefined)
+ options.filename = '(unnamed)';
assert.object(formats[format], 'formats[format]');
try {
- var k = formats[format].read(data);
+ var k = formats[format].read(data, options);
if (k instanceof PrivateKey)
k = k.toPublic();
if (!k.comment)
- k.comment = name;
+ k.comment = options.filename;
return (k);
} catch (e) {
- throw (new KeyParseError(name, format, e));
+ if (e.name === 'KeyEncryptedError')
+ throw (e);
+ throw (new KeyParseError(options.filename, format, e));
}
};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js
index 993ae3265..f80d93966 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/private-key.js
@@ -23,6 +23,7 @@ var Key = require('./key');
var InvalidAlgorithmError = errs.InvalidAlgorithmError;
var KeyParseError = errs.KeyParseError;
+var KeyEncryptedError = errs.KeyEncryptedError;
var formats = {};
formats['auto'] = require('./formats/auto');
@@ -44,13 +45,14 @@ util.inherits(PrivateKey, Key);
PrivateKey.formats = formats;
-PrivateKey.prototype.toBuffer = function (format) {
+PrivateKey.prototype.toBuffer = function (format, options) {
if (format === undefined)
format = 'pkcs1';
assert.string(format, 'format');
assert.object(formats[format], 'formats[format]');
+ assert.optionalObject(options, 'options');
- return (formats[format].write(this));
+ return (formats[format].write(this, options));
};
PrivateKey.prototype.hash = function (algo) {
@@ -146,10 +148,7 @@ PrivateKey.prototype.createSign = function (hashAlgo) {
var v, nm, err;
try {
- nm = this.type.toUpperCase() + '-';
- if (this.type === 'ecdsa')
- nm = 'ecdsa-with-';
- nm += hashAlgo.toUpperCase();
+ nm = hashAlgo.toUpperCase();
v = crypto.createSign(nm);
} catch (e) {
err = e;
@@ -175,25 +174,33 @@ PrivateKey.prototype.createSign = function (hashAlgo) {
return (v);
};
-PrivateKey.parse = function (data, format, name) {
+PrivateKey.parse = function (data, format, options) {
if (typeof (data) !== 'string')
assert.buffer(data, 'data');
if (format === undefined)
format = 'auto';
assert.string(format, 'format');
- if (name === undefined)
- name = '(unnamed)';
+ if (typeof (options) === 'string')
+ options = { filename: options };
+ assert.optionalObject(options, 'options');
+ if (options === undefined)
+ options = {};
+ assert.optionalString(options.filename, 'options.filename');
+ if (options.filename === undefined)
+ options.filename = '(unnamed)';
assert.object(formats[format], 'formats[format]');
try {
- var k = formats[format].read(data);
+ var k = formats[format].read(data, options);
assert.ok(k instanceof PrivateKey, 'key is not a private key');
if (!k.comment)
- k.comment = name;
+ k.comment = options.filename;
return (k);
} catch (e) {
- throw (new KeyParseError(name, format, e));
+ if (e.name === 'KeyEncryptedError')
+ throw (e);
+ throw (new KeyParseError(options.filename, format, e));
}
};
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js
index ddf4a8c98..964f55cb5 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/signature.js
@@ -65,23 +65,31 @@ Signature.prototype.toBuffer = function (format) {
buf = new SSHBuffer({});
buf.writeString('ssh-dss');
r = this.part.r.data;
- if (r[0] === 0x00)
+ if (r.length > 20 && r[0] === 0x00)
r = r.slice(1);
s = this.part.s.data;
+ if (s.length > 20 && s[0] === 0x00)
+ s = s.slice(1);
+ if ((this.hashAlgorithm &&
+ this.hashAlgorithm !== 'sha1') ||
+ r.length + s.length !== 40) {
+ throw (new Error('OpenSSH only supports ' +
+ 'DSA signatures with SHA1 hash'));
+ }
buf.writeBuffer(Buffer.concat([r, s]));
return (buf.toBuffer());
} else if (format === 'ssh' && this.type === 'ecdsa') {
var inner = new SSHBuffer({});
- r = this.part.r;
- if (r[0] === 0x00)
- r = r.slice(1);
- inner.writePart(r);
+ r = this.part.r.data;
+ inner.writeBuffer(r);
inner.writePart(this.part.s);
buf = new SSHBuffer({});
/* XXX: find a more proper way to do this? */
var curve;
- var sz = this.part.r.data.length * 8;
+ if (r[0] === 0x00)
+ r = r.slice(1);
+ var sz = r.length * 8;
if (sz === 256)
curve = 'nistp256';
else if (sz === 384)
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js
index 0b0027734..8fc2cb878 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/ssh-buffer.js
@@ -73,6 +73,14 @@ SSHBuffer.prototype.readInt = function () {
return (v);
};
+SSHBuffer.prototype.readInt64 = function () {
+ assert.ok(this._offset + 8 < this._buffer.length,
+ 'buffer not long enough to read Int64');
+ var v = this._buffer.slice(this._offset, this._offset + 8);
+ this._offset += 8;
+ return (v);
+};
+
SSHBuffer.prototype.readChar = function () {
var v = this._buffer[this._offset++];
return (v);
@@ -106,6 +114,22 @@ SSHBuffer.prototype.writeInt = function (v) {
this._offset += 4;
};
+SSHBuffer.prototype.writeInt64 = function (v) {
+ assert.buffer(v, 'value');
+ if (v.length > 8) {
+ var lead = v.slice(0, v.length - 8);
+ for (var i = 0; i < lead.length; ++i) {
+ assert.strictEqual(lead[i], 0,
+ 'must fit in 64 bits of precision');
+ }
+ v = v.slice(v.length - 8, v.length);
+ }
+ while (this._offset + 8 > this._size)
+ this.expand();
+ v.copy(this._buffer, this._offset);
+ this._offset += 8;
+};
+
SSHBuffer.prototype.writeChar = function (v) {
while (this._offset + 1 > this._size)
this.expand();
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js
index 34c22d31a..d57245cc1 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/lib/utils.js
@@ -8,11 +8,13 @@ module.exports = {
ecNormalize: ecNormalize,
countZeros: countZeros,
assertCompatible: assertCompatible,
- isCompatible: isCompatible
+ isCompatible: isCompatible,
+ opensslKeyDeriv: opensslKeyDeriv
};
var assert = require('assert-plus');
var PrivateKey = require('./private-key');
+var crypto = require('crypto');
var MAX_CLASS_DEPTH = 3;
@@ -68,6 +70,43 @@ function assertCompatible(obj, klass, needVer, name) {
'version ' + needVer[0] + '.' + needVer[1]);
}
+var CIPHER_LEN = {
+ 'des-ede3-cbc': { key: 7, iv: 8 },
+ 'aes-128-cbc': { key: 16, iv: 16 }
+};
+var PKCS5_SALT_LEN = 8;
+
+function opensslKeyDeriv(cipher, salt, passphrase, count) {
+ assert.buffer(salt, 'salt');
+ assert.buffer(passphrase, 'passphrase');
+ assert.number(count, 'iteration count');
+
+ var clen = CIPHER_LEN[cipher];
+ assert.object(clen, 'supported cipher');
+
+ salt = salt.slice(0, PKCS5_SALT_LEN);
+
+ var D, D_prev, bufs;
+ var material = new Buffer(0);
+ while (material.length < clen.key + clen.iv) {
+ bufs = [];
+ if (D_prev)
+ bufs.push(D_prev);
+ bufs.push(passphrase);
+ bufs.push(salt);
+ D = Buffer.concat(bufs);
+ for (var j = 0; j < count; ++j)
+ D = crypto.createHash('md5').update(D).digest();
+ material = Buffer.concat([material, D]);
+ D_prev = D;
+ }
+
+ return ({
+ key: material.slice(0, clen.key),
+ iv: material.slice(clen.key, clen.key + clen.iv)
+ });
+}
+
/* Count leading zero bits on a buffer */
function countZeros(buf) {
var o = 0, obit = 8;
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json
index 9d3b1f7ec..7e1f2b3ac 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/asn1/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "asn1@>=0.2.3 <0.3.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
+ {
+ "raw": "asn1@~0.2.3",
+ "scope": null,
+ "escapedName": "asn1",
+ "name": "asn1",
+ "rawSpec": "~0.2.3",
+ "spec": ">=0.2.3 <0.3.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
"_from": "asn1@>=0.2.3 <0.3.0",
@@ -11,16 +19,17 @@
"_installable": true,
"_location": "/request/http-signature/sshpk/asn1",
"_npmUser": {
- "email": "patrick.f.mooney@gmail.com",
- "name": "pfmooney"
+ "name": "pfmooney",
+ "email": "patrick.f.mooney@gmail.com"
},
"_npmVersion": "1.4.28",
"_phantomChildren": {},
"_requested": {
- "name": "asn1",
- "raw": "asn1@>=0.2.3 <0.3.0",
- "rawSpec": ">=0.2.3 <0.3.0",
+ "raw": "asn1@~0.2.3",
"scope": null,
+ "escapedName": "asn1",
+ "name": "asn1",
+ "rawSpec": "~0.2.3",
"spec": ">=0.2.3 <0.3.0",
"type": "range"
},
@@ -30,11 +39,11 @@
"_resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
"_shasum": "dac8787713c9966849fc8180777ebe9c1ddf3b86",
"_shrinkwrap": null,
- "_spec": "asn1@>=0.2.3 <0.3.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
+ "_spec": "asn1@~0.2.3",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
- "email": "mcavage@gmail.com",
- "name": "Mark Cavage"
+ "name": "Mark Cavage",
+ "email": "mcavage@gmail.com"
},
"bugs": {
"url": "https://github.com/mcavage/node-asn1/issues"
@@ -61,7 +70,7 @@
"directories": {},
"dist": {
"shasum": "dac8787713c9966849fc8180777ebe9c1ddf3b86",
- "tarball": "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+ "tarball": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
},
"homepage": "https://github.com/mcavage/node-asn1",
"license": "MIT",
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/AUTHORS b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/AUTHORS
index 1923524fe..1923524fe 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/AUTHORS
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/AUTHORS
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/CHANGES.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/CHANGES.md
index 57d92bfdb..57d92bfdb 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/CHANGES.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/CHANGES.md
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/README.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/README.md
index ec200d161..ec200d161 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/README.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/README.md
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/assert.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js
index 26f944eec..26f944eec 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/assert.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/assert.js
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json
index 5e7cfaadf..305af0ddb 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/node_modules/assert-plus/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/assert-plus/package.json
@@ -1,69 +1,80 @@
{
"_args": [
[
- "assert-plus@^1.0.0",
- "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash"
+ {
+ "raw": "assert-plus@^1.0.0",
+ "scope": null,
+ "escapedName": "assert-plus",
+ "name": "assert-plus",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
"_from": "assert-plus@>=1.0.0 <2.0.0",
"_id": "assert-plus@1.0.0",
"_inCache": true,
"_installable": true,
- "_location": "/request/http-signature/sshpk/dashdash/assert-plus",
+ "_location": "/request/http-signature/sshpk/assert-plus",
"_nodeVersion": "0.10.40",
"_npmUser": {
- "email": "patrick.f.mooney@gmail.com",
- "name": "pfmooney"
+ "name": "pfmooney",
+ "email": "patrick.f.mooney@gmail.com"
},
"_npmVersion": "3.3.9",
"_phantomChildren": {},
"_requested": {
- "name": "assert-plus",
"raw": "assert-plus@^1.0.0",
- "rawSpec": "^1.0.0",
"scope": null,
+ "escapedName": "assert-plus",
+ "name": "assert-plus",
+ "rawSpec": "^1.0.0",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
- "/request/http-signature/sshpk/dashdash"
+ "/request/http-signature/sshpk",
+ "/request/http-signature/sshpk/dashdash",
+ "/request/http-signature/sshpk/getpass"
],
"_resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
"_shasum": "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525",
"_shrinkwrap": null,
"_spec": "assert-plus@^1.0.0",
- "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
- "email": "mcavage@gmail.com",
- "name": "Mark Cavage"
+ "name": "Mark Cavage",
+ "email": "mcavage@gmail.com"
},
"bugs": {
"url": "https://github.com/mcavage/node-assert-plus/issues"
},
"contributors": [
{
- "email": "dave@daveeddy.com",
- "name": "Dave Eddy"
+ "name": "Dave Eddy",
+ "email": "dave@daveeddy.com"
},
{
- "email": "fred.kuo@joyent.com",
- "name": "Fred Kuo"
+ "name": "Fred Kuo",
+ "email": "fred.kuo@joyent.com"
},
{
- "email": "ralphtheninja@riseup.net",
- "name": "Lars-Magnus Skog"
+ "name": "Lars-Magnus Skog",
+ "email": "ralphtheninja@riseup.net"
},
{
- "email": "mcavage@gmail.com",
- "name": "Mark Cavage"
+ "name": "Mark Cavage",
+ "email": "mcavage@gmail.com"
},
{
- "email": "pmooney@pfmooney.com",
- "name": "Patrick Mooney"
+ "name": "Patrick Mooney",
+ "email": "pmooney@pfmooney.com"
},
{
- "email": "robert.gulewich@joyent.com",
- "name": "Rob Gulewich"
+ "name": "Rob Gulewich",
+ "email": "robert.gulewich@joyent.com"
}
],
"dependencies": {},
@@ -75,7 +86,7 @@
"directories": {},
"dist": {
"shasum": "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525",
- "tarball": "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+ "tarball": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
},
"engines": {
"node": ">=0.8"
@@ -85,12 +96,12 @@
"main": "./assert.js",
"maintainers": [
{
- "email": "mcavage@gmail.com",
- "name": "mcavage"
+ "name": "mcavage",
+ "email": "mcavage@gmail.com"
},
{
- "email": "patrick.f.mooney@gmail.com",
- "name": "pfmooney"
+ "name": "pfmooney",
+ "email": "patrick.f.mooney@gmail.com"
}
],
"name": "assert-plus",
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js
index 572b00ede..adb6f13b1 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/lib/dashdash.js
@@ -826,7 +826,7 @@ function bashCompletionSpecFromOptions(args) {
var longopts = [];
var optargs = [];
(args.options || []).forEach(function (o) {
- if (o.group) {
+ if (o.group !== undefined && o.group !== null) {
// Skip group headers.
return;
}
@@ -999,12 +999,45 @@ function getOptionType(name) {
}
+/**
+ * Return a synopsis string for the given option spec.
+ *
+ * Examples:
+ * > synopsisFromOpt({names: ['help', 'h'], type: 'bool'});
+ * '[ --help | -h ]'
+ * > synopsisFromOpt({name: 'file', type: 'string', helpArg: 'FILE'});
+ * '[ --file=FILE ]'
+ */
+function synopsisFromOpt(o) {
+ assert.object(o, 'o');
+
+ if (o.hasOwnProperty('group')) {
+ return null;
+ }
+ var names = o.names || [o.name];
+ // `type` here could be undefined if, for example, the command has a
+ // dashdash option spec with a bogus 'type'.
+ var type = getOptionType(o.type);
+ var helpArg = o.helpArg || (type && type.helpArg) || 'ARG';
+ var parts = [];
+ names.forEach(function (name) {
+ var part = (name.length === 1 ? '-' : '--') + name;
+ if (type && type.takesArg) {
+ part += (name.length === 1 ? ' ' + helpArg : '=' + helpArg);
+ }
+ parts.push(part);
+ });
+ return ('[ ' + parts.join(' | ') + ' ]');
+};
+
+
module.exports = {
createParser: createParser,
Parser: Parser,
parse: parse,
addOptionType: addOptionType,
getOptionType: getOptionType,
+ synopsisFromOpt: synopsisFromOpt,
// Bash completion-related exports
BASH_COMPLETION_TEMPLATE_PATH: BASH_COMPLETION_TEMPLATE_PATH,
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/package.json
index 81f871030..03c284dec 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/package.json
@@ -1,44 +1,53 @@
{
"_args": [
[
- "dashdash@>=1.10.1 <2.0.0",
+ {
+ "raw": "dashdash@^1.12.0",
+ "scope": null,
+ "escapedName": "dashdash",
+ "name": "dashdash",
+ "rawSpec": "^1.12.0",
+ "spec": ">=1.12.0 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
- "_from": "dashdash@>=1.10.1 <2.0.0",
- "_id": "dashdash@1.13.0",
+ "_from": "dashdash@>=1.12.0 <2.0.0",
+ "_id": "dashdash@1.14.0",
"_inCache": true,
"_installable": true,
"_location": "/request/http-signature/sshpk/dashdash",
"_npmOperationalInternal": {
- "host": "packages-5-east.internal.npmjs.com",
- "tmp": "tmp/dashdash-1.13.0.tgz_1455248887432_0.5643249636050314"
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/dashdash-1.14.0.tgz_1464847169030_0.07120498712174594"
},
"_npmUser": {
- "email": "trentm@gmail.com",
- "name": "trentm"
+ "name": "trentm",
+ "email": "trentm@gmail.com"
},
"_npmVersion": "1.4.29",
"_phantomChildren": {},
"_requested": {
- "name": "dashdash",
- "raw": "dashdash@>=1.10.1 <2.0.0",
- "rawSpec": ">=1.10.1 <2.0.0",
+ "raw": "dashdash@^1.12.0",
"scope": null,
- "spec": ">=1.10.1 <2.0.0",
+ "escapedName": "dashdash",
+ "name": "dashdash",
+ "rawSpec": "^1.12.0",
+ "spec": ">=1.12.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/request/http-signature/sshpk"
],
- "_resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz",
- "_shasum": "a5aae6fd9d8e156624eb0dd9259eb12ba245385a",
+ "_resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
+ "_shasum": "29e486c5418bf0f356034a993d51686a33e84141",
"_shrinkwrap": null,
- "_spec": "dashdash@>=1.10.1 <2.0.0",
+ "_spec": "dashdash@^1.12.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
- "email": "trentm@gmail.com",
"name": "Trent Mick",
+ "email": "trentm@gmail.com",
"url": "http://trentm.com"
},
"bugs": {
@@ -46,8 +55,8 @@
},
"contributors": [
{
- "email": "trentm@gmail.com",
"name": "Trent Mick",
+ "email": "trentm@gmail.com",
"url": "http://trentm.com"
},
{
@@ -76,13 +85,13 @@
},
"directories": {},
"dist": {
- "shasum": "a5aae6fd9d8e156624eb0dd9259eb12ba245385a",
- "tarball": "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz"
+ "shasum": "29e486c5418bf0f356034a993d51686a33e84141",
+ "tarball": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"
},
"engines": {
"node": ">=0.10"
},
- "gitHead": "69425c9d9000d72c95e78ca43e3f84675f8f73ff",
+ "gitHead": "2f70d248a509418e4473922ee034faf9cd91b3f8",
"homepage": "https://github.com/trentm/node-dashdash",
"keywords": [
"option",
@@ -98,8 +107,8 @@
"main": "./lib/dashdash.js",
"maintainers": [
{
- "email": "trentm@gmail.com",
- "name": "trentm"
+ "name": "trentm",
+ "email": "trentm@gmail.com"
}
],
"name": "dashdash",
@@ -112,5 +121,5 @@
"scripts": {
"test": "nodeunit test/*.test.js"
},
- "version": "1.13.0"
+ "version": "1.14.0"
}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/ecc-jsbn/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/ecc-jsbn/package.json
index ec581d9a9..205419795 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/ecc-jsbn/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/ecc-jsbn/package.json
@@ -1,28 +1,37 @@
{
"_args": [
[
- "ecc-jsbn@>=0.0.1 <1.0.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
+ {
+ "raw": "ecc-jsbn@~0.1.1",
+ "scope": null,
+ "escapedName": "ecc-jsbn",
+ "name": "ecc-jsbn",
+ "rawSpec": "~0.1.1",
+ "spec": ">=0.1.1 <0.2.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
- "_from": "ecc-jsbn@>=0.0.1 <1.0.0",
+ "_from": "ecc-jsbn@>=0.1.1 <0.2.0",
"_id": "ecc-jsbn@0.1.1",
"_inCache": true,
"_installable": true,
"_location": "/request/http-signature/sshpk/ecc-jsbn",
"_nodeVersion": "0.12.6",
"_npmUser": {
- "email": "jeremie@jabber.org",
- "name": "quartzjer"
+ "name": "quartzjer",
+ "email": "jeremie@jabber.org"
},
"_npmVersion": "2.11.2",
"_phantomChildren": {},
"_requested": {
- "name": "ecc-jsbn",
- "raw": "ecc-jsbn@>=0.0.1 <1.0.0",
- "rawSpec": ">=0.0.1 <1.0.0",
+ "raw": "ecc-jsbn@~0.1.1",
"scope": null,
- "spec": ">=0.0.1 <1.0.0",
+ "escapedName": "ecc-jsbn",
+ "name": "ecc-jsbn",
+ "rawSpec": "~0.1.1",
+ "spec": ">=0.1.1 <0.2.0",
"type": "range"
},
"_requiredBy": [
@@ -31,11 +40,11 @@
"_resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
"_shasum": "0fc73a9ed5f0d53c38193398523ef7e543777505",
"_shrinkwrap": null,
- "_spec": "ecc-jsbn@>=0.0.1 <1.0.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
+ "_spec": "ecc-jsbn@~0.1.1",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
- "email": "jeremie@jabber.org",
"name": "Jeremie Miller",
+ "email": "jeremie@jabber.org",
"url": "http://jeremie.com/"
},
"bugs": {
@@ -49,14 +58,14 @@
"directories": {},
"dist": {
"shasum": "0fc73a9ed5f0d53c38193398523ef7e543777505",
- "tarball": "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+ "tarball": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
},
"gitHead": "d35a360352496721030da645e8054f07efc22487",
"homepage": "https://github.com/quartzjer/ecc-jsbn",
"keywords": [
- "browserify",
+ "jsbn",
"ecc",
- "jsbn"
+ "browserify"
],
"license": "MIT",
"main": "index.js",
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.npmignore b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.npmignore
new file mode 100644
index 000000000..a4261fc06
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.npmignore
@@ -0,0 +1,8 @@
+.gitmodules
+deps
+docs
+Makefile
+node_modules
+test
+tools
+coverage
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.travis.yml b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.travis.yml
new file mode 100644
index 000000000..d8b5833a7
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/.travis.yml
@@ -0,0 +1,9 @@
+language: node_js
+node_js:
+ - "5.10"
+ - "4.4"
+ - "4.1"
+ - "0.12"
+ - "0.10"
+before_install:
+ - "make check"
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/LICENSE b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/LICENSE
new file mode 100644
index 000000000..f6d947d2f
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/LICENSE
@@ -0,0 +1,18 @@
+Copyright Joyent, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 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/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/README.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/README.md
new file mode 100644
index 000000000..6e4a50f63
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/README.md
@@ -0,0 +1,32 @@
+## getpass
+
+Get a password from the terminal. Sounds simple? Sounds like the `readline`
+module should be able to do it? NOPE.
+
+## Install and use it
+
+```bash
+npm install --save getpass
+```
+
+```javascript
+const mod_getpass = require('getpass');
+```
+
+## API
+
+### `mod_getpass.getPass([options, ]callback)`
+
+Gets a password from the terminal. If available, this uses `/dev/tty` to avoid
+interfering with any data being piped in or out of stdio.
+
+This function prints a prompt (by default `Password:`) and then accepts input
+without echoing.
+
+Parameters:
+
+ * `options`, an Object, with properties:
+ * `prompt`, an optional String
+ * `callback`, a `Func(error, password)`, with arguments:
+ * `error`, either `null` (no error) or an `Error` instance
+ * `password`, a String
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/lib/index.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/lib/index.js
new file mode 100644
index 000000000..55a7718c0
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/lib/index.js
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016, Joyent, Inc. All rights reserved.
+ * Author: Alex Wilson <alex.wilson@joyent.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 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.
+*/
+
+module.exports = {
+ getPass: getPass
+};
+
+const mod_tty = require('tty');
+const mod_fs = require('fs');
+const mod_assert = require('assert-plus');
+
+var BACKSPACE = String.fromCharCode(127);
+var CTRLC = '\u0003';
+var CTRLD = '\u0004';
+
+function getPass(opts, cb) {
+ if (typeof (opts) === 'function' && cb === undefined) {
+ cb = opts;
+ opts = {};
+ }
+ mod_assert.object(opts, 'options');
+ mod_assert.func(cb, 'callback');
+
+ mod_assert.optionalString(opts.prompt, 'options.prompt');
+ if (opts.prompt === undefined)
+ opts.prompt = 'Password';
+
+ openTTY(function (err, rfd, wfd, rtty, wtty) {
+ if (err) {
+ cb(err);
+ return;
+ }
+
+ wtty.write(opts.prompt + ':');
+ rtty.resume();
+ rtty.setRawMode(true);
+ rtty.resume();
+ rtty.setEncoding('utf8');
+
+ var pw = '';
+ rtty.on('data', onData);
+
+ function onData(data) {
+ var str = data.toString('utf8');
+ for (var i = 0; i < str.length; ++i) {
+ var ch = str[i];
+ switch (ch) {
+ case '\r':
+ case '\n':
+ case CTRLD:
+ cleanup();
+ cb(null, pw);
+ return;
+ case CTRLC:
+ cleanup();
+ cb(new Error('Aborted'));
+ return;
+ case BACKSPACE:
+ pw = pw.slice(0, pw.length - 1);
+ break;
+ default:
+ pw += ch;
+ break;
+ }
+ }
+ }
+
+ function cleanup() {
+ wtty.write('\r\n');
+ rtty.setRawMode(false);
+ rtty.pause();
+ rtty.removeListener('data', onData);
+ if (wfd !== undefined && wfd !== rfd) {
+ wtty.end();
+ mod_fs.closeSync(wfd);
+ }
+ if (rfd !== undefined) {
+ rtty.end();
+ mod_fs.closeSync(rfd);
+ }
+ }
+ });
+}
+
+function openTTY(cb) {
+ mod_fs.open('/dev/tty', 'r+', function (err, rttyfd) {
+ if ((err && (err.code === 'ENOENT' || err.code === 'EACCES')) ||
+ (process.version.match(/^v0[.][0-8][.]/))) {
+ cb(null, undefined, undefined, process.stdin,
+ process.stdout);
+ return;
+ }
+ var rtty = new mod_tty.ReadStream(rttyfd);
+ mod_fs.open('/dev/tty', 'w+', function (err3, wttyfd) {
+ var wtty = new mod_tty.WriteStream(wttyfd);
+ if (err3) {
+ cb(err3);
+ return;
+ }
+ cb(null, rttyfd, wttyfd, rtty, wtty);
+ });
+ });
+}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/package.json
new file mode 100644
index 000000000..bb44e44af
--- /dev/null
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/getpass/package.json
@@ -0,0 +1,91 @@
+{
+ "_args": [
+ [
+ {
+ "raw": "getpass@^0.1.1",
+ "scope": null,
+ "escapedName": "getpass",
+ "name": "getpass",
+ "rawSpec": "^0.1.1",
+ "spec": ">=0.1.1 <0.2.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
+ ]
+ ],
+ "_from": "getpass@>=0.1.1 <0.2.0",
+ "_id": "getpass@0.1.6",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/http-signature/sshpk/getpass",
+ "_nodeVersion": "0.12.9",
+ "_npmOperationalInternal": {
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/getpass-0.1.6.tgz_1461907090215_0.6450737570412457"
+ },
+ "_npmUser": {
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
+ },
+ "_npmVersion": "2.14.9",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "getpass@^0.1.1",
+ "scope": null,
+ "escapedName": "getpass",
+ "name": "getpass",
+ "rawSpec": "^0.1.1",
+ "spec": ">=0.1.1 <0.2.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request/http-signature/sshpk"
+ ],
+ "_resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+ "_shasum": "283ffd9fc1256840875311c1b60e8c40187110e6",
+ "_shrinkwrap": null,
+ "_spec": "getpass@^0.1.1",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
+ "author": {
+ "name": "Alex Wilson",
+ "email": "alex.wilson@joyent.com"
+ },
+ "bugs": {
+ "url": "https://github.com/arekinath/node-getpass/issues"
+ },
+ "dependencies": {
+ "assert-plus": "^1.0.0"
+ },
+ "description": "getpass for node.js",
+ "devDependencies": {
+ "json": "^9.0.3",
+ "pty.js": "^0.3.0",
+ "tape": "^4.4.0"
+ },
+ "directories": {},
+ "dist": {
+ "shasum": "283ffd9fc1256840875311c1b60e8c40187110e6",
+ "tarball": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"
+ },
+ "gitHead": "e7fdf43ad60aa520f894d41856852aa320f36646",
+ "homepage": "https://github.com/arekinath/node-getpass#readme",
+ "license": "MIT",
+ "main": "lib/index.js",
+ "maintainers": [
+ {
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
+ }
+ ],
+ "name": "getpass",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/arekinath/node-getpass.git"
+ },
+ "scripts": {
+ "test": "tape test/*.test.js"
+ },
+ "version": "0.1.6"
+}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jodid25519/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jodid25519/package.json
index 3bc9f501c..12f5e8155 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jodid25519/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jodid25519/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "jodid25519@>=1.0.0 <2.0.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
+ {
+ "raw": "jodid25519@^1.0.0",
+ "scope": null,
+ "escapedName": "jodid25519",
+ "name": "jodid25519",
+ "rawSpec": "^1.0.0",
+ "spec": ">=1.0.0 <2.0.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
"_from": "jodid25519@>=1.0.0 <2.0.0",
@@ -12,16 +20,17 @@
"_location": "/request/http-signature/sshpk/jodid25519",
"_nodeVersion": "4.1.1",
"_npmUser": {
- "email": "alex@cooperi.net",
- "name": "arekinath"
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
},
"_npmVersion": "2.14.4",
"_phantomChildren": {},
"_requested": {
- "name": "jodid25519",
- "raw": "jodid25519@>=1.0.0 <2.0.0",
- "rawSpec": ">=1.0.0 <2.0.0",
+ "raw": "jodid25519@^1.0.0",
"scope": null,
+ "escapedName": "jodid25519",
+ "name": "jodid25519",
+ "rawSpec": "^1.0.0",
"spec": ">=1.0.0 <2.0.0",
"type": "range"
},
@@ -31,8 +40,8 @@
"_resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz",
"_shasum": "06d4912255093419477d425633606e0e90782967",
"_shrinkwrap": null,
- "_spec": "jodid25519@>=1.0.0 <2.0.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
+ "_spec": "jodid25519@^1.0.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
"name": "Michele Bini, Ron Garret, Guy K. Kloss"
},
@@ -55,22 +64,22 @@
"sinon-chai": "^2.8.0"
},
"directories": {
- "doc": "doc",
"src": "src",
- "test": "test"
+ "test": "test",
+ "doc": "doc"
},
"dist": {
"shasum": "06d4912255093419477d425633606e0e90782967",
- "tarball": "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+ "tarball": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
},
"gitHead": "a83b9fcf7fd3be4f27cd4a57817aff171c7cd918",
"homepage": "https://github.com/meganz/jodid25519",
"keywords": [
"Curve25519",
- "ECDH",
- "ECDSA",
"Ed25519",
+ "ECDH",
"EdDSA",
+ "ECDSA",
"encryption",
"signing"
],
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jsbn/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jsbn/package.json
index 838d035ff..30d10169d 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jsbn/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/jsbn/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "jsbn@>=0.1.0 <0.2.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
+ {
+ "raw": "jsbn@~0.1.0",
+ "scope": null,
+ "escapedName": "jsbn",
+ "name": "jsbn",
+ "rawSpec": "~0.1.0",
+ "spec": ">=0.1.0 <0.2.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
"_from": "jsbn@>=0.1.0 <0.2.0",
@@ -12,16 +20,17 @@
"_location": "/request/http-signature/sshpk/jsbn",
"_nodeVersion": "0.12.2",
"_npmUser": {
- "email": "andyperlitch@gmail.com",
- "name": "andyperlitch"
+ "name": "andyperlitch",
+ "email": "andyperlitch@gmail.com"
},
"_npmVersion": "2.7.4",
"_phantomChildren": {},
"_requested": {
- "name": "jsbn",
- "raw": "jsbn@>=0.1.0 <0.2.0",
- "rawSpec": ">=0.1.0 <0.2.0",
+ "raw": "jsbn@~0.1.0",
"scope": null,
+ "escapedName": "jsbn",
+ "name": "jsbn",
+ "rawSpec": "~0.1.0",
"spec": ">=0.1.0 <0.2.0",
"type": "range"
},
@@ -33,8 +42,8 @@
"_resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz",
"_shasum": "650987da0dd74f4ebf5a11377a2aa2d273e97dfd",
"_shrinkwrap": null,
- "_spec": "jsbn@>=0.1.0 <0.2.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
+ "_spec": "jsbn@~0.1.0",
+ "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
"name": "Tom Wu"
},
@@ -47,14 +56,14 @@
"directories": {},
"dist": {
"shasum": "650987da0dd74f4ebf5a11377a2aa2d273e97dfd",
- "tarball": "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+ "tarball": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
},
"gitHead": "148a967b112806e63ddeeed78ee7938eef74c84a",
"homepage": "https://github.com/andyperlitch/jsbn",
"keywords": [
- "big",
"biginteger",
"bignumber",
+ "big",
"integer"
],
"license": "BSD",
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/CHANGELOG.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/CHANGELOG.md
index 9debcb42f..77c69bd5e 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/CHANGELOG.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/CHANGELOG.md
@@ -2,59 +2,6 @@ TweetNaCl.js Changelog
======================
-v0.14.1
--------
-
-No code changes, just tweaked packaging and added COPYING.txt.
-
-
-v0.14.0
--------
-
-* **Breaking change!** All functions from `nacl.util` have been removed. These
- functions are no longer available:
-
- nacl.util.decodeUTF8
- nacl.util.encodeUTF8
- nacl.util.decodeBase64
- nacl.util.encodeBase64
-
- If want to continue using them, you can include
- <https://github.com/dchest/tweetnacl-util-js> package:
-
- <script src="nacl.min.js"></script>
- <script src="nacl-util.min.js"></script>
-
- or
-
- var nacl = require('tweetnacl');
- nacl.util = require('tweetnacl-util');
-
- However it is recommended to use better packages that have wider
- compatibility and better performance. Functions from `nacl.util` were never
- intended to be robust solution for string conversion and were included for
- convenience: cryptography library is not the right place for them.
-
- Currently calling these functions will throw error pointing to
- `tweetnacl-util-js` (in the next version this error message will be removed).
-
-* Improved detection of available random number generators, making it possible
- to use `nacl.randomBytes` and related functions in Web Workers without
- changes.
-
-* Changes to testing (see README).
-
-
-v0.13.3
--------
-
-No code changes.
-
-* Reverted license field in package.json to "Public domain".
-
-* Fixed typo in README.
-
-
v0.13.2
-------
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
deleted file mode 100644
index c2bd1e5b7..000000000
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/COPYING.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Public Domain
-
-The person who associated a work with this deed has dedicated the work to the
-public domain by waiving all of his or her rights to the work worldwide under
-copyright law, including all related and neighboring rights, to the extent
-allowed by law.
-
-You can copy, modify, distribute and perform the work, even for commercial
-purposes, all without asking permission.
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/README.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/README.md
index c80bbed8d..11bd3472c 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/README.md
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/README.md
@@ -7,7 +7,7 @@ to JavaScript for modern browsers and Node.js. Public domain.
[![Build Status](https://travis-ci.org/dchest/tweetnacl-js.svg?branch=master)
](https://travis-ci.org/dchest/tweetnacl-js)
-Demo: <https://tweetnacl.js.org>
+[Demo](https://dchest.github.io/tweetnacl-js/)
**:warning: Beta version. The library is stable and API is frozen, however
it has not been independently reviewed. If you can help reviewing it, please
@@ -26,6 +26,8 @@ Documentation
* [Hashing](#hashing)
* [Random bytes generation](#random-bytes-generation)
* [Constant-time comparison](#constant-time-comparison)
+ * [Utilities](#utilities)
+* [Examples](#examples)
* [System requirements](#system-requirements)
* [Development and testing](#development-and-testing)
* [Contributors](#contributors)
@@ -65,20 +67,10 @@ or [download source code](https://github.com/dchest/tweetnacl-js/releases).
Usage
------
+------
All API functions accept and return bytes as `Uint8Array`s. If you need to
-encode or decode strings, use functions from
-<https://github.com/dchest/tweetnacl-util-js> or one of the more robust codec
-packages.
-
-In Node.js v4 and later `Buffer` objects are backed by `Uint8Array`s, so you
-can freely pass them to TweetNaCl.js functions as arguments. The returned
-objects are still `Uint8Array`s, so if you need `Buffer`s, you'll have to
-convert them manually; make sure to convert using copying: `new Buffer(array)`,
-instead of sharing: `new Buffer(array.buffer)`, because some functions return
-subarrays of their buffers.
-
+encode or decode strings, use functions from `nacl.util` namespace.
### Public-key authenticated encryption (box)
@@ -295,6 +287,12 @@ depending on the platform it runs on:
* `window.msCrypto.getRandomValues` (Internet Explorer 11)
* `crypto.randomBytes` (Node.js)
+Note that browsers are required to throw `QuotaExceededError` exception if
+requested `length` is more than 65536, so do not ask for more than 65536 bytes
+in *one call* (multiple calls to get as many bytes as you like are okay:
+browsers can generate infinite amount of random bytes without any bad
+consequences).
+
If the platform doesn't provide a suitable PRNG, the following functions,
which require random numbers, will throw exception:
@@ -328,6 +326,30 @@ Returns `false` if either of the arguments has zero length, or arguments have
different lengths, or their contents differ.
+### Utilities
+
+Encoding/decoding functions are provided for convenience. They are correct,
+however their performance and wide compatibility with uncommon runtimes is not
+something that is considered important compared to the simplicity and size of
+implementation. You can use third-party libraries if you need to.
+
+#### nacl.util.decodeUTF8(string)
+
+Decodes string and returns `Uint8Array` of bytes.
+
+#### nacl.util.encodeUTF8(array)
+
+Encodes `Uint8Array` or `Array` of bytes into string.
+
+#### nacl.util.decodeBase64(string)
+
+Decodes Base-64 encoded string and returns `Uint8Array` of bytes.
+
+#### nacl.util.encodeBase64(array)
+
+Encodes `Uint8Array` or `Array` of bytes into string using Base-64 encoding.
+
+
System requirements
-------------------
@@ -342,7 +364,7 @@ of:
Other systems:
-* Node.js
+* Node.js (we test on 0.10 and later)
Development and testing
@@ -363,36 +385,32 @@ Tests use minified version, so make sure to rebuild it every time you change
To run tests in Node.js:
- $ npm run test-node
+ $ npm test
By default all tests described here work on `nacl.min.js`. To test other
versions, set environment variable `NACL_SRC` to the file name you want to test.
For example, the following command will test fast minified version:
- $ NACL_SRC=nacl-fast.min.js npm run test-node
+ $ NACL_SRC=nacl-fast.min.js npm test
To run full suite of tests in Node.js, including comparing outputs of
JavaScript port to outputs of the original C version:
- $ npm run test-node-all
+ $ npm run testall
To prepare tests for browsers:
- $ npm run build-test-browser
+ $ npm run browser
and then open `test/browser/test.html` (or `test/browser/test-fast.html`) to
run them.
-To run headless browser tests with `tape-run` (powered by Electron):
+To run headless browser tests with `testling`:
- $ npm run test-browser
+ $ npm run testling
(If you get `Error: spawn ENOENT`, install *xvfb*: `sudo apt-get install xvfb`.)
-To run tests in both Node and Electron:
-
- $ npm test
-
### Benchmarking
To run benchmarks in Node.js:
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js
index 5e4562fe8..6c4995848 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.js
@@ -745,7 +745,7 @@ poly1305.prototype.finish = function(mac, macpos) {
}
g[9] -= (1 << 13);
- mask = (c ^ 1) - 1;
+ mask = (g[9] >>> ((2 * 8) - 1)) - 1;
for (i = 0; i < 10; i++) g[i] &= mask;
mask = ~mask;
for (i = 0; i < 10; i++) this.h[i] = (this.h[i] & mask) | g[i];
@@ -2157,13 +2157,39 @@ function cleanup(arr) {
for (var i = 0; i < arr.length; i++) arr[i] = 0;
}
-// TODO: Completely remove this in v0.15.
-if (!nacl.util) {
- nacl.util = {};
- nacl.util.decodeUTF8 = nacl.util.encodeUTF8 = nacl.util.encodeBase64 = nacl.util.decodeBase64 = function() {
- throw new Error('nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js');
- };
-}
+nacl.util = {};
+
+nacl.util.decodeUTF8 = function(s) {
+ var i, d = unescape(encodeURIComponent(s)), b = new Uint8Array(d.length);
+ for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+ return b;
+};
+
+nacl.util.encodeUTF8 = function(arr) {
+ var i, s = [];
+ for (i = 0; i < arr.length; i++) s.push(String.fromCharCode(arr[i]));
+ return decodeURIComponent(escape(s.join('')));
+};
+
+nacl.util.encodeBase64 = function(arr) {
+ if (typeof btoa === 'undefined') {
+ return (new Buffer(arr)).toString('base64');
+ } else {
+ var i, s = [], len = arr.length;
+ for (i = 0; i < len; i++) s.push(String.fromCharCode(arr[i]));
+ return btoa(s.join(''));
+ }
+};
+
+nacl.util.decodeBase64 = function(s) {
+ if (typeof atob === 'undefined') {
+ return new Uint8Array(Array.prototype.slice.call(new Buffer(s, 'base64'), 0));
+ } else {
+ var i, d = atob(s), b = new Uint8Array(d.length);
+ for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+ return b;
+ }
+};
nacl.randomBytes = function(n) {
var b = new Uint8Array(n);
@@ -2360,22 +2386,26 @@ nacl.setPRNG = function(fn) {
(function() {
// Initialize PRNG if environment provides CSPRNG.
// If not, methods calling randombytes will throw.
- var crypto = typeof self !== 'undefined' ? (self.crypto || self.msCrypto) : null;
- if (crypto && crypto.getRandomValues) {
- // Browsers.
- var QUOTA = 65536;
- nacl.setPRNG(function(x, n) {
- var i, v = new Uint8Array(n);
- for (i = 0; i < n; i += QUOTA) {
- crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
- }
- for (i = 0; i < n; i++) x[i] = v[i];
- cleanup(v);
- });
+ var crypto;
+ if (typeof window !== 'undefined') {
+ // Browser.
+ if (window.crypto && window.crypto.getRandomValues) {
+ crypto = window.crypto; // Standard
+ } else if (window.msCrypto && window.msCrypto.getRandomValues) {
+ crypto = window.msCrypto; // Internet Explorer 11+
+ }
+ if (crypto) {
+ nacl.setPRNG(function(x, n) {
+ var i, v = new Uint8Array(n);
+ crypto.getRandomValues(v);
+ for (i = 0; i < n; i++) x[i] = v[i];
+ cleanup(v);
+ });
+ }
} else if (typeof require !== 'undefined') {
// Node.js.
crypto = require('crypto');
- if (crypto && crypto.randomBytes) {
+ if (crypto) {
nacl.setPRNG(function(x, n) {
var i, v = crypto.randomBytes(n);
for (i = 0; i < n; i++) x[i] = v[i];
@@ -2385,4 +2415,4 @@ nacl.setPRNG = function(fn) {
}
})();
-})(typeof module !== 'undefined' && module.exports ? module.exports : (self.nacl = self.nacl || {}));
+})(typeof module !== 'undefined' && module.exports ? module.exports : (window.nacl = window.nacl || {}));
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js
index 624fbbe91..7072c2af4 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl-fast.min.js
@@ -1,2 +1,2 @@
-!function(r){"use strict";function t(r,t,n,e){r[t]=n>>24&255,r[t+1]=n>>16&255,r[t+2]=n>>8&255,r[t+3]=255&n,r[t+4]=e>>24&255,r[t+5]=e>>16&255,r[t+6]=e>>8&255,r[t+7]=255&e}function n(r,t,n,e,o){var i,h=0;for(i=0;o>i;i++)h|=r[t+i]^n[e+i];return(1&h-1>>>8)-1}function e(r,t,e,o){return n(r,t,e,o,16)}function o(r,t,e,o){return n(r,t,e,o,32)}function i(r,t,n,e){for(var o,i=255&e[0]|(255&e[1])<<8|(255&e[2])<<16|(255&e[3])<<24,h=255&n[0]|(255&n[1])<<8|(255&n[2])<<16|(255&n[3])<<24,a=255&n[4]|(255&n[5])<<8|(255&n[6])<<16|(255&n[7])<<24,f=255&n[8]|(255&n[9])<<8|(255&n[10])<<16|(255&n[11])<<24,s=255&n[12]|(255&n[13])<<8|(255&n[14])<<16|(255&n[15])<<24,u=255&e[4]|(255&e[5])<<8|(255&e[6])<<16|(255&e[7])<<24,c=255&t[0]|(255&t[1])<<8|(255&t[2])<<16|(255&t[3])<<24,y=255&t[4]|(255&t[5])<<8|(255&t[6])<<16|(255&t[7])<<24,l=255&t[8]|(255&t[9])<<8|(255&t[10])<<16|(255&t[11])<<24,w=255&t[12]|(255&t[13])<<8|(255&t[14])<<16|(255&t[15])<<24,p=255&e[8]|(255&e[9])<<8|(255&e[10])<<16|(255&e[11])<<24,v=255&n[16]|(255&n[17])<<8|(255&n[18])<<16|(255&n[19])<<24,b=255&n[20]|(255&n[21])<<8|(255&n[22])<<16|(255&n[23])<<24,g=255&n[24]|(255&n[25])<<8|(255&n[26])<<16|(255&n[27])<<24,_=255&n[28]|(255&n[29])<<8|(255&n[30])<<16|(255&n[31])<<24,A=255&e[12]|(255&e[13])<<8|(255&e[14])<<16|(255&e[15])<<24,d=i,U=h,E=a,x=f,M=s,m=u,B=c,S=y,K=l,T=w,Y=p,k=v,L=b,z=g,R=_,P=A,O=0;20>O;O+=2)o=d+L|0,M^=o<<7|o>>>25,o=M+d|0,K^=o<<9|o>>>23,o=K+M|0,L^=o<<13|o>>>19,o=L+K|0,d^=o<<18|o>>>14,o=m+U|0,T^=o<<7|o>>>25,o=T+m|0,z^=o<<9|o>>>23,o=z+T|0,U^=o<<13|o>>>19,o=U+z|0,m^=o<<18|o>>>14,o=Y+B|0,R^=o<<7|o>>>25,o=R+Y|0,E^=o<<9|o>>>23,o=E+R|0,B^=o<<13|o>>>19,o=B+E|0,Y^=o<<18|o>>>14,o=P+k|0,x^=o<<7|o>>>25,o=x+P|0,S^=o<<9|o>>>23,o=S+x|0,k^=o<<13|o>>>19,o=k+S|0,P^=o<<18|o>>>14,o=d+x|0,U^=o<<7|o>>>25,o=U+d|0,E^=o<<9|o>>>23,o=E+U|0,x^=o<<13|o>>>19,o=x+E|0,d^=o<<18|o>>>14,o=m+M|0,B^=o<<7|o>>>25,o=B+m|0,S^=o<<9|o>>>23,o=S+B|0,M^=o<<13|o>>>19,o=M+S|0,m^=o<<18|o>>>14,o=Y+T|0,k^=o<<7|o>>>25,o=k+Y|0,K^=o<<9|o>>>23,o=K+k|0,T^=o<<13|o>>>19,o=T+K|0,Y^=o<<18|o>>>14,o=P+R|0,L^=o<<7|o>>>25,o=L+P|0,z^=o<<9|o>>>23,o=z+L|0,R^=o<<13|o>>>19,o=R+z|0,P^=o<<18|o>>>14;d=d+i|0,U=U+h|0,E=E+a|0,x=x+f|0,M=M+s|0,m=m+u|0,B=B+c|0,S=S+y|0,K=K+l|0,T=T+w|0,Y=Y+p|0,k=k+v|0,L=L+b|0,z=z+g|0,R=R+_|0,P=P+A|0,r[0]=d>>>0&255,r[1]=d>>>8&255,r[2]=d>>>16&255,r[3]=d>>>24&255,r[4]=U>>>0&255,r[5]=U>>>8&255,r[6]=U>>>16&255,r[7]=U>>>24&255,r[8]=E>>>0&255,r[9]=E>>>8&255,r[10]=E>>>16&255,r[11]=E>>>24&255,r[12]=x>>>0&255,r[13]=x>>>8&255,r[14]=x>>>16&255,r[15]=x>>>24&255,r[16]=M>>>0&255,r[17]=M>>>8&255,r[18]=M>>>16&255,r[19]=M>>>24&255,r[20]=m>>>0&255,r[21]=m>>>8&255,r[22]=m>>>16&255,r[23]=m>>>24&255,r[24]=B>>>0&255,r[25]=B>>>8&255,r[26]=B>>>16&255,r[27]=B>>>24&255,r[28]=S>>>0&255,r[29]=S>>>8&255,r[30]=S>>>16&255,r[31]=S>>>24&255,r[32]=K>>>0&255,r[33]=K>>>8&255,r[34]=K>>>16&255,r[35]=K>>>24&255,r[36]=T>>>0&255,r[37]=T>>>8&255,r[38]=T>>>16&255,r[39]=T>>>24&255,r[40]=Y>>>0&255,r[41]=Y>>>8&255,r[42]=Y>>>16&255,r[43]=Y>>>24&255,r[44]=k>>>0&255,r[45]=k>>>8&255,r[46]=k>>>16&255,r[47]=k>>>24&255,r[48]=L>>>0&255,r[49]=L>>>8&255,r[50]=L>>>16&255,r[51]=L>>>24&255,r[52]=z>>>0&255,r[53]=z>>>8&255,r[54]=z>>>16&255,r[55]=z>>>24&255,r[56]=R>>>0&255,r[57]=R>>>8&255,r[58]=R>>>16&255,r[59]=R>>>24&255,r[60]=P>>>0&255,r[61]=P>>>8&255,r[62]=P>>>16&255,r[63]=P>>>24&255}function h(r,t,n,e){for(var o,i=255&e[0]|(255&e[1])<<8|(255&e[2])<<16|(255&e[3])<<24,h=255&n[0]|(255&n[1])<<8|(255&n[2])<<16|(255&n[3])<<24,a=255&n[4]|(255&n[5])<<8|(255&n[6])<<16|(255&n[7])<<24,f=255&n[8]|(255&n[9])<<8|(255&n[10])<<16|(255&n[11])<<24,s=255&n[12]|(255&n[13])<<8|(255&n[14])<<16|(255&n[15])<<24,u=255&e[4]|(255&e[5])<<8|(255&e[6])<<16|(255&e[7])<<24,c=255&t[0]|(255&t[1])<<8|(255&t[2])<<16|(255&t[3])<<24,y=255&t[4]|(255&t[5])<<8|(255&t[6])<<16|(255&t[7])<<24,l=255&t[8]|(255&t[9])<<8|(255&t[10])<<16|(255&t[11])<<24,w=255&t[12]|(255&t[13])<<8|(255&t[14])<<16|(255&t[15])<<24,p=255&e[8]|(255&e[9])<<8|(255&e[10])<<16|(255&e[11])<<24,v=255&n[16]|(255&n[17])<<8|(255&n[18])<<16|(255&n[19])<<24,b=255&n[20]|(255&n[21])<<8|(255&n[22])<<16|(255&n[23])<<24,g=255&n[24]|(255&n[25])<<8|(255&n[26])<<16|(255&n[27])<<24,_=255&n[28]|(255&n[29])<<8|(255&n[30])<<16|(255&n[31])<<24,A=255&e[12]|(255&e[13])<<8|(255&e[14])<<16|(255&e[15])<<24,d=i,U=h,E=a,x=f,M=s,m=u,B=c,S=y,K=l,T=w,Y=p,k=v,L=b,z=g,R=_,P=A,O=0;20>O;O+=2)o=d+L|0,M^=o<<7|o>>>25,o=M+d|0,K^=o<<9|o>>>23,o=K+M|0,L^=o<<13|o>>>19,o=L+K|0,d^=o<<18|o>>>14,o=m+U|0,T^=o<<7|o>>>25,o=T+m|0,z^=o<<9|o>>>23,o=z+T|0,U^=o<<13|o>>>19,o=U+z|0,m^=o<<18|o>>>14,o=Y+B|0,R^=o<<7|o>>>25,o=R+Y|0,E^=o<<9|o>>>23,o=E+R|0,B^=o<<13|o>>>19,o=B+E|0,Y^=o<<18|o>>>14,o=P+k|0,x^=o<<7|o>>>25,o=x+P|0,S^=o<<9|o>>>23,o=S+x|0,k^=o<<13|o>>>19,o=k+S|0,P^=o<<18|o>>>14,o=d+x|0,U^=o<<7|o>>>25,o=U+d|0,E^=o<<9|o>>>23,o=E+U|0,x^=o<<13|o>>>19,o=x+E|0,d^=o<<18|o>>>14,o=m+M|0,B^=o<<7|o>>>25,o=B+m|0,S^=o<<9|o>>>23,o=S+B|0,M^=o<<13|o>>>19,o=M+S|0,m^=o<<18|o>>>14,o=Y+T|0,k^=o<<7|o>>>25,o=k+Y|0,K^=o<<9|o>>>23,o=K+k|0,T^=o<<13|o>>>19,o=T+K|0,Y^=o<<18|o>>>14,o=P+R|0,L^=o<<7|o>>>25,o=L+P|0,z^=o<<9|o>>>23,o=z+L|0,R^=o<<13|o>>>19,o=R+z|0,P^=o<<18|o>>>14;r[0]=d>>>0&255,r[1]=d>>>8&255,r[2]=d>>>16&255,r[3]=d>>>24&255,r[4]=m>>>0&255,r[5]=m>>>8&255,r[6]=m>>>16&255,r[7]=m>>>24&255,r[8]=Y>>>0&255,r[9]=Y>>>8&255,r[10]=Y>>>16&255,r[11]=Y>>>24&255,r[12]=P>>>0&255,r[13]=P>>>8&255,r[14]=P>>>16&255,r[15]=P>>>24&255,r[16]=B>>>0&255,r[17]=B>>>8&255,r[18]=B>>>16&255,r[19]=B>>>24&255,r[20]=S>>>0&255,r[21]=S>>>8&255,r[22]=S>>>16&255,r[23]=S>>>24&255,r[24]=K>>>0&255,r[25]=K>>>8&255,r[26]=K>>>16&255,r[27]=K>>>24&255,r[28]=T>>>0&255,r[29]=T>>>8&255,r[30]=T>>>16&255,r[31]=T>>>24&255}function a(r,t,n,e){i(r,t,n,e)}function f(r,t,n,e){h(r,t,n,e)}function s(r,t,n,e,o,i,h){var f,s,u=new Uint8Array(16),c=new Uint8Array(64);for(s=0;16>s;s++)u[s]=0;for(s=0;8>s;s++)u[s]=i[s];for(;o>=64;){for(a(c,u,h,cr),s=0;64>s;s++)r[t+s]=n[e+s]^c[s];for(f=1,s=8;16>s;s++)f=f+(255&u[s])|0,u[s]=255&f,f>>>=8;o-=64,t+=64,e+=64}if(o>0)for(a(c,u,h,cr),s=0;o>s;s++)r[t+s]=n[e+s]^c[s];return 0}function u(r,t,n,e,o){var i,h,f=new Uint8Array(16),s=new Uint8Array(64);for(h=0;16>h;h++)f[h]=0;for(h=0;8>h;h++)f[h]=e[h];for(;n>=64;){for(a(s,f,o,cr),h=0;64>h;h++)r[t+h]=s[h];for(i=1,h=8;16>h;h++)i=i+(255&f[h])|0,f[h]=255&i,i>>>=8;n-=64,t+=64}if(n>0)for(a(s,f,o,cr),h=0;n>h;h++)r[t+h]=s[h];return 0}function c(r,t,n,e,o){var i=new Uint8Array(32);f(i,e,o,cr);for(var h=new Uint8Array(8),a=0;8>a;a++)h[a]=e[a+16];return u(r,t,n,h,i)}function y(r,t,n,e,o,i,h){var a=new Uint8Array(32);f(a,i,h,cr);for(var u=new Uint8Array(8),c=0;8>c;c++)u[c]=i[c+16];return s(r,t,n,e,o,u,a)}function l(r,t,n,e,o,i){var h=new yr(i);return h.update(n,e,o),h.finish(r,t),0}function w(r,t,n,o,i,h){var a=new Uint8Array(16);return l(a,0,n,o,i,h),e(r,t,a,0)}function p(r,t,n,e,o){var i;if(32>n)return-1;for(y(r,0,t,0,n,e,o),l(r,16,r,32,n-32,r),i=0;16>i;i++)r[i]=0;return 0}function v(r,t,n,e,o){var i,h=new Uint8Array(32);if(32>n)return-1;if(c(h,0,32,e,o),0!==w(t,16,t,32,n-32,h))return-1;for(y(r,0,t,0,n,e,o),i=0;32>i;i++)r[i]=0;return 0}function b(r,t){var n;for(n=0;16>n;n++)r[n]=0|t[n]}function g(r){var t,n,e=1;for(t=0;16>t;t++)n=r[t]+e+65535,e=Math.floor(n/65536),r[t]=n-65536*e;r[0]+=e-1+37*(e-1)}function _(r,t,n){for(var e,o=~(n-1),i=0;16>i;i++)e=o&(r[i]^t[i]),r[i]^=e,t[i]^=e}function A(r,t){var n,e,o,i=$(),h=$();for(n=0;16>n;n++)h[n]=t[n];for(g(h),g(h),g(h),e=0;2>e;e++){for(i[0]=h[0]-65517,n=1;15>n;n++)i[n]=h[n]-65535-(i[n-1]>>16&1),i[n-1]&=65535;i[15]=h[15]-32767-(i[14]>>16&1),o=i[15]>>16&1,i[14]&=65535,_(h,i,1-o)}for(n=0;16>n;n++)r[2*n]=255&h[n],r[2*n+1]=h[n]>>8}function d(r,t){var n=new Uint8Array(32),e=new Uint8Array(32);return A(n,r),A(e,t),o(n,0,e,0)}function U(r){var t=new Uint8Array(32);return A(t,r),1&t[0]}function E(r,t){var n;for(n=0;16>n;n++)r[n]=t[2*n]+(t[2*n+1]<<8);r[15]&=32767}function x(r,t,n){for(var e=0;16>e;e++)r[e]=t[e]+n[e]}function M(r,t,n){for(var e=0;16>e;e++)r[e]=t[e]-n[e]}function m(r,t,n){var e,o,i=0,h=0,a=0,f=0,s=0,u=0,c=0,y=0,l=0,w=0,p=0,v=0,b=0,g=0,_=0,A=0,d=0,U=0,E=0,x=0,M=0,m=0,B=0,S=0,K=0,T=0,Y=0,k=0,L=0,z=0,R=0,P=n[0],O=n[1],N=n[2],C=n[3],F=n[4],I=n[5],G=n[6],Z=n[7],j=n[8],q=n[9],V=n[10],X=n[11],D=n[12],H=n[13],J=n[14],Q=n[15];e=t[0],i+=e*P,h+=e*O,a+=e*N,f+=e*C,s+=e*F,u+=e*I,c+=e*G,y+=e*Z,l+=e*j,w+=e*q,p+=e*V,v+=e*X,b+=e*D,g+=e*H,_+=e*J,A+=e*Q,e=t[1],h+=e*P,a+=e*O,f+=e*N,s+=e*C,u+=e*F,c+=e*I,y+=e*G,l+=e*Z,w+=e*j,p+=e*q,v+=e*V,b+=e*X,g+=e*D,_+=e*H,A+=e*J,d+=e*Q,e=t[2],a+=e*P,f+=e*O,s+=e*N,u+=e*C,c+=e*F,y+=e*I,l+=e*G,w+=e*Z,p+=e*j,v+=e*q,b+=e*V,g+=e*X,_+=e*D,A+=e*H,d+=e*J,U+=e*Q,e=t[3],f+=e*P,s+=e*O,u+=e*N,c+=e*C,y+=e*F,l+=e*I,w+=e*G,p+=e*Z,v+=e*j,b+=e*q,g+=e*V,_+=e*X,A+=e*D,d+=e*H,U+=e*J,E+=e*Q,e=t[4],s+=e*P,u+=e*O,c+=e*N,y+=e*C,l+=e*F,w+=e*I,p+=e*G,v+=e*Z,b+=e*j,g+=e*q,_+=e*V,A+=e*X,d+=e*D,U+=e*H,E+=e*J,x+=e*Q,e=t[5],u+=e*P,c+=e*O,y+=e*N,l+=e*C,w+=e*F,p+=e*I,v+=e*G,b+=e*Z,g+=e*j,_+=e*q,A+=e*V,d+=e*X,U+=e*D,E+=e*H,x+=e*J,M+=e*Q,e=t[6],c+=e*P,y+=e*O,l+=e*N,w+=e*C,p+=e*F,v+=e*I,b+=e*G,g+=e*Z,_+=e*j,A+=e*q,d+=e*V,U+=e*X,E+=e*D,x+=e*H,M+=e*J,m+=e*Q,e=t[7],y+=e*P,l+=e*O,w+=e*N,p+=e*C,v+=e*F,b+=e*I,g+=e*G,_+=e*Z,A+=e*j,d+=e*q,U+=e*V,E+=e*X,x+=e*D,M+=e*H,m+=e*J,B+=e*Q,e=t[8],l+=e*P,w+=e*O,p+=e*N,v+=e*C,b+=e*F,g+=e*I,_+=e*G,A+=e*Z,d+=e*j,U+=e*q,E+=e*V,x+=e*X,M+=e*D,m+=e*H,B+=e*J,S+=e*Q,e=t[9],w+=e*P,p+=e*O,v+=e*N,b+=e*C,g+=e*F,_+=e*I,A+=e*G,d+=e*Z,U+=e*j,E+=e*q,x+=e*V,M+=e*X,m+=e*D,B+=e*H,S+=e*J,K+=e*Q,e=t[10],p+=e*P,v+=e*O,b+=e*N,g+=e*C,_+=e*F,A+=e*I,d+=e*G,U+=e*Z,E+=e*j,x+=e*q,M+=e*V,m+=e*X,B+=e*D,S+=e*H,K+=e*J,T+=e*Q,e=t[11],v+=e*P,b+=e*O,g+=e*N,_+=e*C,A+=e*F,d+=e*I,U+=e*G,E+=e*Z,x+=e*j,M+=e*q,m+=e*V,B+=e*X,S+=e*D,K+=e*H,T+=e*J,Y+=e*Q,e=t[12],b+=e*P,g+=e*O,_+=e*N,A+=e*C,d+=e*F,U+=e*I,E+=e*G,x+=e*Z,M+=e*j,m+=e*q,B+=e*V,S+=e*X,K+=e*D,T+=e*H,Y+=e*J,k+=e*Q,e=t[13],g+=e*P,_+=e*O,A+=e*N,d+=e*C,U+=e*F,E+=e*I,x+=e*G,M+=e*Z,m+=e*j,B+=e*q,S+=e*V,K+=e*X,T+=e*D,Y+=e*H,k+=e*J,L+=e*Q,e=t[14],_+=e*P,A+=e*O,d+=e*N,U+=e*C,E+=e*F,x+=e*I,M+=e*G,m+=e*Z,B+=e*j,S+=e*q,K+=e*V,T+=e*X,Y+=e*D,k+=e*H,L+=e*J,z+=e*Q,e=t[15],A+=e*P,d+=e*O,U+=e*N,E+=e*C,x+=e*F,M+=e*I,m+=e*G,B+=e*Z,S+=e*j,K+=e*q,T+=e*V,Y+=e*X,k+=e*D,L+=e*H,z+=e*J,R+=e*Q,i+=38*d,h+=38*U,a+=38*E,f+=38*x,s+=38*M,u+=38*m,c+=38*B,y+=38*S,l+=38*K,w+=38*T,p+=38*Y,v+=38*k,b+=38*L,g+=38*z,_+=38*R,o=1,e=i+o+65535,o=Math.floor(e/65536),i=e-65536*o,e=h+o+65535,o=Math.floor(e/65536),h=e-65536*o,e=a+o+65535,o=Math.floor(e/65536),a=e-65536*o,e=f+o+65535,o=Math.floor(e/65536),f=e-65536*o,e=s+o+65535,o=Math.floor(e/65536),s=e-65536*o,e=u+o+65535,o=Math.floor(e/65536),u=e-65536*o,e=c+o+65535,o=Math.floor(e/65536),c=e-65536*o,e=y+o+65535,o=Math.floor(e/65536),y=e-65536*o,e=l+o+65535,o=Math.floor(e/65536),l=e-65536*o,e=w+o+65535,o=Math.floor(e/65536),w=e-65536*o,e=p+o+65535,o=Math.floor(e/65536),p=e-65536*o,e=v+o+65535,o=Math.floor(e/65536),v=e-65536*o,e=b+o+65535,o=Math.floor(e/65536),b=e-65536*o,e=g+o+65535,o=Math.floor(e/65536),g=e-65536*o,e=_+o+65535,o=Math.floor(e/65536),_=e-65536*o,e=A+o+65535,o=Math.floor(e/65536),A=e-65536*o,i+=o-1+37*(o-1),o=1,e=i+o+65535,o=Math.floor(e/65536),i=e-65536*o,e=h+o+65535,o=Math.floor(e/65536),h=e-65536*o,e=a+o+65535,o=Math.floor(e/65536),a=e-65536*o,e=f+o+65535,o=Math.floor(e/65536),f=e-65536*o,e=s+o+65535,o=Math.floor(e/65536),s=e-65536*o,e=u+o+65535,o=Math.floor(e/65536),u=e-65536*o,e=c+o+65535,o=Math.floor(e/65536),c=e-65536*o,e=y+o+65535,o=Math.floor(e/65536),y=e-65536*o,e=l+o+65535,o=Math.floor(e/65536),l=e-65536*o,e=w+o+65535,o=Math.floor(e/65536),w=e-65536*o,e=p+o+65535,o=Math.floor(e/65536),p=e-65536*o,e=v+o+65535,o=Math.floor(e/65536),v=e-65536*o,e=b+o+65535,o=Math.floor(e/65536),b=e-65536*o,e=g+o+65535,o=Math.floor(e/65536),g=e-65536*o,e=_+o+65535,o=Math.floor(e/65536),_=e-65536*o,e=A+o+65535,o=Math.floor(e/65536),A=e-65536*o,i+=o-1+37*(o-1),r[0]=i,r[1]=h,r[2]=a,r[3]=f,r[4]=s,r[5]=u,r[6]=c,r[7]=y,r[8]=l,r[9]=w,r[10]=p,r[11]=v,r[12]=b,r[13]=g,r[14]=_,r[15]=A}function B(r,t){m(r,t,t)}function S(r,t){var n,e=$();for(n=0;16>n;n++)e[n]=t[n];for(n=253;n>=0;n--)B(e,e),2!==n&&4!==n&&m(e,e,t);for(n=0;16>n;n++)r[n]=e[n]}function K(r,t){var n,e=$();for(n=0;16>n;n++)e[n]=t[n];for(n=250;n>=0;n--)B(e,e),1!==n&&m(e,e,t);for(n=0;16>n;n++)r[n]=e[n]}function T(r,t,n){var e,o,i=new Uint8Array(32),h=new Float64Array(80),a=$(),f=$(),s=$(),u=$(),c=$(),y=$();for(o=0;31>o;o++)i[o]=t[o];for(i[31]=127&t[31]|64,i[0]&=248,E(h,n),o=0;16>o;o++)f[o]=h[o],u[o]=a[o]=s[o]=0;for(a[0]=u[0]=1,o=254;o>=0;--o)e=i[o>>>3]>>>(7&o)&1,_(a,f,e),_(s,u,e),x(c,a,s),M(a,a,s),x(s,f,u),M(f,f,u),B(u,c),B(y,a),m(a,s,a),m(s,f,c),x(c,a,s),M(a,a,s),B(f,a),M(s,u,y),m(a,s,ir),x(a,a,u),m(s,s,a),m(a,u,y),m(u,f,h),B(f,c),_(a,f,e),_(s,u,e);for(o=0;16>o;o++)h[o+16]=a[o],h[o+32]=s[o],h[o+48]=f[o],h[o+64]=u[o];var l=h.subarray(32),w=h.subarray(16);return S(l,l),m(w,w,l),A(r,w),0}function Y(r,t){return T(r,t,nr)}function k(r,t){return rr(t,32),Y(r,t)}function L(r,t,n){var e=new Uint8Array(32);return T(e,n,t),f(r,tr,e,cr)}function z(r,t,n,e,o,i){var h=new Uint8Array(32);return L(h,o,i),lr(r,t,n,e,h)}function R(r,t,n,e,o,i){var h=new Uint8Array(32);return L(h,o,i),wr(r,t,n,e,h)}function P(r,t,n,e){for(var o,i,h,a,f,s,u,c,y,l,w,p,v,b,g,_,A,d,U,E,x,M,m,B,S,K,T=new Int32Array(16),Y=new Int32Array(16),k=r[0],L=r[1],z=r[2],R=r[3],P=r[4],O=r[5],N=r[6],C=r[7],F=t[0],I=t[1],G=t[2],Z=t[3],j=t[4],q=t[5],V=t[6],X=t[7],D=0;e>=128;){for(U=0;16>U;U++)E=8*U+D,T[U]=n[E+0]<<24|n[E+1]<<16|n[E+2]<<8|n[E+3],Y[U]=n[E+4]<<24|n[E+5]<<16|n[E+6]<<8|n[E+7];for(U=0;80>U;U++)if(o=k,i=L,h=z,a=R,f=P,s=O,u=N,c=C,y=F,l=I,w=G,p=Z,v=j,b=q,g=V,_=X,x=C,M=X,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=(P>>>14|j<<18)^(P>>>18|j<<14)^(j>>>9|P<<23),M=(j>>>14|P<<18)^(j>>>18|P<<14)^(P>>>9|j<<23),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=P&O^~P&N,M=j&q^~j&V,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=pr[2*U],M=pr[2*U+1],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=T[U%16],M=Y[U%16],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,A=65535&S|K<<16,d=65535&m|B<<16,x=A,M=d,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=(k>>>28|F<<4)^(F>>>2|k<<30)^(F>>>7|k<<25),M=(F>>>28|k<<4)^(k>>>2|F<<30)^(k>>>7|F<<25),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=k&L^k&z^L&z,M=F&I^F&G^I&G,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,c=65535&S|K<<16,_=65535&m|B<<16,x=a,M=p,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=A,M=d,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,a=65535&S|K<<16,p=65535&m|B<<16,L=o,z=i,R=h,P=a,O=f,N=s,C=u,k=c,I=y,G=l,Z=w,j=p,q=v,V=b,X=g,F=_,U%16===15)for(E=0;16>E;E++)x=T[E],M=Y[E],m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=T[(E+9)%16],M=Y[(E+9)%16],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,A=T[(E+1)%16],d=Y[(E+1)%16],x=(A>>>1|d<<31)^(A>>>8|d<<24)^A>>>7,M=(d>>>1|A<<31)^(d>>>8|A<<24)^(d>>>7|A<<25),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,A=T[(E+14)%16],d=Y[(E+14)%16],x=(A>>>19|d<<13)^(d>>>29|A<<3)^A>>>6,M=(d>>>19|A<<13)^(A>>>29|d<<3)^(d>>>6|A<<26),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,T[E]=65535&S|K<<16,Y[E]=65535&m|B<<16;x=k,M=F,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[0],M=t[0],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[0]=k=65535&S|K<<16,t[0]=F=65535&m|B<<16,x=L,M=I,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[1],M=t[1],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[1]=L=65535&S|K<<16,t[1]=I=65535&m|B<<16,x=z,M=G,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[2],M=t[2],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[2]=z=65535&S|K<<16,t[2]=G=65535&m|B<<16,x=R,M=Z,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[3],M=t[3],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[3]=R=65535&S|K<<16,t[3]=Z=65535&m|B<<16,x=P,M=j,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[4],M=t[4],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[4]=P=65535&S|K<<16,t[4]=j=65535&m|B<<16,x=O,M=q,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[5],M=t[5],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[5]=O=65535&S|K<<16,t[5]=q=65535&m|B<<16,x=N,M=V,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[6],M=t[6],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[6]=N=65535&S|K<<16,t[6]=V=65535&m|B<<16,x=C,M=X,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[7],M=t[7],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[7]=C=65535&S|K<<16,t[7]=X=65535&m|B<<16,D+=128,e-=128}return e}function O(r,n,e){var o,i=new Int32Array(8),h=new Int32Array(8),a=new Uint8Array(256),f=e;for(i[0]=1779033703,i[1]=3144134277,i[2]=1013904242,i[3]=2773480762,i[4]=1359893119,i[5]=2600822924,i[6]=528734635,i[7]=1541459225,h[0]=4089235720,h[1]=2227873595,h[2]=4271175723,h[3]=1595750129,h[4]=2917565137,h[5]=725511199,h[6]=4215389547,h[7]=327033209,P(i,h,n,e),e%=128,o=0;e>o;o++)a[o]=n[f-e+o];for(a[e]=128,e=256-128*(112>e?1:0),a[e-9]=0,t(a,e-8,f/536870912|0,f<<3),P(i,h,a,e),o=0;8>o;o++)t(r,8*o,i[o],h[o]);return 0}function N(r,t){var n=$(),e=$(),o=$(),i=$(),h=$(),a=$(),f=$(),s=$(),u=$();M(n,r[1],r[0]),M(u,t[1],t[0]),m(n,n,u),x(e,r[0],r[1]),x(u,t[0],t[1]),m(e,e,u),m(o,r[3],t[3]),m(o,o,ar),m(i,r[2],t[2]),x(i,i,i),M(h,e,n),M(a,i,o),x(f,i,o),x(s,e,n),m(r[0],h,a),m(r[1],s,f),m(r[2],f,a),m(r[3],h,s)}function C(r,t,n){var e;for(e=0;4>e;e++)_(r[e],t[e],n)}function F(r,t){var n=$(),e=$(),o=$();S(o,t[2]),m(n,t[0],o),m(e,t[1],o),A(r,e),r[31]^=U(n)<<7}function I(r,t,n){var e,o;for(b(r[0],er),b(r[1],or),b(r[2],or),b(r[3],er),o=255;o>=0;--o)e=n[o/8|0]>>(7&o)&1,C(r,t,e),N(t,r),N(r,r),C(r,t,e)}function G(r,t){var n=[$(),$(),$(),$()];b(n[0],fr),b(n[1],sr),b(n[2],or),m(n[3],fr,sr),I(r,n,t)}function Z(r,t,n){var e,o=new Uint8Array(64),i=[$(),$(),$(),$()];for(n||rr(t,32),O(o,t,32),o[0]&=248,o[31]&=127,o[31]|=64,G(i,o),F(r,i),e=0;32>e;e++)t[e+32]=r[e];return 0}function j(r,t){var n,e,o,i;for(e=63;e>=32;--e){for(n=0,o=e-32,i=e-12;i>o;++o)t[o]+=n-16*t[e]*vr[o-(e-32)],n=t[o]+128>>8,t[o]-=256*n;t[o]+=n,t[e]=0}for(n=0,o=0;32>o;o++)t[o]+=n-(t[31]>>4)*vr[o],n=t[o]>>8,t[o]&=255;for(o=0;32>o;o++)t[o]-=n*vr[o];for(e=0;32>e;e++)t[e+1]+=t[e]>>8,r[e]=255&t[e]}function q(r){var t,n=new Float64Array(64);for(t=0;64>t;t++)n[t]=r[t];for(t=0;64>t;t++)r[t]=0;j(r,n)}function V(r,t,n,e){var o,i,h=new Uint8Array(64),a=new Uint8Array(64),f=new Uint8Array(64),s=new Float64Array(64),u=[$(),$(),$(),$()];O(h,e,32),h[0]&=248,h[31]&=127,h[31]|=64;var c=n+64;for(o=0;n>o;o++)r[64+o]=t[o];for(o=0;32>o;o++)r[32+o]=h[32+o];for(O(f,r.subarray(32),n+32),q(f),G(u,f),F(r,u),o=32;64>o;o++)r[o]=e[o];for(O(a,r,n+64),q(a),o=0;64>o;o++)s[o]=0;for(o=0;32>o;o++)s[o]=f[o];for(o=0;32>o;o++)for(i=0;32>i;i++)s[o+i]+=a[o]*h[i];return j(r.subarray(32),s),c}function X(r,t){var n=$(),e=$(),o=$(),i=$(),h=$(),a=$(),f=$();return b(r[2],or),E(r[1],t),B(o,r[1]),m(i,o,hr),M(o,o,r[2]),x(i,r[2],i),B(h,i),B(a,h),m(f,a,h),m(n,f,o),m(n,n,i),K(n,n),m(n,n,o),m(n,n,i),m(n,n,i),m(r[0],n,i),B(e,r[0]),m(e,e,i),d(e,o)&&m(r[0],r[0],ur),B(e,r[0]),m(e,e,i),d(e,o)?-1:(U(r[0])===t[31]>>7&&M(r[0],er,r[0]),m(r[3],r[0],r[1]),0)}function D(r,t,n,e){var i,h,a=new Uint8Array(32),f=new Uint8Array(64),s=[$(),$(),$(),$()],u=[$(),$(),$(),$()];if(h=-1,64>n)return-1;if(X(u,e))return-1;for(i=0;n>i;i++)r[i]=t[i];for(i=0;32>i;i++)r[i+32]=e[i];if(O(f,r,n),q(f),I(s,u,f),G(u,t.subarray(32)),N(s,u),F(a,s),n-=64,o(t,0,a,0)){for(i=0;n>i;i++)r[i]=0;return-1}for(i=0;n>i;i++)r[i]=t[i+64];return h=n}function H(r,t){if(r.length!==br)throw new Error("bad key size");if(t.length!==gr)throw new Error("bad nonce size")}function J(r,t){if(r.length!==Er)throw new Error("bad public key size");if(t.length!==xr)throw new Error("bad secret key size")}function Q(){var r,t;for(t=0;t<arguments.length;t++)if("[object Uint8Array]"!==(r=Object.prototype.toString.call(arguments[t])))throw new TypeError("unexpected type "+r+", use Uint8Array")}function W(r){for(var t=0;t<r.length;t++)r[t]=0}var $=function(r){var t,n=new Float64Array(16);if(r)for(t=0;t<r.length;t++)n[t]=r[t];return n},rr=function(){throw new Error("no PRNG")},tr=new Uint8Array(16),nr=new Uint8Array(32);nr[0]=9;var er=$(),or=$([1]),ir=$([56129,1]),hr=$([30883,4953,19914,30187,55467,16705,2637,112,59544,30585,16505,36039,65139,11119,27886,20995]),ar=$([61785,9906,39828,60374,45398,33411,5274,224,53552,61171,33010,6542,64743,22239,55772,9222]),fr=$([54554,36645,11616,51542,42930,38181,51040,26924,56412,64982,57905,49316,21502,52590,14035,8553]),sr=$([26200,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214]),ur=$([41136,18958,6951,50414,58488,44335,6150,12099,55207,15867,153,11085,57099,20417,9344,11139]),cr=new Uint8Array([101,120,112,97,110,100,32,51,50,45,98,121,116,101,32,107]),yr=function(r){this.buffer=new Uint8Array(16),this.r=new Uint16Array(10),this.h=new Uint16Array(10),this.pad=new Uint16Array(8),this.leftover=0,this.fin=0;var t,n,e,o,i,h,a,f;t=255&r[0]|(255&r[1])<<8,this.r[0]=8191&t,n=255&r[2]|(255&r[3])<<8,this.r[1]=8191&(t>>>13|n<<3),e=255&r[4]|(255&r[5])<<8,this.r[2]=7939&(n>>>10|e<<6),o=255&r[6]|(255&r[7])<<8,this.r[3]=8191&(e>>>7|o<<9),i=255&r[8]|(255&r[9])<<8,this.r[4]=255&(o>>>4|i<<12),this.r[5]=i>>>1&8190,h=255&r[10]|(255&r[11])<<8,this.r[6]=8191&(i>>>14|h<<2),a=255&r[12]|(255&r[13])<<8,this.r[7]=8065&(h>>>11|a<<5),f=255&r[14]|(255&r[15])<<8,this.r[8]=8191&(a>>>8|f<<8),this.r[9]=f>>>5&127,this.pad[0]=255&r[16]|(255&r[17])<<8,this.pad[1]=255&r[18]|(255&r[19])<<8,this.pad[2]=255&r[20]|(255&r[21])<<8,this.pad[3]=255&r[22]|(255&r[23])<<8,this.pad[4]=255&r[24]|(255&r[25])<<8,this.pad[5]=255&r[26]|(255&r[27])<<8,this.pad[6]=255&r[28]|(255&r[29])<<8,this.pad[7]=255&r[30]|(255&r[31])<<8};yr.prototype.blocks=function(r,t,n){for(var e,o,i,h,a,f,s,u,c,y,l,w,p,v,b,g,_,A,d,U=this.fin?0:2048,E=this.h[0],x=this.h[1],M=this.h[2],m=this.h[3],B=this.h[4],S=this.h[5],K=this.h[6],T=this.h[7],Y=this.h[8],k=this.h[9],L=this.r[0],z=this.r[1],R=this.r[2],P=this.r[3],O=this.r[4],N=this.r[5],C=this.r[6],F=this.r[7],I=this.r[8],G=this.r[9];n>=16;)e=255&r[t+0]|(255&r[t+1])<<8,E+=8191&e,o=255&r[t+2]|(255&r[t+3])<<8,x+=8191&(e>>>13|o<<3),i=255&r[t+4]|(255&r[t+5])<<8,M+=8191&(o>>>10|i<<6),h=255&r[t+6]|(255&r[t+7])<<8,m+=8191&(i>>>7|h<<9),a=255&r[t+8]|(255&r[t+9])<<8,B+=8191&(h>>>4|a<<12),S+=a>>>1&8191,f=255&r[t+10]|(255&r[t+11])<<8,K+=8191&(a>>>14|f<<2),s=255&r[t+12]|(255&r[t+13])<<8,T+=8191&(f>>>11|s<<5),u=255&r[t+14]|(255&r[t+15])<<8,Y+=8191&(s>>>8|u<<8),k+=u>>>5|U,c=0,y=c,y+=E*L,y+=x*(5*G),y+=M*(5*I),y+=m*(5*F),y+=B*(5*C),c=y>>>13,y&=8191,y+=S*(5*N),y+=K*(5*O),y+=T*(5*P),y+=Y*(5*R),y+=k*(5*z),c+=y>>>13,y&=8191,l=c,l+=E*z,l+=x*L,l+=M*(5*G),l+=m*(5*I),l+=B*(5*F),c=l>>>13,l&=8191,l+=S*(5*C),l+=K*(5*N),l+=T*(5*O),l+=Y*(5*P),l+=k*(5*R),c+=l>>>13,l&=8191,w=c,w+=E*R,w+=x*z,w+=M*L,w+=m*(5*G),w+=B*(5*I),c=w>>>13,w&=8191,w+=S*(5*F),w+=K*(5*C),w+=T*(5*N),w+=Y*(5*O),w+=k*(5*P),c+=w>>>13,w&=8191,p=c,p+=E*P,p+=x*R,p+=M*z,p+=m*L,p+=B*(5*G),c=p>>>13,p&=8191,p+=S*(5*I),p+=K*(5*F),p+=T*(5*C),p+=Y*(5*N),p+=k*(5*O),c+=p>>>13,p&=8191,v=c,v+=E*O,v+=x*P,v+=M*R,v+=m*z,v+=B*L,c=v>>>13,v&=8191,v+=S*(5*G),v+=K*(5*I),v+=T*(5*F),v+=Y*(5*C),v+=k*(5*N),c+=v>>>13,v&=8191,b=c,b+=E*N,b+=x*O,b+=M*P,b+=m*R,b+=B*z,c=b>>>13,b&=8191,b+=S*L,b+=K*(5*G),b+=T*(5*I),b+=Y*(5*F),b+=k*(5*C),c+=b>>>13,b&=8191,g=c,g+=E*C,g+=x*N,g+=M*O,g+=m*P,g+=B*R,c=g>>>13,g&=8191,g+=S*z,g+=K*L,g+=T*(5*G),g+=Y*(5*I),g+=k*(5*F),c+=g>>>13,g&=8191,_=c,_+=E*F,_+=x*C,_+=M*N,_+=m*O,_+=B*P,c=_>>>13,_&=8191,_+=S*R,_+=K*z,_+=T*L,_+=Y*(5*G),_+=k*(5*I),c+=_>>>13,_&=8191,A=c,A+=E*I,A+=x*F,A+=M*C,A+=m*N,A+=B*O,c=A>>>13,A&=8191,A+=S*P,A+=K*R,A+=T*z,A+=Y*L,A+=k*(5*G),c+=A>>>13,A&=8191,d=c,d+=E*G,d+=x*I,d+=M*F,d+=m*C,d+=B*N,c=d>>>13,d&=8191,d+=S*O,d+=K*P,d+=T*R,d+=Y*z,d+=k*L,c+=d>>>13,d&=8191,c=(c<<2)+c|0,c=c+y|0,y=8191&c,c>>>=13,l+=c,E=y,x=l,M=w,m=p,B=v,S=b,K=g,T=_,Y=A,k=d,t+=16,n-=16;this.h[0]=E,this.h[1]=x,this.h[2]=M,this.h[3]=m,this.h[4]=B,this.h[5]=S,this.h[6]=K,this.h[7]=T,this.h[8]=Y,this.h[9]=k},yr.prototype.finish=function(r,t){var n,e,o,i,h=new Uint16Array(10);if(this.leftover){for(i=this.leftover,this.buffer[i++]=1;16>i;i++)this.buffer[i]=0;this.fin=1,this.blocks(this.buffer,0,16)}for(n=this.h[1]>>>13,this.h[1]&=8191,i=2;10>i;i++)this.h[i]+=n,n=this.h[i]>>>13,this.h[i]&=8191;for(this.h[0]+=5*n,n=this.h[0]>>>13,this.h[0]&=8191,this.h[1]+=n,n=this.h[1]>>>13,this.h[1]&=8191,this.h[2]+=n,h[0]=this.h[0]+5,n=h[0]>>>13,h[0]&=8191,i=1;10>i;i++)h[i]=this.h[i]+n,n=h[i]>>>13,h[i]&=8191;for(h[9]-=8192,e=(1^n)-1,i=0;10>i;i++)h[i]&=e;for(e=~e,i=0;10>i;i++)this.h[i]=this.h[i]&e|h[i];for(this.h[0]=65535&(this.h[0]|this.h[1]<<13),this.h[1]=65535&(this.h[1]>>>3|this.h[2]<<10),this.h[2]=65535&(this.h[2]>>>6|this.h[3]<<7),this.h[3]=65535&(this.h[3]>>>9|this.h[4]<<4),this.h[4]=65535&(this.h[4]>>>12|this.h[5]<<1|this.h[6]<<14),this.h[5]=65535&(this.h[6]>>>2|this.h[7]<<11),this.h[6]=65535&(this.h[7]>>>5|this.h[8]<<8),this.h[7]=65535&(this.h[8]>>>8|this.h[9]<<5),o=this.h[0]+this.pad[0],this.h[0]=65535&o,i=1;8>i;i++)o=(this.h[i]+this.pad[i]|0)+(o>>>16)|0,this.h[i]=65535&o;r[t+0]=this.h[0]>>>0&255,r[t+1]=this.h[0]>>>8&255,r[t+2]=this.h[1]>>>0&255,r[t+3]=this.h[1]>>>8&255,r[t+4]=this.h[2]>>>0&255,r[t+5]=this.h[2]>>>8&255,r[t+6]=this.h[3]>>>0&255,r[t+7]=this.h[3]>>>8&255,r[t+8]=this.h[4]>>>0&255,r[t+9]=this.h[4]>>>8&255,r[t+10]=this.h[5]>>>0&255,r[t+11]=this.h[5]>>>8&255,r[t+12]=this.h[6]>>>0&255,r[t+13]=this.h[6]>>>8&255,r[t+14]=this.h[7]>>>0&255,r[t+15]=this.h[7]>>>8&255},yr.prototype.update=function(r,t,n){var e,o;if(this.leftover){for(o=16-this.leftover,o>n&&(o=n),e=0;o>e;e++)this.buffer[this.leftover+e]=r[t+e];if(n-=o,t+=o,this.leftover+=o,this.leftover<16)return;this.blocks(this.buffer,0,16),this.leftover=0}if(n>=16&&(o=n-n%16,this.blocks(r,t,o),t+=o,n-=o),n){for(e=0;n>e;e++)this.buffer[this.leftover+e]=r[t+e];this.leftover+=n}};var lr=p,wr=v,pr=[1116352408,3609767458,1899447441,602891725,3049323471,3964484399,3921009573,2173295548,961987163,4081628472,1508970993,3053834265,2453635748,2937671579,2870763221,3664609560,3624381080,2734883394,310598401,1164996542,607225278,1323610764,1426881987,3590304994,1925078388,4068182383,2162078206,991336113,2614888103,633803317,3248222580,3479774868,3835390401,2666613458,4022224774,944711139,264347078,2341262773,604807628,2007800933,770255983,1495990901,1249150122,1856431235,1555081692,3175218132,1996064986,2198950837,2554220882,3999719339,2821834349,766784016,2952996808,2566594879,3210313671,3203337956,3336571891,1034457026,3584528711,2466948901,113926993,3758326383,338241895,168717936,666307205,1188179964,773529912,1546045734,1294757372,1522805485,1396182291,2643833823,1695183700,2343527390,1986661051,1014477480,2177026350,1206759142,2456956037,344077627,2730485921,1290863460,2820302411,3158454273,3259730800,3505952657,3345764771,106217008,3516065817,3606008344,3600352804,1432725776,4094571909,1467031594,275423344,851169720,430227734,3100823752,506948616,1363258195,659060556,3750685593,883997877,3785050280,958139571,3318307427,1322822218,3812723403,1537002063,2003034995,1747873779,3602036899,1955562222,1575990012,2024104815,1125592928,2227730452,2716904306,2361852424,442776044,2428436474,593698344,2756734187,3733110249,3204031479,2999351573,3329325298,3815920427,3391569614,3928383900,3515267271,566280711,3940187606,3454069534,4118630271,4000239992,116418474,1914138554,174292421,2731055270,289380356,3203993006,460393269,320620315,685471733,587496836,852142971,1086792851,1017036298,365543100,1126000580,2618297676,1288033470,3409855158,1501505948,4234509866,1607167915,987167468,1816402316,1246189591],vr=new Float64Array([237,211,245,92,26,99,18,88,214,156,247,162,222,249,222,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16]),br=32,gr=24,_r=32,Ar=16,dr=32,Ur=32,Er=32,xr=32,Mr=32,mr=gr,Br=_r,Sr=Ar,Kr=64,Tr=32,Yr=64,kr=32,Lr=64;r.lowlevel={crypto_core_hsalsa20:f,crypto_stream_xor:y,crypto_stream:c,crypto_stream_salsa20_xor:s,crypto_stream_salsa20:u,crypto_onetimeauth:l,crypto_onetimeauth_verify:w,crypto_verify_16:e,crypto_verify_32:o,crypto_secretbox:p,crypto_secretbox_open:v,crypto_scalarmult:T,crypto_scalarmult_base:Y,crypto_box_beforenm:L,crypto_box_afternm:lr,crypto_box:z,crypto_box_open:R,crypto_box_keypair:k,crypto_hash:O,crypto_sign:V,crypto_sign_keypair:Z,crypto_sign_open:D,crypto_secretbox_KEYBYTES:br,crypto_secretbox_NONCEBYTES:gr,crypto_secretbox_ZEROBYTES:_r,crypto_secretbox_BOXZEROBYTES:Ar,crypto_scalarmult_BYTES:dr,crypto_scalarmult_SCALARBYTES:Ur,crypto_box_PUBLICKEYBYTES:Er,crypto_box_SECRETKEYBYTES:xr,crypto_box_BEFORENMBYTES:Mr,crypto_box_NONCEBYTES:mr,crypto_box_ZEROBYTES:Br,crypto_box_BOXZEROBYTES:Sr,crypto_sign_BYTES:Kr,crypto_sign_PUBLICKEYBYTES:Tr,crypto_sign_SECRETKEYBYTES:Yr,crypto_sign_SEEDBYTES:kr,crypto_hash_BYTES:Lr},r.util||(r.util={},r.util.decodeUTF8=r.util.encodeUTF8=r.util.encodeBase64=r.util.decodeBase64=function(){throw new Error("nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js")}),r.randomBytes=function(r){var t=new Uint8Array(r);return rr(t,r),t},r.secretbox=function(r,t,n){Q(r,t,n),H(n,t);for(var e=new Uint8Array(_r+r.length),o=new Uint8Array(e.length),i=0;i<r.length;i++)e[i+_r]=r[i];return p(o,e,e.length,t,n),o.subarray(Ar)},r.secretbox.open=function(r,t,n){Q(r,t,n),H(n,t);for(var e=new Uint8Array(Ar+r.length),o=new Uint8Array(e.length),i=0;i<r.length;i++)e[i+Ar]=r[i];return e.length<32?!1:0!==v(o,e,e.length,t,n)?!1:o.subarray(_r)},r.secretbox.keyLength=br,r.secretbox.nonceLength=gr,r.secretbox.overheadLength=Ar,r.scalarMult=function(r,t){if(Q(r,t),r.length!==Ur)throw new Error("bad n size");if(t.length!==dr)throw new Error("bad p size");var n=new Uint8Array(dr);return T(n,r,t),n},r.scalarMult.base=function(r){if(Q(r),r.length!==Ur)throw new Error("bad n size");var t=new Uint8Array(dr);return Y(t,r),t},r.scalarMult.scalarLength=Ur,r.scalarMult.groupElementLength=dr,r.box=function(t,n,e,o){var i=r.box.before(e,o);return r.secretbox(t,n,i)},r.box.before=function(r,t){Q(r,t),J(r,t);var n=new Uint8Array(Mr);return L(n,r,t),n},r.box.after=r.secretbox,r.box.open=function(t,n,e,o){var i=r.box.before(e,o);return r.secretbox.open(t,n,i)},r.box.open.after=r.secretbox.open,r.box.keyPair=function(){var r=new Uint8Array(Er),t=new Uint8Array(xr);return k(r,t),{publicKey:r,secretKey:t}},r.box.keyPair.fromSecretKey=function(r){if(Q(r),r.length!==xr)throw new Error("bad secret key size");var t=new Uint8Array(Er);return Y(t,r),{publicKey:t,secretKey:new Uint8Array(r)}},r.box.publicKeyLength=Er,r.box.secretKeyLength=xr,r.box.sharedKeyLength=Mr,r.box.nonceLength=mr,r.box.overheadLength=r.secretbox.overheadLength,r.sign=function(r,t){if(Q(r,t),t.length!==Yr)throw new Error("bad secret key size");var n=new Uint8Array(Kr+r.length);return V(n,r,r.length,t),n},r.sign.open=function(r,t){if(2!==arguments.length)throw new Error("nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?");if(Q(r,t),t.length!==Tr)throw new Error("bad public key size");var n=new Uint8Array(r.length),e=D(n,r,r.length,t);if(0>e)return null;for(var o=new Uint8Array(e),i=0;i<o.length;i++)o[i]=n[i];return o},r.sign.detached=function(t,n){for(var e=r.sign(t,n),o=new Uint8Array(Kr),i=0;i<o.length;i++)o[i]=e[i];return o},r.sign.detached.verify=function(r,t,n){if(Q(r,t,n),t.length!==Kr)throw new Error("bad signature size");if(n.length!==Tr)throw new Error("bad public key size");var e,o=new Uint8Array(Kr+r.length),i=new Uint8Array(Kr+r.length);for(e=0;Kr>e;e++)o[e]=t[e];for(e=0;e<r.length;e++)o[e+Kr]=r[e];return D(i,o,o.length,n)>=0},r.sign.keyPair=function(){var r=new Uint8Array(Tr),t=new Uint8Array(Yr);return Z(r,t),{publicKey:r,secretKey:t}},r.sign.keyPair.fromSecretKey=function(r){if(Q(r),r.length!==Yr)throw new Error("bad secret key size");for(var t=new Uint8Array(Tr),n=0;n<t.length;n++)t[n]=r[32+n];return{publicKey:t,secretKey:new Uint8Array(r)}},r.sign.keyPair.fromSeed=function(r){if(Q(r),r.length!==kr)throw new Error("bad seed size");for(var t=new Uint8Array(Tr),n=new Uint8Array(Yr),e=0;32>e;e++)n[e]=r[e];return Z(t,n,!0),{publicKey:t,secretKey:n}},r.sign.publicKeyLength=Tr,r.sign.secretKeyLength=Yr,r.sign.seedLength=kr,r.sign.signatureLength=Kr,r.hash=function(r){Q(r);var t=new Uint8Array(Lr);return O(t,r,r.length),t},r.hash.hashLength=Lr,r.verify=function(r,t){return Q(r,t),
-0===r.length||0===t.length?!1:r.length!==t.length?!1:0===n(r,0,t,0,r.length)?!0:!1},r.setPRNG=function(r){rr=r},function(){var t="undefined"!=typeof self?self.crypto||self.msCrypto:null;if(t&&t.getRandomValues){var n=65536;r.setPRNG(function(r,e){var o,i=new Uint8Array(e);for(o=0;e>o;o+=n)t.getRandomValues(i.subarray(o,o+Math.min(e-o,n)));for(o=0;e>o;o++)r[o]=i[o];W(i)})}else"undefined"!=typeof require&&(t=require("crypto"),t&&t.randomBytes&&r.setPRNG(function(r,n){var e,o=t.randomBytes(n);for(e=0;n>e;e++)r[e]=o[e];W(o)}))}()}("undefined"!=typeof module&&module.exports?module.exports:self.nacl=self.nacl||{}); \ No newline at end of file
+!function(r){"use strict";function t(r,t,n,e){r[t]=n>>24&255,r[t+1]=n>>16&255,r[t+2]=n>>8&255,r[t+3]=255&n,r[t+4]=e>>24&255,r[t+5]=e>>16&255,r[t+6]=e>>8&255,r[t+7]=255&e}function n(r,t,n,e,o){var i,h=0;for(i=0;o>i;i++)h|=r[t+i]^n[e+i];return(1&h-1>>>8)-1}function e(r,t,e,o){return n(r,t,e,o,16)}function o(r,t,e,o){return n(r,t,e,o,32)}function i(r,t,n,e){for(var o,i=255&e[0]|(255&e[1])<<8|(255&e[2])<<16|(255&e[3])<<24,h=255&n[0]|(255&n[1])<<8|(255&n[2])<<16|(255&n[3])<<24,a=255&n[4]|(255&n[5])<<8|(255&n[6])<<16|(255&n[7])<<24,f=255&n[8]|(255&n[9])<<8|(255&n[10])<<16|(255&n[11])<<24,s=255&n[12]|(255&n[13])<<8|(255&n[14])<<16|(255&n[15])<<24,u=255&e[4]|(255&e[5])<<8|(255&e[6])<<16|(255&e[7])<<24,c=255&t[0]|(255&t[1])<<8|(255&t[2])<<16|(255&t[3])<<24,y=255&t[4]|(255&t[5])<<8|(255&t[6])<<16|(255&t[7])<<24,l=255&t[8]|(255&t[9])<<8|(255&t[10])<<16|(255&t[11])<<24,w=255&t[12]|(255&t[13])<<8|(255&t[14])<<16|(255&t[15])<<24,p=255&e[8]|(255&e[9])<<8|(255&e[10])<<16|(255&e[11])<<24,g=255&n[16]|(255&n[17])<<8|(255&n[18])<<16|(255&n[19])<<24,v=255&n[20]|(255&n[21])<<8|(255&n[22])<<16|(255&n[23])<<24,b=255&n[24]|(255&n[25])<<8|(255&n[26])<<16|(255&n[27])<<24,d=255&n[28]|(255&n[29])<<8|(255&n[30])<<16|(255&n[31])<<24,A=255&e[12]|(255&e[13])<<8|(255&e[14])<<16|(255&e[15])<<24,_=i,U=h,E=a,x=f,M=s,m=u,B=c,S=y,K=l,T=w,Y=p,k=g,L=v,C=b,R=d,z=A,P=0;20>P;P+=2)o=_+L|0,M^=o<<7|o>>>25,o=M+_|0,K^=o<<9|o>>>23,o=K+M|0,L^=o<<13|o>>>19,o=L+K|0,_^=o<<18|o>>>14,o=m+U|0,T^=o<<7|o>>>25,o=T+m|0,C^=o<<9|o>>>23,o=C+T|0,U^=o<<13|o>>>19,o=U+C|0,m^=o<<18|o>>>14,o=Y+B|0,R^=o<<7|o>>>25,o=R+Y|0,E^=o<<9|o>>>23,o=E+R|0,B^=o<<13|o>>>19,o=B+E|0,Y^=o<<18|o>>>14,o=z+k|0,x^=o<<7|o>>>25,o=x+z|0,S^=o<<9|o>>>23,o=S+x|0,k^=o<<13|o>>>19,o=k+S|0,z^=o<<18|o>>>14,o=_+x|0,U^=o<<7|o>>>25,o=U+_|0,E^=o<<9|o>>>23,o=E+U|0,x^=o<<13|o>>>19,o=x+E|0,_^=o<<18|o>>>14,o=m+M|0,B^=o<<7|o>>>25,o=B+m|0,S^=o<<9|o>>>23,o=S+B|0,M^=o<<13|o>>>19,o=M+S|0,m^=o<<18|o>>>14,o=Y+T|0,k^=o<<7|o>>>25,o=k+Y|0,K^=o<<9|o>>>23,o=K+k|0,T^=o<<13|o>>>19,o=T+K|0,Y^=o<<18|o>>>14,o=z+R|0,L^=o<<7|o>>>25,o=L+z|0,C^=o<<9|o>>>23,o=C+L|0,R^=o<<13|o>>>19,o=R+C|0,z^=o<<18|o>>>14;_=_+i|0,U=U+h|0,E=E+a|0,x=x+f|0,M=M+s|0,m=m+u|0,B=B+c|0,S=S+y|0,K=K+l|0,T=T+w|0,Y=Y+p|0,k=k+g|0,L=L+v|0,C=C+b|0,R=R+d|0,z=z+A|0,r[0]=_>>>0&255,r[1]=_>>>8&255,r[2]=_>>>16&255,r[3]=_>>>24&255,r[4]=U>>>0&255,r[5]=U>>>8&255,r[6]=U>>>16&255,r[7]=U>>>24&255,r[8]=E>>>0&255,r[9]=E>>>8&255,r[10]=E>>>16&255,r[11]=E>>>24&255,r[12]=x>>>0&255,r[13]=x>>>8&255,r[14]=x>>>16&255,r[15]=x>>>24&255,r[16]=M>>>0&255,r[17]=M>>>8&255,r[18]=M>>>16&255,r[19]=M>>>24&255,r[20]=m>>>0&255,r[21]=m>>>8&255,r[22]=m>>>16&255,r[23]=m>>>24&255,r[24]=B>>>0&255,r[25]=B>>>8&255,r[26]=B>>>16&255,r[27]=B>>>24&255,r[28]=S>>>0&255,r[29]=S>>>8&255,r[30]=S>>>16&255,r[31]=S>>>24&255,r[32]=K>>>0&255,r[33]=K>>>8&255,r[34]=K>>>16&255,r[35]=K>>>24&255,r[36]=T>>>0&255,r[37]=T>>>8&255,r[38]=T>>>16&255,r[39]=T>>>24&255,r[40]=Y>>>0&255,r[41]=Y>>>8&255,r[42]=Y>>>16&255,r[43]=Y>>>24&255,r[44]=k>>>0&255,r[45]=k>>>8&255,r[46]=k>>>16&255,r[47]=k>>>24&255,r[48]=L>>>0&255,r[49]=L>>>8&255,r[50]=L>>>16&255,r[51]=L>>>24&255,r[52]=C>>>0&255,r[53]=C>>>8&255,r[54]=C>>>16&255,r[55]=C>>>24&255,r[56]=R>>>0&255,r[57]=R>>>8&255,r[58]=R>>>16&255,r[59]=R>>>24&255,r[60]=z>>>0&255,r[61]=z>>>8&255,r[62]=z>>>16&255,r[63]=z>>>24&255}function h(r,t,n,e){for(var o,i=255&e[0]|(255&e[1])<<8|(255&e[2])<<16|(255&e[3])<<24,h=255&n[0]|(255&n[1])<<8|(255&n[2])<<16|(255&n[3])<<24,a=255&n[4]|(255&n[5])<<8|(255&n[6])<<16|(255&n[7])<<24,f=255&n[8]|(255&n[9])<<8|(255&n[10])<<16|(255&n[11])<<24,s=255&n[12]|(255&n[13])<<8|(255&n[14])<<16|(255&n[15])<<24,u=255&e[4]|(255&e[5])<<8|(255&e[6])<<16|(255&e[7])<<24,c=255&t[0]|(255&t[1])<<8|(255&t[2])<<16|(255&t[3])<<24,y=255&t[4]|(255&t[5])<<8|(255&t[6])<<16|(255&t[7])<<24,l=255&t[8]|(255&t[9])<<8|(255&t[10])<<16|(255&t[11])<<24,w=255&t[12]|(255&t[13])<<8|(255&t[14])<<16|(255&t[15])<<24,p=255&e[8]|(255&e[9])<<8|(255&e[10])<<16|(255&e[11])<<24,g=255&n[16]|(255&n[17])<<8|(255&n[18])<<16|(255&n[19])<<24,v=255&n[20]|(255&n[21])<<8|(255&n[22])<<16|(255&n[23])<<24,b=255&n[24]|(255&n[25])<<8|(255&n[26])<<16|(255&n[27])<<24,d=255&n[28]|(255&n[29])<<8|(255&n[30])<<16|(255&n[31])<<24,A=255&e[12]|(255&e[13])<<8|(255&e[14])<<16|(255&e[15])<<24,_=i,U=h,E=a,x=f,M=s,m=u,B=c,S=y,K=l,T=w,Y=p,k=g,L=v,C=b,R=d,z=A,P=0;20>P;P+=2)o=_+L|0,M^=o<<7|o>>>25,o=M+_|0,K^=o<<9|o>>>23,o=K+M|0,L^=o<<13|o>>>19,o=L+K|0,_^=o<<18|o>>>14,o=m+U|0,T^=o<<7|o>>>25,o=T+m|0,C^=o<<9|o>>>23,o=C+T|0,U^=o<<13|o>>>19,o=U+C|0,m^=o<<18|o>>>14,o=Y+B|0,R^=o<<7|o>>>25,o=R+Y|0,E^=o<<9|o>>>23,o=E+R|0,B^=o<<13|o>>>19,o=B+E|0,Y^=o<<18|o>>>14,o=z+k|0,x^=o<<7|o>>>25,o=x+z|0,S^=o<<9|o>>>23,o=S+x|0,k^=o<<13|o>>>19,o=k+S|0,z^=o<<18|o>>>14,o=_+x|0,U^=o<<7|o>>>25,o=U+_|0,E^=o<<9|o>>>23,o=E+U|0,x^=o<<13|o>>>19,o=x+E|0,_^=o<<18|o>>>14,o=m+M|0,B^=o<<7|o>>>25,o=B+m|0,S^=o<<9|o>>>23,o=S+B|0,M^=o<<13|o>>>19,o=M+S|0,m^=o<<18|o>>>14,o=Y+T|0,k^=o<<7|o>>>25,o=k+Y|0,K^=o<<9|o>>>23,o=K+k|0,T^=o<<13|o>>>19,o=T+K|0,Y^=o<<18|o>>>14,o=z+R|0,L^=o<<7|o>>>25,o=L+z|0,C^=o<<9|o>>>23,o=C+L|0,R^=o<<13|o>>>19,o=R+C|0,z^=o<<18|o>>>14;r[0]=_>>>0&255,r[1]=_>>>8&255,r[2]=_>>>16&255,r[3]=_>>>24&255,r[4]=m>>>0&255,r[5]=m>>>8&255,r[6]=m>>>16&255,r[7]=m>>>24&255,r[8]=Y>>>0&255,r[9]=Y>>>8&255,r[10]=Y>>>16&255,r[11]=Y>>>24&255,r[12]=z>>>0&255,r[13]=z>>>8&255,r[14]=z>>>16&255,r[15]=z>>>24&255,r[16]=B>>>0&255,r[17]=B>>>8&255,r[18]=B>>>16&255,r[19]=B>>>24&255,r[20]=S>>>0&255,r[21]=S>>>8&255,r[22]=S>>>16&255,r[23]=S>>>24&255,r[24]=K>>>0&255,r[25]=K>>>8&255,r[26]=K>>>16&255,r[27]=K>>>24&255,r[28]=T>>>0&255,r[29]=T>>>8&255,r[30]=T>>>16&255,r[31]=T>>>24&255}function a(r,t,n,e){i(r,t,n,e)}function f(r,t,n,e){h(r,t,n,e)}function s(r,t,n,e,o,i,h){var f,s,u=new Uint8Array(16),c=new Uint8Array(64);for(s=0;16>s;s++)u[s]=0;for(s=0;8>s;s++)u[s]=i[s];for(;o>=64;){for(a(c,u,h,cr),s=0;64>s;s++)r[t+s]=n[e+s]^c[s];for(f=1,s=8;16>s;s++)f=f+(255&u[s])|0,u[s]=255&f,f>>>=8;o-=64,t+=64,e+=64}if(o>0)for(a(c,u,h,cr),s=0;o>s;s++)r[t+s]=n[e+s]^c[s];return 0}function u(r,t,n,e,o){var i,h,f=new Uint8Array(16),s=new Uint8Array(64);for(h=0;16>h;h++)f[h]=0;for(h=0;8>h;h++)f[h]=e[h];for(;n>=64;){for(a(s,f,o,cr),h=0;64>h;h++)r[t+h]=s[h];for(i=1,h=8;16>h;h++)i=i+(255&f[h])|0,f[h]=255&i,i>>>=8;n-=64,t+=64}if(n>0)for(a(s,f,o,cr),h=0;n>h;h++)r[t+h]=s[h];return 0}function c(r,t,n,e,o){var i=new Uint8Array(32);f(i,e,o,cr);for(var h=new Uint8Array(8),a=0;8>a;a++)h[a]=e[a+16];return u(r,t,n,h,i)}function y(r,t,n,e,o,i,h){var a=new Uint8Array(32);f(a,i,h,cr);for(var u=new Uint8Array(8),c=0;8>c;c++)u[c]=i[c+16];return s(r,t,n,e,o,u,a)}function l(r,t,n,e,o,i){var h=new yr(i);return h.update(n,e,o),h.finish(r,t),0}function w(r,t,n,o,i,h){var a=new Uint8Array(16);return l(a,0,n,o,i,h),e(r,t,a,0)}function p(r,t,n,e,o){var i;if(32>n)return-1;for(y(r,0,t,0,n,e,o),l(r,16,r,32,n-32,r),i=0;16>i;i++)r[i]=0;return 0}function g(r,t,n,e,o){var i,h=new Uint8Array(32);if(32>n)return-1;if(c(h,0,32,e,o),0!==w(t,16,t,32,n-32,h))return-1;for(y(r,0,t,0,n,e,o),i=0;32>i;i++)r[i]=0;return 0}function v(r,t){var n;for(n=0;16>n;n++)r[n]=0|t[n]}function b(r){var t,n,e=1;for(t=0;16>t;t++)n=r[t]+e+65535,e=Math.floor(n/65536),r[t]=n-65536*e;r[0]+=e-1+37*(e-1)}function d(r,t,n){for(var e,o=~(n-1),i=0;16>i;i++)e=o&(r[i]^t[i]),r[i]^=e,t[i]^=e}function A(r,t){var n,e,o,i=$(),h=$();for(n=0;16>n;n++)h[n]=t[n];for(b(h),b(h),b(h),e=0;2>e;e++){for(i[0]=h[0]-65517,n=1;15>n;n++)i[n]=h[n]-65535-(i[n-1]>>16&1),i[n-1]&=65535;i[15]=h[15]-32767-(i[14]>>16&1),o=i[15]>>16&1,i[14]&=65535,d(h,i,1-o)}for(n=0;16>n;n++)r[2*n]=255&h[n],r[2*n+1]=h[n]>>8}function _(r,t){var n=new Uint8Array(32),e=new Uint8Array(32);return A(n,r),A(e,t),o(n,0,e,0)}function U(r){var t=new Uint8Array(32);return A(t,r),1&t[0]}function E(r,t){var n;for(n=0;16>n;n++)r[n]=t[2*n]+(t[2*n+1]<<8);r[15]&=32767}function x(r,t,n){for(var e=0;16>e;e++)r[e]=t[e]+n[e]}function M(r,t,n){for(var e=0;16>e;e++)r[e]=t[e]-n[e]}function m(r,t,n){var e,o,i=0,h=0,a=0,f=0,s=0,u=0,c=0,y=0,l=0,w=0,p=0,g=0,v=0,b=0,d=0,A=0,_=0,U=0,E=0,x=0,M=0,m=0,B=0,S=0,K=0,T=0,Y=0,k=0,L=0,C=0,R=0,z=n[0],P=n[1],O=n[2],N=n[3],F=n[4],I=n[5],j=n[6],G=n[7],Z=n[8],V=n[9],q=n[10],X=n[11],D=n[12],H=n[13],J=n[14],Q=n[15];e=t[0],i+=e*z,h+=e*P,a+=e*O,f+=e*N,s+=e*F,u+=e*I,c+=e*j,y+=e*G,l+=e*Z,w+=e*V,p+=e*q,g+=e*X,v+=e*D,b+=e*H,d+=e*J,A+=e*Q,e=t[1],h+=e*z,a+=e*P,f+=e*O,s+=e*N,u+=e*F,c+=e*I,y+=e*j,l+=e*G,w+=e*Z,p+=e*V,g+=e*q,v+=e*X,b+=e*D,d+=e*H,A+=e*J,_+=e*Q,e=t[2],a+=e*z,f+=e*P,s+=e*O,u+=e*N,c+=e*F,y+=e*I,l+=e*j,w+=e*G,p+=e*Z,g+=e*V,v+=e*q,b+=e*X,d+=e*D,A+=e*H,_+=e*J,U+=e*Q,e=t[3],f+=e*z,s+=e*P,u+=e*O,c+=e*N,y+=e*F,l+=e*I,w+=e*j,p+=e*G,g+=e*Z,v+=e*V,b+=e*q,d+=e*X,A+=e*D,_+=e*H,U+=e*J,E+=e*Q,e=t[4],s+=e*z,u+=e*P,c+=e*O,y+=e*N,l+=e*F,w+=e*I,p+=e*j,g+=e*G,v+=e*Z,b+=e*V,d+=e*q,A+=e*X,_+=e*D,U+=e*H,E+=e*J,x+=e*Q,e=t[5],u+=e*z,c+=e*P,y+=e*O,l+=e*N,w+=e*F,p+=e*I,g+=e*j,v+=e*G,b+=e*Z,d+=e*V,A+=e*q,_+=e*X,U+=e*D,E+=e*H,x+=e*J,M+=e*Q,e=t[6],c+=e*z,y+=e*P,l+=e*O,w+=e*N,p+=e*F,g+=e*I,v+=e*j,b+=e*G,d+=e*Z,A+=e*V,_+=e*q,U+=e*X,E+=e*D,x+=e*H,M+=e*J,m+=e*Q,e=t[7],y+=e*z,l+=e*P,w+=e*O,p+=e*N,g+=e*F,v+=e*I,b+=e*j,d+=e*G,A+=e*Z,_+=e*V,U+=e*q,E+=e*X,x+=e*D,M+=e*H,m+=e*J,B+=e*Q,e=t[8],l+=e*z,w+=e*P,p+=e*O,g+=e*N,v+=e*F,b+=e*I,d+=e*j,A+=e*G,_+=e*Z,U+=e*V,E+=e*q,x+=e*X,M+=e*D,m+=e*H,B+=e*J,S+=e*Q,e=t[9],w+=e*z,p+=e*P,g+=e*O,v+=e*N,b+=e*F,d+=e*I,A+=e*j,_+=e*G,U+=e*Z,E+=e*V,x+=e*q,M+=e*X,m+=e*D,B+=e*H,S+=e*J,K+=e*Q,e=t[10],p+=e*z,g+=e*P,v+=e*O,b+=e*N,d+=e*F,A+=e*I,_+=e*j,U+=e*G,E+=e*Z,x+=e*V,M+=e*q,m+=e*X,B+=e*D,S+=e*H,K+=e*J,T+=e*Q,e=t[11],g+=e*z,v+=e*P,b+=e*O,d+=e*N,A+=e*F,_+=e*I,U+=e*j,E+=e*G,x+=e*Z,M+=e*V,m+=e*q,B+=e*X,S+=e*D,K+=e*H,T+=e*J,Y+=e*Q,e=t[12],v+=e*z,b+=e*P,d+=e*O,A+=e*N,_+=e*F,U+=e*I,E+=e*j,x+=e*G,M+=e*Z,m+=e*V,B+=e*q,S+=e*X,K+=e*D,T+=e*H,Y+=e*J,k+=e*Q,e=t[13],b+=e*z,d+=e*P,A+=e*O,_+=e*N,U+=e*F,E+=e*I,x+=e*j,M+=e*G,m+=e*Z,B+=e*V,S+=e*q,K+=e*X,T+=e*D,Y+=e*H,k+=e*J,L+=e*Q,e=t[14],d+=e*z,A+=e*P,_+=e*O,U+=e*N,E+=e*F,x+=e*I,M+=e*j,m+=e*G,B+=e*Z,S+=e*V,K+=e*q,T+=e*X,Y+=e*D,k+=e*H,L+=e*J,C+=e*Q,e=t[15],A+=e*z,_+=e*P,U+=e*O,E+=e*N,x+=e*F,M+=e*I,m+=e*j,B+=e*G,S+=e*Z,K+=e*V,T+=e*q,Y+=e*X,k+=e*D,L+=e*H,C+=e*J,R+=e*Q,i+=38*_,h+=38*U,a+=38*E,f+=38*x,s+=38*M,u+=38*m,c+=38*B,y+=38*S,l+=38*K,w+=38*T,p+=38*Y,g+=38*k,v+=38*L,b+=38*C,d+=38*R,o=1,e=i+o+65535,o=Math.floor(e/65536),i=e-65536*o,e=h+o+65535,o=Math.floor(e/65536),h=e-65536*o,e=a+o+65535,o=Math.floor(e/65536),a=e-65536*o,e=f+o+65535,o=Math.floor(e/65536),f=e-65536*o,e=s+o+65535,o=Math.floor(e/65536),s=e-65536*o,e=u+o+65535,o=Math.floor(e/65536),u=e-65536*o,e=c+o+65535,o=Math.floor(e/65536),c=e-65536*o,e=y+o+65535,o=Math.floor(e/65536),y=e-65536*o,e=l+o+65535,o=Math.floor(e/65536),l=e-65536*o,e=w+o+65535,o=Math.floor(e/65536),w=e-65536*o,e=p+o+65535,o=Math.floor(e/65536),p=e-65536*o,e=g+o+65535,o=Math.floor(e/65536),g=e-65536*o,e=v+o+65535,o=Math.floor(e/65536),v=e-65536*o,e=b+o+65535,o=Math.floor(e/65536),b=e-65536*o,e=d+o+65535,o=Math.floor(e/65536),d=e-65536*o,e=A+o+65535,o=Math.floor(e/65536),A=e-65536*o,i+=o-1+37*(o-1),o=1,e=i+o+65535,o=Math.floor(e/65536),i=e-65536*o,e=h+o+65535,o=Math.floor(e/65536),h=e-65536*o,e=a+o+65535,o=Math.floor(e/65536),a=e-65536*o,e=f+o+65535,o=Math.floor(e/65536),f=e-65536*o,e=s+o+65535,o=Math.floor(e/65536),s=e-65536*o,e=u+o+65535,o=Math.floor(e/65536),u=e-65536*o,e=c+o+65535,o=Math.floor(e/65536),c=e-65536*o,e=y+o+65535,o=Math.floor(e/65536),y=e-65536*o,e=l+o+65535,o=Math.floor(e/65536),l=e-65536*o,e=w+o+65535,o=Math.floor(e/65536),w=e-65536*o,e=p+o+65535,o=Math.floor(e/65536),p=e-65536*o,e=g+o+65535,o=Math.floor(e/65536),g=e-65536*o,e=v+o+65535,o=Math.floor(e/65536),v=e-65536*o,e=b+o+65535,o=Math.floor(e/65536),b=e-65536*o,e=d+o+65535,o=Math.floor(e/65536),d=e-65536*o,e=A+o+65535,o=Math.floor(e/65536),A=e-65536*o,i+=o-1+37*(o-1),r[0]=i,r[1]=h,r[2]=a,r[3]=f,r[4]=s,r[5]=u,r[6]=c,r[7]=y,r[8]=l,r[9]=w,r[10]=p,r[11]=g,r[12]=v,r[13]=b,r[14]=d,r[15]=A}function B(r,t){m(r,t,t)}function S(r,t){var n,e=$();for(n=0;16>n;n++)e[n]=t[n];for(n=253;n>=0;n--)B(e,e),2!==n&&4!==n&&m(e,e,t);for(n=0;16>n;n++)r[n]=e[n]}function K(r,t){var n,e=$();for(n=0;16>n;n++)e[n]=t[n];for(n=250;n>=0;n--)B(e,e),1!==n&&m(e,e,t);for(n=0;16>n;n++)r[n]=e[n]}function T(r,t,n){var e,o,i=new Uint8Array(32),h=new Float64Array(80),a=$(),f=$(),s=$(),u=$(),c=$(),y=$();for(o=0;31>o;o++)i[o]=t[o];for(i[31]=127&t[31]|64,i[0]&=248,E(h,n),o=0;16>o;o++)f[o]=h[o],u[o]=a[o]=s[o]=0;for(a[0]=u[0]=1,o=254;o>=0;--o)e=i[o>>>3]>>>(7&o)&1,d(a,f,e),d(s,u,e),x(c,a,s),M(a,a,s),x(s,f,u),M(f,f,u),B(u,c),B(y,a),m(a,s,a),m(s,f,c),x(c,a,s),M(a,a,s),B(f,a),M(s,u,y),m(a,s,ir),x(a,a,u),m(s,s,a),m(a,u,y),m(u,f,h),B(f,c),d(a,f,e),d(s,u,e);for(o=0;16>o;o++)h[o+16]=a[o],h[o+32]=s[o],h[o+48]=f[o],h[o+64]=u[o];var l=h.subarray(32),w=h.subarray(16);return S(l,l),m(w,w,l),A(r,w),0}function Y(r,t){return T(r,t,nr)}function k(r,t){return rr(t,32),Y(r,t)}function L(r,t,n){var e=new Uint8Array(32);return T(e,n,t),f(r,tr,e,cr)}function C(r,t,n,e,o,i){var h=new Uint8Array(32);return L(h,o,i),lr(r,t,n,e,h)}function R(r,t,n,e,o,i){var h=new Uint8Array(32);return L(h,o,i),wr(r,t,n,e,h)}function z(r,t,n,e){for(var o,i,h,a,f,s,u,c,y,l,w,p,g,v,b,d,A,_,U,E,x,M,m,B,S,K,T=new Int32Array(16),Y=new Int32Array(16),k=r[0],L=r[1],C=r[2],R=r[3],z=r[4],P=r[5],O=r[6],N=r[7],F=t[0],I=t[1],j=t[2],G=t[3],Z=t[4],V=t[5],q=t[6],X=t[7],D=0;e>=128;){for(U=0;16>U;U++)E=8*U+D,T[U]=n[E+0]<<24|n[E+1]<<16|n[E+2]<<8|n[E+3],Y[U]=n[E+4]<<24|n[E+5]<<16|n[E+6]<<8|n[E+7];for(U=0;80>U;U++)if(o=k,i=L,h=C,a=R,f=z,s=P,u=O,c=N,y=F,l=I,w=j,p=G,g=Z,v=V,b=q,d=X,x=N,M=X,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=(z>>>14|Z<<18)^(z>>>18|Z<<14)^(Z>>>9|z<<23),M=(Z>>>14|z<<18)^(Z>>>18|z<<14)^(z>>>9|Z<<23),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=z&P^~z&O,M=Z&V^~Z&q,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=pr[2*U],M=pr[2*U+1],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=T[U%16],M=Y[U%16],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,A=65535&S|K<<16,_=65535&m|B<<16,x=A,M=_,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=(k>>>28|F<<4)^(F>>>2|k<<30)^(F>>>7|k<<25),M=(F>>>28|k<<4)^(k>>>2|F<<30)^(k>>>7|F<<25),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,x=k&L^k&C^L&C,M=F&I^F&j^I&j,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,c=65535&S|K<<16,d=65535&m|B<<16,x=a,M=p,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=A,M=_,m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,a=65535&S|K<<16,p=65535&m|B<<16,L=o,C=i,R=h,z=a,P=f,O=s,N=u,k=c,I=y,j=l,G=w,Z=p,V=g,q=v,X=b,F=d,U%16===15)for(E=0;16>E;E++)x=T[E],M=Y[E],m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=T[(E+9)%16],M=Y[(E+9)%16],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,A=T[(E+1)%16],_=Y[(E+1)%16],x=(A>>>1|_<<31)^(A>>>8|_<<24)^A>>>7,M=(_>>>1|A<<31)^(_>>>8|A<<24)^(_>>>7|A<<25),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,A=T[(E+14)%16],_=Y[(E+14)%16],x=(A>>>19|_<<13)^(_>>>29|A<<3)^A>>>6,M=(_>>>19|A<<13)^(A>>>29|_<<3)^(_>>>6|A<<26),m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,T[E]=65535&S|K<<16,Y[E]=65535&m|B<<16;x=k,M=F,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[0],M=t[0],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[0]=k=65535&S|K<<16,t[0]=F=65535&m|B<<16,x=L,M=I,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[1],M=t[1],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[1]=L=65535&S|K<<16,t[1]=I=65535&m|B<<16,x=C,M=j,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[2],M=t[2],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[2]=C=65535&S|K<<16,t[2]=j=65535&m|B<<16,x=R,M=G,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[3],M=t[3],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[3]=R=65535&S|K<<16,t[3]=G=65535&m|B<<16,x=z,M=Z,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[4],M=t[4],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[4]=z=65535&S|K<<16,t[4]=Z=65535&m|B<<16,x=P,M=V,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[5],M=t[5],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[5]=P=65535&S|K<<16,t[5]=V=65535&m|B<<16,x=O,M=q,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[6],M=t[6],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[6]=O=65535&S|K<<16,t[6]=q=65535&m|B<<16,x=N,M=X,m=65535&M,B=M>>>16,S=65535&x,K=x>>>16,x=r[7],M=t[7],m+=65535&M,B+=M>>>16,S+=65535&x,K+=x>>>16,B+=m>>>16,S+=B>>>16,K+=S>>>16,r[7]=N=65535&S|K<<16,t[7]=X=65535&m|B<<16,D+=128,e-=128}return e}function P(r,n,e){var o,i=new Int32Array(8),h=new Int32Array(8),a=new Uint8Array(256),f=e;for(i[0]=1779033703,i[1]=3144134277,i[2]=1013904242,i[3]=2773480762,i[4]=1359893119,i[5]=2600822924,i[6]=528734635,i[7]=1541459225,h[0]=4089235720,h[1]=2227873595,h[2]=4271175723,h[3]=1595750129,h[4]=2917565137,h[5]=725511199,h[6]=4215389547,h[7]=327033209,z(i,h,n,e),e%=128,o=0;e>o;o++)a[o]=n[f-e+o];for(a[e]=128,e=256-128*(112>e?1:0),a[e-9]=0,t(a,e-8,f/536870912|0,f<<3),z(i,h,a,e),o=0;8>o;o++)t(r,8*o,i[o],h[o]);return 0}function O(r,t){var n=$(),e=$(),o=$(),i=$(),h=$(),a=$(),f=$(),s=$(),u=$();M(n,r[1],r[0]),M(u,t[1],t[0]),m(n,n,u),x(e,r[0],r[1]),x(u,t[0],t[1]),m(e,e,u),m(o,r[3],t[3]),m(o,o,ar),m(i,r[2],t[2]),x(i,i,i),M(h,e,n),M(a,i,o),x(f,i,o),x(s,e,n),m(r[0],h,a),m(r[1],s,f),m(r[2],f,a),m(r[3],h,s)}function N(r,t,n){var e;for(e=0;4>e;e++)d(r[e],t[e],n)}function F(r,t){var n=$(),e=$(),o=$();S(o,t[2]),m(n,t[0],o),m(e,t[1],o),A(r,e),r[31]^=U(n)<<7}function I(r,t,n){var e,o;for(v(r[0],er),v(r[1],or),v(r[2],or),v(r[3],er),o=255;o>=0;--o)e=n[o/8|0]>>(7&o)&1,N(r,t,e),O(t,r),O(r,r),N(r,t,e)}function j(r,t){var n=[$(),$(),$(),$()];v(n[0],fr),v(n[1],sr),v(n[2],or),m(n[3],fr,sr),I(r,n,t)}function G(r,t,n){var e,o=new Uint8Array(64),i=[$(),$(),$(),$()];for(n||rr(t,32),P(o,t,32),o[0]&=248,o[31]&=127,o[31]|=64,j(i,o),F(r,i),e=0;32>e;e++)t[e+32]=r[e];return 0}function Z(r,t){var n,e,o,i;for(e=63;e>=32;--e){for(n=0,o=e-32,i=e-12;i>o;++o)t[o]+=n-16*t[e]*gr[o-(e-32)],n=t[o]+128>>8,t[o]-=256*n;t[o]+=n,t[e]=0}for(n=0,o=0;32>o;o++)t[o]+=n-(t[31]>>4)*gr[o],n=t[o]>>8,t[o]&=255;for(o=0;32>o;o++)t[o]-=n*gr[o];for(e=0;32>e;e++)t[e+1]+=t[e]>>8,r[e]=255&t[e]}function V(r){var t,n=new Float64Array(64);for(t=0;64>t;t++)n[t]=r[t];for(t=0;64>t;t++)r[t]=0;Z(r,n)}function q(r,t,n,e){var o,i,h=new Uint8Array(64),a=new Uint8Array(64),f=new Uint8Array(64),s=new Float64Array(64),u=[$(),$(),$(),$()];P(h,e,32),h[0]&=248,h[31]&=127,h[31]|=64;var c=n+64;for(o=0;n>o;o++)r[64+o]=t[o];for(o=0;32>o;o++)r[32+o]=h[32+o];for(P(f,r.subarray(32),n+32),V(f),j(u,f),F(r,u),o=32;64>o;o++)r[o]=e[o];for(P(a,r,n+64),V(a),o=0;64>o;o++)s[o]=0;for(o=0;32>o;o++)s[o]=f[o];for(o=0;32>o;o++)for(i=0;32>i;i++)s[o+i]+=a[o]*h[i];return Z(r.subarray(32),s),c}function X(r,t){var n=$(),e=$(),o=$(),i=$(),h=$(),a=$(),f=$();return v(r[2],or),E(r[1],t),B(o,r[1]),m(i,o,hr),M(o,o,r[2]),x(i,r[2],i),B(h,i),B(a,h),m(f,a,h),m(n,f,o),m(n,n,i),K(n,n),m(n,n,o),m(n,n,i),m(n,n,i),m(r[0],n,i),B(e,r[0]),m(e,e,i),_(e,o)&&m(r[0],r[0],ur),B(e,r[0]),m(e,e,i),_(e,o)?-1:(U(r[0])===t[31]>>7&&M(r[0],er,r[0]),m(r[3],r[0],r[1]),0)}function D(r,t,n,e){var i,h,a=new Uint8Array(32),f=new Uint8Array(64),s=[$(),$(),$(),$()],u=[$(),$(),$(),$()];if(h=-1,64>n)return-1;if(X(u,e))return-1;for(i=0;n>i;i++)r[i]=t[i];for(i=0;32>i;i++)r[i+32]=e[i];if(P(f,r,n),V(f),I(s,u,f),j(u,t.subarray(32)),O(s,u),F(a,s),n-=64,o(t,0,a,0)){for(i=0;n>i;i++)r[i]=0;return-1}for(i=0;n>i;i++)r[i]=t[i+64];return h=n}function H(r,t){if(r.length!==vr)throw new Error("bad key size");if(t.length!==br)throw new Error("bad nonce size")}function J(r,t){if(r.length!==Er)throw new Error("bad public key size");if(t.length!==xr)throw new Error("bad secret key size")}function Q(){var r,t;for(t=0;t<arguments.length;t++)if("[object Uint8Array]"!==(r=Object.prototype.toString.call(arguments[t])))throw new TypeError("unexpected type "+r+", use Uint8Array")}function W(r){for(var t=0;t<r.length;t++)r[t]=0}var $=function(r){var t,n=new Float64Array(16);if(r)for(t=0;t<r.length;t++)n[t]=r[t];return n},rr=function(){throw new Error("no PRNG")},tr=new Uint8Array(16),nr=new Uint8Array(32);nr[0]=9;var er=$(),or=$([1]),ir=$([56129,1]),hr=$([30883,4953,19914,30187,55467,16705,2637,112,59544,30585,16505,36039,65139,11119,27886,20995]),ar=$([61785,9906,39828,60374,45398,33411,5274,224,53552,61171,33010,6542,64743,22239,55772,9222]),fr=$([54554,36645,11616,51542,42930,38181,51040,26924,56412,64982,57905,49316,21502,52590,14035,8553]),sr=$([26200,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214]),ur=$([41136,18958,6951,50414,58488,44335,6150,12099,55207,15867,153,11085,57099,20417,9344,11139]),cr=new Uint8Array([101,120,112,97,110,100,32,51,50,45,98,121,116,101,32,107]),yr=function(r){this.buffer=new Uint8Array(16),this.r=new Uint16Array(10),this.h=new Uint16Array(10),this.pad=new Uint16Array(8),this.leftover=0,this.fin=0;var t,n,e,o,i,h,a,f;t=255&r[0]|(255&r[1])<<8,this.r[0]=8191&t,n=255&r[2]|(255&r[3])<<8,this.r[1]=8191&(t>>>13|n<<3),e=255&r[4]|(255&r[5])<<8,this.r[2]=7939&(n>>>10|e<<6),o=255&r[6]|(255&r[7])<<8,this.r[3]=8191&(e>>>7|o<<9),i=255&r[8]|(255&r[9])<<8,this.r[4]=255&(o>>>4|i<<12),this.r[5]=i>>>1&8190,h=255&r[10]|(255&r[11])<<8,this.r[6]=8191&(i>>>14|h<<2),a=255&r[12]|(255&r[13])<<8,this.r[7]=8065&(h>>>11|a<<5),f=255&r[14]|(255&r[15])<<8,this.r[8]=8191&(a>>>8|f<<8),this.r[9]=f>>>5&127,this.pad[0]=255&r[16]|(255&r[17])<<8,this.pad[1]=255&r[18]|(255&r[19])<<8,this.pad[2]=255&r[20]|(255&r[21])<<8,this.pad[3]=255&r[22]|(255&r[23])<<8,this.pad[4]=255&r[24]|(255&r[25])<<8,this.pad[5]=255&r[26]|(255&r[27])<<8,this.pad[6]=255&r[28]|(255&r[29])<<8,this.pad[7]=255&r[30]|(255&r[31])<<8};yr.prototype.blocks=function(r,t,n){for(var e,o,i,h,a,f,s,u,c,y,l,w,p,g,v,b,d,A,_,U=this.fin?0:2048,E=this.h[0],x=this.h[1],M=this.h[2],m=this.h[3],B=this.h[4],S=this.h[5],K=this.h[6],T=this.h[7],Y=this.h[8],k=this.h[9],L=this.r[0],C=this.r[1],R=this.r[2],z=this.r[3],P=this.r[4],O=this.r[5],N=this.r[6],F=this.r[7],I=this.r[8],j=this.r[9];n>=16;)e=255&r[t+0]|(255&r[t+1])<<8,E+=8191&e,o=255&r[t+2]|(255&r[t+3])<<8,x+=8191&(e>>>13|o<<3),i=255&r[t+4]|(255&r[t+5])<<8,M+=8191&(o>>>10|i<<6),h=255&r[t+6]|(255&r[t+7])<<8,m+=8191&(i>>>7|h<<9),a=255&r[t+8]|(255&r[t+9])<<8,B+=8191&(h>>>4|a<<12),S+=a>>>1&8191,f=255&r[t+10]|(255&r[t+11])<<8,K+=8191&(a>>>14|f<<2),s=255&r[t+12]|(255&r[t+13])<<8,T+=8191&(f>>>11|s<<5),u=255&r[t+14]|(255&r[t+15])<<8,Y+=8191&(s>>>8|u<<8),k+=u>>>5|U,c=0,y=c,y+=E*L,y+=5*x*j,y+=5*M*I,y+=5*m*F,y+=5*B*N,c=y>>>13,y&=8191,y+=5*S*O,y+=5*K*P,y+=5*T*z,y+=5*Y*R,y+=5*k*C,c+=y>>>13,y&=8191,l=c,l+=E*C,l+=x*L,l+=5*M*j,l+=5*m*I,l+=5*B*F,c=l>>>13,l&=8191,l+=5*S*N,l+=5*K*O,l+=5*T*P,l+=5*Y*z,l+=5*k*R,c+=l>>>13,l&=8191,w=c,w+=E*R,w+=x*C,w+=M*L,w+=5*m*j,w+=5*B*I,c=w>>>13,w&=8191,w+=5*S*F,w+=5*K*N,w+=5*T*O,w+=5*Y*P,w+=5*k*z,c+=w>>>13,w&=8191,p=c,p+=E*z,p+=x*R,p+=M*C,p+=m*L,p+=5*B*j,c=p>>>13,p&=8191,p+=5*S*I,p+=5*K*F,p+=5*T*N,p+=5*Y*O,p+=5*k*P,c+=p>>>13,p&=8191,g=c,g+=E*P,g+=x*z,g+=M*R,g+=m*C,g+=B*L,c=g>>>13,g&=8191,g+=5*S*j,g+=5*K*I,g+=5*T*F,g+=5*Y*N,g+=5*k*O,c+=g>>>13,g&=8191,v=c,v+=E*O,v+=x*P,v+=M*z,v+=m*R,v+=B*C,c=v>>>13,v&=8191,v+=S*L,v+=5*K*j,v+=5*T*I,v+=5*Y*F,v+=5*k*N,c+=v>>>13,v&=8191,b=c,b+=E*N,b+=x*O,b+=M*P,b+=m*z,b+=B*R,c=b>>>13,b&=8191,b+=S*C,b+=K*L,b+=5*T*j,b+=5*Y*I,b+=5*k*F,c+=b>>>13,b&=8191,d=c,d+=E*F,d+=x*N,d+=M*O,d+=m*P,d+=B*z,c=d>>>13,d&=8191,d+=S*R,d+=K*C,d+=T*L,d+=5*Y*j,d+=5*k*I,c+=d>>>13,d&=8191,A=c,A+=E*I,A+=x*F,A+=M*N,A+=m*O,A+=B*P,c=A>>>13,A&=8191,A+=S*z,A+=K*R,A+=T*C,A+=Y*L,A+=5*k*j,c+=A>>>13,A&=8191,_=c,_+=E*j,_+=x*I,_+=M*F,_+=m*N,_+=B*O,c=_>>>13,_&=8191,_+=S*P,_+=K*z,_+=T*R,_+=Y*C,_+=k*L,c+=_>>>13,_&=8191,c=(c<<2)+c|0,c=c+y|0,y=8191&c,c>>>=13,l+=c,E=y,x=l,M=w,m=p,B=g,S=v,K=b,T=d,Y=A,k=_,t+=16,n-=16;this.h[0]=E,this.h[1]=x,this.h[2]=M,this.h[3]=m,this.h[4]=B,this.h[5]=S,this.h[6]=K,this.h[7]=T,this.h[8]=Y,this.h[9]=k},yr.prototype.finish=function(r,t){var n,e,o,i,h=new Uint16Array(10);if(this.leftover){for(i=this.leftover,this.buffer[i++]=1;16>i;i++)this.buffer[i]=0;this.fin=1,this.blocks(this.buffer,0,16)}for(n=this.h[1]>>>13,this.h[1]&=8191,i=2;10>i;i++)this.h[i]+=n,n=this.h[i]>>>13,this.h[i]&=8191;for(this.h[0]+=5*n,n=this.h[0]>>>13,this.h[0]&=8191,this.h[1]+=n,n=this.h[1]>>>13,this.h[1]&=8191,this.h[2]+=n,h[0]=this.h[0]+5,n=h[0]>>>13,h[0]&=8191,i=1;10>i;i++)h[i]=this.h[i]+n,n=h[i]>>>13,h[i]&=8191;for(h[9]-=8192,e=(h[9]>>>15)-1,i=0;10>i;i++)h[i]&=e;for(e=~e,i=0;10>i;i++)this.h[i]=this.h[i]&e|h[i];for(this.h[0]=65535&(this.h[0]|this.h[1]<<13),this.h[1]=65535&(this.h[1]>>>3|this.h[2]<<10),this.h[2]=65535&(this.h[2]>>>6|this.h[3]<<7),this.h[3]=65535&(this.h[3]>>>9|this.h[4]<<4),this.h[4]=65535&(this.h[4]>>>12|this.h[5]<<1|this.h[6]<<14),this.h[5]=65535&(this.h[6]>>>2|this.h[7]<<11),this.h[6]=65535&(this.h[7]>>>5|this.h[8]<<8),this.h[7]=65535&(this.h[8]>>>8|this.h[9]<<5),o=this.h[0]+this.pad[0],this.h[0]=65535&o,i=1;8>i;i++)o=(this.h[i]+this.pad[i]|0)+(o>>>16)|0,this.h[i]=65535&o;r[t+0]=this.h[0]>>>0&255,r[t+1]=this.h[0]>>>8&255,r[t+2]=this.h[1]>>>0&255,r[t+3]=this.h[1]>>>8&255,r[t+4]=this.h[2]>>>0&255,r[t+5]=this.h[2]>>>8&255,r[t+6]=this.h[3]>>>0&255,r[t+7]=this.h[3]>>>8&255,r[t+8]=this.h[4]>>>0&255,r[t+9]=this.h[4]>>>8&255,r[t+10]=this.h[5]>>>0&255,r[t+11]=this.h[5]>>>8&255,r[t+12]=this.h[6]>>>0&255,r[t+13]=this.h[6]>>>8&255,r[t+14]=this.h[7]>>>0&255,r[t+15]=this.h[7]>>>8&255},yr.prototype.update=function(r,t,n){var e,o;if(this.leftover){for(o=16-this.leftover,o>n&&(o=n),e=0;o>e;e++)this.buffer[this.leftover+e]=r[t+e];if(n-=o,t+=o,this.leftover+=o,this.leftover<16)return;this.blocks(this.buffer,0,16),this.leftover=0}if(n>=16&&(o=n-n%16,this.blocks(r,t,o),t+=o,n-=o),n){for(e=0;n>e;e++)this.buffer[this.leftover+e]=r[t+e];this.leftover+=n}};var lr=p,wr=g,pr=[1116352408,3609767458,1899447441,602891725,3049323471,3964484399,3921009573,2173295548,961987163,4081628472,1508970993,3053834265,2453635748,2937671579,2870763221,3664609560,3624381080,2734883394,310598401,1164996542,607225278,1323610764,1426881987,3590304994,1925078388,4068182383,2162078206,991336113,2614888103,633803317,3248222580,3479774868,3835390401,2666613458,4022224774,944711139,264347078,2341262773,604807628,2007800933,770255983,1495990901,1249150122,1856431235,1555081692,3175218132,1996064986,2198950837,2554220882,3999719339,2821834349,766784016,2952996808,2566594879,3210313671,3203337956,3336571891,1034457026,3584528711,2466948901,113926993,3758326383,338241895,168717936,666307205,1188179964,773529912,1546045734,1294757372,1522805485,1396182291,2643833823,1695183700,2343527390,1986661051,1014477480,2177026350,1206759142,2456956037,344077627,2730485921,1290863460,2820302411,3158454273,3259730800,3505952657,3345764771,106217008,3516065817,3606008344,3600352804,1432725776,4094571909,1467031594,275423344,851169720,430227734,3100823752,506948616,1363258195,659060556,3750685593,883997877,3785050280,958139571,3318307427,1322822218,3812723403,1537002063,2003034995,1747873779,3602036899,1955562222,1575990012,2024104815,1125592928,2227730452,2716904306,2361852424,442776044,2428436474,593698344,2756734187,3733110249,3204031479,2999351573,3329325298,3815920427,3391569614,3928383900,3515267271,566280711,3940187606,3454069534,4118630271,4000239992,116418474,1914138554,174292421,2731055270,289380356,3203993006,460393269,320620315,685471733,587496836,852142971,1086792851,1017036298,365543100,1126000580,2618297676,1288033470,3409855158,1501505948,4234509866,1607167915,987167468,1816402316,1246189591],gr=new Float64Array([237,211,245,92,26,99,18,88,214,156,247,162,222,249,222,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16]),vr=32,br=24,dr=32,Ar=16,_r=32,Ur=32,Er=32,xr=32,Mr=32,mr=br,Br=dr,Sr=Ar,Kr=64,Tr=32,Yr=64,kr=32,Lr=64;r.lowlevel={crypto_core_hsalsa20:f,crypto_stream_xor:y,crypto_stream:c,crypto_stream_salsa20_xor:s,crypto_stream_salsa20:u,crypto_onetimeauth:l,crypto_onetimeauth_verify:w,crypto_verify_16:e,crypto_verify_32:o,crypto_secretbox:p,crypto_secretbox_open:g,crypto_scalarmult:T,crypto_scalarmult_base:Y,crypto_box_beforenm:L,crypto_box_afternm:lr,crypto_box:C,crypto_box_open:R,crypto_box_keypair:k,crypto_hash:P,crypto_sign:q,crypto_sign_keypair:G,crypto_sign_open:D,crypto_secretbox_KEYBYTES:vr,crypto_secretbox_NONCEBYTES:br,crypto_secretbox_ZEROBYTES:dr,crypto_secretbox_BOXZEROBYTES:Ar,crypto_scalarmult_BYTES:_r,crypto_scalarmult_SCALARBYTES:Ur,crypto_box_PUBLICKEYBYTES:Er,crypto_box_SECRETKEYBYTES:xr,crypto_box_BEFORENMBYTES:Mr,crypto_box_NONCEBYTES:mr,crypto_box_ZEROBYTES:Br,crypto_box_BOXZEROBYTES:Sr,crypto_sign_BYTES:Kr,crypto_sign_PUBLICKEYBYTES:Tr,crypto_sign_SECRETKEYBYTES:Yr,crypto_sign_SEEDBYTES:kr,crypto_hash_BYTES:Lr},r.util={},r.util.decodeUTF8=function(r){var t,n=unescape(encodeURIComponent(r)),e=new Uint8Array(n.length);for(t=0;t<n.length;t++)e[t]=n.charCodeAt(t);return e},r.util.encodeUTF8=function(r){var t,n=[];for(t=0;t<r.length;t++)n.push(String.fromCharCode(r[t]));return decodeURIComponent(escape(n.join("")))},r.util.encodeBase64=function(r){if("undefined"==typeof btoa)return new Buffer(r).toString("base64");var t,n=[],e=r.length;for(t=0;e>t;t++)n.push(String.fromCharCode(r[t]));return btoa(n.join(""))},r.util.decodeBase64=function(r){if("undefined"==typeof atob)return new Uint8Array(Array.prototype.slice.call(new Buffer(r,"base64"),0));var t,n=atob(r),e=new Uint8Array(n.length);for(t=0;t<n.length;t++)e[t]=n.charCodeAt(t);return e},r.randomBytes=function(r){var t=new Uint8Array(r);return rr(t,r),t},r.secretbox=function(r,t,n){Q(r,t,n),H(n,t);for(var e=new Uint8Array(dr+r.length),o=new Uint8Array(e.length),i=0;i<r.length;i++)e[i+dr]=r[i];return p(o,e,e.length,t,n),o.subarray(Ar)},r.secretbox.open=function(r,t,n){Q(r,t,n),H(n,t);for(var e=new Uint8Array(Ar+r.length),o=new Uint8Array(e.length),i=0;i<r.length;i++)e[i+Ar]=r[i];return e.length<32?!1:0!==g(o,e,e.length,t,n)?!1:o.subarray(dr)},r.secretbox.keyLength=vr,r.secretbox.nonceLength=br,r.secretbox.overheadLength=Ar,r.scalarMult=function(r,t){if(Q(r,t),r.length!==Ur)throw new Error("bad n size");if(t.length!==_r)throw new Error("bad p size");var n=new Uint8Array(_r);return T(n,r,t),n},r.scalarMult.base=function(r){if(Q(r),r.length!==Ur)throw new Error("bad n size");var t=new Uint8Array(_r);return Y(t,r),t},r.scalarMult.scalarLength=Ur,r.scalarMult.groupElementLength=_r,r.box=function(t,n,e,o){var i=r.box.before(e,o);return r.secretbox(t,n,i)},r.box.before=function(r,t){Q(r,t),J(r,t);var n=new Uint8Array(Mr);return L(n,r,t),n},r.box.after=r.secretbox,r.box.open=function(t,n,e,o){var i=r.box.before(e,o);return r.secretbox.open(t,n,i)},r.box.open.after=r.secretbox.open,r.box.keyPair=function(){var r=new Uint8Array(Er),t=new Uint8Array(xr);return k(r,t),{publicKey:r,secretKey:t}},r.box.keyPair.fromSecretKey=function(r){if(Q(r),r.length!==xr)throw new Error("bad secret key size");var t=new Uint8Array(Er);return Y(t,r),{publicKey:t,secretKey:new Uint8Array(r)}},r.box.publicKeyLength=Er,r.box.secretKeyLength=xr,r.box.sharedKeyLength=Mr,r.box.nonceLength=mr,r.box.overheadLength=r.secretbox.overheadLength,r.sign=function(r,t){if(Q(r,t),t.length!==Yr)throw new Error("bad secret key size");var n=new Uint8Array(Kr+r.length);return q(n,r,r.length,t),n},r.sign.open=function(r,t){if(2!==arguments.length)throw new Error("nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?");if(Q(r,t),t.length!==Tr)throw new Error("bad public key size");var n=new Uint8Array(r.length),e=D(n,r,r.length,t);if(0>e)return null;for(var o=new Uint8Array(e),i=0;i<o.length;i++)o[i]=n[i];return o},r.sign.detached=function(t,n){for(var e=r.sign(t,n),o=new Uint8Array(Kr),i=0;i<o.length;i++)o[i]=e[i];return o},r.sign.detached.verify=function(r,t,n){if(Q(r,t,n),t.length!==Kr)throw new Error("bad signature size");if(n.length!==Tr)throw new Error("bad public key size");var e,o=new Uint8Array(Kr+r.length),i=new Uint8Array(Kr+r.length);for(e=0;Kr>e;e++)o[e]=t[e];for(e=0;e<r.length;e++)o[e+Kr]=r[e];return D(i,o,o.length,n)>=0},r.sign.keyPair=function(){var r=new Uint8Array(Tr),t=new Uint8Array(Yr);return G(r,t),{publicKey:r,secretKey:t}},r.sign.keyPair.fromSecretKey=function(r){if(Q(r),r.length!==Yr)throw new Error("bad secret key size");for(var t=new Uint8Array(Tr),n=0;n<t.length;n++)t[n]=r[32+n];return{publicKey:t,secretKey:new Uint8Array(r)
+}},r.sign.keyPair.fromSeed=function(r){if(Q(r),r.length!==kr)throw new Error("bad seed size");for(var t=new Uint8Array(Tr),n=new Uint8Array(Yr),e=0;32>e;e++)n[e]=r[e];return G(t,n,!0),{publicKey:t,secretKey:n}},r.sign.publicKeyLength=Tr,r.sign.secretKeyLength=Yr,r.sign.seedLength=kr,r.sign.signatureLength=Kr,r.hash=function(r){Q(r);var t=new Uint8Array(Lr);return P(t,r,r.length),t},r.hash.hashLength=Lr,r.verify=function(r,t){return Q(r,t),0===r.length||0===t.length?!1:r.length!==t.length?!1:0===n(r,0,t,0,r.length)?!0:!1},r.setPRNG=function(r){rr=r},function(){var t;"undefined"!=typeof window?(window.crypto&&window.crypto.getRandomValues?t=window.crypto:window.msCrypto&&window.msCrypto.getRandomValues&&(t=window.msCrypto),t&&r.setPRNG(function(r,n){var e,o=new Uint8Array(n);for(t.getRandomValues(o),e=0;n>e;e++)r[e]=o[e];W(o)})):"undefined"!=typeof require&&(t=require("crypto"),t&&r.setPRNG(function(r,n){var e,o=t.randomBytes(n);for(e=0;n>e;e++)r[e]=o[e];W(o)}))}()}("undefined"!=typeof module&&module.exports?module.exports:window.nacl=window.nacl||{}); \ No newline at end of file
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js
index f72dd78d1..b8edbbee6 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.js
@@ -944,13 +944,39 @@ function cleanup(arr) {
for (var i = 0; i < arr.length; i++) arr[i] = 0;
}
-// TODO: Completely remove this in v0.15.
-if (!nacl.util) {
- nacl.util = {};
- nacl.util.decodeUTF8 = nacl.util.encodeUTF8 = nacl.util.encodeBase64 = nacl.util.decodeBase64 = function() {
- throw new Error('nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js');
- };
-}
+nacl.util = {};
+
+nacl.util.decodeUTF8 = function(s) {
+ var i, d = unescape(encodeURIComponent(s)), b = new Uint8Array(d.length);
+ for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+ return b;
+};
+
+nacl.util.encodeUTF8 = function(arr) {
+ var i, s = [];
+ for (i = 0; i < arr.length; i++) s.push(String.fromCharCode(arr[i]));
+ return decodeURIComponent(escape(s.join('')));
+};
+
+nacl.util.encodeBase64 = function(arr) {
+ if (typeof btoa === 'undefined') {
+ return (new Buffer(arr)).toString('base64');
+ } else {
+ var i, s = [], len = arr.length;
+ for (i = 0; i < len; i++) s.push(String.fromCharCode(arr[i]));
+ return btoa(s.join(''));
+ }
+};
+
+nacl.util.decodeBase64 = function(s) {
+ if (typeof atob === 'undefined') {
+ return new Uint8Array(Array.prototype.slice.call(new Buffer(s, 'base64'), 0));
+ } else {
+ var i, d = atob(s), b = new Uint8Array(d.length);
+ for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+ return b;
+ }
+};
nacl.randomBytes = function(n) {
var b = new Uint8Array(n);
@@ -1147,22 +1173,26 @@ nacl.setPRNG = function(fn) {
(function() {
// Initialize PRNG if environment provides CSPRNG.
// If not, methods calling randombytes will throw.
- var crypto = typeof self !== 'undefined' ? (self.crypto || self.msCrypto) : null;
- if (crypto && crypto.getRandomValues) {
- // Browsers.
- var QUOTA = 65536;
- nacl.setPRNG(function(x, n) {
- var i, v = new Uint8Array(n);
- for (i = 0; i < n; i += QUOTA) {
- crypto.getRandomValues(v.subarray(i, i + Math.min(n - i, QUOTA)));
- }
- for (i = 0; i < n; i++) x[i] = v[i];
- cleanup(v);
- });
+ var crypto;
+ if (typeof window !== 'undefined') {
+ // Browser.
+ if (window.crypto && window.crypto.getRandomValues) {
+ crypto = window.crypto; // Standard
+ } else if (window.msCrypto && window.msCrypto.getRandomValues) {
+ crypto = window.msCrypto; // Internet Explorer 11+
+ }
+ if (crypto) {
+ nacl.setPRNG(function(x, n) {
+ var i, v = new Uint8Array(n);
+ crypto.getRandomValues(v);
+ for (i = 0; i < n; i++) x[i] = v[i];
+ cleanup(v);
+ });
+ }
} else if (typeof require !== 'undefined') {
// Node.js.
crypto = require('crypto');
- if (crypto && crypto.randomBytes) {
+ if (crypto) {
nacl.setPRNG(function(x, n) {
var i, v = crypto.randomBytes(n);
for (i = 0; i < n; i++) x[i] = v[i];
@@ -1172,4 +1202,4 @@ nacl.setPRNG = function(fn) {
}
})();
-})(typeof module !== 'undefined' && module.exports ? module.exports : (self.nacl = self.nacl || {}));
+})(typeof module !== 'undefined' && module.exports ? module.exports : (window.nacl = window.nacl || {}));
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js
index eed385415..95d869502 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/nacl.min.js
@@ -1 +1 @@
-!function(r){"use strict";function n(r,n){return r<<n|r>>>32-n}function e(r,n){var e=255&r[n+3];return e=e<<8|255&r[n+2],e=e<<8|255&r[n+1],e<<8|255&r[n+0]}function t(r,n){var e=r[n]<<24|r[n+1]<<16|r[n+2]<<8|r[n+3],t=r[n+4]<<24|r[n+5]<<16|r[n+6]<<8|r[n+7];return new lr(e,t)}function o(r,n,e){var t;for(t=0;4>t;t++)r[n+t]=255&e,e>>>=8}function i(r,n,e){r[n]=e.hi>>24&255,r[n+1]=e.hi>>16&255,r[n+2]=e.hi>>8&255,r[n+3]=255&e.hi,r[n+4]=e.lo>>24&255,r[n+5]=e.lo>>16&255,r[n+6]=e.lo>>8&255,r[n+7]=255&e.lo}function a(r,n,e,t,o){var i,a=0;for(i=0;o>i;i++)a|=r[n+i]^e[t+i];return(1&a-1>>>8)-1}function f(r,n,e,t){return a(r,n,e,t,16)}function u(r,n,e,t){return a(r,n,e,t,32)}function c(r,t,i,a,f){var u,c,w,y=new Uint32Array(16),s=new Uint32Array(16),l=new Uint32Array(16),h=new Uint32Array(4);for(u=0;4>u;u++)s[5*u]=e(a,4*u),s[1+u]=e(i,4*u),s[6+u]=e(t,4*u),s[11+u]=e(i,16+4*u);for(u=0;16>u;u++)l[u]=s[u];for(u=0;20>u;u++){for(c=0;4>c;c++){for(w=0;4>w;w++)h[w]=s[(5*c+4*w)%16];for(h[1]^=n(h[0]+h[3]|0,7),h[2]^=n(h[1]+h[0]|0,9),h[3]^=n(h[2]+h[1]|0,13),h[0]^=n(h[3]+h[2]|0,18),w=0;4>w;w++)y[4*c+(c+w)%4]=h[w]}for(w=0;16>w;w++)s[w]=y[w]}if(f){for(u=0;16>u;u++)s[u]=s[u]+l[u]|0;for(u=0;4>u;u++)s[5*u]=s[5*u]-e(a,4*u)|0,s[6+u]=s[6+u]-e(t,4*u)|0;for(u=0;4>u;u++)o(r,4*u,s[5*u]),o(r,16+4*u,s[6+u])}else for(u=0;16>u;u++)o(r,4*u,s[u]+l[u]|0)}function w(r,n,e,t){return c(r,n,e,t,!1),0}function y(r,n,e,t){return c(r,n,e,t,!0),0}function s(r,n,e,t,o,i,a){var f,u,c=new Uint8Array(16),y=new Uint8Array(64);if(!o)return 0;for(u=0;16>u;u++)c[u]=0;for(u=0;8>u;u++)c[u]=i[u];for(;o>=64;){for(w(y,c,a,Br),u=0;64>u;u++)r[n+u]=(e?e[t+u]:0)^y[u];for(f=1,u=8;16>u;u++)f=f+(255&c[u])|0,c[u]=255&f,f>>>=8;o-=64,n+=64,e&&(t+=64)}if(o>0)for(w(y,c,a,Br),u=0;o>u;u++)r[n+u]=(e?e[t+u]:0)^y[u];return 0}function l(r,n,e,t,o){return s(r,n,null,0,e,t,o)}function h(r,n,e,t,o){var i=new Uint8Array(32);return y(i,t,o,Br),l(r,n,e,t.subarray(16),i)}function g(r,n,e,t,o,i,a){var f=new Uint8Array(32);return y(f,i,a,Br),s(r,n,e,t,o,i.subarray(16),f)}function v(r,n){var e,t=0;for(e=0;17>e;e++)t=t+(r[e]+n[e]|0)|0,r[e]=255&t,t>>>=8}function b(r,n,e,t,o,i){var a,f,u,c,w=new Uint32Array(17),y=new Uint32Array(17),s=new Uint32Array(17),l=new Uint32Array(17),h=new Uint32Array(17);for(u=0;17>u;u++)y[u]=s[u]=0;for(u=0;16>u;u++)y[u]=i[u];for(y[3]&=15,y[4]&=252,y[7]&=15,y[8]&=252,y[11]&=15,y[12]&=252,y[15]&=15;o>0;){for(u=0;17>u;u++)l[u]=0;for(u=0;16>u&&o>u;++u)l[u]=e[t+u];for(l[u]=1,t+=u,o-=u,v(s,l),f=0;17>f;f++)for(w[f]=0,u=0;17>u;u++)w[f]=w[f]+s[u]*(f>=u?y[f-u]:320*y[f+17-u]|0)|0|0;for(f=0;17>f;f++)s[f]=w[f];for(c=0,u=0;16>u;u++)c=c+s[u]|0,s[u]=255&c,c>>>=8;for(c=c+s[16]|0,s[16]=3&c,c=5*(c>>>2)|0,u=0;16>u;u++)c=c+s[u]|0,s[u]=255&c,c>>>=8;c=c+s[16]|0,s[16]=c}for(u=0;17>u;u++)h[u]=s[u];for(v(s,Sr),a=0|-(s[16]>>>7),u=0;17>u;u++)s[u]^=a&(h[u]^s[u]);for(u=0;16>u;u++)l[u]=i[u+16];for(l[16]=0,v(s,l),u=0;16>u;u++)r[n+u]=s[u];return 0}function p(r,n,e,t,o,i){var a=new Uint8Array(16);return b(a,0,e,t,o,i),f(r,n,a,0)}function _(r,n,e,t,o){var i;if(32>e)return-1;for(g(r,0,n,0,e,t,o),b(r,16,r,32,e-32,r),i=0;16>i;i++)r[i]=0;return 0}function A(r,n,e,t,o){var i,a=new Uint8Array(32);if(32>e)return-1;if(h(a,0,32,t,o),0!==p(n,16,n,32,e-32,a))return-1;for(g(r,0,n,0,e,t,o),i=0;32>i;i++)r[i]=0;return 0}function U(r,n){var e;for(e=0;16>e;e++)r[e]=0|n[e]}function E(r){var n,e;for(e=0;16>e;e++)r[e]+=65536,n=Math.floor(r[e]/65536),r[(e+1)*(15>e?1:0)]+=n-1+37*(n-1)*(15===e?1:0),r[e]-=65536*n}function d(r,n,e){for(var t,o=~(e-1),i=0;16>i;i++)t=o&(r[i]^n[i]),r[i]^=t,n[i]^=t}function x(r,n){var e,t,o,i=hr(),a=hr();for(e=0;16>e;e++)a[e]=n[e];for(E(a),E(a),E(a),t=0;2>t;t++){for(i[0]=a[0]-65517,e=1;15>e;e++)i[e]=a[e]-65535-(i[e-1]>>16&1),i[e-1]&=65535;i[15]=a[15]-32767-(i[14]>>16&1),o=i[15]>>16&1,i[14]&=65535,d(a,i,1-o)}for(e=0;16>e;e++)r[2*e]=255&a[e],r[2*e+1]=a[e]>>8}function m(r,n){var e=new Uint8Array(32),t=new Uint8Array(32);return x(e,r),x(t,n),u(e,0,t,0)}function B(r){var n=new Uint8Array(32);return x(n,r),1&n[0]}function S(r,n){var e;for(e=0;16>e;e++)r[e]=n[2*e]+(n[2*e+1]<<8);r[15]&=32767}function K(r,n,e){var t;for(t=0;16>t;t++)r[t]=n[t]+e[t]|0}function T(r,n,e){var t;for(t=0;16>t;t++)r[t]=n[t]-e[t]|0}function Y(r,n,e){var t,o,i=new Float64Array(31);for(t=0;31>t;t++)i[t]=0;for(t=0;16>t;t++)for(o=0;16>o;o++)i[t+o]+=n[t]*e[o];for(t=0;15>t;t++)i[t]+=38*i[t+16];for(t=0;16>t;t++)r[t]=i[t];E(r),E(r)}function L(r,n){Y(r,n,n)}function k(r,n){var e,t=hr();for(e=0;16>e;e++)t[e]=n[e];for(e=253;e>=0;e--)L(t,t),2!==e&&4!==e&&Y(t,t,n);for(e=0;16>e;e++)r[e]=t[e]}function z(r,n){var e,t=hr();for(e=0;16>e;e++)t[e]=n[e];for(e=250;e>=0;e--)L(t,t),1!==e&&Y(t,t,n);for(e=0;16>e;e++)r[e]=t[e]}function R(r,n,e){var t,o,i=new Uint8Array(32),a=new Float64Array(80),f=hr(),u=hr(),c=hr(),w=hr(),y=hr(),s=hr();for(o=0;31>o;o++)i[o]=n[o];for(i[31]=127&n[31]|64,i[0]&=248,S(a,e),o=0;16>o;o++)u[o]=a[o],w[o]=f[o]=c[o]=0;for(f[0]=w[0]=1,o=254;o>=0;--o)t=i[o>>>3]>>>(7&o)&1,d(f,u,t),d(c,w,t),K(y,f,c),T(f,f,c),K(c,u,w),T(u,u,w),L(w,y),L(s,f),Y(f,c,f),Y(c,u,y),K(y,f,c),T(f,f,c),L(u,f),T(c,w,s),Y(f,c,Ar),K(f,f,w),Y(c,c,f),Y(f,w,s),Y(w,u,a),L(u,y),d(f,u,t),d(c,w,t);for(o=0;16>o;o++)a[o+16]=f[o],a[o+32]=c[o],a[o+48]=u[o],a[o+64]=w[o];var l=a.subarray(32),h=a.subarray(16);return k(l,l),Y(h,h,l),x(r,h),0}function P(r,n){return R(r,n,br)}function O(r,n){return gr(n,32),P(r,n)}function F(r,n,e){var t=new Uint8Array(32);return R(t,e,n),y(r,vr,t,Br)}function N(r,n,e,t,o,i){var a=new Uint8Array(32);return F(a,o,i),Kr(r,n,e,t,a)}function C(r,n,e,t,o,i){var a=new Uint8Array(32);return F(a,o,i),Tr(r,n,e,t,a)}function M(){var r,n,e,t=0,o=0,i=0,a=0,f=65535;for(e=0;e<arguments.length;e++)r=arguments[e].lo,n=arguments[e].hi,t+=r&f,o+=r>>>16,i+=n&f,a+=n>>>16;return o+=t>>>16,i+=o>>>16,a+=i>>>16,new lr(i&f|a<<16,t&f|o<<16)}function G(r,n){return new lr(r.hi>>>n,r.lo>>>n|r.hi<<32-n)}function Z(){var r,n=0,e=0;for(r=0;r<arguments.length;r++)n^=arguments[r].lo,e^=arguments[r].hi;return new lr(e,n)}function j(r,n){var e,t,o=32-n;return 32>n?(e=r.hi>>>n|r.lo<<o,t=r.lo>>>n|r.hi<<o):64>n&&(e=r.lo>>>n|r.hi<<o,t=r.hi>>>n|r.lo<<o),new lr(e,t)}function q(r,n,e){var t=r.hi&n.hi^~r.hi&e.hi,o=r.lo&n.lo^~r.lo&e.lo;return new lr(t,o)}function I(r,n,e){var t=r.hi&n.hi^r.hi&e.hi^n.hi&e.hi,o=r.lo&n.lo^r.lo&e.lo^n.lo&e.lo;return new lr(t,o)}function V(r){return Z(j(r,28),j(r,34),j(r,39))}function X(r){return Z(j(r,14),j(r,18),j(r,41))}function D(r){return Z(j(r,1),j(r,8),G(r,7))}function H(r){return Z(j(r,19),j(r,61),G(r,6))}function J(r,n,e){var o,a,f,u=[],c=[],w=[],y=[];for(a=0;8>a;a++)u[a]=w[a]=t(r,8*a);for(var s=0;e>=128;){for(a=0;16>a;a++)y[a]=t(n,8*a+s);for(a=0;80>a;a++){for(f=0;8>f;f++)c[f]=w[f];for(o=M(w[7],X(w[4]),q(w[4],w[5],w[6]),Yr[a],y[a%16]),c[7]=M(o,V(w[0]),I(w[0],w[1],w[2])),c[3]=M(c[3],o),f=0;8>f;f++)w[(f+1)%8]=c[f];if(a%16===15)for(f=0;16>f;f++)y[f]=M(y[f],y[(f+9)%16],D(y[(f+1)%16]),H(y[(f+14)%16]))}for(a=0;8>a;a++)w[a]=M(w[a],u[a]),u[a]=w[a];s+=128,e-=128}for(a=0;8>a;a++)i(r,8*a,u[a]);return e}function Q(r,n,e){var t,o=new Uint8Array(64),a=new Uint8Array(256),f=e;for(t=0;64>t;t++)o[t]=Lr[t];for(J(o,n,e),e%=128,t=0;256>t;t++)a[t]=0;for(t=0;e>t;t++)a[t]=n[f-e+t];for(a[e]=128,e=256-128*(112>e?1:0),a[e-9]=0,i(a,e-8,new lr(f/536870912|0,f<<3)),J(o,a,e),t=0;64>t;t++)r[t]=o[t];return 0}function W(r,n){var e=hr(),t=hr(),o=hr(),i=hr(),a=hr(),f=hr(),u=hr(),c=hr(),w=hr();T(e,r[1],r[0]),T(w,n[1],n[0]),Y(e,e,w),K(t,r[0],r[1]),K(w,n[0],n[1]),Y(t,t,w),Y(o,r[3],n[3]),Y(o,o,Er),Y(i,r[2],n[2]),K(i,i,i),T(a,t,e),T(f,i,o),K(u,i,o),K(c,t,e),Y(r[0],a,f),Y(r[1],c,u),Y(r[2],u,f),Y(r[3],a,c)}function $(r,n,e){var t;for(t=0;4>t;t++)d(r[t],n[t],e)}function rr(r,n){var e=hr(),t=hr(),o=hr();k(o,n[2]),Y(e,n[0],o),Y(t,n[1],o),x(r,t),r[31]^=B(e)<<7}function nr(r,n,e){var t,o;for(U(r[0],pr),U(r[1],_r),U(r[2],_r),U(r[3],pr),o=255;o>=0;--o)t=e[o/8|0]>>(7&o)&1,$(r,n,t),W(n,r),W(r,r),$(r,n,t)}function er(r,n){var e=[hr(),hr(),hr(),hr()];U(e[0],dr),U(e[1],xr),U(e[2],_r),Y(e[3],dr,xr),nr(r,e,n)}function tr(r,n,e){var t,o=new Uint8Array(64),i=[hr(),hr(),hr(),hr()];for(e||gr(n,32),Q(o,n,32),o[0]&=248,o[31]&=127,o[31]|=64,er(i,o),rr(r,i),t=0;32>t;t++)n[t+32]=r[t];return 0}function or(r,n){var e,t,o,i;for(t=63;t>=32;--t){for(e=0,o=t-32,i=t-12;i>o;++o)n[o]+=e-16*n[t]*kr[o-(t-32)],e=n[o]+128>>8,n[o]-=256*e;n[o]+=e,n[t]=0}for(e=0,o=0;32>o;o++)n[o]+=e-(n[31]>>4)*kr[o],e=n[o]>>8,n[o]&=255;for(o=0;32>o;o++)n[o]-=e*kr[o];for(t=0;32>t;t++)n[t+1]+=n[t]>>8,r[t]=255&n[t]}function ir(r){var n,e=new Float64Array(64);for(n=0;64>n;n++)e[n]=r[n];for(n=0;64>n;n++)r[n]=0;or(r,e)}function ar(r,n,e,t){var o,i,a=new Uint8Array(64),f=new Uint8Array(64),u=new Uint8Array(64),c=new Float64Array(64),w=[hr(),hr(),hr(),hr()];Q(a,t,32),a[0]&=248,a[31]&=127,a[31]|=64;var y=e+64;for(o=0;e>o;o++)r[64+o]=n[o];for(o=0;32>o;o++)r[32+o]=a[32+o];for(Q(u,r.subarray(32),e+32),ir(u),er(w,u),rr(r,w),o=32;64>o;o++)r[o]=t[o];for(Q(f,r,e+64),ir(f),o=0;64>o;o++)c[o]=0;for(o=0;32>o;o++)c[o]=u[o];for(o=0;32>o;o++)for(i=0;32>i;i++)c[o+i]+=f[o]*a[i];return or(r.subarray(32),c),y}function fr(r,n){var e=hr(),t=hr(),o=hr(),i=hr(),a=hr(),f=hr(),u=hr();return U(r[2],_r),S(r[1],n),L(o,r[1]),Y(i,o,Ur),T(o,o,r[2]),K(i,r[2],i),L(a,i),L(f,a),Y(u,f,a),Y(e,u,o),Y(e,e,i),z(e,e),Y(e,e,o),Y(e,e,i),Y(e,e,i),Y(r[0],e,i),L(t,r[0]),Y(t,t,i),m(t,o)&&Y(r[0],r[0],mr),L(t,r[0]),Y(t,t,i),m(t,o)?-1:(B(r[0])===n[31]>>7&&T(r[0],pr,r[0]),Y(r[3],r[0],r[1]),0)}function ur(r,n,e,t){var o,i,a=new Uint8Array(32),f=new Uint8Array(64),c=[hr(),hr(),hr(),hr()],w=[hr(),hr(),hr(),hr()];if(i=-1,64>e)return-1;if(fr(w,t))return-1;for(o=0;e>o;o++)r[o]=n[o];for(o=0;32>o;o++)r[o+32]=t[o];if(Q(f,r,e),ir(f),nr(c,w,f),er(w,n.subarray(32)),W(c,w),rr(a,c),e-=64,u(n,0,a,0)){for(o=0;e>o;o++)r[o]=0;return-1}for(o=0;e>o;o++)r[o]=n[o+64];return i=e}function cr(r,n){if(r.length!==zr)throw new Error("bad key size");if(n.length!==Rr)throw new Error("bad nonce size")}function wr(r,n){if(r.length!==Cr)throw new Error("bad public key size");if(n.length!==Mr)throw new Error("bad secret key size")}function yr(){var r,n;for(n=0;n<arguments.length;n++)if("[object Uint8Array]"!==(r=Object.prototype.toString.call(arguments[n])))throw new TypeError("unexpected type "+r+", use Uint8Array")}function sr(r){for(var n=0;n<r.length;n++)r[n]=0}var lr=function(r,n){this.hi=0|r,this.lo=0|n},hr=function(r){var n,e=new Float64Array(16);if(r)for(n=0;n<r.length;n++)e[n]=r[n];return e},gr=function(){throw new Error("no PRNG")},vr=new Uint8Array(16),br=new Uint8Array(32);br[0]=9;var pr=hr(),_r=hr([1]),Ar=hr([56129,1]),Ur=hr([30883,4953,19914,30187,55467,16705,2637,112,59544,30585,16505,36039,65139,11119,27886,20995]),Er=hr([61785,9906,39828,60374,45398,33411,5274,224,53552,61171,33010,6542,64743,22239,55772,9222]),dr=hr([54554,36645,11616,51542,42930,38181,51040,26924,56412,64982,57905,49316,21502,52590,14035,8553]),xr=hr([26200,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214]),mr=hr([41136,18958,6951,50414,58488,44335,6150,12099,55207,15867,153,11085,57099,20417,9344,11139]),Br=new Uint8Array([101,120,112,97,110,100,32,51,50,45,98,121,116,101,32,107]),Sr=new Uint32Array([5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252]),Kr=_,Tr=A,Yr=[new lr(1116352408,3609767458),new lr(1899447441,602891725),new lr(3049323471,3964484399),new lr(3921009573,2173295548),new lr(961987163,4081628472),new lr(1508970993,3053834265),new lr(2453635748,2937671579),new lr(2870763221,3664609560),new lr(3624381080,2734883394),new lr(310598401,1164996542),new lr(607225278,1323610764),new lr(1426881987,3590304994),new lr(1925078388,4068182383),new lr(2162078206,991336113),new lr(2614888103,633803317),new lr(3248222580,3479774868),new lr(3835390401,2666613458),new lr(4022224774,944711139),new lr(264347078,2341262773),new lr(604807628,2007800933),new lr(770255983,1495990901),new lr(1249150122,1856431235),new lr(1555081692,3175218132),new lr(1996064986,2198950837),new lr(2554220882,3999719339),new lr(2821834349,766784016),new lr(2952996808,2566594879),new lr(3210313671,3203337956),new lr(3336571891,1034457026),new lr(3584528711,2466948901),new lr(113926993,3758326383),new lr(338241895,168717936),new lr(666307205,1188179964),new lr(773529912,1546045734),new lr(1294757372,1522805485),new lr(1396182291,2643833823),new lr(1695183700,2343527390),new lr(1986661051,1014477480),new lr(2177026350,1206759142),new lr(2456956037,344077627),new lr(2730485921,1290863460),new lr(2820302411,3158454273),new lr(3259730800,3505952657),new lr(3345764771,106217008),new lr(3516065817,3606008344),new lr(3600352804,1432725776),new lr(4094571909,1467031594),new lr(275423344,851169720),new lr(430227734,3100823752),new lr(506948616,1363258195),new lr(659060556,3750685593),new lr(883997877,3785050280),new lr(958139571,3318307427),new lr(1322822218,3812723403),new lr(1537002063,2003034995),new lr(1747873779,3602036899),new lr(1955562222,1575990012),new lr(2024104815,1125592928),new lr(2227730452,2716904306),new lr(2361852424,442776044),new lr(2428436474,593698344),new lr(2756734187,3733110249),new lr(3204031479,2999351573),new lr(3329325298,3815920427),new lr(3391569614,3928383900),new lr(3515267271,566280711),new lr(3940187606,3454069534),new lr(4118630271,4000239992),new lr(116418474,1914138554),new lr(174292421,2731055270),new lr(289380356,3203993006),new lr(460393269,320620315),new lr(685471733,587496836),new lr(852142971,1086792851),new lr(1017036298,365543100),new lr(1126000580,2618297676),new lr(1288033470,3409855158),new lr(1501505948,4234509866),new lr(1607167915,987167468),new lr(1816402316,1246189591)],Lr=new Uint8Array([106,9,230,103,243,188,201,8,187,103,174,133,132,202,167,59,60,110,243,114,254,148,248,43,165,79,245,58,95,29,54,241,81,14,82,127,173,230,130,209,155,5,104,140,43,62,108,31,31,131,217,171,251,65,189,107,91,224,205,25,19,126,33,121]),kr=new Float64Array([237,211,245,92,26,99,18,88,214,156,247,162,222,249,222,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16]),zr=32,Rr=24,Pr=32,Or=16,Fr=32,Nr=32,Cr=32,Mr=32,Gr=32,Zr=Rr,jr=Pr,qr=Or,Ir=64,Vr=32,Xr=64,Dr=32,Hr=64;r.lowlevel={crypto_core_hsalsa20:y,crypto_stream_xor:g,crypto_stream:h,crypto_stream_salsa20_xor:s,crypto_stream_salsa20:l,crypto_onetimeauth:b,crypto_onetimeauth_verify:p,crypto_verify_16:f,crypto_verify_32:u,crypto_secretbox:_,crypto_secretbox_open:A,crypto_scalarmult:R,crypto_scalarmult_base:P,crypto_box_beforenm:F,crypto_box_afternm:Kr,crypto_box:N,crypto_box_open:C,crypto_box_keypair:O,crypto_hash:Q,crypto_sign:ar,crypto_sign_keypair:tr,crypto_sign_open:ur,crypto_secretbox_KEYBYTES:zr,crypto_secretbox_NONCEBYTES:Rr,crypto_secretbox_ZEROBYTES:Pr,crypto_secretbox_BOXZEROBYTES:Or,crypto_scalarmult_BYTES:Fr,crypto_scalarmult_SCALARBYTES:Nr,crypto_box_PUBLICKEYBYTES:Cr,crypto_box_SECRETKEYBYTES:Mr,crypto_box_BEFORENMBYTES:Gr,crypto_box_NONCEBYTES:Zr,crypto_box_ZEROBYTES:jr,crypto_box_BOXZEROBYTES:qr,crypto_sign_BYTES:Ir,crypto_sign_PUBLICKEYBYTES:Vr,crypto_sign_SECRETKEYBYTES:Xr,crypto_sign_SEEDBYTES:Dr,crypto_hash_BYTES:Hr},r.util||(r.util={},r.util.decodeUTF8=r.util.encodeUTF8=r.util.encodeBase64=r.util.decodeBase64=function(){throw new Error("nacl.util moved into separate package: https://github.com/dchest/tweetnacl-util-js")}),r.randomBytes=function(r){var n=new Uint8Array(r);return gr(n,r),n},r.secretbox=function(r,n,e){yr(r,n,e),cr(e,n);for(var t=new Uint8Array(Pr+r.length),o=new Uint8Array(t.length),i=0;i<r.length;i++)t[i+Pr]=r[i];return _(o,t,t.length,n,e),o.subarray(Or)},r.secretbox.open=function(r,n,e){yr(r,n,e),cr(e,n);for(var t=new Uint8Array(Or+r.length),o=new Uint8Array(t.length),i=0;i<r.length;i++)t[i+Or]=r[i];return t.length<32?!1:0!==A(o,t,t.length,n,e)?!1:o.subarray(Pr)},r.secretbox.keyLength=zr,r.secretbox.nonceLength=Rr,r.secretbox.overheadLength=Or,r.scalarMult=function(r,n){if(yr(r,n),r.length!==Nr)throw new Error("bad n size");if(n.length!==Fr)throw new Error("bad p size");var e=new Uint8Array(Fr);return R(e,r,n),e},r.scalarMult.base=function(r){if(yr(r),r.length!==Nr)throw new Error("bad n size");var n=new Uint8Array(Fr);return P(n,r),n},r.scalarMult.scalarLength=Nr,r.scalarMult.groupElementLength=Fr,r.box=function(n,e,t,o){var i=r.box.before(t,o);return r.secretbox(n,e,i)},r.box.before=function(r,n){yr(r,n),wr(r,n);var e=new Uint8Array(Gr);return F(e,r,n),e},r.box.after=r.secretbox,r.box.open=function(n,e,t,o){var i=r.box.before(t,o);return r.secretbox.open(n,e,i)},r.box.open.after=r.secretbox.open,r.box.keyPair=function(){var r=new Uint8Array(Cr),n=new Uint8Array(Mr);return O(r,n),{publicKey:r,secretKey:n}},r.box.keyPair.fromSecretKey=function(r){if(yr(r),r.length!==Mr)throw new Error("bad secret key size");var n=new Uint8Array(Cr);return P(n,r),{publicKey:n,secretKey:new Uint8Array(r)}},r.box.publicKeyLength=Cr,r.box.secretKeyLength=Mr,r.box.sharedKeyLength=Gr,r.box.nonceLength=Zr,r.box.overheadLength=r.secretbox.overheadLength,r.sign=function(r,n){if(yr(r,n),n.length!==Xr)throw new Error("bad secret key size");var e=new Uint8Array(Ir+r.length);return ar(e,r,r.length,n),e},r.sign.open=function(r,n){if(2!==arguments.length)throw new Error("nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?");if(yr(r,n),n.length!==Vr)throw new Error("bad public key size");var e=new Uint8Array(r.length),t=ur(e,r,r.length,n);if(0>t)return null;for(var o=new Uint8Array(t),i=0;i<o.length;i++)o[i]=e[i];return o},r.sign.detached=function(n,e){for(var t=r.sign(n,e),o=new Uint8Array(Ir),i=0;i<o.length;i++)o[i]=t[i];return o},r.sign.detached.verify=function(r,n,e){if(yr(r,n,e),n.length!==Ir)throw new Error("bad signature size");if(e.length!==Vr)throw new Error("bad public key size");var t,o=new Uint8Array(Ir+r.length),i=new Uint8Array(Ir+r.length);for(t=0;Ir>t;t++)o[t]=n[t];for(t=0;t<r.length;t++)o[t+Ir]=r[t];return ur(i,o,o.length,e)>=0},r.sign.keyPair=function(){var r=new Uint8Array(Vr),n=new Uint8Array(Xr);return tr(r,n),{publicKey:r,secretKey:n}},r.sign.keyPair.fromSecretKey=function(r){if(yr(r),r.length!==Xr)throw new Error("bad secret key size");for(var n=new Uint8Array(Vr),e=0;e<n.length;e++)n[e]=r[32+e];return{publicKey:n,secretKey:new Uint8Array(r)}},r.sign.keyPair.fromSeed=function(r){if(yr(r),r.length!==Dr)throw new Error("bad seed size");for(var n=new Uint8Array(Vr),e=new Uint8Array(Xr),t=0;32>t;t++)e[t]=r[t];return tr(n,e,!0),{publicKey:n,secretKey:e}},r.sign.publicKeyLength=Vr,r.sign.secretKeyLength=Xr,r.sign.seedLength=Dr,r.sign.signatureLength=Ir,r.hash=function(r){yr(r);var n=new Uint8Array(Hr);return Q(n,r,r.length),n},r.hash.hashLength=Hr,r.verify=function(r,n){return yr(r,n),0===r.length||0===n.length?!1:r.length!==n.length?!1:0===a(r,0,n,0,r.length)?!0:!1},r.setPRNG=function(r){gr=r},function(){var n="undefined"!=typeof self?self.crypto||self.msCrypto:null;if(n&&n.getRandomValues){var e=65536;r.setPRNG(function(r,t){var o,i=new Uint8Array(t);for(o=0;t>o;o+=e)n.getRandomValues(i.subarray(o,o+Math.min(t-o,e)));for(o=0;t>o;o++)r[o]=i[o];sr(i)})}else"undefined"!=typeof require&&(n=require("crypto"),n&&n.randomBytes&&r.setPRNG(function(r,e){var t,o=n.randomBytes(e);for(t=0;e>t;t++)r[t]=o[t];sr(o)}))}()}("undefined"!=typeof module&&module.exports?module.exports:self.nacl=self.nacl||{}); \ No newline at end of file
+!function(r){"use strict";function n(r,n){return r<<n|r>>>32-n}function e(r,n){var e=255&r[n+3];return e=e<<8|255&r[n+2],e=e<<8|255&r[n+1],e<<8|255&r[n+0]}function t(r,n){var e=r[n]<<24|r[n+1]<<16|r[n+2]<<8|r[n+3],t=r[n+4]<<24|r[n+5]<<16|r[n+6]<<8|r[n+7];return new lr(e,t)}function o(r,n,e){var t;for(t=0;4>t;t++)r[n+t]=255&e,e>>>=8}function i(r,n,e){r[n]=e.hi>>24&255,r[n+1]=e.hi>>16&255,r[n+2]=e.hi>>8&255,r[n+3]=255&e.hi,r[n+4]=e.lo>>24&255,r[n+5]=e.lo>>16&255,r[n+6]=e.lo>>8&255,r[n+7]=255&e.lo}function a(r,n,e,t,o){var i,a=0;for(i=0;o>i;i++)a|=r[n+i]^e[t+i];return(1&a-1>>>8)-1}function f(r,n,e,t){return a(r,n,e,t,16)}function u(r,n,e,t){return a(r,n,e,t,32)}function c(r,t,i,a,f){var u,c,w,y=new Uint32Array(16),s=new Uint32Array(16),l=new Uint32Array(16),h=new Uint32Array(4);for(u=0;4>u;u++)s[5*u]=e(a,4*u),s[1+u]=e(i,4*u),s[6+u]=e(t,4*u),s[11+u]=e(i,16+4*u);for(u=0;16>u;u++)l[u]=s[u];for(u=0;20>u;u++){for(c=0;4>c;c++){for(w=0;4>w;w++)h[w]=s[(5*c+4*w)%16];for(h[1]^=n(h[0]+h[3]|0,7),h[2]^=n(h[1]+h[0]|0,9),h[3]^=n(h[2]+h[1]|0,13),h[0]^=n(h[3]+h[2]|0,18),w=0;4>w;w++)y[4*c+(c+w)%4]=h[w]}for(w=0;16>w;w++)s[w]=y[w]}if(f){for(u=0;16>u;u++)s[u]=s[u]+l[u]|0;for(u=0;4>u;u++)s[5*u]=s[5*u]-e(a,4*u)|0,s[6+u]=s[6+u]-e(t,4*u)|0;for(u=0;4>u;u++)o(r,4*u,s[5*u]),o(r,16+4*u,s[6+u])}else for(u=0;16>u;u++)o(r,4*u,s[u]+l[u]|0)}function w(r,n,e,t){return c(r,n,e,t,!1),0}function y(r,n,e,t){return c(r,n,e,t,!0),0}function s(r,n,e,t,o,i,a){var f,u,c=new Uint8Array(16),y=new Uint8Array(64);if(!o)return 0;for(u=0;16>u;u++)c[u]=0;for(u=0;8>u;u++)c[u]=i[u];for(;o>=64;){for(w(y,c,a,Br),u=0;64>u;u++)r[n+u]=(e?e[t+u]:0)^y[u];for(f=1,u=8;16>u;u++)f=f+(255&c[u])|0,c[u]=255&f,f>>>=8;o-=64,n+=64,e&&(t+=64)}if(o>0)for(w(y,c,a,Br),u=0;o>u;u++)r[n+u]=(e?e[t+u]:0)^y[u];return 0}function l(r,n,e,t,o){return s(r,n,null,0,e,t,o)}function h(r,n,e,t,o){var i=new Uint8Array(32);return y(i,t,o,Br),l(r,n,e,t.subarray(16),i)}function g(r,n,e,t,o,i,a){var f=new Uint8Array(32);return y(f,i,a,Br),s(r,n,e,t,o,i.subarray(16),f)}function p(r,n){var e,t=0;for(e=0;17>e;e++)t=t+(r[e]+n[e]|0)|0,r[e]=255&t,t>>>=8}function v(r,n,e,t,o,i){var a,f,u,c,w=new Uint32Array(17),y=new Uint32Array(17),s=new Uint32Array(17),l=new Uint32Array(17),h=new Uint32Array(17);for(u=0;17>u;u++)y[u]=s[u]=0;for(u=0;16>u;u++)y[u]=i[u];for(y[3]&=15,y[4]&=252,y[7]&=15,y[8]&=252,y[11]&=15,y[12]&=252,y[15]&=15;o>0;){for(u=0;17>u;u++)l[u]=0;for(u=0;16>u&&o>u;++u)l[u]=e[t+u];for(l[u]=1,t+=u,o-=u,p(s,l),f=0;17>f;f++)for(w[f]=0,u=0;17>u;u++)w[f]=w[f]+s[u]*(f>=u?y[f-u]:320*y[f+17-u]|0)|0|0;for(f=0;17>f;f++)s[f]=w[f];for(c=0,u=0;16>u;u++)c=c+s[u]|0,s[u]=255&c,c>>>=8;for(c=c+s[16]|0,s[16]=3&c,c=5*(c>>>2)|0,u=0;16>u;u++)c=c+s[u]|0,s[u]=255&c,c>>>=8;c=c+s[16]|0,s[16]=c}for(u=0;17>u;u++)h[u]=s[u];for(p(s,Sr),a=0|-(s[16]>>>7),u=0;17>u;u++)s[u]^=a&(h[u]^s[u]);for(u=0;16>u;u++)l[u]=i[u+16];for(l[16]=0,p(s,l),u=0;16>u;u++)r[n+u]=s[u];return 0}function b(r,n,e,t,o,i){var a=new Uint8Array(16);return v(a,0,e,t,o,i),f(r,n,a,0)}function A(r,n,e,t,o){var i;if(32>e)return-1;for(g(r,0,n,0,e,t,o),v(r,16,r,32,e-32,r),i=0;16>i;i++)r[i]=0;return 0}function U(r,n,e,t,o){var i,a=new Uint8Array(32);if(32>e)return-1;if(h(a,0,32,t,o),0!==b(n,16,n,32,e-32,a))return-1;for(g(r,0,n,0,e,t,o),i=0;32>i;i++)r[i]=0;return 0}function _(r,n){var e;for(e=0;16>e;e++)r[e]=0|n[e]}function d(r){var n,e;for(e=0;16>e;e++)r[e]+=65536,n=Math.floor(r[e]/65536),r[(e+1)*(15>e?1:0)]+=n-1+37*(n-1)*(15===e?1:0),r[e]-=65536*n}function E(r,n,e){for(var t,o=~(e-1),i=0;16>i;i++)t=o&(r[i]^n[i]),r[i]^=t,n[i]^=t}function x(r,n){var e,t,o,i=hr(),a=hr();for(e=0;16>e;e++)a[e]=n[e];for(d(a),d(a),d(a),t=0;2>t;t++){for(i[0]=a[0]-65517,e=1;15>e;e++)i[e]=a[e]-65535-(i[e-1]>>16&1),i[e-1]&=65535;i[15]=a[15]-32767-(i[14]>>16&1),o=i[15]>>16&1,i[14]&=65535,E(a,i,1-o)}for(e=0;16>e;e++)r[2*e]=255&a[e],r[2*e+1]=a[e]>>8}function m(r,n){var e=new Uint8Array(32),t=new Uint8Array(32);return x(e,r),x(t,n),u(e,0,t,0)}function B(r){var n=new Uint8Array(32);return x(n,r),1&n[0]}function S(r,n){var e;for(e=0;16>e;e++)r[e]=n[2*e]+(n[2*e+1]<<8);r[15]&=32767}function K(r,n,e){var t;for(t=0;16>t;t++)r[t]=n[t]+e[t]|0}function T(r,n,e){var t;for(t=0;16>t;t++)r[t]=n[t]-e[t]|0}function Y(r,n,e){var t,o,i=new Float64Array(31);for(t=0;31>t;t++)i[t]=0;for(t=0;16>t;t++)for(o=0;16>o;o++)i[t+o]+=n[t]*e[o];for(t=0;15>t;t++)i[t]+=38*i[t+16];for(t=0;16>t;t++)r[t]=i[t];d(r),d(r)}function L(r,n){Y(r,n,n)}function C(r,n){var e,t=hr();for(e=0;16>e;e++)t[e]=n[e];for(e=253;e>=0;e--)L(t,t),2!==e&&4!==e&&Y(t,t,n);for(e=0;16>e;e++)r[e]=t[e]}function R(r,n){var e,t=hr();for(e=0;16>e;e++)t[e]=n[e];for(e=250;e>=0;e--)L(t,t),1!==e&&Y(t,t,n);for(e=0;16>e;e++)r[e]=t[e]}function k(r,n,e){var t,o,i=new Uint8Array(32),a=new Float64Array(80),f=hr(),u=hr(),c=hr(),w=hr(),y=hr(),s=hr();for(o=0;31>o;o++)i[o]=n[o];for(i[31]=127&n[31]|64,i[0]&=248,S(a,e),o=0;16>o;o++)u[o]=a[o],w[o]=f[o]=c[o]=0;for(f[0]=w[0]=1,o=254;o>=0;--o)t=i[o>>>3]>>>(7&o)&1,E(f,u,t),E(c,w,t),K(y,f,c),T(f,f,c),K(c,u,w),T(u,u,w),L(w,y),L(s,f),Y(f,c,f),Y(c,u,y),K(y,f,c),T(f,f,c),L(u,f),T(c,w,s),Y(f,c,Ur),K(f,f,w),Y(c,c,f),Y(f,w,s),Y(w,u,a),L(u,y),E(f,u,t),E(c,w,t);for(o=0;16>o;o++)a[o+16]=f[o],a[o+32]=c[o],a[o+48]=u[o],a[o+64]=w[o];var l=a.subarray(32),h=a.subarray(16);return C(l,l),Y(h,h,l),x(r,h),0}function z(r,n){return k(r,n,vr)}function P(r,n){return gr(n,32),z(r,n)}function O(r,n,e){var t=new Uint8Array(32);return k(t,e,n),y(r,pr,t,Br)}function F(r,n,e,t,o,i){var a=new Uint8Array(32);return O(a,o,i),Kr(r,n,e,t,a)}function N(r,n,e,t,o,i){var a=new Uint8Array(32);return O(a,o,i),Tr(r,n,e,t,a)}function M(){var r,n,e,t=0,o=0,i=0,a=0,f=65535;for(e=0;e<arguments.length;e++)r=arguments[e].lo,n=arguments[e].hi,t+=r&f,o+=r>>>16,i+=n&f,a+=n>>>16;return o+=t>>>16,i+=o>>>16,a+=i>>>16,new lr(i&f|a<<16,t&f|o<<16)}function j(r,n){return new lr(r.hi>>>n,r.lo>>>n|r.hi<<32-n)}function G(){var r,n=0,e=0;for(r=0;r<arguments.length;r++)n^=arguments[r].lo,e^=arguments[r].hi;return new lr(e,n)}function I(r,n){var e,t,o=32-n;return 32>n?(e=r.hi>>>n|r.lo<<o,t=r.lo>>>n|r.hi<<o):64>n&&(e=r.lo>>>n|r.hi<<o,t=r.hi>>>n|r.lo<<o),new lr(e,t)}function Z(r,n,e){var t=r.hi&n.hi^~r.hi&e.hi,o=r.lo&n.lo^~r.lo&e.lo;return new lr(t,o)}function V(r,n,e){var t=r.hi&n.hi^r.hi&e.hi^n.hi&e.hi,o=r.lo&n.lo^r.lo&e.lo^n.lo&e.lo;return new lr(t,o)}function q(r){return G(I(r,28),I(r,34),I(r,39))}function X(r){return G(I(r,14),I(r,18),I(r,41))}function D(r){return G(I(r,1),I(r,8),j(r,7))}function H(r){return G(I(r,19),I(r,61),j(r,6))}function J(r,n,e){var o,a,f,u=[],c=[],w=[],y=[];for(a=0;8>a;a++)u[a]=w[a]=t(r,8*a);for(var s=0;e>=128;){for(a=0;16>a;a++)y[a]=t(n,8*a+s);for(a=0;80>a;a++){for(f=0;8>f;f++)c[f]=w[f];for(o=M(w[7],X(w[4]),Z(w[4],w[5],w[6]),Yr[a],y[a%16]),c[7]=M(o,q(w[0]),V(w[0],w[1],w[2])),c[3]=M(c[3],o),f=0;8>f;f++)w[(f+1)%8]=c[f];if(a%16===15)for(f=0;16>f;f++)y[f]=M(y[f],y[(f+9)%16],D(y[(f+1)%16]),H(y[(f+14)%16]))}for(a=0;8>a;a++)w[a]=M(w[a],u[a]),u[a]=w[a];s+=128,e-=128}for(a=0;8>a;a++)i(r,8*a,u[a]);return e}function Q(r,n,e){var t,o=new Uint8Array(64),a=new Uint8Array(256),f=e;for(t=0;64>t;t++)o[t]=Lr[t];for(J(o,n,e),e%=128,t=0;256>t;t++)a[t]=0;for(t=0;e>t;t++)a[t]=n[f-e+t];for(a[e]=128,e=256-128*(112>e?1:0),a[e-9]=0,i(a,e-8,new lr(f/536870912|0,f<<3)),J(o,a,e),t=0;64>t;t++)r[t]=o[t];return 0}function W(r,n){var e=hr(),t=hr(),o=hr(),i=hr(),a=hr(),f=hr(),u=hr(),c=hr(),w=hr();T(e,r[1],r[0]),T(w,n[1],n[0]),Y(e,e,w),K(t,r[0],r[1]),K(w,n[0],n[1]),Y(t,t,w),Y(o,r[3],n[3]),Y(o,o,dr),Y(i,r[2],n[2]),K(i,i,i),T(a,t,e),T(f,i,o),K(u,i,o),K(c,t,e),Y(r[0],a,f),Y(r[1],c,u),Y(r[2],u,f),Y(r[3],a,c)}function $(r,n,e){var t;for(t=0;4>t;t++)E(r[t],n[t],e)}function rr(r,n){var e=hr(),t=hr(),o=hr();C(o,n[2]),Y(e,n[0],o),Y(t,n[1],o),x(r,t),r[31]^=B(e)<<7}function nr(r,n,e){var t,o;for(_(r[0],br),_(r[1],Ar),_(r[2],Ar),_(r[3],br),o=255;o>=0;--o)t=e[o/8|0]>>(7&o)&1,$(r,n,t),W(n,r),W(r,r),$(r,n,t)}function er(r,n){var e=[hr(),hr(),hr(),hr()];_(e[0],Er),_(e[1],xr),_(e[2],Ar),Y(e[3],Er,xr),nr(r,e,n)}function tr(r,n,e){var t,o=new Uint8Array(64),i=[hr(),hr(),hr(),hr()];for(e||gr(n,32),Q(o,n,32),o[0]&=248,o[31]&=127,o[31]|=64,er(i,o),rr(r,i),t=0;32>t;t++)n[t+32]=r[t];return 0}function or(r,n){var e,t,o,i;for(t=63;t>=32;--t){for(e=0,o=t-32,i=t-12;i>o;++o)n[o]+=e-16*n[t]*Cr[o-(t-32)],e=n[o]+128>>8,n[o]-=256*e;n[o]+=e,n[t]=0}for(e=0,o=0;32>o;o++)n[o]+=e-(n[31]>>4)*Cr[o],e=n[o]>>8,n[o]&=255;for(o=0;32>o;o++)n[o]-=e*Cr[o];for(t=0;32>t;t++)n[t+1]+=n[t]>>8,r[t]=255&n[t]}function ir(r){var n,e=new Float64Array(64);for(n=0;64>n;n++)e[n]=r[n];for(n=0;64>n;n++)r[n]=0;or(r,e)}function ar(r,n,e,t){var o,i,a=new Uint8Array(64),f=new Uint8Array(64),u=new Uint8Array(64),c=new Float64Array(64),w=[hr(),hr(),hr(),hr()];Q(a,t,32),a[0]&=248,a[31]&=127,a[31]|=64;var y=e+64;for(o=0;e>o;o++)r[64+o]=n[o];for(o=0;32>o;o++)r[32+o]=a[32+o];for(Q(u,r.subarray(32),e+32),ir(u),er(w,u),rr(r,w),o=32;64>o;o++)r[o]=t[o];for(Q(f,r,e+64),ir(f),o=0;64>o;o++)c[o]=0;for(o=0;32>o;o++)c[o]=u[o];for(o=0;32>o;o++)for(i=0;32>i;i++)c[o+i]+=f[o]*a[i];return or(r.subarray(32),c),y}function fr(r,n){var e=hr(),t=hr(),o=hr(),i=hr(),a=hr(),f=hr(),u=hr();return _(r[2],Ar),S(r[1],n),L(o,r[1]),Y(i,o,_r),T(o,o,r[2]),K(i,r[2],i),L(a,i),L(f,a),Y(u,f,a),Y(e,u,o),Y(e,e,i),R(e,e),Y(e,e,o),Y(e,e,i),Y(e,e,i),Y(r[0],e,i),L(t,r[0]),Y(t,t,i),m(t,o)&&Y(r[0],r[0],mr),L(t,r[0]),Y(t,t,i),m(t,o)?-1:(B(r[0])===n[31]>>7&&T(r[0],br,r[0]),Y(r[3],r[0],r[1]),0)}function ur(r,n,e,t){var o,i,a=new Uint8Array(32),f=new Uint8Array(64),c=[hr(),hr(),hr(),hr()],w=[hr(),hr(),hr(),hr()];if(i=-1,64>e)return-1;if(fr(w,t))return-1;for(o=0;e>o;o++)r[o]=n[o];for(o=0;32>o;o++)r[o+32]=t[o];if(Q(f,r,e),ir(f),nr(c,w,f),er(w,n.subarray(32)),W(c,w),rr(a,c),e-=64,u(n,0,a,0)){for(o=0;e>o;o++)r[o]=0;return-1}for(o=0;e>o;o++)r[o]=n[o+64];return i=e}function cr(r,n){if(r.length!==Rr)throw new Error("bad key size");if(n.length!==kr)throw new Error("bad nonce size")}function wr(r,n){if(r.length!==Nr)throw new Error("bad public key size");if(n.length!==Mr)throw new Error("bad secret key size")}function yr(){var r,n;for(n=0;n<arguments.length;n++)if("[object Uint8Array]"!==(r=Object.prototype.toString.call(arguments[n])))throw new TypeError("unexpected type "+r+", use Uint8Array")}function sr(r){for(var n=0;n<r.length;n++)r[n]=0}var lr=function(r,n){this.hi=0|r,this.lo=0|n},hr=function(r){var n,e=new Float64Array(16);if(r)for(n=0;n<r.length;n++)e[n]=r[n];return e},gr=function(){throw new Error("no PRNG")},pr=new Uint8Array(16),vr=new Uint8Array(32);vr[0]=9;var br=hr(),Ar=hr([1]),Ur=hr([56129,1]),_r=hr([30883,4953,19914,30187,55467,16705,2637,112,59544,30585,16505,36039,65139,11119,27886,20995]),dr=hr([61785,9906,39828,60374,45398,33411,5274,224,53552,61171,33010,6542,64743,22239,55772,9222]),Er=hr([54554,36645,11616,51542,42930,38181,51040,26924,56412,64982,57905,49316,21502,52590,14035,8553]),xr=hr([26200,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214,26214]),mr=hr([41136,18958,6951,50414,58488,44335,6150,12099,55207,15867,153,11085,57099,20417,9344,11139]),Br=new Uint8Array([101,120,112,97,110,100,32,51,50,45,98,121,116,101,32,107]),Sr=new Uint32Array([5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,252]),Kr=A,Tr=U,Yr=[new lr(1116352408,3609767458),new lr(1899447441,602891725),new lr(3049323471,3964484399),new lr(3921009573,2173295548),new lr(961987163,4081628472),new lr(1508970993,3053834265),new lr(2453635748,2937671579),new lr(2870763221,3664609560),new lr(3624381080,2734883394),new lr(310598401,1164996542),new lr(607225278,1323610764),new lr(1426881987,3590304994),new lr(1925078388,4068182383),new lr(2162078206,991336113),new lr(2614888103,633803317),new lr(3248222580,3479774868),new lr(3835390401,2666613458),new lr(4022224774,944711139),new lr(264347078,2341262773),new lr(604807628,2007800933),new lr(770255983,1495990901),new lr(1249150122,1856431235),new lr(1555081692,3175218132),new lr(1996064986,2198950837),new lr(2554220882,3999719339),new lr(2821834349,766784016),new lr(2952996808,2566594879),new lr(3210313671,3203337956),new lr(3336571891,1034457026),new lr(3584528711,2466948901),new lr(113926993,3758326383),new lr(338241895,168717936),new lr(666307205,1188179964),new lr(773529912,1546045734),new lr(1294757372,1522805485),new lr(1396182291,2643833823),new lr(1695183700,2343527390),new lr(1986661051,1014477480),new lr(2177026350,1206759142),new lr(2456956037,344077627),new lr(2730485921,1290863460),new lr(2820302411,3158454273),new lr(3259730800,3505952657),new lr(3345764771,106217008),new lr(3516065817,3606008344),new lr(3600352804,1432725776),new lr(4094571909,1467031594),new lr(275423344,851169720),new lr(430227734,3100823752),new lr(506948616,1363258195),new lr(659060556,3750685593),new lr(883997877,3785050280),new lr(958139571,3318307427),new lr(1322822218,3812723403),new lr(1537002063,2003034995),new lr(1747873779,3602036899),new lr(1955562222,1575990012),new lr(2024104815,1125592928),new lr(2227730452,2716904306),new lr(2361852424,442776044),new lr(2428436474,593698344),new lr(2756734187,3733110249),new lr(3204031479,2999351573),new lr(3329325298,3815920427),new lr(3391569614,3928383900),new lr(3515267271,566280711),new lr(3940187606,3454069534),new lr(4118630271,4000239992),new lr(116418474,1914138554),new lr(174292421,2731055270),new lr(289380356,3203993006),new lr(460393269,320620315),new lr(685471733,587496836),new lr(852142971,1086792851),new lr(1017036298,365543100),new lr(1126000580,2618297676),new lr(1288033470,3409855158),new lr(1501505948,4234509866),new lr(1607167915,987167468),new lr(1816402316,1246189591)],Lr=new Uint8Array([106,9,230,103,243,188,201,8,187,103,174,133,132,202,167,59,60,110,243,114,254,148,248,43,165,79,245,58,95,29,54,241,81,14,82,127,173,230,130,209,155,5,104,140,43,62,108,31,31,131,217,171,251,65,189,107,91,224,205,25,19,126,33,121]),Cr=new Float64Array([237,211,245,92,26,99,18,88,214,156,247,162,222,249,222,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16]),Rr=32,kr=24,zr=32,Pr=16,Or=32,Fr=32,Nr=32,Mr=32,jr=32,Gr=kr,Ir=zr,Zr=Pr,Vr=64,qr=32,Xr=64,Dr=32,Hr=64;r.lowlevel={crypto_core_hsalsa20:y,crypto_stream_xor:g,crypto_stream:h,crypto_stream_salsa20_xor:s,crypto_stream_salsa20:l,crypto_onetimeauth:v,crypto_onetimeauth_verify:b,crypto_verify_16:f,crypto_verify_32:u,crypto_secretbox:A,crypto_secretbox_open:U,crypto_scalarmult:k,crypto_scalarmult_base:z,crypto_box_beforenm:O,crypto_box_afternm:Kr,crypto_box:F,crypto_box_open:N,crypto_box_keypair:P,crypto_hash:Q,crypto_sign:ar,crypto_sign_keypair:tr,crypto_sign_open:ur,crypto_secretbox_KEYBYTES:Rr,crypto_secretbox_NONCEBYTES:kr,crypto_secretbox_ZEROBYTES:zr,crypto_secretbox_BOXZEROBYTES:Pr,crypto_scalarmult_BYTES:Or,crypto_scalarmult_SCALARBYTES:Fr,crypto_box_PUBLICKEYBYTES:Nr,crypto_box_SECRETKEYBYTES:Mr,crypto_box_BEFORENMBYTES:jr,crypto_box_NONCEBYTES:Gr,crypto_box_ZEROBYTES:Ir,crypto_box_BOXZEROBYTES:Zr,crypto_sign_BYTES:Vr,crypto_sign_PUBLICKEYBYTES:qr,crypto_sign_SECRETKEYBYTES:Xr,crypto_sign_SEEDBYTES:Dr,crypto_hash_BYTES:Hr},r.util={},r.util.decodeUTF8=function(r){var n,e=unescape(encodeURIComponent(r)),t=new Uint8Array(e.length);for(n=0;n<e.length;n++)t[n]=e.charCodeAt(n);return t},r.util.encodeUTF8=function(r){var n,e=[];for(n=0;n<r.length;n++)e.push(String.fromCharCode(r[n]));return decodeURIComponent(escape(e.join("")))},r.util.encodeBase64=function(r){if("undefined"==typeof btoa)return new Buffer(r).toString("base64");var n,e=[],t=r.length;for(n=0;t>n;n++)e.push(String.fromCharCode(r[n]));return btoa(e.join(""))},r.util.decodeBase64=function(r){if("undefined"==typeof atob)return new Uint8Array(Array.prototype.slice.call(new Buffer(r,"base64"),0));var n,e=atob(r),t=new Uint8Array(e.length);for(n=0;n<e.length;n++)t[n]=e.charCodeAt(n);return t},r.randomBytes=function(r){var n=new Uint8Array(r);return gr(n,r),n},r.secretbox=function(r,n,e){yr(r,n,e),cr(e,n);for(var t=new Uint8Array(zr+r.length),o=new Uint8Array(t.length),i=0;i<r.length;i++)t[i+zr]=r[i];return A(o,t,t.length,n,e),o.subarray(Pr)},r.secretbox.open=function(r,n,e){yr(r,n,e),cr(e,n);for(var t=new Uint8Array(Pr+r.length),o=new Uint8Array(t.length),i=0;i<r.length;i++)t[i+Pr]=r[i];return t.length<32?!1:0!==U(o,t,t.length,n,e)?!1:o.subarray(zr)},r.secretbox.keyLength=Rr,r.secretbox.nonceLength=kr,r.secretbox.overheadLength=Pr,r.scalarMult=function(r,n){if(yr(r,n),r.length!==Fr)throw new Error("bad n size");if(n.length!==Or)throw new Error("bad p size");var e=new Uint8Array(Or);return k(e,r,n),e},r.scalarMult.base=function(r){if(yr(r),r.length!==Fr)throw new Error("bad n size");var n=new Uint8Array(Or);return z(n,r),n},r.scalarMult.scalarLength=Fr,r.scalarMult.groupElementLength=Or,r.box=function(n,e,t,o){var i=r.box.before(t,o);return r.secretbox(n,e,i)},r.box.before=function(r,n){yr(r,n),wr(r,n);var e=new Uint8Array(jr);return O(e,r,n),e},r.box.after=r.secretbox,r.box.open=function(n,e,t,o){var i=r.box.before(t,o);return r.secretbox.open(n,e,i)},r.box.open.after=r.secretbox.open,r.box.keyPair=function(){var r=new Uint8Array(Nr),n=new Uint8Array(Mr);return P(r,n),{publicKey:r,secretKey:n}},r.box.keyPair.fromSecretKey=function(r){if(yr(r),r.length!==Mr)throw new Error("bad secret key size");var n=new Uint8Array(Nr);return z(n,r),{publicKey:n,secretKey:new Uint8Array(r)}},r.box.publicKeyLength=Nr,r.box.secretKeyLength=Mr,r.box.sharedKeyLength=jr,r.box.nonceLength=Gr,r.box.overheadLength=r.secretbox.overheadLength,r.sign=function(r,n){if(yr(r,n),n.length!==Xr)throw new Error("bad secret key size");var e=new Uint8Array(Vr+r.length);return ar(e,r,r.length,n),e},r.sign.open=function(r,n){if(2!==arguments.length)throw new Error("nacl.sign.open accepts 2 arguments; did you mean to use nacl.sign.detached.verify?");if(yr(r,n),n.length!==qr)throw new Error("bad public key size");var e=new Uint8Array(r.length),t=ur(e,r,r.length,n);if(0>t)return null;for(var o=new Uint8Array(t),i=0;i<o.length;i++)o[i]=e[i];return o},r.sign.detached=function(n,e){for(var t=r.sign(n,e),o=new Uint8Array(Vr),i=0;i<o.length;i++)o[i]=t[i];return o},r.sign.detached.verify=function(r,n,e){if(yr(r,n,e),n.length!==Vr)throw new Error("bad signature size");if(e.length!==qr)throw new Error("bad public key size");var t,o=new Uint8Array(Vr+r.length),i=new Uint8Array(Vr+r.length);for(t=0;Vr>t;t++)o[t]=n[t];for(t=0;t<r.length;t++)o[t+Vr]=r[t];return ur(i,o,o.length,e)>=0},r.sign.keyPair=function(){var r=new Uint8Array(qr),n=new Uint8Array(Xr);return tr(r,n),{publicKey:r,secretKey:n}},r.sign.keyPair.fromSecretKey=function(r){if(yr(r),r.length!==Xr)throw new Error("bad secret key size");for(var n=new Uint8Array(qr),e=0;e<n.length;e++)n[e]=r[32+e];return{publicKey:n,secretKey:new Uint8Array(r)}},r.sign.keyPair.fromSeed=function(r){if(yr(r),r.length!==Dr)throw new Error("bad seed size");for(var n=new Uint8Array(qr),e=new Uint8Array(Xr),t=0;32>t;t++)e[t]=r[t];return tr(n,e,!0),{publicKey:n,secretKey:e}},r.sign.publicKeyLength=qr,r.sign.secretKeyLength=Xr,r.sign.seedLength=Dr,r.sign.signatureLength=Vr,r.hash=function(r){yr(r);var n=new Uint8Array(Hr);return Q(n,r,r.length),n},r.hash.hashLength=Hr,r.verify=function(r,n){return yr(r,n),0===r.length||0===n.length?!1:r.length!==n.length?!1:0===a(r,0,n,0,r.length)?!0:!1},r.setPRNG=function(r){gr=r},function(){var n;"undefined"!=typeof window?(window.crypto&&window.crypto.getRandomValues?n=window.crypto:window.msCrypto&&window.msCrypto.getRandomValues&&(n=window.msCrypto),n&&r.setPRNG(function(r,e){var t,o=new Uint8Array(e);for(n.getRandomValues(o),t=0;e>t;t++)r[t]=o[t];sr(o)})):"undefined"!=typeof require&&(n=require("crypto"),n&&r.setPRNG(function(r,e){var t,o=n.randomBytes(e);for(t=0;e>t;t++)r[t]=o[t];sr(o)}))}()}("undefined"!=typeof module&&module.exports?module.exports:window.nacl=window.nacl||{}); \ No newline at end of file
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
index 0903b54cc..147ea92c4 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/tweetnacl/package.json
@@ -1,41 +1,46 @@
{
"_args": [
[
- "tweetnacl@>=0.13.0 <1.0.0",
+ {
+ "raw": "tweetnacl@~0.13.0",
+ "scope": null,
+ "escapedName": "tweetnacl",
+ "name": "tweetnacl",
+ "rawSpec": "~0.13.0",
+ "spec": ">=0.13.0 <0.14.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk"
]
],
- "_from": "tweetnacl@>=0.13.0 <1.0.0",
- "_id": "tweetnacl@0.14.3",
+ "_from": "tweetnacl@>=0.13.0 <0.14.0",
+ "_id": "tweetnacl@0.13.3",
"_inCache": true,
"_installable": true,
"_location": "/request/http-signature/sshpk/tweetnacl",
- "_nodeVersion": "5.6.0",
- "_npmOperationalInternal": {
- "host": "packages-16-east.internal.npmjs.com",
- "tmp": "tmp/tweetnacl-0.14.3.tgz_1459224951636_0.7403244483284652"
- },
+ "_nodeVersion": "4.2.3",
"_npmUser": {
- "email": "dmitry@codingrobots.com",
- "name": "dchest"
+ "name": "dchest",
+ "email": "dmitry@codingrobots.com"
},
- "_npmVersion": "3.7.3",
+ "_npmVersion": "2.14.7",
"_phantomChildren": {},
"_requested": {
- "name": "tweetnacl",
- "raw": "tweetnacl@>=0.13.0 <1.0.0",
- "rawSpec": ">=0.13.0 <1.0.0",
+ "raw": "tweetnacl@~0.13.0",
"scope": null,
- "spec": ">=0.13.0 <1.0.0",
+ "escapedName": "tweetnacl",
+ "name": "tweetnacl",
+ "rawSpec": "~0.13.0",
+ "spec": ">=0.13.0 <0.14.0",
"type": "range"
},
"_requiredBy": [
"/request/http-signature/sshpk"
],
- "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz",
- "_shasum": "3da382f670f25ded78d7b3d1792119bca0b7132d",
+ "_resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz",
+ "_shasum": "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56",
"_shrinkwrap": null,
- "_spec": "tweetnacl@>=0.13.0 <1.0.0",
+ "_spec": "tweetnacl@~0.13.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk",
"author": {
"name": "TweetNaCl-js contributors"
@@ -50,24 +55,23 @@
"dependencies": {},
"description": "Port of TweetNaCl cryptographic library to JavaScript",
"devDependencies": {
- "browserify": "^13.0.0",
- "eslint": "^2.2.0",
- "faucet": "^0.0.1",
+ "browserify": "^10.1.3",
+ "eslint": "^1.4.3",
+ "faucet": "0.0.1",
"tap-browser-color": "^0.1.2",
- "tape": "^4.4.0",
- "tape-run": "^2.1.3",
- "tweetnacl-util": "^0.13.3",
- "uglify-js": "^2.6.1"
+ "tape": "^4.0.0",
+ "testling": "^1.7.1",
+ "uglify-js": "^2.4.21"
},
"directories": {
"test": "test"
},
"dist": {
- "shasum": "3da382f670f25ded78d7b3d1792119bca0b7132d",
- "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
+ "shasum": "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56",
+ "tarball": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
},
- "gitHead": "3eb4fc544a2a1d6c0a41b98b9906288ca8b087e4",
- "homepage": "https://tweetnacl.js.org",
+ "gitHead": "2bb422cb707fba4a5ec9654688564a4fb861b068",
+ "homepage": "https://dchest.github.io/tweetnacl-js",
"keywords": [
"crypto",
"cryptography",
@@ -82,12 +86,12 @@
"salsa20",
"signatures"
],
- "license": "SEE LICENSE IN COPYING.txt",
+ "license": "Public domain",
"main": "nacl-fast.js",
"maintainers": [
{
- "email": "dmitry@codingrobots.com",
- "name": "dchest"
+ "name": "dchest",
+ "email": "dmitry@codingrobots.com"
}
],
"name": "tweetnacl",
@@ -99,13 +103,27 @@
},
"scripts": {
"bench": "node test/benchmark/bench.js",
+ "browser": "browserify test/browser/init.js test/*.js | uglifyjs -c -m -o test/browser/_bundle.js 2>/dev/null",
+ "browser-quick": "browserify test/browser/init.js test/*.quick.js | uglifyjs -c -m -o test/browser/_bundle-quick.js 2>/dev/null",
"build": "uglifyjs nacl.js -c -m -o nacl.min.js && uglifyjs nacl-fast.js -c -m -o nacl-fast.min.js",
- "build-test-browser": "browserify test/browser/init.js test/*.js | uglifyjs -c -m -o test/browser/_bundle.js 2>/dev/null && browserify test/browser/init.js test/*.quick.js | uglifyjs -c -m -o test/browser/_bundle-quick.js 2>/dev/null",
+ "chrome": "browserify test/browser/testling_init.js test/*.js | testling -x google-chrome | faucet",
+ "firefox": "browserify test/browser/testling_init.js test/*.js | testling -x firefox | faucet",
"lint": "eslint nacl.js nacl-fast.js test/*.js test/benchmark/*.js",
- "test": "npm run test-node-all && npm run test-browser",
- "test-browser": "NACL_SRC=${NACL_SRC:='nacl.min.js'} && npm run build-test-browser && cat $NACL_SRC test/browser/_bundle.js | tape-run | faucet",
- "test-node": "tape test/*.js | faucet",
- "test-node-all": "make -C test/c && tape test/*.js test/c/*.js | faucet"
+ "test": "tape test/*.js | faucet",
+ "testall": "make -C test/c && tape test/*.js test/c/*.js | faucet",
+ "testling": "browserify test/browser/testling_init.js test/*.js | testling | faucet"
+ },
+ "testling": {
+ "files": "test/*.js",
+ "browsers": [
+ "chrome/22..latest",
+ "firefox/16..latest",
+ "safari/latest",
+ "opera/11.0..latest",
+ "iphone/6..latest",
+ "ipad/6..latest",
+ "android-browser/latest"
+ ]
},
- "version": "0.14.3"
+ "version": "0.13.3"
}
diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json b/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
index fc995b42c..27d297637 100644
--- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
+++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/package.json
@@ -1,39 +1,48 @@
{
"_args": [
[
- "sshpk@^1.7.0",
+ {
+ "raw": "sshpk@^1.7.0",
+ "scope": null,
+ "escapedName": "sshpk",
+ "name": "sshpk",
+ "rawSpec": "^1.7.0",
+ "spec": ">=1.7.0 <2.0.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature"
]
],
"_from": "sshpk@>=1.7.0 <2.0.0",
- "_id": "sshpk@1.7.4",
+ "_id": "sshpk@1.9.2",
"_inCache": true,
"_installable": true,
"_location": "/request/http-signature/sshpk",
- "_nodeVersion": "0.12.9",
+ "_nodeVersion": "0.12.15",
"_npmOperationalInternal": {
- "host": "packages-6-west.internal.npmjs.com",
- "tmp": "tmp/sshpk-1.7.4.tgz_1455236064846_0.4782760036177933"
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/sshpk-1.9.2.tgz_1469841656006_0.10793639998883009"
},
"_npmUser": {
- "email": "alex@cooperi.net",
- "name": "arekinath"
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
},
- "_npmVersion": "2.14.4",
+ "_npmVersion": "2.15.8",
"_phantomChildren": {},
"_requested": {
- "name": "sshpk",
"raw": "sshpk@^1.7.0",
- "rawSpec": "^1.7.0",
"scope": null,
+ "escapedName": "sshpk",
+ "name": "sshpk",
+ "rawSpec": "^1.7.0",
"spec": ">=1.7.0 <2.0.0",
"type": "range"
},
"_requiredBy": [
"/request/http-signature"
],
- "_resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz",
- "_shasum": "ad7b47defca61c8415d964243b62b0ce60fbca38",
+ "_resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz",
+ "_shasum": "3b41351bbad5c34ddf4bd8119937efee31a46765",
"_shrinkwrap": null,
"_spec": "sshpk@^1.7.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature",
@@ -50,33 +59,34 @@
},
"contributors": [
{
- "email": "dave@daveeddy.com",
- "name": "Dave Eddy"
+ "name": "Dave Eddy",
+ "email": "dave@daveeddy.com"
},
{
- "email": "mcavage@gmail.com",
- "name": "Mark Cavage"
+ "name": "Mark Cavage",
+ "email": "mcavage@gmail.com"
},
{
- "email": "alex@cooperi.net",
- "name": "Alex Wilson"
+ "name": "Alex Wilson",
+ "email": "alex@cooperi.net"
}
],
"dependencies": {
- "asn1": ">=0.2.3 <0.3.0",
- "assert-plus": ">=0.2.0 <0.3.0",
- "dashdash": ">=1.10.1 <2.0.0",
- "ecc-jsbn": ">=0.0.1 <1.0.0",
- "jodid25519": ">=1.0.0 <2.0.0",
- "jsbn": ">=0.1.0 <0.2.0",
- "tweetnacl": ">=0.13.0 <1.0.0"
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jodid25519": "^1.0.0",
+ "jsbn": "~0.1.0",
+ "tweetnacl": "~0.13.0"
},
"description": "A library for finding and using SSH public keys",
"devDependencies": {
- "benchmark": ">=1.0.0 <2.0.0",
- "sinon": ">=1.17.2 <2.0.0",
- "tape": ">=3.5.0 <4.0.0",
- "temp": "0.8.2"
+ "benchmark": "^1.0.0",
+ "sinon": "^1.17.2",
+ "tape": "^3.5.0",
+ "temp": "^0.8.2"
},
"directories": {
"bin": "./bin",
@@ -84,33 +94,33 @@
"man": "./man/man1"
},
"dist": {
- "shasum": "ad7b47defca61c8415d964243b62b0ce60fbca38",
- "tarball": "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"
+ "shasum": "3b41351bbad5c34ddf4bd8119937efee31a46765",
+ "tarball": "https://registry.npmjs.org/sshpk/-/sshpk-1.9.2.tgz"
},
"engines": {
- "node": ">=0.8.0"
+ "node": ">=0.10.0"
},
- "gitHead": "9b86d45d512c97f6ea10b98a2970828dfb290310",
+ "gitHead": "a8b794384822a52eea5ed3b2f192a780b7909609",
"homepage": "https://github.com/arekinath/node-sshpk#readme",
"license": "MIT",
"main": "lib/index.js",
"maintainers": [
{
- "email": "alex@cooperi.net",
- "name": "arekinath"
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
}
],
"man": [
- "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-conv.1",
- "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-sign.1",
- "/Users/alex.wilson/dev/sshpk/man/man1/sshpk-verify.1"
+ "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-conv.1",
+ "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-sign.1",
+ "/Users/alex.wilson/dev/node-sshpk/man/man1/sshpk-verify.1"
],
"name": "sshpk",
"optionalDependencies": {
- "ecc-jsbn": ">=0.0.1 <1.0.0",
- "jodid25519": ">=1.0.0 <2.0.0",
- "jsbn": ">=0.1.0 <0.2.0",
- "tweetnacl": ">=0.13.0 <1.0.0"
+ "ecc-jsbn": "~0.1.1",
+ "jodid25519": "^1.0.0",
+ "jsbn": "~0.1.0",
+ "tweetnacl": "~0.13.0"
},
"readme": "ERROR: No README data found!",
"repository": {
@@ -120,5 +130,5 @@
"scripts": {
"test": "tape test/*.js"
},
- "version": "1.7.4"
+ "version": "1.9.2"
}
diff --git a/node_modules/request/node_modules/http-signature/package.json b/node_modules/request/node_modules/http-signature/package.json
index c7479c09f..2f9211c9a 100644
--- a/node_modules/request/node_modules/http-signature/package.json
+++ b/node_modules/request/node_modules/http-signature/package.json
@@ -1,7 +1,15 @@
{
"_args": [
[
- "http-signature@~1.1.0",
+ {
+ "raw": "http-signature@~1.1.0",
+ "scope": null,
+ "escapedName": "http-signature",
+ "name": "http-signature",
+ "rawSpec": "~1.1.0",
+ "spec": ">=1.1.0 <1.2.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
@@ -12,16 +20,17 @@
"_location": "/request/http-signature",
"_nodeVersion": "0.12.9",
"_npmUser": {
- "email": "alex@cooperi.net",
- "name": "arekinath"
+ "name": "arekinath",
+ "email": "alex@cooperi.net"
},
"_npmVersion": "2.14.9",
"_phantomChildren": {},
"_requested": {
- "name": "http-signature",
"raw": "http-signature@~1.1.0",
- "rawSpec": "~1.1.0",
"scope": null,
+ "escapedName": "http-signature",
+ "name": "http-signature",
+ "rawSpec": "~1.1.0",
"spec": ">=1.1.0 <1.2.0",
"type": "range"
},
@@ -66,7 +75,7 @@
"directories": {},
"dist": {
"shasum": "df72e267066cd0ac67fb76adf8e134a8fbcf91bf",
- "tarball": "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
+ "tarball": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
},
"engines": {
"node": ">=0.8",
diff --git a/node_modules/request/node_modules/is-typedarray/package.json b/node_modules/request/node_modules/is-typedarray/package.json
index 863afc516..b90ee3139 100644
--- a/node_modules/request/node_modules/is-typedarray/package.json
+++ b/node_modules/request/node_modules/is-typedarray/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "is-typedarray@~1.0.0",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request"
+ {
+ "raw": "is-typedarray@~1.0.0",
+ "scope": null,
+ "escapedName": "is-typedarray",
+ "name": "is-typedarray",
+ "rawSpec": "~1.0.0",
+ "spec": ">=1.0.0 <1.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "is-typedarray@>=1.0.0 <1.1.0",
@@ -12,16 +20,17 @@
"_location": "/request/is-typedarray",
"_nodeVersion": "0.10.36",
"_npmUser": {
- "email": "hughskennedy@gmail.com",
- "name": "hughsk"
+ "name": "hughsk",
+ "email": "hughskennedy@gmail.com"
},
"_npmVersion": "2.7.5",
"_phantomChildren": {},
"_requested": {
- "name": "is-typedarray",
"raw": "is-typedarray@~1.0.0",
- "rawSpec": "~1.0.0",
"scope": null,
+ "escapedName": "is-typedarray",
+ "name": "is-typedarray",
+ "rawSpec": "~1.0.0",
"spec": ">=1.0.0 <1.1.0",
"type": "range"
},
@@ -32,10 +41,10 @@
"_shasum": "e479c80858df0c1b11ddda6940f96011fcda4a9a",
"_shrinkwrap": null,
"_spec": "is-typedarray@~1.0.0",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "hughskennedy@gmail.com",
"name": "Hugh Kennedy",
+ "email": "hughskennedy@gmail.com",
"url": "http://hughsk.io/"
},
"bugs": {
@@ -49,15 +58,15 @@
"directories": {},
"dist": {
"shasum": "e479c80858df0c1b11ddda6940f96011fcda4a9a",
- "tarball": "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+ "tarball": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
},
"gitHead": "0617cfa871686cf541af62b144f130488f44f6fe",
"homepage": "https://github.com/hughsk/is-typedarray",
"keywords": [
+ "typed",
"array",
"detect",
"is",
- "typed",
"util"
],
"license": "MIT",
diff --git a/node_modules/request/node_modules/isstream/package.json b/node_modules/request/node_modules/isstream/package.json
index 87c26fe12..c2d661f5b 100644
--- a/node_modules/request/node_modules/isstream/package.json
+++ b/node_modules/request/node_modules/isstream/package.json
@@ -1,15 +1,70 @@
{
- "name": "isstream",
- "version": "0.1.2",
+ "_args": [
+ [
+ {
+ "raw": "isstream@~0.1.2",
+ "scope": null,
+ "escapedName": "isstream",
+ "name": "isstream",
+ "rawSpec": "~0.1.2",
+ "spec": ">=0.1.2 <0.2.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
+ ],
+ "_from": "isstream@>=0.1.2 <0.2.0",
+ "_id": "isstream@0.1.2",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/isstream",
+ "_nodeVersion": "1.4.3",
+ "_npmUser": {
+ "name": "rvagg",
+ "email": "rod@vagg.org"
+ },
+ "_npmVersion": "2.6.1",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "isstream@~0.1.2",
+ "scope": null,
+ "escapedName": "isstream",
+ "name": "isstream",
+ "rawSpec": "~0.1.2",
+ "spec": ">=0.1.2 <0.2.0",
+ "type": "range"
+ },
+ "_requiredBy": [
+ "/request"
+ ],
+ "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+ "_shrinkwrap": null,
+ "_spec": "isstream@~0.1.2",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
+ "author": {
+ "name": "Rod Vagg",
+ "email": "rod@vagg.org"
+ },
+ "bugs": {
+ "url": "https://github.com/rvagg/isstream/issues"
+ },
+ "dependencies": {},
"description": "Determine if an object is a Stream",
- "main": "isstream.js",
- "scripts": {
- "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
+ "devDependencies": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x",
+ "tape": "~2.12.3"
},
- "repository": {
- "type": "git",
- "url": "git+https://github.com/rvagg/isstream.git"
+ "directories": {},
+ "dist": {
+ "shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+ "tarball": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
},
+ "gitHead": "cd39cba6da939b4fc9110825203adc506422c3dc",
+ "homepage": "https://github.com/rvagg/isstream",
"keywords": [
"stream",
"type",
@@ -17,26 +72,23 @@
"readable-stream",
"hippo"
],
- "devDependencies": {
- "tape": "~2.12.3",
- "core-util-is": "~1.0.0",
- "isarray": "0.0.1",
- "string_decoder": "~0.10.x",
- "inherits": "~2.0.1"
- },
- "author": {
- "name": "Rod Vagg",
- "email": "rod@vagg.org"
- },
"license": "MIT",
- "bugs": {
- "url": "https://github.com/rvagg/isstream/issues"
+ "main": "isstream.js",
+ "maintainers": [
+ {
+ "name": "rvagg",
+ "email": "rod@vagg.org"
+ }
+ ],
+ "name": "isstream",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/rvagg/isstream.git"
},
- "homepage": "https://github.com/rvagg/isstream",
- "readme": "# isStream\n\n[![Build Status](https://secure.travis-ci.org/rvagg/isstream.png)](http://travis-ci.org/rvagg/isstream)\n\n**Test if an object is a `Stream`**\n\n[![NPM](https://nodei.co/npm/isstream.svg)](https://nodei.co/npm/isstream/)\n\nThe missing `Stream.isStream(obj)`: determine if an object is standard Node.js `Stream`. Works for Node-core `Stream` objects (for 0.8, 0.10, 0.11, and in theory, older and newer versions) and all versions of **[readable-stream](https://github.com/isaacs/readable-stream)**.\n\n## Usage:\n\n```js\nvar isStream = require('isstream')\nvar Stream = require('stream')\n\nisStream(new Stream()) // true\n\nisStream({}) // false\n\nisStream(new Stream.Readable()) // true\nisStream(new Stream.Writable()) // true\nisStream(new Stream.Duplex()) // true\nisStream(new Stream.Transform()) // true\nisStream(new Stream.PassThrough()) // true\n```\n\n## But wait! There's more!\n\nYou can also test for `isReadable(obj)`, `isWritable(obj)` and `isDuplex(obj)` to test for implementations of Streams2 (and Streams3) base classes.\n\n```js\nvar isReadable = require('isstream').isReadable\nvar isWritable = require('isstream').isWritable\nvar isDuplex = require('isstream').isDuplex\nvar Stream = require('stream')\n\nisReadable(new Stream()) // false\nisWritable(new Stream()) // false\nisDuplex(new Stream()) // false\n\nisReadable(new Stream.Readable()) // true\nisReadable(new Stream.Writable()) // false\nisReadable(new Stream.Duplex()) // true\nisReadable(new Stream.Transform()) // true\nisReadable(new Stream.PassThrough()) // true\n\nisWritable(new Stream.Readable()) // false\nisWritable(new Stream.Writable()) // true\nisWritable(new Stream.Duplex()) // true\nisWritable(new Stream.Transform()) // true\nisWritable(new Stream.PassThrough()) // true\n\nisDuplex(new Stream.Readable()) // false\nisDuplex(new Stream.Writable()) // false\nisDuplex(new Stream.Duplex()) // true\nisDuplex(new Stream.Transform()) // true\nisDuplex(new Stream.PassThrough()) // true\n```\n\n*Reminder: when implementing your own streams, please [use **readable-stream** rather than core streams](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).*\n\n\n## License\n\n**isStream** is Copyright (c) 2015 Rod Vagg [@rvagg](https://twitter.com/rvagg) and licenced under the MIT licence. All rights not explicitly granted in the MIT license are reserved. See the included LICENSE.md file for more details.\n",
- "readmeFilename": "README.md",
- "_id": "isstream@0.1.2",
- "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
- "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
- "_from": "isstream@>=0.1.2 <0.2.0"
+ "scripts": {
+ "test": "tar --xform 's/^package/readable-stream-1.0/' -zxf readable-stream-1.0.*.tgz && tar --xform 's/^package/readable-stream-1.1/' -zxf readable-stream-1.1.*.tgz && node test.js; rm -rf readable-stream-1.?/"
+ },
+ "version": "0.1.2"
}
diff --git a/node_modules/request/node_modules/json-stringify-safe/package.json b/node_modules/request/node_modules/json-stringify-safe/package.json
index f09f9d571..354008466 100644
--- a/node_modules/request/node_modules/json-stringify-safe/package.json
+++ b/node_modules/request/node_modules/json-stringify-safe/package.json
@@ -1,22 +1,55 @@
{
- "name": "json-stringify-safe",
- "version": "5.0.1",
- "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
- "keywords": [
- "json",
- "stringify",
- "circular",
- "safe"
+ "_args": [
+ [
+ {
+ "raw": "json-stringify-safe@~5.0.1",
+ "scope": null,
+ "escapedName": "json-stringify-safe",
+ "name": "json-stringify-safe",
+ "rawSpec": "~5.0.1",
+ "spec": ">=5.0.1 <5.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
+ ]
],
- "homepage": "https://github.com/isaacs/json-stringify-safe",
- "bugs": {
- "url": "https://github.com/isaacs/json-stringify-safe/issues"
+ "_from": "json-stringify-safe@>=5.0.1 <5.1.0",
+ "_id": "json-stringify-safe@5.0.1",
+ "_inCache": true,
+ "_installable": true,
+ "_location": "/request/json-stringify-safe",
+ "_nodeVersion": "2.0.1",
+ "_npmUser": {
+ "name": "isaacs",
+ "email": "isaacs@npmjs.com"
+ },
+ "_npmVersion": "2.10.0",
+ "_phantomChildren": {},
+ "_requested": {
+ "raw": "json-stringify-safe@~5.0.1",
+ "scope": null,
+ "escapedName": "json-stringify-safe",
+ "name": "json-stringify-safe",
+ "rawSpec": "~5.0.1",
+ "spec": ">=5.0.1 <5.1.0",
+ "type": "range"
},
+ "_requiredBy": [
+ "/request"
+ ],
+ "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
+ "_shrinkwrap": null,
+ "_spec": "json-stringify-safe@~5.0.1",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
"name": "Isaac Z. Schlueter",
"email": "i@izs.me",
"url": "http://blog.izs.me"
},
+ "bugs": {
+ "url": "https://github.com/isaacs/json-stringify-safe/issues"
+ },
"contributors": [
{
"name": "Andri Möll",
@@ -24,24 +57,47 @@
"url": "http://themoll.com"
}
],
+ "dependencies": {},
+ "description": "Like JSON.stringify, but doesn't blow up on circular refs.",
+ "devDependencies": {
+ "mocha": ">= 2.1.0 < 3",
+ "must": ">= 0.12 < 0.13",
+ "sinon": ">= 1.12.2 < 2"
+ },
+ "directories": {},
+ "dist": {
+ "shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
+ "tarball": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+ },
+ "gitHead": "3890dceab3ad14f8701e38ca74f38276abc76de5",
+ "homepage": "https://github.com/isaacs/json-stringify-safe",
+ "keywords": [
+ "json",
+ "stringify",
+ "circular",
+ "safe"
+ ],
"license": "ISC",
+ "main": "stringify.js",
+ "maintainers": [
+ {
+ "name": "isaacs",
+ "email": "i@izs.me"
+ },
+ {
+ "name": "moll",
+ "email": "andri@dot.ee"
+ }
+ ],
+ "name": "json-stringify-safe",
+ "optionalDependencies": {},
+ "readme": "ERROR: No README data found!",
"repository": {
"type": "git",
"url": "git://github.com/isaacs/json-stringify-safe.git"
},
- "main": "stringify.js",
"scripts": {
"test": "node test.js"
},
- "devDependencies": {
- "mocha": ">= 2.1.0 < 3",
- "must": ">= 0.12 < 0.13",
- "sinon": ">= 1.12.2 < 2"
- },
- "readme": "# json-stringify-safe\n\nLike JSON.stringify, but doesn't throw on circular references.\n\n## Usage\n\nTakes the same arguments as `JSON.stringify`.\n\n```javascript\nvar stringify = require('json-stringify-safe');\nvar circularObj = {};\ncircularObj.circularRef = circularObj;\ncircularObj.list = [ circularObj, circularObj ];\nconsole.log(stringify(circularObj, null, 2));\n```\n\nOutput:\n\n```json\n{\n \"circularRef\": \"[Circular]\",\n \"list\": [\n \"[Circular]\",\n \"[Circular]\"\n ]\n}\n```\n\n## Details\n\n```\nstringify(obj, serializer, indent, decycler)\n```\n\nThe first three arguments are the same as to JSON.stringify. The last\nis an argument that's only used when the object has been seen already.\n\nThe default `decycler` function returns the string `'[Circular]'`.\nIf, for example, you pass in `function(k,v){}` (return nothing) then it\nwill prune cycles. If you pass in `function(k,v){ return {foo: 'bar'}}`,\nthen cyclical objects will always be represented as `{\"foo\":\"bar\"}` in\nthe result.\n\n```\nstringify.getSerialize(serializer, decycler)\n```\n\nReturns a serializer that can be used elsewhere. This is the actual\nfunction that's passed to JSON.stringify.\n\n**Note** that the function returned from `getSerialize` is stateful for now, so\ndo **not** use it more than once.\n",
- "readmeFilename": "README.md",
- "_id": "json-stringify-safe@5.0.1",
- "_shasum": "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb",
- "_resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
- "_from": "json-stringify-safe@>=5.0.1 <5.1.0"
+ "version": "5.0.1"
}
diff --git a/node_modules/request/node_modules/mime-types/HISTORY.md b/node_modules/request/node_modules/mime-types/HISTORY.md
index 1d86a5cb1..63bd4ea0b 100644
--- a/node_modules/request/node_modules/mime-types/HISTORY.md
+++ b/node_modules/request/node_modules/mime-types/HISTORY.md
@@ -1,3 +1,9 @@
+2.1.11 / 2016-05-01
+===================
+
+ * deps: mime-db@~1.23.0
+ - Add new mime types
+
2.1.10 / 2016-02-15
===================
diff --git a/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md b/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
index 44f9f6465..d6705ac86 100644
--- a/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
+++ b/node_modules/request/node_modules/mime-types/node_modules/mime-db/HISTORY.md
@@ -1,3 +1,24 @@
+1.23.0 / 2016-05-01
+===================
+
+ * Add `application/efi`
+ * Add `application/vnd.3gpp.sms+xml`
+ * Add `application/vnd.3lightssoftware.imagescal`
+ * Add `application/vnd.coreos.ignition+json`
+ * Add `application/vnd.desmume.movie`
+ * Add `application/vnd.onepager`
+ * Add `application/vnd.vel+json`
+ * Add `text/prs.prop.logic`
+ * Add `video/encaprtp`
+ * Add `video/h265`
+ * Add `video/iso.segment`
+ * Add `video/raptorfec`
+ * Add `video/rtploopback`
+ * Add `video/vnd.radgamettools.bink`
+ * Add `video/vnd.radgamettools.smacker`
+ * Add `video/vp8`
+ * Add extension `.3gpp` to `audio/3gpp`
+
1.22.0 / 2016-02-15
===================
diff --git a/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json b/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
index 863deb4f0..0a5a8a7bb 100644
--- a/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
+++ b/node_modules/request/node_modules/mime-types/node_modules/mime-db/db.json
@@ -284,6 +284,9 @@
"source": "iana",
"compressible": false
},
+ "application/efi": {
+ "source": "iana"
+ },
"application/emergencycalldata.comment+xml": {
"source": "iana"
},
@@ -1217,6 +1220,9 @@
"application/vnd.3gpp.sms": {
"source": "iana"
},
+ "application/vnd.3gpp.sms+xml": {
+ "source": "iana"
+ },
"application/vnd.3gpp.srvcc-ext+xml": {
"source": "iana"
},
@@ -1239,6 +1245,9 @@
"source": "iana",
"extensions": ["tcap"]
},
+ "application/vnd.3lightssoftware.imagescal": {
+ "source": "iana"
+ },
"application/vnd.3m.post-it-notes": {
"source": "iana",
"extensions": ["pwn"]
@@ -1497,6 +1506,10 @@
"source": "iana",
"extensions": ["cdbcmsg"]
},
+ "application/vnd.coreos.ignition+json": {
+ "source": "iana",
+ "compressible": true
+ },
"application/vnd.cosmocaller": {
"source": "iana",
"extensions": ["cmc"]
@@ -1600,6 +1613,9 @@
"application/vnd.desmume-movie": {
"source": "iana"
},
+ "application/vnd.desmume.movie": {
+ "source": "apache"
+ },
"application/vnd.dir-bi.plate-dl-nosuffix": {
"source": "iana"
},
@@ -3138,6 +3154,9 @@
"application/vnd.omaloc-supl-init": {
"source": "iana"
},
+ "application/vnd.onepager": {
+ "source": "iana"
+ },
"application/vnd.openblox.game+xml": {
"source": "iana"
},
@@ -3981,6 +4000,10 @@
"application/vnd.vectorworks": {
"source": "iana"
},
+ "application/vnd.vel+json": {
+ "source": "iana",
+ "compressible": true
+ },
"application/vnd.verimatrix.vcas": {
"source": "iana"
},
@@ -4826,7 +4849,9 @@
"source": "iana"
},
"audio/3gpp": {
- "source": "iana"
+ "source": "iana",
+ "compressible": false,
+ "extensions": ["3gpp"]
},
"audio/3gpp2": {
"source": "iana"
@@ -5991,6 +6016,9 @@
"source": "iana",
"extensions": ["dsc"]
},
+ "text/prs.prop.logic": {
+ "source": "iana"
+ },
"text/raptorfec": {
"source": "iana"
},
@@ -6282,6 +6310,9 @@
"video/dv": {
"source": "apache"
},
+ "video/encaprtp": {
+ "source": "apache"
+ },
"video/h261": {
"source": "apache",
"extensions": ["h261"]
@@ -6306,6 +6337,12 @@
"video/h264-svc": {
"source": "apache"
},
+ "video/h265": {
+ "source": "apache"
+ },
+ "video/iso.segment": {
+ "source": "apache"
+ },
"video/jpeg": {
"source": "apache",
"extensions": ["jpgv"]
@@ -6369,12 +6406,18 @@
"compressible": false,
"extensions": ["qt","mov"]
},
+ "video/raptorfec": {
+ "source": "apache"
+ },
"video/raw": {
"source": "apache"
},
"video/rtp-enc-aescm128": {
"source": "apache"
},
+ "video/rtploopback": {
+ "source": "apache"
+ },
"video/rtx": {
"source": "apache"
},
@@ -6474,6 +6517,12 @@
"video/vnd.objectvideo": {
"source": "apache"
},
+ "video/vnd.radgamettools.bink": {
+ "source": "apache"
+ },
+ "video/vnd.radgamettools.smacker": {
+ "source": "apache"
+ },
"video/vnd.sealed.mpeg1": {
"source": "apache"
},
@@ -6494,6 +6543,9 @@
"source": "apache",
"extensions": ["viv"]
},
+ "video/vp8": {
+ "source": "apache"
+ },
"video/webm": {
"source": "apache",
"compressible": false,
diff --git a/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json b/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
index 1abcdca6c..8411c5ad0 100644
--- a/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
+++ b/node_modules/request/node_modules/mime-types/node_modules/mime-db/package.json
@@ -1,78 +1,87 @@
{
"_args": [
[
- "mime-db@~1.22.0",
+ {
+ "raw": "mime-db@~1.23.0",
+ "scope": null,
+ "escapedName": "mime-db",
+ "name": "mime-db",
+ "rawSpec": "~1.23.0",
+ "spec": ">=1.23.0 <1.24.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request/node_modules/mime-types"
]
],
- "_from": "mime-db@>=1.22.0 <1.23.0",
- "_id": "mime-db@1.22.0",
+ "_from": "mime-db@>=1.23.0 <1.24.0",
+ "_id": "mime-db@1.23.0",
"_inCache": true,
"_installable": true,
"_location": "/request/mime-types/mime-db",
- "_nodeVersion": "4.2.3",
+ "_nodeVersion": "4.4.3",
"_npmOperationalInternal": {
- "host": "packages-9-west.internal.npmjs.com",
- "tmp": "tmp/mime-db-1.22.0.tgz_1455558813990_0.7830642955377698"
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/mime-db-1.23.0.tgz_1462163798086_0.43938886746764183"
},
"_npmUser": {
- "email": "doug@somethingdoug.com",
- "name": "dougwilson"
+ "name": "dougwilson",
+ "email": "doug@somethingdoug.com"
},
- "_npmVersion": "2.14.7",
+ "_npmVersion": "2.15.1",
"_phantomChildren": {},
"_requested": {
- "name": "mime-db",
- "raw": "mime-db@~1.22.0",
- "rawSpec": "~1.22.0",
+ "raw": "mime-db@~1.23.0",
"scope": null,
- "spec": ">=1.22.0 <1.23.0",
+ "escapedName": "mime-db",
+ "name": "mime-db",
+ "rawSpec": "~1.23.0",
+ "spec": ">=1.23.0 <1.24.0",
"type": "range"
},
"_requiredBy": [
"/request/mime-types"
],
- "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz",
- "_shasum": "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a",
+ "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz",
+ "_shasum": "a31b4070adaea27d732ea333740a64d0ec9a6659",
"_shrinkwrap": null,
- "_spec": "mime-db@~1.22.0",
+ "_spec": "mime-db@~1.23.0",
"_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/mime-types",
"bugs": {
"url": "https://github.com/jshttp/mime-db/issues"
},
"contributors": [
{
- "email": "doug@somethingdoug.com",
- "name": "Douglas Christopher Wilson"
+ "name": "Douglas Christopher Wilson",
+ "email": "doug@somethingdoug.com"
},
{
- "email": "me@jongleberry.com",
"name": "Jonathan Ong",
+ "email": "me@jongleberry.com",
"url": "http://jongleberry.com"
},
{
- "email": "robert@broofa.com",
"name": "Robert Kieffer",
+ "email": "robert@broofa.com",
"url": "http://github.com/broofa"
}
],
"dependencies": {},
"description": "Media Type Database",
"devDependencies": {
- "bluebird": "3.3.1",
+ "bluebird": "3.3.5",
"co": "4.6.0",
"cogent": "1.0.1",
- "csv-parse": "1.0.1",
+ "csv-parse": "1.1.0",
"gnode": "0.1.2",
- "istanbul": "0.4.2",
+ "istanbul": "0.4.3",
"mocha": "1.21.5",
- "raw-body": "2.1.5",
- "stream-to-array": "2.2.1"
+ "raw-body": "2.1.6",
+ "stream-to-array": "2.3.0"
},
"directories": {},
"dist": {
- "shasum": "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a",
- "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+ "shasum": "a31b4070adaea27d732ea333740a64d0ec9a6659",
+ "tarball": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
},
"engines": {
"node": ">= 0.6"
@@ -84,7 +93,7 @@
"db.json",
"index.js"
],
- "gitHead": "ed88d32405582a5aaff6225d1210005d6be2623e",
+ "gitHead": "ba0d99fd05b3bfdc2ebcd78f858c25cb7db6af41",
"homepage": "https://github.com/jshttp/mime-db#readme",
"keywords": [
"mime",
@@ -98,12 +107,12 @@
"license": "MIT",
"maintainers": [
{
- "email": "doug@somethingdoug.com",
- "name": "dougwilson"
+ "name": "dougwilson",
+ "email": "doug@somethingdoug.com"
},
{
- "email": "jonathanrichardong@gmail.com",
- "name": "jongleberry"
+ "name": "jongleberry",
+ "email": "jonathanrichardong@gmail.com"
}
],
"name": "mime-db",
@@ -121,5 +130,5 @@
"test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
"update": "npm run fetch && npm run build"
},
- "version": "1.22.0"
+ "version": "1.23.0"
}
diff --git a/node_modules/request/node_modules/mime-types/package.json b/node_modules/request/node_modules/mime-types/package.json
index 8e7b5f62b..dae8f5a70 100644
--- a/node_modules/request/node_modules/mime-types/package.json
+++ b/node_modules/request/node_modules/mime-types/package.json
@@ -1,31 +1,40 @@
{
"_args": [
[
- "mime-types@~2.1.7",
+ {
+ "raw": "mime-types@~2.1.7",
+ "scope": null,
+ "escapedName": "mime-types",
+ "name": "mime-types",
+ "rawSpec": "~2.1.7",
+ "spec": ">=2.1.7 <2.2.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "mime-types@>=2.1.7 <2.2.0",
- "_id": "mime-types@2.1.10",
+ "_id": "mime-types@2.1.11",
"_inCache": true,
"_installable": true,
"_location": "/request/mime-types",
- "_nodeVersion": "4.2.3",
+ "_nodeVersion": "4.4.3",
"_npmOperationalInternal": {
- "host": "packages-9-west.internal.npmjs.com",
- "tmp": "tmp/mime-types-2.1.10.tgz_1455575237256_0.9163766100537032"
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/mime-types-2.1.11.tgz_1462165365027_0.7217204745393246"
},
"_npmUser": {
- "email": "doug@somethingdoug.com",
- "name": "dougwilson"
+ "name": "dougwilson",
+ "email": "doug@somethingdoug.com"
},
- "_npmVersion": "2.14.7",
+ "_npmVersion": "2.15.1",
"_phantomChildren": {},
"_requested": {
- "name": "mime-types",
"raw": "mime-types@~2.1.7",
- "rawSpec": "~2.1.7",
"scope": null,
+ "escapedName": "mime-types",
+ "name": "mime-types",
+ "rawSpec": "~2.1.7",
"spec": ">=2.1.7 <2.2.0",
"type": "range"
},
@@ -33,8 +42,8 @@
"/request",
"/request/form-data"
],
- "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz",
- "_shasum": "b93c7cb4362e16d41072a7e54538fb4d43070837",
+ "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz",
+ "_shasum": "c259c471bda808a85d6cd193b430a5fae4473b3c",
"_shrinkwrap": null,
"_spec": "mime-types@~2.1.7",
"_where": "/Users/rebecca/code/npm/node_modules/request",
@@ -43,32 +52,32 @@
},
"contributors": [
{
- "email": "doug@somethingdoug.com",
- "name": "Douglas Christopher Wilson"
+ "name": "Douglas Christopher Wilson",
+ "email": "doug@somethingdoug.com"
},
{
- "email": "fishrock123@rocketmail.com",
"name": "Jeremiah Senkpiel",
+ "email": "fishrock123@rocketmail.com",
"url": "https://searchbeam.jit.su"
},
{
- "email": "me@jongleberry.com",
"name": "Jonathan Ong",
+ "email": "me@jongleberry.com",
"url": "http://jongleberry.com"
}
],
"dependencies": {
- "mime-db": "~1.22.0"
+ "mime-db": "~1.23.0"
},
"description": "The ultimate javascript content-type utility.",
"devDependencies": {
- "istanbul": "0.4.2",
+ "istanbul": "0.4.3",
"mocha": "1.21.5"
},
"directories": {},
"dist": {
- "shasum": "b93c7cb4362e16d41072a7e54538fb4d43070837",
- "tarball": "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"
+ "shasum": "c259c471bda808a85d6cd193b430a5fae4473b3c",
+ "tarball": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
},
"engines": {
"node": ">= 0.6"
@@ -78,7 +87,7 @@
"LICENSE",
"index.js"
],
- "gitHead": "70785d38e9cc251137b00f73ab3d3257c4aea203",
+ "gitHead": "298ffcf490a5d6e60edea7bf7a69036df04846b1",
"homepage": "https://github.com/jshttp/mime-types#readme",
"keywords": [
"mime",
@@ -87,16 +96,16 @@
"license": "MIT",
"maintainers": [
{
- "email": "doug@somethingdoug.com",
- "name": "dougwilson"
+ "name": "dougwilson",
+ "email": "doug@somethingdoug.com"
},
{
- "email": "fishrock123@rocketmail.com",
- "name": "fishrock123"
+ "name": "fishrock123",
+ "email": "fishrock123@rocketmail.com"
},
{
- "email": "jonathanrichardong@gmail.com",
- "name": "jongleberry"
+ "name": "jongleberry",
+ "email": "jonathanrichardong@gmail.com"
}
],
"name": "mime-types",
@@ -111,5 +120,5 @@
"test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot test/test.js",
"test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter dot test/test.js"
},
- "version": "2.1.10"
+ "version": "2.1.11"
}
diff --git a/node_modules/request/node_modules/node-uuid/package.json b/node_modules/request/node_modules/node-uuid/package.json
index 44c585893..a3a391590 100644
--- a/node_modules/request/node_modules/node-uuid/package.json
+++ b/node_modules/request/node_modules/node-uuid/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "node-uuid@~1.4.7",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request"
+ {
+ "raw": "node-uuid@~1.4.7",
+ "scope": null,
+ "escapedName": "node-uuid",
+ "name": "node-uuid",
+ "rawSpec": "~1.4.7",
+ "spec": ">=1.4.7 <1.5.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "node-uuid@>=1.4.7 <1.5.0",
@@ -12,16 +20,17 @@
"_location": "/request/node-uuid",
"_nodeVersion": "5.0.0",
"_npmUser": {
- "email": "coolaj86@gmail.com",
- "name": "coolaj86"
+ "name": "coolaj86",
+ "email": "coolaj86@gmail.com"
},
"_npmVersion": "3.3.6",
"_phantomChildren": {},
"_requested": {
- "name": "node-uuid",
"raw": "node-uuid@~1.4.7",
- "rawSpec": "~1.4.7",
"scope": null,
+ "escapedName": "node-uuid",
+ "name": "node-uuid",
+ "rawSpec": "~1.4.7",
"spec": ">=1.4.7 <1.5.0",
"type": "range"
},
@@ -32,10 +41,10 @@
"_shasum": "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f",
"_shrinkwrap": null,
"_spec": "node-uuid@~1.4.7",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "robert@broofa.com",
- "name": "Robert Kieffer"
+ "name": "Robert Kieffer",
+ "email": "robert@broofa.com"
},
"bin": {
"uuid": "./bin/uuid"
@@ -61,7 +70,7 @@
"directories": {},
"dist": {
"shasum": "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f",
- "tarball": "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+ "tarball": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
},
"gitHead": "309512573ec1c60143c257157479a20f7f1f51cd",
"homepage": "https://github.com/broofa/node-uuid",
diff --git a/node_modules/request/node_modules/oauth-sign/package.json b/node_modules/request/node_modules/oauth-sign/package.json
index 788eebb0c..a01120c9f 100644
--- a/node_modules/request/node_modules/oauth-sign/package.json
+++ b/node_modules/request/node_modules/oauth-sign/package.json
@@ -1,41 +1,54 @@
{
"_args": [
[
- "oauth-sign@~0.8.0",
+ {
+ "raw": "oauth-sign@~0.8.1",
+ "scope": null,
+ "escapedName": "oauth-sign",
+ "name": "oauth-sign",
+ "rawSpec": "~0.8.1",
+ "spec": ">=0.8.1 <0.9.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "oauth-sign@>=0.8.0 <0.9.0",
- "_id": "oauth-sign@0.8.1",
+ "_from": "oauth-sign@>=0.8.1 <0.9.0",
+ "_id": "oauth-sign@0.8.2",
"_inCache": true,
"_installable": true,
"_location": "/request/oauth-sign",
- "_nodeVersion": "5.5.0",
+ "_nodeVersion": "5.9.0",
+ "_npmOperationalInternal": {
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/oauth-sign-0.8.2.tgz_1462396399020_0.8175400267355144"
+ },
"_npmUser": {
- "email": "simeonvelichkov@gmail.com",
- "name": "simov"
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
},
- "_npmVersion": "3.6.0",
+ "_npmVersion": "2.15.3",
"_phantomChildren": {},
"_requested": {
- "name": "oauth-sign",
- "raw": "oauth-sign@~0.8.0",
- "rawSpec": "~0.8.0",
+ "raw": "oauth-sign@~0.8.1",
"scope": null,
- "spec": ">=0.8.0 <0.9.0",
+ "escapedName": "oauth-sign",
+ "name": "oauth-sign",
+ "rawSpec": "~0.8.1",
+ "spec": ">=0.8.1 <0.9.0",
"type": "range"
},
"_requiredBy": [
"/request"
],
- "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz",
- "_shasum": "182439bdb91378bf7460e75c64ea43e6448def06",
+ "_resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+ "_shasum": "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43",
"_shrinkwrap": null,
- "_spec": "oauth-sign@~0.8.0",
+ "_spec": "oauth-sign@~0.8.1",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "mikeal.rogers@gmail.com",
"name": "Mikeal Rogers",
+ "email": "mikeal.rogers@gmail.com",
"url": "http://www.futurealoof.com"
},
"bugs": {
@@ -46,28 +59,31 @@
"devDependencies": {},
"directories": {},
"dist": {
- "shasum": "182439bdb91378bf7460e75c64ea43e6448def06",
- "tarball": "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+ "shasum": "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43",
+ "tarball": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
},
"engines": {
"node": "*"
},
- "gitHead": "9c7229a336c9face98b83f93b72cb7c80dbba08d",
+ "files": [
+ "index.js"
+ ],
+ "gitHead": "0b034206316132f57e26970152c2fb18e71bddd5",
"homepage": "https://github.com/mikeal/oauth-sign#readme",
"license": "Apache-2.0",
"main": "index.js",
"maintainers": [
{
- "email": "mikeal.rogers@gmail.com",
- "name": "mikeal"
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
},
{
- "email": "jnylen@gmail.com",
- "name": "nylen"
+ "name": "nylen",
+ "email": "jnylen@gmail.com"
},
{
- "email": "simeonvelichkov@gmail.com",
- "name": "simov"
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
}
],
"name": "oauth-sign",
@@ -79,5 +95,5 @@
"scripts": {
"test": "node test.js"
},
- "version": "0.8.1"
+ "version": "0.8.2"
}
diff --git a/node_modules/request/node_modules/oauth-sign/test.js b/node_modules/request/node_modules/oauth-sign/test.js
deleted file mode 100644
index a8847270d..000000000
--- a/node_modules/request/node_modules/oauth-sign/test.js
+++ /dev/null
@@ -1,89 +0,0 @@
-var oauth = require('./index')
- , hmacsign = oauth.hmacsign
- , assert = require('assert')
- , qs = require('querystring')
- ;
-
-// Tests from Twitter documentation https://dev.twitter.com/docs/auth/oauth
-
-var reqsign = hmacsign('POST', 'https://api.twitter.com/oauth/request_token',
- { oauth_callback: 'http://localhost:3005/the_dance/process_callback?service_provider_id=11'
- , oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g'
- , oauth_nonce: 'QP70eNmVz8jvdPevU3oJD2AfF7R7odC2XJcn4XlZJqk'
- , oauth_signature_method: 'HMAC-SHA1'
- , oauth_timestamp: '1272323042'
- , oauth_version: '1.0'
- }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98")
-
-console.log(reqsign)
-console.log('8wUi7m5HFQy76nowoCThusfgB+Q=')
-assert.equal(reqsign, '8wUi7m5HFQy76nowoCThusfgB+Q=')
-
-var accsign = hmacsign('POST', 'https://api.twitter.com/oauth/access_token',
- { oauth_consumer_key: 'GDdmIQH6jhtmLUypg82g'
- , oauth_nonce: '9zWH6qe0qG7Lc1telCn7FhUbLyVdjEaL3MO5uHxn8'
- , oauth_signature_method: 'HMAC-SHA1'
- , oauth_token: '8ldIZyxQeVrFZXFOZH5tAwj6vzJYuLQpl0WUEYtWc'
- , oauth_timestamp: '1272323047'
- , oauth_verifier: 'pDNg57prOHapMbhv25RNf75lVRd6JDsni1AJJIDYoTY'
- , oauth_version: '1.0'
- }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "x6qpRnlEmW9JbQn4PQVVeVG8ZLPEx6A0TOebgwcuA")
-
-console.log(accsign)
-console.log('PUw/dHA4fnlJYM6RhXk5IU/0fCc=')
-assert.equal(accsign, 'PUw/dHA4fnlJYM6RhXk5IU/0fCc=')
-
-var upsign = hmacsign('POST', 'http://api.twitter.com/1/statuses/update.json',
- { oauth_consumer_key: "GDdmIQH6jhtmLUypg82g"
- , oauth_nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y"
- , oauth_signature_method: "HMAC-SHA1"
- , oauth_token: "819797-Jxq8aYUDRmykzVKrgoLhXSq67TEa5ruc4GJC2rWimw"
- , oauth_timestamp: "1272325550"
- , oauth_version: "1.0"
- , status: 'setting up my twitter 私のさえずりを設定する'
- }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "J6zix3FfA9LofH0awS24M3HcBYXO5nI1iYe8EfBA")
-
-console.log(upsign)
-console.log('yOahq5m0YjDDjfjxHaXEsW9D+X0=')
-assert.equal(upsign, 'yOahq5m0YjDDjfjxHaXEsW9D+X0=')
-
-// handle objects in params (useful for Wordpress REST API)
-var upsign = hmacsign('POST', 'http://wordpress.com/wp-json',
- { oauth_consumer_key: "GDdmIQH6jhtmLUypg82g"
- , oauth_nonce: "oElnnMTQIZvqvlfXM56aBLAf5noGD0AQR3Fmi7Q6Y"
- , oauth_signature_method: "HMAC-SHA1"
- , oauth_token: "819797-Jxq8aYUDRmykzVKrgoLhXSq67TEa5ruc4GJC2rWimw"
- , oauth_timestamp: "1272325550"
- , oauth_version: "1.0"
- , filter: { number: "-1" }
- }, "MCD8BKwGdgPHvAuvgvz4EQpqDAtx89grbuNMRd7Eh98", "J6zix3FfA9LofH0awS24M3HcBYXO5nI1iYe8EfBA")
-
-console.log(upsign)
-console.log('YrJFBdwnjuIitGpKrxLUplcuuUQ=')
-assert.equal(upsign, 'YrJFBdwnjuIitGpKrxLUplcuuUQ=')
-
-// example in rfc5849
-var params = qs.parse('b5=%3D%253D&a3=a&c%40=&a2=r%20b' + '&' + 'c2&a3=2+q')
-params.oauth_consumer_key = '9djdj82h48djs9d2'
-params.oauth_token = 'kkk9d7dh3k39sjv7'
-params.oauth_nonce = '7d8f3e4a'
-params.oauth_signature_method = 'HMAC-SHA1'
-params.oauth_timestamp = '137131201'
-
-var rfc5849sign = hmacsign('POST', 'http://example.com/request',
- params, "j49sk3j29djd", "dh893hdasih9")
-
-console.log(rfc5849sign)
-console.log('r6/TJjbCOr97/+UU0NsvSne7s5g=')
-assert.equal(rfc5849sign, 'r6/TJjbCOr97/+UU0NsvSne7s5g=')
-
-
-// PLAINTEXT
-
-var plainSign = oauth.sign('PLAINTEXT', 'GET', 'http://dummy.com', {}, 'consumer_secret', 'token_secret')
-console.log(plainSign)
-assert.equal(plainSign, 'consumer_secret&token_secret')
-
-plainSign = oauth.plaintext('consumer_secret', 'token_secret')
-console.log(plainSign)
-assert.equal(plainSign, 'consumer_secret&token_secret')
diff --git a/node_modules/request/node_modules/qs/.npmignore b/node_modules/request/node_modules/qs/.npmignore
deleted file mode 100644
index 7e1574dc5..000000000
--- a/node_modules/request/node_modules/qs/.npmignore
+++ /dev/null
@@ -1,18 +0,0 @@
-.idea
-*.iml
-npm-debug.log
-dump.rdb
-node_modules
-results.tap
-results.xml
-npm-shrinkwrap.json
-config.json
-.DS_Store
-*/.DS_Store
-*/*/.DS_Store
-._*
-*/._*
-*/*/._*
-coverage.*
-lib-cov
-complexity.md
diff --git a/node_modules/request/node_modules/qs/.travis.yml b/node_modules/request/node_modules/qs/.travis.yml
deleted file mode 100644
index 63bdc12be..000000000
--- a/node_modules/request/node_modules/qs/.travis.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-language: node_js
-node_js:
- - "5.3"
- - "5.2"
- - "5.1"
- - "5.0"
- - "4.2"
- - "4.1"
- - "4.0"
- - "iojs-v3.3"
- - "iojs-v3.2"
- - "iojs-v3.1"
- - "iojs-v3.0"
- - "iojs-v2.5"
- - "iojs-v2.4"
- - "iojs-v2.3"
- - "iojs-v2.2"
- - "iojs-v2.1"
- - "iojs-v2.0"
- - "iojs-v1.8"
- - "iojs-v1.7"
- - "iojs-v1.6"
- - "iojs-v1.5"
- - "iojs-v1.4"
- - "iojs-v1.3"
- - "iojs-v1.2"
- - "iojs-v1.1"
- - "iojs-v1.0"
- - "0.12"
- - "0.11"
- - "0.10"
- - "0.9"
- - "0.8"
- - "0.6"
- - "0.4"
-before_install:
- - 'if [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then case "$(npm --version)" in 1.*) npm install -g npm@1.4.28 ;; 2.*) npm install -g npm@2 ;; esac ; fi'
- - 'if [ "${TRAVIS_NODE_VERSION}" != "0.6" ] && [ "${TRAVIS_NODE_VERSION}" != "0.9" ]; then npm install -g npm; fi'
-script:
- - 'if [ "${TRAVIS_NODE_VERSION}" != "4.2" ]; then npm run tests-only ; else npm test ; fi'
-sudo: false
-matrix:
- fast_finish: true
- allow_failures:
- - node_js: "5.2"
- - node_js: "5.1"
- - node_js: "5.0"
- - node_js: "4.1"
- - node_js: "4.0"
- - node_js: "iojs-v3.2"
- - node_js: "iojs-v3.1"
- - node_js: "iojs-v3.0"
- - node_js: "iojs-v2.4"
- - node_js: "iojs-v2.3"
- - node_js: "iojs-v2.2"
- - node_js: "iojs-v2.1"
- - node_js: "iojs-v2.0"
- - node_js: "iojs-v1.7"
- - node_js: "iojs-v1.6"
- - node_js: "iojs-v1.5"
- - node_js: "iojs-v1.4"
- - node_js: "iojs-v1.3"
- - node_js: "iojs-v1.2"
- - node_js: "iojs-v1.1"
- - node_js: "iojs-v1.0"
- - node_js: "0.11"
- - node_js: "0.9"
- - node_js: "0.6"
- - node_js: "0.4"
diff --git a/node_modules/request/node_modules/qs/CHANGELOG.md b/node_modules/request/node_modules/qs/CHANGELOG.md
index 5c66ea444..86bea7638 100644
--- a/node_modules/request/node_modules/qs/CHANGELOG.md
+++ b/node_modules/request/node_modules/qs/CHANGELOG.md
@@ -1,4 +1,16 @@
-## [**6.1.0**](https://github.com/ljharb/qs/issues?milestone=34&state=closed)
+## **6.2.1**
+- [Fix] ensure `key[]=x&key[]&key[]=y` results in 3, not 2, values
+- [Refactor] Be explicit and use `Object.prototype.hasOwnProperty.call`
+- [Tests] remove `parallelshell` since it does not reliably report failures
+- [Tests] up to `node` `v6.3`, `v5.12`
+- [Dev Deps] update `tape`, `eslint`, `@ljharb/eslint-config`, `qs-iconv`
+
+## [**6.2.0**](https://github.com/ljharb/qs/issues?milestone=36&state=closed)
+- [New] pass Buffers to the encoder/decoder directly (#161)
+- [New] add "encoder" and "decoder" options, for custom param encoding/decoding (#160)
+- [Fix] fix compacting of nested sparse arrays (#150)
+
+## [**6.1.0**](https://github.com/ljharb/qs/issues?milestone=35&state=closed)
- [New] allowDots option for `stringify` (#151)
- [Fix] "sort" option should work at a depth of 3 or more (#151)
- [Fix] Restore `dist` directory; will be removed in v7 (#148)
@@ -12,6 +24,9 @@
## [**6.0.0**](https://github.com/ljharb/qs/issues?milestone=31&state=closed)
- [**#124**](https://github.com/ljharb/qs/issues/124) Use ES6 and drop support for node < v4
+## **5.2.1**
+- [Fix] ensure `key[]=x&key[]&key[]=y` results in 3, not 2, values
+
## [**5.2.0**](https://github.com/ljharb/qs/issues?milestone=30&state=closed)
- [**#64**](https://github.com/ljharb/qs/issues/64) Add option to sort object keys in the query string
diff --git a/node_modules/request/node_modules/qs/README.md b/node_modules/request/node_modules/qs/README.md
index 335eafb4b..97e390796 100644
--- a/node_modules/request/node_modules/qs/README.md
+++ b/node_modules/request/node_modules/qs/README.md
@@ -225,6 +225,26 @@ var unencoded = qs.stringify({ a: { b: 'c' } }, { encode: false });
assert.equal(unencoded, 'a[b]=c');
```
+This encoding can also be replaced by a custom encoding method set as `encoder` option:
+
+```javascript
+var encoded = qs.stringify({ a: { b: 'c' } }, { encoder: function (str) {
+ // Passed in values `a`, `b`, `c`
+ return // Return encoded string
+}})
+```
+
+_(Note: the `encoder` option does not apply if `encode` is `false`)_
+
+Analogue to the `encoder` there is a `decoder` option for `parse` to override decoding of properties and values:
+
+```javascript
+var decoded = qs.parse('x=z', { decoder: function (str) {
+ // Passed in values `x`, `z`
+ return // Return decoded string
+}})
+```
+
Examples beyond this point will be shown as though the output is not URI encoded for clarity. Please note that the return values in these cases *will* be URI encoded during real usage.
When arrays are stringified, by default they are given explicit indices:
@@ -333,3 +353,24 @@ To completely skip rendering keys with `null` values, use the `skipNulls` flag:
var nullsSkipped = qs.stringify({ a: 'b', c: null}, { skipNulls: true });
assert.equal(nullsSkipped, 'a=b');
```
+
+### Dealing with special character sets
+
+By default the encoding and decoding of characters is done in `utf-8`. If you
+wish to encode querystrings to a different character set (i.e.
+[Shift JIS](https://en.wikipedia.org/wiki/Shift_JIS)) you can use the
+[`qs-iconv`](https://github.com/martinheidegger/qs-iconv) library:
+
+```javascript
+var encoder = require('qs-iconv/encoder')('shift_jis');
+var shiftJISEncoded = qs.stringify({ a: 'こんにちは!' }, { encoder: encoder });
+assert.equal(shiftJISEncoded, 'a=%82%B1%82%F1%82%C9%82%BF%82%CD%81I');
+```
+
+This also works for decoding of query strings:
+
+```javascript
+var decoder = require('qs-iconv/decoder')('shift_jis');
+var obj = qs.parse('a=%82%B1%82%F1%82%C9%82%BF%82%CD%81I', { decoder: decoder });
+assert.deepEqual(obj, { a: 'こんにちは!' });
+```
diff --git a/node_modules/request/node_modules/qs/bower.json b/node_modules/request/node_modules/qs/bower.json
deleted file mode 100644
index 44f050642..000000000
--- a/node_modules/request/node_modules/qs/bower.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "name": "qs",
- "main": "dist/qs.js",
- "homepage": "https://github.com/hapijs/qs",
- "authors": [
- "Nathan LaFreniere <quitlahok@gmail.com>"
- ],
- "description": "A querystring parser that supports nesting and arrays, with a depth limit",
- "keywords": [
- "querystring",
- "qs"
- ],
- "license": "BSD-3-Clause",
- "ignore": [
- "**/.*",
- "node_modules",
- "bower_components",
- "test",
- "tests"
- ]
-}
diff --git a/node_modules/request/node_modules/qs/component.json b/node_modules/request/node_modules/qs/component.json
deleted file mode 100644
index cb8d93fb1..000000000
--- a/node_modules/request/node_modules/qs/component.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name": "qs",
- "repository": "hapijs/qs",
- "description": "query-string parser / stringifier with nesting support",
- "version": "6.1.0",
- "keywords": ["querystring", "query", "parser"],
- "main": "lib/index.js",
- "scripts": [
- "lib/index.js",
- "lib/parse.js",
- "lib/stringify.js",
- "lib/utils.js"
- ],
- "license": "BSD-3-Clause"
-}
diff --git a/node_modules/request/node_modules/qs/dist/qs.js b/node_modules/request/node_modules/qs/dist/qs.js
index bb8ea31a9..fcf825b58 100644
--- a/node_modules/request/node_modules/qs/dist/qs.js
+++ b/node_modules/request/node_modules/qs/dist/qs.js
@@ -14,7 +14,9 @@ module.exports = {
var Utils = require('./utils');
-var internals = {
+var has = Object.prototype.hasOwnProperty;
+
+var defaults = {
delimiter: '&',
depth: 5,
arrayLimit: 20,
@@ -22,10 +24,11 @@ var internals = {
strictNullHandling: false,
plainObjects: false,
allowPrototypes: false,
- allowDots: false
+ allowDots: false,
+ decoder: Utils.decode
};
-internals.parseValues = function (str, options) {
+var parseValues = function parseValues(str, options) {
var obj = {};
var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit);
@@ -33,28 +36,25 @@ internals.parseValues = function (str, options) {
var part = parts[i];
var pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1;
+ var key, val;
if (pos === -1) {
- obj[Utils.decode(part)] = '';
-
- if (options.strictNullHandling) {
- obj[Utils.decode(part)] = null;
- }
+ key = options.decoder(part);
+ val = options.strictNullHandling ? null : '';
} else {
- var key = Utils.decode(part.slice(0, pos));
- var val = Utils.decode(part.slice(pos + 1));
-
- if (Object.prototype.hasOwnProperty.call(obj, key)) {
- obj[key] = [].concat(obj[key]).concat(val);
- } else {
- obj[key] = val;
- }
+ key = options.decoder(part.slice(0, pos));
+ val = options.decoder(part.slice(pos + 1));
+ }
+ if (has.call(obj, key)) {
+ obj[key] = [].concat(obj[key]).concat(val);
+ } else {
+ obj[key] = val;
}
}
return obj;
};
-internals.parseObject = function (chain, val, options) {
+var parseObject = function parseObject(chain, val, options) {
if (!chain.length) {
return val;
}
@@ -64,7 +64,7 @@ internals.parseObject = function (chain, val, options) {
var obj;
if (root === '[]') {
obj = [];
- obj = obj.concat(internals.parseObject(chain, val, options));
+ obj = obj.concat(parseObject(chain, val, options));
} else {
obj = options.plainObjects ? Object.create(null) : {};
var cleanRoot = root[0] === '[' && root[root.length - 1] === ']' ? root.slice(1, root.length - 1) : root;
@@ -77,16 +77,16 @@ internals.parseObject = function (chain, val, options) {
(options.parseArrays && index <= options.arrayLimit)
) {
obj = [];
- obj[index] = internals.parseObject(chain, val, options);
+ obj[index] = parseObject(chain, val, options);
} else {
- obj[cleanRoot] = internals.parseObject(chain, val, options);
+ obj[cleanRoot] = parseObject(chain, val, options);
}
}
return obj;
};
-internals.parseKeys = function (givenKey, val, options) {
+var parseKeys = function parseKeys(givenKey, val, options) {
if (!givenKey) {
return;
}
@@ -109,7 +109,7 @@ internals.parseKeys = function (givenKey, val, options) {
if (segment[1]) {
// If we aren't using plain objects, optionally prefix keys
// that would overwrite object prototype properties
- if (!options.plainObjects && Object.prototype.hasOwnProperty(segment[1])) {
+ if (!options.plainObjects && has.call(Object.prototype, segment[1])) {
if (!options.allowPrototypes) {
return;
}
@@ -123,7 +123,7 @@ internals.parseKeys = function (givenKey, val, options) {
var i = 0;
while ((segment = child.exec(key)) !== null && i < options.depth) {
i += 1;
- if (!options.plainObjects && Object.prototype.hasOwnProperty(segment[1].replace(/\[|\]/g, ''))) {
+ if (!options.plainObjects && has.call(Object.prototype, segment[1].replace(/\[|\]/g, ''))) {
if (!options.allowPrototypes) {
continue;
}
@@ -137,30 +137,32 @@ internals.parseKeys = function (givenKey, val, options) {
keys.push('[' + key.slice(segment.index) + ']');
}
- return internals.parseObject(keys, val, options);
+ return parseObject(keys, val, options);
};
module.exports = function (str, opts) {
var options = opts || {};
- options.delimiter = typeof options.delimiter === 'string' || Utils.isRegExp(options.delimiter) ? options.delimiter : internals.delimiter;
- options.depth = typeof options.depth === 'number' ? options.depth : internals.depth;
- options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : internals.arrayLimit;
+
+ if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') {
+ throw new TypeError('Decoder has to be a function.');
+ }
+
+ options.delimiter = typeof options.delimiter === 'string' || Utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter;
+ options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth;
+ options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit;
options.parseArrays = options.parseArrays !== false;
- options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : internals.allowDots;
- options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : internals.plainObjects;
- options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : internals.allowPrototypes;
- options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : internals.parameterLimit;
- options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
-
- if (
- str === '' ||
- str === null ||
- typeof str === 'undefined'
- ) {
+ options.decoder = typeof options.decoder === 'function' ? options.decoder : defaults.decoder;
+ options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : defaults.allowDots;
+ options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : defaults.plainObjects;
+ options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : defaults.allowPrototypes;
+ options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : defaults.parameterLimit;
+ options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+
+ if (str === '' || str === null || typeof str === 'undefined') {
return options.plainObjects ? Object.create(null) : {};
}
- var tempObj = typeof str === 'string' ? internals.parseValues(str, options) : str;
+ var tempObj = typeof str === 'string' ? parseValues(str, options) : str;
var obj = options.plainObjects ? Object.create(null) : {};
// Iterate over the keys and setup the new object
@@ -168,7 +170,7 @@ module.exports = function (str, opts) {
var keys = Object.keys(tempObj);
for (var i = 0; i < keys.length; ++i) {
var key = keys[i];
- var newObj = internals.parseKeys(key, tempObj[key], options);
+ var newObj = parseKeys(key, tempObj[key], options);
obj = Utils.merge(obj, newObj, options);
}
@@ -180,45 +182,45 @@ module.exports = function (str, opts) {
var Utils = require('./utils');
-var internals = {
- delimiter: '&',
- arrayPrefixGenerators: {
- brackets: function (prefix) {
- return prefix + '[]';
- },
- indices: function (prefix, key) {
- return prefix + '[' + key + ']';
- },
- repeat: function (prefix) {
- return prefix;
- }
+var arrayPrefixGenerators = {
+ brackets: function brackets(prefix) {
+ return prefix + '[]';
+ },
+ indices: function indices(prefix, key) {
+ return prefix + '[' + key + ']';
},
+ repeat: function repeat(prefix) {
+ return prefix;
+ }
+};
+
+var defaults = {
+ delimiter: '&',
strictNullHandling: false,
skipNulls: false,
- encode: true
+ encode: true,
+ encoder: Utils.encode
};
-internals.stringify = function (object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots) {
+var stringify = function stringify(object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots) {
var obj = object;
if (typeof filter === 'function') {
obj = filter(prefix, obj);
- } else if (Utils.isBuffer(obj)) {
- obj = String(obj);
} else if (obj instanceof Date) {
obj = obj.toISOString();
} else if (obj === null) {
if (strictNullHandling) {
- return encode ? Utils.encode(prefix) : prefix;
+ return encoder ? encoder(prefix) : prefix;
}
obj = '';
}
- if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean') {
- if (encode) {
- return [Utils.encode(prefix) + '=' + Utils.encode(obj)];
+ if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || Utils.isBuffer(obj)) {
+ if (encoder) {
+ return [encoder(prefix) + '=' + encoder(obj)];
}
- return [prefix + '=' + obj];
+ return [prefix + '=' + String(obj)];
}
var values = [];
@@ -243,9 +245,9 @@ internals.stringify = function (object, prefix, generateArrayPrefix, strictNullH
}
if (Array.isArray(obj)) {
- values = values.concat(internals.stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ values = values.concat(stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
} else {
- values = values.concat(internals.stringify(obj[key], prefix + (allowDots ? '.' + key : '[' + key + ']'), generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ values = values.concat(stringify(obj[key], prefix + (allowDots ? '.' + key : '[' + key + ']'), generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
}
}
@@ -255,14 +257,20 @@ internals.stringify = function (object, prefix, generateArrayPrefix, strictNullH
module.exports = function (object, opts) {
var obj = object;
var options = opts || {};
- var delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
- var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
- var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
- var encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
+ var delimiter = typeof options.delimiter === 'undefined' ? defaults.delimiter : options.delimiter;
+ var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+ var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : defaults.skipNulls;
+ var encode = typeof options.encode === 'boolean' ? options.encode : defaults.encode;
+ var encoder = encode ? (typeof options.encoder === 'function' ? options.encoder : defaults.encoder) : null;
var sort = typeof options.sort === 'function' ? options.sort : null;
var allowDots = typeof options.allowDots === 'undefined' ? false : options.allowDots;
var objKeys;
var filter;
+
+ if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
+ throw new TypeError('Encoder has to be a function.');
+ }
+
if (typeof options.filter === 'function') {
filter = options.filter;
obj = filter('', obj);
@@ -277,7 +285,7 @@ module.exports = function (object, opts) {
}
var arrayFormat;
- if (options.arrayFormat in internals.arrayPrefixGenerators) {
+ if (options.arrayFormat in arrayPrefixGenerators) {
arrayFormat = options.arrayFormat;
} else if ('indices' in options) {
arrayFormat = options.indices ? 'indices' : 'repeat';
@@ -285,7 +293,7 @@ module.exports = function (object, opts) {
arrayFormat = 'indices';
}
- var generateArrayPrefix = internals.arrayPrefixGenerators[arrayFormat];
+ var generateArrayPrefix = arrayPrefixGenerators[arrayFormat];
if (!objKeys) {
objKeys = Object.keys(obj);
@@ -302,7 +310,7 @@ module.exports = function (object, opts) {
continue;
}
- keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ keys = keys.concat(stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
}
return keys.join(delimiter);
@@ -357,7 +365,7 @@ exports.merge = function (target, source, options) {
mergeTarget = exports.arrayToObject(target, options);
}
- return Object.keys(source).reduce(function (acc, key) {
+ return Object.keys(source).reduce(function (acc, key) {
var value = source[key];
if (Object.prototype.hasOwnProperty.call(acc, key)) {
@@ -365,7 +373,7 @@ exports.merge = function (target, source, options) {
} else {
acc[key] = value;
}
- return acc;
+ return acc;
}, mergeTarget);
};
@@ -420,7 +428,7 @@ exports.encode = function (str) {
i += 1;
c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
- out += (hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]);
+ out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)];
}
return out;
@@ -443,7 +451,9 @@ exports.compact = function (obj, references) {
var compacted = [];
for (var i = 0; i < obj.length; ++i) {
- if (typeof obj[i] !== 'undefined') {
+ if (obj[i] && typeof obj[i] === 'object') {
+ compacted.push(exports.compact(obj[i], refs));
+ } else if (typeof obj[i] !== 'undefined') {
compacted.push(obj[i]);
}
}
diff --git a/node_modules/request/node_modules/qs/lib/parse.js b/node_modules/request/node_modules/qs/lib/parse.js
index 9b6cbd221..8b37cb3b2 100755
--- a/node_modules/request/node_modules/qs/lib/parse.js
+++ b/node_modules/request/node_modules/qs/lib/parse.js
@@ -2,7 +2,9 @@
var Utils = require('./utils');
-var internals = {
+var has = Object.prototype.hasOwnProperty;
+
+var defaults = {
delimiter: '&',
depth: 5,
arrayLimit: 20,
@@ -10,10 +12,11 @@ var internals = {
strictNullHandling: false,
plainObjects: false,
allowPrototypes: false,
- allowDots: false
+ allowDots: false,
+ decoder: Utils.decode
};
-internals.parseValues = function (str, options) {
+var parseValues = function parseValues(str, options) {
var obj = {};
var parts = str.split(options.delimiter, options.parameterLimit === Infinity ? undefined : options.parameterLimit);
@@ -21,28 +24,25 @@ internals.parseValues = function (str, options) {
var part = parts[i];
var pos = part.indexOf(']=') === -1 ? part.indexOf('=') : part.indexOf(']=') + 1;
+ var key, val;
if (pos === -1) {
- obj[Utils.decode(part)] = '';
-
- if (options.strictNullHandling) {
- obj[Utils.decode(part)] = null;
- }
+ key = options.decoder(part);
+ val = options.strictNullHandling ? null : '';
} else {
- var key = Utils.decode(part.slice(0, pos));
- var val = Utils.decode(part.slice(pos + 1));
-
- if (Object.prototype.hasOwnProperty.call(obj, key)) {
- obj[key] = [].concat(obj[key]).concat(val);
- } else {
- obj[key] = val;
- }
+ key = options.decoder(part.slice(0, pos));
+ val = options.decoder(part.slice(pos + 1));
+ }
+ if (has.call(obj, key)) {
+ obj[key] = [].concat(obj[key]).concat(val);
+ } else {
+ obj[key] = val;
}
}
return obj;
};
-internals.parseObject = function (chain, val, options) {
+var parseObject = function parseObject(chain, val, options) {
if (!chain.length) {
return val;
}
@@ -52,7 +52,7 @@ internals.parseObject = function (chain, val, options) {
var obj;
if (root === '[]') {
obj = [];
- obj = obj.concat(internals.parseObject(chain, val, options));
+ obj = obj.concat(parseObject(chain, val, options));
} else {
obj = options.plainObjects ? Object.create(null) : {};
var cleanRoot = root[0] === '[' && root[root.length - 1] === ']' ? root.slice(1, root.length - 1) : root;
@@ -65,16 +65,16 @@ internals.parseObject = function (chain, val, options) {
(options.parseArrays && index <= options.arrayLimit)
) {
obj = [];
- obj[index] = internals.parseObject(chain, val, options);
+ obj[index] = parseObject(chain, val, options);
} else {
- obj[cleanRoot] = internals.parseObject(chain, val, options);
+ obj[cleanRoot] = parseObject(chain, val, options);
}
}
return obj;
};
-internals.parseKeys = function (givenKey, val, options) {
+var parseKeys = function parseKeys(givenKey, val, options) {
if (!givenKey) {
return;
}
@@ -97,7 +97,7 @@ internals.parseKeys = function (givenKey, val, options) {
if (segment[1]) {
// If we aren't using plain objects, optionally prefix keys
// that would overwrite object prototype properties
- if (!options.plainObjects && Object.prototype.hasOwnProperty(segment[1])) {
+ if (!options.plainObjects && has.call(Object.prototype, segment[1])) {
if (!options.allowPrototypes) {
return;
}
@@ -111,7 +111,7 @@ internals.parseKeys = function (givenKey, val, options) {
var i = 0;
while ((segment = child.exec(key)) !== null && i < options.depth) {
i += 1;
- if (!options.plainObjects && Object.prototype.hasOwnProperty(segment[1].replace(/\[|\]/g, ''))) {
+ if (!options.plainObjects && has.call(Object.prototype, segment[1].replace(/\[|\]/g, ''))) {
if (!options.allowPrototypes) {
continue;
}
@@ -125,30 +125,32 @@ internals.parseKeys = function (givenKey, val, options) {
keys.push('[' + key.slice(segment.index) + ']');
}
- return internals.parseObject(keys, val, options);
+ return parseObject(keys, val, options);
};
module.exports = function (str, opts) {
var options = opts || {};
- options.delimiter = typeof options.delimiter === 'string' || Utils.isRegExp(options.delimiter) ? options.delimiter : internals.delimiter;
- options.depth = typeof options.depth === 'number' ? options.depth : internals.depth;
- options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : internals.arrayLimit;
+
+ if (options.decoder !== null && options.decoder !== undefined && typeof options.decoder !== 'function') {
+ throw new TypeError('Decoder has to be a function.');
+ }
+
+ options.delimiter = typeof options.delimiter === 'string' || Utils.isRegExp(options.delimiter) ? options.delimiter : defaults.delimiter;
+ options.depth = typeof options.depth === 'number' ? options.depth : defaults.depth;
+ options.arrayLimit = typeof options.arrayLimit === 'number' ? options.arrayLimit : defaults.arrayLimit;
options.parseArrays = options.parseArrays !== false;
- options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : internals.allowDots;
- options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : internals.plainObjects;
- options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : internals.allowPrototypes;
- options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : internals.parameterLimit;
- options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
-
- if (
- str === '' ||
- str === null ||
- typeof str === 'undefined'
- ) {
+ options.decoder = typeof options.decoder === 'function' ? options.decoder : defaults.decoder;
+ options.allowDots = typeof options.allowDots === 'boolean' ? options.allowDots : defaults.allowDots;
+ options.plainObjects = typeof options.plainObjects === 'boolean' ? options.plainObjects : defaults.plainObjects;
+ options.allowPrototypes = typeof options.allowPrototypes === 'boolean' ? options.allowPrototypes : defaults.allowPrototypes;
+ options.parameterLimit = typeof options.parameterLimit === 'number' ? options.parameterLimit : defaults.parameterLimit;
+ options.strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+
+ if (str === '' || str === null || typeof str === 'undefined') {
return options.plainObjects ? Object.create(null) : {};
}
- var tempObj = typeof str === 'string' ? internals.parseValues(str, options) : str;
+ var tempObj = typeof str === 'string' ? parseValues(str, options) : str;
var obj = options.plainObjects ? Object.create(null) : {};
// Iterate over the keys and setup the new object
@@ -156,7 +158,7 @@ module.exports = function (str, opts) {
var keys = Object.keys(tempObj);
for (var i = 0; i < keys.length; ++i) {
var key = keys[i];
- var newObj = internals.parseKeys(key, tempObj[key], options);
+ var newObj = parseKeys(key, tempObj[key], options);
obj = Utils.merge(obj, newObj, options);
}
diff --git a/node_modules/request/node_modules/qs/lib/stringify.js b/node_modules/request/node_modules/qs/lib/stringify.js
index 892dad45a..6e1c9a263 100755
--- a/node_modules/request/node_modules/qs/lib/stringify.js
+++ b/node_modules/request/node_modules/qs/lib/stringify.js
@@ -2,45 +2,45 @@
var Utils = require('./utils');
-var internals = {
- delimiter: '&',
- arrayPrefixGenerators: {
- brackets: function (prefix) {
- return prefix + '[]';
- },
- indices: function (prefix, key) {
- return prefix + '[' + key + ']';
- },
- repeat: function (prefix) {
- return prefix;
- }
+var arrayPrefixGenerators = {
+ brackets: function brackets(prefix) {
+ return prefix + '[]';
+ },
+ indices: function indices(prefix, key) {
+ return prefix + '[' + key + ']';
},
+ repeat: function repeat(prefix) {
+ return prefix;
+ }
+};
+
+var defaults = {
+ delimiter: '&',
strictNullHandling: false,
skipNulls: false,
- encode: true
+ encode: true,
+ encoder: Utils.encode
};
-internals.stringify = function (object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots) {
+var stringify = function stringify(object, prefix, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots) {
var obj = object;
if (typeof filter === 'function') {
obj = filter(prefix, obj);
- } else if (Utils.isBuffer(obj)) {
- obj = String(obj);
} else if (obj instanceof Date) {
obj = obj.toISOString();
} else if (obj === null) {
if (strictNullHandling) {
- return encode ? Utils.encode(prefix) : prefix;
+ return encoder ? encoder(prefix) : prefix;
}
obj = '';
}
- if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean') {
- if (encode) {
- return [Utils.encode(prefix) + '=' + Utils.encode(obj)];
+ if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || Utils.isBuffer(obj)) {
+ if (encoder) {
+ return [encoder(prefix) + '=' + encoder(obj)];
}
- return [prefix + '=' + obj];
+ return [prefix + '=' + String(obj)];
}
var values = [];
@@ -65,9 +65,9 @@ internals.stringify = function (object, prefix, generateArrayPrefix, strictNullH
}
if (Array.isArray(obj)) {
- values = values.concat(internals.stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ values = values.concat(stringify(obj[key], generateArrayPrefix(prefix, key), generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
} else {
- values = values.concat(internals.stringify(obj[key], prefix + (allowDots ? '.' + key : '[' + key + ']'), generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ values = values.concat(stringify(obj[key], prefix + (allowDots ? '.' + key : '[' + key + ']'), generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
}
}
@@ -77,14 +77,20 @@ internals.stringify = function (object, prefix, generateArrayPrefix, strictNullH
module.exports = function (object, opts) {
var obj = object;
var options = opts || {};
- var delimiter = typeof options.delimiter === 'undefined' ? internals.delimiter : options.delimiter;
- var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : internals.strictNullHandling;
- var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : internals.skipNulls;
- var encode = typeof options.encode === 'boolean' ? options.encode : internals.encode;
+ var delimiter = typeof options.delimiter === 'undefined' ? defaults.delimiter : options.delimiter;
+ var strictNullHandling = typeof options.strictNullHandling === 'boolean' ? options.strictNullHandling : defaults.strictNullHandling;
+ var skipNulls = typeof options.skipNulls === 'boolean' ? options.skipNulls : defaults.skipNulls;
+ var encode = typeof options.encode === 'boolean' ? options.encode : defaults.encode;
+ var encoder = encode ? (typeof options.encoder === 'function' ? options.encoder : defaults.encoder) : null;
var sort = typeof options.sort === 'function' ? options.sort : null;
var allowDots = typeof options.allowDots === 'undefined' ? false : options.allowDots;
var objKeys;
var filter;
+
+ if (options.encoder !== null && options.encoder !== undefined && typeof options.encoder !== 'function') {
+ throw new TypeError('Encoder has to be a function.');
+ }
+
if (typeof options.filter === 'function') {
filter = options.filter;
obj = filter('', obj);
@@ -99,7 +105,7 @@ module.exports = function (object, opts) {
}
var arrayFormat;
- if (options.arrayFormat in internals.arrayPrefixGenerators) {
+ if (options.arrayFormat in arrayPrefixGenerators) {
arrayFormat = options.arrayFormat;
} else if ('indices' in options) {
arrayFormat = options.indices ? 'indices' : 'repeat';
@@ -107,7 +113,7 @@ module.exports = function (object, opts) {
arrayFormat = 'indices';
}
- var generateArrayPrefix = internals.arrayPrefixGenerators[arrayFormat];
+ var generateArrayPrefix = arrayPrefixGenerators[arrayFormat];
if (!objKeys) {
objKeys = Object.keys(obj);
@@ -124,7 +130,7 @@ module.exports = function (object, opts) {
continue;
}
- keys = keys.concat(internals.stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encode, filter, sort, allowDots));
+ keys = keys.concat(stringify(obj[key], key, generateArrayPrefix, strictNullHandling, skipNulls, encoder, filter, sort, allowDots));
}
return keys.join(delimiter);
diff --git a/node_modules/request/node_modules/qs/lib/utils.js b/node_modules/request/node_modules/qs/lib/utils.js
index 5d4335603..2c5c8ee50 100755
--- a/node_modules/request/node_modules/qs/lib/utils.js
+++ b/node_modules/request/node_modules/qs/lib/utils.js
@@ -46,7 +46,7 @@ exports.merge = function (target, source, options) {
mergeTarget = exports.arrayToObject(target, options);
}
- return Object.keys(source).reduce(function (acc, key) {
+ return Object.keys(source).reduce(function (acc, key) {
var value = source[key];
if (Object.prototype.hasOwnProperty.call(acc, key)) {
@@ -54,7 +54,7 @@ exports.merge = function (target, source, options) {
} else {
acc[key] = value;
}
- return acc;
+ return acc;
}, mergeTarget);
};
@@ -109,7 +109,7 @@ exports.encode = function (str) {
i += 1;
c = 0x10000 + (((c & 0x3FF) << 10) | (string.charCodeAt(i) & 0x3FF));
- out += (hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)]);
+ out += hexTable[0xF0 | (c >> 18)] + hexTable[0x80 | ((c >> 12) & 0x3F)] + hexTable[0x80 | ((c >> 6) & 0x3F)] + hexTable[0x80 | (c & 0x3F)];
}
return out;
@@ -132,7 +132,9 @@ exports.compact = function (obj, references) {
var compacted = [];
for (var i = 0; i < obj.length; ++i) {
- if (typeof obj[i] !== 'undefined') {
+ if (obj[i] && typeof obj[i] === 'object') {
+ compacted.push(exports.compact(obj[i], refs));
+ } else if (typeof obj[i] !== 'undefined') {
compacted.push(obj[i]);
}
}
diff --git a/node_modules/request/node_modules/qs/package.json b/node_modules/request/node_modules/qs/package.json
index 33318a725..64853dbde 100644
--- a/node_modules/request/node_modules/qs/package.json
+++ b/node_modules/request/node_modules/qs/package.json
@@ -1,73 +1,84 @@
{
"_args": [
[
- "qs@~6.1.0",
+ {
+ "raw": "qs@~6.2.0",
+ "scope": null,
+ "escapedName": "qs",
+ "name": "qs",
+ "rawSpec": "~6.2.0",
+ "spec": ">=6.2.0 <6.3.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "qs@>=6.1.0 <6.2.0",
- "_id": "qs@6.1.0",
+ "_from": "qs@>=6.2.0 <6.3.0",
+ "_id": "qs@6.2.1",
"_inCache": true,
"_installable": true,
"_location": "/request/qs",
- "_nodeVersion": "5.5.0",
+ "_nodeVersion": "6.3.0",
"_npmOperationalInternal": {
- "host": "packages-5-east.internal.npmjs.com",
- "tmp": "tmp/qs-6.1.0.tgz_1454565583082_0.44599376199766994"
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/qs-6.2.1.tgz_1469044929716_0.06957711698487401"
},
"_npmUser": {
- "email": "ljharb@gmail.com",
- "name": "ljharb"
+ "name": "ljharb",
+ "email": "ljharb@gmail.com"
},
- "_npmVersion": "3.3.12",
+ "_npmVersion": "3.10.3",
"_phantomChildren": {},
"_requested": {
- "name": "qs",
- "raw": "qs@~6.1.0",
- "rawSpec": "~6.1.0",
+ "raw": "qs@~6.2.0",
"scope": null,
- "spec": ">=6.1.0 <6.2.0",
+ "escapedName": "qs",
+ "name": "qs",
+ "rawSpec": "~6.2.0",
+ "spec": ">=6.2.0 <6.3.0",
"type": "range"
},
"_requiredBy": [
"/request"
],
- "_resolved": "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz",
- "_shasum": "ec1d1626b24278d99f0fdf4549e524e24eceeb26",
+ "_resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz",
+ "_shasum": "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625",
"_shrinkwrap": null,
- "_spec": "qs@~6.1.0",
+ "_spec": "qs@~6.2.0",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"bugs": {
"url": "https://github.com/ljharb/qs/issues"
},
"contributors": [
{
- "email": "ljharb@gmail.com",
"name": "Jordan Harband",
+ "email": "ljharb@gmail.com",
"url": "http://ljharb.codes"
}
],
"dependencies": {},
"description": "A querystring parser that supports nesting and arrays, with a depth limit",
"devDependencies": {
- "@ljharb/eslint-config": "^1.6.1",
- "browserify": "^12.0.1",
+ "@ljharb/eslint-config": "^6.0.0",
+ "browserify": "^13.0.1",
"covert": "^1.1.0",
- "eslint": "^1.10.3",
- "evalmd": "^0.0.16",
+ "eslint": "^3.1.0",
+ "evalmd": "^0.0.17",
+ "iconv-lite": "^0.4.13",
"mkdirp": "^0.5.1",
"parallelshell": "^2.0.0",
- "tape": "^4.3.0"
+ "qs-iconv": "^1.0.3",
+ "tape": "^4.6.0"
},
"directories": {},
"dist": {
- "shasum": "ec1d1626b24278d99f0fdf4549e524e24eceeb26",
- "tarball": "http://registry.npmjs.org/qs/-/qs-6.1.0.tgz"
+ "shasum": "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625",
+ "tarball": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
},
"engines": {
"node": ">=0.6"
},
- "gitHead": "5bd79545edb33d6a43398fec7df9ecef2da005ea",
+ "gitHead": "335f839142e6c2c69f5302c4940d92acb0e77561",
"homepage": "https://github.com/ljharb/qs",
"keywords": [
"querystring",
@@ -77,16 +88,16 @@
"main": "lib/index.js",
"maintainers": [
{
- "email": "eran@hammer.io",
- "name": "hueniverse"
+ "name": "hueniverse",
+ "email": "eran@hammer.io"
},
{
- "email": "ljharb@gmail.com",
- "name": "ljharb"
+ "name": "ljharb",
+ "email": "ljharb@gmail.com"
},
{
- "email": "quitlahok@gmail.com",
- "name": "nlf"
+ "name": "nlf",
+ "email": "quitlahok@gmail.com"
}
],
"name": "qs",
@@ -101,9 +112,10 @@
"dist": "mkdirp dist && browserify --standalone Qs lib/index.js > dist/qs.js",
"lint": "eslint lib/*.js text/*.js",
"prepublish": "npm run dist",
+ "pretest": "npm run --silent readme && npm run --silent lint",
"readme": "evalmd README.md",
- "test": "parallelshell 'npm run readme' 'npm run lint' 'npm run coverage'",
+ "test": "npm run --silent coverage",
"tests-only": "node test"
},
- "version": "6.1.0"
+ "version": "6.2.1"
}
diff --git a/node_modules/request/node_modules/qs/test/parse.js b/node_modules/request/node_modules/qs/test/parse.js
index 5665d074e..ccf8c8c4c 100755
--- a/node_modules/request/node_modules/qs/test/parse.js
+++ b/node_modules/request/node_modules/qs/test/parse.js
@@ -2,6 +2,7 @@
var test = require('tape');
var qs = require('../');
+var iconv = require('iconv-lite');
test('parse()', function (t) {
t.test('parses a simple string', function (st) {
@@ -120,8 +121,11 @@ test('parse()', function (t) {
st.deepEqual(qs.parse('foo[]=bar&foo[bad]=baz'), { foo: { '0': 'bar', bad: 'baz' } });
st.deepEqual(qs.parse('foo[bad]=baz&foo[]=bar&foo[]=foo'), { foo: { bad: 'baz', '0': 'bar', '1': 'foo' } });
st.deepEqual(qs.parse('foo[0][a]=a&foo[0][b]=b&foo[1][a]=aa&foo[1][b]=bb'), { foo: [{ a: 'a', b: 'b' }, { a: 'aa', b: 'bb' }] });
- st.deepEqual(qs.parse('a[]=b&a[t]=u&a[hasOwnProperty]=c'), { a: { '0': 'b', t: 'u', c: true } });
- st.deepEqual(qs.parse('a[]=b&a[hasOwnProperty]=c&a[x]=y'), { a: { '0': 'b', '1': 'c', x: 'y' } });
+
+ st.deepEqual(qs.parse('a[]=b&a[t]=u&a[hasOwnProperty]=c', { allowPrototypes: false }), { a: { '0': 'b', c: true, t: 'u' } });
+ st.deepEqual(qs.parse('a[]=b&a[t]=u&a[hasOwnProperty]=c', { allowPrototypes: true }), { a: { '0': 'b', t: 'u', hasOwnProperty: 'c' } });
+ st.deepEqual(qs.parse('a[]=b&a[hasOwnProperty]=c&a[x]=y', { allowPrototypes: false }), { a: { '0': 'b', '1': 'c', x: 'y' } });
+ st.deepEqual(qs.parse('a[]=b&a[hasOwnProperty]=c&a[x]=y', { allowPrototypes: true }), { a: { '0': 'b', hasOwnProperty: 'c', x: 'y' } });
st.end();
});
@@ -173,14 +177,42 @@ test('parse()', function (t) {
t.test('allows for empty strings in arrays', function (st) {
st.deepEqual(qs.parse('a[]=b&a[]=&a[]=c'), { a: ['b', '', 'c'] });
- st.deepEqual(qs.parse('a[0]=b&a[1]&a[2]=c&a[19]=', { strictNullHandling: true }), { a: ['b', null, 'c', ''] });
- st.deepEqual(qs.parse('a[0]=b&a[1]=&a[2]=c&a[19]', { strictNullHandling: true }), { a: ['b', '', 'c', null] });
- st.deepEqual(qs.parse('a[]=&a[]=b&a[]=c'), { a: ['', 'b', 'c'] });
+
+ st.deepEqual(
+ qs.parse('a[0]=b&a[1]&a[2]=c&a[19]=', { strictNullHandling: true, arrayLimit: 20 }),
+ { a: ['b', null, 'c', ''] },
+ 'with arrayLimit 20 + array indices: null then empty string works'
+ );
+ st.deepEqual(
+ qs.parse('a[]=b&a[]&a[]=c&a[]=', { strictNullHandling: true, arrayLimit: 0 }),
+ { a: ['b', null, 'c', ''] },
+ 'with arrayLimit 0 + array brackets: null then empty string works'
+ );
+
+ st.deepEqual(
+ qs.parse('a[0]=b&a[1]=&a[2]=c&a[19]', { strictNullHandling: true, arrayLimit: 20 }),
+ { a: ['b', '', 'c', null] },
+ 'with arrayLimit 20 + array indices: empty string then null works'
+ );
+ st.deepEqual(
+ qs.parse('a[]=b&a[]=&a[]=c&a[]', { strictNullHandling: true, arrayLimit: 0 }),
+ { a: ['b', '', 'c', null] },
+ 'with arrayLimit 0 + array brackets: empty string then null works'
+ );
+
+ st.deepEqual(
+ qs.parse('a[]=&a[]=b&a[]=c'),
+ { a: ['', 'b', 'c'] },
+ 'array brackets: empty strings work'
+ );
st.end();
});
t.test('compacts sparse arrays', function (st) {
st.deepEqual(qs.parse('a[10]=1&a[2]=2'), { a: ['2', '1'] });
+ st.deepEqual(qs.parse('a[1][b][2][c]=1'), { a: [{ b: [{ c: '1' }] }] });
+ st.deepEqual(qs.parse('a[1][2][3][c]=1'), { a: [[[{ c: '1' }]]] });
+ st.deepEqual(qs.parse('a[1][2][3][c][1]=1'), { a: [[[{ c: ['1'] }]]] });
st.end();
});
@@ -390,4 +422,30 @@ test('parse()', function (t) {
st.deepEqual(qs.parse('a[]=b&a[c]=d', { plainObjects: true }), expectedArray);
st.end();
});
+
+ t.test('can parse with custom encoding', function (st) {
+ st.deepEqual(qs.parse('%8c%a7=%91%e5%8d%e3%95%7b', {
+ decoder: function (str) {
+ var reg = /\%([0-9A-F]{2})/ig;
+ var result = [];
+ var parts;
+ var last = 0;
+ while (parts = reg.exec(str)) {
+ result.push(parseInt(parts[1], 16));
+ last = parts.index + parts[0].length;
+ }
+ return iconv.decode(new Buffer(result), 'shift_jis').toString();
+ }
+ }), { 県: '大阪府' });
+ st.end();
+ });
+
+ t.test('throws error with wrong decoder', function (st) {
+ st.throws(function () {
+ qs.parse({}, {
+ decoder: 'string'
+ });
+ }, new TypeError('Decoder has to be a function.'));
+ st.end();
+ });
});
diff --git a/node_modules/request/node_modules/qs/test/stringify.js b/node_modules/request/node_modules/qs/test/stringify.js
index da72839d2..699397e33 100755
--- a/node_modules/request/node_modules/qs/test/stringify.js
+++ b/node_modules/request/node_modules/qs/test/stringify.js
@@ -2,6 +2,7 @@
var test = require('tape');
var qs = require('../');
+var iconv = require('iconv-lite');
test('stringify()', function (t) {
t.test('stringifies a querystring object', function (st) {
@@ -21,7 +22,7 @@ test('stringify()', function (t) {
st.equal(qs.stringify({ a: { b: { c: { d: 'e' } } } }), 'a%5Bb%5D%5Bc%5D%5Bd%5D=e');
st.end();
});
-
+
t.test('stringifies a nested object with dots notation', function (st) {
st.equal(qs.stringify({ a: { b: 'c' } }, { allowDots: true }), 'a.b=c');
st.equal(qs.stringify({ a: { b: { c: { d: 'e' } } } }, { allowDots: true }), 'a.b.c.d=e');
@@ -53,7 +54,7 @@ test('stringify()', function (t) {
st.equal(qs.stringify({ a: { b: ['c', 'd'] } }), 'a%5Bb%5D%5B0%5D=c&a%5Bb%5D%5B1%5D=d');
st.end();
});
-
+
t.test('stringifies a nested array value with dots notation', function (st) {
st.equal(qs.stringify({ a: { b: ['c', 'd'] } }, { allowDots: true, encode: false }), 'a.b[0]=c&a.b[1]=d');
st.end();
@@ -64,7 +65,12 @@ test('stringify()', function (t) {
st.equal(qs.stringify({ a: [{ b: { c: [1] } }] }), 'a%5B0%5D%5Bb%5D%5Bc%5D%5B0%5D=1');
st.end();
});
-
+
+ t.test('stringifies an array with mixed objects and primitives', function (st) {
+ st.equal(qs.stringify({ a: [{ b: 1 }, 2, 3] }, { encode: false }), 'a[0][b]=1&a[1]=2&a[2]=3');
+ st.end();
+ });
+
t.test('stringifies an object inside an array with dots notation', function (st) {
st.equal(qs.stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false }), 'a[0].b=c');
st.equal(qs.stringify({ a: [{ b: { c: [1] } }] }, { allowDots: true, encode: false }), 'a[0].b.c[0]=1');
@@ -249,11 +255,51 @@ test('stringify()', function (t) {
st.equal(qs.stringify({ a: 'c', z: { j: 'a', i: 'b' }, b: 'f' }, { sort: sort }), 'a=c&b=f&z%5Bi%5D=b&z%5Bj%5D=a');
st.end();
});
-
+
t.test('can sort the keys at depth 3 or more too', function (st) {
var sort = function (a, b) { return a.localeCompare(b); };
st.equal(qs.stringify({ a: 'a', z: { zj: {zjb: 'zjb', zja: 'zja'}, zi: {zib: 'zib', zia: 'zia'} }, b: 'b' }, { sort: sort, encode: false }), 'a=a&b=b&z[zi][zia]=zia&z[zi][zib]=zib&z[zj][zja]=zja&z[zj][zjb]=zjb');
st.equal(qs.stringify({ a: 'a', z: { zj: {zjb: 'zjb', zja: 'zja'}, zi: {zib: 'zib', zia: 'zia'} }, b: 'b' }, { sort: null, encode: false }), 'a=a&z[zj][zjb]=zjb&z[zj][zja]=zja&z[zi][zib]=zib&z[zi][zia]=zia&b=b');
st.end();
});
+
+ t.test('can stringify with custom encoding', function (st) {
+ st.equal(qs.stringify({ 県: '大阪府', '': ''}, {
+ encoder: function (str) {
+ if (str.length === 0) {
+ return '';
+ }
+ var buf = iconv.encode(str, 'shiftjis');
+ var result = [];
+ for (var i=0; i < buf.length; ++i) {
+ result.push(buf.readUInt8(i).toString(16));
+ }
+ return '%' + result.join('%');
+ }
+ }), '%8c%a7=%91%e5%8d%e3%95%7b&=');
+ st.end();
+ });
+
+ t.test('throws error with wrong encoder', function (st) {
+ st.throws(function () {
+ qs.stringify({}, {
+ encoder: 'string'
+ });
+ }, new TypeError('Encoder has to be a function.'));
+ st.end();
+ });
+
+ t.test('can use custom encoder for a buffer object', {
+ skip: typeof Buffer === 'undefined'
+ }, function (st) {
+ st.equal(qs.stringify({ a: new Buffer([1]) }, {
+ encoder: function (buffer) {
+ if (typeof buffer === 'string') {
+ return buffer;
+ }
+ return String.fromCharCode(buffer.readUInt8(0) + 97);
+ }
+ }), 'a=b');
+ st.end();
+ });
});
diff --git a/node_modules/request/node_modules/stringstream/package.json b/node_modules/request/node_modules/stringstream/package.json
index 9ab3d820d..514c18dc1 100644
--- a/node_modules/request/node_modules/stringstream/package.json
+++ b/node_modules/request/node_modules/stringstream/package.json
@@ -1,8 +1,16 @@
{
"_args": [
[
- "stringstream@~0.0.4",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request"
+ {
+ "raw": "stringstream@~0.0.4",
+ "scope": null,
+ "escapedName": "stringstream",
+ "name": "stringstream",
+ "rawSpec": "~0.0.4",
+ "spec": ">=0.0.4 <0.1.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "stringstream@>=0.0.4 <0.1.0",
@@ -12,16 +20,17 @@
"_location": "/request/stringstream",
"_nodeVersion": "4.2.1",
"_npmUser": {
- "email": "michael.hart.au@gmail.com",
- "name": "hichaelmart"
+ "name": "hichaelmart",
+ "email": "michael.hart.au@gmail.com"
},
"_npmVersion": "2.14.8",
"_phantomChildren": {},
"_requested": {
- "name": "stringstream",
"raw": "stringstream@~0.0.4",
- "rawSpec": "~0.0.4",
"scope": null,
+ "escapedName": "stringstream",
+ "name": "stringstream",
+ "rawSpec": "~0.0.4",
"spec": ">=0.0.4 <0.1.0",
"type": "range"
},
@@ -32,10 +41,10 @@
"_shasum": "4e484cd4de5a0bbbee18e46307710a8a81621878",
"_shrinkwrap": null,
"_spec": "stringstream@~0.0.4",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "michael.hart.au@gmail.com",
"name": "Michael Hart",
+ "email": "michael.hart.au@gmail.com",
"url": "http://github.com/mhart"
},
"bugs": {
@@ -47,15 +56,15 @@
"directories": {},
"dist": {
"shasum": "4e484cd4de5a0bbbee18e46307710a8a81621878",
- "tarball": "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+ "tarball": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
},
"gitHead": "1efe3bf507bf3a1161f8473908b60e881d41422b",
"homepage": "https://github.com/mhart/StringStream#readme",
"keywords": [
- "base64",
- "gzip",
+ "string",
"stream",
- "string"
+ "base64",
+ "gzip"
],
"license": "MIT",
"main": "stringstream.js",
diff --git a/node_modules/request/node_modules/tough-cookie/README.md b/node_modules/request/node_modules/tough-cookie/README.md
index 9899dbf6e..126f222b9 100644
--- a/node_modules/request/node_modules/tough-cookie/README.md
+++ b/node_modules/request/node_modules/tough-cookie/README.md
@@ -1,9 +1,8 @@
[RFC6265](https://tools.ietf.org/html/rfc6265) Cookies and CookieJar for Node.js
-[![Build Status](https://travis-ci.org/SalesforceEng/tough-cookie.png?branch=master)](https://travis-ci.org/SalesforceEng/tough-cookie)
+[![npm package](https://nodei.co/npm/tough-cookie.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/tough-cookie/)
-[![NPM Stats](https://nodei.co/npm/tough-cookie.png?downloads=true&stars=true)](https://npmjs.org/package/tough-cookie)
-![NPM Downloads](https://nodei.co/npm-dl/tough-cookie.png?months=9)
+[![Build Status](https://travis-ci.org/SalesforceEng/tough-cookie.png?branch=master)](https://travis-ci.org/SalesforceEng/tough-cookie)
# Synopsis
@@ -30,6 +29,10 @@ It's _so_ easy!
Why the name? NPM modules `cookie`, `cookies` and `cookiejar` were already taken.
+## Version Support
+
+Support for versions of node.js will follow that of the [request](https://www.npmjs.com/package/request) module.
+
# API
## tough
@@ -426,6 +429,17 @@ Inherits from `Store`.
A just-in-memory CookieJar synchronous store implementation, used by default. Despite being a synchronous implementation, it's usable with both the synchronous and asynchronous forms of the `CookieJar` API.
+## Community Cookie Stores
+
+These are some Store implementations authored and maintained by the community. They aren't official and we don't vouch for them but you may be interested to have a look:
+
+- [`db-cookie-store`](https://github.com/JSBizon/db-cookie-store): SQL including SQLite-based databases
+- [`file-cookie-store`](https://github.com/JSBizon/file-cookie-store): Netscape cookie file format on disk
+- [`redis-cookie-store`](https://github.com/benkroeger/redis-cookie-store): Redis
+- [`tough-cookie-filestore`](https://github.com/mitsuru/tough-cookie-filestore): JSON on disk
+- [`tough-cookie-web-storage-store`](https://github.com/exponentjs/tough-cookie-web-storage-store): DOM localStorage and sessionStorage
+
+
# Serialization Format
**NOTE**: if you want to have custom `Cookie` properties serialized, add the property name to `Cookie.serializableProperties`.
diff --git a/node_modules/request/node_modules/tough-cookie/lib/cookie.js b/node_modules/request/node_modules/tough-cookie/lib/cookie.js
index 12da297ac..c3dacfe44 100644
--- a/node_modules/request/node_modules/tough-cookie/lib/cookie.js
+++ b/node_modules/request/node_modules/tough-cookie/lib/cookie.js
@@ -68,9 +68,6 @@ var LOOSE_COOKIE_PAIR = /^((?:=)?([^=;]*)\s*=\s*)?([^\n\r\0]*)/;
// Note ';' is \x3B
var PATH_VALUE = /[\x20-\x3A\x3C-\x7E]+/;
-// Used for checking whether or not there is a trailing semi-colon
-var TRAILING_SEMICOLON = /;+$/;
-
var DAY_OF_MONTH = /^(\d{1,2})[^\d]*$/;
var TIME = /^(\d{1,2})[^\d]*:(\d{1,2})[^\d]*:(\d{1,2})[^\d]*$/;
var MONTH = /^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/i;
@@ -327,12 +324,6 @@ function parse(str, options) {
}
str = str.trim();
- // S4.1.1 Trailing semi-colons are not part of the specification.
- var semiColonCheck = TRAILING_SEMICOLON.exec(str);
- if (semiColonCheck) {
- str = str.slice(0, semiColonCheck.index);
- }
-
// We use a regex to parse the "name-value-pair" part of S5.2
var firstSemi = str.indexOf(';'); // S5.2 step 1
var pairRe = options.loose ? LOOSE_COOKIE_PAIR : COOKIE_PAIR;
@@ -362,7 +353,7 @@ function parse(str, options) {
// S5.2.3 "unparsed-attributes consist of the remainder of the set-cookie-string
// (including the %x3B (";") in question)." plus later on in the same section
// "discard the first ";" and trim".
- var unparsed = str.slice(firstSemi).replace(/^\s*;\s*/,'').trim();
+ var unparsed = str.slice(firstSemi + 1).trim();
// "If the unparsed-attributes string is empty, skip the rest of these
// steps."
@@ -378,9 +369,12 @@ function parse(str, options) {
* cookie-attribute-list". Therefore, in this implementation, we overwrite
* the previous value.
*/
- var cookie_avs = unparsed.split(/\s*;\s*/);
+ var cookie_avs = unparsed.split(';');
while (cookie_avs.length) {
- var av = cookie_avs.shift();
+ var av = cookie_avs.shift().trim();
+ if (av.length === 0) { // happens if ";;" appears
+ continue;
+ }
var av_sep = av.indexOf('=');
var av_key, av_value;
diff --git a/node_modules/request/node_modules/tough-cookie/package.json b/node_modules/request/node_modules/tough-cookie/package.json
index 565dbe191..ca65ee521 100644
--- a/node_modules/request/node_modules/tough-cookie/package.json
+++ b/node_modules/request/node_modules/tough-cookie/package.json
@@ -1,45 +1,54 @@
{
"_args": [
[
- "tough-cookie@~2.2.0",
+ {
+ "raw": "tough-cookie@~2.3.0",
+ "scope": null,
+ "escapedName": "tough-cookie",
+ "name": "tough-cookie",
+ "rawSpec": "~2.3.0",
+ "spec": ">=2.3.0 <2.4.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm/node_modules/request"
]
],
- "_from": "tough-cookie@>=2.2.0 <2.3.0",
- "_id": "tough-cookie@2.2.2",
+ "_from": "tough-cookie@>=2.3.0 <2.4.0",
+ "_id": "tough-cookie@2.3.1",
"_inCache": true,
"_installable": true,
"_location": "/request/tough-cookie",
- "_nodeVersion": "5.1.1",
+ "_nodeVersion": "6.3.1",
"_npmOperationalInternal": {
- "host": "packages-13-west.internal.npmjs.com",
- "tmp": "tmp/tough-cookie-2.2.2.tgz_1457564639182_0.5129188685677946"
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/tough-cookie-2.3.1.tgz_1469494891088_0.8524557144846767"
},
"_npmUser": {
- "email": "jstash@gmail.com",
- "name": "jstash"
+ "name": "jstash",
+ "email": "jstash@gmail.com"
},
- "_npmVersion": "3.3.12",
+ "_npmVersion": "3.10.3",
"_phantomChildren": {},
"_requested": {
- "name": "tough-cookie",
- "raw": "tough-cookie@~2.2.0",
- "rawSpec": "~2.2.0",
+ "raw": "tough-cookie@~2.3.0",
"scope": null,
- "spec": ">=2.2.0 <2.3.0",
+ "escapedName": "tough-cookie",
+ "name": "tough-cookie",
+ "rawSpec": "~2.3.0",
+ "spec": ">=2.3.0 <2.4.0",
"type": "range"
},
"_requiredBy": [
"/request"
],
- "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz",
- "_shasum": "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7",
+ "_resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz",
+ "_shasum": "99c77dfbb7d804249e8a299d4cb0fd81fef083fd",
"_shrinkwrap": null,
- "_spec": "tough-cookie@~2.2.0",
+ "_spec": "tough-cookie@~2.3.0",
"_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "jstashewsky@salesforce.com",
- "name": "Jeremy Stashewsky"
+ "name": "Jeremy Stashewsky",
+ "email": "jstashewsky@salesforce.com"
},
"bugs": {
"url": "https://github.com/SalesforceEng/tough-cookie/issues"
@@ -68,20 +77,21 @@
"description": "RFC6265 Cookies and Cookie Jar for node.js",
"devDependencies": {
"async": "^1.4.2",
+ "string.prototype.repeat": "^0.2.0",
"vows": "^0.8.1"
},
"directories": {},
"dist": {
- "shasum": "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7",
- "tarball": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
+ "shasum": "99c77dfbb7d804249e8a299d4cb0fd81fef083fd",
+ "tarball": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=0.8"
},
"files": [
"lib"
],
- "gitHead": "cc46628c4d7d2e8c372ecba29293ca8a207ec192",
+ "gitHead": "c11a2d11d12348a35ef595c809e30e641a804a7d",
"homepage": "https://github.com/SalesforceEng/tough-cookie",
"keywords": [
"HTTP",
@@ -97,12 +107,12 @@
"main": "./lib/cookie",
"maintainers": [
{
- "email": "jeremy@goinstant.com",
- "name": "jstash"
+ "name": "jstash",
+ "email": "jstash@gmail.com"
},
{
- "email": "services@goinstant.com",
- "name": "goinstant"
+ "name": "nexxy",
+ "email": "emily@contactvibe.com"
}
],
"name": "tough-cookie",
@@ -116,5 +126,5 @@
"suffixup": "curl -o public_suffix_list.dat https://publicsuffix.org/list/public_suffix_list.dat && ./generate-pubsuffix.js",
"test": "vows test/*_test.js"
},
- "version": "2.2.2"
+ "version": "2.3.1"
}
diff --git a/node_modules/request/node_modules/tunnel-agent/package.json b/node_modules/request/node_modules/tunnel-agent/package.json
index 0b2f3110a..9c1a5262c 100644
--- a/node_modules/request/node_modules/tunnel-agent/package.json
+++ b/node_modules/request/node_modules/tunnel-agent/package.json
@@ -1,41 +1,54 @@
{
"_args": [
[
- "tunnel-agent@~0.4.1",
- "/Users/ogd/Documents/projects/npm/npm/node_modules/request"
+ {
+ "raw": "tunnel-agent@~0.4.1",
+ "scope": null,
+ "escapedName": "tunnel-agent",
+ "name": "tunnel-agent",
+ "rawSpec": "~0.4.1",
+ "spec": ">=0.4.1 <0.5.0",
+ "type": "range"
+ },
+ "/Users/rebecca/code/npm/node_modules/request"
]
],
"_from": "tunnel-agent@>=0.4.1 <0.5.0",
- "_id": "tunnel-agent@0.4.2",
+ "_id": "tunnel-agent@0.4.3",
"_inCache": true,
"_installable": true,
"_location": "/request/tunnel-agent",
- "_nodeVersion": "5.0.0",
+ "_nodeVersion": "5.9.0",
+ "_npmOperationalInternal": {
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/tunnel-agent-0.4.3.tgz_1462396470295_0.23639482469297945"
+ },
"_npmUser": {
- "email": "simeonvelichkov@gmail.com",
- "name": "simov"
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
},
- "_npmVersion": "3.3.12",
+ "_npmVersion": "2.15.3",
"_phantomChildren": {},
"_requested": {
- "name": "tunnel-agent",
"raw": "tunnel-agent@~0.4.1",
- "rawSpec": "~0.4.1",
"scope": null,
+ "escapedName": "tunnel-agent",
+ "name": "tunnel-agent",
+ "rawSpec": "~0.4.1",
"spec": ">=0.4.1 <0.5.0",
"type": "range"
},
"_requiredBy": [
"/request"
],
- "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz",
- "_shasum": "1104e3f36ac87125c287270067d582d18133bfee",
+ "_resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+ "_shasum": "6373db76909fe570e08d73583365ed828a74eeeb",
"_shrinkwrap": null,
"_spec": "tunnel-agent@~0.4.1",
- "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request",
+ "_where": "/Users/rebecca/code/npm/node_modules/request",
"author": {
- "email": "mikeal.rogers@gmail.com",
"name": "Mikeal Rogers",
+ "email": "mikeal.rogers@gmail.com",
"url": "http://www.futurealoof.com"
},
"bugs": {
@@ -46,13 +59,16 @@
"devDependencies": {},
"directories": {},
"dist": {
- "shasum": "1104e3f36ac87125c287270067d582d18133bfee",
- "tarball": "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+ "shasum": "6373db76909fe570e08d73583365ed828a74eeeb",
+ "tarball": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
},
"engines": {
"node": "*"
},
- "gitHead": "449634d1054949f9f145f4925985a8dea0f46b0f",
+ "files": [
+ "index.js"
+ ],
+ "gitHead": "e72d830f5ed388a2a71d37ce062c38e3fb34bdde",
"homepage": "https://github.com/mikeal/tunnel-agent#readme",
"license": "Apache-2.0",
"main": "index.js",
@@ -81,5 +97,5 @@
"url": "git+https://github.com/mikeal/tunnel-agent.git"
},
"scripts": {},
- "version": "0.4.2"
+ "version": "0.4.3"
}
diff --git a/node_modules/request/package.json b/node_modules/request/package.json
index 6c9fa0ec8..8e1c5b8a1 100644
--- a/node_modules/request/package.json
+++ b/node_modules/request/package.json
@@ -1,51 +1,63 @@
{
"_args": [
[
- "request@latest",
+ {
+ "raw": "request@~2.74.0",
+ "scope": null,
+ "escapedName": "request",
+ "name": "request",
+ "rawSpec": "~2.74.0",
+ "spec": ">=2.74.0 <2.75.0",
+ "type": "range"
+ },
"/Users/rebecca/code/npm"
]
],
- "_from": "request@latest",
- "_id": "request@2.72.0",
+ "_from": "request@>=2.74.0 <2.75.0",
+ "_id": "request@2.74.0",
"_inCache": true,
"_installable": true,
"_location": "/request",
- "_nodeVersion": "5.9.0",
+ "_nodeVersion": "6.2.2",
"_npmOperationalInternal": {
- "host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/request-2.72.0.tgz_1460901215210_0.9173020373564214"
+ "host": "packages-16-east.internal.npmjs.com",
+ "tmp": "tmp/request-2.74.0.tgz_1469231082306_0.13140005595050752"
},
"_npmUser": {
- "email": "simeonvelichkov@gmail.com",
- "name": "simov"
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
},
- "_npmVersion": "3.8.5",
+ "_npmVersion": "2.15.6",
"_phantomChildren": {
"ansi-regex": "2.0.0",
"inherits": "2.0.1",
"strip-ansi": "3.0.1"
},
"_requested": {
- "name": "request",
- "raw": "request@latest",
- "rawSpec": "latest",
+ "raw": "request@~2.74.0",
"scope": null,
- "spec": "latest",
- "type": "tag"
+ "escapedName": "request",
+ "name": "request",
+ "rawSpec": "~2.74.0",
+ "spec": ">=2.74.0 <2.75.0",
+ "type": "range"
},
"_requiredBy": [
+ "#USER",
"/",
"/node-gyp",
- "/npm-registry-client"
+ "/npm-registry-client",
+ "/npm-registry-couchapp/couchapp",
+ "/npm-registry-couchapp/couchapp/nano"
],
- "_resolved": "https://registry.npmjs.org/request/-/request-2.72.0.tgz",
- "_shasum": "0ce3a179512620b10441f14c82e21c12c0ddb4e1",
+ "_resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz",
+ "_shasum": "7693ca768bbb0ea5c8ce08c084a45efa05b892ab",
"_shrinkwrap": null,
- "_spec": "request@latest",
+ "_spec": "request@~2.74.0",
"_where": "/Users/rebecca/code/npm",
"author": {
- "email": "mikeal.rogers@gmail.com",
- "name": "Mikeal Rogers"
+ "name": "Mikeal Rogers",
+ "email": "mikeal.rogers@gmail.com"
},
"bugs": {
"url": "http://github.com/request/request/issues"
@@ -58,7 +70,7 @@
"combined-stream": "~1.0.5",
"extend": "~3.0.0",
"forever-agent": "~0.6.1",
- "form-data": "~1.0.0-rc3",
+ "form-data": "~1.0.0-rc4",
"har-validator": "~2.0.6",
"hawk": "~3.1.3",
"http-signature": "~1.1.0",
@@ -68,62 +80,62 @@
"mime-types": "~2.1.7",
"node-uuid": "~1.4.7",
"oauth-sign": "~0.8.1",
- "qs": "~6.1.0",
+ "qs": "~6.2.0",
"stringstream": "~0.0.4",
- "tough-cookie": "~2.2.0",
+ "tough-cookie": "~2.3.0",
"tunnel-agent": "~0.4.1"
},
"description": "Simplified HTTP request client.",
"devDependencies": {
"bluebird": "^3.2.1",
- "browserify": "^12.0.2",
+ "browserify": "^13.0.1",
"browserify-istanbul": "^2.0.0",
"buffer-equal": "^1.0.0",
- "codecov.io": "^0.1.6",
+ "codecov": "^1.0.1",
"coveralls": "^2.11.4",
"eslint": "^2.5.3",
"function-bind": "^1.0.2",
"istanbul": "^0.4.0",
- "karma": "^0.13.10",
+ "karma": "^1.1.1",
"karma-browserify": "^5.0.1",
- "karma-cli": "^0.1.1",
- "karma-coverage": "^0.5.3",
+ "karma-cli": "^1.0.0",
+ "karma-coverage": "^1.0.0",
"karma-phantomjs-launcher": "^1.0.0",
- "karma-tap": "^1.0.3",
+ "karma-tap": "^2.0.1",
"phantomjs-prebuilt": "^2.1.3",
"rimraf": "^2.2.8",
"server-destroy": "^1.0.1",
- "tape": "^4.2.0",
+ "tape": "^4.6.0",
"taper": "^0.4.0"
},
"directories": {},
"dist": {
- "shasum": "0ce3a179512620b10441f14c82e21c12c0ddb4e1",
- "tarball": "https://registry.npmjs.org/request/-/request-2.72.0.tgz"
+ "shasum": "7693ca768bbb0ea5c8ce08c084a45efa05b892ab",
+ "tarball": "https://registry.npmjs.org/request/-/request-2.74.0.tgz"
},
"engines": {
"node": ">=0.8.0"
},
- "gitHead": "6dcac13642955577592fdafb5ff3cdc8a6ff1b1b",
+ "gitHead": "76e82351cbc21049441b1763c6f2bbd504fa8f5a",
"homepage": "https://github.com/request/request#readme",
"license": "Apache-2.0",
"main": "index.js",
"maintainers": [
{
- "email": "mikeal.rogers@gmail.com",
- "name": "mikeal"
+ "name": "mikeal",
+ "email": "mikeal.rogers@gmail.com"
},
{
- "email": "jnylen@gmail.com",
- "name": "nylen"
+ "name": "nylen",
+ "email": "jnylen@gmail.com"
},
{
- "email": "fkschott@gmail.com",
- "name": "fredkschott"
+ "name": "fredkschott",
+ "email": "fkschott@gmail.com"
},
{
- "email": "simeonvelichkov@gmail.com",
- "name": "simov"
+ "name": "simov",
+ "email": "simeonvelichkov@gmail.com"
}
],
"name": "request",
@@ -146,5 +158,5 @@
"util",
"utility"
],
- "version": "2.72.0"
+ "version": "2.74.0"
}
diff --git a/node_modules/request/request.js b/node_modules/request/request.js
index 124157e86..8267c1253 100644
--- a/node_modules/request/request.js
+++ b/node_modules/request/request.js
@@ -9,6 +9,7 @@ var http = require('http')
, bl = require('bl')
, hawk = require('hawk')
, aws2 = require('aws-sign2')
+ , aws4 = require('aws4')
, httpSignature = require('http-signature')
, mime = require('mime-types')
, stringstream = require('stringstream')
@@ -70,20 +71,6 @@ function filterOutReservedFunctions(reserved, options) {
}
-// Function for properly handling a connection error
-function connectionErrorHandler(error) {
- var socket = this
- if (socket.res) {
- if (socket.res.request) {
- socket.res.request.emit('error', error)
- } else {
- socket.res.emit('error', error)
- }
- } else {
- socket._httpMessage.emit('error', error)
- }
-}
-
// Return a simpler request object to allow serialization
function requestToJSON() {
var self = this
@@ -335,7 +322,7 @@ Request.prototype.init = function (options) {
var formData = options.formData
var requestForm = self.form()
var appendFormValue = function (key, value) {
- if (value.hasOwnProperty('value') && value.hasOwnProperty('options')) {
+ if (value && value.hasOwnProperty('value') && value.hasOwnProperty('options')) {
requestForm.append(key, value.value, value.options)
} else {
requestForm.append(key, value)
@@ -804,11 +791,6 @@ Request.prototype.start = function () {
self.emit('socket', socket)
})
- self.on('end', function() {
- if ( self.req.connection ) {
- self.req.connection.removeListener('error', connectionErrorHandler)
- }
- })
self.emit('request', self.req)
}
@@ -843,11 +825,6 @@ Request.prototype.onRequestResponse = function (response) {
debug('response end', self.uri.href, response.statusCode, response.headers)
})
- // The check on response.connection is a workaround for browserify.
- if (response.connection && response.connection.listeners('error').indexOf(connectionErrorHandler) === -1) {
- response.connection.setMaxListeners(0)
- response.connection.once('error', connectionErrorHandler)
- }
if (self._aborted) {
debug('aborted', self.uri.href)
response.resume()
@@ -1264,10 +1241,9 @@ Request.prototype.aws = function (opts, now) {
self._aws = opts
return self
}
-
+
if (opts.sign_version == 4 || opts.sign_version == '4') {
- var aws4 = require('aws4')
- // use aws4
+ // use aws4
var options = {
host: self.uri.host,
path: self.uri.path,