Windows 上的安卓应用运行器:双击 APK 即装,应用以独立窗口与桌面图标运行,自持 QEMU 运行时
fix(runtime): SDK 索引相对 URL 补全 + AVD 64 位架构修复
RoutineMiku9de46fa4d3db
diff --git a/build/pack.js b/build/pack.jsindex ee65598..a70af13 100644--- a/build/pack.js+++ b/build/pack.js@@ -8,7 +8,10 @@ const fs = require('fs');const path = require('path');const ROOT = path.join(__dirname, '..');-const OUT = path.join(ROOT, 'dist', 'ApkStart-win64-portable');+// 允许指定输出目录(用于目标目录被正在运行的实例占用时,先构建到别处再替换)+const OUT = process.env.APKSTART_PACK_OUT+ ? path.resolve(process.env.APKSTART_PACK_OUT)+ : path.join(ROOT, 'dist', 'ApkStart-win64-portable');const ELECTRON_DIST = path.join(ROOT, 'node_modules', 'electron', 'dist');function rmrf(p) {diff --git a/src/core/emulator.js b/src/core/emulator.jsindex 046c0e5..ebdd4cc 100644--- a/src/core/emulator.js+++ b/src/core/emulator.js@@ -57,12 +57,18 @@ class EmulatorEngine {`avd.ini.encoding=UTF-8\npath=${avdDir.replace(/\\/g, '/')}\ntarget=android-${p.sysApi}\n`,);+ // hw.cpu.arch 必须是 ABI 本身(x86_64 不能截成 x86),+ // 否则模拟器会按 32 位启动却加载 64 位内核,报 "requires an x86-64 CPU, but only detected an i686 CPU"。+ const cpuArch = p.sysAbi === 'arm64-v8a' ? 'arm64'+ : p.sysAbi === 'armeabi-v7a' ? 'arm'+ : p.sysAbi;+const cfg = [`AvdId=${AVD_NAME}`,'avd.ini.displayname=ApkStart','avd.ini.encoding=UTF-8',`abi.type=${p.sysAbi}`,- `hw.cpu.arch=${p.sysAbi.split('_')[0]}`,+ `hw.cpu.arch=${cpuArch}`,`hw.cpu.ncore=${cores}`,`hw.ramSize=${memoryMB}`,'vm.heapSize=512',diff --git a/src/core/provision.js b/src/core/provision.jsindex 51514c8..4c0ca2d 100644--- a/src/core/provision.js+++ b/src/core/provision.js@@ -42,6 +42,27 @@ const SOURCES = {isoSizeHint: 900 * 1024 * 1024,};+/**+ * SDK 索引里的 <url> 是相对路径,基准目录各不相同:+ * repository2-3.xml → https://dl.google.com/android/repository/+ * sys-img/android/*.xml → https://dl.google.com/android/repository/sys-img/android/+ * 所以基准目录一律取「索引文件自身所在目录」。此前直接拿文件名当 URL 会抛 Invalid URL。+ */+const REPO_BASE = 'https://dl.google.com/android/repository/';++function baseOf(indexUrl) {+ const s = String(indexUrl || '');+ const i = s.lastIndexOf('/');+ return i > 0 ? s.slice(0, i + 1) : REPO_BASE;+}++function absUrl(u, base = REPO_BASE) {+ const s = String(u || '').trim();+ if (!s) return '';+ if (/^[a-z][a-z0-9+.-]*:\/\//i.test(s)) return s;+ return base + s.replace(/^\/+/, '');+}+/** 想默认使用的系统镜像(API 级别 + 渠道)。AOSP 版体积小、无 GMS 授权问题。 */const DEFAULT_SYSIMG = { api: '30', tag: 'default', abi: 'x86_64' };@@ -336,13 +357,14 @@ class Provisioner {/** 从 SDK 索引里动态解析最新的 Windows emulator 包地址 */async resolveEmulatorUrl() {const cached = store.getSettings().runtime.emulatorUrl;- if (cached && cached.trim()) return cached.trim();+ if (cached && cached.trim()) return absUrl(cached);if (this._cache.emulatorUrl) return this._cache.emulatorUrl;try {const xml = await this._fetchText(SOURCES.sdkIndex);const block = /<remotePackage path="emulator"[\s\S]*?<\/remotePackage>/.exec(xml);if (block) {- const urls = [...block[0].matchAll(/<url>([^<]+)<\/url>/g)].map((m) => m[1]);+ const base = baseOf(SOURCES.sdkIndex);+ const urls = [...block[0].matchAll(/<url>([^<]+)<\/url>/g)].map((m) => absUrl(m[1], base));const win = urls.find((u) => /windows_x64.*\.zip$/i.test(u));if (win) {this._cache.emulatorUrl = win;@@ -357,7 +379,7 @@ class Provisioner {/** 从 sys-img 索引里解析默认 AOSP 系统镜像地址 */async resolveSysimgUrl() {const cached = store.getSettings().runtime.sysimgUrl;- if (cached && cached.trim()) return cached.trim();+ if (cached && cached.trim()) return absUrl(cached, baseOf(SOURCES.sysImgIndexes[0]));if (this._cache.sysimgUrl) return this._cache.sysimgUrl;const want = `system-images;android-${DEFAULT_SYSIMG.api};${DEFAULT_SYSIMG.tag};${DEFAULT_SYSIMG.abi}`;for (const idx of SOURCES.sysImgIndexes) {@@ -367,7 +389,8 @@ class Provisioner {const re = new RegExp(`<remotePackage path="${want.replace(/[;]/g, ';')}"[\\s\\S]*?</remotePackage>`);const block = re.exec(xml);if (block) {- const urls = [...block[0].matchAll(/<url>([^<]+)<\/url>/g)].map((m) => m[1])+ const base = baseOf(idx);+ const urls = [...block[0].matchAll(/<url>([^<]+)<\/url>/g)].map((m) => absUrl(m[1], base)).filter((u) => /x86_64.*\.zip$/i.test(u));if (urls.length) {this._cache.sysimgUrl = urls[urls.length - 1];@@ -748,4 +771,4 @@ class Provisioner {}}-module.exports = { Provisioner, SOURCES, MIN_SIZE };+module.exports = { Provisioner, SOURCES, MIN_SIZE, absUrl, baseOf };diff --git a/src/ui/app.js b/src/ui/app.jsindex 105630c..e79f91b 100644--- a/src/ui/app.js+++ b/src/ui/app.js@@ -186,6 +186,11 @@ async function refreshStatus() {text.textContent = '运行时引擎未安装 —— 点击右上角「运行时」一键部署';tag.textContent = '需要部署';tag.className = 'brand-tag';+ } else if (s.needsSetup === 'boot') {+ dot.className = 'dot warn';+ text.textContent = '运行时已就绪 —— 点「运行时」里的「启动运行时」开机,或直接安装一个 APK';+ tag.textContent = '待开机';+ tag.className = 'brand-tag';} else if (s.installing) {dot.className = 'dot warn';text.textContent = '安装程序运行中 —— 请在虚拟机窗口里完成安装';diff --git a/test/engine-test.js b/test/engine-test.jsindex 877f97b..872a2c3 100644--- a/test/engine-test.js+++ b/test/engine-test.js@@ -194,6 +194,41 @@ function assert(cond, msg) { if (!cond) throw new Error(msg || '断言失败');assert(new ZipArchive(fs.readFileSync(zipPath)).has('platform-tools/adb.exe'), 'zip 读取异常');});+ await test('SDK 索引里的相对 url 会被补全成绝对地址', async () => {+ const { absUrl, baseOf, SOURCES } = require('../src/core/provision');+ // repository2-3.xml(emulator)相对仓库根+ assert(absUrl('emulator-windows_x64-16847572.zip') === `${baseOf(SOURCES.sdkIndex)}emulator-windows_x64-16847572.zip`,+ 'emulator 相对路径未补全');+ // sys-img 索引相对 sys-img/android/,不能错拼到仓库根+ const sysBase = baseOf(SOURCES.sysImgIndexes[0]);+ assert(sysBase.endsWith('/sys-img/android/'), `sys-img 基准目录异常: ${sysBase}`);+ assert(absUrl('x86_64-30_r11.zip', sysBase) === 'https://dl.google.com/android/repository/sys-img/android/x86_64-30_r11.zip',+ 'sys-img 相对路径补全错误');+ // 绝对地址原样返回+ assert(absUrl('https://example.com/a.zip') === 'https://example.com/a.zip', '绝对地址被改写');+ });++ await test('解析出的 emulator / 系统镜像地址都是可下载的绝对 URL', async () => {+ const p = new Provisioner(TMP);+ const emuUrl = await p.resolveEmulatorUrl();+ const imgUrl = await p.resolveSysimgUrl();+ for (const u of [emuUrl, imgUrl]) {+ assert(/^https?:\/\//i.test(u), `不是绝对 URL: ${u}`);+ assert(/\.zip$/i.test(u), `不是 zip 包: ${u}`);+ }+ assert(/windows_x64/i.test(emuUrl), `emulator 包平台不对: ${emuUrl}`);+ });++ await test('AVD 配置使用 64 位架构(x86_64 不能被截成 x86)', async () => {+ const { EmulatorEngine } = require('../src/core/emulator');+ const emu = new EmulatorEngine(TMP);+ const r = emu.ensureAvd({ memoryMB: 2048, cores: 2 });+ const cfg = fs.readFileSync(path.join(r.avdDir, 'config.ini'), 'utf8');+ assert(/^hw\.cpu\.arch=x86_64$/m.test(cfg), `hw.cpu.arch 应为 x86_64,实际:${cfg.match(/^hw\.cpu\.arch=.*$/m)}`);+ assert(/^abi\.type=x86_64$/m.test(cfg), 'abi.type 应为 x86_64');+ assert(/^image\.sysdir\.1=system-images\//m.test(cfg), 'image.sysdir.1 缺失');+ });+await test('镜像校验:区分有效 ISO9660 / 损坏 / 未下完', async () => {const p = new Provisioner(TMP);const mk = (file, size, writeMagic) => {