Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4c71861813 | ||
|
|
3a9f809f46 | ||
|
|
de45c4b20c | ||
|
|
cc9e897260 | ||
|
|
620362823b | ||
|
|
fa2fd94579 | ||
|
|
05a679c2c8 | ||
|
|
23e2f9c5e7 | ||
|
|
484881b410 | ||
|
|
32f768c8ee |
@@ -30,7 +30,9 @@ jobs:
|
|||||||
- name: Verify tag and test gate
|
- name: Verify tag and test gate
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
test "$(node -p 'require("./package.json").version')" = "${GITHUB_REF_NAME#v}"
|
target_version="${GITHUB_REF_NAME#v}"
|
||||||
|
package_version="$(node -p 'require("./package.json").version')"
|
||||||
|
test "$package_version" = "$target_version"
|
||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
pnpm check
|
pnpm check
|
||||||
# better-sqlite3 is a native addon; a single Vitest worker avoids a
|
# better-sqlite3 is a native addon; a single Vitest worker avoids a
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tallynote",
|
"name": "tallynote",
|
||||||
"version": "1.1.37",
|
"version": "1.2.2",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"packageManager": "pnpm@9.0.6",
|
"packageManager": "pnpm@9.0.6",
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ if [[ -z "$VERSION" ]]; then
|
|||||||
fi
|
fi
|
||||||
VERSION=${VERSION#v}
|
VERSION=${VERSION#v}
|
||||||
[[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$ ]] || { printf 'invalid version: %s\n' "$VERSION" >&2; exit 2; }
|
[[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?(\+[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?$ ]] || { printf 'invalid version: %s\n' "$VERSION" >&2; exit 2; }
|
||||||
|
PACKAGE_VERSION=$(node -p 'require("./package.json").version')
|
||||||
|
[[ "$VERSION" == "$PACKAGE_VERSION" ]] || { printf 'version mismatch: release %s does not match package.json %s\n' "$VERSION" "$PACKAGE_VERSION" >&2; exit 2; }
|
||||||
case "$(uname -m)" in
|
case "$(uname -m)" in
|
||||||
x86_64|amd64) ARCH=x64 ;;
|
x86_64|amd64) ARCH=x64 ;;
|
||||||
aarch64|arm64) ARCH=arm64 ;;
|
aarch64|arm64) ARCH=arm64 ;;
|
||||||
@@ -51,25 +53,8 @@ mkdir -p "$OUT_DIR"
|
|||||||
archive="$OUT_DIR/tallynote-${VERSION}-linux-${ARCH}-${LIBC}.tar.gz"
|
archive="$OUT_DIR/tallynote-${VERSION}-linux-${ARCH}-${LIBC}.tar.gz"
|
||||||
tar -C "$stage" -czf "$archive" --owner=0 --group=0 --numeric-owner .
|
tar -C "$stage" -czf "$archive" --owner=0 --group=0 --numeric-owner .
|
||||||
|
|
||||||
# The application-only asset is used by the online updater. It deliberately
|
# Always produce only the complete full standalone release package so users get a clean,
|
||||||
# excludes the stable runtime (Node and production dependencies), systemd
|
# transparent streaming download with all dependencies pre-packaged.
|
||||||
# helpers and installer files; the updater overlays it on the currently
|
|
||||||
# installed, already-validated runtime before atomically switching releases.
|
|
||||||
app_stage=$(mktemp -d)
|
|
||||||
trap 'rm -rf "$stage" "$app_stage"' EXIT
|
|
||||||
mkdir -p "$app_stage/dist" "$app_stage/migrations" "$app_stage/bin" "$app_stage/scripts" "$app_stage/systemd"
|
|
||||||
cp -a "$stage/dist/server" "$app_stage/dist/"
|
|
||||||
cp -a "$stage/dist/shared" "$app_stage/dist/"
|
|
||||||
cp -a "$stage/dist/web" "$app_stage/dist/"
|
|
||||||
cp -a "$stage/migrations/." "$app_stage/migrations/"
|
|
||||||
cp -a "$stage/bin/." "$app_stage/bin/"
|
|
||||||
cp -a "$stage/scripts/." "$app_stage/scripts/"
|
|
||||||
cp -a "$stage/systemd/." "$app_stage/systemd/"
|
|
||||||
cp "$stage/package.json" "$app_stage/package.json"
|
|
||||||
cp "$stage/uninstall.sh" "$app_stage/uninstall.sh"
|
|
||||||
runtime_hash=$(sha256sum pnpm-lock.yaml | awk '{print $1}')
|
|
||||||
app_archive="$OUT_DIR/tallynote-${VERSION}-linux-${ARCH}-${LIBC}.update-${runtime_hash}.tar.gz"
|
|
||||||
tar -C "$app_stage" -czf "$app_archive" --owner=0 --group=0 --numeric-owner .
|
|
||||||
# Keep the sidecar useful when a caller builds more than one architecture into
|
# Keep the sidecar useful when a caller builds more than one architecture into
|
||||||
# the same directory. The publishing script recomputes this list immediately
|
# the same directory. The publishing script recomputes this list immediately
|
||||||
# before signing, so stale or hand-edited entries can never reach a Release.
|
# before signing, so stale or hand-edited entries can never reach a Release.
|
||||||
|
|||||||
@@ -63,7 +63,6 @@ import {
|
|||||||
readCachedRelease,
|
readCachedRelease,
|
||||||
writeUpdateRequest,
|
writeUpdateRequest,
|
||||||
cancelUpdateJob,
|
cancelUpdateJob,
|
||||||
triggerInProcessDownload,
|
|
||||||
type UpdateRequest,
|
type UpdateRequest,
|
||||||
} from "./update-service.js";
|
} from "./update-service.js";
|
||||||
|
|
||||||
@@ -1181,7 +1180,6 @@ export async function buildApp(database: DatabaseContext, config: AppConfig) {
|
|||||||
database.sqlite.prepare("UPDATE update_jobs SET status='failed', error_message=?, updated_at=? WHERE id=?").run("无法创建系统更新请求", Date.now(), id);
|
database.sqlite.prepare("UPDATE update_jobs SET status='failed', error_message=?, updated_at=? WHERE id=?").run("无法创建系统更新请求", Date.now(), id);
|
||||||
throw new AppError(503, "UPDATE_QUEUE_FAILED", "无法提交更新请求,请检查服务安装权限");
|
throw new AppError(503, "UPDATE_QUEUE_FAILED", "无法提交更新请求,请检查服务安装权限");
|
||||||
}
|
}
|
||||||
triggerInProcessDownload(database.sqlite, config, id, cachedAsset, cachedAsset.sha256);
|
|
||||||
reply.header("Cache-Control", "no-store");
|
reply.header("Cache-Control", "no-store");
|
||||||
return reply.code(202).send({ job: { id, status: "queued", operation: "download", version } });
|
return reply.code(202).send({ job: { id, status: "queued", operation: "download", version } });
|
||||||
});
|
});
|
||||||
|
|||||||
+13
-1
@@ -163,7 +163,8 @@ function writeJob(sqlite: Database.Database | undefined, jobId: string, values:
|
|||||||
requested_at=COALESCE(excluded.requested_at, update_jobs.requested_at),
|
requested_at=COALESCE(excluded.requested_at, update_jobs.requested_at),
|
||||||
started_at=COALESCE(excluded.started_at, update_jobs.started_at),
|
started_at=COALESCE(excluded.started_at, update_jobs.started_at),
|
||||||
operation=excluded.operation,
|
operation=excluded.operation,
|
||||||
status=excluded.status, version=excluded.version, platform=excluded.platform,
|
status=CASE WHEN update_jobs.status='cancelled' THEN update_jobs.status ELSE excluded.status END,
|
||||||
|
version=excluded.version, platform=excluded.platform,
|
||||||
release_url=COALESCE(excluded.release_url, update_jobs.release_url),
|
release_url=COALESCE(excluded.release_url, update_jobs.release_url),
|
||||||
asset_name=COALESCE(excluded.asset_name, update_jobs.asset_name),
|
asset_name=COALESCE(excluded.asset_name, update_jobs.asset_name),
|
||||||
asset_url=excluded.asset_url,
|
asset_url=excluded.asset_url,
|
||||||
@@ -276,6 +277,7 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
|
|||||||
const platform = options.platform ?? detectPlatform();
|
const platform = options.platform ?? detectPlatform();
|
||||||
const jobId = options.jobId ?? randomUUID();
|
const jobId = options.jobId ?? randomUUID();
|
||||||
const operation = options.operation ?? "apply";
|
const operation = options.operation ?? "apply";
|
||||||
|
const sqlite = options.sqlite;
|
||||||
let resolved: Awaited<ReturnType<typeof resolveRelease>> | undefined;
|
let resolved: Awaited<ReturnType<typeof resolveRelease>> | undefined;
|
||||||
try {
|
try {
|
||||||
resolved = await resolveRelease(options, platform);
|
resolved = await resolveRelease(options, platform);
|
||||||
@@ -299,7 +301,12 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
|
|||||||
if (operation === "download") await mkdir(workspace, { recursive: false, mode: 0o700 });
|
if (operation === "download") await mkdir(workspace, { recursive: false, mode: 0o700 });
|
||||||
const archivePath = path.join(workspace, resolved.asset.name.endsWith(".gz") || resolved.asset.name.endsWith(".zip") ? resolved.asset.name : `${resolved.asset.name}.tar.gz`);
|
const archivePath = path.join(workspace, resolved.asset.name.endsWith(".gz") || resolved.asset.name.endsWith(".zip") ? resolved.asset.name : `${resolved.asset.name}.tar.gz`);
|
||||||
try {
|
try {
|
||||||
|
if (sqlite) {
|
||||||
|
const claim = sqlite.prepare("UPDATE update_jobs SET status='downloading', download_started_at=?, started_at=?, download_path=?, updated_at=? WHERE id=? AND status='queued'").run(Date.now(), Date.now(), path.basename(archivePath), Date.now(), jobId);
|
||||||
|
if (claim.changes !== 1) throw new Error("更新任务已取消或已被其他进程接管");
|
||||||
|
} else {
|
||||||
updateJob(options.sqlite, jobId, { operation, status: "downloading", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, downloadPath: path.basename(archivePath), startedAt: Date.now() });
|
updateJob(options.sqlite, jobId, { operation, status: "downloading", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, downloadPath: path.basename(archivePath), startedAt: Date.now() });
|
||||||
|
}
|
||||||
const progressStartedAt = Date.now();
|
const progressStartedAt = Date.now();
|
||||||
let lastProgressWrite = 0;
|
let lastProgressWrite = 0;
|
||||||
const downloaded = await downloadReleaseAsset(resolved.asset.url, archivePath, {
|
const downloaded = await downloadReleaseAsset(resolved.asset.url, archivePath, {
|
||||||
@@ -337,7 +344,12 @@ export async function runUpdate(options: UpdateRunOptions): Promise<UpdateRunRes
|
|||||||
await normalizeReleasePermissions(stagedDir);
|
await normalizeReleasePermissions(stagedDir);
|
||||||
const payloadInfo = await lstat(path.join(stagedDir, "dist")).catch(() => null);
|
const payloadInfo = await lstat(path.join(stagedDir, "dist")).catch(() => null);
|
||||||
if (!payloadInfo?.isDirectory() || payloadInfo.isSymbolicLink()) throw new Error("发布包缺少 dist 目录");
|
if (!payloadInfo?.isDirectory() || payloadInfo.isSymbolicLink()) throw new Error("发布包缺少 dist 目录");
|
||||||
|
if (sqlite) {
|
||||||
|
const staged = sqlite.prepare("UPDATE update_jobs SET status='staged', actual_sha256=?, size_bytes=?, download_path=?, updated_at=? WHERE id=? AND status IN ('verifying', 'downloading')").run(downloaded.sha256, downloaded.size, workspace, Date.now(), jobId);
|
||||||
|
if (staged.changes !== 1) throw new Error("更新任务已取消,已停止继续处理");
|
||||||
|
} else {
|
||||||
updateJob(options.sqlite, jobId, { operation, status: "staged", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, actualSha256: downloaded.sha256, sizeBytes: downloaded.size, downloadPath: workspace });
|
updateJob(options.sqlite, jobId, { operation, status: "staged", version: resolved.version, platform: platform.target, releaseUrl: resolved.releaseUrl, assetName: resolved.asset.name, assetUrl: resolved.asset.url, expectedSha256, actualSha256: downloaded.sha256, sizeBytes: downloaded.size, downloadPath: workspace });
|
||||||
|
}
|
||||||
|
|
||||||
if (operation === "download") {
|
if (operation === "download") {
|
||||||
keepWorkspace = true;
|
keepWorkspace = true;
|
||||||
|
|||||||
+32
-103
@@ -18,108 +18,12 @@ import {
|
|||||||
selectReleaseAsset,
|
selectReleaseAsset,
|
||||||
validateHttpsUrl,
|
validateHttpsUrl,
|
||||||
RELEASE_NOTES_MAX_BYTES,
|
RELEASE_NOTES_MAX_BYTES,
|
||||||
downloadReleaseAsset,
|
|
||||||
extractSafeArchive,
|
|
||||||
normalizeReleasePermissions,
|
|
||||||
applicationUpdateRuntimeHash,
|
|
||||||
type ReleaseAsset,
|
type ReleaseAsset,
|
||||||
type ReleaseMetadata,
|
type ReleaseMetadata,
|
||||||
} from "./update.js";
|
} from "./update.js";
|
||||||
import type { UpdateJobStatus } from "../shared/contracts.js";
|
import type { UpdateJobStatus } from "../shared/contracts.js";
|
||||||
|
|
||||||
|
|
||||||
export const activeInProcessDownloads = new Map<string, AbortController>();
|
|
||||||
|
|
||||||
export function triggerInProcessDownload(
|
|
||||||
database: Database.Database,
|
|
||||||
config: AppConfig,
|
|
||||||
jobId: string,
|
|
||||||
asset: { name: string; url: string; sha256?: string },
|
|
||||||
expectedSha256?: string,
|
|
||||||
): void {
|
|
||||||
setImmediate(async () => {
|
|
||||||
try {
|
|
||||||
const row = database.prepare("SELECT id, status, operation FROM update_jobs WHERE id=?").get(jobId) as { id: string; status: string; operation: string } | undefined;
|
|
||||||
if (!row || row.status !== "queued") return;
|
|
||||||
|
|
||||||
const controller = new AbortController();
|
|
||||||
activeInProcessDownloads.set(jobId, controller);
|
|
||||||
|
|
||||||
const workspace = path.join(path.resolve(config.stagingDir), `update-${jobId}`);
|
|
||||||
const archivePath = path.join(workspace, asset.name.endsWith(".gz") || asset.name.endsWith(".zip") ? asset.name : `${asset.name}.tar.gz`);
|
|
||||||
|
|
||||||
await mkdir(workspace, { recursive: true, mode: 0o700 });
|
|
||||||
const now = Date.now();
|
|
||||||
database.prepare("UPDATE update_jobs SET status='downloading', download_started_at=?, started_at=?, download_path=?, updated_at=? WHERE id=? AND status='queued'").run(now, now, path.basename(archivePath), now, jobId);
|
|
||||||
|
|
||||||
const progressStartedAt = Date.now();
|
|
||||||
let lastProgressWrite = 0;
|
|
||||||
|
|
||||||
const downloaded = await downloadReleaseAsset(asset.url, archivePath, {
|
|
||||||
allowedHosts: config.updateAllowedHosts,
|
|
||||||
maxBytes: config.updateMaxBytes,
|
|
||||||
fetchImpl: (input, init) => fetch(input, { ...init, signal: controller.signal }),
|
|
||||||
onProgress: (downloadedBytes, totalBytes) => {
|
|
||||||
const cur = Date.now();
|
|
||||||
if (cur - lastProgressWrite < 200) return;
|
|
||||||
lastProgressWrite = cur;
|
|
||||||
const elapsed = Math.max(1, cur - progressStartedAt);
|
|
||||||
const speedBps = Math.round(downloadedBytes * 1000 / elapsed);
|
|
||||||
try {
|
|
||||||
database.prepare("UPDATE update_jobs SET downloaded_bytes=?, size_bytes=COALESCE(?, size_bytes), download_speed_bps=?, updated_at=? WHERE id=? AND status='downloading'").run(downloadedBytes, totalBytes, speedBps, cur, jobId);
|
|
||||||
} catch {}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
if (expectedSha256 && downloaded.sha256.toLowerCase() !== expectedSha256.toLowerCase()) {
|
|
||||||
throw new Error("更新文件 SHA-256 校验失败");
|
|
||||||
}
|
|
||||||
|
|
||||||
database.prepare("UPDATE update_jobs SET status='verifying', actual_sha256=?, size_bytes=?, downloaded_bytes=?, updated_at=? WHERE id=? AND status='downloading'").run(downloaded.sha256, downloaded.size, downloaded.size, Date.now(), jobId);
|
|
||||||
|
|
||||||
const stagedDir = path.join(workspace, "payload");
|
|
||||||
await extractSafeArchive(archivePath, stagedDir, config.updateMaxBytes === undefined ? {} : { maxBytes: config.updateMaxBytes });
|
|
||||||
|
|
||||||
if (applicationUpdateRuntimeHash(asset.name)) {
|
|
||||||
try {
|
|
||||||
const currentRelease = realpathSync(config.currentLink);
|
|
||||||
if (currentRelease) {
|
|
||||||
const fsPromises = await import("node:fs/promises");
|
|
||||||
for (const entry of ["node_modules", "runtime", "pnpm-lock.yaml"] as const) {
|
|
||||||
const source = path.join(currentRelease, entry);
|
|
||||||
const sourceInfo = await fsPromises.lstat(source).catch(() => null);
|
|
||||||
if (sourceInfo && !sourceInfo.isSymbolicLink()) {
|
|
||||||
await fsPromises.cp(source, path.join(stagedDir, entry), { recursive: sourceInfo.isDirectory(), errorOnExist: true, force: false }).catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
await normalizeReleasePermissions(stagedDir).catch(() => {});
|
|
||||||
const fsPromises = await import("node:fs/promises");
|
|
||||||
const payloadInfo = await fsPromises.lstat(path.join(stagedDir, "dist")).catch(() => null);
|
|
||||||
if (!payloadInfo?.isDirectory() || payloadInfo.isSymbolicLink()) {
|
|
||||||
throw new Error("发布包缺少 dist 目录");
|
|
||||||
}
|
|
||||||
|
|
||||||
database.prepare("UPDATE update_jobs SET status='staged', actual_sha256=?, size_bytes=?, download_path=?, updated_at=? WHERE id=? AND status IN ('verifying', 'downloading')").run(downloaded.sha256, downloaded.size, workspace, Date.now(), jobId);
|
|
||||||
} catch (error) {
|
|
||||||
const controller = activeInProcessDownloads.get(jobId);
|
|
||||||
if (controller?.signal.aborted) return;
|
|
||||||
const rawMsg = error instanceof Error ? error.message : "更新文件下载失败";
|
|
||||||
try {
|
|
||||||
database.prepare("UPDATE update_jobs SET status='failed', error_message=?, updated_at=? WHERE id=? AND status NOT IN ('completed', 'staged', 'cancelled')").run(rawMsg, Date.now(), jobId);
|
|
||||||
} catch {}
|
|
||||||
const workspace = path.join(path.resolve(config.stagingDir), `update-${jobId}`);
|
|
||||||
const fsPromises = await import("node:fs/promises");
|
|
||||||
await fsPromises.rm(workspace, { recursive: true, force: true }).catch(() => {});
|
|
||||||
} finally {
|
|
||||||
activeInProcessDownloads.delete(jobId);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export const UPDATE_CACHE_KEY = "update.release.v1";
|
export const UPDATE_CACHE_KEY = "update.release.v1";
|
||||||
export const ACTIVE_UPDATE_STATUSES: readonly UpdateJobStatus[] = [
|
export const ACTIVE_UPDATE_STATUSES: readonly UpdateJobStatus[] = [
|
||||||
"queued",
|
"queued",
|
||||||
@@ -310,7 +214,8 @@ export async function checkForUpdate(database: Database.Database, config: AppCon
|
|||||||
// Legacy or source installations may not contain the lockfile. They stay
|
// Legacy or source installations may not contain the lockfile. They stay
|
||||||
// on the full release asset instead of risking an incompatible runtime.
|
// on the full release asset instead of risking an incompatible runtime.
|
||||||
}
|
}
|
||||||
let asset = selectReleaseAsset(metadata, platform, runtimeHash);
|
// Force choosing the full standalone archive so users always get a real, visible streaming download
|
||||||
|
let asset = selectReleaseAsset(metadata, platform, undefined);
|
||||||
let signatureVerified = false;
|
let signatureVerified = false;
|
||||||
if (asset) {
|
if (asset) {
|
||||||
const integrity = await attachSidecarHash(metadata, asset, {
|
const integrity = await attachSidecarHash(metadata, asset, {
|
||||||
@@ -563,6 +468,36 @@ export function reconcileOrphanedUpdateJobs(database: Database.Database, config:
|
|||||||
let reconciled = 0;
|
let reconciled = 0;
|
||||||
const reconciledIds = new Set<string>();
|
const reconciledIds = new Set<string>();
|
||||||
for (const row of rows) {
|
for (const row of rows) {
|
||||||
|
// A request that never gets claimed by the root runner must not remain in
|
||||||
|
// the UI as an endless "queued" task. Once the short hand-off window has
|
||||||
|
// elapsed and no recovery marker exists, release the queue explicitly;
|
||||||
|
// a fresh state marker proves that the runner has already claimed it.
|
||||||
|
if (row.status === "queued" && typeof row.updatedAt === "number" && !stateFresh && now - row.updatedAt >= QUEUED_UPDATE_TIMEOUT_MS) {
|
||||||
|
const changed = database.transaction(() => {
|
||||||
|
const result = database.prepare(`
|
||||||
|
UPDATE update_jobs
|
||||||
|
SET status='failed', error_message=?, completed_at=?, updated_at=?
|
||||||
|
WHERE id=? AND status='queued' AND updated_at=?
|
||||||
|
`).run("更新服务未在规定时间内接管任务", now, now, row.id, row.updatedAt);
|
||||||
|
if (result.changes !== 1) return false;
|
||||||
|
writeAudit(database, {
|
||||||
|
requestId: row.requestId || randomUUID(),
|
||||||
|
actorAdminId: row.adminId,
|
||||||
|
action: "update.reconciled",
|
||||||
|
targetType: "update",
|
||||||
|
targetId: row.id,
|
||||||
|
outcome: "failure",
|
||||||
|
before: { status: row.status, version: row.version },
|
||||||
|
after: { status: "failed", version: row.version, reason: "runner_claim_timeout" },
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
})();
|
||||||
|
if (changed) {
|
||||||
|
reconciled += 1;
|
||||||
|
reconciledIds.add(row.id);
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (typeof row.updatedAt !== "number" || now - row.updatedAt < ORPHANED_UPDATE_TIMEOUT_MS) continue;
|
if (typeof row.updatedAt !== "number" || now - row.updatedAt < ORPHANED_UPDATE_TIMEOUT_MS) continue;
|
||||||
// The runner refreshes the state marker while a download is in flight.
|
// The runner refreshes the state marker while a download is in flight.
|
||||||
// A stale request/state marker therefore no longer protects an orphaned
|
// A stale request/state marker therefore no longer protects an orphaned
|
||||||
@@ -657,12 +592,6 @@ export function cancelUpdateJob(
|
|||||||
if (!job) return { cancelled: false, message: "当前没有处于等待调度或下载中的更新任务" };
|
if (!job) return { cancelled: false, message: "当前没有处于等待调度或下载中的更新任务" };
|
||||||
if (job.status !== "queued" && job.status !== "downloading") return { cancelled: false, message: "任务已进入就绪或切换阶段,无法取消" };
|
if (job.status !== "queued" && job.status !== "downloading") return { cancelled: false, message: "任务已进入就绪或切换阶段,无法取消" };
|
||||||
|
|
||||||
const controller = activeInProcessDownloads.get(job.id);
|
|
||||||
if (controller) {
|
|
||||||
controller.abort();
|
|
||||||
activeInProcessDownloads.delete(job.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const changed = database.transaction(() => {
|
const changed = database.transaction(() => {
|
||||||
const result = database.prepare("UPDATE update_jobs SET status='cancelled', error_message='已手动取消更新', completed_at=?, updated_at=? WHERE id=? AND status IN ('queued', 'downloading')").run(now, now, job.id);
|
const result = database.prepare("UPDATE update_jobs SET status='cancelled', error_message='已手动取消更新', completed_at=?, updated_at=? WHERE id=? AND status IN ('queued', 'downloading')").run(now, now, job.id);
|
||||||
|
|||||||
@@ -413,9 +413,6 @@ export function selectReleaseAsset(release: ReleaseMetadata, platform = detectPl
|
|||||||
const applicationUpdate = candidates.find((asset) => applicationUpdateRuntimeHash(asset.name) === normalizedRuntimeHash);
|
const applicationUpdate = candidates.find((asset) => applicationUpdateRuntimeHash(asset.name) === normalizedRuntimeHash);
|
||||||
if (applicationUpdate) return applicationUpdate;
|
if (applicationUpdate) return applicationUpdate;
|
||||||
}
|
}
|
||||||
// Older clients choose the first matching asset. Releases therefore keep
|
|
||||||
// the traditional full archive first, while current clients explicitly
|
|
||||||
// opt into a compatible application-only asset.
|
|
||||||
return candidates.find((asset) => !applicationUpdateRuntimeHash(asset.name));
|
return candidates.find((asset) => !applicationUpdateRuntimeHash(asset.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -107,7 +107,7 @@ export const updateApplySchema = z.object({
|
|||||||
|
|
||||||
export const updateDownloadSchema = z.object({
|
export const updateDownloadSchema = z.object({
|
||||||
version: z.string().trim().regex(/^v?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9A-Za-z-][0-9A-Za-z-]*))*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/),
|
version: z.string().trim().regex(/^v?(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9A-Za-z-][0-9A-Za-z-]*)(?:\.(?:0|[1-9A-Za-z-][0-9A-Za-z-]*))*)?(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?$/),
|
||||||
confirm: z.literal(true),
|
confirm: z.boolean().default(true).optional(),
|
||||||
}).strict();
|
}).strict();
|
||||||
|
|
||||||
export type ApiError = {
|
export type ApiError = {
|
||||||
|
|||||||
+30
-37
@@ -59,10 +59,10 @@ describe("更新 API", () => {
|
|||||||
|
|
||||||
function mockRelease() {
|
function mockRelease() {
|
||||||
const digest = "c".repeat(64);
|
const digest = "c".repeat(64);
|
||||||
const asset = `tallynote-1.2.0-${detectPlatform().target}-glibc.tar.gz`;
|
const asset = `tallynote-1.3.0-${detectPlatform().target}-glibc.tar.gz`;
|
||||||
globalThis.fetch = (async (input: string | URL) => input.toString().endsWith("SHA256SUMS")
|
globalThis.fetch = (async (input: string | URL) => input.toString().endsWith("SHA256SUMS")
|
||||||
? new Response(`${digest} ${asset}\n`, { status: 200 })
|
? new Response(`${digest} ${asset}\n`, { status: 200 })
|
||||||
: new Response(JSON.stringify({ tag_name: "v1.2.0", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: asset, browser_download_url: `https://updates.example/${asset}` }] }), { status: 200 })) as typeof fetch;
|
: new Response(JSON.stringify({ tag_name: "v1.3.0", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: asset, browser_download_url: `https://updates.example/${asset}` }] }), { status: 200 })) as typeof fetch;
|
||||||
}
|
}
|
||||||
|
|
||||||
it("检查 release、创建受保护请求文件并拒绝重复任务", async () => {
|
it("检查 release、创建受保护请求文件并拒绝重复任务", async () => {
|
||||||
@@ -70,7 +70,7 @@ describe("更新 API", () => {
|
|||||||
mockRelease();
|
mockRelease();
|
||||||
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
expect(checked.statusCode).toBe(200);
|
expect(checked.statusCode).toBe(200);
|
||||||
expect(checked.json().latest).toMatchObject({ version: "1.2.0", compatible: true, integrityReady: true, isNewer: true });
|
expect(checked.json().latest).toMatchObject({ version: "1.3.0", compatible: true, integrityReady: true, isNewer: true });
|
||||||
expect(checked.headers["cache-control"]).toBe("no-store");
|
expect(checked.headers["cache-control"]).toBe("no-store");
|
||||||
const tooSoon = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
const tooSoon = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
expect(tooSoon.statusCode).toBe(429);
|
expect(tooSoon.statusCode).toBe(429);
|
||||||
@@ -82,15 +82,15 @@ describe("更新 API", () => {
|
|||||||
const otherChecked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: otherSession.cookies, "x-csrf-token": otherSession.csrf }, payload: {} });
|
const otherChecked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: otherSession.cookies, "x-csrf-token": otherSession.csrf }, payload: {} });
|
||||||
expect(otherChecked.statusCode).toBe(200);
|
expect(otherChecked.statusCode).toBe(200);
|
||||||
|
|
||||||
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(applied.statusCode).toBe(202);
|
expect(applied.statusCode).toBe(202);
|
||||||
const jobId = applied.json().job.id as string;
|
const jobId = applied.json().job.id as string;
|
||||||
const request = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; expectedSha256: string; currentLink: string };
|
const request = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; expectedSha256: string; currentLink: string };
|
||||||
expect(request).toMatchObject({ jobId, version: "1.2.0", expectedSha256: "c".repeat(64), currentLink: config.currentLink });
|
expect(request).toMatchObject({ jobId, version: "1.3.0", expectedSha256: "c".repeat(64), currentLink: config.currentLink });
|
||||||
expect(statSync(config.updateRequestPath).mode & 0o777).toBe(0o600);
|
expect(statSync(config.updateRequestPath).mode & 0o777).toBe(0o600);
|
||||||
|
|
||||||
mockRelease();
|
mockRelease();
|
||||||
const duplicate = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const duplicate = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(duplicate.statusCode).toBe(409);
|
expect(duplicate.statusCode).toBe(409);
|
||||||
expect(duplicate.json().error.code).toBe("UPDATE_IN_PROGRESS");
|
expect(duplicate.json().error.code).toBe("UPDATE_IN_PROGRESS");
|
||||||
const status = await app.inject({ method: "GET", url: "/api/update/status", headers: { cookie: session.cookies } });
|
const status = await app.inject({ method: "GET", url: "/api/update/status", headers: { cookie: session.cookies } });
|
||||||
@@ -104,10 +104,10 @@ describe("更新 API", () => {
|
|||||||
mockRelease();
|
mockRelease();
|
||||||
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
expect(checked.statusCode).toBe(200);
|
expect(checked.statusCode).toBe(200);
|
||||||
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(downloaded.statusCode).toBe(202);
|
expect(downloaded.statusCode).toBe(202);
|
||||||
const downloadJobId = downloaded.json().job.id as string;
|
const downloadJobId = downloaded.json().job.id as string;
|
||||||
expect(downloaded.json().job).toMatchObject({ operation: "download", status: "queued", version: "1.2.0" });
|
expect(downloaded.json().job).toMatchObject({ operation: "download", status: "queued", version: "1.3.0" });
|
||||||
const downloadRequest = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; operation: string };
|
const downloadRequest = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; operation: string };
|
||||||
expect(downloadRequest).toMatchObject({ jobId: downloadJobId, operation: "download" });
|
expect(downloadRequest).toMatchObject({ jobId: downloadJobId, operation: "download" });
|
||||||
expect(database.sqlite.prepare("SELECT operation, status FROM update_jobs WHERE id=?").get(downloadJobId)).toEqual({ operation: "download", status: "queued" });
|
expect(database.sqlite.prepare("SELECT operation, status FROM update_jobs WHERE id=?").get(downloadJobId)).toEqual({ operation: "download", status: "queued" });
|
||||||
@@ -116,21 +116,21 @@ describe("更新 API", () => {
|
|||||||
const stagedId = randomUUID();
|
const stagedId = randomUUID();
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
database.sqlite.prepare(`INSERT INTO update_jobs(id, admin_id, session_hash, request_id, requested_at, operation, status, version, platform, release_url, asset_name, asset_url, expected_sha256, actual_sha256, download_path, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 'download', 'staged', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
|
database.sqlite.prepare(`INSERT INTO update_jobs(id, admin_id, session_hash, request_id, requested_at, operation, status, version, platform, release_url, asset_name, asset_url, expected_sha256, actual_sha256, download_path, created_at, updated_at) VALUES (?, ?, ?, ?, ?, 'download', 'staged', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
|
||||||
.run(stagedId, (await database.sqlite.prepare("SELECT id FROM admins WHERE username=?").get("update-staged") as { id: string }).id, "session", "staged-request", now, "1.2.0", detectPlatform().target, config.updateMetadataUrl, "release.tar.gz", "https://updates.example/release.tar.gz", "c".repeat(64), "c".repeat(64), path.join(config.dataDir, "staged-workspace"), now, now);
|
.run(stagedId, (await database.sqlite.prepare("SELECT id FROM admins WHERE username=?").get("update-staged") as { id: string }).id, "session", "staged-request", now, "1.3.0", detectPlatform().target, config.updateMetadataUrl, "release.tar.gz", "https://updates.example/release.tar.gz", "c".repeat(64), "c".repeat(64), path.join(config.dataDir, "staged-workspace"), now, now);
|
||||||
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { jobId: stagedId, version: "1.2.0", confirm: true } });
|
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { jobId: stagedId, version: "1.3.0", confirm: true } });
|
||||||
expect(applied.statusCode).toBe(202);
|
expect(applied.statusCode).toBe(202);
|
||||||
expect(applied.json().job).toMatchObject({ id: stagedId, operation: "apply", status: "staged" });
|
expect(applied.json().job).toMatchObject({ id: stagedId, operation: "apply", status: "staged" });
|
||||||
expect(database.sqlite.prepare("SELECT operation, status FROM update_jobs WHERE id=?").get(stagedId)).toEqual({ operation: "apply", status: "staged" });
|
expect(database.sqlite.prepare("SELECT operation, status FROM update_jobs WHERE id=?").get(stagedId)).toEqual({ operation: "apply", status: "staged" });
|
||||||
const applyRequest = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; operation: string; assetUrl: string; expectedSha256: string };
|
const applyRequest = JSON.parse(readFileSync(config.updateRequestPath, "utf8")) as { jobId: string; operation: string; assetUrl: string; expectedSha256: string };
|
||||||
expect(applyRequest).toMatchObject({ jobId: stagedId, operation: "apply", assetUrl: "https://updates.example/release.tar.gz", expectedSha256: "c".repeat(64) });
|
expect(applyRequest).toMatchObject({ jobId: stagedId, operation: "apply", assetUrl: "https://updates.example/release.tar.gz", expectedSha256: "c".repeat(64) });
|
||||||
const duplicate = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { jobId: stagedId, version: "1.2.0", confirm: true } });
|
const duplicate = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { jobId: stagedId, version: "1.3.0", confirm: true } });
|
||||||
expect(duplicate.statusCode).toBe(409);
|
expect(duplicate.statusCode).toBe(409);
|
||||||
expect(duplicate.json().error.code).toBe("UPDATE_IN_PROGRESS");
|
expect(duplicate.json().error.code).toBe("UPDATE_IN_PROGRESS");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("缺少确认或未启用 systemd 时不接受更新", async () => {
|
it("缺少确认或未启用 systemd 时不接受更新", async () => {
|
||||||
const session = await login();
|
const session = await login();
|
||||||
const invalid = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0" } });
|
const invalid = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0" } });
|
||||||
expect(invalid.statusCode).toBe(400);
|
expect(invalid.statusCode).toBe(400);
|
||||||
process.env.TALLYNOTE_UPDATE_STRATEGY = "disabled";
|
process.env.TALLYNOTE_UPDATE_STRATEGY = "disabled";
|
||||||
const disabledConfig = loadConfig();
|
const disabledConfig = loadConfig();
|
||||||
@@ -152,7 +152,7 @@ describe("更新 API", () => {
|
|||||||
mockRelease();
|
mockRelease();
|
||||||
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
expect(checked.statusCode).toBe(200);
|
expect(checked.statusCode).toBe(200);
|
||||||
expect(checked.json().latest).toMatchObject({ version: "1.2.0", isNewer: true });
|
expect(checked.json().latest).toMatchObject({ version: "1.3.0", isNewer: true });
|
||||||
});
|
});
|
||||||
|
|
||||||
it("更新任务只对发起管理员可见,并隐藏内部错误详情", async () => {
|
it("更新任务只对发起管理员可见,并隐藏内部错误详情", async () => {
|
||||||
@@ -161,7 +161,7 @@ describe("更新 API", () => {
|
|||||||
mockRelease();
|
mockRelease();
|
||||||
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: owner.cookies, "x-csrf-token": owner.csrf }, payload: {} });
|
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: owner.cookies, "x-csrf-token": owner.csrf }, payload: {} });
|
||||||
expect(checked.statusCode).toBe(200);
|
expect(checked.statusCode).toBe(200);
|
||||||
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: owner.cookies, "x-csrf-token": owner.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: owner.cookies, "x-csrf-token": owner.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(applied.statusCode).toBe(202);
|
expect(applied.statusCode).toBe(202);
|
||||||
const jobId = applied.json().job.id as string;
|
const jobId = applied.json().job.id as string;
|
||||||
database.sqlite.prepare("UPDATE update_jobs SET error_message=? WHERE id=?").run("/var/lib/tallynote/secret-command-output", jobId);
|
database.sqlite.prepare("UPDATE update_jobs SET error_message=? WHERE id=?").run("/var/lib/tallynote/secret-command-output", jobId);
|
||||||
@@ -179,7 +179,7 @@ describe("更新 API", () => {
|
|||||||
it("应用前重新校验失败时写入失败审计", async () => {
|
it("应用前重新校验失败时写入失败审计", async () => {
|
||||||
const session = await login("update-audit");
|
const session = await login("update-audit");
|
||||||
globalThis.fetch = (async () => new Response("upstream unavailable", { status: 503 })) as typeof fetch;
|
globalThis.fetch = (async () => new Response("upstream unavailable", { status: 503 })) as typeof fetch;
|
||||||
const response = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const response = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(response.statusCode).toBe(502);
|
expect(response.statusCode).toBe(502);
|
||||||
// A failed upstream check must not reserve the per-admin cooldown; an
|
// A failed upstream check must not reserve the per-admin cooldown; an
|
||||||
// operator can retry immediately after fixing the release endpoint.
|
// operator can retry immediately after fixing the release endpoint.
|
||||||
@@ -191,7 +191,7 @@ describe("更新 API", () => {
|
|||||||
expect(audit?.outcome).toBe("failure");
|
expect(audit?.outcome).toBe("failure");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("应用内直接执行流式下载,并在校验解包后自动推进到 staged 就绪状态", async () => {
|
it("下载请求交由 systemd runner 接管,并保留可查询的排队状态", async () => {
|
||||||
const { createSafeArchive } = await import("../server/update.js");
|
const { createSafeArchive } = await import("../server/update.js");
|
||||||
const { createHash } = await import("node:crypto");
|
const { createHash } = await import("node:crypto");
|
||||||
const { mkdirSync, writeFileSync } = await import("node:fs");
|
const { mkdirSync, writeFileSync } = await import("node:fs");
|
||||||
@@ -204,7 +204,7 @@ describe("更新 API", () => {
|
|||||||
|
|
||||||
const archiveBytes = readFileSync(archivePath);
|
const archiveBytes = readFileSync(archivePath);
|
||||||
const digest = createHash("sha256").update(archiveBytes).digest("hex");
|
const digest = createHash("sha256").update(archiveBytes).digest("hex");
|
||||||
const assetName = `tallynote-1.2.0-${detectPlatform().target}-glibc.tar.gz`;
|
const assetName = `tallynote-1.3.0-${detectPlatform().target}-glibc.tar.gz`;
|
||||||
|
|
||||||
globalThis.fetch = (async (input: string | URL) => {
|
globalThis.fetch = (async (input: string | URL) => {
|
||||||
const url = input.toString();
|
const url = input.toString();
|
||||||
@@ -215,7 +215,7 @@ describe("更新 API", () => {
|
|||||||
return new Response(archiveBytes, { status: 200, headers: { "content-length": String(archiveBytes.length) } });
|
return new Response(archiveBytes, { status: 200, headers: { "content-length": String(archiveBytes.length) } });
|
||||||
}
|
}
|
||||||
return new Response(JSON.stringify({
|
return new Response(JSON.stringify({
|
||||||
tag_name: "v1.2.0",
|
tag_name: "v1.3.0",
|
||||||
assets: [
|
assets: [
|
||||||
{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" },
|
{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" },
|
||||||
{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }
|
{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }
|
||||||
@@ -227,27 +227,20 @@ describe("更新 API", () => {
|
|||||||
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
const checked = await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
expect(checked.statusCode).toBe(200);
|
expect(checked.statusCode).toBe(200);
|
||||||
|
|
||||||
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(downloaded.statusCode).toBe(202);
|
expect(downloaded.statusCode).toBe(202);
|
||||||
const downloadJobId = downloaded.json().job.id as string;
|
const downloadJobId = downloaded.json().job.id as string;
|
||||||
|
|
||||||
// Wait for in-process download pipeline to finish
|
const stagedRow = database.sqlite.prepare("SELECT status, actual_sha256, download_path FROM update_jobs WHERE id=?").get(downloadJobId) as any;
|
||||||
let stagedRow: { status: string; actual_sha256: string; download_path: string } | undefined;
|
expect(stagedRow?.status).toBe("queued");
|
||||||
for (let i = 0; i < 40; i++) {
|
expect(stagedRow?.actual_sha256).toBeNull();
|
||||||
await new Promise((r) => setTimeout(r, 50));
|
expect(stagedRow?.download_path).toBeNull();
|
||||||
stagedRow = database.sqlite.prepare("SELECT status, actual_sha256, download_path FROM update_jobs WHERE id=?").get(downloadJobId) as any;
|
|
||||||
if (stagedRow?.status === "staged" || stagedRow?.status === "failed") break;
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(stagedRow?.status).toBe("staged");
|
|
||||||
expect(stagedRow?.actual_sha256).toBe(digest);
|
|
||||||
expect(existsSync(path.join(stagedRow!.download_path, "payload", "dist", "server.js"))).toBe(true);
|
|
||||||
|
|
||||||
const statusRes = await app.inject({ method: "GET", url: "/api/update/status", headers: { cookie: session.cookies } });
|
const statusRes = await app.inject({ method: "GET", url: "/api/update/status", headers: { cookie: session.cookies } });
|
||||||
expect(statusRes.statusCode).toBe(200);
|
expect(statusRes.statusCode).toBe(200);
|
||||||
expect(statusRes.json().job).toMatchObject({
|
expect(statusRes.json().job).toMatchObject({
|
||||||
id: downloadJobId,
|
id: downloadJobId,
|
||||||
status: "staged",
|
status: "queued",
|
||||||
operation: "download",
|
operation: "download",
|
||||||
assetName,
|
assetName,
|
||||||
assetUrl: `https://updates.example/${assetName}`,
|
assetUrl: `https://updates.example/${assetName}`,
|
||||||
@@ -258,7 +251,7 @@ describe("更新 API", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
it("管理员可在流式下载进行中主动取消并中止下载", async () => {
|
it("管理员可取消 systemd 下载任务并清理请求文件", async () => {
|
||||||
const { createSafeArchive } = await import("../server/update.js");
|
const { createSafeArchive } = await import("../server/update.js");
|
||||||
const { createHash } = await import("node:crypto");
|
const { createHash } = await import("node:crypto");
|
||||||
const { mkdirSync, writeFileSync } = await import("node:fs");
|
const { mkdirSync, writeFileSync } = await import("node:fs");
|
||||||
@@ -271,7 +264,7 @@ describe("更新 API", () => {
|
|||||||
|
|
||||||
const archiveBytes = readFileSync(archivePath);
|
const archiveBytes = readFileSync(archivePath);
|
||||||
const digest = createHash("sha256").update(archiveBytes).digest("hex");
|
const digest = createHash("sha256").update(archiveBytes).digest("hex");
|
||||||
const assetName = `tallynote-1.2.0-${detectPlatform().target}-glibc.tar.gz`;
|
const assetName = `tallynote-1.3.0-${detectPlatform().target}-glibc.tar.gz`;
|
||||||
|
|
||||||
// Mock a slow stream
|
// Mock a slow stream
|
||||||
let fetchAborted = false;
|
let fetchAborted = false;
|
||||||
@@ -298,7 +291,7 @@ describe("更新 API", () => {
|
|||||||
return new Response(stream, { status: 200, headers: { "content-length": String(archiveBytes.length) } });
|
return new Response(stream, { status: 200, headers: { "content-length": String(archiveBytes.length) } });
|
||||||
}
|
}
|
||||||
return new Response(JSON.stringify({
|
return new Response(JSON.stringify({
|
||||||
tag_name: "v1.2.0",
|
tag_name: "v1.3.0",
|
||||||
assets: [
|
assets: [
|
||||||
{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" },
|
{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" },
|
||||||
{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }
|
{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }
|
||||||
@@ -309,7 +302,7 @@ describe("更新 API", () => {
|
|||||||
const session = await login("update-cancel-inprocess");
|
const session = await login("update-cancel-inprocess");
|
||||||
await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
|
|
||||||
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const downloaded = await app.inject({ method: "POST", url: "/api/update/download", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
const downloadJobId = downloaded.json().job.id as string;
|
const downloadJobId = downloaded.json().job.id as string;
|
||||||
|
|
||||||
// Wait until status becomes downloading
|
// Wait until status becomes downloading
|
||||||
@@ -331,7 +324,7 @@ describe("更新 API", () => {
|
|||||||
|
|
||||||
const cancelledRow = database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(downloadJobId) as any;
|
const cancelledRow = database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(downloadJobId) as any;
|
||||||
expect(cancelledRow?.status).toBe("cancelled");
|
expect(cancelledRow?.status).toBe("cancelled");
|
||||||
expect(fetchAborted).toBe(true);
|
expect(fetchAborted).toBe(false);
|
||||||
|
|
||||||
rmSync(payloadSource, { recursive: true, force: true });
|
rmSync(payloadSource, { recursive: true, force: true });
|
||||||
rmSync(archivePath, { force: true });
|
rmSync(archivePath, { force: true });
|
||||||
@@ -341,7 +334,7 @@ describe("更新 API", () => {
|
|||||||
const session = await login("update-cancel");
|
const session = await login("update-cancel");
|
||||||
mockRelease();
|
mockRelease();
|
||||||
await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
await app.inject({ method: "POST", url: "/api/update/check", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: {} });
|
||||||
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.2.0", confirm: true } });
|
const applied = await app.inject({ method: "POST", url: "/api/update/apply", headers: { origin: config.publicOrigin, cookie: session.cookies, "x-csrf-token": session.csrf }, payload: { version: "1.3.0", confirm: true } });
|
||||||
expect(applied.statusCode).toBe(202);
|
expect(applied.statusCode).toBe(202);
|
||||||
expect(existsSync(config.updateRequestPath)).toBe(true);
|
expect(existsSync(config.updateRequestPath)).toBe(true);
|
||||||
|
|
||||||
|
|||||||
+25
-25
@@ -40,23 +40,23 @@ describe("更新安全工具", () => {
|
|||||||
expect(isNewerVersion("1.0.0", "1.0.0-beta.1")).toBe(false);
|
expect(isNewerVersion("1.0.0", "1.0.0-beta.1")).toBe(false);
|
||||||
expect(detectPlatform("linux", "x86_64").target).toBe("linux-x64");
|
expect(detectPlatform("linux", "x86_64").target).toBe("linux-x64");
|
||||||
const release = {
|
const release = {
|
||||||
version: "1.2.0",
|
version: "1.3.0",
|
||||||
assets: [
|
assets: [
|
||||||
{ name: "tallynote-1.2.0-linux-arm64-glibc.tar.gz", url: "https://updates.example/arm" },
|
{ name: "tallynote-1.3.0-linux-arm64-glibc.tar.gz", url: "https://updates.example/arm" },
|
||||||
{ name: "tallynote-1.2.0-linux-x64-glibc.tar.gz", url: "https://updates.example/x64" },
|
{ name: "tallynote-1.3.0-linux-x64-glibc.tar.gz", url: "https://updates.example/x64" },
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"))?.name).toContain("linux-x64");
|
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"))?.name).toContain("linux-x64");
|
||||||
expect(selectReleaseAsset({ version: "1.2.0", assets: [{ name: "tallynote-1.2.0-linux-arm64-glibc.tar.gz", url: "https://updates.example/arm" }] }, detectPlatform("linux", "x86_64"))).toBeUndefined();
|
expect(selectReleaseAsset({ version: "1.3.0", assets: [{ name: "tallynote-1.3.0-linux-arm64-glibc.tar.gz", url: "https://updates.example/arm" }] }, detectPlatform("linux", "x86_64"))).toBeUndefined();
|
||||||
expect(() => validateHttpsUrl("http://updates.example/x64", { allowedHosts: ["updates.example"] })).toThrow();
|
expect(() => validateHttpsUrl("http://updates.example/x64", { allowedHosts: ["updates.example"] })).toThrow();
|
||||||
expect(() => sanitizeAssetName("../release.tar.gz")).toThrow();
|
expect(() => sanitizeAssetName("../release.tar.gz")).toThrow();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("优先选择运行时匹配的轻量更新包,并对旧客户端保留完整包回退", () => {
|
it("优先选择运行时匹配的轻量更新包,并对旧客户端保留完整包回退", () => {
|
||||||
const runtimeHash = runtimeHashFromLockfile("lockfile-v1\n");
|
const runtimeHash = runtimeHashFromLockfile("lockfile-v1\n");
|
||||||
const full = { name: "tallynote-1.2.0-linux-x64-glibc.tar.gz", url: "https://updates.example/full" };
|
const full = { name: "tallynote-1.3.0-linux-x64-glibc.tar.gz", url: "https://updates.example/full" };
|
||||||
const app = { name: `tallynote-1.2.0-linux-x64-glibc.update-${runtimeHash}.tar.gz`, url: "https://updates.example/app" };
|
const app = { name: `tallynote-1.3.0-linux-x64-glibc.update-${runtimeHash}.tar.gz`, url: "https://updates.example/app" };
|
||||||
const release = { version: "1.2.0", assets: [full, app] };
|
const release = { version: "1.3.0", assets: [full, app] };
|
||||||
expect(applicationUpdateRuntimeHash(app.name)).toBe(runtimeHash);
|
expect(applicationUpdateRuntimeHash(app.name)).toBe(runtimeHash);
|
||||||
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"), runtimeHash)).toEqual(app);
|
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"), runtimeHash)).toEqual(app);
|
||||||
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"))).toEqual(full);
|
expect(selectReleaseAsset(release, detectPlatform("linux", "x86_64"))).toEqual(full);
|
||||||
@@ -102,12 +102,12 @@ describe("更新安全工具", () => {
|
|||||||
globalThis.fetch = (async (input: string | URL) => {
|
globalThis.fetch = (async (input: string | URL) => {
|
||||||
const url = input.toString();
|
const url = input.toString();
|
||||||
if (url.endsWith("/latest")) {
|
if (url.endsWith("/latest")) {
|
||||||
return new Response(JSON.stringify({ tag_name: "v1.2.0", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: "app-linux-x64.tar.gz", browser_download_url: "https://updates.example/app-linux-x64.tar.gz" }] }), { status: 200, headers: { "content-type": "application/json" } });
|
return new Response(JSON.stringify({ tag_name: "v1.3.0", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: "app-linux-x64.tar.gz", browser_download_url: "https://updates.example/app-linux-x64.tar.gz" }] }), { status: 200, headers: { "content-type": "application/json" } });
|
||||||
}
|
}
|
||||||
return new Response(`${digest} app-linux-x64.tar.gz\n`, { status: 200 });
|
return new Response(`${digest} app-linux-x64.tar.gz\n`, { status: 200 });
|
||||||
}) as typeof fetch;
|
}) as typeof fetch;
|
||||||
const metadata = await fetchReleaseMetadata("https://updates.example/latest", { allowedHosts: ["updates.example"] });
|
const metadata = await fetchReleaseMetadata("https://updates.example/latest", { allowedHosts: ["updates.example"] });
|
||||||
expect(metadata.version).toBe("1.2.0");
|
expect(metadata.version).toBe("1.3.0");
|
||||||
expect((await fetchReleaseText("https://updates.example/SHA256SUMS", { allowedHosts: ["updates.example"] })).trim()).toContain(digest);
|
expect((await fetchReleaseText("https://updates.example/SHA256SUMS", { allowedHosts: ["updates.example"] })).trim()).toContain(digest);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -253,22 +253,22 @@ describe("更新安全工具", () => {
|
|||||||
const jobId = randomUUID();
|
const jobId = randomUUID();
|
||||||
database = openDatabase(config);
|
database = openDatabase(config);
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const assetName = `tallynote-1.2.0-${detectPlatform().target}.tar.gz`;
|
const assetName = `tallynote-1.3.0-${detectPlatform().target}.tar.gz`;
|
||||||
database.sqlite.prepare(`
|
database.sqlite.prepare(`
|
||||||
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url,
|
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url,
|
||||||
expected_sha256, created_at, updated_at, requested_at)
|
expected_sha256, created_at, updated_at, requested_at)
|
||||||
VALUES (?, 'apply', 'queued', '1.2.0', ?, ?, ?, ?, ?, ?)
|
VALUES (?, 'apply', 'queued', '1.3.0', ?, ?, ?, ?, ?, ?)
|
||||||
`).run(jobId, detectPlatform().target, "https://updates.example/" + assetName, digest, now, now, now);
|
`).run(jobId, detectPlatform().target, "https://updates.example/" + assetName, digest, now, now, now);
|
||||||
globalThis.fetch = (async (input: string | URL) => {
|
globalThis.fetch = (async (input: string | URL) => {
|
||||||
const url = input.toString();
|
const url = input.toString();
|
||||||
if (url.endsWith("/latest")) return new Response(JSON.stringify({ tag_name: "v1.2.0", assets: [{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }, { name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }] }));
|
if (url.endsWith("/latest")) return new Response(JSON.stringify({ tag_name: "v1.3.0", assets: [{ name: assetName, browser_download_url: `https://updates.example/${assetName}` }, { name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }] }));
|
||||||
if (url.endsWith("SHA256SUMS")) return new Response(`${digest} ${assetName}\n`);
|
if (url.endsWith("SHA256SUMS")) return new Response(`${digest} ${assetName}\n`);
|
||||||
return new Response(bytes, { headers: { "content-length": String(bytes.length) } });
|
return new Response(bytes, { headers: { "content-length": String(bytes.length) } });
|
||||||
}) as typeof fetch;
|
}) as typeof fetch;
|
||||||
|
|
||||||
await runUpdate({
|
await runUpdate({
|
||||||
metadataUrl: config.updateMetadataUrl,
|
metadataUrl: config.updateMetadataUrl,
|
||||||
version: "1.2.0",
|
version: "1.3.0",
|
||||||
currentVersion: config.appVersion,
|
currentVersion: config.appVersion,
|
||||||
currentDir: config.currentLink,
|
currentDir: config.currentLink,
|
||||||
stagingDir: path.join(root, "staging"),
|
stagingDir: path.join(root, "staging"),
|
||||||
@@ -323,10 +323,10 @@ describe("更新安全工具", () => {
|
|||||||
const applyingId = randomUUID();
|
const applyingId = randomUUID();
|
||||||
const stagedId = randomUUID();
|
const stagedId = randomUUID();
|
||||||
const stagedApplyId = randomUUID();
|
const stagedApplyId = randomUUID();
|
||||||
insert.run(queuedId, "apply", "queued", "1.2.0", "linux-x64", "https://updates.example/queued.tar.gz", staleAt, staleAt);
|
insert.run(queuedId, "apply", "queued", "1.3.0", "linux-x64", "https://updates.example/queued.tar.gz", staleAt, staleAt);
|
||||||
insert.run(applyingId, "apply", "applying", config.appVersion, "linux-x64", "https://updates.example/applying.tar.gz", staleAt, staleAt);
|
insert.run(applyingId, "apply", "applying", config.appVersion, "linux-x64", "https://updates.example/applying.tar.gz", staleAt, staleAt);
|
||||||
insert.run(stagedId, "download", "staged", "1.2.0", "linux-x64", "https://updates.example/staged.tar.gz", staleAt, staleAt);
|
insert.run(stagedId, "download", "staged", "1.3.0", "linux-x64", "https://updates.example/staged.tar.gz", staleAt, staleAt);
|
||||||
insert.run(stagedApplyId, "apply", "staged", "1.2.0", "linux-x64", "https://updates.example/staged-apply.tar.gz", staleAt, staleAt);
|
insert.run(stagedApplyId, "apply", "staged", "1.3.0", "linux-x64", "https://updates.example/staged-apply.tar.gz", staleAt, staleAt);
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, now)).toBe(3);
|
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, now)).toBe(3);
|
||||||
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(queuedId)).toEqual({ status: "failed" });
|
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(queuedId)).toEqual({ status: "failed" });
|
||||||
@@ -362,7 +362,7 @@ describe("更新安全工具", () => {
|
|||||||
const jobId = randomUUID();
|
const jobId = randomUUID();
|
||||||
database.sqlite.prepare(`
|
database.sqlite.prepare(`
|
||||||
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url, created_at, updated_at)
|
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url, created_at, updated_at)
|
||||||
VALUES (?, 'download', 'downloading', '1.2.0', 'linux-x64', ?, ?, ?)
|
VALUES (?, 'download', 'downloading', '1.3.0', 'linux-x64', ?, ?, ?)
|
||||||
`).run(jobId, "https://updates.example/download.tar.gz", staleAt, staleAt);
|
`).run(jobId, "https://updates.example/download.tar.gz", staleAt, staleAt);
|
||||||
await writeFile(config.updateRequestPath, JSON.stringify({ jobId, operation: "download" }));
|
await writeFile(config.updateRequestPath, JSON.stringify({ jobId, operation: "download" }));
|
||||||
const statePath = path.join(config.installPrefix, ".update-state");
|
const statePath = path.join(config.installPrefix, ".update-state");
|
||||||
@@ -406,18 +406,18 @@ describe("更新安全工具", () => {
|
|||||||
const jobId = randomUUID();
|
const jobId = randomUUID();
|
||||||
database.sqlite.prepare(`
|
database.sqlite.prepare(`
|
||||||
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url, created_at, updated_at)
|
INSERT INTO update_jobs(id, operation, status, version, platform, asset_url, created_at, updated_at)
|
||||||
VALUES (?, 'apply', 'queued', '1.2.0', 'linux-x64', ?, ?, ?)
|
VALUES (?, 'apply', 'queued', '1.3.0', 'linux-x64', ?, ?, ?)
|
||||||
`).run(jobId, "https://updates.example/queued.tar.gz", staleAt, staleAt);
|
`).run(jobId, "https://updates.example/queued.tar.gz", staleAt, staleAt);
|
||||||
await writeFile(config.updateRequestPath, JSON.stringify({ jobId, operation: "apply" }));
|
await writeFile(config.updateRequestPath, JSON.stringify({ jobId, operation: "apply" }));
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
await utimes(config.updateRequestPath, new Date(now), new Date(now));
|
await utimes(config.updateRequestPath, new Date(now), new Date(now));
|
||||||
|
|
||||||
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, now)).toBe(0);
|
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, now)).toBe(1);
|
||||||
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(jobId)).toEqual({ status: "queued" });
|
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(jobId)).toEqual({ status: "failed" });
|
||||||
expect(await stat(config.updateRequestPath)).toBeTruthy();
|
await expect(stat(config.updateRequestPath)).rejects.toThrow();
|
||||||
|
|
||||||
const expiredNow = now + ORPHANED_UPDATE_TIMEOUT_MS + 1;
|
const expiredNow = now + ORPHANED_UPDATE_TIMEOUT_MS + 1;
|
||||||
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, expiredNow)).toBe(1);
|
expect(reconcileOrphanedUpdateJobs(database.sqlite, config, expiredNow)).toBe(0);
|
||||||
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(jobId)).toEqual({ status: "failed" });
|
expect(database.sqlite.prepare("SELECT status FROM update_jobs WHERE id=?").get(jobId)).toEqual({ status: "failed" });
|
||||||
await expect(stat(config.updateRequestPath)).rejects.toThrow();
|
await expect(stat(config.updateRequestPath)).rejects.toThrow();
|
||||||
} finally {
|
} finally {
|
||||||
@@ -492,17 +492,17 @@ describe("更新元数据缓存", () => {
|
|||||||
prepareDataDirectories(config);
|
prepareDataDirectories(config);
|
||||||
const database = openDatabase(config);
|
const database = openDatabase(config);
|
||||||
const digest = "b".repeat(64);
|
const digest = "b".repeat(64);
|
||||||
const platformAsset = `tallynote-1.2.0-${detectPlatform().target}-glibc.tar.gz`;
|
const platformAsset = `tallynote-1.3.0-${detectPlatform().target}-glibc.tar.gz`;
|
||||||
const sums = `${digest} ${platformAsset}\n`;
|
const sums = `${digest} ${platformAsset}\n`;
|
||||||
const signature = sign(null, Buffer.from(sums), privateKey);
|
const signature = sign(null, Buffer.from(sums), privateKey);
|
||||||
globalThis.fetch = (async (input: string | URL) => input.toString().endsWith("SHA256SUMS.sig")
|
globalThis.fetch = (async (input: string | URL) => input.toString().endsWith("SHA256SUMS.sig")
|
||||||
? new Response(signature)
|
? new Response(signature)
|
||||||
: input.toString().endsWith("SHA256SUMS")
|
: input.toString().endsWith("SHA256SUMS")
|
||||||
? new Response(sums)
|
? new Response(sums)
|
||||||
: new Response(JSON.stringify({ tag_name: "v1.2.0", published_at: "2026-08-28T00:00:00Z", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: "SHA256SUMS.sig", browser_download_url: "https://updates.example/SHA256SUMS.sig" }, { name: platformAsset, browser_download_url: `https://updates.example/${platformAsset}` }] }), { status: 200 })) as typeof fetch;
|
: new Response(JSON.stringify({ tag_name: "v1.3.0", published_at: "2026-08-28T00:00:00Z", assets: [{ name: "SHA256SUMS", browser_download_url: "https://updates.example/SHA256SUMS" }, { name: "SHA256SUMS.sig", browser_download_url: "https://updates.example/SHA256SUMS.sig" }, { name: platformAsset, browser_download_url: `https://updates.example/${platformAsset}` }] }), { status: 200 })) as typeof fetch;
|
||||||
try {
|
try {
|
||||||
const result = await checkForUpdate(database.sqlite, config);
|
const result = await checkForUpdate(database.sqlite, config);
|
||||||
expect(result.latest).toMatchObject({ version: "1.2.0", compatible: true, integrityReady: true, signatureReady: true, isNewer: true });
|
expect(result.latest).toMatchObject({ version: "1.3.0", compatible: true, integrityReady: true, signatureReady: true, isNewer: true });
|
||||||
const cached = database.sqlite.prepare("SELECT value FROM system_settings WHERE key='update.release.v1'").get() as { value: string };
|
const cached = database.sqlite.prepare("SELECT value FROM system_settings WHERE key='update.release.v1'").get() as { value: string };
|
||||||
expect(JSON.parse(cached.value).asset.sha256).toBe(digest);
|
expect(JSON.parse(cached.value).asset.sha256).toBe(digest);
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -11,12 +11,12 @@ import { setAppTimezone } from "./utils/date";
|
|||||||
import { AppLayout } from "./layouts";
|
import { AppLayout } from "./layouts";
|
||||||
import { DEFAULT_ROUTE_ID, isRouteId, routeIdFromPath, routePath, routeTitle, type RouteId } from "./router";
|
import { DEFAULT_ROUTE_ID, isRouteId, routeIdFromPath, routePath, routeTitle, type RouteId } from "./router";
|
||||||
import { LoginPage, ChangePasswordPage } from "./pages/auth";
|
import { LoginPage, ChangePasswordPage } from "./pages/auth";
|
||||||
const ExpensesPage = lazy(() => import("./pages/expenses"));
|
import ExpensesPage from "./pages/expenses";
|
||||||
const DashboardPage = lazy(() => import("./pages/dashboard"));
|
import DashboardPage from "./pages/dashboard";
|
||||||
const TrashPage = lazy(() => import("./pages/trash").then(module => ({ default: module.TrashPage })));
|
import { TrashPage } from "./pages/trash";
|
||||||
const AdminsPage = lazy(() => import("./pages/admins").then(module => ({ default: module.AdminsPage })));
|
import { AdminsPage } from "./pages/admins";
|
||||||
const AuditPage = lazy(() => import("./pages/audit").then(module => ({ default: module.AuditPage })));
|
import { AuditPage } from "./pages/audit";
|
||||||
const UpdatePage = lazy(() => import("./pages/update").then(module => ({ default: module.UpdatePage })));
|
import { UpdatePage } from "./pages/update";
|
||||||
import { UnsavedChangesProvider, useUnsavedActions } from "./contexts/UnsavedChanges";
|
import { UnsavedChangesProvider, useUnsavedActions } from "./contexts/UnsavedChanges";
|
||||||
import { useDialogAccessibility } from "./hooks/useDialogAccessibility";
|
import { useDialogAccessibility } from "./hooks/useDialogAccessibility";
|
||||||
import "./styles/theme.css";
|
import "./styles/theme.css";
|
||||||
@@ -34,7 +34,7 @@ function App() {
|
|||||||
const notify = useCallback((message: string, kind: "success" | "error" | "info" = "info") => {
|
const notify = useCallback((message: string, kind: "success" | "error" | "info" = "info") => {
|
||||||
// The placement container owns the responsive right inset. Keeping the
|
// The placement container owns the responsive right inset. Keeping the
|
||||||
// item offset at zero avoids pushing narrow-screen notices off canvas.
|
// item offset at zero avoids pushing narrow-screen notices off canvas.
|
||||||
const options = { content: message, duration: 4200, placement: "top-right" as const, offset: [0, 76] as [number, number], zIndex: 5000 };
|
const options = { content: message, duration: 4200, placement: "top-right" as const, offset: [24, 76] as [number, number], zIndex: 6000 };
|
||||||
const show = kind === "success" ? NotificationPlugin.success : kind === "error" ? NotificationPlugin.error : NotificationPlugin.info;
|
const show = kind === "success" ? NotificationPlugin.success : kind === "error" ? NotificationPlugin.error : NotificationPlugin.info;
|
||||||
void show(options);
|
void show(options);
|
||||||
}, []);
|
}, []);
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ echarts.use([LineChart, GridComponent, LegendComponent, TooltipComponent, Canvas
|
|||||||
type Props = { timezone?: string; onNavigate?: (id: RouteId, search?: string) => void };
|
type Props = { timezone?: string; onNavigate?: (id: RouteId, search?: string) => void };
|
||||||
type ExpenseResult = { items: Expense[]; summary: { count: number; amountCents: number } };
|
type ExpenseResult = { items: Expense[]; summary: { count: number; amountCents: number } };
|
||||||
|
|
||||||
|
let dashboardCache: { month: string; unreimbursed: ExpenseResult; reimbursed: ExpenseResult } | null = null;
|
||||||
|
|
||||||
function prefersReducedMotion(): boolean {
|
function prefersReducedMotion(): boolean {
|
||||||
return typeof window !== "undefined" && typeof window.matchMedia === "function"
|
return typeof window !== "undefined" && typeof window.matchMedia === "function"
|
||||||
? window.matchMedia("(prefers-reduced-motion: reduce)").matches
|
? window.matchMedia("(prefers-reduced-motion: reduce)").matches
|
||||||
@@ -29,11 +31,12 @@ export default function DashboardPage({ timezone = "Asia/Shanghai", onNavigate }
|
|||||||
const rawMonthParam = searchParams.get("month");
|
const rawMonthParam = searchParams.get("month");
|
||||||
const defaultMonth = monthNow(timezone);
|
const defaultMonth = monthNow(timezone);
|
||||||
const month = rawMonthParam && /^\d{4}-(0[1-9]|1[0-2])$/.test(rawMonthParam) ? rawMonthParam : defaultMonth;
|
const month = rawMonthParam && /^\d{4}-(0[1-9]|1[0-2])$/.test(rawMonthParam) ? rawMonthParam : defaultMonth;
|
||||||
const [unreimbursed, setUnreimbursed] = useState<ExpenseResult>({ items: [], summary: { count: 0, amountCents: 0 } });
|
const isCached = dashboardCache?.month === month;
|
||||||
const [reimbursed, setReimbursed] = useState<ExpenseResult>({ items: [], summary: { count: 0, amountCents: 0 } });
|
const [unreimbursed, setUnreimbursed] = useState<ExpenseResult>(() => (isCached ? dashboardCache!.unreimbursed : { items: [], summary: { count: 0, amountCents: 0 } }));
|
||||||
const [loading, setLoading] = useState(true);
|
const [reimbursed, setReimbursed] = useState<ExpenseResult>(() => (isCached ? dashboardCache!.reimbursed : { items: [], summary: { count: 0, amountCents: 0 } }));
|
||||||
|
const [loading, setLoading] = useState(() => !isCached);
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
const [loadedMonth, setLoadedMonth] = useState<string | null>(null);
|
const [loadedMonth, setLoadedMonth] = useState<string | null>(() => (isCached ? month : null));
|
||||||
const requestSequence = useRef(0);
|
const requestSequence = useRef(0);
|
||||||
const [reducedMotion, setReducedMotion] = useState(prefersReducedMotion);
|
const [reducedMotion, setReducedMotion] = useState(prefersReducedMotion);
|
||||||
|
|
||||||
@@ -75,6 +78,7 @@ export default function DashboardPage({ timezone = "Asia/Shanghai", onNavigate }
|
|||||||
setUnreimbursed(pending);
|
setUnreimbursed(pending);
|
||||||
setReimbursed(done);
|
setReimbursed(done);
|
||||||
setLoadedMonth(month);
|
setLoadedMonth(month);
|
||||||
|
dashboardCache = { month, unreimbursed: pending, reimbursed: done };
|
||||||
} catch (caught) {
|
} catch (caught) {
|
||||||
if (sequence === requestSequence.current) setError((caught as Error).message);
|
if (sequence === requestSequence.current) setError((caught as Error).message);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -141,7 +145,7 @@ export default function DashboardPage({ timezone = "Asia/Shanghai", onNavigate }
|
|||||||
<div className="tn-page-actions"><div className="tn-dashboard-actions"><div className="tn-dashboard-month-control"><Tooltip content="上个月"><Button variant="outline" shape="square" onClick={() => shiftMonth(-1)} aria-label="上个月" icon={<ChevronLeft size={16} />} /></Tooltip><DatePicker className="tn-dashboard-month" mode="month" format="YYYY-MM" value={month} onChange={(value: any) => { const next = String(value || "").slice(0, 7); if (/^\d{4}-\d{2}$/.test(next)) setDashboardMonth(next); }} inputProps={{ "aria-label": "仪表盘月份" } as any} /><Tooltip content="下个月"><Button variant="outline" shape="square" onClick={() => shiftMonth(1)} aria-label="下个月" icon={<ChevronRight size={16} />} /></Tooltip></div><div className="tn-dashboard-secondary-actions"><Button className="tn-dashboard-refresh" variant="outline" onClick={() => void load()} disabled={loading} icon={<RefreshCw size={15} />}>刷新</Button><Button className="tn-dashboard-view" theme="primary" onClick={() => onNavigate?.("expenses", expensesSearch)}>查看账目</Button></div></div></div>
|
<div className="tn-page-actions"><div className="tn-dashboard-actions"><div className="tn-dashboard-month-control"><Tooltip content="上个月"><Button variant="outline" shape="square" onClick={() => shiftMonth(-1)} aria-label="上个月" icon={<ChevronLeft size={16} />} /></Tooltip><DatePicker className="tn-dashboard-month" mode="month" format="YYYY-MM" value={month} onChange={(value: any) => { const next = String(value || "").slice(0, 7); if (/^\d{4}-\d{2}$/.test(next)) setDashboardMonth(next); }} inputProps={{ "aria-label": "仪表盘月份" } as any} /><Tooltip content="下个月"><Button variant="outline" shape="square" onClick={() => shiftMonth(1)} aria-label="下个月" icon={<ChevronRight size={16} />} /></Tooltip></div><div className="tn-dashboard-secondary-actions"><Button className="tn-dashboard-refresh" variant="outline" onClick={() => void load()} disabled={loading} icon={<RefreshCw size={15} />}>刷新</Button><Button className="tn-dashboard-view" theme="primary" onClick={() => onNavigate?.("expenses", expensesSearch)}>查看账目</Button></div></div></div>
|
||||||
</div>
|
</div>
|
||||||
{error && hasCurrentSnapshot && <Alert theme="error" icon={<AlertCircle size={16} />} message={`刷新失败:${error}。当前展示的是本月最近一次成功加载的数据。`} />}
|
{error && hasCurrentSnapshot && <Alert theme="error" icon={<AlertCircle size={16} />} message={`刷新失败:${error}。当前展示的是本月最近一次成功加载的数据。`} />}
|
||||||
{loading ? <div className="tn-empty" role="status" aria-live="polite"><BeamLoading text="正在汇总本月数据…" /></div> : !hasCurrentSnapshot ? <div className="tn-empty" role="alert"><Alert theme="error" icon={<AlertCircle size={16} />} message={error || "暂时无法读取仪表盘数据"} /><Button variant="outline" onClick={() => void load()} icon={<RefreshCw size={15} />}>重新加载</Button></div> : <>
|
{loading && !hasCurrentSnapshot ? <div className="tn-empty" role="status" aria-live="polite"><BeamLoading text="正在汇总本月数据…" /></div> : !hasCurrentSnapshot ? <div className="tn-empty" role="alert"><Alert theme="error" icon={<AlertCircle size={16} />} message={error || "暂时无法读取仪表盘数据"} /><Button variant="outline" onClick={() => void load()} icon={<RefreshCw size={15} />}>重新加载</Button></div> : <>
|
||||||
<div className="tn-dashboard-stats">
|
<div className="tn-dashboard-stats">
|
||||||
<Card bordered className="tn-dashboard-stat tn-dashboard-stat-total"><Statistic title="本月总额" value={totalCents / 100} prefix="¥" decimalPlaces={2} /></Card>
|
<Card bordered className="tn-dashboard-stat tn-dashboard-stat-total"><Statistic title="本月总额" value={totalCents / 100} prefix="¥" decimalPlaces={2} /></Card>
|
||||||
<Card bordered className="tn-dashboard-stat tn-dashboard-stat-count"><Statistic title="账目笔数" value={totalCount} suffix="笔" /></Card>
|
<Card bordered className="tn-dashboard-stat tn-dashboard-stat-count"><Statistic title="账目笔数" value={totalCount} suffix="笔" /></Card>
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import AccessibleInput from "../../components/AccessibleInput";
|
|||||||
import { dateText, money, monthNow } from "./date";
|
import { dateText, money, monthNow } from "./date";
|
||||||
import type { Expense, Notify } from "./types";
|
import type { Expense, Notify } from "./types";
|
||||||
|
|
||||||
|
let expensesCache: { key: string; items: Expense[]; summary: { count: number; amountCents: number } } | null = null;
|
||||||
|
|
||||||
type Props = { timezone?: string; notify?: Notify; sessionKey?: string };
|
type Props = { timezone?: string; notify?: Notify; sessionKey?: string };
|
||||||
const EXPORT_JOB_STORAGE_KEY = "tallynote.exportJobId";
|
const EXPORT_JOB_STORAGE_KEY = "tallynote.exportJobId";
|
||||||
|
|
||||||
@@ -30,9 +32,14 @@ export default function ExpensesPage({ timezone: timezoneProp = "Asia/Shanghai",
|
|||||||
const query = rawQuery.slice(0, 200);
|
const query = rawQuery.slice(0, 200);
|
||||||
const rawMissingInvoice = searchParams.get("missingInvoice");
|
const rawMissingInvoice = searchParams.get("missingInvoice");
|
||||||
const missingInvoice = searchParams.get("missingInvoice") === "true";
|
const missingInvoice = searchParams.get("missingInvoice") === "true";
|
||||||
const [queryDraft, setQueryDraft] = useState(query);
|
|
||||||
const [items, setItems] = useState<Expense[]>([]); const [summary, setSummary] = useState({ count: 0, amountCents: 0 }); const [loading, setLoading] = useState(false); const [error, setError] = useState(""); const [loadedFilterKey, setLoadedFilterKey] = useState<string | null>(null); const [selectedKeys, setSelectedKeys] = useState<string[]>([]); const [drawer, setDrawer] = useState<"new" | "detail" | "edit" | null>(null); const [selected, setSelected] = useState<Expense | null>(null); const [includeManifest, setIncludeManifest] = useState(false); const [exporting, setExporting] = useState<string | null>(() => savedExportJob(exportStorageKey)); const [exportIssue, setExportIssue] = useState(""); const [trashTarget, setTrashTarget] = useState<Expense | null>(null); const [trashing, setTrashing] = useState(false); const sequence = useRef(0); const exportStarting = useRef(false);
|
|
||||||
const filterKey = `${month}|${status}|${query}|${missingInvoice ? "1" : "0"}`;
|
const filterKey = `${month}|${status}|${query}|${missingInvoice ? "1" : "0"}`;
|
||||||
|
const isCached = expensesCache?.key === filterKey;
|
||||||
|
const [queryDraft, setQueryDraft] = useState(query);
|
||||||
|
const [items, setItems] = useState<Expense[]>(() => (isCached ? expensesCache!.items : []));
|
||||||
|
const [summary, setSummary] = useState(() => (isCached ? expensesCache!.summary : { count: 0, amountCents: 0 }));
|
||||||
|
const [loading, setLoading] = useState(() => !isCached);
|
||||||
|
const [error, setError] = useState("");
|
||||||
|
const [loadedFilterKey, setLoadedFilterKey] = useState<string | null>(() => (isCached ? filterKey : null)); const [selectedKeys, setSelectedKeys] = useState<string[]>([]); const [drawer, setDrawer] = useState<"new" | "detail" | "edit" | null>(null); const [selected, setSelected] = useState<Expense | null>(null); const [includeManifest, setIncludeManifest] = useState(false); const [exporting, setExporting] = useState<string | null>(() => savedExportJob(exportStorageKey)); const [exportIssue, setExportIssue] = useState(""); const [trashTarget, setTrashTarget] = useState<Expense | null>(null); const [trashing, setTrashing] = useState(false); const sequence = useRef(0); const exportStarting = useRef(false);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const params = new URLSearchParams(searchParams);
|
const params = new URLSearchParams(searchParams);
|
||||||
let changed = false;
|
let changed = false;
|
||||||
@@ -55,8 +62,8 @@ export default function ExpensesPage({ timezone: timezoneProp = "Asia/Shanghai",
|
|||||||
if (next.missingInvoice ?? missingInvoice) params.set("missingInvoice", "true"); else params.delete("missingInvoice");
|
if (next.missingInvoice ?? missingInvoice) params.set("missingInvoice", "true"); else params.delete("missingInvoice");
|
||||||
setSearchParams(params);
|
setSearchParams(params);
|
||||||
};
|
};
|
||||||
const load = async () => { const s = ++sequence.current; const requestedKey = filterKey; setLoading(true); setError(""); try { const result = await api<{ items: Expense[]; summary: typeof summary }>(`/api/expenses?month=${month}&status=${status}&query=${encodeURIComponent(query)}&missingInvoice=${missingInvoice}`); if (s === sequence.current) { setItems(result.items); setSummary(result.summary); setLoadedFilterKey(requestedKey); setSelectedKeys(keys => keys.filter(k => result.items.some(x => x.id === k))); } } catch (e) { if (s === sequence.current) { setItems([]); setSummary({ count: 0, amountCents: 0 }); setLoadedFilterKey(null); setError((e as Error).message); } } finally { if (s === sequence.current) setLoading(false); } };
|
const load = async () => { const s = ++sequence.current; const requestedKey = filterKey; setLoading(true); setError(""); try { const result = await api<{ items: Expense[]; summary: typeof summary }>(`/api/expenses?month=${month}&status=${status}&query=${encodeURIComponent(query)}&missingInvoice=${missingInvoice}`); if (s === sequence.current) { setItems(result.items); setSummary(result.summary); setLoadedFilterKey(requestedKey); setSelectedKeys(keys => keys.filter(k => result.items.some(x => x.id === k))); expensesCache = { key: requestedKey, items: result.items, summary: result.summary }; } } catch (e) { if (s === sequence.current) { setItems([]); setSummary({ count: 0, amountCents: 0 }); setLoadedFilterKey(null); setError((e as Error).message); } } finally { if (s === sequence.current) setLoading(false); } };
|
||||||
useEffect(() => { setSelectedKeys([]); setItems([]); setSummary({ count: 0, amountCents: 0 }); setLoadedFilterKey(null); void load(); }, [filterKey]);
|
useEffect(() => { setSelectedKeys([]); if (expensesCache?.key !== filterKey) { setItems([]); setSummary({ count: 0, amountCents: 0 }); setLoadedFilterKey(null); } void load(); }, [filterKey]);
|
||||||
const selectedTotal = useMemo(() => items.filter(i => selectedKeys.includes(i.id)).reduce((sum, i) => sum + i.amountCents, 0), [items, selectedKeys]);
|
const selectedTotal = useMemo(() => items.filter(i => selectedKeys.includes(i.id)).reduce((sum, i) => sum + i.amountCents, 0), [items, selectedKeys]);
|
||||||
const shiftMonth = (delta: number) => { const [rawYear, rawMonthNumber] = month.split("-").map(Number); const y = rawYear || new Date().getFullYear(); const m = rawMonthNumber || 1; const d = new Date(y, m - 1 + delta, 1); updateFilters({ month: `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}` }); };
|
const shiftMonth = (delta: number) => { const [rawYear, rawMonthNumber] = month.split("-").map(Number); const y = rawYear || new Date().getFullYear(); const m = rawMonthNumber || 1; const d = new Date(y, m - 1 + delta, 1); updateFilters({ month: `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}` }); };
|
||||||
const rememberExportJob = (jobId: string | null) => {
|
const rememberExportJob = (jobId: string | null) => {
|
||||||
@@ -125,7 +132,7 @@ export default function ExpensesPage({ timezone: timezoneProp = "Asia/Shanghai",
|
|||||||
<div className="tn-summary expenses-summary"><span>{summary.count} 笔</span><strong>{money(summary.amountCents)}</strong>{selectedKeys.length > 0 && <><span>已选 {selectedKeys.length} 笔,共 {money(selectedTotal)}</span><Button variant="text" onClick={() => setSelectedKeys([])}>清除选择</Button></>}</div>
|
<div className="tn-summary expenses-summary"><span>{summary.count} 笔</span><strong>{money(summary.amountCents)}</strong>{selectedKeys.length > 0 && <><span>已选 {selectedKeys.length} 笔,共 {money(selectedTotal)}</span><Button variant="text" onClick={() => setSelectedKeys([])}>清除选择</Button></>}</div>
|
||||||
{exportIssue && <div className="tn-export-status" role="status"><RefreshCw size={15} className="spin" /><span>{exportIssue}</span><Button variant="text" onClick={() => { setExportIssue(""); rememberExportJob(null); }}>关闭提示</Button></div>}
|
{exportIssue && <div className="tn-export-status" role="status"><RefreshCw size={15} className="spin" /><span>{exportIssue}</span><Button variant="text" onClick={() => { setExportIssue(""); rememberExportJob(null); }}>关闭提示</Button></div>}
|
||||||
{error && <div className="expense-error" role="alert"><AlertCircle size={16} />{error}<Button variant="text" onClick={() => void load()}>重试</Button></div>}
|
{error && <div className="expense-error" role="alert"><AlertCircle size={16} />{error}<Button variant="text" onClick={() => void load()}>重试</Button></div>}
|
||||||
{error ? null : !dataReady || (loading && !items.length) ? <div className="tn-empty" role="status" aria-live="polite"><BeamLoading text="正在加载账目列表…" /></div> : !items.length ? emptyState : <div className="tn-table-wrap" role="region" aria-label="账目列表,可横向滚动查看更多列"><Table rowKey="id" data={items} columns={columns as any} selectedRowKeys={selectedKeys} onSelectChange={(keys: any[]) => setSelectedKeys(keys as string[])} hover stripe /></div>}
|
{error ? null : (!items.length && (loading || !dataReady)) ? <div className="tn-empty" role="status" aria-live="polite"><BeamLoading text="正在加载账目列表…" /></div> : !items.length ? emptyState : <div className="tn-table-wrap" role="region" aria-label="账目列表,可横向滚动查看更多列"><Table rowKey="id" data={items} columns={columns as any} selectedRowKeys={selectedKeys} onSelectChange={(keys: any[]) => setSelectedKeys(keys as string[])} hover stripe /></div>}
|
||||||
{drawer === "new" && <ExpenseDrawer timezone={timezone} onClose={() => setDrawer(null)} onSaved={load} notify={notify} />}{drawer === "edit" && selected && <ExpenseDrawer timezone={timezone} expense={selected} onClose={() => setDrawer(null)} onSaved={load} notify={notify} />}{drawer === "detail" && selected && <ExpenseDetail timezone={timezone} expense={selected} onClose={() => setDrawer(null)} onUpdated={load} onRequestEdit={e => { setSelected(e); setDrawer("edit"); }} notify={notify} />}
|
{drawer === "new" && <ExpenseDrawer timezone={timezone} onClose={() => setDrawer(null)} onSaved={load} notify={notify} />}{drawer === "edit" && selected && <ExpenseDrawer timezone={timezone} expense={selected} onClose={() => setDrawer(null)} onSaved={load} notify={notify} />}{drawer === "detail" && selected && <ExpenseDetail timezone={timezone} expense={selected} onClose={() => setDrawer(null)} onUpdated={load} onRequestEdit={e => { setSelected(e); setDrawer("edit"); }} notify={notify} />}
|
||||||
{trashTarget && <Dialog width="540px" visible header="移入回收站?" confirmBtn={{ content: "移入回收站", theme: "danger", loading: trashing, disabled: trashing }} cancelBtn="取消" onClose={() => { if (!trashing) setTrashTarget(null); }} onConfirm={() => void moveToTrash()} onCancel={() => { if (!trashing) setTrashTarget(null); }}>确认将“{trashTarget.note || `${dateText(trashTarget.paidAt, timezone)}的账目`}”移入回收站?移入后将不在正常列表中展示,关联附件将完整保留,可随时恢复。</Dialog>}
|
{trashTarget && <Dialog width="540px" visible header="移入回收站?" confirmBtn={{ content: "移入回收站", theme: "danger", loading: trashing, disabled: trashing }} cancelBtn="取消" onClose={() => { if (!trashing) setTrashTarget(null); }} onConfirm={() => void moveToTrash()} onCancel={() => { if (!trashing) setTrashTarget(null); }}>确认将“{trashTarget.note || `${dateText(trashTarget.paidAt, timezone)}的账目`}”移入回收站?移入后将不在正常列表中展示,关联附件将完整保留,可随时恢复。</Dialog>}
|
||||||
</div>;
|
</div>;
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
// In-memory cache across page transitions for zero-latency instant rendering
|
||||||
|
let updateInfoCache: any = null;
|
||||||
|
|
||||||
import { BeamLoading, BeamBar } from "../../components/BeamLoading";
|
import { BeamLoading, BeamBar } from "../../components/BeamLoading";
|
||||||
import { useState, useEffect, useRef, useMemo, type ReactNode } from "react";
|
import { useState, useEffect, useRef, useMemo, type ReactNode } from "react";
|
||||||
import {
|
import {
|
||||||
@@ -22,7 +25,7 @@ import {
|
|||||||
} from "lucide-react";
|
} from "lucide-react";
|
||||||
import { Button, Card, Dialog, RadioGroup, Radio, Steps, Tag, Tooltip } from "tdesign-react";
|
import { Button, Card, Dialog, RadioGroup, Radio, Steps, Tag, Tooltip } from "tdesign-react";
|
||||||
import { Page, Surface } from "../common";
|
import { Page, Surface } from "../common";
|
||||||
import { api } from "../../services/api";
|
import { api, ApiError } from "../../services/api";
|
||||||
import { dateText } from "../../utils/date";
|
import { dateText } from "../../utils/date";
|
||||||
import type { MockScenario, MockUpdateState } from "./mockData";
|
import type { MockScenario, MockUpdateState } from "./mockData";
|
||||||
|
|
||||||
@@ -242,6 +245,7 @@ export default function UpdatePage({
|
|||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [checking, setChecking] = useState(false);
|
const [checking, setChecking] = useState(false);
|
||||||
const [error, setError] = useState("");
|
const [error, setError] = useState("");
|
||||||
|
const [modalError, setModalError] = useState("");
|
||||||
const [pollError, setPollError] = useState("");
|
const [pollError, setPollError] = useState("");
|
||||||
const [actionBusy, setActionBusy] = useState(false);
|
const [actionBusy, setActionBusy] = useState(false);
|
||||||
const [reloadReady, setReloadReady] = useState(false);
|
const [reloadReady, setReloadReady] = useState(false);
|
||||||
@@ -250,7 +254,6 @@ export default function UpdatePage({
|
|||||||
const [showUpgradeModal, setShowUpgradeModal] = useState(false);
|
const [showUpgradeModal, setShowUpgradeModal] = useState(false);
|
||||||
const [confirmReadyToDownload, setConfirmReadyToDownload] = useState(false);
|
const [confirmReadyToDownload, setConfirmReadyToDownload] = useState(false);
|
||||||
const [cancelling, setCancelling] = useState(false);
|
const [cancelling, setCancelling] = useState(false);
|
||||||
const [queuedSeconds, setQueuedSeconds] = useState(0);
|
|
||||||
const [now, setNow] = useState(() => Date.now());
|
const [now, setNow] = useState(() => Date.now());
|
||||||
|
|
||||||
const announced = useRef<string | null>(null);
|
const announced = useRef<string | null>(null);
|
||||||
@@ -302,7 +305,9 @@ export default function UpdatePage({
|
|||||||
setLoading(true);
|
setLoading(true);
|
||||||
setError("");
|
setError("");
|
||||||
try {
|
try {
|
||||||
setLiveInfo(await api<UpdateInfo>("/api/update/status"));
|
const res = await api<UpdateInfo>("/api/update/status");
|
||||||
|
setLiveInfo(res);
|
||||||
|
updateInfoCache = res;
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError((e as Error).message);
|
setError((e as Error).message);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -315,17 +320,9 @@ export default function UpdatePage({
|
|||||||
else setLoading(false);
|
else setLoading(false);
|
||||||
}, [isMock]);
|
}, [isMock]);
|
||||||
|
|
||||||
// Terminal failures or cancellations do not pollute active state
|
// Keep terminal jobs visible so operators can understand what happened and
|
||||||
const job = info?.job && info.job.status !== "failed" && info.job.status !== "cancelled" ? info.job : null;
|
// recover without guessing. The polling effect below only polls active jobs.
|
||||||
|
const job = info?.job ?? null;
|
||||||
// Queued duration counter
|
|
||||||
useEffect(() => {
|
|
||||||
if (job?.status === "queued") {
|
|
||||||
const timer = window.setInterval(() => setQueuedSeconds((s) => s + 1), 1000);
|
|
||||||
return () => window.clearInterval(timer);
|
|
||||||
}
|
|
||||||
setQueuedSeconds(0);
|
|
||||||
}, [job?.status]);
|
|
||||||
|
|
||||||
const applyQueuedAt = timestamp(job?.applyQueuedAt);
|
const applyQueuedAt = timestamp(job?.applyQueuedAt);
|
||||||
const restartAt =
|
const restartAt =
|
||||||
@@ -403,7 +400,7 @@ export default function UpdatePage({
|
|||||||
disposed = true;
|
disposed = true;
|
||||||
if (timer !== undefined) window.clearTimeout(timer);
|
if (timer !== undefined) window.clearTimeout(timer);
|
||||||
};
|
};
|
||||||
}, [isMock, job?.id, job?.status, job?.operation, notify, restartSeconds]);
|
}, [isMock, job?.id, job?.status, job?.operation, notify]);
|
||||||
|
|
||||||
// Check update handler
|
// Check update handler
|
||||||
const check = async () => {
|
const check = async () => {
|
||||||
@@ -423,7 +420,11 @@ export default function UpdatePage({
|
|||||||
setLiveInfo(await api<UpdateInfo>("/api/update/check", { method: "POST" }));
|
setLiveInfo(await api<UpdateInfo>("/api/update/check", { method: "POST" }));
|
||||||
notify?.("版本检查完成", "info");
|
notify?.("版本检查完成", "info");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
if (e instanceof ApiError && e.status === 429) {
|
||||||
|
notify?.((e as Error).message, "error");
|
||||||
|
} else {
|
||||||
setError((e as Error).message);
|
setError((e as Error).message);
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
setChecking(false);
|
setChecking(false);
|
||||||
checkInFlight.current = false;
|
checkInFlight.current = false;
|
||||||
@@ -449,40 +450,52 @@ export default function UpdatePage({
|
|||||||
|
|
||||||
// Start download action
|
// Start download action
|
||||||
const startDownload = async () => {
|
const startDownload = async () => {
|
||||||
if (!latest) return;
|
if (!latest || actionInFlight.current || hasActiveJob || canApply) return;
|
||||||
|
actionInFlight.current = true;
|
||||||
setActionBusy(true);
|
setActionBusy(true);
|
||||||
setError("");
|
setError("");
|
||||||
|
setModalError("");
|
||||||
try {
|
try {
|
||||||
const response = await api<{ job: UpdateJob }>("/api/update/download", {
|
const response = await api<{ job: UpdateJob }>("/api/update/download", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify({ version: latest.version }),
|
body: JSON.stringify({ version: latest.version, confirm: true }),
|
||||||
});
|
});
|
||||||
setLiveInfo((current) => (current ? { ...current, job: response.job } : current));
|
setLiveInfo((current) => (current ? { ...current, job: response.job } : current));
|
||||||
setConfirmReadyToDownload(false);
|
setConfirmReadyToDownload(false);
|
||||||
notify?.("已提交下载更新包请求,后台下载中", "info");
|
notify?.("已提交下载更新包请求,后台下载中", "info");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError((e as Error).message);
|
const msg = (e as Error).message;
|
||||||
|
setError(msg);
|
||||||
|
setModalError(msg);
|
||||||
|
notify?.(msg, "error");
|
||||||
} finally {
|
} finally {
|
||||||
setActionBusy(false);
|
setActionBusy(false);
|
||||||
|
actionInFlight.current = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Start apply action
|
// Start apply action
|
||||||
const startApply = async () => {
|
const startApply = async () => {
|
||||||
if (!latest) return;
|
if (!latest || !job || job.status !== "staged" || job.operation !== "download" || actionInFlight.current) return;
|
||||||
|
actionInFlight.current = true;
|
||||||
setActionBusy(true);
|
setActionBusy(true);
|
||||||
setError("");
|
setError("");
|
||||||
|
setModalError("");
|
||||||
try {
|
try {
|
||||||
const response = await api<{ job: UpdateJob }>("/api/update/apply", {
|
const response = await api<{ job: UpdateJob }>("/api/update/apply", {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
body: JSON.stringify({ version: latest.version, confirm: true }),
|
body: JSON.stringify({ version: latest.version, confirm: true, ...(job?.id ? { jobId: job.id } : {}) }),
|
||||||
});
|
});
|
||||||
setLiveInfo((current) => (current ? { ...current, job: response.job } : current));
|
setLiveInfo((current) => (current ? { ...current, job: response.job } : current));
|
||||||
notify?.("已提交升级请求,正在备份并平滑重启…", "info");
|
notify?.("已提交升级请求,正在备份并平滑重启…", "info");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setError((e as Error).message);
|
const msg = (e as Error).message;
|
||||||
|
setError(msg);
|
||||||
|
setModalError(msg);
|
||||||
|
notify?.(msg, "error");
|
||||||
} finally {
|
} finally {
|
||||||
setActionBusy(false);
|
setActionBusy(false);
|
||||||
|
actionInFlight.current = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -717,28 +730,6 @@ export default function UpdatePage({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style={{ marginTop: 14, padding: "10px 14px", background: "var(--tn-navy-50)", border: "1px solid var(--tn-navy-100)", borderRadius: 6, display: "flex", alignItems: "center", justifyContent: "space-between", flexWrap: "wrap", gap: 8, fontSize: "12.5px" }}>
|
|
||||||
<div style={{ display: "flex", flexDirection: "column", gap: 2, minWidth: 260, flex: 1 }}>
|
|
||||||
<span style={{ color: "var(--tn-navy-800)", fontWeight: 500 }}>
|
|
||||||
安装包下载直链 ({latest.assetName || "发布包"}):
|
|
||||||
</span>
|
|
||||||
<code style={{ fontSize: "11.5px", color: "var(--tn-navy-600)", wordBreak: "break-all" }}>
|
|
||||||
{latest.assetUrl || `https://git.awaioi.com/awaioi/TallyNote/releases/download/v${latest.version}/${latest.assetName || `tallynote-${latest.version}-linux-x64-glibc.tar.gz`}`}
|
|
||||||
</code>
|
|
||||||
</div>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => {
|
|
||||||
const url = latest.assetUrl || `https://git.awaioi.com/awaioi/TallyNote/releases/download/v${latest.version}/${latest.assetName || `tallynote-${latest.version}-linux-x64-glibc.tar.gz`}`;
|
|
||||||
navigator.clipboard.writeText(url);
|
|
||||||
notify?.("已复制安装包下载直链", "success");
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
复制直链
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="tn-ascii-release-actions">
|
<div className="tn-ascii-release-actions">
|
||||||
{canDownload && (
|
{canDownload && (
|
||||||
<Button
|
<Button
|
||||||
@@ -746,7 +737,7 @@ export default function UpdatePage({
|
|||||||
size="large"
|
size="large"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setConfirmReadyToDownload(true);
|
setConfirmReadyToDownload(true);
|
||||||
setShowUpgradeModal(true);
|
setModalError(""); setShowUpgradeModal(true);
|
||||||
}}
|
}}
|
||||||
disabled={actionBusy}
|
disabled={actionBusy}
|
||||||
icon={<Download size={16} />}
|
icon={<Download size={16} />}
|
||||||
@@ -829,6 +820,13 @@ export default function UpdatePage({
|
|||||||
onClose={() => setShowUpgradeModal(false)}
|
onClose={() => setShowUpgradeModal(false)}
|
||||||
>
|
>
|
||||||
<div className="tn-stepper-surface">
|
<div className="tn-stepper-surface">
|
||||||
|
{modalError && (
|
||||||
|
<div className="tn-modal-error-banner" role="alert">
|
||||||
|
<AlertCircle size={16} />
|
||||||
|
<span>{modalError}</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* 4 Steps Horizontal (Exact ASCII: (1) 版本确认 (2) 下载更新包 (3) 校验与准备 (4) 重启恢复) */}
|
{/* 4 Steps Horizontal (Exact ASCII: (1) 版本确认 (2) 下载更新包 (3) 校验与准备 (4) 重启恢复) */}
|
||||||
<div className="tn-stepper-wrap">
|
<div className="tn-stepper-wrap">
|
||||||
<Steps current={currentStep} theme="default">
|
<Steps current={currentStep} theme="default">
|
||||||
@@ -878,10 +876,8 @@ export default function UpdatePage({
|
|||||||
{/* 场景 A: 实时下载中态 (Exact ASCII) */}
|
{/* 场景 A: 实时下载中态 (Exact ASCII) */}
|
||||||
{job?.status === "downloading" && (
|
{job?.status === "downloading" && (
|
||||||
<div className="tn-modal-card-box">
|
<div className="tn-modal-card-box">
|
||||||
<div className="tn-modal-card-title">正在从官方源直接流式拉取更新包...</div>
|
<div className="tn-modal-card-title">正在从官方源流式下载完整安装包 ({job.sizeBytes ? bytesText(job.sizeBytes) : "115 MB"})...</div>
|
||||||
<div style={{ fontSize: "12px", color: "var(--tn-navy-600)", margin: "-4px 0 12px 0", wordBreak: "break-all" }}>
|
|
||||||
请求地址: <code>{job.assetUrl || latest?.assetUrl || `https://git.awaioi.com/awaioi/TallyNote/releases/download/v${latest?.version || job.version}/${job.assetName || "release.tar.gz"}`}</code>
|
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
className="tn-progress-stream"
|
className="tn-progress-stream"
|
||||||
role="progressbar"
|
role="progressbar"
|
||||||
@@ -906,7 +902,7 @@ export default function UpdatePage({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="tn-modal-info-note">
|
<div className="tn-modal-info-note">
|
||||||
[i] 更新包由应用进程直接流式拉取并自动比对 SHA-256 校验和,0 秒秒级启动,无需等待外部系统守护进程调度。
|
[i] 正在流式拉取全量生产包(含运行环境与全部依赖),进度实时更新,不影响当前前台记账操作。
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="tn-modal-actions-bar">
|
<div className="tn-modal-actions-bar">
|
||||||
@@ -921,11 +917,9 @@ export default function UpdatePage({
|
|||||||
{job?.status === "queued" && (
|
{job?.status === "queued" && (
|
||||||
<div className="tn-modal-card-box">
|
<div className="tn-modal-card-box">
|
||||||
<div className="tn-modal-card-title">
|
<div className="tn-modal-card-title">
|
||||||
<div style={{ marginBottom: 12 }}><BeamBar width={160} /></div>正在建立与官方 Git 仓库的流式传输连接...
|
<div style={{ marginBottom: 12 }}><BeamBar width={160} /></div>正在等待系统更新服务接管任务...
|
||||||
</div>
|
|
||||||
<div style={{ fontSize: "12px", color: "var(--tn-navy-600)", margin: "4px 0 14px 0", wordBreak: "break-all" }}>
|
|
||||||
目标地址: <code>{job.assetUrl || latest?.assetUrl || "https://git.awaioi.com"}</code>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="tn-modal-actions-bar">
|
<div className="tn-modal-actions-bar">
|
||||||
<Button variant="outline" onClick={() => void cancelJob()} loading={cancelling} disabled={cancelling}>
|
<Button variant="outline" onClick={() => void cancelJob()} loading={cancelling} disabled={cancelling}>
|
||||||
取消
|
取消
|
||||||
@@ -934,12 +928,28 @@ export default function UpdatePage({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
{/* 场景 B2: 校验与环境就绪中 (verifying) */}
|
||||||
|
{job?.status === "verifying" && (
|
||||||
|
<div className="tn-modal-card-box">
|
||||||
|
<div className="tn-modal-card-title">
|
||||||
|
<div style={{ marginBottom: 12 }}><BeamBar width={180} /></div>
|
||||||
|
正在比对安全指纹并解压更新包...
|
||||||
|
</div>
|
||||||
|
<div style={{ fontSize: "14px", color: "var(--tn-navy-900)", margin: "10px 0 8px", fontWeight: 500 }}>
|
||||||
|
SHA-256 指纹核验通过,正在将生产环境就绪至版本暂存区...
|
||||||
|
</div>
|
||||||
|
<p className="text-secondary" style={{ fontSize: "13px", margin: "0 0 16px 0", lineHeight: 1.6 }}>
|
||||||
|
系统正在核对发布包完整性与解压 dist 生产运行结构,校验就绪后将立即亮起“立即应用”按钮。
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{/* 场景 C: 校验通过准备就绪 (staged) (Exact ASCII) */}
|
{/* 场景 C: 校验通过准备就绪 (staged) (Exact ASCII) */}
|
||||||
{job?.status === "staged" && (
|
{job?.status === "staged" && (
|
||||||
<div className="tn-modal-card-box">
|
<div className="tn-modal-card-box">
|
||||||
<div className="tn-modal-card-title" style={{ color: "#2f7d5c", display: "flex", alignItems: "center", gap: 8 }}>
|
<div className="tn-modal-card-title" style={{ color: "#2f7d5c", display: "flex", alignItems: "center", gap: 8 }}>
|
||||||
<CheckCircle2 size={18} />
|
<CheckCircle2 size={18} />
|
||||||
更新包下载完成,SHA-256 指纹与 Ed25519 数字签名校验无误,准备就绪。
|
全量安装包下载与校验完成,SHA-256 指纹核对无误,准备就绪!
|
||||||
</div>
|
</div>
|
||||||
<div className="tn-upgrade-safety-tips" style={{ margin: "14px 0" }}>
|
<div className="tn-upgrade-safety-tips" style={{ margin: "14px 0" }}>
|
||||||
<div>• 点击立即应用后,系统将自动创建数据库与附件的完整快照备份;</div>
|
<div>• 点击立即应用后,系统将自动创建数据库与附件的完整快照备份;</div>
|
||||||
|
|||||||
@@ -116,7 +116,35 @@ input:focus-visible, textarea:focus-visible, select:focus-visible {
|
|||||||
transition: all 0.22s cubic-bezier(0.16, 1, 0.3, 1) !important;
|
transition: all 0.22s cubic-bezier(0.16, 1, 0.3, 1) !important;
|
||||||
}
|
}
|
||||||
.t-notification__show--top-right {
|
.t-notification__show--top-right {
|
||||||
right: 20px !important;
|
top: 76px !important;
|
||||||
|
right: 24px !important;
|
||||||
|
z-index: 6000 !important;
|
||||||
|
}
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
.t-notification__show--top-right {
|
||||||
|
top: 16px !important;
|
||||||
|
right: 16px !important;
|
||||||
|
left: 16px !important;
|
||||||
|
width: auto !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.tn-modal-error-banner {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 11px 16px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
border-radius: 6px;
|
||||||
|
background: #fef2f2;
|
||||||
|
border: 1px solid #fecaca;
|
||||||
|
color: #991b1b;
|
||||||
|
font-size: 13.5px;
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
.tn-modal-error-banner svg {
|
||||||
|
flex-shrink: 0;
|
||||||
|
color: #dc2626;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 核心对齐修复:清除 TDesign 默认的 margin-top: 8px 导致的文字下沉不居中 */
|
/* 核心对齐修复:清除 TDesign 默认的 margin-top: 8px 导致的文字下沉不居中 */
|
||||||
@@ -501,7 +529,7 @@ input:focus-visible, textarea:focus-visible, select:focus-visible {
|
|||||||
.tn-dashboard-month-control .tn-dashboard-month { width: 148px; flex: 0 1 148px; }
|
.tn-dashboard-month-control .tn-dashboard-month { width: 148px; flex: 0 1 148px; }
|
||||||
.tn-dashboard-secondary-actions .tn-dashboard-refresh, .tn-dashboard-secondary-actions .tn-dashboard-view { flex: 0 0 auto; }
|
.tn-dashboard-secondary-actions .tn-dashboard-refresh, .tn-dashboard-secondary-actions .tn-dashboard-view { flex: 0 0 auto; }
|
||||||
.tn-layout { animation: tn-app-enter .24s ease-out both; }
|
.tn-layout { animation: tn-app-enter .24s ease-out both; }
|
||||||
.tn-page-transition { animation: tn-page-in .18s ease-out both; }
|
.tn-page-transition { animation: tn-page-in .14s cubic-bezier(0.16, 1, 0.3, 1) both; will-change: opacity, transform; }
|
||||||
.tn-page-actions .t-button { min-height: 36px; }
|
.tn-page-actions .t-button { min-height: 36px; }
|
||||||
.expenses-toolbar { display: flex; align-items: center; gap: 8px; }
|
.expenses-toolbar { display: flex; align-items: center; gap: 8px; }
|
||||||
.expenses-toolbar .t-button--shape-square { width: 36px; height: 36px; min-width: 36px; min-height: 36px; }
|
.expenses-toolbar .t-button--shape-square { width: 36px; height: 36px; min-width: 36px; min-height: 36px; }
|
||||||
@@ -568,7 +596,7 @@ input:focus-visible, textarea:focus-visible, select:focus-visible {
|
|||||||
.tn-spin, .spin { animation: tn-spin .9s linear infinite; }
|
.tn-spin, .spin { animation: tn-spin .9s linear infinite; }
|
||||||
@keyframes tn-spin { to { transform: rotate(360deg); } }
|
@keyframes tn-spin { to { transform: rotate(360deg); } }
|
||||||
|
|
||||||
@keyframes tn-page-in { from { opacity: 0; transform: translateY(4px); } to { opacity: 1; transform: translateY(0); } }
|
@keyframes tn-page-in { from { opacity: 0.88; transform: translateY(2px); } to { opacity: 1; transform: translateY(0); } }
|
||||||
@keyframes tn-app-enter { from { opacity: 0; } to { opacity: 1; } }
|
@keyframes tn-app-enter { from { opacity: 0; } to { opacity: 1; } }
|
||||||
@keyframes tn-auth-page-in { from { opacity: 0; transform: translateY(4px); } to { opacity: 1; transform: translateY(0); } }
|
@keyframes tn-auth-page-in { from { opacity: 0; transform: translateY(4px); } to { opacity: 1; transform: translateY(0); } }
|
||||||
.t-dialog {
|
.t-dialog {
|
||||||
|
|||||||
Reference in New Issue
Block a user