Appview v1 generating and ingesting mute ops w/ bsync

.github/workflows/build-and-push-bsky-aws.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - appview-v1-sync-mutes
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

packages/bsky/buf.gen.yaml

@@ -0,0 +1,12 @@
+version: v1
+plugins:
+  - plugin: es
+    opt:
+      - target=ts
+      - import_extension=.ts
+    out: src/proto
+  - plugin: connect-es
+    opt:
+      - target=ts
+      - import_extension=.ts
+    out: src/proto

packages/bsky/package.json

@@ -28,7 +28,8 @@
     "test": "../dev-infra/with-test-redis-and-db.sh jest",
     "test:log": "tail -50 test.log | pino-pretty",
     "test:updateSnapshot": "jest --updateSnapshot",
-    "migration:create": "ts-node ./bin/migration-create.ts"
+    "migration:create": "ts-node ./bin/migration-create.ts",
+    "buf:gen": "buf generate ../bsync/proto"
   },
   "dependencies": {
     "@atproto/api": "workspace:^",
@@ -39,6 +40,9 @@
     "@atproto/lexicon": "workspace:^",
     "@atproto/repo": "workspace:^",
     "@atproto/xrpc-server": "workspace:^",
+    "@bufbuild/protobuf": "^1.5.0",
+    "@connectrpc/connect": "^1.1.4",
+    "@connectrpc/connect-node": "^1.1.4",
     "@did-plc/lib": "^0.0.1",
     "@isaacs/ttlcache": "^1.4.1",
     "compression": "^1.7.4",
@@ -65,6 +69,9 @@
     "@atproto/lex-cli": "workspace:^",
     "@atproto/pds": "workspace:^",
     "@atproto/xrpc": "workspace:^",
+    "@bufbuild/buf": "^1.28.1",
+    "@bufbuild/protoc-gen-es": "^1.5.0",
+    "@connectrpc/protoc-gen-connect-es": "^1.1.4",
     "@did-plc/server": "^0.0.1",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",

packages/bsky/src/api/app/bsky/graph/muteActor.ts

@@ -1,11 +1,14 @@
+import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
+import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.muteActor({
     auth: ctx.authVerifier.standard,
-    handler: async ({ auth, input }) => {
+    handler: async ({ req, auth, input }) => {
       const { actor } = input.body
       const requester = auth.credentials.iss
       const db = ctx.db.getPrimary()
@@ -18,10 +21,34 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError('Cannot mute oneself')
       }
 
-      await ctx.services.graph(db).muteActor({
-        subjectDid,
-        mutedByDid: requester,
-      })
+      const muteActor = async () => {
+        await ctx.services.graph(db).muteActor({
+          subjectDid,
+          mutedByDid: requester,
+        })
+      }
+
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.ADD,
+          actorDid: requester,
+          subject: subjectDid,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await muteActor()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
+        }
+      }
     },
   })
 }

packages/bsky/src/api/app/bsky/graph/muteActorList.ts

@@ -1,13 +1,16 @@
+import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import * as lex from '../../../../lexicon/lexicons'
 import AppContext from '../../../../context'
 import { AtUri } from '@atproto/syntax'
+import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.muteActorList({
     auth: ctx.authVerifier.standard,
-    handler: async ({ auth, input }) => {
+    handler: async ({ req, auth, input }) => {
       const { list } = input.body
       const requester = auth.credentials.iss
 
@@ -19,10 +22,34 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError(`Invalid collection: expected: ${collId}`)
       }
 
-      await ctx.services.graph(db).muteActorList({
-        list,
-        mutedByDid: requester,
-      })
+      const muteActorList = async () => {
+        await ctx.services.graph(db).muteActorList({
+          list,
+          mutedByDid: requester,
+        })
+      }
+
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.ADD,
+          actorDid: requester,
+          subject: list,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await muteActorList()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
+        }
+      }
     },
   })
 }

packages/bsky/src/api/app/bsky/graph/unmuteActor.ts

@@ -1,11 +1,14 @@
+import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
+import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.unmuteActor({
     auth: ctx.authVerifier.standard,
-    handler: async ({ auth, input }) => {
+    handler: async ({ req, auth, input }) => {
       const { actor } = input.body
       const requester = auth.credentials.iss
       const db = ctx.db.getPrimary()
@@ -18,10 +21,34 @@ export default function (server: Server, ctx: AppContext) {
         throw new InvalidRequestError('Cannot mute oneself')
       }
 
-      await ctx.services.graph(db).unmuteActor({
-        subjectDid,
-        mutedByDid: requester,
-      })
+      const unmuteActor = async () => {
+        await ctx.services.graph(db).unmuteActor({
+          subjectDid,
+          mutedByDid: requester,
+        })
+      }
+
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.REMOVE,
+          actorDid: requester,
+          subject: subjectDid,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await unmuteActor()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
+        }
+      }
     },
   })
 }

packages/bsky/src/api/app/bsky/graph/unmuteActorList.ts

