wip

.changeset/eleven-dolphins-rhyme.md

@@ -0,0 +1,5 @@
+---
+"@atproto/common-web": patch
+---
+
+Expose isCid utility function

.changeset/twelve-trainers-bathe.md

@@ -0,0 +1,5 @@
+---
+"@atproto/lexicon": patch
+---
+
+Small performance improvements

packages/api/src/moderation/const/labels.ts

@@ -17,7 +17,6 @@ export const DEFAULT_LABEL_SETTINGS: Record<string, LabelPreference> = {
   'graphic-media': 'warn',
 }
 
-/** @deprecated use {@link KNOWN_LABEL_DEFINITIONS} instead */
 export const LABELS: Record<KnownLabelValue, InterpretedLabelValueDefinition> =
   {
     '!hide': {

packages/aws/src/s3.ts

@@ -218,6 +218,7 @@ export class S3BlobStore implements BlobStore {
 }
 
 const handleErr = (err: unknown) => {
+  // @ts-expect-error (implicit any)
   if (err?.['Code'] === 'NoSuchKey') {
     throw new BlobNotFoundError()
   } else {

packages/bsky/package.json

@@ -71,6 +71,7 @@
     "@bufbuild/protoc-gen-es": "^1.5.0",
     "@connectrpc/protoc-gen-connect-es": "^1.1.4",
     "@did-plc/server": "^0.0.1",
+    "@types/compression": "^1.7.5",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/express-serve-static-core": "^4.17.36",

packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts

@@ -93,7 +93,9 @@ export const skeleton = async (inputs: {
     actorDid: did,
     limit: params.limit,
     cursor: params.cursor,
-    feedType: FILTER_TO_FEED_TYPE[params.filter],
+    feedType: Object.hasOwn(FILTER_TO_FEED_TYPE, params.filter)
+      ? FILTER_TO_FEED_TYPE[params.filter as keyof typeof FILTER_TO_FEED_TYPE]
+      : undefined,
   })
 
   let items: FeedItem[] = res.items.map((item) => ({

packages/bsky/src/api/util.ts

@@ -11,7 +11,7 @@ type ResHeaderOpts = {
 export const resHeaders = (
   opts: Partial<ResHeaderOpts>,
 ): Record<string, string> => {
-  const headers = {}
+  const headers: Record<string, string> = {}
   if (opts.labelers) {
     headers[ATPROTO_CONTENT_LABELERS] = formatLabelerHeader(opts.labelers)
   }

packages/bsky/src/cache/read-through.ts

@@ -82,7 +82,7 @@ export class ReadThroughCache<T> {
     if (opts?.revalidate) {
       return this.fetchAndCacheMany(keys)
     }
-    let cached: Record<string, string>
+    let cached: Record<string, string | undefined>
     try {
       cached = await this.redis.getMulti(keys)
     } catch (err) {

packages/bsky/src/config.ts

@@ -335,7 +335,7 @@ export class ServerConfig {
 function stripUndefineds(
   obj: Record<string, unknown>,
 ): Record<string, unknown> {
-  const result = {}
+  const result: Record<string, unknown> = {}
   Object.entries(obj).forEach(([key, val]) => {
     if (val !== undefined) {
       result[key] = val

packages/bsky/src/data-plane/client.ts

@@ -32,7 +32,7 @@ export const createDataPlaneClient = (
         const client = randomElement(remainingClients)
         assert(client, 'no clients available')
         try {
-          return await client.lib[method.localName](...args)
+          return await (client.lib as any)[method.localName](...args)
         } catch (err) {
           if (
             err instanceof ConnectError &&

packages/bsky/src/data-plane/server/db/migrations/20230309T045948368Z-init.ts

@@ -11,9 +11,18 @@ export async function up(db: Kysely<unknown>): Promise<void> {
       db,
     )
   } catch (err: unknown) {
-    // The "if not exists" isn't bulletproof against races, and we see test suites racing to
-    // create the extension. So we can just ignore errors indicating the extension already exists.
-    if (!err?.['detail']?.includes?.('(pg_trgm) already exists')) throw err
+    if (
+      err instanceof Error &&
+      'detail' in err &&
+      Array.isArray(err.detail) &&
+      err.detail.includes('(pg_trgm) already exists')
+    ) {
+      // The "if not exists" isn't bulletproof against races, and we see test suites racing to
+      // create the extension. So we can just ignore errors indicating the extension already exists.
+      return
+    }
+
+    throw err
   }
 
   // duplicateRecords

packages/bsky/src/data-plane/server/db/util.ts

@@ -2,6 +2,7 @@ import {
   DummyDriver,
   DynamicModule,
   ExpressionBuilder,
+  Kysely,
   RawBuilder,
   SelectQueryBuilder,
   sql,
@@ -31,7 +32,7 @@ export const softDeleted = (actorOrRecord: { takedownRef: string | null }) => {
 export const countAll = sql<number>`count(*)`
 
 // For use with doUpdateSet()
-export const excluded = <T>(db: DatabaseSchema, col) => {
+export const excluded = <T>(db: DatabaseSchema, col: string) => {
   return sql<T>`${db.dynamic.ref(`excluded.${col}`)}`
 }
 
@@ -49,7 +50,7 @@ export const dummyDialect = {
   createDriver() {
     return new DummyDriver()
   },
-  createIntrospector(db) {
+  createIntrospector(db: Kysely<any>) {
     return new SqliteIntrospector(db)
   },
   createQueryCompiler() {

packages/bsky/src/data-plane/server/indexing/index.ts

@@ -1,4 +1,4 @@
-import { sql } from 'kysely'
+import { ExpressionBuilder, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtpAgent, ComAtprotoSyncGetLatestCommit } from '@atproto/api'
 import {
@@ -13,6 +13,7 @@ import { IdResolver, getPds } from '@atproto/identity'
 import { DAY, HOUR } from '@atproto/common'
 import { ValidationError } from '@atproto/lexicon'
 import { Database } from '../db'
+import { DatabaseSchemaType } from '../db/database-schema'
 import { Actor } from '../db/tables/actor'
 import * as Post from './plugins/post'
 import * as Threadgate from './plugins/thread-gate'
@@ -246,10 +247,10 @@ export class IndexingService {
   }
 
   findIndexerForCollection(collection: string) {
-    const indexers = Object.values(
-      this.records as Record<string, RecordProcessor<unknown, unknown>>,
-    )
-    return indexers.find((indexer) => indexer.collection === collection)
+    const indexers = Object.values(this.records)
+    return indexers.find((indexer) => indexer.collection === collection) as
+      | RecordProcessor<unknown, unknown>
+      | undefined
   }
 
   async updateActorStatus(did: string, active: boolean, status: string = '') {
@@ -325,7 +326,9 @@ export class IndexingService {
       .where('creator', '=', did)
       .execute()
     // posts
-    const postByUser = (qb) =>
+    const postByUser = (
+      qb: ExpressionBuilder<DatabaseSchemaType, keyof DatabaseSchemaType>,
+    ) =>
       qb
         .selectFrom('post')
         .where('post.creator', '=', did)

packages/bsky/src/data-plane/server/indexing/processor.ts

@@ -2,7 +2,7 @@ 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 { jsonStringToLex, LexValue, stringifyLex } from '@atproto/lexicon'
 import { lexicons } from '../../../lexicon/lexicons'
 import { Database } from '../db'
 import DatabaseSchema from '../db/database-schema'
@@ -75,7 +75,7 @@ export class RecordProcessor<T, S> {
         uri: uri.toString(),
         cid: cid.toString(),
         did: uri.host,
-        json: stringifyLex(obj),
+        json: stringifyLex(obj as LexValue),
         indexedAt: timestamp,
       })
       .onConflict((oc) => oc.doNothing())
@@ -127,7 +127,7 @@ export class RecordProcessor<T, S> {
       .where('uri', '=', uri.toString())
       .set({
         cid: cid.toString(),
-        json: stringifyLex(obj),
+        json: stringifyLex(obj as LexValue),
         indexedAt: timestamp,
       })
       .execute()

packages/bsky/src/data-plane/server/routes/profile.ts

@@ -42,7 +42,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       const row = byDid[did]
       const chatDeclaration = parseRecordBytes(
         chatDeclarations.records[i].record,
-      )
+      ) as any
       return {
         exists: !!row,
         handle: row?.handle ?? undefined,
@@ -68,11 +68,11 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     if (handles.length === 0) {
       return { dids: [] }
     }
-    const res = await db.db
+    const res = (await db.db
       .selectFrom('actor')
       .where('handle', 'in', handles)
-      .selectAll()
-      .execute()
+      .select(['did', 'handle'])
+      .execute()) as { did: string; handle: string }[]
     const byHandle = keyBy(res, 'handle')
     const dids = handles.map((handle) => byHandle[handle]?.did ?? '')
     return { dids }

packages/bsky/src/hydration/util.ts

@@ -4,6 +4,7 @@ import { CID } from 'multiformats/cid'
 import * as ui8 from 'uint8arrays'
 import { lexicons } from '../lexicon/lexicons'
 import { Record } from '../proto/bsky_pb'
+import { isTypeofObject, JsonValue } from '@atproto/common'
 
 export class HydrationMap<T> extends Map<string, T | null> implements Merges {
   merge(map: HydrationMap<T>): this {
@@ -83,8 +84,12 @@ export const parseRecord = <T extends UnknownRecord>(
 }
 
 const isValidRecord = (json: unknown) => {
-  const lexRecord = jsonToLex(json)
-  if (typeof lexRecord?.['$type'] !== 'string') {
+  const lexRecord = jsonToLex(json as JsonValue)
+  if (
+    !isTypeofObject(lexRecord) ||
+    !('$type' in lexRecord) ||
+    typeof lexRecord['$type'] !== 'string'
+  ) {
     return false
   }
   try {

packages/bsky/src/redis.ts

@@ -54,7 +54,13 @@ export class Redis {
       }
       results.push(result)
       for (const [seqBuf, values] of messages) {
-        const message = { cursor: seqBuf.toString(), contents: {} }
+        const message: {
+          cursor: string
+          contents: Record<string, Buffer | undefined>
+        } = {
+          cursor: seqBuf.toString(),
+          contents: {},
+        }
         result.messages.push(message)
         for (let i = 0; i < values.length; ++i) {
           if (i % 2 === 0) continue
@@ -116,10 +122,10 @@ export class Redis {
   async getMulti(keys: string[]) {
     const namespaced = keys.map((k) => this.ns(k))
     const got = await this.driver.mget(...namespaced)
-    const results = {}
+    const results: Record<string, string | undefined> = {}
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i]
-      results[key] = got[i]
+      results[key] = got[i] ?? undefined
     }
     return results
   }

packages/bsky/tsconfig.build.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",
-    "noUnusedLocals": false
+    "noUnusedLocals": false,
+    "noPropertyAccessFromIndexSignature": false
   },
   "include": ["./src"]
 }

packages/bsync/tsconfig.build.json

@@ -2,7 +2,8 @@
   "extends": "../../tsconfig/node.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "outDir": "./dist"
+    "outDir": "./dist",
+    "noPropertyAccessFromIndexSignature": false
   },
   "include": ["./src"]
 }