majorly improve SOL push UI + allow for more customization.

This commit is contained in:
KingKDot
2026-07-14 00:03:55 -05:00
parent 0a645d3280
commit 4042d4f768
12 changed files with 506 additions and 168 deletions
+16 -16
View File
@@ -53,6 +53,20 @@ let currentUsername = null;
let showAllBuilds = false;
let buildPlugins = [];
async function loadSolRpcEndpoints() {
const field = document.getElementById("sol-rpc-endpoints");
if (!field || field.value.trim()) return;
try {
const res = await fetch("/api/sol/rpc-endpoints", { credentials: "include" });
if (!res.ok) return;
const data = await res.json();
const endpoints = Array.isArray(data?.endpoints)
? data.endpoints.map((item) => String(item || "").trim()).filter(Boolean)
: [];
field.value = endpoints.join("\n");
} catch {}
}
async function loadServerVersion() {
try {
const res = await fetch("/api/version", { credentials: "include" });
@@ -937,22 +951,7 @@ if (solMemoCheckbox && solSettings) {
updateServerUrlPlaceholder();
}
if (isSol) {
const rpcField = document.getElementById("sol-rpc-endpoints");
if (rpcField && !rpcField.value.trim()) {
rpcField.value = [
"https://api.mainnet-beta.solana.com",
"https://solana-mainnet.gateway.tatum.io",
"https://go.getblock.us/86aac42ad4484f3c813079afc201451c",
"https://solana-rpc.publicnode.com",
"https://api.blockeden.xyz/solana/KeCh6p22EX5AeRHxMSmc",
"https://solana.drpc.org",
"https://solana.leorpc.com/?api_key=FREE",
"https://solana.api.onfinality.io/public",
"https://solana.api.pocket.network/",
].join("\n");
}
}
if (isSol) loadSolRpcEndpoints();
});
}
@@ -1634,6 +1633,7 @@ async function init() {
}
await loadServerVersion();
await loadSolRpcEndpoints();
await loadSavedBuilds();
await loadBuildProfiles();
+81 -23
View File
@@ -1,16 +1,4 @@
(() => {
const DEFAULT_RPC_ENDPOINTS = [
"https://api.mainnet-beta.solana.com",
"https://solana-mainnet.gateway.tatum.io",
"https://solana-rpc.publicnode.com",
"https://api.blockeden.xyz/solana/KeCh6p22EX5AeRHxMSmc",
"https://solana.drpc.org",
"https://solana.leorpc.com/?api_key=FREE",
"https://solana.api.onfinality.io/public",
"https://solana.api.pocket.network/",
"https://api.devnet.solana.com",
];
const rpcSelect = document.getElementById("rpc-url");
const customRpcWrapper = document.getElementById("custom-rpc-wrapper");
const customRpcInput = document.getElementById("custom-rpc-url");
@@ -23,8 +11,12 @@ const outputSection = document.getElementById("output-section");
const outputDiv = document.getElementById("output");
const walletInfo = document.getElementById("wallet-info");
const walletAddress = document.getElementById("wallet-address");
const rpcEndpointList = document.getElementById("rpc-endpoint-list");
const newRpcInput = document.getElementById("new-rpc-url");
const addRpcBtn = document.getElementById("add-rpc-btn");
const rpcManagerError = document.getElementById("rpc-manager-error");
if (!rpcSelect || !customRpcWrapper || !customRpcInput || !privateKeyInput || !toggleKeyBtn || !serverUrlInput || !previewBtn || !publishBtn || !outputSection || !outputDiv || !walletInfo || !walletAddress) {
if (!rpcSelect || !customRpcWrapper || !customRpcInput || !privateKeyInput || !toggleKeyBtn || !serverUrlInput || !previewBtn || !publishBtn || !outputSection || !outputDiv || !walletInfo || !walletAddress || !rpcEndpointList || !newRpcInput || !addRpcBtn || !rpcManagerError) {
return;
}
@@ -48,24 +40,90 @@ function appendRpcOption(value, label = value) {
}
async function loadRpcEndpoints() {
const selected = rpcSelect.value;
rpcSelect.innerHTML = "";
let endpoints = [];
let records = [];
try {
const res = await fetch("/api/sol/rpc-endpoints", { credentials: "include" });
if (res.ok) {
const data = await res.json();
endpoints = normalizeRpcEndpoints(data?.endpoints);
const urls = normalizeRpcEndpoints(data?.endpoints);
records = Array.isArray(data?.records)
? data.records.filter((item) => item && typeof item.id === "string" && urls.includes(item.url))
: urls.map((url) => ({ id: "", url }));
}
} catch {}
if (endpoints.length === 0) {
endpoints = DEFAULT_RPC_ENDPOINTS;
}
normalizeRpcEndpoints(endpoints).forEach((ep) => appendRpcOption(ep));
records.forEach((item) => appendRpcOption(item.url));
appendRpcOption("__custom__", "Custom RPC endpoint...");
rpcSelect.value = records.some((item) => item.url === selected) ? selected : (records[0]?.url || "__custom__");
customRpcWrapper.classList.toggle("hidden", rpcSelect.value !== "__custom__");
renderRpcEndpointManager(records);
}
function setRpcManagerError(message = "") {
rpcManagerError.textContent = message;
rpcManagerError.classList.toggle("hidden", !message);
}
function renderRpcEndpointManager(records) {
rpcEndpointList.innerHTML = "";
if (records.length === 0) {
const empty = document.createElement("p");
empty.className = "rounded-lg border border-dashed border-slate-700 px-3 py-4 text-center text-xs text-slate-500";
empty.textContent = "No saved endpoints. Add one below or use a custom endpoint for this publish.";
rpcEndpointList.appendChild(empty);
return;
}
records.forEach((record) => {
const row = document.createElement("div");
row.className = "group flex items-center gap-1 rounded-lg border border-slate-800 bg-slate-950/60 p-1.5";
const input = document.createElement("input");
input.type = "url";
input.value = record.url;
input.className = "flex-1 min-w-0 px-2 py-1.5 bg-transparent border border-transparent rounded text-xs font-mono text-slate-300 focus:outline-none focus:border-sky-500/60 focus:bg-slate-950";
const save = document.createElement("button");
save.type = "button";
save.className = "inline-flex items-center justify-center w-8 h-8 shrink-0 rounded-md text-slate-500 hover:text-sky-300 hover:bg-sky-500/10 transition-colors";
save.title = "Save endpoint";
save.innerHTML = '<i class="fa-solid fa-floppy-disk"></i>';
save.addEventListener("click", () => mutateRpcEndpoint(`/api/sol/rpc-endpoints/${record.id}`, "PATCH", { url: input.value }));
const remove = document.createElement("button");
remove.type = "button";
remove.className = "inline-flex items-center justify-center w-8 h-8 shrink-0 rounded-md text-slate-500 hover:text-red-300 hover:bg-red-500/10 transition-colors";
remove.title = "Delete endpoint";
remove.innerHTML = '<i class="fa-solid fa-trash"></i>';
remove.addEventListener("click", () => mutateRpcEndpoint(`/api/sol/rpc-endpoints/${record.id}`, "DELETE"));
row.append(input, save, remove);
rpcEndpointList.appendChild(row);
});
}
async function mutateRpcEndpoint(path, method, body) {
setRpcManagerError();
try {
const res = await fetch(path, {
method,
headers: body ? { "Content-Type": "application/json" } : undefined,
credentials: "include",
body: body ? JSON.stringify(body) : undefined,
});
const data = await res.json();
if (!res.ok) throw new Error(data?.error || "Failed to save RPC endpoints");
newRpcInput.value = "";
await loadRpcEndpoints();
} catch (error) {
setRpcManagerError(error?.message || "Failed to save RPC endpoints");
}
}
addRpcBtn.addEventListener("click", () => mutateRpcEndpoint("/api/sol/rpc-endpoints", "POST", { url: newRpcInput.value }));
newRpcInput.addEventListener("keydown", (event) => {
if (event.key === "Enter") {
event.preventDefault();
addRpcBtn.click();
}
});
loadRpcEndpoints();
rpcSelect.addEventListener("change", () => {
@@ -122,8 +180,8 @@ async function checkWalletBalance() {
function showOutput(text, isError = false) {
outputSection.classList.remove("hidden");
outputDiv.textContent = text;
outputDiv.className = `p-3 bg-slate-800/60 border rounded-lg text-sm font-mono break-all whitespace-pre-wrap max-h-64 overflow-y-auto ${
isError ? "border-red-700/60 text-red-300" : "border-slate-700 text-slate-200"
outputDiv.className = `p-4 bg-slate-950/70 border rounded-lg text-sm font-mono break-all whitespace-pre-wrap max-h-72 overflow-y-auto ${
isError ? "border-red-500/40 text-red-300" : "border-slate-800 text-slate-200"
}`;
}
+115 -74
View File
@@ -9,112 +9,153 @@
<link rel="stylesheet" href="/vendor/inter/400.css" />
<link rel="stylesheet" href="/vendor/inter/600.css" />
<link rel="stylesheet" href="/vendor/inter/700.css" />
<link rel="stylesheet" href="/assets/tailwind.css" />
<link rel="stylesheet" href="/assets/tailwind.css" />
<link rel="stylesheet" href="/vendor/fontawesome/css/all.min.css" />
<link rel="icon" type="image/x-icon" href="/assets/favicon.ico" />
<link rel="stylesheet" href="/assets/main.css" />
<link rel="stylesheet" href="/assets/custom.css" />
<style>
#rpc-url,
#rpc-url option {
color: #f1f5f9;
background-color: #0f172a;
}
</style>
<script defer src="/assets/toast.js"></script>
<script defer src="/assets/ripple.js"></script>
</head>
<body class="min-h-screen bg-slate-950 text-slate-100">
<header id="top-nav"></header>
<main class="px-5 py-6">
<div class="max-w-3xl mx-auto flex flex-col gap-5">
<main class="max-w-7xl w-full mx-auto px-4 sm:px-6 lg:px-8 py-8">
<div class="mb-6 flex flex-col sm:flex-row sm:items-end sm:justify-between gap-3">
<div>
<h1 class="text-2xl font-semibold flex items-center gap-2">
<i class="fa-solid fa-link-slash text-purple-400"></i> Solana Memo Publisher
</h1>
<p class="text-slate-400 mt-1">
Publish an encrypted server URL as a Solana memo transaction.
Clients configured with Solana lookup will query this address to find the server.
<h1 class="text-2xl font-bold text-slate-100">Solana Memo Publisher</h1>
<p class="text-slate-400 text-sm mt-1 max-w-2xl">
Publish encrypted connection endpoints for clients configured to resolve this server through Solana.
</p>
</div>
<div class="inline-flex self-start sm:self-auto items-center gap-2 px-3 py-1.5 rounded-full bg-emerald-500/10 border border-emerald-500/30 text-xs font-medium text-emerald-300">
<span class="w-1.5 h-1.5 rounded-full bg-emerald-400"></span>
Mainnet
</div>
</div>
<div class="bg-slate-900/70 border border-slate-800 rounded-lg p-5 flex flex-col gap-5">
<!-- RPC Endpoint -->
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="rpc-url">RPC Endpoint</label>
<select id="rpc-url"
class="w-full px-3 py-2 bg-slate-800/60 border border-slate-700 rounded-lg text-slate-100 focus:outline-none focus:border-purple-500 transition-colors">
</select>
<div id="custom-rpc-wrapper" class="hidden mt-2">
<input type="text" id="custom-rpc-url" placeholder="https://your-rpc-endpoint.com"
class="w-full px-3 py-2 bg-slate-800/60 border border-slate-700 rounded-lg focus:outline-none focus:border-purple-500 transition-colors" />
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
<section class="lg:col-span-2 bg-slate-900/60 border border-slate-800 rounded-xl p-5 sm:p-6 space-y-6">
<div class="flex items-center gap-3">
<div class="flex items-center justify-center w-9 h-9 rounded-lg bg-violet-500/10 border border-violet-500/30">
<i class="fa-solid fa-paper-plane text-violet-400"></i>
</div>
<div>
<h2 class="text-lg font-semibold">Publish connection memo</h2>
<p class="text-sm text-slate-400">Choose a provider, sign with your wallet, and publish the latest server list.</p>
</div>
</div>
<!-- Private Key -->
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="private-key">Solana Private Key (Base58)</label>
<div class="flex items-center gap-2">
<input type="password" id="private-key" placeholder="Enter your Solana wallet private key"
class="flex-1 min-w-0 px-3 py-2 bg-slate-800/60 border border-slate-700 rounded-lg focus:outline-none focus:border-purple-500 transition-colors font-mono text-sm" />
<button type="button" id="toggle-key-visibility"
class="shrink-0 px-3 py-2 text-xs text-slate-400 hover:text-slate-200 bg-slate-800/60 border border-slate-700 rounded-lg transition-colors">
<i class="fa-solid fa-eye"></i> Show
</button>
<div class="space-y-5 pt-1">
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="server-url">Server URLs</label>
<textarea id="server-url" rows="3" placeholder="wss://your-server:5173"
class="w-full px-3 py-2.5 rounded-lg border border-slate-700 bg-slate-950/70 text-slate-100 placeholder-slate-500 font-mono text-sm resize-y focus:outline-none focus:ring-2 focus:ring-violet-500/60 focus:border-violet-500"></textarea>
<p class="text-xs text-slate-500 mt-1.5">Enter one WebSocket URL per line. Clients try them in the published order.</p>
</div>
<p class="text-xs text-slate-500 mt-1">
<i class="fa-solid fa-shield-halved text-amber-400"></i>
Your private key is never stored — it's used in-memory only for signing and discarded immediately.
</p>
<div id="wallet-info" class="hidden mt-2 p-2 bg-slate-800/40 rounded-lg text-xs text-slate-400">
<span id="wallet-address"></span>
<span id="wallet-balance" class="ml-2"></span>
<div class="grid grid-cols-1 md:grid-cols-2 gap-5">
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="rpc-url">RPC provider</label>
<select id="rpc-url"
class="w-full px-3 py-2.5 rounded-lg border border-slate-700 bg-slate-950/70 text-slate-100 focus:outline-none focus:ring-2 focus:ring-violet-500/60 focus:border-violet-500">
</select>
<div id="custom-rpc-wrapper" class="hidden mt-2">
<input type="url" id="custom-rpc-url" placeholder="https://rpc.example.com"
class="w-full px-3 py-2.5 rounded-lg border border-slate-700 bg-slate-950/70 text-slate-100 placeholder-slate-500 text-sm focus:outline-none focus:ring-2 focus:ring-violet-500/60 focus:border-violet-500" />
</div>
<p class="text-xs text-slate-500 mt-1.5">Used for this transaction only.</p>
</div>
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="private-key">Wallet private key</label>
<div class="flex items-stretch">
<input type="password" id="private-key" autocomplete="off" placeholder="Base58 private key"
class="flex-1 min-w-0 px-3 py-2.5 rounded-l-lg border border-r-0 border-slate-700 bg-slate-950/70 text-slate-100 placeholder-slate-500 font-mono text-sm focus:outline-none focus:ring-2 focus:ring-violet-500/60 focus:border-violet-500" />
<button type="button" id="toggle-key-visibility"
class="shrink-0 px-3 rounded-r-lg border border-slate-700 bg-slate-800 hover:bg-slate-700 text-xs text-slate-300 transition-colors">
<i class="fa-solid fa-eye"></i> Show
</button>
</div>
<p class="text-xs text-slate-500 mt-1.5"><i class="fa-solid fa-shield-halved text-amber-400 mr-1"></i>Used in memory and never stored.</p>
</div>
</div>
<div id="wallet-info" class="hidden rounded-lg border border-slate-800 bg-slate-950/60 px-3 py-2 text-xs text-slate-400">
<i class="fa-solid fa-wallet text-violet-400 mr-1.5"></i>
<span id="wallet-address"></span><span id="wallet-balance" class="ml-2"></span>
</div>
</div>
<!-- Server URL -->
<div>
<label class="block text-sm font-medium text-slate-300 mb-2" for="server-url">Server URL to Publish</label>
<input type="text" id="server-url" placeholder="wss://your-server:5173"
class="w-full px-3 py-2 bg-slate-800/60 border border-slate-700 rounded-lg focus:outline-none focus:border-purple-500 transition-colors" />
<p class="text-xs text-slate-500 mt-1">
The server URL that clients will connect to. Multiple URLs can be separated by newlines.
</p>
</div>
<!-- Action Buttons -->
<div class="flex gap-3 flex-wrap">
<div class="pt-5 border-t border-slate-800 flex flex-col-reverse sm:flex-row sm:items-center sm:justify-end gap-3">
<button type="button" id="preview-btn"
class="inline-flex items-center gap-2 px-4 py-2 rounded-lg bg-slate-700 hover:bg-slate-600 text-slate-200 border border-slate-600 transition-colors">
class="inline-flex items-center justify-center gap-2 px-4 py-2.5 rounded-lg bg-slate-800 hover:bg-slate-700 text-slate-200 border border-slate-700 font-medium text-sm transition-colors disabled:opacity-50">
<i class="fa-solid fa-eye"></i> Preview Memo
</button>
<button type="button" id="publish-btn"
class="inline-flex items-center gap-2 px-4 py-2 rounded-lg bg-purple-700 hover:bg-purple-600 text-white border border-purple-600 transition-colors">
class="inline-flex items-center justify-center gap-2 px-5 py-2.5 rounded-lg bg-violet-600 hover:bg-violet-500 text-white border border-violet-500 font-semibold text-sm shadow-lg shadow-violet-950/30 transition-colors disabled:opacity-50">
<i class="fa-solid fa-paper-plane"></i> Publish to Solana
</button>
</div>
<!-- Output -->
<div id="output-section" class="hidden">
<label class="block text-sm font-medium text-slate-300 mb-2">Result</label>
<div id="output" class="p-3 bg-slate-800/60 border border-slate-700 rounded-lg text-sm font-mono break-all whitespace-pre-wrap max-h-64 overflow-y-auto">
<div id="output-section" class="hidden pt-5 border-t border-slate-800">
<div class="flex items-center gap-2 mb-2 text-sm font-medium text-slate-300">
<i class="fa-solid fa-terminal text-violet-400"></i> Result
</div>
<div id="output" class="p-4 bg-slate-950/70 border border-slate-800 rounded-lg text-sm font-mono break-all whitespace-pre-wrap max-h-72 overflow-y-auto"></div>
</div>
</div>
<div class="pt-5 border-t border-slate-800">
<div class="flex items-center gap-2 mb-3">
<i class="fa-solid fa-circle-info text-violet-400"></i>
<h3 class="text-sm font-semibold text-slate-300">Publishing workflow</h3>
</div>
<ol class="grid grid-cols-1 sm:grid-cols-3 gap-3 text-xs">
<li class="flex gap-2.5 rounded-lg border border-slate-800 bg-slate-950/40 p-3">
<span class="flex items-center justify-center w-5 h-5 shrink-0 rounded-full bg-violet-500/10 border border-violet-500/30 font-semibold text-violet-300">1</span>
<p class="text-slate-400 leading-relaxed">Encrypt URLs with the configured agent token.</p>
</li>
<li class="flex gap-2.5 rounded-lg border border-slate-800 bg-slate-950/40 p-3">
<span class="flex items-center justify-center w-5 h-5 shrink-0 rounded-full bg-violet-500/10 border border-violet-500/30 font-semibold text-violet-300">2</span>
<p class="text-slate-400 leading-relaxed">Sign and publish a low-cost memo transaction.</p>
</li>
<li class="flex gap-2.5 rounded-lg border border-slate-800 bg-slate-950/40 p-3">
<span class="flex items-center justify-center w-5 h-5 shrink-0 rounded-full bg-violet-500/10 border border-violet-500/30 font-semibold text-violet-300">3</span>
<p class="text-slate-400 leading-relaxed">Clients resolve the newest valid memo.</p>
</li>
</ol>
</div>
</section>
<!-- Info -->
<div class="bg-slate-900/50 border border-slate-800 rounded-lg p-4 text-sm text-slate-400">
<h3 class="text-slate-300 font-medium mb-2"><i class="fa-solid fa-circle-info text-blue-400"></i> How it works</h3>
<ul class="list-disc list-inside flex flex-col gap-1">
<li>The server URL is encrypted with AES-256-GCM using SHA-256 of your server's Agent Token as the key.</li>
<li>The encrypted memo is published as a Solana memo transaction from your wallet.</li>
<li>Clients built with Solana mode query your wallet address for the latest memo and decrypt it.</li>
<li>Publishing costs approximately 0.000005 SOL (~$0.001).</li>
<li>To update the server URL, just publish a new memo — clients always use the newest one.</li>
</ul>
</div>
<section class="bg-slate-900/60 border border-slate-800 rounded-xl p-5 space-y-4">
<div class="flex items-center gap-3">
<div class="flex items-center justify-center w-9 h-9 rounded-lg bg-sky-500/10 border border-sky-500/30">
<i class="fa-solid fa-network-wired text-sky-400"></i>
</div>
<div class="min-w-0">
<h2 class="text-base font-semibold">RPC endpoint pool</h2>
<p class="text-xs text-slate-400">Shared by future client builds.</p>
</div>
</div>
<div id="rpc-endpoint-list" class="space-y-2"></div>
<div class="pt-3 border-t border-slate-800 space-y-2">
<label class="block text-xs font-semibold uppercase tracking-wider text-slate-500" for="new-rpc-url">Add endpoint</label>
<div class="flex gap-2">
<input type="url" id="new-rpc-url" placeholder="https://rpc.example.com"
class="flex-1 min-w-0 px-3 py-2 rounded-lg border border-slate-700 bg-slate-950/70 text-slate-100 placeholder-slate-500 text-sm focus:outline-none focus:ring-2 focus:ring-sky-500/60 focus:border-sky-500" />
<button type="button" id="add-rpc-btn"
class="shrink-0 inline-flex items-center justify-center w-10 rounded-lg bg-sky-600 hover:bg-sky-500 text-white border border-sky-500 transition-colors" title="Add endpoint">
<i class="fa-solid fa-plus"></i>
</button>
</div>
<p id="rpc-manager-error" class="hidden text-xs text-red-300"></p>
</div>
<div class="rounded-lg bg-sky-500/5 border border-sky-500/20 p-3 text-xs leading-relaxed text-slate-400">
Keep every provider on the same cluster. Changes are saved server-wide and included in newly configured builds.
</div>
</section>
</div>
</main>
+11
View File
@@ -3,6 +3,7 @@ import { getConfig } from "./config";
import {
clearRequestRateLimitsForTests,
consumeLoginPageRateLimit,
consumeSolRpcRateLimit,
consumeUnauthorizedRateLimit,
isRateLimited,
recordFailedAttempt,
@@ -59,4 +60,14 @@ describe("rateLimit", () => {
expect(result.limited).toBe(true);
expect(result.retryAfter).toBeGreaterThan(0);
});
test("applies separate Solana publish and balance limits per user", () => {
const userId = Date.now();
for (let i = 0; i < 3; i += 1) {
expect(consumeSolRpcRateLimit(userId, "publish").limited).toBe(false);
}
expect(consumeSolRpcRateLimit(userId, "publish").limited).toBe(true);
expect(consumeSolRpcRateLimit(userId, "balance").limited).toBe(false);
expect(consumeSolRpcRateLimit(userId + 1, "publish").limited).toBe(false);
});
});
+10
View File
@@ -162,6 +162,16 @@ export function consumeUnauthorizedRateLimit(ip: string): { limited: boolean; re
return consumeRequestRateLimit(`unauthorized:${ip}`, "Unauthorized request", policy);
}
export function consumeSolRpcRateLimit(
userId: number,
action: "balance" | "publish",
): { limited: boolean; retryAfter?: number } {
const policy = action === "publish"
? makeRequestPolicy("SOL_PUBLISH", { maxRequests: 3, windowMs: 5 * 60 * 1000, lockoutMs: 5 * 60 * 1000 })
: makeRequestPolicy("SOL_BALANCE", { maxRequests: 12, windowMs: 60 * 1000, lockoutMs: 60 * 1000 });
return consumeRequestRateLimit(`sol-${action}:${userId}`, `Solana ${action}`, policy);
}
export function clearRequestRateLimitsForTests(): void {
requestRateLimitStore.clear();
}
@@ -29,6 +29,7 @@ import { resolveRuntimeRoot } from "../runtime-paths";
import { createUploadPull } from "../file-transfer-state";
import { handleBuildProfileRoutes } from "./build-profile-routes";
import { sanitizeInitialClientTag } from "../build-config-sanitize";
import { getSolRpcEndpointUrls, normalizeSolRpcUrls } from "../../sol-rpc-endpoints";
type RequestIpProvider = {
requestIP: (req: Request) => { address?: string } | null | undefined;
@@ -287,8 +288,22 @@ export async function handleBuildRoutes(
}
safeSolAddress = trimmedAddr;
if (typeof solRpcEndpoints === "string" && solRpcEndpoints.trim()) {
const endpoints = solRpcEndpoints.split("\n").map((e: string) => e.trim()).filter(Boolean);
const requestedEndpoints = typeof solRpcEndpoints === "string" && solRpcEndpoints.trim()
? solRpcEndpoints.split("\n").map((e: string) => e.trim()).filter(Boolean)
: getSolRpcEndpointUrls();
if (requestedEndpoints.length === 0) {
return Response.json(
{ error: "Solana memo mode requires at least one RPC endpoint" },
{ status: 400 },
);
}
if (requestedEndpoints.length > 0) {
let endpoints: string[];
try {
endpoints = normalizeSolRpcUrls(requestedEndpoints);
} catch (error: any) {
return Response.json({ error: error?.message || "Invalid RPC endpoints" }, { status: 400 });
}
for (const ep of endpoints) {
try {
const parsed = new URL(ep);
+64 -33
View File
@@ -3,6 +3,12 @@ import { authenticateRequest } from "../../auth";
import { getConfig } from "../../config";
import { logger } from "../../logger";
import { requirePermission } from "../../rbac";
import { consumeSolRpcRateLimit } from "../../rateLimit";
import {
getSolRpcEndpoints,
normalizeSolRpcUrl,
saveSolRpcEndpointUrls,
} from "../../sol-rpc-endpoints";
let _solana: typeof import("@solana/web3.js") | null = null;
async function getSolana() {
@@ -36,19 +42,6 @@ function decodeBase58(str: string): Uint8Array {
return new Uint8Array(bytes.reverse());
}
const DEFAULT_RPC_ENDPOINTS = [
"https://api.mainnet-beta.solana.com",
"https://solana-mainnet.gateway.tatum.io",
"https://go.getblock.us/86aac42ad4484f3c813079afc201451c",
"https://solana-rpc.publicnode.com",
"https://api.blockeden.xyz/solana/KeCh6p22EX5AeRHxMSmc",
"https://solana.drpc.org",
"https://solana.leorpc.com/?api_key=FREE",
"https://solana.api.onfinality.io/public",
"https://solana.api.pocket.network/",
"https://api.devnet.solana.com",
];
function encryptServerUrl(serverUrl: string, agentToken: string): string {
const keyHash = createHash("sha256").update(agentToken).digest();
const nonce = randomBytes(12);
@@ -72,11 +65,49 @@ export async function handleSolRoutes(
return new Response("Unauthorized", { status: 401 });
}
try {
requirePermission(user, "system:configure");
} catch (error) {
if (error instanceof Response) return error;
return new Response("Forbidden", { status: 403 });
if (req.method === "GET" && url.pathname === "/api/sol/rpc-endpoints") {
const records = getSolRpcEndpoints();
return Response.json({ endpoints: records.map((item) => item.url), records });
}
try { requirePermission(user, "system:configure"); }
catch (error) { return error instanceof Response ? error : new Response("Forbidden", { status: 403 }); }
if (req.method === "POST" && url.pathname === "/api/sol/rpc-endpoints") {
const body = await req.json();
const current = getSolRpcEndpoints().map((item) => item.url);
try {
const endpoint = normalizeSolRpcUrl(body?.url);
if (current.includes(endpoint)) {
return Response.json({ error: "RPC endpoint is already in the list" }, { status: 409 });
}
const records = saveSolRpcEndpointUrls([...current, endpoint], user.userId);
return Response.json({ records, endpoints: records.map((item) => item.url) }, { status: 201 });
} catch (error: any) {
return Response.json({ error: error?.message || "Invalid RPC endpoint" }, { status: 400 });
}
}
const endpointMatch = url.pathname.match(/^\/api\/sol\/rpc-endpoints\/([a-f0-9]{16})$/);
if (endpointMatch && (req.method === "PATCH" || req.method === "DELETE")) {
const current = getSolRpcEndpoints();
const index = current.findIndex((item) => item.id === endpointMatch[1]);
if (index < 0) return Response.json({ error: "RPC endpoint not found" }, { status: 404 });
const urls = current.map((item) => item.url);
if (req.method === "DELETE") urls.splice(index, 1);
else {
try {
const endpoint = normalizeSolRpcUrl((await req.json())?.url);
if (urls.some((item, itemIndex) => itemIndex !== index && item === endpoint)) {
return Response.json({ error: "RPC endpoint is already in the list" }, { status: 409 });
}
urls[index] = endpoint;
} catch (error: any) {
return Response.json({ error: error?.message || "Invalid RPC endpoint" }, { status: 400 });
}
}
const records = saveSolRpcEndpointUrls(urls, user.userId);
return Response.json({ records, endpoints: records.map((item) => item.url) });
}
if (req.method === "POST" && url.pathname === "/api/sol/preview") {
@@ -98,6 +129,11 @@ export async function handleSolRoutes(
}
if (req.method === "POST" && url.pathname === "/api/sol/publish") {
const rateLimit = consumeSolRpcRateLimit(user.userId, "publish");
if (rateLimit.limited) return Response.json(
{ error: "Solana publish rate limit exceeded" },
{ status: 429, headers: { "Retry-After": String(rateLimit.retryAfter || 60) } },
);
const body = await req.json();
const { privateKeyBase58, serverUrl, rpcUrl } = body;
@@ -123,14 +159,11 @@ export async function handleSolRoutes(
return Response.json({ error: "Invalid Solana private key (Base58)" }, { status: 400 });
}
const endpoint = typeof rpcUrl === "string" && rpcUrl.trim()
? rpcUrl.trim()
: "https://api.mainnet-beta.solana.com";
let endpoint: string;
try {
new URL(endpoint);
} catch {
return Response.json({ error: "Invalid RPC URL" }, { status: 400 });
endpoint = normalizeSolRpcUrl(rpcUrl);
} catch (err: any) {
return Response.json({ error: err?.message || "Invalid RPC URL" }, { status: 400 });
}
const memo = encryptServerUrl(serverUrl.trim(), agentToken);
@@ -182,6 +215,11 @@ export async function handleSolRoutes(
}
if (req.method === "POST" && url.pathname === "/api/sol/balance") {
const rateLimit = consumeSolRpcRateLimit(user.userId, "balance");
if (rateLimit.limited) return Response.json(
{ error: "Solana balance rate limit exceeded" },
{ status: 429, headers: { "Retry-After": String(rateLimit.retryAfter || 60) } },
);
const body = await req.json();
const { publicKeyBase58, rpcUrl } = body;
@@ -197,11 +235,8 @@ export async function handleSolRoutes(
return Response.json({ error: "Invalid Solana public key" }, { status: 400 });
}
const endpoint = typeof rpcUrl === "string" && rpcUrl.trim()
? rpcUrl.trim()
: "https://api.mainnet-beta.solana.com";
try {
const endpoint = normalizeSolRpcUrl(rpcUrl);
const { Connection, LAMPORTS_PER_SOL } = await getSolana();
const connection = new Connection(endpoint, "confirmed");
const balance = await connection.getBalance(pubkey);
@@ -216,10 +251,6 @@ export async function handleSolRoutes(
}
}
if (req.method === "GET" && url.pathname === "/api/sol/rpc-endpoints") {
return Response.json({ endpoints: DEFAULT_RPC_ENDPOINTS });
}
return null;
} catch (err: any) {
logger.error(`[sol] Route error: ${err?.message || err}`);
+79
View File
@@ -0,0 +1,79 @@
import { createHash } from "crypto";
import { getSharedUiSettings, saveSharedUiSettings } from "./db";
const SETTINGS_SCOPE = "sol-rpc-endpoints";
export const MAX_SOL_RPC_ENDPOINTS = 20;
export const DEFAULT_SOL_RPC_ENDPOINTS = [
"https://api.mainnet.solana.com/",
"https://solana-rpc.publicnode.com/",
"https://solana.api.pocket.network/",
"https://solana.leorpc.com/?api_key=FREE",
"https://public.rpc.solanavibestation.com/",
"https://api.uniblock.dev/uni/v1/json-rpc?chainId=solana",
];
export type SolRpcEndpoint = { id: string; url: string };
export function normalizeSolRpcUrl(value: unknown): string {
if (typeof value !== "string") throw new Error("RPC endpoint must be a URL string");
const trimmed = value.trim();
if (!trimmed) throw new Error("RPC endpoint is required");
if (trimmed.length > 2048) throw new Error("RPC endpoint is too long");
let parsed: URL;
try {
parsed = new URL(trimmed);
} catch {
throw new Error("Invalid RPC endpoint URL");
}
if (parsed.protocol !== "https:" && parsed.protocol !== "http:") {
throw new Error("RPC endpoint must use HTTP or HTTPS");
}
if (parsed.username || parsed.password) {
throw new Error("RPC endpoint must not contain URL credentials");
}
return parsed.toString();
}
export function normalizeSolRpcUrls(values: unknown): string[] {
if (!Array.isArray(values)) throw new Error("endpoints must be an array");
const result: string[] = [];
const seen = new Set<string>();
for (const value of values) {
const normalized = normalizeSolRpcUrl(value);
if (!seen.has(normalized)) {
seen.add(normalized);
result.push(normalized);
}
}
if (result.length > MAX_SOL_RPC_ENDPOINTS) {
throw new Error(`A maximum of ${MAX_SOL_RPC_ENDPOINTS} RPC endpoints is allowed`);
}
return result;
}
function endpointId(url: string): string {
return createHash("sha256").update(url).digest("hex").slice(0, 16);
}
export function getSolRpcEndpointUrls(): string[] {
const record = getSharedUiSettings(SETTINGS_SCOPE);
if (!record) return [...DEFAULT_SOL_RPC_ENDPOINTS];
try {
const parsed = JSON.parse(record.settingsJson);
return normalizeSolRpcUrls(parsed?.endpoints);
} catch {
return [...DEFAULT_SOL_RPC_ENDPOINTS];
}
}
export function getSolRpcEndpoints(): SolRpcEndpoint[] {
return getSolRpcEndpointUrls().map((url) => ({ id: endpointId(url), url }));
}
export function saveSolRpcEndpointUrls(values: unknown, userId: number): SolRpcEndpoint[] {
const endpoints = normalizeSolRpcUrls(values);
saveSharedUiSettings(SETTINGS_SCOPE, JSON.stringify({ endpoints }), userId);
return endpoints.map((url) => ({ id: endpointId(url), url }));
}