@lvce-editor/shared-process 0.27.2 → 0.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.27.2",
+  "version": "0.28.0",
   "main": "index.js",
   "type": "module",
   "keywords": [
@@ -18,15 +18,13 @@
   },
   "dependencies": {
     "@lvce-editor/assert": "^1.2.0",
-    "@lvce-editor/extension-host-helper-process": "0.27.2",
-    "@lvce-editor/ipc": "^8.0.1",
+    "@lvce-editor/extension-host-helper-process": "0.28.0",
+    "@lvce-editor/ipc": "^8.2.0",
     "@lvce-editor/json-rpc": "^1.3.0",
     "@lvce-editor/jsonc-parser": "^1.2.0",
-    "@lvce-editor/network-process": "0.27.2",
     "@lvce-editor/pretty-error": "^1.5.0",
-    "@lvce-editor/pty-host": "0.27.2",
+    "@lvce-editor/pty-host": "0.28.0",
     "@lvce-editor/verror": "^1.2.0",
-    "@lvce-editor/web-socket-server": "^1.1.0",
     "debug": "^4.3.4",
     "execa": "^8.0.1",
     "exit-hook": "^4.0.0",
@@ -38,6 +36,8 @@
     "open": "^10.1.0",
     "tail": "^2.2.6",
     "tmp-promise": "^3.0.3",
-    "trash": "^8.1.1"
+    "trash": "^8.1.1",
+    "@lvce-editor/network-process": "0.28.0",
+    "@lvce-editor/search-process": "0.28.0"
   }
 }

package/src/parts/GetTypeFromUrl/GetTypeFromUrl.js

@@ -12,6 +12,7 @@ export const getTypeFromUrl = (url) => {
         }
         return rest;
     }
+    // deprecated
     const rest = url.slice(questionMarkIndex);
     const searchParams = new URLSearchParams(rest);
     const type = searchParams.get('type');

package/src/parts/GetTypeScriptPath/GetTypeScriptPath.js

@@ -1,9 +1,10 @@
 import { join } from 'node:path';
 import * as IsBuiltServer from '../IsBuiltServer/IsBuiltServer.js';
 import * as PlatformPaths from '../PlatformPaths/PlatformPaths.js';
