@atproto/bsky 0.0.209 → 0.0.211

package/src/api/app/bsky/unspecced/getTrends.ts

@@ -9,7 +9,7 @@ import {
 } from '../../../../hydration/hydrator'
 import { Server } from '../../../../lexicon'
 import { SkeletonTrend } from '../../../../lexicon/types/app/bsky/unspecced/defs'
-import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrendingTopics'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/unspecced/getTrends'
 import {
   HydrationFnInput,
   PresentationFnInput,
@@ -33,11 +33,10 @@ export default function (server: Server, ctx: AppContext) {
           ? req.headers['x-bsky-topics'].join(',')
           : req.headers['x-bsky-topics'],
       })
-      const { ...result } = await getTrends(
+      const result = await getTrends(
         {
           ...params,
-          viewer: viewer ?? undefined,
-          hydrateCtx: hydrateCtx.copy({ viewer }),
+          hydrateCtx,
           headers,
         },
         ctx,
@@ -56,7 +55,7 @@ const skeleton = async (input: SkeletonFnInput<Context, Params>) => {
     const res = await ctx.topicsAgent.app.bsky.unspecced.getTrendsSkeleton(
       {
         limit: params.limit,
-        viewer: params.viewer,
+        viewer: params.hydrateCtx.viewer ?? undefined,
       },
       {
         headers: params.headers,
@@ -78,8 +77,9 @@ const hydration = async (
   }
   dids = dedupeStrs(dids)
   const pairs: Map<string, string[]> = new Map()
-  if (params.viewer) {
-    pairs.set(params.viewer, dids)
+  const viewer = params.hydrateCtx.viewer
+  if (viewer) {
+    pairs.set(viewer, dids)
   }
   const [profileState, bidirectionalBlocks] = await Promise.all([
     ctx.hydrator.hydrateProfilesBasic(dids, params.hydrateCtx),
@@ -91,12 +91,12 @@ const hydration = async (
 
 const noBlocks = (input: RulesFnInput<Context, Params, SkeletonState>) => {
   const { skeleton, params, hydration } = input
-
-  if (!params.viewer) {
+  const viewer = params.hydrateCtx.viewer
+  if (!viewer) {
     return skeleton
   }
 
-  const blocks = hydration.bidirectionalBlocks?.get(params.viewer)
+  const blocks = hydration.bidirectionalBlocks?.get(viewer)
   const filteredSkeleton: SkeletonState = {
     trends: skeleton.trends.map((t) => ({
       ...t,

package/src/api/index.ts

@@ -19,6 +19,10 @@ import removeData from './app/bsky/contact/removeData'
 import sendNotification from './app/bsky/contact/sendNotification'
 import startPhoneVerification from './app/bsky/contact/startPhoneVerification'
 import verifyPhone from './app/bsky/contact/verifyPhone'
+import createDraft from './app/bsky/draft/createDraft'
+import deleteDraft from './app/bsky/draft/deleteDraft'
+import getDrafts from './app/bsky/draft/getDrafts'
+import updateDraft from './app/bsky/draft/updateDraft'
 import getActorFeeds from './app/bsky/feed/getActorFeeds'
 import getActorLikes from './app/bsky/feed/getActorLikes'
 import getAuthorFeed from './app/bsky/feed/getAuthorFeed'
@@ -66,6 +70,7 @@ import putActivitySubscription from './app/bsky/notification/putActivitySubscrip
 import putPreferences from './app/bsky/notification/putPreferences'
 import putPreferencesV2 from './app/bsky/notification/putPreferencesV2'
 import registerPush from './app/bsky/notification/registerPush'
+import unregisterPush from './app/bsky/notification/unregisterPush'
 import updateSeen from './app/bsky/notification/updateSeen'
 import getAgeAssuranceState from './app/bsky/unspecced/getAgeAssuranceState'
 import getConfig from './app/bsky/unspecced/getConfig'
@@ -104,6 +109,10 @@ export default function (server: Server, ctx: AppContext) {
   createBookmark(server, ctx)
   deleteBookmark(server, ctx)
   getBookmarks(server, ctx)
+  createDraft(server, ctx)
+  deleteDraft(server, ctx)
+  getDrafts(server, ctx)
+  updateDraft(server, ctx)
   dismissMatch(server, ctx)
   getMatches(server, ctx)
   getSyncStatus(server, ctx)
@@ -172,6 +181,7 @@ export default function (server: Server, ctx: AppContext) {
   putPreferences(server, ctx)
   putPreferencesV2(server, ctx)
   registerPush(server, ctx)
+  unregisterPush(server, ctx)
   getConfig(server, ctx)
   getPopularFeedGenerators(server, ctx)
   getTaggedSuggestions(server, ctx)

package/src/config.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { noUndefinedVals } from '@atproto/common'
 import { subLogger as log } from './logger'
 
 type LiveNowConfig = {
@@ -80,8 +81,8 @@ export interface ServerConfigValues {
   indexedAtEpoch?: Date
   // misc/dev
   blobCacheLocation?: string
-  statsigKey?: string
-  statsigEnv?: string
+  growthBookApiHost?: string
+  growthBookClientKey?: string
   // threads
   bigThreadUris: Set<string>
   bigThreadDepth?: number
@@ -106,6 +107,7 @@ export interface ServerConfigValues {
   proxyPreferCompressed?: boolean
   kws?: KwsConfig
   debugFieldAllowedDids: Set<string>
+  draftsLimit: number
 }
 
 export class ServerConfig {
@@ -210,14 +212,12 @@ export class ServerConfig {
     )
     const modServiceDid = process.env.MOD_SERVICE_DID
     assert(modServiceDid)
-    const statsigKey =
+
+    const growthBookApiHost = process.env.BSKY_GROWTHBOOK_API_HOST || undefined
+    const growthBookClientKey =
       process.env.NODE_ENV === 'test'
         ? 'secret-key'
-        : process.env.BSKY_STATSIG_KEY || undefined
-    const statsigEnv =
-      process.env.NODE_ENV === 'test'
-        ? 'test'
-        : process.env.BSKY_STATSIG_ENV || 'development'
+        : process.env.BSKY_GROWTHBOOK_CLIENT_KEY || undefined
     const clientCheckEmailConfirmed =
       process.env.BSKY_CLIENT_CHECK_EMAIL_CONFIRMED === 'true'
     const topicsEnabled = process.env.BSKY_TOPICS_ENABLED === 'true'
@@ -322,6 +322,10 @@ export class ServerConfig {
       envList(process.env.BSKY_DEBUG_FIELD_ALLOWED_DIDS),
     )
 
+    const draftsLimit = process.env.BSKY_DRAFTS_LIMIT
+      ? parseInt(process.env.BSKY_DRAFTS_LIMIT || '', 10)
+      : 500
+
     return new ServerConfig({
       version,
       debugMode,
@@ -365,8 +369,8 @@ export class ServerConfig {
       blobRateLimitBypassHostname,
       adminPasswords,
       modServiceDid,
-      statsigKey,
-      statsigEnv,
+      growthBookApiHost,
+      growthBookClientKey,
       clientCheckEmailConfirmed,
       topicsEnabled,
       indexedAtEpoch,
@@ -388,7 +392,8 @@ export class ServerConfig {
       proxyPreferCompressed,
       kws,
       debugFieldAllowedDids,
-      ...stripUndefineds(overrides ?? {}),
+      draftsLimit,
+      ...noUndefinedVals(overrides ?? {}),
     })
   }
 
@@ -565,12 +570,12 @@ export class ServerConfig {
     return this.cfg.blobCacheLocation
   }
 
-  get statsigKey() {
-    return this.cfg.statsigKey
+  get growthBookApiHost() {
+    return this.cfg.growthBookApiHost
   }
 
-  get statsigEnv() {
-    return this.cfg.statsigEnv
+  get growthBookClientKey() {
+    return this.cfg.growthBookClientKey
   }
 
   get clientCheckEmailConfirmed() {
@@ -656,18 +661,10 @@ export class ServerConfig {
   get debugFieldAllowedDids() {
     return this.cfg.debugFieldAllowedDids
   }
-}
 
-function stripUndefineds(
-  obj: Record<string, unknown>,
-): Record<string, unknown> {
-  const result = {}
-  Object.entries(obj).forEach(([key, val]) => {
-    if (val !== undefined) {
-      result[key] = val
-    }
-  })
-  return result
+  get draftsLimit() {
+    return this.cfg.draftsLimit
+  }
 }
 
 function envList(str: string | undefined): string[] {

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

@@ -180,6 +180,8 @@ const createRoutes = (db: Database) => (router: ConnectRouter) =>
           await handleAgeAssuranceV2EventOperation(db, req, now)
         } else if (namespace === Namespaces.AppBskyBookmarkDefsBookmark) {
           await handleBookmarkOperation(db, req, now)
+        } else if (namespace === Namespaces.AppBskyDraftDefsDraftWithId) {
+          await handleDraftOperation(db, req, now)
         }
       } catch (err) {
         httpLogger.warn({ err, namespace }, 'mock bsync put operation failed')
@@ -415,3 +417,48 @@ const handleBookmarkOperation = async (
     })
   }
 }
+
+const handleDraftOperation = async (
+  db: Database,
+  req: PutOperationRequest,
+  now: string,
+) => {
+  const { actorDid, key, method, payload } = req
+
+  if (method === Method.CREATE) {
+    const payloadString = Buffer.from(payload).toString('utf8')
+
+    await db.db
+      .insertInto('draft')
+      .values({
+        creator: actorDid,
+        key,
+        createdAt: now,
+        updatedAt: now,
+        payload: payloadString,
+      })
+      .execute()
+  }
+
+  if (method === Method.UPDATE) {
+    const payloadString = Buffer.from(payload).toString('utf8')
+
+    await db.db
+      .updateTable('draft')
+      .where('creator', '=', actorDid)
+      .where('key', '=', key)
+      .set({
+        updatedAt: now,
+        payload: payloadString,
+      })
+      .execute()
+  }
+
+  if (method === Method.DELETE) {
+    await db.db
+      .deleteFrom('draft')
+      .where('creator', '=', actorDid)
+      .where('key', '=', key)
+      .execute()
+  }
+}

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

@@ -8,6 +8,7 @@ import * as algo from './tables/algo'
 import * as blobTakedown from './tables/blob-takedown'
 import * as bookmark from './tables/bookmark'
 import * as didCache from './tables/did-cache'
+import * as draft from './tables/draft'
 import * as duplicateRecord from './tables/duplicate-record'
 import * as feedGenerator from './tables/feed-generator'
 import * as feedItem from './tables/feed-item'
@@ -83,6 +84,7 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   verification.PartialDB &
   privateData.PartialDB &
   activitySubscription.PartialDB &
-  bookmark.PartialDB
+  bookmark.PartialDB &
+  draft.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>

package/src/data-plane/server/db/migrations/20260112T133951271Z-add-drafts.ts

@@ -0,0 +1,24 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .createTable('draft')
+    .addColumn('creator', 'varchar', (col) => col.notNull())
+    .addColumn('key', 'varchar', (col) => col.notNull())
+    .addColumn('createdAt', 'varchar', (col) => col.notNull())
+    .addColumn('updatedAt', 'varchar', (col) => col.notNull())
+    .addColumn('payload', 'text', (col) => col.notNull())
+    .addPrimaryKeyConstraint('draft_pkey', ['creator', 'key'])
+    .execute()
+
+  // Supports getting paginated drafts by updatedAt.
+  await db.schema
+    .createIndex('draft_creator_updated_at_key_idx')
+    .on('draft')
+    .columns(['creator', 'updatedAt', 'key'])
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.dropTable('draft').execute()
+}

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

@@ -56,3 +56,4 @@ export * as _20250627T025331240Z from './20250627T025331240Z-add-actor-age-assur
 export * as _20250812T183735692Z from './20250812T183735692Z-add-bookmarks'
 export * as _20250813T174955711Z from './20250813T174955711Z-add-post-agg-bookmarks'
 export * as _20251120T004738098Z from './20251120T004738098Z-update-actor-age-assurance-v2'
+export * as _20260112T133951271Z from './20260112T133951271Z-add-drafts'

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

@@ -296,6 +296,14 @@ export class IsoSortAtKey extends IsoTimeKey<{
   }
 }
 
+export class IsoUpdatedAtKey extends IsoTimeKey<{
+  updatedAt: string
+}> {
+  labelResult(result: { updatedAt: string }) {
+    return { primary: result.updatedAt }
+  }
+}
+
 type KeyResult = { key: string }
 type RkeyLabeledResult = SingleKeyCursor
 

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

@@ -0,0 +1,11 @@
+export interface Draft {
+  creator: string
+  key: string
+  createdAt: string
+  updatedAt: string
+  payload: string
+}
+
+export const tableName = 'draft'
+
+export type PartialDB = { [tableName]: Draft }

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

@@ -21,6 +21,7 @@ import * as Block from './plugins/block'
 import * as ChatDeclaration from './plugins/chat-declaration'
 import * as FeedGenerator from './plugins/feed-generator'
 import * as Follow from './plugins/follow'
+import * as GermDeclaration from './plugins/germ-declaration'
 import * as Labeler from './plugins/labeler'
 import * as Like from './plugins/like'
 import * as List from './plugins/list'
@@ -55,6 +56,7 @@ export class IndexingService {
     labeler: Labeler.PluginType
     notifDeclaration: NotifDeclaration.PluginType
     chatDeclaration: ChatDeclaration.PluginType
+    germDeclaration: GermDeclaration.PluginType
     verification: Verification.PluginType
     status: Status.PluginType
   }
@@ -81,6 +83,7 @@ export class IndexingService {
       labeler: Labeler.makePlugin(this.db, this.background),
       notifDeclaration: NotifDeclaration.makePlugin(this.db, this.background),
       chatDeclaration: ChatDeclaration.makePlugin(this.db, this.background),
+      germDeclaration: GermDeclaration.makePlugin(this.db, this.background),
       verification: Verification.makePlugin(this.db, this.background),
       status: Status.makePlugin(this.db, this.background),
     }

package/src/data-plane/server/indexing/plugins/germ-declaration.ts

@@ -0,0 +1,63 @@
+import { CID } from 'multiformats/cid'
+import { AtUri } from '@atproto/syntax'
+import * as lex from '../../../../lexicon/lexicons'
+import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
+
+// @NOTE this indexer is a placeholder to ensure it gets indexed in the generic records table
+
+const lexId = lex.ids.ComGermnetworkDeclaration
+
+const insertFn = async (
+  _db: DatabaseSchema,
+  uri: AtUri,
+  _cid: CID,
+  _obj: unknown,
+  _timestamp: string,
+): Promise<unknown | null> => {
+  if (uri.rkey !== 'self') return null
+  return true
+}
+
+const findDuplicate = async (): Promise<AtUri | null> => {
+  return null
+}
+
+const notifsForInsert = () => {
+  return []
+}
+
+const deleteFn = async (
+  _db: DatabaseSchema,
+  uri: AtUri,
+): Promise<unknown | null> => {
+  if (uri.rkey !== 'self') return null
+  return true
+}
+
+const notifsForDelete = () => {
+  return { notifs: [], toDelete: [] }
+}
+
+export type PluginType = RecordProcessor<unknown, unknown>
+
+export const makePlugin = (
+  db: Database,
+  background: BackgroundQueue,
+): PluginType => {
+  const processor = new RecordProcessor(db, background, {
+    lexId,
+    insertFn,
+    findDuplicate,
+    deleteFn,
+    notifsForInsert,
+    notifsForDelete,
+  })
+  // @TODO use lexicon validation
+  processor.assertValidRecord = () => null
+  return processor
+}
+
+export default makePlugin

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

@@ -0,0 +1,37 @@
+import { PlainMessage, Timestamp } from '@bufbuild/protobuf'
+import { ServiceImpl } from '@connectrpc/connect'
+import { Service } from '../../../proto/bsky_connect'
+import { DraftInfo } from '../../../proto/bsky_pb'
+import { Database } from '../db'
+import { IsoUpdatedAtKey } from '../db/pagination'
+
+export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
+  async getActorDrafts(req) {
+    const { actorDid, cursor, limit } = req
+    const { ref } = db.db.dynamic
+
+    let builder = db.db
+      .selectFrom('draft')
+      .where('draft.creator', '=', actorDid)
+      .selectAll()
+
+    const key = new IsoUpdatedAtKey(ref('draft.updatedAt'))
+    builder = key.paginate(builder, {
+      cursor,
+      limit,
+    })
+
+    const res = await builder.execute()
+    return {
+      drafts: res.map(
+        (d): PlainMessage<DraftInfo> => ({
+          key: d.key,
+          payload: Buffer.from(d.payload),
+          createdAt: Timestamp.fromDate(new Date(d.createdAt)),
+          updatedAt: Timestamp.fromDate(new Date(d.updatedAt)),
+        }),
+      ),
+      cursor: key.packFromResult(res),
+    }
+  },
+})

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

@@ -5,6 +5,7 @@ import { Database } from '../db'
 import activitySubscription from './activity-subscription'
 import blocks from './blocks'
 import bookmarks from './bookmarks'
+import drafts from './drafts'
 import feedGens from './feed-gens'
 import feeds from './feeds'
 import follows from './follows'
@@ -34,6 +35,7 @@ export default (db: Database, idResolver: IdResolver) =>
       ...activitySubscription(db),
       ...blocks(db),
       ...bookmarks(db),
+      ...drafts(db),
       ...feedGens(db),
       ...feeds(db),
       ...follows(db),

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

@@ -49,6 +49,11 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
           .whereRef('creator', '=', ref('profile_agg.did'))
           .select(countAll.as('val'))
           .as('starterPacksCount'),
+        db.db
+          .selectFrom('draft')
+          .whereRef('creator', '=', ref('profile_agg.did'))
+          .select(countAll.as('val'))
+          .as('draftsCount'),
       ])
       .execute()
     const byDid = keyBy(res, 'did')
@@ -61,6 +66,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       starterPacks: req.dids.map(
         (uri) => byDid.get(uri)?.starterPacksCount ?? 0,
       ),
+      drafts: req.dids.map((uri) => byDid.get(uri)?.draftsCount ?? 0),
     }
   },
   async getStarterPackCounts(req) {

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

@@ -38,6 +38,9 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const notifDeclarationUris = dids.map(
       (did) => `at://${did}/app.bsky.notification.declaration/self`,
     )
+    const germDeclarationUris = dids.map(
+      (did) => `at://${did}/com.germnetwork.declaration/self`,
+    )
     const { ref } = db.db.dynamic
     const [
       handlesRes,
@@ -46,6 +49,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       statuses,
       chatDeclarations,
       notifDeclarations,
+      germDeclarations,
     ] = await Promise.all([
       db.db
         .selectFrom('actor')
@@ -73,6 +77,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       getRecords(db)({ uris: statusUris }),
       getRecords(db)({ uris: chatDeclarationUris }),
       getRecords(db)({ uris: notifDeclarationUris }),
+      getRecords(db)({ uris: germDeclarationUris }),
     ])
 
     const verificationsBySubjectDid = verificationsReceived.reduce(
@@ -95,6 +100,8 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         chatDeclarations.records[i].record,
       )
 
+      const germDeclaration = germDeclarations.records[i]
+
       const verifications = verificationsBySubjectDid.get(did) ?? []
       const verifiedBy: VerifiedBy = verifications.reduce((acc, cur) => {
         acc[cur.creator] = {
@@ -173,6 +180,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         trustedVerifier: row?.trustedVerifier ?? false,
         verifiedBy,
         statusRecord: status,
+        germRecord: germDeclaration,
         tags: [],
         profileTags: [],
         allowActivitySubscriptionsFrom: activitySubscription(),

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

@@ -27,6 +27,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     db,
     ids.AppBskyNotificationDeclaration,
   ),
+  getGermDeclarationRecords: getRecords(db, ids.ComGermnetworkDeclaration),
   getStarterPackRecords: getRecords(db, ids.AppBskyGraphStarterpack),
   getVerificationRecords: getRecords(db, ids.AppBskyGraphVerification),
   getStatusRecords: getRecords(db, ids.AppBskyActorStatus),