6.7.0 - Alpha5 - 修复版本比较时 Canary 后缀的权重错误

.utils/fetch-and-parse-android-studio-archives.mjs

@@ -0,0 +1,220 @@
+import { fileURLToPath } from 'node:url';
+import puppeteer from 'puppeteer';
+import { sleep } from './utils/async.mjs';
+import { compareVersionStrings, isVersionStable } from './utils/versioning.mjs';
+import { readPropertiesSync } from './utils/properties.mjs';
+
+/** @typedef {import('puppeteer').Page} Page */
+/** @typedef {import('puppeteer').Frame} Frame */
+/**
+ * @template {Node} T
+ * @typedef {import('puppeteer').ElementHandle<T>} ElementHandle
+ */
+/**
+ * @typedef {Object} ArchiveItem
+ * @property {string} title
+ * @property {string} date
+ * @property {string | null} version
+ * @property {{ text: string, href: string }[]} links
+ * @property {{ [filename: string]: string }} checksums
+ */
+
+const URL = 'https://developer.android.com/studio/archive?hl=en';
+
+/**
+ * 在所有 frame (含主文档) 中查找 "同意" 按钮.
+ *
+ * @param {Page} page
+ * @param {number} [timeoutMs=30000]
+ * @returns {Promise<{handle: ElementHandle<HTMLButtonElement>, frame: Frame}>}
+ */
+async function waitAndFindAgreeButton(page, timeoutMs = 30000) {
+    const deadline = Date.now() + timeoutMs;
+    const selector = 'button.button-primary';
+
+    while (Date.now() < deadline) {
+
+        // 1) 先尝试主文档
+
+        const mainBtn = await page.$$(selector);
+        for (const h of mainBtn) {
+            const txt = await page.evaluate(el => (el.textContent || '').trim().toLowerCase(), h);
+            if (txt.includes('agree')) return { handle: h, frame: page.mainFrame() };
+        }
+
+        // 2) 再查所有子 frame
+
+        const frames = page.frames();
+        for (const f of frames) {
+            /** @type {ElementHandle<HTMLButtonElement>} */
+            const btn = await f.$(selector);
+            if (!btn) continue;
+            const txt = await f.evaluate(el => (el.textContent || '').trim().toLowerCase(), btn);
+            if (txt.includes('i agree') || txt.includes('agree to the terms') || txt === 'agree') {
+                return { handle: btn, frame: f };
+            }
+        }
+
+        // 3) 触发懒加载: 轻微滚动几次
+
+        await page.evaluate(() => window.scrollBy(0, 600));
+        await sleep(250);
+    }
+    throw new Error('未在任何文档中找到 "同意" 按钮 (超时)');
+}
+
+/**
+ * 在所有 frame 中等待某个选择器出现, 并返回该 frame.
+ *
+ * @param {Page} page
+ * @param {string} selector
+ * @param [timeoutMs=30000]
+ * @returns {Promise<Frame>}
+ */
+async function waitForFrameWithSelector(page, selector, timeoutMs = 30000) {
+    const deadline = Date.now() + timeoutMs;
+    while (Date.now() < deadline) {
+        for (const f of page.frames()) {
+            const el = await f.$(selector);
+            if (el) return f;
+        }
+        await sleep(250);
+    }
+    throw new Error(` 未在任何 frame 中找到选择器: ${selector}`);
+}
+
+/**
+ * @return {Promise<ArchiveItem[]>}
+ */
+export async function getAndroidStudioArchives() {
+    const browser = await puppeteer.launch({
+        headless: true,
+        args: [
+            '--no-sandbox',
+            '--disable-setuid-sandbox',
+        ],
+    });
+
+    const page = await browser.newPage();
+    await page.setUserAgent('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36');
+    await page.goto(URL, { waitUntil: 'networkidle2', timeout: 60000 });
+
+    // 滚动到下载区域, 促发懒加载 (有助于注入承载 "同意" 按钮的 iframe)
+    await page.evaluate(() => {
+        const anchor = document.querySelector('#downloads')
+            || Array.from(document.querySelectorAll('h2, h3'))
+                .find(h => /download|archive/i.test(h.textContent || ''));
+        if (anchor) anchor.scrollIntoView({ behavior: 'instant', block: 'start' });
+    });
+    await sleep(500);
+
+    // 等待并点击 "同意" 按钮
+    try {
+        const { handle, frame } = await waitAndFindAgreeButton(page, 30000);
+        await frame.waitForSelector('button.button-primary', { visible: true, timeout: 15000 }).catch(() => {
+        });
+        await handle.click();
+    } catch (e) {
+        console.log('未检测到协议或已同意, 继续解析...');
+    }
+
+    // 同意后不要在主文档等待; 改为在包含内容的 frame 里等待 devsite-expandable
+    // 若首次未出现, 尝试轻微滚动以触发懒加载, 再次检查
+    /** @type {Frame} */
+    let contentFrame;
+    try {
+        contentFrame = await waitForFrameWithSelector(page, 'devsite-expandable', 20000);
+    } catch {
+        // 尝试滚动触发
+        for (let i = 0; i < 8; i++) {
+            await page.evaluate(() => window.scrollBy(0, 800));
+            await sleep(250);
+        }
+        // 再次寻找
+        contentFrame = await waitForFrameWithSelector(page, 'devsite-expandable', 20000);
+    }
+
+    /**
+     * @type {ArchiveItem[]}
+     */
+    const archives = await contentFrame.$$eval('devsite-expandable', nodes => {
+
+        // 从内容 frame 中直接抽取 devsite-expandable 数据
+
+        /**
+         * @param {Node | null} el
+         * @returns {string}
+         */
+        const pickText = el => (el?.textContent || '').trim();
+
+        return nodes.map(n => {
+            /** @type {Node} */
+            const titleEl = n.querySelector('.expand-control');
+            const title = pickText(titleEl?.childNodes?.[0]); // 不含日期的主标题
+            const date = pickText(n.querySelector('.expand-control span'))
+                .replace(/^([A-Z][a-z]{2})[a-z]*( \d+, \d+)$/, '$1$2');
+            /** @type {Element[]} */
+            const linkEls = Array.from(n.querySelectorAll('.downloads a[href]'));
+            const links = linkEls.map(a => ({
+                text: pickText(a),
+                href: a.getAttribute('href') || '',
+            }));
+
+            // 收集 checksums (在 .downloads 文本中)
+            /** @type {HTMLElement} */
+            const downloadsElement = n.querySelector('.downloads');
+            const bodyText = (downloadsElement?.innerText || '').trim();
+            /** @type {{[filename: string]: string}} */
+            const checksums = {};
+            // 行格式: <sha256> <filename>
+            bodyText.split('\n').forEach(line => {
+                const m = /^\s*([a-f0-9]{64})\s+(.+?)\s*$/.exec(line);
+                if (m) {
+                    const [ _, sha256, filename ] = m;
+                    checksums[filename] = sha256;
+                }
+            });
+
+            // 解析版本号 (2025.1.2 等), 优先从标题中提取
+            let version = null;
+            const vm = title.match(/\d{2,}\.\d+(?:\.\d+)?/);
+            if (vm) version = vm[0];
+
+            return { title, date, version, links, checksums };
+        });
+    });
+
+    await browser.close();
+
+    return archives;
+}
+
+async function main() {
+    const props = readPropertiesSync();
+    const minSupportedAndroidStudioVersion = props['MIN_SUPPORTED_ANDROID_STUDIO_IDE_VERSION'];
+    const getVersionFromTitle = (/** @type {string} */ title) => title.split('|')[1].trim();
+    const archives = await getAndroidStudioArchives();
+    const results = archives.filter(archive => {
+        if (!archive.title.includes('|')) return false;
+        return compareVersionStrings(archive.version ?? '0', minSupportedAndroidStudioVersion) >= 0;
+    }).map(({ title, date, version, links }) => {
+        const windowsZipUrl = links.find(link => link.text.match(/-windows(-exe)?\.zip/i))?.href;
+        if (!windowsZipUrl) {
+            console.log('Unable to find Windows zip link for:');
+            console.log(links.map(link => link.text).join('\n'));
+        }
+        const stable = isVersionStable(getVersionFromTitle(title)) || '-';
+        return { title, date, version, stable, 'link for Windows (zip)': windowsZipUrl };
+    }).sort((a, b) => {
+        return compareVersionStrings(getVersionFromTitle(b.title), getVersionFromTitle(a.title));
+    });
+    console.table(results);
+}
+
+// 判断是否为直接执行该文件
+if (fileURLToPath(import.meta.url) === process.argv[1]) {
+    await main().catch((err) => {
+        console.error(err);
+        process.exitCode = 1;
+    });
+}

