diff --git a/packages/core/src/client/standalone/vite.config.ts b/packages/core/src/client/standalone/vite.config.ts index 4767e5a6..5752dc61 100644 --- a/packages/core/src/client/standalone/vite.config.ts +++ b/packages/core/src/client/standalone/vite.config.ts @@ -24,7 +24,10 @@ export default defineConfig({ : viteDevServer.config.server.host || 'localhost' const { middleware } = await createDevToolsMiddleware({ cwd: viteDevServer.config.root, - hostWebSocket: host, + websocket: { + host, + https: false, + }, context, }) viteDevServer.middlewares.use(DEVTOOLS_MOUNT_PATH_NO_TRAILING_SLASH, middleware) diff --git a/packages/core/src/node/cli-commands.ts b/packages/core/src/node/cli-commands.ts index f2e0e79d..81b79faa 100644 --- a/packages/core/src/node/cli-commands.ts +++ b/packages/core/src/node/cli-commands.ts @@ -33,7 +33,10 @@ export async function start(options: StartOptions) { }) const { h3 } = await createDevToolsMiddleware({ cwd: devtools.config.root, - hostWebSocket: host, + websocket: { + host, + https: false, + }, context: devtools.context, }) diff --git a/packages/core/src/node/plugins/server.ts b/packages/core/src/node/plugins/server.ts index 54fdec98..9a363bc2 100644 --- a/packages/core/src/node/plugins/server.ts +++ b/packages/core/src/node/plugins/server.ts @@ -49,7 +49,9 @@ export function DevToolsServer(): Plugin { const { middleware } = await createDevToolsMiddleware({ cwd: viteDevServer.config.root, - hostWebSocket: host, + websocket: { + host, + }, context, }) viteDevServer.middlewares.use(DEVTOOLS_MOUNT_PATH, middleware) diff --git a/packages/core/src/node/ws.ts b/packages/core/src/node/ws.ts index 513e664b..fe7ae397 100644 --- a/packages/core/src/node/ws.ts +++ b/packages/core/src/node/ws.ts @@ -16,8 +16,11 @@ const debugInvoked = createDebug('vite:devtools:rpc:invoked') export interface CreateWsServerOptions { cwd: string - portWebSocket?: number - hostWebSocket: string + websocket: { + port?: number + host: string + https?: DevToolsNodeContext['viteConfig']['server']['https'] | false + } base?: string context: DevToolsNodeContext } @@ -26,9 +29,9 @@ const ANONYMOUS_SCOPE = 'vite:anonymous:' export async function createWsServer(options: CreateWsServerOptions) { const rpcHost = options.context.rpc as unknown as RpcFunctionsHost - const host = options.hostWebSocket ?? 'localhost' - const https = options.context.viteConfig.server.https - const port = options.portWebSocket ?? await getPort({ port: 7812, host, random: true })! + const host = options.websocket.host + const https = options.websocket.https === false ? undefined : (options.websocket.https ?? options.context.viteConfig.server.https) + const port = options.websocket.port ?? await getPort({ port: 7812, host, random: true })! const wsClients = new Set()