@lvce-editor/process-explorer 3.10.0 → 3.12.1

package/dist/index.js

@@ -168,7 +168,6 @@ const walkValue = (value, transferrables, isTransferrable) => {
     for (const property of Object.values(value)) {
       walkValue(property, transferrables, isTransferrable);
     }
-    return;
   }
 };
 const getTransferrables = value => {
@@ -371,7 +370,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);
@@ -705,13 +711,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) {
@@ -725,7 +731,7 @@ const wrap$9 = webSocket => {
             const data = deserialize(message);
             const event = {
               data,
-              target: this
+              target: wrap
             };
             listener(event);
           };
@@ -738,7 +744,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');
@@ -749,6 +755,7 @@ const wrap$9 = webSocket => {
      */
     wrappedListener: undefined
   };
+  return wrap;
 };
 const IpcChildWithWebSocket = {
   __proto__: null,
@@ -891,7 +898,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;
   }
@@ -922,31 +932,45 @@ 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') {
-    error.stack = error.stack + NewLine$1 + currentStack;
+    setStack(error, `${error.stack}${NewLine$1}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine$1 + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine$1}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine$1 + error.data.stack + NewLine$1 + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine$1}${error.data.stack}${NewLine$1}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -967,7 +991,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -1331,9 +1355,14 @@ const create$4 = async ({
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
-  const rawIpc = await IpcParentWithWebSocket$1.create({
-    webSocket
-  });
+  let rawIpc;
+  try {
+    rawIpc = await IpcParentWithWebSocket$1.create({
+      webSocket
+    });
+  } catch (error) {
+    throw new VError(error, 'Failed to create rpc connection');
+  }
   const ipc = IpcParentWithWebSocket$1.wrap(rawIpc);
   handleIpc(ipc);
   const rpc = createRpc(ipc);
@@ -1646,9 +1675,9 @@ const getModule$1 = async () => {
   return Promise.resolve().then(function () { return ListProcessesWithMemoryUsageUnix; });
 };
 
-const listProcessesWithMemoryUsage$2 = async (rootPid, includeElectronData = true) => {
+const listProcessesWithMemoryUsage$2 = async (rootPid, includeElectronData = true, pidMap) => {
   const module = await getModule$1();
-  return module.listProcessesWithMemoryUsage(rootPid, includeElectronData);
+  return module.listProcessesWithMemoryUsage(rootPid, includeElectronData, pidMap);
 };
 
 const execFile$1 = promisify(execFile$2);
@@ -2635,6 +2664,7 @@ function requireReceiver() {
       this._opcode = 0;
       this._totalPayloadLength = 0;
       this._messageLength = 0;
+      this._numFragments = 0;
       this._fragments = [];
       this._errored = false;
       this._loop = false;
@@ -2902,18 +2932,17 @@ function requireReceiver() {
         this.controlMessage(data, cb);
         return;
       }
+      if (this._maxFragments > 0 && ++this._numFragments > this._maxFragments) {
+        const error = this.createError(RangeError, 'Too many message fragments', false, 1008, 'WS_ERR_TOO_MANY_BUFFERED_PARTS');
+        cb(error);
+        return;
+      }
       if (this._compressed) {
         this._state = INFLATING;
         this.decompress(data, cb);
         return;
       }
       if (data.length) {
-        if (this._maxFragments > 0 && this._fragments.length >= this._maxFragments) {
-          const error = this.createError(RangeError, 'Too many message fragments', false, 1008, 'WS_ERR_TOO_MANY_BUFFERED_PARTS');
-          cb(error);
-          return;
-        }
-
         //
         // This message is not compressed so its length is the sum of the payload
         // length of all fragments.
@@ -2942,11 +2971,6 @@ function requireReceiver() {
             cb(error);
             return;
           }
-          if (this._maxFragments > 0 && this._fragments.length >= this._maxFragments) {
-            const error = this.createError(RangeError, 'Too many message fragments', false, 1008, 'WS_ERR_TOO_MANY_BUFFERED_PARTS');
-            cb(error);
-            return;
-          }
           this._fragments.push(buf);
         }
         this.dataMessage(cb);
@@ -2970,6 +2994,7 @@ function requireReceiver() {
       this._totalPayloadLength = 0;
       this._messageLength = 0;
       this._fragmented = 0;
+      this._numFragments = 0;
       this._fragments = [];
       if (this._opcode === 2) {
         let data;
@@ -4716,9 +4741,9 @@ function requireWebsocket() {
    *     masking key
    * @param {Number} [options.handshakeTimeout] Timeout in milliseconds for the
    *     handshake request
-   * @param {Number} [options.maxBufferedChunks=1048576] The maximum number of
+   * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
    *     buffered data chunks
-   * @param {Number} [options.maxFragments=131072] The maximum number of message
+   * @param {Number} [options.maxFragments=16384] The maximum number of message
    *     fragments
    * @param {Number} [options.maxPayload=104857600] The maximum allowed message
    *     size
@@ -4740,8 +4765,8 @@ function requireWebsocket() {
       autoPong: true,
       closeTimeout: CLOSE_TIMEOUT,
       protocolVersion: protocolVersions[1],
-      maxBufferedChunks: 1024 * 1024,
-      maxFragments: 128 * 1024,
+      maxBufferedChunks: 256 * 1024,
+      maxFragments: 16 * 1024,
       maxPayload: 100 * 1024 * 1024,
       skipUTF8Validation: false,
       perMessageDeflate: true,
@@ -5614,9 +5639,9 @@ function requireWebsocketServer() {
      *     called
      * @param {Function} [options.handleProtocols] A hook to handle protocols
      * @param {String} [options.host] The hostname where to bind the server
-     * @param {Number} [options.maxBufferedChunks=1048576] The maximum number of
+     * @param {Number} [options.maxBufferedChunks=262144] The maximum number of
      *     buffered data chunks
-     * @param {Number} [options.maxFragments=131072] The maximum number of message
+     * @param {Number} [options.maxFragments=16384] The maximum number of message
      *     fragments
      * @param {Number} [options.maxPayload=104857600] The maximum allowed message
      *     size
@@ -5639,8 +5664,8 @@ function requireWebsocketServer() {
       options = {
         allowSynchronousEvents: true,
         autoPong: true,
-        maxBufferedChunks: 1024 * 1024,
-        maxFragments: 128 * 1024,
+        maxBufferedChunks: 256 * 1024,
+        maxFragments: 16 * 1024,
         maxPayload: 100 * 1024 * 1024,
         skipUTF8Validation: false,
         perMessageDeflate: false,
@@ -6237,13 +6262,13 @@ const CommandLine = 2;
 
 // listProcesses windows implementation based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/node/ps.ts (License MIT)
 
-const listProcessesWithMemoryUsage$1 = async (rootPid, includeElectronData = true) => {
+const listProcessesWithMemoryUsage$1 = async (rootPid, includeElectronData = true, electronPidMap) => {
   try {
     const processList = await getProcessList(rootPid, CommandLine | Memory);
     if (!processList) {
       throw new VError(`Root process ${rootPid} not found`);
     }
-    const pidMap = includeElectronData ? await createPidMap() : {};
+    const pidMap = electronPidMap ?? (includeElectronData ? await createPidMap() : {});
     const completeProcessList = await addCpuUsage(processList);
     const result = toResult(completeProcessList, rootPid, pidMap);
     return result;
@@ -6424,10 +6449,10 @@ const parsePsOutput = (stdout, rootPid, pidMap) => {
   return result;
 };
 
-const listProcessesWithMemoryUsage = async (rootPid, includeElectronData = true) => {
+const listProcessesWithMemoryUsage = async (rootPid, includeElectronData = true, electronPidMap) => {
   // console.time('getPsOutput')
   const stdout = await getPsOutput();
-  const pidMap = includeElectronData ? await createPidMap() : {};
+  const pidMap = electronPidMap ?? (includeElectronData ? await createPidMap() : {});
   // console.log({ stdout })
   // console.timeEnd('getPsOutput')
   // console.time('parsePsOutput')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/process-explorer",
-  "version": "3.10.0",
+  "version": "3.12.1",
   "description": "Process Explorer",
   "main": "dist/index.js",
   "bin": "bin/processExplorer.js",