ico
/
pingql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: hopefully......

This commit is contained in:
nate 2026-03-19 00:53:20 +04:00
parent 8a24b30b2a
commit 1e6739b42a
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/pay/src/routes.ts
View File

@ -159,11 +159,4 @@ export const routes = new Elysia()
}; };
}) })
// Lightweight status poll ;
.get("/checkout/:id/status", async ({ accountId, params, set }) => {
const [payment] = await sql`
SELECT status, txid FROM payments WHERE id = ${params.id} AND account_id = ${accountId}
`;
if (!payment) { set.status = 404; return { error: "Payment not found" }; }
return { status: payment.status, txid: payment.txid };
});

27
apps/web/src/views/checkout.ejs
View File

@ -232,16 +232,25 @@
document.getElementById('pay-usd').textContent = data.amount_usd.toFixed(2); document.getElementById('pay-usd').textContent = data.amount_usd.toFixed(2);
document.getElementById('pay-address').textContent = data.address; document.getElementById('pay-address').textContent = data.address;
// Show current status immediately
if (data.status === 'confirming') {
document.getElementById('pay-status').innerHTML = `
<span class="w-2 h-2 rounded-full bg-blue-500 animate-pulse"></span>
<span class="text-blue-400">Transaction detected, waiting for confirmation...</span>
`;
if (data.txid) watchedTxids.push(data.txid);
}
// Start countdown // Start countdown
const expiresAt = new Date(data.expires_at).getTime(); const expiresAt = new Date(data.expires_at).getTime();
updateCountdown(expiresAt); updateCountdown(expiresAt);
countdownInterval = setInterval(() => updateCountdown(expiresAt), 1000); countdownInterval = setInterval(() => updateCountdown(expiresAt), 1000);
// Start SSE stream for instant tx detection on the client // Start SSE for instant tx/block detection
watchAddress(data.coin, data.address); watchAddress(data.coin, data.address);
// Poll as fallback (for confirmations and in case SSE drops) // Poll full checkout as fallback
pollInterval = setInterval(() => pollStatus(), 10000); pollInterval = setInterval(() => pollPayment(), 10000);
} }
let watchedAddress = null; let watchedAddress = null;
@ -316,9 +325,9 @@
} }
} }
async function pollStatus() { async function pollPayment() {
try { try {
const res = await fetch(`${PAY_API}/checkout/${paymentId}/status`, { credentials: 'include' }); const res = await fetch(`${PAY_API}/checkout/${paymentId}`, { credentials: 'include' });
const data = await res.json(); const data = await res.json();
if (data.status === 'confirming') { if (data.status === 'confirming') {
@ -326,6 +335,7 @@
<span class="w-2 h-2 rounded-full bg-blue-500 animate-pulse"></span> <span class="w-2 h-2 rounded-full bg-blue-500 animate-pulse"></span>
<span class="text-blue-400">Transaction detected, waiting for confirmation...</span> <span class="text-blue-400">Transaction detected, waiting for confirmation...</span>
`; `;
if (data.txid && !watchedTxids.includes(data.txid)) watchedTxids.push(data.txid);
} else if (data.status === 'paid') { } else if (data.status === 'paid') {
clearInterval(pollInterval); clearInterval(pollInterval);
clearInterval(countdownInterval); clearInterval(countdownInterval);
@ -364,7 +374,12 @@
document.getElementById('step-pay').classList.remove('hidden'); document.getElementById('step-pay').classList.remove('hidden');
document.getElementById('pay-status-section').classList.add('hidden'); document.getElementById('pay-status-section').classList.add('hidden');
document.getElementById('pay-success').classList.remove('hidden'); document.getElementById('pay-success').classList.remove('hidden');
} else if (data.status !== 'expired') { } else if (data.status === 'expired') {
document.getElementById('step-select').classList.add('hidden');
document.getElementById('step-pay').classList.remove('hidden');
document.getElementById('pay-status-section').classList.add('hidden');
document.getElementById('pay-expired').classList.remove('hidden');
} else {
paymentId = data.id; paymentId = data.id;
showPayment(data); showPayment(data);
} }