refactor: server

Author: yuyinws

client/app/pages/inspector.vue

@@ -14,7 +14,7 @@ const lastUpdate = computed(() => {
 
 function initWebSocket() {
   wsStatus.value = 'pending'
-  ws = new WebSocket(`ws://${window.location.host}/_ws/inspector`)
+  ws = new WebSocket(`ws://${window.location.host}/ws/inspector`)
   ws.onopen = () => {
     wsStatus.value = 'success'
   }

package.json

@@ -91,7 +91,7 @@
     "dist"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "scripts": {
     "build": "unbuild && pnpm run build:client",
@@ -165,8 +165,7 @@
     "mrmime": "^2.0.1",
     "oxc-parser": "^0.63.0",
     "pathe": "^2.0.3",
-    "unplugin": "^2.3.2",
-    "uuid": "^11.1.0"
+    "unplugin": "^2.3.2"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.12.0",

pnpm-lock.yaml

@@ -3,13 +3,13 @@ import { createServer as _createServer } from 'node:http'
 import { env } from 'node:process'
 import wsAdapter from 'crossws/adapters/node'
 import { createApp, toNodeListener } from 'h3'
-import inspectorHandler from './_ws/inspector'
 import filePathMap from './filePathMap'
 import health from './health'
 import { launchEditor as launchEditorHandler } from './launchEditor'
 import send from './send'
 import serveStatic from './serveStatic'
-import ws from './ws'
+import inspectorHandler from './ws/inspector'
+import passLogsHandler from './ws/passLogs'
 
 export async function createServer(options: Options) {
   const { server, launchEditor, passLogs, inspector } = options
@@ -29,11 +29,11 @@ export async function createServer(options: Options) {
     app.use('/health', health)
 
     if (inspector)
-      app.use('/_ws/inspector', inspectorHandler)
+      app.use('/ws/inspector', inspectorHandler)
 
     if (passLogs) {
     // Pass server log route
-      app.use('/ws', ws)
+      app.use('/ws/passLogs', passLogsHandler)
         .use('/send', send)
     }
 
@@ -46,7 +46,7 @@ export async function createServer(options: Options) {
 
     const server = _createServer(toNodeListener(app))
 
-    const { handleUpgrade } = wsAdapter(app.websocket)
+    const { handleUpgrade } = wsAdapter(app.websocket as any)
 
     server.on('upgrade', handleUpgrade)
 

src/core/server/index.ts

@@ -1,10 +1,9 @@
-import type { Peer } from 'crossws'
 import { effect } from 'alien-signals'
 import { defineWebSocketHandler } from 'h3'
 import { version } from '../../../../package.json'
 import { expressionsMapState } from '../../utils/state'
 
-const connections = new Map<string, Peer>()
+const connections = new Map<string, any>()
 
 function formatedResponse(expressionsMap: any) {
   return {

src/core/server/_ws/inspector.ts src/core/server/ws/inspector.tssrc/core/server/_ws/inspector.ts renamed to src/core/server/ws/inspector.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { defineWebSocketHandler } from 'h3'
-import { PLUGIN_NAME } from '../constants'
-import { peersState } from '../utils/state'
+import { PLUGIN_NAME } from '../../constants'
+import { peersState } from '../../utils/state'
 
 export default defineWebSocketHandler({
   open(peer) {

src/core/server/ws.ts src/core/server/ws/passLogs.tssrc/core/server/ws.ts renamed to src/core/server/ws/passLogs.ts

@@ -1,7 +1,6 @@
-import type { Peer } from 'crossws'
 import type { ExpressionMeta, ExpressionsMap } from '../../types'
+import { randomUUID } from 'node:crypto'
 import { signal } from 'alien-signals'
-import { v4 as uuidv4 } from 'uuid'
 
 export const filePathMapState = signal(new Map<string, string>())
 
@@ -19,7 +18,7 @@ export function addExpression(relativePath: string, expressionMeta: ExpressionMe
   )) {
     const newMap = new Map(currentMap)
     newMap.set(relativePath, {
-      id: uuidv4(),
+      id: randomUUID(),
       filePath: relativePath,
       expressions: [...expressions, expressionMeta],
     })
@@ -28,4 +27,4 @@ export function addExpression(relativePath: string, expressionMeta: ExpressionMe
 }
 
 export const serverState = signal(false)
-export const peersState = signal(new Set<Peer<any>>())
+export const peersState = signal(new Set<any>())

src/core/utils/state.ts

@@ -1,11 +1,11 @@
-export function initVirtualModulesGenerator(port: number, isProd: boolean) {
+export function initVirtualModulesGenerator(host: string, port: number, isProd: boolean) {
   if (isProd)
     return ''
 
   return /* js */`
   ;(() => {
     if (globalThis.window) {
-      const socket = new WebSocket('ws://localhost:${port}/ws')
+      const socket = new WebSocket('ws://${host}:${port}/ws/passLogs')
       globalThis.window.UNPLUGIN_TURBO_CONSOLE_CLIENT_SOCKET = socket
       socket.addEventListener('message', (event) => {
         try {

src/core/utils/virtualModules.ts

@@ -1,10 +1,10 @@
 import type { UnpluginFactory } from 'unplugin'
 import type { Context, Options } from './types'
+import { randomUUID } from 'node:crypto'
 import { cwd, env } from 'node:process'
 import { checkPort, getRandomPort } from 'get-port-please'
 import { relative } from 'pathe'
 import { createUnplugin } from 'unplugin'
-import { v4 as uuidv4 } from 'uuid'
 import { PLUGIN_NAME, VirtualModules } from './core/constants'
 import { resolveOptions } from './core/options'
 import { createServer } from './core/server/index'
@@ -52,7 +52,7 @@ export const unpluginFactory: UnpluginFactory<Options | undefined> = (rawOptions
       id = id.slice(1)
 
       if (id === VirtualModules.Init) {
-        return initVirtualModulesGenerator(options.server.port!, env.NODE_ENV === 'production')
+        return initVirtualModulesGenerator(options.server.host!, options.server.port!, env.NODE_ENV === 'production')
       }
       else if (id === VirtualModules.ThemeDetect) {
         return themeDetectVirtualModule(env.NODE_ENV === 'production')
@@ -138,7 +138,7 @@ export const unpluginFactory: UnpluginFactory<Options | undefined> = (rawOptions
         const currentMap = expressionsMapState()
         const newMap = new Map(currentMap)
         newMap.set(relativePath, {
-          id: uuidv4(),
+          id: randomUUID(),
           filePath: relativePath,
           expressions: [],
         })