fix: will watch same folder multiple times (#3831)

opensumi · Jul 3, 2024 · a8a96d3 · a8a96d3
1 parent 4c1e2ec
commit a8a96d3
Showing 1 changed file with 26 additions and 11 deletions.
diff --git a/packages/file-service/src/node/recursive/file-service-watcher.ts b/packages/file-service/src/node/recursive/file-service-watcher.ts
@@ -28,6 +28,13 @@ export interface WatcherOptions {
   excludes: string[];
 }
 
+const watcherPlaceHolder = {
+  disposable: {
+    dispose: () => {},
+  },
+  handlers: [],
+};
+
 /**
  * @deprecated
  */
@@ -88,18 +95,24 @@ export class FileSystemWatcherServer implements IFileSystemWatcherServer {
    */
   async watchFileChanges(uri: string, options?: WatchOptions): Promise<number> {
     const basePath = FileUri.fsPath(uri);
-    const exist = await fs.pathExists(basePath);
 
     let watcherId = this.checkIsAlreadyWatched(basePath);
     if (watcherId) {
       return watcherId;
     }
 
     watcherId = FileSystemWatcherServer.WATCHER_SEQUENCE++;
+    this.WATCHER_HANDLERS.set(watcherId, {
+      ...watcherPlaceHolder,
+      path: basePath,
+    });
+
     const toDisposeWatcher = new DisposableCollection();
-    let watchPath;
+    let watchPath: string;
+
+    const exist = await fs.pathExists(basePath);
     if (exist) {
-      const stat = await fs.lstatSync(basePath);
+      const stat = await fs.lstat(basePath);
       if (stat && stat.isDirectory()) {
         watchPath = basePath;
       } else {
@@ -116,14 +129,16 @@ export class FileSystemWatcherServer implements IFileSystemWatcherServer {
       }
       events = this.trimChangeEvent(events);
       for (const event of events) {
-        if (event.type === 'create') {
-          this.pushAdded(event.path);
-        }
-        if (event.type === 'delete') {
-          this.pushDeleted(event.path);
-        }
-        if (event.type === 'update') {
-          this.pushUpdated(event.path);
+        switch (event.type) {
+          case 'create':
+            this.pushAdded(event.path);
+            break;
+          case 'delete':
+            this.pushDeleted(event.path);
+            break;
+          case 'update':
+            this.pushUpdated(event.path);
+            break;
         }
       }
     };