@atproto/bsky 0.0.201 → 0.0.203

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.201",
+  "version": "0.0.203",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -52,9 +52,9 @@
     "undici": "^6.19.8",
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "0.2.0",
-    "@atproto-labs/xrpc-utils": "0.0.24",
-    "@atproto/api": "^0.18.6",
     "@atproto/common": "^0.5.3",
+    "@atproto-labs/xrpc-utils": "0.0.24",
+    "@atproto/api": "^0.18.8",
     "@atproto/crypto": "^0.4.5",
     "@atproto/did": "^0.2.3",
     "@atproto/identity": "^0.4.10",
@@ -62,7 +62,7 @@
     "@atproto/repo": "^0.8.12",
     "@atproto/syntax": "^0.4.2",
     "@atproto/sync": "^0.1.39",
-    "@atproto/xrpc-server": "^0.10.3"
+    "@atproto/xrpc-server": "^0.10.4"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -78,10 +78,10 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
+    "@atproto/api": "^0.18.8",
     "@atproto/lex-cli": "^0.9.8",
-    "@atproto/api": "^0.18.6",
-    "@atproto/pds": "^0.4.199",
-    "@atproto/xrpc": "^0.7.7"
+    "@atproto/xrpc": "^0.7.7",
+    "@atproto/pds": "^0.4.199"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/*",

package/proto/bsky.proto

@@ -1310,6 +1310,33 @@ message GetFollowsFollowingResponse {
   repeated FollowsFollowing results = 1;
 }
 
+message GetSitemapIndexRequest {
+  SitemapPageType type = 1;
+}
+
+message GetSitemapIndexResponse {
+  // GZIP compressed XML sitemap
+  bytes sitemap = 1;
+}
+
+// Sitemap HTTP paths are typically of the form `/type/yyyy-mm-dd/N.xml.gz`, i.e. `/users/2025-01-01/1.xml.gz`
+message GetSitemapPageRequest {
+  SitemapPageType type = 1;
+  google.protobuf.Timestamp date = 2;
+  // One-indexed
+  int32 bucket = 3;
+}
+
+enum SitemapPageType {
+  SITEMAP_PAGE_TYPE_UNSPECIFIED = 0;
+  SITEMAP_PAGE_TYPE_USER = 1;
+}
+
+message GetSitemapPageResponse {
+  // GZIP compressed XML sitemap
+  bytes sitemap = 1;
+}
+
 // Ping
 message PingRequest {}
 message PingResponse {}
@@ -1470,6 +1497,10 @@ service Service {
   // Graph
   rpc GetFollowsFollowing(GetFollowsFollowingRequest) returns (GetFollowsFollowingResponse);
 
+  // Sitemaps
+  rpc GetSitemapIndex(GetSitemapIndexRequest) returns (GetSitemapIndexResponse);
+  rpc GetSitemapPage(GetSitemapPageRequest) returns (GetSitemapPageResponse);
+
   // Ping
   rpc Ping(PingRequest) returns (PingResponse);
 

package/src/api/age-assurance/const.ts

@@ -138,5 +138,25 @@ export const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
         },
       ],
     },
+    {
+      countryCode: 'US',
+      regionCode: 'TN',
+      rules: [
+        {
+          $type: ids.IfAssuredOverAge,
+          age: 18,
+          access: 'full',
+        },
+        {
+          $type: ids.IfDeclaredOverAge,
+          age: 18,
+          access: 'full',
+        },
+        {
+          $type: ids.Default,
+          access: 'none',
+        },
+      ],
+    },
   ],
 }

package/src/api/app/bsky/ageassurance/begin.ts

@@ -37,14 +37,14 @@ export default function (server: Server, ctx: AppContext) {
 
       const actorDid = auth.credentials.iss
       const actorInfo = await getAgeVerificationState(ctx, actorDid)
+      const existingStatus = actorInfo?.ageAssuranceStatus?.status
+      const existingAccess = actorInfo?.ageAssuranceStatus?.access
 
-      if (actorInfo?.ageAssuranceStatus) {
-        if (actorInfo.ageAssuranceStatus.status === 'blocked') {
-          throw new InvalidRequestError(
-            `Cannot initiate age assurance flow from current state: ${actorInfo.ageAssuranceStatus.status}`,
-            'InvalidInitiation',
-          )
-        }
+      if (existingStatus === 'blocked') {
+        throw new InvalidRequestError(
+          `Cannot initiate age assurance flow from current state: ${existingStatus}`,
+          'InvalidInitiation',
+        )
       }
 
       const attemptId = crypto.randomUUID()
@@ -107,14 +107,24 @@ export default function (server: Server, ctx: AppContext) {
         })
       }
 
+      // If we have existing status/access for this region, retain it.
+      const nextStatus =
+        existingStatus && existingStatus !== 'unknown'
+          ? existingStatus
+          : 'pending'
+      const nextAccess =
+        existingAccess && existingAccess !== 'unknown'
+          ? existingAccess
+          : 'unknown'
+
       const event = await createEvent(ctx, actorDid, {
         attemptId,
         email,
         // Assumes `app.set('trust proxy', ...)` configured with `true` or specific values.
         initIp: req.ip,
         initUa: getClientUa(req),
-        status: 'pending',
-        access: 'unknown',
+        status: nextStatus,
+        access: nextAccess,
         countryCode,
         regionCode,
       })
@@ -123,8 +133,8 @@ export default function (server: Server, ctx: AppContext) {
         encoding: 'application/json',
         body: {
           lastInitiatedAt: event.createdAt,
-          status: 'pending',
-          access: 'unknown',
+          status: nextStatus,
+          access: nextAccess,
         },
       }
     },

package/src/api/app/bsky/contact/dismissMatch.ts

@@ -1,6 +1,6 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.contact.dismissMatch({
@@ -9,11 +9,12 @@ export default function (server: Server, ctx: AppContext) {
       assertRolodexOrThrowUnimplemented(ctx)
 
       const actor = auth.credentials.iss
-      // TODO: Error handling.
-      await ctx.rolodexClient.dismissMatch({
-        actor,
-        subject: input.body.subject,
-      })
+      await callRolodexClient(
+        ctx.rolodexClient.dismissMatch({
+          actor,
+          subject: input.body.subject,
+        }),
+      )
 
       return {
         encoding: 'application/json',

package/src/api/app/bsky/contact/getMatches.ts

@@ -14,7 +14,7 @@ import {
 } from '../../../../pipeline'
 import { RolodexClient } from '../../../../rolodex'
 import { Views } from '../../../../views'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   const getMatches = createPipeline(skeleton, hydration, noBlocks, presentation)
@@ -48,12 +48,13 @@ const skeleton = async (
 ): Promise<SkeletonState> => {
   const { params, ctx } = input
   const actor = params.hydrateCtx.viewer
-  // TODO: Error handling.
-  const { cursor, subjects } = await ctx.rolodexClient.getMatches({
-    actor: params.hydrateCtx.viewer,
-    limit: params.limit,
-    cursor: params.cursor,
-  })
+  const { cursor, subjects } = await callRolodexClient(
+    ctx.rolodexClient.getMatches({
+      actor: params.hydrateCtx.viewer,
+      limit: params.limit,
+      cursor: params.cursor,
+    }),
+  )
   return {
     actor,
     subjects,

package/src/api/app/bsky/contact/getSyncStatus.ts

@@ -1,7 +1,7 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { SyncStatus } from '../../../../lexicon/types/app/bsky/contact/defs'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.contact.getSyncStatus({
@@ -10,10 +10,11 @@ export default function (server: Server, ctx: AppContext) {
       assertRolodexOrThrowUnimplemented(ctx)
 
       const actor = auth.credentials.iss
-      // TODO: Error handling.
-      const res = await ctx.rolodexClient.getSyncStatus({
-        actor,
-      })
+      const res = await callRolodexClient(
+        ctx.rolodexClient.getSyncStatus({
+          actor,
+        }),
+      )
 
       let syncStatus: SyncStatus | undefined
       if (res.status && res.status.syncedAt) {

package/src/api/app/bsky/contact/importContacts.ts

@@ -17,7 +17,7 @@ import {
 import { ImportContactsMatch } from '../../../../proto/rolodex_pb'
 import { RolodexClient } from '../../../../rolodex'
 import { Views } from '../../../../views'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   const importContacts = createPipeline(
@@ -56,12 +56,13 @@ const skeleton = async (
 ): Promise<SkeletonState> => {
   const { params, ctx } = input
   const actor = params.hydrateCtx.viewer
-  // TODO: Error handling.
-  const { matches } = await ctx.rolodexClient.importContacts({
-    actor: params.hydrateCtx.viewer,
-    contacts: params.contacts,
-    token: params.token,
-  })
+  const { matches } = await callRolodexClient(
+    ctx.rolodexClient.importContacts({
+      actor: params.hydrateCtx.viewer,
+      contacts: params.contacts,
+      token: params.token,
+    }),
+  )
   return {
     actor,
     matches,

package/src/api/app/bsky/contact/removeData.ts

@@ -1,6 +1,6 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.contact.removeData({
@@ -9,10 +9,11 @@ export default function (server: Server, ctx: AppContext) {
       assertRolodexOrThrowUnimplemented(ctx)
 
       const actor = auth.credentials.iss
-      // TODO: Error handling.
-      await ctx.rolodexClient.removeData({
-        actor,
-      })
+      await callRolodexClient(
+        ctx.rolodexClient.removeData({
+          actor,
+        }),
+      )
 
       return {
         encoding: 'application/json',

package/src/api/app/bsky/contact/sendNotification.ts

@@ -1,6 +1,7 @@
 import { TID } from '@atproto/common'
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
+import { Notification } from '../../../../lexicon/types/app/bsky/contact/defs'
 import { Namespaces } from '../../../../stash'
 import { assertRolodexOrThrowUnimplemented } from './util'
 
@@ -19,7 +20,7 @@ export default function (server: Server, ctx: AppContext) {
         payload: {
           from,
           to,
-        },
+        } satisfies Notification,
         key: TID.nextStr(),
       })
 

package/src/api/app/bsky/contact/startPhoneVerification.ts

@@ -1,6 +1,6 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.contact.startPhoneVerification({
@@ -9,11 +9,12 @@ export default function (server: Server, ctx: AppContext) {
       assertRolodexOrThrowUnimplemented(ctx)
 
       const actor = auth.credentials.iss
-      // TODO: Error handling.
-      await ctx.rolodexClient.startPhoneVerification({
-        actor,
-        phone: input.body.phone,
-      })
+      await callRolodexClient(
+        ctx.rolodexClient.startPhoneVerification({
+          actor,
+          phone: input.body.phone,
+        }),
+      )
 
       return {
         encoding: 'application/json',

package/src/api/app/bsky/contact/util.ts

@@ -1,4 +1,9 @@
-import { MethodNotImplementedError } from '@atproto/xrpc-server'
+import { ConnectError } from '@connectrpc/connect'
+import {
+  InternalServerError,
+  InvalidRequestError,
+  MethodNotImplementedError,
+} from '@atproto/xrpc-server'
 import { AppContext } from '../../../..'
 import { RolodexClient } from '../../../../rolodex'
 
@@ -11,3 +16,77 @@ export function assertRolodexOrThrowUnimplemented(
     )
   }
 }
+
+/**
+ * Converts UPPERCASE_ERROR from Rolodex to PascalCase for XRPC.
+ */
+function convertErrorName(reason: string): string {
+  switch (reason) {
+    case 'INVALID_DID':
+      return 'InvalidDid'
+    case 'INVALID_LIMIT':
+      return 'InvalidLimit'
+    case 'INVALID_CURSOR':
+      return 'InvalidCursor'
+    case 'INVALID_CONTACTS':
+      return 'InvalidContacts'
+    case 'TOO_MANY_CONTACTS':
+      return 'TooManyContacts'
+    case 'INVALID_TOKEN':
+      return 'InvalidToken'
+    case 'RATE_LIMIT_EXCEEDED':
+      return 'RateLimitExceeded'
+    case 'INVALID_PHONE':
+      return 'InvalidPhone'
+    case 'INVALID_CODE':
+      return 'InvalidCode'
+    case 'INTERNAL_ERROR':
+      return 'InternalError'
+    default:
+      return reason
+  }
+}
+
+/**
+ * Helper to call Rolodex client methods and translate RPC errors to XRPC
+ * errors.
+ *
+ * These `reason` values need to stay in sync with the Rolodex service
+ */
+export async function callRolodexClient<T>(caller: T) {
+  try {
+    return await caller
+  } catch (e) {
+    // might be something we want to handle
+    if (e instanceof ConnectError) {
+      /**
+       * https://connectrpc.com/docs/protocol#error-end-stream
+       */
+      const details = e.details?.at(0) as
+        | {
+            debug: {
+              reason: string
+              message: string
+            }
+          }
+        | undefined
+      const reason = details?.debug?.reason // e.g. INVALID_DID
+      // Handle known error reasons
+      if (reason) {
+        const errorName = convertErrorName(reason)
+        // NOTE: Don't leak e.message to the response.
+
+        if (reason === 'INTERNAL_ERROR') {
+          throw new InternalServerError('Upstream error', errorName, {
+            cause: e,
+          })
+        } else {
+          throw new InvalidRequestError('An error occurred', errorName, {
+            cause: e,
+          })
+        }
+      }
+    }
+    throw e
+  }
+}

