🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor analytics API and UI components for PDF export functionality (#807)
Bill Yange036123be1db
diff --git a/client/src/api/analytics/endpoints/export.ts b/client/src/api/analytics/endpoints/export.tsnew file mode 100644index 000000000..96bf0ee57--- /dev/null+++ b/client/src/api/analytics/endpoints/export.ts@@ -0,0 +1,31 @@+import { authedFetch } from "../../utils";+import { CommonApiParams, toQueryParams } from "./types";++export interface ExportPdfParams extends CommonApiParams {}++/**+ * Export analytics data as a PDF report+ * GET /api/sites/:siteId/export/pdf+ *+ * This function fetches the PDF from the server and triggers a browser download.+ */+export async function exportPdfReport(site: string | number, params: ExportPdfParams): Promise<void> {+ const blob = await authedFetch<Blob>(`/sites/${site}/export/pdf`, toQueryParams(params), {+ responseType: "blob",+ });++ // Create download link+ const url = URL.createObjectURL(blob);+ const link = document.createElement("a");+ link.href = url;++ // Generate filename with date range+ const startDate = params.startDate || "all";+ const endDate = params.endDate || "time";+ link.download = `rybbit-report-${site}-${startDate}-to-${endDate}.pdf`;++ document.body.appendChild(link);+ link.click();+ document.body.removeChild(link);+ URL.revokeObjectURL(url);+}diff --git a/client/src/api/analytics/endpoints/index.ts b/client/src/api/analytics/endpoints/index.tsindex 4d5e6230a..8a5eab070 100644--- a/client/src/api/analytics/endpoints/index.ts+++ b/client/src/api/analytics/endpoints/index.ts@@ -128,3 +128,7 @@ export type {GetSessionReplayEventsResponse,SessionReplaysParams,} from "./sessionReplay";++// Export endpoints+export { exportPdfReport } from "./export";+export type { ExportPdfParams } from "./export";diff --git a/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx b/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsxnew file mode 100644index 000000000..2d18eb86b--- /dev/null+++ b/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx@@ -0,0 +1,89 @@+"use client";++import { Download, FileArchive, FileText, Loader2 } from "lucide-react";+import { useState } from "react";+import { toast } from "sonner";+import { Button } from "../../../../../components/ui/button";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "../../../../../components/ui/dropdown-menu";+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";+import { getTimezone, useStore } from "../../../../../lib/store";+import { exportCsv } from "./exportCsv";+import { exportPdf } from "./exportPdf";++export function ExportButton() {+ const [isExportingCsv, setIsExportingCsv] = useState(false);+ const [isExportingPdf, setIsExportingPdf] = useState(false);+ const { site, time, filters } = useStore();++ const handleExportPdf = async () => {+ if (!site) {+ toast.error("No site selected");+ return;+ }++ setIsExportingPdf(true);++ try {+ await exportPdf({ site, time, filters, timeZone: getTimezone() });+ toast.success("PDF report downloaded");+ } catch (error) {+ console.error("PDF export failed:", error);+ toast.error(error instanceof Error ? error.message : "Failed to generate PDF report");+ } finally {+ setIsExportingPdf(false);+ }+ };++ const handleExportCsv = async () => {+ if (!site) {+ toast.error("No site selected");+ return;+ }++ setIsExportingCsv(true);++ try {+ const fileCount = await exportCsv({ site, time, filters, timeZone: getTimezone() });+ toast.success(`Exported ${fileCount} files`);+ } catch (error) {+ console.error("Export failed:", error);+ toast.error(error instanceof Error ? error.message : "Export failed. Please try again.");+ } finally {+ setIsExportingCsv(false);+ }+ };++ const isExporting = isExportingCsv || isExportingPdf;++ return (+ <DropdownMenu>+ <Tooltip>+ <TooltipTrigger asChild>+ <DropdownMenuTrigger asChild>+ <Button variant="secondary" size="icon" disabled={isExporting} className="h-8 w-8">+ {isExporting ? <Loader2 className="h-4 w-4 animate-spin" /> : <Download className="h-4 w-4" />}+ </Button>+ </DropdownMenuTrigger>+ </TooltipTrigger>+ <TooltipContent>+ <p>Export data</p>+ </TooltipContent>+ </Tooltip>+ <DropdownMenuContent align="end">+ <DropdownMenuItem onClick={handleExportPdf} disabled={isExportingPdf}>+ <FileText className="h-4 w-4 mr-2" />+ {isExportingPdf ? "Generating PDF..." : "Export as PDF Report"}+ </DropdownMenuItem>+ <DropdownMenuItem onClick={handleExportCsv} disabled={isExportingCsv}>+ <FileArchive className="h-4 w-4 mr-2" />+ {isExportingCsv ? "Exporting..." : "Export as CSV (ZIP)"}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ );+}diff --git a/client/src/app/[site]/components/SubHeader/Export/exportCsv.ts b/client/src/app/[site]/components/SubHeader/Export/exportCsv.tsnew file mode 100644index 000000000..3c9f08e7f--- /dev/null+++ b/client/src/app/[site]/components/SubHeader/Export/exportCsv.ts@@ -0,0 +1,230 @@+import { FilterParameter } from "@rybbit/shared";+import {+ fetchEventNames,+ fetchMetric,+ fetchOutboundLinks,+ fetchOverviewBucketed,+} from "../../../../../api/analytics/endpoints";+import { getStartAndEndDate } from "../../../../../api/utils";+import { fetchGSCConnectionStatus, fetchGSCData, GSCDimension } from "../../../../../api/gsc/endpoints";+import { IS_CLOUD } from "../../../../../lib/const";+import { CSVFile, downloadZip, formatDateForFilename } from "../../../../../lib/export";+import { Time } from "../../../../../components/DateSelector/types";+import { Filter } from "@rybbit/shared";++// Metric parameters for each section+const REFERRER_METRICS: { param: FilterParameter; filename: string }[] = [+ { param: "referrer", filename: "referrers.csv" },+ { param: "channel", filename: "channels.csv" },+ { param: "utm_source", filename: "utm-source.csv" },+ { param: "utm_medium", filename: "utm-medium.csv" },+ { param: "utm_campaign", filename: "utm-campaign.csv" },+ { param: "utm_term", filename: "utm-term.csv" },+ { param: "utm_content", filename: "utm-content.csv" },+];++const PAGE_METRICS: { param: FilterParameter; filename: string }[] = [+ { param: "pathname", filename: "pages.csv" },+ { param: "page_title", filename: "page-titles.csv" },+ { param: "entry_page", filename: "entry-pages.csv" },+ { param: "exit_page", filename: "exit-pages.csv" },+ { param: "hostname", filename: "hostnames.csv" },+];++const DEVICE_METRICS: { param: FilterParameter; filename: string }[] = [+ { param: "browser", filename: "browsers.csv" },+ { param: "device_type", filename: "devices.csv" },+ { param: "operating_system", filename: "operating-systems.csv" },+ { param: "dimensions", filename: "screen-dimensions.csv" },+];++const COUNTRY_METRICS: { param: FilterParameter; filename: string }[] = [+ { param: "country", filename: "countries.csv" },+ { param: "region", filename: "regions.csv" },+ { param: "city", filename: "cities.csv" },+ { param: "language", filename: "languages.csv" },+ { param: "timezone", filename: "timezones.csv" },+];++const NETWORK_METRICS: { param: FilterParameter; filename: string }[] = [+ { param: "vpn", filename: "vpn.csv" },+ { param: "crawler", filename: "crawlers.csv" },+ { param: "datacenter", filename: "datacenters.csv" },+ { param: "company", filename: "companies.csv" },+ { param: "company_type", filename: "company-types.csv" },+ { param: "company_domain", filename: "company-domains.csv" },+ { param: "asn_org", filename: "asn-orgs.csv" },+ { param: "asn_type", filename: "asn-types.csv" },+ { param: "asn_domain", filename: "asn-domains.csv" },+];++const GSC_DIMENSIONS: { dimension: GSCDimension; filename: string }[] = [+ { dimension: "query", filename: "gsc-queries.csv" },+ { dimension: "page", filename: "gsc-pages.csv" },+ { dimension: "country", filename: "gsc-countries.csv" },+ { dimension: "device", filename: "gsc-devices.csv" },+];++interface ExportCsvParams {+ site: string;+ time: Time;+ filters: Filter[];+ timeZone: string;+}++export async function exportCsv({ site, time, filters, timeZone }: ExportCsvParams): Promise<number> {+ const csvFiles: CSVFile[] = [];++ // Convert time to API params+ const { startDate, endDate } = getStartAndEndDate(time);+ const commonParams = {+ startDate: startDate ?? "",+ endDate: endDate ?? "",+ timeZone,+ filters,+ };++ // Fetch all metrics in parallel+ const allMetrics = [+ ...REFERRER_METRICS,+ ...PAGE_METRICS,+ ...DEVICE_METRICS,+ ...COUNTRY_METRICS,+ ...(IS_CLOUD ? NETWORK_METRICS : []),+ ];++ const metricPromises = allMetrics.map(async ({ param, filename }) => {+ try {+ const result = await fetchMetric(site, { ...commonParams, parameter: param });+ return { filename, data: result.data as Record<string, unknown>[] };+ } catch {+ console.warn(`Failed to fetch ${param}`);+ return { filename, data: [] };+ }+ });++ // Fetch overview bucketed data+ const overviewPromise = (async () => {+ try {+ const data = await fetchOverviewBucketed(site, { ...commonParams, bucket: "day" });+ return {+ filename: "overview-timeseries.csv",+ data: data as unknown as Record<string, unknown>[],+ };+ } catch {+ console.warn("Failed to fetch overview bucketed");+ return { filename: "overview-timeseries.csv", data: [] };+ }+ })();++ // Fetch weekdays heatmap data (hourly bucketed)+ const weekdaysPromise = (async () => {+ try {+ const data = await fetchOverviewBucketed(site, { ...commonParams, bucket: "hour" });+ return {+ filename: "weekdays-heatmap.csv",+ data: data as unknown as Record<string, unknown>[],+ };+ } catch {+ console.warn("Failed to fetch weekdays data");+ return { filename: "weekdays-heatmap.csv", data: [] };+ }+ })();++ // Fetch events data+ const eventsPromise = (async () => {+ try {+ const data = await fetchEventNames(site, commonParams);+ return {+ filename: "events.csv",+ data: data as unknown as Record<string, unknown>[],+ };+ } catch {+ console.warn("Failed to fetch events");+ return { filename: "events.csv", data: [] };+ }+ })();++ // Fetch outbound links+ const outboundPromise = (async () => {+ try {+ const data = await fetchOutboundLinks(site, commonParams);+ return {+ filename: "outbound-links.csv",+ data: data as unknown as Record<string, unknown>[],+ };+ } catch {+ console.warn("Failed to fetch outbound links");+ return { filename: "outbound-links.csv", data: [] };+ }+ })();++ // Check GSC connection and fetch if connected+ const gscPromises = (async () => {+ try {+ const status = await fetchGSCConnectionStatus(site);+ if (!status.connected) {+ return [];+ }++ const gscResults = await Promise.all(+ GSC_DIMENSIONS.map(async ({ dimension, filename }) => {+ try {+ const { startDate, endDate } = getStartAndEndDate(time);+ const data = await fetchGSCData(site, {+ dimension,+ startDate: startDate ?? "",+ endDate: endDate ?? "",+ timeZone,+ });+ return {+ filename,+ data: data as unknown as Record<string, unknown>[],+ };+ } catch {+ console.warn(`Failed to fetch GSC ${dimension}`);+ return { filename, data: [] };+ }+ })+ );+ return gscResults;+ } catch {+ console.warn("Failed to check GSC connection");+ return [];+ }+ })();++ // Wait for all fetches to complete+ const [metricResults, overview, weekdays, events, outbound, gscResults] = await Promise.all([+ Promise.all(metricPromises),+ overviewPromise,+ weekdaysPromise,+ eventsPromise,+ outboundPromise,+ gscPromises,+ ]);++ // Collect all CSV files+ csvFiles.push(...metricResults);+ csvFiles.push(overview);+ csvFiles.push(weekdays);+ csvFiles.push(events);+ csvFiles.push(outbound);+ csvFiles.push(...gscResults);++ // Filter out empty files+ const nonEmptyFiles = csvFiles.filter(f => f.data.length > 0);++ if (nonEmptyFiles.length === 0) {+ throw new Error("No data to export");+ }++ // Generate ZIP filename+ const dateStr = formatDateForFilename();+ const zipFilename = `rybbit-export-${site}-${dateStr}.zip`;++ // Download the ZIP+ await downloadZip(nonEmptyFiles, zipFilename);++ return nonEmptyFiles.length;+}diff --git a/client/src/app/[site]/components/SubHeader/Export/exportPdf.ts b/client/src/app/[site]/components/SubHeader/Export/exportPdf.tsnew file mode 100644index 000000000..e1af5576c--- /dev/null+++ b/client/src/app/[site]/components/SubHeader/Export/exportPdf.ts@@ -0,0 +1,22 @@+import { Filter } from "@rybbit/shared";+import { exportPdfReport } from "../../../../../api/analytics/endpoints";+import { getStartAndEndDate } from "../../../../../api/utils";+import { Time } from "../../../../../components/DateSelector/types";++interface ExportPdfParams {+ site: string;+ time: Time;+ filters: Filter[];+ timeZone: string;+}++export async function exportPdf({ site, time, filters, timeZone }: ExportPdfParams): Promise<void> {+ const { startDate, endDate } = getStartAndEndDate(time);++ await exportPdfReport(site, {+ startDate: startDate ?? "",+ endDate: endDate ?? "",+ timeZone,+ filters,+ });+}diff --git a/client/src/app/[site]/components/SubHeader/Export/index.ts b/client/src/app/[site]/components/SubHeader/Export/index.tsnew file mode 100644index 000000000..576c484c2--- /dev/null+++ b/client/src/app/[site]/components/SubHeader/Export/index.ts@@ -0,0 +1,3 @@+export { ExportButton } from "./ExportButton";+export { exportCsv } from "./exportCsv";+export { exportPdf } from "./exportPdf";diff --git a/client/src/app/[site]/components/SubHeader/ShareSite.tsx b/client/src/app/[site]/components/SubHeader/ShareSite.tsxindex 34663e8b8..f5170d1c4 100644--- a/client/src/app/[site]/components/SubHeader/ShareSite.tsx+++ b/client/src/app/[site]/components/SubHeader/ShareSite.tsx@@ -23,7 +23,7 @@ export function ShareSite() {<TooltipTrigger asChild><DropdownMenuTrigger asChild><Button variant="secondary" size="icon" onClick={() => {}} className="h-8 w-8">- <Share />+ <Share className="h-4 w-4" /></Button></DropdownMenuTrigger></TooltipTrigger>diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsxindex 8e4201e71..698179773 100644--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx@@ -8,6 +8,7 @@ import { Filters } from "./Filters/Filters";import { DateSelector } from "../../../../components/DateSelector/DateSelector";import { authClient } from "../../../../lib/auth";import { MobileSidebar } from "../Sidebar/MobileSidebar";+import { ExportButton } from "./Export";import { NewFilterButton } from "./Filters/NewFilterButton";import { LiveUserCount } from "./LiveUserCount";import { ShareSite } from "./ShareSite";@@ -28,6 +29,9 @@ export function SubHeader({ availableFilters }: { availableFilters?: FilterParam<div className="flex items-center gap-2"><LiveUserCount />{session.data && <ShareSite />}+ <div className="hidden md:block">+ <ExportButton />+ </div><DateSelector time={time} setTime={setTime} /><div className="flex items-center"><Buttondiff --git a/client/src/app/[site]/main/components/ExportButton.tsx b/client/src/app/[site]/main/components/ExportButton.tsxdeleted file mode 100644index af9bd9662..000000000--- a/client/src/app/[site]/main/components/ExportButton.tsx+++ /dev/null@@ -1,262 +0,0 @@-"use client";--import { FilterParameter } from "@rybbit/shared";-import { Download, Loader2 } from "lucide-react";-import { useState } from "react";-import { toast } from "sonner";-import {- fetchEventNames,- fetchMetric,- fetchOutboundLinks,- fetchOverviewBucketed,-} from "../../../../api/analytics/endpoints";-import { getStartAndEndDate } from "../../../../api/utils";-import { fetchGSCConnectionStatus, fetchGSCData, GSCDimension } from "../../../../api/gsc/endpoints";-import { Button } from "../../../../components/ui/button";-import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";-import { IS_CLOUD } from "../../../../lib/const";-import { CSVFile, downloadZip, formatDateForFilename } from "../../../../lib/export";-import { useStore } from "../../../../lib/store";-import { timeZone } from "../../../../lib/dateTimeUtils";--// Metric parameters for each section-const REFERRER_METRICS: { param: FilterParameter; filename: string }[] = [- { param: "referrer", filename: "referrers.csv" },- { param: "channel", filename: "channels.csv" },- { param: "utm_source", filename: "utm-source.csv" },- { param: "utm_medium", filename: "utm-medium.csv" },- { param: "utm_campaign", filename: "utm-campaign.csv" },- { param: "utm_term", filename: "utm-term.csv" },- { param: "utm_content", filename: "utm-content.csv" },-];--const PAGE_METRICS: { param: FilterParameter; filename: string }[] = [- { param: "pathname", filename: "pages.csv" },- { param: "page_title", filename: "page-titles.csv" },- { param: "entry_page", filename: "entry-pages.csv" },- { param: "exit_page", filename: "exit-pages.csv" },- { param: "hostname", filename: "hostnames.csv" },-];--const DEVICE_METRICS: { param: FilterParameter; filename: string }[] = [- { param: "browser", filename: "browsers.csv" },- { param: "device_type", filename: "devices.csv" },- { param: "operating_system", filename: "operating-systems.csv" },- { param: "dimensions", filename: "screen-dimensions.csv" },-];--const COUNTRY_METRICS: { param: FilterParameter; filename: string }[] = [- { param: "country", filename: "countries.csv" },- { param: "region", filename: "regions.csv" },- { param: "city", filename: "cities.csv" },- { param: "language", filename: "languages.csv" },- { param: "timezone", filename: "timezones.csv" },-];--const NETWORK_METRICS: { param: FilterParameter; filename: string }[] = [- { param: "vpn", filename: "vpn.csv" },- { param: "crawler", filename: "crawlers.csv" },- { param: "datacenter", filename: "datacenters.csv" },- { param: "company", filename: "companies.csv" },- { param: "company_type", filename: "company-types.csv" },- { param: "company_domain", filename: "company-domains.csv" },- { param: "asn_org", filename: "asn-orgs.csv" },- { param: "asn_type", filename: "asn-types.csv" },- { param: "asn_domain", filename: "asn-domains.csv" },-];--const GSC_DIMENSIONS: { dimension: GSCDimension; filename: string }[] = [- { dimension: "query", filename: "gsc-queries.csv" },- { dimension: "page", filename: "gsc-pages.csv" },- { dimension: "country", filename: "gsc-countries.csv" },- { dimension: "device", filename: "gsc-devices.csv" },-];--export function ExportButton() {- const [isExporting, setIsExporting] = useState(false);- const { site, time, filters } = useStore();-- const handleExport = async () => {- if (!site) {- toast.error("No site selected");- return;- }-- setIsExporting(true);- const csvFiles: CSVFile[] = [];-- // Convert time to API params- const { startDate, endDate } = getStartAndEndDate(time);- const commonParams = {- startDate: startDate ?? "",- endDate: endDate ?? "",- timeZone,- filters,- };-- try {- // Fetch all metrics in parallel- const allMetrics = [- ...REFERRER_METRICS,- ...PAGE_METRICS,- ...DEVICE_METRICS,- ...COUNTRY_METRICS,- ...(IS_CLOUD ? NETWORK_METRICS : []),- ];-- const metricPromises = allMetrics.map(async ({ param, filename }) => {- try {- const result = await fetchMetric(site, { ...commonParams, parameter: param });- return { filename, data: result.data as Record<string, unknown>[] };- } catch {- console.warn(`Failed to fetch ${param}`);- return { filename, data: [] };- }- });-- // Fetch overview bucketed data- const overviewPromise = (async () => {- try {- const data = await fetchOverviewBucketed(site, { ...commonParams, bucket: "day" });- return {- filename: "overview-timeseries.csv",- data: data as unknown as Record<string, unknown>[],- };- } catch {- console.warn("Failed to fetch overview bucketed");- return { filename: "overview-timeseries.csv", data: [] };- }- })();-- // Fetch weekdays heatmap data (hourly bucketed)- const weekdaysPromise = (async () => {- try {- const data = await fetchOverviewBucketed(site, { ...commonParams, bucket: "hour" });- return {- filename: "weekdays-heatmap.csv",- data: data as unknown as Record<string, unknown>[],- };- } catch {- console.warn("Failed to fetch weekdays data");- return { filename: "weekdays-heatmap.csv", data: [] };- }- })();-- // Fetch events data- const eventsPromise = (async () => {- try {- const data = await fetchEventNames(site, commonParams);- return {- filename: "events.csv",- data: data as unknown as Record<string, unknown>[],- };- } catch {- console.warn("Failed to fetch events");- return { filename: "events.csv", data: [] };- }- })();-- // Fetch outbound links- const outboundPromise = (async () => {- try {- const data = await fetchOutboundLinks(site, commonParams);- return {- filename: "outbound-links.csv",- data: data as unknown as Record<string, unknown>[],- };- } catch {- console.warn("Failed to fetch outbound links");- return { filename: "outbound-links.csv", data: [] };- }- })();-- // Check GSC connection and fetch if connected- const gscPromises = (async () => {- try {- const status = await fetchGSCConnectionStatus(site);- if (!status.connected) {- return [];- }-- const gscResults = await Promise.all(- GSC_DIMENSIONS.map(async ({ dimension, filename }) => {- try {- const { startDate, endDate } = getStartAndEndDate(time);- const data = await fetchGSCData(site, {- dimension,- startDate: startDate ?? "",- endDate: endDate ?? "",- timeZone,- });- return {- filename,- data: data as unknown as Record<string, unknown>[],- };- } catch {- console.warn(`Failed to fetch GSC ${dimension}`);- return { filename, data: [] };- }- })- );- return gscResults;- } catch {- console.warn("Failed to check GSC connection");- return [];- }- })();-- // Wait for all fetches to complete- const [metricResults, overview, weekdays, events, outbound, gscResults] = await Promise.all([- Promise.all(metricPromises),- overviewPromise,- weekdaysPromise,- eventsPromise,- outboundPromise,- gscPromises,- ]);-- // Collect all CSV files- csvFiles.push(...metricResults);- csvFiles.push(overview);- csvFiles.push(weekdays);- csvFiles.push(events);- csvFiles.push(outbound);- csvFiles.push(...gscResults);-- // Filter out empty files- const nonEmptyFiles = csvFiles.filter(f => f.data.length > 0);-- if (nonEmptyFiles.length === 0) {- toast.error("No data to export");- return;- }-- // Generate ZIP filename- const dateStr = formatDateForFilename();- const zipFilename = `rybbit-export-${site}-${dateStr}.zip`;-- // Download the ZIP- await downloadZip(nonEmptyFiles, zipFilename);-- toast.success(`Exported ${nonEmptyFiles.length} files`);- } catch (error) {- console.error("Export failed:", error);- toast.error("Export failed. Please try again.");- } finally {- setIsExporting(false);- }- };-- return (- <Tooltip>- <TooltipTrigger asChild>- <Button variant="ghost" size="smIcon" onClick={handleExport} disabled={isExporting}>- {isExporting ? <Loader2 className="h-4 w-4 animate-spin" /> : <Download className="h-4 w-4" />}- </Button>- </TooltipTrigger>- <TooltipContent>- <p>Export all data as CSV (ZIP)</p>- </TooltipContent>- </Tooltip>- );-}diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsxindex a47530659..8dc0d6518 100644--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx@@ -10,7 +10,6 @@ import { useWhiteLabel } from "../../../../../hooks/useIsWhiteLabel";import { authClient } from "../../../../../lib/auth";import { useStore } from "../../../../../lib/store";import { cn } from "../../../../../lib/utils";-import { ExportButton } from "../ExportButton";import { Chart } from "./Chart";import { Overview } from "./Overview";import { PreviousChart } from "./PreviousChart";@@ -87,14 +86,7 @@ export function MainSection() {)}</div><span className="text-sm text-neutral-700 dark:text-neutral-200">{SELECTED_STAT_MAP[selectedStat]}</span>- <div className="flex items-center">- <div className="hidden md:block">- <ExportButton />- </div>- <div className="pl-1">- <BucketSelection />- </div>- </div>+ <BucketSelection /></div><div className="h-[200px] md:h-[290px] relative"><div className="absolute top-0 left-0 w-full h-full">diff --git a/server/package-lock.json b/server/package-lock.jsonindex 109804e8d..c0e951166 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -36,6 +36,7 @@"pg": "8.16.0","postgres": "3.4.5","psl": "^1.15.0",+ "puppeteer": "^24.34.0","react": "19.2.1","react-dom": "19.2.1","resend": "^4.5.1",@@ -1001,6 +1002,35 @@"node": ">=16"}},+ "node_modules/@babel/code-frame": {+ "version": "7.27.1",+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",+ "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",+ "license": "MIT",+ "dependencies": {+ "@babel/helper-validator-identifier": "^7.27.1",+ "js-tokens": "^4.0.0",+ "picocolors": "^1.1.1"+ },+ "engines": {+ "node": ">=6.9.0"+ }+ },+ "node_modules/@babel/code-frame/node_modules/js-tokens": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",+ "license": "MIT"+ },+ "node_modules/@babel/helper-validator-identifier": {+ "version": "7.28.5",+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",+ "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }+ },"node_modules/@better-auth/core": {"version": "1.3.27","resolved": "https://registry.npmjs.org/@better-auth/core/-/core-1.3.27.tgz",@@ -3055,6 +3085,52 @@"integrity": "sha512-k2ENnmBugE/rzQfEcdWHcCY+/FM3VLzH9cYEsbdsoqrvzAKRhUZeRNhAZvB8OitQJ1TBed3yqWtdjzS6wJKBwg==","license": "MIT"},+ "node_modules/@puppeteer/browsers": {+ "version": "2.11.0",+ "resolved": "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.11.0.tgz",+ "integrity": "sha512-n6oQX6mYkG8TRPuPXmbPidkUbsSRalhmaaVAQxvH1IkQy63cwsH+kOjB3e4cpCDHg0aSvsiX9bQ4s2VB6mGWUQ==",+ "license": "Apache-2.0",+ "dependencies": {+ "debug": "^4.4.3",+ "extract-zip": "^2.0.1",+ "progress": "^2.0.3",+ "proxy-agent": "^6.5.0",+ "semver": "^7.7.3",+ "tar-fs": "^3.1.1",+ "yargs": "^17.7.2"+ },+ "bin": {+ "browsers": "lib/cjs/main-cli.js"+ },+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/@puppeteer/browsers/node_modules/tar-fs": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",+ "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",+ "license": "MIT",+ "dependencies": {+ "pump": "^3.0.0",+ "tar-stream": "^3.1.5"+ },+ "optionalDependencies": {+ "bare-fs": "^4.0.1",+ "bare-path": "^3.0.0"+ }+ },+ "node_modules/@puppeteer/browsers/node_modules/tar-stream": {+ "version": "3.1.7",+ "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",+ "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",+ "license": "MIT",+ "dependencies": {+ "b4a": "^1.6.4",+ "fast-fifo": "^1.2.0",+ "streamx": "^2.15.0"+ }+ },"node_modules/@react-email/body": {"version": "0.2.0","resolved": "https://registry.npmjs.org/@react-email/body/-/body-0.2.0.tgz",@@ -4492,6 +4568,12 @@"node": ">=18.0.0"}},+ "node_modules/@tootallnate/quickjs-emscripten": {+ "version": "0.23.0",+ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",+ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",+ "license": "MIT"+ },"node_modules/@tybys/wasm-util": {"version": "0.10.1","resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",@@ -4625,6 +4707,16 @@"dev": true,"license": "MIT"},+ "node_modules/@types/yauzl": {+ "version": "2.10.3",+ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",+ "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",+ "license": "MIT",+ "optional": true,+ "dependencies": {+ "@types/node": "*"+ }+ },"node_modules/@vitest/expect": {"version": "3.2.4","resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",@@ -4781,7 +4873,6 @@"version": "7.1.4","resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz","integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",- "dev": true,"license": "MIT","engines": {"node": ">= 14"@@ -4848,7 +4939,6 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz","integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",- "dev": true,"license": "Python-2.0"},"node_modules/asn1js": {@@ -4875,6 +4965,18 @@"node": ">=12"}},+ "node_modules/ast-types": {+ "version": "0.13.4",+ "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",+ "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",+ "license": "MIT",+ "dependencies": {+ "tslib": "^2.0.1"+ },+ "engines": {+ "node": ">=4"+ }+ },"node_modules/asynckit": {"version": "0.4.0","resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",@@ -4911,6 +5013,111 @@"proxy-from-env": "^1.1.0"}},+ "node_modules/b4a": {+ "version": "1.7.3",+ "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz",+ "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==",+ "license": "Apache-2.0",+ "peerDependencies": {+ "react-native-b4a": "*"+ },+ "peerDependenciesMeta": {+ "react-native-b4a": {+ "optional": true+ }+ }+ },+ "node_modules/bare-events": {+ "version": "2.8.2",+ "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",+ "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",+ "license": "Apache-2.0",+ "peerDependencies": {+ "bare-abort-controller": "*"+ },+ "peerDependenciesMeta": {+ "bare-abort-controller": {+ "optional": true+ }+ }+ },+ "node_modules/bare-fs": {+ "version": "4.5.2",+ "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.2.tgz",+ "integrity": "sha512-veTnRzkb6aPHOvSKIOy60KzURfBdUflr5VReI+NSaPL6xf+XLdONQgZgpYvUuZLVQ8dCqxpBAudaOM1+KpAUxw==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "bare-events": "^2.5.4",+ "bare-path": "^3.0.0",+ "bare-stream": "^2.6.4",+ "bare-url": "^2.2.2",+ "fast-fifo": "^1.3.2"+ },+ "engines": {+ "bare": ">=1.16.0"+ },+ "peerDependencies": {+ "bare-buffer": "*"+ },+ "peerDependenciesMeta": {+ "bare-buffer": {+ "optional": true+ }+ }+ },+ "node_modules/bare-os": {+ "version": "3.6.2",+ "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.6.2.tgz",+ "integrity": "sha512-T+V1+1srU2qYNBmJCXZkUY5vQ0B4FSlL3QDROnKQYOqeiQR8UbjNHlPa+TIbM4cuidiN9GaTaOZgSEgsvPbh5A==",+ "license": "Apache-2.0",+ "optional": true,+ "engines": {+ "bare": ">=1.14.0"+ }+ },+ "node_modules/bare-path": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz",+ "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "bare-os": "^3.0.1"+ }+ },+ "node_modules/bare-stream": {+ "version": "2.7.0",+ "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.7.0.tgz",+ "integrity": "sha512-oyXQNicV1y8nc2aKffH+BUHFRXmx6VrPzlnaEvMhram0nPBrKcEdcyBg5r08D0i8VxngHFAiVyn1QKXpSG0B8A==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "streamx": "^2.21.0"+ },+ "peerDependencies": {+ "bare-buffer": "*",+ "bare-events": "*"+ },+ "peerDependenciesMeta": {+ "bare-buffer": {+ "optional": true+ },+ "bare-events": {+ "optional": true+ }+ }+ },+ "node_modules/bare-url": {+ "version": "2.3.2",+ "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz",+ "integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==",+ "license": "Apache-2.0",+ "optional": true,+ "dependencies": {+ "bare-path": "^3.0.0"+ }+ },"node_modules/base64-arraybuffer": {"version": "1.0.2","resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",@@ -4940,6 +5147,15 @@],"license": "MIT"},+ "node_modules/basic-ftp": {+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.1.0.tgz",+ "integrity": "sha512-RkaJzeJKDbaDWTIPiJwubyljaEPwpVWkm9Rt5h9Nd6h7tEXTJ3VB4qxdZBioV7JO5yLUaOKwz7vDOzlncUsegw==",+ "license": "MIT",+ "engines": {+ "node": ">=10.0.0"+ }+ },"node_modules/better-auth": {"version": "1.3.27","resolved": "https://registry.npmjs.org/better-auth/-/better-auth-1.3.27.tgz",@@ -5100,6 +5316,15 @@"ieee754": "^1.2.1"}},+ "node_modules/buffer-crc32": {+ "version": "0.2.13",+ "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",+ "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",+ "license": "MIT",+ "engines": {+ "node": "*"+ }+ },"node_modules/buffer-equal-constant-time": {"version": "1.0.1","resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",@@ -5167,6 +5392,15 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/callsites": {+ "version": "3.1.0",+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },"node_modules/chai": {"version": "5.3.3","resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",@@ -5200,6 +5434,106 @@"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==","license": "ISC"},+ "node_modules/chromium-bidi": {+ "version": "12.0.1",+ "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-12.0.1.tgz",+ "integrity": "sha512-fGg+6jr0xjQhzpy5N4ErZxQ4wF7KLEvhGZXD6EgvZKDhu7iOhZXnZhcDxPJDcwTcrD48NPzOCo84RP2lv3Z+Cg==",+ "license": "Apache-2.0",+ "dependencies": {+ "mitt": "^3.0.1",+ "zod": "^3.24.1"+ },+ "peerDependencies": {+ "devtools-protocol": "*"+ }+ },+ "node_modules/cliui": {+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",+ "license": "ISC",+ "dependencies": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.1",+ "wrap-ansi": "^7.0.0"+ },+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/cliui/node_modules/ansi-regex": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/cliui/node_modules/ansi-styles": {+ "version": "4.3.0",+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",+ "license": "MIT",+ "dependencies": {+ "color-convert": "^2.0.1"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"+ }+ },+ "node_modules/cliui/node_modules/emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "license": "MIT"+ },+ "node_modules/cliui/node_modules/string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "license": "MIT",+ "dependencies": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/cliui/node_modules/strip-ansi": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",+ "license": "MIT",+ "dependencies": {+ "ansi-regex": "^5.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/cliui/node_modules/wrap-ansi": {+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",+ "license": "MIT",+ "dependencies": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"+ }+ },"node_modules/clone": {"version": "2.1.2","resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",@@ -5286,6 +5620,32 @@"url": "https://opencollective.com/express"}},+ "node_modules/cosmiconfig": {+ "version": "9.0.0",+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",+ "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",+ "license": "MIT",+ "dependencies": {+ "env-paths": "^2.2.1",+ "import-fresh": "^3.3.0",+ "js-yaml": "^4.1.0",+ "parse-json": "^5.2.0"+ },+ "engines": {+ "node": ">=14"+ },+ "funding": {+ "url": "https://github.com/sponsors/d-fischer"+ },+ "peerDependencies": {+ "typescript": ">=4.9.5"+ },+ "peerDependenciesMeta": {+ "typescript": {+ "optional": true+ }+ }+ },"node_modules/cron-parser": {"version": "4.9.0","resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz",@@ -5333,6 +5693,15 @@"dev": true,"license": "MIT"},+ "node_modules/data-uri-to-buffer": {+ "version": "6.0.2",+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",+ "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",+ "license": "MIT",+ "engines": {+ "node": ">= 14"+ }+ },"node_modules/data-urls": {"version": "5.0.0","resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz",@@ -5435,6 +5804,20 @@"integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==","license": "MIT"},+ "node_modules/degenerator": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",+ "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",+ "license": "MIT",+ "dependencies": {+ "ast-types": "^0.13.4",+ "escodegen": "^2.1.0",+ "esprima": "^4.0.1"+ },+ "engines": {+ "node": ">= 14"+ }+ },"node_modules/delayed-stream": {"version": "1.0.0","resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",@@ -5500,6 +5883,12 @@"node": ">=8"}},+ "node_modules/devtools-protocol": {+ "version": "0.0.1534754",+ "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1534754.tgz",+ "integrity": "sha512-26T91cV5dbOYnXdJi5qQHoTtUoNEqwkHcAyu/IKtjIAxiEqPMrDiRkDOPWVsGfNZGmlQVHQbZRSjD8sxagWVsQ==",+ "license": "BSD-3-Clause"+ },"node_modules/diacritics": {"version": "1.3.0","resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",@@ -5779,6 +6168,24 @@"url": "https://github.com/fb55/entities?sponsor=1"}},+ "node_modules/env-paths": {+ "version": "2.2.1",+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/error-ex": {+ "version": "1.3.4",+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",+ "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",+ "license": "MIT",+ "dependencies": {+ "is-arrayish": "^0.2.1"+ }+ },"node_modules/es-define-property": {"version": "1.0.1","resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",@@ -5886,13 +6293,65 @@"esbuild": ">=0.12 <1"}},+ "node_modules/escalade": {+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },"node_modules/escape-html": {"version": "1.0.3","resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz","integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==","license": "MIT"},- "node_modules/estree-walker": {+ "node_modules/escodegen": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",+ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",+ "license": "BSD-2-Clause",+ "dependencies": {+ "esprima": "^4.0.1",+ "estraverse": "^5.2.0",+ "esutils": "^2.0.2"+ },+ "bin": {+ "escodegen": "bin/escodegen.js",+ "esgenerate": "bin/esgenerate.js"+ },+ "engines": {+ "node": ">=6.0"+ },+ "optionalDependencies": {+ "source-map": "~0.6.1"+ }+ },+ "node_modules/esprima": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",+ "license": "BSD-2-Clause",+ "bin": {+ "esparse": "bin/esparse.js",+ "esvalidate": "bin/esvalidate.js"+ },+ "engines": {+ "node": ">=4"+ }+ },+ "node_modules/estraverse": {+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=4.0"+ }+ },+ "node_modules/estree-walker": {"version": "3.0.3","resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz","integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",@@ -5902,6 +6361,15 @@"@types/estree": "^1.0.0"}},+ "node_modules/esutils": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",+ "license": "BSD-2-Clause",+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/event-target-shim": {"version": "5.0.1","resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",@@ -5920,6 +6388,15 @@"node": ">=0.8.x"}},+ "node_modules/events-universal": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",+ "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",+ "license": "Apache-2.0",+ "dependencies": {+ "bare-events": "^2.7.0"+ }+ },"node_modules/expand-template": {"version": "2.0.3","resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",@@ -5939,6 +6416,26 @@"node": ">=12.0.0"}},+ "node_modules/extract-zip": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",+ "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",+ "license": "BSD-2-Clause",+ "dependencies": {+ "debug": "^4.1.1",+ "get-stream": "^5.1.0",+ "yauzl": "^2.10.0"+ },+ "bin": {+ "extract-zip": "cli.js"+ },+ "engines": {+ "node": ">= 10.17.0"+ },+ "optionalDependencies": {+ "@types/yauzl": "^2.9.1"+ }+ },"node_modules/fast-copy": {"version": "4.0.1","resolved": "https://registry.npmjs.org/fast-copy/-/fast-copy-4.0.1.tgz",@@ -5957,6 +6454,12 @@"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==","license": "MIT"},+ "node_modules/fast-fifo": {+ "version": "1.3.2",+ "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",+ "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",+ "license": "MIT"+ },"node_modules/fast-glob": {"version": "3.3.3","resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",@@ -6131,6 +6634,15 @@"walk-up-path": "^4.0.0"}},+ "node_modules/fd-slicer": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",+ "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",+ "license": "MIT",+ "dependencies": {+ "pend": "~1.2.0"+ }+ },"node_modules/fdir": {"version": "6.5.0","resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",@@ -6280,6 +6792,15 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/get-caller-file": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",+ "license": "ISC",+ "engines": {+ "node": "6.* || 8.* || >= 10.*"+ }+ },"node_modules/get-intrinsic": {"version": "1.3.0","resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",@@ -6317,6 +6838,21 @@"node": ">= 0.4"}},+ "node_modules/get-stream": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",+ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",+ "license": "MIT",+ "dependencies": {+ "pump": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/get-tsconfig": {"version": "4.13.0","resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.0.tgz",@@ -6330,6 +6866,20 @@"url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"}},+ "node_modules/get-uri": {+ "version": "6.0.5",+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",+ "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",+ "license": "MIT",+ "dependencies": {+ "basic-ftp": "^5.0.2",+ "data-uri-to-buffer": "^6.0.2",+ "debug": "^4.3.4"+ },+ "engines": {+ "node": ">= 14"+ }+ },"node_modules/github-from-package": {"version": "0.0.0","resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",@@ -6513,7 +7063,6 @@"version": "7.0.2","resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz","integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",- "dev": true,"license": "MIT","dependencies": {"agent-base": "^7.1.0",@@ -6527,7 +7076,6 @@"version": "7.0.6","resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz","integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",- "dev": true,"license": "MIT","dependencies": {"agent-base": "^7.1.2",@@ -6582,6 +7130,22 @@],"license": "BSD-3-Clause"},+ "node_modules/import-fresh": {+ "version": "3.3.1",+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",+ "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",+ "license": "MIT",+ "dependencies": {+ "parent-module": "^1.0.0",+ "resolve-from": "^4.0.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/inherits": {"version": "2.0.4","resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",@@ -6636,6 +7200,12 @@"node": ">= 10"}},+ "node_modules/is-arrayish": {+ "version": "0.2.1",+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",+ "license": "MIT"+ },"node_modules/is-extglob": {"version": "2.1.1","resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",@@ -6774,7 +7344,6 @@"version": "4.1.1","resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz","integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",- "dev": true,"license": "MIT","dependencies": {"argparse": "^2.0.1"@@ -6823,6 +7392,12 @@}}},+ "node_modules/json-parse-even-better-errors": {+ "version": "2.3.1",+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",+ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",+ "license": "MIT"+ },"node_modules/json-schema-ref-resolver": {"version": "3.0.0","resolved": "https://registry.npmjs.org/json-schema-ref-resolver/-/json-schema-ref-resolver-3.0.0.tgz",@@ -6998,6 +7573,12 @@],"license": "MIT"},+ "node_modules/lines-and-columns": {+ "version": "1.2.4",+ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",+ "license": "MIT"+ },"node_modules/lodash.defaults": {"version": "4.2.0","resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",@@ -7333,6 +7914,15 @@"integrity": "sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==","license": "MIT"},+ "node_modules/netmask": {+ "version": "2.0.2",+ "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",+ "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",+ "license": "MIT",+ "engines": {+ "node": ">= 0.4.0"+ }+ },"node_modules/node-abi": {"version": "3.85.0","resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.85.0.tgz",@@ -7504,12 +8094,74 @@"@oxc-resolver/binding-win32-x64-msvc": "11.15.0"}},+ "node_modules/pac-proxy-agent": {+ "version": "7.2.0",+ "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",+ "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",+ "license": "MIT",+ "dependencies": {+ "@tootallnate/quickjs-emscripten": "^0.23.0",+ "agent-base": "^7.1.2",+ "debug": "^4.3.4",+ "get-uri": "^6.0.1",+ "http-proxy-agent": "^7.0.0",+ "https-proxy-agent": "^7.0.6",+ "pac-resolver": "^7.0.1",+ "socks-proxy-agent": "^8.0.5"+ },+ "engines": {+ "node": ">= 14"+ }+ },+ "node_modules/pac-resolver": {+ "version": "7.0.1",+ "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",+ "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",+ "license": "MIT",+ "dependencies": {+ "degenerator": "^5.0.0",+ "netmask": "^2.0.2"+ },+ "engines": {+ "node": ">= 14"+ }+ },"node_modules/package-json-from-dist": {"version": "1.0.1","resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz","integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==","license": "BlueOak-1.0.0"},+ "node_modules/parent-module": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",+ "license": "MIT",+ "dependencies": {+ "callsites": "^3.0.0"+ },+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/parse-json": {+ "version": "5.2.0",+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",+ "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.0.0",+ "error-ex": "^1.3.1",+ "json-parse-even-better-errors": "^2.3.0",+ "lines-and-columns": "^1.1.6"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/parse5": {"version": "7.3.0","resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",@@ -7596,6 +8248,12 @@"url": "https://ko-fi.com/killymxi"}},+ "node_modules/pend": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",+ "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",+ "license": "MIT"+ },"node_modules/pg": {"version": "8.16.0","resolved": "https://registry.npmjs.org/pg/-/pg-8.16.0.tgz",@@ -7957,6 +8615,43 @@],"license": "MIT"},+ "node_modules/progress": {+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",+ "license": "MIT",+ "engines": {+ "node": ">=0.4.0"+ }+ },+ "node_modules/proxy-agent": {+ "version": "6.5.0",+ "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",+ "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",+ "license": "MIT",+ "dependencies": {+ "agent-base": "^7.1.2",+ "debug": "^4.3.4",+ "http-proxy-agent": "^7.0.1",+ "https-proxy-agent": "^7.0.6",+ "lru-cache": "^7.14.1",+ "pac-proxy-agent": "^7.1.0",+ "proxy-from-env": "^1.1.0",+ "socks-proxy-agent": "^8.0.5"+ },+ "engines": {+ "node": ">= 14"+ }+ },+ "node_modules/proxy-agent/node_modules/lru-cache": {+ "version": "7.18.3",+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",+ "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",+ "license": "ISC",+ "engines": {+ "node": ">=12"+ }+ },"node_modules/proxy-from-env": {"version": "1.1.0","resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",@@ -7994,6 +8689,45 @@"node": ">=6"}},+ "node_modules/puppeteer": {+ "version": "24.34.0",+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-24.34.0.tgz",+ "integrity": "sha512-Sdpl/zsYOsagZ4ICoZJPGZw8d9gZmK5DcxVal11dXi/1/t2eIXHjCf5NfmhDg5XnG9Nye+yo/LqMzIxie2rHTw==",+ "hasInstallScript": true,+ "license": "Apache-2.0",+ "dependencies": {+ "@puppeteer/browsers": "2.11.0",+ "chromium-bidi": "12.0.1",+ "cosmiconfig": "^9.0.0",+ "devtools-protocol": "0.0.1534754",+ "puppeteer-core": "24.34.0",+ "typed-query-selector": "^2.12.0"+ },+ "bin": {+ "puppeteer": "lib/cjs/puppeteer/node/cli.js"+ },+ "engines": {+ "node": ">=18"+ }+ },+ "node_modules/puppeteer-core": {+ "version": "24.34.0",+ "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-24.34.0.tgz",+ "integrity": "sha512-24evawO+mUGW4mvS2a2ivwLdX3gk8zRLZr9HP+7+VT2vBQnm0oh9jJEZmUE3ePJhRkYlZ93i7OMpdcoi2qNCLg==",+ "license": "Apache-2.0",+ "dependencies": {+ "@puppeteer/browsers": "2.11.0",+ "chromium-bidi": "12.0.1",+ "debug": "^4.4.3",+ "devtools-protocol": "0.0.1534754",+ "typed-query-selector": "^2.12.0",+ "webdriver-bidi-protocol": "0.3.10",+ "ws": "^8.18.3"+ },+ "engines": {+ "node": ">=18"+ }+ },"node_modules/pvtsutils": {"version": "1.3.6","resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz",@@ -8166,6 +8900,15 @@"integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==","license": "Apache-2.0"},+ "node_modules/require-directory": {+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",+ "license": "MIT",+ "engines": {+ "node": ">=0.10.0"+ }+ },"node_modules/require-from-string": {"version": "2.0.2","resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",@@ -8187,6 +8930,15 @@"node": ">=18"}},+ "node_modules/resolve-from": {+ "version": "4.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",+ "license": "MIT",+ "engines": {+ "node": ">=4"+ }+ },"node_modules/resolve-pkg-maps": {"version": "1.0.0","resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",@@ -8624,6 +9376,16 @@"simple-concat": "^1.0.0"}},+ "node_modules/smart-buffer": {+ "version": "4.2.0",+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",+ "license": "MIT",+ "engines": {+ "node": ">= 6.0.0",+ "npm": ">= 3.0.0"+ }+ },"node_modules/smol-toml": {"version": "1.5.2","resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.5.2.tgz",@@ -8637,6 +9399,34 @@"url": "https://github.com/sponsors/cyyynthia"}},+ "node_modules/socks": {+ "version": "2.8.7",+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",+ "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",+ "license": "MIT",+ "dependencies": {+ "ip-address": "^10.0.1",+ "smart-buffer": "^4.2.0"+ },+ "engines": {+ "node": ">= 10.0.0",+ "npm": ">= 3.0.0"+ }+ },+ "node_modules/socks-proxy-agent": {+ "version": "8.0.5",+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",+ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",+ "license": "MIT",+ "dependencies": {+ "agent-base": "^7.1.2",+ "debug": "^4.3.4",+ "socks": "^2.8.3"+ },+ "engines": {+ "node": ">= 14"+ }+ },"node_modules/sonic-boom": {"version": "4.2.0","resolved": "https://registry.npmjs.org/sonic-boom/-/sonic-boom-4.2.0.tgz",@@ -8650,7 +9440,7 @@"version": "0.6.1","resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz","integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",- "dev": true,+ "devOptional": true,"license": "BSD-3-Clause","engines": {"node": ">=0.10.0"@@ -8723,6 +9513,17 @@"dev": true,"license": "MIT"},+ "node_modules/streamx": {+ "version": "2.23.0",+ "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",+ "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",+ "license": "MIT",+ "dependencies": {+ "events-universal": "^1.0.0",+ "fast-fifo": "^1.3.2",+ "text-decoder": "^1.1.0"+ }+ },"node_modules/string_decoder": {"version": "1.3.0","resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",@@ -8959,6 +9760,15 @@"node": ">=10"}},+ "node_modules/text-decoder": {+ "version": "1.2.3",+ "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",+ "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",+ "license": "Apache-2.0",+ "dependencies": {+ "b4a": "^1.6.4"+ }+ },"node_modules/thread-stream": {"version": "3.1.0","resolved": "https://registry.npmjs.org/thread-stream/-/thread-stream-3.1.0.tgz",@@ -9194,11 +10004,17 @@"node": ">= 6"}},+ "node_modules/typed-query-selector": {+ "version": "2.12.0",+ "resolved": "https://registry.npmjs.org/typed-query-selector/-/typed-query-selector-2.12.0.tgz",+ "integrity": "sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==",+ "license": "MIT"+ },"node_modules/typescript": {"version": "5.9.3","resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz","integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",- "dev": true,+ "devOptional": true,"license": "Apache-2.0","bin": {"tsc": "bin/tsc",@@ -9501,6 +10317,12 @@"integrity": "sha512-ArI3kx5jI0atlTtmV0fWU3fjpLmq/nD3Zr1iFFlJLaqa5wLBkUSzINwBPySCX/8jRyjlmy1Volw1kz1g9XE4Jg==","license": "Apache-2.0"},+ "node_modules/webdriver-bidi-protocol": {+ "version": "0.3.10",+ "resolved": "https://registry.npmjs.org/webdriver-bidi-protocol/-/webdriver-bidi-protocol-0.3.10.tgz",+ "integrity": "sha512-5LAE43jAVLOhB/QqX4bwSiv0Hg1HBfMmOuwBSXHdvg4GMGu9Y0lIq7p4R/yySu6w74WmaR4GM4H9t2IwLW7hgw==",+ "license": "Apache-2.0"+ },"node_modules/webidl-conversions": {"version": "7.0.0","resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",@@ -9681,7 +10503,6 @@"version": "8.18.3","resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz","integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",- "dev": true,"license": "MIT","engines": {"node": ">=10.0.0"@@ -9734,6 +10555,93 @@"node": ">=0.4"}},+ "node_modules/y18n": {+ "version": "5.0.8",+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",+ "license": "ISC",+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/yargs": {+ "version": "17.7.2",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",+ "license": "MIT",+ "dependencies": {+ "cliui": "^8.0.1",+ "escalade": "^3.1.1",+ "get-caller-file": "^2.0.5",+ "require-directory": "^2.1.1",+ "string-width": "^4.2.3",+ "y18n": "^5.0.5",+ "yargs-parser": "^21.1.1"+ },+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/yargs-parser": {+ "version": "21.1.1",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",+ "license": "ISC",+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/yargs/node_modules/ansi-regex": {+ "version": "5.0.1",+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/yargs/node_modules/emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "license": "MIT"+ },+ "node_modules/yargs/node_modules/string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "license": "MIT",+ "dependencies": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/yargs/node_modules/strip-ansi": {+ "version": "6.0.1",+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",+ "license": "MIT",+ "dependencies": {+ "ansi-regex": "^5.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/yauzl": {+ "version": "2.10.0",+ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",+ "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",+ "license": "MIT",+ "dependencies": {+ "buffer-crc32": "~0.2.3",+ "fd-slicer": "~1.1.0"+ }+ },"node_modules/zod": {"version": "3.24.4","resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",diff --git a/server/package.json b/server/package.jsonindex 0cad0c530..204ea5186 100644--- a/server/package.json+++ b/server/package.json@@ -51,6 +51,7 @@"pg": "8.16.0","postgres": "3.4.5","psl": "^1.15.0",+ "puppeteer": "^24.34.0","react": "19.2.1","react-dom": "19.2.1","resend": "^4.5.1",diff --git a/server/src/api/analytics/generatePdfReport.ts b/server/src/api/analytics/generatePdfReport.tsnew file mode 100644index 000000000..dcc5bc591--- /dev/null+++ b/server/src/api/analytics/generatePdfReport.ts@@ -0,0 +1,62 @@+import { FastifyReply, FastifyRequest } from "fastify";+import { z } from "zod";+import { pdfReportService } from "../../services/pdfReports/pdfReportService.js";+import { DateTime } from "luxon";++const QuerystringSchema = z.object({+ start_date: z.string(),+ end_date: z.string(),+ time_zone: z.string(),+ filters: z.string().optional(),+});++interface GeneratePdfReportRequest {+ Params: {+ siteId: string;+ };+ Querystring: z.infer<typeof QuerystringSchema>;+}++export async function generatePdfReport(+ request: FastifyRequest<GeneratePdfReportRequest>,+ reply: FastifyReply+) {+ try {+ const { siteId } = request.params;+ const queryResult = QuerystringSchema.safeParse(request.query);++ if (!queryResult.success) {+ return reply.status(400).send({+ error: "Validation error",+ details: queryResult.error.flatten(),+ });+ }++ const { start_date, end_date, time_zone, filters } = queryResult.data;++ const pdfBuffer = await pdfReportService.generatePdfReport({+ siteId: Number(siteId),+ startDate: start_date,+ endDate: end_date,+ timeZone: time_zone,+ filters: filters ? JSON.parse(filters) : undefined,+ });++ const formattedStart = DateTime.fromISO(start_date).toFormat("yyyy-MM-dd");+ const formattedEnd = DateTime.fromISO(end_date).toFormat("yyyy-MM-dd");+ const filename = `rybbit-report-${siteId}-${formattedStart}-to-${formattedEnd}.pdf`;++ return reply+ .header("Content-Type", "application/pdf")+ .header("Content-Disposition", `attachment; filename="${filename}"`)+ .send(pdfBuffer);+ } catch (error) {+ console.error("Error generating PDF report:", error);++ if (error instanceof Error && error.message.includes("not found")) {+ return reply.status(404).send({ error: error.message });+ }++ return reply.status(500).send({ error: "Failed to generate PDF report" });+ }+}diff --git a/server/src/api/analytics/index.ts b/server/src/api/analytics/index.tsindex 354fcb0b8..102d865fc 100644--- a/server/src/api/analytics/index.ts+++ b/server/src/api/analytics/index.ts@@ -23,6 +23,9 @@ export { getPerformanceByDimension } from "./performance/getPerformanceByDimensiexport { getPerformanceOverview } from "./performance/getPerformanceOverview.js";export { getPerformanceTimeSeries } from "./performance/getPerformanceTimeSeries.js";+// Export+export { generatePdfReport } from "./generatePdfReport.js";+// Core Analyticsexport { getErrorBucketed } from "./getErrorBucketed.js";export { getErrorEvents } from "./getErrorEvents.js";diff --git a/server/src/index.ts b/server/src/index.tsindex 455de4b1a..007e8c21a 100644--- a/server/src/index.ts+++ b/server/src/index.ts@@ -15,6 +15,7 @@ import {createGoal,deleteFunnel,deleteGoal,+ generatePdfReport,getErrorBucketed,getErrorEvents,getErrorNames,@@ -255,11 +256,10 @@ async function analyticsRoutes(fastify: FastifyInstance) {fastify.get("/sites/:siteId/events/properties", publicSite, getEventProperties);fastify.get("/sites/:siteId/events/outbound", publicSite, getOutboundLinks);fastify.get("/org-event-count/:organizationId", orgMember, getOrgEventCount);-- // Performance Analyticsfastify.get("/sites/:siteId/performance/overview", publicSite, getPerformanceOverview);fastify.get("/sites/:siteId/performance/time-series", publicSite, getPerformanceTimeSeries);fastify.get("/sites/:siteId/performance/by-dimension", publicSite, getPerformanceByDimension);+ fastify.get("/sites/:siteId/export/pdf", publicSite, generatePdfReport);}async function sessionReplayRoutes(fastify: FastifyInstance) {@@ -377,11 +377,10 @@ server.register(apiRoutes, { prefix: "/api" });const start = async () => {try {- console.info("Starting server...");await Promise.all([initializeClickhouse(), initPostgres()]);telemetryService.startTelemetryCron();- if (IS_CLOUD) {+ if (IS_CLOUD && process.env.NODE_ENV !== "development") {weeklyReportService.startWeeklyReportCron();reengagementService.startReengagementCron();}diff --git a/server/src/services/pdfReports/pdfReportService.ts b/server/src/services/pdfReports/pdfReportService.tsnew file mode 100644index 000000000..682ff6e56--- /dev/null+++ b/server/src/services/pdfReports/pdfReportService.ts@@ -0,0 +1,492 @@+import puppeteer from "puppeteer";+import { renderToStaticMarkup } from "react-dom/server";+import { DateTime } from "luxon";+import { eq } from "drizzle-orm";+import { db } from "../../db/postgres/postgres.js";+import { sites } from "../../db/postgres/schema.js";+import { clickhouse } from "../../db/clickhouse/clickhouse.js";+import { getTimeStatement, processResults } from "../../api/analytics/utils/utils.js";+import { getFilterStatement } from "../../api/analytics/utils/getFilterStatement.js";+import { createServiceLogger } from "../../lib/logger/logger.js";+import { PdfReportTemplate } from "./templates/PdfReportTemplate.js";+import type { PdfReportParams, PdfReportData, OverviewData, MetricData, ChartDataPoint } from "./pdfReportTypes.js";++class PdfReportService {+ private logger = createServiceLogger("pdf-report");++ async generatePdfReport(params: PdfReportParams): Promise<Buffer> {+ this.logger.info({ params }, "Generating PDF report");++ // Fetch all report data+ const reportData = await this.fetchReportData(params);++ // Render HTML+ const html = this.renderHtml(reportData);++ // Convert to PDF+ const pdfBuffer = await this.htmlToPdf(html);++ this.logger.info({ siteId: params.siteId }, "PDF report generated successfully");+ return pdfBuffer;+ }++ private async fetchReportData(params: PdfReportParams): Promise<PdfReportData> {+ const { siteId, startDate, endDate, timeZone, filters } = params;++ // Fetch site info+ const site = await db.query.sites.findFirst({+ where: eq(sites.siteId, siteId),+ });++ if (!site) {+ throw new Error(`Site not found: ${siteId}`);+ }++ // Calculate previous period (same duration before startDate)+ const start = DateTime.fromISO(startDate, { zone: timeZone });+ const end = DateTime.fromISO(endDate, { zone: timeZone });+ const durationDays = Math.ceil(end.diff(start, "days").days) || 1;++ const previousEnd = start.minus({ days: 1 });+ const previousStart = previousEnd.minus({ days: durationDays - 1 });++ // Build time statements using getTimeStatement for proper timezone handling+ const timeStatement = getTimeStatement({+ start_date: startDate,+ end_date: endDate,+ time_zone: timeZone,+ });++ const previousTimeStatement = getTimeStatement({+ start_date: previousStart.toISODate()!,+ end_date: previousEnd.toISODate()!,+ time_zone: timeZone,+ });++ const filterStatement = filters ? getFilterStatement(JSON.stringify(filters), siteId) : "";++ // Determine bucket size based on date range+ const bucket = durationDays <= 1 ? "hour" : durationDays <= 60 ? "day" : "week";++ // Fetch all data in parallel+ const [+ overview,+ previousOverview,+ chartData,+ topCountries,+ topRegions,+ topCities,+ topPages,+ topReferrers,+ deviceBreakdown,+ topBrowsers,+ topOperatingSystems,+ ] = await Promise.all([+ this.fetchOverviewData(siteId, timeStatement, filterStatement),+ this.fetchOverviewData(siteId, previousTimeStatement, filterStatement),+ this.fetchChartData(siteId, startDate, endDate, timeZone, bucket, filterStatement),+ this.fetchTopN(siteId, "country", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "region", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "city", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "pathname", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "referrer", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "device_type", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "browser", timeStatement, 13, filterStatement),+ this.fetchTopN(siteId, "operating_system", timeStatement, 13, filterStatement),+ ]);++ if (!overview) {+ throw new Error(`No data available for site ${siteId} in the selected period`);+ }++ return {+ siteId,+ siteName: site.name,+ siteDomain: site.domain,+ startDate,+ endDate,+ timeZone,+ generatedAt: DateTime.now().setZone(timeZone).toFormat("MMMM d, yyyy 'at' h:mm a ZZZZ"),+ overview,+ previousOverview,+ chartData,+ topCountries,+ topRegions,+ topCities,+ topPages,+ topReferrers,+ deviceBreakdown,+ topBrowsers,+ topOperatingSystems,+ };+ }++ private async fetchChartData(+ siteId: number,+ startDate: string,+ endDate: string,+ timeZone: string,+ bucket: "hour" | "day" | "week",+ filterStatement: string+ ): Promise<ChartDataPoint[]> {+ try {+ const bucketFn = bucket === "hour" ? "toStartOfHour" : bucket === "day" ? "toStartOfDay" : "toStartOfWeek";++ const query = `+ SELECT+ toString(toTimeZone(${bucketFn}(toTimeZone(timestamp, {timeZone:String})), {timeZone:String})) AS time,+ COUNT(DISTINCT session_id) AS sessions,+ countIf(type = 'pageview') AS pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND timestamp >= toDateTime({startDate:String}, {timeZone:String})+ AND timestamp < toDateTime({endDate:String}, {timeZone:String}) + INTERVAL 1 DAY+ ${filterStatement}+ GROUP BY time+ ORDER BY time`;++ const result = await clickhouse.query({+ query,+ format: "JSONEachRow",+ query_params: {+ siteId,+ startDate,+ endDate,+ timeZone,+ },+ });++ return await processResults<ChartDataPoint>(result);+ } catch (error) {+ this.logger.error({ error, siteId }, "Error fetching chart data");+ return [];+ }+ }++ private async fetchOverviewData(+ siteId: number,+ timeStatement: string,+ filterStatement: string+ ): Promise<OverviewData | null> {+ try {+ const query = `SELECT+ session_stats.sessions,+ session_stats.pages_per_session,+ session_stats.bounce_rate * 100 AS bounce_rate,+ session_stats.session_duration,+ page_stats.pageviews,+ page_stats.users+ FROM+ (+ SELECT+ COUNT() AS sessions,+ AVG(pages_in_session) AS pages_per_session,+ sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,+ AVG(end_time - start_time) AS session_duration+ FROM+ (+ SELECT+ session_id,+ MIN(timestamp) AS start_time,+ MAX(timestamp) AS end_time,+ COUNT(CASE WHEN type = 'pageview' THEN 1 END) AS pages_in_session+ FROM events+ WHERE+ site_id = {siteId:Int32}+ ${timeStatement}+ ${filterStatement}+ GROUP BY session_id+ )+ ) AS session_stats+ CROSS JOIN+ (+ SELECT+ COUNT(*) AS pageviews,+ COUNT(DISTINCT user_id) AS users+ FROM events+ WHERE+ site_id = {siteId:Int32}+ ${timeStatement}+ AND type = 'pageview'+ ${filterStatement}+ ) AS page_stats`;++ const result = await clickhouse.query({+ query,+ format: "JSONEachRow",+ query_params: {+ siteId,+ },+ });++ const data = await processResults<OverviewData>(result);+ return data[0] || null;+ } catch (error) {+ this.logger.error({ error, siteId }, "Error fetching overview data");+ return null;+ }+ }++ private async fetchTopN(+ siteId: number,+ parameter: string,+ timeStatement: string,+ limit: number = 10,+ filterStatement: string+ ): Promise<MetricData[]> {+ try {+ let query = "";++ if (parameter === "country") {+ query = `+ WITH PageStats AS (+ SELECT+ country as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND country IS NOT NULL+ AND country <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "pathname") {+ query = `+ WITH EventTimes AS (+ SELECT+ session_id,+ pathname,+ timestamp,+ leadInFrame(timestamp) OVER (PARTITION BY session_id ORDER BY timestamp ROWS BETWEEN CURRENT ROW AND 1 FOLLOWING) as next_timestamp+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND type = 'pageview'+ ${timeStatement}+ ${filterStatement}+ ),+ PageDurations AS (+ SELECT+ session_id,+ pathname,+ timestamp,+ next_timestamp,+ if(isNull(next_timestamp), 0, dateDiff('second', timestamp, next_timestamp)) as time_diff_seconds+ FROM EventTimes+ ),+ PathStats AS (+ SELECT+ pathname,+ count() as visits,+ count(DISTINCT session_id) as unique_sessions+ FROM PageDurations+ GROUP BY pathname+ )+ SELECT+ pathname as value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PathStats+ ORDER BY unique_sessions DESC+ LIMIT {limit:Int32}`;+ } else if (parameter === "referrer") {+ query = `+ WITH PageStats AS (+ SELECT+ domainWithoutWWW(referrer) as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND domainWithoutWWW(referrer) IS NOT NULL+ AND domainWithoutWWW(referrer) <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "device_type") {+ query = `+ WITH PageStats AS (+ SELECT+ device_type as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND device_type IS NOT NULL+ AND device_type <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "browser") {+ query = `+ WITH PageStats AS (+ SELECT+ browser as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND browser IS NOT NULL+ AND browser <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "operating_system") {+ query = `+ WITH PageStats AS (+ SELECT+ operating_system as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND operating_system IS NOT NULL+ AND operating_system <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "region") {+ query = `+ WITH PageStats AS (+ SELECT+ region as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND region IS NOT NULL+ AND region <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ } else if (parameter === "city") {+ query = `+ WITH PageStats AS (+ SELECT+ city as value,+ COUNT(distinct(session_id)) as unique_sessions,+ COUNT() as pageviews+ FROM events+ WHERE+ site_id = {siteId:Int32}+ AND city IS NOT NULL+ AND city <> ''+ ${timeStatement}+ ${filterStatement}+ GROUP BY value+ )+ SELECT+ value,+ unique_sessions as count,+ round((unique_sessions / sum(unique_sessions) OVER ()) * 100, 2) as percentage+ FROM PageStats+ ORDER BY count desc+ LIMIT {limit:Int32}`;+ }++ const result = await clickhouse.query({+ query,+ format: "JSONEachRow",+ query_params: {+ siteId,+ limit,+ },+ });++ return await processResults<MetricData>(result);+ } catch (error) {+ this.logger.error({ error, siteId, parameter }, "Error fetching top N data");+ return [];+ }+ }++ private renderHtml(data: PdfReportData): string {+ const element = PdfReportTemplate({ reportData: data });+ return renderToStaticMarkup(element);+ }++ private async htmlToPdf(html: string): Promise<Buffer> {+ const browser = await puppeteer.launch({+ headless: true,+ args: ["--no-sandbox", "--disable-setuid-sandbox"],+ });++ try {+ const page = await browser.newPage();+ await page.setContent(html, { waitUntil: "networkidle0" });++ const pdfBuffer = await page.pdf({+ format: "A4",+ printBackground: true,+ margin: {+ top: "0",+ right: "0",+ bottom: "0",+ left: "0",+ },+ });++ return Buffer.from(pdfBuffer);+ } finally {+ await browser.close();+ }+ }+}++export const pdfReportService = new PdfReportService();diff --git a/server/src/services/pdfReports/pdfReportTypes.ts b/server/src/services/pdfReports/pdfReportTypes.tsnew file mode 100644index 000000000..f46a56968--- /dev/null+++ b/server/src/services/pdfReports/pdfReportTypes.ts@@ -0,0 +1,51 @@+import type { Filter } from "@rybbit/shared";++export interface OverviewData {+ sessions: number;+ pageviews: number;+ users: number;+ pages_per_session: number | null;+ bounce_rate: number | null;+ session_duration: number;+}++export interface MetricData {+ value: string;+ count: number;+ percentage: number | null;+}++export interface ChartDataPoint {+ time: string;+ sessions: number;+ pageviews: number;+}++export interface PdfReportParams {+ siteId: number;+ startDate: string;+ endDate: string;+ timeZone: string;+ filters?: Filter[];+}++export interface PdfReportData {+ siteId: number;+ siteName: string;+ siteDomain: string;+ startDate: string;+ endDate: string;+ timeZone: string;+ generatedAt: string;+ overview: OverviewData;+ previousOverview: OverviewData | null;+ chartData: ChartDataPoint[];+ topCountries: MetricData[];+ topRegions: MetricData[];+ topCities: MetricData[];+ topPages: MetricData[];+ topReferrers: MetricData[];+ deviceBreakdown: MetricData[];+ topBrowsers: MetricData[];+ topOperatingSystems: MetricData[];+}diff --git a/server/src/services/pdfReports/templates/PdfReportTemplate.tsx b/server/src/services/pdfReports/templates/PdfReportTemplate.tsxnew file mode 100644index 000000000..3c5088304--- /dev/null+++ b/server/src/services/pdfReports/templates/PdfReportTemplate.tsx@@ -0,0 +1,224 @@+import * as React from "react";+import type { PdfReportData } from "../pdfReportTypes.js";+import {+ MetricCard,+ TopListSection,+ SessionsChart,+ Page,+ TwoColumnRow,+ calculateGrowth,+ formatDuration,+ formatNumber,+ safeToFixed,+ getCountryDisplay,+ formatDateRange,+} from "./components/index.js";++interface PdfReportTemplateProps {+ reportData: PdfReportData;+}++export const PdfReportTemplate = ({ reportData }: PdfReportTemplateProps): React.ReactElement => {+ const {+ siteName,+ siteDomain,+ startDate,+ endDate,+ timeZone,+ generatedAt,+ overview,+ previousOverview,+ chartData,+ topCountries,+ topRegions,+ topCities,+ topPages,+ topReferrers,+ deviceBreakdown,+ topBrowsers,+ topOperatingSystems,+ } = reportData;++ const metrics = [+ {+ label: "Sessions",+ current: overview.sessions,+ previous: previousOverview?.sessions,+ format: formatNumber,+ },+ {+ label: "Pageviews",+ current: overview.pageviews,+ previous: previousOverview?.pageviews,+ format: formatNumber,+ },+ {+ label: "Unique Users",+ current: overview.users,+ previous: previousOverview?.users,+ format: formatNumber,+ },+ {+ label: "Avg Duration",+ current: overview.session_duration,+ previous: previousOverview?.session_duration,+ format: formatDuration,+ },+ {+ label: "Pages/Session",+ current: overview.pages_per_session,+ previous: previousOverview?.pages_per_session,+ format: (v: number | null) => safeToFixed(v, 1),+ },+ {+ label: "Bounce Rate",+ current: overview.bounce_rate,+ previous: previousOverview?.bounce_rate,+ format: (v: number | null) => `${safeToFixed(v, 1)}%`,+ invertGrowth: true,+ },+ ];++ return (+ <html>+ <head>+ <meta charSet="UTF-8" />+ <style+ dangerouslySetInnerHTML={{+ __html: `+ * {+ margin: 0;+ padding: 0;+ box-sizing: border-box;+ }+ body {+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;+ color: #111827;+ background: #ffffff;+ line-height: 1.5;+ }+ @page {+ size: A4;+ margin: 0;+ }+ .page {+ padding: 40px;+ max-width: 800px;+ margin: 0 auto;+ page-break-after: always;+ page-break-inside: avoid;+ }+ .page-last {+ page-break-after: auto;+ }+ `,+ }}+ />+ </head>+ <body>+ {/* Page 1: Header + Overview */}+ <Page>+ {/* Header */}+ <div style={{ marginBottom: "32px", borderBottom: "2px solid #10b981", paddingBottom: "24px" }}>+ <div style={{ display: "flex", alignItems: "center", gap: "12px", marginBottom: "8px" }}>+ <img+ src={`https://www.google.com/s2/favicons?domain=${siteDomain}&sz=32`}+ alt=""+ width="28"+ height="28"+ style={{ borderRadius: "4px" }}+ />+ <h1 style={{ fontSize: "28px", fontWeight: "600", color: "#111827" }}>{siteName}</h1>+ </div>+ <div style={{ color: "#6b7280", fontSize: "14px" }}>+ <div style={{ marginBottom: "4px" }}>{formatDateRange(startDate, endDate, timeZone)}</div>+ <div>Generated on {generatedAt}</div>+ </div>+ </div>++ {/* Overview Metrics - 3 per row */}+ <div style={{ marginBottom: "32px" }}>+ <h2 style={{ fontSize: "18px", fontWeight: "600", marginBottom: "16px", color: "#111827" }}>Overview</h2>+ <div style={{ display: "flex", flexWrap: "wrap", gap: "12px" }}>+ {metrics.map((metric, index) => {+ const growth = calculateGrowth(metric.current, metric.previous);+ const isPositive = metric.invertGrowth ? !growth.isPositive : growth.isPositive;+ return (+ <div key={index} style={{ width: "calc(33.333% - 8px)", minWidth: "180px" }}>+ <MetricCard+ label={metric.label}+ currentValue={metric.format(metric.current as number)}+ growth={growth.value}+ isPositive={isPositive}+ />+ </div>+ );+ })}+ </div>+ </div>++ {/* Sessions Chart */}+ <SessionsChart data={chartData} startDate={startDate} endDate={endDate} timeZone={timeZone} />++ {/* Footer for page 1 */}+ <div+ style={{+ marginTop: "auto",+ paddingTop: "16px",+ borderTop: "1px solid #e5e7eb",+ textAlign: "center",+ color: "#9ca3af",+ fontSize: "12px",+ }}+ >+ <div>Powered by Rybbit</div>+ <div style={{ marginTop: "4px" }}>https://rybbit.com</div>+ </div>+ </Page>++ <Page>+ <TwoColumnRow+ left={+ <TopListSection+ title="Top Countries"+ items={topCountries}+ renderLabel={item => getCountryDisplay(item.value)}+ />+ }+ right={<TopListSection title="Top Regions" items={topRegions} renderLabel={item => item.value} />}+ />+ <TwoColumnRow+ left={<TopListSection title="Top Cities" items={topCities} renderLabel={item => item.value} />}+ right={<TopListSection title="Top Pages" items={topPages} renderLabel={item => item.value} />}+ />+ </Page>++ <Page>+ <TwoColumnRow+ left={+ <TopListSection+ title="Top Referrers"+ items={topReferrers}+ renderLabel={item => item.value}+ showFavicon={true}+ />+ }+ right={+ <TopListSection+ title="Devices"+ items={deviceBreakdown}+ renderLabel={item => item.value.charAt(0).toUpperCase() + item.value.slice(1)}+ />+ }+ />+ <TwoColumnRow+ left={<TopListSection title="Browsers" items={topBrowsers} renderLabel={item => item.value} />}+ right={+ <TopListSection title="Operating Systems" items={topOperatingSystems} renderLabel={item => item.value} />+ }+ />+ </Page>+ </body>+ </html>+ );+};diff --git a/server/src/services/pdfReports/templates/components/MetricCard.tsx b/server/src/services/pdfReports/templates/components/MetricCard.tsxnew file mode 100644index 000000000..06740aaf2--- /dev/null+++ b/server/src/services/pdfReports/templates/components/MetricCard.tsx@@ -0,0 +1,34 @@+import * as React from "react";++export interface MetricCardProps {+ label: string;+ currentValue: string;+ growth: string;+ isPositive: boolean;+}++export const MetricCard = ({ label, currentValue, growth, isPositive }: MetricCardProps) => (+ <div+ style={{+ backgroundColor: "#f9fafb",+ border: "1px solid #e5e7eb",+ borderRadius: "8px",+ padding: "16px",+ height: "100%",+ }}+ >+ <div style={{ color: "#6b7280", fontSize: "12px", marginBottom: "4px" }}>{label}</div>+ <div style={{ display: "flex", alignItems: "baseline", gap: "8px" }}>+ <span style={{ color: "#111827", fontSize: "24px", fontWeight: "bold" }}>{currentValue}</span>+ <span+ style={{+ color: isPositive ? "#10b981" : "#ef4444",+ fontSize: "12px",+ fontWeight: "500",+ }}+ >+ {growth}+ </span>+ </div>+ </div>+);diff --git a/server/src/services/pdfReports/templates/components/Page.tsx b/server/src/services/pdfReports/templates/components/Page.tsxnew file mode 100644index 000000000..4b01de666--- /dev/null+++ b/server/src/services/pdfReports/templates/components/Page.tsx@@ -0,0 +1,22 @@+import * as React from "react";++export interface PageProps {+ children: React.ReactNode;+ isLastPage?: boolean;+}++export const Page = ({ children, isLastPage }: PageProps) => (+ <div className={isLastPage ? "page page-last" : "page"}>{children}</div>+);++export interface TwoColumnRowProps {+ left: React.ReactNode;+ right: React.ReactNode;+}++export const TwoColumnRow = ({ left, right }: TwoColumnRowProps) => (+ <div style={{ display: "flex", gap: "16px", marginBottom: "16px" }}>+ {left}+ {right}+ </div>+);diff --git a/server/src/services/pdfReports/templates/components/SessionsChart.tsx b/server/src/services/pdfReports/templates/components/SessionsChart.tsxnew file mode 100644index 000000000..4db55aa39--- /dev/null+++ b/server/src/services/pdfReports/templates/components/SessionsChart.tsx@@ -0,0 +1,152 @@+import * as React from "react";+import { DateTime } from "luxon";+import type { ChartDataPoint } from "../../pdfReportTypes.js";+import { formatNumber } from "./utils.js";++export interface SessionsChartProps {+ data: ChartDataPoint[];+ startDate: string;+ endDate: string;+ timeZone: string;+}++const formatChartDate = (time: string, useHours: boolean, timeZone: string): string => {+ // ClickHouse returns format like "2024-01-15 14:00:00", need to use SQL format+ const dt = DateTime.fromSQL(time, { zone: timeZone });+ if (useHours) {+ return dt.toFormat("ha").toLowerCase();+ }+ return dt.toFormat("MMM d");+};++const isOneDayOrLess = (startDate: string, endDate: string, timeZone: string): boolean => {+ const start = DateTime.fromISO(startDate, { zone: timeZone });+ const end = DateTime.fromISO(endDate, { zone: timeZone });+ const diffDays = end.diff(start, "days").days;+ return diffDays <= 1;+};++export const SessionsChart = ({ data, startDate, endDate, timeZone }: SessionsChartProps) => {+ if (data.length === 0) return null;++ const useHours = isOneDayOrLess(startDate, endDate, timeZone);++ const width = 680;+ const height = 220;+ const margin = { top: 10, right: 15, bottom: 30, left: 45 };+ const chartWidth = width - margin.left - margin.right;+ const chartHeight = height - margin.top - margin.bottom;++ // Get sessions values and calculate bounds+ const sessions = data.map(d => Number(d.sessions) || 0);+ const maxValue = Math.max(...sessions, 1);+ const minValue = 0;++ // Scale functions+ const xScale = (index: number) => margin.left + (index / (data.length - 1 || 1)) * chartWidth;+ const yScale = (value: number) =>+ margin.top + chartHeight - ((value - minValue) / (maxValue - minValue || 1)) * chartHeight;++ // Generate path for area+ const areaPath =+ data+ .map((d, i) => {+ const x = xScale(i);+ const y = yScale(Number(d.sessions) || 0);+ return i === 0 ? `M ${x} ${y}` : `L ${x} ${y}`;+ })+ .join(" ") ++ ` L ${xScale(data.length - 1)} ${margin.top + chartHeight} L ${margin.left} ${margin.top + chartHeight} Z`;++ // Generate path for line+ const linePath = data+ .map((d, i) => {+ const x = xScale(i);+ const y = yScale(Number(d.sessions) || 0);+ return i === 0 ? `M ${x} ${y}` : `L ${x} ${y}`;+ })+ .join(" ");++ // Generate Y-axis ticks+ const yTickCount = 5;+ const yTicks = Array.from({ length: yTickCount }, (_, i) => {+ const value = minValue + ((maxValue - minValue) * i) / (yTickCount - 1);+ return { value, y: yScale(value) };+ });++ // Generate X-axis ticks (limit to ~8 ticks)+ const xTickCount = Math.min(data.length, 8);+ const xTickInterval = Math.max(1, Math.floor(data.length / xTickCount));+ const xTicks = data+ .map((d, i) => ({ label: formatChartDate(d.time, useHours, timeZone), x: xScale(i), index: i }))+ .filter((_, i) => i % xTickInterval === 0 || i === data.length - 1);++ // Generate horizontal grid lines+ const gridLines = yTicks.map(tick => tick.y);++ return (+ <div+ style={{+ backgroundColor: "#ffffff",+ border: "1px solid #e5e7eb",+ borderRadius: "8px",+ padding: "16px",+ marginBottom: "24px",+ }}+ >+ <div style={{ color: "#111827", fontSize: "14px", fontWeight: "600", marginBottom: "12px" }}>+ Sessions Over Time+ </div>+ <svg width={width} height={height} style={{ display: "block" }}>+ <defs>+ <linearGradient id="sessionsGradient" x1="0" y1="0" x2="0" y2="1">+ <stop offset="5%" stopColor="#10b981" stopOpacity={0.3} />+ <stop offset="95%" stopColor="#10b981" stopOpacity={0} />+ </linearGradient>+ </defs>++ {/* Grid lines */}+ {gridLines.map((y, i) => (+ <line+ key={i}+ x1={margin.left}+ y1={y}+ x2={width - margin.right}+ y2={y}+ stroke="#e5e7eb"+ strokeDasharray="3 3"+ />+ ))}++ {/* Area fill */}+ <path d={areaPath} fill="url(#sessionsGradient)" />++ {/* Line */}+ <path d={linePath} fill="none" stroke="#10b981" strokeWidth={2} />++ {/* X-axis */}+ <line+ x1={margin.left}+ y1={margin.top + chartHeight}+ x2={width - margin.right}+ y2={margin.top + chartHeight}+ stroke="#e5e7eb"+ />++ {/* X-axis labels */}+ {xTicks.map((tick, i) => (+ <text key={i} x={tick.x} y={margin.top + chartHeight + 18} textAnchor="middle" fontSize={10} fill="#6b7280">+ {tick.label}+ </text>+ ))}++ {/* Y-axis labels */}+ {yTicks.map((tick, i) => (+ <text key={i} x={margin.left - 8} y={tick.y + 4} textAnchor="end" fontSize={10} fill="#6b7280">+ {formatNumber(tick.value)}+ </text>+ ))}+ </svg>+ </div>+ );+};diff --git a/server/src/services/pdfReports/templates/components/TopListSection.tsx b/server/src/services/pdfReports/templates/components/TopListSection.tsxnew file mode 100644index 000000000..38814a595--- /dev/null+++ b/server/src/services/pdfReports/templates/components/TopListSection.tsx@@ -0,0 +1,104 @@+import * as React from "react";+import type { MetricData } from "../../pdfReportTypes.js";+import { formatNumber, safeToFixed, truncateString } from "./utils.js";++interface TopListItemProps {+ value: string;+ percentage: number | null;+ count: number;+ barWidth: number;+ favicon?: string;+}++const TopListItem = ({ value, percentage, count, barWidth, favicon }: TopListItemProps) => (+ <div+ style={{+ display: "flex",+ alignItems: "center",+ padding: "5px 8px",+ marginBottom: "4px",+ borderRadius: "4px",+ position: "relative",+ }}+ >+ <div+ style={{+ position: "absolute",+ left: 0,+ top: 0,+ bottom: 0,+ width: `${barWidth}%`,+ backgroundColor: "rgba(16, 185, 129, 0.15)",+ borderRadius: "6px",+ zIndex: 0,+ }}+ />+ <div style={{ display: "flex", alignItems: "center", flex: "1", minWidth: "0", position: "relative", zIndex: 1 }}>+ {favicon && (+ <img src={favicon} alt="" width="16" height="16" style={{ marginRight: "8px", borderRadius: "2px" }} />+ )}+ <span+ style={{+ color: "#111827",+ fontSize: "13px",+ overflow: "hidden",+ textOverflow: "ellipsis",+ whiteSpace: "nowrap",+ }}+ title={value}+ >+ {truncateString(value, 27)}+ </span>+ </div>+ <div style={{ display: "flex", alignItems: "center", gap: "6px", marginLeft: "12px" }}>+ <span style={{ color: "#6b7280", fontSize: "12px", width: "30px", textAlign: "right" }}>+ {safeToFixed(percentage, 1)}%+ </span>+ <span style={{ color: "#111827", fontSize: "13px", fontWeight: "500", width: "38px", textAlign: "right" }}>+ {formatNumber(count)}+ </span>+ </div>+ </div>+);++export interface TopListSectionProps {+ title: string;+ items: MetricData[];+ renderLabel: (item: MetricData) => string;+ showFavicon?: boolean;+}++export const TopListSection = ({ title, items, renderLabel, showFavicon }: TopListSectionProps) => {+ if (items.length === 0) return null;++ const ratio = items[0]?.percentage ? 100 / items[0].percentage : 1;++ return (+ <div+ style={{+ backgroundColor: "#ffffff",+ border: "1px solid #e5e7eb",+ borderRadius: "8px",+ padding: "16px",+ flex: "1",+ }}+ >+ <div style={{ color: "#111827", fontSize: "14px", fontWeight: "600", marginBottom: "12px" }}>{title}</div>+ {items.map((item, index) => {+ const barWidth = (item.percentage ?? 0) * ratio;+ const favicon = showFavicon ? `https://www.google.com/s2/favicons?domain=${item.value}&sz=16` : undefined;++ return (+ <TopListItem+ key={index}+ value={renderLabel(item)}+ percentage={item.percentage}+ count={item.count}+ barWidth={barWidth}+ favicon={favicon}+ />+ );+ })}+ </div>+ );+};diff --git a/server/src/services/pdfReports/templates/components/index.ts b/server/src/services/pdfReports/templates/components/index.tsnew file mode 100644index 000000000..1b44cb3d9--- /dev/null+++ b/server/src/services/pdfReports/templates/components/index.ts@@ -0,0 +1,14 @@+export { MetricCard } from "./MetricCard.js";+export { TopListSection } from "./TopListSection.js";+export { SessionsChart } from "./SessionsChart.js";+export { Page, TwoColumnRow } from "./Page.js";+export {+ calculateGrowth,+ formatDuration,+ formatNumber,+ safeToFixed,+ truncateString,+ getCountryFlag,+ getCountryDisplay,+ formatDateRange,+} from "./utils.js";diff --git a/server/src/services/pdfReports/templates/components/utils.ts b/server/src/services/pdfReports/templates/components/utils.tsnew file mode 100644index 000000000..1f0d58591--- /dev/null+++ b/server/src/services/pdfReports/templates/components/utils.ts@@ -0,0 +1,69 @@+import { DateTime } from "luxon";++export const calculateGrowth = (+ current: number | null | undefined,+ previous: number | null | undefined+): { value: string; isPositive: boolean } => {+ const curr = current ?? 0;+ const prev = previous ?? 0;++ if (prev === 0) {+ return { value: curr > 0 ? "+100%" : "0%", isPositive: curr >= 0 };+ }+ const growth = ((curr - prev) / prev) * 100;+ const sign = growth > 0 ? "+" : "";+ return { value: `${sign}${growth.toFixed(1)}%`, isPositive: growth >= 0 };+};++export const formatDuration = (seconds: number): string => {+ if (seconds < 60) {+ return `${Math.round(seconds)}s`;+ }+ const minutes = Math.floor(seconds / 60);+ const remainingSeconds = Math.round(seconds % 60);+ return `${minutes}m ${remainingSeconds}s`;+};++export const formatNumber = Intl.NumberFormat("en-US", {+ notation: "compact",+}).format;++export const safeToFixed = (num: number | null | undefined, decimals: number = 1): string => {+ if (num == null || isNaN(num)) {+ return "0";+ }+ return num.toFixed(decimals);+};++export const truncateString = (str: string, maxLength: number = 35): string => {+ if (str.length <= maxLength) return str;+ return str.slice(0, maxLength - 1) + "…";+};++const regionNamesInEnglish = new Intl.DisplayNames(["en"], { type: "region" });++export const getCountryFlag = (countryCode: string): string => {+ if (!countryCode || countryCode.length !== 2) return "";+ const codePoints = countryCode+ .toUpperCase()+ .split("")+ .map(char => 127397 + char.charCodeAt(0));+ return String.fromCodePoint(...codePoints);+};++export const getCountryDisplay = (countryCode: string): string => {+ try {+ const flag = getCountryFlag(countryCode);+ const name = regionNamesInEnglish.of(countryCode.toUpperCase()) || countryCode;+ return `${flag} ${name}`;+ } catch {+ return countryCode;+ }+};++export const formatDateRange = (startDate: string, endDate: string, timeZone: string): string => {+ const start = DateTime.fromISO(startDate, { zone: timeZone });+ const end = DateTime.fromISO(endDate, { zone: timeZone });+ const format = "MMMM d, yyyy";+ return `${start.toFormat(format)} - ${end.toFormat(format)}`;+};