mirror/ChatGPT-Next-Web
2
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-02-17 17:50:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5719 from ConnectAI-E/hotfix/status_text_error
Some checks failed
Run Tests / test (push) Failing after 19m33s
Details

Browse Source 
hotfix for statusText is non ISO-8859-1 #5717
This commit is contained in:
Lloyd Zhou 2024-10-25 20:34:15 +08:00 committed by GitHub
commit 82994843f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/utils/stream.ts
View File

@ -100,7 +100,8 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
})
.catch((e) => {
console.error("stream error", e);
throw e;
// throw e;
return new Response("", { status: 599 });
});
}
return window.fetch(url, options);

15
src-tauri/src/stream.rs
View File

@ -119,11 +119,22 @@ pub async fn stream_fetch(
}
}
Err(err) => {
println!("Error response: {:?}", err.source().expect("REASON").to_string());
let error: String = err.source()
.map(|e| e.to_string())
.unwrap_or_else(|| "Unknown error occurred".to_string());
println!("Error response: {:?}", error);
tauri::async_runtime::spawn( async move {
if let Err(e) = window.emit(event_name, ChunkPayload{ request_id, chunk: error.into() }) {
println!("Failed to emit chunk payload: {:?}", e);
}
if let Err(e) = window.emit(event_name, EndPayload{ request_id, status: 0 }) {
println!("Failed to emit end payload: {:?}", e);
}
});
StreamResponse {
request_id,
status: 599,
status_text: err.source().expect("REASON").to_string(),
status_text: "Error".to_string(),
headers: HashMap::new(),
}
}