This commit is contained in:
lloydzhou 2024-09-30 02:57:51 +08:00
parent 8030e71a5a
commit ef4665cd8b
2 changed files with 13 additions and 5 deletions

View File

@ -293,9 +293,7 @@ export function fetch(
options?: Record<string, unknown>,
): Promise<any> {
if (window.__TAURI__) {
return tauriStreamFetch(url, options)
.then((res) => res.text())
.then((data) => ({ data }));
return tauriStreamFetch(url, options);
// const payload = options?.body || options?.data;
// return tauriFetch(url, {
// ...options,
@ -319,7 +317,9 @@ export function adapter(config: Record<string, unknown>) {
const fetchUrl = params
? `${path}?${new URLSearchParams(params as any).toString()}`
: path;
return fetch(fetchUrl as string, { ...rest, responseType: "text" });
return fetch(fetchUrl as string, { ...rest, responseType: "text" })
.then((res) => res.text())
.then((data) => ({ data }));
}
export function safeLocalStorage(): {

View File

@ -85,7 +85,15 @@ export function fetch(url: string, options?: RequestInit): Promise<any> {
.then((res: StreamResponse) => {
request_id = res.request_id;
const { status, status_text: statusText, headers } = res;
return new Response(ts.readable, { status, statusText, headers });
const response = new Response(ts.readable, {
status,
statusText,
headers,
});
if (status >= 300) {
setTimeout(close, 50);
}
return response;
})
.catch((e) => {
console.error("stream error", e);