zimscraperlib 5.5.1__tar.gz → 5.5.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/CHANGELOG.md +7 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/PKG-INFO +1 -1
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/package.json +1 -1
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/openzim.toml +7 -0
- zimscraperlib-5.5.2/rules/patch_wombat.py +152 -0
- zimscraperlib-5.5.2/src/zimscraperlib/__about__.py +1 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/statics/wombat.js +1 -1
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/statics/wombatSetup.js +1 -1
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/creator.py +51 -17
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_zim_creator.py +89 -0
- zimscraperlib-5.5.1/src/zimscraperlib/__about__.py +0 -1
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/.gitignore +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/.pre-commit-config.yaml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/.readthedocs.yaml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/LICENSE +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/README.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/contrib/README.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/contrib/encode_video.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/assets/openzim.png +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/functional_architecture.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/index.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/license.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/scripts/generate_api_nav.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/software_architecture.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/docs/technical_architecture.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/.prettierignore +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/.prettierrc.json +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/.yarnrc.yml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/eslint.config.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/rollup.config.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/src/wombatSetup.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/test/wombatSetup.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/test/wombatUrlRewriting.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/javascript/yarn.lock +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/mkdocs.yml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/pyproject.toml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/rules/generate_rules.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/rules/rules.yaml +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/constants.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/download.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/filesystem.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/fix_ogvjs_dist.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/html.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/i18n.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/conversion.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/illustration.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/optimization.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/presets.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/probing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/transformation.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/image/utils.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/inputs.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/logging.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/misc.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/py.typed +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/css.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/html.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/js.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/js_ast.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/rules.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/rx_replacer.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/statics/README.md +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/statics/__wb_module_decl.js +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/templates/head_insert.html +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/rewriting/url_rewriting.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/types.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/typing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/uri.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/video/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/video/config.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/video/encoding.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/video/presets.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/video/probing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/_libkiwix.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/archive.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/dedup.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/filesystem.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/indexing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/items.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/metadata.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/src/zimscraperlib/zim/providers.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tasks.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/download/test_download.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/DroidSans.ttf +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/audio.mp3 +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/blue.jpg +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/commons.png +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/commons48.png +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/encrypted.pdf +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/encrypted.txt +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/mail.gif +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/milderm.pdf +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/milderm.txt +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/ninja.webp +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/pluto.jpg +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/single_wave_icon.gbr +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/square.jpg +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/square.png +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/star.svg +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/video.mkv +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/video.mp4 +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/files/video.webm +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/filesystem/test_filesystem.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/html/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/html/test_html.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/i18n/test_i18n.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/image/test_illustration.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/image/test_image.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/inputs/test_inputs.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/logging/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/logging/test_logging.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/misc/test_misc.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/ogvjs/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/ogvjs/test_ogvjs.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/__init__.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_css_rewriting.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_fuzzy_rules.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_html_rewriting.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_js_globals.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_js_rewriting.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_rx_replacer.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/test_url_rewriting.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/rewriting/utils.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/test_constants.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/types/test_types.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/typing/test_typing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/uri/test_uri.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/video/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/video/test_encoding.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/video/test_video.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/conftest.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_archive.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_dedup.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_fs.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_indexing.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_libkiwix.py +0 -0
- {zimscraperlib-5.5.1 → zimscraperlib-5.5.2}/tests/zim/test_metadata.py +0 -0
|
@@ -5,6 +5,13 @@ All notable changes to this project are documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) (as of version 1.5.0).
|
|
7
7
|
|
|
8
|
+
## [5.5.2] - 2026-11-06
|
|
9
|
+
|
|
10
|
+
### Fixed
|
|
11
|
+
|
|
12
|
+
- Patch vendored `wombat.js` so `fetch()` converts POST to GET like `XMLHttpRequest` already does, fixing YouTube embedded player video playback (#379, webrecorder/wombat#242)
|
|
13
|
+
- Stop a `zim.Creator` abandoned before finishing (e.g. after an item path duplication) from hanging forever at garbage collection or interpreter exit: its libzim worker threads are now drained with the GIL released and the partially written ZIM is removed (#300)
|
|
14
|
+
|
|
8
15
|
## [5.5.1] - 2026-10-30
|
|
9
16
|
|
|
10
17
|
### Fixed
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: zimscraperlib
|
|
3
|
-
Version: 5.5.
|
|
3
|
+
Version: 5.5.2
|
|
4
4
|
Summary: Collection of python tools to re-use common code across scrapers
|
|
5
5
|
Project-URL: Donate, https://www.kiwix.org/en/support-us/
|
|
6
6
|
Project-URL: Homepage, https://github.com/openzim/python-scraperlib
|
|
@@ -8,6 +8,13 @@ execute_after=[
|
|
|
8
8
|
action="get_file"
|
|
9
9
|
source="https://cdn.jsdelivr.net/npm/@webrecorder/wombat@3.11.0/dist/wombat.js"
|
|
10
10
|
target_file="wombat.js"
|
|
11
|
+
# wombat.js's fetch() override does not convert POST to GET the way its XHR
|
|
12
|
+
# override does, breaking replay of anything fetched via a POST fetch() call
|
|
13
|
+
# (e.g. YouTube's embedded player). A fix has been proposed upstream
|
|
14
|
+
# (webrecorder/wombat); patch our vendored copy in the meantime.
|
|
15
|
+
execute_after=[
|
|
16
|
+
"cd ../../../../ && python rules/patch_wombat.py",
|
|
17
|
+
]
|
|
11
18
|
|
|
12
19
|
# wombatSetup.js is supposed to be built locally from files in javascript folder.
|
|
13
20
|
# Should someone install from Github repo directly, the configuration below ensures that
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
"""Patch the vendored wombat.js so fetch() converts POST (and other non-GET)
|
|
2
|
+
requests to GET, the same way its XMLHttpRequest override already does.
|
|
3
|
+
|
|
4
|
+
Without this, wombat.js's `window.fetch` override only rewrites the request
|
|
5
|
+
URL: it leaves method and body untouched. Any page that calls `fetch()` with
|
|
6
|
+
a POST (rather than XMLHttpRequest) therefore has that POST sent, as-is,
|
|
7
|
+
to a server that only replays GET-converted content baked into the ZIM at
|
|
8
|
+
scrape time, and 404s. This is exactly how YouTube's embedded player fetches
|
|
9
|
+
its InnerTube player-config (`/youtubei/v1/player`): the request 404s, the
|
|
10
|
+
player's JSON.parse() of the error page throws, and video playback breaks
|
|
11
|
+
right after the user clicks Play.
|
|
12
|
+
|
|
13
|
+
A fix for this has been proposed upstream (webrecorder/wombat), but it uses
|
|
14
|
+
wombat's own full postToGetUrl() conversion, which flattens the request body
|
|
15
|
+
into the query string. That does not match how our own scrape-time tooling
|
|
16
|
+
(warc2zim) currently names a POST-converted ZIM entry: just
|
|
17
|
+
`<original-url>&__wb_method=<METHOD>`, with the body dropped entirely (this
|
|
18
|
+
can be verified directly on a built ZIM, e.g. for the `youtubei/v1/player`,
|
|
19
|
+
`youtubei/v1/next` and WAA `GenerateIT` entries). So, until that upstream fix
|
|
20
|
+
ships *and* our own scrape-time POST naming is made to match it, this patch
|
|
21
|
+
intentionally uses the simpler, body-dropping convention instead, to stay
|
|
22
|
+
consistent with how ZIMs are actually built today.
|
|
23
|
+
|
|
24
|
+
This script is invoked via `execute_after` on the wombat.js `get_file` action
|
|
25
|
+
in openzim.toml, right after wombat.js is downloaded, so it runs on every
|
|
26
|
+
build. It is idempotent: a wombat.js that is already patched (e.g. because
|
|
27
|
+
`get_file` skipped re-downloading it) is left untouched.
|
|
28
|
+
"""
|
|
29
|
+
|
|
30
|
+
import logging
|
|
31
|
+
from pathlib import Path
|
|
32
|
+
|
|
33
|
+
logging.basicConfig(level=logging.INFO)
|
|
34
|
+
|
|
35
|
+
wombat_js = (
|
|
36
|
+
Path(__file__)
|
|
37
|
+
.joinpath("../../src/zimscraperlib/rewriting/statics/wombat.js")
|
|
38
|
+
.resolve()
|
|
39
|
+
)
|
|
40
|
+
|
|
41
|
+
if not wombat_js.exists():
|
|
42
|
+
logging.warning("Skipping wombat.js patching, file is missing")
|
|
43
|
+
raise SystemExit(0)
|
|
44
|
+
|
|
45
|
+
# --- fetch() override ---------------------------------------------------
|
|
46
|
+
#
|
|
47
|
+
# Only the plain `fetch(url, {method, body})` call form is patched here:
|
|
48
|
+
# that is the one that reaches this code with a still-pristine, unrewritten
|
|
49
|
+
# URL. A `fetch(new Request(url, {method, body}))` call is instead handled
|
|
50
|
+
# by the Request-constructor patch below; by the time it reaches here, the
|
|
51
|
+
# Request object already carries its final, rewritten GET url.
|
|
52
|
+
FETCH_ORIGINAL = (
|
|
53
|
+
"if(this.$wbwindow.fetch){var p=this.$wbwindow.fetch;"
|
|
54
|
+
"this.$wbwindow.fetch=function(e,r){var i;"
|
|
55
|
+
"if(e instanceof Request){var o=t.rewriteUrl(e.url);"
|
|
56
|
+
"e.__WB_no_unrewrite=!0,i=o===e.url?e:new Request(o,e),"
|
|
57
|
+
"delete e.__WB_no_unrewrite}"
|
|
58
|
+
"else e=t.rewriteUrl(e.toString()),i=new Request(e,r);"
|
|
59
|
+
"return p.call(t.proxyToObj(this),i)}}"
|
|
60
|
+
)
|
|
61
|
+
|
|
62
|
+
FETCH_PATCHED = (
|
|
63
|
+
"if(this.$wbwindow.fetch){var p=this.$wbwindow.fetch;"
|
|
64
|
+
"this.$wbwindow.fetch=function(e,r){var i;"
|
|
65
|
+
"if(t.wb_info&&t.wb_info.convert_post_to_get&&!(e instanceof Request)){"
|
|
66
|
+
'var curMethod=((r&&r.method)||"GET").toUpperCase();'
|
|
67
|
+
'if("GET"!==curMethod&&"HEAD"!==curMethod){'
|
|
68
|
+
'var curUrl=e.toString(),sep=curUrl.indexOf("?")>-1?"&":"?";'
|
|
69
|
+
'e=curUrl+sep+"__wb_method="+curMethod,'
|
|
70
|
+
'r=Object.assign({},r,{method:"GET",body:undefined})'
|
|
71
|
+
"}}"
|
|
72
|
+
"if(e instanceof Request){var o=t.rewriteUrl(e.url);"
|
|
73
|
+
"e.__WB_no_unrewrite=!0,i=o===e.url?e:new Request(o,e),"
|
|
74
|
+
"delete e.__WB_no_unrewrite}"
|
|
75
|
+
"else e=t.rewriteUrl(e.toString()),i=new Request(e,r);"
|
|
76
|
+
"return p.call(t.proxyToObj(this),i)}}"
|
|
77
|
+
)
|
|
78
|
+
|
|
79
|
+
# --- Request constructor override ---------------------------------------
|
|
80
|
+
#
|
|
81
|
+
# Handles `new Request(url, {method, body})` (and `fetch(new Request(...))`,
|
|
82
|
+
# which goes through this same constructor first). `r` here is the closed-
|
|
83
|
+
# over *native* Request class (captured before the override replaces
|
|
84
|
+
# `window.Request`), so building via `new r(...)` does not recurse back
|
|
85
|
+
# into this override.
|
|
86
|
+
REQUEST_ORIGINAL = (
|
|
87
|
+
"this.$wbwindow.Request&&this.$wbwindow.Request.prototype){"
|
|
88
|
+
"var l=this.$wbwindow.Request;this.$wbwindow.Request=(r=this.$wbwindow.Request,"
|
|
89
|
+
'function e(i,o){t.domConstructorErrorChecker(this,"Request",arguments);'
|
|
90
|
+
'var n=o||{},s=i;switch(typeof i){case"string":s=t.rewriteUrl(i);break;'
|
|
91
|
+
'case"object":if(s=i,i.url){var a=t.rewriteUrl(i.url);'
|
|
92
|
+
"a!==i.url&&(s=new r(a,i))}else i.href&&(s=t.rewriteUrl(i.toString(),!0))}"
|
|
93
|
+
"let h=!1;if(n&&n.referrer){var w=t.rewriteUrl(n.referrer);"
|
|
94
|
+
"w!==n.referrer&&(n instanceof e?(n.__WB_no_unrewrite=!0,h=!0):n.referrer=w)}"
|
|
95
|
+
"var c=new r(s,n);return h&&delete n.__WB_no_unrewrite,c}),"
|
|
96
|
+
"this.$wbwindow.Request.prototype=l.prototype,"
|
|
97
|
+
'Object.defineProperty(this.$wbwindow.Request.prototype,"constructor",'
|
|
98
|
+
"{value:this.$wbwindow.Request}),"
|
|
99
|
+
'this.overridePropExtract(this.$wbwindow.Request.prototype,"url"),'
|
|
100
|
+
'this.overridePropExtract(this.$wbwindow.Request.prototype,"referrer")}'
|
|
101
|
+
)
|
|
102
|
+
|
|
103
|
+
REQUEST_PATCHED = (
|
|
104
|
+
"this.$wbwindow.Request&&this.$wbwindow.Request.prototype){"
|
|
105
|
+
"var l=this.$wbwindow.Request;this.$wbwindow.Request=(r=this.$wbwindow.Request,"
|
|
106
|
+
'function e(i,o){t.domConstructorErrorChecker(this,"Request",arguments);'
|
|
107
|
+
"if(t.wb_info&&t.wb_info.convert_post_to_get){"
|
|
108
|
+
'var cm=((o&&o.method)||(i&&typeof i==="object"&&i.method)||"GET").toUpperCase();'
|
|
109
|
+
'if("GET"!==cm&&"HEAD"!==cm){'
|
|
110
|
+
'var cu=typeof i==="string"?i:'
|
|
111
|
+
"(i&&i.url!==undefined?i.url:(i&&i.href!==undefined?i.toString():null));"
|
|
112
|
+
"if(null!==cu){"
|
|
113
|
+
'var csep=cu.indexOf("?")>-1?"&":"?",cnew=cu+csep+"__wb_method="+cm;'
|
|
114
|
+
'if(typeof i==="string"||i.url===undefined){'
|
|
115
|
+
'i=cnew,o=Object.assign({},o,{method:"GET",body:undefined})'
|
|
116
|
+
"}else{"
|
|
117
|
+
'i=new r(cnew,{method:"GET",body:undefined,headers:i.headers,'
|
|
118
|
+
"credentials:i.credentials,mode:i.mode,cache:i.cache,redirect:i.redirect,"
|
|
119
|
+
"referrer:i.referrer,referrerPolicy:i.referrerPolicy,integrity:i.integrity,"
|
|
120
|
+
"keepalive:i.keepalive,signal:i.signal})"
|
|
121
|
+
"}}}}"
|
|
122
|
+
'var n=o||{},s=i;switch(typeof i){case"string":s=t.rewriteUrl(i);break;'
|
|
123
|
+
'case"object":if(s=i,i.url){var a=t.rewriteUrl(i.url);'
|
|
124
|
+
"a!==i.url&&(s=new r(a,i))}else i.href&&(s=t.rewriteUrl(i.toString(),!0))}"
|
|
125
|
+
"let h=!1;if(n&&n.referrer){var w=t.rewriteUrl(n.referrer);"
|
|
126
|
+
"w!==n.referrer&&(n instanceof e?(n.__WB_no_unrewrite=!0,h=!0):n.referrer=w)}"
|
|
127
|
+
"var c=new r(s,n);return h&&delete n.__WB_no_unrewrite,c}),"
|
|
128
|
+
"this.$wbwindow.Request.prototype=l.prototype,"
|
|
129
|
+
'Object.defineProperty(this.$wbwindow.Request.prototype,"constructor",'
|
|
130
|
+
"{value:this.$wbwindow.Request}),"
|
|
131
|
+
'this.overridePropExtract(this.$wbwindow.Request.prototype,"url"),'
|
|
132
|
+
'this.overridePropExtract(this.$wbwindow.Request.prototype,"referrer")}'
|
|
133
|
+
)
|
|
134
|
+
|
|
135
|
+
content = wombat_js.read_text(encoding="utf-8")
|
|
136
|
+
|
|
137
|
+
already_patched = FETCH_PATCHED in content and REQUEST_PATCHED in content
|
|
138
|
+
needs_patching = FETCH_ORIGINAL in content and REQUEST_ORIGINAL in content
|
|
139
|
+
|
|
140
|
+
if already_patched:
|
|
141
|
+
logging.info("wombat.js is already patched, skipping")
|
|
142
|
+
elif needs_patching:
|
|
143
|
+
content = content.replace(FETCH_ORIGINAL, FETCH_PATCHED)
|
|
144
|
+
content = content.replace(REQUEST_ORIGINAL, REQUEST_PATCHED)
|
|
145
|
+
wombat_js.write_text(content, encoding="utf-8")
|
|
146
|
+
logging.info("wombat.js patched successfully")
|
|
147
|
+
else:
|
|
148
|
+
raise SystemExit(
|
|
149
|
+
"wombat.js does not match the expected (patched or unpatched) fetch()/"
|
|
150
|
+
"Request() override code -- the vendored wombat.js version likely "
|
|
151
|
+
"changed, this patch needs to be re-derived against the new source"
|
|
152
|
+
)
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "5.5.2"
|