Skip to content

feat: enhance global configuration handling and improve attribute retrieval logic #4198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yashh56 wants to merge 4 commits into
base: dev
Choose a base branch
from
+26 −6
Open

feat: enhance global configuration handling and improve attribute retrieval logic #4198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3854d70
Enhance global configuration handling and improve attribute retrieval…
Yashh56 Apr 23, 2026
f9be019
Fix global configuration attribute retrieval to handle null values
Yashh56 Apr 23, 2026
39704b4
Refactor global configuration handling to support various value types…
Yashh56 Apr 24, 2026
1c58dcd
Refactor global configuration handling to improve value type checks a…
Yashh56 Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/recorder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,18 @@ import { record } from 'rrweb';
const { currentScript } = document;
if (!currentScript) return;

const globalConfig = window.umamiConfig || {};
const _data = 'data-';
const attr = currentScript.getAttribute.bind(currentScript);
const config = value => attr(`${_data}${value}`);
const toCamelCase = str => str.replace(/-([a-z])/g, g => g[1].toUpperCase());
const config = value => {
const camelKey = toCamelCase(value);
if (globalConfig[camelKey] != null) {
const v = globalConfig[camelKey];
return Array.isArray(v) ? v.join(',') : String(v);
}
return attr(`${_data}${value}`);
};

const website = config(`website-id`);
const hostUrl = config(`host-url`);
Expand Down
21 changes: 16 additions & 5 deletions src/tracker/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
doNotTrack,
} = window;
const { currentScript, referrer } = document;
if (!currentScript) return;
const globalConfig = window.umamiConfig || {};
if (!currentScript && !globalConfig.websiteId) return;

const { hostname, href, origin } = location;

Expand All @@ -23,8 +24,18 @@
const _data = 'data-';
const _false = 'false';
const _true = 'true';
const attr = currentScript.getAttribute.bind(currentScript);
const config = value => attr(`${_data}${value}`);
const attr = currentScript ? currentScript.getAttribute.bind(currentScript) : () => null;

const toCamelCase = str => str.replace(/-([a-z])/g, g => g[1].toUpperCase());

const config = value => {
const camelKey = toCamelCase(value);
if (globalConfig[camelKey] != null) {
const v = globalConfig[camelKey];
return value === 'before-send' && typeof v === 'function' ? v : Array.isArray(v) ? v.join(',') : String(v);
}
return attr(`${_data}${value}`);
};
Comment thread
Yashh56 marked this conversation as resolved.
Comment thread
Yashh56 marked this conversation as resolved.

const website = config('website-id');
const hostUrl = config('host-url');
Expand All @@ -40,7 +51,7 @@

const domains = domain.split(',').map(n => n.trim());
const host =
hostUrl || '__COLLECT_API_HOST__' || currentScript.src.split('/').slice(0, -1).join('/');
hostUrl || '__COLLECT_API_HOST__' || (currentScript ? currentScript.src.split('/').slice(0, -1).join('/') : '');
const endpoint = `${host.replace(/\/$/, '')}__COLLECT_API_ENDPOINT__`;
const screen = `${width}x${height}`;
const eventRegex = /data-umami-event-([\w-_]+)/;
Expand Down Expand Up @@ -163,7 +174,7 @@
const send = async (payload, type = 'event') => {
if (trackingDisabled()) return;

const callback = window[beforeSend];
const callback = typeof beforeSend === 'function' ? beforeSend : window[beforeSend];

if (typeof callback === 'function') {
payload = await Promise.resolve(callback(type, payload));
Expand Down