singlexyz/ChatGPT-Next-Web
1
0
Fork 0
forked from XiaoMo/ChatGPT-Next-Web
Code Pull Requests Activity

Merge pull request #1604 from ClarenceDan/main

Browse Source 
fix:Fix memory leak issue by adding fetch request timeout
This commit is contained in:
Yifei Zhang 2023-05-18 17:21:48 +08:00 committed by GitHub
commit 33727aad62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/api/common.ts
View File

@ -6,6 +6,7 @@ const PROTOCOL = process.env.PROTOCOL ?? DEFAULT_PROTOCOL;
const BASE_URL = process.env.BASE_URL ?? OPENAI_URL; const BASE_URL = process.env.BASE_URL ?? OPENAI_URL;
export async function requestOpenai(req: NextRequest) { export async function requestOpenai(req: NextRequest) {
const controller = new AbortController();
const authValue = req.headers.get("Authorization") ?? ""; const authValue = req.headers.get("Authorization") ?? "";
const openaiPath = `${req.nextUrl.pathname}${req.nextUrl.search}`.replaceAll( const openaiPath = `${req.nextUrl.pathname}${req.nextUrl.search}`.replaceAll(
"/api/openai/", "/api/openai/",
@ -25,7 +26,12 @@ export async function requestOpenai(req: NextRequest) {
console.log("[Org ID]", process.env.OPENAI_ORG_ID); console.log("[Org ID]", process.env.OPENAI_ORG_ID);
} }
return fetch(`${baseUrl}/${openaiPath}`, { const timeoutId = setTimeout(() => {
controller.abort();
}, 10 * 60 * 1000);
try {
return await fetch(`${baseUrl}/${openaiPath}`, {
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
Authorization: authValue, Authorization: authValue,
@ -36,5 +42,15 @@ export async function requestOpenai(req: NextRequest) {
cache: "no-store", cache: "no-store",
method: req.method, method: req.method,
body: req.body, body: req.body,
signal: controller.signal,
}); });
} catch (err: unknown) {
if (err instanceof Error && err.name === 'AbortError') {
console.log('Fetch aborted');
} else {
throw err;
}
} finally {
clearTimeout(timeoutId);
}
} }