cleanup and fix runtime bugs
This commit is contained in:
@@ -23,7 +23,7 @@ class NetworkCapture:
|
||||
_origin: str | None = None
|
||||
|
||||
def attach(self, page: Page, origin_url: str | None = None) -> None:
|
||||
# Подписываемся на request/response события страницы.
|
||||
# Подписка на сетевые события.
|
||||
try:
|
||||
self._origin = urlparse(origin_url or page.url).netloc.lower() or None
|
||||
except Exception:
|
||||
@@ -32,22 +32,22 @@ class NetworkCapture:
|
||||
page.on("response", self._on_response)
|
||||
|
||||
def _is_same_origin(self, url: str) -> bool:
|
||||
# При необходимости ограничиваемся same-origin и доменами IAAI.
|
||||
if not self.settings.gentle.capture_same_origin_only or not self._origin:
|
||||
# Фильтр по домену.
|
||||
if not self.settings.capture.capture_same_origin_only or not self._origin:
|
||||
return True
|
||||
netloc = urlparse(url).netloc.lower()
|
||||
return netloc == self._origin or netloc.endswith(".iaai.com")
|
||||
|
||||
def _on_request(self, request: Request) -> None:
|
||||
# только xhr/fetch
|
||||
# Берем только xhr/fetch.
|
||||
if request.resource_type not in {"xhr", "fetch"}:
|
||||
return
|
||||
if not self._is_same_origin(request.url):
|
||||
return
|
||||
if len(self.requests) >= self.settings.gentle.max_requests:
|
||||
if len(self.requests) >= self.settings.capture.max_requests:
|
||||
return
|
||||
key = f"{request.method}:{request.url}:{request.post_data or ''}"
|
||||
# Дедупликация одинаковых запросов.
|
||||
# Убираем дубли.
|
||||
if key in self._seen_req:
|
||||
return
|
||||
self._seen_req.add(key)
|
||||
@@ -57,13 +57,13 @@ class NetworkCapture:
|
||||
})
|
||||
|
||||
def _on_response(self, response: Response) -> None:
|
||||
# сохраняем json
|
||||
# Сохраняем JSON.
|
||||
request = response.request
|
||||
if request.resource_type not in {"xhr", "fetch"}:
|
||||
return
|
||||
if not self._is_same_origin(response.url):
|
||||
return
|
||||
if len(self.json_responses) >= self.settings.gentle.max_json_responses:
|
||||
if len(self.json_responses) >= self.settings.capture.max_json_responses:
|
||||
return
|
||||
if not self._is_json(response):
|
||||
return
|
||||
@@ -95,7 +95,7 @@ class NetworkCapture:
|
||||
|
||||
@staticmethod
|
||||
def _categorize(url: str) -> str:
|
||||
# Простая эвристика для разбивки ответов по смыслу.
|
||||
# Простая категория URL.
|
||||
low = url.lower()
|
||||
mapping = {
|
||||
"images": ["image", "media", "photos", "gallery"],
|
||||
@@ -110,15 +110,13 @@ class NetworkCapture:
|
||||
return "other"
|
||||
|
||||
def export(self) -> dict[str, Any]:
|
||||
# полезные категории сначала, other в конец
|
||||
prioritized = sorted(self.json_responses, key=lambda i: (i["category"] == "other", i["url"]))
|
||||
responses = sorted(self.json_responses, key=lambda i: (i["category"] == "other", i["url"]))
|
||||
return {
|
||||
"requests": self.requests,
|
||||
"json_responses": self.json_responses,
|
||||
"prioritized_json_responses": prioritized,
|
||||
"json_responses": responses,
|
||||
"capture_limits": {
|
||||
"same_origin_only": self.settings.gentle.capture_same_origin_only,
|
||||
"max_requests": self.settings.gentle.max_requests,
|
||||
"max_json_responses": self.settings.gentle.max_json_responses,
|
||||
"same_origin_only": self.settings.capture.capture_same_origin_only,
|
||||
"max_requests": self.settings.capture.max_requests,
|
||||
"max_json_responses": self.settings.capture.max_json_responses,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user