From cdf9b9d49953ad729fb5fb62d58e71b226aa4604 Mon Sep 17 00:00:00 2001 From: LukeMackin Date: Tue, 21 Jul 2026 21:20:59 +0800 Subject: [PATCH] =?UTF-8?q?review=20fix:=20=E7=8B=AC=E7=AB=8Bh5-manifest?= =?UTF-8?q?=20+=20=E5=9F=9F=E5=90=8D=E6=A0=A1=E9=AA=8C=20+=20=E6=81=A2?= =?UTF-8?q?=E5=A4=8DAPK=20manifest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ota/h5/manifest-{channel}.json — 独立于APK manifest - ota/manifest-*.json — 恢复gen-manifest.sh格式 - v6 HTML: h5_sha256缺失拒绝 + h5_url域名校验 --- ota/h5/index-v6.html | 5 +++-- ota/h5/manifest-beta.json | 1 + ota/h5/manifest-nightly.json | 1 + ota/h5/manifest-stable.json | 1 + ota/manifest-beta.json | 2 +- ota/manifest-nightly.json | 2 +- ota/manifest-stable.json | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 ota/h5/manifest-beta.json create mode 100644 ota/h5/manifest-nightly.json create mode 100644 ota/h5/manifest-stable.json diff --git a/ota/h5/index-v6.html b/ota/h5/index-v6.html index 96fbd09..f9cc722 100644 --- a/ota/h5/index-v6.html +++ b/ota/h5/index-v6.html @@ -44,13 +44,14 @@ function selectCh(el,ch){ } function log(m){document.getElementById('log').innerText+=m+'\n'} function checkUpdate(){ - var manFile='/manifest-'+channel+'.json'; + var manFile='/h5/manifest-'+channel+'.json'; log('checking '+manFile+' ...'); fetch(BASE+manFile+'?t='+Date.now(),{cache:'no-store'}) .then(function(r){if(!r.ok)throw Error('HTTP '+r.status);return r.json()}) .then(function(j){log('remote: '+j.h5_version); dlUrl=j.h5_url;dlSha=j.h5_sha256||''; - if(!dlUrl){log('ERR: no h5_url');return} + if(!dlSha){log('ERR: manifest missing h5_sha256');return} + if(!dlUrl||dlUrl.indexOf(BASE)!==0){log('ERR: invalid h5_url domain');return} if(j.h5_version!=='0.1.0-dav-android-6'){dlVer=j.h5_version; log('*** NEW VERSION ***');document.getElementById('btnApply').disabled=false} else log('up to date')}) diff --git a/ota/h5/manifest-beta.json b/ota/h5/manifest-beta.json new file mode 100644 index 0000000..1b4f0a2 --- /dev/null +++ b/ota/h5/manifest-beta.json @@ -0,0 +1 @@ +{"h5_version":"0.1.0-dav-android-6","h5_sha256":"779e291531062e916cad5e33ee51d6783a30e9e96babee37ae829b491a354413","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} diff --git a/ota/h5/manifest-nightly.json b/ota/h5/manifest-nightly.json new file mode 100644 index 0000000..1b4f0a2 --- /dev/null +++ b/ota/h5/manifest-nightly.json @@ -0,0 +1 @@ +{"h5_version":"0.1.0-dav-android-6","h5_sha256":"779e291531062e916cad5e33ee51d6783a30e9e96babee37ae829b491a354413","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} diff --git a/ota/h5/manifest-stable.json b/ota/h5/manifest-stable.json new file mode 100644 index 0000000..1b4f0a2 --- /dev/null +++ b/ota/h5/manifest-stable.json @@ -0,0 +1 @@ +{"h5_version":"0.1.0-dav-android-6","h5_sha256":"779e291531062e916cad5e33ee51d6783a30e9e96babee37ae829b491a354413","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} diff --git a/ota/manifest-beta.json b/ota/manifest-beta.json index 17b96e4..4068965 100644 --- a/ota/manifest-beta.json +++ b/ota/manifest-beta.json @@ -1 +1 @@ -{"h5_version":"0.1.0-dav-android-6","h5_sha256":"6a25c8c5c1e2bacdac416885a0cd4754debf699344d63673cffcc91b5d646295","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} +{"version":"0.1.0","builds":{}} diff --git a/ota/manifest-nightly.json b/ota/manifest-nightly.json index 17b96e4..87136c9 100644 --- a/ota/manifest-nightly.json +++ b/ota/manifest-nightly.json @@ -1 +1 @@ -{"h5_version":"0.1.0-dav-android-6","h5_sha256":"6a25c8c5c1e2bacdac416885a0cd4754debf699344d63673cffcc91b5d646295","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} +{"version":"0.1.0","builds":{"android":{"type":"apk","tag":"v0.1.0-dav-android-8","url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/releases/download/v0.1.0-dav-android-8/v0.1.0-dav-android-8-debug.apk","sha256":"b2451a398ea2dd34e585c5ec4529d6654451c9b9ab4ddf4a25ec9b032f0ac2bf","size":3506569,"channel":"nightly","minVersion":"0.1.0"}}} diff --git a/ota/manifest-stable.json b/ota/manifest-stable.json index 17b96e4..4068965 100644 --- a/ota/manifest-stable.json +++ b/ota/manifest-stable.json @@ -1 +1 @@ -{"h5_version":"0.1.0-dav-android-6","h5_sha256":"6a25c8c5c1e2bacdac416885a0cd4754debf699344d63673cffcc91b5d646295","h5_url":"https://git.childish-ghost.com/LukeMackin/Yuzu-GCA/raw/branch/main/ota/h5/index-v6.html"} +{"version":"0.1.0","builds":{}}