Skip to content

fix(file-service): improve watcher reliability and fix memory leaks #4694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coffeedeveloper merged 6 commits into from
Jan 27, 2026
Merged

fix(file-service): improve watcher reliability and fix memory leaks #4694

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee6ae8a
fix(file-service): fix recursive file path bug
coffeedeveloper Jan 22, 2026
a50cfca
fix(file-watcher): fix sort path change issue
coffeedeveloper Jan 22, 2026
94bef07
fix(file-watcher): improve watcher reliability and fix memory leaks
coffeedeveloper Jan 23, 2026
c27e99d
fix(file-service): prevent operations after recursive watcher disposal
coffeedeveloper Jan 23, 2026
11b134a
fix(watcher): await async watcher server initialization
coffeedeveloper Jan 23, 2026
4d8f4ce
fix(watcher): defer init until pending watch registered
coffeedeveloper Jan 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions packages/file-service/src/node/hosted/recursive/file-service-watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@ export class RecursiveFileSystemWatcher extends Disposable implements IWatcher {
});
}

private async resolveWatchPath(basePath: string): Promise<string> {
try {
return await fs.realpath(basePath);
} catch (e) {
return basePath;
}
}

private async doWatchFileChange(uri: string, options?: WatchOptions) {
const basePath = FileUri.fsPath(uri);
this.logger.log('[Recursive] watch file changes: ', uri, 'basePath:', basePath);
Expand All @@ -128,18 +136,20 @@ export class RecursiveFileSystemWatcher extends Disposable implements IWatcher {
return;
}

// 记录原始请求与真实监听目录的映射，方便后续释放
this.watchPathMap.set(basePath, watchPath);
const realWatchPath = await this.resolveWatchPath(watchPath);

// 先检查并清理已存在的 handler（使用 watchPath 确保目录级别的去重）
if (this.WATCHER_HANDLERS.has(watchPath!)) {
this.logger.debug(`[Recursive] Cleaning up existing watcher for directory: ${watchPath}`);
const handler = this.WATCHER_HANDLERS.get(watchPath!);
if (this.WATCHER_HANDLERS.has(realWatchPath)) {
this.logger.debug(`[Recursive] Cleaning up existing watcher for directory: ${realWatchPath}`);
const handler = this.WATCHER_HANDLERS.get(realWatchPath);
handler?.disposable.dispose();
this.WATCHER_HANDLERS.delete(watchPath!);
this.cleanupWatchPathMap(watchPath);
this.WATCHER_HANDLERS.delete(realWatchPath);
this.cleanupWatchPathMap(realWatchPath);
}

// 记录原始请求与真实监听目录的映射，方便后续释放
this.watchPathMap.set(basePath, realWatchPath);
Comment thread
coffeedeveloper marked this conversation as resolved.

const handler = (err, events: ParcelWatcher.Event[]) => {
if (err) {
this.logger.error(`[Recursive] Watching ${watchPath} error: `, err);
Expand All @@ -161,13 +171,13 @@ export class RecursiveFileSystemWatcher extends Disposable implements IWatcher {
}
};

this.WATCHER_HANDLERS.set(watchPath, {
path: watchPath,
this.WATCHER_HANDLERS.set(realWatchPath, {
path: realWatchPath,
disposable: toDisposeWatcher,
handlers: [handler],
});

toDisposeWatcher.push(await this.start(watchPath, options));
toDisposeWatcher.push(await this.start(realWatchPath, options));
this.addDispose(toDisposeWatcher);
}

Expand Down Expand Up @@ -212,7 +222,7 @@ export class RecursiveFileSystemWatcher extends Disposable implements IWatcher {
return new DisposableCollection();
}

const realPath = await fs.realpath(basePath);
const realPath = await this.resolveWatchPath(basePath);
const shouldUseNSFW = await this.shouldUseNSFW();

if (shouldUseNSFW) {
Expand Down
Loading