tidy

Author: matthieusieben

lexicons.json

@@ -1,6 +1,7 @@
 {
   "version": 1,
   "lexicons": [
+    "app.bsky.actor.getProfiles",
     "app.bsky.actor.profile",
     "app.bsky.embed.external",
     "app.bsky.embed.images",
@@ -9,13 +10,18 @@
     "app.bsky.feed.getPostThread",
     "app.bsky.feed.getPosts",
     "app.bsky.feed.post",
+    "com.bad-example.identity.resolveMiniDoc",
     "site.standard.document"
   ],
   "resolutions": {
     "app.bsky.actor.defs": {
       "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.defs",
       "cid": "bafyreigwqwhe2jxohagozazfbrf6dxgzphvkg3d3lg7uxdvepsimqyclka"
     },
+    "app.bsky.actor.getProfiles": {
+      "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.getProfiles",
+      "cid": "bafyreihphrndnt2cvnv3nk442f6kohdnpagk4xip74f2jn36uoal25vhta"
+    },
     "app.bsky.actor.profile": {
       "uri": "at://did:plc:4v4y5r3lwsbtmsxhile2ljac/com.atproto.lexicon.schema/app.bsky.actor.profile",
       "cid": "bafyreia6umzg3a6d7mjbow4p57tviey45muohklhgsvjoamcctoiusr4pe"
@@ -104,6 +110,10 @@
       "uri": "at://did:plc:6msi3pj7krzih5qxqtryxlzw/com.atproto.lexicon.schema/com.atproto.repo.strongRef",
       "cid": "bafyreifrkdbnkvfjujntdaeigolnrjj3srrs53tfixjhmacclps72qlov4"
     },
+    "com.bad-example.identity.resolveMiniDoc": {
+      "uri": "at://did:plc:hdhoaan3xa3jiuq4fg4mefid/com.atproto.lexicon.schema/com.bad-example.identity.resolveMiniDoc",
+      "cid": "bafyreihqq4ud3ihj63op2ety24nziyyh7axibm65mnde5bdeai2z6adety"
+    },
     "site.standard.document": {
       "uri": "at://did:plc:re3ebnp5v7ffagz6rb6xfei4/com.atproto.lexicon.schema/site.standard.document",
       "cid": "bafyreigdukg62hmel4jbdvghdsoaphslhrdktmahzdyokomuka6yejetwa"

lexicons/app/bsky/actor/getProfiles.json

@@ -0,0 +1,41 @@
+{
+  "id": "app.bsky.actor.getProfiles",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": ["profiles"],
+          "properties": {
+            "profiles": {
+              "type": "array",
+              "items": {
+                "ref": "app.bsky.actor.defs#profileViewDetailed",
+                "type": "ref"
+              }
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": ["actors"],
+        "properties": {
+          "actors": {
+            "type": "array",
+            "items": {
+              "type": "string",
+              "format": "at-identifier"
+            },
+            "maxLength": 25
+          }
+        }
+      },
+      "description": "Get detailed profile views of multiple actors."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}

lexicons/com/bad-example/identity/resolveMiniDoc.json

@@ -0,0 +1,50 @@
+{
+  "id": "com.bad-example.identity.resolveMiniDoc",
+  "defs": {
+    "main": {
+      "type": "query",
+      "output": {
+        "schema": {
+          "type": "object",
+          "required": ["did", "handle", "pds", "signing_key"],
+          "properties": {
+            "did": {
+              "type": "string",
+              "format": "did",
+              "description": "DID, bi-directionally verified if a handle was provided in the query."
+            },
+            "pds": {
+              "type": "string",
+              "format": "uri",
+              "description": "The identity's PDS URL"
+            },
+            "handle": {
+              "type": "string",
+              "format": "handle",
+              "description": "The validated handle of the account or `handle.invalid` if the handle\ndid not bi-directionally match the DID document."
+            },
+            "signing_key": {
+              "type": "string",
+              "description": "The atproto signing key publicKeyMultibase\n\nLegacy key encoding not supported. the key is returned directly; `id`,\n`type`, and `controller` are omitted."
+            }
+          }
+        },
+        "encoding": "application/json"
+      },
+      "parameters": {
+        "type": "params",
+        "required": ["identifier"],
+        "properties": {
+          "identifier": {
+            "type": "string",
+            "format": "at-identifier",
+            "description": "Handle or DID to resolve"
+          }
+        }
+      },
+      "description": "Like [com.atproto.identity.resolveIdentity](https://docs.bsky.app/docs/api/com-atproto-identity-resolve-identity) but instead of the full `didDoc` it returns an atproto-relevant subset."
+    }
+  },
+  "$type": "com.atproto.lexicon.schema",
+  "lexicon": 1
+}

server/api/atproto/author-profiles.get.ts

@@ -1,16 +1,9 @@
 import * as v from 'valibot'
 import { CACHE_MAX_AGE_ONE_DAY, BLUESKY_API } from '#shared/utils/constants'
 import { AuthorSchema } from '#shared/schemas/blog'
+import { Client } from '@atproto/lex'
 import type { Author, ResolvedAuthor } from '#shared/schemas/blog'
-
-type ProfilesResponse = {
-  profiles: Array<{
-    did: string
-    handle: string
-    displayName?: string
-    avatar?: string
-  }>
-}
+import * as app from '#shared/types/lexicons/app'
 
 export default defineCachedEventHandler(
   async event => {
@@ -45,17 +38,18 @@ export default defineCachedEventHandler(
       return { authors: [] }
     }
 
-    const handles = authors.filter(a => a.blueskyHandle).map(a => a.blueskyHandle as string)
+    const handles = authors.map(a => a.blueskyHandle).filter(v => v != null)
 
     if (handles.length === 0) {
       return {
         authors: authors.map(author => Object.assign(author, { avatar: null, profileUrl: null })),
       }
     }
 
-    const response = await $fetch<ProfilesResponse>(`${BLUESKY_API}app.bsky.actor.getProfiles`, {
-      query: { actors: handles },
-    }).catch(() => ({ profiles: [] }))
+    const client = new Client({ service: BLUESKY_API })
+    const response = await client
+      .call(app.bsky.actor.getProfiles, { actors: handles })
+      .catch(() => ({ profiles: [] }))
 
     const avatarMap = new Map<string, string>()
     for (const profile of response.profiles) {

server/api/atproto/bluesky-comments.get.ts

@@ -2,7 +2,11 @@ import type { $Typed, AtUriString, Unknown$TypedObject } from '@atproto/lex'
 import { Client, isAtUriString } from '@atproto/lex'
 import type { Comment, CommentEmbed } from '#shared/types/blog-post'
 import * as app from '#shared/types/lexicons/app'
-import { CACHE_MAX_AGE_ONE_MINUTE, BLUESKY_API, AT_URI_REGEX } from '#shared/utils/constants'
+import {
+  CACHE_MAX_AGE_ONE_MINUTE,
+  BLUESKY_API,
+  BSKY_POST_AT_URI_REGEX,
+} from '#shared/utils/constants'
 
 const blueskyClient = new Client({ service: BLUESKY_API })
 
@@ -78,9 +82,9 @@ export default defineCachedEventHandler(
 
 // Helper to convert AT URI to web URL
 function atUriToWebUrl(uri: AtUriString): string | null {
-  const match = uri.match(AT_URI_REGEX)
+  const match = uri.match(BSKY_POST_AT_URI_REGEX)
   if (!match) return null
-  const [, did, rkey] = match
+  const [, did, rkey] = match as [string, `did:plc:${string}`, string]
   return `https://bsky.app/profile/${did}/post/${rkey}`
 }
 

server/api/auth/atproto.get.ts

@@ -4,9 +4,9 @@ import { getOAuthLock } from '#server/utils/atproto/lock'
 import { useOAuthStorage } from '#server/utils/atproto/storage'
 import { SLINGSHOT_HOST } from '#shared/utils/constants'
 import { useServerSession } from '#server/utils/server-session'
-import type { PublicUserSession } from '#shared/schemas/publicUserSession'
 import { handleResolver } from '#server/utils/atproto/oauth'
 import { Client } from '@atproto/lex'
+import * as com from '#shared/types/lexicons/com'
 import * as app from '#shared/types/lexicons/app'
 import { isAtIdentifierString } from '@atproto/lex'
 // @ts-expect-error virtual file from oauth module
@@ -30,7 +30,7 @@ async function getAvatar(did: string, pds: string) {
   try {
     const pdsUrl = new URL(pds)
     // Only fetch from HTTPS PDS endpoints to prevent SSRF
-    if (did && pdsUrl.protocol === 'https:') {
+    if (pdsUrl.protocol === 'https:') {
       const client = new Client(pdsUrl)
       const profileResponse = await client.get(app.bsky.actor.profile, {
         repo: did,
@@ -136,12 +136,13 @@ export default defineEventHandler(async event => {
     new URLSearchParams(query as Record<string, string>),
   )
 
-  const response = await fetch(
-    `https://${SLINGSHOT_HOST}/xrpc/com.bad-example.identity.resolveMiniDoc?identifier=${encodeURIComponent(authSession.did)}`,
-    { headers: { 'User-Agent': 'npmx' } },
-  )
-  if (response.ok) {
-    const miniDoc: PublicUserSession = await response.json()
+  const client = new Client({ service: SLINGSHOT_HOST })
+  const response = await client.xrpcSafe(com['bad-example'].identity.resolveMiniDoc, {
+    headers: { 'User-Agent': 'npmx' },
+    params: { identifier: authSession.did },
+  })
+  if (response.success) {
+    const miniDoc = response.body
 
     let avatar: string | undefined = await getAvatar(authSession.did, miniDoc.pds)
 

shared/schemas/blog.ts

@@ -1,9 +1,15 @@
-import { object, string, optional, array, boolean, pipe, isoDate } from 'valibot'
+import { isAtIdentifierString, type AtIdentifierString } from '@atproto/lex'
+import { custom, object, string, optional, array, boolean, pipe, isoDate } from 'valibot'
 import type { InferOutput } from 'valibot'
 
 export const AuthorSchema = object({
   name: string(),
-  blueskyHandle: optional(string()),
+  blueskyHandle: optional(
+    pipe(
+      string(),
+      custom<AtIdentifierString>(v => typeof v === 'string' && isAtIdentifierString(v)),
+    ),
+  ),
 })
 
 export const BlogPostSchema = object({

shared/utils/constants.ts

@@ -9,7 +9,7 @@ export const CACHE_MAX_AGE_ONE_YEAR = 60 * 60 * 24 * 365
 
 // API Strings
 export const NPMX_SITE = 'https://npmx.dev'
-export const BLUESKY_API = 'https://public.api.bsky.app/xrpc/'
+export const BLUESKY_API = 'https://public.api.bsky.app'
 export const BLUESKY_COMMENTS_REQUEST = '/api/atproto/bluesky-comments'
 export const NPM_REGISTRY = 'https://registry.npmjs.org'
 export const NPM_API = 'https://api.npmjs.org'
@@ -74,4 +74,5 @@ export const BACKGROUND_THEMES = {
 } as const
 
 // Regex
-export const AT_URI_REGEX = /^at:\/\/(did:plc:[a-z0-9]+)\/app\.bsky\.feed\.post\/([a-z0-9]+)$/
+export const BSKY_POST_AT_URI_REGEX =
+  /^at:\/\/(did:plc:[a-z0-9]+)\/app\.bsky\.feed\.post\/([a-z0-9]+)$/