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

Fixed pixels/links collect.
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Details

Browse source
This commit is contained in:
Mike Cao 2025-10-30 12:53:12 -07:00
parent f073fb1996
commit dfe969cabe
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/app/api/send/route.ts
View file

@ -82,6 +82,8 @@ export async function POST(request: Request) {
id, id,
} = payload; } = payload;
const sourceId = websiteId || pixelId || linkId;
// Cache check // Cache check
let cache: Cache | null = null; let cache: Cache | null = null;
@ -128,13 +130,13 @@ export async function POST(request: Request) {
const sessionSalt = hash(startOfMonth(createdAt).toUTCString()); const sessionSalt = hash(startOfMonth(createdAt).toUTCString());
const visitSalt = hash(startOfHour(createdAt).toUTCString()); const visitSalt = hash(startOfHour(createdAt).toUTCString());
const sessionId = id ? uuid(websiteId, id) : uuid(websiteId, ip, userAgent, sessionSalt); const sessionId = id ? uuid(sourceId, id) : uuid(sourceId, ip, userAgent, sessionSalt);
// Create a session if not found // Create a session if not found
if (!clickhouse.enabled && !cache?.sessionId) { if (!clickhouse.enabled && !cache?.sessionId) {
await createSession({ await createSession({
id: sessionId, id: sessionId,
websiteId, websiteId: sourceId,
browser, browser,
os, os,
device, device,
@ -206,7 +208,7 @@ export async function POST(request: Request) {
: EVENT_TYPE.pageView; : EVENT_TYPE.pageView;
await saveEvent({ await saveEvent({
websiteId: websiteId || linkId || pixelId, websiteId: sourceId,
sessionId, sessionId,
visitId, visitId,
eventType, eventType,
@ -270,6 +272,9 @@ export async function POST(request: Request) {
} catch (e) { } catch (e) {
const error = serializeError(e); const error = serializeError(e);
// eslint-disable-next-line no-console
console.log(error);
return serverError({ errorObject: error }); return serverError({ errorObject: error });
} }
} }