@lvce-editor/server 0.116.12 → 0.116.14

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/0517e85/icons (from https://github.com/microsoft/vscode-codicons)
+1) License Notice for static/e271222/icons (from https://github.com/microsoft/vscode-codicons)
 ---------------------------------------
 
 Attribution 4.0 International
@@ -402,7 +402,7 @@ public licenses.
 Creative Commons may be contacted at creativecommons.org.
 
 
-2) License Notice for static/0517e85/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/e271222/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.116.12",
+  "version": "0.116.14",
   "description": "Run LVCE Editor as a server.",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@lvce-editor/jsonc-parser": "^1.5.2",
-    "@lvce-editor/shared-process": "0.116.12",
-    "@lvce-editor/static-server": "0.116.12"
+    "@lvce-editor/shared-process": "0.116.14",
+    "@lvce-editor/static-server": "0.116.14"
   }
 }

package/src/sendSocket.js

@@ -0,0 +1,16 @@
+export const sendSocket = (childProcess, message, socket) => {
+  socket.pause()
+  const handle = socket._handle
+  if (handle) {
+    // pause() stops stream delivery, but can leave the native read active.
+    // send() discards reads on the parent's handle until the child acknowledges
+    // the transfer, so stop that read before the peer can send its first frame.
+    const status = handle.readStop()
+    if (status !== 0) {
+      socket.destroy()
+      throw new Error(`Unable to stop socket reads before transfer (${status})`)
+    }
+    handle.reading = false
+  }
+  childProcess.send(message, socket, { keepOpen: false })
+}

package/src/server.js

@@ -7,6 +7,7 @@ import { fileURLToPath } from 'node:url'
 import { Worker } from 'node:worker_threads'
 import * as ArgvConfig from './argvConfig.js'
 import { getRemoteSshOptions, isAuthenticatedRemoteRequest } from './remoteSshOptions.js'
+import { sendSocket } from './sendSocket.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const ROOT = resolve(__dirname, '../')
@@ -77,7 +78,7 @@ const isStatic = (url) => {
   if (url === '/index.html' || url.startsWith('/index.html?')) {
     return !hasLinkedExtensions
   }
-  if (url.startsWith('/0517e85')) {
+  if (url.startsWith('/e271222')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {
@@ -284,16 +285,14 @@ const sendHandleSharedProcess = async (request, socket, method, ...params) => {
   }
   socket.on('error', handleSocketError)
   const sharedProcess = await getOrCreateSharedProcess()
-  sharedProcess.send(
+  sendSocket(
+    sharedProcess,
     {
       jsonrpc: '2.0',
       method,
       params: [getHandleMessage(request), ...params],
     },
     socket,
-    {
-      keepOpen: false,
-    },
   )
 }
 

package/test/fixtures/socket-transfer-child.js

@@ -0,0 +1,25 @@
+// Delay the handoff acknowledgement so the sender still owns a native handle
+// when the peer sends its first request.
+const send = process._send
+process._send = function (message, ...args) {
+  if (message?.cmd === 'NODE_HANDLE_ACK') {
+    setTimeout(() => send.call(this, message, ...args), 200)
+    return true
+  }
+  return send.call(this, message, ...args)
+}
+
+process.on('message', (_message, socket) => {
+  socket.pause()
+  socket._handle.readStop()
+  socket._handle.reading = false
+  socket.write('ready\n')
+  // Keep the receiver from winning the competing read while the sender's
+  // handle is waiting for its acknowledgement.
+  setTimeout(() => {
+    socket.on('data', (data) => socket.end(data))
+    socket._handle.readStart()
+    socket._handle.reading = true
+    socket.resume()
+  }, 100)
+})

package/test/sendSocket.test.js

@@ -0,0 +1,23 @@
+import assert from 'node:assert/strict'
+import { fork } from 'node:child_process'
+import { once } from 'node:events'
+import { createConnection, createServer } from 'node:net'
+import test from 'node:test'
+import { sendSocket } from '../src/sendSocket.js'
+
+test('preserves the first request while the child has not acknowledged the socket handoff', { timeout: 10000 }, async (context) => {
+  const child = fork(new URL('./fixtures/socket-transfer-child.js', import.meta.url))
+  context.after(() => child.kill())
+  const server = createServer((socket) => sendSocket(child, { type: 'socket' }, socket))
+  context.after(() => server.close())
+  server.listen(0, '127.0.0.1')
+  await once(server, 'listening')
+  const client = createConnection(server.address().port, '127.0.0.1')
+  context.after(() => client.destroy())
+  const [ready] = await once(client, 'data')
+  assert.equal(ready.toString(), 'ready\n')
+  const response = once(client, 'data', { signal: AbortSignal.timeout(5000) })
+  client.write('first request')
+  const [data] = await response
+  assert.equal(data.toString(), 'first request')
+})