Traffic counts what matters: rooms opened from the site, where links were shared, scanners and monitors as bots

- A room opened with Play now never loads /join: the API's answer to
  POST /api/rooms is counted as rooms opened here.
- Link previews (Slack, Discord, Facebook, iMessage, WhatsApp and the
  rest) are reported as where the link was shared, since the people who
  click them arrive with no referrer. WhatsApp's fetcher is a bot now.
- An address that asks for a scanner's paths, or keeps coming back
  without opening a game, is a bot's all day; so is a browser that loads
  pages at a steady interval from a new address each time, never
  playing. A declared bot is still judged request by request.
- The site's own addresses, sslip.io included, are not referrers.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Jm2auWk6RP71CjaAb4FMoG

deploy/waving-hands-rollup.sh

@@ -28,41 +28,9 @@ import collections, datetime, glob, gzip, json, os, re, shutil, sys
 day, out = sys.argv[1], sys.argv[2]
 d0 = datetime.datetime.fromisoformat(day).replace(tzinfo=datetime.timezone.utc)
 t0, t1 = d0.timestamp(), (d0 + datetime.timedelta(days=1)).timestamp()
-BOT = re.compile(r"bot|crawl|spider|slurp|facebookexternalhit|slack|discord|twitter|preview|fetch|curl|python|go-http|wget|headless|scan|monitor|uptime", re.I)
-
-req = human = bot = 0
-hips, bips = set(), set()
-pages, joins, refs, campaigns = collections.Counter(), collections.Counter(), collections.Counter(), collections.Counter()
-seen_campaign = set()
-for f in sorted(glob.glob("/var/lib/caddy/waving-hands-access*.log*")):
-    if os.path.getmtime(f) < t0: continue
-    opener = gzip.open if f.endswith(".gz") else open
-    with opener(f, "rt", errors="ignore") as fh:
-        for line in fh:
-            try: r = json.loads(line)
-            except ValueError: continue
-            ts = r.get("ts", 0)
-            if not (t0 <= ts < t1): continue
-            q = r.get("request", {}); h = q.get("headers", {})
-            ua = " ".join(h.get("User-Agent", [""]))
-            ip = q.get("client_ip") or q.get("remote_ip") or "?"
-            uri = q.get("uri", ""); path = uri.split("?")[0]
-            req += 1
-            if BOT.search(ua) or not ua:
-                bot += 1; bips.add(ip); continue
-            if path.startswith(("/_app/", "/api/")) or path == "/ws" or path.endswith((".png", ".ico", ".txt")): continue
-            human += 1; hips.add(ip)
-            if path == "/": pages["hall"] += 1
-            elif path == "/play": pages["play"] += 1
-            elif path == "/rules": pages["rules"] += 1
-            elif path.startswith("/join/"): joins[path.split("/")[2].upper()] += 1
-            ref = " ".join(h.get("Referer", [""]))
-            if ref and "hands.kestrelsnest.social" not in ref:
-                refs[re.sub(r"^https?://", "", ref).split("/")[0]] += 1
-            m = re.search(r"[?&](ref|utm_source|fbclid)=([^&]*)", uri)
-            if m and (ip, m.group(1)) not in seen_campaign:
-                seen_campaign.add((ip, m.group(1)))
-                campaigns[m.group(1) + ("=" + m.group(2)[:24] if m.group(1) != "fbclid" else "")] += 1
+sys.path.insert(0, "/usr/local/lib/waving-hands")
+import traffic
+t = traffic.scan(day)
 
 created = started = finished = turned = turns = 0
 humans, bots = set(), 0
@@ -80,20 +48,19 @@ for f in glob.glob("/var/lib/waving-hands/rooms/*.jsonl"):
                 if x["bot"]: bots += 1
                 else: humans.add(x["name"])
             elif x["t"] == "unseat": bots -= 1
-    day_turns = [x for x in lines if x["t"] == "turn" and t0 <= x["at"] / 1000 < t1]
-    turns += len(day_turns)
-    # A duel finished today: its last turn is today's and the engine would say so; approximate by replay-free means:
-    # the ledger's final turn falls today and no turn follows it within the day's end.
-    if day_turns and day_turns[-1] is lines[-1] and False: finished += 1
+    turns += sum(1 for x in lines if x["t"] == "turn" and t0 <= x["at"] / 1000 < t1)
+    # The over line is written with the turn that ends the game, so a finish counts on its own day.
+    if any(x["t"] == "over" and t0 <= x["at"] / 1000 < t1 for x in lines): finished += 1
 
 disk = shutil.disk_usage("/")
 mem = {}
 for line in open("/proc/meminfo"):
     k, v = line.split(":", 1); mem[k] = int(v.split()[0])
 load = os.getloadavg()[1]
-row = dict(day=day, requests=req, human=human, bot=bot, humanAddresses=len(hips), botAddresses=len(bips),
-           paths=dict(pages), roomLinks=sum(joins.values()), referrers=dict(refs), campaigns=dict(campaigns),
-           rooms=dict(created=created, started=started, withTurns=turned, humanNames=len(humans), botSeats=bots),
+row = dict(day=day, requests=t["requests"], human=t["human"], bot=t["bot"], humanAddresses=len(t["addresses"]), botAddresses=len(t["botAddresses"]),
+           paths=dict(t["pages"]), roomLinks=sum(t["joins"].values()), roomsOpened=t["opened"], sharedOn=dict(t["shared"]),
+           scanners=t["scanners"], monitors=t["monitors"], referrers=dict(t["referrers"]), campaigns=dict(t["campaigns"]),
+           rooms=dict(created=created, started=started, withTurns=turned, finished=finished, humanNames=len(humans), botSeats=bots),
            turns=turns, ledgers=len(glob.glob("/var/lib/waving-hands/rooms/*.jsonl")),
            vitals=dict(diskUsedPct=round(disk.used * 100 / disk.total), memAvailableMb=mem.get("MemAvailable", 0) // 1024, load5=round(load, 2)),
            at=datetime.datetime.now(datetime.timezone.utc).isoformat(timespec="seconds"))