@lvce-editor/shared-process 0.24.6 → 0.25.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.24.6",
+  "version": "0.25.1",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.24.6",
+    "@lvce-editor/extension-host-helper-process": "0.25.1",
     "@lvce-editor/ipc": "^2.1.0",
     "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/jsonc-parser": "^1.1.1",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/pty-host": "0.24.6",
+    "@lvce-editor/pty-host": "0.25.1",
     "@lvce-editor/verror": "^1.1.2",
     "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",

package/src/parts/AppWindow/AppWindow.js

@@ -9,7 +9,7 @@ export const createAppWindow = async (preferences, parsedArgs, workingDirectory,
   const { width, height } = await Screen.getBounds()
   const windowOptions = GetAppWindowOptions.getAppWindowOptions(preferences, width, height)
   const titleBarItems = GetTitleBarItems.getTitleBarItems()
-  return ParentIpc.invoke('AppWindow.createAppWindow2', windowOptions, parsedArgs, workingDirectory, titleBarItems, url)
+  return ParentIpc.invoke('AppWindow.createAppWindow', windowOptions, parsedArgs, workingDirectory, titleBarItems, url)
 }
 
 export const openNew = async (url) => {

package/src/parts/ChildProcess/ChildProcess.js

@@ -4,7 +4,7 @@ import exitHook from 'exit-hook'
 import * as Debug from '../Debug/Debug.js'
 
 export const state = {
-  /** @type{ChildProcess[]} */
+  /** @type{NodeChildProcess.ChildProcess[]} */
   childProcesses: [],
 }
 

package/src/parts/ChromeExtension/ChromeExtension.js

@@ -3,12 +3,12 @@ import * as Download from '../Download/Download.js'
 import * as ExtractZip from '../ExtractZip/ExtractZip.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Path from '../Path/Path.js'
-import * as Platform from '../Platform/Platform.js'
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
 import { VError } from '../VError/VError.js'
 
 const getExtensionPath = async (tmpDir) => {
   const dirents = await FileSystem.readDirWithFileTypes(tmpDir)
+  // @ts-ignore
   if (dirents.length === 1 && dirents[0].type === 'directory') {
     return Path.join(tmpDir, dirents[0].name)
   }

package/src/parts/ClipBoard/ClipBoardWindows.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import clipboardEx from 'electron-clipboard-ex'
 import { VError } from '../VError/VError.js'
 

package/src/parts/CollectTextSearchStdout/CollectTextSearchStdout.js

@@ -92,7 +92,7 @@ export const collectStdout = async (childProcess, maxSearchResults, charsBefore,
           callback(error)
         }
       },
-    })
+    }),
   )
   const results = Object.values(allSearchResults).flat(1)
   return {

package/src/parts/ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js

@@ -1,7 +1,5 @@
-import * as Character from '../Character/Character.js'
 import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
-
-export const key = 'Content-Security-Policy'
+import * as Character from '../Character/Character.js'
 
 export const value = [
   `default-src 'none'`,

package/src/parts/ContentSecurityPolicyTerminalWorker/ContentSecurityPolicyTerminalWorker.js

@@ -0,0 +1,4 @@
+import * as Character from '../Character/Character.js'
+import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+
+export const value = [`default-src 'none'`, `script-src 'self'`, `connect-src 'self'`].map(AddSemiColon.addSemicolon).join(Character.Space)

package/src/parts/ContentSecurityPolicyTestWorker/ContentSecurityPolicyTestWorker.js

@@ -1,6 +1,4 @@
 import * as Character from '../Character/Character.js'
 import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
 
-export const key = 'Content-Security-Policy'
-
 export const value = [`default-src 'none'`, `script-src 'self'`].map(AddSemiColon.addSemicolon).join(Character.Space)

package/src/parts/ContentSecurityPolicyWorker/ContentSecurityPolicyWorker.js

@@ -1,8 +1,6 @@
 import * as Character from '../Character/Character.js'
 import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
 
-export const key = 'Content-Security-Policy'
-
 // prettier-ignore
 export const value = [
   `default-src 'none'`,

package/src/parts/CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js

@@ -1,2 +1 @@
-export const key = 'Cross-Origin-Embedder-Policy'
 export const value = 'require-corp'

package/src/parts/Developer/Developer.js

@@ -1,11 +1,10 @@
-import { performance } from 'node:perf_hooks'
-import * as ExtensionHost from '../ExtensionHost/ExtensionHost.js'
 import * as Process from '../Process/Process.js'
 
 export const measureLatencyBetweenExtensionHostAndSharedProcess = async (socket, id) => {
   // TODO lazy load extension host
-  const latency = await ExtensionHost.measureLatency()
-  socket.send([/* callback */ id, /* latency */ latency])
+  // @ts-ignore
+  // const latency = await ExtensionHost.measureLatency()
+  // socket.send([/* callback */ id, /* latency */ latency])
 }
 
 export const measureLatencyBetweenSharedProcessAndRendererProcess = async (socket, id) => {

package/src/parts/DownloadAndExtract/DownloadAndExtract.js

@@ -11,7 +11,7 @@ export const downloadAndExtractTarGz = async ({ url, outDir, strip }) => {
       createGunzip(),
       tar.extract(outDir, {
         strip,
-      })
+      }),
     )
   } catch (error) {
     if (error && error instanceof RequestError) {

package/src/parts/Env/Env.js

@@ -18,4 +18,4 @@ export const getRipGrepPath = () => {
   return process.env.RIP_GREP_PATH
 }
 
-export const {env} = process
+export const { env } = process

package/src/parts/ErrorHandling/ErrorHandling.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import * as Character from '../Character/Character.js'
 import * as ExitCode from '../ExitCode/ExitCode.js'
 import * as GetNewLineIndex from '../GetNewLineIndex/GetNewLineIndex.js'

package/src/parts/ExportStatic/ExportStatic.js

@@ -4,10 +4,6 @@ import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
 
-// TODO
-// - implement this for syntax highlighting projects
-// - implement this for language features web extensions
-
 const readExtensionManifest = async (path) => {
   const json = await JsonFile.readJson(path)
   return { ...json, path }
@@ -316,15 +312,21 @@ const addExtensionLanguages = async ({ root, extensionPath, extensionJson, commi
   }
 }
 
-const addExtensionWebExtension = async ({ root, extensionPath, commitHash, extensionJson, pathPrefix }) => {
+const addExtensionWebExtension = async ({ root, extensionPath, commitHash, extensionJson, pathPrefix, useSimpleWebExtensionFile }) => {
   if (!extensionJson.browser) {
     return
   }
+  const webExtensionPath = `${pathPrefix}/${commitHash}/extensions/${extensionJson.id}`
+  if (useSimpleWebExtensionFile) {
+    const webExtensions = [webExtensionPath]
+    await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'webExtensions.json'), webExtensions)
+    return
+  }
   const webExtensions = [
     {
       ...extensionJson,
       isWeb: true,
-      path: `${pathPrefix}/${commitHash}/extensions/${extensionJson.id}`,
+      path: webExtensionPath,
     },
   ]
   await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'webExtensions.json'), webExtensions)
@@ -333,7 +335,7 @@ const addExtensionWebExtension = async ({ root, extensionPath, commitHash, exten
   }
 }
 
-const addExtension = async ({ root, extensionPath, commitHash, pathPrefix }) => {
+const addExtension = async ({ root, extensionPath, commitHash, pathPrefix, useSimpleWebExtensionFile }) => {
   const extensionJson = await readExtensionManifest(Path.join(extensionPath, 'extension.json'))
   const name = extensionJson.name || extensionJson.id || ''
   const description = extensionJson.description || ''
@@ -362,6 +364,7 @@ const addExtension = async ({ root, extensionPath, commitHash, pathPrefix }) =>
     commitHash,
     extensionJson,
     pathPrefix,
+    useSimpleWebExtensionFile,
   })
 }
 
@@ -420,9 +423,9 @@ const addTestFiles = async ({ testPath, commitHash, root, pathPrefix }) => {
 
 /**
  *
- * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string   }} param0
+ * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string, useSimpleWebExtensionFile?:boolean }} param0
  */
-export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath }) => {
+export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath, useSimpleWebExtensionFile }) => {
   if (!existsSync(root)) {
     throw new Error(`root path does not exist: ${root}`)
   }
@@ -460,6 +463,7 @@ export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath }
     commitHash,
     pathPrefix,
     root,
