Fix occasional PathNotFoundException for transient directories on Windows.

Author: davidmorgan

pkgs/watcher/CHANGELOG.md

@@ -1,10 +1,12 @@
-## 1.1.3-wip
+## 1.1.3
 
 - Improve handling of
   `FileSystemException: Directory watcher closed unexpectedly` on Windows. The
   watcher was already attempting to restart after this error and resume sending
   events. But, the restart would sometimes silently fail. Now, it is more
   reliable.
+- Improving handling of directories that are created then immediately deleted on
+  Windows. Previously, that could cause a `PathNotfoundException` to be thrown.
 
 ## 1.1.2
 

pkgs/watcher/lib/src/directory_watcher/windows.dart

@@ -21,7 +21,7 @@ class WindowsDirectoryWatcher extends ResubscribableWatcher
   String get directory => path;
 
   WindowsDirectoryWatcher(String directory)
-      : super(directory, () => _WindowsDirectoryWatcher(directory));
+    : super(directory, () => _WindowsDirectoryWatcher(directory));
 }
 
 class _EventBatcher {
@@ -169,9 +169,10 @@ class _WindowsDirectoryWatcher
   void _onBatch(List<FileSystemEvent> batch) {
     _sortEvents(batch).forEach((path, eventSet) {
       var canonicalEvent = _canonicalEvent(eventSet);
-      var events = canonicalEvent == null
-          ? _eventsBasedOnFileSystem(path)
-          : [canonicalEvent];
+      var events =
+          canonicalEvent == null
+              ? _eventsBasedOnFileSystem(path)
+              : [canonicalEvent];
 
       for (var event in events) {
         if (event is FileSystemCreateEvent) {
@@ -198,7 +199,11 @@ class _WindowsDirectoryWatcher
           });
           subscription.onError((Object e, StackTrace stackTrace) {
             _listSubscriptions.remove(subscription);
-            _emitError(e, stackTrace);
+            // "Path not found" can be caused by creating then quickly removing
+            // a directory: continue without reporting an error.
+            if (e is! PathNotFoundException) {
+              _emitError(e, stackTrace);
+            }
           });
           _listSubscriptions.add(subscription);
         } else if (event is FileSystemModifyEvent) {

pkgs/watcher/pubspec.yaml

@@ -1,5 +1,5 @@
 name: watcher
-version: 1.1.3-wip
+version: 1.1.3
 description: >-
   A file system watcher. It monitors changes to contents of directories and
   sends notifications when files have been added, removed, or modified.

pkgs/watcher/test/directory_watcher/windows_test.dart

@@ -66,6 +66,52 @@ void main() {
     },
   );
 
+  // Regression test for https://github.com/dart-lang/tools/issues/2152:
+  // watcher can throws if a directory is created then quickly deleted.
+  group('Transient directory', () {
+    late StreamSubscription<Object> subscription;
+    late Directory temp;
+    late Watcher watcher;
+    late int errorsSeen;
+
+    setUp(() async {
+      temp = Directory.systemTemp.createTempSync();
+      watcher = DirectoryWatcher(temp.path);
+      errorsSeen = 0;
+      subscription = watcher.events.listen(
+        (e) {},
+        onError: (Object e, _) {
+          print('Event stream error: $e');
+          ++errorsSeen;
+        },
+      );
+      await watcher.ready;
+    });
+
+    tearDown(() {
+      subscription.cancel();
+    });
+
+    test('does not break watching', () async {
+      // Iterate creating 10 directories and deleting 1-10 of them. This means
+      // the directories will exist for different lengths of times, exploring
+      // possible race conditions in directory handling.
+      for (var i = 0; i != 50; ++i) {
+        for (var j = 0; j != 10; ++j) {
+          File('${temp.path}\\$j\\file').createSync(recursive: true);
+        }
+        await Future<void>.delayed(const Duration(milliseconds: 1));
+        for (var j = 0; j != i % 10 + 1; ++j) {
+          final d = Directory('${temp.path}\\$j');
+          d.deleteSync(recursive: true);
+        }
+        await Future<void>.delayed(const Duration(milliseconds: 1));
+      }
+
+      expect(errorsSeen, 0);
+    });
+  });
+
   // The Windows native watcher has a buffer that gets exhausted if events are
   // not handled quickly enough. Then, it throws an error and stops watching.
   // The exhaustion is reliably triggered if enough events arrive during a sync