📈 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
fix: captcha -> harden loader reloads and message handling
Blue Mouse33abde7dafb1
diff --git a/docs/content/docs/captcha/client-side-usage.mdx b/docs/content/docs/captcha/client-side-usage.mdxindex 0430f5b74..8f5183386 100644--- a/docs/content/docs/captcha/client-side-usage.mdx+++ b/docs/content/docs/captcha/client-side-usage.mdx@@ -36,8 +36,12 @@ import "@swetrix/captcha";The package automatically renders `.swecaptcha` elements when the DOM is ready. If you render the widget after the initial page load, you can call:```javascript-import { forceLoadCaptcha } from "@swetrix/captcha";+import { forceLoadCaptcha, loadCaptcha } from "@swetrix/captcha";+// Render any .swecaptcha elements that are not initialised yet.+loadCaptcha();++// Re-render all .swecaptcha elements, replacing existing widgets.forceLoadCaptcha();```diff --git a/packages/captcha/README.md b/packages/captcha/README.mdindex 83da9dbdd..b8b2ee6d0 100644--- a/packages/captcha/README.md+++ b/packages/captcha/README.md@@ -45,7 +45,10 @@ The package automatically renders `.swecaptcha` elements when the DOM is ready.```javascriptimport { forceLoadCaptcha, loadCaptcha } from '@swetrix/captcha'+// Render any .swecaptcha elements that are not initialised yet.loadCaptcha()++// Re-render all .swecaptcha elements, replacing existing widgets.forceLoadCaptcha()```diff --git a/packages/captcha/package.json b/packages/captcha/package.jsonindex 4fe6a2d8c..72abe25cc 100644--- a/packages/captcha/package.json+++ b/packages/captcha/package.json@@ -36,7 +36,7 @@"default": "./dist/captcha-loader.js"},"./captcha-loader": {- "types": "./dist/esnext/captcha-loader.d.ts",+ "types": "./dist/esnext/index.d.ts","import": "./dist/captcha-loader.esm.js","require": "./dist/captcha-loader.cjs","default": "./dist/captcha-loader.js"diff --git a/packages/captcha/src/captcha-loader.ts b/packages/captcha/src/captcha-loader.tsindex fdf951c06..b8883dccd 100644--- a/packages/captcha/src/captcha-loader.ts+++ b/packages/captcha/src/captcha-loader.ts@@ -52,6 +52,8 @@ const FRAME_HEIGHT = '66px'const getFrameID = (cid: string) => `${cid}-frame`const ids: string[] = []+const captchaFrameOrigins = new Map<string, string>()+const captchaFrameSources = new Map<string, MessageEventSource | null>()let messageListenerRegistered = false@@ -203,6 +205,8 @@ const clearExistingCaptcha = (container: Element) => {const input = container.querySelector(`input[id="${cid}"]`)input?.remove()+ captchaFrameOrigins.delete(cid)+ captchaFrameSources.delete(cid)const cidIndex = ids.indexOf(cid)if (cidIndex > -1) {@@ -225,6 +229,7 @@ const renderCaptcha = (container: Element, params: CaptchaParams) => {const input = generateHiddenInput(cParams)container.appendChild(frame)+ captchaFrameSources.set(cParams.cid, frame.contentWindow)container.appendChild(input)}@@ -257,6 +262,17 @@ const postMessageCallback = (pmEvent: MessageEvent) => {return}+ const expectedOrigin = captchaFrameOrigins.get(cid)+ const expectedSource = captchaFrameSources.get(cid)++ if (+ (!expectedOrigin || pmEvent.origin !== expectedOrigin) &&+ (!expectedSource || pmEvent.source !== expectedSource)+ ) {+ log(LOG_ACTIONS.error, `[PM -> ${event}] Unexpected origin: ${pmEvent.origin}`)+ return+ }+const input = getDocument()?.getElementById(cid) as HTMLInputElement | nullconst inputExists = input !== null@@ -300,6 +316,7 @@ const generateCaptchaFrame = (params: CaptchaFrameParams) => {cid,theme: rawTheme,})+ captchaFrameOrigins.set(cid, new URL(captchaFrame.src).origin)captchaFrame.style.height = FRAME_HEIGHTcaptchaFrame.title = 'Swetrix Captcha - Human verification'captchaFrame.style.border = 'none'@@ -359,6 +376,9 @@ const parseParams = (container: Element): CaptchaParams => {return params}+const isCaptchaRendered = (container: Element) =>+ container.querySelector('iframe[id^="swetrix-captcha-"]') !== null+const registerMessageListener = () => {const win = getWindow()@@ -378,16 +398,16 @@ export const loadCaptcha = (forced = false) => {return}- if (!forced && 'swecaptcha' in win) {- log(LOG_ACTIONS.warn, 'Captcha is already loaded.')- }-win.swecaptcha = trueregisterMessageListener()const containers = Array.from(doc.querySelectorAll(CAPTCHA_SELECTOR))for (const container of containers) {+ if (!forced && isCaptchaRendered(container)) {+ continue+ }+const params = parseParams(container)if (!validateParams(params)) {