.utils/scrape-and-inject-android-studio-codename_maps.mjs

@@ -2,191 +2,25 @@
 
 /** @typedef {import('puppeteer').Page} Page */
 /** @typedef {import('puppeteer').Frame} Frame */
+/** @typedef {import('./fetch-and-parse-android-studio-latest-stable-version.mjs').Row} Row */
+/** @typedef {import('./fetch-and-parse-android-studio-archives.mjs').ArchiveItem} ArchiveItem */
 /**
  * @template {Node} T
  * @typedef {import('puppeteer').ElementHandle<T>} ElementHandle
  */
 
-import puppeteer from 'puppeteer';
 import { getLatestStableWindows } from './fetch-and-parse-android-studio-latest-stable-version.mjs';
 import { batchUpdateAnchoredBlocks } from './utils/anchors.mjs';
 import { compareVersionStrings } from './utils/versioning.mjs';
 import { toUpdatedStamp, toYYYYMMDD } from './utils/date.mjs';
-import { sleep } from './utils/async.mjs';
 import { bytes2GiB } from './utils/format.mjs';
 import { getRemoteFileSizeBytes } from './utils/fetch.mjs';
-
-const URL = 'https://developer.android.com/studio/archive?hl=en';
-
-/**
- * 在所有 frame (含主文档) 中查找 "同意" 按钮.
- *
- * @param {Page} page
- * @param {number} [timeoutMs=30000]
- * @returns {Promise<{handle: ElementHandle<HTMLButtonElement>, frame: Frame}>}
- */
-async function waitAndFindAgreeButton(page, timeoutMs = 30000) {
-    const deadline = Date.now() + timeoutMs;
-    const selector = 'button.button-primary';
-
-    while (Date.now() < deadline) {
-
-        // 1) 先尝试主文档
-
-        const mainBtn = await page.$$(selector);
-        for (const h of mainBtn) {
-            const txt = await page.evaluate(el => (el.textContent || '').trim().toLowerCase(), h);
-            if (txt.includes('agree')) return { handle: h, frame: page.mainFrame() };
-        }
-
-        // 2) 再查所有子 frame
-
-        const frames = page.frames();
-        for (const f of frames) {
-            /** @type {ElementHandle<HTMLButtonElement>} */
-            const btn = await f.$(selector);
-            if (!btn) continue;
-            const txt = await f.evaluate(el => (el.textContent || '').trim().toLowerCase(), btn);
-            if (txt.includes('i agree') || txt.includes('agree to the terms') || txt === 'agree') {
-                return { handle: btn, frame: f };
-            }
-        }
-
-        // 3) 触发懒加载: 轻微滚动几次
-
-        await page.evaluate(() => window.scrollBy(0, 600));
-        await sleep(250);
-    }
-    throw new Error('未在任何文档中找到 "同意" 按钮 (超时)');
-}
-
-/**
- * 在所有 frame 中等待某个选择器出现, 并返回该 frame.
- *
- * @param {Page} page
- * @param {string} selector
- * @param [timeoutMs=30000]
- * @returns {Promise<Frame>}
- */
-async function waitForFrameWithSelector(page, selector, timeoutMs = 30000) {
-    const deadline = Date.now() + timeoutMs;
-    while (Date.now() < deadline) {
-        for (const f of page.frames()) {
-            const el = await f.$(selector);
-            if (el) return f;
-        }
-        await sleep(250);
-    }
-    throw new Error(` 未在任何 frame 中找到选择器: ${selector}`);
-}
+import { getAndroidStudioArchives } from './fetch-and-parse-android-studio-archives.mjs';
 
 async function main() {
-    const browser = await puppeteer.launch({
-        headless: true,
-        args: [
-            '--no-sandbox',
-            '--disable-setuid-sandbox',
-        ],
-    });
-
-    const page = await browser.newPage();
-    await page.setUserAgent('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36');
-    await page.goto(URL, { waitUntil: 'networkidle2', timeout: 60000 });
-
-    // 滚动到下载区域, 促发懒加载 (有助于注入承载 "同意" 按钮的 iframe)
-    await page.evaluate(() => {
-        const anchor = document.querySelector('#downloads')
-            || Array.from(document.querySelectorAll('h2, h3'))
-                .find(h => /download|archive/i.test(h.textContent || ''));
-        if (anchor) anchor.scrollIntoView({ behavior: 'instant', block: 'start' });
-    });
-    await sleep(500);
-
-    // 等待并点击 "同意" 按钮
-    try {
-        const { handle, frame } = await waitAndFindAgreeButton(page, 30000);
-        await frame.waitForSelector('button.button-primary', { visible: true, timeout: 15000 }).catch(() => {
-        });
-        await handle.click();
-    } catch (e) {
-        console.log('未检测到协议或已同意, 继续解析...');
-    }
-
-    // 同意后不要在主文档等待; 改为在包含内容的 frame 里等待 devsite-expandable
-    // 若首次未出现, 尝试轻微滚动以触发懒加载, 再次检查
-    /** @type {Frame} */
-    let contentFrame;
-    try {
-        contentFrame = await waitForFrameWithSelector(page, 'devsite-expandable', 20000);
-    } catch {
-        // 尝试滚动触发
-        for (let i = 0; i < 8; i++) {
-            await page.evaluate(() => window.scrollBy(0, 800));
-            await sleep(250);
-        }
-        // 再次寻找
-        contentFrame = await waitForFrameWithSelector(page, 'devsite-expandable', 20000);
-    }
-
-    /**
-     * @typedef {Object} ArchiveItem
-     * @property {string} title
-     * @property {string} date
-     * @property {string | null} version
-     * @property {{ text: string, href: string }[]} links
-     * @property {{ [filename: string]: string }} checksums
-     */
-    /**
-     * @type {ArchiveItem[]}
-     */
-    const archives = await contentFrame.$$eval('devsite-expandable', nodes => {
-
-        // 从内容 frame 中直接抽取 devsite-expandable 数据
-
-        /**
-         * @param {Node | null} el
-         * @returns {string}
-         */
-        const pickText = el => (el?.textContent || '').trim();
-
-        return nodes.map(n => {
-            /** @type {Node} */
-            const titleEl = n.querySelector('.expand-control');
-            const title = pickText(titleEl?.childNodes?.[0]); // 不含日期的主标题
-            const date = pickText(n.querySelector('.expand-control span')); // 例如 "April 1, 2025"
-            /** @type {Element[]} */
-            const linkEls = Array.from(n.querySelectorAll('.downloads a[href]'));
-            const links = linkEls.map(a => ({
-                text: pickText(a),
-                href: a.getAttribute('href') || '',
-            }));
-
-            // 收集 checksums (在 .downloads 文本中)
-            /** @type {HTMLElement} */
-            const downloadsElement = n.querySelector('.downloads');
-            const bodyText = (downloadsElement?.innerText || '').trim();
-            /** @type {{[filename: string]: string}} */
-            const checksums = {};
-            // 行格式: <sha256> <filename>
-            bodyText.split('\n').forEach(line => {
-                const m = /^\s*([a-f0-9]{64})\s+(.+?)\s*$/.exec(line);
-                if (m) {
-                    const [ _, sha256, filename ] = m;
-                    checksums[filename] = sha256;
-                }
-            });
-
-            // 解析版本号 (2025.1.2 等), 优先从标题中提取
-            let version = null;
-            const vm = title.match(/\d{2,}\.\d+(?:\.\d+)?/);
-            if (vm) version = vm[0];
-
-            return { title, date, version, links, checksums };
-        });
-    });
-
     // 1) 用 "最新稳定版" 的校验和/文件名, 在归档中定位条目, 补全并更新 common.json
 
+    const archives = await getAndroidStudioArchives();
     const latestRows = await getLatestStableWindows(); // [{kind, filename, sha256, url, size, ...}]
     const latestExe = latestRows.find(x => x.kind === 'exe');
     const latestZip = latestRows.find(x => x.kind === 'zip');
@@ -198,7 +32,7 @@ async function main() {
      * 在归档中查找: 优先用 sha256 命中, 其次用文件名.
      *
      * @param {ArchiveItem[]} rows
-     * @param {import('./fetch-and-parse-android-studio-latest-stable-version.mjs').Row} target
+     * @param {Row} target
      * @return {ArchiveItem | null}
      */
     const matchArchive = (rows, target) => {
@@ -470,8 +304,6 @@ async function main() {
         lines: codenameMapLines,
         updatedLabel: 'Android Studio 代号名称映射',
     } ]);
-
-    await browser.close();
 }
 
 main().catch(err => {

.utils/utils/versioning.mjs

@@ -1,6 +1,57 @@
 // utils/versioning.mjs
 
-const SUFFIX_PRIORITY = { '': 10, 'alpha': 1, 'beta': 2, 'canary': 3, 'rc': 5 };
+const SUFFIX_PRIORITY = {
+    // 预发布 (越小越靠前)
+    'canary': 1, 'nightly': 1, 'snapshot': 1, 'dev': 1,
+    'pre-alpha': 2, 'prealpha': 2, 'preview': 2, 'eap': 2, 'milestone': 2,
+    'alpha': 3,
+    'beta': 4,
+    'rc': 5,
+    // 正式/稳定
+    '': 10, 'stable': 10, 'ga': 10, 'final': 10, 'release': 10, 'lts': 10,
+};
+
+/**
+ * 统一后缀别名到规范键.
+ *
+ * @param {string} nameRaw
+ * @return {string}
+ */
+function normalizeSuffixName(nameRaw) {
+    const n = String(nameRaw || '').toLowerCase();
+    switch (n) {
+        case 'a':
+            return 'alpha';
+        case 'b':
+            return 'beta';
+        case 'cr':
+            return 'rc';
+        case 'm':
+            return 'milestone';
+        case 'pre':
+            return 'preview';
+        case 'canary':
+        case 'nightly':
+        case 'snapshot':
+        case 'dev':
+        case 'pre-alpha':
+        case 'prealpha':
+        case 'preview':
+        case 'eap':
+        case 'milestone':
+        case 'alpha':
+        case 'beta':
+        case 'rc':
+        case 'stable':
+        case 'ga':
+        case 'final':
+        case 'release':
+        case 'lts':
+            return n;
+        default:
+            return n; // 未知后缀维持原样, 优先级将落在默认分支
+    }
+}
 
 /**
  * @param {string} version
@@ -16,15 +67,18 @@ export function toVersionParts(version) {
         return num;
     });
 
-    // 解析后缀, 如 Alpha2 / Beta / RC1 等; 默认数字为 1
-    const suffixPattern = /([A-Za-z]+)\s*(\d*)|([A-Za-z]*)\s*(\d+)/;
+    // 解析后缀, 支持 rc1 / rc 1 / rc.1 / RC1 等; 默认数字为 1
+    const suffixPattern = /([A-Za-z]+)[\s._-]*(\d*)|([A-Za-z]*)[\s._-]*(\d+)/;
     const suffixStr = parts[1] || '';
     const m = suffixStr.match(suffixPattern);
     if (!m) return [ numberParts, [ '', 0 ] ];
 
-    const suffixName = m[1] || '';
-    const suffixNumber = parseInt(m[2] || '1', 10);
-    return [ numberParts, [ suffixName, Number.isNaN(suffixNumber) ? 1 : suffixNumber ] ];
+    const rawName = (m[1] ?? m[3] ?? '');
+    const rawNum = (m[2] ?? m[4] ?? '');
+    const suffixName = normalizeSuffixName(rawName);
+    const suffixNumberParsed = parseInt(rawNum || '1', 10);
+    const suffixNumber = Number.isNaN(suffixNumberParsed) ? 1 : suffixNumberParsed;
+    return [ numberParts, [ suffixName, suffixNumber ] ];
 }
 
 /**
@@ -50,8 +104,8 @@ export function compareVersionParts(a, b) {
 export function compareVersionSuffix(s1, s2) {
     const [ name1Raw, num1 ] = s1;
     const [ name2Raw, num2 ] = s2;
-    const name1 = name1Raw.toLowerCase();
-    const name2 = name2Raw.toLowerCase();
+    const name1 = normalizeSuffixName(name1Raw);
+    const name2 = normalizeSuffixName(name2Raw);
     const p1 = SUFFIX_PRIORITY[name1] ?? Number.MAX_SAFE_INTEGER;
     const p2 = SUFFIX_PRIORITY[name2] ?? Number.MAX_SAFE_INTEGER;
     if (p1 !== p2) return p1 > p2 ? 1 : -1;
@@ -83,6 +137,16 @@ export function compareVersionStringsDescending(v1, v2) {
     return cmp !== 0 ? cmp : compareVersionSuffix(s2, s1);
 }
 
+/**
+ * @param {string} v
+ * @return {boolean}
+ */
+export function isVersionStable(v) {
+    const [ _, [ suffixName ] ] = toVersionParts(v);
+    const normalizedName = normalizeSuffixName(suffixName);
+    return (SUFFIX_PRIORITY[normalizedName] ?? Number.MAX_SAFE_INTEGER) === 10;
+}
+
 /**
  * @param {string} v
  * @param {Object} options
@@ -91,7 +155,6 @@ export function compareVersionStringsDescending(v1, v2) {
  * @return {boolean}
  */
 export function isVersionInRange(v, { min, max } = {}) {
-    return (min !== null && compareVersionStrings(v, min) >= 0)
-        && (max !== null && compareVersionStrings(v, max) <= 0);
-
-}
+    return (min == null || compareVersionStrings(v, min) >= 0)
+        && (max == null || compareVersionStrings(v, max) <= 0);
+}