Skip to content

Count Cloudflare challenge arrivals as unique #112

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

Merged
adriaandotcom merged 8 commits into from
Oct 15, 2026
Merged

Count Cloudflare challenge arrivals as unique #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0a7da5
Recognize Cloudflare challenge markers only in query names
Oct 15, 2026
c8e4f3f
Refresh the Cloudflare compatibility fix on current v12
Oct 15, 2026
772cab8
Merge current v12 and resolve Cloudflare compatibility artifacts
Oct 15, 2026
0614055
Count Cloudflare challenge arrivals as unique and merge current v12
Oct 15, 2026
3088504
Merge 061405541caf29e2f2e8064fe278961bd3081095 into fix/v12-cloudflar…
simple-analytics-ai[bot] Oct 15, 2026
2e12e2c
Use the requested simple Cloudflare marker check on latest v12
Oct 15, 2026
23b0206
Merge latest v12 and simplify the Cloudflare marker check
Oct 15, 2026
14b75fc
Keep the simple Cloudflare check working after campaign parameters
Oct 15, 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
20 changes: 12 additions & 8 deletions dist/latest/cloudflare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; 2af5; v12) */
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; 5f31; v12) */
/* eslint-env browser */

(function (
Expand Down Expand Up @@ -543,13 +543,17 @@
var page = {};
var lastSendPath;

var getReferrer = function () {
var getReferrer = function (raw) {
// Customers can overwrite their referrer, here we check for that
var overwrittenReferrer =
overwriteOptions.referrer || attr(scriptElement, "referrer");
var referrer =
overwriteOptions.referrer ||
attr(scriptElement, "referrer") ||
doc.referrer ||
"";

if (raw) return referrer;
return (
(overwrittenReferrer || doc.referrer || "")
referrer
.replace(locationHostname, definedHostname)
.replace(/^https?:\/\/((m|l|w{2,3}([0-9]+)?)\.)?([^?#]+)(.*)$/, "$4")
.replace(/^([^/]+)$/, "$1") || undefinedVar
Expand Down Expand Up @@ -800,11 +804,11 @@
currentReferrerHostname == locationHostname
: falseVar;

// We set unique variable based on pushstate or back navigation, if no match we check the referrer
// Only the first pageview can use a Cloudflare referrer as a unique arrival.
page.unique =
/__cf_/.test(getReferrer()) || isPushState || userNavigated
isPushState || userNavigated
? falseVar
: !sameSite;
: !sameSite || (!pages && /[?&]__cf_/.test(getReferrer(trueVar)));

metadata = appendMetadata(metadata, {
type: pageviewText,
Expand Down
4 changes: 2 additions & 2 deletions dist/latest/custom/app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/custom/app.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/latest/custom/e.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/custom/e.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions dist/latest/custom/latest.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; ee41; v12) */
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; 25ef; v12) */
/* eslint-env browser */

(function (
Expand Down Expand Up @@ -543,13 +543,17 @@
var page = {};
var lastSendPath;

var getReferrer = function () {
var getReferrer = function (raw) {
// Customers can overwrite their referrer, here we check for that
var overwrittenReferrer =
overwriteOptions.referrer || attr(scriptElement, "referrer");
var referrer =
overwriteOptions.referrer ||
attr(scriptElement, "referrer") ||
doc.referrer ||
"";

if (raw) return referrer;
return (
(overwrittenReferrer || doc.referrer || "")
referrer
.replace(locationHostname, definedHostname)
.replace(/^https?:\/\/((m|l|w{2,3}([0-9]+)?)\.)?([^?#]+)(.*)$/, "$4")
.replace(/^([^/]+)$/, "$1") || undefinedVar
Expand Down Expand Up @@ -800,11 +804,11 @@
currentReferrerHostname == locationHostname
: falseVar;

// We set unique variable based on pushstate or back navigation, if no match we check the referrer
// Only the first pageview can use a Cloudflare referrer as a unique arrival.
page.unique =
/__cf_/.test(getReferrer()) || isPushState || userNavigated
isPushState || userNavigated
? falseVar
: !sameSite;
: !sameSite || (!pages && /[?&]__cf_/.test(getReferrer(trueVar)));

metadata = appendMetadata(metadata, {
type: pageviewText,
Expand Down
4 changes: 2 additions & 2 deletions dist/latest/custom/latest.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/custom/latest.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/custom/light.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/latest/custom/light.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/latest/custom/proxy.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/custom/proxy.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/latest/hello.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/hello.js.map
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions dist/latest/latest.dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; 0e2c; v12) */
/* Simple Analytics - Privacy-first analytics (docs.simpleanalytics.com/script; 2026-10-15; 233d; v12) */
/* eslint-env browser */

(function (
Expand Down Expand Up @@ -543,13 +543,17 @@
var page = {};
var lastSendPath;

var getReferrer = function () {
var getReferrer = function (raw) {
// Customers can overwrite their referrer, here we check for that
var overwrittenReferrer =
overwriteOptions.referrer || attr(scriptElement, "referrer");
var referrer =
overwriteOptions.referrer ||
attr(scriptElement, "referrer") ||
doc.referrer ||
"";

if (raw) return referrer;
return (
(overwrittenReferrer || doc.referrer || "")
referrer
.replace(locationHostname, definedHostname)
.replace(/^https?:\/\/((m|l|w{2,3}([0-9]+)?)\.)?([^?#]+)(.*)$/, "$4")
.replace(/^([^/]+)$/, "$1") || undefinedVar
Expand Down Expand Up @@ -800,11 +804,11 @@
currentReferrerHostname == locationHostname
: falseVar;

// We set unique variable based on pushstate or back navigation, if no match we check the referrer
// Only the first pageview can use a Cloudflare referrer as a unique arrival.
page.unique =
/__cf_/.test(getReferrer()) || isPushState || userNavigated
isPushState || userNavigated
? falseVar
: !sameSite;
: !sameSite || (!pages && /[?&]__cf_/.test(getReferrer(trueVar)));

metadata = appendMetadata(metadata, {
type: pageviewText,
Expand Down
4 changes: 2 additions & 2 deletions dist/latest/latest.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/latest.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/latest/light.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/latest/light.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading