Compare commits
2 Commits
feat/crawl
...
bugfix/cra
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee4594f679 | ||
| 6b49a47d0a |
@@ -74,6 +74,14 @@ CRAWLER_DOWNLOAD_ALLOWLIST=
|
||||
CRAWLER_ALLOW_ANY_HOST=false
|
||||
# Hard cap on a single image body. Default 32 MiB.
|
||||
CRAWLER_MAX_IMAGE_BYTES=33554432
|
||||
# Path to a system Chromium binary. When set, the crawler skips the
|
||||
# bundled-fetcher download. Required on platforms without a usable
|
||||
# upstream Chromium build (notably Linux_arm64 / Raspberry Pi). On
|
||||
# Debian: /usr/bin/chromium-headless-shell or /usr/bin/chromium. On
|
||||
# Ubuntu the package is chromium-browser (different path). Pair with
|
||||
# `docker compose build --build-arg INSTALL_CHROMIUM=true backend` so
|
||||
# the image actually contains the binary.
|
||||
CRAWLER_CHROMIUM_BINARY=
|
||||
|
||||
# ----- Frontend -----
|
||||
# The frontend container runs SvelteKit's Node adapter on :3000 and
|
||||
|
||||
2
backend/Cargo.lock
generated
2
backend/Cargo.lock
generated
@@ -1470,7 +1470,7 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
|
||||
|
||||
[[package]]
|
||||
name = "mangalord"
|
||||
version = "0.44.0"
|
||||
version = "0.45.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"argon2",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "mangalord"
|
||||
version = "0.44.0"
|
||||
version = "0.45.1"
|
||||
edition = "2021"
|
||||
default-run = "mangalord"
|
||||
|
||||
|
||||
@@ -25,8 +25,23 @@ FROM debian:trixie-slim
|
||||
# binary ("GLIBC_2.39 not found"). Keep these two in lockstep on bumps.
|
||||
# `curl` is for the container HEALTHCHECK; `ca-certificates` is for
|
||||
# outbound HTTPS (crawler covers/pages).
|
||||
#
|
||||
# INSTALL_CHROMIUM is an opt-in for deployments that can't use the
|
||||
# chromiumoxide fetcher path (notably Linux_arm64 / Raspberry Pi, where
|
||||
# the upstream snapshot bucket has no usable build). When `true`, adds
|
||||
# Debian's apt-packaged headless chromium plus a baseline font set —
|
||||
# pair with `CRAWLER_CHROMIUM_BINARY=/usr/bin/chromium-headless-shell`
|
||||
# at runtime so the launcher uses it. Default `false` keeps cloud/x86
|
||||
# images slim.
|
||||
#
|
||||
# Build the Pi image with:
|
||||
# docker compose build --build-arg INSTALL_CHROMIUM=true backend
|
||||
ARG INSTALL_CHROMIUM=false
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends ca-certificates curl \
|
||||
&& if [ "$INSTALL_CHROMIUM" = "true" ]; then \
|
||||
apt-get install -y --no-install-recommends chromium-headless-shell fonts-liberation; \
|
||||
fi \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Non-root runtime user. The API binary doesn't need any root
|
||||
|
||||
@@ -1,10 +1,17 @@
|
||||
//! Chromium launcher and lifecycle.
|
||||
//!
|
||||
//! Uses `chromiumoxide`'s `fetcher` feature so we don't depend on a
|
||||
//! system Chrome install — first call downloads a known-good revision
|
||||
//! into a cache dir and reuses it forever after. `BrowserMode` toggles
|
||||
//! headed vs headless; the headed path needs a display (real `$DISPLAY`
|
||||
//! or `xvfb-run`).
|
||||
//! By default uses `chromiumoxide`'s `fetcher` feature — first call
|
||||
//! downloads a known-good revision into a cache dir and reuses it
|
||||
//! forever after. Set `CRAWLER_CHROMIUM_BINARY` to skip the fetcher
|
||||
//! and use a system-installed Chromium instead; required on platforms
|
||||
//! where the upstream snapshot bucket has no usable build (notably
|
||||
//! `Linux_arm64` / Raspberry Pi). Debian's package is at
|
||||
//! `/usr/bin/chromium` or `/usr/bin/chromium-headless-shell`; Ubuntu
|
||||
//! ships it as `chromium-browser` at a different path — don't paste
|
||||
//! the wrong one.
|
||||
//!
|
||||
//! `BrowserMode` toggles headed vs headless; the headed path needs a
|
||||
//! display (real `$DISPLAY` or `xvfb-run`).
|
||||
//!
|
||||
//! Extra Chromium command-line flags can be supplied through
|
||||
//! [`LaunchOptions::extra_args`] in code, or via the
|
||||
@@ -165,31 +172,41 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
/// Launches Chromium. Downloads it on first run via the `fetcher`
|
||||
/// feature; subsequent runs hit the cache. The cache dir is
|
||||
/// Launches Chromium. If `CRAWLER_CHROMIUM_BINARY` is set, uses that
|
||||
/// path directly. Otherwise downloads via the `fetcher` feature on
|
||||
/// first run and hits the cache after that. The fetcher cache dir is
|
||||
/// `$CRAWLER_CHROMIUM_DIR` if set, else `$HOME/.cache/mangalord/chromium`,
|
||||
/// else `./.chromium-cache` as a last-resort repo-local fallback.
|
||||
pub async fn launch(options: LaunchOptions) -> anyhow::Result<Handle> {
|
||||
let cache = cache_dir()?;
|
||||
tokio::fs::create_dir_all(&cache)
|
||||
.await
|
||||
.with_context(|| format!("create cache dir {}", cache.display()))?;
|
||||
let executable = match system_chromium_path_from_env() {
|
||||
Some(path) => {
|
||||
tracing::info!(path = %path.display(), "using system chromium (CRAWLER_CHROMIUM_BINARY)");
|
||||
path
|
||||
}
|
||||
None => {
|
||||
let cache = cache_dir()?;
|
||||
tokio::fs::create_dir_all(&cache)
|
||||
.await
|
||||
.with_context(|| format!("create cache dir {}", cache.display()))?;
|
||||
|
||||
let fetcher = BrowserFetcher::new(
|
||||
BrowserFetcherOptions::builder()
|
||||
.with_path(&cache)
|
||||
.build()
|
||||
.map_err(|e| anyhow::anyhow!("fetcher options: {e}"))?,
|
||||
);
|
||||
tracing::info!(path = %cache.display(), "ensuring chromium revision is present");
|
||||
let info = fetcher
|
||||
.fetch()
|
||||
.await
|
||||
.context("download chromium via fetcher")?;
|
||||
tracing::info!(executable = %info.executable_path.display(), "chromium ready");
|
||||
let fetcher = BrowserFetcher::new(
|
||||
BrowserFetcherOptions::builder()
|
||||
.with_path(&cache)
|
||||
.build()
|
||||
.map_err(|e| anyhow::anyhow!("fetcher options: {e}"))?,
|
||||
);
|
||||
tracing::info!(path = %cache.display(), "ensuring chromium revision is present");
|
||||
let info = fetcher
|
||||
.fetch()
|
||||
.await
|
||||
.context("download chromium via fetcher")?;
|
||||
tracing::info!(executable = %info.executable_path.display(), "chromium ready");
|
||||
info.executable_path
|
||||
}
|
||||
};
|
||||
|
||||
let mut builder = BrowserConfig::builder()
|
||||
.chrome_executable(info.executable_path)
|
||||
.chrome_executable(executable)
|
||||
// Linux containers / CI commonly lack the user namespaces
|
||||
// Chromium's sandbox wants. Disable it; the crawler runs in its
|
||||
// own container anyway.
|
||||
@@ -246,6 +263,24 @@ fn cache_dir() -> anyhow::Result<PathBuf> {
|
||||
Ok(PathBuf::from("./.chromium-cache"))
|
||||
}
|
||||
|
||||
/// Reads `CRAWLER_CHROMIUM_BINARY` and delegates to the pure helper.
|
||||
/// Thin wrapper kept separate so the decision logic can be unit-tested
|
||||
/// without mutating the process environment.
|
||||
fn system_chromium_path_from_env() -> Option<PathBuf> {
|
||||
system_chromium_path_from_value(std::env::var_os("CRAWLER_CHROMIUM_BINARY").as_deref())
|
||||
}
|
||||
|
||||
/// Returns `Some(path)` only when the value is set and non-empty. An
|
||||
/// exported-but-blank var (common in compose `${VAR:-}` patterns when
|
||||
/// the operator didn't fill it in) must behave like "unset" — otherwise
|
||||
/// we'd hand chromiumoxide an empty path and fail launch in a confusing
|
||||
/// way.
|
||||
pub(crate) fn system_chromium_path_from_value(
|
||||
raw: Option<&std::ffi::OsStr>,
|
||||
) -> Option<PathBuf> {
|
||||
raw.filter(|v| !v.is_empty()).map(PathBuf::from)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@@ -273,6 +308,33 @@ mod tests {
|
||||
assert!(parse_args(" \t\n").is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn system_chromium_path_returns_some_when_value_set() {
|
||||
let raw = std::ffi::OsString::from("/usr/bin/chromium-headless-shell");
|
||||
assert_eq!(
|
||||
system_chromium_path_from_value(Some(raw.as_os_str())),
|
||||
Some(PathBuf::from("/usr/bin/chromium-headless-shell"))
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn system_chromium_path_returns_none_when_unset() {
|
||||
assert_eq!(system_chromium_path_from_value(None), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn system_chromium_path_treats_empty_as_unset() {
|
||||
// Compose's `${VAR:-}` substitution produces an exported-but-empty
|
||||
// env var when the operator left it blank. Treat it as unset so
|
||||
// the launcher falls back to the fetcher path instead of handing
|
||||
// chromiumoxide an empty path.
|
||||
let raw = std::ffi::OsString::from("");
|
||||
assert_eq!(
|
||||
system_chromium_path_from_value(Some(raw.as_os_str())),
|
||||
None
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn default_launch_options_are_headless() {
|
||||
// Headless is the production-safe default — no display required,
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
//! (`td:has(label:contains("Author:"))`) are implemented by walking
|
||||
//! the parsed tree.
|
||||
|
||||
use std::collections::VecDeque;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::Context;
|
||||
@@ -75,10 +74,11 @@ impl Source for TargetSource {
|
||||
&self,
|
||||
ctx: &FetchContext<'_>,
|
||||
) -> anyhow::Result<Box<dyn DiscoverWalk + Send>> {
|
||||
// Always visit page 1 first because that's the only way to
|
||||
// discover `last_page`. Retry it on transient — a broken first
|
||||
// page would otherwise abort the whole walk before we've even
|
||||
// started.
|
||||
// Probe page 1 up front (with transient retry) for two reasons:
|
||||
// a broken first page should abort cleanly rather than mid-walk,
|
||||
// and the HTML is handed straight to the first `next_batch` call
|
||||
// so the walker doesn't re-fetch it. Page count is discovered
|
||||
// incrementally — see `TargetSourceWalker::next_batch`.
|
||||
let first_html = retry_on_transient(
|
||||
|| async {
|
||||
navigate(ctx, self.base_url.as_str(), LIST_PAGE_MARKER).await
|
||||
@@ -87,21 +87,10 @@ impl Source for TargetSource {
|
||||
PAGE_TRANSIENT_RETRY_DELAY,
|
||||
)
|
||||
.await?;
|
||||
let last_page = {
|
||||
let doc = scraper::Html::parse_document(&first_html);
|
||||
parse_last_page(&doc)
|
||||
};
|
||||
|
||||
let order = build_page_order(last_page);
|
||||
tracing::info!(
|
||||
last_page = ?last_page,
|
||||
page_count = order.len(),
|
||||
"walking pagination"
|
||||
);
|
||||
|
||||
Ok(Box::new(TargetSourceWalker {
|
||||
base_url: self.base_url.clone(),
|
||||
pages_remaining: order,
|
||||
next_page: 1,
|
||||
first_page_html: Some(first_html),
|
||||
}))
|
||||
}
|
||||
@@ -147,24 +136,19 @@ impl Source for TargetSource {
|
||||
}
|
||||
}
|
||||
|
||||
/// Build the queue of page numbers `TargetSource::discover` will walk.
|
||||
/// The site orders by `update_date DESC`, so newest-first is just the
|
||||
/// natural page order: `1..=last`. If `last_page` is unknown (source
|
||||
/// surfaces no pagination) only page 1 is visited.
|
||||
fn build_page_order(last_page: Option<i32>) -> VecDeque<i32> {
|
||||
match last_page {
|
||||
None => VecDeque::from([1]),
|
||||
Some(last) => (1..=last).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Walker returned by [`TargetSource::discover`]. Pops one source-index
|
||||
/// page per `next_batch` call. Page 1's HTML is cached at construction
|
||||
/// time (the discover call needed it to read `last_page` anyway) so the
|
||||
/// batch covering page 1 doesn't re-fetch.
|
||||
/// Walker returned by [`TargetSource::discover`]. Walks pages `1..` in
|
||||
/// order, terminating as soon as a page renders cleanly with zero entries
|
||||
/// — that's the "we ran off the end of the index" signal. Page 1's HTML
|
||||
/// is cached at construction time (discover already had to fetch it for
|
||||
/// the transient probe) so the first batch doesn't re-fetch.
|
||||
///
|
||||
/// A genuinely empty `Ok(vec![])` from `parse_manga_list_from` is what
|
||||
/// stops us: the parser's `#logo` sentinel converts unrendered pages
|
||||
/// into transient errors before they reach this loop, so an empty
|
||||
/// parse result reliably means "no more entries."
|
||||
struct TargetSourceWalker {
|
||||
base_url: String,
|
||||
pages_remaining: VecDeque<i32>,
|
||||
next_page: i32,
|
||||
first_page_html: Option<String>,
|
||||
}
|
||||
|
||||
@@ -174,13 +158,11 @@ impl DiscoverWalk for TargetSourceWalker {
|
||||
&mut self,
|
||||
ctx: &FetchContext<'_>,
|
||||
) -> anyhow::Result<Option<Vec<SourceMangaRef>>> {
|
||||
let Some(page_num) = self.pages_remaining.pop_front() else {
|
||||
return Ok(None);
|
||||
};
|
||||
let page_num = self.next_page;
|
||||
let page_refs = if page_num == 1 {
|
||||
// Reuse the cached page-1 HTML from the initial probe. Take
|
||||
// it (rather than clone) so a malformed page-order queue
|
||||
// that re-visits page 1 still falls back to a real fetch.
|
||||
// it (rather than clone) so a future re-entry that somehow
|
||||
// revisits page 1 still falls back to a real fetch.
|
||||
match self.first_page_html.take() {
|
||||
Some(html) => {
|
||||
let doc = scraper::Html::parse_document(&html);
|
||||
@@ -218,6 +200,10 @@ impl DiscoverWalk for TargetSourceWalker {
|
||||
.await?
|
||||
};
|
||||
tracing::info!(page_num, count = page_refs.len(), "page walked");
|
||||
if page_refs.is_empty() {
|
||||
return Ok(None);
|
||||
}
|
||||
self.next_page += 1;
|
||||
Ok(Some(page_refs))
|
||||
}
|
||||
}
|
||||
@@ -288,20 +274,6 @@ fn classify_navigate_html(html: String) -> Result<String, PageError> {
|
||||
Ok(html)
|
||||
}
|
||||
|
||||
fn parse_last_page(doc: &scraper::Html) -> Option<i32> {
|
||||
// Pagination links carry their page number as text. Take the
|
||||
// numeric maximum so we don't depend on a specific layout (Prev,
|
||||
// Next, ellipses, etc. all get filtered out by .parse).
|
||||
let sel = scraper::Selector::parse("#left_side .pagination a").unwrap();
|
||||
doc.select(&sel)
|
||||
.filter_map(|a| {
|
||||
collapse_whitespace(&a.text().collect::<String>())
|
||||
.parse::<i32>()
|
||||
.ok()
|
||||
})
|
||||
.max()
|
||||
}
|
||||
|
||||
/// Substitutes the first `/N/` path segment with the target page
|
||||
/// number. Source impls that paginate via a different URL shape can
|
||||
/// override this — for the modeled site the segment is always present.
|
||||
@@ -853,29 +825,6 @@ mod tests {
|
||||
assert_eq!(parse_chapter_number("Special"), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_last_page_picks_highest_pagination_link() {
|
||||
let html = r#"
|
||||
<div id="left_side"><div class="pagination">
|
||||
<a href="/list/1/">Prev</a>
|
||||
<ol>
|
||||
<li><a href="/list/1/">1</a></li>
|
||||
<li><a href="/list/2/">2</a></li>
|
||||
<li><a href="/list/47/">47</a></li>
|
||||
<li><a href="/list/2/">Next</a></li>
|
||||
</ol>
|
||||
</div></div>
|
||||
"#;
|
||||
let doc = scraper::Html::parse_document(html);
|
||||
assert_eq!(parse_last_page(&doc), Some(47));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_last_page_none_when_no_pagination() {
|
||||
let doc = scraper::Html::parse_document("<html></html>");
|
||||
assert!(parse_last_page(&doc).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn page_url_substitutes_numeric_path_segment() {
|
||||
assert_eq!(
|
||||
@@ -1024,28 +973,6 @@ mod tests {
|
||||
assert!(err.is_transient(), "got non-transient: {err}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn build_page_order_is_natural_one_to_last() {
|
||||
// Newest-first is just the source's natural pagination order:
|
||||
// (update_date DESC) lives at page 1, oldest at the last page.
|
||||
let order = build_page_order(Some(3));
|
||||
assert_eq!(Vec::from(order), vec![1, 2, 3]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn build_page_order_falls_back_to_page_one_only_without_pagination() {
|
||||
// Source surfaced no pagination control — visit page 1 alone
|
||||
// and let the walk end after one batch.
|
||||
let order = build_page_order(None);
|
||||
assert_eq!(Vec::from(order), vec![1]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn build_page_order_single_page_index_yields_one_entry() {
|
||||
let order = build_page_order(Some(1));
|
||||
assert_eq!(Vec::from(order), vec![1]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_chapter_list_returns_transient_when_table_missing() {
|
||||
// Partial render (post-load JS hadn't injected the table, layout
|
||||
|
||||
@@ -10,6 +10,11 @@
|
||||
//!
|
||||
//! Override the cache location with `CRAWLER_CHROMIUM_DIR=/some/path` if
|
||||
//! `$HOME/.cache/mangalord/chromium` isn't writable.
|
||||
//!
|
||||
//! Set `CRAWLER_CHROMIUM_BINARY=/usr/bin/chromium-headless-shell` (or
|
||||
//! another system chromium path) to exercise the system-chromium
|
||||
//! launch path instead of the fetcher download — this is the path the
|
||||
//! Raspberry Pi deployment takes.
|
||||
|
||||
use mangalord::crawler::browser::{self, LaunchOptions};
|
||||
|
||||
|
||||
@@ -39,6 +39,11 @@ services:
|
||||
# Upload limits.
|
||||
MAX_REQUEST_BYTES: ${MAX_REQUEST_BYTES:-209715200}
|
||||
MAX_FILE_BYTES: ${MAX_FILE_BYTES:-20971520}
|
||||
# System-chromium override for the crawler. Leave blank to use the
|
||||
# bundled fetcher; set to e.g. /usr/bin/chromium-headless-shell on
|
||||
# arm64 deployments. Pair with `--build-arg INSTALL_CHROMIUM=true`
|
||||
# so the image actually contains the binary.
|
||||
CRAWLER_CHROMIUM_BINARY: ${CRAWLER_CHROMIUM_BINARY:-}
|
||||
volumes:
|
||||
- storage-data:/var/lib/mangalord/storage
|
||||
# No host port mapping in the default setup — the frontend proxies
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "mangalord-frontend",
|
||||
"version": "0.44.0",
|
||||
"version": "0.45.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
Reference in New Issue
Block a user