watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-09 23:27:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updated pixel/link endpoints. Added name to rawQuery.

Browse source
This commit is contained in:
Mike Cao 2025-09-30 16:11:21 -07:00
parent b9fbbc6453
commit 8a977b0164
18 changed files with 913 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/app/(collect)/p/[slug]/route.ts
View file

@ -1,6 +1,10 @@
export const dynamic = 'force-dynamic';
import { NextResponse } from 'next/server';
import { notFound } from '@/lib/response';
import redis from '@/lib/redis';
import { findPixel } from '@/queries/prisma';
import { Pixel } from '@/generated/prisma/client';
import { POST } from '@/app/api/send/route';
const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw', 'base64');
@ -8,14 +12,34 @@ const image = Buffer.from('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICR
export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {
const { slug } = await params;
const pixel = await findPixel({
where: {
slug,
},
});
let pixel: Pixel;
if (!pixel) {
return notFound();
if (redis.enabled) {
pixel = await redis.client.fetch(
`pixel:${slug}`,
async () => {
return findPixel({
where: {
slug,
},
});
},
86400,
);
if (!pixel) {
return notFound();
}
} else {
pixel = await findPixel({
where: {
slug,
},
});
if (!pixel) {
return notFound();
}
}
const payload = {
@ -23,7 +47,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
payload: {
pixel: pixel.id,
url: request.url,
referrer: request.referrer,
referrer: request.headers.get('referer'),
},
};
@ -33,13 +57,12 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
body: JSON.stringify(payload),
});
const res = await POST(req);
await POST(req);
return new NextResponse(image, {
headers: {
'Content-Type': 'image/gif',
'Content-Length': image.length.toString(),
'x-umami-collect': JSON.stringify(res),
},
});
}

40
src/app/(collect)/q/[slug]/route.ts
View file

@ -1,19 +1,43 @@
export const dynamic = 'force-dynamic';
import { NextResponse } from 'next/server';
import { notFound } from '@/lib/response';
import { findLink } from '@/queries/prisma';
import { POST } from '@/app/api/send/route';
import { Link } from '@/generated/prisma/client';
import redis from '@/lib/redis';
export async function GET(request: Request, { params }: { params: Promise<{ slug: string }> }) {
const { slug } = await params;
const link = await findLink({
where: {
slug,
},
});
let link: Link;
if (!link) {
return notFound();
if (redis.enabled) {
link = await redis.client.fetch(
`link:${slug}`,
async () => {
return findLink({
where: {
slug,
},
});
},
86400,
);
if (!link) {
return notFound();
}
} else {
link = await findLink({
where: {
slug,
},
});
if (!link) {
return notFound();
}
}
const payload = {
@ -21,7 +45,7 @@ export async function GET(request: Request, { params }: { params: Promise<{ slug
payload: {
link: link.id,
url: request.url,
referrer: request.referrer,
referrer: request.headers.get('referer'),
},
};

20
src/app/api/websites/[websiteId]/metrics/expanded/route.ts
View file

@ -1,5 +1,5 @@
import { canViewWebsite } from '@/permissions';
import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { EVENT_COLUMNS, EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import { dateRangeParams, filterParams, searchParams } from '@/lib/schema';
@ -50,21 +50,21 @@ export async function GET(
}
if (EVENT_COLUMNS.includes(type)) {
let data;
const column = FILTER_COLUMNS[type] || type;
if (type === 'event') {
data = await getEventExpandedMetrics(websiteId, { type, limit, offset }, filters);
} else {
data = await getPageviewExpandedMetrics(websiteId, { type, limit, offset }, filters);
if (column === 'event_name') {
filters.eventType = EVENT_TYPE.customEvent;
}
return json(data);
if (type === 'event') {
return json(await getEventExpandedMetrics(websiteId, { type, limit, offset }, filters));
} else {
return json(await getPageviewExpandedMetrics(websiteId, { type, limit, offset }, filters));
}
}
if (type === 'channel') {
const data = await getChannelExpandedMetrics(websiteId, filters);
return json(data);
return json(await getChannelExpandedMetrics(websiteId, filters));
}
return badRequest();

20
src/app/api/websites/[websiteId]/metrics/route.ts
View file

@ -1,5 +1,5 @@
import { canViewWebsite } from '@/permissions';
import { EVENT_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { EVENT_COLUMNS, EVENT_TYPE, FILTER_COLUMNS, SESSION_COLUMNS } from '@/lib/constants';
import { getQueryFilters, parseRequest } from '@/lib/request';
import { badRequest, json, unauthorized } from '@/lib/response';
import {
@ -50,21 +50,21 @@ export async function GET(
}
if (EVENT_COLUMNS.includes(type)) {
let data;
const column = FILTER_COLUMNS[type] || type;
if (type === 'event') {
data = await getEventMetrics(websiteId, { type, limit, offset }, filters);
} else {
data = await getPageviewMetrics(websiteId, { type, limit, offset }, filters);
if (column === 'event_name') {
filters.eventType = EVENT_TYPE.customEvent;
}
return json(data);
if (type === 'event') {
return json(await getEventMetrics(websiteId, { type, limit, offset }, filters));
} else {
return json(await getPageviewMetrics(websiteId, { type, limit, offset }, filters));
}
}
if (type === 'channel') {
const data = await getChannelMetrics(websiteId, filters);
return json(data);
return json(await getChannelMetrics(websiteId, filters));
}
return badRequest();