@lvce-editor/server 0.122.9 → 0.122.11

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/4c89f27/icons (from https://github.com/microsoft/vscode-codicons)
+1) License Notice for static/80cb838/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/4c89f27/fonts/FiraCode-VariableFont.ttf (from https://github.com/tonsky/FiraCode)
+2) License Notice for static/80cb838/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.122.9",
+  "version": "0.122.11",
   "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.122.9",
-    "@lvce-editor/static-server": "0.122.9"
+    "@lvce-editor/shared-process": "0.122.11",
+    "@lvce-editor/static-server": "0.122.11"
   }
 }

package/src/argvConfig.js

@@ -6,6 +6,8 @@ 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 reclaimerFeatureName = 'PartitionAllocMemoryReclaimer'
+const reclaimerFeature = `${reclaimerFeatureName}:interval/1800s`
 
 const getArgument = (key, value) => {
   return `--${key}=${value}`
@@ -63,6 +65,64 @@ export const prepend = (argv, argumentsToPrepend) => {
   argv.splice(2, 0, ...argumentsToPrepend)
 }
 
+const getFeatureName = (feature) => feature.split(/[:<]/, 1)[0].trim()
+
+export const addDefaultMemoryReclaimerFeature = (args) => {
+  const enabledFeatures = []
+  const disabledFeatures = []
+  const keptArgs = []
+  for (let index = 0; index < args.length; index++) {
+    const arg = args[index]
+    if (arg === '--enable-features' || arg === '--disable-features') {
+      const target = arg === '--enable-features' ? enabledFeatures : disabledFeatures
+      target.push(
+        ...(args[index + 1] || '')
+          .split(',')
+          .map((feature) => feature.trim())
+          .filter(Boolean),
+      )
+      index++
+      continue
+    }
+    if (arg.startsWith('--enable-features=')) {
+      enabledFeatures.push(
+        ...arg
+          .slice('--enable-features='.length)
+          .split(',')
+          .map((feature) => feature.trim())
+          .filter(Boolean),
+      )
+      continue
+    }
+    if (arg.startsWith('--disable-features=')) {
+      disabledFeatures.push(
+        ...arg
+          .slice('--disable-features='.length)
+          .split(',')
+          .map((feature) => feature.trim())
+          .filter(Boolean),
+      )
+      continue
+    }
+    keptArgs.push(arg)
+  }
+
+  if (disabledFeatures.some((feature) => getFeatureName(feature) === reclaimerFeatureName)) {
+    return args
+  }
+
+  const reclaimerIndices = enabledFeatures.flatMap((feature, index) => (getFeatureName(feature) === reclaimerFeatureName ? [index] : []))
+  const explicitReclaimerIndex = reclaimerIndices.findLast((index) => enabledFeatures[index].includes(':'))
+  const featureIndex = reclaimerIndices[0] ?? enabledFeatures.length
+  const selectedReclaimerFeature = explicitReclaimerIndex === undefined ? reclaimerFeature : enabledFeatures[explicitReclaimerIndex]
+  const mergedFeatures = enabledFeatures.filter((feature) => getFeatureName(feature) !== reclaimerFeatureName)
+  mergedFeatures.splice(featureIndex, 0, selectedReclaimerFeature)
+
+  const featureArguments = [`--enable-features=${mergedFeatures.join(',')}`]
+  keptArgs.unshift(...featureArguments)
+  return keptArgs
+}
+
 export const getWorkspaceArgument = (args) => {
   for (let index = 0; index < args.length; index++) {
     const argument = args[index]

package/src/server.js

@@ -80,7 +80,7 @@ const isStatic = (url) => {
   if (url === '/index.html' || url.startsWith('/index.html?')) {
     return !hasLinkedExtensions
   }
-  if (url.startsWith('/4c89f27')) {
+  if (url.startsWith('/80cb838')) {
     return true
   }
   if (url.startsWith('/favicon.ico')) {

package/test/argvConfig.test.js

@@ -24,6 +24,36 @@ test('prepends config arguments before explicit command line arguments', () => {
   assert.deepEqual(argv, ['/usr/bin/node', '/usr/lib/lvce/server.js', '--link=/test/extension', '--theme=configured', '--theme=explicit'])
 })
 
+test('adds the default native memory reclaimer feature without losing enabled features', () => {
+  assert.deepEqual(ArgvConfig.addDefaultMemoryReclaimerFeature(['--enable-features=ExampleFeature', '/workspace']), [
+    '--enable-features=ExampleFeature,PartitionAllocMemoryReclaimer:interval/1800s',
+    '/workspace',
+  ])
+})
+
+test('preserves an explicitly configured native memory reclaimer interval', () => {
+  assert.deepEqual(ArgvConfig.addDefaultMemoryReclaimerFeature(['--enable-features=ExampleFeature,PartitionAllocMemoryReclaimer:interval/32s']), [
+    '--enable-features=ExampleFeature,PartitionAllocMemoryReclaimer:interval/32s',
+  ])
+})
+
+test('honors an explicit native memory reclaimer disable', () => {
+  const args = ['--disable-features=ExampleFeature,PartitionAllocMemoryReclaimer', '/workspace']
+  assert.equal(ArgvConfig.addDefaultMemoryReclaimerFeature(args), args)
+})
+
+test('combines repeated feature switches and replaces a bare native reclaimer entry', () => {
+  assert.deepEqual(
+    ArgvConfig.addDefaultMemoryReclaimerFeature([
+      '--enable-features',
+      'ExampleFeature,PartitionAllocMemoryReclaimer',
+      '--enable-features=OtherFeature,PartitionAllocMemoryReclaimer:interval/45s',
+      '/workspace',
+    ]),
+    ['--enable-features=ExampleFeature,PartitionAllocMemoryReclaimer:interval/45s,OtherFeature', '/workspace'],
+  )
+})
+
 test('finds the workspace while ignoring repeated link arguments', () => {
   assert.equal(ArgvConfig.getWorkspaceArgument(['--link', '/test/one', '/test/workspace', '--link=/test/two']), '/test/workspace')
 })