SHA256
Локализовать интерфейс SHiNE на русский и английский
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import { t, th } from '../i18n/index.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { authService, state } from '../state.js';
|
||||
import { canInstallPwa, isStandalonePwaMode } from '../services/pwa-install-service.js';
|
||||
|
||||
export const pageMeta = { id: 'pwa-diagnostics-view', title: 'Диагностика PWA / Push' };
|
||||
export const pageMeta = { id: 'pwa-diagnostics-view', get title() { return t('screens.pwa_diagnostics_view.text_001'); } };
|
||||
|
||||
const LS_SUBSCRIPTION_KEY = 'shine-ui-webpush-subscription-v1';
|
||||
const LS_SUBSCRIPTION_UPDATED_AT_KEY = 'shine-ui-webpush-subscription-updated-at-v1';
|
||||
@@ -40,7 +41,7 @@ function detectLaunchMode() {
|
||||
return 'fullscreen';
|
||||
}
|
||||
if (window.matchMedia?.('(display-mode: browser)')?.matches) {
|
||||
return 'браузер';
|
||||
return t('screens.pwa_diagnostics_view.text_022');
|
||||
}
|
||||
return 'unknown';
|
||||
} catch {
|
||||
@@ -56,10 +57,10 @@ function detectIosSafari() {
|
||||
}
|
||||
|
||||
function buildInstallState({ launchMode, manifestOk, swRegistered }) {
|
||||
if (launchMode === 'standalone' || launchMode === 'fullscreen') return 'уже установлено';
|
||||
if (canInstallPwa()) return 'доступна кнопка установки';
|
||||
if (!window.isSecureContext || !manifestOk || !swRegistered) return 'недоступно';
|
||||
return 'браузер не сообщает';
|
||||
if (launchMode === 'standalone' || launchMode === 'fullscreen') return t('screens.pwa_diagnostics_view.text_023');
|
||||
if (canInstallPwa()) return t('screens.pwa_diagnostics_view.text_024');
|
||||
if (!window.isSecureContext || !manifestOk || !swRegistered) return t('screens.pwa_diagnostics_view.text_025');
|
||||
return t('screens.pwa_diagnostics_view.text_026');
|
||||
}
|
||||
|
||||
function toneFor(value, type = 'binary') {
|
||||
@@ -112,27 +113,27 @@ function rowEl(label, value, tone) {
|
||||
async function collectDiagnostics() {
|
||||
const result = {
|
||||
secureContext: window.isSecureContext === true,
|
||||
manifestStatus: 'не найден',
|
||||
manifestStatus: t('screens.pwa_diagnostics_view.text_027'),
|
||||
manifestUrl: '',
|
||||
swStatus: 'не зарегистрирован',
|
||||
swStatus: t('screens.pwa_diagnostics_view.text_028'),
|
||||
swError: '',
|
||||
launchMode: detectLaunchMode(),
|
||||
installAvailability: 'браузер не сообщает',
|
||||
notificationsApi: 'нет',
|
||||
pushApi: 'нет',
|
||||
installAvailability: t('screens.pwa_diagnostics_view.text_029'),
|
||||
notificationsApi: t('screens.pwa_diagnostics_view.text_030'),
|
||||
pushApi: t('screens.pwa_diagnostics_view.text_031'),
|
||||
notificationPermission: 'default',
|
||||
pushSubscription: 'нет',
|
||||
pushSubscription: t('screens.pwa_diagnostics_view.text_032'),
|
||||
subscriptionEndpoint: '',
|
||||
subscriptionUpdatedAtMs: 0,
|
||||
lastTestPush: 'не запускался',
|
||||
lastTestPush: t('screens.pwa_diagnostics_view.text_033'),
|
||||
lastTestPushAtMs: 0,
|
||||
lastPushPayload: null,
|
||||
iosSafariHint: false,
|
||||
tech: {},
|
||||
};
|
||||
|
||||
result.notificationsApi = 'Notification' in window ? 'поддерживается' : 'нет';
|
||||
result.pushApi = 'PushManager' in window ? 'поддерживается' : 'нет';
|
||||
result.notificationsApi = 'Notification' in window ? t('screens.pwa_diagnostics_view.text_034') : t('screens.pwa_diagnostics_view.text_035');
|
||||
result.pushApi = 'PushManager' in window ? t('screens.pwa_diagnostics_view.text_036') : t('screens.pwa_diagnostics_view.text_037');
|
||||
if ('Notification' in window) {
|
||||
result.notificationPermission = String(Notification.permission || 'default');
|
||||
}
|
||||
@@ -143,26 +144,26 @@ async function collectDiagnostics() {
|
||||
if (href) {
|
||||
const url = new URL(href, window.location.href).toString();
|
||||
const resp = await fetch(url, { cache: 'no-store' });
|
||||
result.manifestStatus = resp.ok ? 'найден' : 'не найден';
|
||||
result.manifestStatus = resp.ok ? t('screens.pwa_diagnostics_view.text_038') : t('screens.pwa_diagnostics_view.text_039');
|
||||
result.manifestUrl = url;
|
||||
} else {
|
||||
result.manifestStatus = 'не найден';
|
||||
result.manifestStatus = t('screens.pwa_diagnostics_view.text_048');
|
||||
}
|
||||
} catch {
|
||||
result.manifestStatus = 'не найден';
|
||||
result.manifestStatus = t('screens.pwa_diagnostics_view.text_049');
|
||||
}
|
||||
|
||||
let registration = null;
|
||||
if ('serviceWorker' in navigator) {
|
||||
try {
|
||||
registration = await navigator.serviceWorker.getRegistration();
|
||||
result.swStatus = registration ? 'зарегистрирован' : 'не зарегистрирован';
|
||||
result.swStatus = registration ? t('screens.pwa_diagnostics_view.text_040') : t('screens.pwa_diagnostics_view.text_041');
|
||||
} catch (error) {
|
||||
result.swStatus = 'ошибка';
|
||||
result.swStatus = t('screens.pwa_diagnostics_view.text_050');
|
||||
result.swError = error?.message || 'unknown';
|
||||
}
|
||||
} else {
|
||||
result.swStatus = 'не зарегистрирован';
|
||||
result.swStatus = t('screens.pwa_diagnostics_view.text_051');
|
||||
}
|
||||
|
||||
result.installAvailability = buildInstallState({
|
||||
@@ -175,13 +176,13 @@ async function collectDiagnostics() {
|
||||
try {
|
||||
const subscription = await registration.pushManager.getSubscription();
|
||||
if (subscription) {
|
||||
result.pushSubscription = 'есть';
|
||||
result.pushSubscription = t('screens.pwa_diagnostics_view.text_052');
|
||||
result.subscriptionEndpoint = String(subscription.endpoint || '');
|
||||
} else {
|
||||
result.pushSubscription = 'нет';
|
||||
result.pushSubscription = t('screens.pwa_diagnostics_view.text_053');
|
||||
}
|
||||
} catch (error) {
|
||||
result.pushSubscription = 'ошибка получения';
|
||||
result.pushSubscription = t('screens.pwa_diagnostics_view.text_054');
|
||||
result.swError = result.swError || (error?.message || 'unknown');
|
||||
}
|
||||
}
|
||||
@@ -237,30 +238,30 @@ async function collectDiagnostics() {
|
||||
function buildRecommendations(diag) {
|
||||
const rows = [];
|
||||
if (!diag.secureContext) {
|
||||
rows.push('Откройте приложение через HTTPS. Без этого push и install-mode работают нестабильно.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_068'));
|
||||
}
|
||||
if (diag.manifestStatus !== 'найден') {
|
||||
rows.push('Проверьте доступность `manifest.webmanifest` и заголовки кэша для него.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_069'));
|
||||
}
|
||||
if (diag.swStatus !== 'зарегистрирован') {
|
||||
rows.push('Service Worker не зарегистрирован. Проверьте путь `firebase-messaging-sw.js` и HTTPS.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_070'));
|
||||
}
|
||||
if (diag.notificationPermission === 'default') {
|
||||
rows.push('Выдайте разрешение на уведомления через кнопку «Запросить разрешение на уведомления».');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_071'));
|
||||
} else if (diag.notificationPermission === 'denied') {
|
||||
rows.push('Разрешение уведомлений заблокировано в браузере. Разрешите уведомления в настройках сайта.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_072'));
|
||||
}
|
||||
if (diag.pushSubscription !== 'есть') {
|
||||
rows.push('Создайте push-подписку кнопкой «Подписаться на push».');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_073'));
|
||||
}
|
||||
if (diag.installAvailability === 'доступна кнопка установки') {
|
||||
rows.push('Установите приложение как PWA для более стабильной доставки push в фоне.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_074'));
|
||||
}
|
||||
if (diag.iosSafariHint) {
|
||||
rows.push('iPhone/Safari: push работает только после «Добавить на экран Домой».');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_075'));
|
||||
}
|
||||
if (!rows.length) {
|
||||
rows.push('Критических проблем не найдено. Проверьте тестовый push для финальной валидации.');
|
||||
rows.push(t('screens.pwa_diagnostics_view.text_076'));
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
@@ -270,7 +271,7 @@ export function render({navigate, chrome}) {
|
||||
screen.className = 'stack';
|
||||
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'Диагностика PWA / Push',
|
||||
title: t('screens.pwa_diagnostics_view.text_002'),
|
||||
back: { label: '←', onClick: () => navigate('developer-settings-view') },
|
||||
}));
|
||||
|
||||
@@ -285,19 +286,19 @@ export function render({navigate, chrome}) {
|
||||
const actions = document.createElement('div');
|
||||
actions.className = 'pwa-diag-actions';
|
||||
actions.innerHTML = `
|
||||
<button class="text-btn" type="button" id="diag-refresh">Проверить заново</button>
|
||||
<button class="text-btn" type="button" id="diag-notif">Запросить разрешение на уведомления</button>
|
||||
<button class="text-btn" type="button" id="diag-subscribe">Подписаться на push</button>
|
||||
<button class="text-btn" type="button" id="diag-unsubscribe">Отписаться от push</button>
|
||||
<button class="text-btn" type="button" id="diag-testpush">Отправить тестовый push</button>
|
||||
<button class="text-btn" type="button" id="diag-toggle-details">Показать тех. детали</button>
|
||||
<button class="text-btn" type="button" id="diag-refresh">${th('screens.pwa_diagnostics_view.text_062')}</button>
|
||||
<button class="text-btn" type="button" id="diag-notif">${th('screens.pwa_diagnostics_view.text_063')}</button>
|
||||
<button class="text-btn" type="button" id="diag-subscribe">${th('screens.pwa_diagnostics_view.text_064')}</button>
|
||||
<button class="text-btn" type="button" id="diag-unsubscribe">${th('screens.pwa_diagnostics_view.text_065')}</button>
|
||||
<button class="text-btn" type="button" id="diag-testpush">${th('screens.pwa_diagnostics_view.text_066')}</button>
|
||||
<button class="text-btn" type="button" id="diag-toggle-details">${th('screens.pwa_diagnostics_view.text_067')}</button>
|
||||
`;
|
||||
actionsCard.append(actions);
|
||||
|
||||
const recommendationsCard = document.createElement('div');
|
||||
recommendationsCard.className = 'card stack';
|
||||
const recommendationsTitle = document.createElement('strong');
|
||||
recommendationsTitle.textContent = 'Рекомендации';
|
||||
recommendationsTitle.textContent = t('screens.pwa_diagnostics_view.text_003');
|
||||
const recommendationsList = document.createElement('div');
|
||||
recommendationsList.className = 'stack pwa-diag-recommendations';
|
||||
recommendationsCard.append(recommendationsTitle, recommendationsList);
|
||||
@@ -306,7 +307,7 @@ export function render({navigate, chrome}) {
|
||||
detailsCard.className = 'card stack';
|
||||
detailsCard.hidden = true;
|
||||
const detailsTitle = document.createElement('strong');
|
||||
detailsTitle.textContent = 'Технические детали';
|
||||
detailsTitle.textContent = t('screens.pwa_diagnostics_view.text_004');
|
||||
const detailsPre = document.createElement('pre');
|
||||
detailsPre.className = 'pwa-diag-json';
|
||||
detailsCard.append(detailsTitle, detailsPre);
|
||||
@@ -328,26 +329,26 @@ export function render({navigate, chrome}) {
|
||||
statusList.innerHTML = '';
|
||||
|
||||
statusList.append(
|
||||
rowEl('HTTPS', latestDiag.secureContext ? 'да' : 'нет', toneFor(latestDiag.secureContext ? 'да' : 'нет')),
|
||||
rowEl('HTTPS', latestDiag.secureContext ? t('screens.pwa_diagnostics_view.text_042') : t('screens.pwa_diagnostics_view.text_043'), toneFor(latestDiag.secureContext ? t('screens.pwa_diagnostics_view.text_044') : t('screens.pwa_diagnostics_view.text_045'))),
|
||||
rowEl('Manifest', latestDiag.manifestStatus, toneFor(latestDiag.manifestStatus)),
|
||||
rowEl('Service Worker', latestDiag.swStatus, toneFor(latestDiag.swStatus)),
|
||||
rowEl('Режим запуска', latestDiag.launchMode, toneFor(latestDiag.launchMode, 'launchMode')),
|
||||
rowEl('Возможность установки', latestDiag.installAvailability, toneFor(latestDiag.installAvailability, 'install')),
|
||||
rowEl(t('screens.pwa_diagnostics_view.text_006'), latestDiag.launchMode, toneFor(latestDiag.launchMode, 'launchMode')),
|
||||
rowEl(t('screens.pwa_diagnostics_view.text_007'), latestDiag.installAvailability, toneFor(latestDiag.installAvailability, 'install')),
|
||||
rowEl('Notifications API', latestDiag.notificationsApi, toneFor(latestDiag.notificationsApi)),
|
||||
rowEl('Push API', latestDiag.pushApi, toneFor(latestDiag.pushApi)),
|
||||
rowEl('Разрешение на уведомления', latestDiag.notificationPermission, toneFor(latestDiag.notificationPermission, 'permission')),
|
||||
rowEl(t('screens.pwa_diagnostics_view.text_008'), latestDiag.notificationPermission, toneFor(latestDiag.notificationPermission, 'permission')),
|
||||
rowEl('Push subscription', latestDiag.pushSubscription, toneFor(latestDiag.pushSubscription)),
|
||||
rowEl('Последний тест push', latestDiag.lastTestPush, toneFor(latestDiag.lastTestPush, 'testPush')),
|
||||
rowEl(t('screens.pwa_diagnostics_view.text_009'), latestDiag.lastTestPush, toneFor(latestDiag.lastTestPush, 'testPush')),
|
||||
);
|
||||
|
||||
if (latestDiag.subscriptionEndpoint) {
|
||||
statusList.append(rowEl('Endpoint подписки', latestDiag.subscriptionEndpoint, 'neutral'));
|
||||
statusList.append(rowEl(t('screens.pwa_diagnostics_view.text_010'), latestDiag.subscriptionEndpoint, 'neutral'));
|
||||
}
|
||||
if (latestDiag.subscriptionUpdatedAtMs) {
|
||||
statusList.append(rowEl('Дата обновления подписки', formatTs(latestDiag.subscriptionUpdatedAtMs), 'neutral'));
|
||||
statusList.append(rowEl(t('screens.pwa_diagnostics_view.text_011'), formatTs(latestDiag.subscriptionUpdatedAtMs), 'neutral'));
|
||||
}
|
||||
if (latestDiag.lastTestPushAtMs) {
|
||||
statusList.append(rowEl('Время последнего теста', formatTs(latestDiag.lastTestPushAtMs), 'neutral'));
|
||||
statusList.append(rowEl(t('screens.pwa_diagnostics_view.text_012'), formatTs(latestDiag.lastTestPushAtMs), 'neutral'));
|
||||
}
|
||||
|
||||
recommendationsList.innerHTML = '';
|
||||
@@ -368,13 +369,13 @@ export function render({navigate, chrome}) {
|
||||
};
|
||||
|
||||
const reloadStatuses = async () => {
|
||||
setInfo('Обновляю статусы...');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_013'));
|
||||
latestDiag = await collectDiagnostics();
|
||||
rerender();
|
||||
if (latestDiag.swError) {
|
||||
setInfo(`Есть предупреждения: ${latestDiag.swError}`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_055', { value1: latestDiag.swError }));
|
||||
} else {
|
||||
setInfo(`Статусы обновлены: ${new Date().toLocaleTimeString('ru-RU')}`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_056', { value1: new Date().toLocaleTimeString('ru-RU') }));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -394,11 +395,11 @@ export function render({navigate, chrome}) {
|
||||
actions.querySelector('#diag-notif').addEventListener('click', async (event) => {
|
||||
await withButtonBusy(event.currentTarget, async () => {
|
||||
if (!('Notification' in window)) {
|
||||
setInfo('Этот браузер не поддерживает Notifications API.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_014'));
|
||||
return;
|
||||
}
|
||||
const permission = await Notification.requestPermission();
|
||||
setInfo(`Разрешение на уведомления: ${permission}`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_057', { value1: permission }));
|
||||
await reloadStatuses();
|
||||
});
|
||||
});
|
||||
@@ -406,12 +407,12 @@ export function render({navigate, chrome}) {
|
||||
actions.querySelector('#diag-subscribe').addEventListener('click', async (event) => {
|
||||
await withButtonBusy(event.currentTarget, async () => {
|
||||
if (!('serviceWorker' in navigator) || !('PushManager' in window)) {
|
||||
setInfo('ServiceWorker/PushManager не поддерживаются в этом браузере.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_015'));
|
||||
return;
|
||||
}
|
||||
const vapidPublicKey = String(window.__SHINE_WEBPUSH_VAPID_PUBLIC_KEY__ || '').trim();
|
||||
if (!vapidPublicKey) {
|
||||
setInfo('Не задан публичный VAPID ключ.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_016'));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -421,7 +422,7 @@ export function render({navigate, chrome}) {
|
||||
permission = await Notification.requestPermission();
|
||||
}
|
||||
if (permission !== 'granted') {
|
||||
setInfo(`Разрешение на уведомления: ${permission}`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_058', { value1: permission }));
|
||||
await reloadStatuses();
|
||||
return;
|
||||
}
|
||||
@@ -448,7 +449,7 @@ export function render({navigate, chrome}) {
|
||||
} catch {
|
||||
// ignore local storage errors
|
||||
}
|
||||
setInfo('Push-подписка создана и отправлена на сервер.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_017'));
|
||||
await reloadStatuses();
|
||||
});
|
||||
});
|
||||
@@ -456,18 +457,18 @@ export function render({navigate, chrome}) {
|
||||
actions.querySelector('#diag-unsubscribe').addEventListener('click', async (event) => {
|
||||
await withButtonBusy(event.currentTarget, async () => {
|
||||
if (!('serviceWorker' in navigator)) {
|
||||
setInfo('Service Worker API недоступен.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_018'));
|
||||
return;
|
||||
}
|
||||
const registration = await navigator.serviceWorker.getRegistration();
|
||||
if (!registration || !registration.pushManager) {
|
||||
setInfo('PushManager недоступен.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_019'));
|
||||
await reloadStatuses();
|
||||
return;
|
||||
}
|
||||
const sub = await registration.pushManager.getSubscription();
|
||||
if (!sub) {
|
||||
setInfo('Активная push-подписка не найдена.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_020'));
|
||||
await reloadStatuses();
|
||||
return;
|
||||
}
|
||||
@@ -478,7 +479,7 @@ export function render({navigate, chrome}) {
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
setInfo('Push-подписка удалена на клиенте.');
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_021'));
|
||||
await reloadStatuses();
|
||||
});
|
||||
});
|
||||
@@ -493,11 +494,11 @@ export function render({navigate, chrome}) {
|
||||
}
|
||||
const resp = await authService.sendTestWebPush({
|
||||
login: state.session.login || '',
|
||||
title: 'SHiNE: тестовый push',
|
||||
text: `Тестовый push для ${state.session.login || 'unknown'}`,
|
||||
title: t('screens.pwa_diagnostics_view.text_005'),
|
||||
text: t('screens.pwa_diagnostics_view.text_059', { value1: state.session.login || 'unknown' }),
|
||||
});
|
||||
lastTestResponse = resp;
|
||||
setInfo(`Тестовый push отправлен. Доставлено: ${Number(resp?.delivered || 0)}.`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_060', { value1: Number(resp?.delivered || 0) }));
|
||||
await reloadStatuses();
|
||||
}).catch(async (error) => {
|
||||
try {
|
||||
@@ -506,14 +507,14 @@ export function render({navigate, chrome}) {
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
setInfo(`Ошибка тестового push: ${error?.message || 'unknown'}`);
|
||||
setInfo(t('screens.pwa_diagnostics_view.text_061', { value1: error?.message || 'unknown' }));
|
||||
await reloadStatuses();
|
||||
});
|
||||
});
|
||||
|
||||
actions.querySelector('#diag-toggle-details').addEventListener('click', (event) => {
|
||||
detailsCard.hidden = !detailsCard.hidden;
|
||||
event.currentTarget.textContent = detailsCard.hidden ? 'Показать тех. детали' : 'Скрыть тех. детали';
|
||||
event.currentTarget.textContent = detailsCard.hidden ? t('screens.pwa_diagnostics_view.text_046') : t('screens.pwa_diagnostics_view.text_047');
|
||||
});
|
||||
|
||||
const onPushDiagUpdate = async () => {
|
||||
|
||||
Reference in New Issue
Block a user