fix: websocket proxies not the same as http (vitejs#4893)

aleclarson · Nov 8, 2021 · ab666ec · ab666ec
1 parent 73f0716
commit ab666ec
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/vite/src/node/server/middlewares/proxy.ts b/packages/vite/src/node/server/middlewares/proxy.ts
@@ -62,7 +62,7 @@ export function proxyMiddleware(
     httpServer.on('upgrade', (req, socket, head) => {
       const url = req.url!
       for (const context in proxies) {
-        if (url.startsWith(context)) {
+        if (doesProxyContextMatchUrl(context, url)) {
           const [proxy, opts] = proxies[context]
           if (
             (opts.ws || opts.target?.toString().startsWith('ws:')) &&
@@ -71,7 +71,9 @@ export function proxyMiddleware(
             if (opts.rewrite) {
               req.url = opts.rewrite(url)
             }
+            debug(`${req.url} -> ws ${opts.target}`)
             proxy.ws(req, socket, head)
+            return
           }
         }
       }
@@ -82,10 +84,7 @@ export function proxyMiddleware(
   return function viteProxyMiddleware(req, res, next) {
     const url = req.url!
     for (const context in proxies) {
-      if (
-        (context.startsWith('^') && new RegExp(context).test(url)) ||
-        url.startsWith(context)
-      ) {
+      if (doesProxyContextMatchUrl(context, url)) {
         const [proxy, opts] = proxies[context]
         const options: HttpProxy.ServerOptions = {}
 
@@ -116,3 +115,10 @@ export function proxyMiddleware(
     next()
   }
 }
+
+function doesProxyContextMatchUrl(context: string, url: string): boolean {
+  return (
+    (context.startsWith('^') && new RegExp(context).test(url)) ||
+    url.startsWith(context)
+  )
+}