Skip to content

Commit

Permalink
Declaring variables within the logical scope
Browse files Browse the repository at this point in the history
  • Loading branch information
avoidwork committed May 27, 2017
1 parent 9f5d895 commit 981bf8d
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 24 deletions.
38 changes: 15 additions & 23 deletions lib/woodland.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ class Woodland {

allows (uri, host, override = false) {
const key = this.hash(host + delimiter + uri);
let result = !override ? this.permissions.get(key) : undefined,
list, odx;
let result = !override ? this.permissions.get(key) : undefined;

if (override || !result) {
list = methods.filter(i => this.allowed(i, uri, host, override));
odx = list.indexOf("OPTIONS");
let list = methods.filter(i => this.allowed(i, uri, host, override)),
odx = list.indexOf("OPTIONS");

if (odx > -1) {
list.splice(odx, 1);
Expand Down Expand Up @@ -114,11 +113,10 @@ class Woodland {

onerror (req, res, err) {
const numeric = !isNaN(err.message),
status = !isNaN(res.statusCode) && res.statusCode >= 400 ? res.statusCode : numeric ? Number(err.message) : 500,
body = numeric ? http.STATUS_CODES[status] : err.message;
status = !isNaN(res.statusCode) && res.statusCode >= 400 ? res.statusCode : numeric ? Number(err.message) : 500;

res.writeHead(status, {"content-type": "text/plain"});
res.end(body);
res.end(numeric ? http.STATUS_CODES[status] : err.message);
}

onfinish () {}
Expand All @@ -132,31 +130,25 @@ class Woodland {
}

route (req, res) {
let deferred = defer(),
method = head.test(req.method) ? "GET" : req.method,
const deferred = defer();
let method = head.test(req.method) ? "GET" : req.method,
middleware, result;

let last = err => {
let errorCode, status;

if (err === undefined) {
deferred.reject((req.allow || "").indexOf("GET") > -1 ? new Error(405) : new Error(404));
} else if (!isNaN(res.statusCode) && res.statusCode >= 400) {
deferred.reject(err);
} else {
errorCode = !isNaN(err.message) ? err.message : http.STATUS_CODES[err.message || err] || 500;
status = res.statusCode >= 400 ? res.statusCode : errorCode;
deferred.reject(new Error(status));
deferred.reject(new Error(res.statusCode >= 400 ? res.statusCode : !isNaN(err.message) ? err.message : http.STATUS_CODES[err.message || err] || 500));
}
};

let next = err => {
process.nextTick(() => {
let arity, iter;

if (!res._headerSent) {
iter = middleware.next();
arity = !iter.done ? utility.getArity(iter.value) : 0;
let iter = middleware.next(),
arity = !iter.done ? utility.getArity(iter.value) : 0;

if (!iter.done) {
if (err !== undefined) {
Expand Down Expand Up @@ -223,15 +215,15 @@ class Woodland {
const key = this.hash(method + delimiter + host + delimiter + uri),
cached = !override ? this.cache.get(key) : undefined;
let params = false,
allMap, hostMap, middleware, pos, result;
result;

if (cached !== undefined) {
result = cached;
} else {
allMap = this.middleware.get(all) || new Map();
hostMap = this.middleware.get(host) || new Map();
middleware = [];
pos = [];
let allMap = this.middleware.get(all) || new Map(),
hostMap = this.middleware.get(host) || new Map(),
middleware = [],
pos = [];

retsu.each([allMap.get(allMethod), allMap.get(method), hostMap.get(allMethod), hostMap.get(method)], map => {
if (map !== undefined) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "woodland",
"version": "1.2.8",
"version": "1.2.9",
"description": "Lightweight HTTP/HTTPS router with virtual hosts & automatic Allow header",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 981bf8d

Please sign in to comment.