+import * as Platform from '../Platform/Platform.js';
 import { pathToFileURL } from 'node:url';
 export const getTypeScriptUri = () => {
-    if (IsBuiltServer.isBuiltServer) {
+    if (!Platform.isProduction || IsBuiltServer.isBuiltServer) {
         return 'typescript';
     }
     const typescriptPath = join(PlatformPaths.getBuiltinExtensionsPath(), 'builtin.language-features-typescript', 'node', 'node_modules', 'typescript', 'lib', 'typescript.js');

package/src/parts/HandleIpcSearchProcess/HandleIpcSearchProcess.js

@@ -1 +1,23 @@
-export {};
+import * as SearchProcess from '../SearchProcess/SearchProcess.js';
+export const targetWebSocket = () => {
+    return SearchProcess.getOrCreate();
+};
+export const upgradeWebSocket = (handle, message) => {
+    return {
+        type: 'send',
+        method: 'HandleWebSocket.handleWebSocket',
+        params: [message],
+        transfer: handle,
+    };
+};
+export const targetMessagePort = () => {
+    return SearchProcess.getOrCreate();
+};
+export const upgradeMessagePort = (port) => {
+    return {
+        type: 'send',
+        method: 'HandleElectronMessagePort.handleElectronMessagePort',
+        params: [],
+        transfer: [port],
+    };
+};

package/src/parts/HandleMessagePortForSearchProcess/HandleMessagePortForSearchProcess.js

@@ -1,8 +1,5 @@
-import * as Assert from '../Assert/Assert.js';
-import * as SearchProcess from '../SearchProcess/SearchProcess.js';
-import * as JsonRpc from '../JsonRpc/JsonRpc.js';
-export const handleMessagePortForSearchProcess = async (port) => {
-    Assert.object(port);
-    const ipc = await SearchProcess.getOrCreate();
-    await JsonRpc.invokeAndTransfer(ipc, [port], 'HandleElectronMessagePort.handleElectronMessagePort');
+import * as HandleIncomingIpc from '../HandleIncomingIpc/HandleIncomingIpc.js';
+import * as IpcId from '../IpcId/IpcId.js';
+export const handleMessagePortForSearchProcess = (port) => {
+    return HandleIncomingIpc.handleIncomingIpc(IpcId.SearchProcess, port, {});
 };

package/src/parts/HandleWebSocketForSearchProcess/HandleWebSocketForSearchProcess.js

@@ -0,0 +1,5 @@
+import * as HandleIncomingIpc from '../HandleIncomingIpc/HandleIncomingIpc.js';
+import * as IpcId from '../IpcId/IpcId.js';
+export const handleWebSocket = (message, handle) => {
+    return HandleIncomingIpc.handleIncomingIpc(IpcId.SearchProcess, handle, message);
+};

package/src/parts/HandleWebSocketForUnknown/HandleWebSocketForUnknown.js

@@ -1,10 +1,6 @@
 import * as Logger from '../Logger/Logger.js';
+import * as DestroySocket from '../DestroySocket/DestroySocket.js';
 export const handleWebSocket = (message, handle, protocol) => {
-    Logger.warn(`[shared-process] unsupported sec-websocket-procotol ${protocol}`);
-    try {
-        handle.destroy();
-    }
-    catch {
-        // ignore
-    }
+    Logger.warn(`[shared-process] unsupported sec-websocket-protocol ${protocol}`);
+    DestroySocket.destroySocket(handle);
 };

package/src/parts/HandleWebSocketModule/HandleWebSocketModule.js

@@ -11,6 +11,8 @@ export const load = (protocol) => {
             return import('../HandleWebSocketForExtensionHostHelperProcess/HandleWebSocketForExtensionHostHelperProcess.js');
         case ProtocolType.TerminalProcess:
             return import('../HandleWebSocketForTerminalProcess/HandleWebSocketForTerminalProcess.js');
+        case ProtocolType.SearchProcess:
+            return import('../HandleWebSocketForSearchProcess/HandleWebSocketForSearchProcess.js');
         default:
             return import('../HandleWebSocketForUnknown/HandleWebSocketForUnknown.js');
     }

package/src/parts/LaunchNetworkProcess/LaunchNetworkProcess.js

@@ -1,10 +1,12 @@
-import * as NetworkProcessPath from '../NetworkProcessPath/NetworkProcessPath.js';
 import * as HandleIpc from '../HandleIpc/HandleIpc.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+import * as IsElectron from '../IsElectron/IsElectron.js';
+import * as NetworkProcessPath from '../NetworkProcessPath/NetworkProcessPath.js';
 export const launchNetworkProcess = async () => {
+    const method = IsElectron.isElectron() ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess;
     const networkProcess = await IpcParent.create({
-        method: IpcParentType.ElectronUtilityProcess,
+        method,
         path: NetworkProcessPath.networkProcessPath,
         argv: [],
         stdio: 'inherit',

package/src/parts/LaunchSearchProcess/LaunchSearchProcess.js

@@ -1,10 +1,12 @@
-import * as SearchProcessPath from '../SearchProcessPath/SearchProcessPath.js';
 import * as HandleIpc from '../HandleIpc/HandleIpc.js';
 import * as IpcParent from '../IpcParent/IpcParent.js';
 import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+import * as IsElectron from '../IsElectron/IsElectron.js';
+import * as SearchProcessPath from '../SearchProcessPath/SearchProcessPath.js';
 export const launchSearchProcess = async () => {
+    const method = IsElectron.isElectron() ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess;
     const searchProcess = await IpcParent.create({
-        method: IpcParentType.ElectronUtilityProcess,
+        method,
         path: SearchProcessPath.searchProcessPath,
         argv: [],
         stdio: 'inherit',

package/src/parts/LaunchTypeScriptCompileProcess/LaunchTypeScriptCompileProcess.js

@@ -0,0 +1,17 @@
+import * as HandleIpc from '../HandleIpc/HandleIpc.js';
+import * as IpcParent from '../IpcParent/IpcParent.js';
+import * as IpcParentType from '../IpcParentType/IpcParentType.js';
+import * as IsElectron from '../IsElectron/IsElectron.js';
+import * as TypeScriptCompileProcessPath from '../TypeScriptCompileProcessPath/TypeScriptCompileProcessPath.js';
+export const launchTypeScriptCompileProcess = async () => {
+    const method = IsElectron.isElectron() ? IpcParentType.ElectronUtilityProcess : IpcParentType.NodeForkedProcess;
+    const typescriptCompileProcess = await IpcParent.create({
+        method,
+        path: TypeScriptCompileProcessPath.typescriptCompileProcessPath,
+        argv: [],
+        stdio: 'inherit',
+        name: 'TypeScript Compile Process',
+    });
+    HandleIpc.handleIpc(typescriptCompileProcess);
+    return typescriptCompileProcess;
+};

package/src/parts/Module/Module.js

@@ -105,8 +105,6 @@ export const load = (moduleId) => {
             return import('../TextDocument/TextDocument.ipc.js');
         case ModuleId.Search:
             return import('../TextSearch/TextSearch.ipc.js');
-        case ModuleId.WebSocketServer:
-            return import('../WebSocketServer/WebSocketServer.ipc.js');
         case ModuleId.Workspace:
             return import('../Workspace/Workspace.ipc.js');
         case ModuleId.ElectronNet:

package/src/parts/ModuleId/ModuleId.js

@@ -14,7 +14,6 @@ export const ElectronWindowProcessExplorer = 12;
 export const SearchFile = 13;
 export const Terminal = 14;
 export const TextDocument = 15;
-export const WebSocketServer = 16;
 export const Workspace = 17;
 export const ChromeExtension = 18;
 export const Download = 19;

package/src/parts/ModuleMap/ModuleMap.js

@@ -232,8 +232,6 @@ export const getModuleId = (commandId) => {
             return ModuleId.Terminal;
         case 4820:
             return ModuleId.TextDocument;
-        case 'WebSocketServer.handleUpgrade':
-            return ModuleId.WebSocketServer;
         case 'ElectronWindow.close':
         case 'ElectronWindow.focus':
         case 'ElectronWindow.getZoom':

package/src/parts/Platform/Platform.js

@@ -41,9 +41,9 @@ export const getAppImageName = () => {
 export const getSetupName = () => {
     return 'Lvce-Setup';
 };
-export const version = '0.27.2';
-export const commit = '26db1a6';
-export const date = '2024-05-01T05:55:48.000Z';
+export const version = '0.28.0';
+export const commit = '24ec280';
+export const date = '2024-05-02T22:22:33.000Z';
 export const getVersion = () => {
     return version;
 };

package/src/parts/ProtocolType/ProtocolType.js

@@ -1,4 +1,5 @@
 export const ExtensionHost = 'extension-host';
 export const ExtensionHostHelperProcess = 'extension-host-helper-process';
+export const SearchProcess = 'search-process';
 export const SharedProcess = 'shared-process';
 export const TerminalProcess = 'terminal-process';

package/src/parts/SearchProcessPath/SearchProcessPath.js

@@ -1,3 +1 @@
-import * as Path from '../Path/Path.js';
-import * as Root from '../Root/Root.js';
-export const searchProcessPath = Path.join(Root.root, 'packages', 'search-process', 'src', 'searchProcessMain.js');
+export { searchProcessPath } from '@lvce-editor/search-process';

package/src/parts/SymLink/SymLink.js

@@ -1,4 +1,4 @@
-import symlinkDir from 'symlink-dir';
-export const createSymLink = async (target, path) => {
-    await symlinkDir(target, path);
+import * as NetworkProcess from '../NetworkProcess/NetworkProcess.js';
+export const createSymLink = (target, path) => {
+    return NetworkProcess.invoke('Symlink.createSymLink', target, path);
 };

package/src/parts/TypeScriptCompileProcessPath/TypeScriptCompileProcessPath.js

@@ -0,0 +1,3 @@
+import * as Path from '../Path/Path.js';
+import * as Root from '../Root/Root.js';
+export const typescriptCompileProcessPath = Path.join(Root.root, 'packages', 'typescript-compile-process', 'src', 'typescriptCompileProcessMain.js');

package/src/parts/WebSocketServer/WebSocketServer.ipc.js

@@ -1,5 +0,0 @@
-import * as WebSocketServer from './WebSocketServer.js';
-export const name = 'WebSocketServer';
-export const Commands = {
-    handleUpgrade: WebSocketServer.handleUpgrade,
-};

package/src/parts/WebSocketServer/WebSocketServer.js

@@ -1 +0,0 @@
-export * from '@lvce-editor/web-socket-server';