@lvce-editor/server 0.53.5 → 0.53.7

package/ThirdPartyNotices.txt

@@ -2,7 +2,7 @@ This project incorporates components from the projects listed below, that may ha
 differing from this project:
 
 
-1) License Notice for static/bef774c/icons (from https://github.com/microsoft/vscode-icons)
+1) License Notice for static/92d11f3/icons (from https://github.com/microsoft/vscode-icons)
 ---------------------------------------
 
 Attribution 4.0 International
@@ -402,7 +402,7 @@ public licenses.
 Creative Commons may be contacted at creativecommons.org.
 
 
-2) License Notice for static/bef774c/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/92d11f3/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
 ---------------------------------------
 
 Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/server",
-  "version": "0.53.5",
+  "version": "0.53.7",
   "description": "Run LVCE Editor as a server.",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -20,7 +20,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@lvce-editor/shared-process": "0.53.5",
-    "@lvce-editor/static-server": "0.53.5"
+    "@lvce-editor/shared-process": "0.53.7",
+    "@lvce-editor/static-server": "0.53.7"
   }
 }

package/src/server.js

@@ -4,6 +4,7 @@ import { ChildProcess, fork } from 'node:child_process'
 import { createServer } from 'node:http'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { Worker } from 'node:worker_threads'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const ROOT = resolve(__dirname, '../')
@@ -45,7 +46,7 @@ const isStatic = (url) => {
   if(url === '/'){
     return true
   }
-  if (url.startsWith('/bef774c')) {
+  if (url.startsWith('/92d11f3')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {
@@ -59,7 +60,7 @@ const isStatic = (url) => {
 
 const handleRequest = (req, res) => {
   if (isStatic(req.url)) {
-    return sendHandleStaticServerProcess(req, res.socket, 'HandleRequest.handleRequest')
+    return sendHandleStaticServerProcess(req, res, 'StaticServer.getResponse')
   }
   return sendHandleSharedProcess(req, res.socket, 'HandleRequest.handleRequest')
 }
@@ -107,24 +108,55 @@ const handleSharedProcessDisconnect = () => {
   console.info('[server] shared process disconnected')
 }
 
+const waitForProcessToBeReady = async (childProcess) => {
+  const { resolve, promise } = Promise.withResolvers()
+  childProcess.once('message', resolve)
+  const message = await promise
+  if (message !== 'ready') {
+    throw new Error('unexpected message')
+  }
+}
+
 /**
  *
- * @returns {Promise<ChildProcess>}
+ * @returns {Promise<any>}
  */
 const launchProcess = async (processPath, execArgv) => {
-  const childProcess = fork(processPath, execArgv, {
-    stdio: 'inherit',
-    env: {
-      ...process.env,
-    },
-    execArgv: [],
-  })
-  childProcess.on('exit', handleExit)
-  childProcess.on('disconnect', handleSharedProcessDisconnect)
-  const { resolve, promise } = Promise.withResolvers()
-  childProcess.once('message', resolve)
-  await promise
-  return childProcess
+  const isWorker = execArgv.includes('--ipc-type=node-worker')
+  if (isWorker) {
+    const childProcess = new Worker(processPath, {
+      argv: execArgv,
+      env: {
+        ...process.env,
+      },
+    })
+    childProcess.on('exit', handleExit)
+    childProcess.on('disconnect', handleSharedProcessDisconnect)
+    await waitForProcessToBeReady(childProcess)
+    return {
+      send(message) {
+        childProcess.postMessage(message)
+      },
+      on(event, listener) {
+        childProcess.on(event, listener)
+      },
+      off(event, listener) {
+        childProcess.off(event, listener)
+      },
+    }
+  } else {
+    const childProcess = fork(processPath, execArgv, {
+      stdio: 'inherit',
+      env: {
+        ...process.env,
+      },
+      execArgv: [],
+    })
+    childProcess.on('exit', handleExit)
+    childProcess.on('disconnect', handleSharedProcessDisconnect)
+    await waitForProcessToBeReady(childProcess)
+    return childProcess
+  }
 }
 
 /**
@@ -153,7 +185,8 @@ const getOrCreateSharedProcess = () => {
  */
 const launchStaticServerProcess = async () => {
   const staticServerPath = fileURLToPath(import.meta.resolve('@lvce-editor/static-server'))
-  return launchProcess(staticServerPath, [])
+  const ipc = await launchProcess(staticServerPath, ['--ipc-type=node-worker'])
+  return ipc
 }
 
 /**
@@ -189,14 +222,22 @@ const handleRequestError = (error) => {
   console.info('[info]: request upgrade error', error)
 }
 
-const handleSocketError = (error) => {
+const handleSocketUpgradeError = (error) => {
   // @ts-ignore
   console.info('[info] request socket upgrade error', error)
 }
 
+const handleSocketError = (error) => {
+  if (error && error.code === 'ECONNRESET') {
+    return
+  }
+  // @ts-ignore
+  console.info('[info] request socket error', error)
+}
+
 const sendHandleSharedProcess = async (request, socket, method, ...params) => {
   request.on('error', handleRequestError)
-  socket.on('error', handleSocketError)
+  socket.on('error', handleSocketUpgradeError)
   const sharedProcess = await getOrCreateSharedProcess()
   sharedProcess.send(
     {
@@ -211,21 +252,47 @@ const sendHandleSharedProcess = async (request, socket, method, ...params) => {
   )
 }
 
-const sendHandleStaticServerProcess = async (request, socket, method, ...params) => {
+let id = 1
+
+const createId = () => {
+  return ++id
+}
+
+const setHeaders = (response, headers) => {
+  for (const [key, value] of Object.entries(headers)) {
+    response.setHeader(key, value)
+  }
+}
+
+const sendHandleStaticServerProcess = async (request, res, method, ...params) => {
   request.on('error', handleRequestError)
-  socket.on('error', handleSocketError)
+  res.socket.on('error', handleSocketError)
   const staticServerProcess = await getOrCreateStaticServerPathProcess()
-  staticServerProcess.send(
-    {
-      jsonrpc: '2.0',
-      method,
-      params: [getHandleMessage(request), ...params],
-    },
-    socket,
-    {
-      keepOpen: false,
-    },
-  )
+  const { resolve, promise } = Promise.withResolvers()
+  const id = createId()
+  const handleMessage = (message) => {
+    if (message.id && message.id === id) {
+      resolve(message)
+      staticServerProcess.off('message', handleMessage)
+    }
+  }
+  staticServerProcess.on('message', handleMessage)
+  staticServerProcess.send({
+    jsonrpc: '2.0',
+    id,
+    method,
+    params: [getHandleMessage(request), ...params],
+  })
+  const response = await promise
+  const { result } = response
+  const { status, headers, body } = result
+  if (!status) {
+    throw new Error('invalid status')
+  }
+  res.statusCode = status
+  setHeaders(res, headers)
+  res.end(body)
+  // TODO use invoke
 }
 
 /**