Optional service config in pds distribution (#2211)

* make appview and mod services optional on pds * pds: allow configuring a reporting service optionally separate from an administrative mod service * tidy
bluesky-social · Feb 22, 2024 · 9f90203 · 9f90203
1 parent 4e0271b
commit 9f90203
Show file tree

Hide file tree

Showing 60 changed files with 280 additions and 103 deletions.
diff --git a/packages/pds/src/api/app/bsky/actor/getPreferences.ts b/packages/pds/src/api/app/bsky/actor/getPreferences.ts
@@ -3,6 +3,7 @@ import AppContext from '../../../../context'
 import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
+  if (!ctx.cfg.bskyAppView) return
   server.app.bsky.actor.getPreferences({
     auth: ctx.authVerifier.access,
     handler: async ({ auth }) => {

diff --git a/packages/pds/src/api/app/bsky/actor/getProfile.ts b/packages/pds/src/api/app/bsky/actor/getProfile.ts
@@ -12,13 +12,15 @@ import { pipethrough } from '../../../../pipethrough'
 const METHOD_NSID = 'app.bsky.actor.getProfile'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.actor.getProfile({
     auth: ctx.authVerifier.accessOrRole,
     handler: async ({ req, auth, params }) => {
       const requester =
         auth.credentials.type === 'access' ? auth.credentials.did : null
       const res = await pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         METHOD_NSID,
         params,
         requester ? await ctx.appviewAuthHeaders(requester) : authPassthru(req),

diff --git a/packages/pds/src/api/app/bsky/actor/getProfiles.ts b/packages/pds/src/api/app/bsky/actor/getProfiles.ts
@@ -11,13 +11,15 @@ import {
 const METHOD_NSID = 'app.bsky.actor.getProfiles'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.actor.getProfiles({
     auth: ctx.authVerifier.access,
     handler: async ({ auth, params }) => {
       const requester = auth.credentials.did
 
       const res = await pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         METHOD_NSID,
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/actor/getSuggestions.ts b/packages/pds/src/api/app/bsky/actor/getSuggestions.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.actor.getSuggestions({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.actor.getSuggestions',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/actor/putPreferences.ts b/packages/pds/src/api/app/bsky/actor/putPreferences.ts
@@ -4,6 +4,7 @@ import AppContext from '../../../../context'
 import { AccountPreference } from '../../../../actor-store/preference/reader'
 
 export default function (server: Server, ctx: AppContext) {
+  if (!ctx.cfg.bskyAppView) return
   server.app.bsky.actor.putPreferences({
     auth: ctx.authVerifier.accessCheckTakedown,
     handler: async ({ auth, input }) => {

diff --git a/packages/pds/src/api/app/bsky/actor/searchActors.ts b/packages/pds/src/api/app/bsky/actor/searchActors.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.actor.searchActors({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.actor.searchActors',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/actor/searchActorsTypeahead.ts b/packages/pds/src/api/app/bsky/actor/searchActorsTypeahead.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.actor.searchActorsTypeahead({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.actor.searchActorsTypeahead',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getActorFeeds.ts b/packages/pds/src/api/app/bsky/feed/getActorFeeds.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getActorFeeds({
     auth: ctx.authVerifier.access,
     handler: async ({ auth, params }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getActorFeeds',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getActorLikes.ts b/packages/pds/src/api/app/bsky/feed/getActorLikes.ts
@@ -12,13 +12,15 @@ import { pipethrough } from '../../../../pipethrough'
 const METHOD_NSID = 'app.bsky.feed.getActorLikes'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getActorLikes({
     auth: ctx.authVerifier.accessOrRole,
     handler: async ({ req, params, auth }) => {
       const requester =
         auth.credentials.type === 'access' ? auth.credentials.did : null
       const res = await pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         METHOD_NSID,
         params,
         requester ? await ctx.appviewAuthHeaders(requester) : authPassthru(req),

diff --git a/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/pds/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -13,13 +13,15 @@ import { pipethrough } from '../../../../pipethrough'
 const METHOD_NSID = 'app.bsky.feed.getAuthorFeed'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getAuthorFeed({
     auth: ctx.authVerifier.accessOrRole,
     handler: async ({ req, params, auth }) => {
       const requester =
         auth.credentials.type === 'access' ? auth.credentials.did : null
       const res = await pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         METHOD_NSID,
         params,
         requester ? await ctx.appviewAuthHeaders(requester) : authPassthru(req),

diff --git a/packages/pds/src/api/app/bsky/feed/getFeed.ts b/packages/pds/src/api/app/bsky/feed/getFeed.ts
@@ -3,13 +3,16 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { appViewAgent } = ctx
+  const { bskyAppView } = ctx.cfg
+  if (!appViewAgent || !bskyAppView) return
   server.app.bsky.feed.getFeed({
     auth: ctx.authVerifier.access,
     handler: async ({ req, params, auth }) => {
       const requester = auth.credentials.did
 
       const { data: feed } =
-        await ctx.appViewAgent.api.app.bsky.feed.getFeedGenerator(
+        await appViewAgent.api.app.bsky.feed.getFeedGenerator(
           { feed: params.feed },
           await ctx.appviewAuthHeaders(requester),
         )
@@ -21,7 +24,7 @@ export default function (server: Server, ctx: AppContext) {
       serviceAuthHeaders.headers['accept-language'] =
         req.headers['accept-language']
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getFeed',
         params,
         serviceAuthHeaders,

diff --git a/packages/pds/src/api/app/bsky/feed/getFeedGenerator.ts b/packages/pds/src/api/app/bsky/feed/getFeedGenerator.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getFeedGenerator({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getFeedGenerator',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getFeedGenerators.ts b/packages/pds/src/api/app/bsky/feed/getFeedGenerators.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getFeedGenerators({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getFeedGenerators',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getLikes.ts b/packages/pds/src/api/app/bsky/feed/getLikes.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getLikes({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getLikes',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getListFeed.ts b/packages/pds/src/api/app/bsky/feed/getListFeed.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getListFeed({
     auth: ctx.authVerifier.access,
     handler: async ({ auth, params }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getListFeed',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getPostThread.ts b/packages/pds/src/api/app/bsky/feed/getPostThread.ts
@@ -1,3 +1,4 @@
+import assert from 'node:assert'
 import { AtUri } from '@atproto/syntax'
 import { Headers, XRPCError } from '@atproto/xrpc'
 import { Server } from '../../../../lexicon'
@@ -26,6 +27,8 @@ import { pipethrough } from '../../../../pipethrough'
 const METHOD_NSID = 'app.bsky.feed.getPostThread'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getPostThread({
     auth: ctx.authVerifier.accessOrRole,
     handler: async ({ req, params, auth }) => {
@@ -34,7 +37,7 @@ export default function (server: Server, ctx: AppContext) {
 
       if (!requester) {
         return pipethrough(
-          ctx.cfg.bskyAppView.url,
+          bskyAppView.url,
           METHOD_NSID,
           params,
           authPassthru(req),
@@ -43,7 +46,7 @@ export default function (server: Server, ctx: AppContext) {
 
       try {
         const res = await pipethrough(
-          ctx.cfg.bskyAppView.url,
+          bskyAppView.url,
           METHOD_NSID,
           params,
           await ctx.appviewAuthHeaders(requester),
@@ -200,6 +203,7 @@ const readAfterWriteNotFound = async (
   const highestParent = getHighestParent(thread)
   if (highestParent) {
     try {
+      assert(ctx.appViewAgent)
       const parentsRes = await ctx.appViewAgent.api.app.bsky.feed.getPostThread(
         { uri: highestParent, parentHeight: params.parentHeight, depth: 0 },
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getPosts.ts b/packages/pds/src/api/app/bsky/feed/getPosts.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getPosts({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getPosts',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getRepostedBy.ts b/packages/pds/src/api/app/bsky/feed/getRepostedBy.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getRepostedBy({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getRepostedBy',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getSuggestedFeeds.ts b/packages/pds/src/api/app/bsky/feed/getSuggestedFeeds.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getSuggestedFeeds({
     auth: ctx.authVerifier.access,
     handler: async ({ auth, params }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.getSuggestedFeeds',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/getTimeline.ts b/packages/pds/src/api/app/bsky/feed/getTimeline.ts
@@ -11,12 +11,14 @@ import { pipethrough } from '../../../../pipethrough'
 const METHOD_NSID = 'app.bsky.feed.getTimeline'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.getTimeline({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       const res = await pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         METHOD_NSID,
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/feed/searchPosts.ts b/packages/pds/src/api/app/bsky/feed/searchPosts.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.feed.searchPosts({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.feed.searchPosts',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/graph/getBlocks.ts b/packages/pds/src/api/app/bsky/graph/getBlocks.ts
@@ -3,12 +3,14 @@ import AppContext from '../../../../context'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.graph.getBlocks({
     auth: ctx.authVerifier.access,
     handler: async ({ params, auth }) => {
       const requester = auth.credentials.did
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.graph.getBlocks',
         params,
         await ctx.appviewAuthHeaders(requester),

diff --git a/packages/pds/src/api/app/bsky/graph/getFollowers.ts b/packages/pds/src/api/app/bsky/graph/getFollowers.ts
@@ -4,13 +4,15 @@ import { authPassthru } from '../../../proxy'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
+  const { bskyAppView } = ctx.cfg
+  if (!bskyAppView) return
   server.app.bsky.graph.getFollowers({
     auth: ctx.authVerifier.accessOrRole,
     handler: async ({ req, params, auth }) => {
       const requester =
         auth.credentials.type === 'access' ? auth.credentials.did : null
       return pipethrough(
-        ctx.cfg.bskyAppView.url,
+        bskyAppView.url,
         'app.bsky.graph.getFollowers',
         params,
         requester ? await ctx.appviewAuthHeaders(requester) : authPassthru(req),