@lvce-editor/typescript-compile-process 1.6.0 → 2.0.0

package/dist/index.js

@@ -1,27 +1,8 @@
 import * as Command from '@lvce-editor/command';
-import { execute } from '@lvce-editor/command';
 import { object, string } from '@lvce-editor/assert';
-import { handleJsonRpcMessage, resolve } from '@lvce-editor/json-rpc';
-import { IpcChildWithWebSocket, IpcChildWithElectronMessagePort, IpcChildWithElectronUtilityProcess, IpcChildWithNodeWorker, IpcChildWithNodeForkedProcess } from '@lvce-editor/ipc';
+import { WebSocketRpcParent, ElectronMessagePortRpcClient, ElectronUtilityProcessRpcClient, NodeForkedProcessRpcClient } from '@lvce-editor/rpc';
 import { VError } from '@lvce-editor/verror';
 
-const prepare = error => {
-  return error;
-};
-const requiresSocket = method => {
-  return false;
-};
-const logError = error => {
-  console.error(error);
-};
-const handleMessage = event => {
-  return handleJsonRpcMessage(event.target, event.data, execute, resolve, prepare, logError, requiresSocket);
-};
-
-const handleIpc = ipc => {
-  ipc.addEventListener('message', handleMessage);
-};
-
 const NodeWorker = 1;
 const NodeForkedProcess = 2;
 const ElectronUtilityProcess = 3;
@@ -46,15 +27,13 @@ const Auto = () => {
 const getModule = method => {
   switch (method) {
     case NodeForkedProcess:
-      return IpcChildWithNodeForkedProcess;
-    case NodeWorker:
-      return IpcChildWithNodeWorker;
+      return NodeForkedProcessRpcClient;
     case ElectronUtilityProcess:
-      return IpcChildWithElectronUtilityProcess;
+      return ElectronUtilityProcessRpcClient;
     case ElectronMessagePort:
-      return IpcChildWithElectronMessagePort;
+      return ElectronMessagePortRpcClient;
     case WebSocket:
-      return IpcChildWithWebSocket;
+      return WebSocketRpcParent;
     default:
       throw new Error('unexpected ipc type');
   }
@@ -64,34 +43,37 @@ const listen$1 = async ({
   method,
   ...params
 }) => {
-  const module = await getModule(method);
-  // @ts-ignore
-  const rawIpc = await module.listen(params);
+  const module = getModule(method);
   // @ts-ignore
-  if (module.signal) {
-    // @ts-ignore
-    module.signal(rawIpc);
-  }
-  // @ts-ignore
-  const ipc = module.wrap(rawIpc);
-  return ipc;
+  const rpc = await module.create(params);
+  return rpc;
 };
 
 const handleElectronMessagePort = async (messagePort, ipcId) => {
   object(messagePort);
   // Assert.number(ipcId)
   // TODO use handleIncomingIpc function
-  const ipc = await listen$1({
+  await listen$1({
     method: ElectronMessagePort,
     messagePort
   });
-  handleIpc(ipc);
 };
 
 const importScript = async url => {
   return await import(url);
 };
 
+const isModuleNotFoundError = error => {
+  return error && error.code === 'ERR_MODULE_NOT_FOUND';
+};
+
+class TypeScriptNotFoundError extends Error {
+  constructor() {
+    super('Failed to load typescript: Typescript not found');
+    this.code = 'E_TYPESCRIPT_NOT_FOUND';
+  }
+}
+
 const loadTypeScript = async typescriptPath => {
   try {
     const typescript = await importScript(typescriptPath);
@@ -101,6 +83,9 @@ const loadTypeScript = async typescriptPath => {
     }
     return actual;
   } catch (error) {
+    if (isModuleNotFoundError(error)) {
+      throw new TypeScriptNotFoundError();
+    }
     throw new VError(error, `Failed to load typescript`);
   }
 };
@@ -138,10 +123,9 @@ const commandMap = {
 };
 
 const listen = async () => {
-  const ipc = await listen$1({
+  await listen$1({
     method: Auto()
   });
-  handleIpc(ipc);
 };
 
 const main = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/typescript-compile-process",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "TypeScript Compile Process",
   "main": "dist/index.js",
   "bin": "bin/typescriptCompileProcess.js",
@@ -20,8 +20,7 @@
   "dependencies": {
     "@lvce-editor/assert": "^1.3.0",
     "@lvce-editor/command": "^1.2.0",
-    "@lvce-editor/ipc": "^11.3.0",
-    "@lvce-editor/json-rpc": "^5.2.0",
+    "@lvce-editor/rpc": "^1.11.0",
     "@lvce-editor/verror": "^1.6.0"
   },
   "xo": {