@atproto/bsky 0.0.16 → 0.0.18

package/dist/services/util/post.d.ts

@@ -2,28 +2,28 @@ import DatabaseSchema from '../../db/database-schema';
 export declare const getDescendentsQb: (db: DatabaseSchema, opts: {
     uri: string;
     depth: number;
-}) => import("kysely/dist/cjs/parser/with-parser").QueryCreatorWithCommonTableExpression<import("../../db/database-schema").DatabaseSchemaType, "descendent(uri, depth)", (cte: import("kysely").QueryCreator<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
+}) => import("kysely/dist/cjs/parser/with-parser").QueryCreatorWithCommonTableExpression<import("../../db/database-schema").DatabaseSchemaType, "descendent(uri, depth)", (cte: import("kysely").QueryCreator<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
     uri: any;
     depth: any;
-}>>) => import("kysely").SelectQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
+}>>) => import("kysely").SelectQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
     uri: any;
     depth: any;
-}>, "post">, "post", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
+}>, "post">, "post", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"descendent", {
     uri: any;
     depth: any;
 }>, "post">, "post", "post.uri as uri" | import("kysely").AliasedRawBuilder<number, "depth">>>>;
 export declare const getAncestorsAndSelfQb: (db: DatabaseSchema, opts: {
     uri: string;
     parentHeight: number;
-}) => import("kysely/dist/cjs/parser/with-parser").QueryCreatorWithCommonTableExpression<import("../../db/database-schema").DatabaseSchemaType, "ancestor(uri, ancestorUri, height)", (cte: import("kysely").QueryCreator<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
+}) => import("kysely/dist/cjs/parser/with-parser").QueryCreatorWithCommonTableExpression<import("../../db/database-schema").DatabaseSchemaType, "ancestor(uri, ancestorUri, height)", (cte: import("kysely").QueryCreator<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
     uri: any;
     height: any;
     ancestorUri: any;
-}>>) => import("kysely").SelectQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
+}>>) => import("kysely").SelectQueryBuilder<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
     uri: any;
     height: any;
     ancestorUri: any;
