@lvce-editor/shared-process 0.11.9 → 0.11.10

package/src/parts/FileSystem/FileSystem.js

@@ -18,16 +18,8 @@ export const copy = async (source, target) => {
   try {
     await fs.cp(source, target, { recursive: true })
   } catch (error) {
-    if (
-      error &&
-      error.message &&
-      error.message.startsWith(
-        'Invalid src or dest: cp returned EINVAL (src and dest cannot be the same)'
-      )
-    ) {
-      throw new VError(
-        `Failed to copy "${source}" to "${target}": src and dest cannot be the same`
-      )
+    if (error && error.message && error.message.startsWith('Invalid src or dest: cp returned EINVAL (src and dest cannot be the same)')) {
+      throw new VError(`Failed to copy "${source}" to "${target}": src and dest cannot be the same`)
     }
     throw new VError(error, `Failed to copy "${source}" to "${target}"`)
   }
@@ -65,11 +57,7 @@ export const readFile = async (path, encoding = EncodingType.Utf8) => {
  * @param {string} content
  * @param {BufferEncoding} encoding
  */
-export const writeFile = async (
-  path,
-  content,
-  encoding = EncodingType.Utf8
-) => {
+export const writeFile = async (path, content, encoding = EncodingType.Utf8) => {
   try {
     // queue would be more correct for concurrent writes but also slower
     // Queue.add(`writeFile/${path}`, () =>
@@ -166,6 +154,7 @@ const getType = (dirent) => {
   if (dirent.isCharacterDevice()) {
     return DirentType.CharacterDevice
   }
+  console.log({ dirent })
   return DirentType.Unknown
 }
 
@@ -182,6 +171,7 @@ const toPrettyDirent = (dirent) => {
 export const readDirWithFileTypes = async (path) => {
   try {
     const dirents = await fs.readdir(path, { withFileTypes: true })
+    console.log({ dirents: dirents.filter((x) => getType(x) === DirentType.Unknown) })
     const prettyDirents = dirents.map(toPrettyDirent)
     return prettyDirents
   } catch (error) {

package/src/parts/GetResponse/GetResponse.js

@@ -1,6 +1,7 @@
 import * as Command from '../Command/Command.js'
 import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
-import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+import * as JsonRpcErrorCode from '../JsonRpcErrorCode/JsonRpcErrorCode.js'
+import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 import * as PrettyError from '../PrettyError/PrettyError.js'
 import { requiresSocket } from '../RequiresSocket/RequiresSocket.js'
 
@@ -11,22 +12,17 @@ export const getResponse = async (message, handle) => {
       : await Command.execute(message.method, ...message.params)
 
     return {
-      jsonrpc: JsonRpc.Version,
+      jsonrpc: JsonRpcVersion.Two,
       id: message.id,
       result: result ?? null,
     }
   } catch (error) {
-    if (
-      error &&
-      error instanceof Error &&
-      error.message &&
-      error.message.startsWith('method not found')
-    ) {
+    if (error && error instanceof Error && error.message && error.message.startsWith('method not found')) {
       return {
-        jsonrpc: JsonRpc.Version,
+        jsonrpc: JsonRpcVersion.Two,
         id: message.id,
         error: {
-          code: JsonRpc.ErrorMethodNotFound,
+          code: JsonRpcErrorCode.MethodNotFound,
           message: error.message,
           data: error.stack,
         },
@@ -35,10 +31,10 @@ export const getResponse = async (message, handle) => {
     // @ts-ignore
     if (error && error instanceof Error && error.code === ErrorCodes.ENOENT) {
       return {
-        jsonrpc: JsonRpc.Version,
+        jsonrpc: JsonRpcVersion.Two,
         id: message.id,
         error: {
-          code: -32001,
+          code: JsonRpcErrorCode.Custom,
           message: `${error}`,
         },
       }
@@ -46,10 +42,10 @@ export const getResponse = async (message, handle) => {
     const prettyError = PrettyError.prepare(error)
     PrettyError.print(prettyError, `[shared-process] `)
     return {
-      jsonrpc: JsonRpc.Version,
+      jsonrpc: JsonRpcVersion.Two,
       id: message.id,
       error: {
-        code: -32001,
+        code: JsonRpcErrorCode.Custom,
         message: prettyError.message,
         data: {
           stack: prettyError.stack,

package/src/parts/JsonRpc/JsonRpc.js

@@ -1,12 +1,9 @@
 import * as Callback from '../Callback/Callback.js'
-
-export const Version = '2.0'
-
-export const ErrorMethodNotFound = -32601
+import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 
 export const send = (transport, method, ...params) => {
   transport.send({
-    jsonrpc: '2.0',
+    jsonrpc: JsonRpcVersion.Two,
     method,
     params,
   })
@@ -17,7 +14,7 @@ export const invoke = (ipc, method, ...params) => {
     // TODO use one map instead of two
     const callbackId = Callback.register(resolve, reject)
     ipc.send({
-      jsonrpc: '2.0',
+      jsonrpc: JsonRpcVersion.Two,
       method,
       params,
       id: callbackId,

package/src/parts/JsonRpcErrorCode/JsonRpcErrorCode.js

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

package/src/parts/JsonRpcVersion/JsonRpcVersion.js

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

package/src/parts/OutputChannel/OutputChannel.ipc.js

@@ -1,6 +1,7 @@
 import * as Assert from '../Assert/Assert.js'
 import * as Command from '../Command/Command.js'
 import * as OutputChannel from './OutputChannel.js'
+import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 
 export const state = {
   outputChannels: Object.create(null),
@@ -21,7 +22,7 @@ const open = (socket, id, path) => {
   const onData = (data) => {
     console.log('send data', data)
     socket.send({
-      jsonrpc: '2.0',
+      jsonrpc: JsonRpcVersion.Two,
       method: 2133,
       params: ['Output', 'handleData', data],
     })
@@ -29,7 +30,7 @@ const open = (socket, id, path) => {
   const onError = (error) => {
     console.info(`[shared process] output channel error: ${error}`)
     socket.send({
-      jsonrpc: '2.0',
+      jsonrpc: JsonRpcVersion.Two,
       method: 2133,
       params: ['Output', 'handleError', error],
     })

package/src/parts/Terminal/Terminal.js

@@ -3,6 +3,7 @@ import { ChildProcess, fork } from 'node:child_process'
 import * as Assert from '../Assert/Assert.js'
 import * as Debug from '../Debug/Debug.js'
 import * as PtyHostPath from '../PtyHostPath/PtyHostPath.js'
+import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
 
 export const state = {
   /**
@@ -75,7 +76,7 @@ export const create = async (socket, id, cwd) => {
         const handleMessage = (message) => {
           const data = message.params[1]
           socket.send({
-            jsonrpc: '2.0',
+            jsonrpc: JsonRpcVersion.Two,
             method: 'Viewlet.send',
             params: ['Terminal', 'handleData', data],
           })
@@ -102,7 +103,7 @@ export const create = async (socket, id, cwd) => {
       break
   }
   state.send({
-    jsonrpc: '2.0',
+    jsonrpc: JsonRpcVersion.Two,
     method: 'Terminal.create',
     params: [id, cwd],
   })
@@ -128,7 +129,7 @@ export const write = (id, data) => {
     return
   }
   state.send({
-    jsonrpc: '2.0',
+    jsonrpc: JsonRpcVersion.Two,
     method: 'Terminal.write',
     params: [id, data],
   })
@@ -140,7 +141,7 @@ export const resize = (state, columns, rows) => {
 
 export const dispose = (id) => {
   state.send({
-    jsonrpc: '2.0',
+    jsonrpc: JsonRpcVersion.Two,
     method: 'Terminal.dispose',
     params: [id],
   })

package/src/sharedProcessMain.js

@@ -27,7 +27,7 @@ const main = async () => {
   const argv0 = argv[0]
   if (knownCliArgs.includes(argv0)) {
     const module = await import('./parts/Cli/Cli.js')
-    await module.handleCliArgs(argv, console, process)
+    await module.handleCliArgs(argv)
     return
   }
 
@@ -36,10 +36,7 @@ const main = async () => {
   process.on('disconnect', handleDisconnect)
   process.on('SIGTERM', handleSigTerm)
 
-  process.on(
-    'uncaughtExceptionMonitor',
-    ErrorHandling.handleUncaughtExceptionMonitor
-  )
+  process.on('uncaughtExceptionMonitor', ErrorHandling.handleUncaughtExceptionMonitor)
   ParentIpc.listen()
 
   // ExtensionHost.start() // TODO start on demand, e.g. not when extensions should be disabled