@lvce-editor/file-watcher-process 4.14.0 → 4.15.0

package/dist/index.js

@@ -1255,7 +1255,7 @@ const normalizeEvent = (eventName, path) => {
   };
 };
 
-const waitForWatcherToBeReady = async watcher => {
+const waitForWatcherToBeReady = async (watcher, signal) => {
   const {
     promise,
     reject,
@@ -1264,6 +1264,7 @@ const waitForWatcherToBeReady = async watcher => {
   const cleanup = () => {
     watcher.off('ready', handleReady);
     watcher.off('error', handleError);
+    signal?.removeEventListener('abort', handleAbort);
   };
   const handleReady = () => {
     cleanup();
@@ -1273,6 +1274,13 @@ const waitForWatcherToBeReady = async watcher => {
     cleanup();
     reject(error);
   };
+  const handleAbort = () => {
+    handleError(signal?.reason);
+  };
+  signal?.throwIfAborted();
+  signal?.addEventListener('abort', handleAbort, {
+    once: true
+  });
   watcher.on('ready', handleReady);
   watcher.on('error', handleError);
   await promise;
@@ -1326,7 +1334,7 @@ const callBackInternal = async (eventName, path, stats) => {
 const callback = (eventName, path, stats) => {
   void callBackInternal(eventName, path);
 };
-const errorCallback$1 = error => {
+const errorCallback = error => {
   console.error(`[file-watcher-process] ${error}`);
 };
 const watchFolder = async uri => {
@@ -1335,7 +1343,7 @@ const watchFolder = async uri => {
     const path = fileURLToPath(uri);
     watcher = new FSWatcher();
     watcher.on('all', callback);
-    watcher.on('error', errorCallback$1);
+    watcher.on('error', errorCallback);
     const readyPromise = waitForWatcherToBeReady(watcher);
     watcher.add(path);
     await readyPromise;
@@ -1391,9 +1399,6 @@ const normalizeEvent2 = (id, eventName, path) => {
 };
 
 const createIgnore = ignore;
-const errorCallback = error => {
-  console.error(`[file-watcher-process] ${error}`);
-};
 const loadGitIgnore = async (root, enabled) => {
   try {
     const content = await readFile(`${root}/.gitignore`, 'utf8');
@@ -1424,36 +1429,72 @@ const createIgnored = async (root, exclude, useGitIgnore) => {
     return gitIgnore.ignores(candidate);
   };
 };
+const send = event => {
+  void invoke('FileWatcher.handleChange', event).catch(error => {
+    console.error(`[file-watcher-process] ${error}`);
+  });
+};
 const watchFolders = async ({
+  depth,
   exclude,
   id,
   roots,
   useGitIgnore = false
 }) => {
-  const callBackInternal = async (eventName, path, stats) => {
-    const event = normalizeEvent2(id, eventName, path);
-
-    // TODO maybe just use send instead of invoke or
-    // send the message to a websocket or message channel directly
-    // instead of routing events through shared process
-    // which might lock up the shared process in case there are many events
-    await invoke('FileWatcher.handleChange', event);
+  if (has(id)) {
+    return fromError(new Error(`watcher ${id} is already registered`));
+  }
+  const controller = new AbortController();
+  const watcherEntries = [];
+  let ready = false;
+  let closing;
+  const callback = (eventName, path) => {
+    if (!controller.signal.aborted) {
+      send(normalizeEvent2(id, eventName, path));
+    }
   };
-  const callback = (eventName, path, stats) => {
-    void callBackInternal(eventName, path);
+  const errorCallback = error => {
+    console.error(`[file-watcher-process] ${error}`);
+    if (controller.signal.aborted) return;
+    if (ready) {
+      send({
+        ...fromError(error),
+        eventName: 'error',
+        id,
+        uri: ''
+      });
+    }
+    controller.abort(error);
   };
-  const watcherEntries = [];
+  controller.signal.addEventListener('abort', () => {
+    remove(id);
+    closing = Promise.allSettled(watcherEntries.map(({
+      watcher
+    }) => watcher.close()));
+  }, {
+    once: true
+  });
+  // Register before asynchronous setup so disposal also cancels a pending watch.
+  add(id, controller);
   try {
     for (const root of roots) {
+      controller.signal.throwIfAborted();
       const path = fileURLToPath(root);
       const ignored = useGitIgnore ? await createIgnored(path, exclude, true) : createExcludedNamesFilter(exclude);
+      controller.signal.throwIfAborted();
       const watcher = new FSWatcher({
+        ...(depth !== undefined && {
+          depth
+        }),
         ignored,
         ignoreInitial: true,
-        ignorePermissionErrors: true
+        ignorePermissionErrors: false
       });
       watcher.on('error', errorCallback);
-      const readyPromise = waitForWatcherToBeReady(watcher);
+      watcher.on('all', callback);
+      const readyPromise = waitForWatcherToBeReady(watcher, controller.signal);
+      // Later roots can fail before Promise.all is reached.
+      void readyPromise.catch(() => {});
       watcherEntries.push({
         readyPromise,
         watcher
@@ -1463,31 +1504,16 @@ const watchFolders = async ({
     await Promise.all(watcherEntries.map(({
       readyPromise
     }) => readyPromise));
+    controller.signal.throwIfAborted();
+    ready = true;
+    const inotifyWatchCount = await getInotifyWatchCount();
+    controller.signal.throwIfAborted();
+    return inotifyWatchCount === undefined ? success : successWithInotifyWatchCount(inotifyWatchCount);
   } catch (error) {
-    await Promise.allSettled(watcherEntries.map(({
-      watcher
-    }) => watcher.close()));
+    controller.abort(error);
+    await closing;
     return fromError(error);
   }
-  for (const {
-    watcher
-  } of watcherEntries) {
-    watcher.on('all', callback);
-  }
-  const controller = new AbortController();
-  controller.signal.addEventListener('abort', () => {
-    void Promise.allSettled(watcherEntries.map(({
-      watcher
-    }) => watcher.close()));
-  }, {
-    once: true
-  });
-  add(id, controller);
-  const inotifyWatchCount = await getInotifyWatchCount();
-  if (inotifyWatchCount === undefined) {
-    return success;
-  }
-  return successWithInotifyWatchCount(inotifyWatchCount);
 };
 
 const commandMap = {

package/package.json

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