@atproto/bsky 0.0.199 → 0.0.201

package/src/api/app/bsky/contact/importContacts.ts

@@ -0,0 +1,118 @@
+import { mapDefined } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
+import { Server } from '../../../../lexicon'
+import { MatchAndContactIndex } from '../../../../lexicon/types/app/bsky/contact/defs'
+import { InputSchema } from '../../../../lexicon/types/app/bsky/contact/importContacts'
+import {
+  HydrationFnInput,
+  SkeletonFnInput,
+  createPipeline,
+  noRules,
+} from '../../../../pipeline'
+import { ImportContactsMatch } from '../../../../proto/rolodex_pb'
+import { RolodexClient } from '../../../../rolodex'
+import { Views } from '../../../../views'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  const importContacts = createPipeline(
+    skeleton,
+    hydration,
+    noRules, //
+    presentation,
+  )
+  server.app.bsky.contact.importContacts({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ input, auth, req }) => {
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const viewer = auth.credentials.iss
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+      })
+
+      const result = await importContacts(
+        { ...input.body, hydrateCtx: hydrateCtx.copy({ viewer }) },
+        ctx,
+      )
+
+      return {
+        encoding: 'application/json',
+        body: result,
+      }
+    },
+  })
+}
+
+const skeleton = async (
+  input: SkeletonFnInput<Context, Params>,
+): Promise<SkeletonState> => {
+  const { params, ctx } = input
+  const actor = params.hydrateCtx.viewer
+  // TODO: Error handling.
+  const { matches } = await ctx.rolodexClient.importContacts({
+    actor: params.hydrateCtx.viewer,
+    contacts: params.contacts,
+    token: params.token,
+  })
+  return {
+    actor,
+    matches,
+  }
+}
+
+const hydration = async (
+  input: HydrationFnInput<Context, Params, SkeletonState>,
+) => {
+  const { ctx, params, skeleton } = input
+  const { matches } = skeleton
+  const subjects = matches.map((m) => m.subject)
+  return ctx.hydrator.hydrateProfiles(subjects, params.hydrateCtx)
+}
+
+const presentation = (input: {
+  ctx: Context
+  params: Params
+  skeleton: SkeletonState
+  hydration: HydrationState
+}) => {
+  const { ctx, skeleton, hydration } = input
+  const matchesAndContactIndexes = mapDefined(
+    skeleton.matches,
+    ({ subject, inputIndex }): MatchAndContactIndex | undefined => {
+      const profile = ctx.views.profile(subject, hydration)
+
+      if (!profile) {
+        return undefined
+      }
+
+      return {
+        contactIndex: inputIndex,
+        match: profile,
+      }
+    },
+  )
+  return { matchesAndContactIndexes }
+}
+
+type Context = {
+  hydrator: Hydrator
+  rolodexClient: RolodexClient
+  views: Views
+}
+
+type Params = InputSchema & {
+  hydrateCtx: HydrateCtx & { viewer: string }
+}
+
+type SkeletonState = {
+  actor: string
+  matches: ImportContactsMatch[]
+}

package/src/api/app/bsky/contact/removeData.ts

@@ -0,0 +1,23 @@
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.contact.removeData({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ auth }) => {
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const actor = auth.credentials.iss
+      // TODO: Error handling.
+      await ctx.rolodexClient.removeData({
+        actor,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {},
+      }
+    },
+  })
+}

package/src/api/app/bsky/contact/sendNotification.ts

@@ -0,0 +1,32 @@
+import { TID } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { Namespaces } from '../../../../stash'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.contact.sendNotification({
+    auth: ctx.authVerifier.role,
+    handler: async ({ input }) => {
+      // Assert rolodex even though we don't call it, it is a proxy to whether the app is configured with contact import support.
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const { from, to } = input.body
+
+      await ctx.stashClient.create({
+        actorDid: from,
+        namespace: Namespaces.AppBskyContactDefsNotification,
+        payload: {
+          from,
+          to,
+        },
+        key: TID.nextStr(),
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {},
+      }
+    },
+  })
+}

package/src/api/app/bsky/contact/startPhoneVerification.ts

@@ -0,0 +1,24 @@
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.contact.startPhoneVerification({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ auth, input }) => {
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const actor = auth.credentials.iss
+      // TODO: Error handling.
+      await ctx.rolodexClient.startPhoneVerification({
+        actor,
+        phone: input.body.phone,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {},
+      }
+    },
+  })
+}

