From 07ddaf5e4cc1cb8ea5c84561dd5fbeb77e3b2550df289c9ca59fc028fdd90740 Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 10 Oct 2026 17:19:47 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=20UI=20=D1=81=20d?= =?UTF-8?q?evnet=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.properties | 2 +- shine-UI/index.html | 13 +++++-- shine-UI/js/app.js | 30 +++++++++++++-- shine-UI/js/state.js | 88 +++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 120 insertions(+), 13 deletions(-) diff --git a/VERSION.properties b/VERSION.properties index 86680514..61b2129a 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.17.0 +client.version=1.18.0 server.version=1.14.0 diff --git a/shine-UI/index.html b/shine-UI/index.html index ad0b1b8d..a4d3bc7e 100644 --- a/shine-UI/index.html +++ b/shine-UI/index.html @@ -39,7 +39,7 @@ }()); diff --git a/shine-UI/js/app.js b/shine-UI/js/app.js index 63425284..66e1e2a4 100644 --- a/shine-UI/js/app.js +++ b/shine-UI/js/app.js @@ -50,6 +50,8 @@ import { markOutgoingDeliveryState, markOutgoingReadByBaseKey, normalizeDmChatId, + applyUrlServerLoginOverrideIfNeeded, + hasUrlEntrySettingsOverride, setContacts, } from './state.js'; @@ -226,6 +228,11 @@ const SCROLL_TO_BOTTOM_PAGE_IDS = new Set([ 'channel-thread-view', ]); +function isLocalPreviewHost() { + const host = String(window.location.hostname || '').toLowerCase(); + return host === 'localhost' || host === '127.0.0.1' || host === '::1'; +} + const FILLED_ACTION_BUTTON_PAGE_IDS = new Set([ ...PRE_AUTH_PAGES.filter((pageId) => pageId !== 'entry-settings-view'), 'settings-view', @@ -1528,10 +1535,12 @@ async function ensureSessionRuntimeStarted() { if (!state.session.isAuthorized || sessionRuntimeStarted) return; sessionRuntimeStarted = true; - await initPwaPush({ - authService, - onLog: (entry) => addAppLogEntry(entry), - }); + if (!isLocalPreviewHost()) { + await initPwaPush({ + authService, + onLog: (entry) => addAppLogEntry(entry), + }); + } startConnectionMonitor(); @@ -1956,6 +1965,19 @@ async function init() { void (async () => { try { + let urlEntrySettingsReady = true; + try { + await applyUrlServerLoginOverrideIfNeeded(); + } catch (error) { + urlEntrySettingsReady = false; + addAppLogEntry({ + level: 'warn', + source: 'entry-settings', + message: 'Не удалось применить сервер из URL', + details: { error: error?.message || 'unknown' }, + }); + } + if (hasUrlEntrySettingsOverride() && !urlEntrySettingsReady) return; await tryAutoLogin(); if (initialNotificationOpenPayload) { await handleNotificationClick(initialNotificationOpenPayload); diff --git a/shine-UI/js/state.js b/shine-UI/js/state.js index 6b28aa3d..b964336b 100644 --- a/shine-UI/js/state.js +++ b/shine-UI/js/state.js @@ -74,6 +74,57 @@ function readLocalWsOverrideUrl() { } } +function buildHttpUrlFromWsUrl(value) { + const raw = String(value || '').trim(); + if (!raw) return ''; + try { + const parsed = new URL(raw); + parsed.protocol = parsed.protocol === 'wss:' ? 'https:' : 'http:'; + parsed.pathname = ''; + parsed.search = ''; + parsed.hash = ''; + return parsed.toString().replace(/\/$/u, ''); + } catch { + return raw.replace(/^wss:/i, 'https:').replace(/^ws:/i, 'http:').replace(/\/ws\/?$/iu, '').replace(/\/$/u, ''); + } +} + +function readUrlShineServerHttpOverride() { + try { + const params = new URLSearchParams(window.location.search); + const explicitHttp = String(params.get('serverHttp') || params.get('httpUrl') || params.get('shineServerHttp') || '').trim(); + if (explicitHttp) return explicitHttp.replace(/\/$/u, ''); + return buildHttpUrlFromWsUrl(readLocalWsOverrideUrl()); + } catch { + return ''; + } +} + +function readUrlServerLoginOverride() { + try { + const params = new URLSearchParams(window.location.search); + const raw = params.get('serverLogin') || params.get('shineServerLogin') || ''; + return String(raw || '').trim().toLowerCase(); + } catch { + return ''; + } +} + +function readUrlSolanaServerOverride() { + try { + const params = new URLSearchParams(window.location.search); + const explicitEndpoint = String(params.get('solanaEndpoint') || params.get('solanaRpc') || '').trim(); + if (explicitEndpoint) return explicitEndpoint; + + const cluster = String(params.get('solana') || params.get('solanaCluster') || params.get('cluster') || '').trim().toLowerCase(); + if (cluster === 'devnet') return 'https://devnet.helius-rpc.com/?api-key=0614c894-52d8-4ddc-bbbc-0947ce5ec3a4'; + if (cluster === 'mainnet' || cluster === 'mainnet-beta') return DEFAULT_SOLANA_SERVER; + return ''; + } catch { + return ''; + } +} + function inferTunnelWsUrl() { try { const host = String(window.location.host || '').toLowerCase(); @@ -91,7 +142,10 @@ function inferTunnelWsUrl() { } const LOCAL_WS_OVERRIDE_URL = readLocalWsOverrideUrl() || inferTunnelWsUrl(); +const URL_SHINE_SERVER_HTTP_OVERRIDE = readUrlShineServerHttpOverride(); +const URL_SHINE_SERVER_LOGIN_OVERRIDE = readUrlServerLoginOverride(); const DEFAULT_SOLANA_SERVER = SOLANA_ENDPOINT_DEFAULT; +const URL_SOLANA_SERVER_OVERRIDE = readUrlSolanaServerOverride(); const DEFAULT_SHINE_SERVER = DEFAULT_SHINE_SERVER_WS; const DEFAULT_SHINE_SERVER_LOGIN_VALUE = DEFAULT_SHINE_SERVER_LOGIN; const DEFAULT_SHINE_SERVER_HTTP_VALUE = DEFAULT_SHINE_SERVER_HTTP; @@ -370,7 +424,15 @@ function createInitialState({ withStoredSession = true } = {}) { const storedLocalDemo = Boolean(storedSession?.isLocalDemo && isLocalPreviewHost()); const storedReactions = loadStoredReactions(); const storedEntrySettings = loadStoredEntrySettings(); - const initialShineServer = LOCAL_WS_OVERRIDE_URL || DEFAULT_SHINE_SERVER; + const initialSolanaServer = URL_SOLANA_SERVER_OVERRIDE + || storedEntrySettings?.solanaServer + || DEFAULT_SOLANA_SERVER; + const initialShineServer = URL_SHINE_SERVER_LOGIN_OVERRIDE || URL_SOLANA_SERVER_OVERRIDE + ? LOCAL_WS_OVERRIDE_URL + : (LOCAL_WS_OVERRIDE_URL || DEFAULT_SHINE_SERVER); + const initialShineServerLogin = URL_SHINE_SERVER_LOGIN_OVERRIDE + || storedEntrySettings?.shineServerLogin + || DEFAULT_SHINE_SERVER_LOGIN_VALUE; return { chats: {}, @@ -395,10 +457,10 @@ function createInitialState({ withStoredSession = true } = {}) { startHint: '', entrySettings: { language: String(storedEntrySettings?.language || 'ru'), - solanaServer: normalizeStoredSolanaServer(storedEntrySettings?.solanaServer), + solanaServer: normalizeStoredSolanaServer(initialSolanaServer), shineServer: String(LOCAL_WS_OVERRIDE_URL || storedEntrySettings?.shineServer || initialShineServer), - shineServerLogin: String(storedEntrySettings?.shineServerLogin || DEFAULT_SHINE_SERVER_LOGIN_VALUE), - shineServerHttp: String(storedEntrySettings?.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP_VALUE), + shineServerLogin: String(initialShineServerLogin), + shineServerHttp: String(URL_SHINE_SERVER_HTTP_OVERRIDE || storedEntrySettings?.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP_VALUE), arweaveServer: String(storedEntrySettings?.arweaveServer || DEFAULT_ARWEAVE_SERVER), callPreflightTimeoutMs: Math.max(1000, Math.min(20000, Number(storedEntrySettings?.callPreflightTimeoutMs || DEFAULT_CALL_PREFLIGHT_TIMEOUT_MS) || DEFAULT_CALL_PREFLIGHT_TIMEOUT_MS)), remoteAddBlockSessionId: String(storedEntrySettings?.remoteAddBlockSessionId || ''), @@ -986,7 +1048,7 @@ export async function saveEntrySettings(nextSettings) { const nextShineServerLogin = String(nextSettings?.shineServerLogin || state.entrySettings.shineServerLogin || DEFAULT_SHINE_SERVER_LOGIN_VALUE).trim().toLowerCase() || DEFAULT_SHINE_SERVER_LOGIN_VALUE; let forcedShineServer = LOCAL_WS_OVERRIDE_URL || ''; - let resolvedShineServerHttp = String(state.entrySettings.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP_VALUE).trim() || DEFAULT_SHINE_SERVER_HTTP_VALUE; + let resolvedShineServerHttp = String(URL_SHINE_SERVER_HTTP_OVERRIDE || state.entrySettings.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP_VALUE).trim() || DEFAULT_SHINE_SERVER_HTTP_VALUE; if (!forcedShineServer) { const resolved = await resolveShineServerByServerLogin({ @@ -1016,6 +1078,22 @@ export async function saveEntrySettings(nextSettings) { state.startHint = `Настройки входа сохранены. SHiNE: ${state.entrySettings.shineServerHttp}`; } +export async function applyUrlServerLoginOverrideIfNeeded() { + if (!URL_SHINE_SERVER_LOGIN_OVERRIDE && !URL_SOLANA_SERVER_OVERRIDE && !LOCAL_WS_OVERRIDE_URL && !URL_SHINE_SERVER_HTTP_OVERRIDE) return false; + await saveEntrySettings({ + ...state.entrySettings, + solanaServer: URL_SOLANA_SERVER_OVERRIDE || state.entrySettings.solanaServer, + shineServer: LOCAL_WS_OVERRIDE_URL || state.entrySettings.shineServer, + shineServerLogin: URL_SHINE_SERVER_LOGIN_OVERRIDE || state.entrySettings.shineServerLogin, + shineServerHttp: URL_SHINE_SERVER_HTTP_OVERRIDE || state.entrySettings.shineServerHttp, + }); + return true; +} + +export function hasUrlEntrySettingsOverride() { + return Boolean(URL_SHINE_SERVER_LOGIN_OVERRIDE || URL_SOLANA_SERVER_OVERRIDE || LOCAL_WS_OVERRIDE_URL || URL_SHINE_SERVER_HTTP_OVERRIDE); +} + export function clearStartHint() { state.startHint = ''; }