From ddac5685a24aa8388b0661f0544cd28b1ca99d82 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 18 Dec 2019 16:05:30 +0800 Subject: [PATCH] Add unload event to the tracking script --- assets/js/p.js | 6 ++++++ assets/js/plausible.js | 6 ++++++ lib/plausible_web/controllers/api/external_controller.ex | 6 ++++++ lib/plausible_web/router.ex | 1 + 4 files changed, 19 insertions(+) diff --git a/assets/js/p.js b/assets/js/p.js index 15d14553a..c0133ad34 100644 --- a/assets/js/p.js +++ b/assets/js/p.js @@ -101,8 +101,14 @@ } + function onUnload() { + var userData = getUserData() + navigator.sendBeacon(plausibleHost + '/api/unload', JSON.stringify({uid: userData.uid})); + } + function page(options) { trigger('pageview', options) + window.addEventListener('unload', onUnload, false); } function trackPushState() { diff --git a/assets/js/plausible.js b/assets/js/plausible.js index b23a3e3d6..af9971cf0 100644 --- a/assets/js/plausible.js +++ b/assets/js/plausible.js @@ -100,8 +100,14 @@ } + function onUnload() { + var userData = getUserData() + navigator.sendBeacon(plausibleHost + '/api/unload', JSON.stringify({uid: userData.uid})); + } + function page() { trigger('pageview') + window.addEventListener('unload', onUnload, false); } var his = window.history diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 1f46733fc..7b3322b18 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -19,6 +19,12 @@ defmodule PlausibleWeb.Api.ExternalController do end end + def unload(conn, _params) do + params = parse_body(conn) + Plausible.Ingest.Session.on_unload(params["uid"], Timex.now()) + conn |> send_resp(202, "") + end + def error(conn, _params) do request = Sentry.Plug.build_request_interface_data(conn, []) Sentry.capture_message("JS snippet error", request: request) diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 60a2157d3..d3372e259 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -50,6 +50,7 @@ defmodule PlausibleWeb.Router do pipe_through :api post "/event", Api.ExternalController, :event + post "/unload", Api.ExternalController, :unload get "/error", Api.ExternalController, :error post "/paddle/webhook", Api.PaddleController, :webhook