@@ -1,18 +1,45 @@
+import assert from 'node:assert'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
+import { MuteOperation_Type } from '../../../../proto/bsync_pb'
+import { BsyncClient } from '../../../../bsync'
 
 export default function (server: Server, ctx: AppContext) {
   server.app.bsky.graph.unmuteActorList({
     auth: ctx.authVerifier.standard,
-    handler: async ({ auth, input }) => {
+    handler: async ({ req, auth, input }) => {
       const { list } = input.body
       const requester = auth.credentials.iss
       const db = ctx.db.getPrimary()
 
-      await ctx.services.graph(db).unmuteActorList({
-        list,
-        mutedByDid: requester,
-      })
+      const unmuteActorList = async () => {
+        await ctx.services.graph(db).unmuteActorList({
+          list,
+          mutedByDid: requester,
+        })
+      }
+
+      const addBsyncMuteOp = async (bsyncClient: BsyncClient) => {
+        await bsyncClient.addMuteOperation({
+          type: MuteOperation_Type.REMOVE,
+          actorDid: requester,
+          subject: list,
+        })
+      }
+
+      if (ctx.cfg.bsyncOnlyMutes) {
+        assert(ctx.bsyncClient)
+        await addBsyncMuteOp(ctx.bsyncClient)
+      } else {
+        await unmuteActorList()
+        if (ctx.bsyncClient) {
+          try {
+            await addBsyncMuteOp(ctx.bsyncClient)
+          } catch (err) {
+            req.log.warn(err, 'failed to sync mute op to bsync')
+          }
+        }
+      }
     },
   })
 }

packages/bsky/src/bsync.ts

@@ -0,0 +1,41 @@
+import { Service } from './proto/bsync_connect'
+import {
+  Code,
+  ConnectError,
+  PromiseClient,
+  createPromiseClient,
+  Interceptor,
+} from '@connectrpc/connect'
+import {
+  createConnectTransport,
+  ConnectTransportOptions,
+} from '@connectrpc/connect-node'
+
+export type BsyncClient = PromiseClient<typeof Service>
+
+export const createBsyncClient = (
+  opts: ConnectTransportOptions,
+): BsyncClient => {
+  const transport = createConnectTransport(opts)
+  return createPromiseClient(Service, transport)
+}
+
+export { Code }
+
+export const isBsyncError = (
+  err: unknown,
+  code?: Code,
+): err is ConnectError => {
+  if (err instanceof ConnectError) {
+    return !code || err.code === code
+  }
+  return false
+}
+
+export const authWithApiKey =
+  (apiKey: string): Interceptor =>
+  (next) =>
+  (req) => {
+    req.header.set('authorization', `Bearer ${apiKey}`)
+    return next(req)
+  }

packages/bsky/src/config.ts

@@ -31,6 +31,11 @@ export interface ServerConfigValues {
   imgUriEndpoint?: string
   blobCacheLocation?: string
   searchEndpoint?: string
+  bsyncUrl?: string
+  bsyncApiKey?: string
+  bsyncHttpVersion?: '1.1' | '2'
+  bsyncIgnoreBadTls?: boolean
+  bsyncOnlyMutes?: boolean
   adminPassword: string
   moderatorPassword: string
   triagePassword: string
@@ -88,6 +93,13 @@ export class ServerConfig {
     const imgUriEndpoint = process.env.IMG_URI_ENDPOINT
     const blobCacheLocation = process.env.BLOB_CACHE_LOC
     const searchEndpoint = process.env.SEARCH_ENDPOINT
+    const bsyncUrl = process.env.BSKY_BSYNC_URL || undefined
+    const bsyncApiKey = process.env.BSKY_BSYNC_API_KEY || undefined
+    const bsyncHttpVersion = process.env.BSKY_BSYNC_HTTP_VERSION || '2'
+    const bsyncIgnoreBadTls = process.env.BSKY_BSYNC_IGNORE_BAD_TLS === 'true'
+    const bsyncOnlyMutes = process.env.BSKY_BSYNC_ONLY_MUTES === 'true'
+    assert(!bsyncOnlyMutes || bsyncUrl, 'bsync-only mutes requires a bsync url')
+    assert(bsyncHttpVersion === '1.1' || bsyncHttpVersion === '2')
     const dbPrimaryPostgresUrl =
       overrides?.dbPrimaryPostgresUrl || process.env.DB_PRIMARY_POSTGRES_URL
     let dbReplicaPostgresUrls = overrides?.dbReplicaPostgresUrls
@@ -152,6 +164,11 @@ export class ServerConfig {
       imgUriEndpoint,
       blobCacheLocation,
       searchEndpoint,
+      bsyncUrl,
+      bsyncApiKey,
+      bsyncHttpVersion,
+      bsyncIgnoreBadTls,
+      bsyncOnlyMutes,
       adminPassword,
       moderatorPassword,
       triagePassword,
@@ -268,6 +285,26 @@ export class ServerConfig {
     return this.cfg.searchEndpoint
   }
 
+  get bsyncUrl() {
+    return this.cfg.bsyncUrl
+  }
+
+  get bsyncApiKey() {
+    return this.cfg.bsyncApiKey
+  }
+
+  get bsyncOnlyMutes() {
+    return this.cfg.bsyncOnlyMutes
+  }
+
+  get bsyncHttpVersion() {
+    return this.cfg.bsyncHttpVersion
+  }
+
+  get bsyncIgnoreBadTls() {
+    return this.cfg.bsyncIgnoreBadTls
+  }
+
   get adminPassword() {
     return this.cfg.adminPassword
   }