Skip to content

refactor(openai-bridge): split runtime retry layers #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ymkiux merged 5 commits into from
Jul 11, 2026
Merged

refactor(openai-bridge): split runtime retry layers #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9c9fd6
feat(providers): configure codex bridge retries
awsl233777 Jul 11, 2026
fbe6e3c
refactor(openai-bridge): split runtime retry layers
awsl233777 Jul 11, 2026
74af750
fix(web-ui): isolate prompts markdown tabs
awsl233777 Jul 11, 2026
db16320
fix(web-ui): reset prompts scroll on tab switch
awsl233777 Jul 11, 2026
fb8b9b4
chore(release): bump version to v0.1.0
awsl233777 Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 69 additions & 4 deletions cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2561,6 +2561,28 @@ function buildClaudeSettingsDiff(params = {}) {
};
}


function normalizeOpenaiBridgeMaxRetries(value, fallback = 2) {
const raw = Number(value);
const fallbackRaw = Number(fallback);
const base = Number.isFinite(raw) ? raw : (Number.isFinite(fallbackRaw) ? fallbackRaw : 2);
return Math.min(10, Math.max(2, Math.floor(base)));
}

function resolveProviderOpenaiBridgeMaxRetries(provider) {
if (!provider || typeof provider !== 'object') return 2;
if (provider.codexmate_bridge_max_retries !== undefined) {
return normalizeOpenaiBridgeMaxRetries(provider.codexmate_bridge_max_retries);
}
if (provider.openai_bridge_max_retries !== undefined) {
return normalizeOpenaiBridgeMaxRetries(provider.openai_bridge_max_retries);
}
if (provider.max_retries !== undefined) {
return normalizeOpenaiBridgeMaxRetries(provider.max_retries);
}
return 2;
}