package/src/api/app/bsky/contact/util.ts

@@ -0,0 +1,13 @@
+import { MethodNotImplementedError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../..'
+import { RolodexClient } from '../../../../rolodex'
+
+export function assertRolodexOrThrowUnimplemented(
+  ctx: AppContext,
+): asserts ctx is AppContext & { rolodexClient: RolodexClient } {
+  if (!ctx.rolodexClient) {
+    throw new MethodNotImplementedError(
+      'This service is not configured to support contact imports.',
+    )
+  }
+}

package/src/api/app/bsky/contact/verifyPhone.ts

@@ -0,0 +1,27 @@
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRolodexOrThrowUnimplemented } from './util'
+
+export default function (server: Server, ctx: AppContext) {
+  server.app.bsky.contact.verifyPhone({
+    auth: ctx.authVerifier.standard,
+    handler: async ({ auth, input }) => {
+      assertRolodexOrThrowUnimplemented(ctx)
+
+      const actor = auth.credentials.iss
+      // TODO: Error handling.
+      const res = await ctx.rolodexClient.verifyPhone({
+        actor,
+        verificationCode: input.body.code,
+        phone: input.body.phone,
+      })
+
+      return {
+        encoding: 'application/json',
+        body: {
+          token: res.token,
+        },
+      }
+    },
+  })
+}

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

