@lvce-editor/shared-process 0.11.2 → 0.11.3

package/extensions/builtin.language-basics-xml/README.md

@@ -1,4 +1,4 @@
-# Language Basics XML
+# Language Basics Xml
 
 ## Contributing
 

package/extensions/builtin.language-basics-xml/extension.json

@@ -6,23 +6,20 @@
     {
       "id": "xml",
       "extensions": [
-        ".xml",
-        ".xsd",
         ".ascx",
         ".atom",
-        ".axml",
         ".axaml",
+        ".axml",
         ".bpmn",
         ".cpt",
         ".csl",
-        ".csproj",
         ".csproj.user",
+        ".csproj",
         ".dita",
         ".ditamap",
         ".dtd",
-        ".ent",
-        ".mod",
         ".dtml",
+        ".ent",
         ".fsproj",
         ".fxml",
         ".iml",
@@ -30,16 +27,18 @@
         ".jmx",
         ".launch",
         ".menu",
+        ".mod",
         ".mxml",
         ".nuspec",
         ".opml",
         ".owl",
+        ".plist",
         ".proj",
         ".props",
         ".pt",
         ".publishsettings",
-        ".pubxml",
         ".pubxml.user",
+        ".pubxml",
         ".rbxlx",
         ".rbxmx",
         ".rdf",
@@ -51,10 +50,11 @@
         ".targets",
         ".tld",
         ".tmx",
-        ".vbproj",
         ".vbproj.user",
-        ".vcxproj",
+        ".vbproj",
         ".vcxproj.filters",
+        ".vcxproj",
+        ".vsixmanifest",
         ".wsdl",
         ".wxi",
         ".wxl",
@@ -64,11 +64,13 @@
         ".xib",
         ".xlf",
         ".xliff",
-        ".xpdl",
-        ".xul",
+        ".xml",
         ".xoml",
-        ".vsixmanifest"
+        ".xpdl",
+        ".xsd",
+        ".xul"
       ],
+      "fileNames": [".project"],
       "tokenize": "src/tokenizeXml.js"
     }
   ]

package/extensions/builtin.language-basics-xml/src/tokenizeXml.js

@@ -58,7 +58,7 @@ const RE_ANGLE_BRACKET_ONLY = /^</
 const RE_ANGLE_BRACKET_OPEN = /^</
 const RE_ANGLE_BRACKET_OPEN_TAG = /^<(?!\s)/
 const RE_ANY_TEXT = /^[^\n]+/
-const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-]+/
+const RE_ATTRIBUTE_NAME = /^[a-zA-Z\d\-\:]+/
 const RE_BLOCK_COMMENT_CONTENT = /^.(?:.*?)(?=-->|$)/s
 const RE_BLOCK_COMMENT_END = /^-->/
 const RE_BLOCK_COMMENT_START = /^<!--/
@@ -98,6 +98,8 @@ export const isLineStateEqual = (lineStateA, lineStateB) => {
   return lineStateA.state === lineStateB.state
 }
 
