@lvce-editor/file-watcher-process 4.3.0 → 4.4.0

package/dist/index.js

@@ -15,7 +15,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean = 5;
 const Function = 6;
 const Null = 7;
@@ -27,7 +27,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -50,7 +50,7 @@ const number = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -1234,6 +1234,41 @@ const waitForWatcherToBeReady = async watcher => {
   await promise;
 };
 
+const success = {
+  ok: true
+};
+const getErrorCode = error => {
+  if (error && typeof error === 'object' && 'code' in error && typeof error.code === 'string') {
+    return error.code;
+  }
+  return undefined;
+};
+const fromError = error => {
+  if (error instanceof Error) {
+    const code = getErrorCode(error);
+    return {
+      error: {
+        ...(code && {
+          code
+        }),
+        message: error.message,
+        name: error.name,
+        ...(error.stack && {
+          stack: error.stack
+        })
+      },
+      ok: false
+    };
+  }
+  return {
+    error: {
+      message: String(error),
+      name: 'Error'
+    },
+    ok: false
+  };
+};
+
 const callBackInternal = async (eventName, path, stats) => {
   const event = normalizeEvent(eventName, path);
   await invoke('FileWatcher.handleChange', event);
@@ -1245,13 +1280,22 @@ const errorCallback$1 = error => {
   console.error(`[file-watcher-process] ${error}`);
 };
 const watchFolder = async uri => {
-  const path = fileURLToPath(uri);
-  const watcher = new FSWatcher();
-  watcher.on('all', callback);
-  watcher.on('error', errorCallback$1);
-  const readyPromise = waitForWatcherToBeReady(watcher);
-  watcher.add(path);
-  await readyPromise;
+  let watcher;
+  try {
+    const path = fileURLToPath(uri);
+    watcher = new FSWatcher();
+    watcher.on('all', callback);
+    watcher.on('error', errorCallback$1);
+    const readyPromise = waitForWatcherToBeReady(watcher);
+    watcher.add(path);
+    await readyPromise;
+    return success;
+  } catch (error) {
+    if (watcher) {
+      await Promise.allSettled([watcher.close()]);
+    }
+    return fromError(error);
+  }
 };
 
 const normalizeEvent2 = (id, eventName, path) => {
@@ -1283,21 +1327,22 @@ const watchFolders = async ({
   const callback = (eventName, path, stats) => {
     void callBackInternal(eventName, path);
   };
-  const watcherEntries = roots.map(root => {
-    const path = fileURLToPath(root);
-    const watcher = new FSWatcher({
-      ignoreInitial: true,
-      ignorePermissionErrors: true
-    });
-    watcher.on('error', errorCallback);
-    const readyPromise = waitForWatcherToBeReady(watcher);
-    watcher.add(path);
-    return {
-      readyPromise,
-      watcher
-    };
-  });
+  const watcherEntries = [];
   try {
+    for (const root of roots) {
+      const path = fileURLToPath(root);
+      const watcher = new FSWatcher({
+        ignoreInitial: true,
+        ignorePermissionErrors: true
+      });
+      watcher.on('error', errorCallback);
+      const readyPromise = waitForWatcherToBeReady(watcher);
+      watcherEntries.push({
+        readyPromise,
+        watcher
+      });
+      watcher.add(path);
+    }
     await Promise.all(watcherEntries.map(({
       readyPromise
     }) => readyPromise));
@@ -1305,13 +1350,14 @@ const watchFolders = async ({
     await Promise.allSettled(watcherEntries.map(({
       watcher
     }) => watcher.close()));
-    throw error;
+    return fromError(error);
   }
   for (const {
     watcher
   } of watcherEntries) {
     watcher.on('all', callback);
   }
+  return success;
 };
 
 const commandMap = {

package/package.json

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