Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

perf(api): load the bluesky oauth client only when enabled

Hampus2a14b94dff67
diff --git a/fluxer_api/src/api/bluesky/BlueskyOAuthController.ts b/fluxer_api/src/api/bluesky/BlueskyOAuthController.ts
index d75a1c30d..81198beed 100644
--- a/fluxer_api/src/api/bluesky/BlueskyOAuthController.ts
+++ b/fluxer_api/src/api/bluesky/BlueskyOAuthController.ts
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
-import {BlueskyOAuthStateInvalidError, BlueskyOAuthStoreError} from '@app/api/bluesky/BlueskyOAuthStores';
+import {BlueskyOAuthStateInvalidError, BlueskyOAuthStoreError} from '@app/api/bluesky/BlueskyOAuthErrors';
import type {BlueskyAuthorizeResult} from '@app/api/bluesky/IBlueskyOAuthService';
import {Config} from '@app/api/Config';
import {BlueskyOAuthAuthorizationFailedError} from '@app/api/connection/errors/BlueskyOAuthAuthorizationFailedError';
diff --git a/fluxer_api/src/api/bluesky/BlueskyOAuthErrors.ts b/fluxer_api/src/api/bluesky/BlueskyOAuthErrors.ts
new file mode 100644
index 000000000..0f2cfbc01
--- /dev/null
+++ b/fluxer_api/src/api/bluesky/BlueskyOAuthErrors.ts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+export type BlueskyOAuthStoreKind = 'state' | 'session';
+
+export class BlueskyOAuthStateInvalidError extends Error {
+ constructor() {
+ super('Bluesky OAuth state is invalid');
+ }
+}
+
+export class BlueskyOAuthStoreError extends Error {
+ constructor(
+ readonly kind: BlueskyOAuthStoreKind,
+ message: string,
+ ) {
+ super(message);
+ }
+}
diff --git a/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts b/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
index 1ac54a999..9450903dc 100644
--- a/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
+++ b/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
@@ -4,13 +4,8 @@ import {randomUUID} from 'node:crypto';
import {readFile} from 'node:fs/promises';
import {isAbsolute} from 'node:path';
import type {UserID} from '@app/api/BrandedTypes';
-import {
- BlueskyOAuthStateInvalidError,
- BlueskyOAuthStoreError,
- createSessionStore,
- createStateStore,
- validateBlueskyGrantOwner,
-} from '@app/api/bluesky/BlueskyOAuthStores';
+import {BlueskyOAuthStateInvalidError, BlueskyOAuthStoreError} from '@app/api/bluesky/BlueskyOAuthErrors';
+import {createSessionStore, createStateStore, validateBlueskyGrantOwner} from '@app/api/bluesky/BlueskyOAuthStores';
import type {
BlueskyAuthorizeResult,
BlueskyCallbackResult,
diff --git a/fluxer_api/src/api/bluesky/BlueskyOAuthStores.ts b/fluxer_api/src/api/bluesky/BlueskyOAuthStores.ts
index ed0a551ad..38c01e56f 100644
--- a/fluxer_api/src/api/bluesky/BlueskyOAuthStores.ts
+++ b/fluxer_api/src/api/bluesky/BlueskyOAuthStores.ts
@@ -1,6 +1,11 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {createUserID} from '@app/api/BrandedTypes';
+import {
+ BlueskyOAuthStateInvalidError,
+ BlueskyOAuthStoreError,
+ type BlueskyOAuthStoreKind,
+} from '@app/api/bluesky/BlueskyOAuthErrors';
import type {BlueskyOAuthGrantOwner} from '@app/api/bluesky/IBlueskyOAuthService';
import type {ConnectionCredentialRepository} from '@app/api/connection/ConnectionCredentialRepository';
import {
@@ -60,23 +65,6 @@ const SavedSessionSchema: z.ZodType<NodeSavedSession> = z.strictObject({
}),
});
-type BlueskyOAuthStoreKind = 'state' | 'session';
-
-export class BlueskyOAuthStateInvalidError extends Error {
- constructor() {
- super('Bluesky OAuth state is invalid');
- }
-}
-
-export class BlueskyOAuthStoreError extends Error {
- constructor(
- readonly kind: BlueskyOAuthStoreKind,
- message: string,
- ) {
- super(message);
- }
-}
-
function parseBlueskyGrantOwner(state: string | null | undefined): BlueskyOAuthGrantOwner {
if (typeof state !== 'string' || state.length > 128) throw new BlueskyOAuthStateInvalidError();
let value: unknown;
diff --git a/fluxer_api/src/api/connection/ConnectionCredentialRepository.ts b/fluxer_api/src/api/connection/ConnectionCredentialRepository.ts
index fe88cb179..e5cf78a5d 100644
--- a/fluxer_api/src/api/connection/ConnectionCredentialRepository.ts
+++ b/fluxer_api/src/api/connection/ConnectionCredentialRepository.ts
@@ -13,9 +13,21 @@ import {executeConditional, fetchMany} from '@app/api/database/CassandraQueryExe
import {type ConditionalWriteEntry, Db, validateTtlSeconds} from '@app/api/database/CassandraTypes';
import {USER_CONNECTION_CREDENTIAL_TYPE, type UserConnectionStorageRow} from '@app/api/database/types/ConnectionTypes';
import {UserConnections} from '@app/api/Tables';
-import {isAtprotoDid} from '@atproto/oauth-client-node';
import {z} from 'zod';
+const DID_PLC_PATTERN = /^did:plc:[a-z2-7]{24}$/;
+const DID_WEB_PREFIX = 'did:web:';
+const DID_WEB_PATTERN = /^did:web:(?:[A-Za-z0-9._-]|%[0-9A-F]{2})+$/;
+
+function isAtprotoDid(value: string): boolean {
+ if (DID_PLC_PATTERN.test(value)) return true;
+ if (!DID_WEB_PATTERN.test(value)) return false;
+ if (value.includes('%3A', DID_WEB_PREFIX.length) && !value.startsWith(`${DID_WEB_PREFIX}localhost%3A`)) {
+ return false;
+ }
+ return URL.canParse(`https://${value.slice(DID_WEB_PREFIX.length).replaceAll('%3A', ':')}`);
+}
+
type CredentialWrite = ConditionalWriteEntry<UserConnectionStorageRow, 'user_id' | 'connection_type' | 'connection_id'>;
const CredentialPayload = z.discriminatedUnion('phase', [
diff --git a/fluxer_api/src/api/middleware/ServiceRegistry.ts b/fluxer_api/src/api/middleware/ServiceRegistry.ts
index 2e552685e..599857799 100644
--- a/fluxer_api/src/api/middleware/ServiceRegistry.ts
+++ b/fluxer_api/src/api/middleware/ServiceRegistry.ts
@@ -181,6 +181,7 @@ async function createBlueskyOAuthService(
return null;
}
try {
+ const {BlueskyOAuthService} = await import('@app/api/bluesky/BlueskyOAuthService');
return await BlueskyOAuthService.create(config, getKVClient(), unfurler, Config.endpoints.apiPublic);
} catch (error) {
Logger.error({error}, 'Bluesky OAuth initialization failed; disabling Bluesky OAuth for this configuration.');