From 8e687c906f73c8e4e8eb9918e52330de90ffa8cf Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Thu, 10 Mar 2022 11:26:37 -0800 Subject: [PATCH 1/2] Removed verbose printing on DevTools events, test webdev with local dwds --- dwds/CHANGELOG.md | 3 +++ dwds/lib/src/dwds_vm_client.dart | 20 +++++++++++++------- dwds/lib/src/injected/client.js | 2 +- dwds/pubspec.yaml | 2 +- webdev/lib/src/version.dart | 2 +- webdev/pubspec.yaml | 10 +++++----- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 01e3e2053..80ce3d895 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -10,6 +10,9 @@ - Add an `ide` query parameter to the Dart DevTools URL for analytics. - Fix a race where injected client crashed on events send just before hot restart. +- Remove verbose printing on receiving DevTools events. +- Update `vm_service` version to `^8.2.0`. + **Breaking changes:** - `Dwds.start` and `ExpressionCompilerService` now take diff --git a/dwds/lib/src/dwds_vm_client.dart b/dwds/lib/src/dwds_vm_client.dart index 8ebfb6269..52d6e0bb5 100644 --- a/dwds/lib/src/dwds_vm_client.dart +++ b/dwds/lib/src/dwds_vm_client.dart @@ -150,25 +150,31 @@ void _processSendEvent(Map event, switch (type) { case 'DevtoolsEvent': { + _logger.finest('Received DevTools event: $event'); var action = payload == null ? null : payload['action']; if (action == 'pageReady') { if (dwdsStats.isFirstDebuggerReady) { if (dwdsStats.devToolsStart != null) { - emitEvent(DwdsEvent.devToolsLoad(DateTime.now() + var time = DateTime.now() .difference(dwdsStats.devToolsStart) - .inMilliseconds)); + .inMilliseconds; + emitEvent(DwdsEvent.devToolsLoad(time)); + _logger.fine('DevTools load time: $time ms'); } if (dwdsStats.debuggerStart != null) { - emitEvent(DwdsEvent.debuggerReady(DateTime.now() + var time = DateTime.now() .difference(dwdsStats.debuggerStart) - .inMilliseconds)); + .inMilliseconds; + emitEvent(DwdsEvent.debuggerReady(time)); + _logger.fine('Debugger ready time: $time ms'); } } else { - print('Ignoring already received event: $event'); - _logger.warning('Ignoring already received event: $event'); + _logger + .finest('Debugger and DevTools startup times alredy recorded.' + ' Ignoring $event.'); } } else { - _logger.warning('Ignoring unknown event: $event'); + _logger.finest('Ignoring unknown event: $event'); } } } diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index d25c60a3d..936b99e6d 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.unsound, csp), the Dart to JavaScript compiler version: 2.17.0-162.0.dev. +// Generated by dart2js (NullSafetyMode.unsound, csp), the Dart to JavaScript compiler version: 2.17.0-169.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index de9ad15c1..cf74b883b 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: stack_trace: ^1.10.0 sse: ^4.1.0 uuid: '>=2.0.0 <4.0.0' - vm_service: ^8.1.0 + vm_service: ^8.2.0 web_socket_channel: ^2.0.0 webkit_inspection_protocol: ^1.0.0 diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart index 3c5f39d6d..285214122 100644 --- a/webdev/lib/src/version.dart +++ b/webdev/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '2.7.8'; +const packageVersion = '2.7.9-dev'; diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index 6463845cb..eaf6ba93a 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -1,6 +1,6 @@ name: webdev # Every time this changes you need to run `dart run build_runner build`. -version: 2.7.8 +version: 2.7.9-dev # We should not depend on a dev SDK before publishing. # publish_to: none homepage: https://github.com/dart-lang/webdev @@ -47,10 +47,10 @@ dev_dependencies: test_process: ^2.0.2 webdriver: ^3.0.0 -# Uncomment for development versions -# dependency_overrides: -# dwds: -# path: ../dwds +# Comment out before releasing webdev. +dependency_overrides: + dwds: + path: ../dwds executables: webdev: From 14a77bc7fd1bbecc3b84f159802f4752f8f11d1d Mon Sep 17 00:00:00 2001 From: Anna Gringauze Date: Thu, 10 Mar 2022 11:38:04 -0800 Subject: [PATCH 2/2] Fix analyzer warnings --- webdev/lib/src/serve/webdev_server.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webdev/lib/src/serve/webdev_server.dart b/webdev/lib/src/serve/webdev_server.dart index f3327e3f4..b73224547 100644 --- a/webdev/lib/src/serve/webdev_server.dart +++ b/webdev/lib/src/serve/webdev_server.dart @@ -132,7 +132,7 @@ class WebDevServer { options.configuration.hostname, options.port, assetHandler, - options.configuration.verbose, + verbose: options.configuration.verbose, ); } var shouldServeDevTools =