make Prettier

This commit is contained in:
AJ ONeal 2019-10-29 14:31:30 -06:00
parent b6900b937b
commit 9ab91d9721
12 changed files with 662 additions and 572 deletions

8
.prettierrc Normal file
View File

@ -0,0 +1,8 @@
{
"bracketSpacing": true,
"printWidth": 80,
"singleQuote": true,
"tabWidth": 4,
"trailingComma": "none",
"useTabs": false
}

198
README.md
View File

@ -8,7 +8,7 @@ Written from scratch, with zero-dependencies.
## Super simple to use ## Super simple to use
µRequest is designed to be a drop-in replacement for request. It supports HTTPS and follows redirects by default. µRequest is designed to be a drop-in replacement for request. It supports HTTPS and follows redirects by default.
```bash ```bash
npm install --save @root/request npm install --save @root/request
@ -16,10 +16,10 @@ npm install --save @root/request
```js ```js
var request = require('@root/request'); var request = require('@root/request');
request('http://www.google.com', function (error, response, body) { request('http://www.google.com', function(error, response, body) {
console.log('error:', error); // Print the error if one occurred console.log('error:', error); // Print the error if one occurred
console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received
console.log('body:', body); // Print the HTML for the Google homepage. console.log('body:', body); // Print the HTML for the Google homepage.
}); });
``` ```
@ -30,25 +30,28 @@ var promisify = require('util').promisify;
var request = require('@root/request'); var request = require('@root/request');
request = promisify(request); request = promisify(request);
request('http://www.google.com').then(function (response) { request('http://www.google.com')
console.log('statusCode:', response.statusCode); // Print the response status code if a response was received .then(function(response) {
console.log('body:', response.body); // Print the HTML for the Google homepage. console.log('statusCode:', response.statusCode); // Print the response status code if a response was received
}).catch(function (error) { console.log('body:', response.body); // Print the HTML for the Google homepage.
console.log('error:', error); // Print the error if one occurred })
}); .catch(function(error) {
console.log('error:', error); // Print the error if one occurred
});
``` ```
## Table of contents ## Table of contents
- [Forms](#forms) - [Forms](#forms)
- [HTTP Authentication](#http-authentication) - [HTTP Authentication](#http-authentication)
- [Custom HTTP Headers](#custom-http-headers) - [Custom HTTP Headers](#custom-http-headers)
- [Unix Domain Sockets](#unix-domain-sockets) - [Unix Domain Sockets](#unix-domain-sockets)
- [**All Available Options**](#requestoptions-callback) - [**All Available Options**](#requestoptions-callback)
## Forms ## Forms
`urequest` supports `application/x-www-form-urlencoded` and `multipart/form-data` form uploads. `urequest` supports `application/x-www-form-urlencoded` and `multipart/form-data` form uploads.
<!-- For `multipart/related` refer to the `multipart` API. --> <!-- For `multipart/related` refer to the `multipart` API. -->
#### application/x-www-form-urlencoded (URL-Encoded Forms) #### application/x-www-form-urlencoded (URL-Encoded Forms)
@ -56,16 +59,21 @@ request('http://www.google.com').then(function (response) {
URL-encoded forms are simple. URL-encoded forms are simple.
```js ```js
request.post('http://service.com/upload', {form:{key:'value'}}) request.post('http://service.com/upload', { form: { key: 'value' } });
// or // or
request.post({url:'http://service.com/upload', form: {key:'value'}}, function(err,httpResponse,body){ /* ... */ }) request.post(
{ url: 'http://service.com/upload', form: { key: 'value' } },
function(err, httpResponse, body) {
/* ... */
}
);
``` ```
<!-- <!--
// or // or
request.post('http://service.com/upload').form({key:'value'}) request.post('http://service.com/upload').form({key:'value'})
--> -->
#### multipart/form-data (Multipart Form Uploads) #### multipart/form-data (Multipart Form Uploads)
For `multipart/form-data` we use the [form-data](https://github.com/form-data/form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option. For `multipart/form-data` we use the [form-data](https://github.com/form-data/form-data) library by [@felixge](https://github.com/felixge). For the most cases, you can pass your upload form data via the `formData` option.
@ -78,35 +86,39 @@ npm install --save form-data@2
```js ```js
var formData = { var formData = {
// Pass a simple key-value pair // Pass a simple key-value pair
my_field: 'my_value', my_field: 'my_value',
// Pass data via Buffers // Pass data via Buffers
my_buffer: Buffer.from([1, 2, 3]), my_buffer: Buffer.from([1, 2, 3]),
// Pass data via Streams // Pass data via Streams
my_file: fs.createReadStream(__dirname + '/unicycle.jpg'), my_file: fs.createReadStream(__dirname + '/unicycle.jpg'),
// Pass multiple values /w an Array // Pass multiple values /w an Array
attachments: [ attachments: [
fs.createReadStream(__dirname + '/attachment1.jpg'), fs.createReadStream(__dirname + '/attachment1.jpg'),
fs.createReadStream(__dirname + '/attachment2.jpg') fs.createReadStream(__dirname + '/attachment2.jpg')
], ],
// Pass optional meta-data with an 'options' object with style: {value: DATA, options: OPTIONS} // Pass optional meta-data with an 'options' object with style: {value: DATA, options: OPTIONS}
// Use case: for some types of streams, you'll need to provide "file"-related information manually. // Use case: for some types of streams, you'll need to provide "file"-related information manually.
// See the `form-data` README for more information about options: https://github.com/form-data/form-data // See the `form-data` README for more information about options: https://github.com/form-data/form-data
custom_file: { custom_file: {
value: fs.createReadStream('/dev/urandom'), value: fs.createReadStream('/dev/urandom'),
options: { options: {
filename: 'topsecret.jpg', filename: 'topsecret.jpg',
contentType: 'image/jpeg' contentType: 'image/jpeg'
}
} }
}
}; };
request.post({url:'http://service.com/upload', formData: formData}, function optionalCallback(err, httpResponse, body) { request.post(
if (err) { { url: 'http://service.com/upload', formData: formData },
return console.error('upload failed:', err); function optionalCallback(err, httpResponse, body) {
} if (err) {
console.log('Upload successful! Server responded with:', body); return console.error('upload failed:', err);
}); }
console.log('Upload successful! Server responded with:', body);
}
);
``` ```
<!-- <!--
For advanced cases, you can access the form-data object itself via `r.form()`. This can be modified until the request is fired on the next cycle of the event-loop. (Note that this calling `form()` will clear the currently set form data for that request.) For advanced cases, you can access the form-data object itself via `r.form()`. This can be modified until the request is fired on the next cycle of the event-loop. (Note that this calling `form()` will clear the currently set form data for that request.)
@ -133,27 +145,28 @@ request.get('http://some.server.com/').auth('username', 'password', false);
request.get('http://some.server.com/').auth(null, null, true, 'bearerToken'); request.get('http://some.server.com/').auth(null, null, true, 'bearerToken');
// or // or
--> -->
```js ```js
request.get('http://some.server.com/', { request.get('http://some.server.com/', {
'auth': { auth: {
'user': 'username', user: 'username',
'pass': 'password', pass: 'password',
'sendImmediately': false sendImmediately: false
} }
}); });
// or // or
request.get('http://some.server.com/', { request.get('http://some.server.com/', {
'auth': { auth: {
'bearer': 'bearerToken' bearer: 'bearerToken'
} }
}); });
``` ```
If passed as an option, `auth` should be a hash containing values: If passed as an option, `auth` should be a hash containing values:
- `user` || `username` - `user` || `username`
- `pass` || `password` - `pass` || `password`
- `bearer` (optional) - `bearer` (optional)
<!-- <!--
- `sendImmediately` (optional) - `sendImmediately` (optional)
@ -177,8 +190,8 @@ var username = 'username',
password = 'password', password = 'password',
url = 'http://' + username + ':' + password + '@some.server.com'; url = 'http://' + username + ':' + password + '@some.server.com';
request({url: url}, function (error, response, body) { request({ url: url }, function(error, response, body) {
// Do more stuff with 'body' here // Do more stuff with 'body' here
}); });
``` ```
@ -209,18 +222,18 @@ custom `User-Agent` header as well as https.
var request = require('request'); var request = require('request');
var options = { var options = {
url: 'https://api.github.com/repos/request/request', url: 'https://api.github.com/repos/request/request',
headers: { headers: {
'User-Agent': 'request' 'User-Agent': 'request'
} }
}; };
function callback(error, response, body) { function callback(error, response, body) {
if (!error && response.statusCode == 200) { if (!error && response.statusCode == 200) {
var info = JSON.parse(body); var info = JSON.parse(body);
console.log(info.stargazers_count + " Stars"); console.log(info.stargazers_count + ' Stars');
console.log(info.forks_count + " Forks"); console.log(info.forks_count + ' Forks');
} }
} }
request(options, callback); request(options, callback);
@ -235,8 +248,10 @@ request(options, callback);
`urequest` supports making requests to [UNIX Domain Sockets](https://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme: `urequest` supports making requests to [UNIX Domain Sockets](https://en.wikipedia.org/wiki/Unix_domain_socket). To make one, use the following URL scheme:
```js ```js
/* Pattern */ 'http://unix:SOCKET:PATH' /* Pattern */ 'http://unix:SOCKET:PATH';
/* Example */ request.get('http://unix:/absolute/path/to/unix.socket:/request/path') /* Example */ request.get(
'http://unix:/absolute/path/to/unix.socket:/request/path'
);
``` ```
Note: The `SOCKET` path is assumed to be absolute to the root of the host file system. Note: The `SOCKET` path is assumed to be absolute to the root of the host file system.
@ -249,9 +264,9 @@ Note: The `SOCKET` path is assumed to be absolute to the root of the host file s
The first argument can be either a `url` or an `options` object. The only required option is `uri`; all others are optional. The first argument can be either a `url` or an `options` object. The only required option is `uri`; all others are optional.
- `uri` || `url` - fully qualified uri or a parsed url object from `url.parse()` - `uri` || `url` - fully qualified uri or a parsed url object from `url.parse()`
- `method` - http method (default: `"GET"`) - `method` - http method (default: `"GET"`)
- `headers` - http headers (default: `{}`) - `headers` - http headers (default: `{}`)
<!-- TODO <!-- TODO
- `baseUrl` - fully qualified uri string used as the base url. Most useful with `request.defaults`, for example when you want to do many requests to the same domain. If `baseUrl` is `https://example.com/api/`, then requesting `/end/point?test=true` will fetch `https://example.com/api/end/point?test=true`. When `baseUrl` is given, `uri` must also be a string. - `baseUrl` - fully qualified uri string used as the base url. Most useful with `request.defaults`, for example when you want to do many requests to the same domain. If `baseUrl` is `https://example.com/api/`, then requesting `/end/point?test=true` will fetch `https://example.com/api/end/point?test=true`. When `baseUrl` is given, `uri` must also be a string.
@ -259,8 +274,8 @@ The first argument can be either a `url` or an `options` object. The only requir
--- ---
- `body` - entity body for PATCH, POST and PUT requests. Must be a `Buffer`, `String` or `ReadStream`. If `json` is `true`, then `body` must be a JSON-serializable object. - `body` - entity body for PATCH, POST and PUT requests. Must be a `Buffer`, `String` or `ReadStream`. If `json` is `true`, then `body` must be a JSON-serializable object.
- `json` - sets `body` to JSON representation of value and adds `Content-type: application/json` header. Additionally, parses the response body as JSON. - `json` - sets `body` to JSON representation of value and adds `Content-type: application/json` header. Additionally, parses the response body as JSON.
<!-- TODO <!-- TODO
- `form` - when passed an object or a querystring, this sets `body` to a querystring representation of value, and adds `Content-type: application/x-www-form-urlencoded` header. When passed no options, a `FormData` instance is returned (and is piped to request). See "Forms" section above. - `form` - when passed an object or a querystring, this sets `body` to a querystring representation of value, and adds `Content-type: application/x-www-form-urlencoded` header. When passed no options, a `FormData` instance is returned (and is piped to request). See "Forms" section above.
@ -281,15 +296,15 @@ The first argument can be either a `url` or an `options` object. The only requir
--- ---
- `followRedirect` - follow HTTP 3xx responses as redirects (default: `true`). This property can also be implemented as function which gets `response` object as a single argument and should return `true` if redirects should continue or `false` otherwise. - `followRedirect` - follow HTTP 3xx responses as redirects (default: `true`). This property can also be implemented as function which gets `response` object as a single argument and should return `true` if redirects should continue or `false` otherwise.
- `followAllRedirects` - follow non-GET HTTP 3xx responses as redirects (default: `false`) - `followAllRedirects` - follow non-GET HTTP 3xx responses as redirects (default: `false`)
- `followOriginalHttpMethod` - by default we redirect to HTTP method GET. you can enable this property to redirect to the original HTTP method (default: `false`) - `followOriginalHttpMethod` - by default we redirect to HTTP method GET. you can enable this property to redirect to the original HTTP method (default: `false`)
- `maxRedirects` - the maximum number of redirects to follow (default: `10`) - `maxRedirects` - the maximum number of redirects to follow (default: `10`)
- `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`). **Note:** if true, referer header set in the initial request is preserved during redirect chain. - `removeRefererHeader` - removes the referer header when a redirect happens (default: `false`). **Note:** if true, referer header set in the initial request is preserved during redirect chain.
--- ---
- `encoding` - encoding to be used on `setEncoding` of response data. If `null`, the `body` is returned as a `Buffer`. Anything else **(including the default value of `undefined`)** will be passed as the [encoding](http://nodejs.org/api/buffer.html#buffer_buffer) parameter to `toString()` (meaning this is effectively `utf8` by default). (**Note:** if you expect binary data, you should set `encoding: null`.) - `encoding` - encoding to be used on `setEncoding` of response data. If `null`, the `body` is returned as a `Buffer`. Anything else **(including the default value of `undefined`)** will be passed as the [encoding](http://nodejs.org/api/buffer.html#buffer_buffer) parameter to `toString()` (meaning this is effectively `utf8` by default). (**Note:** if you expect binary data, you should set `encoding: null`.)
<!-- TODO <!-- TODO
- `gzip` - if `true`, add an `Accept-Encoding` header to request compressed content encodings from the server (if not already present) and decode supported content encodings in the response. **Note:** Automatic decoding of the response content is performed on the body data returned through `request` (both through the `request` stream and passed to the callback function) but is not performed on the `response` stream (available from the `response` event) which is the unmodified `http.IncomingMessage` object which may contain compressed data. See example below. - `gzip` - if `true`, add an `Accept-Encoding` header to request compressed content encodings from the server (if not already present) and decode supported content encodings in the response. **Note:** Automatic decoding of the response content is performed on the body data returned through `request` (both through the `request` stream and passed to the callback function) but is not performed on the `response` stream (available from the `response` event) which is the unmodified `http.IncomingMessage` object which may contain compressed data. See example below.
@ -314,30 +329,31 @@ instead, it **returns a wrapper** that has your default settings applied to it.
`request.defaults` to add/override defaults that were previously defaulted. `request.defaults` to add/override defaults that were previously defaulted.
For example: For example:
```js ```js
//requests using baseRequest() will set the 'x-token' header //requests using baseRequest() will set the 'x-token' header
var baseRequest = request.defaults({ var baseRequest = request.defaults({
headers: {'x-token': 'my-token'} headers: { 'x-token': 'my-token' }
}) });
//requests using specialRequest() will include the 'x-token' header set in //requests using specialRequest() will include the 'x-token' header set in
//baseRequest and will also include the 'special' header //baseRequest and will also include the 'special' header
var specialRequest = baseRequest.defaults({ var specialRequest = baseRequest.defaults({
headers: {special: 'special value'} headers: { special: 'special value' }
}) });
``` ```
### request.METHOD() ### request.METHOD()
These HTTP method convenience functions act just like `request()` but with a default method already set for you: These HTTP method convenience functions act just like `request()` but with a default method already set for you:
- *request.get()*: Defaults to `method: "GET"`. - _request.get()_: Defaults to `method: "GET"`.
- *request.post()*: Defaults to `method: "POST"`. - _request.post()_: Defaults to `method: "POST"`.
- *request.put()*: Defaults to `method: "PUT"`. - _request.put()_: Defaults to `method: "PUT"`.
- *request.patch()*: Defaults to `method: "PATCH"`. - _request.patch()_: Defaults to `method: "PATCH"`.
- *request.del() / request.delete()*: Defaults to `method: "DELETE"`. - _request.del() / request.delete()_: Defaults to `method: "DELETE"`.
- *request.head()*: Defaults to `method: "HEAD"`. - _request.head()_: Defaults to `method: "HEAD"`.
- *request.options()*: Defaults to `method: "OPTIONS"`. - _request.options()_: Defaults to `method: "OPTIONS"`.
--- ---

View File

@ -5,12 +5,16 @@ var request = require('../');
// will redirect to https://www.github.com and then https://github.com // will redirect to https://www.github.com and then https://github.com
//request('http://www.github.com', function (error, response, body) { //request('http://www.github.com', function (error, response, body) {
request({ uri: { protocol: 'http:', hostname: 'www.github.com' } }, function (error, response, body) { request({ uri: { protocol: 'http:', hostname: 'www.github.com' } }, function(
if (error) { error,
console.log('error:', error); // Print the error if one occurred response,
return; body
} ) {
console.log('statusCode:', response.statusCode); // The final statusCode if (error) {
console.log('Final href:', response.request.uri.href); // The final URI console.log('error:', error); // Print the error if one occurred
console.log('Body Length:', body.length); // body length return;
}
console.log('statusCode:', response.statusCode); // The final statusCode
console.log('Final href:', response.request.uri.href); // The final URI
console.log('Body Length:', body.length); // body length
}); });

View File

@ -8,21 +8,24 @@ var request = require('../');
// will redirect to https://www.github.com and then https://github.com // will redirect to https://www.github.com and then https://github.com
//request('http://www.github.com', function (error, response, body) { //request('http://www.github.com', function (error, response, body) {
request( request(
//{ url: 'http://postb.in/syfxxnko' //{ url: 'http://postb.in/syfxxnko'
{ url: 'http://localhost:3007/form-data/' {
, method: 'POST' url: 'http://localhost:3007/form-data/',
, headers: { 'X-Foo': 'Bar' } method: 'POST',
, formData: { headers: { 'X-Foo': 'Bar' },
foo: 'bar' formData: {
, baz: require('fs').createReadStream(require('path').join(__dirname, 'get-to-json.js')) foo: 'bar',
baz: require('fs').createReadStream(
require('path').join(__dirname, 'get-to-json.js')
)
}
},
function(error, response, body) {
if (error) {
console.log('error:', error); // Print the error if one occurred
return;
}
console.log('statusCode:', response.statusCode); // The final statusCode
console.log('Body Length:', body.length); // body length
} }
}
, function (error, response, body) {
if (error) {
console.log('error:', error); // Print the error if one occurred
return;
}
console.log('statusCode:', response.statusCode); // The final statusCode
console.log('Body Length:', body.length); // body length
}
); );

View File

@ -2,11 +2,11 @@
//var request = require('urequest'); //var request = require('urequest');
var request = require('../'); var request = require('../');
request('https://www.google.com', function (error, response, body) { request('https://www.google.com', function(error, response, body) {
if (error) { if (error) {
console.log('error:', error); // Print the error if one occurred console.log('error:', error); // Print the error if one occurred
return; return;
} }
console.log('response.toJSON()'); console.log('response.toJSON()');
console.log(response.toJSON()); console.log(response.toJSON());
}); });

View File

@ -2,8 +2,8 @@
//var request = require('urequest'); //var request = require('urequest');
var request = require('../'); var request = require('../');
request('http://www.google.com', function (error, response, body) { request('http://www.google.com', function(error, response, body) {
console.log('error:', error); // Print the error if one occurred console.log('error:', error); // Print the error if one occurred
console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received
console.log('body:', body); // Print the HTML for the Google homepage. console.log('body:', body); // Print the HTML for the Google homepage.
}); });

View File

@ -2,8 +2,8 @@
//var request = require('urequest'); //var request = require('urequest');
var request = require('../'); var request = require('../');
request('https://www.google.com', function (error, response, body) { request('https://www.google.com', function(error, response, body) {
console.log('error:', error); // Print the error if one occurred console.log('error:', error); // Print the error if one occurred
console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received console.log('statusCode:', response && response.statusCode); // Print the response status code if a response was received
console.log('body:', body); // Print the HTML for the Google homepage. console.log('body:', body); // Print the HTML for the Google homepage.
}); });

View File

@ -4,13 +4,17 @@
var request = require('../'); var request = require('../');
// would normally redirect to https://www.github.com and then https://github.com // would normally redirect to https://www.github.com and then https://github.com
request({ uri: 'https://www.github.com', followRedirect: false }, function (error, response, body) { request({ uri: 'https://www.github.com', followRedirect: false }, function(
if (error) { error,
console.log('error:', error); // Print the error if one occurred response,
return; body
} ) {
console.log('href:', response.request.uri.href); // The final URI if (error) {
console.log('statusCode:', response.statusCode); // Should be 301 or 302 console.log('error:', error); // Print the error if one occurred
console.log('Location:', response.headers.location); // The redirect return;
console.log('Body:', body || JSON.stringify(body)); }
console.log('href:', response.request.uri.href); // The final URI
console.log('statusCode:', response.statusCode); // Should be 301 or 302
console.log('Location:', response.headers.location); // The redirect
console.log('Body:', body || JSON.stringify(body));
}); });

View File

@ -8,18 +8,19 @@ var request = require('../');
// will redirect to https://www.github.com and then https://github.com // will redirect to https://www.github.com and then https://github.com
//request('http://www.github.com', function (error, response, body) { //request('http://www.github.com', function (error, response, body) {
request( request(
{ url: 'http://postb.in/2meyt50C' {
, method: 'POST' url: 'http://postb.in/2meyt50C',
, headers: { 'X-Foo': 'Bar' } method: 'POST',
, form: { foo: 'bar', baz: 'qux' } headers: { 'X-Foo': 'Bar' },
} form: { foo: 'bar', baz: 'qux' }
, function (error, response, body) { },
if (error) { function(error, response, body) {
console.log('error:', error); // Print the error if one occurred if (error) {
return; console.log('error:', error); // Print the error if one occurred
return;
}
console.log('statusCode:', response.statusCode); // The final statusCode
console.log('Body Length:', body.length); // body length
console.log('Response:', response.toJSON()); // body length
} }
console.log('statusCode:', response.statusCode); // The final statusCode
console.log('Body Length:', body.length); // body length
console.log('Response:', response.toJSON()); // body length
}
); );

826
index.js
View File

@ -5,431 +5,485 @@ var https = require('https');
var url = require('url'); var url = require('url');
function debug() { function debug() {
if (module.exports.debug) { if (module.exports.debug) {
console.log.apply(console, arguments); console.log.apply(console, arguments);
} }
} }
function mergeOrDelete(defaults, updates) { function mergeOrDelete(defaults, updates) {
Object.keys(defaults).forEach(function (key) { Object.keys(defaults).forEach(function(key) {
if (!(key in updates)) { if (!(key in updates)) {
updates[key] = defaults[key]; updates[key] = defaults[key];
return; return;
} }
// neither accept the prior default nor define an explicit value // neither accept the prior default nor define an explicit value
// CRDT probs... // CRDT probs...
if ('undefined' === typeof updates[key]) { if ('undefined' === typeof updates[key]) {
delete updates[key]; delete updates[key];
} else if ('object' === typeof defaults[key] && 'object' === typeof updates[key]) { } else if (
updates[key] = mergeOrDelete(defaults[key], updates[key]); 'object' === typeof defaults[key] &&
} 'object' === typeof updates[key]
}); ) {
updates[key] = mergeOrDelete(defaults[key], updates[key]);
}
});
return updates; return updates;
} }
// retrieves an existing header, case-sensitive // retrieves an existing header, case-sensitive
function getHeaderName(reqOpts, header) { function getHeaderName(reqOpts, header) {
var headerNames = {}; var headerNames = {};
Object.keys(reqOpts.headers).forEach(function (casedName) { Object.keys(reqOpts.headers).forEach(function(casedName) {
headerNames[casedName.toLowerCase()] = casedName; headerNames[casedName.toLowerCase()] = casedName;
}); });
// returns the key, which in erroneous cases could be an empty string // returns the key, which in erroneous cases could be an empty string
return headerNames[header.toLowerCase()]; return headerNames[header.toLowerCase()];
} }
// returns whether or not a header exists, case-insensitive // returns whether or not a header exists, case-insensitive
function hasHeader(reqOpts, header) { function hasHeader(reqOpts, header) {
return 'undefined' !== typeof getHeaderName(reqOpts, header); return 'undefined' !== typeof getHeaderName(reqOpts, header);
} }
function toJSONifier(keys) { function toJSONifier(keys) {
return function() {
var obj = {};
var me = this;
return function () { keys.forEach(function(key) {
var obj = {}; if (me[key] && 'function' === typeof me[key].toJSON) {
var me = this; obj[key] = me[key].toJSON();
} else {
obj[key] = me[key];
}
});
keys.forEach(function (key) { return obj;
if (me[key] && 'function' === typeof me[key].toJSON) { };
obj[key] = me[key].toJSON();
} else {
obj[key] = me[key];
}
});
return obj;
};
} }
function setDefaults(defs) { function setDefaults(defs) {
defs = defs || {}; defs = defs || {};
function urequestHelper(opts, cb) { function urequestHelper(opts, cb) {
debug("\n[urequest] processed options:"); debug('\n[urequest] processed options:');
debug(opts); debug(opts);
function onResponse(resp) { function onResponse(resp) {
var followRedirect; var followRedirect;
Object.keys(defs).forEach(function (key) { Object.keys(defs).forEach(function(key) {
if (key in opts && 'undefined' !== typeof opts[key]) { if (key in opts && 'undefined' !== typeof opts[key]) {
return; return;
} }
opts[key] = defs[key]; opts[key] = defs[key];
});
followRedirect = opts.followRedirect;
resp.toJSON = toJSONifier([ 'statusCode', 'body', 'headers', 'request' ]);
resp.request = req;
resp.request.uri = url.parse(opts.url);
//resp.request.method = opts.method;
resp.request.headers = finalOpts.headers;
resp.request.toJSON = toJSONifier([ 'uri', 'method', 'headers' ]);
if (followRedirect && resp.headers.location && -1 !== [ 301, 302, 307, 308 ].indexOf(resp.statusCode)) {
debug('Following redirect: ' + resp.headers.location);
if ('GET' !== opts.method && !opts.followAllRedirects) {
followRedirect = false;
}
if (opts._redirectCount >= opts.maxRedirects) {
followRedirect = false;
}
if ('function' === opts.followRedirect) {
if (!opts.followRedirect(resp)) {
followRedirect = false;
}
}
if (followRedirect) {
if (!opts.followOriginalHttpMethod) {
opts.method = 'GET';
opts.body = null;
delete opts.headers[getHeaderName(opts, 'Content-Length')];
delete opts.headers[getHeaderName(opts, 'Transfer-Encoding')];
}
if (opts.removeRefererHeader && opts.headers) {
delete opts.headers.referer;
}
// TODO needs baseUrl, maybe test for host / socketPath?
opts.url = resp.headers.location;
opts.uri = url.parse(opts.url);
return urequestHelper(opts, cb);
}
}
if (null === opts.encoding) {
resp._body = [];
} else {
resp.body = '';
}
resp._bodyLength = 0;
resp.on('data', function (chunk) {
if ('string' === typeof resp.body) {
resp.body += chunk.toString(opts.encoding);
} else {
resp._body.push(chunk);
resp._bodyLength += chunk.length;
}
});
resp.on('end', function () {
if ('string' !== typeof resp.body) {
if (1 === resp._body.length) {
resp.body = resp._body[0];
} else {
resp.body = Buffer.concat(resp._body, resp._bodyLength);
}
resp._body = null;
}
if (opts.json && 'string' === typeof resp.body) {
// TODO I would parse based on Content-Type
// but request.js doesn't do that.
try {
resp.body = JSON.parse(resp.body);
} catch(e) {
// ignore
}
}
debug("\n[urequest] resp.toJSON():");
debug(resp.toJSON());
cb(null, resp, resp.body);
});
}
var req;
var finalOpts = {};
var _body;
var MyFormData;
var form;
var formHeaders;
var requester;
if (opts.body) {
if (true === opts.json) {
_body = JSON.stringify(opts.body);
} else {
_body = opts.body;
}
} else if (opts.json && true !== opts.json) {
_body = JSON.stringify(opts.json);
} else if (opts.form) {
_body = Object.keys(opts.form).filter(function (key) {
if ('undefined' !== typeof opts.form[key]) {
return true;
}
}).map(function (key) {
return encodeURIComponent(key) + '=' + encodeURIComponent(String(opts.form[key]));
}).join('&');
opts.headers['Content-Type'] = 'application/x-www-form-urlencoded';
}
if ('string' === typeof _body) {
_body = Buffer.from(_body);
}
Object.keys(opts.uri).forEach(function (key) {
finalOpts[key] = opts.uri[key];
});
// A bug should be raised if request does it differently,
// but I think we're supposed to pass all acceptable options
// on to the raw http request
[ 'family', 'host', 'localAddress', 'agent', 'createConnection'
, 'timeout', 'setHost'
].forEach(function (key) {
finalOpts[key] = opts.uri[key];
});
finalOpts.method = opts.method;
finalOpts.headers = JSON.parse(JSON.stringify(opts.headers));
if (_body) {
// Most APIs expect (or require) Content-Length except in the case of multipart uploads
// Transfer-Encoding: Chunked (the default) is generally only well-supported downstream
finalOpts.headers['Content-Length'] = _body.byteLength || _body.length;
}
if (opts.auth) {
// if opts.uri specifies auth it will be parsed by url.parse and passed directly to the http module
if ('string' !== typeof opts.auth) {
opts.auth = (opts.auth.user||opts.auth.username||'') + ':' + (opts.auth.pass||opts.auth.password||'');
}
if ('string' === typeof opts.auth) {
finalOpts.auth = opts.auth;
}
if (false === opts.sendImmediately) {
console.warn("[Warn] setting `sendImmediately: false` is not yet supported. Please open an issue if this is an important feature that you need.");
}
if (opts.bearer) {
// having a shortcut for base64 encoding makes sense, but this? Eh, whatevs...
finalOpts.header.Authorization = 'Bearer: ' + opts.bearer;
}
}
if (opts.formData) {
try {
MyFormData = opts.FormData || require('form-data');
// potential options https://github.com/felixge/node-combined-stream/blob/master/lib/combined_stream.js#L7-L15
} catch(e) {
console.error("urequest does not include extra dependencies by default");
console.error("if you need to use 'form-data' you may install it, like so:");
console.error(" npm install --save form-data");
cb(e);
return;
}
try {
form = new MyFormData();
Object.keys(opts.formData).forEach(function (key) {
function add(key, data, opts) {
if (data.value) { opts = data.options; data = data.value; }
form.append(key, data, opts);
}
if (Array.isArray(opts.formData[key])) {
opts.formData[key].forEach(function (data) {
add(key, data);
}); });
} else { followRedirect = opts.followRedirect;
add(key, opts.formData[key]);
} resp.toJSON = toJSONifier([
'statusCode',
'body',
'headers',
'request'
]);
resp.request = req;
resp.request.uri = url.parse(opts.url);
//resp.request.method = opts.method;
resp.request.headers = finalOpts.headers;
resp.request.toJSON = toJSONifier(['uri', 'method', 'headers']);
if (
followRedirect &&
resp.headers.location &&
-1 !== [301, 302, 307, 308].indexOf(resp.statusCode)
) {
debug('Following redirect: ' + resp.headers.location);
if ('GET' !== opts.method && !opts.followAllRedirects) {
followRedirect = false;
}
if (opts._redirectCount >= opts.maxRedirects) {
followRedirect = false;
}
if ('function' === opts.followRedirect) {
if (!opts.followRedirect(resp)) {
followRedirect = false;
}
}
if (followRedirect) {
if (!opts.followOriginalHttpMethod) {
opts.method = 'GET';
opts.body = null;
delete opts.headers[
getHeaderName(opts, 'Content-Length')
];
delete opts.headers[
getHeaderName(opts, 'Transfer-Encoding')
];
}
if (opts.removeRefererHeader && opts.headers) {
delete opts.headers.referer;
}
// TODO needs baseUrl, maybe test for host / socketPath?
opts.url = resp.headers.location;
opts.uri = url.parse(opts.url);
return urequestHelper(opts, cb);
}
}
if (null === opts.encoding) {
resp._body = [];
} else {
resp.body = '';
}
resp._bodyLength = 0;
resp.on('data', function(chunk) {
if ('string' === typeof resp.body) {
resp.body += chunk.toString(opts.encoding);
} else {
resp._body.push(chunk);
resp._bodyLength += chunk.length;
}
});
resp.on('end', function() {
if ('string' !== typeof resp.body) {
if (1 === resp._body.length) {
resp.body = resp._body[0];
} else {
resp.body = Buffer.concat(resp._body, resp._bodyLength);
}
resp._body = null;
}
if (opts.json && 'string' === typeof resp.body) {
// TODO I would parse based on Content-Type
// but request.js doesn't do that.
try {
resp.body = JSON.parse(resp.body);
} catch (e) {
// ignore
}
}
debug('\n[urequest] resp.toJSON():');
debug(resp.toJSON());
cb(null, resp, resp.body);
});
}
var req;
var finalOpts = {};
var _body;
var MyFormData;
var form;
var formHeaders;
var requester;
if (opts.body) {
if (true === opts.json) {
_body = JSON.stringify(opts.body);
} else {
_body = opts.body;
}
} else if (opts.json && true !== opts.json) {
_body = JSON.stringify(opts.json);
} else if (opts.form) {
_body = Object.keys(opts.form)
.filter(function(key) {
if ('undefined' !== typeof opts.form[key]) {
return true;
}
})
.map(function(key) {
return (
encodeURIComponent(key) +
'=' +
encodeURIComponent(String(opts.form[key]))
);
})
.join('&');
opts.headers['Content-Type'] = 'application/x-www-form-urlencoded';
}
if ('string' === typeof _body) {
_body = Buffer.from(_body);
}
Object.keys(opts.uri).forEach(function(key) {
finalOpts[key] = opts.uri[key];
}); });
} catch(e) {
cb(e); // A bug should be raised if request does it differently,
return; // but I think we're supposed to pass all acceptable options
} // on to the raw http request
formHeaders = form.getHeaders(); [
Object.keys(formHeaders).forEach(function (header) { 'family',
finalOpts.headers[header] = formHeaders[header]; 'host',
}); 'localAddress',
'agent',
'createConnection',
'timeout',
'setHost'
].forEach(function(key) {
finalOpts[key] = opts.uri[key];
});
finalOpts.method = opts.method;
finalOpts.headers = JSON.parse(JSON.stringify(opts.headers));
if (_body) {
// Most APIs expect (or require) Content-Length except in the case of multipart uploads
// Transfer-Encoding: Chunked (the default) is generally only well-supported downstream
finalOpts.headers['Content-Length'] =
_body.byteLength || _body.length;
}
if (opts.auth) {
// if opts.uri specifies auth it will be parsed by url.parse and passed directly to the http module
if ('string' !== typeof opts.auth) {
opts.auth =
(opts.auth.user || opts.auth.username || '') +
':' +
(opts.auth.pass || opts.auth.password || '');
}
if ('string' === typeof opts.auth) {
finalOpts.auth = opts.auth;
}
if (false === opts.sendImmediately) {
console.warn(
'[Warn] setting `sendImmediately: false` is not yet supported. Please open an issue if this is an important feature that you need.'
);
}
if (opts.bearer) {
// having a shortcut for base64 encoding makes sense, but this? Eh, whatevs...
finalOpts.header.Authorization = 'Bearer: ' + opts.bearer;
}
}
if (opts.formData) {
try {
MyFormData = opts.FormData || require('form-data');
// potential options https://github.com/felixge/node-combined-stream/blob/master/lib/combined_stream.js#L7-L15
} catch (e) {
console.error(
'urequest does not include extra dependencies by default'
);
console.error(
"if you need to use 'form-data' you may install it, like so:"
);
console.error(' npm install --save form-data');
cb(e);
return;
}
try {
form = new MyFormData();
Object.keys(opts.formData).forEach(function(key) {
function add(key, data, opts) {
if (data.value) {
opts = data.options;
data = data.value;
}
form.append(key, data, opts);
}
if (Array.isArray(opts.formData[key])) {
opts.formData[key].forEach(function(data) {
add(key, data);
});
} else {
add(key, opts.formData[key]);
}
});
} catch (e) {
cb(e);
return;
}
formHeaders = form.getHeaders();
Object.keys(formHeaders).forEach(function(header) {
finalOpts.headers[header] = formHeaders[header];
});
}
// TODO support unix sockets
if ('https:' === finalOpts.protocol) {
// https://nodejs.org/api/https.html#https_https_request_options_callback
debug('\n[urequest] https.request(opts):');
debug(finalOpts);
requester = https;
} else if ('http:' === finalOpts.protocol) {
// https://nodejs.org/api/http.html#http_http_request_options_callback
debug('\n[urequest] http.request(opts):');
debug(finalOpts);
requester = http;
} else {
cb(new Error("unknown protocol: '" + opts.uri.protocol + "'"));
return;
}
if (form) {
debug("\n[urequest] '" + finalOpts.method + "' (request) form");
debug(formHeaders);
// generally uploads don't use Chunked Encoding (some systems have issues with it)
// and I don't want to do the work to calculate the content-lengths. This seems to work.
req = form.submit(finalOpts, function(err, resp) {
if (err) {
cb(err);
return;
}
onResponse(resp);
resp.resume();
});
//req = requester.request(finalOpts, onResponse);
//req.on('error', cb);
//form.pipe(req);
return;
}
req = requester.request(finalOpts, onResponse);
req.on('error', cb);
if (_body) {
debug("\n[urequest] '" + finalOpts.method + "' (request) body");
debug(_body);
// used for chunked encoding
//req.write(_body);
// used for known content-length
req.end(_body);
} else {
req.end();
}
} }
// TODO support unix sockets function parseUrl(str) {
if ('https:' === finalOpts.protocol) { var obj = url.parse(str);
// https://nodejs.org/api/https.html#https_https_request_options_callback var paths;
debug("\n[urequest] https.request(opts):"); if ('unix' !== (obj.hostname || obj.host || '').toLowerCase()) {
debug(finalOpts); return obj;
requester = https; }
} else if ('http:' === finalOpts.protocol) {
// https://nodejs.org/api/http.html#http_http_request_options_callback obj.href = null;
debug("\n[urequest] http.request(opts):"); obj.hostname = obj.host = null;
debug(finalOpts);
requester = http; paths = (obj.pathname || obj.path || '').split(':');
} else {
cb(new Error("unknown protocol: '" + opts.uri.protocol + "'")); obj.socketPath = paths.shift();
return; obj.pathname = obj.path = paths.join(':');
return obj;
} }
if (form) { function urequest(opts, cb) {
debug("\n[urequest] '" + finalOpts.method + "' (request) form"); debug('\n[urequest] received options:');
debug(formHeaders); debug(opts);
// generally uploads don't use Chunked Encoding (some systems have issues with it) var reqOpts = {};
// and I don't want to do the work to calculate the content-lengths. This seems to work. // request.js behavior:
req = form.submit(finalOpts, function (err, resp) { // encoding: null + json ? unknown
if (err) { cb(err); return; } // json => attempt to parse, fail silently
onResponse(resp); // encoding => buffer.toString(encoding)
resp.resume(); // null === encoding => Buffer.concat(buffers)
}); if ('string' === typeof opts) {
//req = requester.request(finalOpts, onResponse); opts = { url: opts };
//req.on('error', cb); }
//form.pipe(req);
return; module.exports._keys.forEach(function(key) {
if (key in opts && 'undefined' !== typeof opts[key]) {
reqOpts[key] = opts[key];
} else if (key in defs) {
reqOpts[key] = defs[key];
}
});
// TODO url.resolve(defs.baseUrl, opts.url);
if ('string' === typeof opts.url || 'string' === typeof opts.uri) {
if ('string' === typeof opts.url) {
reqOpts.url = opts.url;
reqOpts.uri = parseUrl(opts.url);
} else if ('string' === typeof opts.uri) {
reqOpts.url = opts.uri;
reqOpts.uri = parseUrl(opts.uri);
}
} else {
if ('object' === typeof opts.uri) {
reqOpts.url = url.format(opts.uri);
reqOpts.uri = opts.uri;
//reqOpts.uri = url.parse(reqOpts.uri);
} else if ('object' === typeof opts.url) {
reqOpts.url = url.format(opts.url);
reqOpts.uri = opts.url;
//reqOpts.uri = url.parse(reqOpts.url);
}
}
if (
opts.body ||
'string' === typeof opts.json ||
opts.form ||
opts.formData
) {
// TODO this is probably a deviation from request's API
// need to check and probably eliminate it
reqOpts.method = (reqOpts.method || 'POST').toUpperCase();
} else {
reqOpts.method = (reqOpts.method || 'GET').toUpperCase();
}
if (!reqOpts.headers) {
reqOpts.headers = {};
}
// crazy case for easier testing
if (!hasHeader(reqOpts, 'CoNTeNT-TyPe')) {
if (
(true === reqOpts.json && reqOpts.body) ||
(true !== reqOpts.json && reqOpts.json)
) {
reqOpts.headers['Content-Type'] = 'application/json';
}
}
return urequestHelper(reqOpts, cb);
} }
req = requester.request(finalOpts, onResponse); urequest.defaults = function(_defs) {
req.on('error', cb); _defs = mergeOrDelete(defs, _defs);
return setDefaults(_defs);
if (_body) {
debug("\n[urequest] '" + finalOpts.method + "' (request) body");
debug(_body);
// used for chunked encoding
//req.write(_body);
// used for known content-length
req.end(_body);
} else {
req.end();
}
}
function parseUrl(str) {
var obj = url.parse(str);
var paths;
if ('unix' !== (obj.hostname||obj.host||'').toLowerCase()) {
return obj;
}
obj.href = null;
obj.hostname = obj.host = null;
paths = (obj.pathname||obj.path||'').split(':');
obj.socketPath = paths.shift();
obj.pathname = obj.path = paths.join(':');
return obj;
}
function urequest(opts, cb) {
debug("\n[urequest] received options:");
debug(opts);
var reqOpts = {};
// request.js behavior:
// encoding: null + json ? unknown
// json => attempt to parse, fail silently
// encoding => buffer.toString(encoding)
// null === encoding => Buffer.concat(buffers)
if ('string' === typeof opts) {
opts = { url: opts };
}
module.exports._keys.forEach(function (key) {
if (key in opts && 'undefined' !== typeof opts[key]) {
reqOpts[key] = opts[key];
} else if (key in defs) {
reqOpts[key] = defs[key];
}
});
// TODO url.resolve(defs.baseUrl, opts.url);
if ('string' === typeof opts.url || 'string' === typeof opts.uri) {
if ('string' === typeof opts.url) {
reqOpts.url = opts.url;
reqOpts.uri = parseUrl(opts.url);
} else if ('string' === typeof opts.uri) {
reqOpts.url = opts.uri;
reqOpts.uri = parseUrl(opts.uri);
}
} else {
if ('object' === typeof opts.uri) {
reqOpts.url = url.format(opts.uri);
reqOpts.uri = opts.uri;
//reqOpts.uri = url.parse(reqOpts.uri);
} else if ('object' === typeof opts.url) {
reqOpts.url = url.format(opts.url);
reqOpts.uri = opts.url;
//reqOpts.uri = url.parse(reqOpts.url);
}
}
if (opts.body || 'string' === typeof opts.json || opts.form || opts.formData) {
// TODO this is probably a deviation from request's API
// need to check and probably eliminate it
reqOpts.method = (reqOpts.method || 'POST').toUpperCase();
} else {
reqOpts.method = (reqOpts.method || 'GET').toUpperCase();
}
if (!reqOpts.headers) {
reqOpts.headers = {};
}
// crazy case for easier testing
if (!hasHeader(reqOpts, 'CoNTeNT-TyPe')) {
if ((true === reqOpts.json && reqOpts.body)
|| (true !== reqOpts.json && reqOpts.json)) {
reqOpts.headers['Content-Type'] = 'application/json';
}
}
return urequestHelper(reqOpts, cb);
}
urequest.defaults = function (_defs) {
_defs = mergeOrDelete(defs, _defs);
return setDefaults(_defs);
};
[ 'get', 'put', 'post', 'patch', 'delete', 'head', 'options' ].forEach(function (method) {
urequest[method] = function (obj, cb) {
if ('string' === typeof obj) {
obj = { url: obj };
}
obj.method = method.toUpperCase();
urequest(obj, cb);
}; };
}); ['get', 'put', 'post', 'patch', 'delete', 'head', 'options'].forEach(
urequest.del = urequest.delete; function(method) {
urequest[method] = function(obj, cb) {
if ('string' === typeof obj) {
obj = { url: obj };
}
obj.method = method.toUpperCase();
urequest(obj, cb);
};
}
);
urequest.del = urequest.delete;
return urequest; return urequest;
} }
var _defaults = { var _defaults = {
sendImmediately: true sendImmediately: true,
, method: 'GET' method: 'GET',
, headers: {} headers: {},
, useQuerystring: false useQuerystring: false,
, followRedirect: true followRedirect: true,
, followAllRedirects: false followAllRedirects: false,
, followOriginalHttpMethod: false followOriginalHttpMethod: false,
, maxRedirects: 10 maxRedirects: 10,
, removeRefererHeader: false removeRefererHeader: false,
//, encoding: undefined //, encoding: undefined
, gzip: false gzip: false
//, body: undefined //, body: undefined
//, json: undefined //, json: undefined
}; };
module.exports = setDefaults(_defaults); module.exports = setDefaults(_defaults);
module.exports._keys = Object.keys(_defaults).concat([ module.exports._keys = Object.keys(_defaults).concat([
'encoding' 'encoding',
, 'body' 'body',
, 'json' 'json',
, 'form' 'form',
, 'auth' 'auth',
, 'formData' 'formData',
, 'FormData' 'FormData'
]); ]);
module.exports.debug = (-1 !== (process.env.NODE_DEBUG||'').split(/\s+/g).indexOf('urequest')); module.exports.debug =
-1 !== (process.env.NODE_DEBUG || '').split(/\s+/g).indexOf('urequest');
debug("DEBUG ON for urequest"); debug('DEBUG ON for urequest');

View File

@ -1,29 +1,29 @@
{ {
"name": "@root/request", "name": "@root/request",
"version": "1.3.11", "version": "1.3.11",
"description": "A lightweight, zero-dependency drop-in replacement for request", "description": "A lightweight, zero-dependency drop-in replacement for request",
"main": "index.js", "main": "index.js",
"files": [ "files": [
"lib" "lib"
], ],
"directories": { "directories": {
"example": "examples" "example": "examples"
}, },
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://git.rootprojects.org/root/request.js.git" "url": "https://git.rootprojects.org/root/request.js.git"
}, },
"keywords": [ "keywords": [
"request", "request",
"lightweight", "lightweight",
"alternative", "alternative",
"http", "http",
"https", "https",
"call" "call"
], ],
"author": "AJ ONeal <solderjs@gmail.com> (https://solderjs.com/)", "author": "AJ ONeal <solderjs@gmail.com> (https://solderjs.com/)",
"license": "(MIT OR Apache-2.0)" "license": "(MIT OR Apache-2.0)"
} }

View File

@ -1,11 +1,11 @@
'use strict'; 'use strict';
var net = require('net'); var net = require('net');
var server = net.createServer(function (socket) { var server = net.createServer(function(socket) {
socket.on('data', function (chunk) { socket.on('data', function(chunk) {
console.info(chunk.toString('utf8')); console.info(chunk.toString('utf8'));
}); });
}) });
server.listen(3007, function () { server.listen(3007, function() {
console.info("Listening on", this.address()); console.info('Listening on', this.address());
}); });