watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2025-12-06 01:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Added laptop detection. Reorganized IP headers.

Browse source
This commit is contained in:
Mike Cao 2025-11-03 16:44:01 -08:00
parent c9f522b24d
commit 684863d6c7
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/detect.ts
View file

@ -30,10 +30,18 @@ const PROVIDER_HEADERS = [
},
];
export function getDevice(userAgent: string) {
export function getDevice(userAgent: string, screen: string = '') {
const { device } = UAParser(userAgent);
return device?.type || 'desktop';
const [width] = screen.split('x');
const type = device?.type || 'desktop';
if (type === 'desktop' && screen && +width <= 1920) {
return 'laptop';
}
return type;
}
function getRegionCode(country: string, region: string) {
@ -108,7 +116,7 @@ export async function getClientInfo(request: Request, payload: Record<string, an
const city = safeDecodeURIComponent(location?.city);
const browser = browserName(userAgent);
const os = detectOS(userAgent) as string;
const device = getDevice(userAgent);
const device = getDevice(userAgent, payload?.screen);
return { userAgent, browser, os, ip, country, region, city, device };
}

19
src/lib/ip.ts
View file

@ -1,19 +1,16 @@
// The order here is important and influences how IPs are detected by lib/detect.ts
// Please do not change the order unless you know exactly what you're doing - read https://developers.cloudflare.com/fundamentals/reference/http-headers/
export const IP_ADDRESS_HEADERS = [
'x-client-ip',
'x-forwarded-for',
'cf-connecting-ip', // This should be *after* x-forwarded-for, so that x-forwarded-for is respected if present
'do-connecting-ip',
'fastly-client-ip',
'true-client-ip',
'x-real-ip',
'x-forwarded-for',
'cf-connecting-ip', // Cloudflare
'fastly-client-ip', // Fastly
'true-client-ip', // Akamai
'x-nf-client-connection-ip', // Netlify
'do-connecting-ip', // Digital Ocean
'x-appengine-user-ip', // Google App Ending
'x-client-ip',
'x-cluster-client-ip',
'x-forwarded',
'forwarded',
'x-appengine-user-ip',
'x-nf-client-connection-ip',
'x-real-ip',
];
export function getIpAddress(headers: Headers) {