Skip to content

Commit

Permalink
Fixed bug with redirect
Browse files Browse the repository at this point in the history
  • Loading branch information
@Phara0h
Phara0h committed Jul 8, 2020
1 parent fc3a4b9 commit 638ace1
Showing 1 changed file with 61 additions and 142 deletions.
203 changes: 61 additions & 142 deletions index.js
View file
Expand Up @@ -4,252 +4,171 @@ const client = {
https: require('https'),
http: require('http'),
};

const agent = {
http: new client.http.Agent(
{
http: new client.http.Agent({
keepAlive: true
}),
https: new client.https.Agent(
{
https: new client.https.Agent({
keepAlive: true
})
};

const REDIRECT_CODES = [301, 302, 303, 307];

class SimpleError extends Error
{
constructor()
{
super(
'Error happened due to simple constraint not being 2xx status code.')
class SimpleError extends Error {
constructor() {
super('Error happened due to simple constraint not being 2xx status code.')
this.name = 'FR_Simple';
}
}

class RequestError extends Error
{
constructor(e)
{
class RequestError extends Error {
constructor(e) {
super('Error happened reguarding a request: ' + e.message)
this.name = 'FR_Simple';
}
}

class Fasquest
{
constructor()
{}

request(options, cb = null)
{
if (!cb)
{
class Fasquest {
constructor() {}
request(options, cb = null) {
if (!cb) {
return this.requestPromise(options);
}
else
{
this._request(options, (err, req, res) =>
{
reject(
{
} else {
this._request(options, (err, req, res) => {
reject({
req,
res,
err
});
})
}
}

requestPromise(options)
{
return new Promise((resolve, reject) =>
{
this._request(options, (req, res, err) =>
{
if (err)
{
reject(
{
requestPromise(options) {
return new Promise((resolve, reject) => {
this._request(options, (req, res, err) => {
if (err) {
reject({
req,
res,
err
})
}
else
{
} else {
resolve(options.resolveWithFullResponse ? res : res.body);
}
});
});
}

_request(ops, cb, count = 0)
{
var options = this._setOptions({...ops});
if (options.body && !options.headers['Content-Length'])
{
_request(ops, cb, count = 0) {
var options = this._setOptions({
...ops
});
if (options.body && !options.headers['Content-Length']) {
options.headers['Content-Length'] = Buffer.byteLength(JSON.stringify(options.body));
}

var req = client[options.proto].request(options, (res,b,c) =>
{
var req = client[options.proto].request(options, (res) => {
res.body = '';
res.on('data', (chunk) =>
{
res.on('data', (chunk) => {
res.body += chunk;
});
res.on('end', () =>
{
res.on('end', () => {
// remove as causes circular references
delete options.agent;

if(REDIRECT_CODES.indexOf(res.statusCode) !== -1 && count < options.redirect_max)
{
options.uri = url.resolve(options.uri,res.headers.location);

return this._request(this._setOptions(options), cb, ++count);
}
else {
if (res.headers['content-type'] && res.headers['content-type'].indexOf('json') > -1)
{
try
{
if (REDIRECT_CODES.indexOf(res.statusCode) !== -1 && count < options.redirect_max) {
options.uri = url.resolve(options.uri, res.headers.location);
return this._request(this._setOptions(options), cb, ++count);
} else {
if (res.headers['content-type'] && res.headers['content-type'].indexOf('json') > -1) {
try {
res.body = JSON.parse(res.body);
}
catch (e)
{
} catch (e) {
// do nothing
}
}
if (options.simple)
{
if (res.statusCode > 299 || res.statusCode < 200)
{
if (options.simple) {
if (res.statusCode > 299 || res.statusCode < 200) {
return cb(req, res, new SimpleError());
}
}

return cb(req, res, null);
}

});
});

req.on('error', (e) =>
{
req.on('error', (e) => {
// remove as causes circular references
delete options.agent;

return cb(req, null, new RequestError(e))
});

if (options.body)
{
if (options.body) {
req.write(options.json ? JSON.stringify(options.body) : options.body);
}

req.end();
}

_setOptions(options)
{



_setOptions(options) {
options.simple = options.simple !== false;

if (options.qs)
{
options.method = options.method || 'GET';
if (options.qs) {
var escQS = qs.stringify(options.qs);

if (escQS.length > 0)
{
if (escQS.length > 0) {
options.uri += (options.uri.indexOf('?') > -1 ? '&' : '?') + escQS;
}
}
this._uri_to_options(options);

options.agent = options.agent || agent[options.proto];

if (!options.headers)
{
if (!options.headers) {
options.headers = {};
}

if (options.json)
{
if (options.json) {
options.headers['Content-Type'] = 'application/json';
}
else if (options.form)
{
} else if (options.form) {
options.body = qs.stringify(options.form);
options.headers['Content-Type'] = 'application/x-www-form-urlencoded';
options.headers['Content-Length'] = Buffer.byteLength(options.body);
}
if(options.authorization) {
if(options.authorization.basic) {
options.headers['Authorization'] = 'Basic '+Buffer.from(options.authorization.basic.client+':'+options.authorization.basic.secret, 'ascii').toString('base64');
}
else if(options.authorization.bearer) {
options.headers['Authorization'] = 'Bearer '+options.authorization.bearer;
if (options.authorization) {
if (options.authorization.basic) {
options.headers['Authorization'] = 'Basic ' + Buffer.from(options.authorization.basic.client + ':' + options.authorization.basic.secret, 'ascii').toString('base64');
} else if (options.authorization.bearer) {
options.headers['Authorization'] = 'Bearer ' + options.authorization.bearer;
}

delete options.authorization;
}


if(!options.redirect_max)
{
if (!options.redirect_max) {
options.redirect_max = 5;
}

return options;
}

_uri_to_options(options) {

var convertedUri = {
proto: '',
path: '/',
path: '',
port: 80,
host: ''
}
var splitURI = options.uri.split('://');
convertedUri.proto = splitURI[0];

if(splitURI[1].indexOf(':') > -1){
if (splitURI[1].indexOf(':') > -1) {
const port_host = splitURI[1].split(':');
const pindex = port_host[1].indexOf('/');
if(pindex > -1) {
if (pindex > -1) {
splitURI[1] = port_host[1]
convertedUri.path = splitURI[1].slice(pindex);
convertedUri.port = splitURI[1].slice(0,pindex);
convertedUri.port = splitURI[1].slice(0, pindex);
} else {
convertedUri.port = port_host[1];
convertedUri.port = port_host[1];
}
convertedUri.host = port_host[0];

}
else {
} else {
convertedUri.port = convertedUri.proto == 'https' ? 443 : 80;
}

const hostIndex = splitURI[1].indexOf('/')
if(hostIndex > -1) {
convertedUri.path = convertedUri.path ||splitURI[1].slice(hostIndex);
convertedUri.host = convertedUri.host || splitURI[1].slice(0,hostIndex);
if (hostIndex > -1) {
convertedUri.path = convertedUri.path || splitURI[1].slice(hostIndex);
convertedUri.host = convertedUri.host || splitURI[1].slice(0, hostIndex);
} else {
convertedUri.path = convertedUri.path || '/';
convertedUri.host = convertedUri.host || splitURI[1];
}

options.proto = convertedUri.proto;
options.path = convertedUri.path;
options.port = convertedUri.port;
options.host = convertedUri.host;
}
}

module.exports = new Fasquest();

0 comments on commit 638ace1

Please sign in to comment.