📈 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
feat: Support Swetrix Captcha NPM packages & jsDelivr hosting
Blue Mouse034869654962
diff --git a/docs/content/docs/captcha/client-side-usage.mdx b/docs/content/docs/captcha/client-side-usage.mdxindex 9c662b8c5..0430f5b74 100644--- a/docs/content/docs/captcha/client-side-usage.mdx+++ b/docs/content/docs/captcha/client-side-usage.mdx@@ -21,7 +21,25 @@ The easiest way to add the CAPTCHA script to your website is to edit the HTML co</Tab><Tab value="npm">-**Not yet supported**+Install the package with your package manager:++```bash+npm install @swetrix/captcha+```++Then import it in your browser bundle:++```javascript+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";++forceLoadCaptcha();+```</Tab></Tabs>@@ -49,6 +67,7 @@ You can customise the appearance of the CAPTCHA widget by adding the following a| `data-response-input-name` | string | Name of the token input element. Default: `swetrix-captcha-response`. || `data-api-url` | string | The URL of the CAPTCHA API. Default: `https://api.swetrixcaptcha.com/v1/captcha`. If you're self-hosting Swetrix CE, you should put the URL of your API instance here, like `[BASE_URL]/backend/v1/captcha`. Swetrix Cloud users should leave it as is. || `data-lang` | string | Force a specific language for the widget (see [Language support](#language-support)). |+| `data-asset-url` | string | The URL where the CAPTCHA package assets are hosted. Default: `https://cdn.swetrixcaptcha.com/dist/`. |### Language supportdiff --git a/packages/captcha-validator/.github/funding.yml b/packages/captcha-validator/.github/funding.ymldeleted file mode 100644index f7cbd9642..000000000--- a/packages/captcha-validator/.github/funding.yml+++ /dev/null@@ -1,2 +0,0 @@-github: swetrix-ko_fi: andriirdiff --git a/packages/captcha/README.md b/packages/captcha/README.mdindex 74f6eaccf..83da9dbdd 100644--- a/packages/captcha/README.md+++ b/packages/captcha/README.md@@ -20,6 +20,8 @@ See the full documentation at https://docs.swetrix.com/captcha/introduction## Usage+### Script tag+```html<div class="swecaptcha"data-project-id="YOUR_PROJECT_ID"@@ -28,6 +30,25 @@ See the full documentation at https://docs.swetrix.com/captcha/introduction<script src="https://cdn.swetrixcaptcha.com/captcha-loader.js" defer></script>```+### npm++```bash+npm install @swetrix/captcha+```++```javascript+import '@swetrix/captcha'+```++The package automatically renders `.swecaptcha` elements when the DOM is ready. You can also trigger a reload manually:++```javascript+import { forceLoadCaptcha, loadCaptcha } from '@swetrix/captcha'++loadCaptcha()+forceLoadCaptcha()+```+### Options| Attribute | Description | Values | Default |@@ -36,6 +57,7 @@ See the full documentation at https://docs.swetrix.com/captcha/introduction| `data-theme` | Color theme | `auto`, `light`, `dark` | `auto` || `data-response-input-name` | Hidden input name | Any string | `swetrix-captcha-response` || `data-lang` | Force a specific language | `en`, `de`, `fr`, `pl`, `uk`, `hu` | Auto-detected |+| `data-asset-url` | Custom URL for CAPTCHA package assets | Any absolute or relative URL | `https://cdn.swetrixcaptcha.com/dist/` |### Language Supportdiff --git a/packages/captcha/package-lock.json b/packages/captcha/package-lock.jsonindex f68e80bc8..e62abd64a 100644--- a/packages/captcha/package-lock.json+++ b/packages/captcha/package-lock.json@@ -18,6 +18,9 @@"rollup-plugin-copy": "^3.5.0","tslib": "^2.8.1","typescript": "^5.9.3"+ },+ "funding": {+ "url": "https://github.com/sponsors/Swetrix"}},"node_modules/@babel/code-frame": {diff --git a/packages/captcha/package.json b/packages/captcha/package.jsonindex 4bc3febf5..4fe6a2d8c 100644--- a/packages/captcha/package.json+++ b/packages/captcha/package.json@@ -19,21 +19,48 @@"type": "git","url": "git+https://github.com/Swetrix/swetrix.git"},+ "funding": "https://github.com/sponsors/Swetrix","type": "module",+ "main": "dist/captcha-loader.cjs",+ "module": "dist/captcha-loader.esm.js",+ "browser": "dist/captcha-loader.js",+ "unpkg": "dist/captcha-loader.js",+ "jsdelivr": "dist/captcha-loader.js","typings": "dist/esnext/index.d.ts",- "esnext": "dist/esnext/index.js",+ "esnext": "dist/captcha-loader.esm.js","exports": {".": {"types": "./dist/esnext/index.d.ts",- "import": "./dist/esnext/index.js",- "require": "./dist/captcha.cjs.js",- "default": "./dist/captcha.js"- }+ "import": "./dist/captcha-loader.esm.js",+ "require": "./dist/captcha-loader.cjs",+ "default": "./dist/captcha-loader.js"+ },+ "./captcha-loader": {+ "types": "./dist/esnext/captcha-loader.d.ts",+ "import": "./dist/captcha-loader.esm.js",+ "require": "./dist/captcha-loader.cjs",+ "default": "./dist/captcha-loader.js"+ },+ "./dist/captcha-loader.js": "./dist/captcha-loader.js",+ "./dist/captcha.js": "./dist/captcha.js",+ "./dist/pow-worker.js": "./dist/pow-worker.js",+ "./dist/pages/light.html": "./dist/pages/light.html",+ "./dist/pages/dark.html": "./dist/pages/dark.html",+ "./package.json": "./package.json"+ },+ "files": [+ "dist",+ "README.md",+ "LICENSE"+ ],+ "publishConfig": {+ "access": "public"},"scripts": {"prebuild": "rimraf dist",+ "prepack": "npm run build","prepublish": "npm run build",- "build": "rollup -c",+ "build": "rollup -c && npm run tsc","start": "rollup -c -w","tsc": "tsc -p tsconfig.esnext.json"},diff --git a/packages/captcha/rollup.config.mjs b/packages/captcha/rollup.config.mjsindex a0892e6b6..e8f3fc3f0 100644--- a/packages/captcha/rollup.config.mjs+++ b/packages/captcha/rollup.config.mjs@@ -1,4 +1,3 @@-// import commonjs from '@rollup/plugin-commonjs'import copy from 'rollup-plugin-copy'import typescript from '@rollup/plugin-typescript'import terser from '@rollup/plugin-terser'@@ -6,58 +5,48 @@ import pkg from './package.json' with { type: 'json' }import { createRequire } from 'node:module'const CAPTCHA_PATH = 'src/captcha.ts'-const CAPTCHA_LOADER_PATH = 'src/captcha-loader.ts'+const CAPTCHA_LOADER_PATH = 'src/index.ts'const POW_WORKER_PATH = 'src/pow-worker.ts'const require = createRequire(import.meta.url)+const typescriptPlugin = () =>+ typescript({+ outDir: './dist',+ sourceMap: true,+ tslib: require.resolve('tslib'),+ })+export default [{- input: CAPTCHA_PATH,+ input: CAPTCHA_LOADER_PATH,output: [- {- file: pkg.captcha,- format: 'umd',- name: 'captcha',- sourcemap: true,- },- ],- plugins: [- typescript({- outDir: './dist',- sourceMap: true,- tslib: require.resolve('tslib'),- }),-- // copying assets- copy({- targets: [- { src: 'src/assets/*', dest: 'dist/assets' },- { src: 'src/pages/*', dest: 'dist/pages' },- ],- }),- terser(),- // commonjs(),+ { file: pkg.main, format: 'cjs', sourcemap: true, exports: 'named' },+ { file: pkg.module, format: 'es', sourcemap: true },],+ plugins: [typescriptPlugin()],},{input: CAPTCHA_LOADER_PATH,+ output: [{ file: pkg.browser, format: 'umd', name: 'swetrixCaptcha', sourcemap: true, exports: 'named' }],+ plugins: [typescriptPlugin(), terser()],+ },+ {+ input: CAPTCHA_PATH,output: [{- file: pkg.captchaloader,- format: 'umd',- name: 'captcha-loader',+ file: pkg.captcha,+ format: 'iife',+ name: 'captcha',sourcemap: true,},],plugins: [- typescript({- outDir: './dist',- sourceMap: true,- tslib: require.resolve('tslib'),+ typescriptPlugin(),+ copy({+ targets: [{ src: 'src/pages/*', dest: 'dist/pages' }],}),terser(),- // commonjs(),],},{@@ -70,14 +59,6 @@ export default [sourcemap: true,},],- plugins: [- typescript({- outDir: './dist',- sourceMap: true,- tslib: require.resolve('tslib'),- }),- terser(),- // commonjs(),- ],+ plugins: [typescriptPlugin(), terser()],},]diff --git a/packages/captcha/src/captcha-loader.ts b/packages/captcha/src/captcha-loader.tsindex 09aaf686a..fdf951c06 100644--- a/packages/captcha/src/captcha-loader.ts+++ b/packages/captcha/src/captcha-loader.ts@@ -1,18 +1,25 @@-// @ts-ignore-const isDevelopment = window.__SWETRIX_CAPTCHA_DEV || false-const CAPTCHA_SELECTOR = '.swecaptcha'const SUPPORTED_LOCALES = ['en', 'de', 'fr', 'pl', 'uk', 'hu'] as consttype SupportedLocale = (typeof SUPPORTED_LOCALES)[number]const DEFAULT_LOCALE: SupportedLocale = 'en'-const LIGHT_CAPTCHA_IFRAME_URL = isDevelopment ? './light.html' : 'https://cdn.swetrixcaptcha.com/pages/light'-const DARK_CAPTCHA_IFRAME_URL = isDevelopment ? './dark.html' : 'https://cdn.swetrixcaptcha.com/pages/dark'+const DEFAULT_ASSET_BASE_URL = 'https://cdn.swetrixcaptcha.com/dist/'const DEFAULT_RESPONSE_INPUT_NAME = 'swetrix-captcha-response'const MESSAGE_IDENTIFIER = 'swetrix-captcha'const ID_PREFIX = 'swetrix-captcha-'-const THEMES = ['light', 'dark', 'auto']+const THEMES = ['light', 'dark', 'auto'] as constconst DEFAULT_THEME = 'auto'const PID_REGEX = /^(?!.*--)[a-zA-Z0-9-]{12}$/+const SCRIPT_NAME_REGEX = /(?:^|\/)captcha-loader(?:\.[\w-]+)?\.js(?:[?#]|$)/+const LEGACY_CDN_HOST = 'cdn.swetrixcaptcha.com'++declare global {+ interface Window {+ __SWETRIX_CAPTCHA_ASSET_URL?: string+ __SWETRIX_CAPTCHA_DEV?: boolean+ swecaptcha?: boolean+ swetrixCaptchaForceLoad?: () => void+ }+}enum LOG_ACTIONS {log = 'log',@@ -21,6 +28,21 @@ enum LOG_ACTIONS {info = 'info',}+interface CaptchaParams {+ pid: string | null+ respName: string+ theme: string+ lang: SupportedLocale+ assetBaseUrl: string+ apiUrl?: string+}++type CaptchaFrameParams = CaptchaParams & {+ cid: string+}++type CaptchaQueryParams = Record<string, string | null | undefined>+const DUMMY_PIDS = ['AP00000000000', 'FAIL000000000']const isValidPID = (pid: string) => DUMMY_PIDS.includes(pid) || PID_REGEX.test(pid)@@ -31,15 +53,64 @@ const getFrameID = (cid: string) => `${cid}-frame`const ids: string[] = []+let messageListenerRegistered = false+const log = (status: LOG_ACTIONS, text: string) => {console[status](`[Swetrix Captcha] ${text}`)}+const getWindow = () => (typeof window === 'undefined' ? undefined : window)++const getDocument = () => (typeof document === 'undefined' ? undefined : document)++const normalizeAssetBaseURL = (assetBaseUrl: string) => {+ const fallbackBase = getWindow()?.location.href++ try {+ const url = fallbackBase ? new URL(assetBaseUrl, fallbackBase) : new URL(assetBaseUrl)+ return url.href.endsWith('/') ? url.href : `${url.href}/`+ } catch {+ return DEFAULT_ASSET_BASE_URL+ }+}++const getScriptAssetBaseURL = () => {+ const doc = getDocument()+ if (!doc) {+ return DEFAULT_ASSET_BASE_URL+ }++ const currentScript = doc.currentScript as HTMLScriptElement | null+ const scripts = [+ ...(currentScript?.src ? [currentScript] : []),+ ...Array.from(doc.scripts).reverse(),+ ]+ const loaderScript = scripts.find((script) => SCRIPT_NAME_REGEX.test(script.src))++ if (!loaderScript?.src) {+ return DEFAULT_ASSET_BASE_URL+ }++ if (new URL(loaderScript.src).hostname === LEGACY_CDN_HOST) {+ return DEFAULT_ASSET_BASE_URL+ }++ return normalizeAssetBaseURL(new URL('.', loaderScript.src).href)+}++const resolveAssetBaseURL = (container: Element) => {+ const configuredAssetBaseURL =+ container.getAttribute('data-asset-url') ||+ container.getAttribute('data-assets-url') ||+ getWindow()?.__SWETRIX_CAPTCHA_ASSET_URL++ return normalizeAssetBaseURL(configuredAssetBaseURL || getScriptAssetBaseURL())+}+const detectPreferredTheme = (): 'light' | 'dark' => {- if (typeof window !== 'undefined' && window.matchMedia) {- if (window.matchMedia('(prefers-color-scheme: dark)').matches) {- return 'dark'- }+ const win = getWindow()+ if (win?.matchMedia?.('(prefers-color-scheme: dark)').matches) {+ return 'dark'}return 'light'@@ -77,8 +148,8 @@ const detectBrowserLocale = (): SupportedLocale => {return DEFAULT_LOCALE}-const findHtmlLangAttribute = (element: Element): string | null => {- let current: Element | null = element+const findHtmlLangAttribute = (element: Element | null): string | null => {+ let current = elementwhile (current) {const lang = current.getAttribute('lang')@@ -92,55 +163,47 @@ const findHtmlLangAttribute = (element: Element): string | null => {}const detectLanguage = (container: Element): SupportedLocale => {- // First priority: data-lang attribute on the widget elementconst forcedLang = container.getAttribute('data-lang')if (forcedLang) {return normalizeLocale(forcedLang)}- // Second priority: lang attribute on ancestor elements (e.g., <html lang="de">)- const ancestorLang = findHtmlLangAttribute(container.parentElement as Element)+ const ancestorLang = findHtmlLangAttribute(container.parentElement)if (ancestorLang) {return normalizeLocale(ancestorLang)}- // Fallback: browser languagereturn detectBrowserLocale()}-const resolveTheme = (theme: string | null): 'light' | 'dark' => {- if (!theme || theme === 'auto') {- return detectPreferredTheme()+const resolveTheme = (theme: string): 'light' | 'dark' => {+ if (theme === 'light' || theme === 'dark') {+ return theme}- return theme as 'light' | 'dark'+ return detectPreferredTheme()}-const appendParamsToURL = (url: string, params: any) => {- const queryString = Object.keys(params)- .map((key) => {- return `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`- })- .join('&')+const appendParamsToURL = (url: string, params: CaptchaQueryParams) => {+ const urlObject = new URL(url, getWindow()?.location.href)++ Object.entries(params).forEach(([key, value]) => {+ if (value !== null && value !== undefined) {+ urlObject.searchParams.set(key, value)+ }+ })- return `${url}?${queryString}`+ return urlObject.toString()}const clearExistingCaptcha = (container: Element) => {- // Remove existing iframe(s) that belong to this captchaconst existingFrames = container.querySelectorAll('iframe[id^="swetrix-captcha-"]')existingFrames.forEach((frame) => {- const frameId = frame.id- // Extract cid from frame id (e.g., "swetrix-captcha-abc123-frame" -> "swetrix-captcha-abc123")- const cid = frameId.replace('-frame', '')-- // Remove the corresponding hidden input+ const cid = frame.id.replace('-frame', '')const input = container.querySelector(`input[id="${cid}"]`)- if (input) {- input.remove()- }- // Remove the cid from ids array+ input?.remove()+const cidIndex = ids.indexOf(cid)if (cidIndex > -1) {ids.splice(cidIndex, 1)@@ -150,14 +213,12 @@ const clearExistingCaptcha = (container: Element) => {})}-const renderCaptcha = (container: Element, params: any) => {- // Clear any existing captcha in this container before rendering+const renderCaptcha = (container: Element, params: CaptchaParams) => {clearExistingCaptcha(container)- const cid = generateRandomID()const cParams = {...params,- cid, // CAPTCHA ID+ cid: generateRandomID(),}const frame = generateCaptchaFrame(cParams)@@ -180,9 +241,7 @@ const generateRandomID = (): string => {}const postMessageCallback = (pmEvent: MessageEvent) => {- // TODO: Validate origin-- const { data } = pmEvent+ const data = pmEvent.data as { type?: string; cid?: string; event?: string; token?: string } | nullif (!data) {return@@ -198,7 +257,7 @@ const postMessageCallback = (pmEvent: MessageEvent) => {return}- const input = document.getElementById(cid)+ const input = getDocument()?.getElementById(cid) as HTMLInputElement | nullconst inputExists = input !== nullswitch (event) {@@ -210,31 +269,18 @@ const postMessageCallback = (pmEvent: MessageEvent) => {return}- // @ts-ignore- input.value = token-- break- }-- case 'failure': {- if (!inputExists) {- log(LOG_ACTIONS.error, '[PM -> failure] Input element does not exist.')- return- }-- // @ts-ignore- input.value = ''+ input.value = token || ''break}+ case 'failure':case 'tokenExpired': {if (!inputExists) {log(LOG_ACTIONS.error, '[PM -> failure] Input element does not exist.')return}- // @ts-ignoreinput.value = ''break@@ -242,16 +288,18 @@ const postMessageCallback = (pmEvent: MessageEvent) => {}}-const generateCaptchaFrame = (params: any) => {- const { theme: rawTheme } = params+const generateCaptchaFrame = (params: CaptchaFrameParams) => {+ const { assetBaseUrl, cid, theme: rawTheme, ...queryParams } = paramsconst theme = resolveTheme(rawTheme)const captchaFrame = document.createElement('iframe')+ const captchaPage = theme === 'dark' ? 'pages/dark.html' : 'pages/light.html'- captchaFrame.id = getFrameID(params.cid)- captchaFrame.src =- theme === 'dark'- ? appendParamsToURL(DARK_CAPTCHA_IFRAME_URL, params)- : appendParamsToURL(LIGHT_CAPTCHA_IFRAME_URL, params)+ captchaFrame.id = getFrameID(cid)+ captchaFrame.src = appendParamsToURL(new URL(captchaPage, assetBaseUrl).toString(), {+ ...queryParams,+ cid,+ theme: rawTheme,+ })captchaFrame.style.height = FRAME_HEIGHTcaptchaFrame.title = 'Swetrix Captcha - Human verification'captchaFrame.style.border = 'none'@@ -264,7 +312,7 @@ const generateCaptchaFrame = (params: any) => {return captchaFrame}-const generateHiddenInput = (params: any) => {+const generateHiddenInput = (params: CaptchaFrameParams) => {const { cid } = paramsconst input = document.createElement('input')@@ -278,10 +326,10 @@ const generateHiddenInput = (params: any) => {return input}-const validateParams = (params: any) => {+const validateParams = (params: CaptchaParams) => {const { theme, pid } = params- if (theme && !THEMES.includes(theme)) {+ if (theme && !THEMES.includes(theme as (typeof THEMES)[number])) {log(LOG_ACTIONS.error, `Invalid data-theme parameter: ${theme}. Valid options are: ${THEMES.join(', ')}`)return false}@@ -294,15 +342,15 @@ const validateParams = (params: any) => {return true}-const parseParams = (container: Element): object => {- const params: Record<string, string | null> = {+const parseParams = (container: Element): CaptchaParams => {+ const params: CaptchaParams = {pid: container.getAttribute('data-project-id'),respName: container.getAttribute('data-response-input-name') || DEFAULT_RESPONSE_INPUT_NAME,theme: container.getAttribute('data-theme') || DEFAULT_THEME,lang: detectLanguage(container),+ assetBaseUrl: resolveAssetBaseURL(container),}- // Optional custom API URLconst apiUrl = container.getAttribute('data-api-url')if (apiUrl) {params.apiUrl = apiUrl@@ -311,17 +359,33 @@ const parseParams = (container: Element): object => {return params}-const main = (forced = false) => {- if (!forced && 'swecaptcha' in window) {+const registerMessageListener = () => {+ const win = getWindow()++ if (!win || messageListenerRegistered) {+ return+ }++ win.addEventListener('message', postMessageCallback)+ messageListenerRegistered = true+}++export const loadCaptcha = (forced = false) => {+ const win = getWindow()+ const doc = getDocument()++ if (!win || !doc) {+ return+ }++ if (!forced && 'swecaptcha' in win) {log(LOG_ACTIONS.warn, 'Captcha is already loaded.')}- // TODO: Add some callbacks here- // @ts-ignore- window.swecaptcha = true- window.addEventListener('message', postMessageCallback)+ win.swecaptcha = true+ registerMessageListener()- const containers = Array.from(document.querySelectorAll(CAPTCHA_SELECTOR))+ const containers = Array.from(doc.querySelectorAll(CAPTCHA_SELECTOR))for (const container of containers) {const params = parseParams(container)@@ -335,7 +399,24 @@ const main = (forced = false) => {}}-// @ts-ignore-window.swetrixCaptchaForceLoad = () => main(true)+export const forceLoadCaptcha = () => loadCaptcha(true)++const setupCaptcha = () => {+ const win = getWindow()+ const doc = getDocument()++ if (!win || !doc) {+ return+ }++ win.swetrixCaptchaForceLoad = forceLoadCaptcha++ if (doc.readyState === 'loading') {+ doc.addEventListener('DOMContentLoaded', () => loadCaptcha(), { once: true })+ return+ }++ loadCaptcha()+}-document.addEventListener('DOMContentLoaded', () => main())+setupCaptcha()diff --git a/packages/captcha/src/captcha.ts b/packages/captcha/src/captcha.tsindex b1dba54d9..052b3ae6f 100644--- a/packages/captcha/src/captcha.ts+++ b/packages/captcha/src/captcha.ts@@ -3,13 +3,46 @@ import { logger } from './logger'export {}-// @ts-ignore-const isDevelopment = window.__SWETRIX_CAPTCHA_DEV || false+declare global {+ interface Window {+ __SWETRIX_API_URL?: string+ __SWETRIX_CAPTCHA_ASSET_URL?: string+ __SWETRIX_CAPTCHA_DEV?: boolean+ __SWETRIX_CAPTCHA_ID?: string+ __SWETRIX_PROJECT_ID?: string+ }+}+const DEFAULT_ASSET_BASE_URL = 'https://cdn.swetrixcaptcha.com/dist/'+const getWindow = () => (typeof window === 'undefined' ? undefined : window)+const isDevelopment = getWindow()?.__SWETRIX_CAPTCHA_DEV || falseconst 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_URL-const WORKER_URL = isDevelopment ? './pow-worker.js' : 'https://cdn.swetrixcaptcha.com/pow-worker.js'+const API_URL: string = getWindow()?.__SWETRIX_API_URL || DEFAULT_API_URL+const normalizeAssetBaseURL = (assetBaseUrl: string) => {+ const fallbackBase = getWindow()?.location.href++ try {+ const url = fallbackBase ? new URL(assetBaseUrl, fallbackBase) : new URL(assetBaseUrl)+ return url.href.endsWith('/') ? url.href : `${url.href}/`+ } catch {+ return DEFAULT_ASSET_BASE_URL+ }+}+const getScriptAssetBaseURL = () => {+ if (typeof document === 'undefined') {+ return DEFAULT_ASSET_BASE_URL+ }++ const currentScript = document.currentScript as HTMLScriptElement | null++ if (!currentScript?.src) {+ return DEFAULT_ASSET_BASE_URL+ }++ return normalizeAssetBaseURL(new URL('.', currentScript.src).href)+}+const getAssetBaseURL = () => normalizeAssetBaseURL(getWindow()?.__SWETRIX_CAPTCHA_ASSET_URL || getScriptAssetBaseURL())+const WORKER_URL = new URL('pow-worker.js', getAssetBaseURL()).toString()const MSG_IDENTIFIER = 'swetrix-captcha'const CAPTCHA_TOKEN_LIFETIME = 300 // seconds (5 minutes).@@ -74,8 +107,7 @@ const sendMessageToLoader = (event: IFRAME_MESSAGE_TYPES, data = {}) => {{event,type: MSG_IDENTIFIER,- // @ts-ignore- cid: window.__SWETRIX_CAPTCHA_ID,+ cid: getWindow()?.__SWETRIX_CAPTCHA_ID,...data,},'*',@@ -257,8 +289,7 @@ const generateChallenge = async (): Promise<PowChallenge | null> => {'Content-Type': 'application/json',},body: JSON.stringify({- // @ts-ignore- pid: window.__SWETRIX_PROJECT_ID,+ pid: getWindow()?.__SWETRIX_PROJECT_ID,}),})@@ -286,8 +317,7 @@ const verifySolution = async (challenge: string, nonce: number, solution: stringchallenge,nonce,solution,- // @ts-ignore- pid: window.__SWETRIX_PROJECT_ID,+ pid: getWindow()?.__SWETRIX_PROJECT_ID,}),})diff --git a/packages/captcha/src/index.ts b/packages/captcha/src/index.tsnew file mode 100644index 000000000..fe36f8590--- /dev/null+++ b/packages/captcha/src/index.ts@@ -0,0 +1,8 @@+import { forceLoadCaptcha, loadCaptcha } from './captcha-loader'++export { forceLoadCaptcha, loadCaptcha }++export default {+ forceLoadCaptcha,+ loadCaptcha,+}