StephenDev0/idevice
1
0
Fork 0
mirror of https://github.com/jkcoxson/idevice.git synced 2026-03-02 06:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove dangerous result/option macros

Browse Source
This commit is contained in:
Jackson Coxson
2025-09-03 19:48:43 -06:00
parent ca56575c6c
commit b0e3c5769a
8 changed files with 215 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cpp/examples/app_service.cpp
View File

@@ -44,12 +44,9 @@ int main(int argc, char** argv) {
FfiError err;
// 1) Connect to usbmuxd and pick first device
auto mux = UsbmuxdConnection::default_new(/*tag*/ 0);
if_let_err(mux, err, { die("failed to connect to usbmuxd", err); });
auto mux = UsbmuxdConnection::default_new(/*tag*/ 0).expect("failed to connect to usbmuxd");
auto devices_res = mux.unwrap().get_devices();
if_let_err(devices_res, err, { die("failed to list devices", err); });
auto& devices = devices_res.unwrap();
auto devices = mux.get_devices().expect("failed to list devices");
if (devices.empty()) {
std::cerr << "no devices connected\n";
return 1;
@@ -73,35 +70,31 @@ int main(int argc, char** argv) {
const uint32_t tag = 0;
const std::string label = "app_service-jkcoxson";
auto provider_res =
Provider::usbmuxd_new(std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label);
if_let_err(provider_res, err, { die("failed to create provider", err); });
auto& provider = provider_res.unwrap();
auto provider =
Provider::usbmuxd_new(std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label)
.expect("failed to create provider");
// 3) CoreDeviceProxy
auto cdp = CoreDeviceProxy::connect(provider).unwrap_or_else(
auto cdp = CoreDeviceProxy::connect(provider).unwrap_or_else(
[](FfiError e) -> CoreDeviceProxy { die("failed to connect CoreDeviceProxy", e); });
auto rsd_port = cdp.get_server_rsd_port().unwrap_or_else(
[](FfiError err) -> uint16_t { die("failed to get server RSD port", err); });
// 4) Create software tunnel adapter (consumes proxy)
auto adapter = std::move(cdp).create_tcp_adapter();
if_let_err(adapter, err, { die("failed to create software tunnel adapter", err); });
auto adapter =
std::move(cdp).create_tcp_adapter().expect("failed to create software tunnel adapter");
// 5) Connect adapter to RSD → ReadWrite stream
auto stream = adapter.unwrap().connect(rsd_port);
if_let_err(stream, err, { die("failed to connect RSD stream", err); });
auto stream = adapter.connect(rsd_port).expect("failed to connect RSD stream");
// 6) RSD handshake (consumes stream)
auto rsd = RsdHandshake::from_socket(std::move(stream.unwrap()));
if_let_err(rsd, err, { die("failed RSD handshake", err); });
auto rsd = RsdHandshake::from_socket(std::move(stream)).expect("failed RSD handshake");
// 7) AppService over RSD (borrows adapter + handshake)
auto app = AppService::connect_rsd(adapter.unwrap(), rsd.unwrap())
.unwrap_or_else([&](FfiError e) -> AppService {
die("failed to connect AppService", e); // never returns
});
auto app = AppService::connect_rsd(adapter, rsd).unwrap_or_else([&](FfiError e) -> AppService {
die("failed to connect AppService", e); // never returns
});
// 8) Commands
if (cmd == "list") {
@@ -160,7 +153,7 @@ int main(int argc, char** argv) {
}
std::string bundle_id = argv[2];
if_let_err(app.uninstall(bundle_id), err, { die("uninstall failed", err); });
app.uninstall(bundle_id).expect("Uninstall failed");
std::cout << "Uninstalled " << bundle_id << "\n";
return 0;

46
cpp/examples/debug_proxy.cpp
View File

@@ -34,18 +34,16 @@ static std::vector<std::string> split_args(const std::string& line) {
int main() {
IdeviceFFI::FfiError err;
// 1) usbmuxd → pick first device
auto mux = IdeviceFFI::UsbmuxdConnection::default_new(/*tag*/ 0);
if_let_err(mux, err, { die("failed to connect to usbmuxd", err); });
// 1) Connect to usbmuxd and pick first device
auto mux = UsbmuxdConnection::default_new(/*tag*/ 0).expect("failed to connect to usbmuxd");
auto devices = mux.unwrap().get_devices();
if_let_err(devices, err, { die("failed to list devices", err); });
if (devices.unwrap().empty()) {
auto devices = mux.get_devices().expect("failed to list devices");
if (devices.empty()) {
std::cerr << "no devices connected\n";
return 1;
}
auto& dev = (devices)[0];
auto& dev = (devices.unwrap())[0];
auto udid = dev.get_udid();
if (udid.is_none()) {
std::cerr << "device has no UDID\n";
@@ -58,39 +56,35 @@ int main() {
}
// 2) Provider via default usbmuxd addr
auto addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto addr = UsbmuxdAddr::default_new();
const uint32_t tag = 0;
const std::string label = "debug-proxy-jkcoxson";
auto provider = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label);
if_let_err(provider, err, { die("failed to create provider", err); });
const uint32_t tag = 0;
const std::string label = "app_service-jkcoxson";
auto provider =
Provider::usbmuxd_new(std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label)
.expect("failed to create provider");
// 3) CoreDeviceProxy
auto cdp = CoreDeviceProxy::connect(provider.unwrap())
.unwrap_or_else([](FfiError e) -> CoreDeviceProxy {
die("failed to connect CoreDeviceProxy", e);
});
auto cdp = CoreDeviceProxy::connect(provider).unwrap_or_else(
[](FfiError e) -> CoreDeviceProxy { die("failed to connect CoreDeviceProxy", e); });
auto rsd_port = cdp.get_server_rsd_port().unwrap_or_else(
[](FfiError err) -> uint16_t { die("failed to get server RSD port", err); });
// 4) Create software tunnel adapter (consumes proxy)
auto adapter = std::move(cdp).create_tcp_adapter();
if_let_err(adapter, err, { die("failed to create software tunnel adapter", err); });
auto adapter =
std::move(cdp).create_tcp_adapter().expect("failed to create software tunnel adapter");
// 5) Connect adapter to RSD → ReadWrite stream
auto stream = adapter.unwrap().connect(rsd_port);
if_let_err(stream, err, { die("failed to connect RSD stream", err); });
auto stream = adapter.connect(rsd_port).expect("failed to connect RSD stream");
// 6) RSD handshake (consumes stream)
auto rsd = RsdHandshake::from_socket(std::move(stream.unwrap()));
if_let_err(rsd, err, { die("failed RSD handshake", err); });
auto rsd = RsdHandshake::from_socket(std::move(stream)).expect("failed RSD handshake");
// 6) DebugProxy over RSD
auto dbg_res = IdeviceFFI::DebugProxy::connect_rsd(adapter.unwrap(), rsd.unwrap());
if_let_err(dbg_res, err, { die("failed to connect DebugProxy", err); });
auto& dbg = dbg_res.unwrap();
auto dbg =
IdeviceFFI::DebugProxy::connect_rsd(adapter, rsd).expect("failed to connect DebugProxy");
std::cout << "Shell connected! Type 'exit' to quit.\n";
for (;;) {

60
cpp/examples/diagnosticsservice.cpp
View File

@@ -29,18 +29,16 @@ int main() {
idevice_init_logger(Debug, Disabled, NULL);
FfiError err;
// 1) usbmuxd → pick first device
auto mux = IdeviceFFI::UsbmuxdConnection::default_new(/*tag*/ 0);
if_let_err(mux, err, { die("failed to connect to usbmuxd", err); });
// 1) Connect to usbmuxd and pick first device
auto mux = UsbmuxdConnection::default_new(/*tag*/ 0).expect("failed to connect to usbmuxd");
auto devices = mux.unwrap().get_devices();
if_let_err(devices, err, { die("failed to list devices", err); });
if (devices.unwrap().empty()) {
auto devices = mux.get_devices().expect("failed to list devices");
if (devices.empty()) {
std::cerr << "no devices connected\n";
return 1;
}
auto& dev = (devices)[0];
auto& dev = (devices.unwrap())[0];
auto udid = dev.get_udid();
if (udid.is_none()) {
std::cerr << "device has no UDID\n";
@@ -53,58 +51,54 @@ int main() {
}
// 2) Provider via default usbmuxd addr
auto addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto addr = UsbmuxdAddr::default_new();
const uint32_t tag = 0;
const std::string label = "debug-proxy-jkcoxson";
auto provider = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label);
if_let_err(provider, err, { die("failed to create provider", err); });
const uint32_t tag = 0;
const std::string label = "app_service-jkcoxson";
auto provider =
Provider::usbmuxd_new(std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label)
.expect("failed to create provider");
// 3) CoreDeviceProxy
auto cdp = CoreDeviceProxy::connect(provider.unwrap())
.unwrap_or_else([](FfiError e) -> CoreDeviceProxy {
die("failed to connect CoreDeviceProxy", e);
});
auto cdp = CoreDeviceProxy::connect(provider).unwrap_or_else(
[](FfiError e) -> CoreDeviceProxy { die("failed to connect CoreDeviceProxy", e); });
auto rsd_port = cdp.get_server_rsd_port().unwrap_or_else(
[](FfiError err) -> uint16_t { die("failed to get server RSD port", err); });
// 4) Create software tunnel adapter (consumes proxy)
auto adapter = std::move(cdp).create_tcp_adapter();
if_let_err(adapter, err, { die("failed to create software tunnel adapter", err); });
auto adapter =
std::move(cdp).create_tcp_adapter().expect("failed to create software tunnel adapter");
// 5) Connect adapter to RSD → ReadWrite stream
auto stream = adapter.unwrap().connect(rsd_port);
if_let_err(stream, err, { die("failed to connect RSD stream", err); });
auto stream = adapter.connect(rsd_port).expect("failed to connect RSD stream");
// 6) RSD handshake (consumes stream)
auto rsd = RsdHandshake::from_socket(std::move(stream.unwrap()));
if_let_err(rsd, err, { die("failed RSD handshake", err); });
auto rsd = RsdHandshake::from_socket(std::move(stream)).expect("failed RSD handshake");
// 6) DebugProxy over RSD
auto diag = DiagnosticsService::connect_rsd(adapter.unwrap(), rsd.unwrap());
if_let_err(diag, err, { die("failed to connect DebugProxy", err); });
// 7) DebugProxy over RSD
auto diag =
DiagnosticsService::connect_rsd(adapter, rsd).expect("failed to connect DebugProxy");
std::cout << "Getting sysdiagnose, this takes a while! iOS is slow...\n";
auto cap = diag.unwrap().capture_sysdiagnose(/*dry_run=*/false);
if_let_err(cap, err, { die("capture_sysdiagnose failed", err); });
auto cap = diag.capture_sysdiagnose(/*dry_run=*/false).expect("capture_sysdiagnose failed");
std::cout << "Got sysdiagnose! Saving to file: " << cap.unwrap().preferred_filename << "\n";
std::cout << "Got sysdiagnose! Saving to file: " << cap.preferred_filename << "\n";
// 7) Stream to file with progress
std::ofstream out(cap.unwrap().preferred_filename, std::ios::binary);
std::ofstream out(cap.preferred_filename, std::ios::binary);
if (!out) {
std::cerr << "failed to open output file\n";
return 1;
}
std::size_t written = 0;
const std::size_t total = cap.unwrap().expected_length;
const std::size_t total = cap.expected_length;
for (;;) {
auto chunk = cap.unwrap().stream.next_chunk();
auto chunk = cap.stream.next_chunk();
match_result(
chunk,
res,
@@ -128,6 +122,6 @@ int main() {
}
out.flush();
std::cout << "\nDone! Saved to " << cap.unwrap().preferred_filename << "\n";
std::cout << "\nDone! Saved to " << cap.preferred_filename << "\n";
return 0;
}

15
cpp/examples/idevice_id.cpp
View File

@@ -4,19 +4,10 @@
#include <iostream>
int main() {
auto u = IdeviceFFI::UsbmuxdConnection::default_new(0);
if_let_err(u, e, {
std::cerr << "failed to connect to usbmuxd";
std::cerr << e.message;
});
auto u = IdeviceFFI::UsbmuxdConnection::default_new(0).expect("failed to connect to usbmuxd");
auto devices = u.get_devices().expect("failed to get devices from usbmuxd");
auto devices = u.unwrap().get_devices();
if_let_err(devices, e, {
std::cerr << "failed to get devices from usbmuxd";
std::cerr << e.message;
});
for (IdeviceFFI::UsbmuxdDevice& d : devices.unwrap()) {
for (IdeviceFFI::UsbmuxdDevice& d : devices) {
auto udid = d.get_udid();
if (udid.is_none()) {
std::cerr << "failed to get udid";

43
cpp/examples/ideviceinfo.cpp
View File

@@ -9,21 +9,9 @@
int main() {
idevice_init_logger(Debug, Disabled, NULL);
auto u_res = IdeviceFFI::UsbmuxdConnection::default_new(0);
if_let_err(u_res, e, {
std::cerr << "failed to connect to usbmuxd";
std::cerr << e.message;
return 1;
});
auto& u = u_res.unwrap();
auto u = IdeviceFFI::UsbmuxdConnection::default_new(0).expect("failed to connect to usbmuxd");
auto devices_res = u.get_devices();
if_let_err(devices_res, e, {
std::cerr << "failed to get devices from usbmuxd";
std::cerr << e.message;
return 1;
});
auto devices = std::move(devices_res).unwrap();
auto devices = u.get_devices().expect("failed to get devices from usbmuxd");
if (devices.empty()) {
std::cerr << "no devices connected";
@@ -44,28 +32,15 @@ int main() {
return 1;
}
IdeviceFFI::UsbmuxdAddr addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto prov_res = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), /*tag*/ 0, udid.unwrap(), id.unwrap(), "reeeeeeeee");
if_let_err(prov_res, e, {
std::cerr << "provider failed: " << e.message << "\n";
return 1;
});
auto& prov = prov_res.unwrap();
IdeviceFFI::UsbmuxdAddr addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto prov = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), /*tag*/ 0, udid.unwrap(), id.unwrap(), "reeeeeeeee")
.expect("Failed to create usbmuxd provider");
auto client_res = IdeviceFFI::Lockdown::connect(prov);
if_let_err(client_res, e, {
std::cerr << "lockdown connect failed: " << e.message << "\n";
return 1;
});
auto& client = client_res.unwrap();
auto client = IdeviceFFI::Lockdown::connect(prov).expect("lockdown connect failed");
auto pf = prov.get_pairing_file();
if_let_err(pf, e, {
std::cerr << "failed to get pairing file: " << e.message << "\n";
return 1;
});
client.start_session(pf.unwrap());
auto pf = prov.get_pairing_file().expect("failed to get pairing file");
client.start_session(pf).expect("failed to start session");
auto values = client.get_value(NULL, NULL);
match_result(

54
cpp/examples/location_simulation.cpp
View File

@@ -41,18 +41,16 @@ int main(int argc, char** argv) {
return 2;
}
// 1) usbmuxd → pick first device
auto mux = IdeviceFFI::UsbmuxdConnection::default_new(/*tag*/ 0);
if_let_err(mux, err, { die("failed to connect to usbmuxd", err); });
// 1) Connect to usbmuxd and pick first device
auto mux = UsbmuxdConnection::default_new(/*tag*/ 0).expect("failed to connect to usbmuxd");
auto devices = mux.unwrap().get_devices();
if_let_err(devices, err, { die("failed to list devices", err); });
if (devices.unwrap().empty()) {
auto devices = mux.get_devices().expect("failed to list devices");
if (devices.empty()) {
std::cerr << "no devices connected\n";
return 1;
}
auto& dev = (devices)[0];
auto& dev = (devices.unwrap())[0];
auto udid = dev.get_udid();
if (udid.is_none()) {
std::cerr << "device has no UDID\n";
@@ -65,58 +63,52 @@ int main(int argc, char** argv) {
}
// 2) Provider via default usbmuxd addr
auto addr = IdeviceFFI::UsbmuxdAddr::default_new();
auto addr = UsbmuxdAddr::default_new();
const uint32_t tag = 0;
const std::string label = "debug-proxy-jkcoxson";
auto provider = IdeviceFFI::Provider::usbmuxd_new(
std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label);
if_let_err(provider, err, { die("failed to create provider", err); });
const uint32_t tag = 0;
const std::string label = "app_service-jkcoxson";
auto provider =
Provider::usbmuxd_new(std::move(addr), tag, udid.unwrap(), mux_id.unwrap(), label)
.expect("failed to create provider");
// 3) CoreDeviceProxy
auto cdp = CoreDeviceProxy::connect(provider.unwrap())
.unwrap_or_else([](FfiError e) -> CoreDeviceProxy {
die("failed to connect CoreDeviceProxy", e);
});
auto cdp = CoreDeviceProxy::connect(provider).unwrap_or_else(
[](FfiError e) -> CoreDeviceProxy { die("failed to connect CoreDeviceProxy", e); });
auto rsd_port = cdp.get_server_rsd_port().unwrap_or_else(
[](FfiError err) -> uint16_t { die("failed to get server RSD port", err); });
// 4) Create software tunnel adapter (consumes proxy)
auto adapter = std::move(cdp).create_tcp_adapter();
if_let_err(adapter, err, { die("failed to create software tunnel adapter", err); });
auto adapter =
std::move(cdp).create_tcp_adapter().expect("failed to create software tunnel adapter");
// 5) Connect adapter to RSD → ReadWrite stream
auto stream = adapter.unwrap().connect(rsd_port);
if_let_err(stream, err, { die("failed to connect RSD stream", err); });
auto stream = adapter.connect(rsd_port).expect("failed to connect RSD stream");
// 6) RSD handshake (consumes stream)
auto rsd = RsdHandshake::from_socket(std::move(stream.unwrap()));
if_let_err(rsd, err, { die("failed RSD handshake", err); });
auto rsd = RsdHandshake::from_socket(std::move(stream)).expect("failed RSD handshake");
// 8) RemoteServer over RSD (borrows adapter + handshake)
auto rs = RemoteServer::connect_rsd(adapter.unwrap(), rsd.unwrap());
if_let_err(rs, err, { die("failed to connect RemoteServer", err); });
auto rs = RemoteServer::connect_rsd(adapter, rsd).expect("failed to connect to RemoteServer");
// 9) LocationSimulation client (borrows RemoteServer)
auto sim_res = LocationSimulation::create(rs.unwrap());
if_let_err(sim_res, err, { die("failed to create LocationSimulation client", err); });
auto& sim = sim_res.unwrap();
auto sim = LocationSimulation::create(rs).expect("failed to create LocationSimulation client");
if (do_clear) {
if_let_err(sim.clear(), err, { die("clear failed", err); });
sim.clear().expect("clear failed");
std::cout << "Location cleared!\n";
return 0;
}
// set path
if_let_err(sim.set(lat.unwrap(), lon.unwrap()), err, { die("set failed", err); });
sim.set(lat.unwrap(), lon.unwrap()).expect("set failed");
std::cout << "Location set to (" << lat.unwrap() << ", " << lon.unwrap() << ")\n";
std::cout << "Press Ctrl-C to stop\n";
// keep process alive like the Rust example
for (;;) {
if_let_err(sim.set(lat.unwrap(), lon.unwrap()), err, { die("set failed", err); });
sim.set(lat.unwrap(), lon.unwrap()).expect("set failed");
std::this_thread::sleep_for(std::chrono::seconds(3));
}
}