From daba8e8178741039d5dee455c652d362a6943627 Mon Sep 17 00:00:00 2001 From: Jesse Wierzbinski Date: Wed, 24 Jul 2024 18:52:30 +0200 Subject: [PATCH] refactor(federation): :recycle: Refactor code to use less `fetch` calls and instead use FederationRequester --- bun.lockb | Bin 278820 -> 278836 bytes package.json | 2 +- packages/database-interface/instance.ts | 36 +++++++++++++++++------- packages/database-interface/note.ts | 9 ++---- packages/database-interface/user.ts | 10 ++----- 5 files changed, 33 insertions(+), 24 deletions(-) diff --git a/bun.lockb b/bun.lockb index dcf00f4a53ba761f9f6363a598002edd74d36a91..845289c4a2b8e1127e61943a48ce608f3ecd3811 100755 GIT binary patch delta 25633 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 AL;wH) delta 25599 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 { const logger = getLogger("federation"); try { - const response = await fetch(wellKnownUrl, { - proxy: config.http.proxy.address, - }); + const { raw: response } = await FederationRequester.get( + wellKnownUrl, + { + // @ts-expect-error Bun extension + proxy: config.http.proxy.address, + }, + ); if ( !( @@ -190,9 +198,13 @@ export class Instance extends BaseInterface { const logger = getLogger("federation"); try { - const response = await fetch(wellKnownUrl, { - proxy: config.http.proxy.address, - }); + const { raw: response } = await FederationRequester.get( + wellKnownUrl, + { + // @ts-expect-error Bun extension + proxy: config.http.proxy.address, + }, + ); if (!response.ok) { logger.error`Failed to fetch ActivityPub metadata for instance ${chalk.bold( @@ -223,9 +235,13 @@ export class Instance extends BaseInterface { return null; } - const metadataResponse = await fetch(metadataUrl.href, { - proxy: config.http.proxy.address, - }); + const { raw: metadataResponse } = await FederationRequester.get( + metadataUrl.href, + { + // @ts-expect-error Bun extension + proxy: config.http.proxy.address, + }, + ); if (!metadataResponse.ok) { logger.error`Failed to fetch ActivityPub metadata for instance ${chalk.bold( diff --git a/packages/database-interface/note.ts b/packages/database-interface/note.ts index 2df23cc8..8ea0593a 100644 --- a/packages/database-interface/note.ts +++ b/packages/database-interface/note.ts @@ -6,7 +6,7 @@ import type { Attachment as ApiAttachment, Status as ApiStatus, } from "@lysand-org/client/types"; -import { EntityValidator } from "@lysand-org/federation"; +import { EntityValidator, FederationRequester } from "@lysand-org/federation"; import type { ContentFormat, Note as LysandNote, @@ -591,11 +591,8 @@ export class Note extends BaseInterface { throw new Error(`Invalid URI to parse ${uri}`); } - const response = await fetch(uri, { - method: "GET", - headers: { - Accept: "application/json", - }, + const { raw: response } = await FederationRequester.get(uri, { + // @ts-expect-error Bun extension proxy: config.http.proxy.address, }); diff --git a/packages/database-interface/user.ts b/packages/database-interface/user.ts index edf007fd..ad5d5104 100644 --- a/packages/database-interface/user.ts +++ b/packages/database-interface/user.ts @@ -6,10 +6,7 @@ import type { Account as ApiAccount, Mention as ApiMention, } from "@lysand-org/client/types"; -import { - EntityValidator, - type FederationRequester, -} from "@lysand-org/federation"; +import { EntityValidator, FederationRequester } from "@lysand-org/federation"; import type { Entity, User as LysandUser } from "@lysand-org/federation/types"; import { type InferInsertModel, @@ -343,9 +340,8 @@ export class User extends BaseInterface { uri: string, instance: Instance, ): Promise { - const response = await fetch(uri, { - method: "GET", - headers: { Accept: "application/json" }, + const { raw: response } = await FederationRequester.get(uri, { + // @ts-expect-error Bun extension proxy: config.http.proxy.address, });