coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

better error handling

This commit is contained in:
AJ ONeal 2015-03-02 21:45:16 +00:00
parent 413135725c
commit db7e736659
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
lib/vhost-sni-server.js
View File

@ -28,6 +28,43 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
return dummyCerts; return dummyCerts;
} }
function handleAppScopedError(fn) {
return function (req, res, next) {
next(function (err) {
if (!err) {
fn(req, res);
return;
}
console.error(err);
res.writeHead(500);
res.end(
"<html>"
+ "<head>"
+ '<link rel="icon" href="favicon.ico" />'
+ "</head>"
+ "<body>"
+ "<pre>"
+ "<code>"
+ "Method: " + req.method
+ '\n'
+ "Hostname: " + domaininfo.hostname
+ '\n'
+ "App: " + (domaininfo.pathname ? (domaininfo.pathname + '/') : '')
+ '\n'
+ "Route: " + req.url//.replace(/^\//, '')
+ '\n'
// TODO better sanatization
+ 'Error: ' + (err.message || err.toString()).replace(/</g, '&lt;')
+ "</code>"
+ "</pre>"
+ "</body>"
+ "</html>"
);
});
}
}
function createSecureContext(certs) { function createSecureContext(certs) {
// workaround for v0.12 / v1.2 backwards compat // workaround for v0.12 / v1.2 backwards compat
try { try {
@ -98,41 +135,14 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
// we always add it explicitly // we always add it explicitly
function localAppWrapped(req, res) { function localAppWrapped(req, res) {
console.log('[debug]', domaininfo.hostname + '/' + domaininfo.pathname, req.url); console.log('[debug]', domaininfo.hostname + '/' + domaininfo.pathname, req.url);
localApp(req, res, function (err) { localApp(req, res, handleAppScopedError(function () {
if (err) {
console.error(err);
res.end(
"<html>"
+ "<head>"
+ '<link rel="icon" href="favicon.ico" />'
+ "</head>"
+ "<body>"
+ "<pre>"
+ "<code>"
+ "Method: " + req.method
+ '\n'
+ "Hostname: " + domaininfo.hostname
+ '\n'
+ "App: " + (domaininfo.pathname ? (domaininfo.pathname + '/') : '')
+ '\n'
+ "Route: " + req.url//.replace(/^\//, '')
+ '\n'
// TODO better sanatization
+ 'Error: ' + (err.message || err.toString()).replace(/</g, '&lt;')
+ "</code>"
+ "</pre>"
+ "</body>"
+ "</html>"
);
return;
}
if (!serveFavicon) { if (!serveFavicon) {
serveFavicon = require('serve-favicon')(path.join(__dirname, '..', 'public', 'favicon.ico')); serveFavicon = require('serve-favicon')(path.join(__dirname, '..', 'public', 'favicon.ico'));
} }
// TODO redirect GET /favicon.ico to GET (req.headers.referer||'') + /favicon.ico // TODO redirect GET /favicon.ico to GET (req.headers.referer||'') + /favicon.ico
// TODO other common root things - robots.txt, app-icon, etc // TODO other common root things - robots.txt, app-icon, etc
serveFavicon(req, res, function (err2) { serveFavicon(req, res, handleAppScopedError(function () {
res.writeHead(404); res.writeHead(404);
res.end( res.end(
"<html>" "<html>"
@ -163,8 +173,8 @@ module.exports.create = function (securePort, certsPath, vhostsdir) {
+ domaininfo.hostname + '/' + domaininfo.pathname + domaininfo.hostname + '/' + domaininfo.pathname
+ ', but was not handled. Forcing hard stop to prevent fallthru." } }'); + ', but was not handled. Forcing hard stop to prevent fallthru." } }');
*/ */
}); }));
}); }));
} }
try { try {
domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localAppWrapped); domainMergeMap[domaininfo.hostname].apps.use('/' + domaininfo.pathname, localAppWrapped);