Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Capture pushState events.
Mike Caoeebf145efcbb
diff --git a/.gitignore b/.gitignoreindex 47be70dcc..a2442a921 100644--- a/.gitignore+++ b/.gitignore@@ -14,7 +14,6 @@# production/build-/public/umami.js# misc.DS_Storediff --git a/components/layout.js b/components/layout.jsindex c3880bd37..19750bcd1 100644--- a/components/layout.js+++ b/components/layout.js@@ -17,7 +17,7 @@ export default function Layout({ title, children }) {<scriptasyncdefer- data-website-id="865234ad-6a92-11e7-8846-b05adad3f099"+ data-website-id="d0059975-b79a-4f83-8926-ed731475fded"src="/umami.js"/>)}diff --git a/pages/api/session.js b/pages/api/session.jsindex bca7ce7a7..801dca855 100644--- a/pages/api/session.js+++ b/pages/api/session.js@@ -5,7 +5,7 @@ import { allowPost } from 'lib/middleware';export default async (req, res) => {await allowPost(req, res);- let result = { success: 0, time: Date.now() };+ let result = { success: 0 };const {website_id,@@ -23,6 +23,7 @@ export default async (req, res) => {if (website) {const session = await getSession(session_id);+ const time = Date.now();if (!session) {await createSession(website_id, session_id, {@@ -40,7 +41,8 @@ export default async (req, res) => {success: 1,session_id,website_id,- hash: hash(`${website_id}${session_id}${result.time}`),+ time,+ hash: hash(`${website_id}${session_id}${time}`),};}}diff --git a/pages/index.js b/pages/index.jsindex 5d881cdba..e632bfd1d 100644--- a/pages/index.js+++ b/pages/index.js@@ -1,14 +1,19 @@import React from 'react';import Layout from 'components/layout';+import Link from 'next/link';export default function Home() {return (<Layout>Hello.<br />- <a href="/?q=abc">abc</a>+ <Link href="/?q=abc">+ <a>abc</a>+ </Link><br />- <a href="/?q=123">123</a>+ <Link href="/?q=123">+ <a>123</a>+ </Link></Layout>);}diff --git a/public/umami.js b/public/umami.jsnew file mode 100644index 000000000..d8860b788--- /dev/null+++ b/public/umami.js@@ -0,0 +1 @@+!function(){"use strict";function e(e){var n=this.constructor;return this.then((function(t){return n.resolve(e()).then((function(){return t}))}),(function(t){return n.resolve(e()).then((function(){return n.reject(t)}))}))}var n=setTimeout;function t(e){return Boolean(e&&void 0!==e.length)}function r(){}function o(e){if(!(this instanceof o))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],f(e,this)}function i(e,n){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,o._immediateFn((function(){var t=1===e._state?n.onFulfilled:n.onRejected;if(null!==t){var r;try{r=t(e._value)}catch(e){return void s(n.promise,e)}u(n.promise,r)}else(1===e._state?u:s)(n.promise,e._value)}))):e._deferreds.push(n)}function u(e,n){try{if(n===e)throw new TypeError("A promise cannot be resolved with itself.");if(n&&("object"==typeof n||"function"==typeof n)){var t=n.then;if(n instanceof o)return e._state=3,e._value=n,void c(e);if("function"==typeof t)return void f((r=t,i=n,function(){r.apply(i,arguments)}),e)}e._state=1,e._value=n,c(e)}catch(n){s(e,n)}var r,i}function s(e,n){e._state=2,e._value=n,c(e)}function c(e){2===e._state&&0===e._deferreds.length&&o._immediateFn((function(){e._handled||o._unhandledRejectionFn(e._value)}));for(var n=0,t=e._deferreds.length;n<t;n++)i(e,e._deferreds[n]);e._deferreds=null}function a(e,n,t){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof n?n:null,this.promise=t}function f(e,n){var t=!1;try{e((function(e){t||(t=!0,u(n,e))}),(function(e){t||(t=!0,s(n,e))}))}catch(e){if(t)return;t=!0,s(n,e)}}o.prototype["catch"]=function(e){return this.then(null,e)},o.prototype.then=function(e,n){var t=new this.constructor(r);return i(this,new a(e,n,t)),t},o.prototype["finally"]=e,o.all=function(e){return new o((function(n,r){if(!t(e))return r(new TypeError("Promise.all accepts an array"));var o=Array.prototype.slice.call(e);if(0===o.length)return n([]);var i=o.length;function u(e,t){try{if(t&&("object"==typeof t||"function"==typeof t)){var s=t.then;if("function"==typeof s)return void s.call(t,(function(n){u(e,n)}),r)}o[e]=t,0==--i&&n(o)}catch(e){r(e)}}for(var s=0;s<o.length;s++)u(s,o[s])}))},o.resolve=function(e){return e&&"object"==typeof e&&e.constructor===o?e:new o((function(n){n(e)}))},o.reject=function(e){return new o((function(n,t){t(e)}))},o.race=function(e){return new o((function(n,r){if(!t(e))return r(new TypeError("Promise.race accepts an array"));for(var i=0,u=e.length;i<u;i++)o.resolve(e[i]).then(n,r)}))},o._immediateFn="function"==typeof setImmediate&&function(e){setImmediate(e)}||function(e){n(e,0)},o._unhandledRejectionFn=function(e){"undefined"!=typeof console&&console&&console.warn("Possible Unhandled Promise Rejection:",e)};var l=function(){if("undefined"!=typeof self)return self;if("undefined"!=typeof window)return window;if("undefined"!=typeof global)return global;throw new Error("unable to locate global object")}();"Promise"in l?l.Promise.prototype["finally"]||(l.Promise.prototype["finally"]=e):l["Promise"]=o,self.fetch||(self.fetch=function(e,n){return n=n||{},new Promise((function(t,r){var o=new XMLHttpRequest,i=[],u=[],s={},c=function(){return{ok:2==(o.status/100|0),statusText:o.statusText,status:o.status,url:o.responseURL,text:function(){return Promise.resolve(o.responseText)},json:function(){return Promise.resolve(JSON.parse(o.responseText))},blob:function(){return Promise.resolve(new Blob([o.response]))},clone:c,headers:{keys:function(){return i},entries:function(){return u},get:function(e){return s[e.toLowerCase()]},has:function(e){return e.toLowerCase()in s}}}};for(var a in o.open(n.method||"get",e,!0),o.onload=function(){o.getAllResponseHeaders().replace(/^(.*?):[^\S\n]*([\s\S]*?)$/gm,(function(e,n,t){i.push(n=n.toLowerCase()),u.push([n,t]),s[n]=s[n]?s[n]+","+t:t})),t(c())},o.onerror=r,o.withCredentials="include"==n.credentials,n.headers)o.setRequestHeader(a,n.headers[a]);o.send(n.body||null)}))});var d=window.screen,p=d.width,h=d.height,v=window.navigator.language,y=window.location,w=y.hostname,m=y.pathname,_=y.search,g=window.localStorage,b=window.document,j=window.history,P=b.querySelector("script[data-website-id]");if(P){var S=P.getAttribute("data-website-id");if(S){var T="umami.session",R=new URL(P.src).origin,x=p+"x"+h,F=""+m+_,O=b.referrer,E=function(e,n){return fetch(e,{method:"post",cache:"no-cache",headers:{Accept:"application/json","Content-Type":"application/json"},body:JSON.stringify(n)}).then((function(e){return e.json()}))},I=function(e){return E(R+"/api/session",e).then((function(e){var n=e.success,t=function(e,n){var t={};for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&-1===n.indexOf(r)&&(t[r]=e[r]);return t}(e,["success"]);if(n)return g.setItem(T,JSON.stringify(t)),n}))},L=function(e,n){return E(R+"/api/collect",{type:"pageview",payload:{url:e,referrer:n,session:JSON.parse(g.getItem(T))}}).then((function(e){var n=e.success;return n||g.removeItem(T),n}))},A=function(e,n){var t=function(e){return{website_id:S,hostname:w,url:e,screen:x,language:v}}(e);g.getItem(T)?L(e,n).then((function(e){return!e&&I(t)})):I(t).then((function(t){return t&&L(e,n)}))},C=function(e,n,t){O=F,A(F=t,O)},J=function(e,n){var t=j[e];return function(e,r,o){var i=[e,r,o];return n.apply(null,i),t.apply(j,i)}};j.pushState=J("pushState",C),j.replaceState=J("replaceState",C),A(F,O)}}}();diff --git a/scripts/umami/index.js b/scripts/umami/index.jsindex 1c474f986..d83f4e21d 100644--- a/scripts/umami/index.js+++ b/scripts/umami/index.js@@ -1,63 +1,89 @@import 'promise-polyfill/src/polyfill';import 'unfetch/polyfill';-const HOST_URL = process.env.UMAMI_URL;-const SESSION_VAR = 'umami.session';const {screen: { width, height },navigator: { language },location: { hostname, pathname, search },localStorage: store,document,+ history,} = window;-const post = (url, params) =>- fetch(url, {- method: 'post',- cache: 'no-cache',- headers: {- Accept: 'application/json',- 'Content-Type': 'application/json',- },- body: JSON.stringify(params),- }).then(res => res.json());--const createSession = data =>- post(`${HOST_URL}/api/session`, data).then(({ success, ...session }) => {- if (success) {- store.setItem(SESSION_VAR, JSON.stringify(session));- return success;- }- });--const getSession = () => JSON.parse(store.getItem(SESSION_VAR));--const pageView = (url, referrer) =>- post(`${HOST_URL}/api/collect`, {- type: 'pageview',- payload: { url, referrer, session: getSession() },- }).then(({ success }) => {- if (!success) {- store.removeItem(SESSION_VAR);- }- return success;- });-const script = document.querySelector('script[data-website-id]');if (script) {const website_id = script.getAttribute('data-website-id');if (website_id) {- const referrer = document.referrer;+ const sessionKey = 'umami.session';+ const hostUrl = new URL(script.src).origin;const screen = `${width}x${height}`;- const url = `${pathname}${search}`;- const data = { website_id, hostname, url, screen, language };-- if (!store.getItem(SESSION_VAR)) {- createSession(data).then(success => success && pageView(url, referrer));- } else {- pageView(url, referrer).then(success => !success && createSession(data));- }+ let currentUrl = `${pathname}${search}`;+ let currenrRef = document.referrer;++ const post = (url, params) =>+ fetch(url, {+ method: 'post',+ cache: 'no-cache',+ headers: {+ Accept: 'application/json',+ 'Content-Type': 'application/json',+ },+ body: JSON.stringify(params),+ }).then(res => res.json());++ const createSession = data =>+ post(`${hostUrl}/api/session`, data).then(({ success, ...session }) => {+ if (success) {+ store.setItem(sessionKey, JSON.stringify(session));+ return success;+ }+ });++ const getSession = () => JSON.parse(store.getItem(sessionKey));++ const getSessionData = url => ({ website_id, hostname, url, screen, language });++ const pageView = (url, referrer) =>+ post(`${hostUrl}/api/collect`, {+ type: 'pageview',+ payload: { url, referrer, session: getSession() },+ }).then(({ success }) => {+ if (!success) {+ store.removeItem(sessionKey);+ }+ return success;+ });++ const execute = (url, referrer) => {+ const data = getSessionData(url);++ if (!store.getItem(sessionKey)) {+ createSession(data).then(success => success && pageView(url, referrer));+ } else {+ pageView(url, referrer).then(success => !success && createSession(data));+ }+ };++ const handlePush = (state, title, url) => {+ currenrRef = currentUrl;+ currentUrl = url;+ execute(currentUrl, currenrRef);+ };++ const hook = (type, cb) => {+ const orig = history[type];+ return (state, title, url) => {+ const args = [state, title, url];+ cb.apply(null, args);+ return orig.apply(history, args);+ };+ };++ history.pushState = hook('pushState', handlePush);+ history.replaceState = hook('replaceState', handlePush);++ execute(currentUrl, currenrRef);}}