OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
improvement
Carl-Gerhard Lindesvärd2572da3456fb
diff --git a/apps/sdk-api/src/controllers/misc.controller.ts b/apps/sdk-api/src/controllers/misc.controller.tsnew file mode 100644index 000000000..8667e91e2--- /dev/null+++ b/apps/sdk-api/src/controllers/misc.controller.ts@@ -0,0 +1,83 @@+import type { FastifyReply, FastifyRequest } from 'fastify';++import { redis } from '@mixan/redis';++interface GetFaviconParams {+ url: string;+}++function toBuffer(arrayBuffer: ArrayBuffer) {+ const buffer = Buffer.alloc(arrayBuffer.byteLength);+ const view = new Uint8Array(arrayBuffer);+ for (let i = 0; i < buffer.length; ++i) {+ buffer[i] = view[i]!;+ }+ return buffer;+}++async function getUrlBuffer(url: string) {+ const arrayBuffer = await fetch(url).then((res) => {+ if (res.ok) {+ return res.arrayBuffer();+ }+ });++ if (arrayBuffer) {+ return toBuffer(arrayBuffer);+ }++ return null;+}++export async function getFavicon(+ request: FastifyRequest<{+ Querystring: GetFaviconParams;+ }>,+ reply: FastifyReply+) {+ if (!request.query.url) {+ return reply.status(404).send('Not found');+ }++ function sendBuffer(buffer: Buffer, hostname?: string) {+ if (hostname) {+ redis.set(`favicon:${hostname}`, buffer.toString('base64'));+ }+ reply.type('image/png');+ return reply.send(buffer);+ }++ const url = decodeURIComponent(request.query.url);+ const { hostname, origin } = new URL(url);++ const cache = await redis.get(`favicon:${hostname}`);+ if (cache) {+ return sendBuffer(Buffer.from(cache, 'base64'));+ }++ // Try just get the favicon.ico+ const buffer = await getUrlBuffer(`${origin}/favicon.ico`);+ if (buffer) {+ return sendBuffer(buffer, hostname);+ }++ // If that didnt work try parse html+ const res = await fetch(url).then((res) => res.text());+ const favicon =+ res.match(/<link.*?rel="icon".*?href="(.+?)".*?>/) ||+ res.match(/<link.*?rel="shortcut icon".*?href="(.+?)".*?>/);++ if (favicon?.[1]) {+ const faviconUrl = favicon[1].startsWith('http')+ ? favicon[1]+ : `${origin}${favicon[1]}`;++ const buffer = await getUrlBuffer(faviconUrl);++ if (buffer) {+ return sendBuffer(buffer, hostname);+ }+ }++ return reply.status(404).send('Not found');+}diff --git a/apps/sdk-api/src/index.ts b/apps/sdk-api/src/index.tsindex fc8b90a3d..936309438 100644--- a/apps/sdk-api/src/index.ts+++ b/apps/sdk-api/src/index.ts@@ -6,6 +6,7 @@ import { redisPub } from '@mixan/redis';import eventRouter from './routes/event.router';import liveRouter from './routes/live.router';+import miscRouter from './routes/misc.router';import profileRouter from './routes/profile.router';declare module 'fastify' {@@ -32,6 +33,7 @@ const startServer = async () => {fastify.register(eventRouter, { prefix: '/event' });fastify.register(profileRouter, { prefix: '/profile' });fastify.register(liveRouter, { prefix: '/live' });+ fastify.register(miscRouter, { prefix: '/misc' });fastify.setErrorHandler((error, request, reply) => {fastify.log.error(error);});diff --git a/apps/sdk-api/src/routes/misc.router.ts b/apps/sdk-api/src/routes/misc.router.tsnew file mode 100644index 000000000..3b4adf5b1--- /dev/null+++ b/apps/sdk-api/src/routes/misc.router.ts@@ -0,0 +1,14 @@+import * as controller from '@/controllers/misc.controller';+import type { FastifyPluginCallback } from 'fastify';++const miscRouter: FastifyPluginCallback = (fastify, opts, done) => {+ fastify.route({+ method: 'GET',+ url: '/favicon',+ handler: controller.getFavicon,+ });++ done();+};++export default miscRouter;diff --git a/apps/web/src/components/report/chart/ChartEmpty.tsx b/apps/web/src/components/report/chart/ChartEmpty.tsxindex 8b4e061d2..068447a79 100644--- a/apps/web/src/components/report/chart/ChartEmpty.tsx+++ b/apps/web/src/components/report/chart/ChartEmpty.tsx@@ -22,7 +22,7 @@ export function ChartEmpty() {return (<divclassName={- 'aspect-video w-full max-h-[400px] min-h-[200px] flex justify-center items-center'+ 'aspect-video w-full max-h-[300px] min-h-[200px] flex justify-center items-center'}>No datadiff --git a/apps/web/src/components/report/chart/ChartLoading.tsx b/apps/web/src/components/report/chart/ChartLoading.tsxindex b843d1262..e3dfe1b2b 100644--- a/apps/web/src/components/report/chart/ChartLoading.tsx+++ b/apps/web/src/components/report/chart/ChartLoading.tsx@@ -7,7 +7,7 @@ export function ChartLoading({ className }: ChartLoadingProps) {return (<divclassName={cn(- 'aspect-video w-full bg-slate-200 animate-pulse rounded max-h-[400px] min-h-[200px]',+ 'aspect-video w-full bg-slate-200 animate-pulse rounded max-h-[300px] min-h-[200px]',className)}/>diff --git a/apps/web/src/components/report/chart/ReportAreaChart.tsx b/apps/web/src/components/report/chart/ReportAreaChart.tsxindex be8c8d40f..09162bc94 100644--- a/apps/web/src/components/report/chart/ReportAreaChart.tsx+++ b/apps/web/src/components/report/chart/ReportAreaChart.tsx@@ -41,7 +41,7 @@ export function ReportAreaChart({<><divclassName={cn(- 'max-sm:-mx-3 aspect-video w-full max-h-[400px] min-h-[200px]',+ 'max-sm:-mx-3 aspect-video w-full max-h-[300px] min-h-[200px]',editMode && 'border border-border bg-white rounded-md p-4')}>@@ -49,7 +49,7 @@ export function ReportAreaChart({{({ width }) => (<AreaChartwidth={width}- height={Math.min(Math.max(width * 0.5625, 250), 400)}+ height={Math.min(Math.max(width * 0.5625, 250), 300)}data={rechartData}><Tooltip content={<ReportChartTooltip />} />diff --git a/apps/web/src/components/report/chart/ReportBarChart.tsx b/apps/web/src/components/report/chart/ReportBarChart.tsxindex e65f82973..337982f9a 100644--- a/apps/web/src/components/report/chart/ReportBarChart.tsx+++ b/apps/web/src/components/report/chart/ReportBarChart.tsx@@ -20,15 +20,15 @@ export function ReportBarChart({ data }: ReportBarChartProps) {const { editMode, metric, onClick } = useChartContext();const number = useNumber();const series = useMemo(- () => (editMode ? data.series : data.series.slice(0, 20)),- [data]+ () => (editMode ? data.series : data.series.slice(0, 10)),+ [data, editMode]);const maxCount = Math.max(...series.map((serie) => serie.metrics[metric]));return (<divclassName={cn(- 'flex flex-col w-full divide-y text-xs',+ 'flex flex-col w-full text-xs -mx-2',editMode &&'text-base bg-white border border-border rounded-md p-4 pt-2')}@@ -45,8 +45,8 @@ export function ReportBarChart({ data }: ReportBarChartProps) {<divkey={serie.name}className={cn(- 'py-2 flex flex-1 w-full gap-4 items-center',- isClickable && 'cursor-pointer hover:bg-gray-100'+ 'py-2 px-2 flex flex-1 w-full gap-4 items-center even:bg-slate-50 [&_[role=progressbar]]:even:bg-white [&_[role=progressbar]]:shadow-sm rounded',+ isClickable && 'cursor-pointer hover:!bg-slate-100')}{...(isClickable ? { onClick: () => onClick(serie) } : {})}>diff --git a/apps/web/src/components/report/chart/ReportHistogramChart.tsx b/apps/web/src/components/report/chart/ReportHistogramChart.tsxindex ab3a1016a..080bb19ad 100644--- a/apps/web/src/components/report/chart/ReportHistogramChart.tsx+++ b/apps/web/src/components/report/chart/ReportHistogramChart.tsx@@ -45,7 +45,7 @@ export function ReportHistogramChart({<><divclassName={cn(- 'max-sm:-mx-3 aspect-video w-full max-h-[400px] min-h-[200px]',+ 'max-sm:-mx-3 aspect-video w-full max-h-[300px] min-h-[200px]',editMode && 'border border-border bg-white rounded-md p-4')}>@@ -53,7 +53,7 @@ export function ReportHistogramChart({{({ width }) => (<BarChartwidth={width}- height={Math.min(Math.max(width * 0.5625, 250), 400)}+ height={Math.min(Math.max(width * 0.5625, 250), 300)}data={rechartData}><CartesianGrid strokeDasharray="3 3" vertical={false} />diff --git a/apps/web/src/components/report/chart/ReportLineChart.tsx b/apps/web/src/components/report/chart/ReportLineChart.tsxindex a5a95466d..0d598badc 100644--- a/apps/web/src/components/report/chart/ReportLineChart.tsx+++ b/apps/web/src/components/report/chart/ReportLineChart.tsx@@ -43,7 +43,7 @@ export function ReportLineChart({<><divclassName={cn(- 'max-sm:-mx-3 aspect-video w-full max-h-[400px] min-h-[200px]',+ 'max-sm:-mx-3 aspect-video w-full max-h-[300px] min-h-[200px]',editMode && 'border border-border bg-white rounded-md p-4')}>@@ -51,7 +51,7 @@ export function ReportLineChart({{({ width }) => (<LineChartwidth={width}- height={Math.min(Math.max(width * 0.5625, 250), 400)}+ height={Math.min(Math.max(width * 0.5625, 250), 300)}data={rechartData}><CartesianGriddiff --git a/apps/web/src/components/report/chart/SerieIcon.tsx b/apps/web/src/components/report/chart/SerieIcon.tsxindex 9271456cb..3ccead30f 100644--- a/apps/web/src/components/report/chart/SerieIcon.tsx+++ b/apps/web/src/components/report/chart/SerieIcon.tsx@@ -47,7 +47,10 @@ export function SerieIcon({ name, ...props }: SerieIconProps) {if (name.includes('http')) {Icon = ((_props) => (- <SocialIcon network={networkFor(name)} />+ <img+ className="w-4 h-4 object-cover"+ src={`${String(process.env.NEXT_PUBLIC_API_URL)}/misc/favicon?url=${encodeURIComponent(name)}`}+ />)) as LucideIcon;}