session activity identify stitching

This commit is contained in:
Francis Cao committed 2026-07-15 11:20:27 -07:00
1 parent 8a75208d5b
commit 7afc4ccf6b
15 files changed
+374 -23

No files matched your search

+34 -2
View File
@@ -11,13 +11,14 @@ import { parseRequest } from '@/lib/request';
import { badRequest, forbidden, json, serverError } from '@/lib/response';
import { anyObjectParam, urlOrPathParam } from '@/lib/schema';
import { safeDecodeURI, safeDecodeURIComponent } from '@/lib/url';
import { createSession, saveEvent, saveSessionData } from '@/queries/sql';
import { createSession, saveEvent, saveSessionData, saveSessionLink } from '@/queries/sql';
interface Cache {
websiteId: string;
sessionId: string;
visitId: string;
iat: number;
sessionLinkId?: string;
}
// Reject strings whose first character is a spreadsheet formula trigger to
@@ -128,6 +129,9 @@ export async function POST(request: Request) {
}
}
// Carried forward in the cache token so repeat identify calls skip the link write
let sessionLinkId = cache?.sessionLinkId;
// Client info
const { ip, userAgent, device, browser, os, country, region, city } = await getClientInfo(
request,
@@ -277,6 +281,34 @@ export async function POST(request: Request) {
twclid,
});
} else if (type === COLLECTION_TYPE.identify) {
if (websiteId && id) {
// Persist both memberships so stitched activity can be resolved from
// either the anonymous session or the identified session.
const anonymousSessionId = uuid(sourceId, ip, userAgent, sessionSalt);
const linkedSessionIds = [...new Set([anonymousSessionId, sessionId])];
const newLinkId = hash(...linkedSessionIds, id);
if (sessionLinkId !== newLinkId) {
// Best-effort: a link failure must not block the session data write below
try {
await Promise.all(
linkedSessionIds.map(linkedSessionId =>
saveSessionLink({
websiteId,
sessionId: linkedSessionId,
distinctId: id,
createdAt,
}),
),
);
sessionLinkId = newLinkId;
} catch (e) {
// eslint-disable-next-line no-console
console.error('Failed to save session link:', e);
}
}
}
if (data) {
await saveSessionData({
websiteId,
@@ -316,7 +348,7 @@ export async function POST(request: Request) {
}
const token = createToken(
{ websiteId, sessionId, visitId, iat, type: CACHE_TOKEN_TYPE },
{ websiteId, sessionId, visitId, iat, sessionLinkId, type: CACHE_TOKEN_TYPE },
secret(),
);