@lvce-editor/shared-process 0.85.3 → 0.86.1

package/src/parts/RecentlyOpened/RecentlyOpened.js

@@ -1,60 +1,59 @@
-import { dirname } from 'node:path';
-import * as Assert from '../Assert/Assert.js';
-import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js';
-import * as FileSystem from '../FileSystem/FileSystem.js';
-import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js';
-import * as Json from '../Json/Json.js';
-import * as JsonFile from '../JsonFile/JsonFile.js';
-import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
-import { VError } from '../VError/VError.js';
+import { dirname } from 'node:path'
+import * as Assert from '../Assert/Assert.js'
+import * as ErrorCodes from '../ErrorCodes/ErrorCodes.js'
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as IsEnoentError from '../IsEnoentError/IsEnoentError.js'
+import * as Json from '../Json/Json.js'
+import * as JsonFile from '../JsonFile/JsonFile.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
+import { VError } from '../VError/VError.js'
+
 const addToArrayUnique = (recentlyOpened, path) => {
-    const index = recentlyOpened.indexOf(path);
-    if (index === -1) {
-        return [path, ...recentlyOpened];
-    }
-    return [path, ...recentlyOpened.slice(0, index), ...recentlyOpened.slice(index + 1)];
-};
+  const index = recentlyOpened.indexOf(path)
+  if (index === -1) {
+    return [path, ...recentlyOpened]
+  }
+  return [path, ...recentlyOpened.slice(0, index), ...recentlyOpened.slice(index + 1)]
+}
+
 const getRecentlyOpened = async (recentlyOpenedPath) => {
-    try {
-        const parsed = await JsonFile.readJson(recentlyOpenedPath);
-        return parsed;
-    }
-    catch (error) {
-        if (IsEnoentError.isEnoentError(error)) {
-            // ignore
-        }
-        else if (error && error.code === ErrorCodes.E_JSON_PARSE) {
-            // ignore
-        }
-        else {
-            throw new VError(error, `Failed to read recently opened`);
-        }
-        return [];
+  try {
+    const parsed = await JsonFile.readJson(recentlyOpenedPath)
+    return parsed
+  } catch (error) {
+    if (IsEnoentError.isEnoentError(error)) {
+      // ignore
+    } else if (error && error.code === ErrorCodes.E_JSON_PARSE) {
+      // ignore
+    } else {
+      throw new VError(error, `Failed to read recently opened`)
     }
-};
+    return []
+  }
+}
+
 const setRecentlyOpened = async (recentlyOpenedPath, newRecentlyOpened) => {
-    const stringified = Json.stringify(newRecentlyOpened);
-    try {
-        await FileSystem.writeFile(recentlyOpenedPath, stringified);
-    }
-    catch (error) {
-        if (IsEnoentError.isEnoentError(error)) {
-            await FileSystem.mkdir(dirname(recentlyOpenedPath));
-            await FileSystem.writeFile(recentlyOpenedPath, stringified);
-            return;
-        }
-        throw error;
+  const stringified = Json.stringify(newRecentlyOpened)
+  try {
+    await FileSystem.writeFile(recentlyOpenedPath, stringified)
+  } catch (error) {
+    if (IsEnoentError.isEnoentError(error)) {
+      await FileSystem.mkdir(dirname(recentlyOpenedPath))
+      await FileSystem.writeFile(recentlyOpenedPath, stringified)
+      return
     }
-};
+    throw error
+  }
+}
+
 export const addPath = async (path) => {
-    try {
-        Assert.string(path);
-        const recentlyOpenedPath = PlatformPaths.getRecentlyOpenedPath();
-        const parsed = await getRecentlyOpened(recentlyOpenedPath);
-        const newRecentlyOpened = addToArrayUnique(parsed, path);
-        await setRecentlyOpened(recentlyOpenedPath, newRecentlyOpened);
-    }
-    catch (error) {
-        throw new VError(error, `Failed to add path to recently opened`);
-    }
-};
+  try {
+    Assert.string(path)
+    const recentlyOpenedPath = PlatformPaths.getRecentlyOpenedPath()
+    const parsed = await getRecentlyOpened(recentlyOpenedPath)
+    const newRecentlyOpened = addToArrayUnique(parsed, path)
+    await setRecentlyOpened(recentlyOpenedPath, newRecentlyOpened)
+  } catch (error) {
+    throw new VError(error, `Failed to add path to recently opened`)
+  }
+}

package/src/parts/RegisterWebViewProtocol/RegisterWebViewProtocol.js

