📈 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 postMessage logic
Blue Mouseed9fe4505d0e
diff --git a/captcha-loader.js b/captcha-loader.jsindex f28e97f3b..bcd994500 100644--- a/captcha-loader.js+++ b/captcha-loader.js@@ -2,9 +2,13 @@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 ids = []+const log = (status, text) => {console[status](`[Swetrix Captcha] ${text}`)}@@ -18,19 +22,110 @@}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':+ // TODO+ break+ }+ }++ const generateCaptchaFrame = (params) => {const { theme } = paramsconst captchaFrame = document.createElement('iframe')- captchaFrame.src = theme === 'dark' ?- appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params) :- appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)+ captchaFrame.src = theme === 'dark'+ ? appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params)+ : appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)captchaFrame.title = 'Swetrix Captcha'captchaFrame.style.border = 'none'captchaFrame.style.width = '302px'captchaFrame.style.height = 'auto'captchaFrame.style.overflow = 'visible'- container.appendChild(captchaFrame)+ 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) => {@@ -48,12 +143,14 @@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 = () => {// TODO: Add some callbacks herewindow.swecaptcha = true+ window.addEventListener('message', postMessageCallback)const containers = document.querySelectorAll(CAPTCHA_SELECTOR)diff --git a/captcha.js b/captcha.jsindex 9674f0176..627a8fe58 100644--- a/captcha.js+++ b/captcha.js@@ -1,4 +1,5 @@const API_URL = 'http://localhost:5005/v1/captcha'+const MESSAGE_IDENTIFIER = 'swetrix-captcha'const DEFAULT_THEME = 'light'let TOKEN = ''let HASH = ''@@ -9,8 +10,23 @@ const ENDPOINTS = {VERIFY_MANUAL: '/verify-manual',}+const IFRAME_MESSAGE_TYPES = {+ SUCCESS: 'success',+ FAILURE: 'failure',+ TOKEN_EXPIRED: 'tokenExpired',+}+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@@ -91,6 +107,7 @@ const generateCaptcha = async () => {const data = await response.json()return data} catch (e) {+ postMessage(IFRAME_MESSAGE_TYPES.FAILURE)activateAction('failure')return {}}@@ -115,6 +132,7 @@ const verify = async () => {const data = await response.json()return data} catch (e) {+ postMessage(IFRAME_MESSAGE_TYPES.FAILURE)activateAction('failure')return {}}@@ -155,6 +173,7 @@ document.addEventListener('DOMContentLoaded', () => {})} catch (e) {disableManualChallenge()+ postMessage(IFRAME_MESSAGE_TYPES.FAILURE)activateAction('failure')svgCaptchaInput.value = ''return@@ -162,17 +181,25 @@ document.addEventListener('DOMContentLoaded', () => {if (!response.ok) {disableManualChallenge()+ postMessage(IFRAME_MESSAGE_TYPES.FAILURE)activateAction('failure')svgCaptchaInput.value = ''return}- const data = await response.json()- console.log(data)+ const { success, token } = await response.json()- // TODO+ if (!success) {+ disableManualChallenge()+ postMessage(IFRAME_MESSAGE_TYPES.FAILURE)+ activateAction('failure')+ svgCaptchaInput.value = ''+ return+ }svgCaptchaInput.value = ''++ postMessage(IFRAME_MESSAGE_TYPES.SUCCESS, { token })activateAction('completed')disableManualChallenge()})@@ -197,6 +224,7 @@ document.addEventListener('DOMContentLoaded', () => {}TOKEN = token+ postMessage(IFRAME_MESSAGE_TYPES.SUCCESS, { token })activateAction('completed')return} catch (e) {diff --git a/dark.html b/dark.htmlindex 0654bbc6e..934137a7f 100644--- a/dark.html+++ b/dark.html@@ -203,7 +203,9 @@window.__SWETRIX_CAPTCHA_THEME = 'light'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')+ const cid = urlParams.get('cid')+ window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid</script><script src="captcha.js" defer></script>diff --git a/light.html b/light.htmlindex f985184d7..bd0e02ea6 100644--- a/light.html+++ b/light.html@@ -186,7 +186,9 @@window.__SWETRIX_CAPTCHA_THEME = 'light'const urlParams = new URLSearchParams(window.location.search)const pid = urlParams.get('pid')+ const cid = urlParams.get('cid')+ window.__SWETRIX_CAPTCHA_ID = cidwindow.__SWETRIX_PROJECT_ID = pid</script><script src="captcha.js" defer></script>