fix(update): 修复云端安装交接并完善发布验收
修复隐藏缓存目录下载和响应收尾,使用原生助手校验安装包并确认交接。 补齐真实静默升级、便携版及中文路径验收,并按现行设备和科目授权契约更新回归。 服务端安装时生成独立密钥,覆盖升级保留既有配置;补齐安装包副本验证说明。
This commit is contained in:
1 parent
66be3a63b1
commit
71cc8eb605
19 files changed
+1424
-91
No files matched your search
@@ -3,7 +3,6 @@ import crypto from 'node:crypto';
|
||||
import fs from 'node:fs';
|
||||
import fsp from 'node:fs/promises';
|
||||
import path from 'node:path';
|
||||
import { spawn } from 'node:child_process';
|
||||
import { BrowserWindow, app } from 'electron';
|
||||
import {
|
||||
isNewerVersion,
|
||||
@@ -15,6 +14,7 @@ import { getConfig, saveConfig } from './config.js';
|
||||
import { island } from './island.js';
|
||||
import { logger } from './logger.js';
|
||||
import { connectionEvents } from './config-events.js';
|
||||
import { prepareUpdateInstaller } from './update-installer.js';
|
||||
|
||||
let updateEpoch = 0;
|
||||
let downloadAbort = new AbortController();
|
||||
@@ -43,15 +43,17 @@ connectionEvents.on('changed', () => {
|
||||
* 空闲安装要求不在上课且主窗口隐藏满五分钟;
|
||||
* 2. **下完先校验 sha256**:服务端给的哈希对不上就删掉文件、记 error,**不做任何信任放行**
|
||||
* (宁可这次更新失败,也不能把一个来源不明的 exe 装到教室里);
|
||||
* 3. **安装脚本脱离本进程**:PowerShell 等旧进程退出、安装器完成后重新拉起应用,
|
||||
* 本进程随即走既有退出路径退出(重启应用这件事交给安装脚本,而不是自己 `relaunch`,
|
||||
* 否则会与"安装器正在覆盖自己"撞车 —— Windows 上正在运行的程序文件是删不掉的)。
|
||||
* 3. **独立安装助手**:助手就绪后才退出旧进程,由助手执行安装并确认新版启动;
|
||||
* 助手从更新目录运行,不锁住正在被安装器替换的应用文件。
|
||||
*/
|
||||
|
||||
let policy:
|
||||
| (Pick<ClientHeartbeatResponse, 'updateTargetVersion' | 'updateMode' | 'updateNotBefore'> & {
|
||||
serverUrl: string;
|
||||
username: string;
|
||||
updateSha256: string;
|
||||
updateSize: number;
|
||||
updateFileName: string;
|
||||
})
|
||||
| null = null;
|
||||
function policyPath(): string {
|
||||
@@ -107,6 +109,9 @@ export function syncUpdatePolicy(next: ClientHeartbeatResponse): void {
|
||||
updateTargetVersion: next.updateTargetVersion,
|
||||
updateMode: next.updateMode ?? 'idle',
|
||||
updateNotBefore: next.updateNotBefore ?? null,
|
||||
updateSha256: next.update?.version === next.updateTargetVersion ? next.update.sha256 : '',
|
||||
updateSize: next.update?.version === next.updateTargetVersion ? next.update.size : 0,
|
||||
updateFileName: next.update?.version === next.updateTargetVersion ? next.update.fileName : '',
|
||||
};
|
||||
fs.mkdirSync(pendingUpdateDir(), { recursive: true });
|
||||
fs.writeFileSync(policyPath(), JSON.stringify(policy), 'utf8');
|
||||
@@ -458,6 +463,14 @@ export async function maybeInstallPendingUpdate(): Promise<void> {
|
||||
}
|
||||
const active = loadPolicy();
|
||||
if (!active || active.updateTargetVersion !== version) return;
|
||||
if (
|
||||
!/^[0-9a-f]{64}$/i.test(active.updateSha256 ?? '') ||
|
||||
active.updateSize <= 0 ||
|
||||
active.updateFileName !== path.basename(installer)
|
||||
) {
|
||||
logger.warn(`更新 ${version} 尚无有效的服务端摘要,等待心跳重新确认安装包`);
|
||||
return;
|
||||
}
|
||||
if (active.updateMode === 'after-school') {
|
||||
const at = Date.parse(active.updateNotBefore ?? '');
|
||||
if (!Number.isFinite(at) || Date.now() < at) return;
|
||||
@@ -520,33 +533,29 @@ export async function maybeInstallPendingUpdate(): Promise<void> {
|
||||
logger.info(`开始静默安装更新 ${version}:${installer}`);
|
||||
try {
|
||||
const exe = process.env.PORTABLE_EXECUTABLE_FILE || app.getPath('exe');
|
||||
const quote = (value: string): string => "'" + value.replaceAll("'", "''") + "'";
|
||||
const config = getConfig();
|
||||
const resultFile = path.join(pendingUpdateDir(), 'install-result.json');
|
||||
// 上一次失败的结果不能冒充这一次:安装开始时先清掉,只有本轮失败才重新写入。
|
||||
fs.rmSync(resultFile, { force: true });
|
||||
const script =
|
||||
`$ErrorActionPreference = 'Stop'; try { Wait-Process -Id ${process.pid} -ErrorAction SilentlyContinue; ` +
|
||||
`$installer = Start-Process -FilePath ${quote(installer)} -ArgumentList '/S','--updated','--force-run' -WindowStyle Hidden -Wait -PassThru; ` +
|
||||
`if ($installer.ExitCode -ne 0) { throw ('安装器退出码:' + $installer.ExitCode) } ` +
|
||||
`} catch { @{ version=${quote(version)}; serverUrl=${quote(config.serverUrl)}; username=${quote(config.username)}; error=$_.Exception.Message } | ConvertTo-Json -Compress | Set-Content -LiteralPath ${quote(resultFile)} -Encoding UTF8; ` +
|
||||
`if (Test-Path -LiteralPath ${quote(exe)}) { Start-Process -FilePath ${quote(exe)} -WindowStyle Hidden } }`;
|
||||
const encoded = Buffer.from(script, 'utf16le').toString('base64');
|
||||
const child = spawn(
|
||||
'powershell.exe',
|
||||
['-NoProfile', '-NonInteractive', '-WindowStyle', 'Hidden', '-EncodedCommand', encoded],
|
||||
{
|
||||
detached: true,
|
||||
stdio: 'ignore',
|
||||
windowsHide: true,
|
||||
},
|
||||
);
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
child.once('spawn', resolve);
|
||||
child.once('error', reject);
|
||||
const helper = await prepareUpdateInstaller({
|
||||
directory: pendingUpdateDir(),
|
||||
installer,
|
||||
version,
|
||||
sha256: active.updateSha256,
|
||||
size: active.updateSize,
|
||||
serverUrl: config.serverUrl,
|
||||
username: config.username,
|
||||
restartExe: exe,
|
||||
portable: Boolean(process.env.PORTABLE_EXECUTABLE_FILE),
|
||||
});
|
||||
child.unref();
|
||||
// 安装器从实际安装目录启动新版;免安装版的旧 exe 可能随退出消失,只在安装失败时尝试恢复它。
|
||||
if (
|
||||
installEpoch !== updateEpoch ||
|
||||
loadPolicy()?.updateTargetVersion !== version ||
|
||||
getConfig().autoUpdate === false
|
||||
) {
|
||||
helper.cancel();
|
||||
installing = false;
|
||||
return;
|
||||
}
|
||||
helper.commit();
|
||||
logger.info(`更新 ${version} 的独立安装助手已就绪,确认退出旧客户端`);
|
||||
if (quitHandler) {
|
||||
quitHandler();
|
||||
} else {
|
||||
@@ -555,6 +564,8 @@ export async function maybeInstallPendingUpdate(): Promise<void> {
|
||||
}
|
||||
} catch (error) {
|
||||
installing = false;
|
||||
if (installEpoch !== updateEpoch) return;
|
||||
installationRetryAt = Date.now() + 5 * 60_000;
|
||||
publishProgress({ stage: 'failed', error: String(error).slice(0, 1000) });
|
||||
logger.error(
|
||||
`启动更新安装失败(将在下次满足安装条件时重试):${error instanceof Error ? error.message : String(error)}`,
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
import crypto from 'node:crypto';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { spawn } from 'node:child_process';
|
||||
|
||||
interface InstallerOptions {
|
||||
directory: string;
|
||||
installer: string;
|
||||
version: string;
|
||||
sha256: string;
|
||||
size: number;
|
||||
serverUrl: string;
|
||||
username: string;
|
||||
restartExe: string;
|
||||
portable: boolean;
|
||||
}
|
||||
|
||||
/** 先确认独立助手就绪;调用方复核策略后 commit,再退出应用。 */
|
||||
export async function prepareUpdateInstaller(options: InstallerOptions) {
|
||||
const attempt = crypto.randomUUID();
|
||||
const prefix = path.join(options.directory, `install-${attempt}`);
|
||||
const helper = path.join(options.directory, `updater-${attempt}.exe`);
|
||||
const resultFile = path.join(options.directory, 'install-result.json');
|
||||
const logFile = path.join(options.directory, 'install-helper.log');
|
||||
fs.mkdirSync(options.directory, { recursive: true });
|
||||
for (const name of fs.readdirSync(options.directory)) {
|
||||
if (/^updater-[0-9a-f-]{36}\.exe$/i.test(name)) {
|
||||
try {
|
||||
fs.rmSync(path.join(options.directory, name));
|
||||
} catch {
|
||||
/* 仍在运行的助手留待下次清理 */
|
||||
}
|
||||
}
|
||||
}
|
||||
fs.copyFileSync(path.join(__dirname, 'update-helper.exe'), helper);
|
||||
fs.writeFileSync(
|
||||
`${prefix}.json`,
|
||||
JSON.stringify({
|
||||
Attempt: attempt,
|
||||
ParentId: process.pid,
|
||||
ParentExe: process.execPath,
|
||||
Installer: options.installer,
|
||||
RestartExe: options.restartExe,
|
||||
Version: options.version,
|
||||
ServerUrl: options.serverUrl,
|
||||
Username: options.username,
|
||||
Sha256: options.sha256,
|
||||
Size: options.size,
|
||||
Portable: options.portable,
|
||||
}),
|
||||
'utf8',
|
||||
);
|
||||
fs.rmSync(resultFile, { force: true });
|
||||
fs.writeFileSync(logFile, `${new Date().toISOString()} 准备安装 ${options.version}\n`, 'utf8');
|
||||
let child: ReturnType<typeof spawn>;
|
||||
try {
|
||||
child = spawn(helper, [`${prefix}.json`], {
|
||||
detached: true,
|
||||
stdio: 'ignore',
|
||||
windowsHide: true,
|
||||
cwd: options.directory,
|
||||
});
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const timeout = setTimeout(
|
||||
() => finish(new Error('更新助手就绪超时,请查看 install-helper.log')),
|
||||
15_000,
|
||||
);
|
||||
const poll = setInterval(() => {
|
||||
try {
|
||||
if (fs.readFileSync(`${prefix}.ready`, 'utf8').trim() === attempt) finish();
|
||||
} catch {
|
||||
/* 尚未就绪 */
|
||||
}
|
||||
}, 50);
|
||||
const onError = (error: Error) => finish(error);
|
||||
const onExit = (code: number | null) => {
|
||||
let detail = '';
|
||||
try {
|
||||
detail = JSON.parse(fs.readFileSync(resultFile, 'utf8')).error ?? '';
|
||||
} catch {
|
||||
/* 原生进程未能启动 */
|
||||
}
|
||||
finish(new Error(detail || `更新助手提前退出(${code ?? '未知退出码'}),请查看 install-helper.log`));
|
||||
};
|
||||
function finish(error?: Error) {
|
||||
clearTimeout(timeout);
|
||||
clearInterval(poll);
|
||||
child.removeListener('error', onError);
|
||||
child.removeListener('exit', onExit);
|
||||
if (error) reject(error);
|
||||
else resolve();
|
||||
}
|
||||
child.once('error', onError);
|
||||
child.once('exit', onExit);
|
||||
});
|
||||
child.unref();
|
||||
} catch (error) {
|
||||
fs.writeFileSync(`${prefix}.cancel`, attempt, 'utf8');
|
||||
throw error;
|
||||
}
|
||||
return {
|
||||
commit: () => fs.writeFileSync(`${prefix}.start`, attempt, 'utf8'),
|
||||
cancel: () => fs.writeFileSync(`${prefix}.cancel`, attempt, 'utf8'),
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user