@@ -1,14 +1,16 @@
-import * as GetPortTuple from '../GetPortTuple/GetPortTuple.js';
-import * as ParentIpc from '../MainProcess/MainProcess.js';
-import * as PreviewProcess from '../PreviewProcess/PreviewProcess.js';
-import * as WebViewProtocolState from '../WebViewProtocolState/WebViewProtocolState.js';
+import * as GetPortTuple from '../GetPortTuple/GetPortTuple.js'
+import * as ParentIpc from '../MainProcess/MainProcess.js'
+import * as PreviewProcess from '../PreviewProcess/PreviewProcess.js'
+import * as WebViewProtocolState from '../WebViewProtocolState/WebViewProtocolState.js'
+
 const doRegisterWebViewProtocol = async () => {
-    const { port1, port2 } = await GetPortTuple.getPortTuple();
-    await ParentIpc.invokeAndTransfer('ElectronSession.registerWebviewProtocol', port1);
-    // TODO launch preview process at the start of this
-    await PreviewProcess.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port2);
-};
+  const { port1, port2 } = await GetPortTuple.getPortTuple()
+  await ParentIpc.invokeAndTransfer('ElectronSession.registerWebviewProtocol', port1)
+  // TODO launch preview process at the start of this
+  await PreviewProcess.invokeAndTransfer('HandleElectronMessagePort.handleElectronMessagePort', port2)
+}
+
 // TODO send port directly to from preview process to renderer worker?
 export const registerWebViewProtocol = async () => {
-    return WebViewProtocolState.getOrCreate(doRegisterWebViewProtocol);
-};
+  return WebViewProtocolState.getOrCreate(doRegisterWebViewProtocol)
+}

package/src/parts/RejectWebSocket/RejectWebSocket.js

@@ -1,10 +1,11 @@
-import * as DestroySocket from '../DestroySocket/DestroySocket.js';
-import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js';
+import * as DestroySocket from '../DestroySocket/DestroySocket.js'
+import * as HttpStatusCode from '../HttpStatusCode/HttpStatusCode.js'
+
 export const rejectWebSocket = (socket) => {
-    socket.write(`HTTP/1.1 ${HttpStatusCode.Forbidden} Forbidden\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`);
-    if (typeof socket.end === 'function') {
-        socket.end();
-        return;
-    }
-    DestroySocket.destroySocket(socket);
-};
+  socket.write(`HTTP/1.1 ${HttpStatusCode.Forbidden} Forbidden\r\nConnection: close\r\nContent-Length: 0\r\n\r\n`)
+  if (typeof socket.end === 'function') {
+    socket.end()
+    return
+  }
+  DestroySocket.destroySocket(socket)
+}

package/src/parts/RemoveQueryParameters/RemoveQueryParameters.js

@@ -1,7 +1,7 @@
 export const removeQueryParameters = (url) => {
-    const questionIndex = url.indexOf('?');
-    if (questionIndex === -1) {
-        return url;
-    }
-    return url.slice(0, questionIndex);
-};
+  const questionIndex = url.indexOf('?')
+  if (questionIndex === -1) {
+    return url
+  }
+  return url.slice(0, questionIndex)
+}

package/src/parts/RemoveSymlink/RemoveSymlink.js

@@ -1,12 +1,12 @@
-import { rm } from 'node:fs/promises';
-import * as Assert from '../Assert/Assert.js';
-import { VError } from '../VError/VError.js';
+import { rm } from 'node:fs/promises'
+import * as Assert from '../Assert/Assert.js'
+import { VError } from '../VError/VError.js'
+
 export const removeSymlink = async (path) => {
-    try {
-        Assert.string(path);
-        await rm(path, { force: true });
-    }
-    catch (error) {
-        throw new VError(error, `Failed to remove symlink ${path}`);
-    }
-};
+  try {
+    Assert.string(path)
+    await rm(path, { force: true })
+  } catch (error) {
+    throw new VError(error, `Failed to remove symlink ${path}`)
+  }
+}

package/src/parts/RemoveValues/RemoveValues.js

