@lvce-editor/server 0.126.25 → 0.127.0

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/cbed48c/icons (from https://github.com/microsoft/vscode-codicons)
+1) License Notice for static/bb456c5/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/cbed48c/fonts (from https://www.npmjs.com/package/@fontsource/fira-code)
+2) License Notice for static/bb456c5/fonts (from https://www.npmjs.com/package/@fontsource/fira-code)
 ---------------------------------------
 
 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.126.25",
+  "version": "0.127.0",
   "description": "Run LVCE Editor as a server.",
   "main": "index.js",
   "bin": "bin/server.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@lvce-editor/jsonc-parser": "^1.6.0",
-    "@lvce-editor/shared-process": "0.126.25",
-    "@lvce-editor/static-server": "0.126.25"
+    "@lvce-editor/shared-process": "0.127.0",
+    "@lvce-editor/static-server": "0.127.0"
   }
 }

package/src/argvConfig.js

@@ -1,11 +1,11 @@
 import { parse } from '@lvce-editor/jsonc-parser'
 import { readFile } from 'node:fs/promises'
 import { homedir, tmpdir } from 'node:os'
-import { join } from 'node:path'
+import { join, resolve } 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 optionsWithSeparateValues = new Set(['--auth-worker-path', '--connection-token', '--idle-timeout', '--link', '--only-extension', '--port', '--test-path'])
 const reclaimerFeatureName = 'PartitionAllocMemoryReclaimer'
 const reclaimerFeature = `${reclaimerFeatureName}:interval/1800s`
 
@@ -136,3 +136,25 @@ export const getWorkspaceArgument = (args) => {
   }
   return ''
 }
+
+export const resolveAuthWorkerPath = (args, workingDirectory = process.cwd()) => {
+  const resolvedArgs = [...args]
+  for (let index = 0; index < resolvedArgs.length; index++) {
+    const argument = resolvedArgs[index]
+    if (argument === '--auth-worker-path') {
+      const value = resolvedArgs[index + 1]
+      if (!value || value.startsWith('--')) {
+        throw new TypeError('--auth-worker-path requires a filesystem path')
+      }
+      resolvedArgs[index] = `--auth-worker-path=${resolve(workingDirectory, value)}`
+      resolvedArgs.splice(index + 1, 1)
+    } else if (argument.startsWith('--auth-worker-path=')) {
+      const value = argument.slice('--auth-worker-path='.length)
+      if (!value) {
+        throw new TypeError('--auth-worker-path requires a filesystem path')
+      }
+      resolvedArgs[index] = `--auth-worker-path=${resolve(workingDirectory, value)}`
+    }
+  }
+  return resolvedArgs
+}

package/src/server.js

@@ -19,7 +19,7 @@ if (env.LVCE_ARGV_CONFIG_LOADED !== '1') {
 }
 
 // TODO pass argv to shared process instead of using environment variables / global variables
-const argvSliced = argv.slice(2)
+const argvSliced = ArgvConfig.resolveAuthWorkerPath(argv.slice(2))
 let argv2 = ArgvConfig.getWorkspaceArgument(argvSliced)
 for (const arg of argvSliced) {
   if (arg.startsWith('--only-extension=')) {
@@ -81,7 +81,7 @@ const isStatic = (url) => {
   if (url === '/index.html' || url.startsWith('/index.html?')) {
     return !hasLinkedExtensions && !hasCustomWorkerPathOverride
   }
-  if (url.startsWith('/cbed48c')) {
+  if (url.startsWith('/bb456c5')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {

package/test/argvConfig.test.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert/strict'
-import { join } from 'node:path'
+import { join, resolve } from 'node:path'
 import test from 'node:test'
 import * as ArgvConfig from '../src/argvConfig.js'
 
@@ -69,3 +69,20 @@ test('worker path options do not become workspace arguments', () => {
   )
   assert.equal(ArgvConfig.getWorkspaceArgument(['--process-explorer-worker=/worker.js']), '')
 })
+
+test('resolves an auth worker path supplied with equals syntax', () => {
+  const workingDirectory = '/test/workspace'
+  assert.deepEqual(ArgvConfig.resolveAuthWorkerPath(['--auth-worker-path=relative/auth worker.js'], workingDirectory), [
+    `--auth-worker-path=${resolve(workingDirectory, 'relative/auth worker.js')}`,
+  ])
+})
+
+test('resolves an auth worker path supplied as a separate argument', () => {
+  const workingDirectory = '/test'
+  assert.deepEqual(ArgvConfig.resolveAuthWorkerPath(['--auth-worker-path', 'relative/auth worker.js', '/workspace'], '/test'), [
+    `--auth-worker-path=${resolve(workingDirectory, 'relative/auth worker.js')}`,
+    '/workspace',
+  ])
+  assert.equal(ArgvConfig.getWorkspaceArgument(['--auth-worker-path=/test/auth worker.js', '/workspace']), '/workspace')
+  assert.equal(ArgvConfig.getWorkspaceArgument(['--auth-worker-path', '/test/auth worker.js', '/workspace']), '/workspace')
+})