Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

refactor getLocation to use lookup array for cleaner header extraction

Michael Wallner58c2d068e7a2
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 526ea2dfc..ee9d2603c 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -15,6 +15,27 @@ import { safeDecodeURIComponent } from '@/lib/url';
const MAXMIND = 'maxmind';
+const PROVIDER_HEADERS = [
+ // Cloudflare headers
+ {
+ countryHeader: 'cf-ipcountry',
+ regionHeader: 'cf-region-code',
+ cityHeader: 'cf-ipcity',
+ },
+ // Vercel headers
+ {
+ countryHeader: 'x-vercel-ip-country',
+ regionHeader: 'x-vercel-ip-country-region',
+ cityHeader: 'x-vercel-ip-city',
+ },
+ // CloudFront headers
+ {
+ countryHeader: 'cloudfront-viewer-country',
+ regionHeader: 'cloudfront-viewer-country-region',
+ cityHeader: 'cloudfront-viewer-city',
+ },
+];
+
export function getIpAddress(headers: Headers) {
const customHeader = process.env.CLIENT_IP_HEADER;
@@ -94,43 +115,19 @@ export async function getLocation(ip: string = '', headers: Headers, hasPayloadI
}
if (!hasPayloadIP && !process.env.SKIP_LOCATION_HEADERS) {
- // Cloudflare headers
- if (headers.get('cf-ipcountry')) {
- const country = decodeHeader(headers.get('cf-ipcountry'));
- const region = decodeHeader(headers.get('cf-region-code'));
- const city = decodeHeader(headers.get('cf-ipcity'));
-
- return {
- country,
- region: getRegionCode(country, region),
- city,
- };
- }
-
- // Vercel headers
- if (headers.get('x-vercel-ip-country')) {
- const country = decodeHeader(headers.get('x-vercel-ip-country'));
- const region = decodeHeader(headers.get('x-vercel-ip-country-region'));
- const city = decodeHeader(headers.get('x-vercel-ip-city'));
-
- return {
- country,
- region: getRegionCode(country, region),
- city,
- };
- }
-
- // CloudFront headers
- if (headers.get('cloudfront-viewer-country')) {
- const country = decodeHeader(headers.get('cloudfront-viewer-country'));
- const region = decodeHeader(headers.get('cloudfront-viewer-country-region'));
- const city = decodeHeader(headers.get('cloudfront-viewer-city'));
-
- return {
- country,
- region: getRegionCode(country, region),
- city,
- };
+ for (const provider of PROVIDER_HEADERS) {
+ const countryHeader = headers.get(provider.countryHeader);
+ if (countryHeader) {
+ const country = decodeHeader(countryHeader);
+ const region = decodeHeader(headers.get(provider.regionHeader));
+ const city = decodeHeader(headers.get(provider.cityHeader));
+
+ return {
+ country,
+ region: getRegionCode(country, region),
+ city,
+ };
+ }
}
}