feat(phase-4): AC-16/17/18 前端登录态与分片上传、后管包体与竞态门
AC-16(S1-F1/S1-F2) - frontend-vue ensureAuth:清态前先判 isAuthError——弱网/超时/5xx 不再把人踢回登录页; http.ts 的 onResponseRejected 给错误打鉴权标记(HTTP 401 与业务 401/4011 都算), 纯网络错误保留底层文案供调用方区分"断网"与"掉登录";clearLocalSession 导出复用。 - admin 全局错误兜底:main.ts 装 app.config.errorHandler(首屏就崩也接得住), window error / unhandledrejection 由 App.vue setup 调 useGlobalErrorReporting() 接线, 卸载出口在 onBeforeUnmount 摘监听与提示定时器(后管的 timer-cleanup-pairing 尺子要求 "注册点所在文件找得回反注册 + 卸载钩子",故接线必须在组件作用域,不在 main.ts)。 上报体只带 kind/message/stack/route/ts 并过脱敏(Bearer、JWT 三段式、query 里疑似 token/key/secret 的取值一律打码),凭据零容忍;服务端新增 /api/admin/client-errors(requireAdmin,字段截断 2000 后 WARN 落日志,不落库)。 AC-17(S1-F3) - 后端新增分片通道 ChunkedUploadService(init/part/status/complete/abort):8MB/片、 同片重复上传幂等覆盖、流式拼装复算 sha256、超限与缺片直接拒绝、24h 过期回收; FileUploadController 暴露 /api/files/chunk/**,LocalFileStorageService 加 saveTempFileFromFile(同一套扩展名黑名单与 fileKey 索引);三键显式写进 application.yml (不进"只在代码默认值里"的名单)。 - 工作台安装包 93MB:WorkbenchClientPackageService 走同一分片通道转存 client 桶 (objectKey 写进会话 purpose,拼装时逐字匹配,防借分片接口覆盖已发布包), confirm 失败带 cleanupUnconfirmedObject 补偿清理未登记对象;后管 ≤64MB 仍直传预签名 PUT。 - 用户端 upload.ts:大文件分片 + 逐片重试 + 进度回调,超时按体积给(不再固定 120s); 断点探测失败不再静默按"全缺"重传(catch-silence 棘轮因此一格没涨,blocks 300→301 已记名)。 AC-18(P1-F1/P1-F2/P1-F4/S1-F4) - 后管 manualChunks 摘掉 element-plus(按需引入已在 src/plugins/element.ts 生效): 实测构建产物已无 element-plus 独立 chunk,index.html 只 modulepreload vue 块。 - UsersPage/DeviceLogsPage 接 createLatestRequestGate,旧响应不再覆盖新页; 用户端新增 useServerTablePaging(只驻留当前页 + 自带竞态门 + 失败给原因), 挂载用例 3 例钉住"翻页重取/旧响应作废/失败可见"。 - DeliveryVideoWorkspace 两处轮询接 document.visibilityState,隐藏标签页暂停。 激活 Phase 0 预置契约 7 例(用户端 5 + 后管 5,共 12 例;其中 AC-16 后管两支按"接线在组件作用域" 的口径改写并把判据加强到反注册配对 + 根组件接线,见蓝图 §5)。 门禁读数:后端 mvn -o test-compile rc=0,CatchSilenceRatchetTest 9 例绿(total 1034→1045、 notRethrow 585→591、logOnly 182→188 逐处记名,EMPTY 未涨)、ChunkedUploadServiceTest 8 例、 WorkbenchClientPackageServiceTest 21 例、ClientErrorReportControllerTest 4 例;后管 1848 例 + mount 33 例 + vue-tsc + build 全绿;用户端 955 例 + mount 30 例 + vue-tsc + build 全绿。 真机:OssWorkbenchClientLiveVerificationTest 以线上 MinIO 实测 PUT→stat→sha256→presign→删除 全链 1 例绿(凭据只走环境变量,不落任何文件)。 ⚠ 按 pathspec 只圈本轮文件:application.yml 用索引手术只提交分片三键那一格,他人 「PENDING 不再按 2 小时判死」的 StaleTaskRepairService/ClientTaskPullSpi/application.yml 注释件与 useLiveTaskBoard/BrandAppearancePatentTab/task-delete-target 四件在飞改动 原样留在工作树未提交。
This commit is contained in:
@@ -815,6 +815,30 @@ function sleep(milliseconds: number) {
|
||||
return new Promise<void>((resolve) => window.setTimeout(resolve, milliseconds))
|
||||
}
|
||||
|
||||
/**
|
||||
* 隐藏标签页暂停轮询(P1-F4):页面不可见时不再每 5 秒打一次任务接口,
|
||||
* 等 visibilitychange 回前台再放行。回到前台后第一次等待照常执行,不改变终态判定。
|
||||
*/
|
||||
function waitWhileHidden(): Promise<void> {
|
||||
if (typeof document === 'undefined' || document.visibilityState !== 'hidden') {
|
||||
return Promise.resolve()
|
||||
}
|
||||
return new Promise<void>((resolve) => {
|
||||
const onVisible = () => {
|
||||
if (document.visibilityState !== 'hidden') {
|
||||
document.removeEventListener('visibilitychange', onVisible)
|
||||
resolve()
|
||||
}
|
||||
}
|
||||
document.addEventListener('visibilitychange', onVisible)
|
||||
})
|
||||
}
|
||||
|
||||
async function sleepRespectingVisibility(milliseconds: number) {
|
||||
await waitWhileHidden()
|
||||
await sleep(milliseconds)
|
||||
}
|
||||
|
||||
async function waitForImageVideoTask(ticket: ImageVideoAsyncTaskVo): Promise<unknown> {
|
||||
let task = ticket
|
||||
for (let pollCount = 0; pollCount < IMAGE_VIDEO_TASK_MAX_POLLS; pollCount += 1) {
|
||||
@@ -826,7 +850,7 @@ async function waitForImageVideoTask(ticket: ImageVideoAsyncTaskVo): Promise<unk
|
||||
if (isTerminalImageVideoTask(task)) {
|
||||
throw new Error(task.errorMessage || 'Coze 任务执行失败')
|
||||
}
|
||||
await sleep(IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
await sleepRespectingVisibility(IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
task = await getImageVideoAsyncTask(task.taskId)
|
||||
}
|
||||
throw new Error('Coze 任务查询超时,请稍后重试')
|
||||
@@ -1133,7 +1157,13 @@ async function pollAssemblyResult(tab: WorkspaceTab, taskId: number) {
|
||||
assembly.polling = false
|
||||
return
|
||||
}
|
||||
assembly.pollTimer = window.setTimeout(() => {
|
||||
assembly.pollTimer = window.setTimeout(async () => {
|
||||
// P1-F4:结果轮询(约 5s/轮)在隐藏标签页里暂停,回前台再续链
|
||||
await waitWhileHidden()
|
||||
if (disposed) {
|
||||
assembly.polling = false
|
||||
return
|
||||
}
|
||||
void pollAssemblyResult(tab, taskId)
|
||||
}, IMAGE_VIDEO_TASK_POLL_DELAY_MS)
|
||||
}
|
||||
|
||||
@@ -83,12 +83,36 @@ export function onResponseFulfilled(response: AxiosResponse): AxiosResponse {
|
||||
/** 响应失败分支:折叠为 Error 之前先判下线(互踢与登录态失效;后者也可能真以 HTTP 401 回来)。 */
|
||||
export function onResponseRejected(error: unknown): Promise<never> {
|
||||
const payload = responsePayloadOf(error)
|
||||
if (isKickedPayload(payload)) {
|
||||
handleKicked()
|
||||
} else if (isUnauthorizedPayload(payload) || responseStatusOf(error) === 401) {
|
||||
handleSessionExpired(authReasonOf(responseHeadersOf(error)))
|
||||
const status = responseStatusOf(error)
|
||||
// S1-F1:把"这是不是鉴权失败"随错误带出去。弱网/5xx 与 401 过去在调用方长得一模一样,
|
||||
// ensureAuth 那条旁路因此逢错就清令牌;现在清态只认这个标注(HTTP 200+code=401 也算)。
|
||||
const authFailure = isKickedPayload(payload) || isUnauthorizedPayload(payload) || status === 401
|
||||
if (authFailure) {
|
||||
if (isKickedPayload(payload)) {
|
||||
handleKicked()
|
||||
} else {
|
||||
handleSessionExpired(authReasonOf(responseHeadersOf(error)))
|
||||
}
|
||||
}
|
||||
return Promise.reject(new Error(extractErrorMessage(error)))
|
||||
const friendly = extractErrorMessage(error)
|
||||
// 纯网络层错误(没有任何响应:断网/DNS/超时)保留底层技术文案——它不是后端返回的英文,
|
||||
// 不受"只透中文"闸门约束;调用方据此区分"网络断了"与"登录失效",据此决定重试还是登出。
|
||||
const noResponse = status === undefined && payload === undefined
|
||||
const rawMessage = (error as { message?: unknown })?.message
|
||||
const message = (!authFailure && noResponse && typeof rawMessage === 'string' && rawMessage)
|
||||
? rawMessage
|
||||
: friendly
|
||||
const rejected = new Error(message) as Error & { isAuthError?: boolean }
|
||||
rejected.isAuthError = authFailure
|
||||
return Promise.reject(rejected)
|
||||
}
|
||||
|
||||
/**
|
||||
* 这次请求失败是否为鉴权类(401/4011/互踢),由 onResponseRejected 标注。
|
||||
* 调用方据此决定要不要清登录态——网络抖动与 5xx 一律不是。
|
||||
*/
|
||||
export function isAuthError(error: unknown): boolean {
|
||||
return (error as { isAuthError?: boolean } | null | undefined)?.isAuthError === true
|
||||
}
|
||||
|
||||
function createHttpClient(): AxiosInstance {
|
||||
|
||||
@@ -24,14 +24,23 @@ export interface UploadTempFileOptions {
|
||||
moduleType?: string;
|
||||
}
|
||||
|
||||
export async function uploadTempFileToJava(
|
||||
/** 分片阈值与片大小(S1-F3/AC-17):≤8MB 单次 multipart 足够;再大必须分片,
|
||||
* 否则视频/大包一断就从 0 重传,且 120s 固定超时对慢链路根本不够用。 */
|
||||
export const UPLOAD_PART_SIZE = 8 * 1024 * 1024
|
||||
export const CHUNK_UPLOAD_THRESHOLD = UPLOAD_PART_SIZE
|
||||
/** 每片重试次数(不含首次)。 */
|
||||
const PART_RETRY_LIMIT = 2
|
||||
|
||||
function uploadPartUrl(uploadId: string, index: number): string {
|
||||
return `${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}/part/${index}`
|
||||
}
|
||||
|
||||
/** 单次 multipart 上传(小文件短链路)。超时按体积给,不再固定 120s。 */
|
||||
async function singleUpload(
|
||||
file: File,
|
||||
relativePathOrOptions?: string | UploadTempFileOptions,
|
||||
) {
|
||||
const options =
|
||||
typeof relativePathOrOptions === 'string'
|
||||
? { relativePath: relativePathOrOptions }
|
||||
: relativePathOrOptions || {}
|
||||
options: UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const formData = new FormData()
|
||||
formData.append('file', file)
|
||||
if (options.relativePath) {
|
||||
@@ -50,8 +59,105 @@ export async function uploadTempFileToJava(
|
||||
headers: {
|
||||
'Content-Type': 'multipart/form-data',
|
||||
},
|
||||
timeout: 120000,
|
||||
// 30s 保底 + 每 MB 15s:慢公网传 100MB 视频不再被固定 120s 掐死(S1-F3)
|
||||
timeout: 30_000 + Math.ceil(file.size / (1024 * 1024)) * 15_000,
|
||||
onUploadProgress: (event) => {
|
||||
if (!onProgress) return
|
||||
const total = event.total || file.size
|
||||
onProgress(total > 0 ? Math.min(Math.round((event.loaded / total) * 100), 100) : 0)
|
||||
},
|
||||
},
|
||||
)
|
||||
return response.data
|
||||
}
|
||||
|
||||
/**
|
||||
* 分片上传(AC-17):init → 逐片 POST(每片独立重试)→ complete 服务端拼装。
|
||||
* 开传前查询已到片号:上一次断掉的会话可跳过已传片(后端保留 24h)。
|
||||
*/
|
||||
async function chunkedUpload(
|
||||
file: File,
|
||||
options: UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const totalParts = Math.max(1, Math.ceil(file.size / UPLOAD_PART_SIZE))
|
||||
const init = await http.post<JavaApiResponse<{ upload_id?: string }>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/init`,
|
||||
null,
|
||||
{ params: { fileName: file.name, totalParts, totalBytes: file.size } },
|
||||
)
|
||||
const uploadId = String(init.data?.data?.upload_id ?? '')
|
||||
if (!uploadId) {
|
||||
throw new Error('后端未返回分片会话,请重试')
|
||||
}
|
||||
|
||||
// 开传前先问到已达片号:上一次断掉的会话可以跳过已传片(后端保留 24h)。
|
||||
// 这一问失败不再静默按"全缺"重传:断网/5xx 当场说清楚,别闷头把整包从 0 再传一遍。
|
||||
const status = await http.get<JavaApiResponse<{ uploaded_parts?: unknown[] }>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}`,
|
||||
)
|
||||
const arrived = status.data?.data?.uploaded_parts
|
||||
const done = new Set<number>(Array.isArray(arrived) ? arrived.map((index) => Number(index)) : [])
|
||||
|
||||
const report = (partialBytes: number) => {
|
||||
if (!onProgress) return
|
||||
const loaded = done.size * UPLOAD_PART_SIZE + partialBytes
|
||||
onProgress(Math.min(Math.round((loaded / file.size) * 100), 99))
|
||||
}
|
||||
|
||||
for (let index = 0; index < totalParts; index += 1) {
|
||||
if (done.has(index)) {
|
||||
report(0)
|
||||
continue
|
||||
}
|
||||
const blob = file.slice(index * UPLOAD_PART_SIZE, Math.min(file.size, (index + 1) * UPLOAD_PART_SIZE))
|
||||
let lastError: unknown = null
|
||||
for (let attempt = 0; attempt <= PART_RETRY_LIMIT; attempt += 1) {
|
||||
const form = new FormData()
|
||||
form.append('file', blob, `part-${index}`)
|
||||
try {
|
||||
await http.post(uploadPartUrl(uploadId, index), form, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' },
|
||||
timeout: 300_000,
|
||||
onUploadProgress: (event) => report(Math.min(event.loaded || 0, blob.size)),
|
||||
})
|
||||
done.add(index)
|
||||
lastError = null
|
||||
break
|
||||
} catch (error) {
|
||||
lastError = error
|
||||
}
|
||||
}
|
||||
if (lastError) {
|
||||
await http.delete(`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}`).catch(() => undefined)
|
||||
throw lastError instanceof Error ? lastError : new Error('分片上传失败')
|
||||
}
|
||||
}
|
||||
|
||||
const params: Record<string, string | boolean> = {}
|
||||
if (options.relativePath) params.relativePath = options.relativePath
|
||||
if (options.uploadToOss) params.uploadToOss = true
|
||||
if (options.moduleType) params.moduleType = options.moduleType
|
||||
const response = await http.post<JavaApiResponse<UploadFileVo>>(
|
||||
`${JAVA_API_PREFIX}/files/chunk/${encodeURIComponent(uploadId)}/complete`,
|
||||
null,
|
||||
{ params, timeout: 600_000 },
|
||||
)
|
||||
if (onProgress) onProgress(100)
|
||||
return response.data
|
||||
}
|
||||
|
||||
export async function uploadTempFileToJava(
|
||||
file: File,
|
||||
relativePathOrOptions?: string | UploadTempFileOptions,
|
||||
onProgress?: (percent: number) => void,
|
||||
): Promise<JavaApiResponse<UploadFileVo>> {
|
||||
const options =
|
||||
typeof relativePathOrOptions === 'string'
|
||||
? { relativePath: relativePathOrOptions }
|
||||
: relativePathOrOptions || {}
|
||||
if (file.size > CHUNK_UPLOAD_THRESHOLD) {
|
||||
return chunkedUpload(file, options, onProgress)
|
||||
}
|
||||
return singleUpload(file, options, onProgress)
|
||||
}
|
||||
|
||||
@@ -9,9 +9,10 @@
|
||||
* - 两者都没有或校验失败 → 返回 false,由守卫跳转登录页。
|
||||
*/
|
||||
|
||||
import { get } from '@/shared/api/http'
|
||||
import { get, isAuthError } from '@/shared/api/http'
|
||||
import { decideAuthGate } from './auth-gate.ts'
|
||||
import { AUTH_TOKEN_KEY, UID_KEY } from './session-keys.ts'
|
||||
import { clearLocalSession } from './kick-handler.ts'
|
||||
import { writeCompanyIdentity } from './company-identity'
|
||||
import { writeAccountExpiry } from './account-expiry'
|
||||
|
||||
@@ -47,12 +48,12 @@ export async function ensureAuth(): Promise<boolean> {
|
||||
writeCompanyIdentity(response.data)
|
||||
writeAccountExpiry(response.data)
|
||||
return true
|
||||
} catch {
|
||||
// token 失效:清掉本地登录态(跳转交给路由守卫)
|
||||
try {
|
||||
window.localStorage.removeItem(AUTH_TOKEN_KEY)
|
||||
} catch {
|
||||
/* 忽略 */
|
||||
} catch (error) {
|
||||
// S1-F1:只有真正的鉴权失败(HTTP 401 / 业务 401·4011)才算登录失效。
|
||||
// 弱网、5xx、超时都是网络问题——过去这里不分原因清掉令牌并把用户踢回登录页,
|
||||
// 现在只在 isAuthError 标注为鉴权类时清态;其余原因保留登录态,交由守卫按原状放行/重试。
|
||||
if (isAuthError(error)) {
|
||||
clearLocalSession()
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ function hadLocalSession(): boolean {
|
||||
}
|
||||
|
||||
/** 清登录态并关闭自动登录。设备号与记住的账号保留:同设备重登不算新设备。 */
|
||||
function clearLocalSession(): void {
|
||||
export function clearLocalSession(): void {
|
||||
try {
|
||||
const storage = window.localStorage
|
||||
storage.removeItem(AUTH_TOKEN_KEY)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
import { computed, onMounted, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
|
||||
/**
|
||||
* 表格分页(2026-09 全维度审查 F9)。
|
||||
@@ -6,6 +6,11 @@ import { computed, ref, watch, type ComputedRef, type Ref } from 'vue'
|
||||
* 工具页的"匹配结果"表此前把整份数据绑到 el-table 的 :data 上,全量行常驻 DOM
|
||||
* (每行 8+ 节点,几百行就会明显拖慢打开/滚动)。这里提供共用的分页切片:
|
||||
* 只改变渲染的数据窗口,不改动数据源本身,因此挑选/删除/提交等逻辑不受影响。
|
||||
*
|
||||
* 2026-10-29(AC-18/P1-F2)补另一半:`useTablePaging` 只切**渲染**窗口,数据仍整份驻内存;
|
||||
* 大列表(撞款矩阵、结果明细)真正的出路是**服务端分页**——每页只从后端取当前窗口。
|
||||
* `useServerTablePaging` 提供这一模式:调用方交一个 `fetchPage({page,pageSize})` 取数函数,
|
||||
* 组件只持有当前页 + 总数,页码/每页变化自动重取(带 latest-request 门防旧响应覆盖)。
|
||||
*/
|
||||
|
||||
/** 默认每页条数:足够一屏展示,又不会让 DOM 随列表规模线性膨胀。 */
|
||||
@@ -60,3 +65,66 @@ export function useTablePaging<T>(
|
||||
|
||||
return { page, pageSize, total, paged }
|
||||
}
|
||||
|
||||
/** 服务端一页的返回形状:调用方从后端响应里整理出 items + total。 */
|
||||
export interface ServerPage<T> {
|
||||
items: T[];
|
||||
total: number;
|
||||
}
|
||||
|
||||
/** 取数函数:按 page(从 1 起)与 pageSize 向后端请求当前窗口。 */
|
||||
export type PageFetcher<T> = (params: { page: number; pageSize: number }) => Promise<ServerPage<T>>
|
||||
|
||||
/** 纯函数:页码越界收敛 + 请求参数拼装,供单测直接对撞(不依赖组件实例)。 */
|
||||
export function resolveServerWindow(page: number, total: number, pageSize: number): { page: number; pageSize: number } {
|
||||
return { page: clampPage(page, total, pageSize), pageSize }
|
||||
}
|
||||
|
||||
/**
|
||||
* 服务端分页(AC-18/P1-F2):只驻留当前页数据,页码或每页变化时重新 fetch。
|
||||
*
|
||||
* - 旧响应覆盖防护:每次 fetch 前 `gate.begin()` 拿令牌,回写前比 `isCurrent`;
|
||||
* 快速翻页/切筛选时晚到的旧页不会盖住新页(与 latest-request 同一语义,这里自带)。
|
||||
* - `reload()` 供外部在增删改后主动刷新当前页。
|
||||
*/
|
||||
export function useServerTablePaging<T>(
|
||||
fetchPage: PageFetcher<T>,
|
||||
pageSize: number = DEFAULT_TABLE_PAGE_SIZE,
|
||||
) {
|
||||
const page = ref(1)
|
||||
const total = ref(0)
|
||||
const rows = ref<T[]>([]) as Ref<T[]>
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
let token = 0
|
||||
|
||||
async function load(): Promise<void> {
|
||||
const current = ++token
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
try {
|
||||
const result = await fetchPage({ page: page.value, pageSize })
|
||||
if (current !== token) return // 已被更新的请求作废,丢弃旧页
|
||||
rows.value = result.items
|
||||
total.value = result.total
|
||||
} catch (e) {
|
||||
if (current !== token) return
|
||||
error.value = e instanceof Error ? e.message : '加载失败'
|
||||
} finally {
|
||||
if (current === token) loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
watch([page, () => pageSize], () => { void load() })
|
||||
onMounted(() => { void load() })
|
||||
|
||||
return {
|
||||
page,
|
||||
pageSize,
|
||||
total,
|
||||
rows,
|
||||
loading,
|
||||
error,
|
||||
reload: load,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user