Add: escapeIPv6

mozilla · Oct 25, 2021 · d0c20e7 · d0c20e7
1 parent 2e0b49a
commit d0c20e7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/extension-runners/chromium.js b/src/extension-runners/chromium.js
@@ -332,7 +332,7 @@ export class ChromiumExtensionRunner {
       }
 
       const ws = new window.WebSocket(
-        "ws://${wssInfo.address}:${wssInfo.port}");
+        "ws://${escapeIPv6(wssInfo.address)}:${wssInfo.port}");
 
       ws.onmessage = async (evt) => {
         const msg = JSON.parse(evt.data);
@@ -424,3 +424,10 @@ export class ChromiumExtensionRunner {
     }
   }
 }
+
+export function escapeIPv6(address: string): string {
+  if (/^([a-f0-9:]+:+)+[a-f0-9]+$/.test(address)) {
+    return `[${address}]`;
+  }
+  return address;
+}
diff --git a/tests/unit/test-extension-runners/test.chromium.js b/tests/unit/test-extension-runners/test.chromium.js
@@ -18,6 +18,7 @@ import {
 import {
   ChromiumExtensionRunner,
   DEFAULT_CHROME_FLAGS,
+  escapeIPv6,
 } from '../../../src/extension-runners/chromium';
 import type {
   ChromiumExtensionRunnerParams,
@@ -126,7 +127,7 @@ describe('util/extension-runners/chromium', async () => {
 
     // $FlowIgnore: allow to call addess even wss property can be undefined.
     const wssInfo = runnerInstance.wss.address();
-    const wsURL = `ws://${wssInfo.address}:${wssInfo.port}`;
+    const wsURL = `ws://${escapeIPv6(wssInfo.address)}:${wssInfo.port}`;
     const wsClient = new WebSocket(wsURL);
 
     await new Promise((resolve) => wsClient.on('open', resolve));
@@ -637,7 +638,7 @@ describe('util/extension-runners/chromium', async () => {
       }
       // $FlowIgnore: if runnerInstance.wss would be unexpectedly undefined the test case will fail.
       const wssInfo = runnerInstance.wss.address();
-      const wsURL = `ws://${wssInfo.address}:${wssInfo.port}`;
+      const wsURL = `ws://${escapeIPv6(wssInfo.address)}:${wssInfo.port}`;
       wsClient = new WebSocket(wsURL);
       await new Promise((resolve) => wsClient.on('open', resolve));
     };