@iann29/rastro 0.5.0 → 0.7.0

package/dist/component/people.js

@@ -0,0 +1,249 @@
+import { v } from "convex/values";
+import { query, mutation } from "./_generated/server.js";
+import { fail } from "./errors.js";
+import { personFilterValidator, visitorProfileValidator, } from "./validators.js";
+export const personDocumentValidator = visitorProfileValidator.extend({
+    _id: v.id("visitorProfiles"),
+    _creationTime: v.number(),
+    siteId: v.id("sites"),
+});
+export function profileSearchFields(name, email) {
+    return {
+        searchName: normalizeSearch(name ?? ""),
+        searchEmail: normalizeSearch(email ?? ""),
+    };
+}
+function normalizeSearch(value) {
+    return value.normalize("NFKC").trim().toLowerCase();
+}
+export function mergePersonAttributes(previous = {}, patch) {
+    const attributes = { ...previous };
+    for (const [key, value] of Object.entries(patch ?? {})) {
+        validateAttributeKey(key);
+        if (value === null)
+            delete attributes[key];
+        else {
+            validateAttributeValue(value);
+            attributes[key] = value;
+        }
+    }
+    if (Object.keys(attributes).length > 32 ||
+        new TextEncoder().encode(JSON.stringify(attributes)).length > 4096)
+        fail("INVALID_ARGUMENT", "attributes allow at most 32 keys and 4096 UTF-8 bytes");
+    return Object.fromEntries(Object.entries(attributes).sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0)));
+}
+function validateAttributeKey(key) {
+    if (!/^[A-Za-z][A-Za-z0-9_.-]{0,63}$/.test(key) ||
+        ["__proto__", "constructor", "prototype"].includes(key))
+        fail("INVALID_ARGUMENT", "attribute keys must start with a letter and contain up to 64 ASCII letters, digits, dots, underscores or hyphens");
+}
+function validateAttributeValue(value) {
+    if ((typeof value === "string" && value.length > 512) ||
+        (typeof value === "number" && !Number.isFinite(value)))
+        fail("INVALID_ARGUMENT", "attribute values require finite numbers or strings up to 512 characters");
+}
+/** Index each current attribute once; ordinary reads never scan all profiles. */
+export async function syncPersonAttributes(ctx, siteId, visitorId, attributes) {
+    const rows = await ctx.db
+        .query("visitorAttributes")
+        .withIndex("by_siteId_and_visitorId", (q) => q.eq("siteId", siteId).eq("visitorId", visitorId))
+        .take(33);
+    const present = new Set();
+    for (const row of rows) {
+        present.add(row.key);
+        if (!Object.hasOwn(attributes, row.key))
+            await ctx.db.delete("visitorAttributes", row._id);
+        else if (attributes[row.key] !== row.value)
+            await ctx.db.patch("visitorAttributes", row._id, {
+                value: attributes[row.key],
+            });
+    }
+    for (const [key, value] of Object.entries(attributes)) {
+        if (!present.has(key))
+            await ctx.db.insert("visitorAttributes", {
+                siteId,
+                visitorId,
+                key,
+                value,
+            });
+    }
+}
+export function publicPerson(row) {
+    const { searchName: _name, searchEmail: _email, ...person } = row;
+    return person;
+}
+/** An optional, bounded upgrade for profiles created before the directory. */
+export const backfillSearch = mutation({
+    args: { siteId: v.id("sites") },
+    returns: v.object({ updated: v.number(), isDone: v.boolean() }),
+    handler: async (ctx, { siteId }) => {
+        if (!(await ctx.db.get("sites", siteId)))
+            fail("NOT_FOUND", "site not found");
+        const rows = await ctx.db
+            .query("visitorProfiles")
+            .withIndex("by_siteId_and_searchName_and_visitorId", (q) => q.eq("siteId", siteId).eq("searchName", undefined))
+            .take(65);
+        for (const row of rows.slice(0, 64)) {
+            await ctx.db.patch("visitorProfiles", row._id, profileSearchFields(row.name, row.email));
+            await syncPersonAttributes(ctx, siteId, row.visitorId, row.attributes ?? {});
+        }
+        return { updated: Math.min(64, rows.length), isDone: rows.length <= 64 };
+    },
+});
+/** Exclusive upper bound for a Unicode prefix, including supplementary characters. */
+function afterPrefix(prefix) {
+    const points = Array.from(prefix);
+    for (let i = points.length - 1; i >= 0; i--) {
+        const code = points[i].codePointAt(0);
+        if (code < 0x10ffff)
+            return (points.slice(0, i).join("") +
+                String.fromCodePoint(code + 1 === 0xd800 ? 0xe000 : code + 1));
+    }
+    return undefined;
+}
+function normalizedFilter(filter) {
+    if (!filter)
+        return undefined;
+    if (filter.field === "attribute") {
+        validateAttributeKey(filter.key);
+        validateAttributeValue(filter.value);
+        return { field: "attribute", key: filter.key, value: filter.value };
+    }
+    if (filter.prefix.length > 320)
+        fail("INVALID_ARGUMENT", "search prefix exceeds 320 characters");
+    const prefix = filter.field === "visitorId"
+        ? filter.prefix.trim()
+        : normalizeSearch(filter.prefix);
+    return prefix ? { field: filter.field, prefix } : undefined;
+}
+export const list = query({
+    args: {
+        siteId: v.id("sites"),
+        filter: v.optional(personFilterValidator),
+        paginationOpts: v.object({
+            cursor: v.union(v.string(), v.null()),
+            numItems: v.number(),
+        }),
+    },
+    returns: v.object({
+        page: v.array(personDocumentValidator),
+        isDone: v.boolean(),
+        continueCursor: v.string(),
+    }),
+    handler: async (ctx, args) => {
+        const filter = normalizedFilter(args.filter);
+        const scope = JSON.stringify([args.siteId, filter ?? null]);
+        const limit = args.paginationOpts.numItems;
+        if (!Number.isSafeInteger(limit) || limit < 1 || limit > 50)
+            fail("INVALID_ARGUMENT", "numItems must be an integer between 1 and 50");
+        let after;
+        if (args.paginationOpts.cursor !== null) {
+            try {
+                // NFKC may expand one character into several, in both scope and value.
+                if (args.paginationOpts.cursor.length > 16_384)
+                    throw new Error();
+                const cursor = JSON.parse(args.paginationOpts.cursor);
+                if (cursor.v !== 1 ||
+                    cursor.scope !== scope ||
+                    typeof cursor.value !== "string" ||
+                    typeof cursor.visitorId !== "string")
+                    throw new Error();
+                after = { value: cursor.value, visitorId: cursor.visitorId };
+                if (filter &&
+                    filter.field !== "attribute" &&
+                    !after.value.startsWith(filter.prefix))
+                    throw new Error();
+            }
+            catch {
+                fail("INVALID_ARGUMENT", "cursor does not belong to this people query");
+            }
+        }
+        let rows;
+        const take = limit + 1;
+        if (filter?.field === "attribute") {
+            const matches = await ctx.db
+                .query("visitorAttributes")
+                .withIndex("by_siteId_and_key_and_value_and_visitorId", (q) => q
+                .eq("siteId", args.siteId)
+                .eq("key", filter.key)
+                .eq("value", filter.value)
+                .gt("visitorId", after?.visitorId ?? ""))
+                .take(take);
+            rows = await Promise.all(matches.map(async (match) => {
+                const row = await ctx.db
+                    .query("visitorProfiles")
+                    .withIndex("by_siteId_and_visitorId", (q) => q.eq("siteId", args.siteId).eq("visitorId", match.visitorId))
+                    .unique();
+                if (!row)
+                    fail("NOT_FOUND", "person attribute index has no profile");
+                return row;
+            }));
+        }
+        else if (filter && filter.field !== "visitorId") {
+            const pending = await ctx.db
+                .query("visitorProfiles")
+                .withIndex("by_siteId_and_searchName_and_visitorId", (q) => q.eq("siteId", args.siteId).eq("searchName", undefined))
+                .first();
+            if (pending)
+                fail("CONFLICT", "Run backfillVisitorProfiles for this site before searching existing profiles");
+            const field = filter.field === "name" ? "searchName" : "searchEmail";
+            const index = filter.field === "name"
+                ? "by_siteId_and_searchName_and_visitorId"
+                : "by_siteId_and_searchEmail_and_visitorId";
+            rows = after
+                ? await ctx.db
+                    .query("visitorProfiles")
+                    .withIndex(index, (q) => q
+                    .eq("siteId", args.siteId)
+                    .eq(field, after.value)
+                    .gt("visitorId", after.visitorId))
+                    .take(take)
+                : [];
+            if (rows.length < take) {
+                const upper = afterPrefix(filter.prefix);
+                const rest = await ctx.db
+                    .query("visitorProfiles")
+                    .withIndex(index, (q) => {
+                    const lower = after
+                        ? q.eq("siteId", args.siteId).gt(field, after.value)
+                        : q.eq("siteId", args.siteId).gte(field, filter.prefix);
+                    return upper === undefined ? lower : lower.lt(field, upper);
+                })
+                    .take(take - rows.length);
+                rows.push(...rest);
+            }
+        }
+        else {
+            const prefix = filter?.prefix ?? "";
+            const upper = afterPrefix(prefix);
+            rows = await ctx.db
+                .query("visitorProfiles")
+                .withIndex("by_siteId_and_visitorId", (q) => {
+                const lower = after
+                    ? q.eq("siteId", args.siteId).gt("visitorId", after.visitorId)
+                    : q.eq("siteId", args.siteId).gte("visitorId", prefix);
+                return upper === undefined ? lower : lower.lt("visitorId", upper);
+            })
+                .take(take);
+        }
+        const page = rows.slice(0, limit);
+        const last = page.at(-1);
+        return {
+            page: page.map(publicPerson),
+            isDone: rows.length <= limit,
+            continueCursor: JSON.stringify({
+                v: 1,
+                scope,
+                visitorId: last?.visitorId ?? after?.visitorId ?? "",
+                value: last
+                    ? filter?.field === "name"
+                        ? last.searchName
+                        : filter?.field === "email"
+                            ? last.searchEmail
+                            : last.visitorId
+                    : (after?.value ?? ""),
+            }),
+        };
+    },
+});
+//# sourceMappingURL=people.js.map