+export const hasArrayReturn = true
+
 /**
  *
  * @param {string} line
@@ -285,11 +287,9 @@ export const tokenizeLine = (line, lineState) => {
         state
         throw new Error('no')
     }
-    index += next[0].length
-    tokens.push({
-      type: token,
-      length: next[0].length,
-    })
+    const tokenLength = next[0].length
+    index += tokenLength
+    tokens.push(token, tokenLength)
   }
   return {
     state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -16,9 +16,10 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.11.2",
-    "@lvce-editor/extension-host-helper-process": "0.11.2",
-    "@lvce-editor/pty-host": "0.11.2",
+    "@babel/code-frame": "^7.18.6",
+    "@lvce-editor/extension-host": "0.11.3",
+    "@lvce-editor/extension-host-helper-process": "0.11.3",
+    "@lvce-editor/pty-host": "0.11.3",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
     "exit-hook": "^3.1.2",
@@ -37,8 +38,8 @@
     "xdg-basedir": "^5.1.0"
   },
   "optionalDependencies": {
+    "extract-zip": "^2.0.1",
     "keytar": "^7.9.0",
-    "vscode-ripgrep-with-github-api-error-fix": "^2.6.0",
-    "extract-zip": "^2.0.1"
+    "vscode-ripgrep-with-github-api-error-fix": "^2.6.0"
   }
 }

package/src/parts/Command/Command.js

@@ -1,9 +1,11 @@
-import * as Module from '../Module/Module.js'
 import * as ModuleMap from '../ModuleMap/ModuleMap.js'
 
-const commands = Object.create(null)
-const invocables = Object.create(null)
-const pendingModules = Object.create(null)
+export const state = {
+  commands: Object.create(null),
+  invocables: Object.create(null),
+  pendingModules: Object.create(null),
+  async load(moduleId) {},
+}
 
 const initializeModule = (module) => {
   if (module.Commands) {
@@ -21,49 +23,49 @@ const initializeModule = (module) => {
 }
 
 const getOrLoadModule = (moduleId) => {
-  if (!pendingModules[moduleId]) {
-    const importPromise = Module.load(moduleId)
-    pendingModules[moduleId] = importPromise
+  if (!state.pendingModules[moduleId]) {
+    const importPromise = state.load(moduleId)
+    state.pendingModules[moduleId] = importPromise
       .then(initializeModule)
       .catch((error) => {
         console.error(error)
       })
   }
-  return pendingModules[moduleId]
+  return state.pendingModules[moduleId]
 }
 
 const loadCommand = (command) => getOrLoadModule(ModuleMap.getModuleId(command))
 
 export const register = (commandId, listener) => {
-  commands[commandId] = listener
+  state.commands[commandId] = listener
 }
 
 export const registerInvocable = (commandId, listener) => {
-  invocables[commandId] = listener
+  state.invocables[commandId] = listener
 }
 
 export const invoke = async (command, ...args) => {
-  if (!(command in commands)) {
+  if (!(command in state.commands)) {
     await loadCommand(command)
-    if (!(command in commands)) {
+    if (!(command in state.commands)) {
       console.warn(`[shared process] Unknown command "${command}"`)
       throw new Error(`Command ${command} not found`)
     }
   }
-  if (typeof commands[command] !== 'function') {
+  if (typeof state.commands[command] !== 'function') {
     throw new TypeError(`Command ${command} is not a function`)
   }
-  return commands[command](...args)
+  return state.commands[command](...args)
 }
 
 export const execute = (command, ...args) => {
-  if (command in commands) {
-    commands[command](...args)
+  if (command in state.commands) {
+    state.commands[command](...args)
   } else {
     loadCommand(command)
       // TODO can skip then block in prod (only to prevent endless loop in dev)
       .then(() => {
-        if (!(command in commands)) {
+        if (!(command in state.commands)) {
           console.warn(`Unknown command "${command}"`)
           return
         }
@@ -79,3 +81,7 @@ export const execute = (command, ...args) => {
       })
   }
 }
+
+export const setLoad = (load) => {
+  state.load = load
+}

package/src/parts/ExtensionInstall/ExtensionInstall.ipc.js

@@ -1,6 +1,8 @@
 import * as ExensionInstall from './ExtensionInstall.js'
 
+export const name = 'ExtensionInstall'
+
 // prettier-ignore
 export const Commands = {
-  'ExtensionInstall.install': ExensionInstall.install,
+  install: ExensionInstall.install,
 }

package/src/parts/GetResponse/GetResponse.js

@@ -0,0 +1,60 @@
+import * as Command from '../Command/Command.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+import * as PrettyError from '../PrettyError/PrettyError.js'
+import { requiresSocket } from '../RequiresSocket/RequiresSocket.js'
+
+export const getResponse = async (message, handle) => {
+  try {
+    const result = requiresSocket(message.method)
+      ? await Command.invoke(message.method, handle, ...message.params)
+      : await Command.invoke(message.method, ...message.params)
+
+    return {
+      jsonrpc: JsonRpc.Version,
+      id: message.id,
+      result: result ?? null,
+    }
+  } catch (error) {
+    if (
+      error &&
+      error instanceof Error &&
+      error.message &&
+      error.message.startsWith('method not found')
+    ) {
+      return {
+        jsonrpc: JsonRpc.Version,
+        id: message.id,
+        error: {
+          code: JsonRpc.ErrorMethodNotFound,
+          message: error.message,
+          data: error.stack,
+        },
+      }
+    }
+    if (error && error instanceof Error && error.code === ErrorCodes.ENOENT) {
+      return {
+        jsonrpc: JsonRpc.Version,
+        id: message.id,
+        error: {
+          code: -32001,
+          message: `${error}`,
+        },
+      }
+    }
+    const prettyError = PrettyError.prepare(error)
+    PrettyError.print(prettyError)
+    return {
+      jsonrpc: JsonRpc.Version,
+      id: message.id,
+      error: {
+        code: -32001,
+        message: prettyError.message,
+        data: {
+          stack: prettyError.stack,
+          codeFrame: prettyError.codeFrame,
+        },
+      },
+    }
+  }
+}

package/src/parts/GitLsFiles/GitLsFiles.ipc.js

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

package/src/parts/GitLsFiles/GitLsFiles.js

@@ -0,0 +1,9 @@
+import * as Exec from '../Exec/Exec.js'
+
+export const gitLsFiles = async (cwd, limit) => {
+  const { stdout, stderr } = await Exec.exec('git', ['ls-files'], {
+    cwd,
+  })
+  // TODO limit stdout lines to given limit
+  return stdout
+}

package/src/parts/JoinLines/JoinLines.js

@@ -0,0 +1,3 @@
+export const joinLines = (lines) => {
+  return lines.join('\n')
+}

package/src/parts/JsonRpc/JsonRpc.js

@@ -1,5 +1,9 @@
 import * as Callback from '../Callback/Callback.js'
 
+export const Version = '2.0'
+
+export const ErrorMethodNotFound = -32601
+
 export const send = (transport, method, ...params) => {
   transport.send({
     jsonrpc: '2.0',

package/src/parts/LimitString/LimitString.js

@@ -0,0 +1,15 @@
+export const limitString = (string, limit) => {
+  let lines = 0
+  let i = 0
+  while (i !== -1 && lines < limit) {
+    i = string.indexOf('\n', i + 1)
+    if (i === -1) {
+      break
+    }
+    lines++
+  }
+  if (i === -1) {
+    return string
+  }
+  return string.slice(0, i)
+}

package/src/parts/Module/Module.js

@@ -16,6 +16,8 @@ export const load = (moduleId) => {
       return import('../ExtensionManagement/ExtensionManagement.ipc.js')
     case ModuleId.FileSystem:
       return import('../FileSystem/FileSystem.ipc.js')
+    case ModuleId.GitLsFiles:
+      return import('../GitLsFiles/GitLsFiles.ipc.js')
     case ModuleId.Native:
       return import('../Native/Native.ipc.js')
     case ModuleId.OutputChannel:

package/src/parts/ModuleId/ModuleId.js

@@ -16,3 +16,4 @@ export const WebSocketServer = 15
 export const Workspace = 16
 export const ChromeExtension = 17
 export const Download = 18
+export const GitLsFiles = 19

package/src/parts/ModuleMap/ModuleMap.js

@@ -92,6 +92,8 @@ export const getModuleId = (commandId) => {
     case 'FileSystem.rename':
     case 'FileSystem.writeFile':
       return ModuleId.FileSystem
+    case 'GitLsFiles.gitLsFiles':
+      return ModuleId.GitLsFiles
     case 'Native.openFolder':
       return ModuleId.Native
     case 'OutputChannel.close':
@@ -129,7 +131,7 @@ export const getModuleId = (commandId) => {
       return ModuleId.Terminal
     case 4820:
       return ModuleId.TextDocument
-    case 5621:
+    case 'WebSocketServer.handleUpgrade':
       return ModuleId.WebSocketServer
     case 'Workspace.getHomeDir':
     case 'Workspace.resolveRoot':

package/src/parts/ParentIpc/ParentIpc.js

@@ -3,12 +3,11 @@ import VError from 'verror'
 import * as Callback from '../Callback/Callback.js'
 import * as Command from '../Command/Command.js'
 import * as Debug from '../Debug/Debug.js'
-import * as Error from '../Error/Error.js'
-import { requiresSocket } from '../RequiresSocket/RequiresSocket.js'
-import * as Platform from '../Platform/Platform.js'
+import * as ExtensionHostHelperProcessIpc from '../ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js'
 import * as ExtensionHostIpc from '../ExtensionHostIpc/ExtensionHostIpc.js'
 import * as ExtensionHostRpc from '../ExtensionHostRpc/ExtensionHostRpc.js'
-import * as ExtensionHostHelperProcessIpc from '../ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js'
+import * as GetResponse from '../GetResponse/GetResponse.js'
+
 // TODO add tests for this
 
 // TODO handle structure: one shared process multiple extension hosts
@@ -43,7 +42,7 @@ const handleWebSocketSharedProcess = (message, handle) => {
     console.info('[info shared process: handle error]', error)
   })
   Command.execute(
-    /* WebSocketServer.handleUpgrade */ 5621,
+    /* WebSocketServer.handleUpgrade */ 'WebSocketServer.handleUpgrade',
     /* message */ message,
     /* handle */ handle
   )
