refactor: replace client socket url with server request (#918)

vitejs · Oct 20, 2020 · bec6b3c · bec6b3c
1 parent 24336f4
commit bec6b3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/client/client.ts b/src/client/client.ts
@@ -1,7 +1,7 @@
 // This file runs in the browser.
 
 // injected by serverPluginHmr when served
-declare const __PORT__: number
+declare const __HOST__: string
 declare const __MODE__: string
 declare const __DEFINES__: Record<string, any>
 ;(window as any).process = (window as any).process || {}
@@ -29,9 +29,7 @@ console.log('[vite] connecting...')
 
 declare var __VUE_HMR_RUNTIME__: HMRRuntime
 
-const socketProtocol = location.protocol === 'https:' ? 'wss' : 'ws'
-const socketUrl = `${socketProtocol}://${location.hostname}:${__PORT__}`
-const socket = new WebSocket(socketUrl, 'vite-hmr')
+const socket = new WebSocket(__HOST__, 'vite-hmr')
 
 function warnFailedFetch(err: Error, path: string | string[]) {
   if (!err.message.match('fetch')) {

diff --git a/src/node/server/serverPluginClient.ts b/src/node/server/serverPluginClient.ts
@@ -24,9 +24,12 @@ export const clientPlugin: ServerPlugin = ({ app, config }) => {
 
   app.use(async (ctx, next) => {
     if (ctx.path === clientPublicPath) {
+      const socketProtocol = ctx.protocol.toString() === 'https' ? 'wss' : 'ws'
+      const socketUrl = `${socketProtocol}://${ctx.host.toString()}`
+
       ctx.type = 'js'
       ctx.status = 200
-      ctx.body = clientCode.replace(`__PORT__`, ctx.port.toString())
+      ctx.body = clientCode.replace(`__HOST__`, JSON.stringify(socketUrl))
     } else {
       if (ctx.path === legacyPublicPath) {
         console.error(