swetrix 2.4.0 → 3.0.0

package/dist/swetrix.es5.js

@@ -110,7 +110,7 @@ var Lib = /** @class */ (function () {
         if (!this.canTrack()) {
             return;
         }
-        var data = __assign({ pid: this.projectID, pg: this.activePage, lc: getLocale(), tz: getTimezone(), ref: getReferrer(), so: getUTMSource(), me: getUTMMedium(), ca: getUTMCampaign() }, event);
+        var data = __assign(__assign({}, event), { pid: this.projectID, pg: this.activePage, lc: getLocale(), tz: getTimezone(), ref: getReferrer(), so: getUTMSource(), me: getUTMMedium(), ca: getUTMCampaign() });
         this.sendRequest('custom', data);
     };
     Lib.prototype.trackPageViews = function (options) {
@@ -121,14 +121,12 @@ var Lib = /** @class */ (function () {
             return this.pageData.actions;
         }
         this.pageViewsOptions = options;
-        var hbInterval, interval;
+        var interval;
         if (!(options === null || options === void 0 ? void 0 : options.unique)) {
             interval = setInterval(this.trackPathChange, 2000);
         }
-        if (!(options === null || options === void 0 ? void 0 : options.noHeartbeat)) {
-            setTimeout(this.heartbeat, 3000);
-            hbInterval = setInterval(this.heartbeat, 28000);
-        }
+        setTimeout(this.heartbeat, 3000);
+        var hbInterval = setInterval(this.heartbeat, 28000);
         var path = getPath({
             hash: options === null || options === void 0 ? void 0 : options.hash,
             search: options === null || options === void 0 ? void 0 : options.search,
@@ -157,23 +155,17 @@ var Lib = /** @class */ (function () {
         this.perfStatsCollected = true;
         return {
             // Network
-            // @ts-ignore
-            dns: perf.domainLookupEnd - perf.domainLookupStart,
-            // @ts-ignore
-            tls: perf.secureConnectionStart ? perf.requestStart - perf.secureConnectionStart : 0,
-            // @ts-ignore
-            conn: perf.secureConnectionStart ? perf.secureConnectionStart - perf.connectStart : perf.connectEnd - perf.connectStart,
-            // @ts-ignore
-            response: perf.responseEnd - perf.responseStart,
+            dns: perf.domainLookupEnd - perf.domainLookupStart, // DNS Resolution
+            tls: perf.secureConnectionStart ? perf.requestStart - perf.secureConnectionStart : 0, // TLS Setup; checking if secureConnectionStart is not 0 (it's 0 for non-https websites)
+            conn: perf.secureConnectionStart
+                ? perf.secureConnectionStart - perf.connectStart
+                : perf.connectEnd - perf.connectStart, // Connection time
+            response: perf.responseEnd - perf.responseStart, // Response Time (Download)
             // Frontend
-            // @ts-ignore
-            render: perf.domComplete - perf.domContentLoadedEventEnd,
-            // @ts-ignore
-            dom_load: perf.domContentLoadedEventEnd - perf.responseEnd,
-            // @ts-ignore
-            page_load: perf.loadEventStart,
+            render: perf.domComplete - perf.domContentLoadedEventEnd, // Browser rendering the HTML time
+            dom_load: perf.domContentLoadedEventEnd - perf.responseEnd, // DOM loading timing
+            page_load: perf.loadEventStart, // Page load time
             // Backend
-            // @ts-ignore
             ttfb: perf.responseStart - perf.requestStart,
         };
     };
@@ -187,20 +179,6 @@ var Lib = /** @class */ (function () {
         };
         this.sendRequest('hb', data);
     };
-    Lib.prototype.checkIgnore = function (path) {
-        var _a;
-        var ignore = (_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.ignore;
-        if (Array.isArray(ignore)) {
-            for (var i = 0; i < ignore.length; ++i) {
-                if (ignore[i] === path)
-                    return true;
-                // @ts-ignore
-                if (ignore[i] instanceof RegExp && ignore[i].test(path))
-                    return true;
-            }
-        }
-        return false;
-    };
     // Tracking path changes. If path changes -> calling this.trackPage method
     Lib.prototype.trackPathChange = function () {
         var _a, _b;
@@ -216,15 +194,10 @@ var Lib = /** @class */ (function () {
         }
     };
     Lib.prototype.getPreviousPage = function () {
-        var _a, _b;
         // Assuming that this function is called in trackPage and this.activePage is not overwritten by new value yet
         // That method of getting previous page works for SPA websites
         if (this.activePage) {
-            var shouldIgnore = this.checkIgnore(this.activePage);
-            if (shouldIgnore && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.doNotAnonymise)) {
-                return null;
-            }
-            return shouldIgnore ? null : this.activePage;
+            return this.activePage;
         }
         // Checking if URL is supported by the browser (for example, IE11 does not support it)
         if (typeof URL === 'function') {
@@ -240,76 +213,60 @@ var Lib = /** @class */ (function () {
                 if (host !== refHost) {
                     return null;
                 }
-                var shouldIgnore = this.checkIgnore(pathname);
-                if (shouldIgnore && ((_b = this.pageViewsOptions) === null || _b === void 0 ? void 0 : _b.doNotAnonymise)) {
-                    return null;
-                }
-                return shouldIgnore ? null : pathname;
+                return pathname;
             }
-            catch (_c) {
+            catch (_a) {
                 return null;
             }
         }
         return null;
     };
     Lib.prototype.trackPage = function (pg, unique) {
-        var _a, _b;
         if (unique === void 0) { unique = false; }
         if (!this.pageData)
             return;
         this.pageData.path = pg;
-        var shouldIgnore = this.checkIgnore(pg);
-        if (shouldIgnore && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.doNotAnonymise))
-            return;
         var perf = this.getPerformanceStats();
-        var prev;
-        if (!((_b = this.pageViewsOptions) === null || _b === void 0 ? void 0 : _b.noUserFlow)) {
-            prev = this.getPreviousPage();
-        }
+        var prev = this.getPreviousPage();
         this.activePage = pg;
-        this.submitPageView(shouldIgnore ? null : pg, prev, unique, perf);
+        this.submitPageView(pg, prev, unique, perf, true);
     };
-    Lib.prototype.submitPageView = function (pg, prev, unique, perf) {
-        var data = {
+    Lib.prototype.submitPageView = function (pg, prev, unique, perf, evokeCallback) {
+        var _a;
+        var privateData = {
             pid: this.projectID,
+            perf: perf,
+            unique: unique,
+        };
+        var pvPayload = {
             lc: getLocale(),
             tz: getTimezone(),
             ref: getReferrer(),
             so: getUTMSource(),
             me: getUTMMedium(),
             ca: getUTMCampaign(),
-            unique: unique,
             pg: pg,
-            perf: perf,
             prev: prev,
         };
-        this.sendRequest('', data);
-    };
-    Lib.prototype.debug = function (message) {
-        var _a;
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.debug) {
-            console.log('[Swetrix]', message);
+        if (evokeCallback && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.callback)) {
+            var callbackResult = this.pageViewsOptions.callback(pvPayload);
+            if (callbackResult === false) {
+                return;
+            }
+            if (callbackResult && typeof callbackResult === 'object') {
+                Object.assign(pvPayload, callbackResult);
+            }
         }
+        Object.assign(pvPayload, privateData);
+        this.sendRequest('', pvPayload);
     };
     Lib.prototype.canTrack = function () {
         var _a, _b, _c, _d;
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.disabled) {
-            this.debug('Tracking disabled: the \'disabled\' setting is set to true.');
-            return false;
-        }
-        if (!isInBrowser()) {
-            this.debug('Tracking disabled: script does not run in browser environment.');
-            return false;
-        }
-        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.respectDNT) && ((_c = window.navigator) === null || _c === void 0 ? void 0 : _c.doNotTrack) === '1') {
-            this.debug('Tracking disabled: respecting user\'s \'Do Not Track\' preference.');
-            return false;
-        }
-        if (!((_d = this.options) === null || _d === void 0 ? void 0 : _d.debug) && isLocalhost()) {
-            return false;
-        }
-        if (isAutomated()) {
-            this.debug('Tracking disabled: navigation is automated by WebDriver.');
+        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.disabled) ||
+            !isInBrowser() ||
+            (((_b = this.options) === null || _b === void 0 ? void 0 : _b.respectDNT) && ((_c = window.navigator) === null || _c === void 0 ? void 0 : _c.doNotTrack) === '1') ||
+            (!((_d = this.options) === null || _d === void 0 ? void 0 : _d.devMode) && isLocalhost()) ||
+            isAutomated()) {
             return false;
         }
         return true;

package/dist/swetrix.js

@@ -1 +1 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).swetrix={})}(this,function(o){"use strict";function t(t){return(t=location.search.match(t))&&t[2]||void 0}function i(){return void 0!==navigator.languages?navigator.languages[0]:navigator.language}function a(){try{return Intl.DateTimeFormat().resolvedOptions().timeZone}catch(t){}}function s(){return document.referrer||void 0}function r(){return t(n)}function c(){return t(p)}function u(){return t(h)}function l(t){var e,n=location.pathname||"";return t.hash&&(n+=-1<(e=location.hash.indexOf("?"))?location.hash.substring(0,e):location.hash),t.search&&(e=location.hash.indexOf("?"),n+=location.search||(-1<e?location.hash.substring(e):"")),n}var e=function(){return(e=Object.assign||function(t){for(var e,n=1,o=arguments.length;n<o;n++)for(var i in e=arguments[n])Object.prototype.hasOwnProperty.call(e,i)&&(t[i]=e[i]);return t}).apply(this,arguments)},n=/[?&](ref|source|utm_source)=([^?&]+)/,h=/[?&](utm_campaign)=([^?&]+)/,p=/[?&](utm_medium)=([^?&]+)/,d={stop:function(){}},g=(f.prototype.track=function(t){this.canTrack()&&(t=e({pid:this.projectID,pg:this.activePage,lc:i(),tz:a(),ref:s(),so:r(),me:c(),ca:u()},t),this.sendRequest("custom",t))},f.prototype.trackPageViews=function(t){var e,n,o;return this.canTrack()?(this.pageData||(null!=(this.pageViewsOptions=t)&&t.unique||(n=setInterval(this.trackPathChange,2e3)),null!=t&&t.noHeartbeat||(setTimeout(this.heartbeat,3e3),e=setInterval(this.heartbeat,28e3)),o=l({hash:null==t?void 0:t.hash,search:null==t?void 0:t.search}),this.pageData={path:o,actions:{stop:function(){clearInterval(n),clearInterval(e)}}},this.trackPage(o,null==t?void 0:t.unique)),this.pageData.actions):d},f.prototype.getPerformanceStats=function(){var t;return this.canTrack()&&!this.perfStatsCollected&&null!=(t=window.performance)&&t.getEntriesByType&&(t=window.performance.getEntriesByType("navigation")[0])?(this.perfStatsCollected=!0,{dns:t.domainLookupEnd-t.domainLookupStart,tls:t.secureConnectionStart?t.requestStart-t.secureConnectionStart:0,conn:t.secureConnectionStart?t.secureConnectionStart-t.connectStart:t.connectEnd-t.connectStart,response:t.responseEnd-t.responseStart,render:t.domComplete-t.domContentLoadedEventEnd,dom_load:t.domContentLoadedEventEnd-t.responseEnd,page_load:t.loadEventStart,ttfb:t.responseStart-t.requestStart}):{}},f.prototype.heartbeat=function(){var t;(null!=(t=this.pageViewsOptions)&&t.heartbeatOnBackground||"hidden"!==document.visibilityState)&&(t={pid:this.projectID},this.sendRequest("hb",t))},f.prototype.checkIgnore=function(t){var e,n=null==(e=this.pageViewsOptions)?void 0:e.ignore;if(Array.isArray(n))for(var o=0;o<n.length;++o){if(n[o]===t)return!0;if(n[o]instanceof RegExp&&n[o].test(t))return!0}return!1},f.prototype.trackPathChange=function(){var t;this.pageData&&(t=l({hash:null==(t=this.pageViewsOptions)?void 0:t.hash,search:null==(t=this.pageViewsOptions)?void 0:t.search}),this.pageData.path!==t)&&this.trackPage(t,!1)},f.prototype.getPreviousPage=function(){var t;if(this.activePage)return(o=this.checkIgnore(this.activePage))&&null!=(e=this.pageViewsOptions)&&e.doNotAnonymise||o?null:this.activePage;if("function"==typeof URL){var e=s();if(!e)return null;var n=location.host;try{var o,i=new URL(e),a=i.host,r=i.pathname;return n!==a?null:(o=this.checkIgnore(r))&&null!=(t=this.pageViewsOptions)&&t.doNotAnonymise||o?null:r}catch(t){}}return null},f.prototype.trackPage=function(t,e){var n,o,i,a;void 0===e&&(e=!1),this.pageData&&(this.pageData.path=t,(o=this.checkIgnore(t))&&null!=(i=this.pageViewsOptions)&&i.doNotAnonymise||(i=this.getPerformanceStats(),null!=(n=this.pageViewsOptions)&&n.noUserFlow||(a=this.getPreviousPage()),this.activePage=t,this.submitPageView(o?null:t,a,e,i)))},f.prototype.submitPageView=function(t,e,n,o){n={pid:this.projectID,lc:i(),tz:a(),ref:s(),so:r(),me:c(),ca:u(),unique:n,pg:t,perf:o,prev:e};this.sendRequest("",n)},f.prototype.debug=function(t){var e;null!=(e=this.options)&&e.debug&&console.log("[Swetrix]",t)},f.prototype.canTrack=function(){var t;return null!=(t=this.options)&&t.disabled?(this.debug("Tracking disabled: the 'disabled' setting is set to true."),!1):"undefined"==typeof window?(this.debug("Tracking disabled: script does not run in browser environment."),!1):null!=(t=this.options)&&t.respectDNT&&"1"===(null==(t=window.navigator)?void 0:t.doNotTrack)?(this.debug("Tracking disabled: respecting user's 'Do Not Track' preference."),!1):!(!(null!=(t=this.options)&&t.debug||"localhost"!==(null===location||void 0===location?void 0:location.hostname)&&"127.0.0.1"!==(null===location||void 0===location?void 0:location.hostname)&&""!==(null===location||void 0===location?void 0:location.hostname))||null!==navigator&&void 0!==navigator&&navigator.webdriver&&(this.debug("Tracking disabled: navigation is automated by WebDriver."),1))},f.prototype.sendRequest=function(t,e){var n=(null==(n=this.options)?void 0:n.apiURL)||"https://api.swetrix.com/log",o=new XMLHttpRequest;o.open("POST","".concat(n,"/").concat(t),!0),o.setRequestHeader("Content-Type","application/json"),o.send(JSON.stringify(e))},f);function f(t,e){this.projectID=t,this.options=e,this.pageData=null,this.pageViewsOptions=null,this.perfStatsCollected=!1,this.activePage=null,this.trackPathChange=this.trackPathChange.bind(this),this.heartbeat=this.heartbeat.bind(this)}o.LIB_INSTANCE=null,o.init=function(t,e){return o.LIB_INSTANCE||(o.LIB_INSTANCE=new g(t,e)),o.LIB_INSTANCE},o.track=function(t){o.LIB_INSTANCE&&o.LIB_INSTANCE.track(t)},o.trackPageview=function(t,e,n){o.LIB_INSTANCE&&o.LIB_INSTANCE.submitPageView(t,e||null,Boolean(n),{})},o.trackViews=function(e){return new Promise(function(t){o.LIB_INSTANCE?"undefined"==typeof document||"complete"===document.readyState?t(o.LIB_INSTANCE.trackPageViews(e)):window.addEventListener("load",function(){t(o.LIB_INSTANCE.trackPageViews(e))}):t(d)})},Object.defineProperty(o,"__esModule",{value:!0})});
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).swetrix={})}(this,function(a){"use strict";function t(t){return(t=location.search.match(t))&&t[2]||void 0}function i(){return void 0!==navigator.languages?navigator.languages[0]:navigator.language}function r(){try{return Intl.DateTimeFormat().resolvedOptions().timeZone}catch(t){}}function s(){return document.referrer||void 0}function c(){return t(n)}function u(){return t(p)}function l(){return t(h)}function o(t){var e,n=location.pathname||"";return t.hash&&(n+=-1<(e=location.hash.indexOf("?"))?location.hash.substring(0,e):location.hash),t.search&&(e=location.hash.indexOf("?"),n+=location.search||(-1<e?location.hash.substring(e):"")),n}var e=function(){return(e=Object.assign||function(t){for(var e,n=1,a=arguments.length;n<a;n++)for(var o in e=arguments[n])Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);return t}).apply(this,arguments)},n=/[?&](ref|source|utm_source)=([^?&]+)/,h=/[?&](utm_campaign)=([^?&]+)/,p=/[?&](utm_medium)=([^?&]+)/,d={stop:function(){}},f=(g.prototype.track=function(t){this.canTrack()&&(t=e(e({},t),{pid:this.projectID,pg:this.activePage,lc:i(),tz:r(),ref:s(),so:c(),me:u(),ca:l()}),this.sendRequest("custom",t))},g.prototype.trackPageViews=function(t){var e,n,a;return this.canTrack()?(this.pageData||(null!=(this.pageViewsOptions=t)&&t.unique||(e=setInterval(this.trackPathChange,2e3)),setTimeout(this.heartbeat,3e3),n=setInterval(this.heartbeat,28e3),a=o({hash:null==t?void 0:t.hash,search:null==t?void 0:t.search}),this.pageData={path:a,actions:{stop:function(){clearInterval(e),clearInterval(n)}}},this.trackPage(a,null==t?void 0:t.unique)),this.pageData.actions):d},g.prototype.getPerformanceStats=function(){var t;return this.canTrack()&&!this.perfStatsCollected&&null!=(t=window.performance)&&t.getEntriesByType&&(t=window.performance.getEntriesByType("navigation")[0])?(this.perfStatsCollected=!0,{dns:t.domainLookupEnd-t.domainLookupStart,tls:t.secureConnectionStart?t.requestStart-t.secureConnectionStart:0,conn:t.secureConnectionStart?t.secureConnectionStart-t.connectStart:t.connectEnd-t.connectStart,response:t.responseEnd-t.responseStart,render:t.domComplete-t.domContentLoadedEventEnd,dom_load:t.domContentLoadedEventEnd-t.responseEnd,page_load:t.loadEventStart,ttfb:t.responseStart-t.requestStart}):{}},g.prototype.heartbeat=function(){var t;(null!=(t=this.pageViewsOptions)&&t.heartbeatOnBackground||"hidden"!==document.visibilityState)&&(t={pid:this.projectID},this.sendRequest("hb",t))},g.prototype.trackPathChange=function(){var t;this.pageData&&(t=o({hash:null==(t=this.pageViewsOptions)?void 0:t.hash,search:null==(t=this.pageViewsOptions)?void 0:t.search}),this.pageData.path!==t)&&this.trackPage(t,!1)},g.prototype.getPreviousPage=function(){if(this.activePage)return this.activePage;if("function"==typeof URL){var t=s();if(!t)return null;var e=location.host;try{var n=new URL(t),a=n.host,o=n.pathname;return e!==a?null:o}catch(t){}}return null},g.prototype.trackPage=function(t,e){var n,a;void 0===e&&(e=!1),this.pageData&&(this.pageData.path=t,n=this.getPerformanceStats(),a=this.getPreviousPage(),this.activePage=t,this.submitPageView(t,a,e,n,!0))},g.prototype.submitPageView=function(t,e,n,a,o){a={pid:this.projectID,perf:a,unique:n},n={lc:i(),tz:r(),ref:s(),so:c(),me:u(),ca:l(),pg:t,prev:e};if(o&&null!=(t=this.pageViewsOptions)&&t.callback){e=this.pageViewsOptions.callback(n);if(!1===e)return;e&&"object"==typeof e&&Object.assign(n,e)}Object.assign(n,a),this.sendRequest("",n)},g.prototype.canTrack=function(){var t;return!(null!=(t=this.options)&&t.disabled||"undefined"==typeof window||null!=(t=this.options)&&t.respectDNT&&"1"===(null==(t=window.navigator)?void 0:t.doNotTrack)||(null==(t=this.options)||!t.devMode)&&("localhost"===(null===location||void 0===location?void 0:location.hostname)||"127.0.0.1"===(null===location||void 0===location?void 0:location.hostname)||""===(null===location||void 0===location?void 0:location.hostname))||null!==navigator&&void 0!==navigator&&navigator.webdriver)},g.prototype.sendRequest=function(t,e){var n=(null==(n=this.options)?void 0:n.apiURL)||"https://api.swetrix.com/log",a=new XMLHttpRequest;a.open("POST","".concat(n,"/").concat(t),!0),a.setRequestHeader("Content-Type","application/json"),a.send(JSON.stringify(e))},g);function g(t,e){this.projectID=t,this.options=e,this.pageData=null,this.pageViewsOptions=null,this.perfStatsCollected=!1,this.activePage=null,this.trackPathChange=this.trackPathChange.bind(this),this.heartbeat=this.heartbeat.bind(this)}a.LIB_INSTANCE=null,a.init=function(t,e){return a.LIB_INSTANCE||(a.LIB_INSTANCE=new f(t,e)),a.LIB_INSTANCE},a.track=function(t){a.LIB_INSTANCE&&a.LIB_INSTANCE.track(t)},a.trackPageview=function(t,e,n){a.LIB_INSTANCE&&a.LIB_INSTANCE.submitPageView(t,e||null,Boolean(n),{})},a.trackViews=function(e){return new Promise(function(t){a.LIB_INSTANCE?"undefined"==typeof document||"complete"===document.readyState?t(a.LIB_INSTANCE.trackPageViews(e)):window.addEventListener("load",function(){t(a.LIB_INSTANCE.trackPageViews(e))}):t(d)})},Object.defineProperty(a,"__esModule",{value:!0})});

