Print status message when proxy server rejects

szmarczak · Nov 15, 2022 · 7a9a46a · 7a9a46a
1 parent 51eeaf5
commit 7a9a46a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/source/proxies/h1-over-h2.js b/source/proxies/h1-over-h2.js
@@ -26,7 +26,7 @@ const createConnection = (self, options, callback) => {
 				const statusCode = headers[':status'];
 
 				if (statusCode !== 200) {
-					callback(new UnexpectedStatusCodeError(statusCode));
+					callback(new UnexpectedStatusCodeError(statusCode, ''));
 					return;
 				}
 

diff --git a/source/proxies/h2-over-h1.js b/source/proxies/h2-over-h1.js
@@ -9,7 +9,7 @@ const getStream = request => new Promise((resolve, reject) => {
 		socket.unshift(head);
 
 		request.off('error', reject);
-		resolve([socket, response.statusCode]);
+		resolve([socket, response.statusCode, response.statusMessage]);
 	};
 
 	request.once('error', reject);

diff --git a/source/proxies/h2-over-h2.js b/source/proxies/h2-over-h2.js
@@ -25,7 +25,7 @@ class Http2OverHttp2 extends Http2OverHttpX {
 		const stream = await globalAgent.request(proxyOptions.url, proxyOptions, headers);
 		const statusCode = await getStatusCode(stream);
 
-		return [stream, statusCode];
+		return [stream, statusCode, ''];
 	}
 }
 

diff --git a/source/proxies/h2-over-hx.js b/source/proxies/h2-over-hx.js
@@ -14,9 +14,9 @@ class Http2OverHttpX extends Agent {
 	async createConnection(origin, options) {
 		const authority = `${origin.hostname}:${origin.port || 443}`;
 
-		const [stream, statusCode] = await this._getProxyStream(authority);
+		const [stream, statusCode, statusMessage] = await this._getProxyStream(authority);
 		if (statusCode !== 200) {
-			throw new UnexpectedStatusCodeError(statusCode);
+			throw new UnexpectedStatusCodeError(statusCode, statusMessage);
 		}
 
 		if (this.proxyOptions.raw) {

diff --git a/source/proxies/unexpected-status-code-error.js b/source/proxies/unexpected-status-code-error.js
@@ -1,9 +1,10 @@
 'use strict';
 
 class UnexpectedStatusCodeError extends Error {
-	constructor(statusCode) {
-		super(`The proxy server rejected the request with status code ${statusCode}`);
+	constructor(statusCode, statusMessage = '') {
+		super(`The proxy server rejected the request with status code ${statusCode} (${statusMessage || 'empty status message'})`);
 		this.statusCode = statusCode;
+		this.statusMessage = statusMessage;
 	}
 }
 

diff --git a/test/proxies.js b/test/proxies.js
@@ -263,7 +263,7 @@ test.serial('HTTPS over HTTP/2 - 403', wrapper, async (t, server) => {
 		request.end();
 
 		const error = await pEvent(request, 'error');
-		t.is(error.message, 'The proxy server rejected the request with status code 403');
+		t.is(error.message, 'The proxy server rejected the request with status code 403 (empty status message)');
 
 		http2.globalAgent.destroy();
 	});
@@ -362,7 +362,7 @@ test.serial('HTTP over HTTP/2 - 403', async t => {
 		request.end();
 
 		const error = await pEvent(request, 'error');
-		t.is(error.message, 'The proxy server rejected the request with status code 403');
+		t.is(error.message, 'The proxy server rejected the request with status code 403 (empty status message)');
 
 		http2.globalAgent.destroy();
 	});
@@ -534,7 +534,7 @@ test.serial('HTTP/2 over HTTPS - 403', wrapper, async (t, server) => {
 		request.end();
 
 		const error = await pEvent(request, 'error');
-		t.is(error.message, 'The proxy server rejected the request with status code 403');
+		t.is(error.message, 'The proxy server rejected the request with status code 403 (Forbidden)');
 
 		agent.destroy();
 		http2.globalAgent.destroy();
@@ -700,7 +700,7 @@ test.serial('HTTP/2 over HTTP - 403', wrapper, async (t, server) => {
 		request.end();
 
 		const error = await pEvent(request, 'error');
-		t.is(error.message, 'The proxy server rejected the request with status code 403');
+		t.is(error.message, 'The proxy server rejected the request with status code 403 (Forbidden)');
 
 		agent.destroy();
 		http2.globalAgent.destroy();
@@ -868,7 +868,7 @@ test.serial('HTTP/2 over HTTP/2 - 403', wrapper, async (t, server) => {
 		request.end();
 
 		const error = await pEvent(request, 'error');
-		t.is(error.message, 'The proxy server rejected the request with status code 403');
+		t.is(error.message, 'The proxy server rejected the request with status code 403 (empty status message)');
 
 		http2.globalAgent.destroy();
 	});