@atproto/bsky 0.0.15 → 0.0.17

package/tests/indexing.test.ts

@@ -498,7 +498,8 @@ describe('indexing', () => {
 
     it('skips invalid records.', async () => {
       const { db, services } = network.bsky.indexer.ctx
-      const { db: pdsDb, services: pdsServices } = network.pds.ctx
+      const { accountManager } = network.pds.ctx
+      // const { db: pdsDb, services: pdsServices } = network.pds.ctx
       // Create a good and a bad post record
       const writes = await Promise.all([
         pdsRepo.prepareCreate({
@@ -513,9 +514,20 @@ describe('indexing', () => {
           validate: false,
         }),
       ])
-      await pdsServices
-        .repo(pdsDb)
-        .processWrites({ did: sc.dids.alice, writes }, 1)
+      const writeCommit = await network.pds.ctx.actorStore.transact(
+        sc.dids.alice,
+        (store) => store.repo.processWrites(writes),
+      )
+      await accountManager.updateRepoRoot(
+        sc.dids.alice,
+        writeCommit.cid,
+        writeCommit.rev,
+      )
+      await network.pds.ctx.sequencer.sequenceCommit(
+        sc.dids.alice,
+        writeCommit,
+        writes,
+      )
       // Index
       const { data: commit } =
         await pdsAgent.api.com.atproto.sync.getLatestCommit({
@@ -643,15 +655,10 @@ describe('indexing', () => {
       )
       await expect(getProfileBefore).resolves.toBeDefined()
       // Delete account on pds
-      await pdsAgent.api.com.atproto.server.requestAccountDelete(undefined, {
-        headers: sc.getHeaders(alice),
-      })
-      const { token } = await network.pds.ctx.db.db
-        .selectFrom('email_token')
-        .selectAll()
-        .where('purpose', '=', 'delete_account')
-        .where('did', '=', alice)
-        .executeTakeFirstOrThrow()
+      const token = await network.pds.ctx.accountManager.createEmailToken(
+        alice,
+        'delete_account',
+      )
       await pdsAgent.api.com.atproto.server.deleteAccount({
         token,
         did: alice,

package/tests/redis-cache.test.ts

@@ -0,0 +1,231 @@
+import { wait } from '@atproto/common'
+import { Redis } from '../src/'
+import { ReadThroughCache } from '../src/cache/read-through'
+
+describe('redis cache', () => {
+  let redis: Redis
+
+  beforeAll(async () => {
+    redis = new Redis({ host: process.env.REDIS_HOST || '' })
+  })
+
+  afterAll(async () => {
+    await redis.destroy()
+  })
+
+  it('caches according to namespace', async () => {
+    const ns1 = redis.withNamespace('ns1')
+    const ns2 = redis.withNamespace('ns2')
+    await Promise.all([
+      ns1.set('key', 'a'),
+      ns2.set('key', 'b'),
+      redis.set('key', 'c'),
+    ])
+    const got = await Promise.all([
+      ns1.get('key'),
+      ns2.get('key'),
+      redis.get('key'),
+    ])
+    expect(got[0]).toEqual('a')
+    expect(got[1]).toEqual('b')
+    expect(got[2]).toEqual('c')
+
+    await Promise.all([
+      ns1.setMulti({ key1: 'a', key2: 'b' }),
+      ns2.setMulti({ key1: 'c', key2: 'd' }),
+      redis.setMulti({ key1: 'e', key2: 'f' }),
+    ])
+    const gotMany = await Promise.all([
+      ns1.getMulti(['key1', 'key2']),
+      ns2.getMulti(['key1', 'key2']),
+      redis.getMulti(['key1', 'key2']),
+    ])
+    expect(gotMany[0]['key1']).toEqual('a')
+    expect(gotMany[0]['key2']).toEqual('b')
+    expect(gotMany[1]['key1']).toEqual('c')
+    expect(gotMany[1]['key2']).toEqual('d')
+    expect(gotMany[2]['key1']).toEqual('e')
+    expect(gotMany[2]['key2']).toEqual('f')
+  })
+
+  it('caches values when empty', async () => {
+    const vals = {
+      '1': 'a',
+      '2': 'b',
+      '3': 'c',
+    }
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test1'), {
+      staleTTL: 60000,
+      maxTTL: 60000,
+      fetchMethod: async (key) => {
+        hits++
+        return vals[key]
+      },
+    })
+    const got = await Promise.all([
+      cache.get('1'),
+      cache.get('2'),
+      cache.get('3'),
+    ])
+    expect(got[0]).toEqual('a')
+    expect(got[1]).toEqual('b')
+    expect(got[2]).toEqual('c')
+    expect(hits).toBe(3)
+
+    const refetched = await Promise.all([
+      cache.get('1'),
+      cache.get('2'),
+      cache.get('3'),
+    ])
+    expect(refetched[0]).toEqual('a')
+    expect(refetched[1]).toEqual('b')
+    expect(refetched[2]).toEqual('c')
+    expect(hits).toBe(3)
+  })
+
+  it('skips and refreshes cache when requested', async () => {
+    let val = 'a'
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test2'), {
+      staleTTL: 60000,
+      maxTTL: 60000,
+      fetchMethod: async () => {
+        hits++
+        return val
+      },
+    })
+
+    const try1 = await cache.get('1')
+    expect(try1).toEqual('a')
+    expect(hits).toBe(1)
+
+    val = 'b'
+
+    const try2 = await cache.get('1')
+    expect(try2).toEqual('a')
+    expect(hits).toBe(1)
+
+    const try3 = await cache.get('1', { revalidate: true })
+    expect(try3).toEqual('b')
+    expect(hits).toBe(2)
+
+    const try4 = await cache.get('1')
+    expect(try4).toEqual('b')
+    expect(hits).toBe(2)
+  })
+
+  it('accurately reports stale entries & refreshes the cache', async () => {
+    let val = 'a'
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test3'), {
+      staleTTL: 1,
+      maxTTL: 60000,
+      fetchMethod: async () => {
+        hits++
+        return val
+      },
+    })
+
+    const try1 = await cache.get('1')
+    expect(try1).toEqual('a')
+
+    await wait(5)
+
+    val = 'b'
+
+    const try2 = await cache.get('1')
+    // cache gives us stale value while it revalidates
+    expect(try2).toEqual('a')
+
+    await wait(5)
+
+    const try3 = await cache.get('1')
+    expect(try3).toEqual('b')
+    expect(hits).toEqual(3)
+  })
+
+  it('does not return expired dids & refreshes the cache', async () => {
+    let val = 'a'
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test4'), {
+      staleTTL: 0,
+      maxTTL: 1,
+      fetchMethod: async () => {
+        hits++
+        return val
+      },
+    })
+
+    const try1 = await cache.get('1')
+    expect(try1).toEqual('a')
+
+    await wait(5)
+
+    val = 'b'
+
+    const try2 = await cache.get('1')
+    expect(try2).toEqual('b')
+    expect(hits).toBe(2)
+  })
+
+  it('caches negative values', async () => {
+    let val: string | null = null
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test5'), {
+      staleTTL: 60000,
+      maxTTL: 60000,
+      fetchMethod: async () => {
+        hits++
+        return val
+      },
+    })
+
+    const try1 = await cache.get('1')
+    expect(try1).toEqual(null)
+    expect(hits).toBe(1)
+
+    val = 'b'
+
+    const try2 = await cache.get('1')
+    // returns cached negative value
+    expect(try2).toEqual(null)
+    expect(hits).toBe(1)
+
+    const try3 = await cache.get('1', { revalidate: true })
+    expect(try3).toEqual('b')
+    expect(hits).toEqual(2)
+
+    const try4 = await cache.get('1')
+    expect(try4).toEqual('b')
+    expect(hits).toEqual(2)
+  })
+
+  it('times out and fails open', async () => {
+    let val = 'a'
+    let hits = 0
+    const cache = new ReadThroughCache<string>(redis.withNamespace('test6'), {
+      staleTTL: 60000,
+      maxTTL: 60000,
+      fetchMethod: async () => {
+        hits++
+        return val
+      },
+    })
+
+    const try1 = await cache.get('1')
+    expect(try1).toEqual('a')
+
+    const orig = cache.redis.driver.get
+    cache.redis.driver.get = async (key) => {
+      await wait(600)
+      return orig(key)
+    }
+
+    val = 'b'
+
+    const try2 = await cache.get('1')
+    expect(try2).toEqual('b')
+    expect(hits).toBe(2)
+  })
+})

package/tests/seeds/basic.ts

@@ -103,6 +103,8 @@ export default async (sc: SeedClient, users = true) => {
     'tests/sample-img/key-landscape-small.jpg',
     'image/jpeg',
   )
+  // must ensure ordering of replies in indexing
+  await sc.network.processAll()
   await sc.reply(
     bob,
     sc.posts[alice][1].ref,
@@ -117,6 +119,7 @@ export default async (sc: SeedClient, users = true) => {
     sc.posts[alice][1].ref,
     replies.carol[0],
   )
+  await sc.network.processAll()
   const alicesReplyToBob = await sc.reply(
     alice,
     sc.posts[alice][1].ref,

package/tests/subscription/repo.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import { CommitData } from '@atproto/repo'
-import { RepoService } from '@atproto/pds/src/services/repo'
 import { PreparedWrite } from '@atproto/pds/src/repo'
 import * as sequencer from '@atproto/pds/src/sequencer'
 import { cborDecode, cborEncode } from '@atproto/common'
@@ -84,9 +83,8 @@ describe('sync', () => {
 
   it('indexes actor when commit is unprocessable.', async () => {
     // mock sequencing to create an unprocessable commit event
-    const afterWriteProcessingOriginal =
-      RepoService.prototype.afterWriteProcessing
-    RepoService.prototype.afterWriteProcessing = async function (
+    const sequenceCommitOrig = network.pds.ctx.sequencer.sequenceCommit
+    network.pds.ctx.sequencer.sequenceCommit = async function (
       did: string,
       commitData: CommitData,
       writes: PreparedWrite[],
@@ -95,7 +93,7 @@ describe('sync', () => {
       const evt = cborDecode(seqEvt.event) as sequencer.CommitEvt
       evt.blocks = new Uint8Array() // bad blocks
       seqEvt.event = cborEncode(evt)
-      await sequencer.sequenceEvt(this.db, seqEvt)
+      await network.pds.ctx.sequencer.sequenceEvt(seqEvt)
     }
     // create account and index the initial commit event
     await sc.createAccount('jack', {
@@ -103,12 +101,11 @@ describe('sync', () => {
       email: 'jack@test.com',
       password: 'password',
     })
-    await network.pds.ctx.sequencerLeader?.isCaughtUp()
     await network.processAll()
     // confirm jack was indexed as an actor despite the bad event
     const actors = await dumpTable(ctx.db.getPrimary(), 'actor', ['did'])
     expect(actors.map((a) => a.handle)).toContain('jack.test')
-    RepoService.prototype.afterWriteProcessing = afterWriteProcessingOriginal
+    network.pds.ctx.sequencer.sequenceCommit = sequenceCommitOrig
   })
 
   async function updateProfile(

package/tests/views/__snapshots__/block-lists.test.ts.snap

@@ -126,9 +126,6 @@ Object {
       "uri": "record(0)",
       "viewer": Object {},
     },
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -204,9 +201,6 @@ Object {
       "viewer": Object {},
     },
     "replies": Array [],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -288,9 +282,6 @@ Object {
         "uri": "record(7)",
       },
     ],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -498,6 +489,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(4)",
     },
     Object {
       "subject": Object {
@@ -522,6 +514,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(5)",
     },
     Object {
       "subject": Object {
@@ -550,6 +543,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(6)",
     },
   ],
   "list": Object {

package/tests/views/__snapshots__/blocks.test.ts.snap

@@ -126,9 +126,6 @@ Object {
       "uri": "record(0)",
       "viewer": Object {},
     },
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -204,9 +201,6 @@ Object {
       "viewer": Object {},
     },
     "replies": Array [],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;
@@ -359,9 +353,6 @@ Object {
         },
       },
     ],
-    "viewer": Object {
-      "canReply": true,
-    },
   },
 }
 `;

package/tests/views/__snapshots__/mute-lists.test.ts.snap

@@ -292,9 +292,6 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -498,6 +495,7 @@ Object {
           "muted": false,
         },
       },
+      "uri": "record(3)",
     },
     Object {
       "subject": Object {
@@ -506,7 +504,7 @@ Object {
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "followedBy": "record(3)",
+          "followedBy": "record(5)",
           "muted": true,
           "mutedByList": Object {
             "avatar": "https://bsky.public.url/img/avatar/plain/user(0)/cids(1)@jpeg",
@@ -521,6 +519,7 @@ Object {
           },
         },
       },
+      "uri": "record(4)",
     },
     Object {
       "subject": Object {
@@ -533,7 +532,7 @@ Object {
         "labels": Array [],
         "viewer": Object {
           "blockedBy": false,
-          "following": "record(4)",
+          "following": "record(7)",
           "muted": true,
           "mutedByList": Object {
             "avatar": "https://bsky.public.url/img/avatar/plain/user(0)/cids(1)@jpeg",
@@ -548,6 +547,7 @@ Object {
           },
         },
       },
+      "uri": "record(6)",
     },
   ],
   "list": Object {

package/tests/views/__snapshots__/mutes.test.ts.snap

@@ -269,8 +269,5 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;

package/tests/views/__snapshots__/thread.test.ts.snap

@@ -195,9 +195,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -437,9 +434,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -615,9 +609,6 @@ Object {
       },
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -771,9 +762,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -826,9 +814,6 @@ Object {
     "viewer": Object {},
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -896,9 +881,6 @@ Object {
     "viewer": Object {},
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -968,9 +950,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1040,9 +1019,6 @@ Object {
     },
   },
   "replies": Array [],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1243,9 +1219,6 @@ Object {
       ],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;
 
@@ -1384,8 +1357,5 @@ Object {
       "replies": Array [],
     },
   ],
-  "viewer": Object {
-    "canReply": true,
-  },
 }
 `;

package/tests/views/actor-search.test.ts

@@ -1,7 +1,6 @@
 import AtpAgent from '@atproto/api'
 import { wait } from '@atproto/common'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
-import { TAKEDOWN } from '@atproto/api/src/client/types/com/atproto/admin/defs'
 import { forSnapshot, paginateAll, stripViewer } from '../_util'
 import usersBulkSeed from '../seeds/users-bulk'
 
@@ -240,9 +239,9 @@ describe.skip('pds actor search views', () => {
   })
 
   it('search blocks by actor takedown', async () => {
-    await agent.api.com.atproto.admin.takeModerationAction(
+    await agent.api.com.atproto.admin.emitModerationEvent(
       {
-        action: TAKEDOWN,
+        event: { $type: 'com.atproto.admin.defs#modEventTakedown' },
         subject: {
           $type: 'com.atproto.admin.defs#repoRef',
           did: sc.dids['cara-wiegand69.test'],