coolaj86
/
request.js
mirror of https://github.com/therootcompany/request.js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

make Prettier (v2)

json-url-form
AJ ONeal 3 years ago
parent
3574e35635
commit
9395ec96e3
11 changed files with 61 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      README.md
  2. 23
      examples/follow-redirect.js
  3. 2
      examples/form-data.js
  4. 2
      examples/get-to-json.js
  5. 2
      examples/http-string.js
  6. 2
      examples/https-string.js
  7. 25
      examples/no-follow-redirect.js
  8. 4
      examples/postbin.js
  9. 2
      examples/www-form.js
  10. 46
      index.js
  11. 6
      tests/tcp-listener.js

10
README.md
View File

@ -18,7 +18,7 @@ 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.
@ -31,11 +31,11 @@ request('http://www.google.com', function(error, response, body) {
var request = require('@root/request'); var request = require('@root/request');
request('http://www.google.com') request('http://www.google.com')
.then(function(response) { .then(function (response) {
console.log('statusCode:', response.statusCode); // Print the response status code if a response was received console.log('statusCode:', response.statusCode); // Print the response status code if a response was received
console.log('body:', response.body); // Print the HTML for the Google homepage. console.log('body:', response.body); // Print the HTML for the Google homepage.
}) })
.catch(function(error) { .catch(function (error) {
console.log('error:', error); // Print the error if one occurred console.log('error:', error); // Print the error if one occurred
}); });
``` ```
@ -63,7 +63,7 @@ request.post('http://service.com/upload', { form: { key: 'value' } });
// or // or
request.post( request.post(
{ url: 'http://service.com/upload', form: { key: 'value' } }, { url: 'http://service.com/upload', form: { key: 'value' } },
function(err, httpResponse, body) { function (err, httpResponse, body) {
/* ... */ /* ... */
} }
); );
@ -190,7 +190,7 @@ 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
}); });
``` ```

23
examples/follow-redirect.js
View File

@ -5,16 +5,15 @@ 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( request(
error, { uri: { protocol: 'http:', hostname: 'www.github.com' } },
response, function (error, response, body) {
body if (error) {
) { 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('Final href:', response.request.uri.href); // The final URI
console.log('Body Length:', body.length); // body length
} }
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
});

2
examples/form-data.js
View File

@ -20,7 +20,7 @@ request(
) )
} }
}, },
function(error, response, body) { 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;

2
examples/get-to-json.js
View File

@ -2,7 +2,7 @@
//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;

2
examples/http-string.js
View File

@ -2,7 +2,7 @@
//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.

2
examples/https-string.js
View File

@ -2,7 +2,7 @@
//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.

25
examples/no-follow-redirect.js
View File

@ -4,17 +4,16 @@
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( request(
error, { uri: 'https://www.github.com', followRedirect: false },
response, function (error, response, body) {
body if (error) {
) { 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('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));
} }
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));
});

4
examples/postbin.js
View File

@ -7,9 +7,9 @@ request({
//headers: { 'user-agent': 'test/1.0' } // overwrite //headers: { 'user-agent': 'test/1.0' } // overwrite
//userAgent: 'test/1.1' // add to the default //userAgent: 'test/1.1' // add to the default
}) })
.then(function(resp) { .then(function (resp) {
console.log(resp.body); console.log(resp.body);
}) })
.catch(function(err) { .catch(function (err) {
console.error(err); console.error(err);
}); });

2
examples/www-form.js
View File

