From fcb9092f8a2667fb5a7bcda727c5d8fa3e7c52d7 Mon Sep 17 00:00:00 2001 From: FoxxMD Date: Thu, 4 Jun 2026 15:14:45 +0000 Subject: [PATCH] refactor: Rename bluesky to atproto, classes --- .../common/vendor/atproto/ATProtoAppApiClient.ts | 4 ++-- .../common/vendor/atproto/ATProtoOauthApiClient.ts | 4 ++-- .../vendor/atproto/AbstractATProtoApiClient.ts | 2 +- src/backend/common/vendor/teal/TealApiClient.ts | 12 ++++++------ src/backend/scrobblers/TealfmScrobbler.ts | 12 ++++++------ src/backend/server/auth.ts | 8 ++++---- src/backend/sources/TealfmSource.ts | 10 +++++----- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts b/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts index 6f33c9d0..fdec3781 100644 --- a/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts +++ b/src/backend/common/vendor/atproto/ATProtoAppApiClient.ts @@ -1,7 +1,7 @@ import { AbstractApiOptions } from "../../infrastructure/Atomic.js"; import { TealClientData } from "../../infrastructure/config/client/tealfm.js"; import { Agent, CredentialSession, AtpSessionEvent, AtpSessionData } from "@atproto/api"; -import { AbstractBlueSkyApiClient } from "./AbstractATProtoApiClient.js"; +import { AbstractATProtoApiClient } from "./AbstractATProtoApiClient.js"; import { isPortReachableConnect, normalizeWebAddress } from "../../../utils/NetworkUtils.js"; import { URLData } from "../../../../core/Atomic.js"; import { isNodeNetworkException } from "../../errors/NodeErrors.js"; @@ -21,7 +21,7 @@ interface HandleData { pds: string } -export class BlueSkyAppApiClient extends AbstractBlueSkyApiClient { +export class ATProtoAppApiClient extends AbstractATProtoApiClient { declare config: TealClientData & {did?: AtprotoDid}; appSession?: CredentialSession; diff --git a/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts b/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts index 6245e409..ff675858 100644 --- a/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts +++ b/src/backend/common/vendor/atproto/ATProtoOauthApiClient.ts @@ -8,10 +8,10 @@ import { OAuthSession, } from "@atproto/oauth-client-node"; import { Agent } from "@atproto/api"; -import { AbstractBlueSkyApiClient } from "./AbstractATProtoApiClient.js"; +import { AbstractATProtoApiClient } from "./AbstractATProtoApiClient.js"; -export class BlueSkyOauthApiClient extends AbstractBlueSkyApiClient { +export class ATProtoOauthApiClient extends AbstractATProtoApiClient { declare config: TealClientData; diff --git a/src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts b/src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts index e0e83771..1f6c3ffc 100644 --- a/src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts +++ b/src/backend/common/vendor/atproto/AbstractATProtoApiClient.ts @@ -7,7 +7,7 @@ import { MSCache } from "../../Cache.js"; import { UpstreamError } from "../../errors/UpstreamError.js"; import { streamBodyProgress } from "../../../utils/NetworkUtils.js"; -export abstract class AbstractBlueSkyApiClient extends AbstractApiClient { +export abstract class AbstractATProtoApiClient extends AbstractApiClient { agent!: Agent; diff --git a/src/backend/common/vendor/teal/TealApiClient.ts b/src/backend/common/vendor/teal/TealApiClient.ts index af223396..e39b08df 100644 --- a/src/backend/common/vendor/teal/TealApiClient.ts +++ b/src/backend/common/vendor/teal/TealApiClient.ts @@ -7,9 +7,9 @@ import { MSCache } from "../../Cache.js"; import { AbstractApiOptions, PagelessListensTimeRangeOptions, PagelessTimeRangeListens, PagelessTimeRangeListensResult } from "../../infrastructure/Atomic.js"; import { ListRecord, RecordOptions, TealClientData } from "../../infrastructure/config/client/tealfm.js"; import AbstractApiClient from "../AbstractApiClient.js"; -import { AbstractBlueSkyApiClient } from "../atproto/AbstractATProtoApiClient.js"; -import { BlueSkyAppApiClient } from "../atproto/ATProtoAppApiClient.js"; -import { BlueSkyOauthApiClient } from "../atproto/ATProtoOauthApiClient.js"; +import { AbstractATProtoApiClient } from "../atproto/AbstractATProtoApiClient.js"; +import { ATProtoAppApiClient } from "../atproto/ATProtoAppApiClient.js"; +import { ATProtoOauthApiClient } from "../atproto/ATProtoOauthApiClient.js"; import { Duration } from "dayjs/plugin/duration.js"; import { FmTealAlphaActorStatus, FmTealAlphaFeedPlay } from "./lexicons/index.js"; import { ScrobbleSubmitError } from "../../errors/MSErrors.js"; @@ -23,7 +23,7 @@ export class TealApiClient extends AbstractApiClient implements PagelessTimeRang declare config: TealClientData; - declare client: AbstractBlueSkyApiClient; + declare client: AbstractATProtoApiClient; cache: MSCache; @@ -31,9 +31,9 @@ export class TealApiClient extends AbstractApiClient implements PagelessTimeRang super('teal', name, config, options); if(config.appPassword !== undefined) { - this.client = new BlueSkyAppApiClient(name, config, {...options, logger: this.logger}); + this.client = new ATProtoAppApiClient(name, config, {...options, logger: this.logger}); } else if(config.baseUri !== undefined) { - this.client = new BlueSkyOauthApiClient(name, config, {...options, logger: this.logger}); + this.client = new ATProtoOauthApiClient(name, config, {...options, logger: this.logger}); } else { throw new Error(`Must define either 'baseUri' or 'appPassword' in configuration!`); } diff --git a/src/backend/scrobblers/TealfmScrobbler.ts b/src/backend/scrobblers/TealfmScrobbler.ts index 97aaea32..18b78c8b 100644 --- a/src/backend/scrobblers/TealfmScrobbler.ts +++ b/src/backend/scrobblers/TealfmScrobbler.ts @@ -14,9 +14,9 @@ import { Notifiers } from "../notifier/Notifiers.js"; import { nowPlayingUpdateByPlayDuration, shouldClearNPStatus } from "./AbstractScrobbleClient.js"; import { TealClientConfig } from "../common/infrastructure/config/client/tealfm.js"; -import { BlueSkyAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js"; -import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; -import { AbstractBlueSkyApiClient } from "../common/vendor/atproto/AbstractATProtoApiClient.js"; +import { ATProtoAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js"; +import { ATProtoOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; +import { AbstractATProtoApiClient } from "../common/vendor/atproto/AbstractATProtoApiClient.js"; import { playToRecord, TealApiClient } from "../common/vendor/teal/TealApiClient.js"; import { playToStatusRecord } from "../common/vendor/teal/TealApiClient.js"; import { nowPlayingExpirationDuration } from "../common/vendor/teal/TealApiClient.js"; @@ -82,7 +82,7 @@ export default class TealScrobbler extends AbstractHistoricalScrobbleClient { } protected async doCheckConnection(): Promise { - if (this.client.client instanceof BlueSkyAppApiClient) { + if (this.client.client instanceof ATProtoAppApiClient) { try { return await this.client.client.checkPds(); } catch (e) { @@ -94,7 +94,7 @@ export default class TealScrobbler extends AbstractHistoricalScrobbleClient { } async getAuthorizeUrl(): Promise { - return await (this.client.client as BlueSkyOauthApiClient).createAuthorizeUrl(this.config.data.identifier); + return await (this.client.client as ATProtoOauthApiClient).createAuthorizeUrl(this.config.data.identifier); } doAuthentication = async () => { @@ -104,7 +104,7 @@ export default class TealScrobbler extends AbstractHistoricalScrobbleClient { if(sessionRes) { return true; } - if(this.client.client instanceof BlueSkyAppApiClient) { + if(this.client.client instanceof ATProtoAppApiClient) { const res = await this.client.client.appLogin(); return res; } diff --git a/src/backend/server/auth.ts b/src/backend/server/auth.ts index d68ee971..643e3e83 100644 --- a/src/backend/server/auth.ts +++ b/src/backend/server/auth.ts @@ -12,7 +12,7 @@ import { sortAndDeduplicateDiagnostics } from "typescript"; import { source } from "common-tags"; import TealScrobbler from "../scrobblers/TealfmScrobbler.js"; import { parseRegexSingle } from "@foxxmd/regex-buddy-core"; -import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; +import { ATProtoOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; import LibrefmScrobbler from "../scrobblers/LibrefmScrobbler.js"; import LibrefmSource from "../sources/LibrefmSource.js"; import e from "express"; @@ -195,16 +195,16 @@ export const setupAuthRoutes = (app: Express, logger: Logger, sourceMiddle: Expr handle } = {} } = req; - const url = await (validClient.client.client as BlueSkyOauthApiClient).createAuthorizeUrl(handle as string); + const url = await (validClient.client.client as ATProtoOauthApiClient).createAuthorizeUrl(handle as string); res.redirect(url) } if(intents[1].includes('client-metadata.json')) { - return res.json((validClient.client.client as BlueSkyOauthApiClient).getMetadata()); + return res.json((validClient.client.client as ATProtoOauthApiClient).getMetadata()); } if(intents[1].includes('oauth/callback')) { - const result = await (validClient.client.client as BlueSkyOauthApiClient).handleCallback(new URLSearchParams(req.query as Record)); + const result = await (validClient.client.client as ATProtoOauthApiClient).handleCallback(new URLSearchParams(req.query as Record)); if(result) { return res.status(200); } diff --git a/src/backend/sources/TealfmSource.ts b/src/backend/sources/TealfmSource.ts index 58ae0c0c..ae96e70b 100644 --- a/src/backend/sources/TealfmSource.ts +++ b/src/backend/sources/TealfmSource.ts @@ -4,12 +4,12 @@ import { isNodeNetworkException } from "../common/errors/NodeErrors.js"; import { FormatPlayObjectOptions, InternalConfig } from "../common/infrastructure/Atomic.js"; import { RecentlyPlayedOptions } from "./AbstractSource.js"; import MemorySource from "./MemorySource.js"; -import { AbstractBlueSkyApiClient } from "../common/vendor/atproto/AbstractATProtoApiClient.js"; +import { AbstractATProtoApiClient } from "../common/vendor/atproto/AbstractATProtoApiClient.js"; import { listRecordToPlay, TealApiClient } from "../common/vendor/teal/TealApiClient.js"; import { recordToPlay } from "../common/vendor/teal/TealApiClient.js"; import { TealSourceConfig } from "../common/infrastructure/config/source/tealfm.js"; -import { BlueSkyAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js"; -import { BlueSkyOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; +import { ATProtoAppApiClient } from "../common/vendor/atproto/ATProtoAppApiClient.js"; +import { ATProtoOauthApiClient } from "../common/vendor/atproto/ATProtoOauthApiClient.js"; import { parseArrayFromMaybeString } from "../utils/StringUtils.js"; export default class TealfmSource extends MemorySource { @@ -70,7 +70,7 @@ export default class TealfmSource extends MemorySource { } protected async doCheckConnection(): Promise { - if (this.client instanceof BlueSkyAppApiClient) { + if (this.client instanceof ATProtoAppApiClient) { try { return await this.client.checkPds(); } catch (e) { @@ -87,7 +87,7 @@ export default class TealfmSource extends MemorySource { if(sessionRes) { return true; } - if(this.client.client instanceof BlueSkyAppApiClient) { + if(this.client.client instanceof ATProtoAppApiClient) { return await this.client.client.appLogin(); } } catch (e) { -- 2.51.2