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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Added hostname back to tracker.
Mike Cao21adbc29d4af
diff --git a/src/app/api/send/_route.ts b/src/app/api/send/route.tssimilarity index 100%rename from src/app/api/send/_route.tsrename to src/app/api/send/route.tsdiff --git a/src/pages/api/send.ts b/src/pages/api/send.tsdeleted file mode 100644index cfbbbca2c..000000000--- a/src/pages/api/send.ts+++ /dev/null@@ -1,205 +0,0 @@-import { z } from 'zod';-import { isbot } from 'isbot';-import { createToken, parseToken } from '@/lib/jwt';-import clickhouse from '@/lib/clickhouse';-import { parseRequest } from '@/lib/request';-import { fetchSession, fetchWebsite } from '@/lib/load';-import { getClientInfo, hasBlockedIp } from '@/lib/detect';-import { secret, uuid, visitSalt } from '@/lib/crypto';-import { COLLECTION_TYPE } from '@/lib/constants';-import { createSession, saveEvent, saveSessionData } from '@/queries';-import { NextApiRequest, NextApiResponse } from 'next';-import { serializeError } from 'serialize-error';--export default async function (req: NextApiRequest, res: NextApiResponse) {- const request = new Request(`https://${req.headers.host}${req.url}`, {- method: req.method || 'GET',- headers: new Headers(req.headers as Record<string, string>),- body: req.method !== 'GET' && req.method !== 'HEAD' ? JSON.stringify(req.body) : null,- });-- // Bot check- if (!process.env.DISABLE_BOT_CHECK && isbot(request.headers.get('user-agent'))) {- return res.status(200).json({ beep: 'boop' });- }-- const schema = z.object({- type: z.enum(['event', 'identify']),- payload: z.object({- website: z.string().uuid(),- data: z.object({}).passthrough().optional(),- hostname: z.string().max(100).optional(),- language: z.string().max(35).optional(),- referrer: z.string().optional(),- screen: z.string().max(11).optional(),- title: z.string().optional(),- url: z.string().optional(),- name: z.string().max(50).optional(),- tag: z.string().max(50).optional(),- ip: z.string().ip().optional(),- userAgent: z.string().optional(),- }),- });-- const { body, error } = await parseRequest(request, schema, { skipAuth: true });-- if (error) {- return error();- }-- const { type, payload } = body;-- const {- website: websiteId,- hostname,- screen,- language,- url,- referrer,- name,- data,- title,- tag,- } = payload;-- // Cache check- let cache: { websiteId: string; sessionId: string; visitId: string; iat: number } | null = null;- const cacheHeader = request.headers.get('x-umami-cache');-- if (cacheHeader) {- const result = await parseToken(cacheHeader, secret());-- if (result) {- cache = result;- }- }-- // Find website- if (!cache?.websiteId) {- const website = await fetchWebsite(websiteId);-- if (!website) {- return res.status(400).json({ error: 'Website not found.' });- }- }-- // Client info- const { ip, userAgent, device, browser, os, country, subdivision1, subdivision2, city } =- await getClientInfo(request, payload);-- // IP block- if (hasBlockedIp(ip)) {- return res.status(403).json({ error: 'IP not allowed.' });- }-- const sessionId = uuid(websiteId, hostname, ip, userAgent);-- // Find session- if (!cache?.sessionId) {- const session = await fetchSession(websiteId, sessionId);-- // Create a session if not found- if (!session && !clickhouse.enabled) {- try {- await createSession({- id: sessionId,- websiteId,- hostname,- browser,- os,- device,- screen,- language,- country,- subdivision1,- subdivision2,- city,- });- } catch (e: any) {- if (!e.message.toLowerCase().includes('unique constraint')) {- return res.status(500).json({ error: serializeError(e) });- }- }- }- }-- // Visit info- const now = Math.floor(new Date().getTime() / 1000);- let visitId = cache?.visitId || uuid(sessionId, visitSalt());- let iat = cache?.iat || now;-- // Expire visit after 30 minutes- if (now - iat > 1800) {- visitId = uuid(sessionId, visitSalt());- iat = now;- }-- if (type === COLLECTION_TYPE.event) {- const base = hostname ? `http://${hostname}` : 'http://localhost';- const currentUrl = new URL(url, base);-- let urlPath = currentUrl.pathname;- const urlQuery = currentUrl.search.substring(1);- const urlDomain = currentUrl.hostname.replace(/^www\./, '');-- if (process.env.REMOVE_TRAILING_SLASH) {- urlPath = urlPath.replace(/(.+)\/$/, '$1');- }-- let referrerPath: string;- let referrerQuery: string;- let referrerDomain: string;-- if (referrer) {- const referrerUrl = new URL(referrer, base);-- referrerPath = referrerUrl.pathname;- referrerQuery = referrerUrl.search.substring(1);-- if (referrerUrl.hostname !== 'localhost') {- referrerDomain = referrerUrl.hostname.replace(/^www\./, '');- }- }-- await saveEvent({- websiteId,- sessionId,- visitId,- urlPath,- urlQuery,- referrerPath,- referrerQuery,- referrerDomain,- pageTitle: title,- eventName: name,- eventData: data,- hostname: hostname || urlDomain,- browser,- os,- device,- screen,- language,- country,- subdivision1,- subdivision2,- city,- tag,- });- }-- if (type === COLLECTION_TYPE.identify) {- if (!data) {- return res.status(400).json({ error: 'Data required.' });- }-- await saveSessionData({- websiteId,- sessionId,- sessionData: data,- });- }-- const token = createToken({ websiteId, sessionId, visitId, iat }, secret());-- return res.status(200).json({ cache: token });-}diff --git a/src/tracker/index.js b/src/tracker/index.jsindex aaf05a252..dbd47b7c6 100644--- a/src/tracker/index.js+++ b/src/tracker/index.js@@ -40,6 +40,7 @@screen,language,title,+ hostname,url: currentUrl,referrer: currentRef,tag: tag ? tag : undefined,