@lvce-editor/pty-host 0.20.11 → 0.20.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "0.20.11",
+  "version": "0.20.12",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -16,6 +16,7 @@
     "node": ">=16"
   },
   "dependencies": {
+    "@lvce-editor/json-rpc": "^0.3.0",
     "@lvce-editor/pretty-error": "^1.2.2",
     "@lvce-editor/verror": "^1.1.2",
     "debug": "^4.3.4",

package/src/parts/Callback/Callback.js

@@ -1,26 +1 @@
-import * as Assert from '../Assert/Assert.js'
-import * as Id from '../Id/Id.js'
-import * as Logger from '../Logger/Logger.js'
-import * as Promises from '../Promises/Promises.js'
-
-export const state = {
-  callbacks: Object.create(null),
-}
-
-export const registerPromise = () => {
-  const id = Id.create()
-  const { resolve, promise } = Promises.withResolvers()
-  state.callbacks[id] = resolve
-  return { id, promise }
-}
-
-export const resolve = (id, args) => {
-  Assert.number(id)
-  if (!(id in state.callbacks)) {
-    console.log(args)
-    Logger.warn(`callback ${id} may already be disposed`)
-    return
-  }
-  state.callbacks[id](args)
-  delete state.callbacks[id]
-}
+export { resolve } from '@lvce-editor/json-rpc'

package/src/parts/HandleIpc/HandleIpc.js

@@ -1,12 +1,22 @@
 import * as Assert from '../Assert/Assert.js'
 import * as Callback from '../Callback/Callback.js'
 import * as Command from '../Command/Command.js'
-import * as HandleJsonRpcMessage from '../HandleJsonRpcMessage/HandleJsonRpcMessage.js'
+import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+import * as PrettyError from '../PrettyError/PrettyError.js'
+import * as PrintPrettyError from '../PrintPrettyError/PrintPrettyError.js'
+import * as RequiresSocket from '../RequiresSocket/RequiresSocket.js'
+
+const preparePrettyError = PrettyError.prepare
+
+const logError = (error, prettyError) => {
+  PrintPrettyError.printPrettyError(prettyError, `[terminal-process] `)
+}
 
 export const handleIpc = (ipc) => {
   Assert.object(ipc)
   const handleMessage = (message) => {
-    return HandleJsonRpcMessage.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve)
+    // @ts-ignore
+    return JsonRpc.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve, preparePrettyError, logError, RequiresSocket.requiresSocket)
   }
   ipc.on('message', handleMessage)
 }

package/src/parts/JsonRpc/JsonRpc.js

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

package/src/parts/PtyController/PtyController.js

@@ -7,7 +7,7 @@ export const state = {
 }
 
 // TODO maybe merge pty and pty controller
-export const create = (id, cwd, command, args, ipc) => {
+export const create = (ipc, id, cwd, command, args) => {
   Assert.number(id)
   Assert.string(cwd)
   Assert.string(command)

package/src/parts/GetErrorResponse/GetErrorResponse.js

@@ -1,56 +0,0 @@
-import { CommandNotFoundError } from '../CommandNotFoundError/CommandNotFoundError.js'
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-import * as JsonRpcErrorCode from '../JsonRpcErrorCode/JsonRpcErrorCode.js'
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
-import * as PrettyError from '../PrettyError/PrettyError.js'
-import * as PrintPrettyError from '../PrintPrettyError/PrintPrettyError.js'
-
-const shouldLogError = (error) => {
-  if (error && error.code === ErrorCodes.ENOENT) {
-    return false
-  }
-  return true
-}
-
-export const getErrorResponse = (message, error) => {
-  if (error && error instanceof CommandNotFoundError) {
-    return {
-      jsonrpc: JsonRpcVersion.Two,
-      id: message.id,
-      error: {
-        code: JsonRpcErrorCode.MethodNotFound,
-        message: error.message,
-        data: error.stack,
-      },
-    }
-  }
-  if (!shouldLogError(error)) {
-    return {
-      jsonrpc: JsonRpcVersion.Two,
-      id: message.id,
-      error: {
-        code: JsonRpcErrorCode.Custom,
-        message: `${error}`,
-        data: {
-          code: error.code,
-        },
-      },
-    }
-  }
-  const prettyError = PrettyError.prepare(error)
-  PrintPrettyError.printPrettyError(prettyError, `[terminal-process] `)
-  return {
-    jsonrpc: JsonRpcVersion.Two,
-    id: message.id,
-    error: {
-      code: JsonRpcErrorCode.Custom,
-      message: prettyError.message,
-      data: {
-        stack: prettyError.stack,
-        codeFrame: prettyError.codeFrame,
-        type: prettyError.type,
-        code: prettyError.code,
-      },
-    },
-  }
-}

package/src/parts/GetResponse/GetResponse.js

@@ -1,14 +0,0 @@
-import * as GetErrorResponse from '../GetErrorResponse/GetErrorResponse.js'
-import * as GetSuccessResponse from '../GetSuccessResponse/GetSuccessResponse.js'
-import * as RequiresSocket from '../RequiresSocket/RequiresSocket.js'
-
-export const getResponse = async (message, execute, handle) => {
-  try {
-    const result = RequiresSocket.requiresSocket(message.method)
-      ? await execute(message.method, ...message.params, handle)
-      : await execute(message.method, ...message.params)
-    return GetSuccessResponse.getSuccessResponse(message, result)
-  } catch (error) {
-    return GetErrorResponse.getErrorResponse(message, error)
-  }
-}

package/src/parts/GetSuccessResponse/GetSuccessResponse.js

@@ -1,12 +0,0 @@
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
-
-export const getSuccessResponse = (message, result) => {
-  if (!message.id) {
-    return undefined
-  }
-  return {
-    jsonrpc: JsonRpcVersion.Two,
-    id: message.id,
-    result: result ?? null,
-  }
-}

package/src/parts/HandleJsonRpcMessage/HandleJsonRpcMessage.js

@@ -1,12 +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)
-  if ('id' in message) {
-    ipc.send(response)
-  }
-}

package/src/parts/JsonRpcErrorCode/JsonRpcErrorCode.js

@@ -1,2 +0,0 @@
-export const MethodNotFound = -32601
-export const Custom = -32001

package/src/parts/JsonRpcEvent/JsonRpcEvent.js

@@ -1,9 +0,0 @@
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
-
-export const create = (method, params) => {
-  return {
-    jsonrpc: JsonRpcVersion.Two,
-    method,
-    params,
-  }
-}

package/src/parts/JsonRpcRequest/JsonRpcRequest.js

@@ -1,16 +0,0 @@
-import * as Callback from '../Callback/Callback.js'
-import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
-
-export const create = (method, params) => {
-  const { id, promise } = Callback.registerPromise()
-  const message = {
-    jsonrpc: JsonRpcVersion.Two,
-    method,
-    params,
-    id,
-  }
-  return {
-    message,
-    promise,
-  }
-}

package/src/parts/JsonRpcVersion/JsonRpcVersion.js

@@ -1 +0,0 @@
-export const Two = '2.0'