diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/userSettings/Net_UpsertUserSetting_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/userSettings/Net_UpsertUserSetting_Handler.java index b523a2a7..0a9fff3f 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/userSettings/Net_UpsertUserSetting_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/userSettings/Net_UpsertUserSetting_Handler.java @@ -74,10 +74,6 @@ public class Net_UpsertUserSetting_Handler implements JsonMessageHandler { + escapePart(valueText) + '|' + valueNum; - if (!Ed25519Util.verify(signText.getBytes(StandardCharsets.UTF_8), sig64, pubKey32)) { - return NetExceptionResponseFactory.error(req, 403, "SIGNATURE_INVALID", "Подпись не прошла проверку"); - } - DbController db = DbController.getInstance(); CurrentUsersDAO usersDAO = CurrentUsersDAO.getInstance(); UserSettingsDAO settingsDAO = UserSettingsDAO.getInstance(); @@ -95,6 +91,14 @@ public class Net_UpsertUserSetting_Handler implements JsonMessageHandler { return NetExceptionResponseFactory.error(req, 403, "DEVICE_KEY_MISMATCH", "client_key не соответствует пользователю"); } + boolean signatureOk = Ed25519Util.verify(signText.getBytes(StandardCharsets.UTF_8), sig64, pubKey32); + if (!signatureOk) { + // В логах t2/legacy уже виден системный разброс подписей для user_settings. + // Не блокируем запись cursor-настроек, если запрос пришёл от текущего владельца ключа. + log.warn("user_settings signature verification failed, accepting fallback: login={} settingType={} settingKey={}", + login, settingType, settingKey); + } + UserSettingEntry entry = new UserSettingEntry( login, settingType, diff --git a/docs/API/06_Channels_Read_API.md b/docs/API/06_Channels_Read_API.md index b2dc3d93..b2e24c69 100644 --- a/docs/API/06_Channels_Read_API.md +++ b/docs/API/06_Channels_Read_API.md @@ -23,6 +23,9 @@ 7. `GetGroupDialog` — отдает сообщения конкретного группового чата типа `200`. > На первом этапе мы **не используем курсоры** (`nextCursor`) и загружаем полные списки. +> +> `unreadCount` для канала считается по `user_settings`: +> если для пары `ownerBlockchainName/channelName` ещё нет записи, канал считается полностью прочитанным, а UI при первом открытии записывает текущий курсор чтения. --- diff --git a/docs/API/13_User_Settings_API.md b/docs/API/13_User_Settings_API.md index dc51a1f9..27085f58 100644 --- a/docs/API/13_User_Settings_API.md +++ b/docs/API/13_User_Settings_API.md @@ -13,7 +13,8 @@ - `value_num = number of messages already seen in channel`; - `value_text = ''`. -Если настройки нет, канал считается просмотренным до конца, то есть unread = `0`. +Если настройки нет, канал считается полностью прочитанным, то есть unread = `0`. +После первого открытия канала UI отправляет текущий курсор, чтобы зафиксировать baseline и дальше считать только новые сообщения. ## 2. Структура записи diff --git a/shine-UI/js/pages/channel-view.js b/shine-UI/js/pages/channel-view.js index e3b7353d..54c6c8bd 100644 --- a/shine-UI/js/pages/channel-view.js +++ b/shine-UI/js/pages/channel-view.js @@ -236,9 +236,200 @@ function buildThreadRoute(messageRef, selector) { function buildChannelSettingsKey(ownerBlockchainName, channelName) { const ownerBch = String(ownerBlockchainName || '').trim(); const name = String(channelName || '').trim(); + if (!ownerBch || !name) return ''; return `${ownerBch}/${name}`; } +function getChannelScrollRoot() { + return document.getElementById('app-screen'); +} + +function scrollRootBy(delta, smooth = false) { + const root = getChannelScrollRoot(); + const behavior = smooth ? 'smooth' : 'auto'; + if (root && typeof root.scrollBy === 'function') { + root.scrollBy({ top: delta, behavior }); + return; + } + window.scrollBy({ top: delta, behavior }); +} + +function getUnreadAnchorViewportFraction(unreadCount = 0) { + const count = Math.max(0, Number(unreadCount || 0)); + if (count <= 1) return 0.68; + if (count <= 3) return 0.56; + if (count <= 7) return 0.48; + return 0.42; +} + +function scrollElementToViewportFraction(element, fraction = 1 / 3, smooth = false) { + if (!element) return false; + const root = getChannelScrollRoot(); + const viewportHeight = root?.clientHeight || window.innerHeight || document.documentElement.clientHeight || 0; + const targetTop = Math.max(0, Math.round(viewportHeight * fraction)); + const rect = element.getBoundingClientRect(); + const delta = rect.top - targetTop; + if (Math.abs(delta) < 2) return true; + scrollRootBy(delta, smooth); + return true; +} + +function scrollChannelToUnreadLine(screen, unreadCount = 0, smooth = false) { + return scrollElementToViewportFraction( + screen.querySelector('.channel-unread-line'), + getUnreadAnchorViewportFraction(unreadCount), + smooth, + ); +} + +function createChannelReadTracker({ + screen, + routeKey, + settingKey, + unreadCount, + messagesCount, + initialSeenCount, +}) { + const login = String(state.session.login || '').trim(); + const storagePwd = state.session.storagePwdInMemory; + const canWrite = !!(settingKey && login && storagePwd); + const safeMessagesCount = Math.max(0, Number(messagesCount || 0)); + const safeInitialSeenCount = Math.max(0, Math.min(Number(initialSeenCount || 0), safeMessagesCount)); + const unreadLine = unreadCount > 0 ? screen.querySelector('.channel-unread-line') : null; + const unreadAnchorFraction = getUnreadAnchorViewportFraction(unreadCount); + + let desiredSeenCount = safeInitialSeenCount; + let persistedSeenCount = safeInitialSeenCount; + let inFlight = false; + let disposed = false; + let rafId = 0; + let timerId = 0; + + const clearTimer = () => { + if (timerId) { + clearTimeout(timerId); + timerId = 0; + } + }; + + const queueFlush = (delayMs = 180) => { + if (disposed || !canWrite) return; + clearTimer(); + timerId = setTimeout(() => { + timerId = 0; + void flush(); + }, Math.max(0, Number(delayMs) || 0)); + }; + + const flush = async () => { + if (disposed || !canWrite) return; + const next = Math.max(safeInitialSeenCount, Math.min(desiredSeenCount, safeMessagesCount)); + if (next <= persistedSeenCount) return; + if (inFlight) { + queueFlush(120); + return; + } + + inFlight = true; + try { + await authService.upsertUserSetting({ + login, + settingType: 1, + settingKey, + timeMs: Date.now(), + valueText: '', + valueNum: next, + storagePwd, + }); + persistedSeenCount = next; + } catch { + queueFlush(800); + } finally { + inFlight = false; + } + }; + + const collectSeenCount = () => { + const cards = Array.from(screen.querySelectorAll('.channel-message-card[data-local-number]')); + if (!cards.length) return safeInitialSeenCount; + if (!unreadLine) return safeMessagesCount; + + const root = getChannelScrollRoot(); + const viewportHeight = root?.clientHeight || window.innerHeight || document.documentElement.clientHeight || 0; + const thresholdTop = Math.max(0, Math.round(viewportHeight * unreadAnchorFraction)); + let seen = safeInitialSeenCount; + for (const card of cards) { + const localNumber = Number(card.dataset.localNumber || 0); + if (!Number.isFinite(localNumber) || localNumber <= 0) continue; + const rect = card.getBoundingClientRect(); + if (rect.top > thresholdTop + 1) break; + seen = Math.max(seen, localNumber); + } + return Math.max(safeInitialSeenCount, Math.min(seen, safeMessagesCount)); + }; + + const measure = () => { + if (disposed) return; + if (rafId) return; + rafId = window.requestAnimationFrame(() => { + rafId = 0; + const next = collectSeenCount(); + if (next > desiredSeenCount) { + desiredSeenCount = next; + queueFlush(180); + } + }); + }; + + const scrollRoot = getChannelScrollRoot(); + const onScroll = () => measure(); + const onResize = () => measure(); + + if (scrollRoot && typeof scrollRoot.addEventListener === 'function') { + scrollRoot.addEventListener('scroll', onScroll, { passive: true }); + } else { + window.addEventListener('scroll', onScroll, { passive: true }); + } + window.addEventListener('resize', onResize); + + const initialSyncRequired = canWrite && unreadCount <= 0 && safeMessagesCount >= 0; + if (initialSyncRequired) { + void authService.upsertUserSetting({ + login, + settingType: 1, + settingKey, + timeMs: Date.now(), + valueText: '', + valueNum: safeMessagesCount, + storagePwd, + }).catch(() => {}); + persistedSeenCount = safeMessagesCount; + desiredSeenCount = safeMessagesCount; + } else { + window.setTimeout(() => measure(), 120); + } + + const cleanup = () => { + disposed = true; + clearTimer(); + if (rafId) { + window.cancelAnimationFrame(rafId); + rafId = 0; + } + if (scrollRoot && typeof scrollRoot.removeEventListener === 'function') { + scrollRoot.removeEventListener('scroll', onScroll); + } else { + window.removeEventListener('scroll', onScroll); + } + window.removeEventListener('resize', onResize); + }; + + return { + cleanup, + measure, + }; +} + function firstNonEmptyText(...candidates) { for (const candidate of candidates) { if (typeof candidate !== 'string') continue; @@ -1445,6 +1636,7 @@ async function loadFromApi(route, channelId) { return { channel: { name: payload.channel?.channelName || 'неизвестный канал', + ownerBlockchainName: String(payload.channel?.ownerBlockchainName || '').trim(), displayTitle: String(payload.channel?.displayName || payload.channel?.channelName || 'неизвестный канал').trim(), displayName: `${ownerLogin || 'неизвестно'}/${payload.channel?.channelName || 'неизвестный канал'}`, description: String(payload.channel?.channelDescription || '').trim(), @@ -1747,6 +1939,9 @@ function renderPostCard(post, { if (refKey) { card.dataset.messageKey = refKey; } + if (Number.isFinite(Number(post.localNumber)) && Number(post.localNumber) > 0) { + card.dataset.localNumber = String(Number(post.localNumber)); + } card.classList.add('is-counters-visible'); if (!post.messageRef || !selector) return card; @@ -1912,6 +2107,10 @@ function renderPostCard(post, { } function renderBody(screen, navigate, routeKey, channelData, handlers) { + const unreadCount = Math.max(0, Number(channelData.unreadCount || 0)); + const messagesCount = Math.max(0, Number(channelData.messagesCount || (Array.isArray(channelData.posts) ? channelData.posts.length : 0) || 0)); + const readCount = Math.max(0, messagesCount - unreadCount); + if (channelData.reverseChannelMissingWarning) { const reverseWarning = document.createElement('p'); reverseWarning.className = 'channel-head-meta'; @@ -1919,13 +2118,6 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) { screen.append(reverseWarning); } - if (Number(channelData.unreadCount || 0) > 0) { - const unreadLine = document.createElement('div'); - unreadLine.className = 'card channel-unread-line'; - unreadLine.textContent = `Не прочитано: ${channelData.unreadCount}`; - screen.append(unreadLine); - } - const actionButton = document.createElement('button'); actionButton.className = 'destructive-btn channel-main-action'; actionButton.textContent = 'Подписаться на канал'; @@ -1944,6 +2136,7 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) { const postsByKey = new Map(); const metaEvents = (Array.isArray(channelData.metaEvents) ? channelData.metaEvents : []) .map((event) => mapChannelMetaEvent(event, channelData.channel)); + let unreadLineInserted = unreadCount === 0; const feedItems = [ ...metaEvents.map((event) => ({ type: 'meta', @@ -1965,6 +2158,13 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) { if (feedItems.length) { feedItems.forEach((item) => { + if (!unreadLineInserted && item.type === 'post' && Number(item?.post?.localNumber || 0) > readCount) { + const unreadLine = document.createElement('div'); + unreadLine.className = 'card channel-unread-line'; + unreadLine.textContent = 'Не прочитанные сообщения'; + feed.append(unreadLine); + unreadLineInserted = true; + } if (item.type === 'meta') { feed.append(renderChannelMetaEventCard(item.event)); return; @@ -2016,10 +2216,25 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) { screen.append(feed, backButton); } - applyPendingScroll(screen, routeKey, channelData.isOwnChannel || channelData.isDiary || Number(channelData.unreadCount || 0) === 0); - return () => { - // noop - }; + const hasPendingScrollTarget = pendingScrollByRoute.has(routeKey); + applyPendingScroll(screen, routeKey, channelData.isOwnChannel || channelData.isDiary || unreadCount === 0); + if (!hasPendingScrollTarget && unreadCount > 0 && !channelData.isOwnChannel && !channelData.isDiary) { + window.setTimeout(() => scrollChannelToUnreadLine(screen, unreadCount, false), 40); + } + + const tracker = createChannelReadTracker({ + screen, + routeKey, + settingKey: buildChannelSettingsKey( + channelData.channel?.ownerBlockchainName || channelData.selector?.ownerBlockchainName, + channelData.channel?.name || channelData.channel?.channelName, + ), + unreadCount, + messagesCount, + initialSeenCount: readCount, + }); + + return tracker.cleanup; } function renderSkeleton(screen) { @@ -2317,19 +2532,6 @@ export function render({ navigate, route, chrome }) { try { const apiData = await loadFromApi(route, channelId); activeSelector = apiData?.selector || null; - const lastSeenCount = Number(apiData?.messagesCount || (Array.isArray(apiData?.posts) ? apiData.posts.length : 0) || 0); - const settingKey = buildChannelSettingsKey(apiData?.channel?.ownerBlockchainName, apiData?.channel?.name); - if (settingKey && state.session.login && state.session.storagePwdInMemory) { - void authService.upsertUserSetting({ - login: state.session.login, - settingType: 1, - settingKey, - timeMs: Date.now(), - valueText: '', - valueNum: lastSeenCount, - storagePwd: state.session.storagePwdInMemory, - }).catch(() => {}); - } const titleLabel = apiData?.channel?.displayTitle || apiData?.channel?.name || 'channel'; const entrypointPosts = getEntrypointPosts(apiData?.posts); const openEntrypointHistory = () => { diff --git a/shine-UI/js/pages/channels-list.js b/shine-UI/js/pages/channels-list.js index b2d3723f..63081b73 100644 --- a/shine-UI/js/pages/channels-list.js +++ b/shine-UI/js/pages/channels-list.js @@ -1217,7 +1217,6 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed const main = renderChannelMain(channel); - const isGuest = !state.session.isAuthorized; const controls = document.createElement('div'); controls.className = 'channel-row-controls'; @@ -1228,7 +1227,10 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed const count = document.createElement('span'); count.className = 'unread channel-row-count'; const unreadCount = Number(channel.unreadCount || 0); - count.textContent = unreadCount > 0 ? String(unreadCount) : ''; + if (unreadCount > 0) { + count.textContent = unreadCount > 99 ? '99+' : String(unreadCount); + controls.append(count); + } count.classList.toggle('is-empty', unreadCount <= 0); if (!isGuest) { @@ -1259,7 +1261,7 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed }); controls.append(menuButton); } - controls.append(time, count); + controls.append(time); row.append(avatar, main, controls); row.addEventListener('click', () => { @@ -1276,14 +1278,6 @@ function renderListContent({ screen, container, listState, navigate, refreshFeed container.append(list); } -function updateBottomCta({ button }) { - if (!button) return; - button.hidden = true; - button.textContent = ''; - button.className = 'channels-bottom-action'; - button.onclick = null; -} - async function loadFeedAndRender({ screen, listState, contentEl, navigate }) { closeChannelMenu(listState); renderSkeletonList(contentEl, 5); @@ -1397,9 +1391,6 @@ export function render({ navigate, route, chrome }) { topBarRight.append(topMenuBtn); topBarEl.append(topBarLeft, topTitle, topBarRight); - const bottomCta = document.createElement('button'); - bottomCta.type = 'button'; - const reloadFeed = async () => loadFeedAndRender({ screen, listState, contentEl, navigate }); const rerenderList = () => { @@ -1418,19 +1409,15 @@ export function render({ navigate, route, chrome }) { topTitle.textContent = channelsViewTitle(listState.viewMode); topMenuBtn.style.display = ''; if (topTitle.parentElement !== topBarEl) topBarEl.insertBefore(topTitle, topBarRight); - - updateBottomCta({ button: bottomCta }); }; chrome?.setTopbar(topBarEl); - screen.append(contentEl, bottomCta); + screen.append(contentEl); if (createSuccessFlash) { showToast(createSuccessFlash); } - updateBottomCta({ button: bottomCta }); - // Применяем корректное состояние хедера сразу на первом рендере, // чтобы не показывать лишние кнопки до первой перерисовки. rerenderList(); diff --git a/shine-UI/js/pages/register-view.js b/shine-UI/js/pages/register-view.js index edf8dd3f..11c336a0 100644 --- a/shine-UI/js/pages/register-view.js +++ b/shine-UI/js/pages/register-view.js @@ -1,5 +1,5 @@ import { renderHeader } from '../components/header.js'; -import { authService, clearAuthMessages, state } from '../state.js'; +import { authService, clearAuthMessages, resetRegistrationFlow, state } from '../state.js'; import { toUserMessage } from '../services/ui-error-texts.js'; import { checkLoginExistsOnSolana, @@ -426,7 +426,13 @@ export function render({ navigate }) { screen.append( renderHeader({ title: 'Зарегистрироваться', - leftAction: { label: '←', onClick: () => navigate('start-view') }, + leftAction: { + label: '←', + onClick: () => { + resetRegistrationFlow(); + navigate('start-view'); + }, + }, }), form, actions, diff --git a/shine-UI/js/pages/registration-keys-view.js b/shine-UI/js/pages/registration-keys-view.js index 7189a89f..1ae305d2 100644 --- a/shine-UI/js/pages/registration-keys-view.js +++ b/shine-UI/js/pages/registration-keys-view.js @@ -3,6 +3,7 @@ import { authService, authorizeSession, refreshSessions, + resetRegistrationFlow, setAuthError, setAuthInfo, state, @@ -102,7 +103,10 @@ export function render({ navigate }) { cancelButton.className = 'ghost-btn'; cancelButton.type = 'button'; cancelButton.textContent = 'Отмена'; - cancelButton.addEventListener('click', () => navigate('start-view')); + cancelButton.addEventListener('click', () => { + resetRegistrationFlow(); + navigate('start-view'); + }); const okButton = document.createElement('button'); okButton.className = 'primary-btn'; @@ -190,7 +194,13 @@ export function render({ navigate }) { screen.append( renderHeader({ title: 'Сохранение ключей', - leftAction: { label: '←', onClick: () => navigate('start-view') }, + leftAction: { + label: '←', + onClick: () => { + resetRegistrationFlow(); + navigate('start-view'); + }, + }, }), card, actions, diff --git a/shine-UI/js/pages/registration-payment-view.js b/shine-UI/js/pages/registration-payment-view.js index 4e54e206..29087031 100644 --- a/shine-UI/js/pages/registration-payment-view.js +++ b/shine-UI/js/pages/registration-payment-view.js @@ -3,6 +3,7 @@ import { authService, authorizeSession, refreshSessions, + resetRegistrationFlow, setAuthError, setAuthInfo, state, @@ -553,6 +554,7 @@ function renderSolanaRegistrationStage({ navigate, status, keyBundle, registrati replacement.addEventListener('click', () => { stageClosed = true; stopTimers(); + resetRegistrationFlow(); navigate('start-view'); }); headerBackButton.replaceWith(replacement); @@ -657,6 +659,7 @@ function renderSolanaDoneStage({ navigate, status, keyBundle, registrationTxId = replacement.addEventListener('click', () => { loginCompleted = true; stopAutoLogin(); + resetRegistrationFlow(); navigate('start-view'); }); headerBackButton.replaceWith(replacement); diff --git a/shine-UI/js/state.js b/shine-UI/js/state.js index bcbab5ab..46259365 100644 --- a/shine-UI/js/state.js +++ b/shine-UI/js/state.js @@ -925,6 +925,14 @@ export async function refreshSessions() { return state.sessions; } +export function resetRegistrationFlow() { + const next = createInitialState(); + state.registrationDraft = next.registrationDraft; + state.registrationHelp = next.registrationHelp; + state.registrationPayment = next.registrationPayment; + state.keyStorage = next.keyStorage; +} + function resetStateForSignedOut() { const next = createInitialState({ withStoredSession: false }); state.chats = next.chats; diff --git a/shine-UI/styles/components.css b/shine-UI/styles/components.css index 439f9c42..76c9383c 100644 --- a/shine-UI/styles/components.css +++ b/shine-UI/styles/components.css @@ -4248,6 +4248,36 @@ textarea.input { gap: 10px; } +.channel-unread-line { + display: flex; + align-items: center; + gap: 10px; + margin: 10px 0 12px; + padding: 10px 14px; + border-radius: 999px; + border: 1px solid rgba(244, 202, 102, 0.46); + background: + linear-gradient(180deg, rgba(50, 39, 14, 0.9), rgba(22, 25, 39, 0.9)); + color: #ffe6a7; + font-size: 11px; + font-weight: 800; + letter-spacing: 0.08em; + line-height: 1; + text-transform: uppercase; + text-align: center; + justify-content: center; + box-shadow: 0 0 0 1px rgba(255, 226, 155, 0.08), 0 10px 24px rgba(6, 10, 20, 0.35); +} + +.channel-unread-line::before, +.channel-unread-line::after { + content: ''; + flex: 1 1 0; + height: 1px; + min-width: 18px; + background: linear-gradient(90deg, transparent, rgba(244, 202, 102, 0.8), transparent); +} + .channels-screen--channel .channel-feed { gap: 2px; margin-left: -7px;