Removed session code.

lib/request.js

@@ -68,13 +68,13 @@ export async function getCountry(req, ip) {
 
   lookup.close();
 
-  return result.country.iso_code;
+  return result?.country?.iso_code;
 }
 
 export async function getClientInfo(req, { screen }) {
+  const userAgent = req.headers['user-agent'];
   const ip = getIpAddress(req);
   const country = await getCountry(req, ip);
-  const userAgent = req.headers['user-agent'];
   const browser = browserName(userAgent);
   const os = detectOS(userAgent);
   const device = getDevice(screen, browser, os);

lib/session.js

@@ -1,6 +1,6 @@
 import { getWebsiteByUuid, getSessionByUuid, createSession } from 'lib/queries';
 import { getClientInfo } from 'lib/request';
-import { uuid, isValidId, parseToken } from 'lib/crypto';
+import { uuid, isValidId } from 'lib/crypto';
 
 export async function verifySession(req) {
   const { payload } = req.body;
@@ -9,50 +9,42 @@ export async function verifySession(req) {
     throw new Error('Invalid request');
   }
 
-  const { website: website_uuid, hostname, screen, language, session } = payload;
+  const { website: website_uuid, hostname, screen, language } = payload;
 
   if (!isValidId(website_uuid)) {
     throw new Error(`Invalid website: ${website_uuid}`);
   }
 
-  const token = await parseToken(session);
+  const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
 
-  if (!token || token.website_uuid !== website_uuid) {
+  const website = await getWebsiteByUuid(website_uuid);
-    const { userAgent, browser, os, ip, country, device } = await getClientInfo(req, payload);
 
-    const website = await getWebsiteByUuid(website_uuid);
+  if (!website) {
-
+    throw new Error(`Website not found: ${website_uuid}`);
-    if (!website) {
-      throw new Error(`Website not found: ${website_uuid}`);
-    }
-
-    const { website_id } = website;
-    const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
-
-    let session = await getSessionByUuid(session_uuid);
-
-    if (!session) {
-      session = await createSession(website_id, {
-        session_uuid,
-        hostname,
-        browser,
-        os,
-        screen,
-        language,
-        country,
-        device,
-      });
-    }
-
-    const { session_id } = session;
-
-    return {
-      website_id,
-      website_uuid,
-      session_id,
-      session_uuid,
-    };
   }
 
-  return token;
+  const { website_id } = website;
+  const session_uuid = uuid(website_id, hostname, ip, userAgent, os);
+
+  let session = await getSessionByUuid(session_uuid);
+
+  if (!session) {
+    session = await createSession(website_id, {
+      session_uuid,
+      hostname,
+      browser,
+      os,
+      screen,
+      language,
+      country,
+      device,
+    });
+  }
+
+  const { session_id } = session;
+
+  return {
+    website_id,
+    session_id,
+  };
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.10.4",
+  "version": "0.11.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",

pages/api/collect.js

@@ -1,16 +1,15 @@
 import { savePageView, saveEvent } from 'lib/queries';
 import { useCors, useSession } from 'lib/middleware';
-import { createToken } from 'lib/crypto';
 import { ok, badRequest } from 'lib/response';
 
 export default async (req, res) => {
   await useCors(req, res);
   await useSession(req, res);
 
-  const { session } = req;
-  const token = await createToken(session);
-  const { website_id, session_id } = session;
   const { type, payload } = req.body;
+  const {
+    session: { website_id, session_id },
+  } = req;
 
   if (type === 'pageview') {
     const { url, referrer } = payload;
@@ -24,5 +23,5 @@ export default async (req, res) => {
     return badRequest(res);
   }
 
-  return ok(res, { session: token });
+  return ok(res);
 };

tracker/index.js

@@ -2,18 +2,20 @@ import 'promise-polyfill/src/polyfill';
 import 'unfetch/polyfill';
 import { post, hook } from '../lib/web';
 
-((window, sessionKey) => {
+(window => {
   const {
     screen: { width, height },
     navigator: { language },
     location: { hostname, pathname, search },
-    localStorage: store,
     document,
     history,
   } = window;
 
   const script = document.querySelector('script[data-website-id]');
-  const website = script && script.getAttribute('data-website-id');
+
+  if (!script) return;
+
+  const website = script.getAttribute('data-website-id');
   const hostUrl = new URL(script.src).origin;
   const screen = `${width}x${height}`;
   const listeners = [];
@@ -21,9 +23,10 @@ import { post, hook } from '../lib/web';
   let currentUrl = `${pathname}${search}`;
   let currentRef = document.referrer;
 
+  /* Collect metrics */
+
   const collect = (type, params) => {
     const payload = {
-      session: store.getItem(sessionKey),
       url: currentUrl,
       referrer: currentRef,
       website,
@@ -41,7 +44,7 @@ import { post, hook } from '../lib/web';
     return post(`${hostUrl}/api/collect`, {
       type,
       payload,
-    }).then(({ session }) => session && store.setItem(sessionKey, session));
+    });
   };
 
   const pageView = () => collect('pageview').then(() => setTimeout(loadEvents, 300));
@@ -86,4 +89,4 @@ import { post, hook } from '../lib/web';
   /* Start */
 
   pageView();
-})(window, 'umami.session');
+})(window);