@lvce-editor/shared-process 0.11.5 → 0.11.6

package/package.json

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

package/src/parts/ClipBoard/ClipBoardGnome.js

@@ -4,6 +4,7 @@
 
 import VError from 'verror'
 import * as Exec from '../Exec/Exec.js'
+import * as SplitLines from '../SplitLines/SplitLines.js'
 
 const removePrefix = (file) => {
   if (file.startsWith('file://')) {
@@ -35,7 +36,7 @@ export const readFiles = async () => {
     }
     throw error
   }
-  const [type, ...files] = result.stdout.split('\n')
+  const [type, ...files] = SplitLines.splitLines(result.stdout)
   const actualFiles = files.map(removePrefix)
   return {
     source: 'gnomeCopiedFiles',

package/src/parts/Developer/Developer.js

@@ -2,6 +2,7 @@ import { createWriteStream, writeFileSync } from 'node:fs'
 import { performance } from 'node:perf_hooks'
 import * as ExtensionHost from '../ExtensionHost/ExtensionHost.js'
 import * as Process from '../Process/Process.js'
+import * as Timeout from '../Timeout/Timeout.js'
 
 export const measureLatencyBetweenExtensionHostAndSharedProcess = async (
   socket,
@@ -77,7 +78,7 @@ export const allocateMemory = () => {
 
 /* istanbul ignore next */
 export const crashSharedProcess = () => {
-  setTimeout(() => {
+  Timeout.setTimeout(() => {
     throw new Error('oops')
   }, 0)
 }
@@ -113,7 +114,7 @@ export const createProfile = async () => {
       session.post('Profiler.start', () => {
         // Invoke business logic under measurement here...
 
-        setTimeout(() => {
+        Timeout.setTimeout(() => {
           session.post('Profiler.stop', (error, { profile }) => {
             // Write profile to disk, upload, etc.
             if (!error) {

package/src/parts/ExtensionInstallFromFile/ExtensionInstallFromFile.js

@@ -1,7 +1,7 @@
 import VError from 'verror'
-import * as Assert from '../Assert/Assert.js'
 import * as Extract from '../Extract/Extract.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 
@@ -24,8 +24,7 @@ export const install = async ({ path }) => {
     await Extract.extractTarBr(path, cachedExtensionPath)
     const extensionsPath = Platform.getExtensionsPath()
     const manifestPath = Path.join(cachedExtensionPath, 'extension.json')
-    const manifestContent = await FileSystem.readFile(manifestPath)
-    const manifestJson = JSON.parse(manifestContent)
+    const manifestJson = await JsonFile.readJson(manifestPath)
     const id = manifestJson.id
     if (!id) {
       throw new Error('missing id in extension manifest')

package/src/parts/ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js

@@ -1,6 +1,7 @@
 import VError from 'verror'
 import * as DownloadAndExtract from '../DownloadAndExtract/DownloadAndExtract.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 
@@ -19,8 +20,7 @@ export const install = async ({ user, repo, branch }) => {
     })
     const extensionsPath = Platform.getExtensionsPath()
     const manifestPath = Path.join(cachedExtensionPath, 'extension.json')
-    const manifestContent = await FileSystem.readFile(manifestPath)
-    const manifestJson = JSON.parse(manifestContent)
+    const manifestJson = await JsonFile.readJson(manifestPath)
     const id = manifestJson.id
     if (!id) {
       throw new Error('missing id in extension manifest')

package/src/parts/ExtensionInstallFromUrl/ExtensionInstallFromUrl.js

@@ -1,11 +1,11 @@
-import { readFile, rename, rm } from 'fs/promises'
+import { rename, rm } from 'fs/promises'
 import { join } from 'path'
 import VError from 'verror'
 import * as Download from '../Download/Download.js'
 import * as Extract from '../Extract/Extract.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Platform from '../Platform/Platform.js'
 import * as TmpFile from '../TmpFile/TmpFile.js'
-import * as EncodingType from '../EncodingType/EncodingType.js'
 
 export const install = async ({ url }) => {
   try {
@@ -18,8 +18,7 @@ export const install = async ({ url }) => {
     const tmpDir = await TmpFile.getTmpDir()
     await Extract.extractTarBr(tmpFile, tmpDir)
     const manifestPath = join(tmpDir, 'extension.json')
-    const manifestContent = await readFile(manifestPath, EncodingType.Utf8)
-    const manifestJson = JSON.parse(manifestContent)
+    const manifestJson = await JsonFile.readJson(manifestPath)
     const id = manifestJson.id
     if (!id) {
       throw new Error('missing id in extension manifest')

package/src/parts/GetResponse/GetResponse.js

@@ -32,6 +32,7 @@ export const getResponse = async (message, handle) => {
         },
       }
     }
+    // @ts-ignore
     if (error && error instanceof Error && error.code === ErrorCodes.ENOENT) {
       return {
         jsonrpc: JsonRpc.Version,
@@ -43,7 +44,7 @@ export const getResponse = async (message, handle) => {
       }
     }
     const prettyError = PrettyError.prepare(error)
-    PrettyError.print(prettyError)
+    PrettyError.print(prettyError, `[shared-process] `)
     return {
       jsonrpc: JsonRpc.Version,
       id: message.id,

package/src/parts/PrettyError/PrettyError.js

@@ -1,8 +1,9 @@
-import { readFileSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
 import { codeFrameColumns } from '@babel/code-frame'
 import cleanStack from 'clean-stack'
 import { LinesAndColumns } from 'lines-and-columns'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import * as SplitLines from '../SplitLines/SplitLines.js'
 
 const getActualPath = (fileUri) => {
   if (fileUri.startsWith('file://')) {
@@ -20,7 +21,7 @@ export const prepare = (error) => {
     }
   }
   const cleanedStack = cleanStack(error.stack)
-  const lines = cleanedStack.split('\n')
+  const lines = SplitLines.splitLines(cleanedStack)
   const file = lines[1]
   let codeFrame = ''
   if (error.codeFrame) {
@@ -82,8 +83,8 @@ export const prepareJsonError = (json, property, message) => {
   return jsonError
 }
 
-export const print = (prettyError) => {
+export const print = (prettyError, prefix = '') => {
   console.error(
-    `Error: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}`
+    `${prefix}Error: ${prettyError.message}\n\n${prettyError.codeFrame}\n\n${prettyError.stack}`
   )
 }

package/src/parts/RecentlyOpened/RecentlyOpened.js

@@ -4,6 +4,7 @@ import * as Assert from '../Assert/Assert.js'
 import { FileNotFoundError } from '../Error/FileNotFoundError.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'
 
 const isValid = (recentlyOpened) => {
@@ -24,8 +25,7 @@ const addToArrayUnique = (recentlyOpened, path) => {
 
 const getRecentlyOpened = async (recentlyOpenedPath) => {
   try {
-    const content = await FileSystem.readFile(recentlyOpenedPath)
-    const parsed = await Json.parse(content, recentlyOpenedPath)
+    const parsed = await JsonFile.readJson(recentlyOpenedPath)
     return parsed
   } catch (error) {
     // TODO should check for error.code

package/src/parts/RipGrepParsedLineType/RipGrepParsedLineType.js

@@ -0,0 +1,4 @@
+export const Begin = 'begin'
+export const Match = 'match'
+export const Summary = 'summary'
+export const Context = 'context'

package/src/parts/Search/Search.js

@@ -1,6 +1,8 @@
 import { spawn } from 'node:child_process'
-import * as RgPath from '../RgPath/RgPath.js'
 import * as Platform from '../Platform/Platform.js'
+import * as RgPath from '../RgPath/RgPath.js'
+import * as RipGrepParsedLineType from '../RipGrepParsedLineType/RipGrepParsedLineType.js'
+import * as SplitLines from '../SplitLines/SplitLines.js'
 
 const MAX_SEARCH_RESULTS = 300
 
@@ -25,64 +27,51 @@ const useNice = !Platform.isWindows
 // TODO update client
 // TODO not always run nice, maybe configure nice via flag/options
 
-const ParsedLineType = {
-  Begin: 'begin',
-  Match: 'match',
-  Summary: 'summary',
-}
-
 export const search = async (searchDir, searchString) => {
   // TODO reject promise when ripgrep search fails
   return new Promise((resolve, reject) => {
+    const ripGrepArgs = [
+      '--smart-case',
+      '--stats',
+      '--json',
+      '--fixed-strings',
+      searchString,
+      '.',
+    ]
     const childProcess = useNice
-      ? spawn(
-          'nice',
-          [
-            '-20',
-            RgPath.rgPath,
-            '--smart-case',
-            '--stats',
-            '--json',
-            searchString,
-            '.',
-          ],
-          {
-            cwd: searchDir,
-          }
-        )
-      : spawn(
-          RgPath.rgPath,
-          ['--smart-case', '--stats', '--json', searchString, '.'],
-          {
-            cwd: searchDir,
-          }
-        )
+      ? spawn('nice', ['-20', RgPath.rgPath, ...ripGrepArgs], {
+          cwd: searchDir,
+        })
+      : spawn(RgPath.rgPath, ripGrepArgs, {
+          cwd: searchDir,
+        })
     const allSearchResults = Object.create(null)
     let buffer = ''
     let stats = {}
+    let limitHit = false
     let numberOfResults = 0
     // TODO use pipeline / transform stream maybe
 
     const handleData = (chunk) => {
       buffer += chunk
-      const lines = buffer.split('\n')
+      const lines = SplitLines.splitLines(buffer)
       // @ts-ignore
       buffer = lines.pop()
       for (const line of lines) {
         const parsedLine = JSON.parse(line)
+        console.log(parsedLine)
         switch (parsedLine.type) {
-          case ParsedLineType.Begin: {
+          case RipGrepParsedLineType.Begin: {
             allSearchResults[parsedLine.data.path.text] = []
             break
           }
-          case ParsedLineType.Match: {
+          case RipGrepParsedLineType.Match:
             numberOfResults++
             allSearchResults[parsedLine.data.path.text].push(
               toSearchResult(parsedLine)
             )
             break
-          }
-          case ParsedLineType.Summary:
+          case RipGrepParsedLineType.Summary:
             stats = parsedLine.data
             break
           default:
@@ -90,6 +79,7 @@ export const search = async (searchDir, searchString) => {
         }
       }
       if (numberOfResults > MAX_SEARCH_RESULTS) {
+        limitHit = true
         childProcess.kill()
       }
     }
@@ -98,6 +88,7 @@ export const search = async (searchDir, searchString) => {
       resolve({
         results: Object.entries(allSearchResults),
         stats,
+        limitHit,
       })
     }
     const handleError = (error) => {
@@ -106,6 +97,7 @@ export const search = async (searchDir, searchString) => {
       resolve({
         results: [],
         stats,
+        limitHit,
       })
     }
     childProcess.stdout.on('data', handleData)

package/src/parts/SplitLines/SplitLines.js

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

package/src/parts/Stats/Stats.js

@@ -1,9 +1,9 @@
 // parse ps output based on vscode https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/node/ps.ts (License MIT)
 
 import * as Exec from '../Exec/Exec.js'
+import * as SplitLines from '../SplitLines/SplitLines.js'
 
-const PID_CMD =
-  /^\s*(\d+)\s+(\d+)\s+(\d+\.\d+)\s+(\d+\.\d+)\s+(.+)$/
+const PID_CMD = /^\s*(\d+)\s+(\d+)\s+(\d+\.\d+)\s+(\d+\.\d+)\s+(.+)$/
 
 const parsePsOutputLine = (line) => {
   const matches = PID_CMD.exec(line.trim())
@@ -18,7 +18,7 @@ const parsePsOutputLine = (line) => {
   }
 }
 const parsePsOutput = (stdout, rootPid) => {
-  const lines = stdout.split('\n')
+  const lines = SplitLines.splitLines(stdout)
   return lines.map(parsePsOutputLine)
 }