@atproto/bsky 0.0.138 → 0.0.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.138",
+  "version": "0.0.139",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -50,7 +50,7 @@
     "undici": "^6.19.8",
     "@atproto-labs/fetch-node": "0.1.8",
     "@atproto-labs/xrpc-utils": "0.0.11",
-    "@atproto/api": "^0.14.21",
+    "@atproto/api": "^0.14.22",
     "@atproto/common": "^0.4.10",
     "@atproto/crypto": "^0.4.4",
     "@atproto/did": "^0.1.5",
@@ -74,9 +74,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.14.21",
+    "@atproto/api": "^0.14.22",
     "@atproto/lex-cli": "^0.7.2",
-    "@atproto/pds": "^0.4.122",
+    "@atproto/pds": "^0.4.123",
     "@atproto/xrpc": "^0.6.12"
   },
   "scripts": {

package/proto/bsky.proto

@@ -381,6 +381,7 @@ message GetActorRepostsResponse {
 //     - should this include handles?  apply repo takedown?
 message GetActorsRequest {
   repeated string dids = 1;
+  repeated string skip_cache_for_dids = 2;
 }
 
 message ActorInfo {

package/src/api/app/bsky/feed/getAuthorFeed.ts

@@ -70,10 +70,10 @@ export const skeleton = async (inputs: {
   if (!did) {
     throw new InvalidRequestError('Profile not found')
   }
-  const actors = await ctx.hydrator.actor.getActors(
-    [did],
-    params.hydrateCtx.includeTakedowns,
-  )
+  const actors = await ctx.hydrator.actor.getActors([did], {
+    includeTakedowns: params.hydrateCtx.includeTakedowns,
+    skipCacheForDids: params.hydrateCtx.skipCacheForViewer,
+  })
   const actor = actors.get(did)
   if (!actor) {
     throw new InvalidRequestError('Profile not found')

package/src/api/app/bsky/notification/getUnreadCount.ts

@@ -76,6 +76,8 @@ type SkeletonState = {
 }
 
 const getPriority = async (ctx: Context, did: string) => {
-  const actors = await ctx.hydrator.actor.getActors([did])
+  const actors = await ctx.hydrator.actor.getActors([did], {
+    skipCacheForDids: [did],
+  })
   return !!actors.get(did)?.priorityNotifications
 }

package/src/api/app/bsky/notification/listNotifications.ts

@@ -246,6 +246,8 @@ type SkeletonState = {
 }
 
 const getPriority = async (ctx: Context, did: string) => {
-  const actors = await ctx.hydrator.actor.getActors([did])
+  const actors = await ctx.hydrator.actor.getActors([did], {
+    skipCacheForDids: [did],
+  })
   return !!actors.get(did)?.priorityNotifications
 }

package/src/api/com/atproto/admin/getAccountInfos.ts

@@ -10,7 +10,10 @@ export default function (server: Server, ctx: AppContext) {
       const { dids } = params
       const { includeTakedowns } = ctx.authVerifier.parseCreds(auth)
 
-      const actors = await ctx.hydrator.actor.getActors(dids, true)
+      const actors = await ctx.hydrator.actor.getActors(dids, {
+        includeTakedowns: true,
+        skipCacheForDids: dids,
+      })
 
       const infos = mapDefined(dids, (did) => {
         const info = actors.get(did)

package/src/api/com/atproto/admin/getSubjectStatus.ts

@@ -47,7 +47,12 @@ export default function (server: Server, ctx: AppContext) {
           }
         }
       } else if (did) {
-        const res = (await ctx.hydrator.actor.getActors([did], true)).get(did)
+        const res = (
+          await ctx.hydrator.actor.getActors([did], {
+            includeTakedowns: true,
+            skipCacheForDids: [did],
+          })
+        ).get(did)
         if (res) {
           body = {
             subject: {

package/src/api/com/atproto/repo/getRecord.ts

@@ -14,7 +14,9 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError(`Could not find repo: ${repo}`)
       }
 
-      const actors = await ctx.hydrator.actor.getActors([did], includeTakedowns)
+      const actors = await ctx.hydrator.actor.getActors([did], {
+        includeTakedowns,
+      })
       if (!actors.get(did)) {
         throw new InvalidRequestError(`Could not find repo: ${repo}`)
       }

package/src/hydration/actor.ts

@@ -100,9 +100,16 @@ export class ActorHydrator {
     return res.filter((did) => did !== undefined)
   }
 
-  async getActors(dids: string[], includeTakedowns = false): Promise<Actors> {
+  async getActors(
+    dids: string[],
+    opts: {
+      includeTakedowns?: boolean
+      skipCacheForDids?: string[]
+    } = {},
+  ): Promise<Actors> {
+    const { includeTakedowns = false, skipCacheForDids } = opts
     if (!dids.length) return new HydrationMap<Actor>()
-    const res = await this.dataplane.getActors({ dids })
+    const res = await this.dataplane.getActors({ dids, skipCacheForDids })
     return dids.reduce((acc, did, i) => {
       const actor = res.actors[i]
       const isNoHosted =

package/src/hydration/hydrator.ts

@@ -71,6 +71,11 @@ export class HydrateCtx {
   includeActorTakedowns = this.vals.includeActorTakedowns
   include3pBlocks = this.vals.include3pBlocks
   constructor(private vals: HydrateCtxVals) {}
+  // Convenience with use with dataplane.getActors cache control
+  get skipCacheForViewer() {
+    if (!this.viewer) return
+    return [this.viewer]
+  }
   copy<V extends Partial<HydrateCtxVals>>(vals?: V): HydrateCtx & V {
     return new HydrateCtx({ ...this.vals, ...vals }) as HydrateCtx & V
   }
@@ -191,7 +196,10 @@ export class Hydrator {
   ): Promise<HydrationState> {
     const includeTakedowns = ctx.includeTakedowns || ctx.includeActorTakedowns
     const [actors, labels, profileViewersState] = await Promise.all([
-      this.actor.getActors(dids, includeTakedowns),
+      this.actor.getActors(dids, {
+        includeTakedowns,
+        skipCacheForDids: ctx.skipCacheForViewer,
+      }),
       this.label.getLabelsForSubjects(labelSubjectsForDid(dids), ctx.labelers),
       this.hydrateProfileViewers(dids, ctx),
     ])
@@ -304,7 +312,10 @@ export class Hydrator {
         [...uris, ...includeAuthorDids],
         ctx.labelers,
       ),
-      this.actor.getActors(includeAuthorDids, ctx.includeTakedowns),
+      this.actor.getActors(includeAuthorDids, {
+        includeTakedowns: ctx.includeTakedowns,
+        skipCacheForDids: ctx.skipCacheForViewer,
+      }),
     ])
 
     if (!ctx.includeTakedowns) {
@@ -949,10 +960,7 @@ export class Hydrator {
       }
     }
 
-    const activeListAuthors = await this.actor.getActors(
-      [...listAuthorDids],
-      false,
-    )
+    const activeListAuthors = await this.actor.getActors([...listAuthorDids])
 
     for (const [source, targets] of didMap) {
       const didBlocks = new HydrationMap<boolean>()
@@ -1075,9 +1083,9 @@ export class Hydrator {
       )
     } else if (collection === ids.AppBskyActorProfile) {
       const did = parsed.hostname
-      const actor = (await this.actor.getActors([did], includeTakedowns)).get(
-        did,
-      )
+      const actor = (
+        await this.actor.getActors([did], { includeTakedowns })
+      ).get(did)
       if (!actor?.profile || !actor?.profileCid) return undefined
       const recordInfo: RecordInfo<ProfileRecord> = {
         record: actor.profile,
@@ -1097,10 +1105,9 @@ export class Hydrator {
     const nonServiceLabelers = labelers.filter(
       (did) => !this.serviceLabelers.has(did),
     )
-    const labelerActors = await this.actor.getActors(
-      nonServiceLabelers,
-      vals.includeTakedowns,
-    )
+    const labelerActors = await this.actor.getActors(nonServiceLabelers, {
+      includeTakedowns: vals.includeTakedowns,
+    })
     const availableDids = labelers.filter(
       (did) => this.serviceLabelers.has(did) || !!labelerActors.get(did),
     )

package/src/lexicon/index.ts

@@ -75,11 +75,13 @@ import * as ComAtprotoSyncGetBlob from './types/com/atproto/sync/getBlob.js'
 import * as ComAtprotoSyncGetBlocks from './types/com/atproto/sync/getBlocks.js'
 import * as ComAtprotoSyncGetCheckout from './types/com/atproto/sync/getCheckout.js'
 import * as ComAtprotoSyncGetHead from './types/com/atproto/sync/getHead.js'
+import * as ComAtprotoSyncGetHostStatus from './types/com/atproto/sync/getHostStatus.js'
 import * as ComAtprotoSyncGetLatestCommit from './types/com/atproto/sync/getLatestCommit.js'
 import * as ComAtprotoSyncGetRecord from './types/com/atproto/sync/getRecord.js'
 import * as ComAtprotoSyncGetRepo from './types/com/atproto/sync/getRepo.js'
 import * as ComAtprotoSyncGetRepoStatus from './types/com/atproto/sync/getRepoStatus.js'
 import * as ComAtprotoSyncListBlobs from './types/com/atproto/sync/listBlobs.js'
+import * as ComAtprotoSyncListHosts from './types/com/atproto/sync/listHosts.js'
 import * as ComAtprotoSyncListRepos from './types/com/atproto/sync/listRepos.js'
 import * as ComAtprotoSyncListReposByCollection from './types/com/atproto/sync/listReposByCollection.js'
 import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOfUpdate.js'
@@ -1061,6 +1063,17 @@ export class ComAtprotoSyncNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getHostStatus<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoSyncGetHostStatus.Handler<ExtractAuth<AV>>,
+      ComAtprotoSyncGetHostStatus.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.sync.getHostStatus' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getLatestCommit<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -1116,6 +1129,17 @@ export class ComAtprotoSyncNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  listHosts<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      ComAtprotoSyncListHosts.Handler<ExtractAuth<AV>>,
+      ComAtprotoSyncListHosts.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'com.atproto.sync.listHosts' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   listRepos<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,

package/src/lexicon/lexicons.ts

@@ -3365,6 +3365,16 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncDefs: {
+    lexicon: 1,
+    id: 'com.atproto.sync.defs',
+    defs: {
+      hostStatus: {
+        type: 'string',
+        knownValues: ['active', 'idle', 'offline', 'throttled', 'banned'],
+      },
+    },
+  },
   ComAtprotoSyncGetBlob: {
     lexicon: 1,
     id: 'com.atproto.sync.getBlob',
@@ -3525,6 +3535,59 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncGetHostStatus: {
+    lexicon: 1,
+    id: 'com.atproto.sync.getHostStatus',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Returns information about a specified upstream host, as consumed by the server. Implemented by relays.',
+        parameters: {
+          type: 'params',
+          required: ['hostname'],
+          properties: {
+            hostname: {
+              type: 'string',
+              description:
+                'Hostname of the host (eg, PDS or relay) being queried.',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['hostname'],
+            properties: {
+              hostname: {
+                type: 'string',
+              },
+              seq: {
+                type: 'integer',
+                description:
+                  'Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor).',
+              },
+              accountCount: {
+                type: 'integer',
+                description:
+                  'Number of accounts on the server which are associated with the upstream host. Note that the upstream may actually have more accounts.',
+              },
+              status: {
+                type: 'ref',
+                ref: 'lex:com.atproto.sync.defs#hostStatus',
+              },
+            },
+          },
+        },
+        errors: [
+          {
+            name: 'HostNotFound',
+          },
+        ],
+      },
+    },
+  },
   ComAtprotoSyncGetLatestCommit: {
     lexicon: 1,
     id: 'com.atproto.sync.getLatestCommit',
@@ -3805,6 +3868,74 @@ export const schemaDict = {
       },
     },
   },
+  ComAtprotoSyncListHosts: {
+    lexicon: 1,
+    id: 'com.atproto.sync.listHosts',
+    defs: {
+      main: {
+        type: 'query',
+        description:
+          'Enumerates upstream hosts (eg, PDS or relay instances) that this service consumes from. Implemented by relays.',
+        parameters: {
+          type: 'params',
+          properties: {
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 1000,
+              default: 200,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['hosts'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              hosts: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:com.atproto.sync.listHosts#host',
+                },
+                description:
+                  'Sort order is not formally specified. Recommended order is by time host was first seen by the server, with oldest first.',
+              },
+            },
+          },
+        },
+      },
+      host: {
+        type: 'object',
+        required: ['hostname'],
+        properties: {
+          hostname: {
+            type: 'string',
+            description: 'hostname of server; not a URL (no scheme)',
+          },
+          seq: {
+            type: 'integer',
+            description:
+              'Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor).',
+          },
+          accountCount: {
+            type: 'integer',
+          },
+          status: {
+            type: 'ref',
+            ref: 'lex:com.atproto.sync.defs#hostStatus',
+          },
+        },
+      },
+    },
+  },
   ComAtprotoSyncListRepos: {
     lexicon: 1,
     id: 'com.atproto.sync.listRepos',
@@ -3992,6 +4123,11 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'HostBanned',
+          },
+        ],
       },
     },
   },
@@ -10928,7 +11064,7 @@ export const schemaDict = {
               value: {
                 type: 'string',
                 minLength: 1,
-                maxLength: 32,
+                maxLength: 64,
                 minGraphemes: 1,
                 maxGraphemes: 1,
               },
@@ -11714,7 +11850,7 @@ export const schemaDict = {
               value: {
                 type: 'string',
                 minLength: 1,
-                maxLength: 32,
+                maxLength: 64,
                 minGraphemes: 1,
                 maxGraphemes: 1,
               },
@@ -12195,15 +12331,18 @@ export const ids = {
   ComAtprotoServerResetPassword: 'com.atproto.server.resetPassword',
   ComAtprotoServerRevokeAppPassword: 'com.atproto.server.revokeAppPassword',
   ComAtprotoServerUpdateEmail: 'com.atproto.server.updateEmail',
+  ComAtprotoSyncDefs: 'com.atproto.sync.defs',
   ComAtprotoSyncGetBlob: 'com.atproto.sync.getBlob',
   ComAtprotoSyncGetBlocks: 'com.atproto.sync.getBlocks',
   ComAtprotoSyncGetCheckout: 'com.atproto.sync.getCheckout',
   ComAtprotoSyncGetHead: 'com.atproto.sync.getHead',
+  ComAtprotoSyncGetHostStatus: 'com.atproto.sync.getHostStatus',
   ComAtprotoSyncGetLatestCommit: 'com.atproto.sync.getLatestCommit',
   ComAtprotoSyncGetRecord: 'com.atproto.sync.getRecord',
   ComAtprotoSyncGetRepo: 'com.atproto.sync.getRepo',
   ComAtprotoSyncGetRepoStatus: 'com.atproto.sync.getRepoStatus',
   ComAtprotoSyncListBlobs: 'com.atproto.sync.listBlobs',
+  ComAtprotoSyncListHosts: 'com.atproto.sync.listHosts',
   ComAtprotoSyncListRepos: 'com.atproto.sync.listRepos',
   ComAtprotoSyncListReposByCollection: 'com.atproto.sync.listReposByCollection',
   ComAtprotoSyncNotifyOfUpdate: 'com.atproto.sync.notifyOfUpdate',

package/src/lexicon/types/com/atproto/sync/defs.ts

@@ -0,0 +1,23 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.defs'
+
+export type HostStatus =
+  | 'active'
+  | 'idle'
+  | 'offline'
+  | 'throttled'
+  | 'banned'
+  | (string & {})

package/src/lexicon/types/com/atproto/sync/getHostStatus.ts

@@ -0,0 +1,61 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoSyncDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.getHostStatus'
+
+export interface QueryParams {
+  /** Hostname of the host (eg, PDS or relay) being queried. */
+  hostname: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  hostname: string
+  /** Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). */
+  seq?: number
+  /** Number of accounts on the server which are associated with the upstream host. Note that the upstream may actually have more accounts. */
+  accountCount?: number
+  status?: ComAtprotoSyncDefs.HostStatus
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'HostNotFound'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/com/atproto/sync/listHosts.ts

@@ -0,0 +1,77 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import type * as ComAtprotoSyncDefs from './defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'com.atproto.sync.listHosts'
+
+export interface QueryParams {
+  limit: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  /** Sort order is not formally specified. Recommended order is by time host was first seen by the server, with oldest first. */
+  hosts: Host[]
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+  resetRouteRateLimits: () => Promise<void>
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput
+
+export interface Host {
+  $type?: 'com.atproto.sync.listHosts#host'
+  /** hostname of server; not a URL (no scheme) */
+  hostname: string
+  /** Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). */
+  seq?: number
+  accountCount?: number
+  status?: ComAtprotoSyncDefs.HostStatus
+}
+
+const hashHost = 'host'
+
+export function isHost<V>(v: V) {
+  return is$typed(v, id, hashHost)
+}
+
+export function validateHost<V>(v: V) {
+  return validate<Host & V>(v, id, hashHost)
+}

package/src/lexicon/types/com/atproto/sync/requestCrawl.ts

@@ -31,6 +31,7 @@ export interface HandlerInput {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'HostBanned'
 }
 
 export type HandlerOutput = HandlerError | void

package/src/proto/bsky_pb.ts

@@ -4474,6 +4474,11 @@ export class GetActorsRequest extends Message<GetActorsRequest> {
    */
   dids: string[] = []
 
+  /**
+   * @generated from field: repeated string skip_cache_for_dids = 2;
+   */
+  skipCacheForDids: string[] = []
+
   constructor(data?: PartialMessage<GetActorsRequest>) {
     super()
     proto3.util.initPartial(data, this)
@@ -4489,6 +4494,13 @@ export class GetActorsRequest extends Message<GetActorsRequest> {
       T: 9 /* ScalarType.STRING */,
       repeated: true,
     },
+    {
+      no: 2,
+      name: 'skip_cache_for_dids',
+      kind: 'scalar',
+      T: 9 /* ScalarType.STRING */,
+      repeated: true,
+    },
   ])
 
   static fromBinary(