Merge pull request #1837 from bluesky-social/no-cache-actor-store

No cache actor store

packages/bsky/src/util/retry.ts

@@ -1,26 +1,6 @@
 import { AxiosError } from 'axios'
-import { wait } from '@atproto/common'
 import { XRPCError, ResponseType } from '@atproto/xrpc'
-
-export async function retry<T>(
-  fn: () => Promise<T>,
-  opts: RetryOptions = {},
-): Promise<T> {
-  const { max = 3, retryable = () => true } = opts
-  let retries = 0
-  let doneError: unknown
-  while (!doneError) {
-    try {
-      if (retries) await backoff(retries)
-      return await fn()
-    } catch (err) {
-      const willRetry = retries < max && retryable(err)
-      if (!willRetry) doneError = err
-      retries += 1
-    }
-  }
-  throw doneError
-}
+import { RetryOptions, retry } from '@atproto/common'
 
 export async function retryHttp<T>(
   fn: () => Promise<T>,
@@ -44,26 +24,3 @@ export function retryableHttp(err: unknown) {
 const retryableHttpStatusCodes = new Set([
   408, 425, 429, 500, 502, 503, 504, 522, 524,
 ])
-
-type RetryOptions = {
-  max?: number
-  retryable?: (err: unknown) => boolean
-}
-
-// Waits exponential backoff with max and jitter: ~50, ~100, ~200, ~400, ~800, ~1000, ~1000, ...
-async function backoff(n: number, multiplier = 50, max = 1000) {
-  const exponentialMs = Math.pow(2, n) * multiplier
-  const ms = Math.min(exponentialMs, max)
-  await wait(jitter(ms))
-}
-
-// Adds randomness +/-15% of value
-function jitter(value: number) {
-  const delta = value * 0.15
-  return value + randomRange(-delta, delta)
-}
-
-function randomRange(from: number, to: number) {
-  const rand = Math.random() * (to - from)
-  return rand + from
-}

packages/bsky/tests/auto-moderator/takedowns.test.ts

@@ -93,12 +93,15 @@ describe('takedowner', () => {
       .executeTakeFirst()
     expect(record?.takedownId).toEqual(modAction.id)
 
-    const actorDb = await network.pds.ctx.actorStore.db(post.ref.uri.hostname)
-    const recordPds = await actorDb.db
-      .selectFrom('record')
-      .where('uri', '=', post.ref.uriStr)
-      .select('takedownRef')
-      .executeTakeFirst()
+    const recordPds = await network.pds.ctx.actorStore.read(
+      post.ref.uri.hostname,
+      (store) =>
+        store.db.db
+          .selectFrom('record')
+          .where('uri', '=', post.ref.uriStr)
+          .select('takedownRef')
+          .executeTakeFirst(),
+    )
     expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(1)
@@ -136,12 +139,13 @@ describe('takedowner', () => {
       .executeTakeFirst()
     expect(record?.takedownId).toEqual(modAction.id)
 
-    const actorDb = await network.pds.ctx.actorStore.db(alice)
-    const recordPds = await actorDb.db
-      .selectFrom('record')
-      .where('uri', '=', res.data.uri)
-      .select('takedownRef')
-      .executeTakeFirst()
+    const recordPds = await network.pds.ctx.actorStore.read(alice, (store) =>
+      store.db.db
+        .selectFrom('record')
+        .where('uri', '=', res.data.uri)
+        .select('takedownRef')
+        .executeTakeFirst(),
+    )
     expect(recordPds?.takedownRef).toEqual(modAction.id.toString())
 
     expect(testInvalidator.invalidated.length).toBe(2)

packages/common-web/src/index.ts

@@ -6,6 +6,7 @@ export * from './async'
 export * from './util'
 export * from './tid'
 export * from './ipld'
+export * from './retry'
 export * from './types'
 export * from './times'
 export * from './strings'

packages/common-web/src/retry.ts

@@ -0,0 +1,47 @@
+import { wait } from './util'
+
+export type RetryOptions = {
+  maxRetries?: number
+  backoffMultiplier?: number
+  backoffMax?: number
+  retryable?: (err: unknown) => boolean
+}
+
+export async function retry<T>(
+  fn: () => Promise<T>,
+  opts: RetryOptions = {},
+): Promise<T> {
+  const { maxRetries = 3, retryable = () => true } = opts
+  let retries = 0
+  let doneError: unknown
+  while (!doneError) {
+    try {
+      if (retries)
+        await backoff(retries, opts.backoffMultiplier, opts.backoffMax)
+      return await fn()
+    } catch (err) {
+      const willRetry = retries < maxRetries && retryable(err)
+      if (!willRetry) doneError = err
+      retries += 1
+    }
+  }
+  throw doneError
+}
+
+// Waits exponential backoff with max and jitter: ~50, ~100, ~200, ~400, ~800, ~1000, ~1000, ...
+async function backoff(n: number, multiplier = 50, max = 1000) {
+  const exponentialMs = Math.pow(2, n) * multiplier
+  const ms = Math.min(exponentialMs, max)
+  await wait(jitter(ms))
+}
+
+// Adds randomness +/-15% of value
+function jitter(value: number) {
+  const delta = value * 0.15
+  return value + randomRange(-delta, delta)
+}
+
+function randomRange(from: number, to: number) {
+  const rand = Math.random() * (to - from)
+  return rand + from
+}

packages/pds/package.json

@@ -60,7 +60,6 @@
     "jose": "^5.0.1",
     "key-encoder": "^2.0.3",
     "kysely": "^0.22.0",
-    "lru-cache": "^10.0.1",
     "multiformats": "^9.9.0",
     "nodemailer": "^6.8.0",
     "nodemailer-html-to-text": "^3.2.0",

packages/pds/src/account-manager/index.ts

@@ -29,8 +29,8 @@ export class AccountManager {
     await getMigrator(this.db).migrateToLatestOrThrow()
   }
 
-  async close() {
-    await this.db.close()
+  close() {
+    this.db.close()
   }
 
   // Account