@ -14,7 +14,7 @@ request(
headers: { 'X-Foo': 'Bar' }, headers: { 'X-Foo': 'Bar' },
form: { foo: 'bar', baz: 'qux' } form: { foo: 'bar', baz: 'qux' }
}, },
function(error, response, body) { 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;

46
index.js
View File

@ -13,7 +13,7 @@ function debug() {
} }
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;
@ -37,7 +37,7 @@ function mergeOrDelete(defaults, 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
@ -49,11 +49,11 @@ function hasHeader(reqOpts, header) {
} }
function toJSONifier(keys) { function toJSONifier(keys) {
return function() { return function () {
var obj = {}; var obj = {};
var me = this; var me = this;
keys.forEach(function(key) { keys.forEach(function (key) {
if (me[key] && 'function' === typeof me[key].toJSON) { if (me[key] && 'function' === typeof me[key].toJSON) {
obj[key] = me[key].toJSON(); obj[key] = me[key].toJSON();
} else { } else {
@ -78,7 +78,7 @@ function setDefaults(defs) {
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;
} }
@ -146,7 +146,7 @@ function setDefaults(defs) {
resp.body = ''; resp.body = '';
} }
resp._bodyLength = 0; resp._bodyLength = 0;
resp.on('data', function(chunk) { resp.on('data', function (chunk) {
if ('string' === typeof resp.body) { if ('string' === typeof resp.body) {
resp.body += chunk.toString(opts.encoding); resp.body += chunk.toString(opts.encoding);
} else { } else {
@ -154,7 +154,7 @@ function setDefaults(defs) {
resp._bodyLength += chunk.length; resp._bodyLength += chunk.length;
} }
}); });
resp.on('end', function() { resp.on('end', function () {
if ('string' !== typeof resp.body) { if ('string' !== typeof resp.body) {
if (1 === resp._body.length) { if (1 === resp._body.length) {
resp.body = resp._body[0]; resp.body = resp._body[0];
@ -199,12 +199,12 @@ function setDefaults(defs) {
_body = JSON.stringify(opts.json); _body = JSON.stringify(opts.json);
} else if (opts.form) { } else if (opts.form) {
_body = Object.keys(opts.form) _body = Object.keys(opts.form)
.filter(function(key) { .filter(function (key) {
if ('undefined' !== typeof opts.form[key]) { if ('undefined' !== typeof opts.form[key]) {
return true; return true;
} }
}) })
.map(function(key) { .map(function (key) {
return ( return (
encodeURIComponent(key) + encodeURIComponent(key) +
'=' + '=' +
@ -218,7 +218,7 @@ function setDefaults(defs) {
_body = Buffer.from(_body); _body = Buffer.from(_body);
} }
Object.keys(opts.uri).forEach(function(key) { Object.keys(opts.uri).forEach(function (key) {
finalOpts[key] = opts.uri[key]; finalOpts[key] = opts.uri[key];
}); });
@ -233,7 +233,7 @@ function setDefaults(defs) {
'createConnection', 'createConnection',
'timeout', 'timeout',
'setHost' 'setHost'
].forEach(function(key) { ].forEach(function (key) {
finalOpts[key] = opts.uri[key]; finalOpts[key] = opts.uri[key];
}); });
@ -299,7 +299,7 @@ function setDefaults(defs) {
} }
try { try {
form = new MyFormData(); form = new MyFormData();
Object.keys(opts.formData).forEach(function(key) { Object.keys(opts.formData).forEach(function (key) {
function add(key, data, opts) { function add(key, data, opts) {
if (data.value) { if (data.value) {
opts = data.options; opts = data.options;
@ -308,7 +308,7 @@ function setDefaults(defs) {
form.append(key, data, opts); form.append(key, data, opts);
} }
if (Array.isArray(opts.formData[key])) { if (Array.isArray(opts.formData[key])) {
opts.formData[key].forEach(function(data) { opts.formData[key].forEach(function (data) {
add(key, data); add(key, data);
}); });
} else { } else {
@ -320,7 +320,7 @@ function setDefaults(defs) {
return; return;
} }
formHeaders = form.getHeaders(); formHeaders = form.getHeaders();
Object.keys(formHeaders).forEach(function(header) { Object.keys(formHeaders).forEach(function (header) {
finalOpts.headers[header] = formHeaders[header]; finalOpts.headers[header] = formHeaders[header];
}); });
} }
@ -346,7 +346,7 @@ function setDefaults(defs) {
debug(formHeaders); debug(formHeaders);
// generally uploads don't use Chunked Encoding (some systems have issues with it) // 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. // 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) { req = form.submit(finalOpts, function (err, resp) {
if (err) { if (err) {
cb(err); cb(err);
return; return;
@ -380,7 +380,7 @@ function setDefaults(defs) {
if ('function' === typeof _body.pipe) { if ('function' === typeof _body.pipe) {
// used for chunked encoding // used for chunked encoding
_body.pipe(req); _body.pipe(req);
_body.on('error', function(err) { _body.on('error', function (err) {
// https://nodejs.org/api/stream.html#stream_readable_pipe_destination_options // https://nodejs.org/api/stream.html#stream_readable_pipe_destination_options
// if the Readable stream emits an error during processing, // if the Readable stream emits an error during processing,
// the Writable destination is not closed automatically // the Writable destination is not closed automatically
@ -427,7 +427,7 @@ function setDefaults(defs) {
opts = { url: opts }; opts = { url: opts };
} }
module.exports._keys.forEach(function(key) { module.exports._keys.forEach(function (key) {
if (key in opts && 'undefined' !== typeof opts[key]) { if (key in opts && 'undefined' !== typeof opts[key]) {
reqOpts[key] = opts[key]; reqOpts[key] = opts[key];
} else if (key in defs) { } else if (key in defs) {
@ -489,14 +489,14 @@ function setDefaults(defs) {
} }
function smartPromisify(fn) { function smartPromisify(fn) {
return function(opts) { return function (opts) {
var cb; var cb;
if ('function' === typeof arguments[1]) { if ('function' === typeof arguments[1]) {
cb = Array.prototype.slice.call(arguments)[1]; cb = Array.prototype.slice.call(arguments)[1];
return fn(opts, cb); return fn(opts, cb);
} }
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
fn(opts, function(err, resp) { fn(opts, function (err, resp) {
if (err) { if (err) {
err._response = resp; err._response = resp;
reject(err); reject(err);
@ -510,13 +510,13 @@ function setDefaults(defs) {
var smartUrequest = smartPromisify(urequest); var smartUrequest = smartPromisify(urequest);
smartUrequest.defaults = function(_defs) { smartUrequest.defaults = function (_defs) {
_defs = mergeOrDelete(defs, _defs); _defs = mergeOrDelete(defs, _defs);
return setDefaults(_defs); return setDefaults(_defs);
}; };
['get', 'put', 'post', 'patch', 'delete', 'head', 'options'].forEach( ['get', 'put', 'post', 'patch', 'delete', 'head', 'options'].forEach(
function(method) { function (method) {
smartUrequest[method] = smartPromisify(function(obj, cb) { smartUrequest[method] = smartPromisify(function (obj, cb) {
if ('string' === typeof obj) { if ('string' === typeof obj) {
obj = { url: obj }; obj = { url: obj };
} }

6
tests/tcp-listener.js
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());
}); });

Write Preview
Loading…
Cancel
Save