|
@@ -30,26 +30,30 @@ export async function requestOpenai(req: NextRequest) {
|
|
controller.abort();
|
|
controller.abort();
|
|
}, 10 * 60 * 1000);
|
|
}, 10 * 60 * 1000);
|
|
|
|
|
|
|
|
+ const fetchUrl = `${baseUrl}/${openaiPath}`;
|
|
|
|
+ const fetchOptions: RequestInit = {
|
|
|
|
+ headers: {
|
|
|
|
+ "Content-Type": "application/json",
|
|
|
|
+ Authorization: authValue,
|
|
|
|
+ ...(process.env.OPENAI_ORG_ID && {
|
|
|
|
+ "OpenAI-Organization": process.env.OPENAI_ORG_ID,
|
|
|
|
+ }),
|
|
|
|
+ },
|
|
|
|
+ cache: "no-store",
|
|
|
|
+ method: req.method,
|
|
|
|
+ body: req.body,
|
|
|
|
+ signal: controller.signal,
|
|
|
|
+ };
|
|
|
|
+
|
|
try {
|
|
try {
|
|
- return await fetch(`${baseUrl}/${openaiPath}`, {
|
|
|
|
- headers: {
|
|
|
|
- "Content-Type": "application/json",
|
|
|
|
- Authorization: authValue,
|
|
|
|
- ...(process.env.OPENAI_ORG_ID && {
|
|
|
|
- "OpenAI-Organization": process.env.OPENAI_ORG_ID,
|
|
|
|
- }),
|
|
|
|
- },
|
|
|
|
- cache: "no-store",
|
|
|
|
- method: req.method,
|
|
|
|
- body: req.body,
|
|
|
|
- signal: controller.signal,
|
|
|
|
- });
|
|
|
|
- } catch (err: unknown) {
|
|
|
|
- if (err instanceof Error && err.name === "AbortError") {
|
|
|
|
- console.log("Fetch aborted");
|
|
|
|
- } else {
|
|
|
|
- throw err;
|
|
|
|
|
|
+ const res = await fetch(fetchUrl, fetchOptions);
|
|
|
|
+
|
|
|
|
+ if (res.status === 401) {
|
|
|
|
+ // to prevent browser prompt for credentials
|
|
|
|
+ res.headers.delete("www-authenticate");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ return res;
|
|
} finally {
|
|
} finally {
|
|
clearTimeout(timeoutId);
|
|
clearTimeout(timeoutId);
|
|
}
|
|
}
|