Skip to content

Revert "Don't wait on stream listening in DevTools start up " #3351

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.

Sign up for GitHub

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
jacob314 merged 1 commit into from
Sep 10, 2021
+16 −17
Merged

Revert "Don't wait on stream listening in DevTools start up " #3351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 16 additions & 17 deletions packages/devtools_app/lib/src/service_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,19 @@ class ServiceConnectionManager {

service.onEvent(serviceStreamName).listen(handleServiceEvent);

_connectedState.value = const ConnectedState(true);

final isolates = [
...vm.isolates,
if (preferences.vmDeveloperModeEnabled.value) ...vm.systemIsolates,
];

await isolateManager.init(isolates);
if (service != this.service) {
// A different service has been opened.
return;
}

final streamIds = [
EventStreams.kDebug,
EventStreams.kExtension,
Expand All @@ -258,9 +271,9 @@ class ServiceConnectionManager {
serviceStreamName,
];

for (final id in streamIds) {
await Future.wait(streamIds.map((String id) async {
try {
unawaited(service.streamListen(id));
await service.streamListen(id);
} catch (e) {
if (id.endsWith('Logging')) {
// Don't complain about '_Logging' or 'Logging' events (new VMs don't
Expand All @@ -272,21 +285,7 @@ class ServiceConnectionManager {
);
}
}
}

if (service != this.service) {
// A different service has been opened.
return;
}

_connectedState.value = const ConnectedState(true);

final isolates = [
...vm.isolates,
if (preferences.vmDeveloperModeEnabled.value) ...vm.systemIsolates,
];

await isolateManager.init(isolates);
}));
if (service != this.service) {
// A different service has been opened.
return;
Expand Down