Node.js based forum software built for the modern web
feat: begin tracking relay sends/receipts for ap analytics
Julian Lamb8216c3f6ac0
diff --git a/src/activitypub/analytics.js b/src/activitypub/analytics.jsindex c3297c879b..c8f3643200 100644--- a/src/activitypub/analytics.js+++ b/src/activitypub/analytics.js@@ -57,4 +57,16 @@ Analytics.receiptError = async (body, error) => {analytics.increment(['ap.inErr', `ap.inErr:byHost:${hostname}`]),]);await db.expire(`ap.errors:${id}`, 60 * 60 * 24); // 24 hours+};++Analytics.relays = {};++Analytics.relays.in = (relay) => {+ const { hostname } = new URL(relay);+ analytics.increment(['ap.relayIn', `ap.relayIn:byHost:${hostname}`]);+};++Analytics.relays.out = (relay) => {+ const { hostname } = new URL(relay);+ analytics.increment(['ap.relayOut', `ap.relayOut:byHost:${hostname}`]);};\ No newline at end of filediff --git a/src/activitypub/feps.js b/src/activitypub/feps.jsindex 262010b7da..ee35813422 100644--- a/src/activitypub/feps.js+++ b/src/activitypub/feps.js@@ -77,4 +77,8 @@ Feps.announce = async function announce(id, activity) {cc,object: activity,});++ relays.forEach((relay) => {+ activitypub.analytics.relay.out(relay);+ });};diff --git a/src/activitypub/inbox.js b/src/activitypub/inbox.jsindex 1d398acc37..066134b6cb 100644--- a/src/activitypub/inbox.js+++ b/src/activitypub/inbox.js@@ -469,6 +469,10 @@ inbox.announce = async (req) => {await topics.crossposts.add(tid, cid, 0);}));}++ if (fromRelay) {+ activitypub.analytics.relays.in(actor);+ }}if (!cid) { // Topic events from actors followed by users only