📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Better a11y, UI; add api-url param support; add progress bar; add 'auto' theme
Blue Mouseb73bebdc2caa
diff --git a/.prettierrc.js b/.prettierrc.cjssimilarity index 100%rename from .prettierrc.jsrename to .prettierrc.cjsdiff --git a/README.md b/README.mdindex 100b9d460..5cf6764e5 100644--- a/README.md+++ b/README.md@@ -6,6 +6,38 @@ Swetrix CAPTCHA is a privacy-oriented, simple and opensource CAPTCHA service.See the full documentation at https://docs.swetrix.com/captcha/introduction+## Features++- **Privacy-focused**: No tracking, no cookies+- **Accessible**: Full keyboard navigation, ARIA support, screen reader announcements, respects `prefers-reduced-motion`+- **Progress indicator**: Visual progress bar during verification+- **Auto theme detection**: Automatically matches browser's light/dark mode preference+- **Lightweight**: Minimal footprint, fast loading++## Usage++```html+<div class="swecaptcha"+ data-project-id="YOUR_PROJECT_ID"+ data-theme="auto">+</div>+<script src="https://cdn.swetrixcaptcha.com/captcha-loader.js" defer></script>+```++### Options++| Attribute | Description | Values | Default |+|-----------|-------------|--------|---------|+| `data-project-id` | Your project ID | Valid project ID | Required |+| `data-theme` | Color theme | `auto`, `light`, `dark` | `auto` |+| `data-response-input-name` | Hidden input name | Any string | `swetrix-captcha-response` |++### Theme Options++- `auto`: Automatically detects user's browser theme preference using `prefers-color-scheme`+- `light`: Forces light theme+- `dark`: Forces dark theme+## DevelopmentTo build the captcha run:diff --git a/dist/captcha-loader.js b/dist/captcha-loader.jsindex ca4157b5e..fc43ae438 100644--- a/dist/captcha-loader.js+++ b/dist/captcha-loader.js@@ -1,2 +1,2 @@-!function(e){"function"==typeof define&&define.amd?define(e):e()}(function(){"use strict";const e=window.__SWETRIX_CAPTCHA_DEV||!1,t=e?"./light.html":"https://cap.swetrix.com/pages/light",n=e?"./dark.html":"https://cap.swetrix.com/pages/dark",r=["light","dark"],a=/^(?!.*--)[a-zA-Z0-9-]{12}$/;var i;!function(e){e.log="log",e.error="error",e.warn="warn",e.info="info"}(i||(i={}));const o=["AP00000000000","FAIL000000000"],c=[],d=(e,t)=>{console[e](`[Swetrix Captcha] ${t}`)},s=(e,t)=>`${e}?${Object.keys(t).map(e=>`${encodeURIComponent(e)}=${encodeURIComponent(t[e])}`).join("&")}`,p=(e,t)=>{const n={...t,cid:u()},r=m(n),a=h(n);e.appendChild(r),e.appendChild(a)},u=()=>{const e="swetrix-captcha-"+Math.random().toString(36).substr(2,6);return c.includes(e)?u():(c.push(e),e)},l=e=>{const{data:t}=e;if(!t)return;const{type:n,cid:r,event:a}=t;if("swetrix-captcha"!==n)return;if(!r||!c.includes(r))return;const o=document.getElementById(r),s=null!==o;switch(a){case"success":{const{token:e}=t;if(!s)return void d(i.error,"[PM -> success] Input element does not exist.");o.value=e;break}case"failure":case"tokenExpired":if(!s)return void d(i.error,"[PM -> failure] Input element does not exist.");o.value=""}},m=e=>{const{theme:r}=e,a=document.createElement("iframe");return a.id=`${e.cid}-frame`,a.src=s("dark"===r?n:t,e),a.style.height="66px",a.title="Swetrix Captcha",a.style.border="none",a.style.width="302px",a.style.overflow="visible",a},h=e=>{const{cid:t}=e,n=document.createElement("input");return n.type="hidden",n.name=e.respName,n.value="",n.id=t,n},w=e=>{const{theme:t,pid:n}=e;return t&&!r.includes(t)?(d(i.error,`Invalid data-theme parameter: ${t}`),!1):!(!n||!(e=>o.includes(e)||a.test(e))(n))||(d(i.error,`Invalid data-project-id parameter: ${n}`),!1)},f=e=>({pid:e.getAttribute("data-project-id"),respName:e.getAttribute("data-response-input-name")||"swetrix-captcha-response",theme:e.getAttribute("data-theme")}),g=(e=!1)=>{!e&&"swecaptcha"in window&&d(i.warn,"Captcha is already loaded."),window.swecaptcha=!0,window.addEventListener("message",l);const t=Array.from(document.querySelectorAll(".swecaptcha"));for(const e of t){const t=f(e);if(!w(t))return void d(i.error,"Aborting captcha rendering due to invalid parameters.");p(e,t)}};window.swetrixCaptchaForceLoad=()=>g(!0),document.addEventListener("DOMContentLoaded",()=>g())});+!function(e){"function"==typeof define&&define.amd?define(e):e()}(function(){"use strict";const e=window.__SWETRIX_CAPTCHA_DEV||!1,t=e?"./light.html":"https://cdn.swetrixcaptcha.com/pages/light",r=e?"./dark.html":"https://cdn.swetrixcaptcha.com/pages/dark",n=["light","dark","auto"],a=/^(?!.*--)[a-zA-Z0-9-]{12}$/;var i;!function(e){e.log="log",e.error="error",e.warn="warn",e.info="info"}(i||(i={}));const o=["AP00000000000","FAIL000000000"],d=[],c=(e,t)=>{console[e](`[Swetrix Captcha] ${t}`)},s=e=>e&&"auto"!==e?e:"undefined"!=typeof window&&window.matchMedia&&window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light",u=(e,t)=>`${e}?${Object.keys(t).map(e=>`${encodeURIComponent(e)}=${encodeURIComponent(t[e])}`).join("&")}`,p=(e,t)=>{const r={...t,cid:l()},n=h(r),a=w(r);e.appendChild(n),e.appendChild(a)},l=()=>{const e="swetrix-captcha-"+Math.random().toString(36).substr(2,6);return d.includes(e)?l():(d.push(e),e)},m=e=>{const{data:t}=e;if(!t)return;const{type:r,cid:n,event:a}=t;if("swetrix-captcha"!==r)return;if(!n||!d.includes(n))return;const o=document.getElementById(n),s=null!==o;switch(a){case"success":{const{token:e}=t;if(!s)return void c(i.error,"[PM -> success] Input element does not exist.");o.value=e;break}case"failure":case"tokenExpired":if(!s)return void c(i.error,"[PM -> failure] Input element does not exist.");o.value=""}},h=e=>{const{theme:n}=e,a=s(n),i=document.createElement("iframe");return i.id=`${e.cid}-frame`,i.src=u("dark"===a?r:t,e),i.style.height="66px",i.title="Swetrix Captcha - Human verification",i.style.border="none",i.style.width="302px",i.style.overflow="visible",i.setAttribute("role","presentation"),i.setAttribute("aria-label","Human verification widget"),i},w=e=>{const{cid:t}=e,r=document.createElement("input");return r.type="hidden",r.name=e.respName,r.value="",r.id=t,r.setAttribute("aria-hidden","true"),r},f=e=>{const{theme:t,pid:r}=e;return t&&!n.includes(t)?(c(i.error,`Invalid data-theme parameter: ${t}. Valid options are: ${n.join(", ")}`),!1):!(!r||!(e=>o.includes(e)||a.test(e))(r))||(c(i.error,`Invalid data-project-id parameter: ${r}`),!1)},g=e=>{const t={pid:e.getAttribute("data-project-id"),respName:e.getAttribute("data-response-input-name")||"swetrix-captcha-response",theme:e.getAttribute("data-theme")||"auto"},r=e.getAttribute("data-api-url");return r&&(t.apiUrl=r),t},v=(e=!1)=>{!e&&"swecaptcha"in window&&c(i.warn,"Captcha is already loaded."),window.swecaptcha=!0,window.addEventListener("message",m);const t=Array.from(document.querySelectorAll(".swecaptcha"));for(const e of t){const t=g(e);if(!f(t))return void c(i.error,"Aborting captcha rendering due to invalid parameters.");p(e,t)}};window.swetrixCaptchaForceLoad=()=>v(!0),document.addEventListener("DOMContentLoaded",()=>v())});//# sourceMappingURL=captcha-loader.js.mapdiff --git a/dist/captcha-loader.js.map b/dist/captcha-loader.js.mapindex e5cd0318f..eed6672c5 100644--- a/dist/captcha-loader.js.map+++ b/dist/captcha-loader.js.map@@ -1 +1 @@-{"version":3,"file":"captcha-loader.js","sources":["../src/captcha-loader.ts"],"sourcesContent":[null],"names":["isDevelopment","window","__SWETRIX_CAPTCHA_DEV","LIGHT_CAPTCHA_IFRAME_URL","DARK_CAPTCHA_IFRAME_URL","THEMES","PID_REGEX","LOG_ACTIONS","DUMMY_PIDS","ids","log","status","text","console","appendParamsToURL","url","params","Object","keys","map","key","encodeURIComponent","join","renderCaptcha","container","cParams","cid","generateRandomID","frame","generateCaptchaFrame","input","generateHiddenInput","appendChild","randomID","Math","random","toString","substr","includes","push","postMessageCallback","pmEvent","data","type","event","document","getElementById","inputExists","token","error","value","theme","captchaFrame","createElement","id","src","style","height","title","border","width","overflow","name","respName","validateParams","pid","test","isValidPID","parseParams","getAttribute","main","forced","warn","swecaptcha","addEventListener","containers","Array","from","querySelectorAll","swetrixCaptchaForceLoad"],"mappings":"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"}\ No newline at end of file+{"version":3,"file":"captcha-loader.js","sources":["../src/captcha-loader.ts"],"sourcesContent":[null],"names":["isDevelopment","window","__SWETRIX_CAPTCHA_DEV","LIGHT_CAPTCHA_IFRAME_URL","DARK_CAPTCHA_IFRAME_URL","THEMES","PID_REGEX","LOG_ACTIONS","DUMMY_PIDS","ids","log","status","text","console","resolveTheme","theme","matchMedia","matches","appendParamsToURL","url","params","Object","keys","map","key","encodeURIComponent","join","renderCaptcha","container","cParams","cid","generateRandomID","frame","generateCaptchaFrame","input","generateHiddenInput","appendChild","randomID","Math","random","toString","substr","includes","push","postMessageCallback","pmEvent","data","type","event","document","getElementById","inputExists","token","error","value","rawTheme","captchaFrame","createElement","id","src","style","height","title","border","width","overflow","setAttribute","name","respName","validateParams","pid","test","isValidPID","parseParams","getAttribute","apiUrl","main","forced","warn","swecaptcha","addEventListener","containers","Array","from","querySelectorAll","swetrixCaptchaForceLoad"],"mappings":"0FACA,MAAMA,EAAgBC,OAAOC,wBAAyB,EAGhDC,EAA2BH,EAAgB,eAAiB,6CAC5DI,EAA0BJ,EAAgB,cAAgB,4CAI1DK,EAAS,CAAC,QAAS,OAAQ,QAE3BC,EAAY,6BAElB,IAAKC,GAAL,SAAKA,GACHA,EAAA,IAAA,MACAA,EAAA,MAAA,QACAA,EAAA,KAAA,OACAA,EAAA,KAAA,MACD,CALD,CAAKA,IAAAA,EAAW,CAAA,IAOhB,MAAMC,EAAa,CAAC,gBAAiB,iBAQ/BC,EAAgB,GAEhBC,EAAM,CAACC,EAAqBC,KAChCC,QAAQF,GAAQ,qBAAqBC,MAajCE,EAAgBC,GACfA,GAAmB,SAAVA,EAIPA,EAde,oBAAXd,QAA0BA,OAAOe,YACtCf,OAAOe,WAAW,gCAAgCC,QAC7C,OAIJ,QAWHC,EAAoB,CAACC,EAAaC,IAO/B,GAAGD,KANUE,OAAOC,KAAKF,GAC7BG,IAAKC,GACG,GAAGC,mBAAmBD,MAAQC,mBAAmBL,EAAOI,OAEhEE,KAAK,OAKJC,EAAgB,CAACC,EAAoBR,KACzC,MACMS,EAAU,IACXT,EACHU,IAHUC,KAMNC,EAAQC,EAAqBJ,GAC7BK,EAAQC,EAAoBN,GAElCD,EAAUQ,YAAYJ,GACtBJ,EAAUQ,YAAYF,IAGlBH,EAAmB,KACvB,MAAMM,EArEU,mBAqEaC,KAAKC,SAASC,SAAS,IAAIC,OAAO,EAAG,GAElE,OAAIhC,EAAIiC,SAASL,GACRN,KAGTtB,EAAIkC,KAAKN,GAEFA,IAGHO,EAAuBC,IAG3B,MAAMC,KAAEA,GAASD,EAEjB,IAAKC,EACH,OAGF,MAAMC,KAAEA,EAAIjB,IAAEA,EAAGkB,MAAEA,GAAUF,EAE7B,GA5FyB,oBA4FrBC,EACF,OAGF,IAAKjB,IAAQrB,EAAIiC,SAASZ,GACxB,OAGF,MAAMI,EAAQe,SAASC,eAAepB,GAChCqB,EAAwB,OAAVjB,EAEpB,OAAQc,GACN,IAAK,UAAW,CACd,MAAMI,MAAEA,GAAUN,EAElB,IAAKK,EAEH,YADAzC,EAAIH,EAAY8C,MAAO,iDAKzBnB,EAAMoB,MAAQF,EAEd,KACF,CAEA,IAAK,UAYL,IAAK,eACH,IAAKD,EAEH,YADAzC,EAAIH,EAAY8C,MAAO,iDAKzBnB,EAAMoB,MAAQ,KAOdrB,EAAwBb,IAC5B,MAAQL,MAAOwC,GAAanC,EACtBL,EAAQD,EAAayC,GACrBC,EAAeP,SAASQ,cAAc,UAgB5C,OAdAD,EAAaE,GAlIqB,GAkILtC,EAAOU,YACpC0B,EAAaG,IAEPzC,EADM,SAAVH,EACsBX,EACAD,EADyBiB,GAEjDoC,EAAaI,MAAMC,OAzIA,OA0InBL,EAAaM,MAAQ,uCACrBN,EAAaI,MAAMG,OAAS,OAC5BP,EAAaI,MAAMI,MAAQ,QAC3BR,EAAaI,MAAMK,SAAW,UAE9BT,EAAaU,aAAa,OAAQ,gBAClCV,EAAaU,aAAa,aAAc,6BAEjCV,GAGHrB,EAAuBf,IAC3B,MAAMU,IAAEA,GAAQV,EACVc,EAAQe,SAASQ,cAAc,SASrC,OAPAvB,EAAMa,KAAO,SACbb,EAAMiC,KAAO/C,EAAOgD,SACpBlC,EAAMoB,MAAQ,GACdpB,EAAMwB,GAAK5B,EAEXI,EAAMgC,aAAa,cAAe,QAE3BhC,GAGHmC,EAAkBjD,IACtB,MAAML,MAAEA,EAAKuD,IAAEA,GAAQlD,EAEvB,OAAIL,IAAUV,EAAOqC,SAAS3B,IAC5BL,EAAIH,EAAY8C,MAAO,iCAAiCtC,yBAA6BV,EAAOqB,KAAK,UAC1F,MAGJ4C,IA7KY,CAACA,GAAgB9D,EAAWkC,SAAS4B,IAAQhE,EAAUiE,KAAKD,GA6KhEE,CAAWF,MACtB5D,EAAIH,EAAY8C,MAAO,sCAAsCiB,MACtD,IAMLG,EAAe7C,IACnB,MAAMR,EAAwC,CAC5CkD,IAAK1C,EAAU8C,aAAa,mBAC5BN,SAAUxC,EAAU8C,aAAa,6BAxMD,2BAyMhC3D,MAAOa,EAAU8C,aAAa,eArMZ,QAyMdC,EAAS/C,EAAU8C,aAAa,gBAKtC,OAJIC,IACFvD,EAAOuD,OAASA,GAGXvD,GAGHwD,EAAO,CAACC,GAAS,MAChBA,GAAU,eAAgB5E,QAC7BS,EAAIH,EAAYuE,KAAM,8BAKxB7E,OAAO8E,YAAa,EACpB9E,OAAO+E,iBAAiB,UAAWpC,GAEnC,MAAMqC,EAAaC,MAAMC,KAAKlC,SAASmC,iBAlOhB,gBAoOvB,IAAK,MAAMxD,KAAaqD,EAAY,CAClC,MAAM7D,EAASqD,EAAY7C,GAE3B,IAAKyC,EAAejD,GAElB,YADAV,EAAIH,EAAY8C,MAAO,yDAIzB1B,EAAcC,EAAWR,EAC3B,GAIFnB,OAAOoF,wBAA0B,IAAMT,GAAK,GAE5C3B,SAAS+B,iBAAiB,mBAAoB,IAAMJ"}\ No newline at end of filediff --git a/dist/captcha.js b/dist/captcha.jsindex b0181df33..4da284d45 100644--- a/dist/captcha.js+++ b/dist/captcha.js@@ -1,2 +1,2 @@-!function(e){"function"==typeof define&&define.amd?define(e):e()}(function(){"use strict";const e=window.__SWETRIX_CAPTCHA_DEV||!1,t=e?"http://localhost:5005/v1/captcha":"https://api.swetrix.com/v1/captcha",o=e?"./pow-worker.js":"https://cap.swetrix.com/pow-worker.js",n=1e8,r=3e5,a="/generate",i="/verify";var c,l;!function(e){e.SUCCESS="success",e.FAILURE="failure",e.TOKEN_EXPIRED="tokenExpired"}(c||(c={})),function(e){e.checkbox="checkbox",e.failure="failure",e.completed="completed",e.loading="loading"}(l||(l={}));let s=l.checkbox,d=null;const u=(e,t={})=>{window.parent.postMessage({event:e,type:"swetrix-captcha",cid:window.__SWETRIX_CAPTCHA_ID,...t},"*")},f=e=>{var t,o,n,r,a;s=e;const i=document.querySelector("#status-default"),c=document.querySelector("#status-failure"),d=document.querySelector("#status-computing"),u={checkbox:document.querySelector("#checkbox"),failure:document.querySelector("#failure"),completed:document.querySelector("#completed"),loading:document.querySelector("#loading")};e!==l.checkbox?null===(t=u.checkbox)||void 0===t||t.classList.add("fade-out"):null===(o=u.checkbox)||void 0===o||o.classList.remove("fade-out"),null===(n=u.loading)||void 0===n||n.classList.remove("show"),null===(r=u.failure)||void 0===r||r.classList.remove("show"),null===(a=u.completed)||void 0===a||a.classList.remove("show"),null==i||i.classList.add("hidden"),null==c||c.classList.add("hidden"),null==d||d.classList.add("hidden"),"failure"===e?null==c||c.classList.remove("hidden"):"loading"===e?null==d||d.classList.remove("hidden"):null==i||i.classList.remove("hidden"),e!==l.checkbox&&requestAnimationFrame(()=>{var t;null===(t=u[e])||void 0===t||t.classList.add("show")})},m=()=>{setTimeout(()=>{u(c.TOKEN_EXPIRED),f(l.checkbox)},3e5)},h=async(e,o,n)=>{try{const r=await fetch(`${t}${i}`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({challenge:e,nonce:o,solution:n,pid:window.__SWETRIX_PROJECT_ID})});if(!r.ok)throw new Error("Verification failed");const a=await r.json();if(!a.success)throw new Error("Verification failed");return a.token}catch(e){return u(c.FAILURE),f(l.failure),null}},w=async e=>{const{challenge:t,difficulty:o}=e;let a=0;const i=Date.now(),s=async e=>{const t=(new TextEncoder).encode(e),o=await crypto.subtle.digest("SHA-256",t);return Array.from(new Uint8Array(o)).map(e=>e.toString(16).padStart(2,"0")).join("")},d=(e,t)=>{for(let o=0;o<t;o++)if("0"!==e[o])return!1;return!0};for(;a<n;){if(Date.now()-i>=r)return console.error(`PoW main-thread timeout: 300000ms elapsed after ${a} attempts`),u(c.FAILURE),void f(l.failure);const e=`${t}:${a}`,n=await s(e);if(d(n,o)){const e=await h(t,a,n);return void(e&&(u(c.SUCCESS,{token:e}),m(),f(l.completed)))}a++}console.error("PoW main-thread max iterations reached: 100000000 attempts"),u(c.FAILURE),f(l.failure)};document.addEventListener("DOMContentLoaded",()=>{const e=document.querySelector("#swetrix-captcha"),n=document.querySelector("#branding");null==n||n.addEventListener("click",e=>{e.stopPropagation()}),null==e||e.addEventListener("click",async()=>{if(s===l.loading||s===l.completed)return;if(s===l.failure)return void f(l.checkbox);f(l.loading);const e=await(async()=>{try{const e=await fetch(`${t}${a}`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({pid:window.__SWETRIX_PROJECT_ID})});if(!e.ok)throw new Error("Failed to generate challenge");return await e.json()}catch(e){return u(c.FAILURE),f(l.failure),null}})();e&&await(async e=>new Promise((t,n)=>{d&&d.terminate();try{d=new Worker(o)}catch(o){return void w(e).then(t).catch(n)}d.onmessage=async o=>{const n=o.data;if("progress"!==n.type){if("timeout"===n.type)return console.error("PoW worker timeout:",n.reason),u(c.FAILURE),f(l.failure),null==d||d.terminate(),d=null,void t();if("result"===n.type){const o=await h(e.challenge,n.nonce,n.solution);return o&&(u(c.SUCCESS,{token:o}),m(),f(l.completed)),null==d||d.terminate(),d=null,void t()}if("error"===n.type){const e=n;return console.error("PoW worker error message:",e.message||"Unknown error"),u(c.FAILURE),f(l.failure),null==d||d.terminate(),d=null,void t()}console.warn("PoW worker received unexpected message type:",n.type,"Raw data:",n),u(c.FAILURE),f(l.failure),null==d||d.terminate(),d=null,t()}},d.onerror=o=>{console.error("PoW worker error:",o),null==d||d.terminate(),d=null,w(e).then(t).catch(n)},d.postMessage({challenge:e.challenge,difficulty:e.difficulty})}))(e)})})});+!function(e){"function"==typeof define&&define.amd?define(e):e()}(function(){"use strict";const e=window.__SWETRIX_CAPTCHA_DEV||!1,t=e?"http://localhost:5005/v1/captcha":"https://api.swetrixcaptcha.com/v1/captcha",r=window.__SWETRIX_API_URL||t,a=e?"./pow-worker.js":"https://cdn.swetrixcaptcha.com/pow-worker.js",o=1e8,i=3e5,n="/generate",s="/verify";var c,l;!function(e){e.SUCCESS="success",e.FAILURE="failure",e.TOKEN_EXPIRED="tokenExpired"}(c||(c={})),function(e){e.checkbox="checkbox",e.failure="failure",e.completed="completed",e.loading="loading"}(l||(l={}));let u=l.checkbox,d=null;const h=(e,t={})=>{window.parent.postMessage({event:e,type:"swetrix-captcha",cid:window.__SWETRIX_CAPTCHA_ID,...t},"*")},f=e=>{const t=document.querySelector("#progress-bar-container"),r=document.querySelector("#progress-bar");t&&r&&(e<0?(t.classList.add("show"),r.classList.add("indeterminate"),r.style.width="",t.setAttribute("aria-valuenow","0"),t.removeAttribute("aria-valuenow")):0===e?(t.classList.remove("show"),r.classList.remove("indeterminate"),r.style.width="0%",t.setAttribute("aria-valuenow","0")):e>=100?(r.classList.remove("indeterminate"),r.style.width="100%",t.setAttribute("aria-valuenow","100"),setTimeout(()=>{t.classList.remove("show"),setTimeout(()=>{r.style.width="0%"},300)},400)):(t.classList.add("show"),r.classList.remove("indeterminate"),r.style.width=`${Math.min(e,95)}%`,t.setAttribute("aria-valuenow",String(Math.round(e)))))},m=e=>{const t=document.querySelector("#swetrix-captcha");if(!t)return;switch(e){case l.checkbox:t.setAttribute("role","checkbox"),t.setAttribute("aria-checked","false"),t.setAttribute("aria-busy","false"),t.setAttribute("aria-label","Human verification checkbox. Press Enter or Space to verify you are human.");break;case l.loading:t.setAttribute("role","status"),t.setAttribute("aria-checked","mixed"),t.setAttribute("aria-busy","true"),t.setAttribute("aria-label","Verifying that you are human. Please wait.");break;case l.completed:t.setAttribute("role","checkbox"),t.setAttribute("aria-checked","true"),t.setAttribute("aria-busy","false"),t.setAttribute("aria-label","Verification successful. You have been verified as human.");break;case l.failure:t.setAttribute("role","checkbox"),t.setAttribute("aria-checked","false"),t.setAttribute("aria-busy","false"),t.setAttribute("aria-label","Verification failed. Press Enter or Space to try again.")}const r=document.querySelector("#sr-status");if(r)switch(e){case l.loading:r.textContent="Verification in progress. Please wait.";break;case l.completed:r.textContent="Verification successful!";break;case l.failure:r.textContent="Verification failed. Please try again.";break;default:r.textContent=""}},w=e=>{var t,r,a,o,i;u=e;const n=document.querySelector("#status-default"),s=document.querySelector("#status-failure"),c=document.querySelector("#status-computing"),d={checkbox:document.querySelector("#checkbox"),failure:document.querySelector("#failure"),completed:document.querySelector("#completed"),loading:document.querySelector("#loading")};e!==l.checkbox?null===(t=d.checkbox)||void 0===t||t.classList.add("fade-out"):null===(r=d.checkbox)||void 0===r||r.classList.remove("fade-out"),null===(a=d.loading)||void 0===a||a.classList.remove("show"),null===(o=d.failure)||void 0===o||o.classList.remove("show"),null===(i=d.completed)||void 0===i||i.classList.remove("show"),null==n||n.classList.add("hidden"),null==s||s.classList.add("hidden"),null==c||c.classList.add("hidden"),"failure"===e?(null==s||s.classList.remove("hidden"),f(0)):"loading"===e?(null==c||c.classList.remove("hidden"),f(-1)):"completed"===e?(null==n||n.classList.remove("hidden"),f(100)):(null==n||n.classList.remove("hidden"),f(0)),e!==l.checkbox&&requestAnimationFrame(()=>{var t;null===(t=d[e])||void 0===t||t.classList.add("show")}),m(e)},p=()=>{setTimeout(()=>{h(c.TOKEN_EXPIRED),w(l.checkbox)},3e5)},y=async(e,t,a)=>{try{const o=await fetch(`${r}${s}`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({challenge:e,nonce:t,solution:a,pid:window.__SWETRIX_PROJECT_ID})});if(!o.ok)throw new Error("Verification failed");const i=await o.json();if(!i.success)throw new Error("Verification failed");return i.token}catch(e){return h(c.FAILURE),w(l.failure),null}},b=(e,t)=>{const r=e/(Math.pow(16,t)/2)*100;return Math.min(95,10*Math.sqrt(r))},v=async e=>{const{challenge:t,difficulty:r}=e;let a=0;const n=Date.now(),s=async e=>{const t=(new TextEncoder).encode(e),r=await crypto.subtle.digest("SHA-256",t);return Array.from(new Uint8Array(r)).map(e=>e.toString(16).padStart(2,"0")).join("")},u=(e,t)=>{for(let r=0;r<t;r++)if("0"!==e[r])return!1;return!0};for(;a<o;){if(Date.now()-n>=i)return console.error(`PoW main-thread timeout: 300000ms elapsed after ${a} attempts`),h(c.FAILURE),void w(l.failure);const e=`${t}:${a}`,o=await s(e);if(u(o,r)){f(100);const e=await y(t,a,o);return void(e&&(h(c.SUCCESS,{token:e}),p(),w(l.completed)))}if(a++,a%1e3==0){const e=b(a,r);f(e)}}console.error("PoW main-thread max iterations reached: 100000000 attempts"),h(c.FAILURE),w(l.failure)},k=async()=>{if(u===l.loading||u===l.completed)return;if(u===l.failure)return void w(l.checkbox);w(l.loading);const e=await(async()=>{try{const e=await fetch(`${r}${n}`,{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({pid:window.__SWETRIX_PROJECT_ID})});if(!e.ok)throw new Error("Failed to generate challenge");return await e.json()}catch(e){return h(c.FAILURE),w(l.failure),null}})();e&&await(async e=>new Promise((t,r)=>{d&&d.terminate();try{d=new Worker(a)}catch(a){return void v(e).then(t).catch(r)}d.onmessage=async r=>{const a=r.data;if("progress"===a.type){const t=b(a.attempts,e.difficulty);return void f(t)}if("timeout"===a.type)return console.error("PoW worker timeout:",a.reason),h(c.FAILURE),w(l.failure),null==d||d.terminate(),d=null,void t();if("result"===a.type){f(100);const r=await y(e.challenge,a.nonce,a.solution);return r&&(h(c.SUCCESS,{token:r}),p(),w(l.completed)),null==d||d.terminate(),d=null,void t()}if("error"===a.type){const e=a;return console.error("PoW worker error message:",e.message||"Unknown error"),h(c.FAILURE),w(l.failure),null==d||d.terminate(),d=null,void t()}console.warn("PoW worker received unexpected message type:",a.type,"Raw data:",a),h(c.FAILURE),w(l.failure),null==d||d.terminate(),d=null,t()},d.onerror=a=>{console.error("PoW worker error:",a),null==d||d.terminate(),d=null,v(e).then(t).catch(r)},d.postMessage({challenge:e.challenge,difficulty:e.difficulty})}))(e)};document.addEventListener("DOMContentLoaded",()=>{const e=document.querySelector("#swetrix-captcha"),t=document.querySelector("#branding");null==t||t.addEventListener("click",e=>{e.stopPropagation()}),null==e||e.addEventListener("click",k),null==e||e.addEventListener("keydown",e=>{const t=e;"Enter"!==t.key&&" "!==t.key||(e.preventDefault(),k())}),null==e||e.addEventListener("keyup",e=>{" "===e.key&&e.preventDefault()}),m(l.checkbox)})});//# sourceMappingURL=captcha.js.mapdiff --git a/dist/captcha.js.map b/dist/captcha.js.mapindex e3dad637b..8176045a0 100644--- a/dist/captcha.js.map+++ b/dist/captcha.js.map@@ -1 +1 @@-{"version":3,"file":"captcha.js","sources":["../src/captcha.ts"],"sourcesContent":[null],"names":["isDevelopment","window","__SWETRIX_CAPTCHA_DEV","API_URL","WORKER_URL","MAX_ITERATIONS","TIMEOUT_MS","ENDPOINTS","IFRAME_MESSAGE_TYPES","ACTION","activeAction","checkbox","powWorker","sendMessageToLoader","event","data","parent","postMessage","type","cid","__SWETRIX_CAPTCHA_ID","activateAction","action","statusDefault","document","querySelector","statusFailure","statusComputing","actions","failure","completed","loading","_a","classList","add","_b","remove","_c","_d","_e","requestAnimationFrame","setLifetimeTimeout","setTimeout","TOKEN_EXPIRED","CAPTCHA_TOKEN_LIFETIME","verifySolution","async","challenge","nonce","solution","response","fetch","method","headers","body","JSON","stringify","pid","__SWETRIX_PROJECT_ID","ok","Error","json","success","token","e","FAILURE","solveInMainThread","challengeStr","difficulty","startTime","Date","now","sha256","message","TextEncoder","encode","hashBuffer","crypto","subtle","digest","Array","from","Uint8Array","map","b","toString","padStart","join","hasValidPrefix","hash","diff","i","console","error","input","SUCCESS","addEventListener","captchaComponent","branding","stopPropagation","generateChallenge","Promise","resolve","reject","terminate","Worker","then","catch","onmessage","reason","errorData","warn","onerror","solveChallenge"],"mappings":"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"}\ No newline at end of file+{"version":3,"file":"captcha.js","sources":["../src/captcha.ts"],"sourcesContent":[null],"names":["isDevelopment","window","__SWETRIX_CAPTCHA_DEV","DEFAULT_API_URL","API_URL","__SWETRIX_API_URL","WORKER_URL","MAX_ITERATIONS","TIMEOUT_MS","ENDPOINTS","IFRAME_MESSAGE_TYPES","ACTION","activeAction","checkbox","powWorker","sendMessageToLoader","event","data","parent","postMessage","type","cid","__SWETRIX_CAPTCHA_ID","updateProgressBar","progress","progressBarContainer","document","querySelector","progressBar","classList","add","style","width","setAttribute","removeAttribute","remove","setTimeout","Math","min","String","round","updateAriaState","action","captchaComponent","loading","completed","failure","srStatus","textContent","activateAction","statusDefault","statusFailure","statusComputing","actions","_a","_b","_c","_d","_e","requestAnimationFrame","setLifetimeTimeout","TOKEN_EXPIRED","CAPTCHA_TOKEN_LIFETIME","verifySolution","async","challenge","nonce","solution","response","fetch","method","headers","body","JSON","stringify","pid","__SWETRIX_PROJECT_ID","ok","Error","json","success","token","e","FAILURE","calculateProgress","attempts","difficulty","rawProgress","pow","sqrt","solveInMainThread","challengeStr","startTime","Date","now","sha256","message","TextEncoder","encode","hashBuffer","crypto","subtle","digest","Array","from","Uint8Array","map","b","toString","padStart","join","hasValidPrefix","hash","diff","i","console","error","input","SUCCESS","handleCaptchaActivation","generateChallenge","Promise","resolve","reject","terminate","Worker","then","catch","onmessage","reason","errorData","warn","onerror","solveChallenge","addEventListener","branding","stopPropagation","keyboardEvent","key","preventDefault"],"mappings":"0FAGA,MAAMA,EAAgBC,OAAOC,wBAAyB,EAEhDC,EAAkBH,EAAgB,mCAAqC,4CAEvEI,EAAkBH,OAAOI,mBAAqBF,EAC9CG,EAAaN,EAAgB,kBAAoB,+CAKjDO,EAAiB,IACjBC,EAAa,IAEbC,EACM,YADNA,EAEI,UAGV,IAAKC,EAMAC,GANL,SAAKD,GACHA,EAAA,QAAA,UACAA,EAAA,QAAA,UACAA,EAAA,cAAA,cACD,CAJD,CAAKA,IAAAA,EAAoB,CAAA,IAMzB,SAAKC,GACHA,EAAA,SAAA,WACAA,EAAA,QAAA,UACAA,EAAA,UAAA,YACAA,EAAA,QAAA,SACD,CALD,CAAKA,IAAAA,EAAM,CAAA,IAwBX,IAAIC,EAAuBD,EAAOE,SAC9BC,EAA2B,KAG/B,MAAMC,EAAsB,CAACC,EAA6BC,EAAO,MAC/DhB,OAAOiB,OAAOC,YACZ,CACEH,QACAI,KAlDiB,kBAoDjBC,IAAKpB,OAAOqB,wBACTL,GAEL,MAQEM,EAAqBC,IACzB,MAAMC,EAAuBC,SAASC,cAAc,2BAC9CC,EAAcF,SAASC,cAAc,iBAEtCF,GAAyBG,IAE1BJ,EAAW,GAEbC,EAAqBI,UAAUC,IAAI,QACnCF,EAAYC,UAAUC,IAAI,iBAC1BF,EAAYG,MAAMC,MAAQ,GAC1BP,EAAqBQ,aAAa,gBAAiB,KACnDR,EAAqBS,gBAAgB,kBACf,IAAbV,GAETC,EAAqBI,UAAUM,OAAO,QACtCP,EAAYC,UAAUM,OAAO,iBAC7BP,EAAYG,MAAMC,MAAQ,KAC1BP,EAAqBQ,aAAa,gBAAiB,MAC1CT,GAAY,KAErBI,EAAYC,UAAUM,OAAO,iBAC7BP,EAAYG,MAAMC,MAAQ,OAC1BP,EAAqBQ,aAAa,gBAAiB,OAEnDG,WAAW,KACTX,EAAqBI,UAAUM,OAAO,QAEtCC,WAAW,KACTR,EAAYG,MAAMC,MAAQ,MACzB,MACF,OAGHP,EAAqBI,UAAUC,IAAI,QACnCF,EAAYC,UAAUM,OAAO,iBAC7BP,EAAYG,MAAMC,MAAQ,GAAGK,KAAKC,IAAId,EAAU,OAChDC,EAAqBQ,aAAa,gBAAiBM,OAAOF,KAAKG,MAAMhB,QAOnEiB,EAAmBC,IACvB,MAAMC,EAAmBjB,SAASC,cAAc,oBAChD,IAAKgB,EAAkB,OAEvB,OAAQD,GACN,KAAK/B,EAAOE,SACV8B,EAAiBV,aAAa,OAAQ,YACtCU,EAAiBV,aAAa,eAAgB,SAC9CU,EAAiBV,aAAa,YAAa,SAC3CU,EAAiBV,aACf,aACA,8EAEF,MACF,KAAKtB,EAAOiC,QACVD,EAAiBV,aAAa,OAAQ,UACtCU,EAAiBV,aAAa,eAAgB,SAC9CU,EAAiBV,aAAa,YAAa,QAC3CU,EAAiBV,aAAa,aAAc,8CAC5C,MACF,KAAKtB,EAAOkC,UACVF,EAAiBV,aAAa,OAAQ,YACtCU,EAAiBV,aAAa,eAAgB,QAC9CU,EAAiBV,aAAa,YAAa,SAC3CU,EAAiBV,aAAa,aAAc,6DAC5C,MACF,KAAKtB,EAAOmC,QACVH,EAAiBV,aAAa,OAAQ,YACtCU,EAAiBV,aAAa,eAAgB,SAC9CU,EAAiBV,aAAa,YAAa,SAC3CU,EAAiBV,aAAa,aAAc,2DAKhD,MAAMc,EAAWrB,SAASC,cAAc,cACxC,GAAIoB,EACF,OAAQL,GACN,KAAK/B,EAAOiC,QACVG,EAASC,YAAc,yCACvB,MACF,KAAKrC,EAAOkC,UACVE,EAASC,YAAc,2BACvB,MACF,KAAKrC,EAAOmC,QACVC,EAASC,YAAc,yCACvB,MACF,QACED,EAASC,YAAc,KASzBC,EAAkBP,kBACtB9B,EAAe8B,EAEf,MAAMQ,EAAgBxB,SAASC,cAAc,mBACvCwB,EAAgBzB,SAASC,cAAc,mBACvCyB,EAAkB1B,SAASC,cAAc,qBAEzC0B,EAAU,CACdxC,SAAUa,SAASC,cAAc,aACjCmB,QAASpB,SAASC,cAAc,YAChCkB,UAAWnB,SAASC,cAAc,cAClCiB,QAASlB,SAASC,cAAc,aAK9Be,IAAW/B,EAAOE,SACJ,QAAhByC,EAAAD,EAAQxC,gBAAQ,IAAAyC,GAAAA,EAAEzB,UAAUC,IAAI,YAEhB,QAAhByB,EAAAF,EAAQxC,gBAAQ,IAAA0C,GAAAA,EAAE1B,UAAUM,OAAO,YAItB,QAAfqB,EAAAH,EAAQT,eAAO,IAAAY,GAAAA,EAAE3B,UAAUM,OAAO,QACnB,QAAfsB,EAAAJ,EAAQP,eAAO,IAAAW,GAAAA,EAAE5B,UAAUM,OAAO,QACjB,QAAjBuB,EAAAL,EAAQR,iBAAS,IAAAa,GAAAA,EAAE7B,UAAUM,OAAO,QAGpCe,SAAAA,EAAerB,UAAUC,IAAI,UAC7BqB,SAAAA,EAAetB,UAAUC,IAAI,UAC7BsB,SAAAA,EAAiBvB,UAAUC,IAAI,UAEhB,YAAXY,GACFS,SAAAA,EAAetB,UAAUM,OAAO,UAChCZ,EAAkB,IACE,YAAXmB,GACTU,SAAAA,EAAiBvB,UAAUM,OAAO,UAElCZ,GAAkB,IACE,cAAXmB,GACTQ,SAAAA,EAAerB,UAAUM,OAAO,UAChCZ,EAAkB,OAElB2B,SAAAA,EAAerB,UAAUM,OAAO,UAChCZ,EAAkB,IAIhBmB,IAAW/B,EAAOE,UAEpB8C,sBAAsB,WACL,QAAfL,EAAAD,EAAQX,UAAO,IAAAY,GAAAA,EAAEzB,UAAUC,IAAI,UAKnCW,EAAgBC,IAGZkB,EAAqB,KACzBxB,WAAW,KACTrB,EAAoBL,EAAqBmD,eACzCZ,EAAetC,EAAOE,WACrBiD,MA4BCC,EAAiBC,MAAOC,EAAmBC,EAAeC,KAC9D,IACE,MAAMC,QAAiBC,MAAM,GAAGjE,IAAUK,IAAoB,CAC5D6D,OAAQ,OACRC,QAAS,CACP,eAAgB,oBAElBC,KAAMC,KAAKC,UAAU,CACnBT,YACAC,QACAC,WAEAQ,IAAK1E,OAAO2E,yBAIhB,IAAKR,EAASS,GACZ,MAAM,IAAIC,MAAM,uBAGlB,MAAM7D,QAAamD,EAASW,OAE5B,IAAK9D,EAAK+D,QACR,MAAM,IAAIF,MAAM,uBAGlB,OAAO7D,EAAKgE,KACd,CAAE,MAAOC,GAGP,OAFAnE,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,SACf,IACT,GAOIsC,EAAoB,CAACC,EAAkBC,KAG3C,MAIMC,EAAeF,GAJMhD,KAAKmD,IAAI,GAAIF,GAAc,GAIA,IAMtD,OAFsBjD,KAAKC,IAAI,GAA6B,GAAzBD,KAAKoD,KAAKF,KAsGzCG,EAAoB1B,MAAOC,IAC/B,MAAQA,UAAW0B,EAAYL,WAAEA,GAAerB,EAChD,IAAIC,EAAQ,EACZ,MAAM0B,EAAYC,KAAKC,MAGjBC,EAAS/B,MAAOgC,IACpB,MACM/E,GADU,IAAIgF,aACCC,OAAOF,GACtBG,QAAmBC,OAAOC,OAAOC,OAAO,UAAWrF,GAEzD,OADkBsF,MAAMC,KAAK,IAAIC,WAAWN,IAC3BO,IAAKC,GAAMA,EAAEC,SAAS,IAAIC,SAAS,EAAG,MAAMC,KAAK,KAG9DC,EAAiB,CAACC,EAAcC,KACpC,IAAK,IAAIC,EAAI,EAAGA,EAAID,EAAMC,IACxB,GAAgB,MAAZF,EAAKE,GAAY,OAAO,EAE9B,OAAO,GAGT,KAAOhD,EAAQ3D,GAAgB,CAG7B,GADkBsF,KAAKC,MAAQF,GACdpF,EAIf,OAHA2G,QAAQC,MAAM,mDAA0DlD,cACxEnD,EAAoBL,EAAqByE,cACzClC,EAAetC,EAAOmC,SAIxB,MAAMuE,EAAQ,GAAG1B,KAAgBzB,IAC3B8C,QAAajB,EAAOsB,GAE1B,GAAIN,EAAeC,EAAM1B,GAAa,CACpC/D,EAAkB,KAClB,MAAM0D,QAAclB,EAAe4B,EAAczB,EAAO8C,GAOxD,YALI/B,IACFlE,EAAoBL,EAAqB4G,QAAS,CAAErC,UACpDrB,IACAX,EAAetC,EAAOkC,YAG1B,CAKA,GAHAqB,IAGIA,EA7CmB,KA6CU,EAAG,CAClC,MAAM1C,EAAW4D,EAAkBlB,EAAOoB,GAC1C/D,EAAkBC,EACpB,CACF,CAGA2F,QAAQC,MAAM,8DACdrG,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,UAMlByE,EAA0BvD,UAC9B,GAAIpD,IAAiBD,EAAOiC,SAAWhC,IAAiBD,EAAOkC,UAC7D,OAGF,GAAIjC,IAAiBD,EAAOmC,QAE1B,YADAG,EAAetC,EAAOE,UAIxBoC,EAAetC,EAAOiC,SAEtB,MAAMqB,OA5PkBD,WACxB,IACE,MAAMI,QAAiBC,MAAM,GAAGjE,IAAUK,IAAsB,CAC9D6D,OAAQ,OACRC,QAAS,CACP,eAAgB,oBAElBC,KAAMC,KAAKC,UAAU,CAEnBC,IAAK1E,OAAO2E,yBAIhB,IAAKR,EAASS,GACZ,MAAM,IAAIC,MAAM,gCAGlB,aAAaV,EAASW,MACxB,CAAE,MAAOG,GAGP,OAFAnE,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,SACf,IACT,GAsOwB0E,GAEnBvD,QA/KgBD,OAAOC,GACrB,IAAIwD,QAAQ,CAACC,EAASC,KAEvB7G,GACFA,EAAU8G,YAGZ,IACE9G,EAAY,IAAI+G,OAAOvH,EACzB,CAAE,MAAO4E,GAGP,YADAQ,EAAkBzB,GAAW6D,KAAKJ,GAASK,MAAMJ,EAEnD,CAEA7G,EAAUkH,UAAYhE,MACpBhD,IAIA,MAAMC,EAAOD,EAAMC,KAEnB,GAAkB,aAAdA,EAAKG,KAAqB,CAE5B,MACMI,EAAW4D,EADInE,EAC2BoE,SAAUpB,EAAUqB,YAEpE,YADA/D,EAAkBC,EAEpB,CAEA,GAAkB,YAAdP,EAAKG,KAQP,OANA+F,QAAQC,MAAM,sBAAwBnG,EAA6CgH,QACnFlH,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,SACtBhC,SAAAA,EAAW8G,YACX9G,EAAY,UACZ4G,IAIF,GAAkB,WAAdzG,EAAKG,KAAmB,CAE1BG,EAAkB,KAClB,MAAM0D,QAAclB,EAAeE,EAAUA,UAAYhD,EAAmBiD,MAAQjD,EAAmBkD,UAWvG,OATIc,IACFlE,EAAoBL,EAAqB4G,QAAS,CAAErC,UACpDrB,IACAX,EAAetC,EAAOkC,YAGxB/B,SAAAA,EAAW8G,YACX9G,EAAY,UACZ4G,GAEF,CAGA,GAAkB,UAAdzG,EAAKG,KAAkB,CACzB,MAAM8G,EAAYjH,EAOlB,OANAkG,QAAQC,MAAM,4BAA6Bc,EAAUlC,SAAW,iBAChEjF,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,SACtBhC,SAAAA,EAAW8G,YACX9G,EAAY,UACZ4G,GAEF,CAGAP,QAAQgB,KAAK,+CAAiDlH,EAA4BG,KAAM,YAAaH,GAC7GF,EAAoBL,EAAqByE,SACzClC,EAAetC,EAAOmC,SACtBhC,SAAAA,EAAW8G,YACX9G,EAAY,KACZ4G,KAGF5G,EAAUsH,QAAWhB,IACnBD,QAAQC,MAAM,oBAAqBA,GACnCtG,SAAAA,EAAW8G,YACX9G,EAAY,KAGZ4E,EAAkBzB,GAAW6D,KAAKJ,GAASK,MAAMJ,IAInD7G,EAAUK,YAAY,CACpB8C,UAAWA,EAAUA,UACrBqB,WAAYrB,EAAUqB,eAwFpB+C,CAAepE,IAGvBvC,SAAS4G,iBAAiB,mBAAoB,KAC5C,MAAM3F,EAAmBjB,SAASC,cAAc,oBAC1C4G,EAAW7G,SAASC,cAAc,aAExC4G,SAAAA,EAAUD,iBAAiB,QAAUpD,IACnCA,EAAEsD,oBAGJ7F,SAAAA,EAAkB2F,iBAAiB,QAASf,GAE5C5E,SAAAA,EAAkB2F,iBAAiB,UAAYpD,IAC7C,MAAMuD,EAAgBvD,EAEI,UAAtBuD,EAAcC,KAAyC,MAAtBD,EAAcC,MACjDxD,EAAEyD,iBACFpB,OAIJ5E,SAAAA,EAAkB2F,iBAAiB,QAAUpD,IAEjB,MADJA,EACJwD,KAChBxD,EAAEyD,mBAINlG,EAAgB9B,EAAOE"}\ No newline at end of filediff --git a/dist/pages/dark.html b/dist/pages/dark.htmlindex 37e96e41c..35e571c21 100644--- a/dist/pages/dark.html+++ b/dist/pages/dark.html@@ -5,6 +5,7 @@<meta charset="utf-8"><title>Swetrix Captcha</title><meta http-equiv="X-UA-Compatible" content="IE=edge">+ <meta name="viewport" content="width=device-width, initial-scale=1"><style>html {@@ -31,6 +32,7 @@background-color: #0f172a;border: 1px solid #1e293b;+ border-radius: 4px;height: 64px;-webkit-user-select: none;user-select: none;@@ -44,6 +46,61 @@background-color: #1e293b;}+ /* Focus styles for accessibility - only show on keyboard navigation */+ #swetrix-captcha:focus {+ outline: none;+ }++ #swetrix-captcha:focus-visible {+ outline: 2px solid #60a5fa;+ outline-offset: 2px;+ }++ /* Fallback for browsers without :focus-visible support */+ #swetrix-captcha.keyboard-focus {+ outline: 2px solid #60a5fa;+ outline-offset: 2px;+ }++ /* Progress bar at the top */+ #progress-bar-container {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ height: 2px;+ background-color: #1e293b;+ border-radius: 4px 4px 0 0;+ overflow: hidden;+ opacity: 0;+ transition: opacity 0.3s ease;+ }++ #progress-bar-container.show {+ opacity: 1;+ }++ #progress-bar {+ height: 100%;+ width: 0%;+ background: linear-gradient(90deg, #3b82f6, #60a5fa);+ transition: width 0.3s ease, opacity 0.3s ease;+ }++ #progress-bar.indeterminate {+ width: 30%;+ animation: indeterminate 1.5s ease-in-out infinite;+ }++ @keyframes indeterminate {+ 0% {+ transform: translateX(-100%);+ }+ 100% {+ transform: translateX(400%);+ }+ }+#challenge {display: flex;align-items: center;@@ -68,13 +125,19 @@top: 50%;left: 50%;transform: translate(-50%, -50%);- transition: opacity 0.25s ease, transform 0.25s ease;+ transition: opacity 0.25s ease, transform 0.25s ease, border-color 0.2s ease, box-shadow 0.2s ease;}#checkbox:hover {border-color: #4b5563;}+ /* Focus indicator for checkbox when parent is focused */+ #swetrix-captcha:focus-visible #checkbox {+ border-color: #60a5fa;+ box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.3);+ }+#status {font-size: 14px;color: #f9fafb;@@ -124,6 +187,11 @@text-decoration: underline;}+ #branding a:focus {+ outline: 1px solid #60a5fa;+ outline-offset: 1px;+ }+#action svg {width: 28px;height: 28px;@@ -230,54 +298,112 @@stroke-dashoffset: -124;}}++ /* Reduced motion preference */+ @media (prefers-reduced-motion: reduce) {+ #checkbox,+ #completed,+ #failure,+ #loading,+ #status span,+ #progress-bar,+ #branding a {+ transition: none;+ }++ #loading svg,+ #loading svg circle,+ #completed.show svg path,+ #failure.show,+ #progress-bar.indeterminate {+ animation: none;+ }++ #progress-bar.indeterminate {+ width: 100%;+ }+ }++ /* High contrast mode support */+ @media (forced-colors: active) {+ #swetrix-captcha {+ border: 2px solid CanvasText;+ }++ #checkbox {+ border: 2px solid CanvasText;+ }++ #progress-bar {+ background: Highlight;+ }+ }</style><script>window.__SWETRIX_CAPTCHA_THEME = 'dark'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')const cid = urlParams.get('cid')+ const apiUrl = urlParams.get('apiUrl')window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid+ if (apiUrl) {+ window.__SWETRIX_API_URL = apiUrl+ }</script><script src="../captcha.js" defer></script></head><body>- <div id="swetrix-captcha">+ <div+ id="swetrix-captcha"+ role="checkbox"+ aria-checked="false"+ aria-label="Human verification checkbox. Press Enter or Space to verify you are human."+ tabindex="0"+ >+ <!-- Progress bar at the top -->+ <div id="progress-bar-container" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" aria-label="Verification progress">+ <div id="progress-bar"></div>+ </div>+<div id="challenge"><div id="action"><!-- Can contain a checkbox itself / a red cross (with a retry action) / a green check mark -->- <div id="checkbox"></div>- <div id="failure">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="checkbox" aria-hidden="true"></div>+ <div id="failure" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg></div>- <div id="completed">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="completed" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg></div>- <div id="loading">- <svg viewBox="0 0 50 50">+ <div id="loading" aria-hidden="true">+ <svg viewBox="0 0 50 50" aria-hidden="true"><circle cx="25" cy="25" r="20" fill="none" stroke-width="4"></circle></svg></div></div>- <div id="status">+ <div id="status" aria-live="polite" aria-atomic="true"><span id="status-default">I am human</span>- <span id="status-failure" class="hidden">Failure, please retry</span>+ <span id="status-failure" class="hidden">Verification failed, click to retry</span><span id="status-computing" class="hidden"><span>Verifying...</span></span></div></div><div id="branding">- <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer">Swetrix Captcha</a>+ <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer" aria-label="Swetrix Captcha - opens in new window">Swetrix Captcha</a></div>++ <!-- Screen reader only live region for status updates -->+ <div id="sr-status" class="hidden" aria-live="assertive" aria-atomic="true"></div></div></body>diff --git a/dist/pages/light.html b/dist/pages/light.htmlindex d32684079..2ec2c4e91 100644--- a/dist/pages/light.html+++ b/dist/pages/light.html@@ -5,6 +5,7 @@<meta charset="utf-8"><title>Swetrix Captcha</title><meta http-equiv="X-UA-Compatible" content="IE=edge">+ <meta name="viewport" content="width=device-width, initial-scale=1"><style>html {@@ -32,6 +33,7 @@/* bg-gray-100 */background-color: #f9fafb;border: 1px solid #e9e9e9;+ border-radius: 4px;height: 64px;-webkit-user-select: none;user-select: none;@@ -46,6 +48,61 @@background-color: #f3f4f6;}+ /* Focus styles for accessibility - only show on keyboard navigation */+ #swetrix-captcha:focus {+ outline: none;+ }++ #swetrix-captcha:focus-visible {+ outline: 2px solid #3b82f6;+ outline-offset: 2px;+ }++ /* Fallback for browsers without :focus-visible support */+ #swetrix-captcha.keyboard-focus {+ outline: 2px solid #3b82f6;+ outline-offset: 2px;+ }++ /* Progress bar at the top */+ #progress-bar-container {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ height: 2px;+ background-color: #e5e7eb;+ border-radius: 4px 4px 0 0;+ overflow: hidden;+ opacity: 0;+ transition: opacity 0.3s ease;+ }++ #progress-bar-container.show {+ opacity: 1;+ }++ #progress-bar {+ height: 100%;+ width: 0%;+ background: linear-gradient(90deg, #3b82f6, #2563eb);+ transition: width 0.3s ease, opacity 0.3s ease;+ }++ #progress-bar.indeterminate {+ width: 30%;+ animation: indeterminate 1.5s ease-in-out infinite;+ }++ @keyframes indeterminate {+ 0% {+ transform: translateX(-100%);+ }+ 100% {+ transform: translateX(400%);+ }+ }+#challenge {display: flex;align-items: center;@@ -70,13 +127,19 @@top: 50%;left: 50%;transform: translate(-50%, -50%);- transition: opacity 0.25s ease, transform 0.25s ease;+ transition: opacity 0.25s ease, transform 0.25s ease, border-color 0.2s ease, box-shadow 0.2s ease;}#checkbox:hover {border-color: #a0a0a0;}+ /* Focus indicator for checkbox when parent is focused */+ #swetrix-captcha:focus-visible #checkbox {+ border-color: #3b82f6;+ box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.3);+ }+#status {font-size: 14px;color: #0f0f0f;@@ -126,6 +189,11 @@text-decoration: underline;}+ #branding a:focus {+ outline: 1px solid #3b82f6;+ outline-offset: 1px;+ }+#action svg {width: 28px;height: 28px;@@ -232,54 +300,112 @@stroke-dashoffset: -124;}}++ /* Reduced motion preference */+ @media (prefers-reduced-motion: reduce) {+ #checkbox,+ #completed,+ #failure,+ #loading,+ #status span,+ #progress-bar,+ #branding a {+ transition: none;+ }++ #loading svg,+ #loading svg circle,+ #completed.show svg path,+ #failure.show,+ #progress-bar.indeterminate {+ animation: none;+ }++ #progress-bar.indeterminate {+ width: 100%;+ }+ }++ /* High contrast mode support */+ @media (forced-colors: active) {+ #swetrix-captcha {+ border: 2px solid CanvasText;+ }++ #checkbox {+ border: 2px solid CanvasText;+ }++ #progress-bar {+ background: Highlight;+ }+ }</style><script>window.__SWETRIX_CAPTCHA_THEME = 'light'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')const cid = urlParams.get('cid')+ const apiUrl = urlParams.get('apiUrl')window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid+ if (apiUrl) {+ window.__SWETRIX_API_URL = apiUrl+ }</script><script src="../captcha.js" defer></script></head><body>- <div id="swetrix-captcha">+ <div+ id="swetrix-captcha"+ role="checkbox"+ aria-checked="false"+ aria-label="Human verification checkbox. Press Enter or Space to verify you are human."+ tabindex="0"+ >+ <!-- Progress bar at the top -->+ <div id="progress-bar-container" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" aria-label="Verification progress">+ <div id="progress-bar"></div>+ </div>+<div id="challenge"><div id="action"><!-- Can contain a checkbox itself / a red cross (with a retry action) / a green check mark -->- <div id="checkbox"></div>- <div id="failure">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="checkbox" aria-hidden="true"></div>+ <div id="failure" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg></div>- <div id="completed">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="completed" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg></div>- <div id="loading">- <svg viewBox="0 0 50 50">+ <div id="loading" aria-hidden="true">+ <svg viewBox="0 0 50 50" aria-hidden="true"><circle cx="25" cy="25" r="20" fill="none" stroke-width="4"></circle></svg></div></div>- <div id="status">+ <div id="status" aria-live="polite" aria-atomic="true"><span id="status-default">I am human</span>- <span id="status-failure" class="hidden">Failure, please retry</span>+ <span id="status-failure" class="hidden">Verification failed, click to retry</span><span id="status-computing" class="hidden"><span>Verifying...</span></span></div></div><div id="branding">- <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer">Swetrix Captcha</a>+ <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer" aria-label="Swetrix Captcha - opens in new window">Swetrix Captcha</a></div>++ <!-- Screen reader only live region for status updates -->+ <div id="sr-status" class="hidden" aria-live="assertive" aria-atomic="true"></div></div></body>diff --git a/dist/pages/test.html b/dist/pages/test.htmlindex e1ef6846f..5c3741bea 100644--- a/dist/pages/test.html+++ b/dist/pages/test.html@@ -25,7 +25,8 @@<input type="text" name="name" value="name"><input type="text" name="email" value="email"><input type="number" name="number" value="number">- <div class="swecaptcha" data-project-id="AP00000000000" data-theme="light"></div>+ <div class="swecaptcha" data-project-id="AP00000000000" data-theme="auto"></div>+ <!-- <div class="swecaptcha" data-project-id="79eF2Z9rNNvv" data-theme="auto"></div> --><input type="submit" value="Submit"></form></body>diff --git a/package.json b/package.jsonindex 2b39ff1ff..ac5e08d15 100644--- a/package.json+++ b/package.json@@ -1,6 +1,6 @@{"name": "@swetrix/captcha",- "version": "2.0.2",+ "version": "2.1.0","description": "Swetrix CAPTCHA","type": "module","captchaloader": "dist/captcha-loader.js",diff --git a/src/captcha-loader.ts b/src/captcha-loader.tsindex f12114614..d4f1819d7 100644--- a/src/captcha-loader.ts+++ b/src/captcha-loader.ts@@ -7,7 +7,8 @@ const DARK_CAPTCHA_IFRAME_URL = isDevelopment ? './dark.html' : 'https://cdn.sweconst DEFAULT_RESPONSE_INPUT_NAME = 'swetrix-captcha-response'const MESSAGE_IDENTIFIER = 'swetrix-captcha'const ID_PREFIX = 'swetrix-captcha-'-const THEMES = ['light', 'dark']+const THEMES = ['light', 'dark', 'auto']+const DEFAULT_THEME = 'auto'const PID_REGEX = /^(?!.*--)[a-zA-Z0-9-]{12}$/enum LOG_ACTIONS {@@ -31,6 +32,24 @@ const log = (status: LOG_ACTIONS, text: string) => {console[status](`[Swetrix Captcha] ${text}`)}+const detectPreferredTheme = (): 'light' | 'dark' => {+ if (typeof window !== 'undefined' && window.matchMedia) {+ if (window.matchMedia('(prefers-color-scheme: dark)').matches) {+ return 'dark'+ }+ }++ return 'light'+}++const resolveTheme = (theme: string | null): 'light' | 'dark' => {+ if (!theme || theme === 'auto') {+ return detectPreferredTheme()+ }++ return theme as 'light' | 'dark'+}+const appendParamsToURL = (url: string, params: any) => {const queryString = Object.keys(params).map((key) => {@@ -131,7 +150,8 @@ const postMessageCallback = (pmEvent: MessageEvent) => {}const generateCaptchaFrame = (params: any) => {- const { theme } = params+ const { theme: rawTheme } = params+ const theme = resolveTheme(rawTheme)const captchaFrame = document.createElement('iframe')captchaFrame.id = getFrameID(params.cid)@@ -140,11 +160,14 @@ const generateCaptchaFrame = (params: any) => {? appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params): appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)captchaFrame.style.height = FRAME_HEIGHT- captchaFrame.title = 'Swetrix Captcha'+ captchaFrame.title = 'Swetrix Captcha - Human verification'captchaFrame.style.border = 'none'captchaFrame.style.width = '302px'captchaFrame.style.overflow = 'visible'+ captchaFrame.setAttribute('role', 'presentation')+ captchaFrame.setAttribute('aria-label', 'Human verification widget')+return captchaFrame}@@ -157,6 +180,8 @@ const generateHiddenInput = (params: any) => {input.value = ''input.id = cid+ input.setAttribute('aria-hidden', 'true')+return input}@@ -164,7 +189,7 @@ const validateParams = (params: any) => {const { theme, pid } = paramsif (theme && !THEMES.includes(theme)) {- log(LOG_ACTIONS.error, `Invalid data-theme parameter: ${theme}`)+ log(LOG_ACTIONS.error, `Invalid data-theme parameter: ${theme}. Valid options are: ${THEMES.join(', ')}`)return false}@@ -176,11 +201,21 @@ const validateParams = (params: any) => {return true}-const parseParams = (container: Element): object => ({- pid: container.getAttribute('data-project-id'),- respName: container.getAttribute('data-response-input-name') || DEFAULT_RESPONSE_INPUT_NAME,- theme: container.getAttribute('data-theme'),-})+const parseParams = (container: Element): object => {+ const params: Record<string, string | null> = {+ pid: container.getAttribute('data-project-id'),+ respName: container.getAttribute('data-response-input-name') || DEFAULT_RESPONSE_INPUT_NAME,+ theme: container.getAttribute('data-theme') || DEFAULT_THEME,+ }++ // Optional custom API URL+ const apiUrl = container.getAttribute('data-api-url')+ if (apiUrl) {+ params.apiUrl = apiUrl+ }++ return params+}const main = (forced = false) => {if (!forced && 'swecaptcha' in window) {diff --git a/src/captcha.ts b/src/captcha.tsindex 03c9e1a83..61f8b6985 100644--- a/src/captcha.ts+++ b/src/captcha.ts@@ -3,7 +3,9 @@ export {}// @ts-ignoreconst isDevelopment = window.__SWETRIX_CAPTCHA_DEV || false-const API_URL = isDevelopment ? 'http://localhost:5005/v1/captcha' : 'https://api.swetrixcaptcha.com/v1/captcha'+const DEFAULT_API_URL = isDevelopment ? 'http://localhost:5005/v1/captcha' : 'https://api.swetrixcaptcha.com/v1/captcha'+// @ts-ignore+const API_URL: string = window.__SWETRIX_API_URL || DEFAULT_API_URLconst WORKER_URL = isDevelopment ? './pow-worker.js' : 'https://cdn.swetrixcaptcha.com/pow-worker.js'const MSG_IDENTIFIER = 'swetrix-captcha'const CAPTCHA_TOKEN_LIFETIME = 300 // seconds (5 minutes).@@ -49,6 +51,7 @@ interface PowProgress {let activeAction: ACTION = ACTION.checkboxlet powWorker: Worker | null = null+let progressStartTime: number = 0const sendMessageToLoader = (event: IFRAME_MESSAGE_TYPES, data = {}) => {window.parent.postMessage(@@ -63,6 +66,107 @@ const sendMessageToLoader = (event: IFRAME_MESSAGE_TYPES, data = {}) => {)}+/**+ * Updates the progress bar+ * @param progress - Progress value between 0 and 100, or -1 for indeterminate+ */+const updateProgressBar = (progress: number) => {+ const progressBarContainer = document.querySelector('#progress-bar-container')+ const progressBar = document.querySelector('#progress-bar') as HTMLElement | null++ if (!progressBarContainer || !progressBar) return++ if (progress < 0) {+ // Indeterminate state+ progressBarContainer.classList.add('show')+ progressBar.classList.add('indeterminate')+ progressBar.style.width = ''+ progressBarContainer.setAttribute('aria-valuenow', '0')+ progressBarContainer.removeAttribute('aria-valuenow')+ } else if (progress === 0) {+ // Hide progress bar+ progressBarContainer.classList.remove('show')+ progressBar.classList.remove('indeterminate')+ progressBar.style.width = '0%'+ progressBarContainer.setAttribute('aria-valuenow', '0')+ } else if (progress >= 100) {+ // Complete - fade out while staying at 100%+ progressBar.classList.remove('indeterminate')+ progressBar.style.width = '100%'+ progressBarContainer.setAttribute('aria-valuenow', '100')+ // Fade out after a brief moment at 100%+ setTimeout(() => {+ progressBarContainer.classList.remove('show')+ // Reset width only after fade out completes (for next use)+ setTimeout(() => {+ progressBar.style.width = '0%'+ }, 300)+ }, 400)+ } else {+ // Show determinate progress+ progressBarContainer.classList.add('show')+ progressBar.classList.remove('indeterminate')+ progressBar.style.width = `${Math.min(progress, 95)}%` // Cap at 95% until complete+ progressBarContainer.setAttribute('aria-valuenow', String(Math.round(progress)))+ }+}++/**+ * Updates ARIA attributes based on current state+ */+const updateAriaState = (action: ACTION) => {+ const captchaComponent = document.querySelector('#swetrix-captcha')+ if (!captchaComponent) return++ switch (action) {+ case ACTION.checkbox:+ captchaComponent.setAttribute('role', 'checkbox')+ captchaComponent.setAttribute('aria-checked', 'false')+ captchaComponent.setAttribute('aria-busy', 'false')+ captchaComponent.setAttribute(+ 'aria-label',+ 'Human verification checkbox. Press Enter or Space to verify you are human.',+ )+ break+ case ACTION.loading:+ captchaComponent.setAttribute('role', 'status')+ captchaComponent.setAttribute('aria-checked', 'mixed')+ captchaComponent.setAttribute('aria-busy', 'true')+ captchaComponent.setAttribute('aria-label', 'Verifying that you are human. Please wait.')+ break+ case ACTION.completed:+ captchaComponent.setAttribute('role', 'checkbox')+ captchaComponent.setAttribute('aria-checked', 'true')+ captchaComponent.setAttribute('aria-busy', 'false')+ captchaComponent.setAttribute('aria-label', 'Verification successful. You have been verified as human.')+ break+ case ACTION.failure:+ captchaComponent.setAttribute('role', 'checkbox')+ captchaComponent.setAttribute('aria-checked', 'false')+ captchaComponent.setAttribute('aria-busy', 'false')+ captchaComponent.setAttribute('aria-label', 'Verification failed. Press Enter or Space to try again.')+ break+ }++ // Announce to screen readers+ const srStatus = document.querySelector('#sr-status')+ if (srStatus) {+ switch (action) {+ case ACTION.loading:+ srStatus.textContent = 'Verification in progress. Please wait.'+ break+ case ACTION.completed:+ srStatus.textContent = 'Verification successful!'+ break+ case ACTION.failure:+ srStatus.textContent = 'Verification failed. Please try again.'+ break+ default:+ srStatus.textContent = ''+ }+ }+}+/*** Sets the provided action visible and the rest hidden with smooth transitions* @param {*} action checkbox | failure | completed | loading@@ -101,10 +205,17 @@ const activateAction = (action: ACTION) => {if (action === 'failure') {statusFailure?.classList.remove('hidden')+ updateProgressBar(0) // Hide progress bar on failure} else if (action === 'loading') {statusComputing?.classList.remove('hidden')+ progressStartTime = Date.now()+ updateProgressBar(-1) // Start with indeterminate progress+ } else if (action === 'completed') {+ statusDefault?.classList.remove('hidden')+ updateProgressBar(100) // Complete the progress bar} else {statusDefault?.classList.remove('hidden')+ updateProgressBar(0) // Hide progress bar}// Show the active action element with animation@@ -114,6 +225,9 @@ const activateAction = (action: ACTION) => {actions[action]?.classList.add('show')})}++ // Update ARIA state+ updateAriaState(action)}const setLifetimeTimeout = () => {@@ -182,6 +296,26 @@ const verifySolution = async (challenge: string, nonce: number, solution: string}}+/**+ * Calculate estimated progress based on difficulty and attempts+ * Uses a logarithmic scale to provide smooth progress feedback+ */+const calculateProgress = (attempts: number, difficulty: number): number => {+ // Estimate expected iterations based on difficulty+ // For difficulty d, expected iterations is roughly 16^d / 2+ const expectedIterations = Math.pow(16, difficulty) / 2++ // Use a logarithmic scale for smoother progress+ // This ensures progress feels more linear to the user+ const rawProgress = (attempts / expectedIterations) * 100++ // Apply easing to make early progress more visible+ // and slow down as we approach completion+ const easedProgress = Math.min(95, Math.sqrt(rawProgress) * 10)++ return easedProgress+}+const solveChallenge = async (challenge: PowChallenge): Promise<void> => {return new Promise((resolve, reject) => {// Terminate any existing worker@@ -205,6 +339,10 @@ const solveChallenge = async (challenge: PowChallenge): Promise<void> => {const data = event.dataif (data.type === 'progress') {+ // Update progress bar based on attempts+ const progressData = data as PowProgress+ const progress = calculateProgress(progressData.attempts, challenge.difficulty)+ updateProgressBar(progress)return}@@ -221,6 +359,7 @@ const solveChallenge = async (challenge: PowChallenge): Promise<void> => {if (data.type === 'result') {// Worker found the solution+ updateProgressBar(100) // Complete progress barconst token = await verifySolution(challenge.challenge, (data as PowResult).nonce, (data as PowResult).solution)if (token) {@@ -278,6 +417,7 @@ const solveInMainThread = async (challenge: PowChallenge): Promise<void> => {const { challenge: challengeStr, difficulty } = challengelet nonce = 0const startTime = Date.now()+ const progressInterval = 1000 // Update progress every 1k iterationsconst sha256 = async (message: string): Promise<string> => {const encoder = new TextEncoder()@@ -308,6 +448,7 @@ const solveInMainThread = async (challenge: PowChallenge): Promise<void> => {const hash = await sha256(input)if (hasValidPrefix(hash, difficulty)) {+ updateProgressBar(100) // Complete progress barconst token = await verifySolution(challengeStr, nonce, hash)if (token) {@@ -319,6 +460,12 @@ const solveInMainThread = async (challenge: PowChallenge): Promise<void> => {}nonce++++ // Update progress bar periodically+ if (nonce % progressInterval === 0) {+ const progress = calculateProgress(nonce, difficulty)+ updateProgressBar(progress)+ }}// Max iterations reached without finding solution@@ -327,6 +474,30 @@ const solveInMainThread = async (challenge: PowChallenge): Promise<void> => {activateAction(ACTION.failure)}+/**+ * Handles the captcha activation (click or keyboard)+ */+const handleCaptchaActivation = async () => {+ if (activeAction === ACTION.loading || activeAction === ACTION.completed) {+ return+ }++ if (activeAction === ACTION.failure) {+ activateAction(ACTION.checkbox)+ return+ }++ activateAction(ACTION.loading)++ const challenge = await generateChallenge()++ if (!challenge) {+ return+ }++ await solveChallenge(challenge)+}+document.addEventListener('DOMContentLoaded', () => {const captchaComponent = document.querySelector('#swetrix-captcha')const branding = document.querySelector('#branding')@@ -335,24 +506,23 @@ document.addEventListener('DOMContentLoaded', () => {e.stopPropagation()})- captchaComponent?.addEventListener('click', async () => {- if (activeAction === ACTION.loading || activeAction === ACTION.completed) {- return- }-- if (activeAction === ACTION.failure) {- activateAction(ACTION.checkbox)- return- }-- activateAction(ACTION.loading)+ captchaComponent?.addEventListener('click', handleCaptchaActivation)- const challenge = await generateChallenge()+ captchaComponent?.addEventListener('keydown', (e: Event) => {+ const keyboardEvent = e as KeyboardEvent- if (!challenge) {- return+ if (keyboardEvent.key === 'Enter' || keyboardEvent.key === ' ') {+ e.preventDefault()+ handleCaptchaActivation()}+ })- await solveChallenge(challenge)+ captchaComponent?.addEventListener('keyup', (e: Event) => {+ const keyboardEvent = e as KeyboardEvent+ if (keyboardEvent.key === ' ') {+ e.preventDefault()+ }})++ updateAriaState(ACTION.checkbox)})diff --git a/src/pages/dark.html b/src/pages/dark.htmlindex 37e96e41c..35e571c21 100644--- a/src/pages/dark.html+++ b/src/pages/dark.html@@ -5,6 +5,7 @@<meta charset="utf-8"><title>Swetrix Captcha</title><meta http-equiv="X-UA-Compatible" content="IE=edge">+ <meta name="viewport" content="width=device-width, initial-scale=1"><style>html {@@ -31,6 +32,7 @@background-color: #0f172a;border: 1px solid #1e293b;+ border-radius: 4px;height: 64px;-webkit-user-select: none;user-select: none;@@ -44,6 +46,61 @@background-color: #1e293b;}+ /* Focus styles for accessibility - only show on keyboard navigation */+ #swetrix-captcha:focus {+ outline: none;+ }++ #swetrix-captcha:focus-visible {+ outline: 2px solid #60a5fa;+ outline-offset: 2px;+ }++ /* Fallback for browsers without :focus-visible support */+ #swetrix-captcha.keyboard-focus {+ outline: 2px solid #60a5fa;+ outline-offset: 2px;+ }++ /* Progress bar at the top */+ #progress-bar-container {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ height: 2px;+ background-color: #1e293b;+ border-radius: 4px 4px 0 0;+ overflow: hidden;+ opacity: 0;+ transition: opacity 0.3s ease;+ }++ #progress-bar-container.show {+ opacity: 1;+ }++ #progress-bar {+ height: 100%;+ width: 0%;+ background: linear-gradient(90deg, #3b82f6, #60a5fa);+ transition: width 0.3s ease, opacity 0.3s ease;+ }++ #progress-bar.indeterminate {+ width: 30%;+ animation: indeterminate 1.5s ease-in-out infinite;+ }++ @keyframes indeterminate {+ 0% {+ transform: translateX(-100%);+ }+ 100% {+ transform: translateX(400%);+ }+ }+#challenge {display: flex;align-items: center;@@ -68,13 +125,19 @@top: 50%;left: 50%;transform: translate(-50%, -50%);- transition: opacity 0.25s ease, transform 0.25s ease;+ transition: opacity 0.25s ease, transform 0.25s ease, border-color 0.2s ease, box-shadow 0.2s ease;}#checkbox:hover {border-color: #4b5563;}+ /* Focus indicator for checkbox when parent is focused */+ #swetrix-captcha:focus-visible #checkbox {+ border-color: #60a5fa;+ box-shadow: 0 0 0 3px rgba(96, 165, 250, 0.3);+ }+#status {font-size: 14px;color: #f9fafb;@@ -124,6 +187,11 @@text-decoration: underline;}+ #branding a:focus {+ outline: 1px solid #60a5fa;+ outline-offset: 1px;+ }+#action svg {width: 28px;height: 28px;@@ -230,54 +298,112 @@stroke-dashoffset: -124;}}++ /* Reduced motion preference */+ @media (prefers-reduced-motion: reduce) {+ #checkbox,+ #completed,+ #failure,+ #loading,+ #status span,+ #progress-bar,+ #branding a {+ transition: none;+ }++ #loading svg,+ #loading svg circle,+ #completed.show svg path,+ #failure.show,+ #progress-bar.indeterminate {+ animation: none;+ }++ #progress-bar.indeterminate {+ width: 100%;+ }+ }++ /* High contrast mode support */+ @media (forced-colors: active) {+ #swetrix-captcha {+ border: 2px solid CanvasText;+ }++ #checkbox {+ border: 2px solid CanvasText;+ }++ #progress-bar {+ background: Highlight;+ }+ }</style><script>window.__SWETRIX_CAPTCHA_THEME = 'dark'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')const cid = urlParams.get('cid')+ const apiUrl = urlParams.get('apiUrl')window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid+ if (apiUrl) {+ window.__SWETRIX_API_URL = apiUrl+ }</script><script src="../captcha.js" defer></script></head><body>- <div id="swetrix-captcha">+ <div+ id="swetrix-captcha"+ role="checkbox"+ aria-checked="false"+ aria-label="Human verification checkbox. Press Enter or Space to verify you are human."+ tabindex="0"+ >+ <!-- Progress bar at the top -->+ <div id="progress-bar-container" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" aria-label="Verification progress">+ <div id="progress-bar"></div>+ </div>+<div id="challenge"><div id="action"><!-- Can contain a checkbox itself / a red cross (with a retry action) / a green check mark -->- <div id="checkbox"></div>- <div id="failure">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="checkbox" aria-hidden="true"></div>+ <div id="failure" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg></div>- <div id="completed">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="completed" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg></div>- <div id="loading">- <svg viewBox="0 0 50 50">+ <div id="loading" aria-hidden="true">+ <svg viewBox="0 0 50 50" aria-hidden="true"><circle cx="25" cy="25" r="20" fill="none" stroke-width="4"></circle></svg></div></div>- <div id="status">+ <div id="status" aria-live="polite" aria-atomic="true"><span id="status-default">I am human</span>- <span id="status-failure" class="hidden">Failure, please retry</span>+ <span id="status-failure" class="hidden">Verification failed, click to retry</span><span id="status-computing" class="hidden"><span>Verifying...</span></span></div></div><div id="branding">- <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer">Swetrix Captcha</a>+ <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer" aria-label="Swetrix Captcha - opens in new window">Swetrix Captcha</a></div>++ <!-- Screen reader only live region for status updates -->+ <div id="sr-status" class="hidden" aria-live="assertive" aria-atomic="true"></div></div></body>diff --git a/src/pages/light.html b/src/pages/light.htmlindex d32684079..2ec2c4e91 100644--- a/src/pages/light.html+++ b/src/pages/light.html@@ -5,6 +5,7 @@<meta charset="utf-8"><title>Swetrix Captcha</title><meta http-equiv="X-UA-Compatible" content="IE=edge">+ <meta name="viewport" content="width=device-width, initial-scale=1"><style>html {@@ -32,6 +33,7 @@/* bg-gray-100 */background-color: #f9fafb;border: 1px solid #e9e9e9;+ border-radius: 4px;height: 64px;-webkit-user-select: none;user-select: none;@@ -46,6 +48,61 @@background-color: #f3f4f6;}+ /* Focus styles for accessibility - only show on keyboard navigation */+ #swetrix-captcha:focus {+ outline: none;+ }++ #swetrix-captcha:focus-visible {+ outline: 2px solid #3b82f6;+ outline-offset: 2px;+ }++ /* Fallback for browsers without :focus-visible support */+ #swetrix-captcha.keyboard-focus {+ outline: 2px solid #3b82f6;+ outline-offset: 2px;+ }++ /* Progress bar at the top */+ #progress-bar-container {+ position: absolute;+ top: 0;+ left: 0;+ right: 0;+ height: 2px;+ background-color: #e5e7eb;+ border-radius: 4px 4px 0 0;+ overflow: hidden;+ opacity: 0;+ transition: opacity 0.3s ease;+ }++ #progress-bar-container.show {+ opacity: 1;+ }++ #progress-bar {+ height: 100%;+ width: 0%;+ background: linear-gradient(90deg, #3b82f6, #2563eb);+ transition: width 0.3s ease, opacity 0.3s ease;+ }++ #progress-bar.indeterminate {+ width: 30%;+ animation: indeterminate 1.5s ease-in-out infinite;+ }++ @keyframes indeterminate {+ 0% {+ transform: translateX(-100%);+ }+ 100% {+ transform: translateX(400%);+ }+ }+#challenge {display: flex;align-items: center;@@ -70,13 +127,19 @@top: 50%;left: 50%;transform: translate(-50%, -50%);- transition: opacity 0.25s ease, transform 0.25s ease;+ transition: opacity 0.25s ease, transform 0.25s ease, border-color 0.2s ease, box-shadow 0.2s ease;}#checkbox:hover {border-color: #a0a0a0;}+ /* Focus indicator for checkbox when parent is focused */+ #swetrix-captcha:focus-visible #checkbox {+ border-color: #3b82f6;+ box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.3);+ }+#status {font-size: 14px;color: #0f0f0f;@@ -126,6 +189,11 @@text-decoration: underline;}+ #branding a:focus {+ outline: 1px solid #3b82f6;+ outline-offset: 1px;+ }+#action svg {width: 28px;height: 28px;@@ -232,54 +300,112 @@stroke-dashoffset: -124;}}++ /* Reduced motion preference */+ @media (prefers-reduced-motion: reduce) {+ #checkbox,+ #completed,+ #failure,+ #loading,+ #status span,+ #progress-bar,+ #branding a {+ transition: none;+ }++ #loading svg,+ #loading svg circle,+ #completed.show svg path,+ #failure.show,+ #progress-bar.indeterminate {+ animation: none;+ }++ #progress-bar.indeterminate {+ width: 100%;+ }+ }++ /* High contrast mode support */+ @media (forced-colors: active) {+ #swetrix-captcha {+ border: 2px solid CanvasText;+ }++ #checkbox {+ border: 2px solid CanvasText;+ }++ #progress-bar {+ background: Highlight;+ }+ }</style><script>window.__SWETRIX_CAPTCHA_THEME = 'light'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')const cid = urlParams.get('cid')+ const apiUrl = urlParams.get('apiUrl')window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid+ if (apiUrl) {+ window.__SWETRIX_API_URL = apiUrl+ }</script><script src="../captcha.js" defer></script></head><body>- <div id="swetrix-captcha">+ <div+ id="swetrix-captcha"+ role="checkbox"+ aria-checked="false"+ aria-label="Human verification checkbox. Press Enter or Space to verify you are human."+ tabindex="0"+ >+ <!-- Progress bar at the top -->+ <div id="progress-bar-container" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0" aria-label="Verification progress">+ <div id="progress-bar"></div>+ </div>+<div id="challenge"><div id="action"><!-- Can contain a checkbox itself / a red cross (with a retry action) / a green check mark -->- <div id="checkbox"></div>- <div id="failure">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="checkbox" aria-hidden="true"></div>+ <div id="failure" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3"/><path d="M12 9v4"/><path d="M12 17h.01"/></svg></div>- <div id="completed">- <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">+ <div id="completed" aria-hidden="true">+ <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5"/></svg></div>- <div id="loading">- <svg viewBox="0 0 50 50">+ <div id="loading" aria-hidden="true">+ <svg viewBox="0 0 50 50" aria-hidden="true"><circle cx="25" cy="25" r="20" fill="none" stroke-width="4"></circle></svg></div></div>- <div id="status">+ <div id="status" aria-live="polite" aria-atomic="true"><span id="status-default">I am human</span>- <span id="status-failure" class="hidden">Failure, please retry</span>+ <span id="status-failure" class="hidden">Verification failed, click to retry</span><span id="status-computing" class="hidden"><span>Verifying...</span></span></div></div><div id="branding">- <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer">Swetrix Captcha</a>+ <a href="https://swetrix.com/captcha" target="_blank" rel="noopener noreferrer" aria-label="Swetrix Captcha - opens in new window">Swetrix Captcha</a></div>++ <!-- Screen reader only live region for status updates -->+ <div id="sr-status" class="hidden" aria-live="assertive" aria-atomic="true"></div></div></body>diff --git a/src/pages/test.html b/src/pages/test.htmlindex e1ef6846f..5c3741bea 100644--- a/src/pages/test.html+++ b/src/pages/test.html@@ -25,7 +25,8 @@<input type="text" name="name" value="name"><input type="text" name="email" value="email"><input type="number" name="number" value="number">- <div class="swecaptcha" data-project-id="AP00000000000" data-theme="light"></div>+ <div class="swecaptcha" data-project-id="AP00000000000" data-theme="auto"></div>+ <!-- <div class="swecaptcha" data-project-id="79eF2Z9rNNvv" data-theme="auto"></div> --><input type="submit" value="Submit"></form></body>