Skip to content

Commit

Permalink
v0.5.4 rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
@iwillwen
iwillwen committed May 6, 2012
1 parent c19695f commit 8d511de
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 349 deletions.
2 changes: 1 addition & 1 deletion index.js
View file
@@ -1,7 +1,7 @@
/*
* @fileOverview
* @author Will Wen Gunn
* @version 0.5.4
* @version 0.5.0
*/
/*
* @constructor webjs
Expand Down
167 changes: 3 additions & 164 deletions lib/http.js
View file
Expand Up @@ -2,174 +2,13 @@
* @class HTTP exports
*/
var http = require('http');
var fs = require('fs');
var util = require('util');
var eventproxy = require('eventproxy').EventProxy;
var router = require('./router');
var mimes = require('./mimes').mimes;
var utils = require('./utils');
var asynclist = require('asynclist');
var httpStatus = require('./httpstatus');
var method = require('./method');
/*
* @function Create a HTTPS Server
*/
var Request = require('./request');
var Response = require('./response');
var req, res, currentServer;
exports.createHttpServer = function (opt) {
currentServer = http.createServer(function (_req, _res) {
req = new Request(_req);
res = new Response(_res);
res.reqHeaders = req.headers;
// var tasks = events('route', req, res, global.web, currentServer);
// tasks.assign(route).run(req, res, function () {
// tasks.trigger(true);
// });
});
var currentServer = http.createServer();
currentServer.setMaxListeners(0);
method.ext(currentServer);
return currentServer;
};
function events (event, req, res, web, server) {
var handlers = global.web.listeners(event),
_handlers = server.listeners(event);
for (var i = 0;i < _handlers.length;i++) handlers.push(_handlers[i]);
var tasks = new asynclist(handlers);
return tasks;
}
function post () {
for (var key in currentServer.handlers.post)
if (currentServer.rules.post[key].test(req.reqPath))
router.handler('post', req, res, key, req.reqPath, currentServer);
}
function put () {
for (var key in currentServer.handlers.put)
if (currentServer.rules.put[key].test(req.reqPath))
router.handler('put', req, res, key, req.reqPath, currentServer);
}
function get () {
var hittedHandlers = [];
for (var key in currentServer.handlers.get)
if (currentServer.rules.get[key].test(req.reqPath)) {
req.params = utils.restParser(key, currentServer.rules.get[key], req.reqPath);
return currentServer.handlers.get[key](req, res, function () {
if (util.arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
router.urlHandler(req, res, key, req.reqPath, currentServer, global.web);
});
}
for (var key in currentServer.handlers.url)
if (currentServer.rules.url[key].test(req.reqPath))
return router.urlHandler(req, res, key, req.reqPath, currentServer, global.web);
fs.stat(req.reqPath.substr(1), function (err, stat) {
if (err) return res.sendError(404);
if (stat.isFile()) {
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
} else {
if (/\/$/i.test(req.reqPath)) {
fs.stat(req.reqPath.substr(1) + 'index.html', function (err, stat) {
if (err) return res.sendError(404);
req.reqPath = req.reqPath + 'index.html';
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
});
} else {
fs.stat(req.reqPath.substr(1) + '/index.html', function (err, stat) {
if (err) return res.sendError(404);
req.reqPath = req.reqPath + '/index.html';
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
});
}
}
});
}
function method (method) {
return function () {
if (global.web.config('readonly')) {
return false;
} else {
var tasks = events(method, exports.req, exports.res, global.web, currentServer)
tasks.assign(function () {
router.handler(method, req, res, req.reqPath, currentServer);
}).run();
}
}
}
function route () {
switch (req.method) {
case "POST":
var tasks = events('post', req, res, global.web, currentServer);
tasks.assign(post).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
break;
case "PUT":
if (currentServer.config('readonly')) {
return false;
} else {
var tasks = events('put', req, res, global.web, currentServer)
tasks.assign(put).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
}
break;
case "GET":
var tasks = events('get', req, res, global.web, currentServer);
tasks.assign(get).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
break;
default:
var tasks = events(exports.req.method, req, res, global.web, currentServer);
tasks.assign(method(exports.req.method)).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
}
}
};
167 changes: 3 additions & 164 deletions lib/https.js
View file
Expand Up @@ -2,174 +2,13 @@
* @class HTTPS exports
*/
var https = require('https');
var fs = require('fs');
var util = require('util');
var eventproxy = require('eventproxy').EventProxy;
var router = require('./router');
var mimes = require('./mimes').mimes;
var utils = require('./utils');
var asynclist = require('asynclist');
var httpStatus = require('./httpstatus');
var method = require('./method');
/*
* @function Create a HTTPS Server
*/
var Request = require('./request');
var Response = require('./response');
var req, res, currentServer;
exports.createHttpsServer = function (opt) {
currentServer = https.createServer(function (_req, _res) {
req = new Request(_req);
res = new Response(_res);
res.reqHeaders = req.headers;
// var tasks = events('route', req, res, global.web, currentServer);
// tasks.assign(route).run(req, res, function () {
// tasks.trigger(true);
// });
});
var currentServer = https.createServer();
currentServer.setMaxListeners(0);
method.ext(currentServer);
return currentServer;
};
function events (event, req, res, web, server) {
var handlers = global.web.listeners(event),
_handlers = server.listeners(event);
for (var i = 0;i < _handlers.length;i++) handlers.push(_handlers[i]);
var tasks = new asynclist(handlers);
return tasks;
}
function post () {
for (var key in currentServer.handlers.post)
if (currentServer.rules.post[key].test(req.reqPath))
router.handler('post', req, res, key, req.reqPath, currentServer);
}
function put () {
for (var key in currentServer.handlers.put)
if (currentServer.rules.put[key].test(req.reqPath))
router.handler('put', req, res, key, req.reqPath, currentServer);
}
function get () {
var hittedHandlers = [];
for (var key in currentServer.handlers.get)
if (currentServer.rules.get[key].test(req.reqPath)) {
req.params = utils.restParser(key, currentServer.rules.get[key], req.reqPath);
return currentServer.handlers.get[key](req, res, function () {
if (util.arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
router.urlHandler(req, res, key, req.reqPath, currentServer, global.web);
});
}
for (var key in currentServer.handlers.url)
if (currentServer.rules.url[key].test(req.reqPath))
return router.urlHandler(req, res, key, req.reqPath, currentServer, global.web);
fs.stat(req.reqPath.substr(1), function (err, stat) {
if (err) return res.sendError(404);
if (stat.isFile()) {
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
} else {
if (/\/$/i.test(req.reqPath)) {
fs.stat(req.reqPath.substr(1) + 'index.html', function (err, stat) {
if (err) return res.sendError(404);
req.reqPath = req.reqPath + 'index.html';
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
});
} else {
fs.stat(req.reqPath.substr(1) + '/index.html', function (err, stat) {
if (err) return res.sendError(404);
req.reqPath = req.reqPath + '/index.html';
router.fileHandler(req, res, req.reqPath, currentServer, global.web);
});
}
}
});
}
function method (method) {
return function () {
if (global.web.config('readonly')) {
return false;
} else {
var tasks = events(method, exports.req, exports.res, global.web, currentServer)
tasks.assign(function () {
router.handler(method, req, res, req.reqPath, currentServer);
}).run();
}
}
}
function route () {
switch (req.method) {
case "POST":
var tasks = events('post', req, res, global.web, currentServer);
tasks.assign(post).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
break;
case "PUT":
if (currentServer.config('readonly')) {
return false;
} else {
var tasks = events('put', req, res, global.web, currentServer)
tasks.assign(put).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
}
break;
case "GET":
var tasks = events('get', req, res, global.web, currentServer);
tasks.assign(get).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
break;
default:
var tasks = events(exports.req.method, req, res, global.web, currentServer);
tasks.assign(method(exports.req.method)).run(req, res, function () {
if (arguments[0] instanceof Error) return res.render('error/error', {
title: arguments[0].message,
root: __dirname,
layout: false,
local: {
title: arguments[0].message,
message: arguments[0].message,
stack: arguments[0].stack
}
});
tasks.trigger(true);
});
}
}
};

0 comments on commit 8d511de

Please sign in to comment.