@lvce-editor/pty-host 8.7.0 → 8.8.1

package/dist/ptyHostMain.js

@@ -270,7 +270,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -473,7 +472,14 @@ class IpcError extends VError {
       const cause = new Error(message);
       // @ts-ignore
       cause.code = code;
-      cause.stack = stack;
+      if (stack) {
+        Object.defineProperty(cause, 'stack', {
+          configurable: true,
+          enumerable: false,
+          value: stack,
+          writable: true
+        });
+      }
       super(cause, betterMessage);
     } else {
       super(betterMessage);
@@ -764,13 +770,13 @@ const signal$4 = webSocket => {
   webSocket.resume();
 };
 const wrap$9 = webSocket => {
-  return {
+  const wrap = {
     dispose() {
-      this.webSocket.close();
+      wrap.webSocket.close();
     },
     // @ts-ignore
     off(event, listener) {
-      this.webSocket.off(event, listener);
+      wrap.webSocket.off(event, listener);
     },
     // @ts-ignore
     on(event, listener) {
@@ -784,7 +790,7 @@ const wrap$9 = webSocket => {
             const data = deserialize(message);
             const event = {
               data,
-              target: this
+              target: wrap
             };
             listener(event);
           };
@@ -797,7 +803,7 @@ const wrap$9 = webSocket => {
     // @ts-ignore
     send(message) {
       const stringifiedMessage = serialize(message);
-      this.webSocket.send(stringifiedMessage);
+      wrap.webSocket.send(stringifiedMessage);
     },
     start() {
       throw new Error('start method is deprecated');
@@ -808,6 +814,7 @@ const wrap$9 = webSocket => {
      */
     wrappedListener: undefined
   };
+  return wrap;
 };
 const IpcChildWithWebSocket = {
   __proto__: null,
@@ -869,7 +876,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -886,8 +896,10 @@ const getCurrentStack = () => {
   const currentStack = joinLines$1(splitLines$1(new Error().stack || '').slice(stackLinesToSkip));
   return currentStack;
 };
-const getNewLineIndex$1 = (string, startIndex = undefined) => {
-  return string.indexOf(NewLine$2, startIndex);
+const getNewLineIndex$1 = (string, startIndex) => {
+  {
+    return string.indexOf(NewLine$2);
+  }
 };
 const getParentStack = error => {
   let parentStack = error.stack || error.data || error.message || '';
@@ -898,55 +910,91 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
+const restoreExistingError = (error, currentStack) => {
+  if (typeof error.stack === 'string') {
+    setStack(error, `${error.stack}${NewLine$2}${currentStack}`);
+  }
+  return error;
+};
+const restoreMethodNotFoundError = (error, currentStack) => {
+  const restoredError = new JsonRpcError(error.message);
+  const parentStack = getParentStack(error);
+  setStack(restoredError, `${parentStack}${NewLine$2}${currentStack}`);
+  return restoredError;
+};
+const restoreStackFromData = (restoredError, error, currentStack) => {
+  if (error.data.stack && error.data.type && error.message) {
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine$2}${error.data.stack}${NewLine$2}${currentStack}`);
+    return;
+  }
+  if (error.data.stack) {
+    setStack(restoredError, error.data.stack);
+  }
+};
+const applyDataProperties = (restoredError, error) => {
+  restoreStackFromData(restoredError, error, getCurrentStack());
+  if (error.data.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.data.codeFrame;
+  }
+  if (error.data.code) {
+    // @ts-ignore
+    restoredError.code = error.data.code;
+  }
+  if (error.data.type) {
+    // @ts-ignore
+    restoredError.name = error.data.type;
+  }
+};
+const applyDirectProperties = (restoredError, error) => {
+  if (error.stack) {
+    const lowerStack = restoredError.stack || '';
+    const indexNewLine = getNewLineIndex$1(lowerStack);
+    const parentStack = getParentStack(error);
+    // @ts-ignore
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
+  }
+  if (error.codeFrame) {
+    // @ts-ignore
+    restoredError.codeFrame = error.codeFrame;
+  }
+};
+const restoreMessageError = (error, _currentStack) => {
+  const restoredError = constructError(error.message, error.type, error.name);
+  if (error.data) {
+    applyDataProperties(restoredError, error);
+  } else {
+    applyDirectProperties(restoredError, error);
+  }
+  return restoredError;
+};
 const restoreJsonRpcError = error => {
   const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
-    if (typeof error.stack === 'string') {
-      error.stack = error.stack + NewLine$2 + currentStack;
-    }
-    return error;
+    return restoreExistingError(error, currentStack);
   }
   if (error && error.code && error.code === MethodNotFound) {
-    const restoredError = new JsonRpcError(error.message);
-    const parentStack = getParentStack(error);
-    restoredError.stack = parentStack + NewLine$2 + currentStack;
-    return restoredError;
+    return restoreMethodNotFoundError(error, currentStack);
   }
   if (error && error.message) {
-    const restoredError = constructError(error.message, error.type, error.name);
-    if (error.data) {
-      if (error.data.stack && error.data.type && error.message) {
-        restoredError.stack = error.data.type + ': ' + error.message + NewLine$2 + error.data.stack + NewLine$2 + currentStack;
-      } else if (error.data.stack) {
-        restoredError.stack = error.data.stack;
-      }
-      if (error.data.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.data.codeFrame;
-      }
-      if (error.data.code) {
-        // @ts-ignore
-        restoredError.code = error.data.code;
-      }
-      if (error.data.type) {
-        // @ts-ignore
-        restoredError.name = error.data.type;
-      }
-    } else {
-      if (error.stack) {
-        const lowerStack = restoredError.stack || '';
-        // @ts-ignore
-        const indexNewLine = getNewLineIndex$1(lowerStack);
-        const parentStack = getParentStack(error);
-        // @ts-ignore
-        restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
-      }
-      if (error.codeFrame) {
-        // @ts-ignore
-        restoredError.codeFrame = error.codeFrame;
-      }
-    }
-    return restoredError;
+    return restoreMessageError(error);
   }
   if (typeof error === 'string') {
     return new Error(`JsonRpc Error: ${error}`);
@@ -1505,14 +1553,14 @@ const remove = id => {
 };
 
 // TODO maybe merge pty and pty controller
-const create = async (ipc, id, cwd, command, args) => {
+const createWithDependencies = async (ipc, id, cwd, command, args, createPty) => {
   number(id);
   string(cwd);
   string(command);
   array(args);
   object(ipc);
   // @ts-ignore
-  const pty = await create$1({
+  const pty = await createPty({
     args,
     command,
     cwd
@@ -1524,9 +1572,23 @@ const create = async (ipc, id, cwd, command, args) => {
       params: [id, 'handleData', event.data]
     });
   };
+  const handleExit = event => {
+    remove(id);
+    ipc.send({
+      jsonrpc: '2.0',
+      method: 'Viewlet.send',
+      params: [id, 'handleExit', event.data]
+    });
+  };
   pty.addEventListener('data', handleData);
+  pty.addEventListener('exit', handleExit, {
+    once: true
+  });
   set(id, pty);
 };
+const create = (ipc, id, cwd, command, args) => {
+  return createWithDependencies(ipc, id, cwd, command, args, create$1);
+};
 const write = (id, data) => {
   const pty = get(id);
   if (!pty) {
@@ -1544,7 +1606,7 @@ const resize = (id, columns, rows) => {
 const dispose = id => {
   const pty = get(id);
   if (!pty) {
-    throw new Error(`pty ${id} not found`);
+    return;
   }
   pty.dispose();
   remove(id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/pty-host",
-  "version": "8.7.0",
+  "version": "8.8.1",
   "keywords": [
     "lvce-editor",
     "pty-host"