Compare commits

...

2 commits

Author SHA1 Message Date
deb0e7302c bundle shedding: drop atcute/identity-resolver hard dep
we still dynamically import the web did doc resolver if we need to
resolve a did:web: but since it's an async import it should get
codesplit on the client side
2025-06-07 11:41:17 +01:00
dbf653e7cd brevity 2025-06-07 11:34:01 +01:00
4 changed files with 36 additions and 46 deletions

View file

@ -21,7 +21,7 @@ const fetchVideoRecord = async (
const xrpc = new XRPC<ATProtoUniverse>(pds); const xrpc = new XRPC<ATProtoUniverse>(pds);
const record = await xrpc.get("com.atproto.repo.getRecord", { const record = await xrpc.get("com.atproto.repo.getRecord", {
parameters: { params: {
collection: "blue.cerulea.video.video", collection: "blue.cerulea.video.video",
repo: did, repo: did,
rkey, rkey,
@ -33,13 +33,13 @@ const fetchVideoRecord = async (
}; };
const resolveVideoURL = async ( const resolveVideoURL = async (
did: `did:${string}`, repo: `did:${string}`,
blob: string blob: string
): Promise<string> => { ): Promise<string> => {
const xrpc = new XRPC<VideoLexiconUniverse>(globalThis.location.href);
try { try {
const xrpc = new XRPC<VideoLexiconUniverse>(globalThis.location.href);
const res = await xrpc.call("blue.cerulea.video.fetchVideo", { const res = await xrpc.call("blue.cerulea.video.fetchVideo", {
input: { repo: did, blob }, input: { repo, blob },
}); });
return `/user-content/${res.filename}`; return `/user-content/${res.filename}`;
} catch { } catch {

View file

@ -1,26 +1,32 @@
import type { DidDocument } from "@atcute/identity"; import type { DidDocument } from "@atcute/identity";
import { import type { WebDidDocumentResolver } from "@atcute/identity-resolver";
CompositeDidDocumentResolver, import type { ATProtoUniverse } from "@char/lexicon.ts/atproto";
PlcDidDocumentResolver, import { XRPC } from "@char/lexicon.ts/rpc";
WebDidDocumentResolver,
XrpcHandleResolver,
} from "@atcute/identity-resolver";
const handleResolver = new XrpcHandleResolver({ const bskyPublic = new XRPC<ATProtoUniverse>("https://public.api.bsky.app");
serviceUrl: "https://public.api.bsky.app",
export async function resolveHandle(handle: string): Promise<`did:${string}`> {
const { did } = await bskyPublic.get("com.atproto.identity.resolveHandle", {
params: { handle },
}); });
return did;
const didResolver = new CompositeDidDocumentResolver({
methods: {
plc: new PlcDidDocumentResolver(),
web: new WebDidDocumentResolver(),
},
});
export function resolveHandle(handle: string): Promise<`did:${string}`> {
return handleResolver.resolve(handle as `${string}.${string}`);
} }
export function resolveDid(did: string): Promise<DidDocument> { export async function resolveDid(did: string): Promise<DidDocument> {
return didResolver.resolve(did as `did:${"plc" | "web"}:${string}`); if (did.startsWith("did:plc:")) {
const doc = await fetch("https://plc.directory/" + did).then((r) =>
r.json()
);
return doc;
} else if (did.startsWith("did:web:")) {
// TODO: write our own did:web resolver (maybe use a CORS proxy on clientside)
const resolver: WebDidDocumentResolver = await import(
"@atcute/identity-resolver"
)
.then((m) => m.WebDidDocumentResolver)
.then((r) => new r());
return resolver.resolve(did as `did:web:${string}`);
}
throw new Error("unsupported did type: " + did);
} }

View file

@ -16,14 +16,8 @@ export const videoLexicon = {
accept: ["video/mp4", "video/webm"], accept: ["video/mp4", "video/webm"],
maxSize: 536870912, maxSize: 536870912,
}, },
title: { title: { type: "string", maxGraphemes: 300, maxLength: 3000 },
type: "string", description: { type: "string" },
maxGraphemes: 300,
maxLength: 3000,
},
description: {
type: "string",
},
}, },
}, },
}, },
@ -42,14 +36,8 @@ export const fetchVideoLexicon = {
type: "object", type: "object",
required: ["repo", "blob"], required: ["repo", "blob"],
properties: { properties: {
repo: { repo: { type: "string", format: "did" },
type: "string", blob: { type: "string", format: "cid" },
format: "did",
},
blob: {
type: "string",
format: "cid",
},
}, },
}, },
}, },
@ -58,11 +46,7 @@ export const fetchVideoLexicon = {
schema: { schema: {
type: "object", type: "object",
required: ["filename"], required: ["filename"],
properties: { properties: { filename: { type: "string" } },
filename: {
type: "string",
},
},
}, },
}, },
errors: [{ name: "Denied" }], errors: [{ name: "Denied" }],

2
vendor/lexicon.ts vendored

@ -1 +1 @@
Subproject commit 1edb68e5eac3ddfabdd77674ed8193ef9af05649 Subproject commit 4b3c48591c21d976ab94d0ae6cf2160a2115471c