@@ -1,24 +1,24 @@
 export const removeValues = (value, toRemove) => {
-    if (!value) {
-        return value;
+  if (!value) {
+    return value
+  }
+  if (Array.isArray(value)) {
+    const newItems        = []
+    for (const item of value) {
+      if (!toRemove.includes(item)) {
+        newItems.push(removeValues(item, toRemove))
+      }
     }
-    if (Array.isArray(value)) {
-        const newItems = [];
-        for (const item of value) {
-            if (!toRemove.includes(item)) {
-                newItems.push(removeValues(item, toRemove));
-            }
-        }
-        return newItems;
+    return newItems
+  }
+  if (typeof value === 'object') {
+    const newObject = Object.create(null)
+    for (const [key, property] of Object.entries(value)) {
+      if (!toRemove.includes(property)) {
+        newObject[key] = removeValues(property, toRemove)
+      }
     }
-    if (typeof value === 'object') {
-        const newObject = Object.create(null);
-        for (const [key, property] of Object.entries(value)) {
-            if (!toRemove.includes(property)) {
-                newObject[key] = removeValues(property, toRemove);
-            }
-        }
-        return newObject;
-    }
-    return value;
-};
+    return newObject
+  }
+  return value
+}

package/src/parts/RequiresSocket/RequiresSocket.js

@@ -1,22 +1,24 @@
 // TODO find a better way to do this
 // most commands don't require sockets
 // but output channel and terminal need to continuously send data through the socket
+
 // TODO remove all of these
 const METHODS_THAT_REQUIRE_SOCKET = new Set([
-    'OutputChannel.open',
-    'ExtensionHost.start',
-    'ExtensionHost.send',
-    'ExtensionHost.watchColorTheme',
-    'ExtensionHost.watchForHotReload',
-    'Terminal.create',
-    'IncrementalTextSearch.start',
-    'ElectronApplicationMenu.setItems',
-    'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess',
-    'ElectronBrowserView.createBrowserView',
-    'ElectronWebContentsView.createWebContentsView',
-    'FileWatcher.watch',
-    'FileWatcher.watchFile2',
-]);
+  'OutputChannel.open',
+  'ExtensionHost.start',
+  'ExtensionHost.send',
+  'ExtensionHost.watchColorTheme',
+  'ExtensionHost.watchForHotReload',
+  'Terminal.create',
+  'IncrementalTextSearch.start',
+  'ElectronApplicationMenu.setItems',
+  'HandleMessagePortForExtensionHostHelperProcess.handleMessagePortForExtensionHostHelperProcess',
+  'ElectronBrowserView.createBrowserView',
+  'ElectronWebContentsView.createWebContentsView',
+  'FileWatcher.watch',
+  'FileWatcher.watchFile2',
+])
+
 export const requiresSocket = (method) => {
-    return METHODS_THAT_REQUIRE_SOCKET.has(method);
-};
+  return METHODS_THAT_REQUIRE_SOCKET.has(method)
+}

package/src/parts/ResolveBin/ResolveBin.js

@@ -1,11 +1,11 @@
-import { fileURLToPath } from 'node:url';
+import { fileURLToPath } from 'node:url'
+
 export const resolveBin = (name) => {
-    try {
-        const uri = import.meta.resolve(name);
-        const path = fileURLToPath(uri);
-        return path;
-    }
-    catch {
-        return '';
-    }
-};
+  try {
+    const uri = import.meta.resolve(name)
+    const path = fileURLToPath(uri)
+    return path
+  } catch {
+    return ''
+  }
+}

package/src/parts/ResolveRoot/ResolveRoot.js

