@atproto/bsky 0.0.156 → 0.0.158

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

@@ -0,0 +1,123 @@
+import { Un$Typed } from '@atproto/api'
+import {
+  ChatPreference,
+  FilterablePreference,
+  Preference,
+  Preferences,
+} from '../../../../lexicon/types/app/bsky/notification/defs'
+import {
+  ChatNotificationFilter,
+  ChatNotificationPreference,
+  FilterableNotificationPreference,
+  NotificationFilter,
+  NotificationPreference,
+  NotificationPreferences,
+} from '../../../../proto/bsky_pb'
+
+type DeepPartial<T> = T extends object
+  ? {
+      [P in keyof T]?: DeepPartial<T[P]>
+    }
+  : T
+
+const ensureChatPreference = (
+  p?: DeepPartial<ChatPreference>,
+): ChatPreference => {
+  const filters = ['all', 'accepted']
+  return {
+    filter:
+      typeof p?.filter === 'string' && filters.includes(p.filter)
+        ? p.filter
+        : 'all',
+    push: p?.push ?? true,
+  }
+}
+
+const ensureFilterablePreference = (
+  p?: DeepPartial<FilterablePreference>,
+): FilterablePreference => {
+  const filters = ['all', 'follows']
+  return {
+    filter:
+      typeof p?.filter === 'string' && filters.includes(p.filter)
+        ? p.filter
+        : 'all',
+    list: p?.list ?? true,
+    push: p?.push ?? true,
+  }
+}
+
+const ensurePreference = (p?: DeepPartial<Preference>): Preference => {
+  return {
+    list: p?.list ?? true,
+    push: p?.push ?? true,
+  }
+}
+
+const ensurePreferences = (
+  p: DeepPartial<Preferences>,
+): Un$Typed<Preferences> => {
+  return {
+    chat: ensureChatPreference(p.chat),
+    follow: ensureFilterablePreference(p.follow),
+    like: ensureFilterablePreference(p.like),
+    likeViaRepost: ensureFilterablePreference(p.likeViaRepost),
+    mention: ensureFilterablePreference(p.mention),
+    quote: ensureFilterablePreference(p.quote),
+    reply: ensureFilterablePreference(p.reply),
+    repost: ensureFilterablePreference(p.repost),
+    repostViaRepost: ensureFilterablePreference(p.repostViaRepost),
+    starterpackJoined: ensurePreference(p.starterpackJoined),
+    subscribedPost: ensurePreference(p.subscribedPost),
+    unverified: ensurePreference(p.unverified),
+    verified: ensurePreference(p.verified),
+  }
+}
+
+const protobufChatPreferenceToLex = (
+  p?: DeepPartial<ChatNotificationPreference>,
+): DeepPartial<ChatPreference> => {
+  return {
+    filter: p?.filter === ChatNotificationFilter.ACCEPTED ? 'accepted' : 'all',
+    push: p?.push?.enabled,
+  }
+}
+
+const protobufFilterablePreferenceToLex = (
+  p?: DeepPartial<FilterableNotificationPreference>,
+): DeepPartial<FilterablePreference> => {
+  return {
+    filter: p?.filter === NotificationFilter.FOLLOWS ? 'follows' : 'all',
+    list: p?.list?.enabled,
+    push: p?.push?.enabled,
+  }
+}
+
+const protobufPreferenceToLex = (
+  p?: DeepPartial<NotificationPreference>,
+): DeepPartial<Preference> => {
+  return {
+    list: p?.list?.enabled,
+    push: p?.push?.enabled,
+  }
+}
+
+export const protobufToLex = (
+  res: DeepPartial<NotificationPreferences>,
+): Un$Typed<Preferences> => {
+  return ensurePreferences({
+    chat: protobufChatPreferenceToLex(res.chat),
+    follow: protobufFilterablePreferenceToLex(res.follow),
+    like: protobufFilterablePreferenceToLex(res.like),
+    likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),
+    mention: protobufFilterablePreferenceToLex(res.mention),
+    quote: protobufFilterablePreferenceToLex(res.quote),
+    reply: protobufFilterablePreferenceToLex(res.reply),
+    repost: protobufFilterablePreferenceToLex(res.repost),
+    repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),
+    starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),
+    subscribedPost: protobufPreferenceToLex(res.subscribedPost),
+    unverified: protobufPreferenceToLex(res.unverified),
+    verified: protobufPreferenceToLex(res.verified),
+  })
+}

