From 590184998f2d5fb80216f5ff816acfc6497f36ab Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Mon, 21 Jun 2021 19:57:00 +0200
Subject: [PATCH] chore: improve connectOverCDP error handling (#7239)

---
 src/server/chromium/chromium.ts |  3 +++
 tests/chromium/chromium.spec.ts | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/server/chromium/chromium.ts b/src/server/chromium/chromium.ts
index 6ebf5857ba..1cebdb651f 100644
--- a/src/server/chromium/chromium.ts
+++ b/src/server/chromium/chromium.ts
@@ -229,6 +229,9 @@ async function urlToWSEndpoint(endpointURL: string) {
   const httpURL = endpointURL.endsWith('/') ? `${endpointURL}json/version/` : `${endpointURL}/json/version/`;
   const json = await new Promise<string>((resolve, reject) => {
     http.get(httpURL, resp => {
+      if (resp.statusCode! < 200 || resp.statusCode! >= 400)
+        reject(new Error(`Unexpected status ${resp.statusCode} when connecting to ${httpURL}.\n` +
+        `This does not look like a DevTools server, try connecting via ws://.`));
       let data = '';
       resp.on('data', chunk => data += chunk);
       resp.on('end', () => resolve(data));
diff --git a/tests/chromium/chromium.spec.ts b/tests/chromium/chromium.spec.ts
index 344c0aa167..169039f2ff 100644
--- a/tests/chromium/chromium.spec.ts
+++ b/tests/chromium/chromium.spec.ts
@@ -308,3 +308,26 @@ playwrightTest('should return valid browser from context.browser()', async ({ br
     await browserServer.close();
   }
 });
+
+test('should report an expected error when the endpointURL returns a non-expected status code', async ({ browserType, server }) => {
+  server.setRoute('/json/version/', (req, resp) => {
+    resp.statusCode = 404;
+    resp.end(JSON.stringify({
+      webSocketDebuggerUrl: 'dont-use-me',
+    }));
+  });
+  await expect(browserType.connectOverCDP({
+    endpointURL: server.PREFIX,
+  })).rejects.toThrowError(`browserType.connectOverCDP: Unexpected status 404 when connecting to ${server.PREFIX}/json/version/`)
+});
+
+test('should report an expected error when the endpoint URL JSON webSocketDebuggerUrl is undefined', async ({ browserType, server }) => {
+  server.setRoute('/json/version/', (req, resp) => {
+    resp.end(JSON.stringify({
+      webSocketDebuggerUrl: undefined,
+    }));
+  });
+  await expect(browserType.connectOverCDP({
+    endpointURL: server.PREFIX,
+  })).rejects.toThrowError('browserType.connectOverCDP: Invalid URL');
+});