Skip to content

change http server callback function identity to match the normal api #171

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

Open
max-mapper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

change http server callback function identity to match the normal api #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/director/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,8 @@ Router.prototype.runlist = function (fns) {
// with false, or evaluation will short circuit.
//
Router.prototype.invoke = function (fns, thisArg, callback) {
var isHttpServerCallback = false
if (thisArg.req && thisArg.res) isHttpServerCallback = true
var self = this;

if (this.async) {
Expand Down Expand Up @@ -431,7 +433,9 @@ Router.prototype.invoke = function (fns, thisArg, callback) {
return _every(fn, apply);
}
else if (typeof fn === 'function') {
return fn.apply(thisArg, fns.captures || []);
var args = fns.captures || []
if (isHttpServerCallback) args = [thisArg.req, thisArg.res].concat(args)
return fn.apply(thisArg, args);
}
else if (typeof fn === 'string' && self.resource) {
self.resource[fn].apply(thisArg, fns.captures || []);
Expand Down
2 changes: 1 addition & 1 deletion test/server/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports.createServer = function (router) {
};

exports.handlers = {
respondWithId: function (id) {
respondWithId: function (req, res, id) {
this.res.writeHead(200, { 'Content-Type': 'text/plain' })
this.res.end('hello from (' + id + ')');
},
Expand Down