- EventProcessor now recovers stuck "processing" activities back to "pending" after 5 minutes (handles process crashes) - New ap_delivery_log table records successful inbox deliveries - Federation delivery handler checks the log before sending, so retries skip already-delivered inboxes - Together these give at-least-once + idempotent semantics Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
195 lines
6.4 KiB
Python
195 lines
6.4 KiB
Python
"""Deliver AP activities to remote followers.
|
|
|
|
Registered as a wildcard handler — fires for every activity. Skips
|
|
non-public activities and those without an actor profile.
|
|
|
|
Idempotent: successful deliveries are recorded in ap_delivery_log.
|
|
On retry (at-least-once reaper), already-delivered inboxes are skipped.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
|
|
import httpx
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from shared.events.bus import register_activity_handler
|
|
from shared.models.federation import ActorProfile, APActivity, APFollower, APDeliveryLog
|
|
from shared.services.registry import services
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
AP_CONTENT_TYPE = "application/activity+json"
|
|
DELIVERY_TIMEOUT = 15 # seconds per request
|
|
|
|
|
|
def _build_activity_json(activity: APActivity, actor: ActorProfile, domain: str) -> dict:
|
|
"""Build the full AP activity JSON-LD for delivery."""
|
|
username = actor.preferred_username
|
|
actor_url = f"https://{domain}/users/{username}"
|
|
|
|
obj = dict(activity.object_data or {})
|
|
|
|
# Object id MUST be on the actor's domain (Mastodon origin check).
|
|
# The post URL (e.g. blog.rose-ash.com/slug/) goes in "url" only.
|
|
object_id = activity.activity_id + "/object"
|
|
|
|
if activity.activity_type == "Delete":
|
|
obj.setdefault("id", object_id)
|
|
obj.setdefault("type", "Tombstone")
|
|
else:
|
|
obj.setdefault("id", object_id)
|
|
obj.setdefault("type", activity.object_type)
|
|
obj.setdefault("attributedTo", actor_url)
|
|
obj.setdefault("published", activity.published.isoformat() if activity.published else None)
|
|
obj.setdefault("to", ["https://www.w3.org/ns/activitystreams#Public"])
|
|
obj.setdefault("cc", [f"{actor_url}/followers"])
|
|
if activity.activity_type == "Update":
|
|
from datetime import datetime, timezone
|
|
obj["updated"] = datetime.now(timezone.utc).isoformat()
|
|
|
|
return {
|
|
"@context": [
|
|
"https://www.w3.org/ns/activitystreams",
|
|
"https://w3id.org/security/v1",
|
|
],
|
|
"id": activity.activity_id,
|
|
"type": activity.activity_type,
|
|
"actor": actor_url,
|
|
"published": activity.published.isoformat() if activity.published else None,
|
|
"to": ["https://www.w3.org/ns/activitystreams#Public"],
|
|
"cc": [f"{actor_url}/followers"],
|
|
"object": obj,
|
|
}
|
|
|
|
|
|
async def _deliver_to_inbox(
|
|
client: httpx.AsyncClient,
|
|
inbox_url: str,
|
|
body: dict,
|
|
actor: ActorProfile,
|
|
domain: str,
|
|
) -> int | None:
|
|
"""POST signed activity to a single inbox. Returns status code or None on error."""
|
|
from shared.utils.http_signatures import sign_request
|
|
from urllib.parse import urlparse
|
|
import json
|
|
|
|
body_bytes = json.dumps(body).encode()
|
|
key_id = f"https://{domain}/users/{actor.preferred_username}#main-key"
|
|
|
|
parsed = urlparse(inbox_url)
|
|
headers = sign_request(
|
|
private_key_pem=actor.private_key_pem,
|
|
key_id=key_id,
|
|
method="POST",
|
|
path=parsed.path,
|
|
host=parsed.netloc,
|
|
body=body_bytes,
|
|
)
|
|
headers["Content-Type"] = AP_CONTENT_TYPE
|
|
|
|
try:
|
|
resp = await client.post(
|
|
inbox_url,
|
|
content=body_bytes,
|
|
headers=headers,
|
|
timeout=DELIVERY_TIMEOUT,
|
|
)
|
|
if resp.status_code < 300:
|
|
log.info("Delivered to %s → %d", inbox_url, resp.status_code)
|
|
else:
|
|
log.warning("Delivery to %s → %d: %s", inbox_url, resp.status_code, resp.text[:200])
|
|
return resp.status_code
|
|
except Exception:
|
|
log.exception("Delivery failed for %s", inbox_url)
|
|
return None
|
|
|
|
|
|
async def on_any_activity(activity: APActivity, session: AsyncSession) -> None:
|
|
"""Deliver a public activity to all followers of its actor."""
|
|
import os
|
|
|
|
# Only deliver public activities that have an actor profile
|
|
if activity.visibility != "public":
|
|
return
|
|
if activity.actor_profile_id is None:
|
|
return
|
|
if not services.has("federation"):
|
|
return
|
|
|
|
domain = os.getenv("AP_DOMAIN", "federation.rose-ash.com")
|
|
|
|
# Load actor with private key
|
|
actor = (
|
|
await session.execute(
|
|
select(ActorProfile).where(ActorProfile.id == activity.actor_profile_id)
|
|
)
|
|
).scalar_one_or_none()
|
|
if not actor or not actor.private_key_pem:
|
|
log.warning("Actor not found or missing key for activity %s", activity.activity_id)
|
|
return
|
|
|
|
# Load followers
|
|
followers = (
|
|
await session.execute(
|
|
select(APFollower).where(APFollower.actor_profile_id == actor.id)
|
|
)
|
|
).scalars().all()
|
|
|
|
if not followers:
|
|
log.debug("No followers to deliver to for %s", activity.activity_id)
|
|
return
|
|
|
|
# Deduplicate inboxes
|
|
all_inboxes = {f.follower_inbox for f in followers if f.follower_inbox}
|
|
|
|
# Check delivery log — skip inboxes we already delivered to (idempotency)
|
|
existing = (
|
|
await session.execute(
|
|
select(APDeliveryLog.inbox_url).where(
|
|
APDeliveryLog.activity_id == activity.id,
|
|
APDeliveryLog.status_code < 300,
|
|
)
|
|
)
|
|
).scalars().all()
|
|
already_delivered = set(existing)
|
|
|
|
inboxes = all_inboxes - already_delivered
|
|
if not inboxes:
|
|
log.info("All %d inbox(es) already delivered for %s", len(all_inboxes), activity.activity_id)
|
|
return
|
|
|
|
if already_delivered:
|
|
log.info(
|
|
"Skipping %d already-delivered inbox(es), delivering to %d remaining",
|
|
len(already_delivered), len(inboxes),
|
|
)
|
|
|
|
# Build activity JSON
|
|
activity_json = _build_activity_json(activity, actor, domain)
|
|
|
|
log.info(
|
|
"Delivering %s to %d inbox(es) for @%s",
|
|
activity.activity_type, len(inboxes), actor.preferred_username,
|
|
)
|
|
|
|
async with httpx.AsyncClient() as client:
|
|
for inbox_url in inboxes:
|
|
status_code = await _deliver_to_inbox(
|
|
client, inbox_url, activity_json, actor, domain
|
|
)
|
|
# Log successful deliveries for idempotency
|
|
if status_code is not None and status_code < 300:
|
|
session.add(APDeliveryLog(
|
|
activity_id=activity.id,
|
|
inbox_url=inbox_url,
|
|
status_code=status_code,
|
|
))
|
|
await session.flush()
|
|
|
|
|
|
# Wildcard: fires for every activity
|
|
register_activity_handler("*", on_any_activity)
|