Skip to content

Commit

Permalink
standard --fix
Browse files Browse the repository at this point in the history
  • Loading branch information
refractalize committed Apr 11, 2017
1 parent ac5e810 commit 4c99976
Show file tree
Hide file tree
Showing 15 changed files with 1,730 additions and 1,743 deletions.
8 changes: 4 additions & 4 deletions browser.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var httpism = require('./httpism');
var middleware = require('./browserMiddleware');
var utils = require('./middlewareUtils');
var httpism = require('./httpism')
var middleware = require('./browserMiddleware')
var utils = require('./middlewareUtils')

module.exports = httpism(
undefined,
Expand All @@ -15,4 +15,4 @@ module.exports = httpism(
utils.querystring,
middleware.send
]
);
)
244 changes: 122 additions & 122 deletions browserMiddleware.js
Original file line number Diff line number Diff line change
@@ -1,214 +1,214 @@
var window = require('global');
var utils = require('./middlewareUtils');
var querystringLite = require('./querystring-lite');
var randomString = require('random-string');

function middleware(name, fn) {
exports[name] = fn;
fn.middleware = name;
var window = require('global')
var utils = require('./middlewareUtils')
var querystringLite = require('./querystring-lite')
var randomString = require('random-string')

function middleware (name, fn) {
exports[name] = fn
fn.middleware = name
}

middleware('exception', utils.exception);
middleware('querystring', utils.querystring);
middleware('expandUrl', utils.expandUrl);
middleware('exception', utils.exception)
middleware('querystring', utils.querystring)
middleware('expandUrl', utils.expandUrl)

middleware('json', function(request, next) {
middleware('json', function (request, next) {
if (request.body instanceof Object) {
request.body = JSON.stringify(request.body);
utils.setHeaderTo(request, "content-type", "application/json");
request.body = JSON.stringify(request.body)
utils.setHeaderTo(request, 'content-type', 'application/json')
}

utils.setHeaderTo(request, "accept", "application/json");
utils.setHeaderTo(request, 'accept', 'application/json')

return next().then(function(response) {
if (utils.shouldParseAs(response, "json", request)) {
response.body = JSON.parse(response.body, request.options.jsonReviver);
return next().then(function (response) {
if (utils.shouldParseAs(response, 'json', request)) {
response.body = JSON.parse(response.body, request.options.jsonReviver)
}
return response;
});
});
return response
})
})

function randomGlobal(value) {
var name;
function randomGlobal (value) {
var name

do {
name = '_' + randomString({length: 20});
} while(typeof window[name] !== 'undefined');
name = '_' + randomString({length: 20})
} while (typeof window[name] !== 'undefined')

window[name] = value;
window[name] = value

return name;
return name
}

middleware('jsonp', function(request, next) {
var jsonp = request.options.jsonp;
middleware('jsonp', function (request, next) {
var jsonp = request.options.jsonp

if (jsonp) {
request.options.querystring = request.options.querystring || {};
request.options.querystring = request.options.querystring || {}

return new Promise(function (resolve, reject) {
var callbackName = randomGlobal(function(v) {
delete window[callbackName];
document.head.removeChild(script);
var callbackName = randomGlobal(function (v) {
delete window[callbackName]
document.head.removeChild(script)
resolve({
statusCode: 200,
headers: {},
body: v
});
});
})
})

request.options.querystring[jsonp] = callbackName;
request.options.querystring[jsonp] = callbackName

utils.mergeQueryString(request);
utils.mergeQueryString(request)

var script = document.createElement('script');
script.type = 'text/javascript';
script.src = request.url;
script.onerror = function(error) {
reject(new Error('could not load script tag for JSONP request: ' + request.url));
};
document.head.appendChild(script);
});
var script = document.createElement('script')
script.type = 'text/javascript'
script.src = request.url
script.onerror = function (error) {
reject(new Error('could not load script tag for JSONP request: ' + request.url))
}
document.head.appendChild(script)
})
}

return next();
});
return next()
})

middleware('text', function(request, next) {
middleware('text', function (request, next) {
if (typeof request.body === 'string') {
utils.setHeaderTo(request, "content-type", "text/plain;charset=UTF-8");
utils.setHeaderTo(request, 'content-type', 'text/plain;charset=UTF-8')
}

return next();
});
return next()
})

middleware('form', function(request, next) {
middleware('form', function (request, next) {
if (request.options.form && request.body instanceof Object) {
var querystring = request.options.qs || querystringLite;
setBodyToString(request, querystring.stringify(request.body));
utils.setHeaderTo(request, "content-type", "application/x-www-form-urlencoded");
var querystring = request.options.qs || querystringLite
setBodyToString(request, querystring.stringify(request.body))
utils.setHeaderTo(request, 'content-type', 'application/x-www-form-urlencoded')
}

return next().then(function(response) {
var querystring = request.options.qs || querystringLite;
if (utils.shouldParseAs(response, "form", request)) {
response.body = querystring.parse(response.body);
return next().then(function (response) {
var querystring = request.options.qs || querystringLite
if (utils.shouldParseAs(response, 'form', request)) {
response.body = querystring.parse(response.body)
}
return response;
});
});
return response
})
})

function setBodyToString(r, s) {
r.body = s;
function setBodyToString (r, s) {
r.body = s
}

function parseHeaders(headers) {
var object = {};
var lines = headers.split('\n');
function parseHeaders (headers) {
var object = {}
var lines = headers.split('\n')

for(var n = 0; n < lines.length; n++) {
var line = lines[n];
var match = /^(.*?):(.*)/.exec(line);
for (var n = 0; n < lines.length; n++) {
var line = lines[n]
var match = /^(.*?):(.*)/.exec(line)

if (match) {
object[match[1].toLowerCase()] = match[2].trim();
object[match[1].toLowerCase()] = match[2].trim()
}
}

return object;
return object
}

function toUpperCase(x) {
return x.toUpperCase();
function toUpperCase (x) {
return x.toUpperCase()
}

function formatHeaderName(name) {
return name.replace(/^([a-z])/, toUpperCase).replace(/-([a-z])/g, toUpperCase);
function formatHeaderName (name) {
return name.replace(/^([a-z])/, toUpperCase).replace(/-([a-z])/g, toUpperCase)
}

function setHeaders(headers, xhr) {
var headerNames = Object.keys(headers);
function setHeaders (headers, xhr) {
var headerNames = Object.keys(headers)

for (var n = 0; n < headerNames.length; n++) {
var key = headerNames[n];
var headerName = formatHeaderName(key);
xhr.setRequestHeader(headerName, headers[key]);
var key = headerNames[n]
var headerName = formatHeaderName(key)
xhr.setRequestHeader(headerName, headers[key])
}
}

function responseUrl(xhr, requestUrl) {
var origin = location.origin;
var responseUrl = xhr.responseURL;
function responseUrl (xhr, requestUrl) {
var origin = location.origin
var responseUrl = xhr.responseURL

if (responseUrl) {
if (responseUrl.substring(0, origin.length) == origin) {
return responseUrl.substring(origin.length);
return responseUrl.substring(origin.length)
} else {
return responseUrl;
return responseUrl
}
} else {
return requestUrl;
return requestUrl
}
}

middleware('send', function(request) {
var Xhr = request.options.xhr || window.XMLHttpRequest;
var xhr = new Xhr();
var reject;
middleware('send', function (request) {
var Xhr = request.options.xhr || window.XMLHttpRequest
var xhr = new Xhr()
var reject

var promise = new Promise(function (fulfil, _reject) {
reject = _reject;
xhr.open(request.method, request.url, true);
reject = _reject
xhr.open(request.method, request.url, true)
xhr.onload = function () {
var statusCode = xhr.status;
var statusCode = xhr.status

var response = {
body: statusCode == 204? undefined: xhr.responseText,
body: statusCode == 204 ? undefined : xhr.responseText,
headers: parseHeaders(xhr.getAllResponseHeaders()),
statusCode: statusCode,
url: responseUrl(xhr, request.url),
xhr: xhr,
statusText: xhr.statusText
};
}

fulfil(response);
};
fulfil(response)
}

xhr.onerror = function () {
reject(new Error('failed to connect to ' + request.method + ' ' + request.url));
};
reject(new Error('failed to connect to ' + request.method + ' ' + request.url))
}

if (!isCrossDomain(request.url) && !request.headers['x-requested-with']) {
request.headers['x-requested-with'] = 'XMLHttpRequest'
}

setHeaders(request.headers, xhr);
xhr.withCredentials = !!request.options.withCredentials;
setHeaders(request.headers, xhr)
xhr.withCredentials = !!request.options.withCredentials

xhr.send(request.body);
});
xhr.send(request.body)
})

function abort() {
xhr.abort();
var error = new Error('aborted connection to ' + request.method + ' ' + request.url);
error.aborted = true;
reject(error);
function abort () {
xhr.abort()
var error = new Error('aborted connection to ' + request.method + ' ' + request.url)
error.aborted = true
reject(error)
}
addAbortToPromise(promise, abort);
addAbortToPromise(promise, abort)

return promise;
});
return promise
})

function isCrossDomain(url) {
return /^https?:\/\//.test(url);
function isCrossDomain (url) {
return /^https?:\/\//.test(url)
}

function addAbortToPromise(promise, abort) {
var then = promise.then;
function addAbortToPromise (promise, abort) {
var then = promise.then
promise.then = function () {
var p = then.apply(this, arguments);
p.abort = abort;
addAbortToPromise(p, abort);
return p;
};
var p = then.apply(this, arguments)
p.abort = abort
addAbortToPromise(p, abort)
return p
}
}
Loading

0 comments on commit 4c99976

Please sign in to comment.