@lvce-editor/shared-process 0.15.1 → 0.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.1",
-    "@lvce-editor/extension-host-helper-process": "0.15.1",
-    "@lvce-editor/pty-host": "0.15.1",
+    "@lvce-editor/extension-host": "0.15.2",
+    "@lvce-editor/extension-host-helper-process": "0.15.2",
+    "@lvce-editor/pty-host": "0.15.2",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/CliUnlink/CliUnlink.js

@@ -1,7 +1,19 @@
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as ExitCode from '../ExitCode/ExitCode.js'
 import * as ExtensionUnlink from '../ExtensionUnlink/ExtensionUnlink.js'
+import * as Logger from '../Logger/Logger.js'
 import * as Process from '../Process/Process.js'
 
 export const handleCliArgs = async (argv) => {
-  const path = argv.length > 1 ? argv[1] : Process.cwd()
-  await ExtensionUnlink.unlink(path)
+  try {
+    const path = argv.length > 1 ? argv[1] : Process.cwd()
+    await ExtensionUnlink.unlink(path)
+  } catch (error) {
+    if (error && error.code === ErrorCodes.E_MANIFEST_NOT_FOUND) {
+      Logger.error(error.message)
+      Process.setExitCode(ExitCode.ExpectedError)
+      return
+    }
+    throw error
+  }
 }

package/src/parts/ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js

@@ -24,6 +24,7 @@ export const install = async ({ user, repo, branch }) => {
     }
     const outDir = Path.join(extensionsPath, id)
     await FileSystem.remove(outDir)
+    await FileSystem.mkdir(extensionsPath)
     await FileSystem.rename(cachedExtensionPath, outDir)
   } catch (error) {
     throw new VError(error, `Failed to install ${user}/${repo}`)

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

@@ -1,12 +1,8 @@
 import * as Assert from '../Assert/Assert.js'
-import * as Command from '../Command/Command.js'
 import * as JsonRpcVersion from '../JsonRpcVersion/JsonRpcVersion.js'
+import * as OutputChannelState from '../OutputChannelState/OutputChannelState.js'
 import * as OutputChannel from './OutputChannel.js'
 
-export const state = {
-  outputChannels: Object.create(null),
-}
-
 const open = (socket, id, path) => {
   console.log({ path })
   Assert.object(socket)
@@ -16,31 +12,32 @@ const open = (socket, id, path) => {
     console.warn('socket not available')
     return
   }
-  if (state.outputChannels[id]) {
-    OutputChannel.dispose(state.outputChannels[id])
+  if (OutputChannelState.has(id)) {
+    OutputChannel.dispose(OutputChannelState.get(id))
   }
   const onData = (data) => {
     console.log('send data', data)
     socket.send({
       jsonrpc: JsonRpcVersion.Two,
-      method: 2133,
-      params: ['Output', 'handleData', data],
+      method: 'Output.handleData',
+      params: [data],
     })
   }
   const onError = (error) => {
     console.info(`[shared process] output channel error: ${error}`)
     socket.send({
       jsonrpc: JsonRpcVersion.Two,
-      method: 2133,
-      params: ['Output', 'handleError', error],
+      method: 'Output.handleError',
+      params: [error],
     })
   }
-  state.outputChannels[id] = OutputChannel.open(path, onData, onError)
+  const outputChannel = OutputChannel.open(path, onData, onError)
+  OutputChannelState.set(id, outputChannel)
 }
 
 const close = (socket, id) => {
-  OutputChannel.dispose(state.outputChannels[id])
-  delete state.outputChannels[id]
+  OutputChannel.dispose(OutputChannelState.get(id))
+  OutputChannelState.remove(id)
 }
 
 export const name = 'OutputChannel'

package/src/parts/OutputChannelState/OutputChannelState.js

@@ -0,0 +1,19 @@
+export const state = {
+  outputChannels: Object.create(null),
+}
+
+export const set = (id, channel) => {
+  state.outputChannels[id] = channel
+}
+
+export const get = (id) => {
+  return state.outputChannels[id]
+}
+
+export const remove = (id) => {
+  delete state.outputChannels[id]
+}
+
+export const has = (id) => {
+  return id in state.outputChannels
+}