@lvce-editor/file-watcher-process 3.1.0 → 3.3.0

package/dist/index.js

@@ -2,6 +2,10 @@ import * as fs from 'node:fs/promises';
 import { watch } from 'chokidar';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 
+const handleUncaughtExceptionMonitor = error => {
+  console.error(`[file-watcher-process] Uncaught Exception: ${error}`);
+};
+
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -480,7 +484,7 @@ const listen$3 = async () => {
     parentPort
   } = await import('node:worker_threads');
   if (!parentPort) {
-    throw new IpcError('parentPort is required');
+    throw new IpcError('parentPort is required for node worker threads ipc');
   }
   return parentPort;
 };
@@ -519,7 +523,7 @@ const IpcChildWithNodeWorker$1 = {
 };
 
 const Two = '2.0';
-const create$4$1 = (method, params) => {
+const create$4 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -619,6 +623,16 @@ const constructError = (message, type, name) => {
   }
   return new ErrorConstructor(message);
 };
+const joinLines = lines => {
+  return lines.join(NewLine);
+};
+const splitLines = lines => {
+  return lines.split(NewLine);
+};
+const getCurrentStack = () => {
+  const currentStack = joinLines(splitLines(new Error().stack || '').slice(2));
+  return currentStack;
+};
 const getNewLineIndex = (string, startIndex = undefined) => {
   return string.indexOf(NewLine, startIndex);
 };
@@ -629,19 +643,16 @@ const getParentStack = error => {
   }
   return parentStack;
 };
-const joinLines = lines => {
-  return lines.join(NewLine);
-};
 const MethodNotFound = -32601;
 const Custom = -32001;