package/dist/swetrix.orig.js

@@ -116,7 +116,7 @@
             if (!this.canTrack()) {
                 return;
             }
-            var data = __assign({ pid: this.projectID, pg: this.activePage, lc: getLocale(), tz: getTimezone(), ref: getReferrer(), so: getUTMSource(), me: getUTMMedium(), ca: getUTMCampaign() }, event);
+            var data = __assign(__assign({}, event), { pid: this.projectID, pg: this.activePage, lc: getLocale(), tz: getTimezone(), ref: getReferrer(), so: getUTMSource(), me: getUTMMedium(), ca: getUTMCampaign() });
             this.sendRequest('custom', data);
         };
         Lib.prototype.trackPageViews = function (options) {
@@ -127,14 +127,12 @@
                 return this.pageData.actions;
             }
             this.pageViewsOptions = options;
-            var hbInterval, interval;
+            var interval;
             if (!(options === null || options === void 0 ? void 0 : options.unique)) {
                 interval = setInterval(this.trackPathChange, 2000);
             }
-            if (!(options === null || options === void 0 ? void 0 : options.noHeartbeat)) {
-                setTimeout(this.heartbeat, 3000);
-                hbInterval = setInterval(this.heartbeat, 28000);
-            }
+            setTimeout(this.heartbeat, 3000);
+            var hbInterval = setInterval(this.heartbeat, 28000);
             var path = getPath({
                 hash: options === null || options === void 0 ? void 0 : options.hash,
                 search: options === null || options === void 0 ? void 0 : options.search,
@@ -163,23 +161,17 @@
             this.perfStatsCollected = true;
             return {
                 // Network
-                // @ts-ignore
-                dns: perf.domainLookupEnd - perf.domainLookupStart,
-                // @ts-ignore
-                tls: perf.secureConnectionStart ? perf.requestStart - perf.secureConnectionStart : 0,
-                // @ts-ignore
-                conn: perf.secureConnectionStart ? perf.secureConnectionStart - perf.connectStart : perf.connectEnd - perf.connectStart,
-                // @ts-ignore
-                response: perf.responseEnd - perf.responseStart,
+                dns: perf.domainLookupEnd - perf.domainLookupStart, // DNS Resolution
+                tls: perf.secureConnectionStart ? perf.requestStart - perf.secureConnectionStart : 0, // TLS Setup; checking if secureConnectionStart is not 0 (it's 0 for non-https websites)
+                conn: perf.secureConnectionStart
+                    ? perf.secureConnectionStart - perf.connectStart
+                    : perf.connectEnd - perf.connectStart, // Connection time
+                response: perf.responseEnd - perf.responseStart, // Response Time (Download)
                 // Frontend
-                // @ts-ignore
-                render: perf.domComplete - perf.domContentLoadedEventEnd,
-                // @ts-ignore
-                dom_load: perf.domContentLoadedEventEnd - perf.responseEnd,
-                // @ts-ignore
-                page_load: perf.loadEventStart,
+                render: perf.domComplete - perf.domContentLoadedEventEnd, // Browser rendering the HTML time
+                dom_load: perf.domContentLoadedEventEnd - perf.responseEnd, // DOM loading timing
+                page_load: perf.loadEventStart, // Page load time
                 // Backend
-                // @ts-ignore
                 ttfb: perf.responseStart - perf.requestStart,
             };
         };
@@ -193,20 +185,6 @@
             };
             this.sendRequest('hb', data);
         };
