From ab608d45b9ca70cca45f4b41f81a3ad7ab007cab Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 10 Nov 2026 18:26:57 +0800 Subject: [PATCH] fix(browser): use pre-license CloakBrowser release --- app/adapters/network/browser.py | 13 ++++++------- .../resources/system_settings_catalog.json | 2 +- app/runtime/config.py | 2 +- docs/development-setup.md | 10 ++++------ docs/rules/05-architecture.md | 3 ++- pyproject.toml | 2 +- tests/test_architecture_egress.py | 2 +- tests/test_browser_queue.py | 19 +++++++++++++++---- uv.lock | 8 ++++---- 9 files changed, 35 insertions(+), 26 deletions(-) diff --git a/app/adapters/network/browser.py b/app/adapters/network/browser.py index 9eecb4ffb..30b2a0353 100644 --- a/app/adapters/network/browser.py +++ b/app/adapters/network/browser.py @@ -513,23 +513,22 @@ def _browser_queue_timeout() -> float: """ 读取部署侧浏览器容量和排队秒数,降容不会中断正在使用的实例。 """ - browser_capacity.configure(int(get_runtime_setting("CLOAKBROWSER_MAX_CONCURRENCY", 1))) + browser_capacity.configure(int(get_runtime_setting("CLOAKBROWSER_MAX_CONCURRENCY", 3))) return float(get_runtime_setting("CLOAKBROWSER_QUEUE_TIMEOUT", 60)) def _require_browser_license(license_key: Optional[str] = None) -> None: """ - 后台缺少 key 时明确报错,禁止 SDK 自动申请账号并在日志输出临时领取链接。 + 兼容显式 key 解析,但保留 0.6.5 无 key 也可运行的免费内核路径。 :param license_key: SDK 调用者显式传入的 key,优先于 SDK 的环境变量和本地文件 """ + if os.environ.get("CLOAKBROWSER_BINARY_PATH"): + return from cloakbrowser.license import resolve_license_key - if not os.environ.get("CLOAKBROWSER_BINARY_PATH") and not resolve_license_key(license_key): - raise RuntimeError( - "CloakBrowser 需要授权 key;请通过 cloakbrowser login 或 https://cloakbrowser.dev/free " - "申请免费 key,并在运行环境设置 CLOAKBROWSER_LICENSE_KEY" - ) + # 0.6.5 的 key 只用于选择最新或 Pro 内核,缺少 key 时由 SDK 回退到旧版免费内核。 + resolve_license_key(license_key) def _explicit_browser_key( diff --git a/app/application/settings/resources/system_settings_catalog.json b/app/application/settings/resources/system_settings_catalog.json index 7656f0b1c..a20f057cc 100644 --- a/app/application/settings/resources/system_settings_catalog.json +++ b/app/application/settings/resources/system_settings_catalog.json @@ -292,7 +292,7 @@ "source_file": "app/runtime/config.py" }, "CLOAKBROWSER_MAX_CONCURRENCY": { - "description": "同时存活的 CloakBrowser 实例上限,默认 1;提高前需确认授权并发额度", + "description": "同时存活的 CloakBrowser 实例上限,默认 3;提高前需确认授权并发额度", "group": "sites", "source_file": "app/runtime/config.py" }, diff --git a/app/runtime/config.py b/app/runtime/config.py index 1cb44ded8..17b1a3fc7 100644 --- a/app/runtime/config.py +++ b/app/runtime/config.py @@ -512,7 +512,7 @@ class ConfigModel(BaseModel): CLOAKBROWSER_HUMANIZE: bool = Field(default=True, description='CloakBrowser 是否启用拟人化输入') CLOAKBROWSER_HUMAN_PRESET: str = Field(default="default", description='CloakBrowser 拟人化输入预设:default 或 careful') CLOAKBROWSER_MAX_CONCURRENCY: int = Field( - default=1, ge=1, description="同时存活的 CloakBrowser 实例上限,默认 1;提高前需确认授权并发额度", + default=3, ge=1, description="同时存活的 CloakBrowser 实例上限,默认 3;提高前需确认授权并发额度", ) CLOAKBROWSER_QUEUE_TIMEOUT: int = Field( default=60, ge=1, description="等待 CloakBrowser 实例名额的最长秒数,默认 60 秒", diff --git a/docs/development-setup.md b/docs/development-setup.md index 9310e8387..01c6a2bb2 100644 --- a/docs/development-setup.md +++ b/docs/development-setup.md @@ -72,15 +72,13 @@ UV_PROJECT_ENVIRONMENT="${MOVIEPILOT_WORKSPACE}/.venv-test" \ #### CloakBrowser 内核、授权与排队 -项目使用 `cloakbrowser 0.7.1`。最新版浏览器内核需要授权 key,免费 key 可运行一个并发实例。 -请先通过 [官方免费申请页](https://cloakbrowser.dev/free) 或 `python -m cloakbrowser login` -领取,并通过运行进程的 `CLOAKBROWSER_LICENSE_KEY` 环境变量或 SDK 管理的本地 key 文件提供。 -Docker/CI 应在启动容器前配置该环境变量;key 不应提交到仓库或写入公开日志。 -未配置时,宿主浏览器入口会明确报错,不会在后台自动申请账号或输出临时领取链接。 +项目固定使用 `cloakbrowser==0.6.5`,这是上游从 `0.7.0` 开始要求授权 key 之前的最后一个版本。 +未配置 key 时,SDK 会使用旧版免费内核;配置 `CLOAKBROWSER_LICENSE_KEY` 或显式传入 key +时,仍可按上游规则选择最新或 Pro 内核。key 不应提交到仓库或写入公开日志。 宿主 Agent、站点浏览器仿真、`app.sdk.browser` 与宿主加载的旧 CloakBrowser 插件共用实例队列: -- `CLOAKBROWSER_MAX_CONCURRENCY` 默认 `1`,表示同时存活的独立浏览器实例数;拥有更高授权额度时可提高。 +- `CLOAKBROWSER_MAX_CONCURRENCY` 默认 `3`,表示同时存活的独立浏览器实例数;多个独立进程仍需自行协调。 - `CLOAKBROWSER_QUEUE_TIMEOUT` 默认 `60` 秒,超过等待上限会返回明确错误,不会终止其它任务。 - `CLOAKBROWSER_OPERATION_TIMEOUT` 默认 `120` 秒,限制启动和单次原生浏览器操作;`CLOAKBROWSER_CLOSE_TIMEOUT` 默认 `5` 秒,限制关闭宽限。 - 同一 Agent 浏览器会话的页面、标签及登录状态继续复用;实例未关闭时,包括等待模型响应期间,仍占用名额。 diff --git a/docs/rules/05-architecture.md b/docs/rules/05-architecture.md index 540307aa5..f1d75b573 100644 --- a/docs/rules/05-architecture.md +++ b/docs/rules/05-architecture.md @@ -451,7 +451,8 @@ Runtime 关闭后不可逆;完整应用生命周期的再次启动必须由新 浏览器适配器在首次宿主调用或旧插件导入前包装 CloakBrowser 的六类启动入口,包根与 `cloakbrowser.browser` 共享包装对象。SDK 内部嵌套启动沿用同一名额,名额在实例关闭成功 或底层 Browser 断开时归还;Context 单独关闭事件不证明浏览器进程已经退出。 -`CLOAKBROWSER_MAX_CONCURRENCY` 默认 1,`CLOAKBROWSER_QUEUE_TIMEOUT` 默认 60 秒, +项目固定使用 `cloakbrowser==0.6.5`,保留上游开始要求 key 前的无 key 免费内核。 +`CLOAKBROWSER_MAX_CONCURRENCY` 默认 3,`CLOAKBROWSER_QUEUE_TIMEOUT` 默认 60 秒, `CLOAKBROWSER_OPERATION_TIMEOUT` 默认 120 秒,`CLOAKBROWSER_CLOSE_TIMEOUT` 默认 5 秒。 所有入口共用进程内 FIFO 队列,超时和取消只撤销等待者,不关闭其它任务持有的实例。 Agent 异步动作直接等待既有会话专属线程,不能让排队取名额的调用占满公共工具线程, diff --git a/pyproject.toml b/pyproject.toml index e0d5335ed..f9614e978 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ dependencies = [ "cachetools~=7.1.4", "chardet~=7.6.0", "click~=8.4.1", - "cloakbrowser~=0.7.1", + "cloakbrowser==0.6.5", "cn2an~=0.5.24", "crcmod-plus==2.3.1", "cryptography~=50.0.0", diff --git a/tests/test_architecture_egress.py b/tests/test_architecture_egress.py index aa8cd5f7e..4dc721264 100644 --- a/tests/test_architecture_egress.py +++ b/tests/test_architecture_egress.py @@ -95,7 +95,7 @@ FROZEN_EGRESS_FINGERPRINT_BY_EDGE = { ("app.adapters.external.server", "requests"): "e8c747a7a4e96c3b1dc102bf49a37881cc674bcfb17b98693cac966afc3c3037", ("app.adapters.external.plugin.client", "httpx2"): "2d249b0906bc7f8fa29f569d6bcc5667d4290a551b1a06bcdf85e09ec50a793d", ("app.adapters.external.plugin.client", "requests"): "b5239e7eee9c23569b7fec66791e56bcc226db86a8d09ee7fc58d3ba8bc14f09", - # 同一浏览器 Adapter 增加授权存在性检查及六入口包装,未向上层扩展 SDK 直连。 + # 同一浏览器 Adapter 保留 key 解析与六入口包装,未向上层扩展 SDK 直连。 ("app.adapters.network.browser", "cloakbrowser"): "42efc4434e0c8c55b6527356bc1f712efd6905fcb8c80b856a893745377f1f81", ("app.adapters.network.doh", "socket.getaddrinfo"): "4ff03419dfacc6bf582b7d4421dd5a0666a63f8ca79be2b1e625f4c8f4c96b71", ("app.adapters.network.doh", "urllib.request"): "6f5f5fd3da02a9e780ea5e7cc1e47bd962314a1a358f14b4ee698485f96ab52b", diff --git a/tests/test_browser_queue.py b/tests/test_browser_queue.py index 306be75b6..f7968035a 100644 --- a/tests/test_browser_queue.py +++ b/tests/test_browser_queue.py @@ -619,17 +619,16 @@ def test_failed_page_initialization_and_close_retains_cleanup_owner(provider, mo assert not helper._failed_closures -def test_missing_key_does_not_start_sdk_or_create_signup_link(monkeypatch): +def test_missing_key_keeps_keyless_free_binary_path(monkeypatch): """ - 后台缺少 key 时只报告配置要求,不调用 SDK 的自动领取流程。 + 回退版本缺少 key 时继续使用旧版免费内核,不触发自动领取流程。 """ from cloakbrowser import license as provider_license monkeypatch.delenv("CLOAKBROWSER_BINARY_PATH", raising=False) resolve = MagicMock(return_value=None) monkeypatch.setattr(provider_license, "resolve_license_key", resolve) - with pytest.raises(RuntimeError, match="CLOAKBROWSER_LICENSE_KEY"): - browser._require_browser_license() + browser._require_browser_license() resolve.assert_called_once_with(None) @@ -646,6 +645,18 @@ def test_explicit_key_is_preserved_for_sdk_resolution(monkeypatch): resolve.assert_called_once_with("test-key") +def test_browser_queue_defaults_to_three_instances(monkeypatch): + """ + 未声明部署配置时,浏览器队列默认允许三个独立实例同时存活。 + """ + configured = MagicMock() + monkeypatch.setattr(browser.browser_capacity, "configure", configured) + monkeypatch.setattr(browser, "get_runtime_setting", lambda _key, default=None: default) + + assert browser._browser_queue_timeout() == 60 + configured.assert_called_once_with(3) + + def test_legacy_positional_key_and_arguments_are_preserved(provider, monkeypatch): """ 旧插件用位置参数传 key 时,授权检查和 SDK 都收到原始值。 diff --git a/uv.lock b/uv.lock index d453204df..53f4eeab0 100644 --- a/uv.lock +++ b/uv.lock @@ -655,16 +655,16 @@ wheels = [ [[package]] name = "cloakbrowser" -version = "0.7.1" +version = "0.6.5" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "cryptography" }, { name = "httpx" }, { name = "playwright" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/ea/2f/8dba47e92282888b853d16148551cdb1ec04ea1a8bb7792fb189634151c8/cloakbrowser-0.7.1.tar.gz", hash = "sha256:4c486564df86065e7619b3316cca68a31930ec511e6290e0eb48ee4dc8c5301b", size = 5848681, upload-time = "2026-11-07T22:56:23.811Z" } +sdist = { url = "https://files.pythonhosted.org/packages/3d/0c/94d725951867ab6104053947c3ac873f85cfdfdfccc4bf8646fb87dee3fd/cloakbrowser-0.6.5.tar.gz", hash = "sha256:f99b1423fc6b7d477cca3f116a1c360a9b69ee983b29ebcc4878572fb3830b78", size = 5847886, upload-time = "2026-10-31T09:40:03.803Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/01/7f/8a4abb92af568ac41abeb97f76a0786c33bbbf6b880e0c8bf2bd9c14dcbe/cloakbrowser-0.7.1-py3-none-any.whl", hash = "sha256:b4eca1a15a49e294ad9090236bf335fdba123c89f7831e5e469a5e1625afa679", size = 138881, upload-time = "2026-11-07T22:56:21.998Z" }, + { url = "https://files.pythonhosted.org/packages/84/91/2e12b847d3ff1311d307467b16c51ff38c678a89cfc062e185e76a578ebd/cloakbrowser-0.6.5-py3-none-any.whl", hash = "sha256:a0d1f4f443d02710352552d0e09f8f7ec5f420d2e75ea9554c4321147b773892", size = 141628, upload-time = "2026-10-31T09:40:02.273Z" }, ] [[package]] @@ -1828,7 +1828,7 @@ requires-dist = [ { name = "cachetools", specifier = "~=7.1.4" }, { name = "chardet", specifier = "~=7.6.0" }, { name = "click", specifier = "~=8.4.1" }, - { name = "cloakbrowser", specifier = "~=0.7.1" }, + { name = "cloakbrowser", specifier = "==0.6.5" }, { name = "cn2an", specifier = "~=0.5.24" }, { name = "crcmod-plus", specifier = "==2.3.1" }, { name = "cryptography", specifier = "~=50.0.0" },