mirror of
https://github.com/NanmiCoder/cc-haha
synced 2026-07-16 13:03:31 +08:00
问题:AdapterHttpClient 中的 HTTP 请求没有设置超时时间, 当服务器响应缓慢时,请求会无限期挂起,阻塞聊天队列, 导致飞书机器人看起来卡住了(电脑在运行,但飞书不回复)。 修复: - 为所有 HTTP 方法添加 30 秒超时(AbortController) - createSession、listRecentProjects、getGitInfo、getTasksForSession - 为图片下载的 fetch 调用添加超时 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
147 lines
4.5 KiB
TypeScript
147 lines
4.5 KiB
TypeScript
export type RecentProject = {
|
|
projectPath: string
|
|
realPath: string
|
|
projectName: string
|
|
isGit: boolean
|
|
repoName: string | null
|
|
branch: string | null
|
|
modifiedAt: string
|
|
sessionCount: number
|
|
}
|
|
|
|
export type GitInfo = {
|
|
branch: string | null
|
|
repoName: string | null
|
|
workDir: string
|
|
changedFiles: number
|
|
}
|
|
|
|
export type SessionTask = {
|
|
id: string
|
|
subject: string
|
|
status: 'pending' | 'in_progress' | 'completed'
|
|
}
|
|
|
|
export class AdapterHttpClient {
|
|
readonly httpBaseUrl: string
|
|
/** Default timeout for HTTP requests (30 seconds) */
|
|
private static readonly DEFAULT_TIMEOUT_MS = 30_000
|
|
|
|
constructor(wsUrl: string) {
|
|
this.httpBaseUrl = wsUrl
|
|
.replace(/^ws:/, 'http:')
|
|
.replace(/^wss:/, 'https:')
|
|
.replace(/\/$/, '')
|
|
}
|
|
|
|
/** Create an AbortController with timeout */
|
|
private createTimeoutController(timeoutMs = AdapterHttpClient.DEFAULT_TIMEOUT_MS): {
|
|
controller: AbortController
|
|
timer: ReturnType<typeof setTimeout>
|
|
} {
|
|
const controller = new AbortController()
|
|
const timer = setTimeout(() => controller.abort(), timeoutMs)
|
|
return { controller, timer }
|
|
}
|
|
|
|
async createSession(workDir: string): Promise<string> {
|
|
const { controller, timer } = this.createTimeoutController()
|
|
try {
|
|
const res = await fetch(`${this.httpBaseUrl}/api/sessions`, {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ workDir }),
|
|
signal: controller.signal,
|
|
})
|
|
if (!res.ok) {
|
|
const err = await res.json().catch(() => ({ message: res.statusText }))
|
|
throw new Error(`Failed to create session: ${(err as any).message}`)
|
|
}
|
|
const data = (await res.json()) as { sessionId: string }
|
|
return data.sessionId
|
|
} finally {
|
|
clearTimeout(timer)
|
|
}
|
|
}
|
|
|
|
async listRecentProjects(): Promise<RecentProject[]> {
|
|
const { controller, timer } = this.createTimeoutController()
|
|
try {
|
|
const res = await fetch(`${this.httpBaseUrl}/api/sessions/recent-projects`, {
|
|
signal: controller.signal,
|
|
})
|
|
if (!res.ok) {
|
|
throw new Error(`Failed to list projects: ${res.statusText}`)
|
|
}
|
|
const data = (await res.json()) as { projects: RecentProject[] }
|
|
return data.projects
|
|
} finally {
|
|
clearTimeout(timer)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Match a project by index (1-based) or fuzzy name from recent projects.
|
|
* Returns { project, ambiguous[] } — ambiguous is set when multiple projects match.
|
|
*/
|
|
async matchProject(query: string): Promise<{ project?: RecentProject; ambiguous?: RecentProject[] }> {
|
|
const projects = await this.listRecentProjects()
|
|
|
|
// Try as 1-based index
|
|
const num = parseInt(query, 10)
|
|
if (!isNaN(num) && num >= 1 && num <= projects.length && String(num) === query.trim()) {
|
|
return { project: projects[num - 1] }
|
|
}
|
|
|
|
const q = query.toLowerCase()
|
|
|
|
// Exact project name match
|
|
const exact = projects.find(p => p.projectName.toLowerCase() === q)
|
|
if (exact) return { project: exact }
|
|
|
|
// Fuzzy: name or path contains query
|
|
const matches = projects.filter(p =>
|
|
p.projectName.toLowerCase().includes(q) ||
|
|
p.realPath.toLowerCase().includes(q)
|
|
)
|
|
if (matches.length === 1) return { project: matches[0] }
|
|
if (matches.length > 1) return { ambiguous: matches }
|
|
|
|
return {}
|
|
}
|
|
|
|
async getGitInfo(sessionId: string): Promise<GitInfo> {
|
|
const { controller, timer } = this.createTimeoutController()
|
|
try {
|
|
const res = await fetch(`${this.httpBaseUrl}/api/sessions/${encodeURIComponent(sessionId)}/git-info`, {
|
|
signal: controller.signal,
|
|
})
|
|
if (!res.ok) {
|
|
const err = await res.json().catch(() => ({ message: res.statusText }))
|
|
throw new Error(`Failed to load git info: ${(err as any).message}`)
|
|
}
|
|
return (await res.json()) as GitInfo
|
|
} finally {
|
|
clearTimeout(timer)
|
|
}
|
|
}
|
|
|
|
async getTasksForSession(sessionId: string): Promise<SessionTask[]> {
|
|
const { controller, timer } = this.createTimeoutController()
|
|
try {
|
|
const res = await fetch(`${this.httpBaseUrl}/api/tasks/lists/${encodeURIComponent(sessionId)}`, {
|
|
signal: controller.signal,
|
|
})
|
|
if (!res.ok) {
|
|
if (res.status === 404) return []
|
|
const err = await res.json().catch(() => ({ message: res.statusText }))
|
|
throw new Error(`Failed to load tasks: ${(err as any).message}`)
|
|
}
|
|
const data = (await res.json()) as { tasks?: SessionTask[] }
|
|
return Array.isArray(data.tasks) ? data.tasks : []
|
|
} finally {
|
|
clearTimeout(timer)
|
|
}
|
|
}
|
|
}
|