Skip to content

Async getHost support, Node 12 deprecation fix #420

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

Closed
wants to merge 7 commits into from
Closed

Async getHost support, Node 12 deprecation fix #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e82e625
OutgoingMessage.prototype._headers is deprecated in Node.js 12
bconnorwhite Sep 1, 2019
6359c95
make sure res.getHeaders() exists for Node 6
bconnorwhite Sep 1, 2019
d4e6310
Allow for async host functions
bconnorwhite Sep 1, 2019
b7c7207
Another res._headers
bconnorwhite Sep 1, 2019
a7501b2
Merge branch 'master' into host-promise
bconnorwhite Sep 1, 2019
dc90130
Node 6 support for async getHost
bconnorwhite Sep 1, 2019
12dbec6
Merge branch 'host-promise'
bconnorwhite Sep 1, 2019
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
2 changes: 1 addition & 1 deletion app/steps/decorateUserResHeaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

function decorateUserResHeaders(container) {
var resolverFn = container.options.userResHeaderDecorator;
var headers = container.user.res._headers;
var headers = container.user.res.getHeaders ? container.user.res.getHeaders() : container.user.res._headers;

if (!resolverFn) {
return Promise.resolve(container);
Expand Down
10 changes: 6 additions & 4 deletions app/steps/resolveProxyHost.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ function resolveProxyHost(container) {
parsedHost = requestOptions.parseHost(container);
}

container.proxy.reqBuilder.host = parsedHost.host;
container.proxy.reqBuilder.port = container.options.port || parsedHost.port;
container.proxy.requestModule = parsedHost.module;
return Promise.resolve(container);
return Promise.resolve(parsedHost).then((parsedHost) => {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thank you for using a promise here for consistency

container.proxy.reqBuilder.host = parsedHost.host;
container.proxy.reqBuilder.port = container.options.port || parsedHost.port;
container.proxy.requestModule = parsedHost.module;
return Promise.resolve(container);
});
}

module.exports = resolveProxyHost;
28 changes: 15 additions & 13 deletions lib/requestOptions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,25 @@ function parseHost(Container) {
return new Error('Empty host parameter');
}

if (!/http(s)?:\/\//.test(host)) {
host = 'http://' + host;
}
return Promise.resolve(host).then((host) => {
if (!/http(s)?:\/\//.test(host)) {
host = 'http://' + host;
}

var parsed = url.parse(host);
var parsed = url.parse(host);

if (!parsed.hostname) {
return new Error('Unable to parse hostname, possibly missing protocol://?');
}
if (!parsed.hostname) {
return new Error('Unable to parse hostname, possibly missing protocol://?');
}

var ishttps = options.https || parsed.protocol === 'https:';
var ishttps = options.https || parsed.protocol === 'https:';

return {
host: parsed.hostname,
port: parsed.port || (ishttps ? 443 : 80),
module: ishttps ? https : http,
};
return {
host: parsed.hostname,
port: parsed.port || (ishttps ? 443 : 80),
module: ishttps ? https : http,
};
});
}

function reqHeaders(req, options) {
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/userResDecorator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ describe('userResDecorator', function () {

proxyApp.use(proxy(redirectingServerOrigin, {
userResDecorator: function (rsp, data, req, res) {
var proxyReturnedLocation = res._headers.location;
var proxyReturnedLocation = res.getHeaders ? res.getHeaders().location : res._headers.location;
res.location(proxyReturnedLocation.replace(redirectingServerPort, preferredPort));
return data;
}
Expand Down