Release v1.0.56: Credential & Browser Profile Manager

scripts/service/browser_service.py

@@ -1,21 +1,28 @@
-"""Chromium/Edge 检测与 Playwright：仅打开浏览器（不写库、不做登录态 DOM 检测）。"""
+# -*- coding: utf-8 -*-
+"""
+Chromium/Edge browser profile opener.
+
+Uses system Chrome/Edge channel, Playwright launch_persistent_context.
+Does NOT download Playwright Chromium.
+Does NOT check login status.
+Does NOT write secret to SQLite.
+"""
 import json
 import os
 import subprocess
 import sys
 import tempfile
 
+from db.connection import init_db
 from db.accounts_repo import get_account_by_id
 from util.logging_config import (
     get_skill_logger,
     subprocess_env_with_trace,
 )
-from util.platforms import PLATFORM_URLS
+from util.platforms import PLATFORMS
 
 # 子进程入口脚本与本模块同目录（独立解释器执行，非 import）
 _SERVICE_DIR = os.path.dirname(os.path.abspath(__file__))
-# PyArmor 在模块首行注入对 pyarmor_runtime_* 的 import；若以「脚本路径」启动子进程，
-# sys.path[0] 仅为 service/，找不到 scripts/ 下的运行时包。必须用 -m 且 cwd=scripts/（标准做法）。
 _SCRIPTS_ROOT = os.path.dirname(_SERVICE_DIR)
 
 
@@ -68,11 +75,17 @@ def _print_browser_install_hint():
 
 
 def cmd_open(account_id):
-    """打开该账号的持久化浏览器，仅用于肉眼核对；不写数据库、不判定是否已登录。"""
-    get_skill_logger().info("open account_id=%r", account_id)
+    """
+    打开该账号的持久化浏览器，仅用于肉眼核对。
+    不写数据库、不判定是否已登录。
+    """
+    log = get_skill_logger()
+    init_db()
+    log.info("browser_open_start account_id=%r", account_id)
+
     target = get_account_by_id(account_id)
     if not target:
-        get_skill_logger().warning("open_not_found account_id=%r", account_id)
+        log.warning("browser_open_error account_id=%r not_found", account_id)
         print("ERROR:ACCOUNT_NOT_FOUND")
         return
 
@@ -85,23 +98,33 @@ def cmd_open(account_id):
         import playwright  # noqa: F401
     except ImportError:
         print(
-            "ERROR:需要 playwright Python 包：请在匠厂共享环境中已含 playwright；"
-            "本机需安装 Google Chrome 或 Microsoft Edge（channel 模式，无需 playwright install chromium）"
+            "ERROR:需要 playwright Python 包。"
         )
         return
 
     profile_dir = (target.get("profile_dir") or "").strip()
     if not profile_dir:
-        print("ERROR:PROFILE_DIR_MISSING 库中 profile_dir 为空。")
+        log.warning("browser_open_error account_id=%s profile_dir_missing", account_id)
+        print("ERROR:PROFILE_DIR_MISSING 账号中 profile_dir 为空。")
         return
     os.makedirs(profile_dir, exist_ok=True)
-    url = (target.get("url") or "").strip() or PLATFORM_URLS.get(
-        target["platform"], "https://www.google.com"
+
+    # Use account url, fall back to platform default
+    platform_spec = PLATFORMS.get(target["platform_key"], {})
+    url = (target.get("url") or "").strip() or platform_spec.get("default_url", "")
+
+    log.info(
+        "browser_open_context profile_dir=%s url=%s channel=%s platform=%s",
+        profile_dir,
+        url,
+        channel,
+        target.get("platform_key"),
     )
+
     browser_name = "Google Chrome" if channel == "chrome" else "Microsoft Edge"
-    print(f"正在打开 [{target['name']}] 的 {browser_name}（仅查看，不写入数据库）")
+    print(f"正在打开 [{target['account_label']}] 的 {browser_name}（仅查看，不写入数据库）")
     print(f"地址：{url}")
-    print("是否已登录由业务侧（如大模型网页引擎）在使用账号时自行处理；本命令不做登录检测。")
+    print("本命令不做登录检测。")
 
     cfg = {"channel": channel, "profile_dir": profile_dir, "url": url}
     with tempfile.NamedTemporaryFile(
@@ -115,6 +138,10 @@ def cmd_open(account_id):
             cwd=_SCRIPTS_ROOT,
             env=subprocess_env_with_trace(),
         )
+        log.info("browser_open_close account_id=%s channel=%s", account_id, channel)
+    except Exception as e:
+        log.error("browser_open_error account_id=%s error=%s", account_id, str(e))
+        raise
     finally:
         try:
             os.unlink(cfg_path)