diff options
| author | Kat Marchán <kzm@sykosomatic.org> | 2016-12-01 22:25:57 +0300 |
|---|---|---|
| committer | Kat Marchán <kzm@sykosomatic.org> | 2016-12-02 02:19:22 +0300 |
| commit | 85b0174ba9842e8e89f3c33d009e4b4a9e877c7d (patch) | |
| tree | 0a6ada6765d87ec652e87412b59f13852774ada6 /node_modules/request | |
| parent | 9664d36653503247737630440bc2ff657de965c3 (diff) | |
request@2.79.0
Mostly test and project maintenance changes + features we do not use
Diffstat (limited to 'node_modules/request')
54 files changed, 1170 insertions, 1604 deletions
diff --git a/node_modules/request/.npmignore b/node_modules/request/.npmignore deleted file mode 100644 index 67fe11cc0..000000000 --- a/node_modules/request/.npmignore +++ /dev/null @@ -1,6 +0,0 @@ -coverage -tests -node_modules -examples -release.sh -disabled.appveyor.yml diff --git a/node_modules/request/.travis.yml b/node_modules/request/.travis.yml deleted file mode 100644 index 643e6551b..000000000 --- a/node_modules/request/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ - -language: node_js - -node_js: - - node - - 6 - - 4 - -after_script: - - npm run test-cov - - codecov - - cat ./coverage/lcov.info | coveralls - -webhooks: - urls: https://webhooks.gitter.im/e/237280ed4796c19cc626 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false - -sudo: false diff --git a/node_modules/request/CHANGELOG.md b/node_modules/request/CHANGELOG.md index be7949cea..7a9b2abf9 100644 --- a/node_modules/request/CHANGELOG.md +++ b/node_modules/request/CHANGELOG.md @@ -1,5 +1,13 @@ ## Change Log +### v2.79.0 (2016/11/18) +- [#2368](https://github.com/request/request/pull/2368) Fix typeof check in test-pool.js (@forivall) +- [#2394](https://github.com/request/request/pull/2394) Use `files` in package.json (@SimenB) +- [#2463](https://github.com/request/request/pull/2463) AWS support for session tokens for temporary credentials (@simov) +- [#2467](https://github.com/request/request/pull/2467) Migrate to uuid (@simov, @antialias) +- [#2459](https://github.com/request/request/pull/2459) Update taper to version 0.5.0 🚀 (@greenkeeperio-bot) +- [#2448](https://github.com/request/request/pull/2448) Make other connect timeout test more reliable too (@mscdex) + ### v2.78.0 (2016/11/03) - [#2447](https://github.com/request/request/pull/2447) Always set request timeout on keep-alive connections (@mscdex) @@ -496,7 +504,6 @@ ### v2.29.0 (2013/12/06) - [#727](https://github.com/request/request/pull/727) fix requester bug (@jchris) - ### v2.28.0 (2013/12/04) - [#724](https://github.com/request/request/pull/724) README.md: add custom HTTP Headers example. (@tcort) - [#719](https://github.com/request/request/pull/719) Made a comment gender neutral. (@unsetbit) diff --git a/node_modules/request/CONTRIBUTING.md b/node_modules/request/CONTRIBUTING.md deleted file mode 100644 index 8aa6999ac..000000000 --- a/node_modules/request/CONTRIBUTING.md +++ /dev/null @@ -1,81 +0,0 @@ - -# Contributing to Request - -:+1::tada: First off, thanks for taking the time to contribute! :tada::+1: - -The following is a set of guidelines for contributing to Request and its packages, which are hosted in the [Request Organization](https://github.com/request) on GitHub. -These are just guidelines, not rules, use your best judgment and feel free to propose changes to this document in a pull request. - - -## Submitting an Issue - -1. Provide a small self **sufficient** code example to **reproduce** the issue. -2. Run your test code using [request-debug](https://github.com/request/request-debug) and copy/paste the results inside the issue. -3. You should **always** use fenced code blocks when submitting code examples or any other formatted output: - <pre> - ```js - put your javascript code here - ``` - - ``` - put any other formatted output here, - like for example the one returned from using request-debug - ``` - </pre> - -If the problem cannot be reliably reproduced, the issue will be marked as `Not enough info (see CONTRIBUTING.md)`. - -If the problem is not related to request the issue will be marked as `Help (please use Stackoverflow)`. - - -## Submitting a Pull Request - -1. In almost all of the cases your PR **needs tests**. Make sure you have any. -2. Run `npm test` locally. Fix any errors before pushing to GitHub. -3. After submitting the PR a build will be triggered on TravisCI. Wait for it to ends and make sure all jobs are passing. - - ------------------------------------------ - - -## Becoming a Contributor - -Individuals making significant and valuable contributions are given -commit-access to the project to contribute as they see fit. This project is -more like an open wiki than a standard guarded open source project. - - -## Rules - -There are a few basic ground-rules for contributors: - -1. **No `--force` pushes** or modifying the Git history in any way. -1. **Non-master branches** ought to be used for ongoing work. -1. **Any** change should be added through Pull Request. -1. **External API changes and significant modifications** ought to be subject - to an **internal pull-request** to solicit feedback from other contributors. -1. Internal pull-requests to solicit feedback are *encouraged* for any other - non-trivial contribution but left to the discretion of the contributor. -1. For significant changes wait a full 24 hours before merging so that active - contributors who are distributed throughout the world have a chance to weigh - in. -1. Contributors should attempt to adhere to the prevailing code-style. -1. Run `npm test` locally before submitting your PR, to catch any easy to miss - style & testing issues. To diagnose test failures, there are two ways to - run a single test file: - - `node_modules/.bin/taper tests/test-file.js` - run using the default - [`taper`](https://github.com/nylen/taper) test reporter. - - `node tests/test-file.js` - view the raw - [tap](https://testanything.org/) output. - - -## Releases - -Declaring formal releases remains the prerogative of the project maintainer. - - -## Changes to this arrangement - -This is an experiment and feedback is welcome! This document may also be -subject to pull-requests or changes by contributors where you believe you have -something valuable to add or change. diff --git a/node_modules/request/README.md b/node_modules/request/README.md index a0b6c84d0..2ddfe72c5 100644 --- a/node_modules/request/README.md +++ b/node_modules/request/README.md @@ -755,7 +755,7 @@ The first argument can be either a `url` or an `options` object. The only requir - `auth` - A hash containing values `user` || `username`, `pass` || `password`, and `sendImmediately` (optional). See documentation above. - `oauth` - Options for OAuth HMAC-SHA1 signing. See documentation above. - `hawk` - Options for [Hawk signing](https://github.com/hueniverse/hawk). The `credentials` key must contain the necessary signing info, [see hawk docs for details](https://github.com/hueniverse/hawk#usage-example). -- `aws` - `object` containing AWS signing information. Should have the properties `key`, `secret`. Also requires the property `bucket`, unless you’re specifying your `bucket` as part of the path, or the request doesn’t use a bucket (i.e. GET Services). If you want to use AWS sign version 4 use the parameter `sign_version` with value `4` otherwise the default is version 2. **Note:** you need to `npm install aws4` first. +- `aws` - `object` containing AWS signing information. Should have the properties `key`, `secret`, and optionally `session` (note that this only works for services that require session as part of the canonical string). Also requires the property `bucket`, unless you’re specifying your `bucket` as part of the path, or the request doesn’t use a bucket (i.e. GET Services). If you want to use AWS sign version 4 use the parameter `sign_version` with value `4` otherwise the default is version 2. **Note:** you need to `npm install aws4` first. - `httpSignature` - Options for the [HTTP Signature Scheme](https://github.com/joyent/node-http-signature/blob/master/http_signing.md) using [Joyent's library](https://github.com/joyent/node-http-signature). The `keyId` and `key` properties must be specified. See the docs for other options. --- diff --git a/node_modules/request/codecov.yml b/node_modules/request/codecov.yml deleted file mode 100644 index acd3f33ce..000000000 --- a/node_modules/request/codecov.yml +++ /dev/null @@ -1,2 +0,0 @@ - -comment: false diff --git a/node_modules/request/lib/auth.js b/node_modules/request/lib/auth.js index 1cb695216..559ca57be 100644 --- a/node_modules/request/lib/auth.js +++ b/node_modules/request/lib/auth.js @@ -1,7 +1,7 @@ 'use strict' var caseless = require('caseless') - , uuid = require('node-uuid') + , uuid = require('uuid') , helpers = require('./helpers') var md5 = helpers.md5 diff --git a/node_modules/request/lib/multipart.js b/node_modules/request/lib/multipart.js index c12817261..3b605bd47 100644 --- a/node_modules/request/lib/multipart.js +++ b/node_modules/request/lib/multipart.js @@ -1,6 +1,6 @@ 'use strict' -var uuid = require('node-uuid') +var uuid = require('uuid') , CombinedStream = require('combined-stream') , isstream = require('isstream') diff --git a/node_modules/request/lib/oauth.js b/node_modules/request/lib/oauth.js index c24209b89..56b39b0f5 100644 --- a/node_modules/request/lib/oauth.js +++ b/node_modules/request/lib/oauth.js @@ -3,7 +3,7 @@ var url = require('url') , qs = require('qs') , caseless = require('caseless') - , uuid = require('node-uuid') + , uuid = require('uuid') , oauth = require('oauth-sign') , crypto = require('crypto') diff --git a/node_modules/request/node_modules/.bin/uuid b/node_modules/request/node_modules/.bin/uuid index 80eb14aa1..b3e45bc53 120000 --- a/node_modules/request/node_modules/.bin/uuid +++ b/node_modules/request/node_modules/.bin/uuid @@ -1 +1 @@ -../node-uuid/bin/uuid
\ No newline at end of file +../uuid/bin/uuid
\ No newline at end of file diff --git a/node_modules/request/node_modules/form-data/README.md b/node_modules/request/node_modules/form-data/README.md index 38d6d9f68..642a9d14a 100644 --- a/node_modules/request/node_modules/form-data/README.md +++ b/node_modules/request/node_modules/form-data/README.md @@ -6,11 +6,11 @@ The API of this library is inspired by the [XMLHttpRequest-2 FormData Interface] [xhr2-fd]: http://dev.w3.org/2006/webapi/XMLHttpRequest-2/Overview.html#the-formdata-interface -[](https://travis-ci.org/form-data/form-data) -[](https://travis-ci.org/form-data/form-data) -[](https://ci.appveyor.com/project/alexindigo/form-data) +[](https://travis-ci.org/form-data/form-data) +[](https://travis-ci.org/form-data/form-data) +[](https://ci.appveyor.com/project/alexindigo/form-data) -[](https://coveralls.io/github/form-data/form-data?branch=master) +[](https://coveralls.io/github/form-data/form-data?branch=master) [](https://david-dm.org/form-data/form-data) [](https://www.bithound.io/github/form-data/form-data) diff --git a/node_modules/request/node_modules/form-data/lib/browser.js b/node_modules/request/node_modules/form-data/lib/browser.js index f683b05a6..09e7c70e6 100644 --- a/node_modules/request/node_modules/form-data/lib/browser.js +++ b/node_modules/request/node_modules/form-data/lib/browser.js @@ -1,2 +1,2 @@ /* eslint-env browser */ -module.exports = self.FormData; +module.exports = typeof self == 'object' ? self.FormData : window.FormData; diff --git a/node_modules/request/node_modules/form-data/package.json b/node_modules/request/node_modules/form-data/package.json index 426ec665d..96fd69e80 100644 --- a/node_modules/request/node_modules/form-data/package.json +++ b/node_modules/request/node_modules/form-data/package.json @@ -10,23 +10,23 @@ "spec": ">=2.1.1 <2.2.0", "type": "range" }, - "/Users/ogd/Documents/projects/npm/npm/node_modules/request" + "/Users/zkat/Documents/code/npm/node_modules/request" ] ], "_from": "form-data@>=2.1.1 <2.2.0", - "_id": "form-data@2.1.1", + "_id": "form-data@2.1.2", "_inCache": true, "_location": "/request/form-data", - "_nodeVersion": "4.5.0", + "_nodeVersion": "6.4.0", "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/form-data-2.1.1.tgz_1475562797683_0.23411617754027247" + "tmp": "tmp/form-data-2.1.2.tgz_1478577739404_0.6574864208232611" }, "_npmUser": { "name": "alexindigo", "email": "iam@alexindigo.com" }, - "_npmVersion": "2.15.9", + "_npmVersion": "3.10.3", "_phantomChildren": {}, "_requested": { "raw": "form-data@~2.1.1", @@ -40,11 +40,11 @@ "_requiredBy": [ "/request" ], - "_resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz", - "_shasum": "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3", + "_resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz", + "_shasum": "89c3534008b97eada4cbb157d58f6f5df025eae4", "_shrinkwrap": null, "_spec": "form-data@~2.1.1", - "_where": "/Users/ogd/Documents/projects/npm/npm/node_modules/request", + "_where": "/Users/zkat/Documents/code/npm/node_modules/request", "author": { "name": "Felix Geisendörfer", "email": "felix@debuggable.com", @@ -61,29 +61,34 @@ }, "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.", "devDependencies": { + "browserify": "^13.1.1", + "browserify-istanbul": "^2.0.0", "coveralls": "^2.11.14", "cross-spawn": "^4.0.2", - "eslint": "^3.7.1", + "eslint": "^3.9.1", "fake": "^0.2.2", "far": "^0.0.7", "formidable": "^1.0.17", "in-publish": "^2.0.0", "is-node-modern": "^1.0.0", "istanbul": "^0.4.5", + "obake": "^0.1.2", + "phantomjs-prebuilt": "^2.1.13", "pkgfiles": "^2.3.0", "pre-commit": "^1.1.3", - "request": "^2.75.0", - "rimraf": "^2.5.4" + "request": "2.76.0", + "rimraf": "^2.5.4", + "tape": "^4.6.2" }, "directories": {}, "dist": { - "shasum": "4adf0342e1a79afa1e84c8c320a9ffc82392a1f3", - "tarball": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz" + "shasum": "89c3534008b97eada4cbb157d58f6f5df025eae4", + "tarball": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz" }, "engines": { "node": ">= 0.12" }, - "gitHead": "ebee8412f79798b87fd3ebed44748c1ca06fc1ac", + "gitHead": "03444d21961a7a44cdc2eae11ee3630f6969023d", "homepage": "https://github.com/form-data/form-data#readme", "license": "MIT", "main": "./lib/form_data", @@ -109,7 +114,7 @@ "optionalDependencies": {}, "pre-commit": [ "lint", - "test", + "ci-test", "check" ], "readme": "ERROR: No README data found!", @@ -118,8 +123,10 @@ "url": "git://github.com/form-data/form-data.git" }, "scripts": { + "browser": "browserify -t browserify-istanbul test/run-browser.js | obake --coverage", "check": "istanbul check-coverage coverage/coverage*.json", - "ci-lint": "is-node-modern && npm run lint || is-node-not-modern", + "ci-lint": "is-node-modern 6 && npm run lint || is-node-not-modern 6", + "ci-test": "npm run test && npm run browser && npm run report", "debug": "verbose=1 ./test/run.js", "files": "pkgfiles --sort=name", "get-version": "node -e \"console.log(require('./package.json').version)\"", @@ -129,9 +136,10 @@ "predebug": "rimraf coverage test/tmp", "prepublish": "in-publish && npm run update-readme || not-in-publish", "pretest": "rimraf coverage test/tmp", + "report": "istanbul report lcov text", "restore-readme": "mv README.md.bak README.md", "test": "istanbul cover test/run.js", "update-readme": "sed -i.bak 's/\\/master\\.svg/\\/v'$(npm --silent run get-version)'.svg/g' README.md" }, - "version": "2.1.1" + "version": "2.1.2" } diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/CHANGES.md b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/CHANGES.md new file mode 100644 index 000000000..d7c8f4ebe --- /dev/null +++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/CHANGES.md @@ -0,0 +1,364 @@ +# node-dashdash changelog + +## not yet released + +(nothing yet) + +## 1.14.1 + +- [issue #30] Change the output used by dashdash's Bash completion support to + indicate "there are no completions for this argument" to cope with different + sorting rules on different Bash/platforms. For example: + + $ triton -v -p test2 package get <TAB> # before + ##-no -tritonpackage- completions-## + + $ triton -v -p test2 package get <TAB> # after + ##-no-completion- -results-## + +## 1.14.0 + +- New `synopsisFromOpt(<option spec>)` function. This will be used by + [node-cmdln](https://github.com/trentm/node-cmdln) to put together a synopsis + of options for a command. Some examples: + + > synopsisFromOpt({names: ['help', 'h'], type: 'bool'}); + '[ --help | -h ]' + > synopsisFromOpt({name: 'file', type: 'string', helpArg: 'FILE'}); + '[ --file=FILE ]' + + +## 1.13.1 + +- [issue #20] `bashCompletionSpecFromOptions` breaks on an options array with + an empty-string group. + + +## 1.13.0 + +- Update assert-plus dep to 1.x to get recent fixes (particularly for + `assert.optional*`). + +- Drop testing (and official support in packages.json#engines) for node 0.8.x. + Add testing against node 5.x and 4.x with `make testall`. + +- [pull #16] Change the `positiveInteger` type to NOT accept zero (0). + For those who might need the old behaviour, see + "examples/custom-option-intGteZero.js". (By Dave Pacheco.) + + +## 1.12.2 + +- Bash completion: Add `argtypes` to specify the types of positional args. + E.g. this would allow you to have an `ssh` command with `argtypes = ['host', + 'cmd']` for bash completion. You then have to provide Bash functions to + handle completing those types via the `specExtra` arg. See + "[examples/ddcompletion.js](examples/ddcompletion.js)" for an example. + +- Bash completion: Tweak so that options or only offered as completions when + there is a leading '-'. E.g. `mytool <TAB>` does NOT offer options, `mytool + -<TAB>` *does*. Without this, a tool with options would never be able to + fallback to Bash's "default" completion. For example `ls <TAB>` wouldn't + result in filename completion. Now it will. + +- Bash completion: A workaround for not being able to explicitly have *no* + completion results. Because dashdash's completion uses `complete -o default`, + we fallback to Bash's "default" completion (typically for filename + completion). Before this change, an attempt to explicitly say "there are + no completions that match" would unintentionally trigger filename completion. + Instead as a workaround we return: + + $ ddcompletion --none <TAB> # the 'none' argtype + ##-no completions-## + + $ ddcompletion # a custom 'fruit' argtype + apple banana orange + $ ddcompletion z + ##-no -fruit- completions-## + + This is a bit of a hack, but IMO a better experience than the surprise + of matching a local filename beginning with 'z', which isn't, in this + case, a "fruit". + +## 1.12.1 + +- Bash completion: Document `<option spec>.completionType`. Add `includeHidden` + option to `bashCompletionSpecFromOptions()`. Add support for dealing with + hidden subcmds. + + +## 1.12.0 + +- Support for generating Bash completion files. See the "Bash completion" + section of the README.md and "examples/ddcompletion.js" for an example. + + +## 1.11.0 + +- Add the `arrayFlatten` boolean option to `dashdash.addOptionType` used for + custom option types. This allows one to create an `arrayOf...` option type + where each usage of the option can return multiple results. For example: + + node mytool.js --foo a,b --foo c + + We could define an option type for `--foo` such that + `opts.foo = ['a', 'b', 'c']`. See + "[examples/custom-option-arrayOfCommaSepString.js](examples/custom-option-arrayOfCommaSepString.js)" + for an example. + + +## 1.10.1 + +- Trim the published package to the minimal bits. Before: 24K tarball, 144K unpacked. + After: 12K tarball, 48K unpacked. `npm` won't let me drop the README.md. :) + + +## 1.10.0 + +- [issue #9] Support `includeDefault` in help config (similar to `includeEnv`) to have a + note of an option's default value, if any, in help output. +- [issue #11] Fix option group breakage introduced in v1.9.0. + + +## 1.9.0 + +- [issue #10] Custom option types added with `addOptionType` can specify a + "default" value. See "examples/custom-option-fruit.js". + + +## 1.8.0 + +- Support `hidden: true` in an option spec to have help output exclude this + option. + + +## 1.7.3 + +- [issue #8] Fix parsing of a short option group when one of the + option takes an argument. For example, consider `tail` with + a `-f` boolean option and a `-n` option that takes a number + argument. This should parse: + + tail -fn5 + + Before this change, that would not parse correctly. + It is suspected that this was introduced in version 1.4.0 + (with commit 656fa8bc71c372ebddad0a7026bd71611e2ec99a). + + +## 1.7.2 + +- Known issues: #8 + +- Exclude 'tools/' dir in packages published to npm. + + +## 1.7.1 + +- Known issues: #8 + +- Support an option group *empty string* value: + + ... + { group: '' }, + ... + + to render as a blank line in option help. This can help separate loosely + related sets of options without resorting to a title for option groups. + + +## 1.7.0 + +- Known issues: #8 + +- [pull #7] Support for `<parser>.help({helpWrap: false, ...})` option to be able + to fully control the formatting for option help (by Patrick Mooney) `helpWrap: + false` can also be set on individual options in the option objects, e.g.: + + var options = [ + { + names: ['foo'], + type: 'string', + helpWrap: false, + help: 'long help with\n newlines' + + '\n spaces\n and such\nwill render correctly' + }, + ... + ]; + + +## 1.6.0 + +- Known issues: #8 + +- [pull #6] Support headings between groups of options (by Joshua M. Clulow) + so that this code: + + var options = [ + { group: 'Armament Options' }, + { names: [ 'weapon', 'w' ], type: 'string' }, + { group: 'General Options' }, + { names: [ 'help', 'h' ], type: 'bool' } + ]; + ... + + will give you this help output: + + ... + Armament Options: + -w, --weapon + + General Options: + -h, --help + ... + + +## 1.5.0 + +- Known issues: #8 + +- Add support for adding custom option types. "examples/custom-option-duration.js" + shows an example adding a "duration" option type. + + $ node custom-option-duration.js -t 1h + duration: 3600000 ms + $ node custom-option-duration.js -t 1s + duration: 1000 ms + $ node custom-option-duration.js -t 5d + duration: 432000000 ms + $ node custom-option-duration.js -t bogus + custom-option-duration.js: error: arg for "-t" is not a valid duration: "bogus" + + A custom option type is added via: + + var dashdash = require('dashdash'); + dashdash.addOptionType({ + name: '...', + takesArg: true, + helpArg: '...', + parseArg: function (option, optstr, arg) { + ... + } + }); + +- [issue #4] Add `date` and `arrayOfDate` option types. They accept these date + formats: epoch second times (e.g. 1396031701) and ISO 8601 format: + `YYYY-MM-DD[THH:MM:SS[.sss][Z]]` (e.g. "2014-03-28", + "2014-03-28T18:35:01.489Z"). See "examples/date.js" for an example usage. + + $ node examples/date.js -s 2014-01-01 -e $(date +%s) + start at 2014-01-01T00:00:00.000Z + end at 2014-03-29T04:26:18.000Z + + +## 1.4.0 + +- Known issues: #8 + +- [pull #2, pull #3] Add a `allowUnknown: true` option on `createParser` to + allow unknown options to be passed through as `opts._args` instead of parsing + throwing an exception (by https://github.com/isaacs). + + See 'allowUnknown' in the README for a subtle caveat. + + +## 1.3.2 + +- Fix a subtlety where a *bool* option using both `env` and `default` didn't + work exactly correctly. If `default: false` then all was fine (by luck). + However, if you had an option like this: + + options: [ { + names: ['verbose', 'v'], + env: 'FOO_VERBOSE', + 'default': true, // <--- this + type: 'bool' + } ], + + wanted `FOO_VERBOSE=0` to make the option false, then you need the fix + in this version of dashdash. + + +## 1.3.1 + +- [issue #1] Fix an envvar not winning over an option 'default'. Previously + an option with both `default` and `env` would never take a value from the + environment variable. E.g. `FOO_FILE` would never work here: + + options: [ { + names: ['file', 'f'], + env: 'FOO_FILE', + 'default': 'default.file', + type: 'string' + } ], + + +## 1.3.0 + +- [Backward incompatible change for boolean envvars] Change the + interpretation of environment variables for boolean options to consider '0' + to be false. Previous to this *any* value to the envvar was considered + true -- which was quite misleading. Example: + + $ FOO_VERBOSE=0 node examples/foo.js + # opts: { verbose: [ false ], + _order: [ { key: 'verbose', value: false, from: 'env' } ], + _args: [] } + # args: [] + + +## 1.2.1 + +- Fix for `parse.help({includeEnv: true, ...})` handling to ensure that an + option with an `env` **but no `help`** still has the "Environment: ..." + output. E.g.: + + { names: ['foo'], type: 'string', env: 'FOO' } + + ... + + --foo=ARG Environment: FOO=ARG + + +## 1.2.0 + +- Transform the option key on the `opts` object returned from + `<parser>.parse()` for convenience. Currently this is just + `s/-/_/g`, e.g. '--dry-run' -> `opts.dry_run`. This allow one to use hyphen + in option names (common) but not have to do silly things like + `opt["dry-run"]` to access the parsed results. + + +## 1.1.0 + +- Environment variable integration. Envvars can be associated with an option, + then option processing will fallback to using that envvar if defined and + if the option isn't specified in argv. See the "Environment variable + integration" section in the README. + +- Change the `<parser>.parse()` signature to take a single object with keys + for arguments. The old signature is still supported. + +- `dashdash.createParser(CONFIG)` alternative to `new dashdash.Parser(CONFIG)` + a la many node-land APIs. + + +## 1.0.2 + +- Add "positiveInteger" and "arrayOfPositiveInteger" option types that only + accept positive integers. + +- Add "integer" and "arrayOfInteger" option types that accepts only integers. + Note that, for better or worse, these do NOT accept: "0x42" (hex), "1e2" + (with exponent) or "1.", "3.0" (floats). + + +## 1.0.1 + +- Fix not modifying the given option spec objects (which breaks creating + a Parser with them more than once). + + +## 1.0.0 + +First release. diff --git a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/LICENSE.txt b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/LICENSE.txt new file mode 100644 index 000000000..54706c66e --- /dev/null +++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/LICENSE.txt @@ -0,0 +1,24 @@ +# This is the MIT license + +Copyright (c) 2013 Trent Mick. All rights reserved. +Copyright (c) 2013 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/dashdash/etc/dashdash.bash_completion.in b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/etc/dashdash.bash_completion.in index 50b7d6e0e..dc333096c 100644 --- a/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/etc/dashdash.bash_completion.in +++ b/node_modules/request/node_modules/http-signature/node_modules/sshpk/node_modules/dashdash/etc/dashdash.bash_completion.in @@ -264,7 +264,7 @@ function _{{name}}_completer { # We want *no* completions, i.e. some way to get the active # 'complete -o default' to not do filename completion. trace " completing 'none' (hack to imply no completions)" - echo "##-no completions-##" + echo "##-no-completion- -results-##" elif [[ $argtype == "file" ]]; then # 'complete -o default' gives the best filename completion, at least # on Mac. @@ -278,8 +278,9 @@ function _{{name}}_completer { completions=$(complete_$argtype "$word") if [[ -z "$completions" ]]; then trace " no custom '$argtype' completions" - # These are in alpha order so they show up correctly. - echo "##-no -$argtype- completions-##" + # These are in ascii and "dictionary" order so they sort + # correctly. + echo "##-no-completion- -results-##" else echo $completions fi 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 03c284dec..9af42e86a 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 @@ -10,23 +10,23 @@ "spec": ">=1.12.0 <2.0.0", "type": "range" }, - "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk" + "/Users/zkat/Documents/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk" ] ], "_from": "dashdash@>=1.12.0 <2.0.0", - "_id": "dashdash@1.14.0", + "_id": "dashdash@1.14.1", "_inCache": true, - "_installable": true, "_location": "/request/http-signature/sshpk/dashdash", + "_nodeVersion": "4.6.1", "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/dashdash-1.14.0.tgz_1464847169030_0.07120498712174594" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/dashdash-1.14.1.tgz_1479854020349_0.731718891998753" }, "_npmUser": { "name": "trentm", "email": "trentm@gmail.com" }, - "_npmVersion": "1.4.29", + "_npmVersion": "2.15.9", "_phantomChildren": {}, "_requested": { "raw": "dashdash@^1.12.0", @@ -40,11 +40,11 @@ "_requiredBy": [ "/request/http-signature/sshpk" ], - "_resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz", - "_shasum": "29e486c5418bf0f356034a993d51686a33e84141", + "_resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "_shasum": "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0", "_shrinkwrap": null, "_spec": "dashdash@^1.12.0", - "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk", + "_where": "/Users/zkat/Documents/code/npm/node_modules/request/node_modules/http-signature/node_modules/sshpk", "author": { "name": "Trent Mick", "email": "trentm@gmail.com", @@ -85,14 +85,14 @@ }, "directories": {}, "dist": { - "shasum": "29e486c5418bf0f356034a993d51686a33e84141", - "tarball": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz" + "shasum": "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0", + "tarball": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz" }, "engines": { "node": ">=0.10" }, - "gitHead": "2f70d248a509418e4473922ee034faf9cd91b3f8", - "homepage": "https://github.com/trentm/node-dashdash", + "gitHead": "1dd7379640462a21ca6d92502803de830b4acfa2", + "homepage": "https://github.com/trentm/node-dashdash#readme", "keywords": [ "option", "parser", @@ -121,5 +121,5 @@ "scripts": { "test": "nodeunit test/*.test.js" }, - "version": "1.14.0" + "version": "1.14.1" } diff --git a/node_modules/request/node_modules/mime-types/HISTORY.md b/node_modules/request/node_modules/mime-types/HISTORY.md index 8c0383a61..31b24e0f4 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.13 / 2016-11-18 +=================== + + * deps: mime-db@~1.25.0 + - Add new mime types + 2.1.12 / 2016-09-18 =================== 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 d4796b55e..01fa85c28 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,13 @@ +1.25.0 / 2016-11-11 +=================== + + * Add `application/dicom+json` + * Add `application/dicom+xml` + * Add `application/vnd.openstreetmap.data+xml` + * Add `application/vnd.tri.onesource` + * Add `application/yang-data+json` + * Add `application/yang-data+xml` + 1.24.0 / 2016-09-18 =================== 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 63b226f9c..94384d313 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 @@ -244,6 +244,13 @@ "application/dicom": { "source": "iana" }, + "application/dicom+json": { + "source": "iana", + "compressible": true + }, + "application/dicom+xml": { + "source": "iana" + }, "application/dii": { "source": "iana" }, @@ -3206,6 +3213,9 @@ "source": "apache", "extensions": ["oxt"] }, + "application/vnd.openstreetmap.data+xml": { + "source": "iana" + }, "application/vnd.openxmlformats-officedocument.custom-properties+xml": { "source": "iana" }, @@ -3949,6 +3959,9 @@ "source": "iana", "extensions": ["tmo"] }, + "application/vnd.tri.onesource": { + "source": "iana" + }, "application/vnd.trid.tpt": { "source": "iana", "extensions": ["tpt"] @@ -4872,6 +4885,13 @@ "source": "iana", "extensions": ["yang"] }, + "application/yang-data+json": { + "source": "iana", + "compressible": true + }, + "application/yang-data+xml": { + "source": "iana" + }, "application/yin+xml": { "source": "iana", "extensions": ["yin"] 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 658681bec..03b2895e1 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 @@ -2,49 +2,48 @@ "_args": [ [ { - "raw": "mime-db@~1.24.0", + "raw": "mime-db@~1.25.0", "scope": null, "escapedName": "mime-db", "name": "mime-db", - "rawSpec": "~1.24.0", - "spec": ">=1.24.0 <1.25.0", + "rawSpec": "~1.25.0", + "spec": ">=1.25.0 <1.26.0", "type": "range" }, - "/Users/rebecca/code/npm/node_modules/request/node_modules/mime-types" + "/Users/zkat/Documents/code/npm/node_modules/request/node_modules/mime-types" ] ], - "_from": "mime-db@>=1.24.0 <1.25.0", - "_id": "mime-db@1.24.0", + "_from": "mime-db@>=1.25.0 <1.26.0", + "_id": "mime-db@1.25.0", "_inCache": true, "_location": "/request/mime-types/mime-db", - "_nodeVersion": "4.5.0", "_npmOperationalInternal": { - "host": "packages-16-east.internal.npmjs.com", - "tmp": "tmp/mime-db-1.24.0.tgz_1474198792761_0.7161959335207939" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/mime-db-1.25.0.tgz_1478915345127_0.22604371700435877" }, "_npmUser": { "name": "dougwilson", "email": "doug@somethingdoug.com" }, - "_npmVersion": "2.15.9", + "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { - "raw": "mime-db@~1.24.0", + "raw": "mime-db@~1.25.0", "scope": null, "escapedName": "mime-db", "name": "mime-db", - "rawSpec": "~1.24.0", - "spec": ">=1.24.0 <1.25.0", + "rawSpec": "~1.25.0", + "spec": ">=1.25.0 <1.26.0", "type": "range" }, "_requiredBy": [ "/request/mime-types" ], - "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz", - "_shasum": "e2d13f939f0016c6e4e9ad25a8652f126c467f0c", + "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz", + "_shasum": "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392", "_shrinkwrap": null, - "_spec": "mime-db@~1.24.0", - "_where": "/Users/rebecca/code/npm/node_modules/request/node_modules/mime-types", + "_spec": "mime-db@~1.25.0", + "_where": "/Users/zkat/Documents/code/npm/node_modules/request/node_modules/mime-types", "bugs": { "url": "https://github.com/jshttp/mime-db/issues" }, @@ -71,6 +70,10 @@ "co": "4.6.0", "cogent": "1.0.1", "csv-parse": "1.1.7", + "eslint": "3.9.1", + "eslint-config-standard": "6.2.1", + "eslint-plugin-promise": "3.3.0", + "eslint-plugin-standard": "2.0.1", "gnode": "0.1.2", "istanbul": "0.4.5", "mocha": "1.21.5", @@ -79,8 +82,8 @@ }, "directories": {}, "dist": { - "shasum": "e2d13f939f0016c6e4e9ad25a8652f126c467f0c", - "tarball": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz" + "shasum": "c18dbd7c73a5dbf6f44a024dc0d165a1e7b1c392", + "tarball": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz" }, "engines": { "node": ">= 0.6" @@ -92,8 +95,8 @@ "db.json", "index.js" ], - "gitHead": "9dd00b34556a8cdd6f3385f09d4989298c4b86e1", - "homepage": "https://github.com/jshttp/mime-db#readme", + "gitHead": "9a2c710e347b4a7f030aae0d15afc0a06d1c8a37", + "homepage": "https://github.com/jshttp/mime-db", "keywords": [ "mime", "db", @@ -124,10 +127,11 @@ "scripts": { "build": "node scripts/build", "fetch": "gnode scripts/fetch-apache && gnode scripts/fetch-iana && gnode scripts/fetch-nginx", + "lint": "eslint .", "test": "mocha --reporter spec --bail --check-leaks test/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot --check-leaks test/", "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.24.0" + "version": "1.25.0" } diff --git a/node_modules/request/node_modules/mime-types/package.json b/node_modules/request/node_modules/mime-types/package.json index 140951c79..75c788f4e 100644 --- a/node_modules/request/node_modules/mime-types/package.json +++ b/node_modules/request/node_modules/mime-types/package.json @@ -10,23 +10,22 @@ "spec": ">=2.1.7 <2.2.0", "type": "range" }, - "/Users/rebecca/code/npm/node_modules/request" + "/Users/zkat/Documents/code/npm/node_modules/request" ] ], "_from": "mime-types@>=2.1.7 <2.2.0", - "_id": "mime-types@2.1.12", + "_id": "mime-types@2.1.13", "_inCache": true, "_location": "/request/mime-types", - "_nodeVersion": "4.5.0", "_npmOperationalInternal": { "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/mime-types-2.1.12.tgz_1474237415119_0.03028594213537872" + "tmp": "tmp/mime-types-2.1.13.tgz_1479505166253_0.5666956284549087" }, "_npmUser": { "name": "dougwilson", "email": "doug@somethingdoug.com" }, - "_npmVersion": "2.15.9", + "_npmVersion": "1.4.28", "_phantomChildren": {}, "_requested": { "raw": "mime-types@~2.1.7", @@ -41,11 +40,11 @@ "/request", "/request/form-data" ], - "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz", - "_shasum": "152ba256777020dd4663f54c2e7bc26381e71729", + "_resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz", + "_shasum": "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88", "_shrinkwrap": null, "_spec": "mime-types@~2.1.7", - "_where": "/Users/rebecca/code/npm/node_modules/request", + "_where": "/Users/zkat/Documents/code/npm/node_modules/request", "bugs": { "url": "https://github.com/jshttp/mime-types/issues" }, @@ -66,21 +65,21 @@ } ], "dependencies": { - "mime-db": "~1.24.0" + "mime-db": "~1.25.0" }, "description": "The ultimate javascript content-type utility.", "devDependencies": { - "eslint": "3.5.0", - "eslint-config-standard": "6.0.1", - "eslint-plugin-promise": "2.0.1", - "eslint-plugin-standard": "2.0.0", + "eslint": "3.10.2", + "eslint-config-standard": "6.2.1", + "eslint-plugin-promise": "3.4.0", + "eslint-plugin-standard": "2.0.1", "istanbul": "0.4.5", "mocha": "1.21.5" }, "directories": {}, "dist": { - "shasum": "152ba256777020dd4663f54c2e7bc26381e71729", - "tarball": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz" + "shasum": "e07aaa9c6c6b9a7ca3012c69003ad25a39e92a88", + "tarball": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz" }, "engines": { "node": ">= 0.6" @@ -90,8 +89,8 @@ "LICENSE", "index.js" ], - "gitHead": "7193a9094e2efe31da93988350bb0b32ab18b1ea", - "homepage": "https://github.com/jshttp/mime-types#readme", + "gitHead": "83e91a5aea93858bc95ec95a99309592cba0ffe3", + "homepage": "https://github.com/jshttp/mime-types", "keywords": [ "mime", "types" @@ -119,10 +118,10 @@ "url": "git+https://github.com/jshttp/mime-types.git" }, "scripts": { - "lint": "eslint **/*.js", + "lint": "eslint .", "test": "mocha --reporter spec test/test.js", "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.12" + "version": "2.1.13" } diff --git a/node_modules/request/node_modules/node-uuid/.npmignore b/node_modules/request/node_modules/node-uuid/.npmignore deleted file mode 100644 index 888613938..000000000 --- a/node_modules/request/node_modules/node-uuid/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules -.DS_Store -.nyc_output -coverage diff --git a/node_modules/request/node_modules/node-uuid/README.md b/node_modules/request/node_modules/node-uuid/README.md deleted file mode 100644 index 5cd855508..000000000 --- a/node_modules/request/node_modules/node-uuid/README.md +++ /dev/null @@ -1,254 +0,0 @@ -# node-uuid - -Simple, fast generation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDS. - -Features: - -* Generate RFC4122 version 1 or version 4 UUIDs -* Runs in node.js and all browsers. -* Registered as a [ComponentJS](https://github.com/component/component) [component](https://github.com/component/component/wiki/Components) ('broofa/node-uuid'). -* Cryptographically strong random # generation - * `crypto.randomBytes(n)` in node.js - * `window.crypto.getRandomValues(ta)` in [supported browsers](https://developer.mozilla.org/en-US/docs/Web/API/RandomSource/getRandomValues#Browser_Compatibility) -* 1.1K minified and gzip'ed (Want something smaller? Check this [crazy shit](https://gist.github.com/982883) out! ) -* [Annotated source code](http://broofa.github.com/node-uuid/docs/uuid.html) -* Comes with a Command Line Interface for generating uuids on the command line - -## Getting Started - -Install it in your browser: - -```html -<script src="uuid.js"></script> -``` - -Or in node.js: - -``` -npm install node-uuid -``` - -```javascript -var uuid = require('node-uuid'); -``` - -Then create some ids ... - -```javascript -// Generate a v1 (time-based) id -uuid.v1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a' - -// Generate a v4 (random) id -uuid.v4(); // -> '110ec58a-a0f2-4ac4-8393-c866d813b8d1' -``` - -## API - -### uuid.v1([`options` [, `buffer` [, `offset`]]]) - -Generate and return a RFC4122 v1 (timestamp-based) UUID. - -* `options` - (Object) Optional uuid state to apply. Properties may include: - - * `node` - (Array) Node id as Array of 6 bytes (per 4.1.6). Default: Randomly generated ID. See note 1. - * `clockseq` - (Number between 0 - 0x3fff) RFC clock sequence. Default: An internally maintained clockseq is used. - * `msecs` - (Number | Date) Time in milliseconds since unix Epoch. Default: The current time is used. - * `nsecs` - (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if `msecs` is unspecified. Default: internal uuid counter is used, as per 4.2.1.2. - -* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. -* `offset` - (Number) Starting index in `buffer` at which to begin writing. - -Returns `buffer`, if specified, otherwise the string form of the UUID - -Notes: - -1. The randomly generated node id is only guaranteed to stay constant for the lifetime of the current JS runtime. (Future versions of this module may use persistent storage mechanisms to extend this guarantee.) - -Example: Generate string UUID with fully-specified options - -```javascript -uuid.v1({ - node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab], - clockseq: 0x1234, - msecs: new Date('2011-11-01').getTime(), - nsecs: 5678 -}); // -> "710b962e-041c-11e1-9234-0123456789ab" -``` - -Example: In-place generation of two binary IDs - -```javascript -// Generate two ids in an array -var arr = new Array(32); // -> [] -uuid.v1(null, arr, 0); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15] -uuid.v1(null, arr, 16); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 02 a3 1c b0 14 32 11 e1 85 58 0b 48 8e 4f c1 15] - -// Optionally use uuid.unparse() to get stringify the ids -uuid.unparse(buffer); // -> '02a2ce90-1432-11e1-8558-0b488e4fc115' -uuid.unparse(buffer, 16) // -> '02a31cb0-1432-11e1-8558-0b488e4fc115' -``` - -### uuid.v4([`options` [, `buffer` [, `offset`]]]) - -Generate and return a RFC4122 v4 UUID. - -* `options` - (Object) Optional uuid state to apply. Properties may include: - - * `random` - (Number[16]) Array of 16 numbers (0-255) to use in place of randomly generated values - * `rng` - (Function) Random # generator to use. Set to one of the built-in generators - `uuid.mathRNG` (all platforms), `uuid.nodeRNG` (node.js only), `uuid.whatwgRNG` (WebKit only) - or a custom function that returns an array[16] of byte values. - -* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. -* `offset` - (Number) Starting index in `buffer` at which to begin writing. - -Returns `buffer`, if specified, otherwise the string form of the UUID - -Example: Generate string UUID with fully-specified options - -```javascript -uuid.v4({ - random: [ - 0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, - 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36 - ] -}); -// -> "109156be-c4fb-41ea-b1b4-efe1671c5836" -``` - -Example: Generate two IDs in a single buffer - -```javascript -var buffer = new Array(32); // (or 'new Buffer' in node.js) -uuid.v4(null, buffer, 0); -uuid.v4(null, buffer, 16); -``` - -### uuid.parse(id[, buffer[, offset]]) -### uuid.unparse(buffer[, offset]) - -Parse and unparse UUIDs - - * `id` - (String) UUID(-like) string - * `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. Default: A new Array or Buffer is used - * `offset` - (Number) Starting index in `buffer` at which to begin writing. Default: 0 - -Example parsing and unparsing a UUID string - -```javascript -var bytes = uuid.parse('797ff043-11eb-11e1-80d6-510998755d10'); // -> <Buffer 79 7f f0 43 11 eb 11 e1 80 d6 51 09 98 75 5d 10> -var string = uuid.unparse(bytes); // -> '797ff043-11eb-11e1-80d6-510998755d10' -``` - -### uuid.noConflict() - -(Browsers only) Set `uuid` property back to it's previous value. - -Returns the node-uuid object. - -Example: - -```javascript -var myUuid = uuid.noConflict(); -myUuid.v1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a' -``` - -## Deprecated APIs - -Support for the following v1.2 APIs is available in v1.3, but is deprecated and will be removed in the next major version. - -### uuid([format [, buffer [, offset]]]) - -uuid() has become uuid.v4(), and the `format` argument is now implicit in the `buffer` argument. (i.e. if you specify a buffer, the format is assumed to be binary). - -### uuid.BufferClass - -The class of container created when generating binary uuid data if no buffer argument is specified. This is expected to go away, with no replacement API. - -## Command Line Interface - -To use the executable, it's probably best to install this library globally. - -`npm install -g node-uuid` - -Usage: - -``` -USAGE: uuid [version] [options] - - -options: - ---help Display this message and exit -``` - -`version` must be an RFC4122 version that is supported by this library, which is currently version 1 and version 4 (denoted by "v1" and "v4", respectively). `version` defaults to version 4 when not supplied. - -### Examples - -``` -> uuid -3a91f950-dec8-4688-ba14-5b7bbfc7a563 -``` - -``` -> uuid v1 -9d0b43e0-7696-11e3-964b-250efa37a98e -``` - -``` -> uuid v4 -6790ac7c-24ac-4f98-8464-42f6d98a53ae -``` - -## Testing - -In node.js - -``` -npm test -``` - -In Browser - -``` -open test/test.html -``` - -### Benchmarking - -Requires node.js - -``` -npm install uuid uuid-js -node benchmark/benchmark.js -``` - -For a more complete discussion of node-uuid performance, please see the `benchmark/README.md` file, and the [benchmark wiki](https://github.com/broofa/node-uuid/wiki/Benchmark) - -For browser performance [checkout the JSPerf tests](http://jsperf.com/node-uuid-performance). - -## Release notes - -### 1.4.6 - -* Properly detect node crypto and whatwg crypto -* Workaround phantomjs/browserify bug -* Explicit check for `window` rather implicit this-global -* Issue warning if Math.random() is being used -* "use strict"; -* A few jshint / stylistic updates (=== and such) - -### 1.4.0 - -* Improved module context detection -* Removed public RNG functions - -### 1.3.2 - -* Improve tests and handling of v1() options (Issue #24) -* Expose RNG option to allow for perf testing with different generators - -### 1.3.0 - -* Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)! -* Support for node.js crypto API -* De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code diff --git a/node_modules/request/node_modules/node-uuid/benchmark/README.md b/node_modules/request/node_modules/node-uuid/benchmark/README.md deleted file mode 100644 index aaeb2ea01..000000000 --- a/node_modules/request/node_modules/node-uuid/benchmark/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# node-uuid Benchmarks - -### Results - -To see the results of our benchmarks visit https://github.com/broofa/node-uuid/wiki/Benchmark - -### Run them yourself - -node-uuid comes with some benchmarks to measure performance of generating UUIDs. These can be run using node.js. node-uuid is being benchmarked against some other uuid modules, that are available through npm namely `uuid` and `uuid-js`. - -To prepare and run the benchmark issue; - -``` -npm install uuid uuid-js -node benchmark/benchmark.js -``` - -You'll see an output like this one: - -``` -# v4 -nodeuuid.v4(): 854700 uuids/second -nodeuuid.v4('binary'): 788643 uuids/second -nodeuuid.v4('binary', buffer): 1336898 uuids/second -uuid(): 479386 uuids/second -uuid('binary'): 582072 uuids/second -uuidjs.create(4): 312304 uuids/second - -# v1 -nodeuuid.v1(): 938086 uuids/second -nodeuuid.v1('binary'): 683060 uuids/second -nodeuuid.v1('binary', buffer): 1644736 uuids/second -uuidjs.create(1): 190621 uuids/second -``` - -* The `uuid()` entries are for Nikhil Marathe's [uuid module](https://bitbucket.org/nikhilm/uuidjs) which is a wrapper around the native libuuid library. -* The `uuidjs()` entries are for Patrick Negri's [uuid-js module](https://github.com/pnegri/uuid-js) which is a pure javascript implementation based on [UUID.js](https://github.com/LiosK/UUID.js) by LiosK. - -If you want to get more reliable results you can run the benchmark multiple times and write the output into a log file: - -``` -for i in {0..9}; do node benchmark/benchmark.js >> benchmark/bench_0.4.12.log; done; -``` - -If you're interested in how performance varies between different node versions, you can issue the above command multiple times. - -You can then use the shell script `bench.sh` provided in this directory to calculate the averages over all benchmark runs and draw a nice plot: - -``` -(cd benchmark/ && ./bench.sh) -``` - -This assumes you have [gnuplot](http://www.gnuplot.info/) and [ImageMagick](http://www.imagemagick.org/) installed. You'll find a nice `bench.png` graph in the `benchmark/` directory then. diff --git a/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu b/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu deleted file mode 100644 index a342fbbe0..000000000 --- a/node_modules/request/node_modules/node-uuid/benchmark/bench.gnu +++ /dev/null @@ -1,174 +0,0 @@ -#!/opt/local/bin/gnuplot -persist -# -# -# G N U P L O T -# Version 4.4 patchlevel 3 -# last modified March 2011 -# System: Darwin 10.8.0 -# -# Copyright (C) 1986-1993, 1998, 2004, 2007-2010 -# Thomas Williams, Colin Kelley and many others -# -# gnuplot home: http://www.gnuplot.info -# faq, bugs, etc: type "help seeking-assistance" -# immediate help: type "help" -# plot window: hit 'h' -set terminal postscript eps noenhanced defaultplex \ - leveldefault color colortext \ - solid linewidth 1.2 butt noclip \ - palfuncparam 2000,0.003 \ - "Helvetica" 14 -set output 'bench.eps' -unset clip points -set clip one -unset clip two -set bar 1.000000 front -set border 31 front linetype -1 linewidth 1.000 -set xdata -set ydata -set zdata -set x2data -set y2data -set timefmt x "%d/%m/%y,%H:%M" -set timefmt y "%d/%m/%y,%H:%M" -set timefmt z "%d/%m/%y,%H:%M" -set timefmt x2 "%d/%m/%y,%H:%M" -set timefmt y2 "%d/%m/%y,%H:%M" -set timefmt cb "%d/%m/%y,%H:%M" -set boxwidth -set style fill empty border -set style rectangle back fc lt -3 fillstyle solid 1.00 border lt -1 -set style circle radius graph 0.02, first 0, 0 -set dummy x,y -set format x "% g" -set format y "% g" -set format x2 "% g" -set format y2 "% g" -set format z "% g" -set format cb "% g" -set angles radians -unset grid -set key title "" -set key outside left top horizontal Right noreverse enhanced autotitles columnhead nobox -set key noinvert samplen 4 spacing 1 width 0 height 0 -set key maxcolumns 2 maxrows 0 -unset label -unset arrow -set style increment default -unset style line -set style line 1 linetype 1 linewidth 2.000 pointtype 1 pointsize default pointinterval 0 -unset style arrow -set style histogram clustered gap 2 title offset character 0, 0, 0 -unset logscale -set offsets graph 0.05, 0.15, 0, 0 -set pointsize 1.5 -set pointintervalbox 1 -set encoding default -unset polar -unset parametric -unset decimalsign -set view 60, 30, 1, 1 -set samples 100, 100 -set isosamples 10, 10 -set surface -unset contour -set clabel '%8.3g' -set mapping cartesian -set datafile separator whitespace -unset hidden3d -set cntrparam order 4 -set cntrparam linear -set cntrparam levels auto 5 -set cntrparam points 5 -set size ratio 0 1,1 -set origin 0,0 -set style data points -set style function lines -set xzeroaxis linetype -2 linewidth 1.000 -set yzeroaxis linetype -2 linewidth 1.000 -set zzeroaxis linetype -2 linewidth 1.000 -set x2zeroaxis linetype -2 linewidth 1.000 -set y2zeroaxis linetype -2 linewidth 1.000 -set ticslevel 0.5 -set mxtics default -set mytics default -set mztics default -set mx2tics default -set my2tics default -set mcbtics default -set xtics border in scale 1,0.5 mirror norotate offset character 0, 0, 0 -set xtics norangelimit -set xtics () -set ytics border in scale 1,0.5 mirror norotate offset character 0, 0, 0 -set ytics autofreq norangelimit -set ztics border in scale 1,0.5 nomirror norotate offset character 0, 0, 0 -set ztics autofreq norangelimit -set nox2tics -set noy2tics -set cbtics border in scale 1,0.5 mirror norotate offset character 0, 0, 0 -set cbtics autofreq norangelimit -set title "" -set title offset character 0, 0, 0 font "" norotate -set timestamp bottom -set timestamp "" -set timestamp offset character 0, 0, 0 font "" norotate -set rrange [ * : * ] noreverse nowriteback # (currently [8.98847e+307:-8.98847e+307] ) -set autoscale rfixmin -set autoscale rfixmax -set trange [ * : * ] noreverse nowriteback # (currently [-5.00000:5.00000] ) -set autoscale tfixmin -set autoscale tfixmax -set urange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set autoscale ufixmin -set autoscale ufixmax -set vrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set autoscale vfixmin -set autoscale vfixmax -set xlabel "" -set xlabel offset character 0, 0, 0 font "" textcolor lt -1 norotate -set x2label "" -set x2label offset character 0, 0, 0 font "" textcolor lt -1 norotate -set xrange [ * : * ] noreverse nowriteback # (currently [-0.150000:3.15000] ) -set autoscale xfixmin -set autoscale xfixmax -set x2range [ * : * ] noreverse nowriteback # (currently [0.00000:3.00000] ) -set autoscale x2fixmin -set autoscale x2fixmax -set ylabel "" -set ylabel offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270 -set y2label "" -set y2label offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270 -set yrange [ 0.00000 : 1.90000e+06 ] noreverse nowriteback # (currently [:] ) -set autoscale yfixmin -set autoscale yfixmax -set y2range [ * : * ] noreverse nowriteback # (currently [0.00000:1.90000e+06] ) -set autoscale y2fixmin -set autoscale y2fixmax -set zlabel "" -set zlabel offset character 0, 0, 0 font "" textcolor lt -1 norotate -set zrange [ * : * ] noreverse nowriteback # (currently [-10.0000:10.0000] ) -set autoscale zfixmin -set autoscale zfixmax -set cblabel "" -set cblabel offset character 0, 0, 0 font "" textcolor lt -1 rotate by -270 -set cbrange [ * : * ] noreverse nowriteback # (currently [8.98847e+307:-8.98847e+307] ) -set autoscale cbfixmin -set autoscale cbfixmax -set zero 1e-08 -set lmargin -1 -set bmargin -1 -set rmargin -1 -set tmargin -1 -set pm3d explicit at s -set pm3d scansautomatic -set pm3d interpolate 1,1 flush begin noftriangles nohidden3d corners2color mean -set palette positive nops_allcF maxcolors 0 gamma 1.5 color model RGB -set palette rgbformulae 7, 5, 15 -set colorbox default -set colorbox vertical origin screen 0.9, 0.2, 0 size screen 0.05, 0.6, 0 front bdefault -set loadpath -set fontpath -set fit noerrorvariables -GNUTERM = "aqua" -plot 'bench_results.txt' using 2:xticlabel(1) w lp lw 2, '' using 3:xticlabel(1) w lp lw 2, '' using 4:xticlabel(1) w lp lw 2, '' using 5:xticlabel(1) w lp lw 2, '' using 6:xticlabel(1) w lp lw 2, '' using 7:xticlabel(1) w lp lw 2, '' using 8:xticlabel(1) w lp lw 2, '' using 9:xticlabel(1) w lp lw 2 -# EOF diff --git a/node_modules/request/node_modules/node-uuid/benchmark/bench.sh b/node_modules/request/node_modules/node-uuid/benchmark/bench.sh deleted file mode 100755 index d870a0cb0..000000000 --- a/node_modules/request/node_modules/node-uuid/benchmark/bench.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# for a given node version run: -# for i in {0..9}; do node benchmark.js >> bench_0.6.2.log; done; - -PATTERNS=('nodeuuid.v1()' "nodeuuid.v1('binary'," 'nodeuuid.v4()' "nodeuuid.v4('binary'," "uuid()" "uuid('binary')" 'uuidjs.create(1)' 'uuidjs.create(4)' '140byte') -FILES=(node_uuid_v1_string node_uuid_v1_buf node_uuid_v4_string node_uuid_v4_buf libuuid_v4_string libuuid_v4_binary uuidjs_v1_string uuidjs_v4_string 140byte_es) -INDICES=(2 3 2 3 2 2 2 2 2) -VERSIONS=$( ls bench_*.log | sed -e 's/^bench_\([0-9\.]*\)\.log/\1/' | tr "\\n" " " ) -TMPJOIN="tmp_join" -OUTPUT="bench_results.txt" - -for I in ${!FILES[*]}; do - F=${FILES[$I]} - P=${PATTERNS[$I]} - INDEX=${INDICES[$I]} - echo "version $F" > $F - for V in $VERSIONS; do - (VAL=$( grep "$P" bench_$V.log | LC_ALL=en_US awk '{ sum += $'$INDEX' } END { print sum/NR }' ); echo $V $VAL) >> $F - done - if [ $I == 0 ]; then - cat $F > $TMPJOIN - else - join $TMPJOIN $F > $OUTPUT - cp $OUTPUT $TMPJOIN - fi - rm $F -done - -rm $TMPJOIN - -gnuplot bench.gnu -convert -density 200 -resize 800x560 -flatten bench.eps bench.png -rm bench.eps diff --git a/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c b/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c deleted file mode 100644 index dbfc75f6d..000000000 --- a/node_modules/request/node_modules/node-uuid/benchmark/benchmark-native.c +++ /dev/null @@ -1,34 +0,0 @@ -/* -Test performance of native C UUID generation - -To Compile: cc -luuid benchmark-native.c -o benchmark-native -*/ - -#include <stdio.h> -#include <unistd.h> -#include <sys/time.h> -#include <uuid/uuid.h> - -int main() { - uuid_t myid; - char buf[36+1]; - int i; - struct timeval t; - double start, finish; - - gettimeofday(&t, NULL); - start = t.tv_sec + t.tv_usec/1e6; - - int n = 2e5; - for (i = 0; i < n; i++) { - uuid_generate(myid); - uuid_unparse(myid, buf); - } - - gettimeofday(&t, NULL); - finish = t.tv_sec + t.tv_usec/1e6; - double dur = finish - start; - - printf("%d uuids/sec", (int)(n/dur)); - return 0; -} diff --git a/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js b/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js deleted file mode 100644 index 40e6efbe7..000000000 --- a/node_modules/request/node_modules/node-uuid/benchmark/benchmark.js +++ /dev/null @@ -1,84 +0,0 @@ -try { - var nodeuuid = require('../uuid'); -} catch (e) { - console.error('node-uuid require failed - skipping tests'); -} - -try { - var uuid = require('uuid'); -} catch (e) { - console.error('uuid require failed - skipping tests'); -} - -try { - var uuidjs = require('uuid-js'); -} catch (e) { - console.error('uuid-js require failed - skipping tests'); -} - -var N = 5e5; - -function rate(msg, t) { - console.log(msg + ': ' + - (N / (Date.now() - t) * 1e3 | 0) + - ' uuids/second'); -} - -console.log('# v4'); - -// node-uuid - string form -if (nodeuuid) { - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v4(); - rate('nodeuuid.v4() - using node.js crypto RNG', t); - - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v4({rng: nodeuuid.mathRNG}); - rate('nodeuuid.v4() - using Math.random() RNG', t); - - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v4('binary'); - rate('nodeuuid.v4(\'binary\')', t); - - var buffer = new nodeuuid.BufferClass(16); - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v4('binary', buffer); - rate('nodeuuid.v4(\'binary\', buffer)', t); -} - -// libuuid - string form -if (uuid) { - for (var i = 0, t = Date.now(); i < N; i++) uuid(); - rate('uuid()', t); - - for (var i = 0, t = Date.now(); i < N; i++) uuid('binary'); - rate('uuid(\'binary\')', t); -} - -// uuid-js - string form -if (uuidjs) { - for (var i = 0, t = Date.now(); i < N; i++) uuidjs.create(4); - rate('uuidjs.create(4)', t); -} - -// 140byte.es -for (var i = 0, t = Date.now(); i < N; i++) 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,function(s,r){r=Math.random()*16|0;return (s=='x'?r:r&0x3|0x8).toString(16)}); -rate('140byte.es_v4', t); - -console.log(''); -console.log('# v1'); - -// node-uuid - v1 string form -if (nodeuuid) { - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v1(); - rate('nodeuuid.v1()', t); - - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v1('binary'); - rate('nodeuuid.v1(\'binary\')', t); - - var buffer = new nodeuuid.BufferClass(16); - for (var i = 0, t = Date.now(); i < N; i++) nodeuuid.v1('binary', buffer); - rate('nodeuuid.v1(\'binary\', buffer)', t); -} - -// uuid-js - v1 string form -if (uuidjs) { - for (var i = 0, t = Date.now(); i < N; i++) uuidjs.create(1); - rate('uuidjs.create(1)', t); -} diff --git a/node_modules/request/node_modules/node-uuid/bower.json b/node_modules/request/node_modules/node-uuid/bower.json deleted file mode 100644 index c0925e190..000000000 --- a/node_modules/request/node_modules/node-uuid/bower.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "node-uuid", - "version": "1.4.7", - "homepage": "https://github.com/broofa/node-uuid", - "authors": [ - "Robert Kieffer <robert@broofa.com>" - ], - "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.", - "main": "uuid.js", - "keywords": [ - "uuid", - "gid", - "rfc4122" - ], - "license": "MIT", - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ] -} diff --git a/node_modules/request/node_modules/node-uuid/component.json b/node_modules/request/node_modules/node-uuid/component.json deleted file mode 100644 index 3ff463366..000000000 --- a/node_modules/request/node_modules/node-uuid/component.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "node-uuid", - "repo": "broofa/node-uuid", - "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.", - "version": "1.4.7", - "author": "Robert Kieffer <robert@broofa.com>", - "contributors": [ - { - "name": "Christoph Tavan <dev@tavan.de>", - "github": "https://github.com/ctavan" - } - ], - "keywords": [ - "uuid", - "guid", - "rfc4122" - ], - "dependencies": {}, - "development": {}, - "main": "uuid.js", - "scripts": [ - "uuid.js" - ], - "license": "MIT" -}
\ No newline at end of file diff --git a/node_modules/request/node_modules/node-uuid/package.json b/node_modules/request/node_modules/node-uuid/package.json deleted file mode 100644 index a3a391590..000000000 --- a/node_modules/request/node_modules/node-uuid/package.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "_args": [ - [ - { - "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", - "_id": "node-uuid@1.4.7", - "_inCache": true, - "_installable": true, - "_location": "/request/node-uuid", - "_nodeVersion": "5.0.0", - "_npmUser": { - "name": "coolaj86", - "email": "coolaj86@gmail.com" - }, - "_npmVersion": "3.3.6", - "_phantomChildren": {}, - "_requested": { - "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" - }, - "_requiredBy": [ - "/request" - ], - "_resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz", - "_shasum": "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f", - "_shrinkwrap": null, - "_spec": "node-uuid@~1.4.7", - "_where": "/Users/rebecca/code/npm/node_modules/request", - "author": { - "name": "Robert Kieffer", - "email": "robert@broofa.com" - }, - "bin": { - "uuid": "./bin/uuid" - }, - "bugs": { - "url": "https://github.com/broofa/node-uuid/issues" - }, - "contributors": [ - { - "name": "AJ ONeal", - "email": "coolaj86@gmail.com" - }, - { - "name": "Christoph Tavan", - "email": "dev@tavan.de" - } - ], - "dependencies": {}, - "description": "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.", - "devDependencies": { - "nyc": "^2.2.0" - }, - "directories": {}, - "dist": { - "shasum": "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f", - "tarball": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz" - }, - "gitHead": "309512573ec1c60143c257157479a20f7f1f51cd", - "homepage": "https://github.com/broofa/node-uuid", - "installable": true, - "keywords": [ - "guid", - "rfc4122", - "uuid" - ], - "lib": ".", - "licenses": [ - { - "type": "MIT", - "url": "https://raw.github.com/broofa/node-uuid/master/LICENSE.md" - } - ], - "main": "./uuid.js", - "maintainers": [ - { - "name": "broofa", - "email": "robert@broofa.com" - }, - { - "name": "coolaj86", - "email": "coolaj86@gmail.com" - } - ], - "name": "node-uuid", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git+https://github.com/broofa/node-uuid.git" - }, - "scripts": { - "coverage": "nyc npm test && nyc report", - "test": "node test/test.js" - }, - "url": "http://github.com/broofa/node-uuid", - "version": "1.4.7" -} diff --git a/node_modules/request/node_modules/node-uuid/test/compare_v1.js b/node_modules/request/node_modules/node-uuid/test/compare_v1.js deleted file mode 100644 index 05af82215..000000000 --- a/node_modules/request/node_modules/node-uuid/test/compare_v1.js +++ /dev/null @@ -1,63 +0,0 @@ -var assert = require('assert'), - nodeuuid = require('../uuid'), - uuidjs = require('uuid-js'), - libuuid = require('uuid').generate, - util = require('util'), - exec = require('child_process').exec, - os = require('os'); - -// On Mac Os X / macports there's only the ossp-uuid package that provides uuid -// On Linux there's uuid-runtime which provides uuidgen -var uuidCmd = os.type() === 'Darwin' ? 'uuid -1' : 'uuidgen -t'; - -function compare(ids) { - console.log(ids); - for (var i = 0; i < ids.length; i++) { - var id = ids[i].split('-'); - id = [id[2], id[1], id[0]].join(''); - ids[i] = id; - } - var sorted = ([].concat(ids)).sort(); - - if (sorted.toString() !== ids.toString()) { - console.log('Warning: sorted !== ids'); - } else { - console.log('everything in order!'); - } -} - -// Test time order of v1 uuids -var ids = []; -while (ids.length < 10e3) ids.push(nodeuuid.v1()); - -var max = 10; -console.log('node-uuid:'); -ids = []; -for (var i = 0; i < max; i++) ids.push(nodeuuid.v1()); -compare(ids); - -console.log(''); -console.log('uuidjs:'); -ids = []; -for (var i = 0; i < max; i++) ids.push(uuidjs.create(1).toString()); -compare(ids); - -console.log(''); -console.log('libuuid:'); -ids = []; -var count = 0; -var last = function() { - compare(ids); -} -var cb = function(err, stdout, stderr) { - ids.push(stdout.substring(0, stdout.length-1)); - count++; - if (count < max) { - return next(); - } - last(); -}; -var next = function() { - exec(uuidCmd, cb); -}; -next(); diff --git a/node_modules/request/node_modules/node-uuid/test/test.html b/node_modules/request/node_modules/node-uuid/test/test.html deleted file mode 100644 index d80326ec5..000000000 --- a/node_modules/request/node_modules/node-uuid/test/test.html +++ /dev/null @@ -1,17 +0,0 @@ -<html> - <head> - <style> - div { - font-family: monospace; - font-size: 8pt; - } - div.log {color: #444;} - div.warn {color: #550;} - div.error {color: #800; font-weight: bold;} - </style> - <script src="../uuid.js"></script> - </head> - <body> - <script src="./test.js"></script> - </body> -</html> diff --git a/node_modules/request/node_modules/node-uuid/test/test.js b/node_modules/request/node_modules/node-uuid/test/test.js deleted file mode 100644 index 5f1113d85..000000000 --- a/node_modules/request/node_modules/node-uuid/test/test.js +++ /dev/null @@ -1,231 +0,0 @@ -if (!this.uuid) { - // node.js - uuid = require('../uuid'); - if (!/_rb/.test(uuid._rng.toString())) { - throw new Error("should use crypto for node.js"); - } -} - -// -// x-platform log/assert shims -// - -function _log(msg, type) { - type = type || 'log'; - - if (typeof(document) != 'undefined') { - document.write('<div class="' + type + '">' + msg.replace(/\n/g, '<br />') + '</div>'); - } - if (typeof(console) != 'undefined') { - var color = { - log: '\033[39m', - warn: '\033[33m', - error: '\033[31m' - }; - console[type](color[type] + msg + color.log); - } -} - -function log(msg) {_log(msg, 'log');} -function warn(msg) {_log(msg, 'warn');} -function error(msg) {_log(msg, 'error');} - -function assert(res, msg) { - if (!res) { - error('FAIL: ' + msg); - } else { - log('Pass: ' + msg); - } -} - -// -// Unit tests -// - -// Verify ordering of v1 ids created with explicit times -var TIME = 1321644961388; // 2011-11-18 11:36:01.388-08:00 - -function compare(name, ids) { - ids = ids.map(function(id) { - return id.split('-').reverse().join('-'); - }).sort(); - var sorted = ([].concat(ids)).sort(); - - assert(sorted.toString() == ids.toString(), name + ' have expected order'); -} - -// Verify ordering of v1 ids created using default behavior -compare('uuids with current time', [ - uuid.v1(), - uuid.v1(), - uuid.v1(), - uuid.v1(), - uuid.v1() -]); - -// Verify ordering of v1 ids created with explicit times -compare('uuids with time option', [ - uuid.v1({msecs: TIME - 10*3600*1000}), - uuid.v1({msecs: TIME - 1}), - uuid.v1({msecs: TIME}), - uuid.v1({msecs: TIME + 1}), - uuid.v1({msecs: TIME + 28*24*3600*1000}) -]); - -assert( - uuid.v1({msecs: TIME}) != uuid.v1({msecs: TIME}), - 'IDs created at same msec are different' -); - -// Verify throw if too many ids created -var thrown = false; -try { - uuid.v1({msecs: TIME, nsecs: 10000}); -} catch (e) { - thrown = true; -} -assert(thrown, 'Exception thrown when > 10K ids created in 1 ms'); - -// Verify clock regression bumps clockseq -var uidt = uuid.v1({msecs: TIME}); -var uidtb = uuid.v1({msecs: TIME - 1}); -assert( - parseInt(uidtb.split('-')[3], 16) - parseInt(uidt.split('-')[3], 16) === 1, - 'Clock regression by msec increments the clockseq' -); - -// Verify clock regression bumps clockseq -var uidtn = uuid.v1({msecs: TIME, nsecs: 10}); -var uidtnb = uuid.v1({msecs: TIME, nsecs: 9}); -assert( - parseInt(uidtnb.split('-')[3], 16) - parseInt(uidtn.split('-')[3], 16) === 1, - 'Clock regression by nsec increments the clockseq' -); - -// Verify explicit options produce expected id -var id = uuid.v1({ - msecs: 1321651533573, - nsecs: 5432, - clockseq: 0x385c, - node: [ 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10 ] -}); -assert(id == 'd9428888-122b-11e1-b85c-61cd3cbb3210', 'Explicit options produce expected id'); - -// Verify adjacent ids across a msec boundary are 1 time unit apart -var u0 = uuid.v1({msecs: TIME, nsecs: 9999}); -var u1 = uuid.v1({msecs: TIME + 1, nsecs: 0}); - -var before = u0.split('-')[0], after = u1.split('-')[0]; -var dt = parseInt(after, 16) - parseInt(before, 16); -assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart'); - -// -// Test parse/unparse -// - -id = '00112233445566778899aabbccddeeff'; -assert(uuid.unparse(uuid.parse(id.substr(0,10))) == - '00112233-4400-0000-0000-000000000000', 'Short parse'); -assert(uuid.unparse(uuid.parse('(this is the uuid -> ' + id + id)) == - '00112233-4455-6677-8899-aabbccddeeff', 'Dirty parse'); - -// -// Perf tests -// - -var generators = { - v1: uuid.v1, - v4: uuid.v4 -}; - -var UUID_FORMAT = { - v1: /[0-9a-f]{8}-[0-9a-f]{4}-1[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i, - v4: /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i -}; - -var N = 1e4; - -// Get %'age an actual value differs from the ideal value -function divergence(actual, ideal) { - return Math.round(100*100*(actual - ideal)/ideal)/100; -} - -function rate(msg, t) { - log(msg + ': ' + (N / (Date.now() - t) * 1e3 | 0) + ' uuids\/second'); -} - -for (var version in generators) { - var counts = {}, max = 0; - var generator = generators[version]; - var format = UUID_FORMAT[version]; - - log('\nSanity check ' + N + ' ' + version + ' uuids'); - for (var i = 0, ok = 0; i < N; i++) { - id = generator(); - if (!format.test(id)) { - throw Error(id + ' is not a valid UUID string'); - } - - if (id != uuid.unparse(uuid.parse(id))) { - assert(fail, id + ' is not a valid id'); - } - - // Count digits for our randomness check - if (version == 'v4') { - var digits = id.replace(/-/g, '').split(''); - for (var j = digits.length-1; j >= 0; j--) { - var c = digits[j]; - max = Math.max(max, counts[c] = (counts[c] || 0) + 1); - } - } - } - - // Check randomness for v4 UUIDs - if (version == 'v4') { - // Limit that we get worried about randomness. (Purely empirical choice, this!) - var limit = 2*100*Math.sqrt(1/N); - - log('\nChecking v4 randomness. Distribution of Hex Digits (% deviation from ideal)'); - - for (var i = 0; i < 16; i++) { - var c = i.toString(16); - var bar = '', n = counts[c], p = Math.round(n/max*100|0); - - // 1-3,5-8, and D-F: 1:16 odds over 30 digits - var ideal = N*30/16; - if (i == 4) { - // 4: 1:1 odds on 1 digit, plus 1:16 odds on 30 digits - ideal = N*(1 + 30/16); - } else if (i >= 8 && i <= 11) { - // 8-B: 1:4 odds on 1 digit, plus 1:16 odds on 30 digits - ideal = N*(1/4 + 30/16); - } else { - // Otherwise: 1:16 odds on 30 digits - ideal = N*30/16; - } - var d = divergence(n, ideal); - - // Draw bar using UTF squares (just for grins) - var s = n/max*50 | 0; - while (s--) bar += '='; - - assert(Math.abs(d) < limit, c + ' |' + bar + '| ' + counts[c] + ' (' + d + '% < ' + limit + '%)'); - } - } -} - -// Perf tests -for (var version in generators) { - log('\nPerformance testing ' + version + ' UUIDs'); - var generator = generators[version]; - var buf = new uuid.BufferClass(16); - - for (var i = 0, t = Date.now(); i < N; i++) generator(); - rate('uuid.' + version + '()', t); - - for (var i = 0, t = Date.now(); i < N; i++) generator('binary'); - rate('uuid.' + version + '(\'binary\')', t); - - for (var i = 0, t = Date.now(); i < N; i++) generator('binary', buf); - rate('uuid.' + version + '(\'binary\', buffer)', t); -} diff --git a/node_modules/request/node_modules/node-uuid/uuid.js b/node_modules/request/node_modules/node-uuid/uuid.js deleted file mode 100644 index 89c5b8fb6..000000000 --- a/node_modules/request/node_modules/node-uuid/uuid.js +++ /dev/null @@ -1,272 +0,0 @@ -// uuid.js -// -// Copyright (c) 2010-2012 Robert Kieffer -// MIT License - http://opensource.org/licenses/mit-license.php - -/*global window, require, define */ -(function(_window) { - 'use strict'; - - // Unique ID creation requires a high quality random # generator. We feature - // detect to determine the best RNG source, normalizing to a function that - // returns 128-bits of randomness, since that's what's usually required - var _rng, _mathRNG, _nodeRNG, _whatwgRNG, _previousRoot; - - function setupBrowser() { - // Allow for MSIE11 msCrypto - var _crypto = _window.crypto || _window.msCrypto; - - if (!_rng && _crypto && _crypto.getRandomValues) { - // WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto - // - // Moderately fast, high quality - try { - var _rnds8 = new Uint8Array(16); - _whatwgRNG = _rng = function whatwgRNG() { - _crypto.getRandomValues(_rnds8); - return _rnds8; - }; - _rng(); - } catch(e) {} - } - - if (!_rng) { - // Math.random()-based (RNG) - // - // If all else fails, use Math.random(). It's fast, but is of unspecified - // quality. - var _rnds = new Array(16); - _mathRNG = _rng = function() { - for (var i = 0, r; i < 16; i++) { - if ((i & 0x03) === 0) { r = Math.random() * 0x100000000; } - _rnds[i] = r >>> ((i & 0x03) << 3) & 0xff; - } - - return _rnds; - }; - if ('undefined' !== typeof console && console.warn) { - console.warn("[SECURITY] node-uuid: crypto not usable, falling back to insecure Math.random()"); - } - } - } - - function setupNode() { - // Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html - // - // Moderately fast, high quality - if ('function' === typeof require) { - try { - var _rb = require('crypto').randomBytes; - _nodeRNG = _rng = _rb && function() {return _rb(16);}; - _rng(); - } catch(e) {} - } - } - - if (_window) { - setupBrowser(); - } else { - setupNode(); - } - - // Buffer class to use - var BufferClass = ('function' === typeof Buffer) ? Buffer : Array; - - // Maps for number <-> hex string conversion - var _byteToHex = []; - var _hexToByte = {}; - for (var i = 0; i < 256; i++) { - _byteToHex[i] = (i + 0x100).toString(16).substr(1); - _hexToByte[_byteToHex[i]] = i; - } - - // **`parse()` - Parse a UUID into it's component bytes** - function parse(s, buf, offset) { - var i = (buf && offset) || 0, ii = 0; - - buf = buf || []; - s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) { - if (ii < 16) { // Don't overflow! - buf[i + ii++] = _hexToByte[oct]; - } - }); - - // Zero out remaining bytes if string was short - while (ii < 16) { - buf[i + ii++] = 0; - } - - return buf; - } - - // **`unparse()` - Convert UUID byte array (ala parse()) into a string** - function unparse(buf, offset) { - var i = offset || 0, bth = _byteToHex; - return bth[buf[i++]] + bth[buf[i++]] + - bth[buf[i++]] + bth[buf[i++]] + '-' + - bth[buf[i++]] + bth[buf[i++]] + '-' + - bth[buf[i++]] + bth[buf[i++]] + '-' + - bth[buf[i++]] + bth[buf[i++]] + '-' + - bth[buf[i++]] + bth[buf[i++]] + - bth[buf[i++]] + bth[buf[i++]] + - bth[buf[i++]] + bth[buf[i++]]; - } - - // **`v1()` - Generate time-based UUID** - // - // Inspired by https://github.com/LiosK/UUID.js - // and http://docs.python.org/library/uuid.html - - // random #'s we need to init node and clockseq - var _seedBytes = _rng(); - - // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1) - var _nodeId = [ - _seedBytes[0] | 0x01, - _seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5] - ]; - - // Per 4.2.2, randomize (14 bit) clockseq - var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff; - - // Previous uuid creation time - var _lastMSecs = 0, _lastNSecs = 0; - - // See https://github.com/broofa/node-uuid for API details - function v1(options, buf, offset) { - var i = buf && offset || 0; - var b = buf || []; - - options = options || {}; - - var clockseq = (options.clockseq != null) ? options.clockseq : _clockseq; - - // UUID timestamps are 100 nano-second units since the Gregorian epoch, - // (1582-10-15 00:00). JSNumbers aren't precise enough for this, so - // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs' - // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00. - var msecs = (options.msecs != null) ? options.msecs : new Date().getTime(); - - // Per 4.2.1.2, use count of uuid's generated during the current clock - // cycle to simulate higher resolution clock - var nsecs = (options.nsecs != null) ? options.nsecs : _lastNSecs + 1; - - // Time since last uuid creation (in msecs) - var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000; - - // Per 4.2.1.2, Bump clockseq on clock regression - if (dt < 0 && options.clockseq == null) { - clockseq = clockseq + 1 & 0x3fff; - } - - // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new - // time interval - if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) { - nsecs = 0; - } - - // Per 4.2.1.2 Throw error if too many uuids are requested - if (nsecs >= 10000) { - throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec'); - } - - _lastMSecs = msecs; - _lastNSecs = nsecs; - _clockseq = clockseq; - - // Per 4.1.4 - Convert from unix epoch to Gregorian epoch - msecs += 12219292800000; - - // `time_low` - var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000; - b[i++] = tl >>> 24 & 0xff; - b[i++] = tl >>> 16 & 0xff; - b[i++] = tl >>> 8 & 0xff; - b[i++] = tl & 0xff; - - // `time_mid` - var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff; - b[i++] = tmh >>> 8 & 0xff; - b[i++] = tmh & 0xff; - - // `time_high_and_version` - b[i++] = tmh >>> 24 & 0xf | 0x10; // include version - b[i++] = tmh >>> 16 & 0xff; - - // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant) - b[i++] = clockseq >>> 8 | 0x80; - - // `clock_seq_low` - b[i++] = clockseq & 0xff; - - // `node` - var node = options.node || _nodeId; - for (var n = 0; n < 6; n++) { - b[i + n] = node[n]; - } - - return buf ? buf : unparse(b); - } - - // **`v4()` - Generate random UUID** - - // See https://github.com/broofa/node-uuid for API details - function v4(options, buf, offset) { - // Deprecated - 'format' argument, as supported in v1.2 - var i = buf && offset || 0; - - if (typeof(options) === 'string') { - buf = (options === 'binary') ? new BufferClass(16) : null; - options = null; - } - options = options || {}; - - var rnds = options.random || (options.rng || _rng)(); - - // Per 4.4, set bits for version and `clock_seq_hi_and_reserved` - rnds[6] = (rnds[6] & 0x0f) | 0x40; - rnds[8] = (rnds[8] & 0x3f) | 0x80; - - // Copy bytes to buffer, if provided - if (buf) { - for (var ii = 0; ii < 16; ii++) { - buf[i + ii] = rnds[ii]; - } - } - - return buf || unparse(rnds); - } - - // Export public API - var uuid = v4; - uuid.v1 = v1; - uuid.v4 = v4; - uuid.parse = parse; - uuid.unparse = unparse; - uuid.BufferClass = BufferClass; - uuid._rng = _rng; - uuid._mathRNG = _mathRNG; - uuid._nodeRNG = _nodeRNG; - uuid._whatwgRNG = _whatwgRNG; - - if (('undefined' !== typeof module) && module.exports) { - // Publish as node.js module - module.exports = uuid; - } else if (typeof define === 'function' && define.amd) { - // Publish as AMD module - define(function() {return uuid;}); - - - } else { - // Publish as global (in browsers) - _previousRoot = _window.uuid; - - // **`noConflict()` - (browser only) to reset global 'uuid' var** - uuid.noConflict = function() { - _window.uuid = _previousRoot; - return uuid; - }; - - _window.uuid = uuid; - } -})('undefined' !== typeof window ? window : null); diff --git a/node_modules/request/node_modules/uuid/.npmignore b/node_modules/request/node_modules/uuid/.npmignore new file mode 100644 index 000000000..67b88724d --- /dev/null +++ b/node_modules/request/node_modules/uuid/.npmignore @@ -0,0 +1,8 @@ +node_modules +.DS_Store + +# VIM temp files +*.sw* + +# Mac desktop services store +.DS_Store diff --git a/node_modules/request/node_modules/uuid/.travis.yml b/node_modules/request/node_modules/uuid/.travis.yml new file mode 100644 index 000000000..8a2c585ee --- /dev/null +++ b/node_modules/request/node_modules/uuid/.travis.yml @@ -0,0 +1,5 @@ +language: node_js +node_js: + - "0.12" + - "4" + - "6" diff --git a/node_modules/request/node_modules/uuid/AUTHORS b/node_modules/request/node_modules/uuid/AUTHORS new file mode 100644 index 000000000..5a1052306 --- /dev/null +++ b/node_modules/request/node_modules/uuid/AUTHORS @@ -0,0 +1,5 @@ +Robert Kieffer <robert@broofa.com> +Christoph Tavan <dev@tavan.de> +AJ ONeal <coolaj86@gmail.com> +Vincent Voyer <vincent@zeroload.net> +Roman Shtylman <shtylman@gmail.com> diff --git a/node_modules/request/node_modules/uuid/HISTORY.md b/node_modules/request/node_modules/uuid/HISTORY.md new file mode 100644 index 000000000..c6050ec8b --- /dev/null +++ b/node_modules/request/node_modules/uuid/HISTORY.md @@ -0,0 +1,28 @@ +# 3.0.1 (2016-11-28) + + * split uuid versions into separate files + +# 3.0.0 (2016-11-17) + + * remove .parse and .unparse + +# 2.0.0 + + * Removed uuid.BufferClass + +# 1.4.0 + + * Improved module context detection + * Removed public RNG functions + +# 1.3.2 + + * Improve tests and handling of v1() options (Issue #24) + * Expose RNG option to allow for perf testing with different generators + +# 1.3.0 + + * Support for version 1 ids, thanks to [@ctavan](https://github.com/ctavan)! + * Support for node.js crypto API + * De-emphasizing performance in favor of a) cryptographic quality PRNGs where available and b) more manageable code + diff --git a/node_modules/request/node_modules/node-uuid/LICENSE.md b/node_modules/request/node_modules/uuid/LICENSE.md index 652609b37..8c84e3986 100644 --- a/node_modules/request/node_modules/node-uuid/LICENSE.md +++ b/node_modules/request/node_modules/uuid/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2010-2012 Robert Kieffer +Copyright (c) 2010-2016 Robert Kieffer and other contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/node_modules/request/node_modules/uuid/README.md b/node_modules/request/node_modules/uuid/README.md new file mode 100644 index 000000000..82a79eb33 --- /dev/null +++ b/node_modules/request/node_modules/uuid/README.md @@ -0,0 +1,132 @@ +# uuid [](http://travis-ci.org/kelektiv/node-uuid) # + +Simple, fast generation of [RFC4122](http://www.ietf.org/rfc/rfc4122.txt) UUIDS. + +Features: + +* Generate RFC4122 version 1 or version 4 UUIDs +* Runs in node.js and browsers +* Cryptographically strong random number generation on supporting platforms +* Small footprint (Want something smaller? [Check this out](https://gist.github.com/982883)!) + +## Quickstart - CommonJS (Recommended) + +```shell +npm install uuid +``` + +```javascript +// Generate a v1 UUID (time-based) +const uuidV1 = require('uuid/v1'); +uuidV1(); // -> '6c84fb90-12c4-11e1-840d-7b25c5ee775a' + +// Generate a v4 UUID (random) +const uuidV4 = require('uuid/v4'); +uuidV4(); // -> '110ec58a-a0f2-4ac4-8393-c866d813b8d1' +``` + +## Quickstart - Pre-packaged for browsers (Not recommended) + +Browser-ready versions of this module are available via [wzrd.in](https://github.com/jfhbrook/wzrd.in). + +```html +<script src="http://wzrd.in/standalone/uuid@latest"></script> + +<script> +uuid.v1(); // -> v1 UUID +uuid.v4(); // -> v4 UUID +</script> +``` + +(Note: Do not do this in production. Just don't. wzrd.in is a great service, but if you're deploying a "real" service you should be using a packaging tool like browserify or webpack. If you do go this route you would be well advised to link to a specific version instead of `uuid@latest` to avoid having your code break when we roll out breaking changes.) + + +## API + +### uuid(...) + +Generate a V4 uuid. See uuid.v4 documentation below. + +### uuid.v1([`options` [, `buffer` [, `offset`]]]) + +Generate and return a RFC4122 v1 (timestamp-based) UUID. + +* `options` - (Object) Optional uuid state to apply. Properties may include: + + * `node` - (Array) Node id as Array of 6 bytes (per 4.1.6). Default: Randomly generated ID. See note 1. + * `clockseq` - (Number between 0 - 0x3fff) RFC clock sequence. Default: An internally maintained clockseq is used. + * `msecs` - (Number | Date) Time in milliseconds since unix Epoch. Default: The current time is used. + * `nsecs` - (Number between 0-9999) additional time, in 100-nanosecond units. Ignored if `msecs` is unspecified. Default: internal uuid counter is used, as per 4.2.1.2. + +* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. +* `offset` - (Number) Starting index in `buffer` at which to begin writing. + +Returns `buffer`, if specified, otherwise the string form of the UUID + +Notes: + +1. The randomly generated node id is only guaranteed to stay constant for the lifetime of the current JS runtime. (Future versions of this module may use persistent storage mechanisms to extend this guarantee.) + +Example: Generate string UUID with fully-specified options + +```javascript +uuid.v1({ + node: [0x01, 0x23, 0x45, 0x67, 0x89, 0xab], + clockseq: 0x1234, + msecs: new Date('2011-11-01').getTime(), + nsecs: 5678 +}); // -> "710b962e-041c-11e1-9234-0123456789ab" +``` + +Example: In-place generation of two binary IDs + +```javascript +// Generate two ids in an array +const arr = new Array(32); // -> [] +uuid.v1(null, arr, 0); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15] +uuid.v1(null, arr, 16); // -> [02 a2 ce 90 14 32 11 e1 85 58 0b 48 8e 4f c1 15 02 a3 1c b0 14 32 11 e1 85 58 0b 48 8e 4f c1 15] +``` + +### uuid.v4([`options` [, `buffer` [, `offset`]]]) + +Generate and return a RFC4122 v4 UUID. + +* `options` - (Object) Optional uuid state to apply. Properties may include: + + * `random` - (Number[16]) Array of 16 numbers (0-255) to use in place of randomly generated values + * `rng` - (Function) Random # generator to use. Set to one of the built-in generators - `uuid.mathRNG` (all platforms), `uuid.nodeRNG` (node.js only), `uuid.whatwgRNG` (WebKit only) - or a custom function that returns an array[16] of byte values. + +* `buffer` - (Array | Buffer) Array or buffer where UUID bytes are to be written. +* `offset` - (Number) Starting index in `buffer` at which to begin writing. + +Returns `buffer`, if specified, otherwise the string form of the UUID + +Example: Generate string UUID with fully-specified options + +```javascript +uuid.v4({ + random: [ + 0x10, 0x91, 0x56, 0xbe, 0xc4, 0xfb, 0xc1, 0xea, + 0x71, 0xb4, 0xef, 0xe1, 0x67, 0x1c, 0x58, 0x36 + ] +}); +// -> "109156be-c4fb-41ea-b1b4-efe1671c5836" +``` + +Example: Generate two IDs in a single buffer + +```javascript +const buffer = new Array(32); // (or 'new Buffer' in node.js) +uuid.v4(null, buffer, 0); +uuid.v4(null, buffer, 16); +``` + +## Testing + +``` +npm test +``` + +## Legacy node-uuid package + +The code for the legacy node-uuid package is available in the `node-uuid` branch. diff --git a/node_modules/request/node_modules/node-uuid/bin/uuid b/node_modules/request/node_modules/uuid/bin/uuid index f732e9918..f732e9918 100755 --- a/node_modules/request/node_modules/node-uuid/bin/uuid +++ b/node_modules/request/node_modules/uuid/bin/uuid diff --git a/node_modules/request/node_modules/uuid/index.js b/node_modules/request/node_modules/uuid/index.js new file mode 100644 index 000000000..e96791ab4 --- /dev/null +++ b/node_modules/request/node_modules/uuid/index.js @@ -0,0 +1,8 @@ +var v1 = require('./v1'); +var v4 = require('./v4'); + +var uuid = v4; +uuid.v1 = v1; +uuid.v4 = v4; + +module.exports = uuid; diff --git a/node_modules/request/node_modules/uuid/lib/bytesToUuid.js b/node_modules/request/node_modules/uuid/lib/bytesToUuid.js new file mode 100644 index 000000000..9ee989cb9 --- /dev/null +++ b/node_modules/request/node_modules/uuid/lib/bytesToUuid.js @@ -0,0 +1,23 @@ +/** + * Convert array of 16 byte values to UUID string format of the form: + * XXXXXXXX-XXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX + */ +var byteToHex = []; +for (var i = 0; i < 256; ++i) { + byteToHex[i] = (i + 0x100).toString(16).substr(1); +} + +function bytesToUuid(buf, offset) { + var i = offset || 0; + var bth = byteToHex; + return bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + '-' + + bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]] + + bth[buf[i++]] + bth[buf[i++]]; +} + +module.exports = bytesToUuid; diff --git a/node_modules/request/node_modules/uuid/lib/rng-browser.js b/node_modules/request/node_modules/uuid/lib/rng-browser.js new file mode 100644 index 000000000..88b7dfb68 --- /dev/null +++ b/node_modules/request/node_modules/uuid/lib/rng-browser.js @@ -0,0 +1,33 @@ +// Unique ID creation requires a high quality random # generator. In the +// browser this is a little complicated due to unknown quality of Math.random() +// and inconsistent support for the `crypto` API. We do the best we can via +// feature-detection +var rng; + +var crypto = global.crypto || global.msCrypto; // for IE 11 +if (crypto && crypto.getRandomValues) { + // WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto + var rnds8 = new Uint8Array(16); + rng = function whatwgRNG() { + crypto.getRandomValues(rnds8); + return rnds8; + }; +} + +if (!rng) { + // Math.random()-based (RNG) + // + // If all else fails, use Math.random(). It's fast, but is of unspecified + // quality. + var rnds = new Array(16); + rng = function() { + for (var i = 0, r; i < 16; i++) { + if ((i & 0x03) === 0) r = Math.random() * 0x100000000; + rnds[i] = r >>> ((i & 0x03) << 3) & 0xff; + } + + return rnds; + }; +} + +module.exports = rng; diff --git a/node_modules/request/node_modules/uuid/lib/rng.js b/node_modules/request/node_modules/uuid/lib/rng.js new file mode 100644 index 000000000..5624d9123 --- /dev/null +++ b/node_modules/request/node_modules/uuid/lib/rng.js @@ -0,0 +1,10 @@ +// Unique ID creation requires a high quality random # generator. In node.js +// this is prett straight-forward - we use the crypto API. + +var rb = require('crypto').randomBytes; + +function rng() { + return rb(16); +}; + +module.exports = rng; diff --git a/node_modules/request/node_modules/uuid/package.json b/node_modules/request/node_modules/uuid/package.json new file mode 100644 index 000000000..57626b794 --- /dev/null +++ b/node_modules/request/node_modules/uuid/package.json @@ -0,0 +1,122 @@ +{ + "_args": [ + [ + { + "raw": "uuid@^3.0.0", + "scope": null, + "escapedName": "uuid", + "name": "uuid", + "rawSpec": "^3.0.0", + "spec": ">=3.0.0 <4.0.0", + "type": "range" + }, + "/Users/zkat/Documents/code/npm/node_modules/request" + ] + ], + "_from": "uuid@>=3.0.0 <4.0.0", + "_id": "uuid@3.0.1", + "_inCache": true, + "_location": "/request/uuid", + "_nodeVersion": "6.7.0", + "_npmOperationalInternal": { + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/uuid-3.0.1.tgz_1480403886767_0.2584113120101392" + }, + "_npmUser": { + "name": "defunctzombie", + "email": "shtylman@gmail.com" + }, + "_npmVersion": "3.10.3", + "_phantomChildren": {}, + "_requested": { + "raw": "uuid@^3.0.0", + "scope": null, + "escapedName": "uuid", + "name": "uuid", + "rawSpec": "^3.0.0", + "spec": ">=3.0.0 <4.0.0", + "type": "range" + }, + "_requiredBy": [ + "/request" + ], + "_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz", + "_shasum": "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1", + "_shrinkwrap": null, + "_spec": "uuid@^3.0.0", + "_where": "/Users/zkat/Documents/code/npm/node_modules/request", + "bin": { + "uuid": "./bin/uuid" + }, + "browser": { + "./lib/rng.js": "./lib/rng-browser.js" + }, + "bugs": { + "url": "https://github.com/kelektiv/node-uuid/issues" + }, + "contributors": [ + { + "name": "Robert Kieffer", + "email": "robert@broofa.com" + }, + { + "name": "Christoph Tavan", + "email": "dev@tavan.de" + }, + { + "name": "AJ ONeal", + "email": "coolaj86@gmail.com" + }, + { + "name": "Vincent Voyer", + "email": "vincent@zeroload.net" + }, + { + "name": "Roman Shtylman", + "email": "shtylman@gmail.com" + } + ], + "dependencies": {}, + "description": "RFC4122 (v1 and v4) generator", + "devDependencies": { + "mocha": "3.1.2" + }, + "directories": {}, + "dist": { + "shasum": "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1", + "tarball": "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz" + }, + "gitHead": "374de826de71d8997f71b4641f65552e48956ced", + "homepage": "https://github.com/kelektiv/node-uuid#readme", + "keywords": [ + "uuid", + "guid", + "rfc4122" + ], + "license": "MIT", + "maintainers": [ + { + "name": "broofa", + "email": "robert@broofa.com" + }, + { + "name": "defunctzombie", + "email": "shtylman@gmail.com" + }, + { + "name": "vvo", + "email": "vincent.voyer@gmail.com" + } + ], + "name": "uuid", + "optionalDependencies": {}, + "readme": "ERROR: No README data found!", + "repository": { + "type": "git", + "url": "git+https://github.com/kelektiv/node-uuid.git" + }, + "scripts": { + "test": "mocha test/test.js" + }, + "version": "3.0.1" +} diff --git a/node_modules/request/node_modules/uuid/test/mocha.opts b/node_modules/request/node_modules/uuid/test/mocha.opts new file mode 100644 index 000000000..5d6a3113b --- /dev/null +++ b/node_modules/request/node_modules/uuid/test/mocha.opts @@ -0,0 +1,3 @@ +--ui qunit +--reporter spec +--check-leaks diff --git a/node_modules/request/node_modules/uuid/test/test.js b/node_modules/request/node_modules/uuid/test/test.js new file mode 100644 index 000000000..ec33bec01 --- /dev/null +++ b/node_modules/request/node_modules/uuid/test/test.js @@ -0,0 +1,96 @@ +var assert = require('assert'); + +var uuid = require('../'); + +// Verify ordering of v1 ids created with explicit times +var TIME = 1321644961388; // 2011-11-18 11:36:01.388-08:00 + +function compare(name, ids) { + test(name, function() { + // avoid .map for older browsers + for (var i=0 ; i<ids.length ; ++i) { + ids[i] = ids[i].split('-').reverse().join('-'); + } + ids = ids.sort(); + var sorted = ([].concat(ids)).sort(); + + assert(sorted.toString() == ids.toString(), name + ' have expected order'); + }); +} + +// Verify ordering of v1 ids created using default behavior +compare('uuids with current time', [ + uuid.v1(), + uuid.v1(), + uuid.v1(), + uuid.v1(), + uuid.v1() +]); + +// Verify ordering of v1 ids created with explicit times +compare('uuids with time option', [ + uuid.v1({msecs: TIME - 10*3600*1000}), + uuid.v1({msecs: TIME - 1}), + uuid.v1({msecs: TIME}), + uuid.v1({msecs: TIME + 1}), + uuid.v1({msecs: TIME + 28*24*3600*1000}) +]); + +test('msec', function() { + assert( + uuid.v1({msecs: TIME}) != uuid.v1({msecs: TIME}), + 'IDs created at same msec are different' + ); +}); + +test('exception thrown when > 10k ids created in 1ms', function() { + // Verify throw if too many ids created + var thrown = false; + try { + uuid.v1({msecs: TIME, nsecs: 10000}); + } catch (e) { + thrown = true; + } + assert(thrown, 'Exception thrown when > 10K ids created in 1 ms'); +}); + +test('clock regression by msec', function() { + // Verify clock regression bumps clockseq + var uidt = uuid.v1({msecs: TIME}); + var uidtb = uuid.v1({msecs: TIME - 1}); + assert( + parseInt(uidtb.split('-')[3], 16) - parseInt(uidt.split('-')[3], 16) === 1, + 'Clock regression by msec increments the clockseq' + ); +}); + +test('clock regression by nsec', function() { + // Verify clock regression bumps clockseq + var uidtn = uuid.v1({msecs: TIME, nsecs: 10}); + var uidtnb = uuid.v1({msecs: TIME, nsecs: 9}); + assert( + parseInt(uidtnb.split('-')[3], 16) - parseInt(uidtn.split('-')[3], 16) === 1, + 'Clock regression by nsec increments the clockseq' + ); +}); + +test('explicit options product expected id', function() { + // Verify explicit options produce expected id + var id = uuid.v1({ + msecs: 1321651533573, + nsecs: 5432, + clockseq: 0x385c, + node: [ 0x61, 0xcd, 0x3c, 0xbb, 0x32, 0x10 ] + }); + assert(id == 'd9428888-122b-11e1-b85c-61cd3cbb3210', 'Explicit options produce expected id'); +}); + +test('ids spanning 1ms boundary are 100ns apart', function() { + // Verify adjacent ids across a msec boundary are 1 time unit apart + var u0 = uuid.v1({msecs: TIME, nsecs: 9999}); + var u1 = uuid.v1({msecs: TIME + 1, nsecs: 0}); + + var before = u0.split('-')[0], after = u1.split('-')[0]; + var dt = parseInt(after, 16) - parseInt(before, 16); + assert(dt === 1, 'Ids spanning 1ms boundary are 100ns apart'); +}); diff --git a/node_modules/request/node_modules/uuid/v1.js b/node_modules/request/node_modules/uuid/v1.js new file mode 100644 index 000000000..315bd4cd6 --- /dev/null +++ b/node_modules/request/node_modules/uuid/v1.js @@ -0,0 +1,103 @@ +// Unique ID creation requires a high quality random # generator. We feature +// detect to determine the best RNG source, normalizing to a function that +// returns 128-bits of randomness, since that's what's usually required +var rng = require('./lib/rng'); +var bytesToUuid = require('./lib/bytesToUuid'); + +// **`v1()` - Generate time-based UUID** +// +// Inspired by https://github.com/LiosK/UUID.js +// and http://docs.python.org/library/uuid.html + +// random #'s we need to init node and clockseq +var _seedBytes = rng(); + +// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1) +var _nodeId = [ + _seedBytes[0] | 0x01, + _seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5] +]; + +// Per 4.2.2, randomize (14 bit) clockseq +var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff; + +// Previous uuid creation time +var _lastMSecs = 0, _lastNSecs = 0; + +// See https://github.com/broofa/node-uuid for API details +function v1(options, buf, offset) { + var i = buf && offset || 0; + var b = buf || []; + + options = options || {}; + + var clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; + + // UUID timestamps are 100 nano-second units since the Gregorian epoch, + // (1582-10-15 00:00). JSNumbers aren't precise enough for this, so + // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs' + // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00. + var msecs = options.msecs !== undefined ? options.msecs : new Date().getTime(); + + // Per 4.2.1.2, use count of uuid's generated during the current clock + // cycle to simulate higher resolution clock + var nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; + + // Time since last uuid creation (in msecs) + var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000; + + // Per 4.2.1.2, Bump clockseq on clock regression + if (dt < 0 && options.clockseq === undefined) { + clockseq = clockseq + 1 & 0x3fff; + } + + // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new + // time interval + if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) { + nsecs = 0; + } + + // Per 4.2.1.2 Throw error if too many uuids are requested + if (nsecs >= 10000) { + throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec'); + } + + _lastMSecs = msecs; + _lastNSecs = nsecs; + _clockseq = clockseq; + + // Per 4.1.4 - Convert from unix epoch to Gregorian epoch + msecs += 12219292800000; + + // `time_low` + var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000; + b[i++] = tl >>> 24 & 0xff; + b[i++] = tl >>> 16 & 0xff; + b[i++] = tl >>> 8 & 0xff; + b[i++] = tl & 0xff; + + // `time_mid` + var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff; + b[i++] = tmh >>> 8 & 0xff; + b[i++] = tmh & 0xff; + + // `time_high_and_version` + b[i++] = tmh >>> 24 & 0xf | 0x10; // include version + b[i++] = tmh >>> 16 & 0xff; + + // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant) + b[i++] = clockseq >>> 8 | 0x80; + + // `clock_seq_low` + b[i++] = clockseq & 0xff; + + // `node` + var node = options.node || _nodeId; + for (var n = 0; n < 6; ++n) { + b[i + n] = node[n]; + } + + return buf ? buf : bytesToUuid(b); +} + +module.exports = v1; diff --git a/node_modules/request/node_modules/uuid/v4.js b/node_modules/request/node_modules/uuid/v4.js new file mode 100644 index 000000000..38b6f76a9 --- /dev/null +++ b/node_modules/request/node_modules/uuid/v4.js @@ -0,0 +1,29 @@ +var rng = require('./lib/rng'); +var bytesToUuid = require('./lib/bytesToUuid'); + +function v4(options, buf, offset) { + var i = buf && offset || 0; + + if (typeof(options) == 'string') { + buf = options == 'binary' ? new Array(16) : null; + options = null; + } + options = options || {}; + + var rnds = options.random || (options.rng || rng)(); + + // Per 4.4, set bits for version and `clock_seq_hi_and_reserved` + rnds[6] = (rnds[6] & 0x0f) | 0x40; + rnds[8] = (rnds[8] & 0x3f) | 0x80; + + // Copy bytes to buffer, if provided + if (buf) { + for (var ii = 0; ii < 16; ++ii) { + buf[i + ii] = rnds[ii]; + } + } + + return buf || bytesToUuid(rnds); +} + +module.exports = v4; diff --git a/node_modules/request/package.json b/node_modules/request/package.json index e009f341f..cf438a535 100644 --- a/node_modules/request/package.json +++ b/node_modules/request/package.json @@ -2,25 +2,25 @@ "_args": [ [ { - "raw": "request@~2.78.0", + "raw": "request@2.79.0", "scope": null, "escapedName": "request", "name": "request", - "rawSpec": "~2.78.0", - "spec": ">=2.78.0 <2.79.0", - "type": "range" + "rawSpec": "2.79.0", + "spec": "2.79.0", + "type": "version" }, - "/Users/ogd/Documents/projects/npm/npm" + "/Users/zkat/Documents/code/npm" ] ], - "_from": "request@>=2.78.0 <2.79.0", - "_id": "request@2.78.0", + "_from": "request@2.79.0", + "_id": "request@2.79.0", "_inCache": true, "_location": "/request", - "_nodeVersion": "6.5.0", + "_nodeVersion": "6.3.1", "_npmOperationalInternal": { - "host": "packages-18-east.internal.npmjs.com", - "tmp": "tmp/request-2.78.0.tgz_1478180284881_0.7387848466169089" + "host": "packages-12-west.internal.npmjs.com", + "tmp": "tmp/request-2.79.0.tgz_1479489666177_0.7806831058114767" }, "_npmUser": { "name": "simov", @@ -32,13 +32,13 @@ "strip-ansi": "3.0.1" }, "_requested": { - "raw": "request@~2.78.0", + "raw": "request@2.79.0", "scope": null, "escapedName": "request", "name": "request", - "rawSpec": "~2.78.0", - "spec": ">=2.78.0 <2.79.0", - "type": "range" + "rawSpec": "2.79.0", + "spec": "2.79.0", + "type": "version" }, "_requiredBy": [ "#USER", @@ -48,11 +48,11 @@ "/npm-registry-couchapp/couchapp", "/npm-registry-couchapp/couchapp/nano" ], - "_resolved": "https://registry.npmjs.org/request/-/request-2.78.0.tgz", - "_shasum": "e1c8dec346e1c81923b24acdb337f11decabe9cc", + "_resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "_shasum": "4dfe5bf6be8b8cdc37fcf93e04b65577722710de", "_shrinkwrap": null, - "_spec": "request@~2.78.0", - "_where": "/Users/ogd/Documents/projects/npm/npm", + "_spec": "request@2.79.0", + "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Mikeal Rogers", "email": "mikeal.rogers@gmail.com" @@ -75,12 +75,12 @@ "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.7", - "node-uuid": "~1.4.7", "oauth-sign": "~0.8.1", "qs": "~6.3.0", "stringstream": "~0.0.4", "tough-cookie": "~2.3.0", - "tunnel-agent": "~0.4.1" + "tunnel-agent": "~0.4.1", + "uuid": "^3.0.0" }, "description": "Simplified HTTP request client.", "devDependencies": { @@ -103,17 +103,22 @@ "rimraf": "^2.2.8", "server-destroy": "^1.0.1", "tape": "^4.6.0", - "taper": "^0.4.0" + "taper": "^0.5.0" }, "directories": {}, "dist": { - "shasum": "e1c8dec346e1c81923b24acdb337f11decabe9cc", - "tarball": "https://registry.npmjs.org/request/-/request-2.78.0.tgz" + "shasum": "4dfe5bf6be8b8cdc37fcf93e04b65577722710de", + "tarball": "https://registry.npmjs.org/request/-/request-2.79.0.tgz" }, "engines": { "node": ">= 4" }, - "gitHead": "d4a68e9b64979f388c204f5d957e366878262340", + "files": [ + "lib/", + "index.js", + "request.js" + ], + "gitHead": "ff729c6f1a87237060d075908563ce13386395ac", "greenkeeper": { "ignore": [ "eslint", @@ -162,5 +167,5 @@ "util", "utility" ], - "version": "2.78.0" + "version": "2.79.0" } diff --git a/node_modules/request/request.js b/node_modules/request/request.js index 9528b5662..26f70c208 100644 --- a/node_modules/request/request.js +++ b/node_modules/request/request.js @@ -1292,10 +1292,14 @@ Request.prototype.aws = function (opts, now) { } var signRes = aws4.sign(options, { accessKeyId: opts.key, - secretAccessKey: opts.secret + secretAccessKey: opts.secret, + sessionToken: opts.session }) self.setHeader('authorization', signRes.headers.Authorization) self.setHeader('x-amz-date', signRes.headers['X-Amz-Date']) + if (signRes.headers['X-Amz-Security-Token']) { + self.setHeader('x-amz-security-token', signRes.headers['X-Amz-Security-Token']) + } } else { // default: use aws-sign2 |