client/viewer.tsx

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

common/identity.ts

@@ -1,32 +1,26 @@
 import type { DidDocument } from "@atcute/identity";
-import type { WebDidDocumentResolver } from "@atcute/identity-resolver";
-import type { ATProtoUniverse } from "@char/lexicon.ts/atproto";
-import { XRPC } from "@char/lexicon.ts/rpc";
+import {
+  CompositeDidDocumentResolver,
+  PlcDidDocumentResolver,
+  WebDidDocumentResolver,
+  XrpcHandleResolver,
+} from "@atcute/identity-resolver";
 
-const bskyPublic = new XRPC<ATProtoUniverse>("https://public.api.bsky.app");
+const handleResolver = new XrpcHandleResolver({
+  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 async function resolveDid(did: string): Promise<DidDocument> {
-  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);
+export function resolveDid(did: string): Promise<DidDocument> {
+  return didResolver.resolve(did as `did:${"plc" | "web"}:${string}`);
 }

common/lexicons.ts

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

vendor/lexicon.ts

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