Hide goose from user-facing connection errors

This commit is contained in:
john
2026-06-25 23:44:58 +08:00
parent e133f9a3a4
commit d51df2fb0a
2 changed files with 77 additions and 14 deletions
+50 -7
View File
@@ -14,6 +14,21 @@ function isHttpsTarget(target) {
return target.startsWith('https://');
}
function sanitizeUserFacingProxyMessage(message, fallback = '后端连接失败,请稍后重试') {
const normalized = String(message ?? '').trim();
if (!normalized) return fallback;
if (!/goose|goosed/i.test(normalized)) return normalized;
if (/超时|timeout/i.test(normalized)) {
return '后端连接超时,请确认后端服务正常后重试';
}
if (/不可用|连接失败|failed to fetch|networkerror|fetch failed|upstream|econn|enotfound/i.test(normalized)) {
return fallback;
}
return normalized
.replace(/\bgoosed\b/gi, '后端服务')
.replace(/\bgoose\b/gi, '后端');
}
async function apiFetch(target, apiSecret, pathname, init = {}) {
const url = new URL(pathname, target);
const headers = {
@@ -308,7 +323,12 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
res.status(upstream.status).json(payload);
} catch (err) {
res.status(500).json({ message: err instanceof Error ? err.message : '恢复会话失败' });
res.status(500).json({
message: sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : '恢复会话失败',
'恢复会话失败',
),
});
}
},
],
@@ -339,12 +359,15 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
if (owned.has(item.id)) sessionsById.set(item.id, item);
}
} catch (err) {
lastFailure = err instanceof Error ? err.message : '读取会话失败';
lastFailure = sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : '读取会话失败',
'读取会话失败',
);
}
}
if (healthyTargets === 0) {
res.status(502).json({ message: lastFailure ?? '所有 goose 服务不可用' });
res.status(502).json({ message: lastFailure ?? '后端连接失败,请稍后重试' });
return;
}
if (healthyTargets < targets.length) {
@@ -352,7 +375,12 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
}
res.json({ sessions: [...sessionsById.values()] });
} catch (err) {
res.status(500).json({ message: err instanceof Error ? err.message : '读取会话失败' });
res.status(500).json({
message: sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : '读取会话失败',
'读取会话失败',
),
});
}
},
],
@@ -377,7 +405,12 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
req.agentSessionId = sessionId;
await build(req, res, next);
} catch (err) {
res.status(500).json({ message: err instanceof Error ? err.message : '请求失败' });
res.status(500).json({
message: sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : '请求失败',
'请求失败',
),
});
}
},
];
@@ -441,7 +474,12 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
source.on('error', () => res.end());
source.pipe(billingTransform);
} catch (err) {
res.status(502).json({ message: err instanceof Error ? err.message : 'SSE 代理失败' });
res.status(502).json({
message: sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : 'SSE 代理失败',
'SSE 代理失败',
),
});
}
};
@@ -494,7 +532,12 @@ export function createTkmindProxy({ apiTarget, apiTargets, apiSecret, userAuth,
sendProxyResponse(res, upstream);
} catch (err) {
res.status(502).json({ message: err instanceof Error ? err.message : '代理失败' });
res.status(502).json({
message: sanitizeUserFacingProxyMessage(
err instanceof Error ? err.message : '代理失败',
'代理失败',
),
});
}
};