@lvce-editor/server 0.103.20 → 0.103.22

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/e2306f5/icons (from https://github.com/microsoft/vscode-codicons)
+1) License Notice for static/5af6a2b/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/e2306f5/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/5af6a2b/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.103.20",
+  "version": "0.103.22",
   "description": "Run LVCE Editor as a server.",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -20,7 +20,8 @@
     "node": ">=24"
   },
   "dependencies": {
-    "@lvce-editor/shared-process": "0.103.20",
-    "@lvce-editor/static-server": "0.103.20"
+    "@lvce-editor/jsonc-parser": "^1.5.0",
+    "@lvce-editor/shared-process": "0.103.22",
+    "@lvce-editor/static-server": "0.103.22"
   }
 }

package/src/argvConfig.js

@@ -0,0 +1,78 @@
+import { parse } from '@lvce-editor/jsonc-parser'
+import { readFile } from 'node:fs/promises'
+import { homedir, tmpdir } from 'node:os'
+import { join } from 'node:path'
+
+const applicationName = 'lvce-oss'
+const keyPattern = /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/
+const optionsWithSeparateValues = new Set(['--connection-token', '--idle-timeout', '--link', '--only-extension', '--port', '--test-path'])
+
+const getArgument = (key, value) => {
+  return `--${key}=${value}`
+}
+
+const getArgumentsForValue = (key, value) => {
+  if (value === true) {
+    return [`--${key}`]
+  }
+  if (value === false) {
+    return []
+  }
+  if (typeof value === 'string' || typeof value === 'number') {
+    return [getArgument(key, value)]
+  }
+  if (Array.isArray(value) && value.every((item) => typeof item === 'string' || typeof item === 'number')) {
+    return value.map((item) => getArgument(key, item))
+  }
+  throw new TypeError(`Invalid argv.json value for "${key}": expected a boolean, string, number, or array of strings and numbers`)
+}
+
+export const parseArgvConfig = (content) => {
+  const config = parse(content)
+  if (!config || typeof config !== 'object' || Array.isArray(config)) {
+    throw new TypeError('Invalid argv.json: expected an object')
+  }
+  const argumentsFromConfig = []
+  for (const [key, value] of Object.entries(config)) {
+    if (!keyPattern.test(key)) {
+      throw new TypeError(`Invalid argv.json key "${key}"`)
+    }
+    argumentsFromConfig.push(...getArgumentsForValue(key, value))
+  }
+  return argumentsFromConfig
+}
+
+export const getArgvConfigPath = (env = process.env, homeDirectory = homedir()) => {
+  const configDirectory = env.XDG_CONFIG_HOME || (homeDirectory ? join(homeDirectory, '.config') : tmpdir())
+  return join(configDirectory, applicationName, 'argv.json')
+}
+
+export const load = async (path) => {
+  try {
+    const content = await readFile(path, 'utf8')
+    return parseArgvConfig(content)
+  } catch (error) {
+    if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+      return []
+    }
+    throw error
+  }
+}
+
+export const prepend = (argv, argumentsToPrepend) => {
+  argv.splice(2, 0, ...argumentsToPrepend)
+}
+
+export const getWorkspaceArgument = (args) => {
+  for (let index = 0; index < args.length; index++) {
+    const argument = args[index]
+    if (optionsWithSeparateValues.has(argument)) {
+      index++
+      continue
+    }
+    if (!argument.startsWith('-')) {
+      return argument
+    }
+  }
+  return ''
+}

package/src/remoteSshOptions.js

@@ -2,7 +2,7 @@ const defaultIdleTimeout = 3 * 60 * 60 * 1000
 
 const getArgument = (argv, name) => {
   const prefix = `${name}=`
-  const argument = argv.find((value) => value.startsWith(prefix))
+  const argument = argv.findLast((value) => value.startsWith(prefix))
   return argument ? argument.slice(prefix.length) : undefined
 }
 

package/src/server.js