package/src/api/index.ts

@@ -42,9 +42,11 @@ import unmuteActor from './app/bsky/graph/unmuteActor'
 import unmuteActorList from './app/bsky/graph/unmuteActorList'
 import unmuteThread from './app/bsky/graph/unmuteThread'
 import getLabelerServices from './app/bsky/labeler/getServices'
+import getPreferences from './app/bsky/notification/getPreferences'
 import getUnreadCount from './app/bsky/notification/getUnreadCount'
 import listNotifications from './app/bsky/notification/listNotifications'
 import putPreferences from './app/bsky/notification/putPreferences'
+import putPreferencesV2 from './app/bsky/notification/putPreferencesV2'
 import registerPush from './app/bsky/notification/registerPush'
 import updateSeen from './app/bsky/notification/updateSeen'
 import getConfig from './app/bsky/unspecced/getConfig'
@@ -122,10 +124,12 @@ export default function (server: Server, ctx: AppContext) {
   searchActors(server, ctx)
   searchActorsTypeahead(server, ctx)
   getSuggestions(server, ctx)
+  getPreferences(server, ctx)
   getUnreadCount(server, ctx)
   listNotifications(server, ctx)
   updateSeen(server, ctx)
   putPreferences(server, ctx)
+  putPreferencesV2(server, ctx)
   registerPush(server, ctx)
   getConfig(server, ctx)
   getPopularFeedGenerators(server, ctx)

package/src/context.ts

@@ -13,6 +13,7 @@ import { DataPlaneClient, HostList } from './data-plane/client'
 import { FeatureGates } from './feature-gates'
 import { Hydrator } from './hydration/hydrator'
 import { httpLogger as log } from './logger'
+import { StashClient } from './stash'
 import {
   ParsedLabelers,
   defaultLabelerHeader,
@@ -35,6 +36,7 @@ export class AppContext {
       signingKey: Keypair
       idResolver: IdResolver
       bsyncClient: BsyncClient
+      stashClient: StashClient
       courierClient: CourierClient | undefined
       authVerifier: AuthVerifier
       featureGates: FeatureGates
@@ -94,6 +96,10 @@ export class AppContext {
     return this.opts.bsyncClient
   }
 
+  get stashClient(): StashClient {
+    return this.opts.stashClient
+  }
+
   get courierClient(): CourierClient | undefined {
     return this.opts.courierClient
   }

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

@@ -4,10 +4,15 @@ import http from 'node:http'
 import { ConnectRouter } from '@connectrpc/connect'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
 import express from 'express'
+import { TID } from '@atproto/common'
 import { AtUri } from '@atproto/syntax'
 import { ids } from '../../lexicon/lexicons'
 import { Service } from '../../proto/bsync_connect'
-import { MuteOperation_Type } from '../../proto/bsync_pb'
+import {
+  Method,
+  MuteOperation_Type,
+  PutOperationRequest,
+} from '../../proto/bsync_pb'
 import { Database } from '../server/db'
 
 export class MockBsync {
@@ -138,7 +143,110 @@ const createRoutes = (db: Database) => (router: ConnectRouter) =>
       throw new Error('not implemented')
     },
 
+    async putOperation(req) {
+      const { actorDid, namespace, key, method, payload } = req
+      if (
+        method !== Method.CREATE &&
+        method !== Method.UPDATE &&
+        method !== Method.DELETE
+      ) {
+        throw new Error(`Unsupported method: ${method}`)
+      }
+
+      const now = new Date().toISOString()
+      if (namespace === 'app.bsky.notification.defs#preferences') {
+        await handleNotificationPreferencesOperation(db, req, now)
+      } else {
+        await handleGenericOperation(db, req, now)
+      }
+
+      return {
+        operation: {
+          id: TID.nextStr(),
+          actorDid,
+          namespace,
+          key,
+          method,
+          payload,
+        },
+      }
+    },
+
+    async scanOperations() {
+      throw new Error('not implemented')
+    },
+
     async ping() {
       return {}
     },
   })
+
+const handleNotificationPreferencesOperation = async (
+  db: Database,
+  req: PutOperationRequest,
+  now: string,
+) => {
+  const { actorDid, namespace, key, method, payload } = req
+  if (method === Method.CREATE || method === Method.UPDATE) {
+    return db.db
+      .insertInto('private_data')
+      .values({
+        actorDid,
+        namespace,
+        key,
+        payload: Buffer.from(payload).toString('utf8'),
+        indexedAt: now,
+        updatedAt: now,
+      })
+      .onConflict((oc) =>
+        oc.columns(['actorDid', 'namespace', 'key']).doUpdateSet({
+          payload: Buffer.from(payload).toString('utf8'),
+          updatedAt: now,
+        }),
+      )
+      .execute()
+  }
+
+  return handleGenericOperation(db, req, now)
+}
+
+const handleGenericOperation = async (
+  db: Database,
+  req: PutOperationRequest,
+  now: string,
+) => {
+  const { actorDid, namespace, key, method, payload } = req
+  if (method === Method.CREATE) {
+    return db.db
+      .insertInto('private_data')
+      .values({
+        actorDid,
+        namespace,
+        key,
+        payload: Buffer.from(payload).toString('utf8'),
+        indexedAt: now,
+        updatedAt: now,
+      })
+      .execute()
+  }
+
+  if (method === Method.UPDATE) {
+    return db.db
+      .updateTable('private_data')
+      .where('actorDid', '=', actorDid)
+      .where('namespace', '=', namespace)
+      .where('key', '=', key)
+      .set({
+        payload: Buffer.from(payload).toString('utf8'),
+        updatedAt: now,
+      })
+      .execute()
+  }
+
+  return db.db
+    .deleteFrom('private_data')
+    .where('actorDid', '=', actorDid)
+    .where('namespace', '=', namespace)
+    .where('key', '=', key)
+    .execute()
+}

package/src/data-plane/server/db/database-schema.ts

@@ -24,6 +24,7 @@ import * as post from './tables/post'
 import * as postAgg from './tables/post-agg'
 import * as postEmbed from './tables/post-embed'
 import * as postgate from './tables/post-gate'
+import * as privateData from './tables/private-data'
 import * as profile from './tables/profile'
 import * as profileAgg from './tables/profile-agg'
 import * as quote from './tables/quote'
@@ -77,6 +78,7 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   starterPack.PartialDB &
   taggedSuggestion.PartialDB &
   quote.PartialDB &
-  verification.PartialDB
+  verification.PartialDB &
+  privateData.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>

package/src/data-plane/server/db/db.ts

@@ -19,6 +19,8 @@ import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
 import { PgOptions } from './types'
 
+export type { DatabaseSchema }
+
 export class Database {
   pool: PgPool
   db: DatabaseSchema

package/src/data-plane/server/db/index.ts

@@ -1 +1,2 @@
 export * from './db'
+export type { DatabaseSchema } from './db'

package/src/data-plane/server/db/migrations/20250602T190357447Z-add-private-data.ts

@@ -0,0 +1,22 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .createTable('private_data')
+    .addColumn('actorDid', 'varchar', (col) => col.notNull())
+    .addColumn('namespace', 'varchar', (col) => col.notNull())
+    .addColumn('key', 'varchar', (col) => col.notNull())
+    .addColumn('payload', 'text', (col) => col.notNull())
+    .addColumn('indexedAt', 'varchar', (col) => col.notNull())
+    .addColumn('updatedAt', 'varchar', (col) => col.notNull())
+    .addPrimaryKeyConstraint('private_data_pkey', [
+      'actorDid',
+      'namespace',
+      'key',
+    ])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropTable('private_data').execute()
+}

package/src/data-plane/server/db/migrations/index.ts

@@ -50,3 +50,4 @@ export * as _20250207T174822012Z from './20250207T174822012Z-add-label-exp'
 export * as _20250404T163421487Z from './20250404T163421487Z-verifications'
 export * as _20250526T023712742Z from './20250526T023712742Z-like-repost-via'
 export * as _20250528T221913281Z from './20250528T221913281Z-add-record-tags'
+export * as _20250602T190357447Z from './20250602T190357447Z-add-private-data'

package/src/data-plane/server/db/tables/private-data.ts

@@ -0,0 +1,13 @@
+export interface PrivateData {
+  actorDid: string
+  namespace: string
+  key: string
+  // JSON-encoded
+  payload: string
+  indexedAt: string
+  updatedAt: string
+}
+
+export const tableName = 'private_data'
+
+export type PartialDB = { [tableName]: PrivateData }

package/src/data-plane/server/db/tables/record.ts

@@ -1,3 +1,5 @@
+import { ColumnType } from 'kysely'
+
 export interface Record {
   uri: string
   cid: string
@@ -5,7 +7,7 @@ export interface Record {
   json: string
   indexedAt: string
   takedownRef: string | null
-  tags: string[] | null
+  tags: ColumnType<string[] | null, string | undefined, string> | null
 }
 
 export const tableName = 'record'

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

@@ -3,9 +3,11 @@ import http from 'node:http'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
 import express from 'express'
 import { IdResolver, MemoryCache } from '@atproto/identity'
-import { Database } from './db'
+import { Database, DatabaseSchema } from './db'
 import createRoutes from './routes'
 
+export type { DatabaseSchema }
+
 export { RepoSubscription } from './subscription'
 
 export class DataPlaneServer {

package/src/data-plane/server/routes/index.ts

@@ -14,6 +14,7 @@ import lists from './lists'
 import moderation from './moderation'
 import mutes from './mutes'
 import notifs from './notifs'
+import privateData from './private-data'
 import profile from './profile'
 import quotes from './quotes'
 import records from './records'
@@ -40,6 +41,7 @@ export default (db: Database, idResolver: IdResolver) =>
       ...moderation(db),
       ...mutes(db),
       ...notifs(db),
+      ...privateData(db),
       ...profile(db),
       ...quotes(db),
       ...records(db),

package/src/data-plane/server/routes/private-data.ts

@@ -0,0 +1,94 @@
+import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
+import {
+  ChatPreference,
+  FilterablePreference,
+  Preference,
+  Preferences,
+} from '../../../lexicon/types/app/bsky/notification/defs'
+import { Service } from '../../../proto/bsky_connect'
+import {
+  ChatNotificationFilter,
+  ChatNotificationPreference,
+  FilterableNotificationPreference,
+  NotificationFilter,
+  NotificationPreference,
+  NotificationPreferences,
+} from '../../../proto/bsky_pb'
+import { Database } from '../db'
+
+export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
+  async getNotificationPreferences(req) {
+    const { dids } = req
+    const res = await db.db
+      .selectFrom('private_data')
+      .selectAll()
+      .where('actorDid', 'in', dids)
+      .where('namespace', '=', 'app.bsky.notification.defs#preferences')
+      .where('key', '=', 'self')
+      .execute()
+
+    const byDid = keyBy(res, 'actorDid')
+    const preferences = dids.map((did) => {
+      const row = byDid.get(did)
+      if (!row) {
+        return {}
+      }
+      const p: Preferences = JSON.parse(row.payload)
+      return lexToProtobuf(p, row.payload)
+    })
+
+    return { preferences }
+  },
+})
+
+export const lexToProtobuf = (
+  p: Preferences,
+  json: string,
+): NotificationPreferences => {
+  return new NotificationPreferences({
+    entry: Buffer.from(json),
+    chat: lexChatPreferenceToProtobuf(p.chat),
+    follow: lexFilterablePreferenceToProtobuf(p.follow),
+    like: lexFilterablePreferenceToProtobuf(p.like),
+    likeViaRepost: lexFilterablePreferenceToProtobuf(p.likeViaRepost),
+    mention: lexFilterablePreferenceToProtobuf(p.mention),
+    quote: lexFilterablePreferenceToProtobuf(p.quote),
+    reply: lexFilterablePreferenceToProtobuf(p.reply),
+    repost: lexFilterablePreferenceToProtobuf(p.repost),
+    repostViaRepost: lexFilterablePreferenceToProtobuf(p.repostViaRepost),
+    starterpackJoined: lexPreferenceToProtobuf(p.starterpackJoined),
+    subscribedPost: lexPreferenceToProtobuf(p.subscribedPost),
+    unverified: lexPreferenceToProtobuf(p.unverified),
+    verified: lexPreferenceToProtobuf(p.verified),
+  })
+}
+
+const lexChatPreferenceToProtobuf = (
+  p: ChatPreference,
+): ChatNotificationPreference =>
+  new ChatNotificationPreference({
+    filter:
+      p.filter === 'accepted'
+        ? ChatNotificationFilter.ACCEPTED
+        : ChatNotificationFilter.ALL,
+    push: { enabled: p.push ?? true },
+  })
+
+const lexFilterablePreferenceToProtobuf = (
+  p: FilterablePreference,
+): FilterableNotificationPreference =>
+  new FilterableNotificationPreference({
+    filter:
+      p.filter === 'follows'
+        ? NotificationFilter.FOLLOWS
+        : NotificationFilter.ALL,
+    list: { enabled: p.list ?? true },
+    push: { enabled: p.push ?? true },
+  })
+
+const lexPreferenceToProtobuf = (p: Preference): NotificationPreference =>
+  new NotificationPreference({
+    list: { enabled: p.list ?? true },
+    push: { enabled: p.push ?? true },
+  })

package/src/index.ts

@@ -29,6 +29,7 @@ import * as imageServer from './image/server'
 import { ImageUriBuilder } from './image/uri'
 import { createServer } from './lexicon'
 import { loggerMiddleware } from './logger'
+import { createStashClient } from './stash'
 import { Views } from './views'
 import { VideoUriBuilder } from './views/util'
 
@@ -136,6 +137,8 @@ export class BskyAppView {
       interceptors: config.bsyncApiKey ? [bsyncAuth(config.bsyncApiKey)] : [],
     })
 
