@atproto/bsky 0.0.37 → 0.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -39,16 +39,17 @@
     "pino": "^8.15.0",
     "pino-http": "^8.2.1",
     "sharp": "^0.32.6",
+    "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.10.5",
-    "@atproto/common": "^0.3.3",
+    "@atproto/api": "^0.11.0",
+    "@atproto/common": "^0.3.4",
     "@atproto/crypto": "^0.3.0",
-    "@atproto/identity": "^0.3.2",
-    "@atproto/lexicon": "^0.3.2",
-    "@atproto/repo": "^0.3.8",
-    "@atproto/syntax": "^0.2.0",
-    "@atproto/xrpc-server": "^0.4.3"
+    "@atproto/identity": "^0.3.3",
+    "@atproto/lexicon": "^0.3.3",
+    "@atproto/repo": "^0.3.9",
+    "@atproto/syntax": "^0.2.1",
+    "@atproto/xrpc-server": "^0.4.4"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -62,11 +63,11 @@
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
     "http2-express-bridge": "^1.0.7",
-    "@atproto/api": "^0.10.5",
-    "@atproto/dev-env": "^0.2.37",
-    "@atproto/lex-cli": "^0.3.1",
-    "@atproto/pds": "^0.4.5",
-    "@atproto/xrpc": "^0.4.2"
+    "@atproto/api": "^0.11.0",
+    "@atproto/dev-env": "^0.2.38",
+    "@atproto/lex-cli": "^0.3.2",
+    "@atproto/pds": "^0.4.6",
+    "@atproto/xrpc": "^0.4.3"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/proto/bsky.proto

@@ -114,6 +114,14 @@ message GetThreadGateRecordsResponse {
   repeated Record records = 1;
 }
 
+message GetLabelerRecordsRequest {
+  repeated string uris = 1;
+}
+
+message GetLabelerRecordsResponse {
+  repeated Record records = 1;
+}
+
 
 //
 // Follows
@@ -230,6 +238,8 @@ message GetCountsForUsersResponse {
   repeated int32 reposts = 2;
   repeated int32 following = 3;
   repeated int32 followers = 4;
+  repeated int32 lists = 5;
+  repeated int32 feeds = 6;
 }
 
 //
@@ -296,6 +306,7 @@ message ActorInfo {
   bool taken_down = 4;
   string takedown_ref = 5;
   google.protobuf.Timestamp tombstoned_at = 6;
+  bool labeler = 7;
 }
 
 message GetActorsResponse {
@@ -944,6 +955,7 @@ service Service {
   rpc GetProfileRecords(GetProfileRecordsRequest) returns (GetProfileRecordsResponse);
   rpc GetRepostRecords(GetRepostRecordsRequest) returns (GetRepostRecordsResponse);
   rpc GetThreadGateRecords(GetThreadGateRecordsRequest) returns (GetThreadGateRecordsResponse);
+  rpc GetLabelerRecords(GetLabelerRecordsRequest) returns (GetLabelerRecordsResponse);
 
   // Follows
   rpc GetActorFollowsActors(GetActorFollowsActorsRequest) returns (GetActorFollowsActorsResponse);

package/src/api/app/bsky/actor/getProfile.ts

@@ -2,29 +2,35 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfile'
 import AppContext from '../../../../context'
-import { setRepoRev } from '../../../util'
+import { resHeaders } from '../../../util'
 import { createPipeline, noRules } from '../../../../pipeline'
-import { HydrationState, Hydrator } from '../../../../hydration/hydrator'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
   server.app.bsky.actor.getProfile({
     auth: ctx.authVerifier.optionalStandardOrRole,
-    handler: async ({ auth, params, res }) => {
-      const { viewer, canViewTakedowns } = ctx.authVerifier.parseCreds(auth)
+    handler: async ({ auth, params, req }) => {
+      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { labelers, viewer, includeTakedowns }
 
-      const result = await getProfile(
-        { ...params, viewer, canViewTakedowns },
-        ctx,
-      )
+      const result = await getProfile({ ...params, hydrateCtx }, ctx)
 
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
-      setRepoRev(res, repoRev)
 
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({
+          repoRev,
+          labelers,
+        }),
       }
     },
   })
@@ -48,11 +54,10 @@ const hydration = async (input: {
   skeleton: SkeletonState
 }) => {
   const { ctx, params, skeleton } = input
-  return ctx.hydrator.hydrateProfilesDetailed(
-    [skeleton.did],
-    params.viewer,
-    true,
-  )
+  return ctx.hydrator.hydrateProfilesDetailed([skeleton.did], {
+    ...params.hydrateCtx,
+    includeTakedowns: true,
+  })
 }
 
 const presentation = (input: {
@@ -66,7 +71,7 @@ const presentation = (input: {
   if (!profile) {
     throw new InvalidRequestError('Profile not found')
   } else if (
-    !params.canViewTakedowns &&
+    !params.hydrateCtx.includeTakedowns &&
     ctx.views.actorIsTakendown(skeleton.did, hydration)
   ) {
     throw new InvalidRequestError(
@@ -83,8 +88,7 @@ type Context = {
 }
 
 type Params = QueryParams & {
-  viewer: string | null
-  canViewTakedowns: boolean
+  hydrateCtx: HydrateCtx
 }
 
 type SkeletonState = { did: string }

package/src/api/app/bsky/actor/getProfiles.ts

@@ -2,26 +2,35 @@ import { mapDefined } from '@atproto/common'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getProfiles'
 import AppContext from '../../../../context'
-import { setRepoRev } from '../../../util'
+import { resHeaders } from '../../../util'
 import { createPipeline, noRules } from '../../../../pipeline'
-import { HydrationState, Hydrator } from '../../../../hydration/hydrator'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 
 export default function (server: Server, ctx: AppContext) {
   const getProfile = createPipeline(skeleton, hydration, noRules, presentation)
   server.app.bsky.actor.getProfiles({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ auth, params, res }) => {
+    handler: async ({ auth, params, req }) => {
       const viewer = auth.credentials.iss
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { viewer, labelers }
 
-      const result = await getProfile({ ...params, viewer }, ctx)
+      const result = await getProfile({ ...params, hydrateCtx }, ctx)
 
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
-      setRepoRev(res, repoRev)
 
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({
+          repoRev,
+          labelers,
+        }),
       }
     },
   })
@@ -42,7 +51,7 @@ const hydration = async (input: {
   skeleton: SkeletonState
 }) => {
   const { ctx, params, skeleton } = input
-  return ctx.hydrator.hydrateProfilesDetailed(skeleton.dids, params.viewer)
+  return ctx.hydrator.hydrateProfilesDetailed(skeleton.dids, params.hydrateCtx)
 }
 
 const presentation = (input: {
@@ -64,7 +73,7 @@ type Context = {
 }
 
 type Params = QueryParams & {
-  viewer: string | null
+  hydrateCtx: HydrateCtx
 }
 
 type SkeletonState = { dids: string[] }

package/src/api/app/bsky/actor/getSuggestions.ts

@@ -3,10 +3,15 @@ import AppContext from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/actor/getSuggestions'
 import { createPipeline } from '../../../../pipeline'
-import { HydrationState, Hydrator } from '../../../../hydration/hydrator'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getSuggestions = createPipeline(
@@ -17,13 +22,16 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.actor.getSuggestions({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ params, auth }) => {
+    handler: async ({ params, auth, req }) => {
       const viewer = auth.credentials.iss
-      const result = await getSuggestions({ ...params, viewer }, ctx)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { viewer, labelers }
+      const result = await getSuggestions({ ...params, hydrateCtx }, ctx)
 
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({ labelers }),
       }
     },
   })
@@ -34,19 +42,20 @@ const skeleton = async (input: {
   params: Params
 }): Promise<Skeleton> => {
   const { ctx, params } = input
+  const viewer = params.hydrateCtx.viewer
   // @NOTE for appview swap moving to rkey-based cursors which are somewhat permissive, should not hard-break pagination
   const suggestions = await ctx.dataplane.getFollowSuggestions({
-    actorDid: params.viewer ?? undefined,
+    actorDid: viewer ?? undefined,
     cursor: params.cursor,
     limit: params.limit,
   })
   let dids = suggestions.dids
-  if (params.viewer !== null) {
+  if (viewer !== null) {
     const follows = await ctx.dataplane.getActorFollowsActors({
-      actorDid: params.viewer,
+      actorDid: viewer,
       targetDids: dids,
     })
-    dids = dids.filter((did, i) => !follows.uris[i] && did !== params.viewer)
+    dids = dids.filter((did, i) => !follows.uris[i] && did !== viewer)
   }
   return { dids, cursor: parseString(suggestions.cursor) }
 }
@@ -57,11 +66,7 @@ const hydration = async (input: {
   skeleton: Skeleton
 }) => {
   const { ctx, params, skeleton } = input
-  return ctx.hydrator.hydrateProfilesDetailed(
-    skeleton.dids,
-    params.viewer,
-    true,
-  )
+  return ctx.hydrator.hydrateProfilesDetailed(skeleton.dids, params.hydrateCtx)
 }
 
 const noBlocksOrMutes = (input: {
@@ -102,7 +107,7 @@ type Context = {
 }
 
 type Params = QueryParams & {
-  viewer: string | null
+  hydrateCtx: HydrateCtx
 }
 
 type Skeleton = { dids: string[]; cursor?: string }

package/src/api/app/bsky/actor/searchActors.ts

@@ -10,10 +10,11 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const searchActors = createPipeline(
@@ -24,12 +25,15 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.actor.searchActors({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ auth, params }) => {
+    handler: async ({ auth, params, req }) => {
       const viewer = auth.credentials.iss
-      const results = await searchActors({ ...params, viewer }, ctx)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { viewer, labelers }
+      const results = await searchActors({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: results,
+        headers: resHeaders({ labelers }),
       }
     },
   })
@@ -71,7 +75,7 @@ const hydration = async (
   inputs: HydrationFnInput<Context, Params, Skeleton>,
 ) => {
   const { ctx, params, skeleton } = inputs
-  return ctx.hydrator.hydrateProfiles(skeleton.dids, params.viewer)
+  return ctx.hydrator.hydrateProfiles(skeleton.dids, params.hydrateCtx)
 }
 
 const noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
@@ -102,7 +106,7 @@ type Context = {
   searchAgent?: AtpAgent
 }
 
-type Params = QueryParams & { viewer: string | null }
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
   dids: string[]

package/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -10,10 +10,11 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
+import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const searchActorsTypeahead = createPipeline(
@@ -24,12 +25,18 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.actor.searchActorsTypeahead({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ params, auth }) => {
+    handler: async ({ params, auth, req }) => {
       const viewer = auth.credentials.iss
-      const results = await searchActorsTypeahead({ ...params, viewer }, ctx)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { labelers, viewer }
+      const results = await searchActorsTypeahead(
+        { ...params, hydrateCtx },
+        ctx,
+      )
       return {
         encoding: 'application/json',
         body: results,
+        headers: resHeaders({ labelers }),
       }
     },
   })
@@ -70,7 +77,7 @@ const hydration = async (
   inputs: HydrationFnInput<Context, Params, Skeleton>,
 ) => {
   const { ctx, params, skeleton } = inputs
-  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.viewer)
+  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx)
 }
 
 const noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {
@@ -100,7 +107,7 @@ type Context = {
   searchAgent?: AtpAgent
 }
 
-type Params = QueryParams & { viewer: string | null }
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
   dids: string[]

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

@@ -4,11 +4,15 @@ import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorFeeds'
 import AppContext from '../../../../context'
 import { createPipeline, noRules } from '../../../../pipeline'
-import { HydrationState, Hydrator } from '../../../../hydration/hydrator'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
-import { clearlyBadCursor } from '../../../util'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
   const getActorFeeds = createPipeline(
@@ -19,12 +23,15 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.feed.getActorFeeds({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ auth, params }) => {
+    handler: async ({ auth, params, req }) => {
       const viewer = auth.credentials.iss
-      const result = await getActorFeeds({ ...params, viewer }, ctx)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { labelers, viewer }
+      const result = await getActorFeeds({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({ labelers }),
       }
     },
   })
@@ -59,7 +66,10 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }) => {
   const { ctx, params, skeleton } = inputs
-  return await ctx.hydrator.hydrateFeedGens(skeleton.feedUris, params.viewer)
+  return await ctx.hydrator.hydrateFeedGens(
+    skeleton.feedUris,
+    params.hydrateCtx,
+  )
 }
 
 const presentation = (inputs: {
@@ -83,7 +93,7 @@ type Context = {
   dataplane: DataPlaneClient
 }
 
-type Params = QueryParams & { viewer: string | null }
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
   feedUris: string[]

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

@@ -3,9 +3,13 @@ import { mapDefined } from '@atproto/common'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getActorLikes'
 import AppContext from '../../../../context'
-import { clearlyBadCursor, setRepoRev } from '../../../util'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 import { createPipeline } from '../../../../pipeline'
-import { HydrationState, Hydrator } from '../../../../hydration/hydrator'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
@@ -21,17 +25,22 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.feed.getActorLikes({
     auth: ctx.authVerifier.standardOptional,
-    handler: async ({ params, auth, res }) => {
+    handler: async ({ params, auth, req }) => {
       const viewer = auth.credentials.iss
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { labelers, viewer }
 
-      const result = await getActorLikes({ ...params, viewer }, ctx)
+      const result = await getActorLikes({ ...params, hydrateCtx }, ctx)
 
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
-      setRepoRev(res, repoRev)
 
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({
+          repoRev,
+          labelers,
+        }),
       }
     },
   })
@@ -42,7 +51,8 @@ const skeleton = async (inputs: {
   params: Params
 }): Promise<Skeleton> => {
   const { ctx, params } = inputs
-  const { actor, limit, cursor, viewer } = params
+  const { actor, limit, cursor } = params
+  const viewer = params.hydrateCtx.viewer
   if (clearlyBadCursor(cursor)) {
     return { items: [] }
   }
@@ -71,7 +81,7 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }) => {
   const { ctx, params, skeleton } = inputs
-  return await ctx.hydrator.hydrateFeedItems(skeleton.items, params.viewer)
+  return await ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx)
 }
 
 const noPostBlocks = (inputs: {
@@ -108,7 +118,7 @@ type Context = {
   dataplane: DataPlaneClient
 }
 
-type Params = QueryParams & { viewer: string | null }
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
 
 type Skeleton = {
   items: FeedItem[]

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

@@ -3,9 +3,10 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getAuthorFeed'
 import AppContext from '../../../../context'
-import { clearlyBadCursor, setRepoRev } from '../../../util'
+import { clearlyBadCursor, resHeaders } from '../../../util'
 import { createPipeline } from '../../../../pipeline'
 import {
+  HydrateCtx,
   HydrationState,
   Hydrator,
   mergeStates,
@@ -26,20 +27,22 @@ export default function (server: Server, ctx: AppContext) {
   )
   server.app.bsky.feed.getAuthorFeed({
     auth: ctx.authVerifier.optionalStandardOrRole,
-    handler: async ({ params, auth, res }) => {
-      const { viewer, canViewTakedowns } = ctx.authVerifier.parseCreds(auth)
+    handler: async ({ params, auth, req }) => {
+      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = { labelers, viewer, includeTakedowns }
 
-      const result = await getAuthorFeed(
-        { ...params, viewer, includeTakedowns: canViewTakedowns },
-        ctx,
-      )
+      const result = await getAuthorFeed({ ...params, hydrateCtx }, ctx)
 
       const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
-      setRepoRev(res, repoRev)
 
       return {
         encoding: 'application/json',
         body: result,
+        headers: resHeaders({
+          repoRev,
+          labelers,
+        }),
       }
     },
   })
@@ -63,7 +66,7 @@ export const skeleton = async (inputs: {
   }
   const actors = await ctx.hydrator.actor.getActors(
     [did],
-    params.includeTakedowns,
+    params.hydrateCtx.includeTakedowns,
   )
   const actor = actors.get(did)
   if (!actor) {
@@ -96,15 +99,9 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }): Promise<HydrationState> => {
   const { ctx, params, skeleton } = inputs
-  const [feedPostState, profileViewerState = {}] = await Promise.all([
-    ctx.hydrator.hydrateFeedItems(
-      skeleton.items,
-      params.viewer,
-      params.includeTakedowns,
-    ),
-    params.viewer
-      ? ctx.hydrator.hydrateProfileViewers([skeleton.actor.did], params.viewer)
-      : undefined,
+  const [feedPostState, profileViewerState] = await Promise.all([
+    ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx),
+    ctx.hydrator.hydrateProfileViewers([skeleton.actor.did], params.hydrateCtx),
   ])
   return mergeStates(feedPostState, profileViewerState)
 }
@@ -157,7 +154,9 @@ type Context = {
   dataplane: DataPlaneClient
 }
 
-type Params = QueryParams & { viewer: string | null; includeTakedowns: boolean }
+type Params = QueryParams & {
+  hydrateCtx: HydrateCtx
+}
 
 type Skeleton = {
   actor: Actor