根因:传输层/服务端暂不可用与鉴权失败共用「负错误码」一个通道,登录门只能按
NCM_ERR_AUTH 判断,任何上游映射偏差都会变成「退出登录」:
- ncm_login.c 把任何业务码 !=200(含 -460 风控)都当 AUTH;ncm_api.c 把 -460 也映射 AUTH;
- api/login 层完全不看 HTTP 状态:401/403 与 5xx/网关 HTML 都落进 JSON/缺字段分支,
反过来 5xx 与网络故障无法区分;
- http 层握手/写入失败把 mbedtls 裸负码(如 -0x7280)直接返回,上层按 NCM_ERR_* 比不中。
改动:
- core/ncm_session.{h,c}(新):ncm_err_classify / ncm_err_is_network /
ncm_http_status_class|err / ncm_gate_decide / ncm_session_boot_decide。
语义:NETWORK={NET,TLS,TIMEOUT,SVC,历史裸码};AUTH 仅 NCM_ERR_AUTH;
401/403→AUTH,408/425/429/5xx→SVC,其它非 2xx→HTTP;启动时有本地会话就先信它
(无网→离线进 home,绝不进扫码)。
- NCM_ERR_SVC=-17(服务端 5xx/429、业务码 -460:暂不可用、可重试,不是登录失效)。
- ncm_http.c:http_ret_norm 在 done: 统一归一(超时/证书/其它→NET),裸 mbedtls 码不再穿透。
- ncm_api.c:api_status_gate 先按 HTTP 状态定性再解析 body;业务码加 302→AUTH、-460→SVC。
- ncm_login.c:status_check/refresh 先过状态门;301/302→AUTH、-460→SVC、其它非 200→HTTP
(不再因一次未知响应把用户踢回扫码)。
- ncm_apicache:新增命中计数,供 App 区分「真网络成功」与「离线读到旧缓存」。
- build_core.sh / build_ncm.sh:核心源列表加 ncm_session.c。
52 lines
2.5 KiB
Bash
Executable File
52 lines
2.5 KiB
Bash
Executable File
#!/bin/bash
|
||
# build_ncm.sh — 构建 dev.player.ncm(网易云 App,SDK framework=1):链 meow_ui.a + 核心库 + minimp3 + dr_flac + mbedtls。
|
||
# 静态 MIPS32r2 (musl sf)。自有代码(app/ + core/)+ core 支撑 vendor 编译;vendor/minimp3/dr_flac/qrcodegen/jsmn 豁免告警。
|
||
# 仅改本 App 目录;编译期不改 SDK(patch_v2/sdk/)、不动 meow_launcherd/。mipsel -Wall -Wextra 0 warning。
|
||
set -e
|
||
cd "$(dirname "$0")"
|
||
ROOT="$HOME/Project/R3ProII"
|
||
CC="$ROOT/.tools/zig-mipsel-cc"
|
||
SYSROOT="$ROOT/.tools/mipsel-linux-muslsf-cross/mipsel-linux-muslsf"
|
||
OUT="$PWD/out"
|
||
mkdir -p "$OUT/app-mipsel"
|
||
|
||
INC="-Icore -I../sdk -I../meow_launcherd \
|
||
-Ivendor/mbedtls/include -Ivendor/jsmn -Ivendor/qrcodegen/c -Ivendor/minimp3 -Ivendor/dr_flac"
|
||
STRICT="-Wall -Wextra -Os -DJSMN_HEADER"
|
||
|
||
CORE="core/ncm_common.c core/ncm_json.c core/ncm_store.c core/ncm_http.c \
|
||
core/ncm_crypto.c core/ncm_req.c core/ncm_login.c core/ncm_api.c \
|
||
core/ncm_cache.c core/ncm_ctx.c core/ncm_apicache.c core/ncm_tag.c core/ncm_session.c"
|
||
APP="app/app.c app/ui/login.c app/ui/home.c app/ui/playlist.c app/ui/player.c \
|
||
app/ui/settings.c app/ui/search.c app/ui/minibar.c app/ui/queue.c app/ui/cache.c \
|
||
app/ui/ncm_colors.c app/ui/chrome.c \
|
||
app/logic/appstate.c app/logic/lyric.c app/logic/songmeta.c \
|
||
app/logic/cover.c app/logic/account.c app/play/player_manager.c app/play/audio_out.c \
|
||
app/play/ipc_media.c app/play/decoder.c app/play/stream_src.c app/play/minimp3_impl.c \
|
||
app/play/mem_watch.c"
|
||
|
||
echo "==> app+core (strict)"
|
||
for f in $APP $CORE; do
|
||
b=$(basename "$f" .c)
|
||
$CC -static -c $STRICT $INC "$f" -o "$OUT/app-mipsel/$b.o"
|
||
done
|
||
|
||
echo "==> vendor impl (warn-exempt)"
|
||
$CC -static -c -Os -I../meow_launcherd -Ivendor/minimp3 app/play/minimp3_impl.c -o "$OUT/app-mipsel/minimp3_impl.o"
|
||
$CC -static -c -Os -Ivendor/dr_flac app/play/dr_flac_impl.c -o "$OUT/app-mipsel/dr_flac_impl.o"
|
||
$CC -static -c -Os -Ivendor/jsmn core/jsmn_impl.c -o "$OUT/app-mipsel/jsmn_impl.o"
|
||
$CC -static -c -Os -Ivendor/qrcodegen/c vendor/qrcodegen/c/qrcodegen.c -o "$OUT/app-mipsel/qrcodegen.o"
|
||
|
||
echo "==> link"
|
||
MIPS_LIBS="$OUT/mbedtls/mipsel/libmbedtls.a $OUT/mbedtls/mipsel/libmbedx509.a $OUT/mbedtls/mipsel/libmbedcrypto.a"
|
||
$CC -Os -static -Wl,--gc-sections -o ncm \
|
||
$OUT/app-mipsel/*.o \
|
||
../sdk/meow_ui.a "$SYSROOT/lib/libz.a" \
|
||
$MIPS_LIBS -lpthread -lm
|
||
ls -la ncm
|
||
file ncm
|
||
echo
|
||
echo "== size =="
|
||
size ncm
|
||
echo "(own code -Wall -Wextra: 0 warning enforced above; vendor exempt)"
|