Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Allow custom express handler after deployd middleware #869

Merged
merged 5 commits into from Apr 8, 2019
Merged

feat: Allow custom express handler after deployd middleware #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de59549
feat: Allow custom express handler after deployd middleware
evaisse Aug 30, 2018
a3e704b
Merge branch 'master' into feature/allow-custom-handler-after-deployd…
andreialecu Mar 12, 2019
61cc4d6
Merge branch 'master' into feature/allow-custom-handler-after-deployd…
NicolasRitouet Mar 12, 2019
b6f0f86
fix following travis issue : 'respond' is defined but never used. (W098)
evaisse Apr 8, 2019
e6322b7
Merge branch 'master' into feature/allow-custom-handler-after-deployd…
andreialecu Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/attach.js
View file
Open in desktop
Expand Up @@ -82,7 +82,7 @@ function attach(httpServer, options) {
// persist keys in a store
server.keys = new Keys();

server.handleRequest = function handleRequest(req, res) {
server.handleRequest = function handleRequest(req, res, nextMiddleware) {
// dont handle socket.io requests
if(req.url.indexOf('/socket.io/') === 0) return;
debug('%s %s', req.method, req.url);
Expand Down Expand Up @@ -121,7 +121,7 @@ function attach(httpServer, options) {
if (root) {
req.isRoot = true;
}
server.route(req, res);
server.route(req, res, nextMiddleware);
} else if (root) {
// all root requests
// must be authenticated
Expand All @@ -130,11 +130,11 @@ function attach(httpServer, options) {
if(err) throw err;
if(key) req.isRoot = true;
debug('is root?', session.isRoot);
server.route(req, res);
server.route(req, res, nextMiddleware);
});
} else {
// normal route
server.route(req, res);
server.route(req, res, nextMiddleware);
}
}
});
Expand All @@ -151,12 +151,12 @@ function attach(httpServer, options) {
fs.mkdirSync(resourcesPath);
}

server.route = function route(req, res) {
server.route = function route(req, res, next) {
config.loadConfig(serverpath, server, function(err, resourcesInstances) {
if (err) throw err;
server.resources = resourcesInstances;
var router = server.router = new Router(resourcesInstances, server);
router.route(req, res);
router.route(req, res, next);
});
};

Expand Down
6 changes: 2 additions & 4 deletions lib/resources/files.js
View file
Open in desktop
Expand Up @@ -2,8 +2,7 @@ var util = require('util')
, send = require('send')
, Resource = require('../resource')
, path = require('path')
, url = require('url')
, respond = require('doh').createResponder();
, url = require('url');

/**
* A `Files` resource proxies incoming requests to the file system.
Expand Down Expand Up @@ -31,8 +30,7 @@ Files.prototype.handle = function (ctx, next) {

send(ctx.req, url.parse(ctx.url).pathname, {root: path.resolve(this.public)})
.on('error', function (err) {
ctx.res.statusCode = 404;
respond('Resource Not Found', ctx.req, ctx.res);
return next();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens with inexistent resources here? Do we still return 404 resource not found somehow?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do return a 404. this handler is only run after no resources can be found.

})
.pipe(ctx.res);
};
Expand Down
4 changes: 3 additions & 1 deletion lib/router.js
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@ function Router(resources, server) {
* @api public
*/

Router.prototype.route = function (req, res) {
Router.prototype.route = function (req, res, next) {
var router = this
, server = this.server
, url = req.url
Expand Down Expand Up @@ -80,6 +80,8 @@ Router.prototype.route = function (req, res) {
} else {
resource.handle(ctx, nextResource);
}
} else if (next) {
next();
} else {
debug('404 %s', req.url);
res.statusCode = 404;
Expand Down
5 changes: 5 additions & 0 deletions test-app/test-attach.js
View file
Open in desktop
Expand Up @@ -17,6 +17,11 @@ require('deployd').attach(server, {
});
app.use(server.handleRequest);

// test deployd routing pass to following handler
// when a given page match an express handler
app.get('/express-custom-handler', function(req, res) {
res.send('Ok');
});

// start server
server.listen(PORT, function() {
Expand Down