refactor: remove bluesky-client from monorepo

Author: mary-ext

README.md

@@ -2,7 +2,6 @@
 
 This monorepository contains the following projects:
 
-- `bluesky-client`: lightweight TypeScript API client for Bluesky
 - [Skeetdeck](https://skeetdeck.pages.dev): Alternative web client for Bluesky with a deck interface
   ![](https://github.com/mary-ext/langit/assets/148872143/9eb9b568-397c-4c60-835c-c5101c192a47)
 

app/api/atp-schema.ts

@@ -1 +1 @@
-export type * from '@externdefs/bluesky-client/atp-schema';
+export type * from '@externdefs/bluesky-client/lexicons';

app/api/classes/multiagent.ts

@@ -1,18 +1,19 @@
-import { batch, createEffect, createRoot, onCleanup } from 'solid-js';
+import { batch, createEffect, createRoot } from 'solid-js';
 
 import {
 	type AtpAccessJwt,
-	type AtpLoginOptions,
 	type AtpSessionData,
-	Agent,
-} from '@externdefs/bluesky-client/agent';
-import { decodeJwt } from '@externdefs/bluesky-client/jwt';
+	type AuthLoginOptions,
+	BskyAuth,
+	BskyXRPC,
+} from '@externdefs/bluesky-client';
+import { decodeJwt } from '@externdefs/bluesky-client/utils/jwt';
 
 import type { At } from '../atp-schema';
 
 import { createReactiveLocalStorage } from '~/utils/storage';
 
-export interface MultiagentLoginOptions extends AtpLoginOptions {
+export interface MultiagentLoginOptions extends AuthLoginOptions {
 	service: string;
 }
 
@@ -37,8 +38,13 @@ interface MultiagentStorage {
 	accounts: MultiagentAccountData[];
 }
 
-interface AgentInstance {
-	agent: Promise<Agent>;
+export interface AgentInstance {
+	rpc: BskyXRPC;
+	auth: BskyAuth;
+}
+
+interface StoredAgent {
+	instance: Promise<AgentInstance>;
 	cleanup: () => void;
 }
 
@@ -52,7 +58,7 @@ export class MultiagentError extends Error {
 export class Multiagent {
 	store: MultiagentStorage;
 
-	#agents: Record<At.DID, AgentInstance> = {};
+	#agents: Record<At.DID, StoredAgent> = {};
 
 	constructor(name: string) {
 		const store = createReactiveLocalStorage<MultiagentStorage>(name, (version, prev) => {
@@ -110,12 +116,12 @@ export class Multiagent {
 	 * Login with a new account
 	 */
 	async login({ service, identifier, password }: MultiagentLoginOptions): Promise<At.DID> {
-		const { agent, cleanup } = this.#createAgent(service);
+		const { auth, rpc, cleanup } = this.#createAgent(service);
 
 		try {
-			await agent.login({ identifier, password });
+			await auth.login({ identifier, password });
 
-			const session = agent.session!;
+			const session = auth.session!;
 			const did = session.did;
 
 			const sessionJwt = decodeJwt(session.accessJwt) as AtpAccessJwt;
@@ -140,7 +146,7 @@ export class Multiagent {
 			});
 
 			this.#agents[did]?.cleanup();
-			this.#agents[did] = { agent: Promise.resolve(agent), cleanup: cleanup };
+			this.#agents[did] = { instance: Promise.resolve({ auth, rpc }), cleanup: cleanup };
 			return did;
 		} catch (err) {
 			throw new MultiagentError(`LOGIN_FAILURE`, { cause: err });
@@ -168,9 +174,9 @@ export class Multiagent {
 	/**
 	 * Retrieve an agent associated with an account
 	 */
-	connect(did: At.DID): Promise<Agent> {
+	connect(did: At.DID): Promise<AgentInstance> {
 		if (did in this.#agents) {
-			return this.#agents[did].agent;
+			return this.#agents[did].instance;
 		}
 
 		const $accounts = this.store.accounts;
@@ -180,12 +186,12 @@ export class Multiagent {
 			return Promise.reject(new MultiagentError(`INVALID_ACCOUNT`));
 		}
 
-		const { agent, cleanup } = this.#createAgent(data.service);
+		const { rpc, auth, cleanup } = this.#createAgent(data.service);
 
-		const promise = new Promise<Agent>((resolve, reject) => {
-			agent.resumeSession(data.session).then(
+		const promise = new Promise<AgentInstance>((resolve, reject) => {
+			auth.resume(data.session).then(
 				() => {
-					resolve(agent);
+					resolve({ auth, rpc });
 				},
 				(err) => {
 					cleanup();
@@ -196,34 +202,35 @@ export class Multiagent {
 			);
 		});
 
-		this.#agents[did] = { agent: promise, cleanup: cleanup };
+		this.#agents[did] = { instance: promise, cleanup: cleanup };
 		return promise;
 	}
 
 	#createAgent(serviceUri: string) {
-		const $accounts = this.store.accounts!;
-		const agent = new Agent({ serviceUri: serviceUri });
+		let ignore = false;
 
-		return {
-			agent: agent,
-			cleanup: createRoot((dispose) => {
-				let ignore = false;
+		const $accounts = this.store.accounts!;
 
-				onCleanup(
-					agent.on('sessionUpdate', (session) => {
-						const did = session!.did;
-						const existing = $accounts.find((acc) => acc.did === did);
+		const rpc = new BskyXRPC({ service: serviceUri });
+		const auth = new BskyAuth(rpc, {
+			onRefresh(session) {
+				const did = session!.did;
+				const existing = $accounts.find((acc) => acc.did === did);
 
-						if (existing) {
-							ignore = true;
-							batch(() => Object.assign(existing.session, session));
-							ignore = false;
-						}
-					}),
-				);
+				if (existing) {
+					ignore = true;
+					batch(() => Object.assign(existing.session, session));
+					ignore = false;
+				}
+			},
+		});
 
+		return {
+			rpc: rpc,
+			auth: auth,
+			cleanup: createRoot((dispose) => {
 				createEffect(() => {
-					const actual = agent.session;
+					const actual = auth.session;
 
 					const did = actual?.did;
 					const existing = $accounts.find((acc) => did && acc.did === did);

app/api/did.ts

@@ -1,4 +1,4 @@
-import { type DidDocument, Agent } from '@externdefs/bluesky-client/agent';
+import { type DidDocument, BskyXRPC} from '@externdefs/bluesky-client'
 
 import type { At } from './atp-schema';
 import { APPVIEW_URL } from './globals/defaults';
@@ -16,8 +16,8 @@ export const getDidInfo = async (identifier: string): Promise<DidDocument> => {
 	if (isDid(identifier)) {
 		did = identifier;
 	} else {
-		const agent = new Agent({ serviceUri: APPVIEW_URL });
-		const response = await agent.rpc.get('com.atproto.identity.resolveHandle', {
+		const rpc = new BskyXRPC({ service: APPVIEW_URL });
+		const response = await rpc.get('com.atproto.identity.resolveHandle', {
 			params: {
 				handle: identifier,
 			},

app/api/queries/_did.ts

@@ -1,14 +1,14 @@
-import type { Agent } from '@externdefs/bluesky-client/agent';
+import type { BskyXRPC } from '@externdefs/bluesky-client';
 
 import type { At } from '../atp-schema';
 import { isDid } from '../utils/misc';
 
-const _getDid = async (agent: Agent, actor: string, signal?: AbortSignal) => {
+const _getDid = async (rpc: BskyXRPC, actor: string, signal?: AbortSignal) => {
 	let did: At.DID;
 	if (isDid(actor)) {
 		did = actor;
 	} else {
-		const response = await agent.rpc.get('com.atproto.identity.resolveHandle', {
+		const response = await rpc.get('com.atproto.identity.resolveHandle', {
 			signal: signal,
 			params: { handle: actor },
 		});

app/api/queries/get-post-thread.ts

@@ -21,7 +21,7 @@ export const getPostThread = async (ctx: QC<ReturnType<typeof getPostThreadKey>>
 	const [, uid, actor, rkey, depth, height] = ctx.queryKey;
 
 	const agent = await multiagent.connect(uid);
-	const did = await _getDid(agent, actor);
+	const did = await _getDid(agent.rpc, actor);
 
 	const uri = `at://${did}/app.bsky.feed.post/${rkey}`;
 	const response = await agent.rpc.get('app.bsky.feed.getPostThread', {

app/api/queries/get-timeline.ts

@@ -1,4 +1,5 @@
-import { Agent } from '@externdefs/bluesky-client/agent';
+import { BskyXRPC } from '@externdefs/bluesky-client';
+
 import type { QueryFunctionContext as QC } from '@pkg/solid-query';
 
 import { assert, mapDefined } from '~/utils/misc';
@@ -32,6 +33,7 @@ import type { FilterPreferences, LanguagePreferences } from '../types';
 
 import _getDid from './_did';
 import { fetchPost } from './get-post';
+import type { AgentInstance } from '../classes/multiagent';
 
 const PALOMAR_SERVICE = 'https://palomar.bsky.social';
 
@@ -186,7 +188,7 @@ export const getTimeline = wrapInfiniteQuery(
 			postFilter = createLabelPostFilter(timelineOpts?.moderation);
 
 			if (params.tab === 'posts') {
-				const did = await _getDid(agent, params.actor);
+				const did = await _getDid(agent.rpc, params.actor);
 				sliceFilter = createProfileSliceFilter(did);
 				postFilter = combine([createInvalidReplyFilter(), createLabelPostFilter(timelineOpts?.moderation)]);
 			} else if (params.tab === 'likes' || params.tab === 'media') {
@@ -243,9 +245,9 @@ export const getTimelineLatest = async (ctx: QC<ReturnType<typeof getTimelineLat
 
 	// Short-circuit search timeline so that we don't go through the hydration
 	if (params.type === 'search') {
-		const agent = new Agent({ serviceUri: PALOMAR_SERVICE });
+		const rpc = new BskyXRPC({ service: PALOMAR_SERVICE });
 
-		const response = await agent.rpc.get('app.bsky.unspecced.searchPostsSkeleton', {
+		const response = await rpc.get('app.bsky.unspecced.searchPostsSkeleton', {
 			signal: ctx.signal,
 			params: {
 				q: params.query,
@@ -268,7 +270,7 @@ export const getTimelineLatest = async (ctx: QC<ReturnType<typeof getTimelineLat
 
 //// Raw fetch
 const fetchPage = async (
-	agent: Agent,
+	{ auth, rpc }: AgentInstance,
 	params: TimelineParams,
 	limit: number,
 	cursor: string | undefined,
@@ -286,7 +288,7 @@ const fetchPage = async (
 	}
 
 	if (type === 'home') {
-		const response = await agent.rpc.get('app.bsky.feed.getTimeline', {
+		const response = await rpc.get('app.bsky.feed.getTimeline', {
 			signal: signal,
 			headers: headers,
 			params: {
@@ -298,7 +300,7 @@ const fetchPage = async (
 
 		return response.data;
 	} else if (type === 'feed') {
-		const response = await agent.rpc.get('app.bsky.feed.getFeed', {
+		const response = await rpc.get('app.bsky.feed.getFeed', {
 			signal: signal,
 			headers: headers,
 			params: {
@@ -310,7 +312,7 @@ const fetchPage = async (
 
 		return response.data;
 	} else if (type === 'list') {
-		const response = await agent.rpc.get('app.bsky.feed.getListFeed', {
+		const response = await rpc.get('app.bsky.feed.getListFeed', {
 			signal: signal,
 			headers: headers,
 			params: {
@@ -323,7 +325,7 @@ const fetchPage = async (
 		return response.data;
 	} else if (type === 'profile') {
 		if (params.tab === 'likes') {
-			const response = await agent.rpc.get('app.bsky.feed.getActorLikes', {
+			const response = await rpc.get('app.bsky.feed.getActorLikes', {
 				signal: signal,
 				headers: headers,
 				params: {
@@ -335,7 +337,7 @@ const fetchPage = async (
 
 			return response.data;
 		} else {
-			const response = await agent.rpc.get('app.bsky.feed.getAuthorFeed', {
+			const response = await rpc.get('app.bsky.feed.getAuthorFeed', {
 				signal: signal,
 				headers: headers,
 				params: {
@@ -354,9 +356,9 @@ const fetchPage = async (
 			return response.data;
 		}
 	} else if (type === 'search') {
-		const palomar = new Agent({ serviceUri: PALOMAR_SERVICE });
+		const palomar = new BskyXRPC({ service: PALOMAR_SERVICE });
 
-		const skeleton = await palomar.rpc.get('app.bsky.unspecced.searchPostsSkeleton', {
+		const skeleton = await palomar.get('app.bsky.unspecced.searchPostsSkeleton', {
 			signal: signal,
 			headers: headers,
 			params: {
@@ -369,7 +371,7 @@ const fetchPage = async (
 		const data = skeleton.data;
 		const skeletons = data.posts;
 
-		const uid = agent.session!.did;
+		const uid = auth.session!.did;
 		const results = await Promise.allSettled(skeletons.map((post) => fetchPost([uid, post.uri])));
 
 		signal?.throwIfAborted();

app/api/richtext/composer.ts

@@ -1,4 +1,4 @@
-import { XRPCError } from '@externdefs/bluesky-client/xrpc-utils';
+import { XRPCError } from '@externdefs/bluesky-client/xrpc';
 
 import type { At } from '../atp-schema';
 import { multiagent } from '../globals/agent';
@@ -459,7 +459,7 @@ export const finalizeRt = async (uid: At.DID, rt: PreliminaryRichText) => {
 					features: [{ $type: 'app.bsky.richtext.facet#mention', did: did }],
 				});
 			} catch (err) {
-				if (err instanceof XRPCError && err.error === 'InvalidRequest') {
+				if (err instanceof XRPCError && err.kind === 'InvalidRequest') {
 					throw new InvalidHandleError(handle);
 				}
 

app/api/utils/misc.ts

@@ -1,4 +1,4 @@
-import { XRPCError } from '@externdefs/bluesky-client/xrpc-utils';
+import { XRPCError } from '@externdefs/bluesky-client/xrpc';
 
 import type { At } from '../atp-schema';
 import { MultiagentError } from '../classes/multiagent';
@@ -53,7 +53,7 @@ export const followAbortSignal = (signals: (AbortSignal | undefined)[]) => {
 };
 
 export const formatXRPCError = (err: XRPCError): string => {
-	const name = err.error;
+	const name = err.kind;
 	return (name ? name + ': ' : '') + err.message;
 };
 
@@ -72,7 +72,7 @@ export const formatQueryError = (err: unknown): string => {
 	}
 
 	if (err instanceof XRPCError) {
-		const error = err.error;
+		const error = err.kind;
 
 		if (error === 'InvalidToken' || error === 'ExpiredToken') {
 			return `Account session is no longer valid, please sign in again`;

app/desktop/components/panes/dialogs/ProfileSettingsPaneDialog.tsx

@@ -1,6 +1,6 @@
 import { createMemo, createSignal as signal } from 'solid-js';
 
-import { XRPCError } from '@externdefs/bluesky-client/xrpc-utils';
+import { XRPCError } from '@externdefs/bluesky-client/xrpc';
 import { createMutation, useQueryClient } from '@pkg/solid-query';
 
 import TextareaAutosize from 'solid-textarea-autosize';
@@ -96,7 +96,7 @@ const ProfileSettingsPaneDialog = (props: ProfileSettingsPaneDialogProps) => {
 			} catch (err) {
 				// If it's anything else than an InvalidRequest (not found), throw an error
 
-				if (!(err instanceof XRPCError) || err.error !== 'InvalidRequest') {
+				if (!(err instanceof XRPCError) || err.kind !== 'InvalidRequest') {
 					throw err;
 				}
 			}