Solana RPC gateway для клиента и сервера

This commit is contained in:
AidarKC
2026-10-18 00:03:46 +03:00
parent b67d06ce43
commit aa5addb5d9
17 changed files with 228 additions and 85 deletions
+13 -22
View File
@@ -1,6 +1,6 @@
import { AuthService } from './services/auth-service.js';
import { listStoredMessages, putStoredMessage, deleteStoredMessage, clearStoredMessages } from './services/message-store.js';
import { SOLANA_ENDPOINT_DEFAULT } from './solana-programs.js';
import { rpcEndpointFromShineHttp, setSolanaCluster } from './services/solana-rpc-gateway.js';
import {
DEFAULT_SHINE_SERVER_HTTP,
DEFAULT_SHINE_SERVER_LOGIN,
@@ -110,20 +110,6 @@ function readUrlServerLoginOverride() {
}
}
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 {
@@ -144,8 +130,8 @@ 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_SOLANA_SERVER = rpcEndpointFromShineHttp(DEFAULT_SHINE_SERVER_HTTP);
const URL_SOLANA_SERVER_OVERRIDE = ''; // RPC always follows SHiNE server
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;
@@ -425,7 +411,6 @@ function createInitialState({ withStoredSession = true } = {}) {
const storedReactions = loadStoredReactions();
const storedEntrySettings = loadStoredEntrySettings();
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
@@ -457,7 +442,7 @@ function createInitialState({ withStoredSession = true } = {}) {
startHint: '',
entrySettings: {
language: String(storedEntrySettings?.language || 'ru'),
solanaServer: normalizeStoredSolanaServer(initialSolanaServer),
solanaServer: rpcEndpointFromShineHttp(URL_SHINE_SERVER_HTTP_OVERRIDE || storedEntrySettings?.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP),
shineServer: String(LOCAL_WS_OVERRIDE_URL || storedEntrySettings?.shineServer || initialShineServer),
shineServerLogin: String(initialShineServerLogin),
shineServerHttp: String(URL_SHINE_SERVER_HTTP_OVERRIDE || storedEntrySettings?.shineServerHttp || DEFAULT_SHINE_SERVER_HTTP_VALUE),
@@ -1063,7 +1048,7 @@ export function saveEntryLanguage(language) {
}
export async function saveEntrySettings(nextSettings) {
const nextSolanaServer = normalizeStoredSolanaServer(nextSettings?.solanaServer || state.entrySettings.solanaServer || DEFAULT_SOLANA_SERVER);
const nextSolanaServer = state.entrySettings.solanaServer;
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 || '';
@@ -1081,7 +1066,7 @@ export async function saveEntrySettings(nextSettings) {
state.entrySettings = {
...state.entrySettings,
...nextSettings,
solanaServer: nextSolanaServer,
solanaServer: rpcEndpointFromShineHttp(resolvedShineServerHttp),
shineServer: forcedShineServer,
shineServerLogin: nextShineServerLogin,
shineServerHttp: resolvedShineServerHttp,
@@ -1094,6 +1079,12 @@ export async function saveEntrySettings(nextSettings) {
persistEntrySettings(state.entrySettings);
authService.setRemoteAddBlockSessionId(state.entrySettings.remoteAddBlockSessionId);
await authService.reconnect(state.entrySettings.shineServer);
try {
const info = await authService.ws.request('GetServerInfo', {}, 9000);
setSolanaCluster(info?.payload?.solanaCluster ?? info?.solanaCluster);
} catch (error) {
console.warn('Unable to refresh Solana network from the selected server', error);
}
state.startHint = `Настройки входа сохранены. SHiNE: ${state.entrySettings.shineServerHttp}`;
}
@@ -1101,7 +1092,7 @@ 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,
solanaServer: 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,