@atproto/bsky 0.0.113 → 0.0.114

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

@@ -1,5 +1,5 @@
-import assert from 'assert'
-import EventEmitter from 'events'
+import assert from 'node:assert'
+import EventEmitter from 'node:events'
 import {
   Kysely,
   KyselyPlugin,
@@ -11,13 +11,13 @@ import {
   RootOperationNode,
   UnknownRow,
 } from 'kysely'
-import TypedEmitter from 'typed-emitter'
 import { Pool as PgPool, types as pgTypes } from 'pg'
-import * as migrations from './migrations'
-import DatabaseSchema, { DatabaseSchemaType } from './database-schema'
-import { PgOptions } from './types'
+import TypedEmitter from 'typed-emitter'
 import { dbLogger } from '../../../logger'
+import { DatabaseSchema, DatabaseSchemaType } from './database-schema'
+import * as migrations from './migrations'
 import { CtxMigrationProvider } from './migrations/provider'
+import { PgOptions } from './types'
 
 export class Database {
   pool: PgPool

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

@@ -4,12 +4,12 @@ import {
   ExpressionBuilder,
   RawBuilder,
   SelectQueryBuilder,
-  sql,
   SqliteAdapter,
   SqliteIntrospector,
   SqliteQueryCompiler,
+  sql,
 } from 'kysely'
-import DatabaseSchema, { DatabaseSchemaType } from './database-schema'
+import { DatabaseSchema, DatabaseSchemaType } from './database-schema'
 
 export const actorWhereClause = (actor: string) => {
   if (actor.startsWith('did:')) {

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

@@ -1,10 +1,10 @@
-import http from 'http'
-import events from 'events'
-import express from 'express'
+import events from 'node:events'
+import http from 'node:http'
 import { expressConnectMiddleware } from '@connectrpc/connect-express'
-import createRoutes from './routes'
-import { Database } from './db'
+import express from 'express'
 import { IdResolver, MemoryCache } from '@atproto/identity'
+import { Database } from './db'
+import createRoutes from './routes'
 
 export { RepoSubscription } from './subscription'
 

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

@@ -1,38 +1,38 @@
 import { sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtpAgent, ComAtprotoSyncGetLatestCommit } from '@atproto/api'
+import { DAY, HOUR } from '@atproto/common'
+import { IdResolver, getPds } from '@atproto/identity'
+import { ValidationError } from '@atproto/lexicon'
 import {
-  readCarWithRoot,
-  WriteOpAction,
-  verifyRepo,
   VerifiedRepo,
+  WriteOpAction,
   getAndParseRecord,
+  readCarWithRoot,
+  verifyRepo,
 } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import { IdResolver, getPds } from '@atproto/identity'
-import { DAY, HOUR } from '@atproto/common'
-import { ValidationError } from '@atproto/lexicon'
+import { subLogger } from '../../../logger'
+import { retryXrpc } from '../../../util/retry'
+import { BackgroundQueue } from '../background'
 import { Database } from '../db'
 import { Actor } from '../db/tables/actor'
-import * as Post from './plugins/post'
-import * as Threadgate from './plugins/thread-gate'
-import * as Postgate from './plugins/post-gate'
-import * as Like from './plugins/like'
-import * as Repost from './plugins/repost'
+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 Profile from './plugins/profile'
+import * as Labeler from './plugins/labeler'
+import * as Like from './plugins/like'
 import * as List from './plugins/list'
-import * as ListItem from './plugins/list-item'
 import * as ListBlock from './plugins/list-block'
-import * as Block from './plugins/block'
-import * as FeedGenerator from './plugins/feed-generator'
+import * as ListItem from './plugins/list-item'
+import * as Post from './plugins/post'
+import * as Postgate from './plugins/post-gate'
+import * as Profile from './plugins/profile'
+import * as Repost from './plugins/repost'
 import * as StarterPack from './plugins/starter-pack'
-import * as Labeler from './plugins/labeler'
-import * as ChatDeclaration from './plugins/chat-declaration'
-import RecordProcessor from './processor'
-import { subLogger } from '../../../logger'
-import { retryXrpc } from '../../../util/retry'
-import { BackgroundQueue } from '../background'
+import * as Threadgate from './plugins/thread-gate'
+import { RecordProcessor } from './processor'
 
 export class IndexingService {
   records: {

package/src/data-plane/server/indexing/plugins/block.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Block from '../../../../lexicon/types/app/bsky/graph/block'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as Block from '../../../../lexicon/types/app/bsky/graph/block'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphBlock
 type IndexedBlock = Selectable<DatabaseSchemaType['actor_block']>

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

@@ -1,10 +1,10 @@
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
 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
 

package/src/data-plane/server/indexing/plugins/feed-generator.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as FeedGenerator from '../../../../lexicon/types/app/bsky/feed/generator'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as FeedGenerator from '../../../../lexicon/types/app/bsky/feed/generator'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedGenerator
 type IndexedFeedGenerator = Selectable<DatabaseSchemaType['feed_generator']>

package/src/data-plane/server/indexing/plugins/follow.ts

@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Follow from '../../../../lexicon/types/app/bsky/graph/follow'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as Follow from '../../../../lexicon/types/app/bsky/graph/follow'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
-import { countAll, excluded } from '../../db/util'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphFollow
 type IndexedFollow = Selectable<DatabaseSchemaType['follow']>

package/src/data-plane/server/indexing/plugins/labeler.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Labeler from '../../../../lexicon/types/app/bsky/labeler/service'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as Labeler from '../../../../lexicon/types/app/bsky/labeler/service'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyLabelerService
 type IndexedLabeler = Selectable<DatabaseSchemaType['labeler']>

package/src/data-plane/server/indexing/plugins/like.ts

@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
-import { countAll, excluded } from '../../db/util'
+import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedLike
 type IndexedLike = Selectable<DatabaseSchemaType['like']>

package/src/data-plane/server/indexing/plugins/list-block.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as ListBlock from '../../../../lexicon/types/app/bsky/graph/listblock'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as ListBlock from '../../../../lexicon/types/app/bsky/graph/listblock'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphListblock
 type IndexedListBlock = Selectable<DatabaseSchemaType['list_block']>

package/src/data-plane/server/indexing/plugins/list-item.ts

@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as ListItem from '../../../../lexicon/types/app/bsky/graph/listitem'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as ListItem from '../../../../lexicon/types/app/bsky/graph/listitem'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphListitem
 type IndexedListItem = Selectable<DatabaseSchemaType['list_item']>

package/src/data-plane/server/indexing/plugins/list.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as List from '../../../../lexicon/types/app/bsky/graph/list'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
+import * as List from '../../../../lexicon/types/app/bsky/graph/list'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphList
 type IndexedList = Selectable<DatabaseSchemaType['list']>

package/src/data-plane/server/indexing/plugins/post-gate.ts

@@ -1,12 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import * as Postgate from '../../../../lexicon/types/app/bsky/feed/postgate'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { Database } from '../../db'
-import RecordProcessor from '../processor'
+import * as Postgate from '../../../../lexicon/types/app/bsky/feed/postgate'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedPostgate
 type IndexedGate = DatabaseSchemaType['post_gate']

package/src/data-plane/server/indexing/plugins/post.ts

@@ -1,27 +1,33 @@
 import { Insertable, Selectable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { jsonStringToLex } from '@atproto/lexicon'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
+import * as lex from '../../../../lexicon/lexicons'
+import { isMain as isEmbedExternal } from '../../../../lexicon/types/app/bsky/embed/external'
+import { isMain as isEmbedImage } from '../../../../lexicon/types/app/bsky/embed/images'
+import { isMain as isEmbedRecord } from '../../../../lexicon/types/app/bsky/embed/record'
+import { isMain as isEmbedRecordWithMedia } from '../../../../lexicon/types/app/bsky/embed/recordWithMedia'
+import { isMain as isEmbedVideo } from '../../../../lexicon/types/app/bsky/embed/video'
 import {
   Record as PostRecord,
   ReplyRef,
 } from '../../../../lexicon/types/app/bsky/feed/post'
-import { Record as GateRecord } from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import { Record as PostgateRecord } from '../../../../lexicon/types/app/bsky/feed/postgate'
-import { isMain as isEmbedImage } from '../../../../lexicon/types/app/bsky/embed/images'
-import { isMain as isEmbedExternal } from '../../../../lexicon/types/app/bsky/embed/external'
-import { isMain as isEmbedRecord } from '../../../../lexicon/types/app/bsky/embed/record'
-import { isMain as isEmbedRecordWithMedia } from '../../../../lexicon/types/app/bsky/embed/recordWithMedia'
-import { isMain as isEmbedVideo } from '../../../../lexicon/types/app/bsky/embed/video'
+import { Record as GateRecord } from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import {
-  isMention,
   isLink,
+  isMention,
 } from '../../../../lexicon/types/app/bsky/richtext/facet'
-import * as lex from '../../../../lexicon/lexicons'
+import {
+  postUriToPostgateUri,
+  postUriToThreadgateUri,
+  uriToDid,
+} from '../../../../util/uris'
+import { parsePostgate } from '../../../../views/util'
+import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
 import { Notification } from '../../db/tables/notification'
-import { Database } from '../../db'
 import { countAll, excluded } from '../../db/util'
 import {
   getAncestorsAndSelfQb,
@@ -29,13 +35,7 @@ import {
   invalidReplyRoot as checkInvalidReplyRoot,
   violatesThreadGate as checkViolatesThreadGate,
 } from '../../util'
-import { BackgroundQueue } from '../../background'
-import { parsePostgate } from '../../../../views/util'
-import {
-  postUriToThreadgateUri,
-  postUriToPostgateUri,
-  uriToDid,
-} from '../../../../util/uris'
+import { RecordProcessor } from '../processor'
 
 type Notif = Insertable<Notification>
 type Post = Selectable<DatabaseSchemaType['post']>

package/src/data-plane/server/indexing/plugins/profile.ts

@@ -1,11 +1,11 @@
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as Profile from '../../../../lexicon/types/app/bsky/actor/profile'
+import { AtUri } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { Database } from '../../db'
+import * as Profile from '../../../../lexicon/types/app/bsky/actor/profile'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyActorProfile
 type IndexedProfile = DatabaseSchemaType['profile']

package/src/data-plane/server/indexing/plugins/repost.ts

@@ -1,13 +1,13 @@
 import { Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
-import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
 import * as lex from '../../../../lexicon/lexicons'
-import RecordProcessor from '../processor'
+import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
-import { countAll, excluded } from '../../db/util'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { BackgroundQueue } from '../../background'
+import { countAll, excluded } from '../../db/util'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedRepost
 type IndexedRepost = Selectable<DatabaseSchemaType['repost']>

package/src/data-plane/server/indexing/plugins/starter-pack.ts

@@ -1,12 +1,12 @@
 import { Selectable } from 'kysely'
-import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import * as StarterPack from '../../../../lexicon/types/app/bsky/graph/starterpack'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
+import * as StarterPack from '../../../../lexicon/types/app/bsky/graph/starterpack'
+import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import RecordProcessor from '../processor'
-import { BackgroundQueue } from '../../background'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyGraphStarterpack
 type IndexedStarterPack = Selectable<DatabaseSchemaType['starter_pack']>

package/src/data-plane/server/indexing/plugins/thread-gate.ts

@@ -1,12 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import * as Threadgate from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import * as lex from '../../../../lexicon/lexicons'
-import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
-import { Database } from '../../db'
-import RecordProcessor from '../processor'
+import * as Threadgate from '../../../../lexicon/types/app/bsky/feed/threadgate'
 import { BackgroundQueue } from '../../background'
+import { Database } from '../../db'
+import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedThreadgate
 type IndexedGate = DatabaseSchemaType['thread_gate']

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

@@ -1,13 +1,13 @@
 import { Insertable } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
 import { chunkArray } from '@atproto/common'
 import { jsonStringToLex, stringifyLex } from '@atproto/lexicon'
+import { AtUri } from '@atproto/syntax'
 import { lexicons } from '../../../lexicon/lexicons'
+import { BackgroundQueue } from '../background'
 import { Database } from '../db'
-import DatabaseSchema from '../db/database-schema'
+import { DatabaseSchema } from '../db/database-schema'
 import { Notification } from '../db/tables/notification'
-import { BackgroundQueue } from '../background'
 
 // @NOTE re: insertions and deletions. Due to how record updates are handled,
 // (insertFn) should have the same effect as (insertFn -> deleteFn -> insertFn).

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

@@ -1,8 +1,8 @@
 import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
+import { FeedType } from '../../../proto/bsky_pb'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
-import { FeedType } from '../../../proto/bsky_pb'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getAuthorFeed(req) {

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

@@ -1,5 +1,5 @@
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { FollowsFollowing } from '../../../proto/bsky_pb'
 import { Database } from '../db'
@@ -18,7 +18,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subjectDid')
-    const uris = targetDids.map((did) => bySubject[did]?.uri ?? '')
+    const uris = targetDids.map((did) => bySubject.get(did)?.uri ?? '')
     return {
       uris,
     }

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

@@ -1,8 +1,8 @@
+import { Timestamp } from '@bufbuild/protobuf'
 import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
+import { DidDocument, IdResolver, getDid, getHandle } from '@atproto/identity'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { DidDocument, IdResolver, getDid, getHandle } from '@atproto/identity'
-import { Timestamp } from '@bufbuild/protobuf'
 
 export default (
   _db: Database,

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

@@ -1,6 +1,7 @@
 import { ConnectRouter } from '@connectrpc/connect'
 import { IdResolver } from '@atproto/identity'
 import { Service } from '../../../proto/bsky_connect'
+import { Database } from '../db'
 import blocks from './blocks'
 import feedGens from './feed-gens'
 import feeds from './feeds'
@@ -20,11 +21,10 @@ import records from './records'
 import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
+import starterPacks from './starter-packs'
 import suggestions from './suggestions'
 import sync from './sync'
 import threads from './threads'
-import starterPacks from './starter-packs'
-import { Database } from '../db'
 
 export default (db: Database, idResolver: IdResolver) =>
   (router: ConnectRouter) =>

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

@@ -1,5 +1,5 @@
-import { DAY, keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { DAY, keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { countAll } from '../db/util'
@@ -17,10 +17,10 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byUri = keyBy(res, 'uri')
     return {
-      likes: uris.map((uri) => byUri[uri]?.likeCount ?? 0),
-      replies: uris.map((uri) => byUri[uri]?.replyCount ?? 0),
-      reposts: uris.map((uri) => byUri[uri]?.repostCount ?? 0),
-      quotes: uris.map((uri) => byUri[uri]?.quoteCount ?? 0),
+      likes: uris.map((uri) => byUri.get(uri)?.likeCount ?? 0),
+      replies: uris.map((uri) => byUri.get(uri)?.replyCount ?? 0),
+      reposts: uris.map((uri) => byUri.get(uri)?.repostCount ?? 0),
+      quotes: uris.map((uri) => byUri.get(uri)?.quoteCount ?? 0),
     }
   },
   async getCountsForUsers(req) {
@@ -52,12 +52,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const byDid = keyBy(res, 'did')
     return {
-      followers: req.dids.map((uri) => byDid[uri]?.followersCount ?? 0),
-      following: req.dids.map((uri) => byDid[uri]?.followsCount ?? 0),
-      posts: req.dids.map((uri) => byDid[uri]?.postsCount ?? 0),
-      lists: req.dids.map((uri) => byDid[uri]?.listsCount ?? 0),
-      feeds: req.dids.map((uri) => byDid[uri]?.feedGensCount ?? 0),
-      starterPacks: req.dids.map((uri) => byDid[uri]?.starterPacksCount ?? 0),
+      followers: req.dids.map((uri) => byDid.get(uri)?.followersCount ?? 0),
+      following: req.dids.map((uri) => byDid.get(uri)?.followsCount ?? 0),
+      posts: req.dids.map((uri) => byDid.get(uri)?.postsCount ?? 0),
+      lists: req.dids.map((uri) => byDid.get(uri)?.listsCount ?? 0),
+      feeds: req.dids.map((uri) => byDid.get(uri)?.feedGensCount ?? 0),
+      starterPacks: req.dids.map(
+        (uri) => byDid.get(uri)?.starterPacksCount ?? 0,
+      ),
     }
   },
   async getStarterPackCounts(req) {
@@ -105,7 +107,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .execute()
     const countsByUri = keyBy(countsListItems, 'uri')
     return {
-      listItems: uris.map((uri) => countsByUri[uri]?.count ?? 0),
+      listItems: uris.map((uri) => countsByUri.get(uri)?.count ?? 0),
     }
   },
 })

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

@@ -1,9 +1,9 @@
+import { ServiceImpl } from '@connectrpc/connect'
+import { Selectable } from 'kysely'
 import * as ui8 from 'uint8arrays'
 import { noUndefinedVals } from '@atproto/common'
-import { ServiceImpl } from '@connectrpc/connect'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
-import { Selectable } from 'kysely'
 import { Label } from '../db/tables/label'
 
 type LabelRow = Selectable<Label>

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

@@ -1,6 +1,6 @@
 import assert from 'node:assert'
-import { keyBy } from '@atproto/common'
 import { ServiceImpl } from '@connectrpc/connect'
+import { keyBy } from '@atproto/common'
 import { Service } from '../../../proto/bsky_connect'
 import { Database } from '../db'
 import { TimeCidKeyset, paginate } from '../db/pagination'
@@ -58,8 +58,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectAll()
       .execute()
     const bySubject = keyBy(res, 'subject')
-    // @TODO handling undefineds properly, or do we need to turn them into empty strings?
-    const uris = refs.map(({ uri }) => bySubject[uri]?.uri)
+    const uris = refs.map(({ uri }) => bySubject.get(uri)?.uri ?? '')
     return { uris }
   },