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

[flutter_tools] support ws scheme in use-existing-app (#69244)

Browse Source
This commit is contained in:
Jonah Williams 2020-10-28 15:09:46 -07:00 committed by GitHub
parent 4aad058a49
commit 735f6eec2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/flutter_tools/lib/src/drive/drive_service.dart
View File

@ -191,11 +191,17 @@ class FlutterDriverService extends DriverService {
DebuggingOptions debuggingOptions,
bool ipv6,
) async {
_vmServiceUri = vmServiceUri.toString();
Uri uri;
if (vmServiceUri.scheme == 'ws') {
uri = vmServiceUri.replace(scheme: 'http', path: vmServiceUri.path.replaceFirst('ws/', ''));
} else {
uri = vmServiceUri;
}
_vmServiceUri = uri.toString();
_device = device;
try {
await device.dds.startDartDevelopmentService(
vmServiceUri,
uri,
debuggingOptions.ddsPort,
ipv6,
debuggingOptions.disableServiceAuthCodes,
@ -206,7 +212,7 @@ class FlutterDriverService extends DriverService {
// application, DDS will already be running remotely and this call will fail.
// This can be ignored to continue to use the existing remote DDS instance.
}
_vmService = await _vmServiceConnector(Uri.parse(_vmServiceUri), device: _device);
_vmService = await _vmServiceConnector(uri, device: _device);
final DeviceLogReader logReader = await device.getLogReader(app: _applicationPackage);
logReader.logLines.listen(_logger.printStatus);

28
packages/flutter_tools/test/general.shard/drive/drive_service_test.dart
View File

@ -280,6 +280,31 @@ void main() {
await driverService.stop();
});
testWithoutContext('Can connect to existing application using ws URI', () async {
final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(requests: <FakeVmServiceRequest>[
getVM,
getVM,
const FakeVmServiceRequest(
method: 'ext.flutter.exit',
args: <String, Object>{
'isolateId': '1',
}
)
]);
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[]);
final DriverService driverService = setUpDriverService(processManager: processManager, vmService: fakeVmServiceHost.vmService);
final FakeDevice device = FakeDevice(LaunchResult.failed());
await driverService.reuseApplication(
Uri.parse('ws://127.0.0.1:63426/1UasC_ihpXY=/ws/'),
device,
DebuggingOptions.enabled(BuildInfo.debug),
false,
);
await driverService.stop();
});
testWithoutContext('Does not call flutterExit on device types that do not support it', () async {
final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(requests: <FakeVmServiceRequest>[
getVM,
@ -321,6 +346,9 @@ FlutterDriverService setUpDriverService({
Object compression,
Device device,
}) async {
if (httpUri.scheme != 'http') {
fail('Expected an HTTP scheme, found $httpUri');
}
return vmService;
}
);