function addProviderToConfig(params = {}) {
const name = typeof params.name === 'string' ? params.name.trim() : '';
const url = typeof params.url === 'string' ? params.url.trim() : '';
Expand All @@ -2575,6 +2597,8 @@ function addProviderToConfig(params = {}) {
? params.model.trim()
: fallbackModel;
const useTransform = !!params.useTransform;
const hasOpenaiBridgeMaxRetries = params.openaiBridgeMaxRetries !== undefined || params.maxRetries !== undefined;
const openaiBridgeMaxRetries = normalizeOpenaiBridgeMaxRetries(params.openaiBridgeMaxRetries ?? params.maxRetries);
const allowManaged = !!params.allowManaged;
const normalizedUrl = normalizeBaseUrl(url);

Expand Down Expand Up @@ -2634,7 +2658,7 @@ function addProviderToConfig(params = {}) {
const requiresOpenaiAuth = useTransform;

if (useTransform) {
const saveRes = upsertOpenaiBridgeProvider(OPENAI_BRIDGE_SETTINGS_FILE, name, normalizedUrl, key);
const saveRes = upsertOpenaiBridgeProvider(OPENAI_BRIDGE_SETTINGS_FILE, name, normalizedUrl, key, undefined, { maxRetries: openaiBridgeMaxRetries });
if (saveRes && saveRes.error) {
return { error: String(saveRes.error) };
}
Expand All @@ -2646,6 +2670,7 @@ function addProviderToConfig(params = {}) {
).toString().replace(/\/+$/g, '');
authKeyForConfig = 'codexmate';
extraLines.push(`codexmate_bridge = "openai"`);
extraLines.push(`codexmate_bridge_max_retries = ${openaiBridgeMaxRetries}`);
}

const safeUrl = escapeTomlBasicString(baseUrlForConfig);
Expand Down Expand Up @@ -2689,6 +2714,8 @@ function updateProviderInConfig(params = {}) {
? String(params.key).trim()
: undefined;
const useTransform = !!params.useTransform;
const hasOpenaiBridgeMaxRetries = params.openaiBridgeMaxRetries !== undefined || params.maxRetries !== undefined;
const openaiBridgeMaxRetries = normalizeOpenaiBridgeMaxRetries(params.openaiBridgeMaxRetries ?? params.maxRetries);
const allowManaged = !!params.allowManaged;

if (!name) return { error: '名称不能为空' };
Expand All @@ -2703,7 +2730,7 @@ function updateProviderInConfig(params = {}) {
}

try {
cmdUpdate(name, url || undefined, key, true, { allowManaged, useTransform });
cmdUpdate(name, url || undefined, key, true, { allowManaged, useTransform, ...(hasOpenaiBridgeMaxRetries ? { openaiBridgeMaxRetries } : {}) });
return { success: true };
} catch (e) {
return { error: e.message || '更新失败' };
Expand Down Expand Up @@ -9846,6 +9873,8 @@ function cmdDelete(name, silent = false) {
function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
const allowManaged = !!(options && options.allowManaged);
const forceUseTransform = !!(options && options.useTransform);
const hasOpenaiBridgeMaxRetries = options && Object.prototype.hasOwnProperty.call(options, 'openaiBridgeMaxRetries');
const openaiBridgeMaxRetries = normalizeOpenaiBridgeMaxRetries(options && options.openaiBridgeMaxRetries);
const normalizedBaseUrl = baseUrl === undefined ? undefined : normalizeBaseUrl(baseUrl);
if (!name) {
if (!silent) console.error('错误: 提供商名称必填');
Expand Down Expand Up @@ -10005,6 +10034,32 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
return next;
};

const replaceTomlNumberField = (block, fieldName, rawValue) => {
const numberValue = String(Math.floor(Number(rawValue)));
const escapedFieldName = escapeRegex(fieldName);
const multilineRanges = collectTomlMultilineStringRanges(block);
const withCommentRegex = new RegExp(`^(\\s*${escapedFieldName}\\s*=\\s*)([-+]?\\d+(?:\\.\\d+)?)(\\s+#.*)?$`, 'mg');
let replaced = false;
let next = block.replace(withCommentRegex, (full, prefix, _value, suffix = '', offset) => {
if (replaced || isIndexInRanges(offset, multilineRanges)) {
return full;
}
replaced = true;
return `${prefix}${numberValue}${suffix}`;
});
if (!replaced) {
const keyIndentMatch = block.match(/^(\s*)[A-Za-z0-9_.-]+\s*=/m);
const indent = keyIndentMatch ? keyIndentMatch[1] : '';
const lineEnding = block.includes('\r\n') ? '\r\n' : '\n';
const tailMatch = block.match(/(\s*)$/);
const tail = tailMatch ? tailMatch[1] : '';
const body = block.slice(0, block.length - tail.length);
const separator = body.endsWith('\n') || body.endsWith('\r') ? '' : lineEnding;
next = `${body}${separator}${indent}${fieldName} = ${numberValue}${tail}`;
}
return next;
};

const replaceTomlBooleanField = (block, fieldName, rawValue) => {
const boolValue = rawValue ? 'true' : 'false';
const escapedFieldName = escapeRegex(fieldName);
Expand Down Expand Up @@ -10061,7 +10116,9 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
: existingApiKey;

if (upstreamBaseUrl) {
const saveRes = upsertOpenaiBridgeProvider(OPENAI_BRIDGE_SETTINGS_FILE, name, upstreamBaseUrl, upstreamApiKey);
const saveRes = upsertOpenaiBridgeProvider(OPENAI_BRIDGE_SETTINGS_FILE, name, upstreamBaseUrl, upstreamApiKey, undefined, {
maxRetries: hasOpenaiBridgeMaxRetries ? openaiBridgeMaxRetries : resolveProviderOpenaiBridgeMaxRetries(providerConfig)
});
if (saveRes && saveRes.error) {
throw new Error(String(saveRes.error));
}
Expand All @@ -10077,6 +10134,9 @@ function cmdUpdate(name, baseUrl, apiKey, silent = false, options = {}) {
updatedBlock = replaceTomlBooleanField(updatedBlock, 'requires_openai_auth', true);
updatedBlock = replaceTomlStringField(updatedBlock, 'preferred_auth_method', 'codexmate');
updatedBlock = replaceTomlStringField(updatedBlock, 'codexmate_bridge', 'openai');
if (hasOpenaiBridgeMaxRetries) {
updatedBlock = replaceTomlNumberField(updatedBlock, 'codexmate_bridge_max_retries', openaiBridgeMaxRetries);
}
} else {
if (normalizedBaseUrl) {
updatedBlock = replaceTomlStringField(updatedBlock, 'base_url', normalizedBaseUrl);
Expand Down Expand Up @@ -12819,7 +12879,10 @@ function createWebServer({ htmlPath, assetsDir, webDir, host, port, openBrowser
break;
}
// 不返回 apiKey（敏感信息），仅返回用户填过的上游 URL
result = { baseUrl: upstream.baseUrl, hasApiKey: !!(upstream.apiKey) };
const config = readConfig();
const provider = config.model_providers && config.model_providers[name];
const providerMaxRetries = resolveProviderOpenaiBridgeMaxRetries(provider);
result = { baseUrl: upstream.baseUrl, hasApiKey: !!(upstream.apiKey), maxRetries: providerMaxRetries };
break;
}
case 'list-sessions':
Expand Down Expand Up @@ -15059,11 +15122,13 @@ function buildMcpProviderListPayload() {
upstreamUrl = upstream.baseUrl.trim();
}
}
const openaiBridgeMaxRetries = resolveProviderOpenaiBridgeMaxRetries(p);
return {
name,
url: p.base_url || '',
upstreamUrl,
codexmate_bridge: bridge,
openaiBridgeMaxRetries,
key: maskKey(p.preferred_auth_method || ''),
hasKey: !!(p.preferred_auth_method && p.preferred_auth_method.trim()),
models: Array.isArray(p.models)
Expand Down
62 changes: 62 additions & 0 deletions cli/openai-bridge-retry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
const DEFAULT_BRIDGE_MAX_RETRIES = 2;
const MIN_BRIDGE_MAX_RETRIES = 2;
const MAX_BRIDGE_MAX_RETRIES = 10;
const BASE_TRANSIENT_RETRY_DELAY_MS = 200;
const MAX_TRANSIENT_RETRY_DELAY_MS = 5000;

function normalizeBridgeMaxRetries(value, fallback = DEFAULT_BRIDGE_MAX_RETRIES) {
const raw = Number(value);
const fallbackRaw = Number(fallback);
const base = Number.isFinite(raw) ? raw : (Number.isFinite(fallbackRaw) ? fallbackRaw : DEFAULT_BRIDGE_MAX_RETRIES);
return Math.min(MAX_BRIDGE_MAX_RETRIES, Math.max(MIN_BRIDGE_MAX_RETRIES, Math.floor(base)));
}

function isTransientNetworkError(error) {
const text = String(error || '').trim();
if (!text) return false;
if (/socket hang up/i.test(text)) return true;
if (/ECONNRESET|ECONNREFUSED|EPIPE|EPROTO|ETIMEDOUT/i.test(text)) return true;
if (/EAI_AGAIN/i.test(text)) return true;
if (/UND_ERR_SOCKET/i.test(text)) return true;
if (/disconnected before|secure tls|tls handshake/i.test(text)) return true;
return false;
}

function getTransientRetryDelayMs(attempt) {
const index = Math.max(0, Number(attempt) - 1);
return Math.min(MAX_TRANSIENT_RETRY_DELAY_MS, BASE_TRANSIENT_RETRY_DELAY_MS * Math.pow(3, index));
}

async function retryTransientRequest(executor, options = {}) {
const maxRetries = normalizeBridgeMaxRetries(options && options.maxRetries);
let lastResult = null;
for (let attempt = 0; attempt <= maxRetries; attempt += 1) {
if (attempt > 0) {
const delay = getTransientRetryDelayMs(attempt);
// eslint-disable-next-line no-await-in-loop
await new Promise((r) => {
const t = setTimeout(r, delay);
if (typeof t.unref === 'function') t.unref();
});
}
// eslint-disable-next-line no-await-in-loop
const result = await executor(attempt);
lastResult = result;
if (!result) return result;
if (result.ok) return result;
if (result.retry) return result;
if (result.status && result.status > 0) return result;
if (!isTransientNetworkError(result.error)) return result;
}
return lastResult;
}

module.exports = {
DEFAULT_BRIDGE_MAX_RETRIES,
MIN_BRIDGE_MAX_RETRIES,
MAX_BRIDGE_MAX_RETRIES,
normalizeBridgeMaxRetries,
isTransientNetworkError,
getTransientRetryDelayMs,
retryTransientRequest
};
Loading
Loading