@atproto/bsky 0.0.64 → 0.0.66

package/src/hydration/graph.ts

@@ -1,9 +1,10 @@
 import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
 import { Record as BlockRecord } from '../lexicon/types/app/bsky/graph/block'
+import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
 import { Record as ListRecord } from '../lexicon/types/app/bsky/graph/list'
 import { Record as ListItemRecord } from '../lexicon/types/app/bsky/graph/listitem'
 import { DataPlaneClient } from '../data-plane/client'
-import { HydrationMap, RecordInfo, parseRecord } from './util'
+import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
 import { FollowInfo } from '../proto/bsky_pb'
 
 export type List = RecordInfo<ListRecord>
@@ -25,6 +26,23 @@ export type Follows = HydrationMap<Follow>
 
 export type Block = RecordInfo<BlockRecord>
 
+export type StarterPack = RecordInfo<StarterPackRecord>
+export type StarterPacks = HydrationMap<StarterPack>
+
+export type StarterPackAgg = {
+  joinedWeek: number
+  joinedAllTime: number
+  listItemSampleUris?: string[] // gets set during starter pack hydration (not for basic view)
+}
+
+export type StarterPackAggs = HydrationMap<StarterPackAgg>
+
+export type ListAgg = {
+  listItems: number
+}
+
+export type ListAggs = HydrationMap<ListAgg>
+
 export type RelationshipPair = [didA: string, didB: string]
 
 const dedupePairs = (pairs: RelationshipPair[]): RelationshipPair[] => {
@@ -84,7 +102,6 @@ export class GraphHydrator {
     }, new HydrationMap<List>())
   }
 
-  // @TODO may not be supported yet by data plane
   async getListItems(
     uris: string[],
     includeTakedowns = false,
@@ -195,4 +212,40 @@ export class GraphHydrator {
     })
     return { followers: res.followers, cursor: res.cursor }
   }
+
+  async getStarterPacks(
+    uris: string[],
+    includeTakedowns = false,
+  ): Promise<StarterPacks> {
+    if (!uris.length) return new HydrationMap<StarterPack>()
+    const res = await this.dataplane.getStarterPackRecords({ uris })
+    return uris.reduce((acc, uri, i) => {
+      const record = parseRecord<StarterPackRecord>(
+        res.records[i],
+        includeTakedowns,
+      )
+      return acc.set(uri, record ?? null)
+    }, new HydrationMap<StarterPack>())
+  }
+
+  async getStarterPackAggregates(refs: ItemRef[]) {
+    if (!refs.length) return new HydrationMap<StarterPackAgg>()
+    const counts = await this.dataplane.getStarterPackCounts({ refs })
+    return refs.reduce((acc, { uri }, i) => {
+      return acc.set(uri, {
+        joinedWeek: counts.joinedWeek[i] ?? 0,
+        joinedAllTime: counts.joinedAllTime[i] ?? 0,
+      })
+    }, new HydrationMap<StarterPackAgg>())
+  }
+
+  async getListAggregates(refs: ItemRef[]) {
+    if (!refs.length) return new HydrationMap<ListAgg>()
+    const counts = await this.dataplane.getListCounts({ refs })
+    return refs.reduce((acc, { uri }, i) => {
+      return acc.set(uri, {
+        listItems: counts.listItems[i] ?? 0,
+      })
+    }, new HydrationMap<ListAgg>())
+  }
 }

package/src/hydration/hydrator.ts

@@ -19,10 +19,13 @@ import {
 import {
   Follows,
   GraphHydrator,
+  ListAggs,
   ListItems,
   ListViewerStates,
   Lists,
   RelationshipPair,
+  StarterPackAggs,
+  StarterPacks,
 } from './graph'
 import {
   LabelHydrator,
@@ -35,6 +38,7 @@ import {
   HydrationMap,
   Merges,
   RecordInfo,
+  ItemRef,
   didFromUri,
   urisByCollection,
 } from './util'
@@ -51,7 +55,6 @@ import {
   PostViewerStates,
   Threadgates,
   FeedItem,
-  ItemRef,
 } from './feed'
 import { ParsedLabelers } from '../util'
 
@@ -85,6 +88,7 @@ export type HydrationState = {
   followBlocks?: FollowBlocks
   threadgates?: Threadgates
   lists?: Lists
+  listAggs?: ListAggs
   listViewers?: ListViewerStates
   listItems?: ListItems
   likes?: Likes
@@ -92,6 +96,8 @@ export type HydrationState = {
   feedgens?: FeedGens
   feedgenViewers?: FeedGenViewerStates
   feedgenAggs?: FeedGenAggs
+  starterPacks?: StarterPacks
+  starterPackAggs?: StarterPackAggs
   labelers?: Labelers
   labelerViewers?: LabelerViewerStates
   labelerAggs?: LabelerAggs
@@ -190,6 +196,10 @@ export class Hydrator {
   // - profile detailed
   //   - profile
   //     - list basic
+  //   - starterpack
+  //     - profile
+  //       - list basic
+  //     - labels
   async hydrateProfilesDetailed(
     dids: string[],
     ctx: HydrateCtx,
@@ -213,11 +223,21 @@ export class Hydrator {
       this.hydrateProfiles(allDids, ctx),
       this.actor.getProfileAggregates(dids),
     ])
-    return {
-      ...state,
+    const starterPackUriSet = new Set<string>()
+    state.actors?.forEach((actor) => {
+      if (actor?.profile?.joinedViaStarterPack) {
+        starterPackUriSet.add(actor?.profile?.joinedViaStarterPack?.uri)
+      }
+    })
+    const starterPackState = await this.hydrateStarterPacksBasic(
+      [...starterPackUriSet],
+      ctx,
+    )
+    return mergeManyStates(state, starterPackState, {
       profileAggs,
       knownFollowers,
-    }
+      ctx,
+    })
   }
 
   // app.bsky.graph.defs#listView
@@ -238,8 +258,9 @@ export class Hydrator {
     uris: string[],
     ctx: HydrateCtx,
   ): Promise<HydrationState> {
-    const [lists, listViewers, labels] = await Promise.all([
+    const [lists, listAggs, listViewers, labels] = await Promise.all([
       this.graph.getLists(uris, ctx.includeTakedowns),
+      this.graph.getListAggregates(uris.map((uri) => ({ uri }))),
       ctx.viewer ? this.graph.getListViewerStates(uris, ctx.viewer) : undefined,
       this.label.getLabelsForSubjects(uris, ctx.labelers),
     ])
@@ -248,7 +269,7 @@ export class Hydrator {
       actionTakedownLabels(uris, lists, labels)
     }
 
-    return { lists, listViewers, labels, ctx }
+    return { lists, listAggs, listViewers, labels, ctx }
   }
 
   // app.bsky.graph.defs#listItemView
@@ -534,6 +555,106 @@ export class Hydrator {
     })
   }
 
+  // app.bsky.graph.defs#starterPackViewBasic
+  // - starterpack
+  //   - profile
+  //     - list basic
+  //  - labels
+  async hydrateStarterPacksBasic(
+    uris: string[],
+    ctx: HydrateCtx,
+  ): Promise<HydrationState> {
+    const [starterPacks, starterPackAggs, profileState, labels] =
+      await Promise.all([
+        this.graph.getStarterPacks(uris, ctx.includeTakedowns),
+        this.graph.getStarterPackAggregates(uris.map((uri) => ({ uri }))),
+        this.hydrateProfiles(uris.map(didFromUri), ctx),
+        this.label.getLabelsForSubjects(uris, ctx.labelers),
+      ])
+    if (!ctx.includeTakedowns) {
+      actionTakedownLabels(uris, starterPacks, labels)
+    }
+    return mergeStates(profileState, {
+      starterPacks,
+      starterPackAggs,
+      labels,
+      ctx,
+    })
+  }
+
+  // app.bsky.graph.defs#starterPackView
+  // - starterpack
+  //   - profile
+  //     - list basic
+  //   - feedgen
+  //     - profile
+  //       - list basic
+  //  - list basic
+  //  - list item
+  //    - profile
+  //      - list basic
+  //  - labels
+  async hydrateStarterPacks(
+    uris: string[],
+    ctx: HydrateCtx,
+  ): Promise<HydrationState> {
+    const starterPackState = await this.hydrateStarterPacksBasic(uris, ctx)
+    // gather feed and list uris
+    const feedUriSet = new Set<string>()
+    const listUriSet = new Set<string>()
+    starterPackState.starterPacks?.forEach((sp) => {
+      sp?.record.feeds?.forEach((feed) => feedUriSet.add(feed.uri))
+      if (sp?.record.list) {
+        listUriSet.add(sp?.record.list)
+      }
+    })
+    const feedUris = [...feedUriSet]
+    const listUris = [...listUriSet]
+    // hydrate feeds, lists, and their members
+    const [feedGenState, listState, ...listsMembers] = await Promise.all([
+      this.hydrateFeedGens(feedUris, ctx),
+      this.hydrateLists(listUris, ctx),
+      ...listUris.map((uri) =>
+        this.dataplane.getListMembers({ listUri: uri, limit: 50 }),
+      ),
+    ])
+    // collect list info
+    const listMembersByList = new Map(
+      listUris.map((uri, i) => [uri, listsMembers[i]]),
+    )
+    const listMemberDids = listsMembers.flatMap((lm) =>
+      lm.listitems.map((li) => li.did),
+    )
+    // sample top list items per starter pack based on their follows
+    const listMemberAggs = await this.actor.getProfileAggregates(listMemberDids)
+    const listItemUris: string[] = []
+    uris.forEach((uri) => {
+      const sp = starterPackState.starterPacks?.get(uri)
+      const agg = starterPackState.starterPackAggs?.get(uri)
+      if (!sp?.record.list || !agg) return
+      const members = listMembersByList.get(sp.record.list)
+      if (!members) return
+      // update aggregation with list items for top 12 most followed members
+      agg.listItemSampleUris = [...members.listitems]
+        .sort((li1, li2) => {
+          const score1 = listMemberAggs.get(li1.did)?.followers ?? 0
+          const score2 = listMemberAggs.get(li2.did)?.followers ?? 0
+          return score2 - score1
+        })
+        .slice(0, 12)
+        .map((li) => li.uri)
+      listItemUris.push(...agg.listItemSampleUris)
+    })
+    // hydrate sampled list items
+    const listItemState = await this.hydrateListItems(listItemUris, ctx)
+    return mergeManyStates(
+      starterPackState,
+      feedGenState,
+      listState,
+      listItemState,
+    )
+  }
+
   // app.bsky.feed.getLikes#like
   // - like
   //   - profile
@@ -685,6 +806,11 @@ export class Hydrator {
         (await this.graph.getBlocks([uri], includeTakedowns)).get(uri) ??
         undefined
       )
+    } else if (collection === ids.AppBskyGraphStarterpack) {
+      return (
+        (await this.graph.getStarterPacks([uri], includeTakedowns)).get(uri) ??
+        undefined
+      )
     } else if (collection === ids.AppBskyFeedGenerator) {
       return (
         (await this.feed.getFeedGens([uri], includeTakedowns)).get(uri) ??
@@ -742,6 +868,14 @@ export class Hydrator {
       includeTakedowns: vals.includeTakedowns,
     })
   }
+
+  async resolveUri(uriStr: string) {
+    const uri = new AtUri(uriStr)
+    const [did] = await this.actor.getDids([uri.host])
+    if (!did) return uriStr
+    uri.host = did
+    return uri.toString()
+  }
 }
 
 // service refs may look like "did:plc:example#service_id". we want to extract the did part "did:plc:example".
@@ -874,6 +1008,7 @@ export const mergeStates = (
     followBlocks: mergeMaps(stateA.followBlocks, stateB.followBlocks),
     threadgates: mergeMaps(stateA.threadgates, stateB.threadgates),
     lists: mergeMaps(stateA.lists, stateB.lists),
+    listAggs: mergeMaps(stateA.listAggs, stateB.listAggs),
     listViewers: mergeMaps(stateA.listViewers, stateB.listViewers),
     listItems: mergeMaps(stateA.listItems, stateB.listItems),
     likes: mergeMaps(stateA.likes, stateB.likes),
@@ -881,6 +1016,8 @@ export const mergeStates = (
     feedgens: mergeMaps(stateA.feedgens, stateB.feedgens),
     feedgenAggs: mergeMaps(stateA.feedgenAggs, stateB.feedgenAggs),
     feedgenViewers: mergeMaps(stateA.feedgenViewers, stateB.feedgenViewers),
+    starterPacks: mergeMaps(stateA.starterPacks, stateB.starterPacks),
+    starterPackAggs: mergeMaps(stateA.starterPackAggs, stateB.starterPackAggs),
     labelers: mergeMaps(stateA.labelers, stateB.labelers),
     labelerAggs: mergeMaps(stateA.labelerAggs, stateB.labelerAggs),
     labelerViewers: mergeMaps(stateA.labelerViewers, stateB.labelerViewers),

package/src/hydration/util.ts

@@ -25,6 +25,8 @@ export type RecordInfo<T> = {
   takedownRef: string | undefined
 }
 
+export type ItemRef = { uri: string; cid?: string }
+
 export const parseRecord = <T>(
   entry: Record,
   includeTakedowns: boolean,

package/src/lexicon/index.ts

@@ -107,6 +107,7 @@ import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggeste
 import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
 import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts'
 import * as AppBskyFeedSendInteractions from './types/app/bsky/feed/sendInteractions'
+import * as AppBskyGraphGetActorStarterPacks from './types/app/bsky/graph/getActorStarterPacks'
 import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
 import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
 import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
@@ -117,6 +118,8 @@ import * as AppBskyGraphGetListMutes from './types/app/bsky/graph/getListMutes'
 import * as AppBskyGraphGetLists from './types/app/bsky/graph/getLists'
 import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
 import * as AppBskyGraphGetRelationships from './types/app/bsky/graph/getRelationships'
+import * as AppBskyGraphGetStarterPack from './types/app/bsky/graph/getStarterPack'
+import * as AppBskyGraphGetStarterPacks from './types/app/bsky/graph/getStarterPacks'
 import * as AppBskyGraphGetSuggestedFollowsByActor from './types/app/bsky/graph/getSuggestedFollowsByActor'
 import * as AppBskyGraphMuteActor from './types/app/bsky/graph/muteActor'
 import * as AppBskyGraphMuteActorList from './types/app/bsky/graph/muteActorList'
@@ -178,6 +181,7 @@ export const APP_BSKY_FEED = {
 export const APP_BSKY_GRAPH = {
   DefsModlist: 'app.bsky.graph.defs#modlist',
   DefsCuratelist: 'app.bsky.graph.defs#curatelist',
+  DefsReferencelist: 'app.bsky.graph.defs#referencelist',
 }
 
 export function createServer(options?: XrpcOptions): Server {
@@ -1443,6 +1447,17 @@ export class AppBskyGraphNS {
     this._server = server
   }
 
+  getActorStarterPacks<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyGraphGetActorStarterPacks.Handler<ExtractAuth<AV>>,
+      AppBskyGraphGetActorStarterPacks.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.graph.getActorStarterPacks' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getBlocks<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -1553,6 +1568,28 @@ export class AppBskyGraphNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  getStarterPack<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyGraphGetStarterPack.Handler<ExtractAuth<AV>>,
+      AppBskyGraphGetStarterPack.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.graph.getStarterPack' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getStarterPacks<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyGraphGetStarterPacks.Handler<ExtractAuth<AV>>,
+      AppBskyGraphGetStarterPacks.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.graph.getStarterPacks' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getSuggestedFollowsByActor<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,