Lint format files. Updated rng function.

This commit is contained in:
Mike Cao committed 2026-06-02 22:35:07 -07:00
1 parent 5bf1792b38
commit 306ca4a435
144 files changed
+962 -626

No files matched your search

+7 -9
View File
@@ -39,10 +39,9 @@ async function relationalQuery(websiteId: string, filters: QueryFilters) {
group by website_event.event_id
`;
const count = await rawQuery(
`select count(*) as num from (${eventQuery}) t`,
queryParams,
).then((res: any) => res[0].num);
const count = await rawQuery(`select count(*) as num from (${eventQuery}) t`, queryParams).then(
(res: any) => res[0].num,
);
const data = await rawQuery(
`
@@ -106,10 +105,9 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
group by event_data.event_id
`;
const count = await rawQuery(
`select count(*) as num from (${eventQuery}) t`,
queryParams,
).then((res: any) => res[0].num);
const count = await rawQuery(`select count(*) as num from (${eventQuery}) t`, queryParams).then(
(res: any) => res[0].num,
);
const data = await rawQuery(
`
@@ -149,4 +147,4 @@ async function clickhouseQuery(websiteId: string, filters: QueryFilters) {
);
return { data, count, page: +page, pageSize: size };
}
}
@@ -1,9 +1,9 @@
import { serializeError } from 'serialize-error';
import { getApiUrl } from '@/lib/api-url';
import clickhouse from '@/lib/clickhouse';
import prisma from '@/lib/prisma';
import { uuid } from '@/lib/crypto';
import { getHeatmapSnapshot, putHeatmapSnapshot } from '@/lib/heatmap-r2';
import prisma from '@/lib/prisma';
import { getWebsite } from '@/queries/prisma';
const SNAPSHOT_STATUS = {
@@ -78,7 +78,12 @@ async function measurePage(page: any) {
const rootClientWidth = root?.clientWidth || 0;
const docClientWidth = doc?.clientWidth || 0;
const bodyClientWidth = body?.clientWidth || 0;
const visibleWidth = Math.max(window.innerWidth, rootClientWidth, docClientWidth, bodyClientWidth);
const visibleWidth = Math.max(
window.innerWidth,
rootClientWidth,
docClientWidth,
bodyClientWidth,
);
const rootScrollWidth = root?.scrollWidth || 0;
const docScrollWidth = doc?.scrollWidth || 0;
const bodyScrollWidth = body?.scrollWidth || 0;
@@ -299,7 +304,9 @@ async function findClickhouseSnapshot(
return null;
}
const status = Object.entries(CLICKHOUSE_SNAPSHOT_STATUS).find(([, value]) => value === row.status)?.[0];
const status = Object.entries(CLICKHOUSE_SNAPSHOT_STATUS).find(
([, value]) => value === row.status,
)?.[0];
if (!status) {
return null;
@@ -325,7 +332,10 @@ function getSnapshotImageUrl(websiteId: string, snapshotId: string) {
function mapSnapshot(websiteId: string, row: SnapshotRecord): HeatmapSnapshotImage {
return {
id: row.id,
imageUrl: row.status === SNAPSHOT_STATUS.ready && row.hasImage ? getSnapshotImageUrl(websiteId, row.id) : null,
imageUrl:
row.status === SNAPSHOT_STATUS.ready && row.hasImage
? getSnapshotImageUrl(websiteId, row.id)
: null,
status: row.status,
mimeType: row.mimeType,
pageW: Number(row.pageW),
@@ -566,7 +576,12 @@ async function insertClickhouseSnapshotRecord({
]);
}
function getSnapshotObjectKey(websiteId: string, snapshotId: string, viewportW: number, viewportH: number) {
function getSnapshotObjectKey(
websiteId: string,
snapshotId: string,
viewportW: number,
viewportH: number,
) {
return `${websiteId}/${viewportW}x${viewportH}/${snapshotId}.png`;
}
@@ -624,7 +639,9 @@ async function captureSnapshot(
let dimensions = await measurePage(page);
let currentWidth = initialViewportW;
let captureWidth =
dimensions.pageW > initialViewportW + 24 ? Math.max(initialViewportW, dimensions.pageW) : initialViewportW;
dimensions.pageW > initialViewportW + 24
? Math.max(initialViewportW, dimensions.pageW)
: initialViewportW;
for (let i = 0; i < 3; i++) {
if (captureWidth <= currentWidth) {
@@ -684,17 +701,11 @@ export async function ensureHeatmapSnapshot({
const updatedAt = existing?.updatedAt ? new Date(existing.updatedAt) : null;
const ageMs = updatedAt ? Date.now() - updatedAt.getTime() : Number.POSITIVE_INFINITY;
if (
existing?.status === SNAPSHOT_STATUS.pending &&
ageMs < SNAPSHOT_PENDING_WINDOW_MS
) {
if (existing?.status === SNAPSHOT_STATUS.pending && ageMs < SNAPSHOT_PENDING_WINDOW_MS) {
return mapSnapshot(websiteId, existing);
}
if (
existing?.status === SNAPSHOT_STATUS.failed &&
ageMs < SNAPSHOT_RETRY_DELAY_MS
) {
if (existing?.status === SNAPSHOT_STATUS.failed && ageMs < SNAPSHOT_RETRY_DELAY_MS) {
return mapSnapshot(websiteId, existing);
}
@@ -738,10 +749,9 @@ export async function ensureHeatmapSnapshot({
try {
const capture = await captureSnapshot(captureUrl, viewportW, viewportH, pageW);
const objectKey =
clickhouse.enabled
? getSnapshotObjectKey(websiteId, snapshotId, viewportW, viewportH)
: null;
const objectKey = clickhouse.enabled
? getSnapshotObjectKey(websiteId, snapshotId, viewportW, viewportH)
: null;
if (objectKey) {
await putHeatmapSnapshot(objectKey, capture.imageData, capture.mimeType);
@@ -798,9 +808,7 @@ export async function getHeatmapSnapshotImage(
snapshotId: string,
): Promise<{ mimeType: string; imageData: Buffer } | null> {
if (clickhouse.enabled) {
const rows = await clickhouse.rawQuery<
{ mimeType: string; objectKey: string }[]
>(
const rows = await clickhouse.rawQuery<{ mimeType: string; objectKey: string }[]>(
`
select
mime_type as mimeType,
+14 -12
View File
@@ -5,8 +5,8 @@ import { filtersObjectToArray } from '@/lib/params';
import prisma from '@/lib/prisma';
import type { QueryFilters } from '@/lib/types';
import {
type HeatmapSnapshotImage,
ensureHeatmapSnapshot,
type HeatmapSnapshotImage,
shouldSkipSnapshot,
} from './ensureHeatmapSnapshot';
@@ -543,15 +543,13 @@ function pickSnapshotViewport(
}
}
let bestViewport:
| {
width: number;
height: number;
count: number;
maxPageW: number;
maxPageH: number;
}
| null = null;
let bestViewport: {
width: number;
height: number;
count: number;
maxPageW: number;
maxPageH: number;
} | null = null;
for (const bucket of viewportBuckets.values()) {
if (!bestViewport || bucket.count > bestViewport.count) {
@@ -626,7 +624,9 @@ function getRelationalHeatmapPathFilterContext(filters: QueryFilters) {
);
const joinedClauses =
filters.match === 'any' ? clauses.filter(Boolean).join('\n or ') : clauses.filter(Boolean).join('\n and ');
filters.match === 'any'
? clauses.filter(Boolean).join('\n or ')
: clauses.filter(Boolean).join('\n and ');
return {
filterQuery:
@@ -680,7 +680,9 @@ function getClickhouseHeatmapPathFilterContext(filters: QueryFilters) {
);
const joinedClauses =
filters.match === 'any' ? clauses.filter(Boolean).join('\n or ') : clauses.filter(Boolean).join('\n and ');
filters.match === 'any'
? clauses.filter(Boolean).join('\n or ')
: clauses.filter(Boolean).join('\n and ');
return {
filterQuery:
+3 -3
View File
@@ -44,14 +44,14 @@ export * from './reports/getUTM';
export * from './sessions/createSession';
export * from './sessions/getSessionActivity';
export * from './sessions/getSessionData';
export * from './sessions/getSessionDataActivityStats';
export * from './sessions/getSessionDataArraySeries';
export * from './sessions/getSessionDataDateSeries';
export * from './sessions/getSessionDataProperties';
export * from './sessions/getSessionDataPropertySeries';
export * from './sessions/getSessionDataNumericSeries';
export * from './sessions/getSessionDataNumericStats';
export * from './sessions/getSessionDataPivot';
export * from './sessions/getSessionDataActivityStats';
export * from './sessions/getSessionDataProperties';
export * from './sessions/getSessionDataPropertySeries';
export * from './sessions/getSessionDataValues';
export * from './sessions/getSessionExpandedMetrics';
export * from './sessions/getSessionMetrics';
@@ -75,13 +75,15 @@ async function relationalQuery(
`;
}
const selectColumn = type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
const selectColumn =
type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
const groupByColumn = type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
const groupByColumn =
type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
return rawQuery(
`
@@ -71,9 +71,10 @@ async function relationalQuery(
column = `x.${FILTER_COLUMNS[type] || type}`;
}
const selectColumn = type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
const selectColumn =
type === 'fullPath'
? `case when website_event.url_query != '' then website_event.url_path || '?' || website_event.url_query else website_event.url_path end`
: column;
return rawQuery(
`
@@ -7,7 +7,12 @@ import type { PropertyFilter, PropertyLeaderboardRow, QueryFilters } from '@/lib
const FUNCTION_NAME = 'getSessionDataActivityStats';
export async function getSessionDataActivityStats(
...args: [websiteId: string, propertyName: string, filters: QueryFilters, propertyFilters?: PropertyFilter[]]
...args: [
websiteId: string,
propertyName: string,
filters: QueryFilters,
propertyFilters?: PropertyFilter[],
]
): Promise<PropertyLeaderboardRow[]> {
return runQuery({
[PRISMA]: () => relationalQuery(...args),
@@ -28,8 +33,12 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
with filtered_sessions as (
@@ -110,8 +119,16 @@ async function clickhouseQuery(
) {
const { timezone = 'UTC' } = filters;
const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -33,7 +33,11 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -71,8 +75,16 @@ async function clickhouseQuery(
): Promise<EventDataSeriesPoint[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -33,7 +33,11 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -69,8 +73,16 @@ async function clickhouseQuery(
): Promise<EventDataDateSeriesPoint[]> {
const { timezone = 'UTC' } = filters;
const { rawQuery, parseFilters, getDateStringSQL, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -35,7 +35,11 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
const aggSql =
metric === 'avg'
? 'avg(cast(session_data.number_value as decimal))'
@@ -83,8 +87,16 @@ async function clickhouseQuery(
): Promise<{ t: string; y: number }[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
const aggSql =
metric === 'avg'
? 'avg(session_data.number_value)'
@@ -33,7 +33,11 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -75,8 +79,16 @@ async function clickhouseQuery(
): Promise<EventDataNumericStats[]> {
const { timezone = 'UTC' } = filters;
const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -128,7 +128,11 @@ async function clickhouseQuery(
const { timezone = 'UTC' } = filters;
const { pagedRawQuery, parseFilters, getPropertyFilterQuery, getDateStringSQL } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
@@ -85,7 +85,11 @@ async function clickhouseQuery(
): Promise<{ propertyName: string; dataType: number; total: number }[]> {
const { timezone = 'UTC' } = filters;
const { rawQuery, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
@@ -33,7 +33,11 @@ async function relationalQuery(
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`
@@ -70,8 +74,16 @@ async function clickhouseQuery(
): Promise<EventDataSeriesPoint[]> {
const { timezone = 'UTC', unit = 'day' } = filters;
const { rawQuery, getDateSQL, parseFilters, getPropertyFilterQuery } = clickhouse;
const { filterQuery, cohortQuery, queryParams } = parseFilters({ ...filters, websiteId, timezone });
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(propertyFilters, 'session', timezone);
const { filterQuery, cohortQuery, queryParams } = parseFilters({
...filters,
websiteId,
timezone,
});
const { sql: pfSQL, params: pfParams } = getPropertyFilterQuery(
propertyFilters,
'session',
timezone,
);
return rawQuery(
`