mirror of
https://github.com/wu736139669/hapi.git
synced 2026-08-05 06:24:37 +00:00
fix: improve error handling in git operations and queries
This commit is contained in:
@@ -155,11 +155,12 @@ export function createGitRoutes(getSyncEngine: () => SyncEngine | null): Hono<We
|
||||
}
|
||||
|
||||
const result = await runRpc(() => engine.runRipgrep(sessionResult.sessionId, args, sessionPath))
|
||||
if (!('success' in result) || !result.success || !result.stdout) {
|
||||
if (!result.success) {
|
||||
return c.json({ success: false, error: result.error ?? 'Failed to list files' })
|
||||
}
|
||||
|
||||
const files = result.stdout
|
||||
const stdout = result.stdout ?? ''
|
||||
const files = stdout
|
||||
.split('\n')
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
|
||||
@@ -50,9 +50,15 @@ export function useGitStatusFiles(api: ApiClient | null, sessionId: string | nul
|
||||
enabled: Boolean(api && sessionId),
|
||||
})
|
||||
|
||||
const queryError = query.error instanceof Error
|
||||
? query.error.message
|
||||
: query.error
|
||||
? 'Git status unavailable'
|
||||
: null
|
||||
|
||||
return {
|
||||
status: query.data?.status ?? null,
|
||||
error: query.data?.error ?? null,
|
||||
error: queryError ?? query.data?.error ?? null,
|
||||
isLoading: query.isLoading,
|
||||
refetch: query.refetch
|
||||
}
|
||||
|
||||
@@ -33,9 +33,15 @@ export function useSessionFileSearch(
|
||||
enabled,
|
||||
})
|
||||
|
||||
const queryError = result.error instanceof Error
|
||||
? result.error.message
|
||||
: result.error
|
||||
? 'Failed to search files'
|
||||
: null
|
||||
|
||||
return {
|
||||
files: result.data?.files ?? [],
|
||||
error: result.data?.error ?? null,
|
||||
error: queryError ?? result.data?.error ?? null,
|
||||
isLoading: result.isLoading,
|
||||
refetch: result.refetch
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user