@@ -26,6 +26,10 @@ export default function (server: Server, ctx: AppContext) {
               did,
               following: subject.following,
               followedBy: subject.followedBy,
+              blocking: subject.blocking,
+              blockedBy: subject.blockedBy,
+              blockingByList: subject.blockingByList,
+              blockedByList: subject.blockedByList,
             }
           : {
               $type: 'app.bsky.graph.defs#notFoundActor',

package/src/api/index.ts

@@ -11,6 +11,13 @@ import aaGetState from './app/bsky/ageassurance/getState'
 import createBookmark from './app/bsky/bookmark/createBookmark'
 import deleteBookmark from './app/bsky/bookmark/deleteBookmark'
 import getBookmarks from './app/bsky/bookmark/getBookmarks'
+import dismissMatch from './app/bsky/contact/dismissMatch'
+import getMatches from './app/bsky/contact/getMatches'
+import getSyncStatus from './app/bsky/contact/getSyncStatus'
+import importContacts from './app/bsky/contact/importContacts'
+import removeData from './app/bsky/contact/removeData'
+import startPhoneVerification from './app/bsky/contact/startPhoneVerification'
+import verifyPhone from './app/bsky/contact/verifyPhone'
 import getActorFeeds from './app/bsky/feed/getActorFeeds'
 import getActorLikes from './app/bsky/feed/getActorLikes'
 import getAuthorFeed from './app/bsky/feed/getAuthorFeed'
@@ -94,6 +101,13 @@ export default function (server: Server, ctx: AppContext) {
   createBookmark(server, ctx)
   deleteBookmark(server, ctx)
   getBookmarks(server, ctx)
+  dismissMatch(server, ctx)
+  getMatches(server, ctx)
+  getSyncStatus(server, ctx)
+  importContacts(server, ctx)
+  removeData(server, ctx)
+  startPhoneVerification(server, ctx)
+  verifyPhone(server, ctx)
   getActorFeeds(server, ctx)
   getSuggestedFeeds(server, ctx)
   getAuthorFeed(server, ctx)

package/src/config.ts

@@ -55,6 +55,10 @@ export interface ServerConfigValues {
   courierApiKey?: string
   courierHttpVersion?: '1.1' | '2'
   courierIgnoreBadTls?: boolean
+  rolodexUrl?: string
+  rolodexApiKey?: string
+  rolodexHttpVersion?: '1.1' | '2'
+  rolodexIgnoreBadTls?: boolean
   searchUrl?: string
   searchTagsHide: Set<string>
   suggestionsUrl?: string
@@ -186,6 +190,12 @@ export class ServerConfig {
     const courierIgnoreBadTls =
       process.env.BSKY_COURIER_IGNORE_BAD_TLS === 'true'
     assert(courierHttpVersion === '1.1' || courierHttpVersion === '2')
+    const rolodexUrl = process.env.BSKY_ROLODEX_URL || undefined
+    const rolodexApiKey = process.env.BSKY_ROLODEX_API_KEY || undefined
+    const rolodexHttpVersion = process.env.BSKY_ROLODEX_HTTP_VERSION || '2'
+    const rolodexIgnoreBadTls =
+      process.env.BSKY_ROLODEX_IGNORE_BAD_TLS === 'true'
+    assert(rolodexHttpVersion === '1.1' || rolodexHttpVersion === '2')
     const blobRateLimitBypassKey =
       process.env.BSKY_BLOB_RATE_LIMIT_BYPASS_KEY || undefined
     // single domain would be e.g. "mypds.com", subdomains are supported with a leading dot e.g. ".mypds.com"
@@ -347,6 +357,10 @@ export class ServerConfig {
       courierApiKey,
       courierHttpVersion,
       courierIgnoreBadTls,
+      rolodexUrl,
+      rolodexApiKey,
+      rolodexHttpVersion,
+      rolodexIgnoreBadTls,
       blobRateLimitBypassKey,
       blobRateLimitBypassHostname,
       adminPasswords,
@@ -470,6 +484,19 @@ export class ServerConfig {
     return this.cfg.courierIgnoreBadTls
   }
 
+  get rolodexUrl() {
+    return this.cfg.rolodexUrl
+  }
+  get rolodexApiKey() {
+    return this.cfg.rolodexApiKey
+  }
+  get rolodexHttpVersion() {
+    return this.cfg.rolodexHttpVersion
+  }
+  get rolodexIgnoreBadTls() {
+    return this.cfg.rolodexIgnoreBadTls
+  }
+
   get searchUrl() {
     return this.cfg.searchUrl
   }

package/src/context.ts

@@ -14,6 +14,7 @@ import { FeatureGates } from './feature-gates'
 import { Hydrator } from './hydration/hydrator'
 import { KwsClient } from './kws'
 import { httpLogger as log } from './logger'
+import { RolodexClient } from './rolodex'
 import { StashClient } from './stash'
 import {
   ParsedLabelers,
@@ -39,6 +40,7 @@ export class AppContext {
       bsyncClient: BsyncClient
       stashClient: StashClient
       courierClient: CourierClient | undefined
+      rolodexClient: RolodexClient | undefined
       authVerifier: AuthVerifier
       featureGates: FeatureGates
       blobDispatcher: Dispatcher
@@ -106,6 +108,10 @@ export class AppContext {
     return this.opts.courierClient
   }
 
+  get rolodexClient(): RolodexClient | undefined {
+    return this.opts.rolodexClient
+  }
+
   get authVerifier(): AuthVerifier {
     return this.opts.authVerifier
   }

package/src/hydration/actor.ts

@@ -179,7 +179,7 @@ export class ActorHydrator {
         return acc.set(did, null)
       }
 
-      const profile = actor.profile
+      const profile = actor.profile?.record
         ? parseRecord<ProfileRecord>(actor.profile, includeTakedowns)
         : undefined
 

package/src/index.ts

@@ -30,6 +30,7 @@ import { ImageUriBuilder } from './image/uri'
 import { createKwsClient } from './kws'
 import { createServer } from './lexicon'
 import { loggerMiddleware } from './logger'
+import { authWithApiKey as rolodexAuth, createRolodexClient } from './rolodex'
 import { createStashClient } from './stash'
 import { Views } from './views'
 import { VideoUriBuilder } from './views/util'
@@ -156,6 +157,17 @@ export class BskyAppView {
         })
       : undefined
 
+    const rolodexClient = config.rolodexUrl
+      ? createRolodexClient({
+          baseUrl: config.rolodexUrl,
+          httpVersion: config.rolodexHttpVersion ?? '2',
+          nodeOptions: { rejectUnauthorized: !config.rolodexIgnoreBadTls },
+          interceptors: config.rolodexApiKey
+            ? [rolodexAuth(config.rolodexApiKey)]
+            : [],
+        })
+      : undefined
+
     const kwsClient = config.kws ? createKwsClient(config.kws) : undefined
 
     const entrywayJwtPublicKey = config.entrywayJwtPublicKeyHex
@@ -191,6 +203,7 @@ export class BskyAppView {
       bsyncClient,
       stashClient,
       courierClient,
+      rolodexClient,
       authVerifier,
       featureGates,
       blobDispatcher,

package/src/lexicon/index.ts

@@ -23,6 +23,14 @@ import * as AppBskyAgeassuranceGetState from './types/app/bsky/ageassurance/getS
 import * as AppBskyBookmarkCreateBookmark from './types/app/bsky/bookmark/createBookmark.js'
 import * as AppBskyBookmarkDeleteBookmark from './types/app/bsky/bookmark/deleteBookmark.js'
 import * as AppBskyBookmarkGetBookmarks from './types/app/bsky/bookmark/getBookmarks.js'
+import * as AppBskyContactDismissMatch from './types/app/bsky/contact/dismissMatch.js'
+import * as AppBskyContactGetMatches from './types/app/bsky/contact/getMatches.js'
+import * as AppBskyContactGetSyncStatus from './types/app/bsky/contact/getSyncStatus.js'
+import * as AppBskyContactImportContacts from './types/app/bsky/contact/importContacts.js'
+import * as AppBskyContactRemoveData from './types/app/bsky/contact/removeData.js'
+import * as AppBskyContactSendNotification from './types/app/bsky/contact/sendNotification.js'
+import * as AppBskyContactStartPhoneVerification from './types/app/bsky/contact/startPhoneVerification.js'
+import * as AppBskyContactVerifyPhone from './types/app/bsky/contact/verifyPhone.js'
 import * as AppBskyFeedDescribeFeedGenerator from './types/app/bsky/feed/describeFeedGenerator.js'
 import * as AppBskyFeedGetActorFeeds from './types/app/bsky/feed/getActorFeeds.js'
 import * as AppBskyFeedGetActorLikes from './types/app/bsky/feed/getActorLikes.js'
@@ -276,6 +284,7 @@ export class AppBskyNS {
   actor: AppBskyActorNS
   ageassurance: AppBskyAgeassuranceNS
   bookmark: AppBskyBookmarkNS
+  contact: AppBskyContactNS
   embed: AppBskyEmbedNS
   feed: AppBskyFeedNS
   graph: AppBskyGraphNS
@@ -290,6 +299,7 @@ export class AppBskyNS {
     this.actor = new AppBskyActorNS(server)
     this.ageassurance = new AppBskyAgeassuranceNS(server)
     this.bookmark = new AppBskyBookmarkNS(server)
+    this.contact = new AppBskyContactNS(server)
     this.embed = new AppBskyEmbedNS(server)
     this.feed = new AppBskyFeedNS(server)
     this.graph = new AppBskyGraphNS(server)
@@ -481,6 +491,110 @@ export class AppBskyBookmarkNS {
   }
 }
 
+export class AppBskyContactNS {
+  _server: Server
+
+  constructor(server: Server) {
+    this._server = server
+  }
+
+  dismissMatch<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactDismissMatch.QueryParams,
+      AppBskyContactDismissMatch.HandlerInput,
+      AppBskyContactDismissMatch.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.dismissMatch' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getMatches<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactGetMatches.QueryParams,
+      AppBskyContactGetMatches.HandlerInput,
+      AppBskyContactGetMatches.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.getMatches' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  getSyncStatus<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactGetSyncStatus.QueryParams,
+      AppBskyContactGetSyncStatus.HandlerInput,
+      AppBskyContactGetSyncStatus.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.getSyncStatus' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  importContacts<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactImportContacts.QueryParams,
+      AppBskyContactImportContacts.HandlerInput,
+      AppBskyContactImportContacts.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.importContacts' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  removeData<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactRemoveData.QueryParams,
+      AppBskyContactRemoveData.HandlerInput,
+      AppBskyContactRemoveData.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.removeData' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  sendNotification<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactSendNotification.QueryParams,
+      AppBskyContactSendNotification.HandlerInput,
+      AppBskyContactSendNotification.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.sendNotification' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  startPhoneVerification<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactStartPhoneVerification.QueryParams,
+      AppBskyContactStartPhoneVerification.HandlerInput,
+      AppBskyContactStartPhoneVerification.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.startPhoneVerification' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
+  verifyPhone<A extends Auth = void>(
+    cfg: MethodConfigOrHandler<
+      A,
+      AppBskyContactVerifyPhone.QueryParams,
+      AppBskyContactVerifyPhone.HandlerInput,
+      AppBskyContactVerifyPhone.HandlerOutput
+    >,
+  ) {
+    const nsid = 'app.bsky.contact.verifyPhone' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+}
+
 export class AppBskyEmbedNS {
   _server: Server