fix: safari can not in (#1590)

This commit is contained in:
Joel
2023-11-21 20:25:23 +08:00
committed by GitHub
parent 778cfb37a2
commit d6a6697891
4 changed files with 2 additions and 32 deletions

View File

@@ -1,11 +1,8 @@
import fetchStream from 'fetch-readablestream'
import { API_PREFIX, IS_CE_EDITION, PUBLIC_API_PREFIX } from '@/config'
import Toast from '@/app/components/base/toast'
import type { MessageEnd, MessageReplace, ThoughtItem } from '@/app/components/app/chat/type'
import { isSupportNativeFetchStream } from '@/utils/stream'
const TIME_OUT = 100000
const supportNativeFetchStream = isSupportNativeFetchStream()
const ContentType = {
json: 'application/json',
@@ -223,9 +220,6 @@ const baseFetch = <T>(
if (body && bodyStringify)
options.body = JSON.stringify(body)
// for those do not support native fetch stream, we use fetch-readablestream as polyfill
const doFetch = supportNativeFetchStream ? globalThis.fetch : fetchStream
// Handle timeout
return Promise.race([
new Promise((resolve, reject) => {
@@ -234,7 +228,7 @@ const baseFetch = <T>(
}, TIME_OUT)
}),
new Promise((resolve, reject) => {
doFetch(urlWithPrefix, options as RequestInit)
globalThis.fetch(urlWithPrefix, options as RequestInit)
.then((res) => {
const resClone = res.clone()
// Error handler