@lvce-editor/shared-process 0.15.21 → 0.15.23

package/extensions/builtin.language-basics-css/src/tokenizeCss.js

@@ -55,6 +55,7 @@ export const TokenType = {
   FuntionName: 890,
   String: 891,
   KeywordImport: 892,
+  CssSelectorClass: 893,
 }
 
 export const TokenMap = {
@@ -81,10 +82,12 @@ export const TokenMap = {
   [TokenType.FuntionName]: 'Function',
   [TokenType.String]: 'String',
   [TokenType.KeywordImport]: 'KeywordImport',
+  [TokenType.CssSelectorClass]: 'CssSelectorClass',
 }
 
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>\+\~\_%\\]+/
 const RE_SELECTOR_ID = /^#[\w\-\_]+/
+const RE_SELECTOR_CLASS = /^\.[\w\-\_]+/
 const RE_WHITESPACE = /^\s+/
 const RE_CURLY_OPEN = /^\{/
 const RE_CURLY_CLOSE = /^\}/
@@ -153,7 +156,10 @@ export const tokenizeLine = (line, lineState) => {
     const part = line.slice(index)
     switch (state) {
       case State.TopLevelContent:
-        if ((next = part.match(RE_SELECTOR))) {
+        if ((next = part.match(RE_SELECTOR_CLASS))) {
+          token = TokenType.CssSelectorClass
+          state = State.AfterSelector
+        } else if ((next = part.match(RE_SELECTOR))) {
           token = TokenType.CssSelector
           state = State.AfterSelector
         } else if ((next = part.match(RE_SELECTOR_ID))) {
@@ -336,6 +342,9 @@ export const tokenizeLine = (line, lineState) => {
         } else if ((next = part.match(RE_NUMERIC))) {
           token = TokenType.Numeric
           state = State.AfterPropertyNameAfterColon
+        } else if ((next = part.match(RE_PROPERTY_NAME))) {
+          token = TokenType.CssPropertyName
+          state = State.AfterPropertyName
         } else if ((next = part.match(RE_ANYTHING_UNTIL_CLOSE_BRACE))) {
           token = TokenType.Unknown
           state = State.InsideSelector

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.21",
+  "version": "0.15.23",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,13 +17,13 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.21",
-    "@lvce-editor/extension-host-helper-process": "0.15.21",
-    "@lvce-editor/pty-host": "0.15.21",
+    "@lvce-editor/extension-host": "0.15.23",
+    "@lvce-editor/extension-host-helper-process": "0.15.23",
+    "@lvce-editor/pty-host": "0.15.23",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",
-    "got": "^12.6.0",
+    "got": "^13.0.0",
     "is-object": "^1.0.2",
     "lines-and-columns": "^2.0.3",
     "p-queue": "^7.3.4",

package/src/parts/ErrorCodes/ErrorCodes.js

@@ -4,6 +4,7 @@ export const E_ICON_THEME_NOT_FOUND = 'E_ICON_THEME_NOT_FOUND'
 export const E_INCOMPATIBLE_NATIVE_MODULE = 'E_INCOMPATIBLE_NATIVE_MODULE'
 export const E_MANIFEST_NOT_FOUND = 'E_MANIFEST_NOT_FOUND'
 export const E_MODULES_NOT_SUPPORTED_IN_ELECTRON = 'E_MODULES_NOT_SUPPORTED_IN_ELECTRON'
+export const E_JSON_PARSE = 'E_JSON_PARSE'
 export const EACCES = 'EACCES'
 export const ECONNRESET = 'ECONNRESET'
 export const EEXIST = 'EEXIST'
@@ -16,3 +17,4 @@ export const EPIPE = 'EPIPE'
 export const ERR_IPC_CHANNEL_CLOSED = 'ERR_IPC_CHANNEL_CLOSED'
 export const ERR_MODULE_NOT_FOUND = 'ERR_MODULE_NOT_FOUND'
 export const EXDEV = 'EXDEV'
+export const ERR_DLOPEN_FAILED = 'ERR_DLOPEN_FAILED'

package/src/parts/ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js

@@ -1,51 +1,12 @@
-import * as ChildProcess from '../ChildProcess/ChildProcess.js'
+import * as IpcParent from '../IpcParent/IpcParent.js'
 import * as Platform from '../Platform/Platform.js'
 
-export const create = async () => {
-  const extensionHostHelperProcessPath =
-    await Platform.getExtensionHostHelperProcessPath()
-  const childProcess = ChildProcess.fork(
-    extensionHostHelperProcessPath,
-    ['--ipc-type=websocket', '--max-old-space-size=60', '--enable-source-maps'],
-    {}
-  )
-  return {
-    on(event, listener) {
-      switch (event) {
-        case 'message':
-          childProcess.on('message', listener)
-          break
-        case 'error':
-          childProcess.on('error', listener)
-          break
-        case 'exit':
-          childProcess.on('exit', listener)
-          break
-        default:
-          throw new Error(`unsupported event type ${event}`)
-      }
-    },
-    off(event, listener) {
-      switch (event) {
-        case 'message':
-          childProcess.off('message', listener)
-          break
-        case 'error':
-          childProcess.off('error', listener)
-          break
-        case 'exit':
-          childProcess.off('exit', listener)
-          break
-        default:
-          throw new Error(`unsupported event type ${event}`)
-      }
-    },
-    send(message) {
-      childProcess.send(message)
-    },
-    dispose() {
-      childProcess.kill()
-    },
-    _process: childProcess,
-  }
+export const create = async ({ method }) => {
+  const extensionHostHelperProcessPath = await Platform.getExtensionHostHelperProcessPath()
+  const ipc = await IpcParent.create({
+    method,
+    path: extensionHostHelperProcessPath,
+    execArgv: ['--max-old-space-size=60', '--enable-source-maps'],
+  })
+  return ipc
 }

package/src/parts/HandleIpc/HandleIpc.js

@@ -1,30 +1,10 @@
 import * as Callback from '../Callback/Callback.js'
 import * as Command from '../Command/Command.js'
-import * as GetResponse from '../GetResponse/GetResponse.js'
-
-const handleJsonRpcResult = (message) => {
-  Callback.resolve(message.id, message.result)
-}
+import * as HandleJsonRpcMessage from '../HandleJsonRpcMessage/HandleJsonRpcMessage.js'
 
 export const handleIpc = (ipc) => {
-  const handleJsonRpcMessage = async (message) => {
-    if (message.method) {
-      const response = await GetResponse.getResponse(message, ipc)
-      ipc.send(response)
-    } else {
-      // TODO handle error
-      Command.execute(message.method, ...message.params)
-    }
-  }
-
-  const handleMessageFromParentProcess = async (message) => {
-    if (message.result) {
-      return handleJsonRpcResult(message)
-    }
-    if (message.method) {
-      return handleJsonRpcMessage(message)
-    }
-    console.warn('unknown message', message)
+  const handleMessage = (message) => {
+    return HandleJsonRpcMessage.handleJsonRpcMessage(ipc, message, Command.execute, Callback.resolve)
   }
-  ipc.on('message', handleMessageFromParentProcess)
+  ipc.on('message', handleMessage)
 }

package/src/parts/HandleJsonRpcMessage/HandleJsonRpcMessage.js

@@ -0,0 +1,27 @@
+import * as ErrorHandling from '../ErrorHandling/ErrorHandling.js'
+import * as GetErrorResponse from '../GetErrorResponse/GetErrorResponse.js'
+import * as GetResponse from '../GetResponse/GetResponse.js'
+import * as Logger from '../Logger/Logger.js'
+import { JsonRpcError } from '../JsonRpcError/JsonRpcError.js'
+
+export const handleJsonRpcMessage = async (ipc, message, execute, resolve) => {
+  if ('id' in message) {
+    if ('method' in message) {
+      const response = await GetResponse.getResponse(message, execute)
+      try {
+        ipc.send(response)
+      } catch (error) {
+        const errorResponse = GetErrorResponse.getErrorResponse(message, error)
+        ipc.send(errorResponse)
+      }
+      return
+    }
+    resolve(message.id, message)
+    return
+  }
+  if ('method' in message) {
+    await GetResponse.getResponse(message, execute)
+    return
+  }
+  throw new JsonRpcError('unexpected message')
+}

package/src/parts/HandleSocketError/HandleSocketError.js

@@ -0,0 +1,9 @@
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as Logger from '../Logger/Logger.js'
+
+export const handleSocketError = (error) => {
+  if (error && error.code === ErrorCodes.ECONNRESET) {
+    return
+  }
+  Logger.info('[info shared process: handle error]', error)
+}

package/src/parts/HandleWebSocketForExtensionHostHelperProcess/HandleWebSocketForExtensionHostHelperProcess.js

@@ -1,6 +1,10 @@
 import * as ExtensionHostHelperProcessIpc from '../ExtensionHostHelperProcessIpc/ExtensionHostHelperProcessIpc.js'
+import * as IpcParentType from '../IpcParentType/IpcParentType.js'
+import * as JsonRpc from '../JsonRpc/JsonRpc.js'
 
 export const handleWebSocket = async (message, handle) => {
-  const ipc = await ExtensionHostHelperProcessIpc.create()
-  ipc._process.send(message, handle)
+  const ipc = await ExtensionHostHelperProcessIpc.create({
+    method: IpcParentType.NodeForkedProcess,
+  })
+  await JsonRpc.invokeAndTransfer(ipc, handle, 'HandleWebSocket.handleWebSocket', message)
 }

package/src/parts/HandleWebSocketForSharedProcess/HandleWebSocketForSharedProcess.js

@@ -1,19 +1,11 @@
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as HandleIpc from '../HandleIpc/HandleIpc.js'
+import * as HandleSocketError from '../HandleSocketError/HandleSocketError.js'
 import * as IpcChild from '../IpcChild/IpcChild.js'
 import * as IpcChildType from '../IpcChildType/IpcChildType.js'
-import * as Logger from '../Logger/Logger.js'
 import * as WebSocketServer from '../WebSocketServer/WebSocketServer.js'
 
-const handleSocketError = (error) => {
-  if (error && error.code === ErrorCodes.ECONNRESET) {
-    return
-  }
-  Logger.info('[info shared process: handle error]', error)
-}
-
 export const handleWebSocket = async (message, handle) => {
-  handle.on('error', handleSocketError)
+  handle.on('error', HandleSocketError.handleSocketError)
   const webSocket = await WebSocketServer.handleUpgrade(message, handle)
   const ipc = await IpcChild.listen({
     method: IpcChildType.WebSocket,

package/src/parts/JsonParsingError/JsonParsingError.js

@@ -1,10 +1,12 @@
 import * as JoinLines from '../JoinLines/JoinLines.js'
 import * as SplitLines from '../SplitLines/SplitLines.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 
 export class JsonParsingError extends Error {
   constructor(message, codeFrame, stack) {
     super(message)
     this.name = 'JsonParsingError'
+    this.code = ErrorCodes.E_JSON_PARSE
     if (codeFrame) {
       this.codeFrame = codeFrame
     }

package/src/parts/JsonRpcError/JsonRpcError.js

@@ -0,0 +1,6 @@
+export class JsonRpcError extends Error {
+  constructor(message) {
+    super(message)
+    this.name = 'JsonRpcError'
+  }
+}

package/src/parts/RecentlyOpened/RecentlyOpened.js

@@ -1,16 +1,12 @@
 import { dirname } from 'node:path'
 import * as Assert from '../Assert/Assert.js'
-import { FileNotFoundError } from '../FileNotFoundError/FileNotFoundError.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as Json from '../Json/Json.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Platform from '../Platform/Platform.js'
 import { VError } from '../VError/VError.js'
 
-const isValid = (recentlyOpened) => {
-  return recentlyOpened && Array.isArray(recentlyOpened)
-}
-
 const addToArrayUnique = (recentlyOpened, path) => {
   const index = recentlyOpened.indexOf(path)
   if (index === -1) {
@@ -24,10 +20,9 @@ const getRecentlyOpened = async (recentlyOpenedPath) => {
     const parsed = await JsonFile.readJson(recentlyOpenedPath)
     return parsed
   } catch (error) {
-    // TODO should check for error.code
-    if (error.message.includes('File not found')) {
+    if (error && error.code === ErrorCodes.ENOENT) {
       // ignore
-    } else if (error.message.includes('Json Parsing Error')) {
+    } else if (error && error.code === ErrorCodes.E_JSON_PARSE) {
       // ignore
     } else {
       throw new VError(error, `Failed to read recently opened`)
@@ -41,7 +36,7 @@ const setRecentlyOpened = async (recentlyOpenedPath, newRecentlyOpened) => {
   try {
     await FileSystem.writeFile(recentlyOpenedPath, stringified)
   } catch (error) {
-    if (error && error instanceof FileNotFoundError) {
+    if (error && error.code === ErrorCodes.ENOENT) {
       await FileSystem.mkdir(dirname(recentlyOpenedPath))
       await FileSystem.writeFile(recentlyOpenedPath, stringified)
       return

package/src/sharedProcessMain.cjs

@@ -1 +0,0 @@
-import('./sharedProcessMain.js')