Windows 上的安卓应用运行器:双击 APK 即装,应用以独立窗口与桌面图标运行,自持 QEMU 运行时
perf: 下载器支持「低速换源」,卡在 95% 的问题解决
RoutineMikuc5d2bca83cc8
diff --git a/src/core/download.js b/src/core/download.jsindex b2ffce1..ddbeed7 100644--- a/src/core/download.js+++ b/src/core/download.js@@ -407,6 +407,7 @@ async function downloadMulti(urls, dest, opt = {}) {pos: i * per,src: i % same.length,tries: 0,+ rotates: 0, // 必须显式初始化:undefined < 2 是 false,换源永远不会触发})).filter((c) => !doneSet.has(c.start));const saveMeta = () => {@@ -437,6 +438,12 @@ async function downloadMulti(urls, dest, opt = {}) {});};+ // 低速换源:某一块从某个源只跑到几十 KB/s 时,光等它下完会把整个下载拖成+ // 「卡在 95% 不动」。跑够 slowAfterMs 且平均速度低于 slowBps 就中断、换下一个源+ // (从断点继续,不丢数据)。每块最多换 2 次,避免在几个慢源之间来回横跳。+ const slowAfterMs = Number(opt.slowAfterMs) > 0 ? Number(opt.slowAfterMs) : 45000;+ const slowBps = Number(opt.slowBps) > 0 ? Number(opt.slowBps) : 120 * 1024;+const fetchChunk = async (c) => {const url = same[c.src % same.length].url;const res = await openStream(url, { headers: { Range: `bytes=${c.pos}-${c.end}` } });@@ -444,6 +451,11 @@ async function downloadMulti(urls, dest, opt = {}) {res.resume();throw new Error(`分块被拒绝 HTTP ${res.statusCode}`);}+ const startPos = c.pos;+ const startedAt = Date.now();+ // 同一条连接 destroy 之后仍可能再收到已缓冲的包,会重复触发换源、把源跳过头,+ // 所以每次请求只允许换一次。+ let rotated = false;await new Promise((resolve, reject) => {// 空闲看门狗 + 「保证 settle」:连接建立了但一个字节都不来(常见的// 「TCP 通但被墙/被限」),光等 socket 超时要 30 秒;而 res.destroy(err)@@ -472,6 +484,18 @@ async function downloadMulti(urls, dest, opt = {}) {got += buf.length;kick();tick(false);+ // 还没下完就慢到不可接受 → 换源(c.pos 已前进,下次从断点继续)+ const took = Date.now() - startedAt;+ if (!rotated && took > slowAfterMs && (c.rotates || 0) < 2 && c.pos <= c.end) {+ const bps = (c.pos - startPos) / (took / 1000);+ if (bps < slowBps) {+ rotated = true;+ c.rotates = (c.rotates || 0) + 1;+ // 这里不推进 c.src:换源统一由下面的 catch 做,否则一次失败会跳两个源+ res.destroy();+ finish(new Error(`该源速度过低(${(bps / 1024).toFixed(0)} KB/s),换源重试`));+ }+ }});res.on('end', () => finish());res.on('error', (e) => finish(e));diff --git a/src/ui/app.js b/src/ui/app.jsindex 76bdd9a..e1f8d80 100644--- a/src/ui/app.js+++ b/src/ui/app.js@@ -798,7 +798,8 @@ function renderUpdate(info) {// 用户排查「为什么检查更新很慢」时,这一行比任何日志都直接。const src = (info.sources || []).map((x) => `${x.name} ${x.tag || ''}`.trim()).join(' / ');const bad = (info.unreachable || []).map((x) => x.name).join('、');- st.textContent = `发现新版本 ${info.tag}${src ? `(${src})` : ''}${bad ? `;${bad} 不可达` : ''}`;+ const stale = info.stale ? '(离线缓存,可能不是最新)' : '';+ st.textContent = `发现新版本 ${info.tag}${src ? `(${src})` : ''}${bad ? `;${bad} 不可达` : ''}${stale}`;showUpdateBtn(true);btn.textContent = info.asset ? '立即更新' : '打开下载页';btn.dataset.mode = info.asset ? 'auto' : 'manual';@@ -810,7 +811,8 @@ function renderUpdate(info) {if (bar) bar.hidden = true;} else {const src = (info.sources || []).map((x) => x.name).join(' / ');- st.textContent = `已是最新版本(v${info.current})${src ? ` · 经由 ${src}` : ''}`;+ const stale = info.stale ? '(离线缓存)' : '';+ st.textContent = `已是最新版本(v${info.current})${src ? ` · 经由 ${src}` : ''}${stale}`;showUpdateBtn(false);if (bar) bar.hidden = true;}diff --git a/test/auto-test.js b/test/auto-test.jsindex a1f3bbd..2b83ceb 100644--- a/test/auto-test.js+++ b/test/auto-test.js@@ -1075,6 +1075,59 @@ const { AdbClient, friendlyInstallError, friendlyLaunchError } = require('../src}});+ await test('下载器:某个源只跑到几十 KB/s 时换源,而不是卡在最后几 % 不动', async () => {+ const http = require('http');+ const { downloadMulti } = require('../src/core/download');+ const MB = 1024 * 1024;+ const total = 2 * MB;+ const data = Buffer.alloc(total, 5);+ // 慢源:每 100ms 才吐 4KB(≈40KB/s)+ const slow = http.createServer((req, res) => {+ const r = /bytes=(\d+)-(\d+)/.exec(req.headers.range || '');+ if (!r) { res.writeHead(200, { 'Content-Length': total }); res.end(data); return; }+ const a = Number(r[1]);+ const b = Math.min(Number(r[2]), total - 1);+ res.writeHead(206, { 'Content-Range': `bytes ${a}-${b}/${total}`, 'Content-Length': b - a + 1 });+ let pos = a;+ const pump = () => {+ if (pos > b) { res.end(); return; }+ const chunk = data.slice(pos, Math.min(b + 1, pos + 4096));+ pos += chunk.length;+ res.write(chunk);+ setTimeout(pump, 100);+ };+ pump();+ });+ const fast = http.createServer((req, res) => {+ const r = /bytes=(\d+)-(\d+)/.exec(req.headers.range || '');+ if (!r) { res.writeHead(200, { 'Content-Length': total }); res.end(data); return; }+ const a = Number(r[1]);+ const b = Math.min(Number(r[2]), total - 1);+ res.writeHead(206, { 'Content-Range': `bytes ${a}-${b}/${total}`, 'Content-Length': b - a + 1 });+ res.end(data.slice(a, b + 1));+ });+ const listen = (srv) => new Promise((r) => srv.listen(0, '127.0.0.1', () => r(srv)));+ const s1 = await listen(slow);+ const s2 = await listen(fast);+ const out = path.join(TMP, 'slowrot.bin');+ const t0 = Date.now();+ try {+ await downloadMulti(+ [`http://127.0.0.1:${s1.address().port}/f`, `http://127.0.0.1:${s2.address().port}/f`],+ out,+ { connections: 2, minChunk: 512 * 1024, idleMs: 3000, slowAfterMs: 400, slowBps: 200 * 1024 },+ );+ const cost = Date.now() - t0;+ assert(Buffer.compare(fs.readFileSync(out), data) === 0, '换源后内容必须正确');+ // 全程走慢源的话 2MB / 40KB/s ≈ 50 秒;换源必须在几秒内完成+ assert(cost < 15000, `应在低速时换源,实际用了 ${cost}ms`);+ } finally {+ s1.close(); s2.close();+ fs.rmSync(out, { force: true });+ fs.rmSync(`${out}.chunks.json`, { force: true });+ }+ });+await test('多源并行下载:只有一条可用地址时退回单源分块', async () => {const http = require('http');const { downloadMulti } = require('../src/core/download');