-}>, "post">, "post", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/did-cache").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
+}>, "post">, "post", import("kysely").Selection<import("kysely/dist/cjs/parser/table-parser").From<import("../../db/tables/duplicate-record").PartialDB & import("../../db/tables/profile").PartialDB & import("../../db/tables/profile-agg").PartialDB & import("../../db/tables/post").PartialDB & import("../../db/tables/post-embed").PartialDB & import("../../db/tables/post-agg").PartialDB & import("../../db/tables/repost").PartialDB & import("../../db/tables/thread-gate").PartialDB & import("../../db/tables/feed-item").PartialDB & import("../../db/tables/follow").PartialDB & import("../../db/tables/like").PartialDB & import("../../db/tables/list").PartialDB & import("../../db/tables/list-item").PartialDB & import("../../db/tables/list-mute").PartialDB & import("../../db/tables/list-block").PartialDB & import("../../db/tables/mute").PartialDB & import("../../db/tables/actor-block").PartialDB & import("../../db/tables/feed-generator").PartialDB & import("../../db/tables/subscription").PartialDB & import("../../db/tables/actor").PartialDB & import("../../db/tables/actor-state").PartialDB & import("../../db/tables/actor-sync").PartialDB & import("../../db/tables/record").PartialDB & import("../../db/tables/notification").PartialDB & import("../../db/tables/notification-push-token").PartialDB & import("../../db/tables/moderation").PartialDB & import("../../db/tables/label").PartialDB & import("../../db/tables/algo").PartialDB & import("../../db/tables/view-param").PartialDB & import("../../db/tables/suggested-follow").PartialDB & import("../../db/tables/suggested-feed").PartialDB & Record<"ancestor", {
     uri: any;
     height: any;
     ancestorUri: any;

package/dist/util/retry.d.ts

@@ -1,8 +1,3 @@
-export declare function retry<T>(fn: () => Promise<T>, opts?: RetryOptions): Promise<T>;
+import { RetryOptions } from '@atproto/common';
 export declare function retryHttp<T>(fn: () => Promise<T>, opts?: RetryOptions): Promise<T>;
 export declare function retryableHttp(err: unknown): boolean;
-declare type RetryOptions = {
-    max?: number;
-    retryable?: (err: unknown) => boolean;
-};
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -35,13 +35,13 @@
     "sharp": "^0.32.6",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.6.24",
+    "@atproto/api": "^0.7.1",
     "@atproto/common": "^0.3.3",
     "@atproto/crypto": "^0.3.0",
     "@atproto/syntax": "^0.1.5",
-    "@atproto/identity": "^0.3.2",
     "@atproto/lexicon": "^0.3.1",
     "@atproto/repo": "^0.3.6",
+    "@atproto/identity": "^0.3.2",
     "@atproto/xrpc-server": "^0.4.2"
   },
   "devDependencies": {
@@ -52,10 +52,10 @@
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.6.24",
-    "@atproto/dev-env": "^0.2.16",
+    "@atproto/api": "^0.7.1",
+    "@atproto/dev-env": "^0.2.18",
     "@atproto/lex-cli": "^0.2.5",
-    "@atproto/pds": "^0.3.4",
+    "@atproto/pds": "^0.3.6",
     "@atproto/xrpc": "^0.4.1"
   },
   "scripts": {

package/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -35,7 +35,7 @@ export default function (server: Server, ctx: AppContext) {
 
       const actors = await ctx.services
         .actor(db)
-        .views.profilesBasic(results, requester, { omitLabels: true })
+        .views.profilesBasic(results, requester)
 
       const SKIP = []
       const filtered = results.flatMap((did) => {

package/src/cache/read-through.ts

@@ -0,0 +1,151 @@
+import { cacheLogger as log } from '../logger'
+import { Redis } from '../redis'
+
+export type CacheItem<T> = {
+  val: T | null // null here is for negative caching
+  updatedAt: number
+}
+
+export type CacheOptions<T> = {
+  staleTTL: number
+  maxTTL: number
+  fetchMethod: (key: string) => Promise<T | null>
+  fetchManyMethod?: (keys: string[]) => Promise<Record<string, T | null>>
+}
+
+export class ReadThroughCache<T> {
+  constructor(public redis: Redis, public opts: CacheOptions<T>) {}
+
+  private async _fetchMany(keys: string[]): Promise<Record<string, T | null>> {
+    let result: Record<string, T | null> = {}
+    if (this.opts.fetchManyMethod) {
+      result = await this.opts.fetchManyMethod(keys)
+    } else {
+      const got = await Promise.all(keys.map((k) => this.opts.fetchMethod(k)))
+      for (let i = 0; i < keys.length; i++) {
+        result[keys[i]] = got[i] ?? null
+      }
+    }
+    // ensure caching negatives
+    for (const key of keys) {
+      result[key] ??= null
+    }
+    return result
+  }
+
+  private async fetchAndCache(key: string): Promise<T | null> {
+    const fetched = await this.opts.fetchMethod(key)
+    this.set(key, fetched).catch((err) =>
+      log.error({ err, key }, 'failed to set cache value'),
+    )
+    return fetched
+  }
+
+  private async fetchAndCacheMany(keys: string[]): Promise<Record<string, T>> {
+    const fetched = await this._fetchMany(keys)
+    this.setMany(fetched).catch((err) =>
+      log.error({ err, keys }, 'failed to set cache values'),
+    )
+    return removeNulls(fetched)
+  }
+
+  async get(key: string, opts?: { revalidate?: boolean }): Promise<T | null> {
+    if (opts?.revalidate) {
+      return this.fetchAndCache(key)
+    }
+    let cached: CacheItem<T> | null
+    try {
+      const got = await this.redis.get(key)
+      cached = got ? JSON.parse(got) : null
+    } catch (err) {
+      cached = null
+      log.warn({ key, err }, 'failed to fetch value from cache')
+    }
+    if (!cached || this.isExpired(cached)) {
+      return this.fetchAndCache(key)
+    }
+    if (this.isStale(cached)) {
+      this.fetchAndCache(key).catch((err) =>
+        log.warn({ key, err }, 'failed to refresh stale cache value'),
+      )
+    }
+    return cached.val
+  }
+
+  async getMany(
+    keys: string[],
+    opts?: { revalidate?: boolean },
+  ): Promise<Record<string, T>> {
+    if (opts?.revalidate) {
+      return this.fetchAndCacheMany(keys)
+    }
+    let cached: Record<string, string>
+    try {
+      cached = await this.redis.getMulti(keys)
+    } catch (err) {
+      cached = {}
+      log.warn({ keys, err }, 'failed to fetch values from cache')
+    }
+
+    const stale: string[] = []
+    const toFetch: string[] = []
+    const results: Record<string, T> = {}
+    for (const key of keys) {
+      const val = cached[key] ? (JSON.parse(cached[key]) as CacheItem<T>) : null
+      if (!val || this.isExpired(val)) {
+        toFetch.push(key)
+        continue
+      }
+      if (this.isStale(val)) {
+        stale.push(key)
+      }
+      if (val.val) {
+        results[key] = val.val
+      }
+    }
+    const fetched = await this.fetchAndCacheMany(toFetch)
+    this.fetchAndCacheMany(stale).catch((err) =>
+      log.warn({ keys, err }, 'failed to refresh stale cache values'),
+    )
+    return {
+      ...results,
+      ...fetched,
+    }
+  }
+
+  async set(key: string, val: T | null) {
+    await this.setMany({ [key]: val })
+  }
+
+  async setMany(vals: Record<string, T | null>) {
+    const items: Record<string, string> = {}
+    for (const key of Object.keys(vals)) {
+      items[key] = JSON.stringify({
+        val: vals[key],
+        updatedAt: Date.now(),
+      })
+    }
+    await this.redis.setMulti(items, this.opts.maxTTL)
+  }
+
+  async clearEntry(key: string) {
+    await this.redis.del(key)
+  }
+
+  isExpired(result: CacheItem<T>) {
+    return Date.now() > result.updatedAt + this.opts.maxTTL
+  }
+
+  isStale(result: CacheItem<T>) {
+    return Date.now() > result.updatedAt + this.opts.staleTTL
+  }
+}
+
+const removeNulls = <T>(obj: Record<string, T | null>): Record<string, T> => {
+  return Object.entries(obj).reduce((acc, [key, val]) => {
+    if (val !== null) {
+      acc[key] = val
+    }
+    return acc
+  }, {} as Record<string, T>)
+}

package/src/config.ts

@@ -1,5 +1,11 @@
 import assert from 'assert'
-import { DAY, HOUR, parseIntWithFallback } from '@atproto/common'
+import {
+  DAY,
+  HOUR,
+  MINUTE,
+  SECOND,
+  parseIntWithFallback,
+} from '@atproto/common'
 
 export interface ServerConfigValues {
   version: string
@@ -12,9 +18,15 @@ export interface ServerConfigValues {
   dbReplicaPostgresUrls?: string[]
   dbReplicaTags?: Record<string, number[]> // E.g. { timeline: [0], thread: [1] }
   dbPostgresSchema?: string
+  redisHost?: string // either set redis host, or both sentinel name and hosts
+  redisSentinelName?: string
+  redisSentinelHosts?: string[]
+  redisPassword?: string
   didPlcUrl: string
   didCacheStaleTTL: number
   didCacheMaxTTL: number
+  labelCacheStaleTTL: number
+  labelCacheMaxTTL: number
   handleResolveNameservers?: string[]
   imgUriEndpoint?: string
   blobCacheLocation?: string
@@ -24,6 +36,9 @@ export interface ServerConfigValues {
   moderatorPassword?: string
   triagePassword?: string
   moderationPushUrl?: string
+  rateLimitsEnabled: boolean
+  rateLimitBypassKey?: string
+  rateLimitBypassIps?: string[]
 }
 
 export class ServerConfig {
@@ -38,6 +53,19 @@ export class ServerConfig {
     const feedGenDid = process.env.FEED_GEN_DID
     const envPort = parseInt(process.env.PORT || '', 10)
     const port = isNaN(envPort) ? 2584 : envPort
+    const redisHost =
+      overrides?.redisHost || process.env.REDIS_HOST || undefined
+    const redisSentinelName =
+      overrides?.redisSentinelName ||
+      process.env.REDIS_SENTINEL_NAME ||
+      undefined
+    const redisSentinelHosts =
+      overrides?.redisSentinelHosts ||
+      (process.env.REDIS_SENTINEL_HOSTS
+        ? process.env.REDIS_SENTINEL_HOSTS.split(',')
+        : [])
+    const redisPassword =
+      overrides?.redisPassword || process.env.REDIS_PASSWORD || undefined
     const didPlcUrl = process.env.DID_PLC_URL || 'http://localhost:2582'
     const didCacheStaleTTL = parseIntWithFallback(
       process.env.DID_CACHE_STALE_TTL,
@@ -47,6 +75,14 @@ export class ServerConfig {
       process.env.DID_CACHE_MAX_TTL,
       DAY,
     )
+    const labelCacheStaleTTL = parseIntWithFallback(
+      process.env.LABEL_CACHE_STALE_TTL,
+      30 * SECOND,
+    )
+    const labelCacheMaxTTL = parseIntWithFallback(
+      process.env.LABEL_CACHE_MAX_TTL,
+      MINUTE,
+    )
     const handleResolveNameservers = process.env.HANDLE_RESOLVE_NAMESERVERS
       ? process.env.HANDLE_RESOLVE_NAMESERVERS.split(',')
       : []
@@ -82,6 +118,14 @@ export class ServerConfig {
       overrides?.moderationPushUrl ||
       process.env.MODERATION_PUSH_URL ||
       undefined
+    const rateLimitsEnabled = process.env.RATE_LIMITS_ENABLED === 'true'
+    const rateLimitBypassKey = process.env.RATE_LIMIT_BYPASS_KEY
+    const rateLimitBypassIps = process.env.RATE_LIMIT_BYPASS_IPS
+      ? process.env.RATE_LIMIT_BYPASS_IPS.split(',').map((ipOrCidr) =>
+          ipOrCidr.split('/')[0]?.trim(),
+        )
+      : undefined
+
     return new ServerConfig({
       version,
       debugMode,
@@ -93,9 +137,15 @@ export class ServerConfig {
       dbReplicaPostgresUrls,
       dbReplicaTags,
       dbPostgresSchema,
+      redisHost,
+      redisSentinelName,
+      redisSentinelHosts,
+      redisPassword,
       didPlcUrl,
       didCacheStaleTTL,
       didCacheMaxTTL,
+      labelCacheStaleTTL,
+      labelCacheMaxTTL,
       handleResolveNameservers,
       imgUriEndpoint,
       blobCacheLocation,
@@ -105,6 +155,9 @@ export class ServerConfig {
       moderatorPassword,
       triagePassword,
       moderationPushUrl,
+      rateLimitsEnabled,
+      rateLimitBypassKey,
+      rateLimitBypassIps,
       ...stripUndefineds(overrides ?? {}),
     })
   }
@@ -162,6 +215,22 @@ export class ServerConfig {
     return this.cfg.dbPostgresSchema
   }
 
+  get redisHost() {
+    return this.cfg.redisHost
+  }
+
+  get redisSentinelName() {
+    return this.cfg.redisSentinelName
+  }
+
+  get redisSentinelHosts() {
+    return this.cfg.redisSentinelHosts
+  }
+
+  get redisPassword() {
+    return this.cfg.redisPassword
+  }
+
   get didCacheStaleTTL() {
     return this.cfg.didCacheStaleTTL
   }
@@ -170,6 +239,14 @@ export class ServerConfig {
     return this.cfg.didCacheMaxTTL
   }
 
+  get labelCacheStaleTTL() {
+    return this.cfg.labelCacheStaleTTL
+  }
+
+  get labelCacheMaxTTL() {
+    return this.cfg.labelCacheMaxTTL
+  }
+
   get handleResolveNameservers() {
     return this.cfg.handleResolveNameservers
   }
@@ -209,6 +286,18 @@ export class ServerConfig {
   get moderationPushUrl() {
     return this.cfg.moderationPushUrl
   }
+
+  get rateLimitsEnabled() {
+    return this.cfg.rateLimitsEnabled
+  }
+
+  get rateLimitBypassKey() {
+    return this.cfg.rateLimitBypassKey
+  }
+
+  get rateLimitBypassIps() {
+    return this.cfg.rateLimitBypassIps
+  }
 }
 
 function getTagIdxs(str?: string): number[] {

package/src/context.ts

@@ -8,11 +8,11 @@ import { ServerConfig } from './config'
 import { ImageUriBuilder } from './image/uri'
 import { Services } from './services'
 import * as auth from './auth'
-import DidSqlCache from './did-cache'
+import DidRedisCache from './did-cache'
 import { BackgroundQueue } from './background'
 import { MountedAlgos } from './feed-gen/types'
-import { LabelCache } from './label-cache'
 import { NotificationServer } from './notifications'
+import { Redis } from './redis'
 
 export class AppContext {
   public moderationPushAgent: AtpAgent | undefined
@@ -24,8 +24,8 @@ export class AppContext {
       services: Services
       signingKey: Keypair
       idResolver: IdResolver
-      didCache: DidSqlCache
-      labelCache: LabelCache
+      didCache: DidRedisCache
+      redis: Redis
       backgroundQueue: BackgroundQueue
       searchAgent?: AtpAgent
       algos: MountedAlgos
@@ -70,12 +70,12 @@ export class AppContext {
     return this.opts.idResolver
   }
 
-  get didCache(): DidSqlCache {
+  get didCache(): DidRedisCache {
     return this.opts.didCache
   }
 
-  get labelCache(): LabelCache {
-    return this.opts.labelCache
+  get redis(): Redis {
+    return this.opts.redis
   }
 
   get notifServer(): NotificationServer {

package/src/daemon/config.ts

@@ -0,0 +1,60 @@
+import assert from 'assert'
+
+export interface DaemonConfigValues {
+  version: string
+  dbPostgresUrl: string
+  dbPostgresSchema?: string
+  notificationsDaemonFromDid?: string
+}
+
+export class DaemonConfig {
+  constructor(private cfg: DaemonConfigValues) {}
+
+  static readEnv(overrides?: Partial<DaemonConfigValues>) {
+    const version = process.env.BSKY_VERSION || '0.0.0'
+    const dbPostgresUrl =
+      overrides?.dbPostgresUrl || process.env.DB_PRIMARY_POSTGRES_URL
+    const dbPostgresSchema =
+      overrides?.dbPostgresSchema || process.env.DB_POSTGRES_SCHEMA
+    const notificationsDaemonFromDid =
+      overrides?.notificationsDaemonFromDid ||
+      process.env.BSKY_NOTIFS_DAEMON_FROM_DID ||
+      undefined
+    assert(dbPostgresUrl)
+    return new DaemonConfig({
+      version,
+      dbPostgresUrl,
+      dbPostgresSchema,
+      notificationsDaemonFromDid,
+      ...stripUndefineds(overrides ?? {}),
+    })
+  }
+
+  get version() {
+    return this.cfg.version
+  }
+
+  get dbPostgresUrl() {
+    return this.cfg.dbPostgresUrl
+  }
+
+  get dbPostgresSchema() {
+    return this.cfg.dbPostgresSchema
+  }
+
+  get notificationsDaemonFromDid() {
+    return this.cfg.notificationsDaemonFromDid
+  }
+}
+
+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
+}

package/src/daemon/context.ts

@@ -0,0 +1,27 @@
+import { PrimaryDatabase } from '../db'
+import { DaemonConfig } from './config'
+import { Services } from './services'
+
+export class DaemonContext {
+  constructor(
+    private opts: {
+      db: PrimaryDatabase
+      cfg: DaemonConfig
+      services: Services
+    },
+  ) {}
+
+  get db(): PrimaryDatabase {
+    return this.opts.db
+  }
+
+  get cfg(): DaemonConfig {
+    return this.opts.cfg
+  }
+
+  get services(): Services {
+    return this.opts.services
+  }
+}
+
+export default DaemonContext