mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-11-02 05:17:23 +08:00
refactor(startup): centralize site access composition
This commit is contained in:
jxxghp
261
app/startup/composition/site.py
Normal file
261
app/startup/composition/site.py
Normal file
@@ -0,0 +1,261 @@
|
||||
"""站点访问技术端口的宿主组合根。"""
|
||||
|
||||
from contextlib import contextmanager
|
||||
from typing import Any, Callable, Iterator, Mapping, Optional, cast
|
||||
|
||||
from app.adapters.external.cookiecloud import CookieCloudHelper
|
||||
from app.adapters.external.ocr import OcrHelper
|
||||
from app.adapters.network.browser import PlaywrightHelper
|
||||
from app.adapters.network.cloudflare import under_challenge
|
||||
from app.adapters.network.http import RequestUtils
|
||||
from app.adapters.system import rust as rust_accel
|
||||
from app.application.rss import (
|
||||
RssBrowserPort,
|
||||
RssHttpPort,
|
||||
RssParserPort,
|
||||
RssResponsePort,
|
||||
configure_rss_ports,
|
||||
reset_rss_ports,
|
||||
)
|
||||
from app.application.security.cookie import (
|
||||
CaptchaHttpPort,
|
||||
CaptchaOcrPort,
|
||||
CookieBrowserPort,
|
||||
CookieResult,
|
||||
configure_cookie_ports,
|
||||
reset_cookie_ports,
|
||||
)
|
||||
from app.application.torrent.download import (
|
||||
TorrentHttpPort,
|
||||
TorrentResponsePort,
|
||||
configure_torrent_port,
|
||||
reset_torrent_port,
|
||||
)
|
||||
from app.chain.site import (
|
||||
SiteBrowserPort,
|
||||
SiteChallengePort,
|
||||
SiteCookieCloudPort,
|
||||
SiteHttpPort,
|
||||
SiteResponsePort,
|
||||
configure_site_ports,
|
||||
reset_site_ports,
|
||||
)
|
||||
|
||||
|
||||
class _RssHttpAdapter:
|
||||
"""用 RequestUtils 实现 RSS HTTP 窄端口。"""
|
||||
|
||||
def get(self, *, url: str, ua: Optional[str], headers: Optional[dict[str, Any]],
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[RssResponsePort]:
|
||||
"""获取 RSS 原始响应。"""
|
||||
return cast(
|
||||
Optional[RssResponsePort],
|
||||
RequestUtils(
|
||||
ua=ua or "",
|
||||
headers=headers or {},
|
||||
proxies=proxies or {},
|
||||
timeout=timeout,
|
||||
).get_res(url),
|
||||
)
|
||||
|
||||
def post(self, *, url: str, data: dict[str, Any], cookie: str, ua: str,
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[RssResponsePort]:
|
||||
"""提交站点 RSS 链接表单。"""
|
||||
return cast(
|
||||
Optional[RssResponsePort],
|
||||
RequestUtils(
|
||||
cookies=cookie,
|
||||
ua=ua,
|
||||
proxies=proxies or {},
|
||||
timeout=timeout,
|
||||
).post_res(url=url, data=data),
|
||||
)
|
||||
|
||||
def decode_xml(self, response: RssResponsePort, *, performance_mode: bool,
|
||||
confidence_threshold: float) -> str:
|
||||
"""复用宿主统一编码探测规则解码 RSS XML。"""
|
||||
decoded: str = RequestUtils.get_decoded_xml_content(
|
||||
cast(Any, response),
|
||||
performance_mode=performance_mode,
|
||||
confidence_threshold=confidence_threshold,
|
||||
)
|
||||
return decoded
|
||||
|
||||
|
||||
class _RssBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现 RSS 页面渲染窄端口。"""
|
||||
|
||||
def render(self, *, url: str, cookie: str, ua: str,
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[str]:
|
||||
"""渲染站点 RSS 配置页面并返回源码。"""
|
||||
source: Optional[str] = PlaywrightHelper().get_page_source(
|
||||
url=url, cookies=cookie, ua=ua, proxies=proxies, timeout=timeout
|
||||
)
|
||||
return source
|
||||
|
||||
|
||||
class _RssParserAdapter:
|
||||
"""用可选 Rust 加速器实现 RSS 解析窄端口。"""
|
||||
|
||||
def parse(self, content: str, max_items: int) -> Optional[list[dict[str, Any]]]:
|
||||
"""调用原生解析器，不可用时保留 None 兜底语义。"""
|
||||
return cast(
|
||||
Optional[list[dict[str, Any]]],
|
||||
rust_accel.parse_rss_items(content, max_items),
|
||||
)
|
||||
|
||||
|
||||
class _CookieBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现站点登录浏览器窄端口。"""
|
||||
|
||||
def action(self, *, url: str, callback: Callable[[Any], CookieResult],
|
||||
proxies: Optional[dict[str, Any]], timeout: Optional[int]) -> CookieResult:
|
||||
"""在浏览器受控会话中执行 Application 登录回调。"""
|
||||
return cast(
|
||||
CookieResult,
|
||||
PlaywrightHelper().action(
|
||||
url=url, callback=callback, proxies=proxies, timeout=timeout
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
class _CaptchaHttpAdapter:
|
||||
"""用 RequestUtils 实现验证码图片下载窄端口。"""
|
||||
|
||||
def fetch(self, *, url: str, cookie: str, ua: str) -> Optional[bytes]:
|
||||
"""下载验证码图片，仅向 Application 返回图片字节。"""
|
||||
response = RequestUtils(ua=ua, cookies=cookie).get_res(url)
|
||||
return response.content if response and response.content else None
|
||||
|
||||
|
||||
class _CaptchaOcrAdapter:
|
||||
"""用 OcrHelper 实现验证码识别窄端口。"""
|
||||
|
||||
def recognize(self, image_b64: str) -> str:
|
||||
"""识别 Base64 验证码图片。"""
|
||||
text: str = OcrHelper().get_captcha_text(image_b64=image_b64)
|
||||
return text
|
||||
|
||||
|
||||
class _TorrentHttpAdapter:
|
||||
"""用 RequestUtils 实现种子下载 HTTP 窄端口。"""
|
||||
|
||||
def request(self, *, method: str, url: str, cookie: Optional[str],
|
||||
ua: Optional[str], referer: Optional[str], proxies: Optional[dict[str, Any]],
|
||||
allow_redirects: bool = True,
|
||||
data: Optional[dict[str, Any]] = None) -> Optional[TorrentResponsePort]:
|
||||
"""按 Application 指定方法发起请求并保留响应三态。"""
|
||||
request = RequestUtils(
|
||||
ua=ua or "",
|
||||
cookies=cookie or "",
|
||||
referer=referer or "",
|
||||
proxies=proxies or {},
|
||||
)
|
||||
if method == "POST":
|
||||
response = request.post_res(
|
||||
url=url, data=data, allow_redirects=allow_redirects
|
||||
)
|
||||
else:
|
||||
response = request.get_res(url=url, allow_redirects=allow_redirects)
|
||||
return cast(Optional[TorrentResponsePort], response)
|
||||
|
||||
|
||||
class _SiteHttpAdapter:
|
||||
"""用 RequestUtils 实现站点链有界 HTTP 响应端口。"""
|
||||
|
||||
@contextmanager
|
||||
def open(
|
||||
self,
|
||||
*,
|
||||
method: str,
|
||||
url: str,
|
||||
headers: Optional[Mapping[str, Any]] = None,
|
||||
cookie: Optional[str] = None,
|
||||
ua: Optional[str] = None,
|
||||
proxies: Optional[Mapping[str, Any]] = None,
|
||||
timeout: int = 20,
|
||||
) -> Iterator[Optional[SiteResponsePort]]:
|
||||
"""打开响应并在所有返回或异常分支后关闭底层连接。"""
|
||||
request = RequestUtils(
|
||||
headers=dict(headers or {}),
|
||||
cookies=cookie or "",
|
||||
ua=ua or "",
|
||||
proxies=dict(proxies or {}),
|
||||
timeout=timeout,
|
||||
)
|
||||
with request.response_manager(method=method, url=url) as response:
|
||||
yield cast(Optional[SiteResponsePort], response)
|
||||
|
||||
|
||||
class _SiteBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现站点链浏览器渲染端口。"""
|
||||
|
||||
def render(
|
||||
self,
|
||||
*,
|
||||
url: str,
|
||||
cookies: str,
|
||||
ua: str,
|
||||
proxies: Optional[Mapping[str, Any]],
|
||||
timeout: int,
|
||||
) -> Optional[str]:
|
||||
"""渲染页面；浏览器 helper 在返回前关闭页面与上下文。"""
|
||||
source: Optional[str] = PlaywrightHelper().get_page_source(
|
||||
url=url,
|
||||
cookies=cookies,
|
||||
ua=ua,
|
||||
proxies=dict(proxies) if proxies else None,
|
||||
timeout=timeout,
|
||||
)
|
||||
return source
|
||||
|
||||
|
||||
class _SiteChallengeAdapter:
|
||||
"""用统一 Cloudflare 规则实现页面挑战识别端口。"""
|
||||
|
||||
def detected(self, html_text: str) -> bool:
|
||||
"""返回页面是否处于站点挑战流程。"""
|
||||
return bool(under_challenge(html_text))
|
||||
|
||||
|
||||
class _SiteCookieCloudAdapter:
|
||||
"""用 CookieCloudHelper 实现站点 Cookie 聚合端口。"""
|
||||
|
||||
def download(self) -> tuple[Optional[dict[str, str]], str]:
|
||||
"""下载并返回 CookieCloud 的兼容二元结果。"""
|
||||
return CookieCloudHelper().download()
|
||||
|
||||
|
||||
def configure_site_access_composition() -> None:
|
||||
"""统一装配 RSS、登录、种子下载与站点链技术边。"""
|
||||
reset_site_access_composition()
|
||||
try:
|
||||
configure_rss_ports(
|
||||
http=cast(RssHttpPort, _RssHttpAdapter()),
|
||||
browser=cast(RssBrowserPort, _RssBrowserAdapter()),
|
||||
parser=cast(RssParserPort, _RssParserAdapter()),
|
||||
)
|
||||
configure_cookie_ports(
|
||||
browser=cast(CookieBrowserPort, _CookieBrowserAdapter()),
|
||||
http=cast(CaptchaHttpPort, _CaptchaHttpAdapter()),
|
||||
ocr=cast(CaptchaOcrPort, _CaptchaOcrAdapter()),
|
||||
)
|
||||
configure_torrent_port(cast(TorrentHttpPort, _TorrentHttpAdapter()))
|
||||
configure_site_ports(
|
||||
http=cast(SiteHttpPort, _SiteHttpAdapter()),
|
||||
browser=cast(SiteBrowserPort, _SiteBrowserAdapter()),
|
||||
challenge=cast(SiteChallengePort, _SiteChallengeAdapter()),
|
||||
cookiecloud=cast(SiteCookieCloudPort, _SiteCookieCloudAdapter()),
|
||||
)
|
||||
except Exception:
|
||||
reset_site_access_composition()
|
||||
raise
|
||||
|
||||
|
||||
def reset_site_access_composition() -> None:
|
||||
"""统一释放站点访问端口，支持重复 lifespan 与失败回滚。"""
|
||||
reset_site_ports()
|
||||
reset_torrent_port()
|
||||
reset_cookie_ports()
|
||||
reset_rss_ports()
|
||||
|
||||
@@ -1,260 +1,16 @@
|
||||
"""装配站点访问相关 Application Port。"""
|
||||
"""站点访问端口的生命周期入口。"""
|
||||
|
||||
from contextlib import contextmanager
|
||||
from typing import Any, Callable, Iterator, Mapping, Optional, cast
|
||||
|
||||
from app.adapters.external.cookiecloud import CookieCloudHelper
|
||||
from app.adapters.external.ocr import OcrHelper
|
||||
from app.adapters.network.browser import PlaywrightHelper
|
||||
from app.adapters.network.cloudflare import under_challenge
|
||||
from app.adapters.network.http import RequestUtils
|
||||
from app.adapters.system import rust as rust_accel
|
||||
from app.application.rss import (
|
||||
RssBrowserPort,
|
||||
RssHttpPort,
|
||||
RssParserPort,
|
||||
RssResponsePort,
|
||||
configure_rss_ports,
|
||||
reset_rss_ports,
|
||||
from app.startup.composition.site import (
|
||||
configure_site_access_composition,
|
||||
reset_site_access_composition,
|
||||
)
|
||||
from app.application.security.cookie import (
|
||||
CaptchaHttpPort,
|
||||
CaptchaOcrPort,
|
||||
CookieBrowserPort,
|
||||
CookieResult,
|
||||
configure_cookie_ports,
|
||||
reset_cookie_ports,
|
||||
)
|
||||
from app.application.torrent.download import (
|
||||
TorrentHttpPort,
|
||||
TorrentResponsePort,
|
||||
configure_torrent_port,
|
||||
reset_torrent_port,
|
||||
)
|
||||
from app.chain.site import (
|
||||
SiteBrowserPort,
|
||||
SiteChallengePort,
|
||||
SiteCookieCloudPort,
|
||||
SiteHttpPort,
|
||||
SiteResponsePort,
|
||||
configure_site_ports,
|
||||
reset_site_ports,
|
||||
)
|
||||
|
||||
|
||||
class _RssHttpAdapter:
|
||||
"""用 RequestUtils 实现 RSS HTTP 窄端口。"""
|
||||
|
||||
def get(self, *, url: str, ua: Optional[str], headers: Optional[dict[str, Any]],
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[RssResponsePort]:
|
||||
"""获取 RSS 原始响应。"""
|
||||
return cast(
|
||||
Optional[RssResponsePort],
|
||||
RequestUtils(
|
||||
ua=ua or "",
|
||||
headers=headers or {},
|
||||
proxies=proxies or {},
|
||||
timeout=timeout,
|
||||
).get_res(url),
|
||||
)
|
||||
|
||||
def post(self, *, url: str, data: dict[str, Any], cookie: str, ua: str,
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[RssResponsePort]:
|
||||
"""提交站点 RSS 链接表单。"""
|
||||
return cast(
|
||||
Optional[RssResponsePort],
|
||||
RequestUtils(
|
||||
cookies=cookie,
|
||||
ua=ua,
|
||||
proxies=proxies or {},
|
||||
timeout=timeout,
|
||||
).post_res(url=url, data=data),
|
||||
)
|
||||
|
||||
def decode_xml(self, response: RssResponsePort, *, performance_mode: bool,
|
||||
confidence_threshold: float) -> str:
|
||||
"""复用宿主统一编码探测规则解码 RSS XML。"""
|
||||
decoded: str = RequestUtils.get_decoded_xml_content(
|
||||
cast(Any, response),
|
||||
performance_mode=performance_mode,
|
||||
confidence_threshold=confidence_threshold,
|
||||
)
|
||||
return decoded
|
||||
|
||||
|
||||
class _RssBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现 RSS 页面渲染窄端口。"""
|
||||
|
||||
def render(self, *, url: str, cookie: str, ua: str,
|
||||
proxies: Optional[dict[str, Any]], timeout: int) -> Optional[str]:
|
||||
"""渲染站点 RSS 配置页面并返回源码。"""
|
||||
source: Optional[str] = PlaywrightHelper().get_page_source(
|
||||
url=url, cookies=cookie, ua=ua, proxies=proxies, timeout=timeout
|
||||
)
|
||||
return source
|
||||
|
||||
|
||||
class _RssParserAdapter:
|
||||
"""用可选 Rust 加速器实现 RSS 解析窄端口。"""
|
||||
|
||||
def parse(self, content: str, max_items: int) -> Optional[list[dict[str, Any]]]:
|
||||
"""调用原生解析器，不可用时保留 None 兜底语义。"""
|
||||
return cast(
|
||||
Optional[list[dict[str, Any]]],
|
||||
rust_accel.parse_rss_items(content, max_items),
|
||||
)
|
||||
|
||||
|
||||
class _CookieBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现站点登录浏览器窄端口。"""
|
||||
|
||||
def action(self, *, url: str, callback: Callable[[Any], CookieResult],
|
||||
proxies: Optional[dict[str, Any]], timeout: Optional[int]) -> CookieResult:
|
||||
"""在浏览器受控会话中执行 Application 登录回调。"""
|
||||
return cast(
|
||||
CookieResult,
|
||||
PlaywrightHelper().action(
|
||||
url=url, callback=callback, proxies=proxies, timeout=timeout
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
class _CaptchaHttpAdapter:
|
||||
"""用 RequestUtils 实现验证码图片下载窄端口。"""
|
||||
|
||||
def fetch(self, *, url: str, cookie: str, ua: str) -> Optional[bytes]:
|
||||
"""下载验证码图片，仅向 Application 返回图片字节。"""
|
||||
response = RequestUtils(ua=ua, cookies=cookie).get_res(url)
|
||||
return response.content if response and response.content else None
|
||||
|
||||
|
||||
class _CaptchaOcrAdapter:
|
||||
"""用 OcrHelper 实现验证码识别窄端口。"""
|
||||
|
||||
def recognize(self, image_b64: str) -> str:
|
||||
"""识别 Base64 验证码图片。"""
|
||||
text: str = OcrHelper().get_captcha_text(image_b64=image_b64)
|
||||
return text
|
||||
|
||||
|
||||
class _TorrentHttpAdapter:
|
||||
"""用 RequestUtils 实现种子下载 HTTP 窄端口。"""
|
||||
|
||||
def request(self, *, method: str, url: str, cookie: Optional[str],
|
||||
ua: Optional[str], referer: Optional[str], proxies: Optional[dict[str, Any]],
|
||||
allow_redirects: bool = True,
|
||||
data: Optional[dict[str, Any]] = None) -> Optional[TorrentResponsePort]:
|
||||
"""按 Application 指定方法发起请求并保留响应三态。"""
|
||||
request = RequestUtils(
|
||||
ua=ua or "",
|
||||
cookies=cookie or "",
|
||||
referer=referer or "",
|
||||
proxies=proxies or {},
|
||||
)
|
||||
if method == "POST":
|
||||
response = request.post_res(
|
||||
url=url, data=data, allow_redirects=allow_redirects
|
||||
)
|
||||
else:
|
||||
response = request.get_res(url=url, allow_redirects=allow_redirects)
|
||||
return cast(Optional[TorrentResponsePort], response)
|
||||
|
||||
|
||||
class _SiteHttpAdapter:
|
||||
"""用 RequestUtils 实现站点链有界 HTTP 响应端口。"""
|
||||
|
||||
@contextmanager
|
||||
def open(
|
||||
self,
|
||||
*,
|
||||
method: str,
|
||||
url: str,
|
||||
headers: Optional[Mapping[str, Any]] = None,
|
||||
cookie: Optional[str] = None,
|
||||
ua: Optional[str] = None,
|
||||
proxies: Optional[Mapping[str, Any]] = None,
|
||||
timeout: int = 20,
|
||||
) -> Iterator[Optional[SiteResponsePort]]:
|
||||
"""打开响应并在所有返回或异常分支后关闭底层连接。"""
|
||||
request = RequestUtils(
|
||||
headers=dict(headers or {}),
|
||||
cookies=cookie or "",
|
||||
ua=ua or "",
|
||||
proxies=dict(proxies or {}),
|
||||
timeout=timeout,
|
||||
)
|
||||
with request.response_manager(method=method, url=url) as response:
|
||||
yield cast(Optional[SiteResponsePort], response)
|
||||
|
||||
|
||||
class _SiteBrowserAdapter:
|
||||
"""用 PlaywrightHelper 实现站点链浏览器渲染端口。"""
|
||||
|
||||
def render(
|
||||
self,
|
||||
*,
|
||||
url: str,
|
||||
cookies: str,
|
||||
ua: str,
|
||||
proxies: Optional[Mapping[str, Any]],
|
||||
timeout: int,
|
||||
) -> Optional[str]:
|
||||
"""渲染页面；浏览器 helper 在返回前关闭页面与上下文。"""
|
||||
source: Optional[str] = PlaywrightHelper().get_page_source(
|
||||
url=url,
|
||||
cookies=cookies,
|
||||
ua=ua,
|
||||
proxies=dict(proxies) if proxies else None,
|
||||
timeout=timeout,
|
||||
)
|
||||
return source
|
||||
|
||||
|
||||
class _SiteChallengeAdapter:
|
||||
"""用统一 Cloudflare 规则实现页面挑战识别端口。"""
|
||||
|
||||
def detected(self, html_text: str) -> bool:
|
||||
"""返回页面是否处于站点挑战流程。"""
|
||||
return bool(under_challenge(html_text))
|
||||
|
||||
|
||||
class _SiteCookieCloudAdapter:
|
||||
"""用 CookieCloudHelper 实现站点 Cookie 聚合端口。"""
|
||||
|
||||
def download(self) -> tuple[Optional[dict[str, str]], str]:
|
||||
"""下载并返回 CookieCloud 的兼容二元结果。"""
|
||||
return CookieCloudHelper().download()
|
||||
|
||||
|
||||
def init_site_access_ports() -> None:
|
||||
"""统一装配 RSS、登录、种子下载与站点链技术边。"""
|
||||
reset_site_access_ports()
|
||||
try:
|
||||
configure_rss_ports(
|
||||
http=cast(RssHttpPort, _RssHttpAdapter()),
|
||||
browser=cast(RssBrowserPort, _RssBrowserAdapter()),
|
||||
parser=cast(RssParserPort, _RssParserAdapter()),
|
||||
)
|
||||
configure_cookie_ports(
|
||||
browser=cast(CookieBrowserPort, _CookieBrowserAdapter()),
|
||||
http=cast(CaptchaHttpPort, _CaptchaHttpAdapter()),
|
||||
ocr=cast(CaptchaOcrPort, _CaptchaOcrAdapter()),
|
||||
)
|
||||
configure_torrent_port(cast(TorrentHttpPort, _TorrentHttpAdapter()))
|
||||
configure_site_ports(
|
||||
http=cast(SiteHttpPort, _SiteHttpAdapter()),
|
||||
browser=cast(SiteBrowserPort, _SiteBrowserAdapter()),
|
||||
challenge=cast(SiteChallengePort, _SiteChallengeAdapter()),
|
||||
cookiecloud=cast(SiteCookieCloudPort, _SiteCookieCloudAdapter()),
|
||||
)
|
||||
except Exception:
|
||||
reset_site_access_ports()
|
||||
raise
|
||||
"""委托组合根装配全部站点访问技术端口。"""
|
||||
configure_site_access_composition()
|
||||
|
||||
|
||||
def reset_site_access_ports() -> None:
|
||||
"""统一释放站点访问端口，支持重复 lifespan 与失败回滚。"""
|
||||
reset_site_ports()
|
||||
reset_torrent_port()
|
||||
reset_cookie_ports()
|
||||
reset_rss_ports()
|
||||
"""委托组合根释放全部站点访问技术端口。"""
|
||||
reset_site_access_composition()
|
||||
|
||||
@@ -163,6 +163,9 @@ not recreate their concrete construction.
|
||||
with the single `RecognitionRuleService` used to publish media-recognition rule
|
||||
providers. `initializers/domain.py` is only the lifecycle hook and must not
|
||||
construct a parallel rule service or import concrete adapters.
|
||||
`startup/composition/site.py` owns RSS, site login, captcha, torrent and SiteChain
|
||||
network/browser/OCR Adapter assembly. `initializers/site.py` is only the lifecycle
|
||||
hook and must not import or construct those concrete adapters.
|
||||
`startup/composition/outbox.py`
|
||||
owns durable handler validation, lazy event/notification replay binding and the
|
||||
short-transaction dispatcher factory. Initializers call this owner in
|
||||
|
||||
@@ -2501,6 +2501,44 @@ def test_network_initializer_delegates_construction_to_composition():
|
||||
assert "app.chain.download.ports" in composition_imports
|
||||
|
||||
|
||||
def test_site_initializer_delegates_construction_to_composition():
|
||||
"""站点 initializer 只保留生命周期入口，不得重新拥有具体技术适配器。"""
|
||||
initializer_path = APP_ROOT / "startup" / "initializers" / "site.py"
|
||||
initializer_tree = ast.parse(
|
||||
initializer_path.read_text(encoding="utf-8-sig"),
|
||||
filename=str(initializer_path),
|
||||
)
|
||||
imported_modules = {
|
||||
node.module
|
||||
for node in ast.walk(initializer_tree)
|
||||
if isinstance(node, ast.ImportFrom) and node.module
|
||||
}
|
||||
assert imported_modules == {"app.startup.composition.site"}
|
||||
calls = {
|
||||
ast.unparse(node.func)
|
||||
for node in ast.walk(initializer_tree)
|
||||
if isinstance(node, ast.Call)
|
||||
}
|
||||
assert calls == {
|
||||
"configure_site_access_composition",
|
||||
"reset_site_access_composition",
|
||||
}
|
||||
|
||||
composition_path = APP_ROOT / "startup" / "composition" / "site.py"
|
||||
composition_tree = ast.parse(
|
||||
composition_path.read_text(encoding="utf-8-sig"),
|
||||
filename=str(composition_path),
|
||||
)
|
||||
composition_imports = {
|
||||
node.module
|
||||
for node in ast.walk(composition_tree)
|
||||
if isinstance(node, ast.ImportFrom) and node.module
|
||||
}
|
||||
assert "app.adapters.external.cookiecloud" in composition_imports
|
||||
assert "app.adapters.network.browser" in composition_imports
|
||||
assert "app.application.rss" in composition_imports
|
||||
|
||||
|
||||
PROCESS_LEVEL_ROOTS = (
|
||||
"app.api",
|
||||
"app.chain",
|
||||
|
||||
@@ -15,6 +15,7 @@ from app.application.torrent.download import (
|
||||
configure_torrent_port,
|
||||
)
|
||||
from app.chain import site as site_module
|
||||
from app.startup.composition import site as site_composition
|
||||
from app.startup.initializers import site as site_initializer
|
||||
|
||||
|
||||
@@ -189,7 +190,7 @@ def test_initializer_rolls_back_partial_ports_on_failure(monkeypatch) -> None:
|
||||
raise RuntimeError("injected failure")
|
||||
|
||||
monkeypatch.setattr(
|
||||
site_initializer, "configure_cookie_ports", fail_cookie_configuration
|
||||
site_composition, "configure_cookie_ports", fail_cookie_configuration
|
||||
)
|
||||
|
||||
with pytest.raises(RuntimeError, match="injected failure"):
|
||||
|
||||
@@ -16,6 +16,7 @@ from app.application.security import cookie as cookie_module
|
||||
from app.application.site.contract import SiteSnapshot
|
||||
from app.chain import site as site_module
|
||||
from app.chain.site import SiteChain, configure_site_ports, reset_site_ports
|
||||
from app.startup.composition import site as site_composition
|
||||
from app.startup.initializers import site as site_initializer
|
||||
|
||||
|
||||
@@ -248,7 +249,7 @@ def test_initializer_rolls_back_all_ports_when_site_chain_publish_fails(
|
||||
raise RuntimeError("site publish failed")
|
||||
|
||||
monkeypatch.setattr(
|
||||
site_initializer, "configure_site_ports", fail_site_configuration
|
||||
site_composition, "configure_site_ports", fail_site_configuration
|
||||
)
|
||||
|
||||
with pytest.raises(RuntimeError, match="site publish failed"):
|
||||
@@ -283,8 +284,8 @@ def test_real_initializer_http_adapter_closes_response(monkeypatch) -> None:
|
||||
finally:
|
||||
state["closed"] = True
|
||||
|
||||
monkeypatch.setattr(site_initializer, "RequestUtils", FakeRequest)
|
||||
adapter = site_initializer._SiteHttpAdapter()
|
||||
monkeypatch.setattr(site_composition, "RequestUtils", FakeRequest)
|
||||
adapter = site_composition._SiteHttpAdapter()
|
||||
|
||||
with adapter.open(method="GET", url="https://close.test/") as opened:
|
||||
assert opened is response
|
||||
|
||||
Reference in New Issue
Block a user