fix: delete watcherMap when watcher is disposed (#2910)

opensumi · Jul 20, 2023 · 9181a0b · 9181a0b
1 parent 2d8d536
commit 9181a0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/file-service/src/browser/file-service-client.ts b/packages/file-service/src/browser/file-service-client.ts
@@ -332,8 +332,14 @@ export class FileServiceClient implements IFileServiceClient {
   // 添加监听文件
   async watchFileChanges(uri: URI, excludes?: string[]): Promise<IFileServiceWatcher> {
     const _uri = this.convertUri(uri.toString());
-    if (this.uriWatcherMap.has(_uri.toString())) {
-      return this.uriWatcherMap.get(_uri.toString())!;
+    const originWatcher = this.uriWatcherMap.get(_uri.toString());
+    if (originWatcher) {
+      // 这里兼容重连逻辑，重连时 watcher 会 disposed，需要重新生成
+      if (!originWatcher.isDisposed()) {
+        return originWatcher;
+      } else {
+        this.uriWatcherMap.delete(_uri.toString());
+      }
     }
 
     const id = this.watcherId++;

diff --git a/packages/file-service/src/browser/watcher.ts b/packages/file-service/src/browser/watcher.ts
@@ -43,4 +43,8 @@ export class FileSystemWatcher implements IFileServiceWatcher {
       this.fileServiceClient.unwatchFileChanges(this.watchId),
     ]) as any;
   }
+
+  isDisposed() {
+    return this.toDispose.disposed;
+  }
 }