实现 #1097;修复导出时sql报错的问题
This commit is contained in:
1 parent
82bce9f784
commit
14c55097e7
7 files changed
+424
-14
No files matched your search
@@ -320,6 +320,7 @@ async function runWeliveEngine() {
|
||||
if (format === 'markdown') return '.md'
|
||||
if (format === 'weclone') return '.csv'
|
||||
if (format === 'html') return '.html'
|
||||
if (format === 'sql') return '.sql'
|
||||
return '.json'
|
||||
}
|
||||
const resolveFinalOutputPath = async (sessionId: string) => {
|
||||
@@ -468,6 +469,9 @@ async function runWeliveEngine() {
|
||||
if (format === 'html') {
|
||||
return await exportService.orchestrator.exportSessionToHtml(sessionId, outputPath, options, queueProgress, taskControl)
|
||||
}
|
||||
if (format === 'sql') {
|
||||
return await exportService.orchestrator.exportSessionToSql(sessionId, outputPath, options, queueProgress, taskControl)
|
||||
}
|
||||
return await exportService.orchestrator.exportSessionToChatLab(sessionId, outputPath, options, queueProgress, taskControl)
|
||||
}
|
||||
|
||||
@@ -533,13 +537,27 @@ async function runLegacyEngine() {
|
||||
config.options || {}
|
||||
)
|
||||
} else if (config.mode === 'single') {
|
||||
result = await exportService.exportSessionToChatLab(
|
||||
String(config.sessionId || '').trim(),
|
||||
String(config.outputPath || '').trim(),
|
||||
config.options || { format: 'chatlab' },
|
||||
onProgress,
|
||||
taskControl
|
||||
)
|
||||
const sessionId = String(config.sessionId || '').trim()
|
||||
const outputPath = String(config.outputPath || '').trim()
|
||||
const options = config.options || { format: 'chatlab' }
|
||||
const format = String(options.format || 'chatlab')
|
||||
if (format === 'json' || format === 'arkme-json') {
|
||||
result = await exportService.orchestrator.exportSessionToDetailedJson(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'excel') {
|
||||
result = await exportService.orchestrator.exportSessionToExcel(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'txt') {
|
||||
result = await exportService.orchestrator.exportSessionToTxt(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'markdown') {
|
||||
result = await exportService.orchestrator.exportSessionToMarkdown(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'weclone') {
|
||||
result = await exportService.orchestrator.exportSessionToWeCloneCsv(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'html') {
|
||||
result = await exportService.orchestrator.exportSessionToHtml(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else if (format === 'sql') {
|
||||
result = await exportService.orchestrator.exportSessionToSql(sessionId, outputPath, options, onProgress, taskControl)
|
||||
} else {
|
||||
result = await exportService.orchestrator.exportSessionToChatLab(sessionId, outputPath, options, onProgress, taskControl)
|
||||
}
|
||||
} else {
|
||||
result = await exportService.exportSessions(
|
||||
Array.isArray(config.sessionIds) ? config.sessionIds : [],
|
||||
|
||||
@@ -38,6 +38,7 @@ import { ExcelFormatter } from '../formatters/ExcelFormatter';
|
||||
import { HtmlFormatter } from '../formatters/HtmlFormatter';
|
||||
import { JsonFormatter } from '../formatters/JsonFormatter';
|
||||
import { MarkdownFormatter } from '../formatters/MarkdownFormatter';
|
||||
import { SqlFormatter } from '../formatters/SqlFormatter';
|
||||
import { TxtFormatter } from '../formatters/TxtFormatter';
|
||||
import { WeCloneFormatter } from '../formatters/WeCloneFormatter';
|
||||
|
||||
@@ -101,6 +102,14 @@ export class ExportOrchestrator {
|
||||
return formatter.export(sessionId, outputPath, options, onProgress, control);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出单个会话为 PostgreSQL SQL 脚本
|
||||
*/
|
||||
async exportSessionToSql(sessionId: string, outputPath: string, options: ExportOptions, onProgress?: (progress: ExportProgress) => void, control?: ExportTaskControl): Promise<{ success: boolean; error?: string }> {
|
||||
const formatter = new SqlFormatter(this.context);
|
||||
return formatter.export(sessionId, outputPath, options, onProgress, control);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量导出多个会话
|
||||
*/
|
||||
@@ -377,6 +386,7 @@ export class ExportOrchestrator {
|
||||
else if (effectiveOptions.format === 'markdown') ext = '.md'
|
||||
else if (effectiveOptions.format === 'weclone') ext = '.csv'
|
||||
else if (effectiveOptions.format === 'html') ext = '.html'
|
||||
else if (effectiveOptions.format === 'sql') ext = '.sql'
|
||||
const preferredOutputPath = path.join(sessionDir, `${fileNameWithPrefix}${ext}`)
|
||||
const canTrySkipUnchanged = canTrySkipUnchangedTextSessions &&
|
||||
typeof messageCountHint === 'number' &&
|
||||
@@ -430,6 +440,8 @@ export class ExportOrchestrator {
|
||||
result = await this.exportSessionToWeCloneCsv(sessionId, outputPath, effectiveOptions, sessionProgress, control)
|
||||
} else if (effectiveOptions.format === 'html') {
|
||||
result = await this.exportSessionToHtml(sessionId, outputPath, effectiveOptions, sessionProgress, control)
|
||||
} else if (effectiveOptions.format === 'sql') {
|
||||
result = await this.exportSessionToSql(sessionId, outputPath, effectiveOptions, sessionProgress, control)
|
||||
} else {
|
||||
result = { success: false, error: `不支持的格式: ${effectiveOptions.format}` }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,335 @@
|
||||
import * as fs from 'fs';
|
||||
import { parallelLimit } from '../../export/utils/parallelLimit';
|
||||
import { MediaExportItem } from '../../export/types';
|
||||
|
||||
const sqlString = (value: unknown): string => {
|
||||
return `'${String(value ?? '').replace(/\u0000/g, '').replace(/'/g, "''")}'`
|
||||
}
|
||||
|
||||
const sqlNullableString = (value: unknown): string => {
|
||||
if (value === null || value === undefined) return 'NULL'
|
||||
return sqlString(value)
|
||||
}
|
||||
|
||||
const sqlNumber = (value: unknown): string => {
|
||||
const numeric = Number(value)
|
||||
return Number.isFinite(numeric) ? String(Math.trunc(numeric)) : 'NULL'
|
||||
}
|
||||
|
||||
const sqlBoolean = (value: unknown): string => {
|
||||
return value ? 'TRUE' : 'FALSE'
|
||||
}
|
||||
|
||||
const resolveMediaType = (msg: any): string | null => {
|
||||
const explicit = String(msg?.mediaType || msg?.media_type || '').trim().toLowerCase()
|
||||
if (explicit) return explicit
|
||||
const localType = Number(msg?.localType ?? msg?.local_type)
|
||||
if (localType === 3) return 'image'
|
||||
if (localType === 34) return 'voice'
|
||||
if (localType === 43) return 'video'
|
||||
if (localType === 47) return 'emoji'
|
||||
if (localType === 49 && String(msg?.content || '').includes('<filename>')) return 'file'
|
||||
return null
|
||||
}
|
||||
|
||||
export class SqlFormatter {
|
||||
constructor(private exportService: any) {}
|
||||
|
||||
public async export(sessionId: any, outputPath: any, options: any, onProgress: any, control: any): Promise<{ success: boolean; error?: string }> {
|
||||
try {
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
const conn = await this.exportService.ensureConnected()
|
||||
if (!conn.success || !conn.cleanedWxid) return { success: false, error: conn.error }
|
||||
|
||||
const cleanedMyWxid = conn.cleanedWxid
|
||||
const sessionInfo = await this.exportService.getContactInfo(sessionId)
|
||||
|
||||
onProgress?.({
|
||||
current: 0,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'preparing'
|
||||
})
|
||||
|
||||
const collectParams = this.exportService.resolveCollectParams(options)
|
||||
const collectProgressReporter = this.exportService.createCollectProgressReporter(sessionInfo.displayName, onProgress, 5)
|
||||
const collected = await this.exportService.collectMessages(
|
||||
sessionId,
|
||||
cleanedMyWxid,
|
||||
options.dateRange,
|
||||
options.senderUsername,
|
||||
collectParams.mode,
|
||||
collectParams.targetMediaTypes,
|
||||
control,
|
||||
collectProgressReporter
|
||||
)
|
||||
const totalMessages = collected.rows.length
|
||||
if (totalMessages === 0) {
|
||||
return { success: false, error: await this.exportService.buildNoMessagesError(sessionId, collected) }
|
||||
}
|
||||
await this.exportService.createWeliveRawOutputPlaceholder(outputPath, control)
|
||||
|
||||
await this.exportService.hydrateEmojiCaptionsForMessages(sessionId, collected.rows, control)
|
||||
await this.exportService.resolveQuotedMessagesForExport(collected.rows, sessionId)
|
||||
|
||||
const sortedMessages = collected.rows
|
||||
const voiceMessages = options.exportVoiceAsText
|
||||
? sortedMessages.filter((msg: any) => msg.localType === 34)
|
||||
: []
|
||||
|
||||
if (options.exportVoiceAsText && voiceMessages.length > 0) {
|
||||
await this.exportService.ensureVoiceModel(onProgress)
|
||||
}
|
||||
|
||||
const { mediaRootDir, mediaRelativePrefix } = this.exportService.getMediaLayout(outputPath, options)
|
||||
const mediaMessages = this.exportService.collectMediaMessagesForExport(sortedMessages, options)
|
||||
const mediaCache = new Map<string, MediaExportItem | null>()
|
||||
const mediaDirCache = new Set<string>()
|
||||
const beforeMediaDoneFiles = this.exportService.getMediaDoneFilesCount()
|
||||
|
||||
if (mediaMessages.length > 0) {
|
||||
await this.exportService.preloadMediaLookupCaches(sessionId, mediaMessages, {
|
||||
exportImages: options.exportImages,
|
||||
exportVideos: options.exportVideos
|
||||
}, control)
|
||||
const voiceMediaMessages = mediaMessages.filter((msg: any) => msg.localType === 34)
|
||||
if (voiceMediaMessages.length > 0) {
|
||||
await this.exportService.preloadVoiceWavCache(sessionId, voiceMediaMessages, control)
|
||||
}
|
||||
|
||||
onProgress?.({
|
||||
current: 25,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'exporting-media',
|
||||
phaseProgress: 0,
|
||||
phaseTotal: mediaMessages.length,
|
||||
phaseLabel: this.exportService.formatMediaPhaseLabel(0, mediaMessages.length, beforeMediaDoneFiles),
|
||||
...this.exportService.getMediaTelemetrySnapshot(),
|
||||
estimatedTotalMessages: totalMessages
|
||||
})
|
||||
|
||||
const mediaConcurrency = this.exportService.getClampedConcurrency(options.exportConcurrency)
|
||||
let mediaExported = 0
|
||||
await parallelLimit(mediaMessages, mediaConcurrency, async (msg: any) => {
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
const mediaKey = this.exportService.getMediaCacheKey(msg)
|
||||
if (!mediaCache.has(mediaKey)) {
|
||||
const mediaItem = await this.exportService.exportMediaForMessage(msg, sessionId, mediaRootDir, mediaRelativePrefix, {
|
||||
exportImages: options.exportImages,
|
||||
exportVoices: options.exportVoices,
|
||||
exportVideos: options.exportVideos,
|
||||
exportEmojis: options.exportEmojis,
|
||||
exportFiles: options.exportFiles,
|
||||
maxFileSizeMb: options.maxFileSizeMb,
|
||||
exportVoiceAsText: options.exportVoiceAsText,
|
||||
exportConflictStrategy: options.exportConflictStrategy,
|
||||
dirCache: mediaDirCache,
|
||||
control
|
||||
})
|
||||
mediaCache.set(mediaKey, mediaItem)
|
||||
}
|
||||
mediaExported++
|
||||
if (mediaExported % 5 === 0 || mediaExported === mediaMessages.length) {
|
||||
onProgress?.({
|
||||
current: 25,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'exporting-media',
|
||||
phaseProgress: mediaExported,
|
||||
phaseTotal: mediaMessages.length,
|
||||
phaseLabel: this.exportService.formatMediaPhaseLabel(mediaExported, mediaMessages.length, beforeMediaDoneFiles),
|
||||
...this.exportService.getMediaTelemetrySnapshot()
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
await this.exportService.preloadWeliveRawEmojiMedia(sortedMessages, mediaCache, mediaRootDir, mediaRelativePrefix, options, control, onProgress, sessionInfo.displayName, 20)
|
||||
const fileOnlyExportFailure = this.exportService.buildFileOnlyExportFailure(options, mediaMessages, beforeMediaDoneFiles)
|
||||
if (fileOnlyExportFailure) return fileOnlyExportFailure
|
||||
|
||||
const voiceTranscriptMap = new Map<string, string>()
|
||||
if (voiceMessages.length > 0) {
|
||||
await this.exportService.preloadVoiceWavCache(sessionId, voiceMessages, control)
|
||||
|
||||
onProgress?.({
|
||||
current: 45,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'exporting-voice',
|
||||
phaseProgress: 0,
|
||||
phaseTotal: voiceMessages.length,
|
||||
phaseLabel: `语音转文字 0/${voiceMessages.length}`,
|
||||
estimatedTotalMessages: totalMessages
|
||||
})
|
||||
|
||||
const VOICE_CONCURRENCY = 4
|
||||
let voiceTranscribed = 0
|
||||
await parallelLimit(voiceMessages, VOICE_CONCURRENCY, async (msg: any) => {
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
const transcript = await this.exportService.transcribeVoice(sessionId, String(msg.localId), msg.createTime, msg.senderUsername)
|
||||
voiceTranscriptMap.set(this.exportService.getStableMessageKey(msg), transcript)
|
||||
voiceTranscribed++
|
||||
onProgress?.({
|
||||
current: 45,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'exporting-voice',
|
||||
phaseProgress: voiceTranscribed,
|
||||
phaseTotal: voiceMessages.length,
|
||||
phaseLabel: `语音转文字 ${voiceTranscribed}/${voiceMessages.length}`
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
onProgress?.({
|
||||
current: 60,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'writing',
|
||||
estimatedTotalMessages: totalMessages,
|
||||
collectedMessages: totalMessages,
|
||||
exportedMessages: 0
|
||||
})
|
||||
|
||||
await this.exportService.recordCreatedFileBeforeWrite(outputPath, control)
|
||||
const stream = fs.createWriteStream(outputPath, { encoding: 'utf-8' })
|
||||
const writeChunk = async (chunk: string): Promise<void> => {
|
||||
await new Promise<void>((resolve, _reject) => {
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
if (!stream.write(chunk)) stream.once('drain', resolve)
|
||||
else resolve()
|
||||
})
|
||||
}
|
||||
const WRITE_BATCH = 160
|
||||
let writeBuffer: string[] = []
|
||||
const flushWriteBuffer = async (): Promise<void> => {
|
||||
if (writeBuffer.length === 0) return
|
||||
await writeChunk(writeBuffer.join(''))
|
||||
writeBuffer = []
|
||||
}
|
||||
|
||||
await writeChunk([
|
||||
'BEGIN;',
|
||||
'CREATE TABLE IF NOT EXISTS weflow_messages (',
|
||||
' session_id TEXT NOT NULL,',
|
||||
' local_id TEXT,',
|
||||
' message_id TEXT,',
|
||||
' create_time BIGINT NOT NULL,',
|
||||
' sender TEXT,',
|
||||
' is_send BOOLEAN NOT NULL,',
|
||||
' local_type INTEGER,',
|
||||
' media_type TEXT,',
|
||||
' content TEXT,',
|
||||
' media_path TEXT',
|
||||
');',
|
||||
'CREATE INDEX IF NOT EXISTS idx_weflow_messages_session_time ON weflow_messages (session_id, create_time);',
|
||||
''
|
||||
].join('\n'))
|
||||
|
||||
for (let i = 0; i < totalMessages; i++) {
|
||||
if ((i & 0x7f) === 0) {
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
}
|
||||
const msg = sortedMessages[i]
|
||||
const mediaKey = this.exportService.getMediaCacheKey(msg)
|
||||
const mediaItem = mediaCache.has(mediaKey)
|
||||
? mediaCache.get(mediaKey)
|
||||
: await this.exportService.resolveWeliveRawMediaItem(msg, mediaRootDir, mediaRelativePrefix, options, control)
|
||||
const shouldUseTranscript = msg.localType === 34 && options.exportVoiceAsText
|
||||
const mediaPathValue = !shouldUseTranscript && mediaItem?.relativePath
|
||||
? this.exportService.formatExportMediaPath(mediaItem.relativePath, options, 'text')
|
||||
: null
|
||||
let contentValue = this.exportService.formatPlainExportContent(
|
||||
msg.content,
|
||||
msg.localType,
|
||||
options,
|
||||
voiceTranscriptMap.get(this.exportService.getStableMessageKey(msg)),
|
||||
cleanedMyWxid,
|
||||
msg.senderUsername,
|
||||
msg.isSend,
|
||||
msg.emojiCaption
|
||||
)
|
||||
|
||||
const quotedReplyDisplay = await this.exportService.resolveQuotedReplyDisplayWithNames({
|
||||
content: msg.content,
|
||||
isGroup: String(sessionId).includes('@chatroom'),
|
||||
displayNamePreference: options.displayNamePreference,
|
||||
getContact: async (_username: string) => ({ success: false }),
|
||||
groupNicknamesMap: new Map<string, string>(),
|
||||
cleanedMyWxid,
|
||||
rawMyWxid: this.exportService.getConfiguredMyWxid(),
|
||||
myDisplayName: cleanedMyWxid
|
||||
})
|
||||
if (quotedReplyDisplay) {
|
||||
contentValue = this.exportService.buildQuotedReplyText(quotedReplyDisplay)
|
||||
} else {
|
||||
const appendedLinkContent = this.exportService.formatLinkCardExportText(msg.content, msg.localType, 'append-url')
|
||||
if (appendedLinkContent) contentValue = appendedLinkContent
|
||||
}
|
||||
|
||||
writeBuffer.push(
|
||||
`INSERT INTO weflow_messages (session_id, local_id, message_id, create_time, sender, is_send, local_type, media_type, content, media_path) VALUES (` +
|
||||
[
|
||||
sqlString(sessionId),
|
||||
sqlNullableString(msg.localId ?? msg.local_id),
|
||||
sqlNullableString(msg.serverId ?? msg.server_id ?? msg.msgId ?? msg.msg_id ?? msg.localId),
|
||||
sqlNumber(msg.createTime ?? msg.create_time),
|
||||
sqlNullableString(msg.senderUsername ?? msg.sender_username),
|
||||
sqlBoolean(msg.isSend ?? msg.is_send),
|
||||
sqlNumber(msg.localType ?? msg.local_type),
|
||||
sqlNullableString(resolveMediaType(msg)),
|
||||
sqlNullableString(contentValue),
|
||||
sqlNullableString(mediaPathValue)
|
||||
].join(', ') +
|
||||
');\n'
|
||||
)
|
||||
if (writeBuffer.length >= WRITE_BATCH) {
|
||||
await flushWriteBuffer()
|
||||
}
|
||||
|
||||
if ((i + 1) % 200 === 0) {
|
||||
onProgress?.({
|
||||
current: 60 + Math.floor((i + 1) / totalMessages * 30),
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'writing',
|
||||
estimatedTotalMessages: totalMessages,
|
||||
collectedMessages: totalMessages,
|
||||
exportedMessages: i + 1
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
await flushWriteBuffer()
|
||||
await writeChunk('COMMIT;\n')
|
||||
|
||||
this.exportService.throwIfStopRequested(control)
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
stream.on('error', reject)
|
||||
stream.end(() => resolve())
|
||||
})
|
||||
|
||||
onProgress?.({
|
||||
current: 100,
|
||||
total: 100,
|
||||
currentSession: sessionInfo.displayName,
|
||||
phase: 'complete',
|
||||
estimatedTotalMessages: totalMessages,
|
||||
collectedMessages: totalMessages,
|
||||
exportedMessages: totalMessages,
|
||||
writtenFiles: 1
|
||||
})
|
||||
|
||||
return { success: true }
|
||||
} catch (e) {
|
||||
if (this.exportService.isStopError(e)) {
|
||||
return { success: false, error: '导出任务已停止' }
|
||||
}
|
||||
if (this.exportService.isPauseError(e)) {
|
||||
return { success: false, error: '导出任务已暂停' }
|
||||
}
|
||||
return { success: false, error: String(e) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -118,10 +118,15 @@ function ExportPage() {
|
||||
allTasks: backgroundTasks,
|
||||
pauseTask: pauseBgTask,
|
||||
resumeTask: resumeBgTask,
|
||||
cancelTask: cancelBgTask
|
||||
cancelTask: cancelBgTask,
|
||||
clearSettledTasks: clearSettledBgTasks
|
||||
} = useBackgroundTasks()
|
||||
const taskCenterBackgroundTasks = backgroundTasks.filter(task => task.sourcePage === 'export' || task.sourcePage === 'chat')
|
||||
|
||||
const clearCompletedTaskCenterBackgroundTasks = useCallback(() => {
|
||||
clearSettledBgTasks(task => task.sourcePage === 'export' || task.sourcePage === 'chat')
|
||||
}, [clearSettledBgTasks])
|
||||
|
||||
// ── 4. Dialog & Exports ──
|
||||
const { dialogState, openDialog, closeDialog } = useExportDialog()
|
||||
|
||||
@@ -297,6 +302,7 @@ function ExportPage() {
|
||||
onPauseBackgroundTask={pauseBgTask}
|
||||
onResumeBackgroundTask={resumeBgTask}
|
||||
onCancelBackgroundTask={cancelBgTask}
|
||||
onClearCompletedBackgroundTasks={clearCompletedTaskCenterBackgroundTasks}
|
||||
/>
|
||||
</section>
|
||||
)}
|
||||
|
||||
@@ -17,8 +17,13 @@ interface TaskCenterProps {
|
||||
onPauseBackgroundTask: (taskId: string) => void
|
||||
onResumeBackgroundTask: (taskId: string) => void
|
||||
onCancelBackgroundTask: (taskId: string) => void
|
||||
onClearCompletedBackgroundTasks: () => void
|
||||
}
|
||||
|
||||
const isBackgroundTaskSettled = (task: BackgroundTaskRecord): boolean => (
|
||||
task.status === 'completed' || task.status === 'failed' || task.status === 'canceled'
|
||||
)
|
||||
|
||||
const parseBackgroundTaskProgress = (progressText?: string): { current: number; total: number; percent: number } | null => {
|
||||
const match = String(progressText || '').match(/(\d[\d,]*)\s*\/\s*(\d[\d,]*)/)
|
||||
if (!match) return null
|
||||
@@ -40,21 +45,28 @@ const TaskCenter: React.FC<TaskCenterProps> = ({
|
||||
backgroundTasks,
|
||||
onPauseBackgroundTask,
|
||||
onResumeBackgroundTask,
|
||||
onCancelBackgroundTask
|
||||
onCancelBackgroundTask,
|
||||
onClearCompletedBackgroundTasks
|
||||
}) => {
|
||||
const hasTasks = exportTasks.length > 0 || backgroundTasks.length > 0
|
||||
|
||||
if (!hasTasks) return null
|
||||
|
||||
const activeExportTasks = exportTasks.filter(t => t.status === 'running' || t.status === 'cancel_requested')
|
||||
const completedExportTasks = exportTasks.filter(t => t.status === 'success' || t.status === 'error')
|
||||
const completedBackgroundTasks = backgroundTasks.filter(isBackgroundTaskSettled)
|
||||
const hasCompletedTasks = completedExportTasks.length > 0 || completedBackgroundTasks.length > 0
|
||||
|
||||
const handleClearCompletedTasks = () => {
|
||||
onClearCompletedExportTasks()
|
||||
onClearCompletedBackgroundTasks()
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="task-center">
|
||||
<div className="task-center-header">
|
||||
<h2 className="title">任务中心</h2>
|
||||
{completedExportTasks.length > 0 && (
|
||||
<button className="clear-btn" onClick={onClearCompletedExportTasks}>
|
||||
{hasCompletedTasks && (
|
||||
<button className="clear-btn" onClick={handleClearCompletedTasks}>
|
||||
<Trash2 size={14} /> 清理已完成
|
||||
</button>
|
||||
)}
|
||||
@@ -116,7 +128,7 @@ const TaskCenter: React.FC<TaskCenterProps> = ({
|
||||
{backgroundTasks.map(bgTask => {
|
||||
const isPausable = bgTask.status === 'running'
|
||||
const isResumable = bgTask.status === 'paused'
|
||||
const isCancelable = bgTask.status !== 'completed' && bgTask.status !== 'canceled' && bgTask.status !== 'failed'
|
||||
const isCancelable = !isBackgroundTaskSettled(bgTask)
|
||||
const progress = parseBackgroundTaskProgress(bgTask.progressText)
|
||||
const sourceLabel = backgroundTaskSourceLabels[bgTask.sourcePage] || '后台任务'
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
import { useState, useEffect, useCallback, useMemo } from 'react'
|
||||
import type { BackgroundTaskRecord } from '../../../types/backgroundTask'
|
||||
import {
|
||||
clearSettledBackgroundTasks,
|
||||
requestCancelBackgroundTask,
|
||||
requestCancelBackgroundTasks,
|
||||
requestPauseBackgroundTask,
|
||||
@@ -25,6 +26,7 @@ export interface BackgroundTasksResult {
|
||||
resumeTask: (taskId: string) => void
|
||||
cancelTask: (taskId: string) => void
|
||||
cancelChatTasks: () => void
|
||||
clearSettledTasks: (predicate?: (task: BackgroundTaskRecord) => boolean) => void
|
||||
}
|
||||
|
||||
export function useBackgroundTasks(): BackgroundTasksResult {
|
||||
@@ -67,6 +69,10 @@ export function useBackgroundTasks(): BackgroundTasksResult {
|
||||
requestCancelBackgroundTasks(task => task.sourcePage === 'chat' && task.status !== 'completed' && task.status !== 'canceled' && task.status !== 'failed')
|
||||
}, [])
|
||||
|
||||
const clearSettledTasks = useCallback((predicate?: (task: BackgroundTaskRecord) => boolean) => {
|
||||
clearSettledBackgroundTasks(predicate)
|
||||
}, [])
|
||||
|
||||
return {
|
||||
allTasks: tasks,
|
||||
chatTasks,
|
||||
@@ -76,6 +82,7 @@ export function useBackgroundTasks(): BackgroundTasksResult {
|
||||
pauseTask,
|
||||
resumeTask,
|
||||
cancelTask,
|
||||
cancelChatTasks
|
||||
cancelChatTasks,
|
||||
clearSettledTasks
|
||||
}
|
||||
}
|
||||
@@ -203,6 +203,26 @@ export const requestCancelBackgroundTasks = (predicate: (task: BackgroundTaskRec
|
||||
return canceledCount
|
||||
}
|
||||
|
||||
export const clearSettledBackgroundTasks = (predicate?: (task: BackgroundTaskRecord) => boolean): number => {
|
||||
let clearedCount = 0
|
||||
for (const task of [...tasks.values()]) {
|
||||
if (ACTIVE_STATUSES.has(task.status)) continue
|
||||
if (predicate && !predicate(task)) continue
|
||||
|
||||
tasks.delete(task.id)
|
||||
cancelHandlers.delete(task.id)
|
||||
pauseHandlers.delete(task.id)
|
||||
resumeHandlers.delete(task.id)
|
||||
clearedCount += 1
|
||||
}
|
||||
|
||||
if (clearedCount > 0) {
|
||||
notifyListeners()
|
||||
}
|
||||
|
||||
return clearedCount
|
||||
}
|
||||
|
||||
export const isBackgroundTaskCancelRequested = (taskId: string): boolean => {
|
||||
const task = tasks.get(taskId)
|
||||
return Boolean(task?.cancelRequested)
|
||||
|
||||
Reference in new issue
Block a user