@lvce-editor/extension-host-helper-process 0.53.5 → 0.53.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-helper-process",
-  "version": "0.53.5",
+  "version": "0.53.7",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
-    "@lvce-editor/ipc": "^14.2.0",
-    "@lvce-editor/json-rpc": "^6.2.0",
-    "@lvce-editor/rpc": "^4.1.0",
+    "@lvce-editor/rpc": "^4.2.0",
     "@lvce-editor/verror": "^1.7.0",
     "execa": "^9.5.3",
     "got": "^14.4.7",

package/src/parts/CommandMapRef/CommandMapRef.js

@@ -0,0 +1 @@
+export const commandMapRef = {}

package/src/parts/Listen/Listen.js

@@ -1,10 +1,12 @@
 import * as CommandMap from '../CommandMap/CommandMap.js'
 import * as IpcChild from '../IpcChild/IpcChild.js'
 import * as IpcChildType from '../IpcChildType/IpcChildType.js'
+import * as CommandMapRef from '../CommandMapRef/CommandMapRef.js'
 
 export const listen = async (argv) => {
+  Object.assign(CommandMapRef.commandMapRef, CommandMap.commandMap)
   await IpcChild.listen({
     method: IpcChildType.Auto(argv),
-    commandMap: CommandMap.commandMap,
+    commandMap: CommandMapRef.commandMapRef,
   })
 }

package/src/parts/LoadFile/LoadFile.js

@@ -1,7 +1,7 @@
-import { VError } from '../VError/VError.js'
-import * as CommandState from '../CommandState/CommandState.js'
-import * as ImportScript from '../ImportScript/ImportScript.js'
+import * as Command from '@lvce-editor/command'
 import * as Assert from '../Assert/Assert.js'
+import * as ImportScript from '../ImportScript/ImportScript.js'
+import { VError } from '../VError/VError.js'
 
 export const loadFile = async (path) => {
   try {
@@ -9,9 +9,9 @@ export const loadFile = async (path) => {
     const module = await ImportScript.importScript(path)
     if (module && module.commandMap) {
       const commandMap = module.commandMap
-      CommandState.registerCommands(commandMap)
+      Command.register(commandMap)
     } else if (module && module.execute) {
-      CommandState.setExecute(module.execute)
+      throw new Error(`execute function is not supported anymore. Use commandMap instead`)
     } else {
       throw new Error(`missing export const execute function`)
     }

package/src/parts/Command/Command.js

@@ -1,10 +0,0 @@
-import { CommandNotFoundError } from '../CommandNotFoundError/CommandNotFoundError.js'
-import * as CommandState from '../CommandState/CommandState.js'
-
-export const execute = (command, ...args) => {
-  const fn = CommandState.getCommand(command)
-  if (!fn) {
-    throw new CommandNotFoundError(command)
-  }
-  return fn(...args)
-}

package/src/parts/CommandNotFoundError/CommandNotFoundError.js

@@ -1,9 +0,0 @@
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-
-export class CommandNotFoundError extends Error {
-  constructor(id) {
-    super(`command ${id} not found`)
-    this.name = 'CommandNotFoundError'
-    this.code = ErrorCodes.E_COMMAND_NOT_FOUND
-  }
-}

package/src/parts/CommandState/CommandState.js

@@ -1,43 +0,0 @@
-import * as Assert from '../Assert/Assert.js'
-import { VError } from '../VError/VError.js'
-
-export const state = {
-  commands: Object.create(null),
-  /**
-   * @type {any}
-   */
-  execute: undefined,
-}
-
-export const registerCommand = (key, fn) => {
-  try {
-    Assert.string(key)
-    Assert.fn(fn)
-    state.commands[key] = fn
-  } catch (error) {
-    throw new VError(error, `Failed to register command ${key}`)
-  }
-}
-
-export const registerCommands = (commandMap) => {
-  for (const [key, value] of Object.entries(commandMap)) {
-    registerCommand(key, value)
-  }
-}
-
-export const getCommand = (key) => {
-  const { commands, execute } = state
-  if (key in commands) {
-    return commands[key]
-  }
-  if (execute) {
-    return (...args) => {
-      return execute(key, ...args)
-    }
-  }
-  return undefined
-}
-
-export const setExecute = (fn) => {
-  state.execute = fn
-}

package/src/parts/FirstUtilityProcessEventType/FirstUtilityProcessEventType.js

@@ -1 +0,0 @@
-export const Message = 1

package/src/parts/GetFirstUtilityProcessEvent/GetFirstUtilityProcessEvent.js

@@ -1,21 +0,0 @@
-import * as FirstUtilityProcessEventType from '../FirstUtilityProcessEventType/FirstUtilityProcessEventType.js'
-
-export const getFirstUtilityProcessEvent = async (parentPort) => {
-  const { type, event } = await new Promise((resolve) => {
-    const cleanup = (value) => {
-      parentPort.off('message', handleMessage)
-      resolve(value)
-    }
-    const handleMessage = (event) => {
-      cleanup({
-        type: FirstUtilityProcessEventType.Message,
-        event,
-      })
-    }
-    parentPort.on('message', handleMessage)
-  })
-  return {
-    type,
-    event,
-  }
-}

package/src/parts/GetUtilityProcessPortData/GetUtilityProcessPortData.js

@@ -1,10 +0,0 @@
-export const getUtilityProcessPortData = (event) => {
-  const { data, ports } = event
-  if (ports.length === 0) {
-    return data
-  }
-  return {
-    ...data,
-    params: [...ports, ...data.params],
-  }
-}

package/src/parts/HandleIpc/HandleIpc.js

@@ -1,10 +0,0 @@
-import * as HandleMessage from '../HandleMessage/HandleMessage.js'
-
-export const handleIpc = (ipc) => {
-  if ('addEventListener' in ipc) {
-    ipc.addEventListener('message', HandleMessage.handleMessage)
-  } else {
-    // deprecated
-    ipc.on('message', HandleMessage.handleMessage)
-  }
-}

package/src/parts/HandleMessage/HandleMessage.js

@@ -1,19 +0,0 @@
-import * as Callback from '../Callback/Callback.js'
-import * as Command from '../Command/Command.js'
-import * as JsonRpc from '../JsonRpc/JsonRpc.js'
-
-const preparePrettyError = (error) => {
-  return error
-}
-
-const logError = (error, prettyError) => {
-  // this is handled by shared process
-}
-
-const requiresSocket = () => {
-  return false
-}
-
-export const handleMessage = (event) => {
-  return JsonRpc.handleJsonRpcMessage(event.target, event.data, Command.execute, Callback.resolve, preparePrettyError, logError, requiresSocket)
-}

package/src/parts/IsMessagePortMain/IsMessagePortMain.js

@@ -1,3 +0,0 @@
-export const isMessagePortMain = (value) => {
-  return value && value.constructor && value.constructor.name === 'MessagePortMain'
-}

package/src/parts/JsonRpc/JsonRpc.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/json-rpc'

package/src/parts/PrintPrettyError/PrintPrettyError.js

@@ -1,5 +0,0 @@
-import * as Logger from '../Logger/Logger.js'
-
-export const printPrettyError = (prettyError, prefix = '') => {
-  Logger.error(`${prefix}${prettyError.type}: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}\n`)
-}