+    useSimpleWebExtensionFile,
   })
   console.timeEnd('addExtension')
 
@@ -473,4 +477,7 @@ export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath }
     })
     console.timeEnd('addTestFiles')
   }
+  return {
+    commitHash,
+  }
 }

package/src/parts/ExtensionInstall/ExtensionInstall.js

@@ -4,9 +4,7 @@ import * as ExtensionInstallType from '../ExtensionInstallType/ExtensionInstallT
 const getModule = (type) => {
   switch (type) {
     case ExtensionInstallType.GithubRepository:
-      return import(
-        '../ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js'
-      )
+      return import('../ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js')
     case ExtensionInstallType.Url:
       return import('../ExtensionInstallFromUrl/ExtensionInstallFromUrl.js')
     case ExtensionInstallType.File:

package/src/parts/ExtensionManagement/ExtensionManagement.ipc.js

@@ -15,6 +15,5 @@ export const Commands = {
   'ExtensionManagement.enable': ExtensionManagement.enable,
   'ExtensionManagement.getAllExtensions': ExtensionManagement.getExtensions,
   'ExtensionManagement.getExtensions': ExtensionManagement.getExtensions,
-  'ExtensionManagement.install': ExtensionManagement.install,
   'ExtensionManagement.uninstall': ExtensionManagement.uninstall,
 }

package/src/parts/ExtensionManifests/ExtensionManifestsFromLinkedExtensionsFolder.js

@@ -20,7 +20,7 @@ const readSymlinks = (absolutePaths) => {
 }
 
 const mergeWithSymLinks = (manifests, symlinks) => {
-  const {length} = manifests
+  const { length } = manifests
   const merged = []
   for (let i = 0; i < length; i++) {
     const manifest = manifests[i]

package/src/parts/Extract/Extract.js

@@ -22,7 +22,7 @@ export const extractTarGz = async ({ inFile, outDir, strip }) => {
       createGunzip(),
       tar.extract(outDir, {
         strip,
-      })
+      }),
     )
   } catch (error) {
     throw new VError(error, `Failed to extract ${inFile}`)

package/src/parts/GetElectronFileResponse/GetElectronFileResponse.js

@@ -4,8 +4,10 @@ import * as GetElectronFileResponseContent from '../GetElectronFileResponseConte
 import * as GetElectronFileResponseRelativePath from '../GetElectronFileResponseRelativePath/GetElectronFileResponseRelativePath.js'
 import * as GetEtag from '../GetEtag/GetEtag.js'
 import * as GetHeaders from '../GetHeaders/GetHeaders.js'
-import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
 import * as GetNotFoundResponse from '../GetNotFoundResponse/GetNotFoundResponse.js'
+import * as GetNotModifiedResponse from '../GetNotModifiedResponse/GetNotModifiedResponse.js'
+import * as GetServerErrorResponse from '../GetServerErrorResponse/GetServerErrorResponse.js'
+import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
 import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
 import * as Logger from '../Logger/Logger.js'
 
@@ -18,13 +20,7 @@ export const getElectronFileResponse = async (url, request) => {
       const stats = await stat(absolutePath)
       etag = GetEtag.getEtag(stats)
       if (request.headers['if-none-match'] === etag) {
-        return {
-          body: '',
-          init: {
-            status: HttpStatusCode.NotModifed,
-            headers: {},
-          },
-        }
+        return GetNotModifiedResponse.getNotModifiedResponse()
       }
     }
     const content = await GetElectronFileResponseContent.getElectronFileResponseContent(request, absolutePath, url)
@@ -45,13 +41,6 @@ export const getElectronFileResponse = async (url, request) => {
       return GetNotFoundResponse.getNotFoundResponse()
     }
     Logger.error(error)
-    return {
-      body: 'server-error',
-      init: {
-        status: HttpStatusCode.ServerError,
-        statusText: 'server-error',
-        headers: {},
-      },
-    }
+    return GetServerErrorResponse.getServerErrorResponse()
   }
 }

