webtap-tool 0.2.1__tar.gz → 0.2.3__tar.gz

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/CHANGELOG.md

@@ -15,6 +15,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [0.2.3] - 2025-09-12
+
+### Added
+
+### Changed
+- Refactored inline strings to constants in setup services for better maintainability
+- Extracted all script templates, paths, and configuration values as module-level constants
+
+### Fixed
+
+### Removed
+
+## [0.2.2] - 2025-09-12
+
+### Added
+
+### Changed
+
+### Fixed
+- macOS Chrome Debug.app now launches Chrome directly to avoid Rosetta warnings on Apple Silicon
+- Added LSArchitecturePriority to Info.plist for native architecture support
+
+### Removed
+
 ## [0.2.1] - 2025-09-12
 
 ### Added

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtap-tool
-Version: 0.2.1
+Version: 0.2.3
 Summary: Terminal-based web page inspector for AI debugging sessions
 Author-email: Fredrik Angelsen <fredrikangelsen@gmail.com>
 Classifier: Development Status :: 3 - Alpha

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "webtap-tool"
-version = "0.2.1"
+version = "0.2.3"
 description = "Terminal-based web page inspector for AI debugging sessions"
 readme = "README.md"
 authors = [

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/src/webtap/services/setup/__init__.py

@@ -10,7 +10,26 @@ from .filters import FilterSetupService
 from .extension import ExtensionSetupService
 from .chrome import ChromeSetupService
 from .desktop import DesktopSetupService
-from .platform import get_platform_info, ensure_directories
+from .platform import get_platform_info, ensure_directories, APP_NAME
+
+# Old installation paths to clean up
+OLD_EXTENSION_PATH = ".config/webtap/extension"
+OLD_WRAPPER_PATH = ".local/bin/wrappers/google-chrome-stable"
+OLD_DESKTOP_PATH = ".local/share/applications/google-chrome.desktop"
+OLD_DEBUG_DIR = ".config/google-chrome-debug"
+
+# Path components
+WRAPPERS_DIR = "wrappers"
+GOOGLE_CHROME_STABLE = "google-chrome-stable"
+
+# Size formatting constants
+KB_SIZE = 1024
+SIZE_FORMAT_KB = "{:.1f} KB"
+SIZE_FORMAT_EMPTY = "empty"
+
+# Mount point command
+MOUNTPOINT_CMD = "mountpoint"
+MOUNTPOINT_CHECK_FLAG = "-q"
 
 
 class SetupService:
@@ -108,11 +127,11 @@ class SetupService:
         result = {}
 
         # Check old extension location
-        old_extension_path = Path.home() / ".config" / "webtap" / "extension"
+        old_extension_path = Path.home() / OLD_EXTENSION_PATH
         if old_extension_path.exists():
             # Calculate size
             size = sum(f.stat().st_size for f in old_extension_path.rglob("*") if f.is_file())
-            size_str = f"{size / 1024:.1f} KB" if size > 0 else "empty"
+            size_str = SIZE_FORMAT_KB.format(size / KB_SIZE) if size > 0 else SIZE_FORMAT_EMPTY
 
             result["old_extension"] = {"path": str(old_extension_path), "size": size_str, "removed": False}
 
@@ -128,7 +147,7 @@ class SetupService:
                     result["old_extension"]["error"] = str(e)
 
         # Check old Chrome wrapper location
-        old_wrapper_path = Path.home() / ".local" / "bin" / "wrappers" / "google-chrome-stable"
+        old_wrapper_path = Path.home() / OLD_WRAPPER_PATH
         if old_wrapper_path.exists():
             result["old_wrapper"] = {"path": str(old_wrapper_path), "removed": False}
 
@@ -144,12 +163,13 @@ class SetupService:
                     result["old_wrapper"]["error"] = str(e)
 
         # Check old desktop entry
-        old_desktop_path = Path.home() / ".local" / "share" / "applications" / "google-chrome.desktop"
+        old_desktop_path = Path.home() / OLD_DESKTOP_PATH
         if old_desktop_path.exists():
             # Check if it's our override (contains reference to wrapper)
             try:
                 content = old_desktop_path.read_text()
-                if "wrappers/google-chrome-stable" in content or "webtap" in content.lower():
+                wrapper_ref = f"{WRAPPERS_DIR}/{GOOGLE_CHROME_STABLE}"
+                if wrapper_ref in content or APP_NAME in content.lower():
                     result["old_desktop"] = {"path": str(old_desktop_path), "removed": False}
 
                     if not dry_run:
@@ -162,11 +182,11 @@ class SetupService:
                 pass  # If we can't read it, skip it
 
         # Check for bindfs mount
-        debug_dir = Path.home() / ".config" / "google-chrome-debug"
+        debug_dir = Path.home() / OLD_DEBUG_DIR
         if debug_dir.exists():
             try:
                 # Check if it's a mount point
-                output = subprocess.run(["mountpoint", "-q", str(debug_dir)], capture_output=True)
+                output = subprocess.run([MOUNTPOINT_CMD, MOUNTPOINT_CHECK_FLAG, str(debug_dir)], capture_output=True)
                 if output.returncode == 0:
                     result["bindfs_mount"] = str(debug_dir)
             except (FileNotFoundError, OSError):

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/src/webtap/services/setup/desktop.py

@@ -62,6 +62,11 @@ MACOS_INFO_PLIST = """<?xml version="1.0" encoding="UTF-8"?>
     <string>????</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.12</string>
+    <key>LSArchitecturePriority</key>
+    <array>
+        <string>arm64</string>
+        <string>x86_64</string>
+    </array>
     <key>CFBundleDocumentTypes</key>
     <array>
         <dict>
@@ -160,12 +165,30 @@ class DesktopSetupService:
         macos_dir = contents_dir / "MacOS"
         macos_dir.mkdir(parents=True, exist_ok=True)
 
-        # Create launcher script
+        # Create launcher script that directly launches Chrome
+        # This avoids Rosetta warnings from nested bash scripts
         launcher_path = macos_dir / "Chrome Debug"
+
+        # Get Chrome path from platform info
+        chrome_path = self.chrome["path"]
+        profile_dir = self.paths["data_dir"] / "profiles" / "default"
+
         launcher_content = f"""#!/bin/bash
-# Chrome Debug app launcher
-# Uses absolute path to wrapper
-exec "{self.wrapper_path.expanduser()}" "$@"
+# Chrome Debug app launcher - direct Chrome execution
+# Avoids Rosetta warnings by directly launching Chrome
+
+PORT=${{WEBTAP_PORT:-9222}}
+PROFILE_DIR="{profile_dir}"
+mkdir -p "$PROFILE_DIR"
+
+# Launch Chrome directly with debugging
+exec "{chrome_path}" \\
+    --remote-debugging-port="$PORT" \\
+    --remote-allow-origins='*' \\
+    --user-data-dir="$PROFILE_DIR" \\
+    --no-first-run \\
+    --no-default-browser-check \\
+    "$@"
 """
         launcher_path.write_text(launcher_content)
         launcher_path.chmod(0o755)

{webtap_tool-0.2.1 → webtap_tool-0.2.3}/src/webtap/services/setup/platform.py

@@ -7,6 +7,46 @@ from typing import Optional
 
 import platformdirs
 
+# Application constants
+APP_NAME = "webtap"
+APP_AUTHOR = "webtap"
+
+# Directory names
+BIN_DIR_NAME = ".local/bin"
+WRAPPER_NAME = "chrome-debug"
+TMP_RUNTIME_DIR = "/tmp"
+
+# Chrome executable names for Linux
+CHROME_NAMES_LINUX = [
+    "google-chrome",
+    "google-chrome-stable",
+    "chromium",
+    "chromium-browser",
+]
+
+# Chrome paths for macOS
+CHROME_PATHS_MACOS = [
+    "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+    "Applications/Google Chrome.app/Contents/MacOS/Google Chrome",  # Relative to home
+]
+
+# Chrome paths for Linux
+CHROME_PATHS_LINUX = [
+    "/usr/bin/google-chrome",
+    "/usr/bin/google-chrome-stable",
+    "/usr/bin/chromium",
+    "/usr/bin/chromium-browser",
+    "/snap/bin/chromium",
+]
+
+# Platform identifiers
+PLATFORM_DARWIN = "Darwin"
+PLATFORM_LINUX = "Linux"
+
+# Application directories
+MACOS_APPLICATIONS_DIR = "Applications"
+LINUX_APPLICATIONS_DIR = ".local/share/applications"
+
 
 def get_platform_paths() -> dict[str, Path]:
     """Get platform-appropriate paths using platformdirs.
@@ -14,10 +54,7 @@ def get_platform_paths() -> dict[str, Path]:
     Returns:
         Dictionary of paths for config, data, cache, runtime, and state directories.
     """
-    app_name = "webtap"
-    app_author = "webtap"
-
-    dirs = platformdirs.PlatformDirs(app_name, app_author)
+    dirs = platformdirs.PlatformDirs(APP_NAME, APP_AUTHOR)
 
     paths = {
         "config_dir": Path(dirs.user_config_dir),  # ~/.config/webtap or ~/Library/Application Support/webtap
@@ -31,7 +68,7 @@ def get_platform_paths() -> dict[str, Path]:
         paths["runtime_dir"] = Path(dirs.user_runtime_dir)
     except AttributeError:
         # Fallback for platforms without runtime dir
-        paths["runtime_dir"] = Path("/tmp") / app_name
+        paths["runtime_dir"] = Path(TMP_RUNTIME_DIR) / APP_NAME
 
     return paths
 
@@ -44,21 +81,15 @@ def get_chrome_path() -> Optional[Path]:
     """
     system = platform.system()
 
-    if system == "Darwin":
+    if system == PLATFORM_DARWIN:
         # macOS standard locations
         candidates = [
-            Path("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"),
-            Path.home() / "Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
+            Path(CHROME_PATHS_MACOS[0]),
+            Path.home() / CHROME_PATHS_MACOS[1],
         ]
-    elif system == "Linux":
+    elif system == PLATFORM_LINUX:
         # Linux standard locations
-        candidates = [
-            Path("/usr/bin/google-chrome"),
-            Path("/usr/bin/google-chrome-stable"),
-            Path("/usr/bin/chromium"),
-            Path("/usr/bin/chromium-browser"),
-            Path("/snap/bin/chromium"),
-        ]
+        candidates = [Path(p) for p in CHROME_PATHS_LINUX]
     else:
         return None
 
@@ -67,7 +98,7 @@ def get_chrome_path() -> Optional[Path]:
             return path
 
     # Try to find in PATH
-    for name in ["google-chrome", "google-chrome-stable", "chromium", "chromium-browser"]:
+    for name in CHROME_NAMES_LINUX:
         if found := shutil.which(name):
             return Path(found)
 
@@ -84,31 +115,30 @@ def get_platform_info() -> dict:
     paths = get_platform_paths()
 
     # Unified paths for both platforms
-    paths["bin_dir"] = Path.home() / ".local/bin"  # User space, no sudo needed
-    wrapper_name = "chrome-debug"  # Same name on both platforms
+    paths["bin_dir"] = Path.home() / BIN_DIR_NAME  # User space, no sudo needed
 
     # Platform-specific launcher locations
-    if system == "Darwin":
-        paths["applications_dir"] = Path.home() / "Applications"
+    if system == PLATFORM_DARWIN:
+        paths["applications_dir"] = Path.home() / MACOS_APPLICATIONS_DIR
     else:  # Linux
-        paths["applications_dir"] = Path.home() / ".local/share/applications"
+        paths["applications_dir"] = Path.home() / LINUX_APPLICATIONS_DIR
 
     chrome_path = get_chrome_path()
 
     return {
         "system": system.lower(),
-        "is_macos": system == "Darwin",
-        "is_linux": system == "Linux",
+        "is_macos": system == PLATFORM_DARWIN,
+        "is_linux": system == PLATFORM_LINUX,
         "paths": paths,
         "chrome": {
             "path": chrome_path,
             "found": chrome_path is not None,
-            "wrapper_name": wrapper_name,
+            "wrapper_name": WRAPPER_NAME,
         },
         "capabilities": {
-            "desktop_files": system == "Linux",
-            "app_bundles": system == "Darwin",
-            "bindfs": system == "Linux" and shutil.which("bindfs") is not None,
+            "desktop_files": system == PLATFORM_LINUX,
+            "app_bundles": system == PLATFORM_DARWIN,
+            "bindfs": system == PLATFORM_LINUX and shutil.which("bindfs") is not None,
         },
     }