package/dist/component/people.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"people.js","sourceRoot":"","sources":["../../src/component/people.ts"],"names":[],"mappings":"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"}

package/dist/component/reports.d.ts

@@ -140,7 +140,7 @@ export declare const liveVisitors: import("convex/server").RegisteredQuery<"publ
     limit?: number | undefined;
     now: number;
     siteIds: import("convex/values").GenericId<"sites">[];
-}, Promise<{
+}, Promise<({
     _id: import("convex/values").GenericId<"liveSessions">;
     _creationTime: number;
     siteId: import("convex/values").GenericId<"sites">;
@@ -172,7 +172,9 @@ export declare const liveVisitors: import("convex/server").RegisteredQuery<"publ
         step: number;
         steps: number;
     } | undefined;
-}[]>>;
+} & {
+    profile?: import("./validators.js").VisitorProfile;
+})[]>>;
 /**
  * Every route the sites served in the range and the transitions between
  * them, read from the daily route rollups newest day first. Exits and
@@ -194,6 +196,9 @@ export declare const siteMap: import("convex/server").RegisteredQuery<"public",
         from: number;
         to: number;
     } | null;
+    routePatterns: {
+        [k: string]: string[];
+    };
     routes: {
         route: string;
         pageviews: number;
@@ -250,7 +255,9 @@ type SessionRow = Omit<Doc<"sessions">, "geoLookupAttemptedAt" | "lastPageviewAt
 export declare const getSession: import("convex/server").RegisteredQuery<"public", {
     sessionId: string;
     siteId: import("convex/values").GenericId<"sites">;
-}, Promise<SessionRow | null>>;
+}, Promise<(SessionRow & {
+    profile?: import("./validators.js").VisitorProfile;
+}) | null>>;
 /** Exact commissions alongside overview's period revenue/conversion totals. */
 export declare const revenueSummary: import("convex/server").RegisteredQuery<"public", {
     from: number;
@@ -272,7 +279,9 @@ export declare const listSessions: import("convex/server").RegisteredQuery<"publ
     siteId: import("convex/values").GenericId<"sites">;
     to: number;
 }, Promise<{
-    page: SessionRow[];
+    page: (SessionRow & {
+        profile?: import("./validators.js").VisitorProfile;
+    })[];
     isDone: boolean;
     continueCursor: string;
 }>>;

