Change to recognize pageReady dwds event from devtools (#1411)

* Change to recognize pageReady dwds event from devtools

* Disable test that depends on unpublished version of devtools

* Addressed CR comments

Author: Anna Gringauze

dwds/CHANGELOG.md

@@ -9,7 +9,7 @@
     'type': '<event type>',
     'payload': {
       'screen: '<screen name>',
-      'action: '<action name>',
+      'action: '<action name>'
     }
   }
   ```
@@ -18,8 +18,8 @@
   {
     'type: 'DevtoolsEvent',
     'payload': {
-      'screen': 'debugger'
-      'action': 'screenReady'
+      'screen': 'debugger',
+      'action': 'pageReady'
     }
   }
   ```

dwds/lib/src/dwds_vm_client.dart

@@ -203,12 +203,14 @@ void _processSendEvent(Map<String, dynamic> event,
       {
         var screen = payload == null ? null : payload['screen'];
         var action = payload == null ? null : payload['action'];
-        if (screen == 'debugger' &&
-            action == 'screenReady' &&
-            dwdsStats.isFirstDebuggerReady()) {
-          emitEvent(DwdsEvent.debuggerReady(DateTime.now()
-              .difference(dwdsStats.debuggerStart)
-              .inMilliseconds));
+        if (screen == 'debugger' && action == 'pageReady') {
+          if (dwdsStats.isFirstDebuggerReady()) {
+            emitEvent(DwdsEvent.debuggerReady(DateTime.now()
+                .difference(dwdsStats.debuggerStart)
+                .inMilliseconds));
+          } else {
+            _logger.warning('Ignoring already received event: $event');
+          }
         } else {
           _logger.warning('Ignoring unknown event: $event');
         }

dwds/test/events_test.dart

@@ -74,10 +74,14 @@ void main() {
 
   test('emits DEBUGGER_READY event', () async {
     await expectEventDuring(
-      matchesEvent(DwdsEventKind.debuggerReady, {}),
+      matchesEvent(DwdsEventKind.debuggerReady, {
+        'elapsedMilliseconds': isNotNull,
+      }),
       () => keyboard.sendChord([Keyboard.alt, 'd']),
     );
-  }, skip: 'https://github.com/dart-lang/webdev/issues/1406');
+  },
+      skip: 'Enable after publishing of '
+          'https://github.com/flutter/devtools/pull/3346');
 
   test('events can be listened to multiple times', () async {
     events.listen((_) {});
@@ -94,18 +98,6 @@ void main() {
     expect(response.type, 'Success');
   });
 
-  test('can receive DevtoolsEvent and emit DEBUGGER_READY event', () async {
-    final response = await expectEventDuring(
-        matchesEvent(DwdsEventKind.debuggerReady, {
-          'elapsedMilliseconds': isNotNull,
-        }),
-        () => vmService.callServiceExtension('ext.dwds.sendEvent', args: {
-              'type': 'DevtoolsEvent',
-              'payload': {'screen': 'debugger', 'action': 'screenReady'},
-            }));
-    expect(response.type, 'Success');
-  });
-
   group('evaluate', () {
     Isolate isolate;
     LibraryRef bootstrap;
@@ -275,7 +267,7 @@ void main() {
 
     test('emits GET_SCRIPTS events', () async {
       await expectEventDuring(
-          matchesEvent(DwdsEventKind.getSourceReport, {
+          matchesEvent(DwdsEventKind.getScripts, {
             'elapsedMilliseconds': isNotNull,
           }),
           () => service.getScripts(isolateId));