bsky: fix tests, making courier config optional. fix unread count query.

bluesky-social · Oct 4, 2024 · dd5fb01 · dd5fb01
1 parent a603380
commit dd5fb01
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 16 deletions.
diff --git a/packages/bsky/src/api/app/bsky/notification/registerPush.ts b/packages/bsky/src/api/app/bsky/notification/registerPush.ts
@@ -1,4 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import {
+  InvalidRequestError,
+  MethodNotImplementedError,
+} from '@atproto/xrpc-server'
 import { Server } from '../../../../lexicon'
 import AppContext from '../../../../context'
 import { AppPlatform } from '../../../../proto/courier_pb'
@@ -7,6 +10,11 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.notification.registerPush({
     auth: ctx.authVerifier.standard,
     handler: async ({ auth, input }) => {
+      if (!ctx.courierClient) {
+        throw new MethodNotImplementedError(
+          'This service is not configured to support push token registration.',
+        )
+      }
       const { token, platform, serviceDid, appId } = input.body
       const did = auth.credentials.iss
       if (serviceDid !== auth.credentials.aud) {

diff --git a/packages/bsky/src/api/app/bsky/notification/updateSeen.ts b/packages/bsky/src/api/app/bsky/notification/updateSeen.ts
@@ -21,7 +21,7 @@ export default function (server: Server, ctx: AppContext) {
           timestamp: Timestamp.fromDate(seenAt),
           priority: true,
         }),
-        ctx.courierClient.pushNotifications({
+        ctx.courierClient?.pushNotifications({
           notifications: [
             {
               id: getNotifId(viewer, seenAt),

diff --git a/packages/bsky/src/config.ts b/packages/bsky/src/config.ts
@@ -17,7 +17,7 @@ export interface ServerConfigValues {
   bsyncApiKey?: string
   bsyncHttpVersion?: '1.1' | '2'
   bsyncIgnoreBadTls?: boolean
-  courierUrl: string
+  courierUrl?: string
   courierApiKey?: string
   courierHttpVersion?: '1.1' | '2'
   courierIgnoreBadTls?: boolean
@@ -92,7 +92,6 @@ export class ServerConfig {
     const bsyncIgnoreBadTls = process.env.BSKY_BSYNC_IGNORE_BAD_TLS === 'true'
     assert(bsyncHttpVersion === '1.1' || bsyncHttpVersion === '2')
     const courierUrl = process.env.BSKY_COURIER_URL || undefined
-    assert(courierUrl)
     const courierApiKey = process.env.BSKY_COURIER_API_KEY || undefined
     const courierHttpVersion = process.env.BSKY_COURIER_HTTP_VERSION || '2'
     const courierIgnoreBadTls =

diff --git a/packages/bsky/src/context.ts b/packages/bsky/src/context.ts
@@ -30,7 +30,7 @@ export class AppContext {
       signingKey: Keypair
       idResolver: IdResolver
       bsyncClient: BsyncClient
-      courierClient: CourierClient
+      courierClient: CourierClient | undefined
       authVerifier: AuthVerifier
       featureGates: FeatureGates
     },
@@ -76,7 +76,7 @@ export class AppContext {
     return this.opts.bsyncClient
   }
 
-  get courierClient(): CourierClient {
+  get courierClient(): CourierClient | undefined {
     return this.opts.courierClient
   }
 

diff --git a/packages/bsky/src/data-plane/server/routes/notifs.ts b/packages/bsky/src/data-plane/server/routes/notifs.ts
@@ -116,7 +116,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
             .selectFrom('follow')
             .select(sql<boolean>`${true}`.as('val'))
             .where('creator', '=', actorDid)
-            .whereRef('subjectDid', '=', ref('notif.author')),
+            .whereRef('subjectDid', '=', ref('notification.author')),
         ),
       )
       .executeTakeFirst()

diff --git a/packages/bsky/src/index.ts b/packages/bsky/src/index.ts
@@ -110,14 +110,16 @@ export class BskyAppView {
       interceptors: config.bsyncApiKey ? [bsyncAuth(config.bsyncApiKey)] : [],
     })
 
-    const courierClient = createCourierClient({
-      baseUrl: config.courierUrl,
-      httpVersion: config.courierHttpVersion ?? '2',
-      nodeOptions: { rejectUnauthorized: !config.courierIgnoreBadTls },
-      interceptors: config.courierApiKey
-        ? [courierAuth(config.courierApiKey)]
-        : [],
-    })
+    const courierClient = config.courierUrl
+      ? createCourierClient({
+          baseUrl: config.courierUrl,
+          httpVersion: config.courierHttpVersion ?? '2',
+          nodeOptions: { rejectUnauthorized: !config.courierIgnoreBadTls },
+          interceptors: config.courierApiKey
+            ? [courierAuth(config.courierApiKey)]
+            : [],
+        })
+      : undefined
 
     const entrywayJwtPublicKey = config.entrywayJwtPublicKeyHex
       ? createPublicKeyObject(config.entrywayJwtPublicKeyHex)

diff --git a/packages/dev-env/src/bsky.ts b/packages/dev-env/src/bsky.ts
@@ -62,7 +62,6 @@ export class TestBsky {
       dataplaneHttpVersion: '1.1',
       bsyncUrl: `http://localhost:${bsyncPort}`,
       bsyncHttpVersion: '1.1',
-      courierUrl: 'https://fake.example',
       modServiceDid: cfg.modServiceDid ?? 'did:example:invalidMod',
       labelsFromIssuerDids: [EXAMPLE_LABELER],
       ...cfg,