Skip to content

feat: add headed mode and custom display support to CLI #3

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

Open
arielfrja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add headed mode and custom display support to CLI #3

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,19 @@ async def cmd_start(args):
logging.basicConfig(level=logging.INFO,
format="%(asctime)s %(levelname)s %(message)s")
daemon = Daemon(browser=args.browser,
headed=args.headed,
display=args.display,
idle_timeout=getattr(args, 'idle_timeout', None),
proxy=getattr(args, 'proxy', None))
await daemon.run()
else:
# Launch daemon as subprocess
cmd = [sys.executable, "-m", "src.daemon", "start",
"--browser", args.browser]
if args.headed:
cmd += ["--headed"]
if args.display:
cmd += ["--display", args.display]
if getattr(args, 'idle_timeout', None):
cmd += ["--idle-timeout", str(args.idle_timeout)]
if getattr(args, 'proxy', None):
Expand Down Expand Up @@ -448,6 +454,8 @@ def main():
# ── Daemon lifecycle ──
p = sub.add_parser("start", help="Start browser daemon", parents=[common])
p.add_argument("--foreground", "-f", action="store_true")
p.add_argument("--headed", action="store_true", help="Run in headed mode (visible window)")
p.add_argument("--display", help="X11 display to use (default: :0 for headed, :99 for headless)")
p.add_argument("--idle-timeout", type=int, default=None,
help="Auto-shutdown after N seconds of inactivity")
p.add_argument("--proxy", default=None,
Expand Down
24 changes: 19 additions & 5 deletions src/daemon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ def _draw_cursor_overlay(path, cx, cy):
class Daemon:
"""Background daemon managing browser and socket server."""

def __init__(self, browser="firefox", session_file=None,
idle_timeout=None, proxy=None):
def __init__(self, browser="firefox", headed=False, display=None,
session_file=None, idle_timeout=None, proxy=None):
self._browser_type = browser
self._headed = headed
self._display = display
self._session_file = session_file
self._idle_timeout = idle_timeout # Auto-shutdown after N seconds idle
self._proxy = proxy # SOCKS5/HTTP proxy (e.g. socks5://127.0.0.1:1080)
Expand Down Expand Up @@ -88,8 +90,15 @@ async def run(self):
with open(_user_js, "w") as f:
f.write(_cert_pref + "\n")
from .pilot import Pilot
# Default display: :0 for headed, :99 for headless
display = self._display
if not display:
display = ":0" if self._headed else ":99"

self.pilot = Pilot(
browser=self._browser_type,
display=display,
headless_xvfb=not self._headed,
session_file=self._session_file,
user_data_dir=FIREFOX_PROFILE_DIR,
proxy=self._proxy,
Expand Down Expand Up @@ -5308,6 +5317,8 @@ def main():
parser.add_argument("--session", "-s", default=None)
parser.add_argument("--foreground", "-f", action="store_true",
help="Run in foreground (don't daemonize)")
parser.add_argument("--headed", action="store_true")
parser.add_argument("--display", default=None)
parser.add_argument("--idle-timeout", type=int, default=None,
help="Auto-shutdown after N seconds idle (0=disabled)")
parser.add_argument("--proxy", default=None,
Expand All @@ -5318,7 +5329,8 @@ def main():
# Run in foreground (used internally)
logging.basicConfig(level=logging.INFO,
format="%(asctime)s %(levelname)s %(message)s")
daemon = Daemon(browser=args.browser, session_file=args.session,
daemon = Daemon(browser=args.browser, headed=args.headed,
display=args.display, session_file=args.session,
idle_timeout=args.idle_timeout, proxy=args.proxy)
asyncio.run(daemon.run())

Expand All @@ -5342,7 +5354,8 @@ def main():
if args.foreground:
logging.basicConfig(level=logging.INFO,
format="%(asctime)s %(levelname)s %(message)s")
daemon = Daemon(browser=args.browser, session_file=args.session,
daemon = Daemon(browser=args.browser, headed=args.headed,
display=args.display, session_file=args.session,
idle_timeout=args.idle_timeout, proxy=args.proxy)
asyncio.run(daemon.run())
else:
Expand All @@ -5363,7 +5376,8 @@ def main():
format="%(asctime)s %(levelname)s %(message)s",
handlers=[logging.StreamHandler()],
)
daemon = Daemon(browser=args.browser, session_file=args.session,
daemon = Daemon(browser=args.browser, headed=args.headed,
display=args.display, session_file=args.session,
idle_timeout=args.idle_timeout, proxy=args.proxy)
asyncio.run(daemon.run())

Expand Down