SHA256
Включить диагностику ошибок браузера
This commit is contained in:
+38
-19
@@ -338,13 +338,15 @@ const GUEST_ALLOWED_PAGES = new Set([
|
||||
'queue',
|
||||
]);
|
||||
|
||||
setClientErrorTransport((payload) => authService.reportClientUiError(payload));
|
||||
setClientErrorTransport((payload) => authService.reportClientError(payload));
|
||||
setClientErrorSentNotifier((payload) => {
|
||||
// Технические подробности – только с включёнными инструментами разработчика.
|
||||
if (!isDeveloperToolsEnabled()) return;
|
||||
const login = String(state.session.login || 'guest').trim();
|
||||
const isoTs = new Date(Number(payload?.clientTs || Date.now())).toISOString();
|
||||
showToast(t('remaining.app.error_sent_to_server_login_time', { login, time: isoTs }));
|
||||
// Для сбоев операций показываем подтверждение. Глобальные ошибки и сбои
|
||||
// отрисовки показывают свой статус отдельно, без второго уведомления.
|
||||
if (payload.kind === 'global_error' || payload.kind === 'unhandled_rejection'
|
||||
|| payload.kind === 'page_render_failure') return;
|
||||
if (payload.kind === 'api_server_error' || isDeveloperToolsEnabled()) {
|
||||
showToast(t('remaining.app.error_report_received', { id: payload.errorId }), { kind: 'info' });
|
||||
}
|
||||
});
|
||||
window.__SHINE_SEND_CLIENT_ERROR_TO_SERVER__ = (payload) => authService.reportClientError(payload);
|
||||
window.__SHINE_SEND_CLIENT_ERROR__ = window.__SHINE_SEND_CLIENT_ERROR_TO_SERVER__;
|
||||
@@ -1323,15 +1325,16 @@ async function ensureSessionAfterWsReconnect() {
|
||||
return wsSessionRestoreInFlight;
|
||||
}
|
||||
|
||||
// Без инструментов разработчика – спокойное сообщение вместо окна со стеком вызовов,
|
||||
// не чаще раза в полминуты (ошибка уже записана в журнал и отправлена на сервер).
|
||||
// Без инструментов разработчика показываем простой итог отправки, не чаще раза в 30 сек.
|
||||
let lastCrashNoticeAt = 0;
|
||||
function showGlobalErrorAlert(title, details = {}) {
|
||||
function showGlobalErrorAlert(title, details = {}, sent = false, reportId = '') {
|
||||
if (!isDeveloperToolsEnabled()) {
|
||||
const now = Date.now();
|
||||
if (now - lastCrashNoticeAt < 30000) return;
|
||||
lastCrashNoticeAt = now;
|
||||
showToast(t('remaining.app.something_went_wrong_error_details_were_sent_to_the_devel'), { kind: 'error' });
|
||||
showToast(sent
|
||||
? t('remaining.app.error_report_received', { id: reportId })
|
||||
: t('remaining.app.error_report_not_sent'), { kind: 'error' });
|
||||
return;
|
||||
}
|
||||
const lines = [title];
|
||||
@@ -1359,7 +1362,7 @@ window.addEventListener('error', (event) => {
|
||||
stack: event.error?.stack || '',
|
||||
},
|
||||
});
|
||||
captureClientError({
|
||||
const reportPromise = captureClientError({
|
||||
kind: 'global_error',
|
||||
message: event.message || 'Global JS error',
|
||||
stack: event.error?.stack || '',
|
||||
@@ -1377,14 +1380,17 @@ window.addEventListener('error', (event) => {
|
||||
&& !event.filename && !(event.error?.stack);
|
||||
if (isOpaqueCrossOriginError) return;
|
||||
|
||||
showGlobalErrorAlert('Поймана глобальная ошибка UI', {
|
||||
const reportId = getLastClientErrorPayload()?.errorId || '';
|
||||
const details = {
|
||||
message: event.message || 'Global JS error',
|
||||
stack: event.error?.stack || '',
|
||||
sourceUrl: event.filename || '',
|
||||
lineNumber: event.lineno,
|
||||
columnNumber: event.colno,
|
||||
pageId,
|
||||
});
|
||||
};
|
||||
if (isDeveloperToolsEnabled()) showGlobalErrorAlert('Поймана глобальная ошибка UI', details);
|
||||
else void reportPromise.then((sent) => showGlobalErrorAlert('Ошибка UI', details, sent, reportId));
|
||||
});
|
||||
|
||||
window.addEventListener('unhandledrejection', (event) => {
|
||||
@@ -1400,7 +1406,7 @@ window.addEventListener('unhandledrejection', (event) => {
|
||||
stack: reason?.stack || '',
|
||||
},
|
||||
});
|
||||
captureClientError({
|
||||
const reportPromise = captureClientError({
|
||||
kind: 'unhandled_rejection',
|
||||
message: reason?.message || String(reason || 'Unhandled promise rejection'),
|
||||
stack: reason?.stack || '',
|
||||
@@ -1410,16 +1416,19 @@ window.addEventListener('unhandledrejection', (event) => {
|
||||
},
|
||||
});
|
||||
|
||||
showGlobalErrorAlert('Пойман необработанный Promise reject', {
|
||||
const reportId = getLastClientErrorPayload()?.errorId || '';
|
||||
const details = {
|
||||
message: reason?.message || String(reason || 'Unhandled promise rejection'),
|
||||
stack: reason?.stack || '',
|
||||
pageId,
|
||||
reasonType: reason?.constructor?.name || typeof reason,
|
||||
});
|
||||
};
|
||||
if (isDeveloperToolsEnabled()) showGlobalErrorAlert('Пойман необработанный Promise reject', details);
|
||||
else void reportPromise.then((sent) => showGlobalErrorAlert('Ошибка UI', details, sent, reportId));
|
||||
});
|
||||
|
||||
function renderPageFailureFallback(pageId, error) {
|
||||
captureClientError({
|
||||
const reportPromise = captureClientError({
|
||||
kind: 'page_render_failure',
|
||||
message: error?.message || 'Page render failed',
|
||||
stack: error?.stack || '',
|
||||
@@ -1443,13 +1452,23 @@ function renderPageFailureFallback(pageId, error) {
|
||||
details.className = 'meta-muted';
|
||||
details.textContent = t('remaining.app.screen_render', { page: pageId || t('remaining.app.unknown') });
|
||||
|
||||
const reportStatus = document.createElement('p');
|
||||
reportStatus.className = 'meta-muted';
|
||||
reportStatus.textContent = t('remaining.app.error_report_pending');
|
||||
const reportId = getLastClientErrorPayload()?.errorId || '';
|
||||
void reportPromise.then((sent) => {
|
||||
if (reportStatus.isConnected) reportStatus.textContent = sent
|
||||
? t('remaining.app.error_report_received', { id: reportId })
|
||||
: t('remaining.app.error_report_not_sent');
|
||||
});
|
||||
|
||||
const retry = document.createElement('button');
|
||||
retry.type = 'button';
|
||||
retry.className = 'primary-btn';
|
||||
retry.textContent = t('remaining.app.retry');
|
||||
retry.addEventListener('click', () => renderApp());
|
||||
|
||||
card.append(title, details, retry);
|
||||
card.append(title, details, reportStatus, retry);
|
||||
wrap.append(card);
|
||||
screenEl.append(wrap);
|
||||
|
||||
@@ -2144,7 +2163,7 @@ const SESSION_HANDSHAKE_OPS = new Set([
|
||||
]);
|
||||
|
||||
authService.ws.setRequestGuard(async (op) => {
|
||||
if (SESSION_HANDSHAKE_OPS.has(op)) return;
|
||||
if (op === 'ClientErrorLog' || SESSION_HANDSHAKE_OPS.has(op)) return;
|
||||
if (!state.session.isAuthorized || authService.ws.isSessionReady()) return;
|
||||
await ensureSessionAfterWsReconnect();
|
||||
});
|
||||
|
||||
@@ -362,7 +362,7 @@
|
||||
"label_007": "Upload",
|
||||
"label_008": "Copy TX ID",
|
||||
"label_009": "Sending UI errors to the server",
|
||||
"label_010": "For developers: When an interface error is enabled, it will automatically be sent to the server for diagnosis."
|
||||
"label_010": "Critical interface errors and unexpected server failures are reported automatically. Passwords, private keys, and message contents are not included. Reports are not queued when offline."
|
||||
},
|
||||
"network_view": {
|
||||
"label_001": "Enter your username",
|
||||
@@ -4666,6 +4666,9 @@
|
||||
"could_not_switch_profile": "Could not switch profile.",
|
||||
"your_session_has_expired_please_sign_in_again": "Your session has expired. Please sign in again.",
|
||||
"something_went_wrong_error_details_were_sent_to_the_devel": "Something went wrong. Error details were sent to the developers. Please try again.",
|
||||
"error_report_pending": "Sending technical error details…",
|
||||
"error_report_received": "The action failed. The server received error report {id}. Please try again.",
|
||||
"error_report_not_sent": "Something went wrong. The error report could not reach the server. Check your connection and try again.",
|
||||
"could_not_display_this_screen": "Could not display this screen",
|
||||
"unknown": "unknown",
|
||||
"retry": "Retry",
|
||||
|
||||
@@ -456,7 +456,7 @@
|
||||
"label_007": "Загрузить",
|
||||
"label_008": "Скопировать TX ID",
|
||||
"label_009": "Отправка UI-ошибок на сервер",
|
||||
"label_010": "Для разработчиков: при включении ошибки интерфейса будут автоматически отправляться на сервер для диагностики.",
|
||||
"label_010": "Критические ошибки интерфейса и неожиданные отказы сервера автоматически отправляются для диагностики. Пароли, приватные ключи и содержимое сообщений не передаются. При отсутствии связи отправка не выполняется.",
|
||||
"label_011": "Отправлять ошибки на сервер",
|
||||
"label_012": "Отмена",
|
||||
"label_013": "Сохранить"
|
||||
@@ -4666,6 +4666,9 @@
|
||||
"could_not_switch_profile": "Не удалось переключить профиль.",
|
||||
"your_session_has_expired_please_sign_in_again": "Ваша сессия устарела. Авторизируйтесь заново.",
|
||||
"something_went_wrong_error_details_were_sent_to_the_devel": "Что-то пошло не так. Сведения об ошибке уже отправлены разработчикам – попробуйте ещё раз.",
|
||||
"error_report_pending": "Отправляем техническую информацию об ошибке…",
|
||||
"error_report_received": "Не удалось выполнить действие. Отчёт об ошибке принят сервером (№ {id}). Попробуйте ещё раз.",
|
||||
"error_report_not_sent": "Возникла ошибка. Не удалось передать отчёт на сервер. Проверьте соединение и повторите попытку.",
|
||||
"could_not_display_this_screen": "Не удалось отрисовать экран",
|
||||
"unknown": "неизвестно",
|
||||
"retry": "Повторить",
|
||||
|
||||
@@ -3,10 +3,6 @@ import { openPaletteEditor } from '../components/palette-editor.js';
|
||||
import { resolveThemeMode } from '../services/theme-service.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { addAppLogEntry, authService, state } from '../state.js';
|
||||
import {
|
||||
isClientErrorReportingEnabled,
|
||||
setClientErrorReportingEnabled,
|
||||
} from '../services/client-error-reporter.js';
|
||||
import {
|
||||
canInstallPwa,
|
||||
isStandalonePwaMode,
|
||||
@@ -217,19 +213,13 @@ function openUiErrorReportingModal() {
|
||||
const root = document.getElementById('modal-root');
|
||||
if (!root) return;
|
||||
|
||||
const enabled = isClientErrorReportingEnabled();
|
||||
root.innerHTML = `
|
||||
<div class="modal" id="settings-ui-error-reporting-modal">
|
||||
<div class="modal-card stack">
|
||||
<h3 class="modal-title">${t('dialogs.modals.developer_settings_view.label_009')}</h3>
|
||||
<p class="meta-muted">${t('dialogs.modals.developer_settings_view.label_010')}</p>
|
||||
<label class="row wrap-row" for="ui-error-reporting-toggle">
|
||||
<input id="ui-error-reporting-toggle" type="checkbox" ${enabled ? 'checked' : ''} />
|
||||
<span>${t('dialogs.modals.developer_settings_view.label_011')}</span>
|
||||
</label>
|
||||
<div class="form-actions-grid">
|
||||
<button class="secondary-btn" id="ui-error-reporting-cancel" type="button">${t('dialogs.modals.developer_settings_view.label_012')}</button>
|
||||
<button class="primary-btn" id="ui-error-reporting-save" type="button">${t('dialogs.modals.developer_settings_view.label_013')}</button>
|
||||
<button class="primary-btn" id="ui-error-reporting-cancel" type="button">${t('dialogs.modals.developer_settings_view.label_006')}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -237,11 +227,6 @@ function openUiErrorReportingModal() {
|
||||
|
||||
const close = () => { root.innerHTML = ''; };
|
||||
root.querySelector('#ui-error-reporting-cancel')?.addEventListener('click', close);
|
||||
root.querySelector('#ui-error-reporting-save')?.addEventListener('click', () => {
|
||||
const checked = root.querySelector('#ui-error-reporting-toggle')?.checked === true;
|
||||
setClientErrorReportingEnabled(checked);
|
||||
close();
|
||||
});
|
||||
}
|
||||
|
||||
export function render({navigate, chrome}) {
|
||||
|
||||
@@ -3543,26 +3543,11 @@ export class AuthService {
|
||||
}
|
||||
|
||||
async reportClientError(details) {
|
||||
// Ошибки не запускают переподключение: без открытого WS отчёт не отправляем.
|
||||
if (this.ws?.ws?.readyState !== WebSocket.OPEN) return false;
|
||||
try {
|
||||
const response = await this.ws.request('ClientErrorLog', details || {}, 3000);
|
||||
return response?.status === 200;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
async reportClientUiError(details = {}) {
|
||||
try {
|
||||
const payload = {
|
||||
source: 'ui_error',
|
||||
code: 'UI_RUNTIME_ERROR',
|
||||
...details,
|
||||
};
|
||||
const response = await this.sendCallDeliveryReport({
|
||||
type: 'ui_error',
|
||||
value: JSON.stringify(payload),
|
||||
});
|
||||
return !!response;
|
||||
return response?.status === 200 && response?.accepted === true;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,83 +1,109 @@
|
||||
const MAX_CONTEXT_LEN = 2000;
|
||||
// Единая диагностика технических ошибок UI. Без очереди и без пользовательского выключателя.
|
||||
const RECENT_WINDOW_MS = 5000;
|
||||
const UI_ERROR_REPORTING_KEY = 'shine-ui-send-errors-to-server-v1';
|
||||
|
||||
const MAX_CONTEXT_LEN = 800;
|
||||
const MAX_IN_FLIGHT = 3;
|
||||
let transport = null;
|
||||
let transportDepth = 0;
|
||||
let inFlight = 0;
|
||||
const recentFingerprints = new Map();
|
||||
let notifySent = null;
|
||||
let lastCapturedPayload = null;
|
||||
|
||||
function nowTs() {
|
||||
return Date.now();
|
||||
}
|
||||
function nowTs() { return Date.now(); }
|
||||
|
||||
// Диагностические строки не должны включать токены, пароли и длинные ключевые данные.
|
||||
function cleanString(value, maxLen = 1000) {
|
||||
if (value == null) return '';
|
||||
const normalized = String(value).replace(/\s+/g, ' ').trim();
|
||||
if (normalized.length <= maxLen) return normalized;
|
||||
return `${normalized.slice(0, Math.max(0, maxLen - 3))}...`;
|
||||
const cleaned = String(value)
|
||||
.replace(/https?:\/\/[^\s)]+/gi, (url) => {
|
||||
const line = url.match(/:(\d+):(\d+)$/);
|
||||
const path = url.replace(/[?#].*$/, '');
|
||||
return `${path}${line && path !== url ? `:${line[1]}:${line[2]}` : ''}`;
|
||||
})
|
||||
.replace(/\bBearer\s+[^\s,;]+/gi, 'Bearer [REDACTED]')
|
||||
.replace(/\b(password|passwd|token|secret|privateKey|sessionId|authorization|apiKey|storagePwd)\s*[:=]\s*["']?[^\s,;}&"']+/gi, '$1=[REDACTED]')
|
||||
.replace(/([?&](?:token|key|password|secret|session|auth|code|signature)=[^&#\s]+)/gi, '[REDACTED_PARAM]')
|
||||
.replace(/\b[A-Za-z0-9_+\/=-]{96,}\b/g, '[REDACTED_LONG_VALUE]')
|
||||
.replace(/[\u0000-\u001f\u007f]+/g, ' ')
|
||||
.trim();
|
||||
return cleaned.length <= maxLen ? cleaned : `${cleaned.slice(0, Math.max(0, maxLen - 3))}...`;
|
||||
}
|
||||
|
||||
function stringifyContext(context) {
|
||||
if (context == null) return '';
|
||||
function safePagePath() {
|
||||
try { return cleanString(window.location?.pathname || '', 150); } catch { return ''; }
|
||||
}
|
||||
|
||||
function safeSource(value) {
|
||||
try {
|
||||
const raw = JSON.stringify(context);
|
||||
if (!raw) return '';
|
||||
if (raw.length <= MAX_CONTEXT_LEN) return raw;
|
||||
return `${raw.slice(0, MAX_CONTEXT_LEN - 3)}...`;
|
||||
} catch (error) {
|
||||
return cleanString(`context_json_error:${error?.message || error}`, MAX_CONTEXT_LEN);
|
||||
}
|
||||
const url = new URL(String(value || ''), window.location.origin);
|
||||
return cleanString(`${url.origin}${url.pathname}`, 240); // без query/hash
|
||||
} catch { return ''; }
|
||||
}
|
||||
|
||||
function makeFingerprint(payload) {
|
||||
return [
|
||||
payload.kind,
|
||||
payload.message,
|
||||
payload.sourceUrl,
|
||||
payload.lineNumber,
|
||||
payload.columnNumber,
|
||||
payload.requestOp,
|
||||
].join('|');
|
||||
// Только разрешённые технические поля: произвольный context может содержать DM/ключи.
|
||||
function safeContext(raw) {
|
||||
const obj = raw && typeof raw === 'object' ? raw : {};
|
||||
const result = {};
|
||||
for (const key of ['pageId', 'reasonType', 'pageProtocol', 'timeoutMs', 'code', 'status']) {
|
||||
const value = obj[key];
|
||||
if (typeof value === 'string' || typeof value === 'number') result[key] = cleanString(value, 80);
|
||||
}
|
||||
if (Array.isArray(obj.pendingOps)) {
|
||||
result.pendingOps = obj.pendingOps.slice(0, 8).map((op) => cleanString(op, 48));
|
||||
}
|
||||
const json = JSON.stringify({ pageVisibility: document.visibilityState || '', ...result });
|
||||
return cleanString(json, MAX_CONTEXT_LEN);
|
||||
}
|
||||
|
||||
function isDuplicate(fingerprint) {
|
||||
const ts = nowTs();
|
||||
const prev = recentFingerprints.get(fingerprint);
|
||||
recentFingerprints.set(fingerprint, ts);
|
||||
|
||||
for (const [key, time] of recentFingerprints.entries()) {
|
||||
if (ts - time > RECENT_WINDOW_MS) {
|
||||
recentFingerprints.delete(key);
|
||||
}
|
||||
}
|
||||
|
||||
return prev != null && ts - prev < RECENT_WINDOW_MS;
|
||||
function errorId() {
|
||||
const bytes = new Uint8Array(6);
|
||||
if (globalThis.crypto?.getRandomValues) globalThis.crypto.getRandomValues(bytes);
|
||||
else return `ERR-${nowTs().toString(16)}-${Math.random().toString(16).slice(2, 8)}`;
|
||||
return `ERR-${[...bytes].map((value) => value.toString(16).padStart(2, '0')).join('').toUpperCase()}`;
|
||||
}
|
||||
|
||||
function buildPayload(details = {}) {
|
||||
const kind = cleanString(details.kind || 'client_error', 64);
|
||||
const runtime = ['global_error', 'unhandled_rejection', 'page_render_failure',
|
||||
'channels_thread_runtime'].includes(kind);
|
||||
const originalMessage = String(details.message || details.reason || 'Unknown client error');
|
||||
const type = originalMessage.match(/\b(TypeError|ReferenceError|SyntaxError|RangeError|URIError|EvalError|AggregateError)\b/);
|
||||
// Произвольные исключения могут содержать приватный текст DM. Для них передаём
|
||||
// только тип и адреса кадров стека, но не текст исключения/первую строку stack.
|
||||
const message = runtime ? `${type?.[1] || 'RuntimeError'}: client exception` : originalMessage;
|
||||
const originalStack = String(details.stack || details.error?.stack || '');
|
||||
const stack = runtime ? originalStack.split('\n').slice(1).join('\n') : originalStack;
|
||||
return {
|
||||
kind: cleanString(details.kind || 'client_error', 64),
|
||||
message: cleanString(details.message || details.reason || 'Unknown client error', 500),
|
||||
stack: cleanString(details.stack || details.error?.stack || '', 8000),
|
||||
sourceUrl: cleanString(details.sourceUrl || details.fileName || '', 240),
|
||||
errorId: errorId(),
|
||||
clientVersion: cleanString(window.__SHINE_BUILD_HASH__ || '', 80),
|
||||
kind,
|
||||
message: cleanString(message, 500),
|
||||
stack: cleanString(stack, 6000),
|
||||
sourceUrl: safeSource(details.sourceUrl || details.fileName || ''),
|
||||
lineNumber: Number.isFinite(details.lineNumber) ? details.lineNumber : null,
|
||||
columnNumber: Number.isFinite(details.columnNumber) ? details.columnNumber : null,
|
||||
route: cleanString(details.route || window.location?.hash || '', 200),
|
||||
href: cleanString(details.href || window.location?.href || '', 240),
|
||||
userAgent: cleanString(details.userAgent || navigator.userAgent || '', 240),
|
||||
route: safePagePath(),
|
||||
href: window.location?.origin || '', // без query/hash и данных из URL
|
||||
userAgent: cleanString(navigator.userAgent || '', 240),
|
||||
clientTs: Number.isFinite(details.clientTs) ? details.clientTs : nowTs(),
|
||||
requestOp: cleanString(details.requestOp || '', 64),
|
||||
requestIdRef: cleanString(details.requestIdRef || '', 128),
|
||||
contextJson: stringifyContext({
|
||||
title: document.title || '',
|
||||
pageVisibility: document.visibilityState || '',
|
||||
...details.context,
|
||||
}),
|
||||
contextJson: safeContext(details.context),
|
||||
};
|
||||
}
|
||||
|
||||
function isDuplicate(payload, key) {
|
||||
const ts = nowTs();
|
||||
const fingerprint = key || [payload.kind, payload.message, payload.sourceUrl,
|
||||
payload.lineNumber, payload.requestOp, payload.stack.slice(0, 180)].join('|');
|
||||
const prev = recentFingerprints.get(fingerprint);
|
||||
for (const [name, last] of recentFingerprints) {
|
||||
if (ts - last > RECENT_WINDOW_MS) recentFingerprints.delete(name);
|
||||
}
|
||||
if (recentFingerprints.size >= 128) recentFingerprints.delete(recentFingerprints.keys().next().value);
|
||||
recentFingerprints.set(fingerprint, ts);
|
||||
return prev != null && ts - prev < RECENT_WINDOW_MS;
|
||||
}
|
||||
|
||||
export function setClientErrorTransport(fn) {
|
||||
transport = typeof fn === 'function' ? fn : null;
|
||||
}
|
||||
@@ -87,55 +113,29 @@ export function setClientErrorSentNotifier(fn) {
|
||||
}
|
||||
|
||||
export function getLastClientErrorPayload() {
|
||||
if (!lastCapturedPayload) return null;
|
||||
return { ...lastCapturedPayload };
|
||||
}
|
||||
|
||||
export function isClientErrorReportingEnabled() {
|
||||
try {
|
||||
return localStorage.getItem(UI_ERROR_REPORTING_KEY) === '1';
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
export function setClientErrorReportingEnabled(enabled) {
|
||||
try {
|
||||
localStorage.setItem(UI_ERROR_REPORTING_KEY, enabled ? '1' : '0');
|
||||
} catch {
|
||||
// ignore storage errors
|
||||
}
|
||||
return lastCapturedPayload ? { ...lastCapturedPayload } : null;
|
||||
}
|
||||
|
||||
export async function captureClientError(details = {}) {
|
||||
const payload = buildPayload(details);
|
||||
if (!payload.message) return false;
|
||||
lastCapturedPayload = payload;
|
||||
if (isDuplicate(payload, details.dedupeKey)) return false;
|
||||
console.error('[client-error]', payload.kind, payload.message); // без исходного error/context
|
||||
|
||||
const fingerprint = details.dedupeKey || makeFingerprint(payload);
|
||||
if (isDuplicate(fingerprint)) return false;
|
||||
|
||||
console.error('[client-error]', payload.kind, payload.message, details.error || '');
|
||||
|
||||
if (!transport || details.skipTransport === true || transportDepth > 0 || !isClientErrorReportingEnabled()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!transport || details.skipTransport === true || inFlight >= MAX_IN_FLIGHT) return false;
|
||||
try {
|
||||
transportDepth += 1;
|
||||
await transport(payload);
|
||||
inFlight += 1;
|
||||
// Только положительное подтверждение ClientErrorLog означает запись на сервере.
|
||||
const accepted = await transport(payload);
|
||||
if (accepted !== true) return false;
|
||||
if (notifySent) {
|
||||
try {
|
||||
notifySent(payload);
|
||||
} catch {
|
||||
// ignore notifier errors
|
||||
}
|
||||
try { notifySent(payload); } catch { /* уведомление не должно ломать диагностику */ }
|
||||
}
|
||||
return true;
|
||||
} catch (error) {
|
||||
console.warn('client error transport failed', error);
|
||||
} catch {
|
||||
// Ошибка отправки не создаёт новый отчёт и не запускает повторную отправку.
|
||||
return false;
|
||||
} finally {
|
||||
transportDepth = Math.max(0, transportDepth - 1);
|
||||
inFlight -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,6 +89,7 @@ export class WsJsonClient {
|
||||
const error = new Error(t('remaining.websocket.this_page_uses_https_but_the_server_uses_ws_use_wss_for_th'));
|
||||
captureClientError({
|
||||
kind: 'ws_mixed_content_blocked',
|
||||
skipTransport: true,
|
||||
message: error.message,
|
||||
context: { url: this.url, pageProtocol: window.location.protocol },
|
||||
});
|
||||
@@ -107,7 +108,8 @@ export class WsJsonClient {
|
||||
ws.addEventListener('error', () => {
|
||||
captureClientError({
|
||||
kind: 'ws_open_error',
|
||||
message: `Failed to connect WebSocket ${this.url}`,
|
||||
skipTransport: true,
|
||||
message: 'WebSocket connection failed',
|
||||
context: { url: this.url },
|
||||
});
|
||||
reject(new Error(`Не удалось подключиться к ${this.url}`));
|
||||
@@ -191,7 +193,7 @@ export class WsJsonClient {
|
||||
captureClientError({
|
||||
kind: 'ws_bad_json',
|
||||
message: 'Received non-JSON message from server',
|
||||
context: { raw: String(raw).slice(0, 1000) },
|
||||
context: { code: 'invalid_json' },
|
||||
});
|
||||
return;
|
||||
}
|
||||
@@ -207,6 +209,18 @@ export class WsJsonClient {
|
||||
const slot = this.pending.get(requestId);
|
||||
if (!slot) return;
|
||||
this.pending.delete(requestId);
|
||||
// Обработанные 4xx — обычные отказы. Только неожиданные 5xx диагностируем.
|
||||
const status = Number(data?.status);
|
||||
if (slot.op !== 'ClientErrorLog' && Number.isInteger(status)
|
||||
&& status >= 500 && status < 600 && status !== 507) {
|
||||
captureClientError({
|
||||
kind: 'api_server_error',
|
||||
message: `Server returned HTTP-like status ${status} for ${slot.op}`,
|
||||
requestOp: slot.op,
|
||||
requestIdRef: requestId,
|
||||
context: { status },
|
||||
});
|
||||
}
|
||||
slot.resolve(data);
|
||||
}
|
||||
|
||||
@@ -238,6 +252,7 @@ export class WsJsonClient {
|
||||
if (pendingOps.length > 0) {
|
||||
captureClientError({
|
||||
kind: 'ws_closed',
|
||||
skipTransport: true,
|
||||
message,
|
||||
context: { url: this.url, pendingOps },
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user