Skip to content

Windows 上的安卓应用运行器:双击 APK 即装,应用以独立窗口与桌面图标运行,自持 QEMU 运行时

fix: Gitee 分片更新包能被正确识别并拼装(实测打通)

RoutineMiku4a1a71971647
diff --git a/src/core/sources.js b/src/core/sources.js
index c048d8e..d9d8005 100644
--- a/src/core/sources.js
+++ b/src/core/sources.js
@@ -194,8 +194,11 @@ function groupParts(assets) {
for (const g of groups.values()) {
g.parts.sort((x, y) => x.index - y.index);
const contiguous = g.parts.every((p, i) => p.index === i + 1);
- g.size = g.parts.reduce((n, p) => n + p.size, 0);
- if (!contiguous || !g.parts.every((p) => p.size > 0 && p.urls.length)) g.broken = true;
+ g.size = g.parts.reduce((n, p) => n + (Number(p.size) || 0), 0);
+ // 注意:Gitee 的发行版资产条目只有 name/url,**没有 size**。
+ // 以「size>0」作为完整性条件会把整组分片判成残缺而丢弃(实测踩过),
+ // 所以这里只要求「分片连续 + 每个分片有地址」;大小未知时进度按已收字节显示。
+ if (!contiguous || !g.parts.every((p) => p.urls.length)) g.broken = true;
}
return { list: out.filter((a) => !a.broken), broken: [...groups.values()].filter((g) => g.broken).map((g) => g.name) };
}
diff --git a/src/core/updater.js b/src/core/updater.js
index 44c5193..46bae1b 100644
--- a/src/core/updater.js
+++ b/src/core/updater.js
@@ -86,7 +86,17 @@ class Updater {
notes: merged.notes,
htmlUrl: merged.htmlUrl,
publishedAt: merged.publishedAt,
- asset: asset ? { name: asset.name, size: asset.size, url: asset.url, source: asset.source } : null,
+ // 注意带上 parts:Gitee 的分片包没有单一 url,丢掉 parts 就变成「有资产但没地址」
+ asset: asset
+ ? {
+ name: asset.name,
+ size: asset.size,
+ url: asset.url,
+ source: asset.source,
+ parts: asset.parts,
+ partial: asset.partial,
+ }
+ : null,
assets: merged.assets,
// 两个源各自的最新版本 / 谁不可达,界面上可以如实显示「这次走的哪个源」
sources: merged.sources,
@@ -94,7 +104,7 @@ class Updater {
flavor: this.flavor,
hasUpdate: cmpVer(merged.tag, this.current) > 0,
current: this.current,
- canAutoApply: !!asset,
+ canAutoApply: !!asset && (!!asset.url || !!(asset.parts && asset.parts.length)),
};
this._last = this.latest;
return this.latest;
diff --git a/test/auto-test.js b/test/auto-test.js
index 2b83ceb..176ebe6 100644
--- a/test/auto-test.js
+++ b/test/auto-test.js
@@ -898,6 +898,54 @@ const { AdbClient, friendlyInstallError, friendlyLaunchError } = require('../src
`只应保留 ApkStart* 资产,实际 ${JSON.stringify(m.assets.map((a) => a.name))}`);
});
+ await test('Gitee 的资产没有 size 字段:分片组仍要成立(否则整包被丢掉)', async () => {
+ const { Sources } = require('../src/core/sources');
+ const s = new Sources(() => ({ runtime: {} }));
+ s.fetchReleases = async () => [{
+ source: 'gitee',
+ name: 'Gitee',
+ web: 'e',
+ rel: {
+ tag_name: 'v0.3.3',
+ // Gitee 发行版资产只有 name + url,没有 size(实测)
+ assets: [
+ { name: 'ApkStart-v0.3.3-win64-portable.zip.part1', browser_download_url: 'ge://p1' },
+ { name: 'ApkStart-v0.3.3-win64-portable.zip.part2', browser_download_url: 'ge://p2' },
+ ],
+ },
+ }];
+ const m = await s.latest();
+ assert(m.assets.length === 1, `应合并成 1 个资产,实际 ${m.assets.length}`);
+ const a = m.assets[0];
+ assert(a.name === 'ApkStart-v0.3.3-win64-portable.zip', `资产名应为整包名,实际 ${a.name}`);
+ assert(a.parts && a.parts.length === 2, '必须保留两片');
+ assert(a.parts[0].urls[0] === 'ge://p1' && a.parts[1].urls[0] === 'ge://p2', '分片地址顺序/内容要对');
+ assert(a.size === 0, '大小未知时应为 0(界面按已收字节显示进度)');
+ });
+
+ await test('分片资产必须一路传到 updater.asset,否则 prepare 会报「没有可用的下载地址」', async () => {
+ const { Updater } = require('../src/core/updater');
+ const u = new Updater({
+ currentVersion: '0.0.1', exePath: path.join(TMP, 'A.exe'), isPackaged: true, dataDir: TMP,
+ settings: () => ({}),
+ });
+ u.sources.latest = async () => ({
+ version: '9.9.9',
+ tag: 'v9.9.9',
+ assets: [{
+ name: 'ApkStart-v9.9.9-win64-portable.zip',
+ size: 0,
+ partial: true,
+ parts: [{ index: 1, size: 0, urls: ['https://gitee.com/x/p1'] }, { index: 2, size: 0, urls: ['https://gitee.com/x/p2'] }],
+ }],
+ sources: [{ source: 'gitee', name: 'Gitee', tag: 'v9.9.9' }],
+ unreachable: [],
+ });
+ const info = await u.check({ force: true });
+ assert(info.asset && info.asset.parts && info.asset.parts.length === 2, 'parts 必须保留到 asset 上');
+ assert(info.canAutoApply === true, '有分片就应判定为可自动更新');
+ });
+
await test('双源:合并版本时只认同版本的资产,不拿旧包冒充新包', async () => {
const { Sources } = require('../src/core/sources');
const s = new Sources(() => ({ runtime: {} }));