@@ -1,85 +1,88 @@
-import { homedir } from 'node:os';
-import { isAbsolute, join, resolve } from 'node:path';
-import { 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 '../MainProcess/MainProcess.js';
-import * as Platform from '../Platform/Platform.js';
-import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
-import * as Root from '../Root/Root.js';
-import * as WorkspaceSource from '../WorkspaceSource/WorkspaceSource.js';
+import { homedir } from 'node:os'
+import { isAbsolute, join, resolve } from 'node:path'
+import { 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 '../MainProcess/MainProcess.js'
+import * as Platform from '../Platform/Platform.js'
+import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js'
+import * as Root from '../Root/Root.js'
+import * as WorkspaceSource from '../WorkspaceSource/WorkspaceSource.js'
+
 const getAbsolutePath = (path) => {
-    if (IsAbsolutePath.isAbsolutePath(path)) {
-        return path;
-    }
-    if (path.startsWith('${cwd}')) {
-        path = Root.root + path.slice(5);
-    }
-    else if (path.startsWith('~')) {
-        path = `${homedir()}${path.slice(1)}`;
-    }
-    path = resolve(path);
-    return path;
-};
+  if (IsAbsolutePath.isAbsolutePath(path)) {
+    return path
+  }
+  if (path.startsWith('${cwd}')) {
+    path = Root.root + path.slice(5)
+  } else if (path.startsWith('~')) {
+    path = `${homedir()}${path.slice(1)}`
+  }
+  path = resolve(path)
+  return path
+}
+
 const toUri = (path) => {
-    return pathToFileURL(path).toString();
-};
+  return pathToFileURL(path).toString()
+}
+
 export const resolveRoot = async () => {
-    if (IsElectron.isElectron) {
-        const argv = await ParentIpc.invoke('Process.getArgv');
-        const relevantArgv = argv.slice(2);
-        const last = relevantArgv.at(-1);
-        if (last && last === '.') {
-            const actual = process.cwd();
-            return {
-                path: actual,
-                uri: toUri(actual),
-                workspaceId: GetWorkspaceId.getWorkspaceId(actual),
-                homeDir: PlatformPaths.getHomeDir(),
-                homeDirUri: toUri(PlatformPaths.getHomeDir()),
-                pathSeparator: Platform.getPathSeparator(),
-                source: WorkspaceSource.SharedProcessCliArg,
-            };
-        }
-        if (last && isAbsolute(last)) {
-            return {
-                path: last,
-                uri: toUri(last),
-                workspaceId: GetWorkspaceId.getWorkspaceId(last),
-                homeDir: PlatformPaths.getHomeDir(),
-                homeDirUri: toUri(PlatformPaths.getHomeDir()),
-                pathSeparator: Platform.getPathSeparator(),
-                source: WorkspaceSource.SharedProcessCliArg,
-            };
-        }
-    }
-    // TODO shared process should have no logic, this should probably be somewhere else
-    const folder = Env.getFolder();
-    if (!folder) {
-        const path = join(Root.root, 'playground');
-        return {
-            path,
-            uri: toUri(path),
-            workspaceId: GetWorkspaceId.getWorkspaceId(path),
-            homeDir: PlatformPaths.getHomeDir(),
-            homeDirUri: toUri(PlatformPaths.getHomeDir()),
-            pathSeparator: Platform.getPathSeparator(),
-            source: WorkspaceSource.SharedProcessEnv,
-        };
+  if (IsElectron.isElectron) {
+    const argv = await ParentIpc.invoke('Process.getArgv')
+    const relevantArgv = argv.slice(2)
+    const last = relevantArgv.at(-1)
+    if (last && last === '.') {
+      const actual = process.cwd()
+      return {
+        path: actual,
+        uri: toUri(actual),
+        workspaceId: GetWorkspaceId.getWorkspaceId(actual),
+        homeDir: PlatformPaths.getHomeDir(),
+        homeDirUri: toUri(PlatformPaths.getHomeDir()),
+        pathSeparator: Platform.getPathSeparator(),
+        source: WorkspaceSource.SharedProcessCliArg,
+      }
     }
-    const absolutePath = getAbsolutePath(folder);
-    const workspaceId = GetWorkspaceId.getWorkspaceId(absolutePath);
-    // TODO this slows down startup a lot (~30-50ms)
-    // const workspaceStorage = await getWorkspaceStorage(workspaceId)
-    return {
-        path: absolutePath,
-        uri: toUri(absolutePath),
-        workspaceId,
+    if (last && isAbsolute(last)) {
+      return {
+        path: last,
+        uri: toUri(last),
+        workspaceId: GetWorkspaceId.getWorkspaceId(last),
         homeDir: PlatformPaths.getHomeDir(),
         homeDirUri: toUri(PlatformPaths.getHomeDir()),
         pathSeparator: Platform.getPathSeparator(),
-        source: WorkspaceSource.SharedProcessDefault,
-    };
-};
+        source: WorkspaceSource.SharedProcessCliArg,
+      }
+    }
+  }
+
+  // TODO shared process should have no logic, this should probably be somewhere else
+  const folder = Env.getFolder()
+  if (!folder) {
+    const path = join(Root.root, 'playground')
+    return {
+      path,
+      uri: toUri(path),
+      workspaceId: GetWorkspaceId.getWorkspaceId(path),
+      homeDir: PlatformPaths.getHomeDir(),
+      homeDirUri: toUri(PlatformPaths.getHomeDir()),
+      pathSeparator: Platform.getPathSeparator(),
+      source: WorkspaceSource.SharedProcessEnv,
+    }
+  }
+  const absolutePath = getAbsolutePath(folder)
+  const workspaceId = GetWorkspaceId.getWorkspaceId(absolutePath)
+  // TODO this slows down startup a lot (~30-50ms)
+  // const workspaceStorage = await getWorkspaceStorage(workspaceId)
+  return {
+    path: absolutePath,
+    uri: toUri(absolutePath),
+    workspaceId,
+    homeDir: PlatformPaths.getHomeDir(),
+    homeDirUri: toUri(PlatformPaths.getHomeDir()),
+    pathSeparator: Platform.getPathSeparator(),
+    source: WorkspaceSource.SharedProcessDefault,
+  }
+}

