@xcanwin/manyoyo 8.6.10 → 8.6.11

package/bin/manyoyo.js

@@ -871,14 +871,20 @@ async function updateOfflineInstall(mode, options, globalConfig) {
             // MANYOYO_TEST_CODE_BASE 只给测试用（指向本地下载站替身）
             const outcome = await codeUpdate.installCodeUpdate({
                 appRoot, branch: options.code, installed, fetchImpl: github.fetch, targetOs: appUpdate.platformOs(),
-                downloadBase: process.env.MANYOYO_TEST_CODE_BASE || undefined, log: line => console.log(`   ${line}`)
+                downloadBase: process.env.MANYOYO_TEST_CODE_BASE || undefined, log: line => console.log(`   ${line}`),
+                // 校验通过后、下载或切换之前先说清楚装的是哪个提交
+                onInfo: info => console.log(`${CYAN}   ${options.code}@${info.commit.slice(0, 7)} ${info.subject}（构建于 ${codeUpdate.formatBuiltAt(info.builtAt)}）${NC}`)
             });
             const label = `${options.code}@${outcome.info.commit.slice(0, 7)}`;
             if (outcome.status === 'same') {
                 console.log(`${GREEN}✅ 已是 ${label}，无需更新${NC}`);
                 return;
             }
-            console.log(`${CYAN}   ${label} ${outcome.info.subject}（构建于 ${outcome.info.builtAt || '未知时间'}）${NC}`);
+            if (outcome.status === 'same-release') {
+                console.log(`${GREEN}✅ ${label} 就是当前正式版 ${installed} 的代码，无需更新${NC}`);
+                return;
+            }
+            if (outcome.status === 'reused') console.log(`${CYAN}   使用本地已有的 ${outcome.version}，无需下载${NC}`);
             result = outcome;
         } catch (error) {
             if (error instanceof appUpdate.UpdateError && error.code === 'NETWORK') {

package/lib/app-update.js

@@ -206,6 +206,19 @@ function pruneApps(appRoot, keep) {
     }
 }
 
+/**
+ * 切换 current 到 app/<version>/（目录必须已就位）、写 .update.json（记下上一版本）、清理旧版本。
+ * installFromArchive 与代码版的“本地已有就直接切换”共用；manifest 原样放进返回值，供调用方做收尾。
+ */
+function switchInstalled({ appRoot, version, manifest }) {
+    const previous = currentVersion(appRoot);
+    switchCurrent(appRoot, version);
+    writeUpdateRecord(appRoot, { previous: previous && previous !== version ? previous : readUpdateRecord(appRoot).previous || '', current: version, updatedAt: new Date().toISOString() });
+    const record = readUpdateRecord(appRoot);
+    pruneApps(appRoot, [version, record.previous].filter(Boolean));
+    return { version, previous: record.previous || '', manifest };
+}
+
 /**
  * 解开已校验过的 -app.tar.gz 并切换 current（网络下载与 --file 共用）。包不完整/内容不符都在切换前中止。
  */
@@ -234,11 +247,7 @@ async function installFromArchive({ appRoot, archive, version, targetArch, targe
         const target = path.join(appRoot, version);
         if (version !== previous) fs.rmSync(target, { recursive: true, force: true });
         if (version !== previous) fs.renameSync(staging, target);
-        switchCurrent(appRoot, version);
-        writeUpdateRecord(appRoot, { previous: previous && previous !== version ? previous : readUpdateRecord(appRoot).previous || '', current: version, updatedAt: new Date().toISOString() });
-        const record = readUpdateRecord(appRoot);
-        pruneApps(appRoot, [version, record.previous].filter(Boolean));
-        return { version, previous: record.previous || '', manifest };
+        return switchInstalled({ appRoot, version, manifest });
     } finally {
         fs.rmSync(staging, { recursive: true, force: true });
     }
@@ -397,6 +406,7 @@ module.exports = {
     compareVersions,
     isAppVersion,
     installFromArchive,
+    switchInstalled,
     detectInstallMode,
     fetchLatestRelease,
     parseSha256Sums,

package/lib/code-update.js

@@ -9,9 +9,9 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 const appUpdate = require('./app-update');
-const { downloadVerified } = require('./download-verified');
+const { downloadVerified, sha256File } = require('./download-verified');
 
-const { UpdateError, compareVersions, networkError, request, installFromArchive } = appUpdate;
+const { UpdateError, compareVersions, networkError, request, installFromArchive, switchInstalled } = appUpdate;
 
 const DOWNLOAD_BASE = 'https://github.com/xcanwin/manyoyo/releases/download/';
 const BRANCH_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._/-]{0,100}$/;
@@ -102,23 +102,70 @@ async function fetchCodeInfo({ branch, fetchImpl = fetch, downloadBase = DOWNLOA
     return validateCodeInfo(parsed, { branch });
 }
 
+// 当前版本的 manyoyo/package.json 里的 gitHead（正式包与代码版包构建时写入）；读不到或格式不对当作没有
+function readCurrentGitHead(appRoot) {
+    try {
+        const head = JSON.parse(fs.readFileSync(path.join(appRoot, 'current', 'manyoyo', 'package.json'), 'utf-8')).gitHead;
+        return typeof head === 'string' && /^[0-9a-f]{40}$/.test(head) ? head : '';
+    } catch (error) {
+        return '';
+    }
+}
+
+/**
+ * 本地 app/<版本>/ 已经是这个代码版时返回它的 manifest，否则 null（调用方照常下载，不报错）。
+ * --rollback 直接切到本地目录，所以这里的检查不能比它宽松：目录结构完整，并额外核对 manifest 与 .installed、提交号。
+ */
+async function findLocalCopy({ appRoot, info, targetArch, targetOs }) {
+    const dir = path.join(appRoot, info.version);
+    try {
+        for (const required of ['node/bin/node', 'manyoyo/bin/manyoyo.js', 'manifest.json', '.installed']) {
+            if (!fs.existsSync(path.join(dir, required))) return null;
+        }
+        const manifest = JSON.parse(fs.readFileSync(path.join(dir, 'manifest.json'), 'utf-8'));
+        if (!manifest || manifest.version !== info.version || manifest.kind !== 'app' || manifest.arch !== targetArch || manifest.os !== targetOs) return null;
+        if (!manifest.source || manifest.source.commit !== info.commit) return null;
+        // installFromArchive 安装时把 manifest.json 的哈希写进 .installed：对得上才说明目录没被动过
+        if (fs.readFileSync(path.join(dir, '.installed'), 'utf-8').trim() !== await sha256File(path.join(dir, 'manifest.json'))) return null;
+        return manifest;
+    } catch (error) {
+        return null;
+    }
+}
+
+// 构建时间按本机时区显示成 YYYY-MM-DD HH:mm；timeZone 可注入（测试不依赖运行机器的时区）
+function formatBuiltAt(builtAt, timeZone) {
+    const date = new Date(builtAt);
+    if (typeof builtAt !== 'string' || !builtAt || Number.isNaN(date.getTime())) return '未知时间';
+    const parts = Object.fromEntries(new Intl.DateTimeFormat('en-CA', { timeZone, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', hourCycle: 'h23' })
+        .formatToParts(date).map(part => [part.type, part.value]));
+    return `${parts.year}-${parts.month}-${parts.day} ${parts.hour}:${parts.minute}`;
+}
+
 /**
  * 安装某个分支的代码版。installed 是当前版本号。
- * 返回 { status: 'same', info } 或 { status: 'installed', info, version, previous, manifest }。
+ * 返回：{ status: 'same', info }（已是这个版本）、{ status: 'same-release', info }（与当前正式版同一个提交）、
+ * { status: 'reused' | 'installed', info, version, previous, manifest }（本地已有就直接切换 / 下载安装）。
  * 校验失败 / 镜像未发布 / 版本更旧都在下载与切换之前中止，current 不变。
+ * onInfo(info)：全部校验通过后、下载或切换之前调用，让调用方先告诉用户装的是哪个提交。
  */
-async function installCodeUpdate({ appRoot, branch, installed, fetchImpl = fetch, downloadBase = DOWNLOAD_BASE, notFoundRetryMs, targetArch = appUpdate.arch(), targetOs = appUpdate.platformOs(), run, log = () => {}, tmpRoot = os.tmpdir() }) {
+async function installCodeUpdate({ appRoot, branch, installed, fetchImpl = fetch, downloadBase = DOWNLOAD_BASE, notFoundRetryMs, onInfo, targetArch = appUpdate.arch(), targetOs = appUpdate.platformOs(), run, log = () => {}, tmpRoot = os.tmpdir() }) {
     const info = await fetchCodeInfo({ branch, fetchImpl, downloadBase, notFoundRetryMs });
     if (info.version === installed) return { status: 'same', info };
+    if (readCurrentGitHead(appRoot) === info.commit) return { status: 'same-release', info };
     if (compareVersions(info.version, installed) < 0) {
         throw new UpdateError('OLDER', `分支 ${branch} 的代码版是 ${info.version}，比当前的 ${installed} 旧。${branch} 的最新提交可能还在构建，稍后再试；要换回正式版请用 manyoyo update --rollback 或重新运行安装命令。`);
     }
     if (!info.imageReady) {
         throw new UpdateError('IMAGE_NOT_READY', `这个代码版需要镜像 ${info.imageVersion}，但它还没有发布，现在升级会让容器拉不到镜像。请等镜像发布后再试，或换一个分支。`);
     }
+    // 降级与镜像检查都排在本地复用之前，否则本地留着旧目录时会绕过它们
+    const local = await findLocalCopy({ appRoot, info, targetArch, targetOs });
     const asset = info.assets[`${targetOs}-${targetArch}`];
-    const url = asset ? `${tagBase(downloadBase, branch)}${asset.name}` : '';
-    if (!asset) throw new UpdateError('NO_ASSET', `代码版 ${info.version} 里没有适合这台机器（${targetOs}-${targetArch}）的升级包。`);
+    if (!local && !asset) throw new UpdateError('NO_ASSET', `代码版 ${info.version} 里没有适合这台机器（${targetOs}-${targetArch}）的升级包。`);
+    if (typeof onInfo === 'function') onInfo(info);
+    if (local) return { status: 'reused', info, ...switchInstalled({ appRoot, version: info.version, manifest: local }) };
+    const url = `${tagBase(downloadBase, branch)}${asset.name}`;
     // 包是按 CODE.json 里的固定命名拼出来的：先确认确实存在（404 就是没有）
     const probe = await request(fetchImpl, url, { method: 'HEAD' });
     if (probe.status === 404) throw new UpdateError('NO_ASSET', `代码版 ${info.version} 的升级包 ${asset.name} 还没有上传完整，请稍后再试。`);
@@ -162,4 +209,4 @@ function latestReleaseNotice(installed, latest) {
     return `已是最新版本 ${installed}`;
 }
 
-module.exports = { isCodeVersion, latestReleaseNotice, DOWNLOAD_BASE, isValidBranch, codeTagForBranch, codeAssetName, validateCodeInfo, fetchCodeInfo, installCodeUpdate };
+module.exports = { formatBuiltAt, isCodeVersion, latestReleaseNotice, DOWNLOAD_BASE, isValidBranch, codeTagForBranch, codeAssetName, validateCodeInfo, fetchCodeInfo, installCodeUpdate };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xcanwin/manyoyo",
-    "version": "8.6.10",
+    "version": "8.6.11",
     "imageVersion": "2.2.0-common",
     "playwrightCliVersion": "0.1.19",
     "patchrightCoreVersion": "1.63.0",