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
Merge dev.
Mike Caob3f8bbe3fc1a
diff --cc package.jsonindex 31320109f,80c9446e1..4fecc2301--- a/package.json+++ b/package.json@@@ -105,8 -106,7 +106,7 @@@"npm-run-all": "^4.1.5","prisma": "6.1.0","react": "^19.0.0",- "react-basics": "^0.125.0",+ "react-basics": "^0.126.0",- "react-beautiful-dnd": "^13.1.0","react-dom": "^19.0.0","react-error-boundary": "^4.0.4","react-intl": "^6.5.5",diff --cc src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsxindex e56733461,e56733461..3f2a3ea0a--- a/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx+++ b/src/app/(main)/settings/websites/[websiteId]/ShareUrl.tsx@@@ -35,7 -35,7 +35,7 @@@ export function ShareUrl({ hostUrl, onS};const handleCheck = (checked: boolean) => {-- const data = { shareId: checked ? generateId() : null };++ const data = { name: website.name, shareId: checked ? generateId() : null };mutate(data, {onSuccess: async () => {touch(`website:${website.id}`);diff --cc src/app/api/send/route.tsindex e70fed0b7,000000000..0db93e854mode 100644,000000..100644--- a/src/app/api/send/route.ts+++ b/src/app/api/send/route.ts@@@ -1,193 -1,0 +1,192 @@@+import { z } from 'zod';+import { isbot } from 'isbot';- import { serializeError } from 'serialize-error';+import { createToken, parseToken, safeDecodeURI } from 'next-basics';+import clickhouse from 'lib/clickhouse';+import { parseRequest } from 'lib/request';+import { badRequest, json, forbidden, serverError } from 'lib/response';+import { fetchSession, fetchWebsite } from 'lib/load';+import { getClientInfo, hasBlockedIp } from 'lib/detect';+import { secret, uuid, visitSalt } from 'lib/crypto';+import { createSession, saveEvent, saveSessionData } from 'queries';+import { COLLECTION_TYPE } from 'lib/constants';++export async function POST(request: Request) {+ // Bot check+ if (!process.env.DISABLE_BOT_CHECK && isbot(request.headers.get('user-agent'))) {+ return json({ beep: 'boop' });+ }++ const schema = z.object({+ type: z.enum(['event', 'identity']),+ 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 badRequest('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 forbidden();+ }++ 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 serverError(serializeError(e));++ return serverError(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) {+ // eslint-disable-next-line prefer-const+ let [urlPath, urlQuery] = safeDecodeURI(url)?.split('?') || [];+ let [referrerPath, referrerQuery] = safeDecodeURI(referrer)?.split('?') || [];+ let referrerDomain = '';++ if (!urlPath) {+ urlPath = '/';+ }++ if (/^[\w-]+:\/\/\w+/.test(referrerPath)) {+ const refUrl = new URL(referrer);+ referrerPath = refUrl.pathname;+ referrerQuery = refUrl.search.substring(1);+ referrerDomain = refUrl.hostname.replace(/www\./, '');+ }++ if (process.env.REMOVE_TRAILING_SLASH) {+ urlPath = urlPath.replace(/(.+)\/$/, '$1');+ }++ await saveEvent({+ websiteId,+ sessionId,+ visitId,+ urlPath,+ urlQuery,+ referrerPath,+ referrerQuery,+ referrerDomain,+ pageTitle: title,+ eventName: name,+ eventData: data,+ hostname,+ browser,+ os,+ device,+ screen,+ language,+ country,+ subdivision1,+ subdivision2,+ city,+ tag,+ });+ }++ if (type === COLLECTION_TYPE.identify) {+ if (!data) {+ return badRequest('Data required.');+ }++ await saveSessionData({+ websiteId,+ sessionId,+ sessionData: data,+ });+ }++ const token = createToken({ websiteId, sessionId, visitId, iat }, secret());++ return json({ cache: token });+}diff --cc yarn.lockindex 106e0f600,9fe7d6e26..1aab5657a--- a/yarn.lock+++ b/yarn.lock@@@ -1117,7 -1117,7 +1117,7 @@@dependencies:regenerator-runtime "^0.14.0"- "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":-"@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4":++"@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4":version "7.23.2"resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==