@@ -84,7 +83,7 @@ const handleWebSocket = (message, handle) => {
     case 'lvce.extension-host-helper-process':
       return handleWebSocketExtensionHostHelperProcess(message, handle)
     default:
-      throw new VError(`unsupported sec-websocket-procotol ${protocol}`)
+      console.warn(`unsupported sec-websocket-procotol ${protocol}`)
   }
 }
 
@@ -94,27 +93,8 @@ const handleJsonRpcResult = (message) => {
 
 const handleJsonRpcMessage = async (message, handle) => {
   if (message.id) {
-    try {
-      const result = requiresSocket(message.method)
-        ? await Command.invoke(message.method, handle, ...message.params)
-        : await Command.invoke(message.method, ...message.params)
-      electronSend({
-        jsonrpc: '2.0',
-        id: message.id,
-        result: result ?? null,
-      })
-    } catch (error) {
-      console.error('[shared process] command failed to execute')
-      console.error(error)
-      electronSend({
-        jsonrpc: '2.0',
-        code: /* ExpectedError */ -32000,
-        id: message.id,
-        error: 'ExpectedError',
-        // @ts-ignore
-        data: error.toString(),
-      })
-    }
+    const response = await GetResponse.getResponse(message, handle)
+    electronSend(response)
   } else {
     // TODO handle error
     Command.execute(message.method, null, ...message.params)
@@ -163,61 +143,8 @@ const electronInitialize = (initializeMessage) => {
       Callback.resolve(message.id, message.result)
     } else if (message.method) {
       if (message.id) {
-        try {
-          const result = requiresSocket(message.method)
-            ? await Command.invoke(
-                message.method,
-                fakeSocket,
-                ...message.params
-              )
-            : await Command.invoke(message.method, ...message.params)
-
-          port.postMessage({
-            jsonrpc: '2.0',
-            id: message.id,
-            result: result ?? null,
-          })
-        } catch (error) {
-          // TODO duplicate code with Socket.js, clean this up
-          if (error instanceof Error.OperationalError) {
-            // console.log({ error })
-            const rawCause = error.cause()
-            const errorCause = rawCause ? rawCause.message : ''
-            const errorMessage = rawCause
-              ? error.message.slice(0, error.message.indexOf(errorCause))
-              : ''
-
-            // console.info('expected error', error)
-            port.postMessage({
-              jsonrpc: '2.0',
-              id: message.id,
-              error: {
-                code: /* ExpectedError */ -32000,
-                message: error.message,
-                data: {
-                  stack: error.originalStack,
-                  codeFrame: error.originalCodeFrame,
-                  category: error.category,
-                  // @ts-ignore
-                  stderr: error.stderr,
-                },
-              },
-            })
-          } else {
-            console.error('[shared process] command failed to execute')
-            console.error(error)
-            // TODO check if socket is active
-            port.postMessage({
-              jsonrpc: '2.0',
-              id: message.id,
-              error: {
-                code: /* UnexpectedError */ -32001,
-                // @ts-ignore
-                message: error.toString(),
-              },
-            })
-          }
-        }
+        const response = await GetResponse.getResponse(message, fakeSocket)
+        port.postMessage(response)
       } else {
         Command.execute(message.method, fakeSocket, ...message.params)
       }

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

@@ -1,6 +1,8 @@
 import * as Process from './Process.js'
 
+export const name = 'Process'
+
 export const Commands = {
-  555: Process.crash,
-  556: Process.crashAsync,
+  crash: Process.crash,
+  crashAsync: Process.crashAsync,
 }

package/src/parts/SearchFile/SearchFile.js

@@ -1,10 +1,13 @@
-import * as RgPath from '../RgPath/RgPath.js'
+import * as Assert from '../Assert/Assert.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as Exec from '../Exec/Exec.js'
+import * as LimitString from '../LimitString/LimitString.js'
+import * as RgPath from '../RgPath/RgPath.js'
 
 const ripGrepPath = process.env.RIP_GREP_PATH || RgPath.rgPath
 
 const isEnoentErrorLinux = (error) => {
-  return error.code === 'ENOENT'
+  return error.code === ErrorCodes.ENOENT
 }
 
 const isEnoentErrorWindows = (error) => {
@@ -24,8 +27,11 @@ const isEnoentError = (error) => {
 // do a delta comparison, so the first time it would send 100kB
 // but the second time only a few hundred bytes of changes
 
-export const searchFile = async (path, searchTerm) => {
+export const searchFile = async (path, searchTerm, limit) => {
   try {
+    Assert.string(path)
+    Assert.string(searchTerm)
+    Assert.number(limit)
     const { stdout, stderr } = await Exec.exec(
       ripGrepPath,
       ['--files', '--sort-files'],
@@ -33,8 +39,7 @@ export const searchFile = async (path, searchTerm) => {
         cwd: path,
       }
     )
-    const lines = stdout.split('\n')
-    return lines
+    return LimitString.limitString(stdout, limit)
   } catch (error) {
     // @ts-ignore
     if (isEnoentError(error)) {

package/src/parts/Socket/Socket.js

@@ -1,7 +1,6 @@
 import VError from 'verror'
 import * as Command from '../Command/Command.js'
-import * as Error from '../Error/Error.js'
-import { requiresSocket } from '../RequiresSocket/RequiresSocket.js'
+import * as GetResponse from '../GetResponse/GetResponse.js'
 
 export const state = {
   /**
@@ -30,59 +29,8 @@ const handleMessage = async (event) => {
       )
       return
     }
-    let result
-    try {
-      result = requiresSocket(object.method)
-        ? await Command.invoke(object.method, state.socket, ...object.params)
-        : await Command.invoke(object.method, ...object.params)
-    } catch (error) {
-      if (error instanceof Error.OperationalError) {
-        // console.log({ error })
-        const rawCause = error.cause()
-        const errorCause = rawCause ? rawCause.message : ''
-        const errorMessage = rawCause
-          ? error.message.slice(0, error.message.indexOf(errorCause))
-          : ''
-
-        // console.info('expected error', error)
-        send({
-          jsonrpc: '2.0',
-          id: object.id,
-          error: {
-            code: /* ExpectedError */ -32000,
-            message: error.message,
-            data: {
-              stack: error.originalStack,
-              codeFrame: error.originalCodeFrame,
-              category: error.category,
-              // @ts-ignore
-              stderr: error.stderr,
-            },
-          },
-        })
-      } else {
-        console.error(error)
-        // TODO check if socket is active
-        send({
-          jsonrpc: '2.0',
-          id: object.id,
-          error: {
-            code: /* UnexpectedError */ -32001,
-            // @ts-ignore
-            message: error.toString(),
-            data: {
-              code: error.code,
-            },
-          },
-        })
-      }
-      return
-    }
-    send({
-      jsonrpc: '2.0',
-      result,
-      id: object.id,
-    })
+    const response = await GetResponse.getResponse(object, state.socket)
+    send(response)
   } else {
     if (!object.params) {
       console.warn('invalid message', typeof object, object.params, object)

package/src/parts/Terminal/Terminal.js

@@ -76,7 +76,7 @@ export const create = async (socket, id, cwd) => {
           const data = message.params[1]
           socket.send({
             jsonrpc: '2.0',
-            method: 2133,
+            method: 'Viewlet.send',
             params: ['Terminal', 'handleData', data],
           })
         }

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

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

package/src/parts/Workspace/Workspace.ipc.js

@@ -1,6 +1,8 @@
 import * as Workspace from './Workspace.js'
 
+export const name = 'Workspace'
+
 export const Commands = {
-  'Workspace.getHomeDir': Workspace.getHomeDir,
-  'Workspace.resolveRoot': Workspace.resolveRoot,
+  getHomeDir: Workspace.getHomeDir,
+  resolveRoot: Workspace.resolveRoot,
 }

package/src/sharedProcessMain.js

@@ -1,3 +1,5 @@
+import * as Command from './parts/Command/Command.js'
+import * as Module from './parts/Module/Module.js'
 import * as ParentIpc from './parts/ParentIpc/ParentIpc.js'
 import * as PrettyError from './parts/PrettyError/PrettyError.js'
 
@@ -48,6 +50,7 @@ const handleSigTerm = () => {
 const knownCliArgs = ['install', 'list', 'link', 'unlink']
 
 const main = async () => {
+  Command.setLoad(Module.load)
   const argv = process.argv.slice(2)
   const argv0 = argv[0]
   if (knownCliArgs.includes(argv0)) {