@lvce-editor/shared-process 0.25.8 → 0.25.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.25.8",
+  "version": "0.25.10",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,18 +18,18 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.25.8",
-    "@lvce-editor/ipc": "^3.4.0",
+    "@lvce-editor/extension-host-helper-process": "0.25.10",
+    "@lvce-editor/ipc": "^3.7.1",
     "@lvce-editor/json-rpc": "^1.3.0",
     "@lvce-editor/jsonc-parser": "^1.2.0",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/pty-host": "0.25.8",
+    "@lvce-editor/pty-host": "0.25.10",
     "@lvce-editor/verror": "^1.2.0",
     "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",
     "execa": "^8.0.1",
     "exit-hook": "^4.0.0",
-    "got": "^13.0.0",
+    "got": "^14.2.1",
     "is-object": "^1.0.2",
     "p-queue": "^8.0.1",
     "tar-fs": "^3.0.5",
@@ -37,7 +37,6 @@
   },
   "optionalDependencies": {
     "@lvce-editor/ripgrep": "^1.0.2",
-    "extract-zip": "^2.0.1",
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",

package/src/parts/ContentSecurityPolicyDocument/ContentSecurityPolicyDocument.js

@@ -1,7 +1,6 @@
-import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
-import * as Character from '../Character/Character.js'
+import * as GetContentSecurityPolicy from '../GetContentSecurityPolicy/GetContentSecurityPolicy.js'
 
-export const value = [
+export const value = GetContentSecurityPolicy.getContentSecurityPolicy([
   `default-src 'none'`,
   `font-src 'self'`,
   `frame-src *`,
@@ -9,6 +8,4 @@ export const value = [
   `script-src 'self'`,
   `media-src 'self'`,
   `style-src 'self'`,
-]
-  .map(AddSemiColon.addSemicolon)
-  .join(Character.Space)
+])

package/src/parts/ContentSecurityPolicySyntaxHighlightingWorker/ContentSecurityPolicySyntaxHighlightingWorker.js

@@ -0,0 +1,3 @@
+import * as GetContentSecurityPolicy from '../GetContentSecurityPolicy/GetContentSecurityPolicy.js'
+
+export const value = GetContentSecurityPolicy.getContentSecurityPolicy([`default-src 'none'`, `script-src 'self'`])

package/src/parts/ContentSecurityPolicyTerminalWorker/ContentSecurityPolicyTerminalWorker.js

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

package/src/parts/ContentSecurityPolicyTestWorker/ContentSecurityPolicyTestWorker.js

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

package/src/parts/ContentSecurityPolicyWorker/ContentSecurityPolicyWorker.js

@@ -1,12 +1,8 @@
-import * as Character from '../Character/Character.js'
-import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+import * as GetContentSecurityPolicy from '../GetContentSecurityPolicy/GetContentSecurityPolicy.js'
 
-// prettier-ignore
-export const value = [
+export const value = GetContentSecurityPolicy.getContentSecurityPolicy([
   `default-src 'none'`,
   `connect-src 'self'`,
   `script-src 'self'`,
   `font-src 'self'`,
-]
-  .map(AddSemiColon.addSemicolon)
-  .join(Character.Space)
+])

package/src/parts/GetContentSecurityPolicy/GetContentSecurityPolicy.js

@@ -0,0 +1,6 @@
+import * as Character from '../Character/Character.js'
+import * as AddSemiColon from '../AddSemiColon/AddSemiColon.js'
+
+export const getContentSecurityPolicy = (items) => {
+  return items.map(AddSemiColon.addSemicolon).join(Character.Space)
+}

package/src/parts/GetHeaders/GetHeaders.js

@@ -3,11 +3,12 @@ import * as GetHeadersDefault from '../GetHeadersDefault/GetHeadersDefault.js'
 import * as GetHeadersExtensionHostWorker from '../GetHeadersExtensionHostWorker/GetHeadersExtensionHostWorker.js'
 import * as GetHeadersMainFrame from '../GetHeadersMainFrame/GetHeadersMainFrame.js'
 import * as GetHeadersOtherWorker from '../GetHeadersOtherWorker/GetHeadersOtherWorker.js'
-import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 import * as GetHeadersRendererWorker from '../GetHeadersRendererWorker/GetHeadersRendererWorker.js'
+import * as GetHeadersSyntaxHighlightingWorker from '../GetHeadersSyntaxHighlightingWorker/GetHeadersSyntaxHighlightingWorker.js'
 import * as GetHeadersTerminalWorker from '../GetHeadersTerminalWorker/GetHeadersTerminalWorker.js'
 import * as GetHeadersTestWorker from '../GetHeadersTestWorker/GetHeadersTestWorker.js'
 import * as GetMimeType from '../GetMimeType/GetMimeType.js'
+import * as HttpHeader from '../HttpHeader/HttpHeader.js'
 
 const getExtraHeaders = (pathName, fileExtension) => {
   switch (fileExtension) {
@@ -27,6 +28,9 @@ const getExtraHeaders = (pathName, fileExtension) => {
       if (pathName.endsWith('terminalWorkerMain.js') || pathName.endsWith('terminalWorkerMain.ts')) {
         return GetHeadersTerminalWorker.getHeadersTerminalWorker()
       }
+      if (pathName.endsWith('syntaxHighlightingWorkerMain.js') || pathName.endsWith('syntaxHighlightingWorkerMain.ts')) {
+        return GetHeadersSyntaxHighlightingWorker.getHeadersSyntaxHighlightingWorker()
+      }
       if (pathName.endsWith('WorkerMain.js') || pathName.endsWith('WorkerMain.ts')) {
         return GetHeadersOtherWorker.getHeadersOtherWorker(pathName)
       }

package/src/parts/GetHeadersSyntaxHighlightingWorker/GetHeadersSyntaxHighlightingWorker.js

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

package/src/parts/IpcChildModule/IpcChildModule.js

@@ -1,16 +1,22 @@
+import {
+  IpcChildWithElectronMessagePort,
+  IpcChildWithElectronUtilityProcess,
+  IpcChildWithNodeForkedProcess,
+  IpcChildWithNodeWorker,
+  IpcChildWithWebSocket,
+} from '@lvce-editor/ipc'
 import * as IpcChildType from '../IpcChildType/IpcChildType.js'
-import { IpcChildWithElectronUtilityProcess, IpcChildWithWebSocket } from '@lvce-editor/ipc'
 
 export const getModule = (method) => {
   switch (method) {
     case IpcChildType.NodeForkedProcess:
-      return import('../IpcChildWithNodeForkedProcess/IpcChildWithNodeForkedProcess.js')
+      return IpcChildWithNodeForkedProcess
     case IpcChildType.NodeWorker:
-      return import('../IpcChildWithNodeWorker/IpcChildWithNodeWorker.js')
+      return IpcChildWithNodeWorker
     case IpcChildType.ElectronUtilityProcess:
       return IpcChildWithElectronUtilityProcess
     case IpcChildType.ElectronMessagePort:
-      return import('../IpcChildWithElectronMessagePort/IpcChildWithElectronMessagePort.js')
+      return IpcChildWithElectronMessagePort
     case IpcChildType.NodeMessagePort:
       return import('../IpcChildWithNodeMessagePort/IpcChildWithNodeMessagePort.js')
     case IpcChildType.WebSocket:

package/src/parts/IpcParentModule/IpcParentModule.js

@@ -1,11 +1,12 @@
+import { IpcParentWithNodeForkedProcess, IpcParentWithNodeWorker } from '@lvce-editor/ipc'
 import * as IpcParentType from '../IpcParentType/IpcParentType.js'
 
 export const getModule = (method) => {
   switch (method) {
     case IpcParentType.NodeWorker:
-      return import('../IpcParentWithNodeWorker/IpcParentWithNodeWorker.js')
+      return IpcParentWithNodeWorker
     case IpcParentType.NodeForkedProcess:
-      return import('../IpcParentWithNodeForkedProcess/IpcParentWithNodeForkedProcess.js')
+      return IpcParentWithNodeForkedProcess
     case IpcParentType.ElectronUtilityProcess:
       return import('../IpcParentWithElectronUtilityProcess/IpcParentWithElectronUtilityProcess.js')
     default:

package/src/parts/Module/Module.js

@@ -16,8 +16,6 @@ export const load = (moduleId) => {
       return import('../AutoUpdaterWindowsNsis/AutoUpdaterWindowsNsis.ipc.js')
     case ModuleId.BulkReplacement:
       return import('../BulkReplacement/BulkReplacement.ipc.js')
-    case ModuleId.ChromeExtension:
-      return import('../ChromeExtension/ChromeExtension.ipc.js')
     case ModuleId.ClipBoard:
       return import('../ClipBoard/ClipBoard.ipc.js')
     case ModuleId.Crash:

package/src/parts/Platform/Platform.js

@@ -61,11 +61,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.25.8'
+export const version = '0.25.10'
 
-export const commit = '2031590'
+export const commit = 'c9592d8'
 
-export const date = '2024-04-11T20:28:49.000Z'
+export const date = '2024-04-14T11:11:32.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/ChromeExtension/ChromeExtension.ipc.js

@@ -1,8 +0,0 @@
-import * as ChromeExtension from './ChromeExtension.js'
-
-export const name = 'ChromeExtension'
-
-export const Commands = {
-  install: ChromeExtension.install,
-  uninstall: ChromeExtension.uninstall,
-}

package/src/parts/ChromeExtension/ChromeExtension.js

@@ -1,46 +0,0 @@
-import * as Assert from '../Assert/Assert.js'
-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 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)
-  }
-  return tmpDir
-}
-
-export const install = async (name, url) => {
-  try {
-    Assert.string(name)
-    Assert.string(url)
-    const cachedChromeExtensionsPath = PlatformPaths.getCachedExtensionsPath()
-    const tempFileCompressed = Path.join(cachedChromeExtensionsPath, `${name}.zip`)
-    const tmpDir = Path.join(cachedChromeExtensionsPath, name)
-    const chromeExtensionsPath = PlatformPaths.getChromeExtensionsPath()
-    await Download.download(url, tempFileCompressed)
-    await ExtractZip.extractZip({ inFile: tempFileCompressed, outDir: tmpDir })
-    const cachedExtensionPath = await getExtensionPath(tmpDir)
-    const outDir = Path.join(chromeExtensionsPath, name)
-    await FileSystem.remove(outDir)
-    await FileSystem.rename(cachedExtensionPath, outDir)
-  } catch (error) {
-    throw new VError(error, `Failed to install chrome extension ${name}`)
-  }
-}
-
-export const uninstall = async (name) => {
-  try {
-    Assert.string(name)
-    // TODO
-    // figure out extension path
-    // remove file
-  } catch (error) {
-    throw new VError(error, `Failed to uninstall chrome extension ${name}`)
-  }
-}

package/src/parts/ExtractZip/ExtractZip.js

@@ -1,12 +0,0 @@
-import { mkdir } from 'node:fs/promises'
-import extract from 'extract-zip'
-import { VError } from '../VError/VError.js'
-
-export const extractZip = async ({ inFile, outDir }) => {
-  try {
-    await mkdir(outDir, { recursive: true })
-    await extract(inFile, { dir: outDir })
-  } catch (error) {
-    throw new VError(error, `Failed to extract ${inFile}`)
-  }
-}

package/src/parts/IpcChildWithNodeForkedProcess/IpcChildWithNodeForkedProcess.js

@@ -1,46 +0,0 @@
-export const listen = async () => {
-  if (!process.send) {
-    throw new Error('process.send must be defined')
-  }
-  return process
-}
-
-export const signal = (process) => {
-  process.send('ready')
-}
-
-const getActualData = (message, handle) => {
-  if (handle) {
-    return {
-      ...message,
-      params: [...message.params, handle],
-    }
-  }
-  return message
-}
-
-export const wrap = (process) => {
-  return {
-    process,
-    on(event, listener) {
-      if (event === 'message') {
-        const wrappedListener = (event, handle) => {
-          const actualData = getActualData(event, handle)
-          listener(actualData)
-        }
-        this.process.on(event, wrappedListener)
-      } else if (event === 'close') {
-        this.process.on('close', listener)
-      } else {
-        throw new Error('unsupported event type')
-      }
-    },
-    off(event, listener) {
-      this.process.off(event, listener)
-    },
-    send(message) {
-      this.process.send(message)
-    },
-    dispose() {},
-  }
-}

package/src/parts/IpcChildWithNodeWorker/IpcChildWithNodeWorker.js

@@ -1,45 +0,0 @@
-import { parentPort } from 'node:worker_threads'
-import * as IsElectron from '../IsElectron/IsElectron.js'
-
-export const listen = async () => {
-  if (!parentPort) {
-    throw new Error('parentPort is required')
-  }
-  return parentPort
-}
-
-export const signal = (parentPort) => {
-  parentPort.postMessage('ready')
-}
-
-const getActualData = (message) => {
-  return message
-}
-
-export const wrap = (parentPort) => {
-  return {
-    parentPort,
-    on(event, listener) {
-      if (event === 'message') {
-        const wrappedListener = (event) => {
-          const actualData = getActualData(event)
-          listener(actualData)
-        }
-        this.parentPort.on(event, wrappedListener)
-      } else if (event === 'close') {
-        this.parentPort.on('close', listener)
-      } else {
-        throw new Error('unsupported event type')
-      }
-    },
-    off(event, listener) {
-      this.parentPort.off(event, listener)
-    },
-    send(message) {
-      this.parentPort.postMessage(message)
-    },
-    dispose() {
-      this.parentPort.close()
-    },
-  }
-}

package/src/parts/IpcParentWithNodeForkedProcess/IpcParentWithNodeForkedProcess.js

@@ -1,5 +0,0 @@
-import { IpcParentWithNodeForkedProcess } from '@lvce-editor/ipc'
-
-export const create = IpcParentWithNodeForkedProcess.create
-
-export const wrap = IpcParentWithNodeForkedProcess.wrap

package/src/parts/IpcParentWithNodeWorker/IpcParentWithNodeWorker.js

@@ -1,36 +0,0 @@
-import { Worker } from 'node:worker_threads'
-import * as Assert from '../Assert/Assert.js'
-import * as FirstNodeWorkerEventType from '../FirstNodeWorkerEventType/FirstNodeWorkerEventType.js'
-import * as GetFirstNodeWorkerEvent from '../GetFirstNodeWorkerEvent/GetFirstNodeWorkerEvent.js'
-
-export const create = async ({ path, argv, env, execArgv }) => {
-  Assert.string(path)
-  const worker = new Worker(path, {
-    argv,
-    env,
-    execArgv,
-  })
-  const { type, event } = await GetFirstNodeWorkerEvent.getFirstNodeWorkerEvent(worker)
-  if (type === FirstNodeWorkerEventType.Error) {
-    throw event
-  }
-  return worker
-}
-
-export const wrap = (worker) => {
-  return {
-    worker,
-    on(event, listener) {
-      this.worker.on(event, listener)
-    },
-    send(message) {
-      this.worker.postMessage(message)
-    },
-    sendAndTransfer(message, transfer) {
-      this.worker.postMessage(message, transfer)
-    },
-    dispose() {
-      this.worker.terminate()
-    },
-  }
-}