package/src/parts/GetHeaders/GetHeaders.js

@@ -1,15 +1,14 @@
 import { extname } from 'path'
+import * as GetHeadersDefault from '../GetHeadersDefault/GetHeadersDefault.js'
 import * as GetHeadersExtensionHostWorker from '../GetHeadersExtensionHostWorker/GetHeadersExtensionHostWorker.js'
 import * as GetHeadersMainFrame from '../GetHeadersMainFrame/GetHeadersMainFrame.js'
-import * as GetHeadersTestWorker from '../GetHeadersTestWorker/GetHeadersTestWorker.js'
 import * as GetHeadersOtherWorker from '../GetHeadersOtherWorker/GetHeadersOtherWorker.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 import * as GetHeadersRendererWorker from '../GetHeadersRendererWorker/GetHeadersRendererWorker.js'
+import * as GetHeadersTerminalWorker from '../GetHeadersTerminalWorker/GetHeadersTerminalWorker.js'
+import * as GetHeadersTestWorker from '../GetHeadersTestWorker/GetHeadersTestWorker.js'
 import * as GetMimeType from '../GetMimeType/GetMimeType.js'
 
-const getHeadersDefault = () => {
-  return {}
-}
-
 const getExtraHeaders = (pathName, fileExtension) => {
   switch (fileExtension) {
     case '.html':
@@ -22,15 +21,18 @@ const getExtraHeaders = (pathName, fileExtension) => {
       if (pathName.endsWith('rendererWorkerMain.js')) {
         return GetHeadersRendererWorker.getHeadersRendererWorker()
       }
-      if (pathName.endsWith('extensionHostWorkerMain.js')) {
+      if (pathName.endsWith('extensionHostWorkerMain.js') || pathName.endsWith('extensionHostWorkerMain.ts')) {
         return GetHeadersExtensionHostWorker.getHeadersExtensionHostWorker()
       }
+      if (pathName.endsWith('terminalWorkerMain.js') || pathName.endsWith('terminalWorkerMain.ts')) {
+        return GetHeadersTerminalWorker.getHeadersTerminalWorker()
+      }
       if (pathName.endsWith('WorkerMain.js') || pathName.endsWith('WorkerMain.ts')) {
         return GetHeadersOtherWorker.getHeadersOtherWorker(pathName)
       }
-      return getHeadersDefault()
+      return GetHeadersDefault.getHeadersDefault()
     default:
-      return getHeadersDefault()
+      return GetHeadersDefault.getHeadersDefault()
   }
 }
 
@@ -38,7 +40,7 @@ export const getHeaders = (absolutePath, pathName) => {
   const extension = extname(absolutePath)
   const mime = GetMimeType.getMimeType(extension)
   const headers = {
-    'Content-Type': mime,
+    [HttpHeader.ContentType]: mime,
   }
   const extraHeaders = getExtraHeaders(pathName, extension)
   return {

package/src/parts/GetHeadersDefault/GetHeadersDefault.js

@@ -0,0 +1,3 @@
+export const getHeadersDefault = () => {
+  return {}
+}

package/src/parts/GetHeadersExtensionHostWorker/GetHeadersExtensionHostWorker.js

@@ -1,9 +1,10 @@
 import * as ContentSecurityPolicyWorker from '../ContentSecurityPolicyWorker/ContentSecurityPolicyWorker.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
 export const getHeadersExtensionHostWorker = () => {
   return {
-    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
-    [ContentSecurityPolicyWorker.key]: ContentSecurityPolicyWorker.value,
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyWorker.value,
   }
 }

package/src/parts/GetHeadersMainFrame/GetHeadersMainFrame.js

@@ -1,11 +1,12 @@
 import * as ContentSecurityPolicyDocument from '../ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
 import * as CrossOriginOpenerPolicy from '../CrossOriginOpenerPolicy/CrossOriginOpenerPolicy.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
 export const getHeadersMainFrame = () => {
   return {
-    [ContentSecurityPolicyDocument.key]: ContentSecurityPolicyDocument.value,
-    [CrossOriginOpenerPolicy.key]: CrossOriginOpenerPolicy.value,
-    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyDocument.value,
+    [HttpHeader.CrossOriginOpenerPolicy]: CrossOriginOpenerPolicy.value,
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
   }
 }

package/src/parts/GetHeadersOtherWorker/GetHeadersOtherWorker.js

@@ -1,13 +1,14 @@
 import * as ContentSecurityPolicyState from '../ContentSecurityPolicyState/ContentSecurityPolicyState.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
 export const getHeadersOtherWorker = (url) => {
   const headers = {
-    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
   }
   const dynamicCsp = ContentSecurityPolicyState.get(url)
   if (dynamicCsp) {
-    headers['Content-Security-Policy'] = dynamicCsp
+    headers[HttpHeader.ContentSecurityPolicy] = dynamicCsp
   }
   return headers
 }

package/src/parts/GetHeadersRendererWorker/GetHeadersRendererWorker.js

@@ -1,9 +1,10 @@
 import * as ContentSecurityPolicyWorker from '../ContentSecurityPolicyWorker/ContentSecurityPolicyWorker.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
 export const getHeadersRendererWorker = () => {
   return {
-    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
-    [ContentSecurityPolicyWorker.key]: ContentSecurityPolicyWorker.value,
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyWorker.value,
   }
 }

package/src/parts/GetHeadersTerminalWorker/GetHeadersTerminalWorker.js

@@ -0,0 +1,10 @@
+import * as ContentSecurityPolicyTerminalWorker from '../ContentSecurityPolicyTerminalWorker/ContentSecurityPolicyTerminalWorker.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
+import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
+
+export const getHeadersTerminalWorker = () => {
+  return {
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyTerminalWorker.value,
+  }
+}

package/src/parts/GetHeadersTestWorker/GetHeadersTestWorker.js

@@ -1,9 +1,10 @@
 import * as ContentSecurityPolicyTestWorker from '../ContentSecurityPolicyTestWorker/ContentSecurityPolicyTestWorker.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
 
 export const getHeadersExtensionHostWorker = () => {
   return {
-    [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
-    [ContentSecurityPolicyTestWorker.key]: ContentSecurityPolicyTestWorker.value,
+    [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+    [HttpHeader.ContentSecurityPolicy]: ContentSecurityPolicyTestWorker.value,
   }
 }

package/src/parts/GetNotModifiedResponse/GetNotModifiedResponse.js

@@ -0,0 +1,11 @@
+import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
+
+export const getNotModifiedResponse = async () => {
+  return {
+    body: '',
+    init: {
+      status: HttpStatusCode.NotModifed,
+      headers: {},
+    },
+  }
+}

package/src/parts/GetServerErrorResponse/GetServerErrorResponse.js

@@ -0,0 +1,12 @@
+import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
+
+export const getServerErrorResponse = () => {
+  return {
+    body: 'server-error',
+    init: {
+      status: HttpStatusCode.ServerError,
+      statusText: 'server-error',
+      headers: {},
+    },
+  }
+}

package/src/parts/GetTestRequestResponse/GetTestRequestResponse.js

@@ -3,6 +3,7 @@ import { join } from 'node:path'
 import * as CreateTestOverview from '../CreateTestOverview/CreateTestOverview.js'
 import * as CrossOriginEmbedderPolicy from '../CrossOriginEmbedderPolicy/CrossOriginEmbedderPolicy.js'
 import * as CrossOriginOpenerPolicy from '../CrossOriginOpenerPolicy/CrossOriginOpenerPolicy.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 import * as GetPathName from '../GetPathName/GetPathName.js'
 import * as GetTestPath from '../GetTestPath/GetTestPath.js'
 import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
@@ -28,10 +29,10 @@ export const getTestRequestResponse = async (request, indexHtmlPath) => {
       init: {
         status: HttpStatusCode.MultipleChoices,
         headers: {
-          'Cache-Control': 'public, max-age=0, must-revalidate',
-          [CrossOriginEmbedderPolicy.key]: CrossOriginEmbedderPolicy.value,
-          [CrossOriginOpenerPolicy.key]: CrossOriginOpenerPolicy.value,
-          'Content-Security-Policy': "default-src 'none'",
+          [HttpHeader.CacheControl]: 'public, max-age=0, must-revalidate',
+          [HttpHeader.CrossOriginEmbedderPolicy]: CrossOriginEmbedderPolicy.value,
+          [HttpHeader.CrossOriginOpenerPolicy]: CrossOriginOpenerPolicy.value,
+          [HttpHeader.ContentSecurityPolicy]: "default-src 'none'",
         },
       },
     }

package/src/parts/GetTypeScriptPath/GetTypeScriptPath.js

@@ -1,12 +1,13 @@
 import { join } from 'node:path'
 import * as IsBuiltServer from '../IsBuiltServer/IsBuiltServer.js'
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
+import { pathToFileURL } from 'node:url'
 
-export const getTypeScriptPath = () => {
+export const getTypeScriptUri = () => {
   if (IsBuiltServer.isBuiltServer) {
     return 'typescript'
   }
-  return join(
+  const typescriptPath = join(
     PlatformPaths.getBuiltinExtensionsPath(),
     'builtin.language-features-typescript',
     'node',
@@ -15,4 +16,6 @@ export const getTypeScriptPath = () => {
     'lib',
     'typescript.js',
   )
+  const typescriptUri = pathToFileURL(typescriptPath).toString()
+  return typescriptUri
 }

package/src/parts/HandleWebSocketForTerminalProcess/HandleWebSocketForTerminalProcess.js

@@ -8,7 +8,7 @@ export const handleWebSocket = async (message, handle) => {
       method: 'HandleWebSocket.handleWebSocket',
       params: [message],
     },
-    handle
+    handle,
   )
   // console.log({ instance })
   // const ipc = await PtyHost.getOrCreate()

package/src/parts/HandleWebSocketModule/HandleWebSocketModule.js

@@ -8,8 +8,6 @@ export const load = (protocol) => {
   switch (protocol) {
     case ProtocolType.SharedProcess:
       return import('../HandleWebSocketForSharedProcess/HandleWebSocketForSharedProcess.js')
-    case ProtocolType.ExtensionHost:
-      return import('../HandleWebSocketForExtensionHost/HandleWebSocketForExtensionHost.js')
     case ProtocolType.ExtensionHostHelperProcess:
       return import('../HandleWebSocketForExtensionHostHelperProcess/HandleWebSocketForExtensionHostHelperProcess.js')
     case ProtocolType.TerminalProcess:

package/src/parts/HeapSnapshot/HeapSnapshot.js

@@ -6,6 +6,6 @@ export const createHeapSnapshot = async () => {
   await pipeline(
     getHeapSnapshot(),
     // TODO get tmp dir from env
-    createWriteStream(`/tmp/vscode-${Date.now()}.heapsnapshot`)
+    createWriteStream(`/tmp/vscode-${Date.now()}.heapsnapshot`),
   )
 }

package/src/parts/HttpHeader/HttpHeader.js

@@ -0,0 +1,7 @@
+export const CacheControl = 'Cache-Control'
+export const ContentType = 'Content-Type'
+export const ContentSecurityPolicy = 'Content-Security-Policy'
+export const CrossOriginEmbedderPolicy = 'Cross-Origin-Embedder-Policy'
+export const CrossOriginOpenerPolicy = 'Cross-Origin-Opener-Policy'
+export const Etag = 'Etag'
+export const IfNotMatch = 'if-none-match'

package/src/parts/IpcChild/IpcChild.js

@@ -9,6 +9,7 @@ export const listen = async ({ method, ...params }) => {
     // @ts-ignore
     module.signal(rawIpc)
   }
+  // @ts-ignore
   const ipc = module.wrap(rawIpc)
   return ipc
 }

package/src/parts/IpcParent/IpcParent.js

@@ -4,6 +4,7 @@ export const create = async ({ method, ...options }) => {
   const module = await IpcParentModule.getModule(method)
   // @ts-ignore
   const rawIpc = await module.create(options)
+  // @ts-ignore
   const ipc = module.wrap(rawIpc)
   return ipc
 }

package/src/parts/JsoncFile/JsoncFile.js

@@ -3,6 +3,7 @@ import * as Jsonc from '../Jsonc/Jsonc.js'
 
 export const readJsonc = async (absolutePath) => {
   const content = await FileSystem.readFile(absolutePath)
+  // @ts-ignore
   const json = await Jsonc.parse(content)
   return json
 }

package/src/parts/Module/Module.js

@@ -60,8 +60,6 @@ export const load = (moduleId) => {
       return import('../Exit/Exit.ipc.js')
     case ModuleId.HandleRequestTest:
       return import('../HandleRequestTest/HandleRequestTest.ipc.js')
-    case ModuleId.ExtensionHost:
-      return import('../ExtensionHost/ExtensionHost.ipc.js')
     case ModuleId.ExtensionManagement:
       return import('../ExtensionManagement/ExtensionManagement.ipc.js')
     case ModuleId.FileSystem:

package/src/parts/Platform/Platform.js

@@ -61,11 +61,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.24.6'
+export const version = '0.25.1'
 
-export const commit = '4d24d4d'
+export const commit = '2a1f221'
 
-export const date = '2024-03-23T08:10:57.000Z'
+export const date = '2024-03-31T09:33:36.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/PlatformPaths/PlatformPaths.js

@@ -71,13 +71,6 @@ export const getUserKeyBindingsPath = () => {
   return Path.join(configDir, 'keybindings.json')
 }
 
-export const getExtensionHostPath = async () => {
-  const { extensionHostPath } = await import(
-    '@lvce-editor/extension-host'
-  )
-  return extensionHostPath
-}
-
 export const getExtensionHostHelperProcessPath = async () => {
   const { extensionHostHelperProcessPath } = await import(
     '@lvce-editor/extension-host-helper-process'

package/src/parts/TranspileTypeScript/TranspileTypeScript.js

@@ -6,8 +6,8 @@ import * as LoadTypeScript from '../LoadTypeScript/LoadTypeScript.js'
 export const transpileTypeScript = async (code) => {
   try {
     Assert.string(code)
-    const typescriptPath = GetTypeScriptPath.getTypeScriptPath()
-    const typescript = await LoadTypeScript.loadTypeScript(typescriptPath)
+    const typescriptUri = GetTypeScriptPath.getTypeScriptUri()
+    const typescript = await LoadTypeScript.loadTypeScript(typescriptUri)
     const newContent = await typescript.transpileModule(code, {
       compilerOptions: {
         target: 'esnext',

package/src/parts/WindowsProcessTree/WindowsProcessTree.js

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import * as LoadWindowsProcessTree from '../LoadWindowsProcessTree/LoadWindowsProcessTree.js'
 import * as Promises from '../Promises/Promises.js'
 

package/src/parts/ExtensionHost/ExtensionHost.ipc.js

@@ -1,20 +0,0 @@
-import * as Command from '../Command/Command.js'
-import * as ExtensionHost from './ExtensionHost.js'
-import * as ExtensionHostKeyBindings from './ExtensionHostKeyBindings.js'
-
-// prettier-ignore
-export const Commands = {
-
-  'ExtensionHost.dispose': ExtensionHost.dispose,
-  'ExtensionHost.send': ExtensionHost.send,
-  'ExtensionHost.start': ExtensionHost.start,
-  'ExtensionHostKeyBindings.getKeyBindings': ExtensionHostKeyBindings.getKeyBindings,
-  // 'ExtensionHost.getCommands': ExtensionHostCommand.getCommandsIpc,
-  // 'ExtensionHostCompletion.execute': ExtensionHost.forward,
-  // 'ExtensionHostExtension.activate': ExtensionHost.forward,
-  // 'ExtensionHostExtension.disable': ExtensionHost.forward,
-  // 'ExtensionHostSemanticTokens.executeSemanticTokenProvider': ExtensionHost.forward,
-  // 'ExtensionHostTextDocument.setLanguageId': ExtensionHost.forward,
-  // 'ExtensionHostTextDocument.syncFull': ExtensionHost.forward,
-  // 'ExtensionHostTextDocument.syncIncremental': ExtensionHost.forward,
-}

package/src/parts/ExtensionHost/ExtensionHost.js

@@ -1,80 +0,0 @@
-import * as Assert from '../Assert/Assert.js'
-import * as Callback from '../Callback/Callback.js'
-import * as ExtensionHostIpc from '../ExtensionHostIpc/ExtensionHostIpc.js'
-import * as ExtensionHostRpc from '../ExtensionHostRpc/ExtensionHostRpc.js'
-import * as JsonRpc from '../JsonRpc/JsonRpc.js'
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
-import { VError } from '../VError/VError.js'
-
-// TODO maybe rename to extension host management for clarity
-
-/**
- * @type{{extensionHosts:any }}
- */
-export const state = {
-  extensionHosts: Object.create(null),
-}
-
-// TODO this function is very ugly and has probably memory leaks
-const createExtensionHost = async (socket) => {
-  Assert.object(socket)
-  const ipc = await ExtensionHostIpc.create()
-  const rpc = ExtensionHostRpc.create(ipc, socket)
-  return rpc
-}
-
-export const start = async (socket) => {
-  try {
-    const id = 1
-    console.log('start extension host', id)
-    const handleMessage = (message) => {
-      if ('result' in message) {
-        Callback.resolve(message.id, message.result)
-      } else if ('error' in message) {
-        Callback.reject(message.id, message.error)
-      } else {
-        console.error('unsupported message type')
-      }
-    }
-    const extensionHost = await createExtensionHost(socket)
-    extensionHost.on('message', handleMessage)
-    state.extensionHosts[id] = extensionHost
-    return id
-  } catch (error) {
-    throw new VError(error, 'Failed to start extension host')
-  }
-}
-
-export const send = async (socket, id, message) => {
-  Assert.number(id)
-  Assert.object(message)
-  console.log(Object.keys(state))
-  const extensionHost = state.extensionHosts[id]
-  if (!extensionHost) {
-    throw new VError(`no extension host with id ${id} found`)
-  }
-  try {
-    const result = await JsonRpc.invoke(extensionHost, message.method, ...message.params)
-    socket.send({
-      jsonrpc: JsonRpcVersion.Two,
-      id: message.id,
-      result,
-    })
-  } catch (error) {
-    // console.log({ error })
-    socket.send({
-      jsonrpc: JsonRpcVersion.Two,
-      id: message.id,
-      error,
-    })
-  }
-}
-
-export const dispose = (id) => {
-  const extensionHost = state.extensionHosts[id]
-  if (!extensionHost) {
-    throw new VError(`no extension host with id ${id} found`)
-  }
-  extensionHost.dispose()
-  delete state.extensionHosts[id]
-}

package/src/parts/ExtensionHost/ExtensionHostKeyBindings.js

@@ -1,11 +0,0 @@
-import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement.js'
-
-const getExtensionKeyBindings = (extension) => {
-  return extension.keyBindings || []
-}
-
-export const getKeyBindings = async () => {
-  const extensions = await ExtensionManagement.getExtensions()
-  const keyBindings = extensions.flatMap(getExtensionKeyBindings)
-  return keyBindings
-}

package/src/parts/ExtensionHostIpc/ExtensionHostIpc.js

@@ -1,5 +0,0 @@
-import * as ExtensionHostIpcWithChildProcess from '../ExtensionHostIpcWithChildProcess/ExtensionHostIpcWithChildProcess.js'
-
-export const create = () => {
-  return ExtensionHostIpcWithChildProcess.create()
-}

package/src/parts/ExtensionHostIpcWithChildProcess/ExtensionHostIpcWithChildProcess.js

@@ -1,56 +0,0 @@
-import * as ChildProcess from '../ChildProcess/ChildProcess.js'
-import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
-
-export const create = async () => {
-  const extensionHostPath = await PlatformPaths.getExtensionHostPath()
-  const childProcess = ChildProcess.fork(
-    extensionHostPath,
-    ['--ipc-type=websocket', '--experimental-json-modules', '--max-old-space-size=60', '--enable-source-maps'],
-    {
-      env: {
-        ...process.env,
-        LOGS_DIR: PlatformPaths.getLogsDir(),
-        CONFIG_DIR: PlatformPaths.getConfigDir(),
-      },
-    },
-  )
-  return {
-    on(event, listener) {
-      switch (event) {
-        case 'message':
-          childProcess.on('message', listener)
-          break
-        case 'error':
-          childProcess.on('error', listener)
-          break
-        case 'exit':
-          childProcess.on('exit', listener)
-          break
-        default:
-          throw new Error(`unsupported event type ${event}`)
-      }
-    },
-    off(event, listener) {
-      switch (event) {
-        case 'message':
-          childProcess.off('message', listener)
-          break
-        case 'error':
-          childProcess.off('error', listener)
-          break
-        case 'exit':
-          childProcess.off('exit', listener)
-          break
-        default:
-          throw new Error(`unsupported event type ${event}`)
-      }
-    },
-    send(message) {
-      childProcess.send(message)
-    },
-    dispose() {
-      childProcess.kill()
-    },
-    _process: childProcess,
-  }
-}

package/src/parts/HandleWebSocketForExtensionHost/HandleWebSocketForExtensionHost.js

@@ -1,15 +0,0 @@
-import * as ExtensionHostIpc from '../ExtensionHostIpc/ExtensionHostIpc.js'
-import * as ExtensionHostRpc from '../ExtensionHostRpc/ExtensionHostRpc.js'
-
-// TODO lazyload modules for spawning extension host, they are only needed later
-export const handleWebSocket = async (message, handle) => {
-  // console.log('[shared-process] received extension host websocket', message)
-  const ipc = await ExtensionHostIpc.create()
-  console.info('[sharedprocess] creating extension ipc')
-  const rpc = await ExtensionHostRpc.create(ipc, handle)
-  console.info('[sharedprocess] created extension host rpc')
-  ipc._process.send(message, handle)
-  // rpc.send(message)
-  // console.log('spawned extension host')
-  // console.log(rpc)
-}