Skip to content
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

fix: add options for setting MJPEG ports #24

Merged
merged 1 commit into from
May 31, 2024
Merged

fix: add options for setting MJPEG ports #24

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
16 changes: 12 additions & 4 deletions tidevice3/cli/runwda.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ def guess_wda_bundle_id(service_provider: LockdownClient) -> typing.Optional[str
@click.option('--bundle-id', default=None, help="WebDriverAgent bundle id")
@click.option("--src-port", default=8100, help="WebDriverAgent listen port")
@click.option("--dst-port", default=8100, help="local listen port")
@click.option("--mjpeg-src-port", default=9100, help="MJPEG listen port")
@click.option("--mjpeg-dst-port", default=9100, help="MJPEG local listen port")
@pass_rsd
def cli_runwda(service_provider: LockdownClient, bundle_id: str, src_port: int, dst_port: int):
def cli_runwda(service_provider: LockdownClient, bundle_id: str, src_port: int, dst_port: int, mjpeg_src_port: int, mjpeg_dst_port: int):
"""run WebDriverAgent"""
if not bundle_id:
bundle_id = guess_wda_bundle_id(service_provider)
Expand All @@ -49,16 +51,22 @@ def tcp_forwarder():
logger.info("forwarder started, listen on %s", dst_port)
forwarder = UsbmuxTcpForwarder(service_provider.udid, dst_port, src_port)
forwarder.start()

def mjpeg_forwarder():
logger.info("MJPEG forwarder started, listening on :%s", mjpeg_dst_port)
forwarder = UsbmuxTcpForwarder(service_provider.udid, mjpeg_dst_port, mjpeg_src_port)
forwarder.start()

def xcuitest():
XCUITestService(service_provider).run(bundle_id)
XCUITestService(service_provider).run(bundle_id, {"MJPEG_SERVER_PORT": mjpeg_src_port, "USE_PORT": src_port})

thread0 = threading.Thread(target=mjpeg_forwarder, daemon=True)
thread1 = threading.Thread(target=tcp_forwarder, daemon=True)
thread2 = threading.Thread(target=xcuitest, daemon=True)
thread0.start()
thread1.start()
thread2.start()

while thread1.is_alive() and thread2.is_alive():
while thread0.is_alive() and thread1.is_alive() and thread2.is_alive():
time.sleep(0.1)
logger.info("Program exited")

Loading