-        Lib.prototype.checkIgnore = function (path) {
-            var _a;
-            var ignore = (_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.ignore;
-            if (Array.isArray(ignore)) {
-                for (var i = 0; i < ignore.length; ++i) {
-                    if (ignore[i] === path)
-                        return true;
-                    // @ts-ignore
-                    if (ignore[i] instanceof RegExp && ignore[i].test(path))
-                        return true;
-                }
-            }
-            return false;
-        };
         // Tracking path changes. If path changes -> calling this.trackPage method
         Lib.prototype.trackPathChange = function () {
             var _a, _b;
@@ -222,15 +200,10 @@
             }
         };
         Lib.prototype.getPreviousPage = function () {
-            var _a, _b;
             // Assuming that this function is called in trackPage and this.activePage is not overwritten by new value yet
             // That method of getting previous page works for SPA websites
             if (this.activePage) {
-                var shouldIgnore = this.checkIgnore(this.activePage);
-                if (shouldIgnore && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.doNotAnonymise)) {
-                    return null;
-                }
-                return shouldIgnore ? null : this.activePage;
+                return this.activePage;
             }
             // Checking if URL is supported by the browser (for example, IE11 does not support it)
             if (typeof URL === 'function') {
@@ -246,76 +219,60 @@
                     if (host !== refHost) {
                         return null;
                     }
-                    var shouldIgnore = this.checkIgnore(pathname);
-                    if (shouldIgnore && ((_b = this.pageViewsOptions) === null || _b === void 0 ? void 0 : _b.doNotAnonymise)) {
-                        return null;
-                    }
-                    return shouldIgnore ? null : pathname;
+                    return pathname;
                 }
