7x31
/
ChatGPT-Next-Web
mirror of https://github.com/Yidadaa/ChatGPT-Next-Web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5611 from ConnectAI-E/feature/tauri-fetch-update 

make sure get request_id before body chunk
This commit is contained in:
Lloyd Zhou 2024-10-09 16:18:37 +08:00 committed by GitHub
parent 19b42aac5d 3e63d405c1
commit 96273fd75e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/utils/stream.ts
View File

@ -28,7 +28,8 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
body = [],
} = options || {};
let unlisten: Function | undefined;
let request_id = 0;
let setRequestId: Function | undefined;
const requestIdPromise = new Promise((resolve) => (setRequestId = resolve));
const ts = new TransformStream();
const writer = ts.writable.getWriter();
@ -47,7 +48,8 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
}
// @ts-ignore 2. listen response multi times, and write to Response.body
window.__TAURI__.event
.listen("stream-response", (e: ResponseEvent) => {
.listen("stream-response", (e: ResponseEvent) =>
requestIdPromise.then((request_id) => {
const { request_id: rid, chunk, status } = e?.payload || {};
if (request_id != rid) {
return;
@ -60,7 +62,8 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
// end of body
close();
}
})
}),
)
.then((u: Function) => (unlisten = u));
const headers: Record<string, string> = {
@ -83,8 +86,8 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
: [],
})
.then((res: StreamResponse) => {
request_id = res.request_id;
const { status, status_text: statusText, headers } = res;
const { request_id, status, status_text: statusText, headers } = res;
setRequestId?.(request_id);
const response = new Response(ts.readable, {
status,
statusText,