Skip to content

Fix crash on processing devtools event #1875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dwds/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
- Pre-warm expression compiler cache to speed up Flutter Inspector loading.
- Remove `ChromeProxyService.setExceptionPauseMode()`.
- Display full error on failure to start DDS.
- Fix crash on processing DevTools event when starting DevTools from observatory
uri.

## 16.0.1

Expand Down
38 changes: 22 additions & 16 deletions dwds/lib/src/dwds_vm_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -153,29 +153,35 @@ void _processSendEvent(Map<String, dynamic> event,
final action = payload?['action'] as String?;
final screen = payload?['screen'] as String?;
if (screen != null && action == 'pageReady') {
if (dwdsStats.isFirstDebuggerReady) {
final debuggerReadyTime = DateTime.now()
.difference(dwdsStats.devToolsStart)
.inMilliseconds;
emitEvent(DwdsEvent.devToolsLoad(debuggerReadyTime, screen));
_logger.fine('DevTools load time: $debuggerReadyTime ms');
final debuggerStartTime = DateTime.now()
.difference(dwdsStats.debuggerStart)
.inMilliseconds;
emitEvent(DwdsEvent.debuggerReady(debuggerStartTime, screen));
_logger.fine('Debugger ready time: $debuggerStartTime ms');
} else {
_logger
.finest('Debugger and DevTools startup times already recorded.'
' Ignoring $event.');
}
_recordDwdsStats(dwdsStats, screen);
} else {
_logger.finest('Ignoring unknown event: $event');
}
}
}
}

void _recordDwdsStats(DwdsStats dwdsStats, String screen) {
if (dwdsStats.isFirstDebuggerReady) {
final devToolsStart = dwdsStats.devToolsStart;
final debuggerStart = dwdsStats.debuggerStart;
if (devToolsStart != null) {
final devToolLoadTime =
DateTime.now().difference(devToolsStart).inMilliseconds;
emitEvent(DwdsEvent.devToolsLoad(devToolLoadTime, screen));
_logger.fine('DevTools load time: $devToolLoadTime ms');
}
if (debuggerStart != null) {
final debuggerReadyTime =
DateTime.now().difference(debuggerStart).inMilliseconds;
emitEvent(DwdsEvent.debuggerReady(debuggerReadyTime, screen));
_logger.fine('Debugger ready time: $debuggerReadyTime ms');
}
} else {
_logger.finest('Debugger and DevTools stats are already recorded.');
}
}

Future<Map<String, dynamic>> _hotRestart(
ChromeProxyService chromeProxyService, VmService client) async {
_logger.info('Attempting a hot restart');
Expand Down
8 changes: 4 additions & 4 deletions dwds/lib/src/events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import 'package:vm_service/vm_service.dart';

class DwdsStats {
/// The time when the user starts the debugger.
late DateTime _debuggerStart;
DateTime get debuggerStart => _debuggerStart;
DateTime? _debuggerStart;
DateTime? get debuggerStart => _debuggerStart;

/// The time when dwds launches DevTools.
late DateTime _devToolsStart;
DateTime get devToolsStart => _devToolsStart;
DateTime? _devToolsStart;
DateTime? get devToolsStart => _devToolsStart;

/// Records and returns weither the debugger is ready.
bool _isFirstDebuggerReady = true;
Expand Down