Prepare DWDS 16.0.2 for hotfix into Flutter to fix flutter_tools …

…crash (#1867)
dart-lang · Jan 6, 2023 · 44b39a9 · 44b39a9
1 parent cb06447
commit 44b39a9
Show file tree

Hide file tree

Showing 8 changed files with 257 additions and 277 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 16.0.2
+- Don't complete an already completed `Completer` in `ChromeProxyService` to fix
+  Flutter tools crash: https://github.com/dart-lang/webdev/pull/1862
+
 ## 16.0.1
 
 - Allow the following API to return `null` and add error handling:

diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart
@@ -257,7 +257,13 @@ class ChromeProxyService implements VmServiceInterface {
 
     unawaited(appConnection.onStart.then((_) async {
       await debugger.resumeFromStart();
-      _startedCompleter.complete();
+      if (!_startedCompleter.isCompleted) {
+        _startedCompleter.complete();
+      } else {
+        // See https://github.com/flutter/flutter/issues/117676:
+        _logger
+            .warning('Unexpected state, debugging may not work as expected.');
+      }
     }));
 
     unawaited(appConnection.onDone.then((_) => destroyIsolate()));

diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
diff --git a/dwds/mono_pkg.yaml b/dwds/mono_pkg.yaml
@@ -15,12 +15,10 @@ stages:
       - command: Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
       - test:
       sdk:
-        - dev
         - stable
     - test:
       os: windows
       sdk:
-        - dev
         - stable
   - beta_cron:
     - analyze: .

diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 16.0.1
+version: 16.0.2
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.

diff --git a/tool/ci.sh b/tool/ci.sh