pjandro/OmniRoute
1
0
Fork 0
mirror of https://github.com/diegosouzapw/OmniRoute.git synced 2026-08-07 15:52:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cliproxyapi): address PR #915 review — executor flexibility, fallback error logging

Browse Source 
- Export resolveCliproxyapiBaseUrl, accept optional baseUrl in constructor
- Log detailed error messages when CLIProxyAPI fallback also fails
- Preserve and re-throw fallback errors instead of silently returning
This commit is contained in:
oyi77
2026-04-02 15:07:59 +07:00
parent d82a7040f1
commit dd33dc1f9b
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
open-sse/executors/cliproxyapi.ts
View File

@@ -10,16 +10,19 @@ function resolveCliproxyapiBaseUrl(): string {
return `http://${host}:${port}`;
}
export { resolveCliproxyapiBaseUrl };
export class CliproxyapiExecutor extends BaseExecutor {
private readonly upstreamBaseUrl: string;
constructor() {
constructor(baseUrl?: string) {
const effectiveBase = baseUrl ?? resolveCliproxyapiBaseUrl();
super("cliproxyapi", {
id: "cliproxyapi",
baseUrl: resolveCliproxyapiBaseUrl() + "/v1/chat/completions",
baseUrl: effectiveBase + "/v1/chat/completions",
headers: { "Content-Type": "application/json" },
});
this.upstreamBaseUrl = resolveCliproxyapiBaseUrl();
this.upstreamBaseUrl = effectiveBase;
}
buildUrl(_model: string, _stream: boolean, _urlIndex = 0): string {

19
open-sse/handlers/chatCore.ts
View File

@@ -1066,12 +1066,25 @@ export async function handleChatCore({
"UPSTREAM_PROXY",
`${prov} native failed (${result.response.status}), retrying via CLIProxyAPI`
);
return proxyExec.execute(input);
try {
return await proxyExec.execute(input);
} catch (proxyErr) {
const proxyMsg = proxyErr instanceof Error ? proxyErr.message : String(proxyErr);
log?.error?.("UPSTREAM_PROXY", `${prov} CLIProxyAPI fallback also failed: ${proxyMsg}`);
throw proxyErr;
}
}
return result;
} catch (err) {
log?.info?.("UPSTREAM_PROXY", `${prov} native error, retrying via CLIProxyAPI`);
return proxyExec.execute(input);
const errMsg = err instanceof Error ? err.message : String(err);
log?.info?.("UPSTREAM_PROXY", `${prov} native error (${errMsg}), retrying via CLIProxyAPI`);
try {
return await proxyExec.execute(input);
} catch (proxyErr) {
const proxyMsg = proxyErr instanceof Error ? proxyErr.message : String(proxyErr);
log?.error?.("UPSTREAM_PROXY", `${prov} CLIProxyAPI fallback also failed: ${proxyMsg}`);
throw proxyErr;
}
}
};
return wrapper;