Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/forward.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ export const forward = async (
request: http.IncomingMessage,
response: http.ServerResponse,
handlerOpts: HandlerOpts,
// eslint-disable-next-line no-async-promise-executor
): Promise<void> => new Promise(async (resolve, reject) => {
): Promise<void> => new Promise((resolve, reject) => {
const proxy = handlerOpts.upstreamProxyUrlParsed;
const origin = proxy ? proxy.origin : request.url;

Expand Down
3 changes: 1 addition & 2 deletions src/forward_socks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ export const forwardSocks = async (
request: http.IncomingMessage,
response: http.ServerResponse,
handlerOpts: HandlerOpts,
// eslint-disable-next-line no-async-promise-executor
): Promise<void> => new Promise(async (resolve, reject) => {
): Promise<void> => new Promise((resolve, reject) => {
const agent = new SocksProxyAgent(handlerOpts.upstreamProxyUrlParsed);

const options: Options = {
Expand Down
38 changes: 38 additions & 0 deletions test/e2e/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,44 @@ it('supports localAddress', async () => {
}
});

it('returns 500 when forward() throws synchronously', async () => {
const target = http.createServer((_serverRequest, serverResponse) => {
serverResponse.end('ok');
});

await listenOnPort(target);

const server = new Server({
port: 0,
prepareRequestFunction: () => {
return {
localAddress: 'not-an-ip',
};
},
});

const failedErrors: NodeJS.ErrnoException[] = [];
server.on('requestFailed', ({ error }) => {
failedErrors.push(error);
});

await server.listen();

try {
const response = await httpRequest({
url: `http://127.0.0.1:${getServerPort(target)}`,
proxyUrl: `http://127.0.0.1:${server.port}`,
});

expect(response.statusCode).toBe(500);
expect(failedErrors).toHaveLength(1);
expect(failedErrors[0].code).toBe('ERR_INVALID_IP_ADDRESS');
} finally {
await server.close();
await util.promisify(target.close.bind(target))();
}
});

it('supports https proxy relay', async () => {
const target = https.createServer(() => {
});
Expand Down
Loading