robotframework-browser-tray 1.7.0__tar.gz → 1.8.0__tar.gz

{robotframework_browser_tray-1.7.0 → robotframework_browser_tray-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: robotframework-browser-tray
-Version: 1.7.0
+Version: 1.8.0
 Summary: Tray icon and REPL for trying out Browser Library keywords using Chromium or Edge
 Author-email: Marduk Bolaños <marduk.bolanos@imbus.de>
 Requires-Python: >=3.9.0
@@ -75,14 +75,14 @@ To exit ibrowser press `Ctrl-D`.
 Add these lines to the Settings section of the .robot file:
 
 ```robotframework
-Library       Browser               playwright_process_port=4711
-Test Setup    Connect To Browser    http://localhost:1234            chromium    use_cdp=True
+Library       Browser
+Test Setup    Connect To Browser    http://localhost:1234    chromium    use_cdp=True
 ```
 
-In order to use other ports execute:
+In order to use another port execute:
 
 ```bash
-browser-tray --pw-port=XXXX --cdp-port=XXXX
+browser-tray --cdp-port=XXXX
 ``` 
 
 
@@ -103,10 +103,6 @@ If Microsoft Edge is installed on your machine:
 
 ## How it works
 
-On start up `ibrowser` checks whether `rfbrowser init` has been executed.
-
-If this requirement is met the Playwright wrapper is started with `node site-packages/Browser/wrapper/index.js 4711`.
-
 Selecting "Open Chromium" in the tray icon executes `site-packages/Browser/wrapper/node_modules/playwright-core/.local-browsers/chromium-XX/chrome-win/chrome.exe --remote-debugging-port=1234 --test-type`.
 
 `ibrowser` is a batteries-included [irobot](https://pypi.org/project/robotframework-debug/) that saves time by importing Browser Library and connecting to a running Chromium or Edge.

{robotframework_browser_tray-1.7.0 → robotframework_browser_tray-1.8.0}/README.md

@@ -63,14 +63,14 @@ To exit ibrowser press `Ctrl-D`.
 Add these lines to the Settings section of the .robot file:
 
 ```robotframework
-Library       Browser               playwright_process_port=4711
-Test Setup    Connect To Browser    http://localhost:1234            chromium    use_cdp=True
+Library       Browser
+Test Setup    Connect To Browser    http://localhost:1234    chromium    use_cdp=True
 ```
 
-In order to use other ports execute:
+In order to use another port execute:
 
 ```bash
-browser-tray --pw-port=XXXX --cdp-port=XXXX
+browser-tray --cdp-port=XXXX
 ``` 
 
 
@@ -91,10 +91,6 @@ If Microsoft Edge is installed on your machine:
 
 ## How it works
 
-On start up `ibrowser` checks whether `rfbrowser init` has been executed.
-
-If this requirement is met the Playwright wrapper is started with `node site-packages/Browser/wrapper/index.js 4711`.
-
 Selecting "Open Chromium" in the tray icon executes `site-packages/Browser/wrapper/node_modules/playwright-core/.local-browsers/chromium-XX/chrome-win/chrome.exe --remote-debugging-port=1234 --test-type`.
 
 `ibrowser` is a batteries-included [irobot](https://pypi.org/project/robotframework-debug/) that saves time by importing Browser Library and connecting to a running Chromium or Edge.

{robotframework_browser_tray-1.7.0 → robotframework_browser_tray-1.8.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "robotframework-browser-tray"
-version = "1.7.0"
+version = "1.8.0"
 description = "Tray icon and REPL for trying out Browser Library keywords using Chromium or Edge"
 authors = [
     {name = "Marduk Bolaños", email = "marduk.bolanos@imbus.de"},

robotframework_browser_tray-1.8.0/src/BrowserTray/BrowserRepl/__init__.py

@@ -0,0 +1,15 @@
+from RobotDebug.RobotDebug import RobotDebug
+from robot.libraries.BuiltIn import BuiltIn
+
+
+class BrowserRepl(RobotDebug):
+    def __init__(self, remote_debugging_port, **kwargs):
+        super().__init__(**kwargs)
+        
+        self.remote_debugging_port = remote_debugging_port
+        self.Library("Browser", "enable_presenter_mode=True")
+        self.connect()
+
+    def connect(self):
+        BuiltIn().run_keyword("Connect To Browser", f"http://localhost:{self.remote_debugging_port}", "chromium", "use_cdp=True")
+        BuiltIn().run_keyword("Set Browser Timeout", "2s")

robotframework_browser_tray-1.8.0/src/BrowserTray/cmdline_args.py

@@ -0,0 +1,17 @@
+import argparse
+
+
+REMOTE_DEBUGGING_PORT = 1234
+
+
+def get_remote_debugging_port() -> int:
+    arg_parser = argparse.ArgumentParser(add_help=True)
+    arg_parser.add_argument(
+        "--cdp-port", 
+        default=REMOTE_DEBUGGING_PORT, 
+        type=int, 
+        help=f"Chromium debugging port (default: {REMOTE_DEBUGGING_PORT})"
+    )
+    args = arg_parser.parse_args()
+
+    return args.cdp_port

{robotframework_browser_tray-1.7.0 → robotframework_browser_tray-1.8.0}/src/BrowserTray/ibrowser/repl.py

@@ -1,7 +1,6 @@
 import http.client
 import re
 import socket
-from subprocess import Popen
 import sys
 import tempfile
 import time
@@ -15,7 +14,6 @@ from robot.run import run_cli
 from robot.api import logger
 
 from BrowserTray import cmdline_args
-from BrowserTray import playwright
 
 
 def escape_ansi(line):
@@ -58,11 +56,11 @@ def wrap_presenter_mode(self, selector, strict):
 LibraryComponent.presenter_mode = wrap_presenter_mode
 
 
-def test_suite(playwright_process_port, remote_debugging_port):
+def test_suite(remote_debugging_port):
     return bytes(dedent(
         f"""
         *** Settings ***
-        Library    BrowserTray.BrowserRepl    {playwright_process_port}    {remote_debugging_port}    repl=${True}
+        Library    BrowserTray.BrowserRepl    {remote_debugging_port}    repl=${True}
 
         *** Test Cases ***
         Robot Framework Debug REPL
@@ -73,7 +71,7 @@ def test_suite(playwright_process_port, remote_debugging_port):
     )
 
 
-def irobot(testsuite: bytes, playwright_proc: Popen):
+def irobot(testsuite: bytes):
     """A standalone robotframework shell."""
 
     default_no_logs = [
@@ -117,18 +115,15 @@ def irobot(testsuite: bytes, playwright_proc: Popen):
             file_path = Path(test_file.name)
             if file_path.exists():
                 file_path.unlink()
-            
-            playwright_proc.terminate()
 
 
 def run():
-    playwright_process_port, remote_debugging_port = cmdline_args.get_ports()
+    remote_debugging_port = cmdline_args.get_remote_debugging_port()
 
     try:
         http.client.HTTPConnection('127.0.0.1', remote_debugging_port, timeout=1).connect()
 
-        playwright_proc = playwright.run(playwright_process_port)
-        irobot(test_suite(playwright_process_port, remote_debugging_port), playwright_proc)
+        irobot(test_suite(remote_debugging_port))
     except socket.timeout:
         print("ibrowser needs either:\n" +
               "  - a running Chromium, started using the tray icon or\n" + 

{robotframework_browser_tray-1.7.0 → robotframework_browser_tray-1.8.0}/src/BrowserTray/tray.py

@@ -109,6 +109,6 @@ def is_running(cmd: str) -> bool:
 
 
 def run():
-    playwright_process_port, remote_debugging_port = cmdline_args.get_ports()
+    remote_debugging_port = cmdline_args.get_remote_debugging_port()
     tray_icon = TrayIcon(remote_debugging_port)
     tray_icon.run()

robotframework_browser_tray-1.7.0/src/BrowserTray/BrowserRepl/__init__.py

@@ -1,14 +0,0 @@
-from RobotDebug.RobotDebug import RobotDebug
-from robot.libraries.BuiltIn import BuiltIn
-
-
-class BrowserRepl(RobotDebug):
-    def __init__(self, playwright_process_port, remote_debugging_port, **kwargs):
-        super().__init__(**kwargs)
-        
-        self.Library("Browser", "enable_presenter_mode=True", f"playwright_process_port={playwright_process_port}")
-        self.connect(remote_debugging_port)
-
-    def connect(self, remote_debugging_port):
-        BuiltIn().run_keyword("Connect To Browser", f"http://localhost:{remote_debugging_port}", "chromium", "use_cdp=True")
-        BuiltIn().run_keyword("Set Browser Timeout", "2s")

robotframework_browser_tray-1.7.0/src/BrowserTray/cmdline_args.py

@@ -1,22 +0,0 @@
-import argparse
-from typing import Tuple
-
-
-REMOTE_DEBUGGING_PORT = 1234
-PLAYWRIGHT_PROCESS_PORT= 4711
-
-
-def get_ports() -> Tuple[int, int]:
-    MAX_PORT = 2**16
-    
-    arg_parser = argparse.ArgumentParser(add_help=True)
-    arg_parser.add_argument("--pw-port", default=PLAYWRIGHT_PROCESS_PORT, type=int, help=f"Playwright process port (default: {PLAYWRIGHT_PROCESS_PORT})")
-    arg_parser.add_argument("--cdp-port", default=REMOTE_DEBUGGING_PORT, type=int, help=f"Chromium debugging port (default: {REMOTE_DEBUGGING_PORT})")
-    args = arg_parser.parse_args()
-    playwright_process_port = args.pw_port
-    remote_debugging_port = args.cdp_port
-
-    if playwright_process_port > MAX_PORT or remote_debugging_port > MAX_PORT:
-        raise ValueError(f"Port numbers cannot be larger than {MAX_PORT}")
-
-    return (playwright_process_port, remote_debugging_port)

robotframework_browser_tray-1.7.0/src/BrowserTray/playwright.py

@@ -1,44 +0,0 @@
-import http.client
-import site
-import socket
-import subprocess
-import sys
-from pathlib import Path
-from subprocess import Popen
-
-
-_, site_packages = site.getsitepackages()
-browser_wrapper = Path(site_packages) / "Browser" / "wrapper"
-index_js = browser_wrapper / "index.js"
-node_modules = browser_wrapper / "node_modules"
-playwright_core = node_modules / "playwright-core"
-
-
-def playwright_is_initialized():
-    return node_modules.is_dir() and playwright_core.is_dir()
-
-
-def start_playwright(playwright_process_port: int) -> Popen:
-    return Popen(
-        ['node', index_js, str(playwright_process_port)],
-        stderr=subprocess.PIPE,
-        stdout=subprocess.PIPE
-    )
-
-
-def run(playwright_process_port: int) -> Popen:
-    if not playwright_is_initialized():
-        print(
-            "Playwright has not been initialized.\n" + 
-            "In order to use Chromium execute 'rfbrowser init chromium'.\n" + 
-            "If you want to use the Microsoft Edge installed on your system execute 'rfbrowser init --skip-browsers'"
-        )
-        sys.exit(1)
-
-    try:
-        http.client.HTTPConnection('127.0.0.1', playwright_process_port, timeout=1).connect()
-        print(f"The port {playwright_process_port} is already in use. Either browser-tray is already running or another process is using the port.\n" + 
-              "To start the Playwright wrapper on another port execute `browser-tray --pw-port PORT`")
-        sys.exit(1)
-    except socket.timeout:
-        return start_playwright(playwright_process_port)