package/src/parts/Restart/Restart.js

@@ -1,10 +1,11 @@
-import { spawn } from 'node:child_process';
+import { spawn } from 'node:child_process'
+
 export const restart = (downloadPath) => {
-    const { ELECTRON_RUN_AS_NODE, ...env } = process.env;
-    // TODO handle errors
-    const childProcess = spawn(downloadPath, {
-        stdio: 'inherit',
-        env,
-    });
-    childProcess.unref();
-};
+  const { ELECTRON_RUN_AS_NODE, ...env } = process.env
+  // TODO handle errors
+  const childProcess = spawn(downloadPath, {
+    stdio: 'inherit',
+    env,
+  })
+  childProcess.unref()
+}

package/src/parts/Root/Root.js

@@ -1,4 +1,6 @@
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-export const root = resolve(__dirname, '../../../');
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+export const root = resolve(__dirname, '../../../')

package/src/parts/Scheme/Scheme.js

@@ -1 +1 @@
-export const WebView = 'lvce-oss-webview';
+export const WebView = 'lvce-oss-webview'

package/src/parts/Screen/Screen.ipc.js

@@ -1,7 +1,9 @@
-import * as Screen from './Screen.js';
-export const name = 'Screen';
+import * as Screen from './Screen.js'
+
+export const name = 'Screen'
+
 export const Commands = {
-    getBounds: Screen.getBounds,
-    getWidth: Screen.getWidth,
-    getHeight: Screen.getHeight,
-};
+  getBounds: Screen.getBounds,
+  getWidth: Screen.getWidth,
+  getHeight: Screen.getHeight,
+}

package/src/parts/Screen/Screen.js

@@ -1,10 +1,13 @@
-import * as ParentIpc from '../MainProcess/MainProcess.js';
+import * as ParentIpc from '../MainProcess/MainProcess.js'
+
 export const getWidth = () => {
-    return ParentIpc.invoke('ElectronScreen.getWidth');
-};
+  return ParentIpc.invoke('ElectronScreen.getWidth')
+}
+
 export const getHeight = () => {
-    return ParentIpc.invoke('ElectronScreen.getHeight');
-};
+  return ParentIpc.invoke('ElectronScreen.getHeight')
+}
+
 export const getBounds = () => {
-    return ParentIpc.invoke('ElectronScreen.getBounds');
-};
+  return ParentIpc.invoke('ElectronScreen.getBounds')
+}

package/src/parts/SearchProcess/SearchProcess.js

@@ -1,18 +1,21 @@
-import * as LaunchSearchProcess from '../LaunchSearchProcess/LaunchSearchProcess.js';
-import * as JsonRpc from '../JsonRpc/JsonRpc.js';
-export const state = {
-    /**
-     * @type {any}
-     */
-    ipc: undefined,
-};
+import * as LaunchSearchProcess from '../LaunchSearchProcess/LaunchSearchProcess.js'
+import * as JsonRpc from '../JsonRpc/JsonRpc.js'
+
+export const state      = {
+  /**
+   * @type {any}
+   */
+  ipc: undefined,
+}
+
 export const getOrCreate = async () => {
-    if (!state.ipc) {
-        state.ipc = LaunchSearchProcess.launchSearchProcess();
-    }
-    return state.ipc;
-};
+  if (!state.ipc) {
+    state.ipc = LaunchSearchProcess.launchSearchProcess()
+  }
+  return state.ipc
+}
+
 export const invoke = async (method, ...params) => {
-    const ipc = await getOrCreate();
-    return JsonRpc.invoke(ipc, method, ...params);
-};
+  const ipc = await getOrCreate()
+  return JsonRpc.invoke(ipc, method, ...params)
+}

package/src/parts/SearchProcessPath/SearchProcessPath.js

@@ -1,2 +1,3 @@
-import * as ResolveBin from '../ResolveBin/ResolveBin.js';
-export const searchProcessPath = ResolveBin.resolveBin('@lvce-editor/search-process');
+import * as ResolveBin from '../ResolveBin/ResolveBin.js'
+
+export const searchProcessPath = ResolveBin.resolveBin('@lvce-editor/search-process')