@lvce-editor/shared-process 0.17.16 → 0.17.17

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

@@ -81,7 +81,7 @@ const RE_SLASH = /^\//
 const RE_STRING_DOUBLE_QUOTE_CONTENT = /^[^"]+/
 const RE_STRING_SINGLE_QUOTE_CONTENT = /^[^']+/
 const RE_TAG_TEXT = /^[^\s>]+/
-const RE_TAGNAME = /^[!\w\-\:]+/
+const RE_TAGNAME = /^[!\w\-\:\.]+/
 const RE_TEXT = /^[^<>\n]+/
 const RE_WHITESPACE = /^\s+/
 const RE_WORD = /^[^\s]+/

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.17.16",
+  "version": "0.17.17",
   "main": "index.js",
   "type": "module",
   "dependencies": {
     "@babel/code-frame": "^7.22.13",
-    "@lvce-editor/extension-host": "0.17.16",
-    "@lvce-editor/extension-host-helper-process": "0.17.16",
+    "@lvce-editor/extension-host": "0.17.17",
+    "@lvce-editor/extension-host-helper-process": "0.17.17",
     "@lvce-editor/jsonc-parser": "^1.1.0",
     "@lvce-editor/pretty-error": "^1.1.1",
-    "@lvce-editor/pty-host": "0.17.16",
+    "@lvce-editor/pty-host": "0.17.17",
     "@lvce-editor/verror": "^1.1.1",
     "debug": "^4.3.4",
     "execa": "^8.0.1",

package/src/parts/ElectronDialog/ElectronDialog.js

@@ -1,7 +1,7 @@
 import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 
 export const showOpenDialog = (title, properties) => {
-  return ParentIpc.invoke('ELectronDialog.showOpenDialog', title, properties)
+  return ParentIpc.invoke('ElectronDialog.showOpenDialog', title, properties)
 }
 
 export const showMessageBox = (options) => {

package/src/parts/GetWorkspaceId/GetWorkspaceId.js

@@ -0,0 +1,5 @@
+import { createHash } from 'node:crypto'
+
+export const getWorkspaceId = (absolutePath) => {
+  return createHash('sha256').update(absolutePath).digest('hex').slice(0, 16)
+}

package/src/parts/IsAbsolutePath/IsAbsolutePath.js

@@ -0,0 +1,5 @@
+const RE_ABSOLUTE_URI = /^[a-z]+:\/\//
+
+export const isAbsolutePath = (path) => {
+  return RE_ABSOLUTE_URI.test(path)
+}

package/src/parts/Platform/Platform.js

@@ -175,11 +175,11 @@ export const getSetupName = () => {
   return 'Lvce-Setup'
 }
 
-export const version = '0.17.16'
+export const version = '0.17.17'
 
-export const commit = 'd004958'
+export const commit = 'e9239cb'
 
-export const date = '2023-09-17T08:51:38.000Z'
+export const date = '2023-09-17T19:26:04.000Z'
 
 export const getVersion = () => {
   return version

package/src/parts/Promises/Promises.js

@@ -0,0 +1,19 @@
+export const withResolvers = () => {
+  /**
+   * @type {any}
+   */
+  let _resolve
+  /**
+   * @type {any}
+   */
+  let _reject
+  const promise = new Promise((resolve, reject) => {
+    _resolve = resolve
+    _reject = reject
+  })
+  return {
+    resolve: _resolve,
+    reject: _reject,
+    promise,
+  }
+}

package/src/parts/WebSocketServer/WebSocketServer.js

@@ -1,6 +1,7 @@
 import { Buffer } from 'node:buffer'
 import * as _ws from 'ws'
 import * as IsSocket from '../IsSocket/IsSocket.js'
+import * as Promises from '../Promises/Promises.js'
 
 // workaround for jest or node bug
 const WebSocketServer = _ws.WebSocketServer
@@ -19,11 +20,11 @@ export const handleUpgrade = async (request, socket) => {
   if (!IsSocket.isSocket(socket)) {
     throw new TypeError(`socket must be of type Socket`)
   }
-  const webSocket = await new Promise((resolve, reject) => {
-    const upgradeCallback = (ws) => {
-      resolve(ws)
-    }
-    webSocketServer.handleUpgrade(request, socket, Buffer.alloc(0), upgradeCallback)
-  })
+  const { resolve, promise } = Promises.withResolvers()
+  const upgradeCallback = (ws) => {
+    resolve(ws)
+  }
+  webSocketServer.handleUpgrade(request, socket, Buffer.alloc(0), upgradeCallback)
+  const webSocket = await promise
   return webSocket
 }

package/src/parts/WindowsProcessTree/WindowsProcessTree.js

@@ -1,4 +1,5 @@
 import * as LoadWindowsProcessTree from '../LoadWindowsProcessTree/LoadWindowsProcessTree.js'
+import * as Promises from '../Promises/Promises.js'
 
 /**
  *
@@ -8,9 +9,9 @@ import * as LoadWindowsProcessTree from '../LoadWindowsProcessTree/LoadWindowsPr
  */
 export const getProcessList = async (rootPid, flags) => {
   const WindowsProcessTree = await LoadWindowsProcessTree.loadWindowProcessTree()
-  return new Promise((resolve, reject) => {
-    WindowsProcessTree.getProcessList(rootPid, resolve, flags)
-  })
+  const { resolve, promise } = Promises.withResolvers()
+  WindowsProcessTree.getProcessList(rootPid, resolve, flags)
+  return promise
 }
 
 /**
@@ -20,7 +21,7 @@ export const getProcessList = async (rootPid, flags) => {
  */
 export const addCpuUsage = async (processList) => {
   const WindowsProcessTree = await LoadWindowsProcessTree.loadWindowProcessTree()
-  return new Promise((resolve) => {
-    WindowsProcessTree.getProcessCpuUsage(processList, resolve)
-  })
+  const { resolve, promise } = Promises.withResolvers()
+  WindowsProcessTree.getProcessCpuUsage(processList, resolve)
+  return promise
 }

package/src/parts/Workspace/Workspace.js

@@ -1,20 +1,17 @@
-import { createHash } from 'node:crypto'
-import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
-import { join, resolve } from 'node:path'
+import { isAbsolute, join, resolve } from 'node:path'
 import { fileURLToPath, pathToFileURL } from 'node:url'
 import * as Env from '../Env/Env.js'
+import * as GetWorkspaceId from '../GetWorkspaceId/GetWorkspaceId.js'
+import * as IsAbsolutePath from '../IsAbsolutePath/IsAbsolutePath.js'
+import * as IsElectron from '../IsElectron/IsElectron.js'
+import * as ParentIpc from '../ParentIpc/ParentIpc.js'
 import * as Platform from '../Platform/Platform.js'
 import * as Root from '../Root/Root.js'
-
-const RE_ABSOLUTE_URI = /^[a-z]+:\/\//
-
-const isAbsoluteUri = (path) => {
-  return RE_ABSOLUTE_URI.test(path)
-}
+import * as WorkspaceSource from '../WorkspaceSource/WorkspaceSource.js'
 
 const getAbsolutePath = (path) => {
-  if (isAbsoluteUri(path)) {
+  if (IsAbsolutePath.isAbsolutePath(path)) {
     return path
   }
   if (path.startsWith('${cwd}')) {
@@ -26,17 +23,6 @@ const getAbsolutePath = (path) => {
   return path
 }
 
-const getWorkspaceStorage = async (workspaceId) => {
-  try {
-    const workspaceStorage = JSON.parse(
-      await readFile(`/tmp/config/${workspaceId}`, 'utf-8')
-    )
-    return workspaceStorage
-  } catch {
-    return {}
-  }
-}
-
 /**
  * @deprecated use platform instead
  */
@@ -48,26 +34,26 @@ export const getHomeDir = () => {
   return homeDir
 }
 
-const getWorkspaceId = (absolutePath) => {
-  return createHash('sha256').update(absolutePath).digest('hex').slice(0, 16)
-}
-
-const configs = {
-  messagePort1: {
-    folder: '/tmp',
-  },
-  messagePort2: {
-    folder: '~',
-  },
-}
-
 const toUri = (path) => {
   return pathToFileURL(path).toString()
 }
 
 export const resolveRoot = async () => {
-  // TODO ask electron, electron can do mapping
-  // await
+  if (IsElectron.isElectron()) {
+    const argv = await ParentIpc.invoke('Process.getArgv')
+    const relevantArgv = argv.slice(2)
+    const last = relevantArgv.at(-1)
+    if (last && isAbsolute(last)) {
+      return {
+        path: last,
+        uri: toUri(last),
+        workspaceId: GetWorkspaceId.getWorkspaceId(last),
+        homeDir: Platform.getHomeDir(),
+        pathSeparator: Platform.getPathSeparator(),
+        source: 'shared-process-default',
+      }
+    }
+  }
 
   // TODO shared process should have no logic, this should probably be somewhere else
   const folder = Env.getFolder()
@@ -76,14 +62,14 @@ export const resolveRoot = async () => {
     return {
       path,
       uri: toUri(path),
-      workspaceId: getWorkspaceId(path),
+      workspaceId: GetWorkspaceId.getWorkspaceId(path),
       homeDir: Platform.getHomeDir(),
       pathSeparator: Platform.getPathSeparator(),
-      source: 'shared-process-env',
+      source: WorkspaceSource.SharedProcessEnv,
     }
   }
   const absolutePath = getAbsolutePath(folder)
-  const workspaceId = getWorkspaceId(absolutePath)
+  const workspaceId = GetWorkspaceId.getWorkspaceId(absolutePath)
   // TODO this slows down startup a lot (~30-50ms)
   // const workspaceStorage = await getWorkspaceStorage(workspaceId)
   return {
@@ -92,7 +78,7 @@ export const resolveRoot = async () => {
     workspaceId,
     homeDir: Platform.getHomeDir(),
     pathSeparator: Platform.getPathSeparator(),
-    source: 'shared-process-default',
+    source: WorkspaceSource.SharedProcessDefault,
   }
 }
 

package/src/parts/WorkspaceSource/WorkspaceSource.js

@@ -0,0 +1,2 @@
+export const SharedProcessEnv = 'shared-process-env'
+export const SharedProcessDefault = 'shared-process-default'