package/src/api/app/bsky/contact/verifyPhone.ts

@@ -1,6 +1,6 @@
 import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertRolodexOrThrowUnimplemented } from './util'
+import { assertRolodexOrThrowUnimplemented, callRolodexClient } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.contact.verifyPhone({
@@ -9,12 +9,13 @@ export default function (server: Server, ctx: AppContext) {
       assertRolodexOrThrowUnimplemented(ctx)
 
       const actor = auth.credentials.iss
-      // TODO: Error handling.
-      const res = await ctx.rolodexClient.verifyPhone({
-        actor,
-        verificationCode: input.body.code,
-        phone: input.body.phone,
-      })
+      const res = await callRolodexClient(
+        ctx.rolodexClient.verifyPhone({
+          actor,
+          verificationCode: input.body.code,
+          phone: input.body.phone,
+        }),
+      )
 
       return {
         encoding: 'application/json',

package/src/api/index.ts

@@ -16,6 +16,7 @@ import getMatches from './app/bsky/contact/getMatches'
 import getSyncStatus from './app/bsky/contact/getSyncStatus'
 import importContacts from './app/bsky/contact/importContacts'
 import removeData from './app/bsky/contact/removeData'
+import sendNotification from './app/bsky/contact/sendNotification'
 import startPhoneVerification from './app/bsky/contact/startPhoneVerification'
 import verifyPhone from './app/bsky/contact/verifyPhone'
 import getActorFeeds from './app/bsky/feed/getActorFeeds'
@@ -95,6 +96,8 @@ export * as blobResolver from './blob-resolver'
 
 export * as external from './external'
 
+export * as sitemap from './sitemap'
+
 export default function (server: Server, ctx: AppContext) {
   // app.bsky
   getTimeline(server, ctx)
@@ -106,6 +109,7 @@ export default function (server: Server, ctx: AppContext) {
   getSyncStatus(server, ctx)
   importContacts(server, ctx)
   removeData(server, ctx)
+  sendNotification(server, ctx)
   startPhoneVerification(server, ctx)
   verifyPhone(server, ctx)
   getActorFeeds(server, ctx)

package/src/api/sitemap.ts

@@ -0,0 +1,76 @@
+import { Readable } from 'node:stream'
+import { Timestamp } from '@bufbuild/protobuf'
+import { Code, ConnectError } from '@connectrpc/connect'
+import express, { RequestHandler, Router } from 'express'
+import { AppContext } from '../context'
+import { httpLogger as log } from '../logger'
+import { SitemapPageType } from '../proto/bsky_pb'
+
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
+  router.get('/external/sitemap/users.xml.gz', userIndexHandler(ctx))
+  router.get(
+    '/external/sitemap/users/:date/:bucket.xml.gz',
+    userPageHandler(ctx),
+  )
+  return router
+}
+
+const userIndexHandler =
+  (ctx: AppContext): RequestHandler =>
+  async (_req: express.Request, res: express.Response) => {
+    try {
+      const result = await ctx.dataplane.getSitemapIndex({
+        type: SitemapPageType.USER,
+      })
+      res.set('Content-Type', 'application/gzip')
+      res.set('Content-Encoding', 'gzip')
+      Readable.from(Buffer.from(result.sitemap)).pipe(res)
+    } catch (err) {
+      log.error({ err }, 'failed to get sitemap index')
+      return res.status(500).send('Internal Server Error')
+    }
+  }
+
+const userPageHandler =
+  (ctx: AppContext): RequestHandler =>
+  async (req: express.Request, res: express.Response) => {
+    const { date, bucket } = req.params
+
+    // Parse date (YYYY-MM-DD format)
+    const dateParts = date.split('-')
+    if (dateParts.length !== 3) {
+      return res.status(400).send('Invalid date format. Expected YYYY-MM-DD')
+    }
+
+    const year = parseInt(dateParts[0], 10)
+    const month = parseInt(dateParts[1], 10)
+    const day = parseInt(dateParts[2], 10)
+
+    if (isNaN(year) || isNaN(month) || isNaN(day)) {
+      return res.status(400).send('Invalid date format. Expected YYYY-MM-DD')
+    }
+
+    // Parse bucket (1-indexed)
+    const bucketNum = parseInt(bucket, 10)
+    if (isNaN(bucketNum) || bucketNum < 1) {
+      return res.status(400).send('Invalid bucket number')
+    }
+
+    try {
+      const result = await ctx.dataplane.getSitemapPage({
+        type: SitemapPageType.USER,
+        date: Timestamp.fromDate(new Date(year, month - 1, day)),
+        bucket: bucketNum,
+      })
+      res.set('Content-Type', 'application/gzip')
+      res.set('Content-Encoding', 'gzip')
+      Readable.from(Buffer.from(result.sitemap)).pipe(res)
+    } catch (err) {
+      if (err instanceof ConnectError && err.code === Code.NotFound) {
+        return res.status(404).send('Sitemap page not found')
+      }
+      log.error({ err }, 'failed to get sitemap page')
+      return res.status(500).send('Internal Server Error')
+    }
+  }

package/src/data-plane/server/routes/index.ts

@@ -22,6 +22,7 @@ import records from './records'
 import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
+import sitemap from './sitemap'
 import starterPacks from './starter-packs'
 import suggestions from './suggestions'
 import sync from './sync'
@@ -50,6 +51,7 @@ export default (db: Database, idResolver: IdResolver) =>
       ...relationships(db),
       ...reposts(db),
       ...search(db),
+      ...sitemap(),
       ...suggestions(db),
       ...sync(db),
       ...threads(db),

package/src/data-plane/server/routes/profile.ts

@@ -136,12 +136,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
 
         const status = row?.ageAssuranceStatus ?? 'unknown'
         let access = row?.ageAssuranceAccess
-        if (status === 'assured') {
-          access = 'full'
-        } else if (status === 'blocked') {
-          access = 'none'
-        } else {
-          access = 'unknown'
+        if (!access || access === 'unknown') {
+          if (status === 'assured') {
+            access = 'full'
+          } else if (status === 'blocked') {
+            access = 'none'
+          } else {
+            access = 'unknown'
+          }
         }
 
         return {

package/src/data-plane/server/routes/sitemap.ts

@@ -0,0 +1,43 @@
+import { gzipSync } from 'node:zlib'
+import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { Service } from '../../../proto/bsky_connect'
+import { GetSitemapPageRequest } from '../../../proto/bsky_pb'
+
+const MOCK_SITEMAP_INDEX = `<?xml version="1.0" encoding="UTF-8"?>
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <sitemap>
+    <loc>https://bsky.app/sitemap/users/2025-01-01/1.xml.gz</loc>
+  </sitemap>
+</sitemapindex>`
+
+const MOCK_SITEMAP_PAGE = `<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  <url>
+    <loc>https://bsky.app/profile/test.bsky.social</loc>
+  </url>
+</urlset>`
+
+export default (): Partial<ServiceImpl<typeof Service>> => ({
+  async getSitemapIndex() {
+    return {
+      sitemap: gzipSync(Buffer.from(MOCK_SITEMAP_INDEX)),
+    }
+  },
+  async getSitemapPage(req: GetSitemapPageRequest) {
+    const date = req.date?.toDate()
+    const isExpectedDate =
+      date &&
+      date.getFullYear() === 2025 &&
+      date.getMonth() === 0 &&
+      date.getDate() === 1
+    const isExpectedBucket = req.bucket === 1
+
+    if (!isExpectedDate || !isExpectedBucket) {
+      throw new ConnectError('Sitemap page not found', Code.NotFound)
+    }
+
+    return {
+      sitemap: gzipSync(Buffer.from(MOCK_SITEMAP_PAGE)),
+    }
+  },
+})

package/src/hydration/actor.ts

@@ -273,7 +273,7 @@ export class ActorHydrator {
     includeTakedowns = false,
   ): Promise<NotificationDeclarations> {
     if (!uris.length) return new HydrationMap<NotificationDeclaration>()
-    const res = await this.dataplane.getActorChatDeclarationRecords({ uris })
+    const res = await this.dataplane.getNotificationDeclarationRecords({ uris })
     return uris.reduce((acc, uri, i) => {
       const record = parseRecord<NotificationDeclarationRecord>(
         res.records[i],