-const splitLines = lines => {
-  return lines.split(NewLine);
-};
 const restoreJsonRpcError = error => {
+  const currentStack = getCurrentStack();
   if (error && error instanceof Error) {
+    if (typeof error.stack === 'string') {
+      error.stack = error.stack + NewLine + currentStack;
+    }
     return error;
   }
-  const currentStack = joinLines(splitLines(new Error().stack || '').slice(1));
   if (error && error.code && error.code === MethodNotFound) {
     const restoredError = new JsonRpcError(error.message);
     const parentStack = getParentStack(error);
@@ -722,6 +733,17 @@ const getErrorType = prettyError => {
   }
   return undefined;
 };
+const isAlreadyStack = line => {
+  return line.trim().startsWith('at ');
+};
+const getStack = prettyError => {
+  const stackString = prettyError.stack || '';
+  const newLineIndex = stackString.indexOf('\n');
+  if (newLineIndex !== -1 && !isAlreadyStack(stackString.slice(0, newLineIndex))) {
+    return stackString.slice(newLineIndex + 1);
+  }
+  return stackString;
+};
 const getErrorProperty = (error, prettyError) => {
   if (error && error.code === E_COMMAND_NOT_FOUND) {
     return {
@@ -734,7 +756,7 @@ const getErrorProperty = (error, prettyError) => {
     code: Custom,
     message: prettyError.message,
     data: {
-      stack: prettyError.stack,
+      stack: getStack(prettyError),
       codeFrame: prettyError.codeFrame,
       type: getErrorType(prettyError),
       code: prettyError.code,
@@ -742,18 +764,18 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1 = (message, error) => {
+const create$1 = (id, error) => {
   return {
     jsonrpc: Two,
-    id: message.id,
+    id,
     error
   };
 };
-const getErrorResponse = (message, error, preparePrettyError, logError) => {
+const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1(message, errorProperty);
+  return create$1(id, errorProperty);
 };
 const create = (message, result) => {
   return {
@@ -766,12 +788,27 @@ const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
   return create(message, resultProperty);
 };
+const getErrorResponseSimple = (id, error) => {
+  return {
+    jsonrpc: Two,
+    id,
+    error: {
+      code: Custom,
+      // @ts-ignore
+      message: error.message,
+      data: error
+    }
+  };
+};
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
     const result = requiresSocket(message.method) ? await execute(message.method, ipc, ...message.params) : await execute(message.method, ...message.params);
     return getSuccessResponse(message, result);
   } catch (error) {
-    return getErrorResponse(message, error, preparePrettyError, logError);
+    if (ipc.canUseSimpleErrorResponse) {
+      return getErrorResponseSimple(message.id, error);
+    }
+    return getErrorResponse(message.id, error, preparePrettyError, logError);
   }
 };
 const defaultPreparePrettyError = error => {
@@ -826,7 +863,7 @@ const handleJsonRpcMessage = async (...args) => {
       try {
         ipc.send(response);
       } catch (error) {
-        const errorResponse = getErrorResponse(message, error, preparePrettyError, logError);
+        const errorResponse = getErrorResponse(message.id, error, preparePrettyError, logError);
         ipc.send(errorResponse);
       }
       return;
@@ -854,7 +891,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   return unwrapJsonRpcResult(responseMessage);
 };
 const send = (transport, method, ...params) => {
-  const message = create$4$1(method, params);
+  const message = create$4(method, params);
   transport.send(message);
 };
 const invoke$1 = (ipc, method, ...params) => {
@@ -931,24 +968,28 @@ const listen$2 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$c = async ({
+const create$j = async ({
   commandMap,
-  messagePort
+  messagePort,
+  requiresSocket
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const ipc = await listen$2(IpcChildWithElectronMessagePort$1, {
     messagePort
   });
+  if (requiresSocket) {
+    ipc.requiresSocket = requiresSocket;
+  }
   handleIpc(ipc);
   const rpc = createRpc(ipc);
   return rpc;
 };
 const ElectronMessagePortRpcClient = {
   __proto__: null,
-  create: create$c
+  create: create$j
 };
-const create$b = async ({
+const create$i = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -960,9 +1001,9 @@ const create$b = async ({
 };
 const ElectronUtilityProcessRpcClient = {
   __proto__: null,
-  create: create$b
+  create: create$i
 };
-const create$7 = async ({
+const create$9 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -974,9 +1015,9 @@ const create$7 = async ({
 };
 const NodeForkedProcessRpcClient = {
   __proto__: null,
-  create: create$7
+  create: create$9
 };
-const create$4 = async ({
+const create$6 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -988,7 +1029,7 @@ const create$4 = async ({
 };
 const NodeWorkerRpcClient = {
   __proto__: null,
-  create: create$4
+  create: create$6
 };
 
 const NodeWorker = 1;
@@ -1047,7 +1088,7 @@ const handleElectronMessagePort = async messagePort => {
 const SharedProcess = 1;
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$g = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1094,17 +1135,21 @@ const waitForWatcherToBeReady = async watcher => {
   await promise;
 };
 
+const callBackInternal = async (eventName, path, stats) => {
+  const event = normalizeEvent(eventName, path);
+  await invoke('FileWatcher.handleChange', event);
+};
+const callback = (eventName, path, stats) => {
+  void callBackInternal(eventName, path);
+};
+const errorCallback = error => {
+  console.error(`[file-watcher-process] ${error}`);
+};
 const watchFolder = async uri => {
-  const callBackInternal = async (eventName, path, stats) => {
-    const event = normalizeEvent(eventName, path);
-    await invoke('FileWatcher.handleChange', event);
-  };
-  const callback = (eventName, path, stats) => {
-    void callBackInternal(eventName, path);
-  };
   const path = fileURLToPath(uri);
   const watcher = watch(path);
   watcher.on('all', callback);
+  watcher.on('error', errorCallback);
   await waitForWatcherToBeReady(watcher);
 };
 
@@ -1160,10 +1205,11 @@ const listen = async () => {
     method: Auto(),
     commandMap: commandMap
   });
-  set$3(SharedProcess, rpc);
+  set$g(SharedProcess, rpc);
 };
 
 const main = async () => {
+  process.on('uncaughtExceptionMonitor', handleUncaughtExceptionMonitor);
   await listen();
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-watcher-process",
-  "version": "3.1.0",
+  "version": "3.3.0",
   "description": "File Watcher Process",
   "keywords": [
     "Lvce Editor",