-                catch (_c) {
+                catch (_a) {
                     return null;
                 }
             }
             return null;
         };
         Lib.prototype.trackPage = function (pg, unique) {
-            var _a, _b;
             if (unique === void 0) { unique = false; }
             if (!this.pageData)
                 return;
             this.pageData.path = pg;
-            var shouldIgnore = this.checkIgnore(pg);
-            if (shouldIgnore && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.doNotAnonymise))
-                return;
             var perf = this.getPerformanceStats();
-            var prev;
-            if (!((_b = this.pageViewsOptions) === null || _b === void 0 ? void 0 : _b.noUserFlow)) {
-                prev = this.getPreviousPage();
-            }
+            var prev = this.getPreviousPage();
             this.activePage = pg;
-            this.submitPageView(shouldIgnore ? null : pg, prev, unique, perf);
+            this.submitPageView(pg, prev, unique, perf, true);
         };
-        Lib.prototype.submitPageView = function (pg, prev, unique, perf) {
-            var data = {
+        Lib.prototype.submitPageView = function (pg, prev, unique, perf, evokeCallback) {
+            var _a;
+            var privateData = {
                 pid: this.projectID,
+                perf: perf,
+                unique: unique,
+            };
+            var pvPayload = {
                 lc: getLocale(),
                 tz: getTimezone(),
                 ref: getReferrer(),
                 so: getUTMSource(),
                 me: getUTMMedium(),
                 ca: getUTMCampaign(),
-                unique: unique,
                 pg: pg,
-                perf: perf,
                 prev: prev,
             };
-            this.sendRequest('', data);
-        };
-        Lib.prototype.debug = function (message) {
-            var _a;
-            if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.debug) {
-                console.log('[Swetrix]', message);
+            if (evokeCallback && ((_a = this.pageViewsOptions) === null || _a === void 0 ? void 0 : _a.callback)) {
+                var callbackResult = this.pageViewsOptions.callback(pvPayload);
+                if (callbackResult === false) {
+                    return;
+                }
+                if (callbackResult && typeof callbackResult === 'object') {
+                    Object.assign(pvPayload, callbackResult);
+                }
             }
+            Object.assign(pvPayload, privateData);
+            this.sendRequest('', pvPayload);
         };
         Lib.prototype.canTrack = function () {
             var _a, _b, _c, _d;
-            if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.disabled) {
-                this.debug('Tracking disabled: the \'disabled\' setting is set to true.');
-                return false;
-            }
-            if (!isInBrowser()) {
-                this.debug('Tracking disabled: script does not run in browser environment.');
-                return false;
-            }
-            if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.respectDNT) && ((_c = window.navigator) === null || _c === void 0 ? void 0 : _c.doNotTrack) === '1') {
-                this.debug('Tracking disabled: respecting user\'s \'Do Not Track\' preference.');
-                return false;
-            }
-            if (!((_d = this.options) === null || _d === void 0 ? void 0 : _d.debug) && isLocalhost()) {
-                return false;
-            }
-            if (isAutomated()) {
-                this.debug('Tracking disabled: navigation is automated by WebDriver.');
+            if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.disabled) ||
+                !isInBrowser() ||
+                (((_b = this.options) === null || _b === void 0 ? void 0 : _b.respectDNT) && ((_c = window.navigator) === null || _c === void 0 ? void 0 : _c.doNotTrack) === '1') ||
+                (!((_d = this.options) === null || _d === void 0 ? void 0 : _d.devMode) && isLocalhost()) ||
+                isAutomated()) {
                 return false;
             }
             return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swetrix",
-  "version": "2.4.0",
+  "version": "3.0.0",
   "description": "The JavaScript analytics client for Swetrix Analytics",
   "main": "dist/swetrix.cjs.js",
   "module": "dist/swetrix.es5.js",
@@ -32,13 +32,13 @@
   "bugs": {
     "url": "https://github.com/Swetrix/swetrix-js/issues"
   },
-  "homepage": "https://swetrix.com/docs",
+  "homepage": "https://docs.swetrix.com",
   "dependencies": {
-    "@types/node": "^20.8.6",
+    "@types/node": "^20.11.8",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^25.0.5",
+    "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "rimraf": "^4.4.1",
     "rollup": "^2.79.1",
@@ -46,6 +46,6 @@
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-typescript2": "^0.36.0",
     "rollup-plugin-uglify": "^6.0.4",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.3"
   }
 }