From 48d0abc125ac43621ed768731b8911635db1e914 Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Mon, 3 Feb 2025 15:22:02 +0100 Subject: [PATCH] @uppy/utils: do not strip www in getSocketHost (#5621) --- packages/@uppy/utils/src/getSocketHost.test.ts | 4 ++++ packages/@uppy/utils/src/getSocketHost.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/@uppy/utils/src/getSocketHost.test.ts b/packages/@uppy/utils/src/getSocketHost.test.ts index dc7131ce9e..cf9ac40002 100644 --- a/packages/@uppy/utils/src/getSocketHost.test.ts +++ b/packages/@uppy/utils/src/getSocketHost.test.ts @@ -7,6 +7,10 @@ describe('getSocketHost', () => { 'wss://foo.bar/a/b/cd?e=fghi&l=k&m=n', ) + expect(getSocketHost('https://www.foo.bar/a/b/cd?e=fghi&l=k&m=n')).toEqual( + 'wss://www.foo.bar/a/b/cd?e=fghi&l=k&m=n', + ) + expect(getSocketHost('Https://foo.bar/a/b/cd?e=fghi&l=k&m=n')).toEqual( 'wss://foo.bar/a/b/cd?e=fghi&l=k&m=n', ) diff --git a/packages/@uppy/utils/src/getSocketHost.ts b/packages/@uppy/utils/src/getSocketHost.ts index 12c389c5a1..982aeeb32b 100644 --- a/packages/@uppy/utils/src/getSocketHost.ts +++ b/packages/@uppy/utils/src/getSocketHost.ts @@ -1,6 +1,6 @@ export default function getSocketHost(url: string): string { // get the host domain - const regex = /^(?:https?:\/\/|\/\/)?(?:[^@\n]+@)?(?:www\.)?([^\n]+)/i + const regex = /^(?:https?:\/\/|\/\/)?(?:[^@\n]+@)?([^\n]+)/i const host = regex.exec(url)?.[1] const socketProtocol = /^http:\/\//i.test(url) ? 'ws' : 'wss'