+    const stashClient = createStashClient(bsyncClient)
+
     const courierClient = config.courierUrl
       ? createCourierClient({
           baseUrl: config.courierUrl,
@@ -178,6 +181,7 @@ export class BskyAppView {
       signingKey,
       idResolver,
       bsyncClient,
+      stashClient,
       courierClient,
       authVerifier,
       featureGates,

package/src/lexicon/index.ts

@@ -138,9 +138,11 @@ import * as AppBskyGraphUnmuteActor from './types/app/bsky/graph/unmuteActor.js'
 import * as AppBskyGraphUnmuteActorList from './types/app/bsky/graph/unmuteActorList.js'
 import * as AppBskyGraphUnmuteThread from './types/app/bsky/graph/unmuteThread.js'
 import * as AppBskyLabelerGetServices from './types/app/bsky/labeler/getServices.js'
+import * as AppBskyNotificationGetPreferences from './types/app/bsky/notification/getPreferences.js'
 import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notification/getUnreadCount.js'
 import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications.js'
 import * as AppBskyNotificationPutPreferences from './types/app/bsky/notification/putPreferences.js'
+import * as AppBskyNotificationPutPreferencesV2 from './types/app/bsky/notification/putPreferencesV2.js'
 import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush.js'
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen.js'
 import * as AppBskyUnspeccedGetConfig from './types/app/bsky/unspecced/getConfig.js'
@@ -1853,6 +1855,17 @@ export class AppBskyNotificationNS {
     this._server = server
   }
 
+  getPreferences<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyNotificationGetPreferences.Handler<ExtractAuth<AV>>,
+      AppBskyNotificationGetPreferences.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.notification.getPreferences' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   getUnreadCount<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,
@@ -1886,6 +1899,17 @@ export class AppBskyNotificationNS {
     return this._server.xrpc.method(nsid, cfg)
   }
 
+  putPreferencesV2<AV extends AuthVerifier>(
+    cfg: ConfigOf<
+      AV,
+      AppBskyNotificationPutPreferencesV2.Handler<ExtractAuth<AV>>,
+      AppBskyNotificationPutPreferencesV2.HandlerReqCtx<ExtractAuth<AV>>
+    >,
+  ) {
+    const nsid = 'app.bsky.notification.putPreferencesV2' // @ts-ignore
+    return this._server.xrpc.method(nsid, cfg)
+  }
+
   registerPush<AV extends AuthVerifier>(
     cfg: ConfigOf<
       AV,