Merge branch 'master' into remove-prints

dwds/CHANGELOG.md

@@ -1,10 +1,13 @@
-## 23.4.0-wip
+## 24.0.0-wip
 
-- Rename `dart_library.js` to `ddc_module_loader.js` to match SDK naming changes. - [#2360](https://github.com/dart-lang/webdev/pull/2360)
 - Implement `setFlag` when it is called with `pause_isolates_on_start`. - [#2373](https://github.com/dart-lang/webdev/pull/2373)
 - Do not persist breakpoints across hot restarts or page reloads. - [#2371](https://github.com/dart-lang/webdev/pull/2371)
 - If `pause_isolates_on_start` is `true`, wait for `resume` to run the app's `main` method. - [#2378](https://github.com/dart-lang/webdev/pull/2378)
 
+**Breaking changes**
+
+- Rename `dart_library.js` to `ddc_module_loader.js` to match SDK naming changes. - [#2360](https://github.com/dart-lang/webdev/pull/2360)
+
 ## 23.3.0
 
 - Filter out internal type properties from the new DDC type system. - [#2348](https://github.com/dart-lang/webdev/pull/2348)

dwds/lib/src/services/chrome_proxy_service.dart

@@ -1548,6 +1548,11 @@ ${globalToolConfiguration.loadStrategy.loadModuleSnippet}("dart_sdk").developer.
     return _rpcNotSupportedFuture('getVMTimelineMicros');
   }
 
+  @override
+  Future<void> yieldControlToDDS(String uri) async {
+    // TODO(elliette): implement
+  }
+
   @override
   Future<InboundReferences> getInboundReferences(
     String isolateId,

dwds/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 23.4.0-wip
+version: 24.0.0-wip
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.
@@ -33,8 +33,8 @@ dependencies:
   stack_trace: ^1.10.0
   sse: ^4.1.2
   uuid: ^3.0.6
-  vm_service: ">=13.0.0 <15.0.0"
-  vm_service_interface: 1.0.1
+  vm_service: ^14.0.0
+  vm_service_interface: 1.1.0
   web_socket_channel: ^2.2.0
   webkit_inspection_protocol: ^1.0.1
 

dwds/test/chrome_proxy_service_test.dart

@@ -2064,22 +2064,34 @@ void main() {
     });
 
     group('setFlag', () {
-      test('pause_isolates_on_start set to true', () {
+      test('pause_isolates_on_start set to true', () async {
         final service = context.service;
         expect(
           service.setFlag('pause_isolates_on_start', 'true'),
           completion(_isSuccess),
         );
-        expect(context.dwds!.shouldPauseIsolatesOnStart, equals(true));
+        // Re-try until sucess because the value doesn't get updated
+        // synchronously (it is sent over a stream):
+        final pauseIsolatesOnStart = await retryFn(
+          () => context.dwds!.shouldPauseIsolatesOnStart,
+          expectedResult: true,
+        );
+        expect(pauseIsolatesOnStart, equals(true));
       });
 
-      test('pause_isolates_on_start set to false', () {
+      test('pause_isolates_on_start set to false', () async {
         final service = context.service;
         expect(
           service.setFlag('pause_isolates_on_start', 'false'),
           completion(_isSuccess),
         );
-        expect(context.dwds!.shouldPauseIsolatesOnStart, equals(false));
+        // Re-try until sucess because the value doesn't get updated
+        // synchronously (it is sent over a stream):
+        final pauseIsolatesOnStart = await retryFn(
+          () => context.dwds!.shouldPauseIsolatesOnStart,
+          expectedResult: false,
+        );
+        expect(pauseIsolatesOnStart, equals(false));
       });
 
       test('pause_isolates_on_start set to invalid value', () {
@@ -2444,3 +2456,5 @@ final _isSuccess = isA<Success>();
 
 TypeMatcher _libRef(uriMatcher) =>
     isA<LibraryRef>().having((l) => l.uri, 'uri', uriMatcher);
+
+void expectEventually(Matcher expectation) {}

dwds/test/debug_service_test.dart

@@ -47,83 +47,93 @@ void main() {
     );
   });
 
-  test('Refuses additional connections when in single client mode', () async {
-    final ddsWs = await WebSocket.connect(
-      '${context.debugConnection.uri}/ws',
-    );
-    final completer = Completer<void>();
-    ddsWs.listen((event) {
-      final response = json.decode(event as String);
+  test(
+    'Refuses additional connections when in single client mode',
+    () async {
+      final ddsWs = await WebSocket.connect(
+        '${context.debugConnection.uri}/ws',
+      );
+      final completer = Completer<void>();
+      ddsWs.listen((event) {
+        final response = json.decode(event as String);
+        expect(response['id'], '0');
+        expect(response.containsKey('result'), isTrue);
+        final result = response['result'] as Map<String, dynamic>;
+        expect(result['type'], 'Success');
+        completer.complete();
+      });
+
+      const yieldControlToDDS = <String, dynamic>{
+        'jsonrpc': '2.0',
+        'id': '0',
+        'method': '_yieldControlToDDS',
+        'params': {
+          'uri': 'http://localhost:123',
+        },
+      };
+      ddsWs.add(json.encode(yieldControlToDDS));
+      await completer.future;
+
+      // While DDS is connected, expect additional connections to fail.
+      await expectLater(
+        WebSocket.connect('${context.debugConnection.uri}/ws'),
+        throwsA(isA<WebSocketException>()),
+      );
+
+      // However, once DDS is disconnected, additional clients can connect again.
+      await ddsWs.close();
+      expect(
+        WebSocket.connect('${context.debugConnection.uri}/ws')
+            .then((ws) => ws.close()),
+        completes,
+      );
+    },
+    // TODO(elliette): Re-enable test.
+    skip: true,
+  );
+
+  test(
+    'Refuses to yield to dwds if existing clients found',
+    () async {
+      final ddsWs = await WebSocket.connect(
+        '${context.debugConnection.uri}/ws',
+      );
+
+      // Connect to vm service.
+      final ws = await WebSocket.connect('${context.debugConnection.uri}/ws');
+
+      final completer = Completer<Map<String, dynamic>>();
+      ddsWs.listen((event) {
+        completer.complete(json.decode(event as String));
+      });
+
+      const yieldControlToDDS = <String, dynamic>{
+        'jsonrpc': '2.0',
+        'id': '0',
+        'method': '_yieldControlToDDS',
+        'params': {
+          'uri': 'http://localhost:123',
+        },
+      };
+
+      // DDS should fail to start with existing vm clients.
+      ddsWs.add(json.encode(yieldControlToDDS));
+
+      final response = await completer.future;
       expect(response['id'], '0');
-      expect(response.containsKey('result'), isTrue);
-      final result = response['result'] as Map<String, dynamic>;
-      expect(result['type'], 'Success');
-      completer.complete();
-    });
-
-    const yieldControlToDDS = <String, dynamic>{
-      'jsonrpc': '2.0',
-      'id': '0',
-      'method': '_yieldControlToDDS',
-      'params': {
-        'uri': 'http://localhost:123',
-      },
-    };
-    ddsWs.add(json.encode(yieldControlToDDS));
-    await completer.future;
-
-    // While DDS is connected, expect additional connections to fail.
-    await expectLater(
-      WebSocket.connect('${context.debugConnection.uri}/ws'),
-      throwsA(isA<WebSocketException>()),
-    );
-
-    // However, once DDS is disconnected, additional clients can connect again.
-    await ddsWs.close();
-    expect(
-      WebSocket.connect('${context.debugConnection.uri}/ws')
-          .then((ws) => ws.close()),
-      completes,
-    );
-  });
-
-  test('Refuses to yield to dwds if existing clients found', () async {
-    final ddsWs = await WebSocket.connect(
-      '${context.debugConnection.uri}/ws',
-    );
-
-    // Connect to vm service.
-    final ws = await WebSocket.connect('${context.debugConnection.uri}/ws');
-
-    final completer = Completer<Map<String, dynamic>>();
-    ddsWs.listen((event) {
-      completer.complete(json.decode(event as String));
-    });
-
-    const yieldControlToDDS = <String, dynamic>{
-      'jsonrpc': '2.0',
-      'id': '0',
-      'method': '_yieldControlToDDS',
-      'params': {
-        'uri': 'http://localhost:123',
-      },
-    };
-
-    // DDS should fail to start with existing vm clients.
-    ddsWs.add(json.encode(yieldControlToDDS));
-
-    final response = await completer.future;
-    expect(response['id'], '0');
-    expect(response.containsKey('error'), isTrue);
-
-    final result = response['error'] as Map<String, dynamic>;
-    expect(result['message'], 'Feature is disabled.');
-    expect(
-      result['data'],
-      'Existing VM service clients prevent DDS from taking control.',
-    );
-
-    await ddsWs.close();
-    await ws.close();
-  });
+      expect(response.containsKey('error'), isTrue);
+
+      final result = response['error'] as Map<String, dynamic>;
+      expect(result['message'], 'Feature is disabled.');
+      expect(
+        result['data'],
+        'Existing VM service clients prevent DDS from taking control.',
+      );
+
+      await ddsWs.close();
+      await ws.close();
+    },
+    // TODO(elliette): Re-enable test.
+    skip: true,
+  );
 }

dwds/test/fixtures/utilities.dart

@@ -42,12 +42,14 @@ int daemonPort(String workingDirectory) {
 String _assetServerPortFilePath(String workingDirectory) =>
     '${daemonWorkspace(workingDirectory)}/.asset_server_port';
 
-/// Retries a callback function with a delay until the result is non-null.
+/// Retries a callback function with a delay until the result is the
+/// [expectedResult] (if provided) or is not null.
 Future<T> retryFn<T>(
   T Function() callback, {
   int retryCount = 3,
   int delayInMs = 1000,
   String failureMessage = 'Function did not succeed after retries.',
+  T? expectedResult,
 }) async {
   if (retryCount == 0) {
     throw Exception(failureMessage);
@@ -56,7 +58,8 @@ Future<T> retryFn<T>(
   await Future.delayed(Duration(milliseconds: delayInMs));
   try {
     final result = callback();
-    if (result != null) return result;
+    if (expectedResult != null && result == expectedResult) return result;
+    if (expectedResult == null && result != null) return result;
   } catch (_) {
     // Ignore any exceptions.
   }

webdev/pubspec.yaml

@@ -34,7 +34,8 @@ dependencies:
   shelf_static: ^1.1.0
   stack_trace: ^1.10.0
   sse: ^4.1.0
-  vm_service: ">=10.1.0 <15.0.0"
+  vm_service: ^14.0.0
+  vm_service_interface: 1.1.0
   webkit_inspection_protocol: ^1.0.1
   yaml: ^3.1.1
 

webdev/test/integration_test.dart

@@ -210,7 +210,9 @@ void main() {
 
         await checkProcessStdout(process, [
           'webdev could not run for this project.',
-          'Could not find a file named "pubspec.yaml"'
+          // TODO(https://github.com/dart-lang/webdev/issues/2393): Uncomment
+          // this line:
+          // 'Found no `pubspec.yaml` file',
         ]);
         await process.shouldExit(78);
       });