package/dist/component/reports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reports.d.ts","sourceRoot":"","sources":["../../src/component/reports.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAiMzD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;gBAqwEX,MAAM;mBACH,MAAM;gBACT,MAAM;sBACA,MAAM;wBACJ,MAAM;kBACZ,MAAM;kBACN,MAAM;qBACH,MAAM;sBACL,MAAM;oBACR,MAAM;2BACC,MAAM;qBACZ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAt6DX,UAAU;YACV,YAAY;YACZ,QAAQ;YACR,YAAY;YACZ,UAAU;YACV,WAAW;YACX,SAAS,EAAE,aAAa;YACxB,QAAQ,EAAE,sBAAsB;YAChC,UAAU;YACV,WAAW,EAAE,aAAa;YAC1B,YAAY;YACZ,WAAW;YACX,WAAW;;;;;;;;;;;;;;sBAsgEP,WAAW;;;;YAz/Df,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;YAC5B,YAAY,EAAE,WAAW;;;GAKjC,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAsEvB,CAAC;AAsBH;;;;;;;;;GASG;AACH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA0KN,MAAM;YAAM,MAAM;eAAS,MAAM;;;QA+CvC,MAAM;QACN,WAAW;;;eAzKN,aAAa;;;wBAGN,CAAC;;;;;;;;sBAq1DP,WAAW;;;;YA/0DP,KAAK,EAAE,iBAAiB;YAAW,KAAK;;;;;;;;GAyKxD,CAAC;AA0CH,KAAK,UAAU,GAAG,IAAI,CACpB,GAAG,CAAC,UAAU,CAAC,EACf,sBAAsB,GAAG,gBAAgB,CAC1C,CAAC;AAkBF,uEAAuE;AACvE,eAAO,MAAM,UAAU;;;8BAmBrB,CAAC;AAEH,+EAA+E;AAC/E,eAAO,MAAM,cAAc;;;;;;GAwEzB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;GAyEvB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BzB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiE1B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgDzB,CAAC;AASH,eAAO,MAAM,WAAW;;;;;;;;qBAiBH,MAAM;oBAAc,MAAM;;;;;;;;;;;;QA0DvC,KAAK;QACL,QAAQ;;;;;;;QAWR,KAAK;;;sBAwsCC,WAAW;;;;GApsCvB,CAAC;AAiBH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;QAoFhB,KAAK;QAGL,QAAQ;;;;;;;QACR,KAAK;;;sBA2lCD,WAAW;;;;;;;;;;;;;;;;KArlCvB,CAAC;AAYH,eAAO,MAAM,gBAAgB;;;;;;;;qBAqDR,MAAM;sBACL,MAAM;yBACH,MAAM;;;;;;;;;;;;;;QAkGvB,KAAK;QACL,QAAQ;;;;;;;QAaR,KAAK;;;sBAk6BC,WAAW;;;QAj6BjB,cAAc;YACZ,KAAK;YAGL,KAAK;;;GAKb,CAAC;AAWH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4HjB,KAAK,EAAE,aAAa;QACpB,QAAQ;;;;;;;QAOR,KAAK;;;sBAywBC,WAAW;;;;GArwBvB,CAAC;AAiBH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;GAmDvB,CAAC;AAykBH,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}
+{"version":3,"file":"reports.d.ts","sourceRoot":"","sources":["../../src/component/reports.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAoMzD,eAAO,MAAM,QAAQ;;;;;;;;;;;;;gBA2xEX,MAAM;mBACH,MAAM;gBACT,MAAM;sBACA,MAAM;wBACJ,MAAM;kBACZ,MAAM;kBACN,MAAM;qBACH,MAAM;sBACL,MAAM;oBACR,MAAM;2BACC,MAAM;qBACZ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA57DX,UAAU;YACV,YAAY;YACZ,QAAQ;YACR,YAAY;YACZ,UAAU;YACV,WAAW;YACX,SAAS,EAAE,aAAa;YACxB,QAAQ,EAAE,sBAAsB;YAChC,UAAU;YACV,WAAW,EAAE,aAAa;YAC1B,YAAY;YACZ,WAAW;YACX,WAAW;;;;;;;;;;;;;;sBA4hEP,WAAW;;;;YA/gEf,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;YAC5B,YAAY,EAAE,WAAW;;;GAKjC,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAuEvB,CAAC;AAsBH;;;;;;;;;GASG;AACH,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA2LN,MAAM;YAAM,MAAM;eAAS,MAAM;;;QAgDvC,MAAM;QACN,WAAW;;;eA/KN,aAAa;;;wBAGN,CAAC;;;;;;;;sBA81DP,WAAW;;;;YAx1DP,KAAK,EAAE,iBAAiB;YAAW,KAAK;;;;;;;;GA+KxD,CAAC;AA0CH,KAAK,UAAU,GAAG,IAAI,CACpB,GAAG,CAAC,UAAU,CAAC,EACf,sBAAsB,GAAG,gBAAgB,CAC1C,CAAC;AAkBF,uEAAuE;AACvE,eAAO,MAAM,UAAU;;;;;WAqBrB,CAAC;AAEH,+EAA+E;AAC/E,eAAO,MAAM,cAAc;;;;;;GAwEzB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;GA0EvB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BzB,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiE1B,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAgDzB,CAAC;AASH,eAAO,MAAM,WAAW;;;;;;;;qBAiBH,MAAM;oBAAc,MAAM;;;;;;;;;;;;QA0DvC,KAAK;QACL,QAAQ;;;;;;;QAWR,KAAK;;;sBAwsCC,WAAW;;;;GApsCvB,CAAC;AAiBH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;QAoFhB,KAAK;QAGL,QAAQ;;;;;;;QACR,KAAK;;;sBA2lCD,WAAW;;;;;;;;;;;;;;;;KArlCvB,CAAC;AAYH,eAAO,MAAM,gBAAgB;;;;;;;;qBAqDR,MAAM;sBACL,MAAM;yBACH,MAAM;;;;;;;;;;;;;;QAkGvB,KAAK;QACL,QAAQ;;;;;;;QAaR,KAAK;;;sBAk6BC,WAAW;;;QAj6BjB,cAAc;YACZ,KAAK;YAGL,KAAK;;;GAKb,CAAC;AAWH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA4HjB,KAAK,EAAE,aAAa;QACpB,QAAQ;;;;;;;QAOR,KAAK;;;sBAywBC,WAAW;;;;GArwBvB,CAAC;AAiBH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;GAmDvB,CAAC;AAykBH,KAAK,YAAY,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC"}

package/dist/component/reports.js

@@ -8,11 +8,12 @@ import { isLocalDayAligned, localDayStart, localDayStarts, localDayTimezone, sha
 import { compareJourneyEvents, hydrateEventContexts, loadSessionJourneyEvents, loadVisitorJourneyEvents, } from "./eventStore.js";
 import { isPlainRecord } from "./guards.js";
 import { classifyOrigin } from "./origin.js";
-import { externalReferrer } from "./sanitize.js";
-import { affiliateFieldsValidator, eventFieldsValidator, funnelFieldsValidator, goalFieldsValidator, sessionFieldsValidator, vitalMetricValidator, } from "./validators.js";
-import { resolveVisitorIdentities } from "./visitors.js";
+import { externalReferrer, normalizeRoute } from "./sanitize.js";
+import { affiliateFieldsValidator, eventFieldsValidator, funnelFieldsValidator, goalFieldsValidator, sessionFieldsValidator, vitalMetricValidator, visitorProfileValidator, } from "./validators.js";
+import { resolveVisitorIdentities, withVisitorProfiles } from "./visitors.js";
 import { mergeVitalHistograms, VITAL_ALL, VITAL_METRICS, vitalHistogramPercentile, vitalRatingCounts, } from "./vitals.js";
 const sessionDocumentValidator = sessionFieldsValidator.extend({
+    profile: v.optional(visitorProfileValidator),
     _id: v.id("sessions"),
     _creationTime: v.number(),
 });
@@ -21,6 +22,7 @@ const eventDocumentValidator = eventFieldsValidator.extend({
     _creationTime: v.number(),
 });
 const liveSessionDocumentValidator = v.object({
+    profile: v.optional(visitorProfileValidator),
     _id: v.id("liveSessions"),
     _creationTime: v.number(),
     siteId: v.id("sites"),
@@ -470,7 +472,7 @@ export const liveVisitors = query({
                 .order("desc")
                 .take(limit)));
         }
-        return rows
+        const visible = rows
             .sort((left, right) => right.lastSeenAt - left.lastSeenAt)
             .slice(0, limit)
             .map((row) => ({
@@ -504,6 +506,7 @@ export const liveVisitors = query({
                 : {}),
             ...(row.funnel ? { funnel: row.funnel } : {}),
         }));
+        return withVisitorProfiles(ctx, visible);
     },
 });
 const siteMapRouteValidator = v.object({
@@ -547,6 +550,7 @@ export const siteMap = query({
         window: v.union(v.object({ from: v.number(), to: v.number() }), v.null()),
         routes: v.array(siteMapRouteValidator),
         transitions: v.array(siteMapTransitionValidator),
+        routePatterns: v.optional(v.record(v.string(), v.array(v.string()))),
         truncated: v.object({ routes: v.boolean(), transitions: v.boolean() }),
         metadata: reportMetadataValidator.extend({
             visitors: v.object({
@@ -564,6 +568,10 @@ export const siteMap = query({
         const siteIds = validateSiteIds(args.siteIds);
         validateRange(args.from, args.to, MAX_FEATURE_ROLLUP_DAYS);
         requireAlignedRange(args.from, args.to, DAY_MS, "site map");
+        const routePatterns = Object.fromEntries(await Promise.all(siteIds.map(async (siteId) => [
+            siteId,
+            (await ctx.db.get("sites", siteId))?.routePatterns ?? [],
+        ])));
         const controls = await Promise.all(siteIds.map((siteId) => ctx.db
             .query("analyticsCoverage")
             .withIndex("by_siteId", (range) => range.eq("siteId", siteId))
@@ -601,6 +609,7 @@ export const siteMap = query({
                 window: null,
                 routes: [],
                 transitions: [],
+                routePatterns,
                 truncated: { routes: false, transitions: false },
                 metadata: metadata("unavailable"),
             };
@@ -639,7 +648,10 @@ export const siteMap = query({
         for (const row of rows) {
             if (row.bucketStart < completeFrom)
                 continue;
-            const current = totalsFor(row.route);
+            // Apply current patterns to retained rollups too, before merging sketches.
+            const patterns = routePatterns[row.siteId];
+            const route = normalizeRoute(row.route, patterns);
+            const current = totalsFor(route);
             current.pageviews += row.pageviews;
             current.entries += row.entries;
             current.continued += row.continued;
@@ -648,10 +660,11 @@ export const siteMap = query({
             current.sketch = unionVisitorSketches(current.sketch, row.visitorSketch);
             current.daily.set(row.bucketStart, (current.daily.get(row.bucketStart) ?? 0) + row.pageviews);
             for (const target of row.outgoing) {
-                const key = `${row.route}\u0000${target.route}`;
+                const to = normalizeRoute(target.route, patterns);
+                const key = `${route}\u0000${to}`;
                 const edge = edges.get(key) ?? {
-                    from: row.route,
-                    to: target.route,
+                    from: route,
+                    to,
                     count: 0,
                 };
                 edge.count += target.count;
@@ -695,6 +708,7 @@ export const siteMap = query({
             from: args.from,
             to: args.to,
             window: completeFrom > args.to ? null : { from: windowFrom, to: args.to },
+            routePatterns,
             routes: routeRows,
             transitions: transitionRows,
             truncated: {
@@ -765,7 +779,7 @@ export const getSession = query({
             return null;
         const { geoLookupAttemptedAt: _geo, lastPageviewAt: _pageview, ...result } = session;
         const site = await ctx.db.get("sites", args.siteId);
-        return withOrigin(result, site?.domains ?? []);
+        return (await withVisitorProfiles(ctx, [withOrigin(result, site?.domains ?? [])]))[0];
     },
 });
 /** Exact commissions alongside overview's period revenue/conversion totals. */
@@ -879,10 +893,11 @@ export const listSessions = query({
         }
         const site = await ctx.db.get("sites", args.siteId);
         const publicRows = rows.map(({ geoLookupAttemptedAt: _attemptedAt, lastPageviewAt: _lastPageviewAt, ...row }) => withOrigin(row, site?.domains ?? []));
-        return keysetPaginationResult(publicRows, pagination, (row) => ({
+        const result = keysetPaginationResult(publicRows, pagination, (row) => ({
             timestamp: row.lastSeenAt,
             creationTime: row._creationTime,
         }));
+        return { ...result, page: await withVisitorProfiles(ctx, result.page) };
     },
 });
 export const sessionJourney = query({