mirror of
https://github.com/hectorqin/reader.git
synced 2026-11-12 05:50:54 +08:00
两件事:把 PR #8 里那四项合并进来(A 选项),然后把 issue 里一直没落地的 「一次只取一章」从服务端契约一路做到客户端。 ## 一、PR #8 的四项(Android 外壳最值钱) - Android 原生整页图渲染:NativePageView + 桥接 v2(renderPage/hidePage)。 只画整页图,EPUB 永远留在 WebView;画不了就返回 false 回退,不出现空白页。 - 离线队列:脏集合语义固定为契约,补上「请求在途时位置被改写」的三条用例。 - TXT 编码探测:GB18030 与 Big5 都解一遍再按损坏证据评分选优。 原来「先 GB18030 失败再 Big5」永远走不到第二步——两者字节范围重叠, 同一串字节通常两边都能解出合法字符,繁体书会整本乱码。 - 格式嗅探:magic number 优先于扩展名,并明确拒绝非书籍的媒体容器。 ## 二、Android 壳第一次真的编译通过 上一轮说「没有 JDK/SDK,只写了契约」,这一轮补上了环境并真的编译。 编译立刻暴露三处——都是只有编译才能发现的: - colors.xml 的注释里写了 --reader-paper。XML 禁止注释中出现双连字符, AAPT 直接拒绝整个文件。Android 壳此前从未构建过,所以从未发现。 - NativePageView.kt 用了 Uint8Array。那是 JavaScript 类型,Kotlin 里不存在; 桥接的另一侧是 ByteArray。 - AndroidManifest.xml 引用了 @mipmap/ic_launcher,而资源里没有这个文件。 三条都让 :app:assembleDebug 失败,也就是说这个 APK 此前根本产不出来。 现在是 BUILD SUCCESSFUL,产物 3.6MB。 ## 三、分窗读取:从契约做到客户端 服务端: - /manifest 省略 group 现在等价于 group=0。原来省略意味着「发全部条目」, 于是一本 1200 章的书在它最需要快的那个请求(打开书)里收到 1200 条记录, 等于分窗对不传参的客户端完全失效。要完整结构用 ?group=all。 - /toc 在没有 OPF 标题映射时回落到章节自身的第一个标题。手作 EPUB 大量 没有标题映射,原来整本目录会读成「第 1 章 … 第 300 章」,等于没有目录。 - 扫描时的 spine 读取不再解析 NCX 与 nav:扫一遍全库本该只读一次包文档。 - 尾部 Range(bytes=-N)在超过 8MB 时退化为整包响应并撤回 Accept-Ranges。 前向流无法跳到文件末尾,服务这种请求意味着为三个字节读完整个 400MB 漫画包。 客户端: - 新增 formats/remote-zip.ts:走 HTTP Range 的只读 ZIP,让浏览器端也能不下整本书。 - 新增 formats/windowed.ts:分窗文档。分窗是传输边界,目录必须完整,两者分开 —— 合在一起就是原来目录面板显示「第 1 章 – 第 40 章」的原因。 - reader-screen 接上 /toc,并且点击目录项会先取对应窗口再跳。 ## 验证 server: 133/133(typecheck + test + build) web: 179 vitest + 29 node:test(typecheck + test + build) android: BUILD SUCCESSFUL,app-debug.apk 3.6MB shell: 契约双向校验 + 渲染模式词表校验通过
106 lines
4.6 KiB
Bash
Executable File
106 lines
4.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# Static checks on the Android shell that do not need a JDK or the Android SDK.
|
|
#
|
|
# CI compiles the shell for real, but that job needs a large SDK image and takes
|
|
# minutes. This runs in a second, so a typo in a package declaration or a bridge
|
|
# method that the web client calls but the shell does not expose is caught before
|
|
# anyone waits for a build — which matters more than usual here, because the two
|
|
# halves of the bridge are written in different languages and cannot be
|
|
# type-checked against each other.
|
|
set -eu
|
|
|
|
script_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
|
android_dir=$(dirname -- "$script_dir")
|
|
repo_dir=$(dirname -- "$android_dir")
|
|
fail=0
|
|
|
|
note() { printf '%s\n' "$1"; }
|
|
err() { printf 'FAIL: %s\n' "$1" >&2; fail=1; }
|
|
|
|
# 1. Package declaration must match the file's directory under src/main/java.
|
|
note "==> checking package declarations match directory layout"
|
|
for file in $(find "$android_dir/app/src" -name '*.kt'); do
|
|
pkg=$(sed -n 's/^package \(.*\)$/\1/p' "$file" | head -1)
|
|
rel=${file#"$android_dir"/app/src/main/java/}
|
|
expected=$(dirname "$rel" | tr '/' '.')
|
|
if [ "$pkg" != "$expected" ]; then
|
|
err "$file declares '$pkg' but lives in '$expected'"
|
|
fi
|
|
done
|
|
|
|
# 2. Every import of our own code must resolve to a file that exists.
|
|
note "==> checking project imports resolve"
|
|
for file in $(find "$android_dir/app/src" -name '*.kt'); do
|
|
sed -n 's/^import cool\.cnb\.reader\.\(.*\)$/\1/p' "$file" | while read -r symbol; do
|
|
# `BuildConfig` is generated, and a class name is the last dot segment.
|
|
case "$symbol" in
|
|
BuildConfig) continue ;;
|
|
esac
|
|
path="$android_dir/app/src/main/java/cool/cnb/reader/$(printf '%s' "$symbol" | tr '.' '/').kt"
|
|
if [ ! -f "$path" ]; then
|
|
err "$file imports cool.cnb.reader.$symbol but $path does not exist"
|
|
fi
|
|
done
|
|
done
|
|
|
|
# 3. Every bridge method the web client calls must exist, and every bridge method
|
|
# the shell exposes must be declared. This is the cross-language seam.
|
|
note "==> checking the JS bridge contract in both directions"
|
|
bridge_file="$android_dir/app/src/main/java/cool/cnb/reader/bridge/ReaderBridge.kt"
|
|
declared=$(sed -n 's/^ fun \([A-Za-z][A-Za-z0-9_]*\)(.*/\1/p' "$bridge_file" | sort -u)
|
|
types_file="$repo_dir/web/src/android-bridge.d.ts"
|
|
consumed=$(sed -n 's/^ \([a-z][A-Za-z0-9_]*\)[?]\?(.*:.*;.*$/\1/p' "$types_file" | sort -u)
|
|
|
|
for method in $consumed; do
|
|
if ! printf '%s\n' "$declared" | grep -qx "$method"; then
|
|
err "web client calls ReaderAndroid.$method() but ReaderBridge.kt does not declare it"
|
|
fi
|
|
done
|
|
|
|
# 4. The render-mode split has to agree with itself across three languages.
|
|
#
|
|
# The whole "EPUB in the WebView, fixed pages natively" decision rests on the
|
|
# client labelling a page as `image`/`document`/`reflowable` and the shell
|
|
# accepting exactly the ones it can draw. Nothing type-checks that, and a
|
|
# mismatch fails in the worst way: every page silently falls back to the slow
|
|
# path, or a page is handed to a view that cannot decode it.
|
|
note "==> checking the render-mode vocabulary matches"
|
|
web_modes=$(sed -n "s/^export type RenderMode = \(.*\);/\1/p" "$repo_dir/web/src/formats/types.ts" \
|
|
| tr -d "'" | tr -d ' ' | tr '|' '\n' | sort -u)
|
|
shell_modes=$(sed -n 's/.*mode != "\([a-z]*\)".*/\1/p' \
|
|
"$android_dir/app/src/main/java/cool/cnb/reader/bridge/ReaderBridge.kt" | sort -u)
|
|
if [ -z "$web_modes" ]; then
|
|
err "cannot read RenderMode from web/src/formats/types.ts"
|
|
fi
|
|
for mode in $shell_modes; do
|
|
if ! printf '%s\n' "$web_modes" | grep -qx "$mode"; then
|
|
err "ReaderBridge.kt branches on render mode '$mode' which RenderMode does not define"
|
|
fi
|
|
done
|
|
# The shell draws images natively, so it must know the client's image vocabulary.
|
|
decodable=$(sed -n '/private val DECODABLE = setOf(/,/)/p' \
|
|
"$android_dir/app/src/main/java/cool/cnb/reader/web/NativePageView.kt" \
|
|
| sed -n 's/.*"\(image\/[a-z]*\)".*/\1/p' | sort -u)
|
|
for mediaType in "image/jpeg" "image/png" "image/webp"; do
|
|
if ! printf '%s\n' "$decodable" | grep -qx "$mediaType"; then
|
|
err "NativePageView cannot decode $mediaType, which the client routinely produces"
|
|
fi
|
|
done
|
|
|
|
# Every bridge method must also appear in the client-facing declaration, or the
|
|
# next person writing client code will not know it is available.
|
|
missing_from_types=0
|
|
for method in $declared; do
|
|
if ! printf '%s\n' "$consumed" | grep -qx "$method"; then
|
|
err "ReaderBridge.$method exists but is missing from android-bridge.d.ts"
|
|
missing_from_types=1
|
|
fi
|
|
done
|
|
[ "$missing_from_types" -eq 0 ] || true
|
|
|
|
if [ "$fail" -ne 0 ]; then
|
|
note "==> shell checks failed"
|
|
exit 1
|
|
fi
|
|
note "==> shell checks passed"
|