Skip to content

Support iOS wireless debugging #118104

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
auto-submit merged 17 commits into from
Jan 19, 2023
Merged

Support iOS wireless debugging #118104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8a607d3
setup wireless debugging to use device IP
vashworth Jan 5, 2023
2dfdf97
fix tests
vashworth Jan 6, 2023
5f3caaa
fix unused var and missing annotation
vashworth Jan 6, 2023
5691519
remove unneeded try catch
vashworth Jan 6, 2023
3e6c1a0
remove commented out line, change null to package id
vashworth Jan 6, 2023
b63c79c
better way to get package id
vashworth Jan 6, 2023
180e93d
update mDNS lookup to continously check for server, add messaging if …
vashworth Jan 9, 2023
7b6da55
Refactor mDNS Discovery to poll for observatories and better handle m…
vashworth Jan 12, 2023
60c487b
add and update comments, use logger spinner intead of timer in flutte…
vashworth Jan 12, 2023
0cf0b70
add newline to message so next log won't be on same line
vashworth Jan 13, 2023
f42e382
fix install/waiting for permission status progress so it doens't doub…
vashworth Jan 13, 2023
9655735
only print backtrace if observatory times out on a physical usb conne…
vashworth Jan 13, 2023
8d78df2
Merge remote-tracking branch 'upstream/master' into wireless_debuggin…
vashworth Jan 13, 2023
eb0f417
fix test
vashworth Jan 13, 2023
edcc5c5
Update related references from Observatory to Dart VM Service
vashworth Jan 18, 2023
60a63a9
fix test
vashworth Jan 18, 2023
f81ca6d
Merge remote-tracking branch 'upstream/master' into wireless_debuggin…
vashworth Jan 18, 2023
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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@vashworth
vashworth committed Jan 6, 2023
commit 2dfdf979ccb4a4f5f499c93d87d9bc45590ee727
2 changes: 1 addition & 1 deletion packages/flutter_tools/lib/src/ios/devices.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ class IOSDevice extends Device {
_logger.printTrace('Application launched on the device. Waiting for observatory url.');
final int defaultTimeout = interfaceType == IOSDeviceConnectionInterface.network ? 60 : 30;
Copy link
Contributor Author

@vashworth vashworth Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found that this took longer when using a network device. 60 seconds might be a bit generous, though. Sometimes 30 seconds is enough, but sometimes it's more like 35. Not sure if people's internet connections might influence this (mine is pretty fast), which is why I overestimated.

Copy link
Member

@jmagman jmagman Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow that's a long time. Maybe 45 and we'll see if we get complaints?

Copy link
Contributor Author

@vashworth vashworth Jan 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good. Updated.

final Timer timer = Timer(discoveryTimeout ?? Duration(seconds: defaultTimeout), () {
_logger.printError('iOS Observatory not discovered after ${discoveryTimeout ?? defaultTimeout} seconds. This is taking much longer than expected...');
_logger.printError('iOS Observatory not discovered after $defaultTimeout seconds. This is taking much longer than expected...');
iosDeployDebugger?.pauseDumpBacktraceResume();
});

Expand Down
6 changes: 6 additions & 0 deletions packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/device_port_forwarder.dart';
import 'package:flutter_tools/src/ios/application_package.dart';
import 'package:flutter_tools/src/ios/devices.dart';
import 'package:flutter_tools/src/ios/iproxy.dart';
import 'package:flutter_tools/src/macos/macos_ipad_device.dart';
import 'package:flutter_tools/src/mdns_discovery.dart';
import 'package:flutter_tools/src/project.dart';
Expand Down Expand Up @@ -979,10 +980,15 @@ class FakeIOSDevice extends Fake implements IOSDevice {
DevicePortForwarder? portForwarder,
DeviceLogReader? logReader,
this.onGetLogReader,
this.interfaceType = IOSDeviceConnectionInterface.none,
// IOSDeviceConnectionInterface interfaceType = IOSDeviceConnectionInterface.none,
}) : _portForwarder = portForwarder, _logReader = logReader;

final DevicePortForwarder? _portForwarder;


final IOSDeviceConnectionInterface interfaceType;

@override
DevicePortForwarder get portForwarder => _portForwarder!;

Expand Down
10 changes: 7 additions & 3 deletions packages/flutter_tools/test/general.shard/macos/xcode_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ void main() {
stdout: devicesOutput,
));
final List<IOSDevice> devices = await xcdevice.getAvailableIOSDevices();
expect(devices, hasLength(3));
expect(devices, hasLength(4));
expect(devices[0].id, '00008027-00192736010F802E');
expect(devices[0].name, 'An iPhone (Space Gray)');
expect(await devices[0].sdkNameAndVersion, 'iOS 13.3 17C54');
Expand All @@ -488,10 +488,14 @@ void main() {
expect(devices[1].name, 'iPad 1');
expect(await devices[1].sdkNameAndVersion, 'iOS 10.1 14C54');
expect(devices[1].cpuArchitecture, DarwinArch.armv7);
expect(devices[2].id, 'f577a7903cc54959be2e34bc4f7f80b7009efcf4');
expect(devices[2].name, 'iPad 2');
expect(devices[2].id, '234234234234234234345445687594e089dede3c44');
expect(devices[2].name, 'A networked iPad');
expect(await devices[2].sdkNameAndVersion, 'iOS 10.1 14C54');
expect(devices[2].cpuArchitecture, DarwinArch.arm64); // Defaults to arm64 for unknown architecture.
expect(devices[3].id, 'f577a7903cc54959be2e34bc4f7f80b7009efcf4');
expect(devices[3].name, 'iPad 2');
expect(await devices[3].sdkNameAndVersion, 'iOS 10.1 14C54');
expect(devices[3].cpuArchitecture, DarwinArch.arm64); // Defaults to arm64 for unknown architecture.
expect(fakeProcessManager, hasNoRemainingExpectations);
}, overrides: <Type, Generator>{
Platform: () => macPlatform,
Expand Down