vbatts/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

HTTP clients tweaks

Browse source
This commit is contained in:
Thomas Sileo 2022-07-13 20:05:15 +02:00
parent 6616343cd3
commit 88b57f29af
5 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/activitypub.py
View file

@ -14,6 +14,8 @@ from app.key import get_pubkey_as_pem
if TYPE_CHECKING:
from app.actor import Actor
_HTTPX_TRANSPORT = httpx.AsyncHTTPTransport(retries=1)
RawObject = dict[str, Any]
AS_CTX = "https://www.w3.org/ns/activitystreams"
AS_PUBLIC = "https://www.w3.org/ns/activitystreams#Public"
@ -49,6 +51,10 @@ class ObjectIsGoneError(Exception):
pass
class ObjectNotFoundError(Exception):
pass
class VisibilityEnum(str, enum.Enum):
PUBLIC = "public"
UNLISTED = "unlisted"
@ -104,7 +110,7 @@ class NotAnObjectError(Exception):
async def fetch(url: str, params: dict[str, Any] | None = None) -> RawObject:
async with httpx.AsyncClient() as client:
async with httpx.AsyncClient(transport=_HTTPX_TRANSPORT) as client:
resp = await client.get(
url,
headers={
@ -119,6 +125,8 @@ async def fetch(url: str, params: dict[str, Any] | None = None) -> RawObject:
# Special handling for deleted object
if resp.status_code == 410:
raise ObjectIsGoneError(f"{url} is gone")
elif resp.status_code == 404:
raise ObjectNotFoundError(f"{url} not found")
resp.raise_for_status()
try: