feat: standalone@3.0.4

Author: tiagozip

standalone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cap-standalone",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "keywords": [
     "algorithm",
     "anti-abuse",

standalone/public/js/dashboard.js

@@ -319,8 +319,8 @@ function renderKeyDetail() {
             <div class="stat-item">
               <div class="stat-bar red"></div>
               <div class="stat-label">Failed</div>
-              <div class="stat-value" id="statFailed">${formatCompact(Math.max(0, (s.challenges || 0) - (s.verified || 0)))}</div>
-              <div id="trendFailed">${trendHtml(Math.max(0, (s.challenges || 0) - (s.verified || 0)), key.prevStats ? Math.max(0, (key.prevStats.challenges || 0) - (key.prevStats.verified || 0)) : null)}</div>
+              <div class="stat-value" id="statFailed">${formatCompact(s.failed || 0)}</div>
+              <div id="trendFailed">${trendHtml(s.failed, key.prevStats?.failed)}</div>
             </div>
             <div class="stat-item">
               <div class="stat-bar purple"></div>
@@ -903,7 +903,7 @@ function renderChart(chartData) {
       datasets: [
         mkDataset("Challenges", "challenges", "#89b4fa"),
         mkDataset("Verified", "verified", "#a6e3a1"),
-        mkDataset("Failed", (d) => Math.max(0, (d.challenges || 0) - (d.verified || 0)), "#f38ba8"),
+        mkDataset("Failed", "failed", "#f38ba8"),
       ],
     },
     options: {

standalone/src/cap.js

@@ -360,8 +360,6 @@ export const capServer = new Elysia({
     const bucket = hourlyBucket();
     const fnf = (p) => { p.catch(() => {}); };
 
-    fnf(db.hincrby(`metrics:challenges:${params.siteKey}`, bucket, 1));
-
     (async () => {
       if (!ip) return;
       const cachedHeaders = getHeaders();
@@ -625,7 +623,7 @@ export const capServer = new Elysia({
     await db.set(`token:${redeemToken}`, String(tokenExpires));
     await db.expire(`token:${redeemToken}`, tokenTtlSecs);
 
-    await db.hincrby(`solutions:${params.siteKey}`, bucket, 1);
+    await db.hincrby(`metrics:verified:${params.siteKey}`, bucket, 1);
 
     if (payload.iat) {
       const latencyMs = Date.now() - payload.iat;

standalone/src/demo.js

@@ -302,6 +302,7 @@ function generateChartData(rng, key, duration) {
 
   let totalChallenges = 0;
   let totalVerified = 0;
+  let totalFailed = 0;
   let totalLatSum = 0;
   let totalLatCount = 0;
   let totalRateLimited = 0;
@@ -323,24 +324,27 @@ function generateChartData(rng, key, duration) {
     const challenges = Math.max(0, Math.round(base * jitter));
     const failRate = key.failRate * (1 + (rng() - 0.5) * 0.6);
     const verified = Math.max(0, Math.round(challenges * (1 - failRate)));
+    const failed = Math.max(0, challenges - verified);
     const rateLimited = Math.round(challenges * (0.005 + rng() * 0.015));
     const avgLatency = Math.round(2000 + rng() * 6000);
 
     totalChallenges += challenges;
     totalVerified += verified;
+    totalFailed += failed;
     totalRateLimited += rateLimited;
     if (challenges > 0) {
       totalLatSum += avgLatency * challenges;
       totalLatCount += challenges;
     }
 
-    data.push({ bucket, challenges, verified, rateLimited });
+    data.push({ bucket, challenges, verified, failed, rateLimited });
   }
 
   return {
     stats: {
       challenges: totalChallenges,
       verified: totalVerified,
+      failed: totalFailed,
       rateLimited: totalRateLimited,
       avgLatency: totalLatCount > 0 ? Math.round(totalLatSum / totalLatCount) : 0,
     },
@@ -426,6 +430,7 @@ export function demoGetKey(siteKey, chartDuration = "today") {
     prevStats = {
       challenges: Math.round(stats.challenges * (0.7 + prevRng() * 0.6)),
       verified: Math.round(stats.verified * (0.7 + prevRng() * 0.6)),
+      failed: Math.round(stats.failed * (0.7 + prevRng() * 0.6)),
       avgLatency: Math.round(stats.avgLatency * (0.8 + prevRng() * 0.4)),
       rateLimited: Math.round(stats.rateLimited * (0.5 + prevRng() * 1.0)),
     };

standalone/src/server.js

@@ -92,7 +92,7 @@ export const server = new Elysia({
 
       return await Promise.all(
         keys.map(async (key) => {
-          const data = await hgetall(`solutions:${key.siteKey}`);
+          const data = await hgetall(`metrics:verified:${key.siteKey}`);
           const current = sumSolutions(data, currentStart);
           const previous = sumSolutions(data, previousStart, currentStart);
 
@@ -249,9 +249,9 @@ export const server = new Elysia({
         prevStartTime = startTime - periodLen;
       }
 
-      const [challengesH, verifiedH, ratelimitedH, latSumH, latCountH] = await Promise.all([
-        hgetall(`metrics:challenges:${sk}`),
+      const [verifiedH, failedH, ratelimitedH, latSumH, latCountH] = await Promise.all([
         hgetall(`metrics:verified:${sk}`),
+        hgetall(`metrics:failed:${sk}`),
         hgetall(`metrics:ratelimited:${sk}`),
         hgetall(`metrics:latency_sum:${sk}`),
         hgetall(`metrics:latency_count:${sk}`),
@@ -280,8 +280,8 @@ export const server = new Elysia({
 
       const chartData = [];
       if (bucketSize === day) {
-        const chM = aggregateDaily(challengesH, startTime, endTime);
         const veM = aggregateDaily(verifiedH, startTime, endTime);
+        const faM = aggregateDaily(failedH, startTime, endTime);
         const rlM = aggregateDaily(ratelimitedH, startTime, endTime);
 
         const numDays =
@@ -296,20 +296,26 @@ export const server = new Elysia({
           const currentDayStart = Math.floor(now / day) * day;
           for (let i = 0; i < numDays; i++) {
             const b = currentDayStart - (numDays - 1 - i) * day;
+            const verified = veM.get(b) || 0;
+            const failed = faM.get(b) || 0;
             chartData.push({
               bucket: b,
-              challenges: chM.get(b) || 0,
-              verified: veM.get(b) || 0,
+              challenges: verified + failed,
+              verified,
+              failed,
               rateLimited: rlM.get(b) || 0,
             });
           }
         } else {
-          const allBuckets = new Set([...chM.keys(), ...veM.keys(), ...rlM.keys()]);
+          const allBuckets = new Set([...veM.keys(), ...faM.keys(), ...rlM.keys()]);
           for (const b of [...allBuckets].sort((a, c) => a - c)) {
+            const verified = veM.get(b) || 0;
+            const failed = faM.get(b) || 0;
             chartData.push({
               bucket: b,
-              challenges: chM.get(b) || 0,
-              verified: veM.get(b) || 0,
+              challenges: verified + failed,
+              verified,
+              failed,
               rateLimited: rlM.get(b) || 0,
             });
           }
@@ -320,32 +326,36 @@ export const server = new Elysia({
         for (let h = startHour; h <= endHour; h++) {
           const b = h * 3600;
           const bs = String(b);
+          const verified = Number(verifiedH[bs] || 0);
+          const failed = Number(failedH[bs] || 0);
           chartData.push({
             bucket: b,
-            challenges: Number(challengesH[bs] || 0),
-            verified: Number(verifiedH[bs] || 0),
+            challenges: verified + failed,
+            verified,
+            failed,
             rateLimited: Number(ratelimitedH[bs] || 0),
           });
         }
       }
 
-      const totalChallenges = sumRange(challengesH, startTime, endTime);
       const totalVerified = sumRange(verifiedH, startTime, endTime);
+      const totalFailed = sumRange(failedH, startTime, endTime);
       const totalRateLimited = sumRange(ratelimitedH, startTime, endTime);
       const totalLatSum = sumRange(latSumH, startTime, endTime);
       const totalLatCount = sumRange(latCountH, startTime, endTime);
       const avgLatency = totalLatCount > 0 ? Math.round(totalLatSum / totalLatCount) : 0;
 
       let prevStats = null;
       if (prevStartTime !== null) {
-        const pChallenges = sumRange(challengesH, prevStartTime, prevEndTime);
         const pVerified = sumRange(verifiedH, prevStartTime, prevEndTime);
+        const pFailed = sumRange(failedH, prevStartTime, prevEndTime);
         const pRateLimited = sumRange(ratelimitedH, prevStartTime, prevEndTime);
         const pLatSum = sumRange(latSumH, prevStartTime, prevEndTime);
         const pLatCount = sumRange(latCountH, prevStartTime, prevEndTime);
         prevStats = {
-          challenges: pChallenges,
+          challenges: pVerified + pFailed,
           verified: pVerified,
+          failed: pFailed,
           avgLatency: pLatCount > 0 ? Math.round(pLatSum / pLatCount) : 0,
           rateLimited: pRateLimited,
         };
@@ -359,8 +369,9 @@ export const server = new Elysia({
           config: JSON.parse(key.config),
         },
         stats: {
-          challenges: totalChallenges,
+          challenges: totalVerified + totalFailed,
           verified: totalVerified,
+          failed: totalFailed,
           avgLatency,
           rateLimited: totalRateLimited,
         },
@@ -492,8 +503,6 @@ export const server = new Elysia({
       const sk = params.siteKey;
       await Promise.all([
         db.del(`key:${sk}`),
-        db.del(`solutions:${sk}`),
-        db.del(`metrics:challenges:${sk}`),
         db.del(`metrics:verified:${sk}`),
         db.del(`metrics:failed:${sk}`),
         db.del(`metrics:ratelimited:${sk}`),

standalone/src/siteverify.js

@@ -4,10 +4,6 @@ import { Elysia } from "elysia";
 import { db } from "./db.js";
 import { checkCorsOrigin } from "./settings-cache.js";
 
-function hourlyBucket() {
-  return String(Math.floor(Date.now() / 1000 / 3600) * 3600);
-}
-
 export const siteverifyServer = new Elysia({
   detail: {
     tags: ["Challenges"],
@@ -60,16 +56,13 @@ export const siteverifyServer = new Elysia({
 
     if (!expires) {
       set.status = 404;
-      await db.hincrby(`metrics:failed:${sitekey}`, hourlyBucket(), 1);
       return { success: false, error: "Token not found" };
     }
 
     if (Number(expires) < Date.now()) {
       set.status = 403;
-      await db.hincrby(`metrics:failed:${sitekey}`, hourlyBucket(), 1);
       return { success: false, error: "Token expired" };
     }
 
-    await db.hincrby(`metrics:verified:${sitekey}`, hourlyBucket(), 1);
     return { success: true };
   });

standalone/src/static.js

@@ -18,7 +18,7 @@ const resolveSafePath = (rel) => {
 
 export const publicStatic = new Elysia().get(
   "/public/*",
-  async ({ cookie, set, request, redirect }) => {
+  async ({ cookie, set, request, redirect, headers }) => {
     const rawPath = new URL(request.url).pathname.replace(/^\/public\/?/, "");
     let rel;
     try {
@@ -39,7 +39,7 @@ export const publicStatic = new Elysia().get(
 
     if (!allowUnauthed && !authed) {
       set.status = 401;
-      redirect("/")
+      redirect("/");
       return { success: false, error: "Unauthorized" };
     }
 
@@ -49,12 +49,10 @@ export const publicStatic = new Elysia().get(
       return { success: false, error: "Not found" };
     }
 
-    set.headers["Cache-Control"] = allowUnauthed
-      ? "public, max-age=86400"
-      : "private, max-age=3600";
-    set.headers["X-Content-Type-Options"] = "nosniff";
-    set.headers["Content-Type"] = f.type || "application/octet-stream";
+    headers["content-type"] = f.type || "application/octet-stream";
+    headers["cache-control"] = allowUnauthed ? "public, max-age=86400" : "private, max-age=3600";
+    headers["x-content-type-options"] = "nosniff";
 
-    return new Response(f);
+    return f;
   },
 );