@lvce-editor/server 0.53.6 → 0.53.8

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/f429d0a/icons (from https://github.com/microsoft/vscode-icons)
+1) License Notice for static/ac6286f/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/f429d0a/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/ac6286f/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.6",
+  "version": "0.53.8",
   "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.6",
-    "@lvce-editor/static-server": "0.53.6"
+    "@lvce-editor/shared-process": "0.53.8",
+    "@lvce-editor/static-server": "0.53.8"
   }
 }

package/src/server.js

@@ -46,7 +46,7 @@ const isStatic = (url) => {
   if(url === '/'){
     return true
   }
-  if (url.startsWith('/f429d0a')) {
+  if (url.startsWith('/ac6286f')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {
@@ -186,6 +186,8 @@ const getOrCreateSharedProcess = () => {
 const launchStaticServerProcess = async () => {
   const staticServerPath = fileURLToPath(import.meta.resolve('@lvce-editor/static-server'))
   const ipc = await launchProcess(staticServerPath, ['--ipc-type=node-worker'])
+  ipc.on('message', handleMessage)
+
   return ipc
 }
 
@@ -222,14 +224,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(
     {
@@ -256,19 +266,36 @@ const setHeaders = (response, headers) => {
   }
 }
 
+const callbacks = Object.create(null)
+
+const registerCallback = () => {
+  const id = createId()
+  const { resolve, promise } = Promise.withResolvers()
+  callbacks[id] = resolve
+  return {
+    id,
+    promise,
+  }
+}
+
+const handleMessage = (message) => {
+  const { id } = message
+  if (callbacks[id]) {
+    callbacks[id](message)
+    delete callbacks[id]
+  }
+}
+
+const hasErrorListener = new WeakSet()
+
 const sendHandleStaticServerProcess = async (request, res, method, ...params) => {
   request.on('error', handleRequestError)
-  res.socket.on('error', handleSocketError)
-  const staticServerProcess = await getOrCreateStaticServerPathProcess()
-  const { resolve, promise } = Promise.withResolvers()
-  const id = createId()
-  const handleMessage = (message) => {
-    if (message.id && message.id === id) {
-      resolve(message)
-      staticServerProcess.off('message', handleMessage)
-    }
+  if (!hasErrorListener.has(res.socket)) {
+    res.socket.on('error', handleSocketError)
+    hasErrorListener.add(res.socket)
   }
-  staticServerProcess.on('message', handleMessage)
+  const staticServerProcess = await getOrCreateStaticServerPathProcess()
+  const { id, promise } = registerCallback()
   staticServerProcess.send({
     jsonrpc: '2.0',
     id,