fix(admin): stop console Intl errors and log websocket drops

Use raw i18n for push template hints so ICU does not parse
{{placeholders}}. Pass total into the user list record count.
Allow log websocket origins behind the Next rewrite, skip the
proxy on Upgrade, and do not open a socket after unmount.
This commit is contained in:
ryan
2026-09-02 17:52:57 +08:00
parent 8aa0753b12
commit 1f1f4efec7
7 changed files with 140 additions and 15 deletions
@@ -252,10 +252,16 @@ export function AppLogs() {
// ---- Initialize ------------------------------------------------------
useEffect(() => {
loadHistory(0).then(() => connectWs());
let cancelled = false;
loadHistory(0).then(() => {
if (cancelled) return;
connectWs();
});
return () => {
wsRef.current?.close();
cancelled = true;
const ws = wsRef.current;
wsRef.current = null;
ws?.close();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
@@ -713,8 +713,8 @@ export function EventsTab() {
</Label>
<span className='text-[10px] text-muted-foreground font-mono flex items-center'>
{newEventType === 'task'
? t('taskTemplateVars')
: t('eventTemplateVars')}
? t.raw('taskTemplateVars')
: t.raw('eventTemplateVars')}
</span>
</div>
<Textarea
@@ -893,8 +893,8 @@ export function EventsTab() {
</Label>
<span className='text-[10px] text-muted-foreground font-mono flex items-center'>
{selectedEvent.task_type
? t('taskTemplateVars')
: t('eventTemplateVars')}
? t.raw('taskTemplateVars')
: t.raw('eventTemplateVars')}
</span>
</div>
<Textarea
@@ -218,7 +218,7 @@ export function UserFilterBar() {
<div className='flex items-center gap-1.5 self-end lg:self-auto'>
<span className='text-[10px] text-muted-foreground whitespace-nowrap'>
{t('totalRecords', { count: total })}
{t('totalRecords', { total })}
</span>
<div className='flex items-center border border-dashed rounded-md shadow-none'>
<Button
+7 -2
View File
@@ -81,6 +81,11 @@ export function proxy(request: NextRequest) {
process.env.WAVELET_SESSION_COOKIE_NAME || 'wavelet_session_id';
const sessionCookie = request.cookies.get(sessionCookieName);
// WebSocket upgrades must pass through to rewrites untouched.
if (request.headers.get('upgrade')?.toLowerCase() === 'websocket') {
return NextResponse.next();
}
/* API 请求:速率限制后放行 */
if (pathname.startsWith('/api/')) {
const rateLimitEnabled = process.env.WAVELET_RATE_LIMIT_ENABLED === 'true';
@@ -136,7 +141,7 @@ export function proxy(request: NextRequest) {
export const config = {
matcher: [
'/api/:path*',
'/((?!_next|favicon.ico|robots.txt|sitemap.xml|.*\\.(?:jpg|jpeg|gif|png|svg|ico|webp)).*)',
'/api/((?!v1/admin/logs/ws).*)',
'/((?!_next|favicon.ico|robots.txt|sitemap.xml|api/v1/admin/logs/ws|.*\\.(?:jpg|jpeg|gif|png|svg|ico|webp)).*)',
],
};