用户端(四面9分批次): 三条全局错误出口、URL 白名单收口、令牌键单点、uid 短路进门禁
- 此前全树 0 处全局错误处理器:装 app.config.errorHandler + window error + unhandledrejection, 每条都留可诊断记录、界面只出中文、处理器自身异常不重抛也不白屏(9 例判据)。 - safeHttpUrl 未覆盖的 3 处(两个品牌 Tab 与 useVersionUpdate 直装服务端 file_url)收口; 令牌键 aiimage_auth_token 由 4 处各自定义 + 2 处内联收成唯一定义点。 - 「localStorage 有 uid 就免校验」改走 auth-gate 单点,剩余例外台账化且同口径必须能抓到 评审点名的原写法(6 例);卸载配对 3 处补齐 + 全树判据(7 例)。 - task-status-text 把 CANCELLED 显示成"执行中"改对,CANCELED/CANCELLED 两拼写都映射(4 例)。 - 主审计补的四处修复:新判据里两处拿数组和 0 比(怎么写都红);静默 catch 的"用户可见出口" 符号表认不出本仓 userNotice 与注入式 notify,把真报了用户的 catch 判成静默; 新错误出口带来的 2 个 try/catch 按棘轮合同写理由进基线(296→298,silent 一格没涨)。 - 验收:node --test 820 例 0 红、npx vue-tsc --noEmit rc=0。
This commit is contained in:
@@ -6,6 +6,7 @@ import axios, {
|
||||
type InternalAxiosRequestConfig,
|
||||
} from 'axios'
|
||||
import { authReasonOf, handleKicked, handleSessionExpired, isKickedPayload, isUnauthorizedPayload } from '../auth/kick-handler.ts'
|
||||
import { AUTH_TOKEN_KEY } from '../auth/session-keys.ts'
|
||||
import { userNotice } from '../utils/user-notice.ts'
|
||||
|
||||
const REQUEST_FALLBACK = '请求未能完成,请稍后重试'
|
||||
@@ -103,7 +104,7 @@ function createHttpClient(): AxiosInstance {
|
||||
// 携带本地登录令牌:桌面端同源 cookie 仍可用;dev(5173) 无 cookie 时靠 Bearer 过 Java 鉴权
|
||||
try {
|
||||
if (config.url && config.url.indexOf('/newApi') === 0 && typeof window !== 'undefined') {
|
||||
const token = window.localStorage.getItem('aiimage_auth_token') || ''
|
||||
const token = window.localStorage.getItem(AUTH_TOKEN_KEY) || ''
|
||||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { requestGetJson } from '../../http.ts'
|
||||
import { AUTH_TOKEN_KEY } from '../../../auth/session-keys.ts'
|
||||
|
||||
export interface PermissionMenuItem {
|
||||
id: number | string
|
||||
@@ -72,7 +73,7 @@ export function readCachedAppColumnPermissions(uid: number): PermissionMenuItem[
|
||||
}
|
||||
|
||||
function getAuthToken() {
|
||||
return typeof window === 'undefined' ? '' : window.localStorage.getItem('aiimage_auth_token') || ''
|
||||
return typeof window === 'undefined' ? '' : window.localStorage.getItem(AUTH_TOKEN_KEY) || ''
|
||||
}
|
||||
|
||||
function normalizeColumnKeys(items: PermissionMenuItem[] | undefined) {
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
/**
|
||||
* 登录态门禁判定(收口 2026-10-09 评审「只要 localStorage 里有 uid 就短路免校验」)。
|
||||
*
|
||||
* 原写法:`if (rawUid && Number(rawUid) > 0) return true`——uid 是本机唯一的登录证据时,
|
||||
* 令牌没了、令牌过期了都能直接进页面,直到某个接口 401 才被踢回去;界面上的表现是"页面打开后一片报错"。
|
||||
*
|
||||
* 但不能硬删:桌面端与线上 Web 同源,`http.ts` 里 `withCredentials: true`,
|
||||
* Java 侧的同源会话 cookie 仍然算登录(注释原话"桌面端同源 cookie 仍可用"),
|
||||
* 这种形态本地只有 uid、没有 JWT。直接改成"无令牌即拒"会把这类合法入口锁在登录页外。
|
||||
*
|
||||
* 所以收窄而不是删除:**只有 uid + 令牌同时存在**才免掉一次 `/newApi/check_login`
|
||||
* (令牌本身每次请求都要过后端,门禁这里省的只是那一次往返);
|
||||
* 只有 uid(cookie 形态)或只有令牌 → 一律走服务端校验;两者都没有 → 拒。
|
||||
*
|
||||
* 判据:tests/uid-bypass-ledger.test.ts(真值表行为钉子 + 免校验例外名单 + 新增例外就红)。
|
||||
*/
|
||||
|
||||
/** 'pass-local'=本机证据齐、免一次服务端校验;'restore'=要问服务端;'deny'=直接回登录页。 */
|
||||
export type AuthGateDecision = 'pass-local' | 'restore' | 'deny'
|
||||
|
||||
export interface AuthGateState {
|
||||
/** localStorage 里的 uid 原值 */
|
||||
uid?: string | null
|
||||
/** localStorage 里的登录令牌原值 */
|
||||
token?: string | null
|
||||
}
|
||||
|
||||
/** uid 是否成形:非空且是正整数('0'、''、'abc'、NaN 都不算登录过)。 */
|
||||
export function hasUsableUid(uid?: string | null): boolean {
|
||||
const raw = typeof uid === 'string' ? uid.trim() : ''
|
||||
if (!raw) return false
|
||||
const value = Number(raw)
|
||||
return Number.isFinite(value) && value > 0
|
||||
}
|
||||
|
||||
/** 令牌是否成形:非空字符串。是否有效不由这里判(后端才是唯一裁判)。 */
|
||||
export function hasUsableToken(token?: string | null): boolean {
|
||||
return typeof token === 'string' && token.trim() !== ''
|
||||
}
|
||||
|
||||
/** 门禁判定:唯一致力于"能不能不进登录页"的函数,别处不许再自己拼 uid 条件。 */
|
||||
export function decideAuthGate(state: AuthGateState): AuthGateDecision {
|
||||
const uidOk = hasUsableUid(state.uid)
|
||||
const tokenOk = hasUsableToken(state.token)
|
||||
if (uidOk && tokenOk) return 'pass-local'
|
||||
if (uidOk || tokenOk) return 'restore'
|
||||
return 'deny'
|
||||
}
|
||||
|
||||
/**
|
||||
* 已登录用户访问登录页要不要送回首页(main.ts 的第二处 uid 判断)。
|
||||
* 送回的条件与门禁同源:本机证据齐才拦;只有 uid(要问服务端)时把登录页留给用户,
|
||||
* 否则令牌一丢就永远点不开登录页,只能靠 URL 上的 logout/switch 参数自救。
|
||||
*/
|
||||
export function shouldBounceToHome(state: AuthGateState): boolean {
|
||||
return decideAuthGate(state) === 'pass-local'
|
||||
}
|
||||
@@ -3,18 +3,18 @@
|
||||
*
|
||||
* SPA 化后由 src/main.ts 的路由守卫调用;本模块只做检查与 uid/username 恢复,
|
||||
* 不主动跳转(跳转统一由 router.beforeEach 返回 { name: 'login' })。
|
||||
* - localStorage.uid 已存在(桌面注入 / 登录页已写入)→ 直接放行,零额外请求;
|
||||
* - 无 uid 但有 JWT → 调 /newApi/check_login 恢复 uid/username;
|
||||
* - 无 token 或校验失败 → 返回 false,由守卫跳转登录页。
|
||||
* 放行条件由 shared/auth/auth-gate.ts 单点判定,不再"看见 uid 就免校验":
|
||||
* - uid 与令牌都在(登录页 / 上一次校验已写全)→ 直接放行,零额外请求;
|
||||
* - 只有 uid(桌面端同源 cookie 形态)或只有 JWT → 调 /newApi/check_login 校验并恢复 uid/username;
|
||||
* - 两者都没有或校验失败 → 返回 false,由守卫跳转登录页。
|
||||
*/
|
||||
|
||||
import { get } from '@/shared/api/http'
|
||||
import { decideAuthGate } from './auth-gate.ts'
|
||||
import { AUTH_TOKEN_KEY, UID_KEY } from './session-keys.ts'
|
||||
import { writeCompanyIdentity } from './company-identity'
|
||||
import { writeAccountExpiry } from './account-expiry'
|
||||
|
||||
const AUTH_TOKEN_KEY = 'aiimage_auth_token'
|
||||
const UID_KEY = 'uid'
|
||||
|
||||
interface CheckLoginData {
|
||||
userId?: number | string
|
||||
username?: string
|
||||
@@ -26,12 +26,14 @@ interface CheckLoginData {
|
||||
export async function ensureAuth(): Promise<boolean> {
|
||||
if (typeof window === 'undefined') return true
|
||||
try {
|
||||
const rawUid = window.localStorage.getItem(UID_KEY) || ''
|
||||
if (rawUid && Number(rawUid) > 0) {
|
||||
const decision = decideAuthGate({
|
||||
uid: window.localStorage.getItem(UID_KEY),
|
||||
token: window.localStorage.getItem(AUTH_TOKEN_KEY),
|
||||
})
|
||||
if (decision === 'pass-local') {
|
||||
return true
|
||||
}
|
||||
const token = window.localStorage.getItem(AUTH_TOKEN_KEY) || ''
|
||||
if (!token) {
|
||||
if (decision === 'deny') {
|
||||
return false
|
||||
}
|
||||
const response = await get<{ success: boolean; data?: CheckLoginData }>('/newApi/check_login')
|
||||
@@ -63,13 +65,11 @@ export async function ensureAuth(): Promise<boolean> {
|
||||
export async function restoreLoginUser(): Promise<{ username?: string } | null> {
|
||||
if (typeof window === 'undefined') return null
|
||||
try {
|
||||
const rawUid = window.localStorage.getItem(UID_KEY) || ''
|
||||
if (rawUid && Number(rawUid) > 0) {
|
||||
// 已有 uid(桌面端注入或登录页已写)无需再查
|
||||
return null
|
||||
}
|
||||
const token = window.localStorage.getItem(AUTH_TOKEN_KEY) || ''
|
||||
if (!token) {
|
||||
const decision = decideAuthGate({
|
||||
uid: window.localStorage.getItem(UID_KEY),
|
||||
token: window.localStorage.getItem(AUTH_TOKEN_KEY),
|
||||
})
|
||||
if (decision === 'pass-local' || decision === 'deny') {
|
||||
return null
|
||||
}
|
||||
const response = await get<{ success: boolean; data?: CheckLoginData }>('/newApi/check_login')
|
||||
|
||||
@@ -10,11 +10,7 @@
|
||||
|
||||
import { COMPANY_NAME_STORAGE_KEY } from './company-identity.ts'
|
||||
import { ACCOUNT_EXPIRY_STORAGE_KEY } from './account-expiry.ts'
|
||||
|
||||
const AUTH_TOKEN_KEY = 'aiimage_auth_token'
|
||||
const UID_KEY = 'uid'
|
||||
const USERNAME_KEY = 'username'
|
||||
const AUTO_LOGIN_KEY = 'aiimage_auto_login'
|
||||
import { AUTH_TOKEN_KEY, UID_KEY, USERNAME_KEY, AUTO_LOGIN_KEY } from './session-keys.ts'
|
||||
|
||||
/** 登录页据此标记显示"已被顶下线"警示(路由守卫会吞掉 query,故用 localStorage 兜底)。 */
|
||||
export const KICK_NOTICE_KEY = 'aiimage_kick_notice'
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
/**
|
||||
* 登录态存储键的唯一出处(收口 2026-10-09 评审「令牌键名 4 处各自定义 + 2 处内联」)。
|
||||
*
|
||||
* 令牌键名以前散在 DesktopLoginPage / ensure-auth / kick-handler / user-token-sync 四份常量与
|
||||
* http.ts / permission.ts 两处内联字符串里:改名要同时命中 6 处,漏一处就是"登了又没完全登"
|
||||
* (拦截器读不到令牌、下线收口清不掉旧键)。这里只留一份定义,其余一律 import。
|
||||
*
|
||||
* 判据:tests/auth-token-key-single-source.test.ts(全树字面量清零 + 非零对照 + 分母自证)。
|
||||
*/
|
||||
|
||||
/** 登录令牌(JWT)在 localStorage 里的键名。 */
|
||||
export const AUTH_TOKEN_KEY = 'aiimage_auth_token'
|
||||
|
||||
/** 当前登录用户 id;Java 侧按它选代理池、拼公开直链的 user_id。 */
|
||||
export const UID_KEY = 'uid'
|
||||
|
||||
/** 当前登录用户名,仅用于界面展示。 */
|
||||
export const USERNAME_KEY = 'username'
|
||||
|
||||
/** 是否自动登录('0' = 关)。被顶下线/登录失效时必须关掉,否则两台机器互踢不停。 */
|
||||
export const AUTO_LOGIN_KEY = 'aiimage_auto_login'
|
||||
@@ -1,5 +1,6 @@
|
||||
import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { setUserTokenPushTarget, syncUserTokenToBridge } from '@/shared/auth/user-token-bridge'
|
||||
import { AUTH_TOKEN_KEY } from '@/shared/auth/session-keys.ts'
|
||||
|
||||
/**
|
||||
* 把登录态令牌持续同步给桌面端 Python(A1/A3)。
|
||||
@@ -7,12 +8,18 @@ import { setUserTokenPushTarget, syncUserTokenToBridge } from '@/shared/auth/use
|
||||
* 触发点:应用启动(桥可能未就绪,监听 pywebviewready 后补推)、localStorage 变化(登录/登出)、
|
||||
* 以及每 60 秒兜底轮询(同标签页内 localStorage 变化不触发 storage 事件)。
|
||||
* 网页形态(无桥)静默跳过。
|
||||
*
|
||||
* 卸载配对:三个注册点(2 个 window 监听 + 1 个轮询定时器)的句柄都留在模块里,
|
||||
* `uninstallUserTokenSync()` 逐个摘掉;由根组件 App.vue 的 onBeforeUnmount 调用,
|
||||
* 判据见 tests/listener-timer-pairing.test.ts。
|
||||
*/
|
||||
|
||||
const AUTH_TOKEN_KEY = 'aiimage_auth_token'
|
||||
const POLL_INTERVAL_MS = 60_000
|
||||
|
||||
let installed = false
|
||||
let readyHandler: (() => void) | null = null
|
||||
let storageHandler: ((event: StorageEvent) => void) | null = null
|
||||
let pollTimer: ReturnType<typeof setInterval> | null = null
|
||||
|
||||
function readToken(): string {
|
||||
try {
|
||||
@@ -50,11 +57,34 @@ export function installUserTokenSync(): void {
|
||||
|
||||
// 桥可能晚于脚本就绪:先尝试一次,再在 ready 事件与轮询里补
|
||||
apply()
|
||||
window.addEventListener('pywebviewready', apply)
|
||||
window.addEventListener('storage', (event) => {
|
||||
readyHandler = apply
|
||||
window.addEventListener('pywebviewready', readyHandler)
|
||||
storageHandler = (event: StorageEvent) => {
|
||||
if (!event.key || event.key === AUTH_TOKEN_KEY) {
|
||||
pushNow()
|
||||
}
|
||||
})
|
||||
window.setInterval(pushNow, POLL_INTERVAL_MS)
|
||||
}
|
||||
window.addEventListener('storage', storageHandler)
|
||||
pollTimer = window.setInterval(pushNow, POLL_INTERVAL_MS)
|
||||
}
|
||||
|
||||
/** 卸载:摘掉两个监听并停掉兜底轮询(与 installUserTokenSync 配对,可重复调用)。 */
|
||||
export function uninstallUserTokenSync(): void {
|
||||
if (typeof window === 'undefined') {
|
||||
return
|
||||
}
|
||||
if (readyHandler) {
|
||||
window.removeEventListener('pywebviewready', readyHandler)
|
||||
readyHandler = null
|
||||
}
|
||||
if (storageHandler) {
|
||||
window.removeEventListener('storage', storageHandler)
|
||||
storageHandler = null
|
||||
}
|
||||
if (pollTimer !== null) {
|
||||
window.clearInterval(pollTimer)
|
||||
pollTimer = null
|
||||
}
|
||||
setUserTokenPushTarget(null)
|
||||
installed = false
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
import { computed, ref } from 'vue'
|
||||
import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { isHttpUrl, safeHttpUrl } from '@/shared/utils/safe-url'
|
||||
import { selectChangelogEntries, selectVersionEntry, type ClientChangelogEntry } from '@/shared/client-changelog'
|
||||
import { compareVersions, normVersion } from '@/shared/utils/version-compare'
|
||||
import {
|
||||
@@ -26,6 +27,7 @@ export type { ClientVersionItem } from '@/shared/utils/version-picker'
|
||||
|
||||
const updateProgress = ref<UpdateProgress | null>(null)
|
||||
let progressListenerBound = false
|
||||
let progressListener: ((event: Event) => void) | null = null
|
||||
|
||||
// 公开版本列表:登录页与首页共用同一份缓存(SPA 内路由切换不重复拉取)
|
||||
const versions = ref<ClientVersionItem[]>([])
|
||||
@@ -40,11 +42,22 @@ let versionListLoaded = false
|
||||
function bindProgressListener() {
|
||||
if (progressListenerBound || typeof window === 'undefined') return
|
||||
progressListenerBound = true
|
||||
window.addEventListener('pywebview-update-progress', (event) => {
|
||||
progressListener = (event: Event) => {
|
||||
const progress = normalizeUpdateProgress((event as CustomEvent<unknown>).detail)
|
||||
if (!progress) return
|
||||
updateProgress.value = progress
|
||||
})
|
||||
}
|
||||
window.addEventListener('pywebview-update-progress', progressListener)
|
||||
}
|
||||
|
||||
/** 与 bindProgressListener 配对的卸载出口(App.vue onBeforeUnmount 调用)。 */
|
||||
export function disposeUpdateProgressListener() {
|
||||
if (typeof window === 'undefined') return
|
||||
if (progressListener) {
|
||||
window.removeEventListener('pywebview-update-progress', progressListener)
|
||||
progressListener = null
|
||||
}
|
||||
progressListenerBound = false
|
||||
}
|
||||
|
||||
async function fetchJson(url: string): Promise<Record<string, unknown>> {
|
||||
@@ -178,7 +191,13 @@ export function useVersionUpdate() {
|
||||
if (!doUpdateApp) {
|
||||
// 网页/无桌面桥形态:OSS 公开直链直接下载安装包(区别于桌面端自动下载安装)
|
||||
hint.value = '开始下载安装包,若浏览器未响应请再次点击...'
|
||||
window.location.href = url
|
||||
if (!isHttpUrl(url)) {
|
||||
console.warn('[safe-url] 更新包地址未通过白名单校验,已取消下载:', String(url).slice(0, 200))
|
||||
hint.value = '更新包地址不可用,请稍后重试或在本机客户端中打开'
|
||||
updating.value = false
|
||||
return
|
||||
}
|
||||
window.location.href = safeHttpUrl(url)
|
||||
updating.value = false
|
||||
return
|
||||
}
|
||||
|
||||
@@ -0,0 +1,188 @@
|
||||
/**
|
||||
* 全局错误处理器(收口 2026-10-09 评审「全树 errorHandler / unhandledrejection / onerror 各 0 处」)。
|
||||
*
|
||||
* 这一层之前是没有的:Vue 渲染期抛错只往控制台吐,界面上什么都不说,用户读到的是"点了没反应";
|
||||
* Promise 没接住的 rejection(接口栈、桥调用)更是直接消失。这里补三个出口并一次装好:
|
||||
* ① `app.config.errorHandler`——组件渲染 / 生命周期 / watcher 抛错;
|
||||
* ② `window` 的 `error` 事件——脱离 Vue 调用栈的顶层同步异常;
|
||||
* ③ `window` 的 `unhandledrejection`——没人 catch 的 Promise。
|
||||
*
|
||||
* 三条规矩:
|
||||
* - 界面只说中文:原文一律先过 `userNotice()`(英文异常原文只进控制台记录),
|
||||
* 这条是全项目的硬规矩,见 tests/user-notice-chinese-only-guard.test.ts;
|
||||
* - 一条都不能静默:每条错误都往记录环里塞一行可诊断文本(含出处与原文),控制台同步留痕;
|
||||
* - 不许把页面搞白屏:处理器自身异常被兜住(兜法里带一次可见提示,不是空 catch),
|
||||
* 并且绝不向上重抛;提示按冷却时间去重,避免渲染循环把界面刷成弹窗瀑布。
|
||||
*
|
||||
* 装好之后返回卸载函数,`disposeGlobalErrorGuard()` 由根组件 onBeforeUnmount 调用(卸载配对)。
|
||||
*/
|
||||
|
||||
import type { ComponentPublicInstance } from 'vue'
|
||||
import { userNotice } from './user-notice.ts'
|
||||
|
||||
/** 记录环上限:再多也没人看,只是把内存当日志盘。 */
|
||||
export const APP_ERROR_RECORD_LIMIT = 20
|
||||
|
||||
/** 两条界面提示之间的最短间隔:渲染循环里的同一个错不该刷出十条弹窗。 */
|
||||
export const APP_ERROR_NOTICE_COOLDOWN_MS = 5000
|
||||
|
||||
/** 单条记录里原文的截断长度。 */
|
||||
export const APP_ERROR_RAW_TEXT_LIMIT = 400
|
||||
|
||||
/** 兜底话术:原文不是中文时给用户看的那句(口语可读,不含异常名)。 */
|
||||
export const APP_ERROR_NOTICE_TEXT = '页面出了点问题,这一步没能完成。可以先刷新页面再试一次,反复出现请把刚才的操作告诉客服。'
|
||||
|
||||
/** 错误处理器自己出问题时说的话:不能拿异常原文当提示,也不能假装没事。 */
|
||||
const GUARD_FAILURE_TEXT = '页面出了点问题,提示消息暂时显示不出来。请刷新页面后重试。'
|
||||
|
||||
/** Vue 的 app 实例上我们要碰的那一个字段(只声明用到的形状,方便测试里给个假对象)。 */
|
||||
export interface ErrorGuardApp {
|
||||
config: {
|
||||
errorHandler?: (err: unknown, instance: ComponentPublicInstance | null, info: string) => void
|
||||
}
|
||||
}
|
||||
|
||||
export interface ErrorGuardListener {
|
||||
(event: unknown): void
|
||||
}
|
||||
|
||||
/** window 的注销形状(同样只声明用到的部分)。 */
|
||||
export interface ErrorGuardHost {
|
||||
addEventListener?: (type: string, listener: ErrorGuardListener) => void
|
||||
removeEventListener?: (type: string, listener: ErrorGuardListener) => void
|
||||
}
|
||||
|
||||
export interface ErrorGuardDeps {
|
||||
/** 用户可见出口(生产接 ElMessage.error,测试里注入假函数) */
|
||||
notify: (text: string) => void
|
||||
/** 落一条可诊断记录(默认 console.error + 内存环) */
|
||||
record?: (line: string) => void
|
||||
/** 时间源,冷却判定用 */
|
||||
now?: () => number
|
||||
}
|
||||
|
||||
let records: string[] = []
|
||||
let noticeSentAt = 0
|
||||
let suppressedSinceLastNotice = 0
|
||||
let currentDisposer: (() => void) | null = null
|
||||
|
||||
/** 内存环里的最近若干条错误(支持同学排查时可在控制台 `__aiimageAppErrors()` 直接看)。 */
|
||||
export function getAppErrorRecords(): string[] {
|
||||
return records.slice()
|
||||
}
|
||||
|
||||
/** 清空记录环(测试用;界面上没有入口,别拿它当"错误已被处理")。 */
|
||||
export function clearAppErrorRecords(): void {
|
||||
records = []
|
||||
suppressedSinceLastNotice = 0
|
||||
}
|
||||
|
||||
/** 取原文:Error 取 message,字符串原样,其余尽量给个能看的形状。 */
|
||||
export function errorRawText(reason: unknown): string {
|
||||
if (reason instanceof Error) return String(reason.message ?? '')
|
||||
if (typeof reason === 'string') return reason
|
||||
if (reason === null || reason === undefined) return ''
|
||||
try {
|
||||
return String(reason)
|
||||
} catch {
|
||||
return '[无法转成文本的错误对象]'
|
||||
}
|
||||
}
|
||||
|
||||
/** 一行可诊断记录:出处 + 原文,只进控制台和内存环,不上界面。 */
|
||||
export function describeAppError(context: string, reason: unknown): string {
|
||||
const raw = errorRawText(reason).slice(0, APP_ERROR_RAW_TEXT_LIMIT)
|
||||
return `[${context}] ${raw || '(没有错误原文)'}`
|
||||
}
|
||||
|
||||
/** 界面文案:中文主干留下,英文原文(Java 栈名、`Network Error` 这类)换成中文兜底句。 */
|
||||
export function userTextForError(reason: unknown): string {
|
||||
return userNotice(errorRawText(reason), APP_ERROR_NOTICE_TEXT)
|
||||
}
|
||||
|
||||
function defaultRecord(line: string): void {
|
||||
console.error('[app-error]', line)
|
||||
}
|
||||
|
||||
/**
|
||||
* 一条错误进出自口:记录一定落,界面提示按冷却去重。
|
||||
* 被冷却吞掉的条数记在案,下一条真提示时补一句"还有 N 次同样的问题"。
|
||||
*/
|
||||
function report(context: string, reason: unknown, deps: ErrorGuardDeps, now: () => number): void {
|
||||
const line = describeAppError(context, reason)
|
||||
records.push(line)
|
||||
if (records.length > APP_ERROR_RECORD_LIMIT) records.splice(0, records.length - APP_ERROR_RECORD_LIMIT)
|
||||
;(deps.record ?? defaultRecord)(line)
|
||||
|
||||
const at = now()
|
||||
if (at - noticeSentAt < APP_ERROR_NOTICE_COOLDOWN_MS) {
|
||||
suppressedSinceLastNotice += 1
|
||||
return
|
||||
}
|
||||
noticeSentAt = at
|
||||
const text = userTextForError(reason)
|
||||
const suffix = suppressedSinceLastNotice > 0 ? `(同样的问题这期间还出现过 ${suppressedSinceLastNotice} 次)` : ''
|
||||
suppressedSinceLastNotice = 0
|
||||
deps.notify(suffix ? `${text}${suffix}` : text)
|
||||
}
|
||||
|
||||
/** 处理器自身不许再把异常抛回框架:兜住之后再给一句中文提示,而不是空 catch。 */
|
||||
function guardRun(body: () => void, deps: ErrorGuardDeps): void {
|
||||
try {
|
||||
body()
|
||||
} catch (fatal) {
|
||||
console.error('[app-error] 错误处理器自身异常', fatal)
|
||||
deps.notify(GUARD_FAILURE_TEXT)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 装上全局错误出口。第二个参数把"界面提示"和"记录"两个出口注进来,
|
||||
* 生产在 main.ts 用 ElMessage + console,测试给假对象,判据才跑得动。
|
||||
*/
|
||||
export function installGlobalErrorGuard(
|
||||
app: ErrorGuardApp,
|
||||
deps: ErrorGuardDeps,
|
||||
host?: ErrorGuardHost,
|
||||
): () => void {
|
||||
const now = deps.now ?? Date.now
|
||||
const listenerHost = host ?? (typeof window === 'undefined' ? undefined : (window as unknown as ErrorGuardHost))
|
||||
|
||||
const handleError = (event: unknown) => {
|
||||
guardRun(() => {
|
||||
const detail = event as { message?: unknown; error?: unknown } | undefined
|
||||
report('window.error', detail && detail.error !== undefined ? detail.error : detail?.message, deps, now)
|
||||
}, deps)
|
||||
}
|
||||
|
||||
const handleRejection = (event: unknown) => {
|
||||
guardRun(() => {
|
||||
report('unhandledrejection', (event as { reason?: unknown } | undefined)?.reason, deps, now)
|
||||
}, deps)
|
||||
}
|
||||
|
||||
app.config.errorHandler = (err: unknown, _instance: unknown, info: string) => {
|
||||
guardRun(() => {
|
||||
report(`vue:${info || 'unknown'}`, err, deps, now)
|
||||
}, deps)
|
||||
}
|
||||
|
||||
listenerHost?.addEventListener?.('error', handleError)
|
||||
listenerHost?.addEventListener?.('unhandledrejection', handleRejection)
|
||||
|
||||
const dispose = () => {
|
||||
listenerHost?.removeEventListener?.('error', handleError)
|
||||
listenerHost?.removeEventListener?.('unhandledrejection', handleRejection)
|
||||
app.config.errorHandler = undefined
|
||||
if (currentDisposer === dispose) currentDisposer = null
|
||||
}
|
||||
currentDisposer = dispose
|
||||
return dispose
|
||||
}
|
||||
|
||||
/** 卸载全局错误出口(根组件 onBeforeUnmount 调用,与 installGlobalErrorGuard 配对)。 */
|
||||
export function disposeGlobalErrorGuard(): void {
|
||||
const dispose = currentDisposer
|
||||
currentDisposer = null
|
||||
dispose?.()
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { computed, reactive } from 'vue'
|
||||
|
||||
import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { isHttpUrl } from './safe-url'
|
||||
|
||||
export type DownloadProgressStatus = 'selecting' | 'running' | 'success' | 'failed' | 'cancelled'
|
||||
|
||||
@@ -98,7 +99,24 @@ export function ensureDownloadProgressListener() {
|
||||
if (progressListenerBound || typeof window === 'undefined') return
|
||||
progressListenerBound = true
|
||||
window.addEventListener('pywebview-download-progress', handlePywebviewProgress)
|
||||
}export function useDownloadProgress() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 与 ensureDownloadProgressListener 配对的卸载出口:摘掉桥事件监听并停掉清扫定时器。
|
||||
* 由根组件 App.vue 的 onBeforeUnmount 调用(判据见 tests/listener-timer-pairing.test.ts)。
|
||||
*/
|
||||
export function disposeDownloadProgressListener() {
|
||||
if (typeof window !== 'undefined' && progressListenerBound) {
|
||||
window.removeEventListener('pywebview-download-progress', handlePywebviewProgress)
|
||||
progressListenerBound = false
|
||||
}
|
||||
if (sweepTimer !== null) {
|
||||
clearInterval(sweepTimer)
|
||||
sweepTimer = null
|
||||
}
|
||||
}
|
||||
|
||||
export function useDownloadProgress() {
|
||||
ensureDownloadProgressListener()
|
||||
const items = computed(() =>
|
||||
Object.values(progressItems)
|
||||
@@ -120,8 +138,26 @@ function buildDownloadId(filename: string) {
|
||||
return `download:${Date.now()}:${Math.random().toString(16).slice(2)}:${safeName}`
|
||||
}
|
||||
|
||||
/** 白名单不通过时的统一说法:进度条目与返回值都用这一句(中文,用户读得懂)。 */
|
||||
const UNSAFE_DOWNLOAD_URL_TEXT = '下载地址不可用,请稍后重试或在本机客户端中打开'
|
||||
|
||||
export async function saveUrlWithProgress(url: string, filename: string, id = buildDownloadId(filename)) {
|
||||
ensureDownloadProgressListener()
|
||||
// 服务端/客户端透传的 file_url、downloadUrl 是开放字段,进桥之前先过白名单:
|
||||
// 校验不过就不发起下载,原因既落进度条目也进控制台留一行可查的记录(判据:tests/url-outlet-guard.test.ts)
|
||||
if (!isHttpUrl(url)) {
|
||||
console.warn('[safe-url] 下载地址未通过白名单校验,已取消下载:', String(url).slice(0, 200))
|
||||
upsertProgress({
|
||||
id,
|
||||
filename,
|
||||
status: 'failed',
|
||||
downloaded: 0,
|
||||
total: 0,
|
||||
percent: 0,
|
||||
error: UNSAFE_DOWNLOAD_URL_TEXT,
|
||||
})
|
||||
return { success: false, error: UNSAFE_DOWNLOAD_URL_TEXT }
|
||||
}
|
||||
const api = getPywebviewApi()
|
||||
if (!api?.save_file_from_url_new) {
|
||||
upsertProgress({
|
||||
|
||||
@@ -21,3 +21,13 @@ export function safeHttpUrl(raw?: string | null): string {
|
||||
}
|
||||
return ALLOWED_PROTOCOLS.has(parsed.protocol) ? value : '#'
|
||||
}
|
||||
|
||||
/**
|
||||
* 判定版:给"要不要跳转/下载"用。
|
||||
*
|
||||
* `safeHttpUrl` 的兜底是 `'#'`,那是写给 `a[href]` 的(点了不动);跳转与下载要先知道
|
||||
* "这地址到底能不能用",否则 `window.open('#')` 会开一张空白标签页,用户看到的比不给还糟。
|
||||
*/
|
||||
export function isHttpUrl(raw?: string | null): boolean {
|
||||
return safeHttpUrl(raw) !== '#'
|
||||
}
|
||||
|
||||
@@ -35,6 +35,7 @@ export const TASK_STATUS_TEXT: Record<string, string> = {
|
||||
RUNNING: '执行中',
|
||||
PENDING: '等待中',
|
||||
CANCELLED: '已取消',
|
||||
CANCELED: '已取消',
|
||||
SCHEDULED: '待执行',
|
||||
QUEUED: '排队中',
|
||||
};
|
||||
@@ -44,9 +45,19 @@ export const TASK_STATUS_CLASS: Record<string, TaskStatusClassName> = {
|
||||
COMPLETED: 'success',
|
||||
FAILED: 'failed',
|
||||
CANCELLED: 'failed',
|
||||
CANCELED: 'failed',
|
||||
RUNNING: 'running',
|
||||
};
|
||||
|
||||
/**
|
||||
* 取消态词表(美式 CANCELED 与英式 CANCELLED 并存:Java 侧两种都发得出,实测 35 与 16 处)。
|
||||
* 显示面必须都认,漏一个拼写它就掉进"未命中"的兜底里,在页面上被说成"执行中"。
|
||||
*/
|
||||
export const CANCELLED_STATUS_WORDS: readonly string[] = ['CANCELLED', 'CANCELED'];
|
||||
|
||||
/** 取消态文案:三页共用(原来靠 textFallback 兜,结果被念成「执行中」)。 */
|
||||
export const CANCELLED_STATUS_TEXT = '已取消';
|
||||
|
||||
export const TASK_STATUS_TEXT_FALLBACK = '等待中';
|
||||
export const TASK_STATUS_CLASS_FALLBACK: TaskStatusClassName = 'pending';
|
||||
|
||||
@@ -77,11 +88,27 @@ export function taskStatusClass(status?: string | null, overrides?: TaskStatusOp
|
||||
/**
|
||||
* 非终态一律显示「执行中」/ running 的页面(BrandWithdrawTab、BrandPatrolDeleteTab、
|
||||
* BrandQueryAsinTab 原行为):只区分 SUCCESS/COMPLETED/FAILED 三种终态。
|
||||
*
|
||||
* 但"取消"不是"还没跑完":任务已经被撤掉了却说成执行中,用户会一直等一个不会来的结果
|
||||
* (2026-10-09 评审实测:CANCELLED 在这 3 页显示为「执行中」)。所以取消态点名,
|
||||
* 两种拼写都列,别再让它掉进 textFallback。
|
||||
*/
|
||||
export const RUNNING_UNTIL_DONE_STATUS_OPTIONS: TaskStatusOptions = {
|
||||
replace: true,
|
||||
text: { SUCCESS: '已完成', COMPLETED: '已完成', FAILED: '失败' },
|
||||
classMap: { SUCCESS: 'success', COMPLETED: 'success', FAILED: 'failed' },
|
||||
text: {
|
||||
SUCCESS: '已完成',
|
||||
COMPLETED: '已完成',
|
||||
FAILED: '失败',
|
||||
CANCELLED: CANCELLED_STATUS_TEXT,
|
||||
CANCELED: CANCELLED_STATUS_TEXT,
|
||||
},
|
||||
classMap: {
|
||||
SUCCESS: 'success',
|
||||
COMPLETED: 'success',
|
||||
FAILED: 'failed',
|
||||
CANCELLED: 'failed',
|
||||
CANCELED: 'failed',
|
||||
},
|
||||
textFallback: '执行中',
|
||||
classFallback: 'running',
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user