Mirrors
/
oai-reverse-proxy
mirror of https://gitgud.io/khanon/oai-reverse-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

corrects openai incorrectly referred to as 'downstream'

This commit is contained in:
nai-degen 2023-05-06 10:07:09 -05:00
parent e541a7b892
commit e9e9f1f8b6
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/proxy/middleware/response/index.ts
View File

@ -46,8 +46,8 @@ export type ProxyResMiddleware = ProxyResHandlerWithBody[];
* Returns a on.proxyRes handler that executes the given middleware stack after * Returns a on.proxyRes handler that executes the given middleware stack after
* the common proxy response handlers have processed the response and decoded * the common proxy response handlers have processed the response and decoded
* the body. Custom middleware won't execute if the response is determined to * the body. Custom middleware won't execute if the response is determined to
* be an error from the downstream service as the response will be taken over * be an error from the upstream service as the response will be taken over by
* by the common error handler. * the common error handler.
* *
* For streaming responses, the handleStream middleware will block remaining * For streaming responses, the handleStream middleware will block remaining
* middleware from executing as it consumes the stream and forwards events to * middleware from executing as it consumes the stream and forwards events to
@ -98,7 +98,7 @@ export const createOnProxyResHandler = (middleware: ProxyResMiddleware) => {
middlewareStack.push(incrementKeyUsage, logPrompt); middlewareStack.push(incrementKeyUsage, logPrompt);
} else { } else {
middlewareStack.push( middlewareStack.push(
handleDownstreamErrors, handleUpstreamErrors,
incrementKeyUsage, incrementKeyUsage,
copyHttpHeaders, copyHttpHeaders,
logPrompt, logPrompt,
@ -115,7 +115,7 @@ export const createOnProxyResHandler = (middleware: ProxyResMiddleware) => {
req.log.error( req.log.error(
`Error while executing proxy response middleware: ${lastMiddlewareName} (${error.message})` `Error while executing proxy response middleware: ${lastMiddlewareName} (${error.message})`
); );
// Either the downstream error handler got to it first, or we're mid- // Either the upstream error handler got to it first, or we're mid-
// stream and we can't do anything about it. // stream and we can't do anything about it.
return; return;
} }
@ -137,7 +137,7 @@ export const createOnProxyResHandler = (middleware: ProxyResMiddleware) => {
}; };
/** /**
* Handles the response from the downstream service and decodes the body if * Handles the response from the upstream service and decodes the body if
* necessary. If the response is JSON, it will be parsed and returned as an * necessary. If the response is JSON, it will be parsed and returned as an
* object. Otherwise, it will be returned as a string. * object. Otherwise, it will be returned as a string.
* @throws {Error} Unsupported content-encoding or invalid application/json body * @throws {Error} Unsupported content-encoding or invalid application/json body
@ -194,12 +194,12 @@ export const decodeResponseBody: RawResponseBodyHandler = async (
// TODO: This is too specific to OpenAI's error responses, Anthropic errors // TODO: This is too specific to OpenAI's error responses, Anthropic errors
// will need a different handler. // will need a different handler.
/** /**
* Handles non-2xx responses from the downstream service. If the proxied * Handles non-2xx responses from the upstream service. If the proxied response
* response is an error, this will respond to the client with an error payload * is an error, this will respond to the client with an error payload and throw
* and throw an error to stop the middleware stack. * an error to stop the middleware stack.
* @throws {Error} HTTP error status code from downstream service * @throws {Error} HTTP error status code from upstream service
*/ */
const handleDownstreamErrors: ProxyResHandlerWithBody = async ( const handleUpstreamErrors: ProxyResHandlerWithBody = async (
proxyRes, proxyRes,
req, req,
res, res,
@ -222,7 +222,7 @@ const handleDownstreamErrors: ProxyResHandlerWithBody = async (
if (typeof body === "object") { if (typeof body === "object") {
errorPayload = body; errorPayload = body;
} else { } else {
throw new Error("Received non-JSON error response from downstream."); throw new Error("Received non-JSON error response from upstream.");
} }
} catch (parseError: any) { } catch (parseError: any) {
const statusMessage = proxyRes.statusMessage || "Unknown error"; const statusMessage = proxyRes.statusMessage || "Unknown error";
@ -236,7 +236,7 @@ const handleDownstreamErrors: ProxyResHandlerWithBody = async (
statusCode, statusCode,
statusMessage: proxyRes.statusMessage, statusMessage: proxyRes.statusMessage,
error: parseError.message, error: parseError.message,
proxy_note: `This is likely a temporary error with the downstream service.`, proxy_note: `This is likely a temporary error with the upstream service.`,
}; };
res.status(statusCode).json(errorObject); res.status(statusCode).json(errorObject);
@ -250,7 +250,7 @@ const handleDownstreamErrors: ProxyResHandlerWithBody = async (
errorPayload, errorPayload,
key: req.key?.hash, key: req.key?.hash,
}, },
`Received error response from downstream. (${proxyRes.statusMessage})` `Received error response from upstream. (${proxyRes.statusMessage})`
); );
if (statusCode === 400) { if (statusCode === 400) {
@ -312,23 +312,25 @@ export const handleInternalError: httpProxy.ErrorCallback = (
res res
) => { ) => {
logger.error({ error: err }, "Error in http-proxy-middleware pipeline."); logger.error({ error: err }, "Error in http-proxy-middleware pipeline.");
// headers might have already been sent
try { try {
(res as http.ServerResponse).writeHead(500, { if ("setHeader" in res && !res.headersSent) {
"Content-Type": "application/json", res.writeHead(500, { "Content-Type": "application/json" });
}); }
res.end( res.end(
JSON.stringify({ JSON.stringify({
error: { error: {
type: "proxy_error", type: "proxy_error",
message: err.message, message: err.message,
stack: err.stack, stack: err.stack,
proxy_note: `Reverse proxy encountered an error before it could reach the downstream API.`, proxy_note: `Reverse proxy encountered an error before it could reach the upstream API.`,
}, },
}) })
); );
} catch (e) { } catch (e) {
logger.error({ error: e }, "Error writing error response headers, giving up."); logger.error(
{ error: e },
`Error writing error response headers, giving up.`
);
} }
}; };