📈 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
added dummy pids logic
Blue Mousea06d19beade7
diff --git a/captcha-loader.js b/captcha-loader.jsdeleted file mode 100644index 5d124aa38..000000000--- a/captcha-loader.js+++ /dev/null@@ -1,221 +0,0 @@-const CAPTCHA_SELECTOR = '.swecaptcha'-const LIGHT_CAPTCHA_IFRAME_URL = './light.html'-const DARK_CAPTCHA_IFRAME_URL = './dark.html'-const DEFAULT_RESPONSE_INPUT_NAME = 'swetrix-captcha-response'-const MESSAGE_IDENTIFIER = 'swetrix-captcha'-const ID_PREFIX = 'swetrix-captcha-'-const THEMES = ['light', 'dark']-const PID_REGEX = /^(?!.*--)[a-zA-Z0-9-]{12}$/--const isValidPID = (pid) => PID_REGEX.test(pid)--const FRAME_HEIGHT_MAPPING = {- default: '66px',- manual: '200px',-}--const getFrameID = (cid) => `${cid}-frame`--const ids = []--const log = (status, text) => {- console[status](`[Swetrix Captcha] ${text}`)-}--const appendParamsToURL = (url, params) => {- const queryString = Object.keys(params).map((key) => {- return `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`- }).join('&')-- return `${url}?${queryString}`-}--const renderCaptcha = (container, params) => {- const cid = generateRandomID()- const cParams = {- ...params,- cid, // CAPTCHA ID- }-- const frame = generateCaptchaFrame(cParams)- const input = generateHiddenInput(cParams)-- container.appendChild(frame)- container.appendChild(input)-}--const generateRandomID = () => {- const randomID = ID_PREFIX + Math.random().toString(36).substr(2, 6)-- if (ids.includes(randomID)) {- return generateRandomID()- }-- ids.push(randomID)-- return randomID-}--const postMessageCallback = (pmEvent) => {- // TODO: Validate origin-- const { data } = pmEvent-- if (!data) {- return- }-- const {- type, cid, event,- } = data-- if (type !== MESSAGE_IDENTIFIER) {- return- }-- if (!cid || !ids.includes(cid)) {- return- }-- const input = document.getElementById(cid)- const inputExists = input !== null-- switch (event) {- case 'success': {- const { token } = data-- if (!inputExists) {- log('error', '[PM -> success] Input element does not exist.')- return- }-- input.value = token-- break- }-- case 'failure': {- if (!inputExists) {- log('error', '[PM -> failure] Input element does not exist.')- return- }-- input.value = ''-- break- }-- case 'tokenExpired': {- if (!inputExists) {- log('error', '[PM -> failure] Input element does not exist.')- return- }-- input.value = ''-- break- }-- case 'manualStarted': {- const frame = document.getElementById(getFrameID(cid))-- if (!frame) {- log('error', '[PM -> manualStarted] Frame does not exist.')- return- }-- frame.style.height = FRAME_HEIGHT_MAPPING.manual-- break- }-- case 'manualFinished': {- const frame = document.getElementById(getFrameID(cid))-- if (!frame) {- log('error', '[PM -> manualFinished] Frame does not exist.')- return- }-- frame.style.height = FRAME_HEIGHT_MAPPING.default-- break- }- }-}--const generateCaptchaFrame = (params) => {- const { theme } = params- const captchaFrame = document.createElement('iframe')-- captchaFrame.id = getFrameID(params.cid)- captchaFrame.src = theme === 'dark'- ? appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params)- : appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)- captchaFrame.style.height = FRAME_HEIGHT_MAPPING.default- captchaFrame.title = 'Swetrix Captcha'- captchaFrame.style.border = 'none'- captchaFrame.style.width = '302px'- captchaFrame.style.overflow = 'visible'-- return captchaFrame-}--const generateHiddenInput = (params) => {- const { cid } = params- const input = document.createElement('input')-- input.type = 'hidden'- input.name = params.respName- input.value = ''- input.id = cid-- return input-}--const validateParams = (params) => {- const { theme, pid } = params-- if (theme && !THEMES.includes(theme)) {- log('error', `Invalid data-theme parameter: ${theme}`)- return false- }-- if (!pid || !isValidPID(pid)) {- log('error', `Invalid data-project-id parameter: ${pid}`)- return false- }-- return true-}--const parseParams = (container) => ({- pid: container.getAttribute('data-project-id'),- respName: container.getAttribute('data-response-input-name') || DEFAULT_RESPONSE_INPUT_NAME,- theme: container.getAttribute('data-theme'),-})--const main = () => {- if ('swecaptcha' in window) {- log('warn', 'Captcha is already loaded.')- }-- // TODO: Add some callbacks here- window.swecaptcha = true- window.addEventListener('message', postMessageCallback)-- const containers = document.querySelectorAll(CAPTCHA_SELECTOR)-- for (const container of containers) {- const params = parseParams(container)-- if (!validateParams(params)) {- log('error', 'Aborting captcha rendering due to invalid parameters.')- return- }-- renderCaptcha(container, params)- }-}--document.addEventListener('DOMContentLoaded', main)diff --git a/captcha.js b/captcha.jsdeleted file mode 100644index 17b54eb01..000000000--- a/captcha.js+++ /dev/null@@ -1,252 +0,0 @@-const API_URL = 'http://localhost:5005/v1/captcha'-const MESSAGE_IDENTIFIER = 'swetrix-captcha'-const DEFAULT_THEME = 'light'-const CAPTCHA_TOKEN_LIFETIME = 300 // seconds (5 minutes).-let TOKEN = ''-let HASH = ''--const ENDPOINTS = {- VERIFY: '/verify',- GENERATE: '/generate',- VERIFY_MANUAL: '/verify-manual',-}--const IFRAME_MESSAGE_TYPES = {- SUCCESS: 'success',- FAILURE: 'failure',- TOKEN_EXPIRED: 'tokenExpired',- MANUAL_STARTED: 'manualStarted',- MANUAL_FINISHED: 'manualFinished',-}--let activeAction = 'checkbox'--const postMessage = (event, data = {}) => {- window.parent.postMessage({- event,- type: MESSAGE_IDENTIFIER,- cid: window.__SWETRIX_CAPTCHA_ID,- ...data,- }, '*')-}--/**- * Sets the provided action visible and the rest hidden- * @param {*} action checkbox | failure | completed | loading- */-const activateAction = (action) => {- activeAction = action-- const statusDefault = document.querySelector('#status-default')- const statusFailure = document.querySelector('#status-failure')-- const actions = {- checkbox: document.querySelector('#checkbox'),- failure: document.querySelector('#failure'),- completed: document.querySelector('#completed'),- loading: document.querySelector('#loading'),- }-- // Apply hidden class to all actions- actions.checkbox.classList.add('hidden')- actions.failure.classList.add('hidden')- actions.completed.classList.add('hidden')- actions.loading.classList.add('hidden')-- // Change the status text- if (action === 'failure') {- statusDefault.classList.add('hidden')- statusFailure.classList.remove('hidden')- } else {- statusDefault.classList.remove('hidden')- statusFailure.classList.add('hidden')- }-- // Remove hidden class from the provided action- actions[action].classList.remove('hidden')-}--const setLifetimeTimeout = () => {- setTimeout(() => {- postMessage(IFRAME_MESSAGE_TYPES.TOKEN_EXPIRED)- activateAction('checkbox')- }, CAPTCHA_TOKEN_LIFETIME * 1000)-}--const enableManualChallenge = (svg) => {- const manualChallenge = document.querySelector('#manual-challenge')- const svgCaptcha = document.querySelector('#svg-captcha')-- if (!svg) {- const error = document.createElement('p')- error.innerText = 'Error loading captcha'- error.style.color = '#d6292a'- svgCaptcha.appendChild(error)- } else {- svgCaptcha.innerHTML = svg- }-- postMessage(IFRAME_MESSAGE_TYPES.MANUAL_STARTED)- manualChallenge.classList.remove('hidden')-}--const disableManualChallenge = () => {- const manualChallenge = document.querySelector('#manual-challenge')- const svgCaptcha = document.querySelector('#svg-captcha')-- postMessage(IFRAME_MESSAGE_TYPES.MANUAL_FINISHED)- svgCaptcha.innerHTML = ''- manualChallenge.classList.add('hidden')-}--const generateCaptcha = async () => {- try {- const response = await fetch(`${API_URL}${ENDPOINTS.GENERATE}`, {- method: 'POST',- headers: {- 'Content-Type': 'application/json',- },- body: JSON.stringify({- theme: window.__SWETRIX_CAPTCHA_THEME || DEFAULT_THEME,- pid: window.__SWETRIX_PROJECT_ID,- }),- })-- if (!response.ok) {- throw ''- }-- const data = await response.json()- return data- } catch (e) {- postMessage(IFRAME_MESSAGE_TYPES.FAILURE)- activateAction('failure')- return {}- }-}--const verify = async () => {- try {- const response = await fetch(`${API_URL}${ENDPOINTS.VERIFY}`, {- method: 'POST',- headers: {- 'Content-Type': 'application/json',- },- body: JSON.stringify({- pid: window.__SWETRIX_PROJECT_ID,- }),- })-- if (!response.ok) {- return {}- }-- const data = await response.json()- return data- } catch (e) {- postMessage(IFRAME_MESSAGE_TYPES.FAILURE)- activateAction('failure')- return {}- }-}--document.addEventListener('DOMContentLoaded', () => {- const captchaComponent = document.querySelector('#swetrix-captcha')- const branding = document.querySelector('#branding')- const svgCaptchaInput = document.querySelector('#svg-captcha-input')- const manualSubmitBtn = document.querySelector('#manual-submit-btn')-- branding.addEventListener('click', (e) => {- e.stopPropagation()- })-- manualSubmitBtn.addEventListener('click', async (e) => {- e.stopPropagation()-- const code = svgCaptchaInput.value-- if (!code) {- return- }-- let response-- try {- response = await fetch(`${API_URL}${ENDPOINTS.VERIFY_MANUAL}`, {- method: 'POST',- body: JSON.stringify({- hash: HASH,- code,- pid: window.__SWETRIX_PROJECT_ID,- }),- headers: {- 'Content-Type': 'application/json',- },- })- } catch (e) {- disableManualChallenge()- postMessage(IFRAME_MESSAGE_TYPES.FAILURE)- activateAction('failure')- svgCaptchaInput.value = ''- return- }-- if (!response.ok) {- disableManualChallenge()- postMessage(IFRAME_MESSAGE_TYPES.FAILURE)- activateAction('failure')- svgCaptchaInput.value = ''- return- }-- const { success, token } = await response.json()-- if (!success) {- disableManualChallenge()- postMessage(IFRAME_MESSAGE_TYPES.FAILURE)- activateAction('failure')- svgCaptchaInput.value = ''- return- }-- svgCaptchaInput.value = ''-- postMessage(IFRAME_MESSAGE_TYPES.SUCCESS, { token })- setLifetimeTimeout()- activateAction('completed')- disableManualChallenge()- })-- captchaComponent.addEventListener('click', async () => {- if (activeAction === 'loading' || activeAction === 'completed') {- return- }-- if (activeAction === 'failure') {- activateAction('checkbox')- return- }-- activateAction('loading')-- try {- const { token } = await verify()-- if (!token) {- throw ''- }-- TOKEN = token- postMessage(IFRAME_MESSAGE_TYPES.SUCCESS, { token })- setLifetimeTimeout()- activateAction('completed')- return- } catch (e) {- const { data, hash } = await generateCaptcha()-- HASH = hash- enableManualChallenge(data)- return- }- })-})diff --git a/src/captcha-loader.ts b/src/captcha-loader.tsindex 2eb705829..28ce3a73a 100644--- a/src/captcha-loader.ts+++ b/src/captcha-loader.ts@@ -14,7 +14,11 @@ enum LOG_ACTIONS {info = 'info',}-const isValidPID = (pid: string) => PID_REGEX.test(pid)+const DUMMY_PIDS = [+ 'AP00000000000', 'MP00000000000', 'FAIL000000000',+]++const isValidPID = (pid: string) => DUMMY_PIDS.includes(pid) || PID_REGEX.test(pid)const FRAME_HEIGHT_MAPPING = {default: '66px',