1.1.0

ari-party · Jun 7, 2024 · fb2c52b · fb2c52b
1 parent bba4887
commit fb2c52b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami-views",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "author": "Astrid <git@astrid.email>",
   "license": "MIT",
   "type": "module",

diff --git a/src/index.ts b/src/index.ts
@@ -43,7 +43,6 @@ app.get('/svg', async (req, res) => {
 
     const views = await getViews(websiteAPI, websiteId, token);
     if (!views) return res.status(500).send('Failed to get views');
-    const { pageviews } = views;
 
     const dom = new JSDOM(`<!DOCTYPE html><body></body>`);
     const body = dom.window.document.querySelector('body')!;
@@ -71,10 +70,10 @@ app.get('/svg', async (req, res) => {
             {
               label: website.domain,
               logo: '',
-              data: pageviews
-                .map((pageview) => ({
-                  x: new Date(pageview.x),
-                  y: pageview.y,
+              data: views
+                .map((view) => ({
+                  x: new Date(view.x),
+                  y: view.y,
                 }))
                 .sort((a, b) => b.x.getTime() - a.x.getTime()),
             },

diff --git a/src/lib/umami/getViews.ts b/src/lib/umami/getViews.ts
@@ -1,7 +1,5 @@
 import ky from 'ky';
 
-import getNearestMidnight from '../../utils/getNearestMidnight';
-
 export interface XY {
   x: string;
   y: number;
@@ -18,15 +16,14 @@ export default async function getViews(
   websiteAPI: string,
   websiteId: string,
   token: string,
-): Promise<PageViews | null> {
-  const today = getNearestMidnight();
-
-  const monthAgo = today - 30 * oneDay;
+): Promise<Array<{ x: Date; y: number }> | null> {
+  const now = 1717714800 * 1_000 || Date.now();
+  const monthAgo = now - 30 * oneDay;
 
   const response = await ky.get(
     `${websiteAPI}api/websites/${websiteId}/pageviews?${new URLSearchParams({
       startAt: String(monthAgo),
-      endAt: String(today - oneDay),
+      endAt: String(now),
       unit: 'day',
       timezone: 'Europe/Amsterdam',
     })}`,
@@ -41,11 +38,19 @@ export default async function getViews(
   const data = (await response.json()) as PageViews;
 
   if (
-    typeof data === 'object' &&
-    typeof data.pageviews === 'object' &&
-    typeof data.sessions === 'object'
+    typeof data !== 'object' ||
+    typeof data.pageviews !== 'object' ||
+    typeof data.sessions !== 'object'
   )
-    return data;
+    return null;
+
+  const pageviews = data.pageviews
+    .map((view) => ({
+      x: new Date(view.x),
+      y: view.y,
+    }))
+    .sort((a, b) => b.x.getTime() - a.x.getTime());
 
-  return null;
+  // ignore the last day
+  return pageviews.slice(1);
 }
diff --git a/src/utils/getNearestMidnight.ts b/src/utils/getNearestMidnight.ts