@lvce-editor/extension-host-helper-process 0.22.7 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-host-helper-process",
-  "version": "0.22.7",
+  "version": "0.23.0",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -17,6 +17,7 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
+    "@lvce-editor/ipc": "^2.1.0",
     "@lvce-editor/json-rpc": "^1.0.0",
     "@lvce-editor/pretty-error": "^1.4.1",
     "@lvce-editor/verror": "^1.1.2",

package/src/parts/CommandMap/CommandMap.js

@@ -1,12 +1,8 @@
-import * as Ajax from '../Ajax/Ajax.js'
-import * as Exec from '../Exec/Exec.js'
 import * as HandleElectronMessagePort from '../HandleElectronMessagePort/HandleElectronMessagePort.js'
 import * as HandleWebSocket from '../HandleWebSocket/HandleWebSocket.js'
 import * as LoadFile from '../LoadFile/LoadFile.js'
 
 export const commandMap = {
-  'Exec.exec': Exec.exec,
-  'Ajax.getJson': Ajax.getJson,
   'HandleWebSocket.handleWebSocket': HandleWebSocket.handleWebSocket,
   'LoadFile.loadFile': LoadFile.loadFile,
   'HandleElectronMessagePort.handleElectronMessagePort': HandleElectronMessagePort.handleElectronMessagePort,

package/src/parts/IpcChild/IpcChild.js

@@ -3,6 +3,11 @@ import * as IpcChildModule from '../IpcChildModule/IpcChildModule.js'
 export const listen = async ({ method, ...params }) => {
   const module = await IpcChildModule.getModule(method)
   const rawIpc = await module.listen(params)
+  // @ts-ignore
+  if (module.signal) {
+    // @ts-ignore
+    module.signal(rawIpc)
+  }
   const ipc = module.wrap(rawIpc)
   return ipc
 }

package/src/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js

@@ -1,43 +1 @@
-import * as GetUtilityProcessPortData from '../GetUtilityProcessPortData/GetUtilityProcessPortData.js'
-import { IpcError } from '../IpcError/IpcError.js'
-
-export const listen = () => {
-  // @ts-ignore
-  const parentPort = process.parentPort
-  if (!parentPort) {
-    throw new IpcError('parent port must be defined')
-  }
-  parentPort.postMessage('ready')
-  return parentPort
-}
-
-export const wrap = (parentPort) => {
-  return {
-    parentPort,
-    on(event, listener) {
-      if (event === 'message') {
-        const wrappedListener = (event) => {
-          const actualData = GetUtilityProcessPortData.getUtilityProcessPortData(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)
-    },
-    sendAndTransfer(message, transfer) {
-      this.parentPort.postMessage(message, transfer)
-    },
-    dispose() {
-      this.parentPort.close()
-    },
-  }
-}
+export * from '@lvce-editor/ipc/dist/parts/IpcChildWithElectronUtilityProcess/IpcChildWithElectronUtilityProcess.js'

package/src/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js

@@ -1,56 +1 @@
-import * as GetFirstWebSocketEvent from '../GetFirstWebSocketEvent/GetFirstWebSocketEvent.js'
-import { IpcError } from '../IpcError/IpcError.js'
-import * as IsWebSocketOpen from '../IsWebSocketOpen/IsWebSocketOpen.js'
-import * as WebSocketSerialization from '../WebSocketSerialization/WebSocketSerialization.js'
-import * as WebSocketServer from '../WebSocketServer/WebSocketServer.js'
-
-export const listen = async ({ request, handle }) => {
-  if (!request) {
-    throw new IpcError('request must be defined')
-  }
-  if (!handle) {
-    throw new IpcError('handle must be defined')
-  }
-  const webSocket = await WebSocketServer.handleUpgrade(request, handle)
-  webSocket.pause()
-  if (!IsWebSocketOpen.isWebSocketOpen(webSocket)) {
-    const { type, event } = await GetFirstWebSocketEvent.getFirstWebSocketEvent(webSocket)
-  }
-  return webSocket
-}
-
-export const wrap = (webSocket) => {
-  return {
-    webSocket,
-    /**
-     * @type {any}
-     */
-    wrappedListener: undefined,
-    on(event, listener) {
-      switch (event) {
-        case 'message':
-          const wrappedListener = (message) => {
-            const data = WebSocketSerialization.deserialize(message)
-            listener(data)
-          }
-          webSocket.on('message', wrappedListener)
-          break
-        default:
-          throw new Error('unknown event listener type')
-      }
-    },
-    off(event, listener) {
-      this.webSocket.off(event, listener)
-    },
-    send(message) {
-      const stringifiedMessage = WebSocketSerialization.serialize(message)
-      this.webSocket.send(stringifiedMessage)
-    },
-    dispose() {
-      this.webSocket.close()
-    },
-    start() {
-      this.webSocket.resume()
-    },
-  }
-}
+export * from '@lvce-editor/ipc/dist/parts/IpcChildWithWebSocket/IpcChildWithWebSocket.js'

package/src/parts/Ajax/Ajax.ipc.js

@@ -1,7 +0,0 @@
-import * as Ajax from './Ajax.js'
-
-export const name = 'Ajax'
-
-export const Commands = {
-  getJson: Ajax.getJson,
-}

package/src/parts/Ajax/Ajax.js

@@ -1,13 +0,0 @@
-import got from 'got'
-
-/**
- * @deprecated use node api directly
- */
-export const getJson = async (url) => {
-  const json = await got(url, {
-    retry: {
-      limit: 0,
-    },
-  }).json()
-  return json
-}

package/src/parts/Exec/Exec.ipc.js

@@ -1,7 +0,0 @@
-import * as Exec from './Exec.js'
-
-export const name = 'Exec'
-
-export const Commands = {
-  exec: Exec.exec,
-}

package/src/parts/Exec/Exec.js

@@ -1,16 +0,0 @@
-import { execa } from 'execa'
-import * as Assert from '../Assert/Assert.js'
-
-/**
- * @deprecated use node api directly
- */
-export const exec = async (file, args, options) => {
-  Assert.string(file)
-  Assert.array(args)
-  const { stdout, stderr, exitCode } = await execa(file, args, options)
-  return {
-    stdout,
-    stderr,
-    exitCode,
-  }
-}

package/src/parts/FirstWebSocketEventType/FirstWebSocketEventType.js

@@ -1,2 +0,0 @@
-export const Open = 1
-export const Close = 2

package/src/parts/GetData/GetData.js

@@ -1,3 +0,0 @@
-export const getData = (event) => {
-  return event.data
-}

package/src/parts/GetFirstWebSocketEvent/GetFirstWebSocketEvent.js

@@ -1,41 +0,0 @@
-import * as FirstWebSocketEventType from '../FirstWebSocketEventType/FirstWebSocketEventType.js'
-import { WebSocket } from 'ws'
-
-export const getFirstWebSocketEvent = async (webSocket) => {
-  switch (webSocket.readyState) {
-    case WebSocket.OPEN:
-      return {
-        type: FirstWebSocketEventType.Open,
-        event: undefined,
-      }
-    case WebSocket.CLOSED:
-      return {
-        type: FirstWebSocketEventType.Close,
-        event: undefined,
-      }
-    default:
-      break
-  }
-  const { type, event } = await new Promise((resolve) => {
-    const cleanup = (value) => {
-      webSocket.off('open', handleOpen)
-      webSocket.off('close', handleClose)
-      resolve(value)
-    }
-    const handleOpen = (event) => {
-      cleanup({
-        type: FirstWebSocketEventType.Open,
-        event,
-      })
-    }
-    const handleClose = (event) => {
-      cleanup({
-        type: FirstWebSocketEventType.Close,
-        event,
-      })
-    }
-    webSocket.on('open', handleOpen)
-    webSocket.on('close', handleClose)
-  })
-  return { type, event }
-}

package/src/parts/GetWebSocket/GetWebSocket.js

@@ -1,25 +0,0 @@
-import * as _ws from 'ws'
-
-export const getWebSocket = async (message, handle) => {
-  // workaround for jest or node bug
-  const WebSocketServer = _ws.WebSocketServer
-    ? _ws.WebSocketServer
-    : // @ts-ignore
-      _ws.default.WebSocketServer
-
-  const webSocketServer = new WebSocketServer({
-    noServer: true,
-  })
-  const webSocket = await new Promise((resolve, reject) => {
-    const upgradeCallback = (webSocket) => {
-      resolve(webSocket)
-    }
-    webSocketServer.handleUpgrade(
-      message,
-      handle,
-      Buffer.alloc(0),
-      upgradeCallback
-    )
-  })
-  return webSocket
-}

package/src/parts/HandleJsonRpcMessage/HandleJsonRpcMessage.js

@@ -1,10 +0,0 @@
-import * as GetResponse from '../GetResponse/GetResponse.js'
-
-export const handleJsonRpcMessage = async (ipc, message, execute, resolve) => {
-  if ('result' in message || 'error' in message) {
-    resolve(message.id, message)
-    return
-  }
-  const response = await GetResponse.getResponse(message, execute)
-  ipc.send(response)
-}

package/src/parts/Id/Id.js

@@ -1,7 +0,0 @@
-export const state = {
-  id: 0,
-}
-
-export const create = () => {
-  return ++state.id
-}

package/src/parts/IsMessagePort/IsMessagePort.js

@@ -1,3 +0,0 @@
-export const isMessagePort = (value) => {
-  return value && value instanceof MessagePort
-}

package/src/parts/IsSocket/IsSocket.js

@@ -1,5 +0,0 @@
-import { Socket } from 'node:net'
-
-export const isSocket = (value) => {
-  return value instanceof Socket
-}

package/src/parts/IsWebSocket/IsWebSocket.js

@@ -1,5 +0,0 @@
-import { WebSocket } from 'ws'
-
-export const isWebSocket = (value) => {
-  return value instanceof WebSocket
-}

package/src/parts/IsWebSocketOpen/IsWebSocketOpen.js

@@ -1,5 +0,0 @@
-import { WebSocket } from 'ws'
-
-export const isWebSocketOpen = (webSocket) => {
-  return webSocket.readyState === WebSocket.OPEN
-}

package/src/parts/Json/Json.js

@@ -1,7 +0,0 @@
-export const stringify = (json) => {
-  return JSON.stringify(json)
-}
-
-export const parse = (data) => {
-  return JSON.parse(data)
-}

package/src/parts/Module/Module.js

@@ -1,12 +0,0 @@
-import * as ModuleId from '../ModuleId/ModuleId.js'
-
-export const load = (moduleId) => {
-  switch (moduleId) {
-    case ModuleId.Exec:
-      return import('../Exec/Exec.ipc.js')
-    case ModuleId.Ajax:
-      return import('../Ajax/Ajax.ipc.js')
-    default:
-      throw new Error(`module ${moduleId} not found`)
-  }
-}

package/src/parts/ModuleId/ModuleId.js

@@ -1,2 +0,0 @@
-export const Exec = 1
-export const Ajax = 2

package/src/parts/ModuleMap/ModuleMap.js

@@ -1,20 +0,0 @@
-import * as ModuleId from '../ModuleId/ModuleId.js'
-
-const getPrefix = (commandId) => {
-  if (!commandId || typeof commandId !== 'string') {
-    return commandId
-  }
-  return commandId.slice(0, commandId.indexOf('.'))
-}
-
-export const getModuleId = (commandId) => {
-  const prefix = getPrefix(commandId)
-  switch (prefix) {
-    case 'Exec':
-      return ModuleId.Exec
-    case 'Ajax':
-      return ModuleId.Ajax
-    default:
-      throw new Error(`command ${commandId} not found`)
-  }
-}

package/src/parts/Process/Process.ipc.js

@@ -1,9 +0,0 @@
-import * as Process from './Process.js'
-
-export const name = 'Process'
-
-export const Commands = {
-  crash: Process.crash,
-  crashAsync: Process.crashAsync,
-  getPid: Process.getPid,
-}

package/src/parts/WebSocketSerialization/WebSocketSerialization.js

@@ -1,7 +0,0 @@
-export const serialize = (message) => {
-  return JSON.stringify(message)
-}
-
-export const deserialize = (message) => {
-  return JSON.parse(message.toString())
-}

package/src/parts/WebSocketServer/WebSocketServer.ipc.js

@@ -1,7 +0,0 @@
-import * as WebSocketServer from './WebSocketServer.js'
-
-export const name = 'WebSocketServer'
-
-export const Commands = {
-  handleUpgrade: WebSocketServer.handleUpgrade,
-}

package/src/parts/WebSocketServer/WebSocketServer.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/web-socket-server'