diff --git a/assets/js/stats/index.js b/assets/js/stats/index.js index 87a9dbc5a..b2cf07b55 100644 --- a/assets/js/stats/index.js +++ b/assets/js/stats/index.js @@ -125,4 +125,13 @@ if (domainEl) { router.updateLinkHandlers() }) }) + + setInterval(function() { + fetch(`/api/${domain}/current-visitors`) + .then(res => res.json()) + .then((res) => { + console.log(res) + document.getElementById('current-visitors').innerHTML = res + }) + }, 10000) } diff --git a/lib/plausible/stats/stats.ex b/lib/plausible/stats/stats.ex index 775398e17..9e5a0aebf 100644 --- a/lib/plausible/stats/stats.ex +++ b/lib/plausible/stats/stats.ex @@ -181,6 +181,15 @@ defmodule Plausible.Stats do ) end + def current_visitors(site) do + Repo.one( + from p in Plausible.Pageview, + where: p.inserted_at >= fragment("(now() at time zone 'utc') - '5 minutes'::interval"), + where: p.hostname == ^site.domain, + select: count(p.user_id, :distinct) + ) + end + defp base_query(site, query) do {:ok, first} = NaiveDateTime.new(query.date_range.first, ~T[00:00:00]) first_datetime = Timex.to_datetime(first, site.timezone) diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex index aeb90ea3a..278700fa9 100644 --- a/lib/plausible_web/controllers/stats_controller.ex +++ b/lib/plausible_web/controllers/stats_controller.ex @@ -23,12 +23,14 @@ defmodule PlausibleWeb.StatsController do {conn, params} = fetch_period(conn, site) query = Stats.Query.from(site.timezone, params) + current_visitors = Stats.current_visitors(site) conn |> assign(:skip_plausible_tracking, !demo) |> render("stats.html", site: site, query: query, + current_visitors: current_visitors, title: "Plausible ยท " <> site.domain ) else @@ -295,6 +297,16 @@ defmodule PlausibleWeb.StatsController do end end + def current_visitors(conn, %{"domain" => domain}) do + site = Repo.get_by(Plausible.Site, domain: domain) + + if site && current_user_can_access?(conn, site) do + json(conn, Stats.current_visitors(site)) + else + render_error(conn, 404) + end + end + defp current_user_can_access?(_conn, %Plausible.Site{public: true}) do true end diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex index 2a18895ba..61dc2edfb 100644 --- a/lib/plausible_web/router.ex +++ b/lib/plausible_web/router.ex @@ -42,6 +42,7 @@ defmodule PlausibleWeb.Router do get "/:domain/operating-systems", StatsController, :operating_systems get "/:domain/browsers", StatsController, :browsers get "/:domain/compare", StatsController, :compare + get "/:domain/current-visitors", StatsController, :current_visitors end scope "/", PlausibleWeb do diff --git a/lib/plausible_web/templates/stats/stats.html.eex b/lib/plausible_web/templates/stats/stats.html.eex index 9c519d6d0..e4a6da213 100644 --- a/lib/plausible_web/templates/stats/stats.html.eex +++ b/lib/plausible_web/templates/stats/stats.html.eex @@ -1,7 +1,15 @@