DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for new VM service message (flutter/engine#31250)

Browse Source 
"Observatory listening on..." is eventually being updated to "Dart VM
Service listening on...". This change allows for parsing the VM service
URI from messages of either format.

See https://github.com/dart-lang/sdk/issues/46756
This commit is contained in:
Ben Konyi 2022-02-04 10:25:53 -08:00 committed by GitHub
parent 9eb7120212
commit a5baa644a3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/src/flutter/shell/testing/observatory/launcher.dart
View File

@ -18,10 +18,8 @@ class ShellProcess {
.transform(utf8.decoder)
.transform(const LineSplitter())
.listen((String line) {
const String observatoryUriPrefix = 'Observatory listening on ';
if (line.startsWith(observatoryUriPrefix)) {
print(line);
final Uri uri = Uri.parse(line.substring(observatoryUriPrefix.length));
final uri = _extractVMServiceUri(line);
if (uri != null) {
_observatoryUriCompleter.complete(uri);
}
});
@ -34,6 +32,17 @@ class ShellProcess {
Future<Uri> waitForObservatory() async {
return _observatoryUriCompleter.future;
}
Uri? _extractVMServiceUri(String str) {
final listeningMessageRegExp = RegExp(
r'(?:Observatory|Dart VM Service) listening on ((http|//)[a-zA-Z0-9:/=_\-\.\[\]]+)',
);
final match = listeningMessageRegExp.firstMatch(str);
if (match != null) {
return Uri.parse(match[1]!);
}
return null;
}
}
class ShellLauncher {

2
engine/src/flutter/testing/android_systrace_test.py
View File

@ -61,7 +61,7 @@ def LaunchPackage(package_name, activity_name, adb_path='adb'):
'%s/%s' % (package_name, activity_name)], stderr=subprocess.STDOUT)
for line in logcat.stdout:
print('>>>>>>>> ' + line.strip())
if 'Observatory listening' in line:
if ('Observatory listening' in line) or ('Dart VM Service listening' in line):
logcat.kill()
break