@@ -5,17 +5,19 @@ import { createServer } from 'node:http'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { Worker } from 'node:worker_threads'
+import * as ArgvConfig from './argvConfig.js'
 import { getRemoteSshOptions, isAuthenticatedRemoteRequest } from './remoteSshOptions.js'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const ROOT = resolve(__dirname, '../')
 
 const { argv, env } = process
-
-let argv2 = argv[2]
+const configArguments = await ArgvConfig.load(ArgvConfig.getArgvConfigPath())
+ArgvConfig.prepend(argv, configArguments)
 
 // TODO pass argv to shared process instead of using environment variables / global variables
 const argvSliced = argv.slice(2)
+let argv2 = ArgvConfig.getWorkspaceArgument(argvSliced)
 for (const arg of argvSliced) {
   if (arg.startsWith('--only-extension=')) {
     process.env['ONLY_EXTENSION'] = arg.slice('--only-extension='.length)
@@ -72,7 +74,7 @@ const isStatic = (url) => {
   if (url === '/index.html' || url.startsWith('/index.html?')) {
     return true
   }
-  if (url.startsWith('/e2306f5')) {
+  if (url.startsWith('/5af6a2b')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {

package/test/argvConfig.test.js

@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict'
+import { join } from 'node:path'
+import test from 'node:test'
+import * as ArgvConfig from '../src/argvConfig.js'
+
+test('converts object values into command line arguments', () => {
+  assert.deepEqual(
+    ArgvConfig.parseArgvConfig(`{
+      // Extension development paths can be repeated.
+      "link": ["/test/one", "/test/two"],
+      "disable-custom-worker-paths": true,
+      "public": false,
+      "port": 3000
+    }`),
+    ['--link=/test/one', '--link=/test/two', '--disable-custom-worker-paths', '--port=3000'],
+  )
+})
+
+test('prepends config arguments before explicit command line arguments', () => {
+  const argv = ['/usr/bin/node', '/usr/lib/lvce/server.js', '--theme=explicit']
+
+  ArgvConfig.prepend(argv, ['--link=/test/extension', '--theme=configured'])
+
+  assert.deepEqual(argv, ['/usr/bin/node', '/usr/lib/lvce/server.js', '--link=/test/extension', '--theme=configured', '--theme=explicit'])
+})
+
+test('finds the workspace while ignoring repeated link arguments', () => {
+  assert.equal(ArgvConfig.getWorkspaceArgument(['--link', '/test/one', '/test/workspace', '--link=/test/two']), '/test/workspace')
+})
+
+test('uses the application config directory for argv.json', () => {
+  assert.equal(ArgvConfig.getArgvConfigPath({ XDG_CONFIG_HOME: '/test/config' }, '/test/home'), join('/test/config', 'lvce-oss', 'argv.json'))
+})

package/test/remoteSshOptions.test.js

@@ -22,6 +22,22 @@ test('parses private remote SSH server options', () => {
   })
 })
 
+test('uses the last value when an explicit argument follows argv.json arguments', () => {
+  assert.deepEqual(
+    getRemoteSshOptions(
+      ['--as-remote-ssh-server', '--port=3000', '--connection-token=config', '--port=45123', '--connection-token=explicit'],
+      {},
+    ),
+    {
+      enabled: true,
+      host: '127.0.0.1',
+      idleTimeout: 10_800_000,
+      port: 45123,
+      token: 'explicit',
+    },
+  )
+})
+
 test('requires an authentication token in remote mode', () => {
   assert.throws(() => getRemoteSshOptions(['--as-remote-ssh-server'], {}), /requires --connection-token/)
 })

package/test/remoteSshServer.integration.test.js

@@ -85,7 +85,10 @@ test('remote mode authenticates and exposes existing workspace processes', { ski
   const token = 'integration-secret'
   const child = spawn(process.execPath, [serverPath, '--as-remote-ssh-server', '--port=0', `--connection-token=${token}`, '--idle-timeout=30000'], {
     detached: true,
-    env: process.env,
+    env: {
+      ...process.env,
+      XDG_CONFIG_HOME: directory,
+    },
     stdio: ['ignore', 'pipe', 'pipe'],
   })
   context.after(async () => {