From fbd05641332387e13c0655443544daa6fbc85388 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 23 Jan 2026 19:33:39 -0800
Subject: [PATCH 1/2] Add x-umami-client-* headers as highest priority source
 for client detection.

---
 src/lib/detect.ts | 10 ++++++++--
 src/lib/ip.ts     |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 68cb6672..6af61b78 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -10,6 +10,12 @@ import { safeDecodeURIComponent } from '@/lib/url';
 const MAXMIND = 'maxmind';
 
 const PROVIDER_HEADERS = [
+  // Umami custom headers
+  {
+    countryHeader: 'x-umami-client-country',
+    regionHeader: 'x-umami-client-region',
+    cityHeader: 'x-umami-client-city',
+  },
   // Cloudflare headers
   {
     countryHeader: 'cf-ipcountry',
@@ -60,13 +66,13 @@ function decodeHeader(s: string | undefined | null): string | undefined | null {
   return Buffer.from(s, 'latin1').toString('utf-8');
 }
 
-export async function getLocation(ip: string = '', headers: Headers, hasPayloadIP: boolean) {
+export async function getLocation(ip: string = '', headers: Headers, skipHeaders: boolean) {
   // Ignore local ips
   if (!ip || (await isLocalhost(ip))) {
     return null;
   }
 
-  if (!hasPayloadIP && !process.env.SKIP_LOCATION_HEADERS) {
+  if (!skipHeaders && !process.env.SKIP_LOCATION_HEADERS) {
     for (const provider of PROVIDER_HEADERS) {
       const countryHeader = headers.get(provider.countryHeader);
       if (countryHeader) {
diff --git a/src/lib/ip.ts b/src/lib/ip.ts
index 5cd77574..b4c46573 100644
--- a/src/lib/ip.ts
+++ b/src/lib/ip.ts
@@ -1,4 +1,5 @@
 export const IP_ADDRESS_HEADERS = [
+  'x-umami-client-ip', // Umami custom header
   'true-client-ip', // CDN
   'cf-connecting-ip', // Cloudflare
   'fastly-client-ip', // Fastly
@@ -31,7 +32,7 @@ export function getIpAddress(headers: Headers) {
   }
 
   if (header === 'forwarded') {
-    const match = ip.match(/for=(\[?[0-9a-fA-F:.]+\]?)/);
+    const match = ip.match(/for=(\[?[0-9a-fA-F:.]+]?)/);
 
     if (match) {
       return match[1];

From fd2e2047cdf400da1deccec062a570ed1540b4d5 Mon Sep 17 00:00:00 2001
From: Mike Cao <moocao@gmail.com>
Date: Fri, 23 Jan 2026 20:30:42 -0800
Subject: [PATCH 2/2] Restrict x-umami-client-* headers to cloud mode only.

---
 src/lib/detect.ts | 16 ++++++++++------
 src/lib/ip.ts     |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 6af61b78..e713ecf7 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -10,12 +10,16 @@ import { safeDecodeURIComponent } from '@/lib/url';
 const MAXMIND = 'maxmind';
 
 const PROVIDER_HEADERS = [
-  // Umami custom headers
-  {
-    countryHeader: 'x-umami-client-country',
-    regionHeader: 'x-umami-client-region',
-    cityHeader: 'x-umami-client-city',
-  },
+  // Umami custom headers (cloud mode only)
+  ...(process.env.CLOUD_MODE
+    ? [
+        {
+          countryHeader: 'x-umami-client-country',
+          regionHeader: 'x-umami-client-region',
+          cityHeader: 'x-umami-client-city',
+        },
+      ]
+    : []),
   // Cloudflare headers
   {
     countryHeader: 'cf-ipcountry',
diff --git a/src/lib/ip.ts b/src/lib/ip.ts
index b4c46573..f6ee733b 100644
--- a/src/lib/ip.ts
+++ b/src/lib/ip.ts
@@ -1,5 +1,5 @@
 export const IP_ADDRESS_HEADERS = [
-  'x-umami-client-ip', // Umami custom header
+  ...(process.env.CLOUD_MODE ? ['x-umami-client-ip'] : []), // Umami custom header (cloud mode only)
   'true-client-ip', // CDN
   'cf-connecting-ip', // Cloudflare
   'fastly-client-ip', // Fastly