@atproto/bsky 0.0.225 → 0.0.226

package/src/api/app/bsky/graph/getKnownFollowers.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { DidString } from '@atproto/lex'
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -31,10 +31,7 @@ export default function (server: Server, ctx: AppContext) {
         viewer,
       })
 
-      const result = await getKnownFollowers(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await getKnownFollowers({ ...params, hydrateCtx }, ctx)
 
       return {
         encoding: 'application/json',
@@ -113,7 +110,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getKnownFollowers.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/api/app/bsky/graph/getListBlocks.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { AtUriString } from '@atproto/lex'
 import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -27,10 +27,7 @@ export default function (server: Server, ctx: AppContext) {
       const viewer = auth.credentials.iss
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
-      const result = await getListBlocks(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await getListBlocks({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: result,
@@ -78,7 +75,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getListBlocks.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/api/app/bsky/graph/getListMutes.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { AtUriString } from '@atproto/lex'
 import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -27,10 +27,7 @@ export default function (server: Server, ctx: AppContext) {
       const viewer = auth.credentials.iss
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
-      const result = await getListMutes(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await getListMutes({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: result,
@@ -78,7 +75,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getListBlocks.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/api/app/bsky/graph/getListsWithMembership.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { AtUriString, DidString } from '@atproto/lex'
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { parseString } from '../../../../hydration/util'
 import { app } from '../../../../lexicons/index.js'
 import {
@@ -35,7 +35,7 @@ export default function (server: Server, ctx: AppContext) {
         viewer,
       })
       const result = await getListsWithMembership(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
+        { ...params, hydrateCtx },
         ctx,
       )
 
@@ -133,7 +133,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getListsWithMembership.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/api/app/bsky/graph/getMutes.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { DidString } from '@atproto/lex'
 import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -22,10 +22,7 @@ export default function (server: Server, ctx: AppContext) {
       const viewer = auth.credentials.iss
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
-      const result = await getMutes(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await getMutes({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: result,
@@ -78,7 +75,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getMutes.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/api/app/bsky/graph/getStarterPacksWithMembership.ts

@@ -3,7 +3,7 @@ import { AtUriString, DidString } from '@atproto/syntax'
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
 import {
-  HydrateCtx,
+  HydrateCtxWithViewer,
   Hydrator,
   mergeManyStates,
 } from '../../../../hydration/hydrator'
@@ -35,7 +35,7 @@ export default function (server: Server, ctx: AppContext) {
         viewer,
       })
       const result = await getStarterPacksWithMembership(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
+        { ...params, hydrateCtx },
         ctx,
       )
 
@@ -126,7 +126,7 @@ type Context = {
 }
 
 type Params = app.bsky.graph.getStarterPacksWithMembership.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

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

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { DidString } from '@atproto/syntax'
 import { Server } from '@atproto/xrpc-server'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -32,7 +32,7 @@ export default function (server: Server, ctx: AppContext) {
       })
 
       const result = await listActivitySubscriptions(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
+        { ...params, hydrateCtx },
         ctx,
       )
 
@@ -103,7 +103,7 @@ type Context = {
 }
 
 type Params = app.bsky.notification.listActivitySubscriptions.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

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

@@ -3,7 +3,7 @@ import { AtUriString, DatetimeString, DidString } from '@atproto/syntax'
 import { InvalidRequestError, Server } from '@atproto/xrpc-server'
 import { ServerConfig } from '../../../../config'
 import { AppContext } from '../../../../context'
-import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
+import { HydrateCtxWithViewer, Hydrator } from '../../../../hydration/hydrator'
 import { app } from '../../../../lexicons/index.js'
 import {
   HydrationFnInput,
@@ -31,10 +31,7 @@ export default function (server: Server, ctx: AppContext) {
       const viewer = auth.credentials.iss
       const labelers = ctx.reqLabelers(req)
       const hydrateCtx = await ctx.hydrator.createContext({ labelers, viewer })
-      const result = await listNotifications(
-        { ...params, hydrateCtx: hydrateCtx.copy({ viewer }) },
-        ctx,
-      )
+      const result = await listNotifications({ ...params, hydrateCtx }, ctx)
       return {
         encoding: 'application/json',
         body: result,
@@ -254,7 +251,7 @@ type Context = {
 }
 
 type Params = app.bsky.notification.listNotifications.$Params & {
-  hydrateCtx: HydrateCtx & { viewer: string }
+  hydrateCtx: HydrateCtxWithViewer
 }
 
 type SkeletonState = {

package/src/data-plane/client/index.ts

@@ -10,6 +10,7 @@ import {
 import { createGrpcTransport } from '@connectrpc/connect-node'
 import { Service } from '../../proto/bsky_connect'
 import { HostList } from './hosts'
+import { callerInterceptor } from './util'
 
 export * from './hosts'
 export * from './util'
@@ -105,6 +106,7 @@ const createBaseClient = (
     httpVersion,
     acceptCompression: [],
     nodeOptions: { rejectUnauthorized },
+    interceptors: [callerInterceptor('appview')],
   })
   return createPromiseClient(Service, transport)
 }

package/src/data-plane/client/util.test.ts

@@ -0,0 +1,39 @@
+/// <reference types="jest" />
+import { callerInterceptor } from './util'
+
+describe('callerInterceptor', () => {
+  it('sets x-atlantis-caller header on the request', async () => {
+    const interceptor = callerInterceptor('appview')
+    const expectedResponse = { status: 'ok' }
+    const next = jest.fn().mockResolvedValue(expectedResponse)
+
+    const req = { header: new Headers() }
+    const handler = interceptor(next)
+    const res = await handler(req as any)
+
+    expect(req.header.get('x-atlantis-caller')).toBe('appview')
+    expect(next).toHaveBeenCalledWith(req)
+    expect(res).toBe(expectedResponse)
+  })
+
+  it('uses the provided caller value', async () => {
+    const interceptor = callerInterceptor('feed-generator')
+    const next = jest.fn().mockResolvedValue({})
+
+    const req = { header: new Headers() }
+    await interceptor(next)(req as any)
+
+    expect(req.header.get('x-atlantis-caller')).toBe('feed-generator')
+  })
+
+  it('does not overwrite other existing headers', async () => {
+    const interceptor = callerInterceptor('appview')
+    const next = jest.fn().mockResolvedValue({})
+
+    const req = { header: new Headers({ 'x-other': 'value' }) }
+    await interceptor(next)(req as any)
+
+    expect(req.header.get('x-atlantis-caller')).toBe('appview')
+    expect(req.header.get('x-other')).toBe('value')
+  })
+})

package/src/data-plane/client/util.ts

@@ -1,7 +1,15 @@
-import { Code, ConnectError } from '@connectrpc/connect'
+import { Code, ConnectError, Interceptor } from '@connectrpc/connect'
 import * as ui8 from 'uint8arrays'
 import { getDidKeyFromMultibase } from '@atproto/identity'
 
+export const callerInterceptor =
+  (caller: string): Interceptor =>
+  (next) =>
+  (req) => {
+    req.header.set('x-atlantis-caller', caller)
+    return next(req)
+  }
+
 export const isDataplaneError = (
   err: unknown,
   code?: Code,

package/src/hydration/hydrator.ts

@@ -99,6 +99,8 @@ export class HydrateCtx {
   }
 }
 
+export type HydrateCtxWithViewer = HydrateCtx & { viewer: string }
+
 export type HydrateCtxVals = {
   labelers: ParsedLabelers
   viewer: DidString | null