fix: __vite_hmr race condition. Fixes #32

vikejs · Dec 11, 2024 · 1b07c47 · 1b07c47
1 parent 034fb16
commit 1b07c47
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/packages/vike-node/package.json b/packages/vike-node/package.json
@@ -109,4 +109,4 @@
   ],
   "repository": "github:vikejs/vike-node",
   "license": "MIT"
-}
+}
diff --git a/packages/vike-node/src/plugin/plugins/devServerPlugin.ts b/packages/vike-node/src/plugin/plugins/devServerPlugin.ts
@@ -1,5 +1,5 @@
 import { fork } from 'child_process'
-import { createServer, type IncomingMessage, type Server } from 'http'
+import { type IncomingMessage, type Server, createServer } from 'http'
 import type { Plugin, ViteDevServer } from 'vite'
 import { globalStore } from '../../runtime/globalStore.js'
 import type { ConfigVikeNodeResolved } from '../../types.js'
@@ -102,7 +102,7 @@ export function devServerPlugin(): Plugin {
 
   function setupHMRProxy(req: IncomingMessage) {
     if (setupHMRProxyDone || isBun) {
-      return
+      return false
     }
 
     setupHMRProxyDone = true
@@ -113,6 +113,7 @@ export function devServerPlugin(): Plugin {
         HMRServer.emit('upgrade', clientReq, clientSocket, wsHead)
       }
     })
+    return true
   }
 }
 

diff --git a/packages/vike-node/src/runtime/globalStore.ts b/packages/vike-node/src/runtime/globalStore.ts
@@ -10,5 +10,5 @@ export const globalStore = (globalThis.__vikeNode ||= {
 }) as {
   isDev: boolean
   viteDevServer?: ViteDevServer
-  setupHMRProxy: (req: IncomingMessage) => void
+  setupHMRProxy: (req: IncomingMessage) => boolean
 }
diff --git a/packages/vike-node/src/runtime/vike-handler.ts b/packages/vike-node/src/runtime/vike-handler.ts
@@ -67,7 +67,13 @@ export const renderPageHandler = ((options?) => async (request, context, runtime
   let staticMiddleware: ConnectMiddleware | undefined
 
   if (nodeReq) {
-    globalStore.setupHMRProxy(nodeReq)
+    const needsUpgrade = globalStore.setupHMRProxy(nodeReq)
+
+    if (needsUpgrade) {
+      // Early response for HTTP connection upgrade
+      return new Response(null)
+    }
+
     const { resolveStaticConfig } = await import('./utils/resolve-static-config.js')
     staticConfig = resolveStaticConfig(options?.static)
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,4 +109,4 @@ @@
       ],
       "repository": "github:vikejs/vike-node",
       "license": "MIT"
-    }
+    }