@atproto/bsky 0.0.230 → 0.0.232

package/tests/views/account-deactivation.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 

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

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 

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

@@ -1,7 +1,8 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyActorSearchActors, AtpAgent, ids } from '@atproto/api'
 import { wait } from '@atproto/common'
 import { SeedClient, TestNetwork, usersBulkSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { forSnapshot, paginateAll, stripViewer } from '../_util.js'
 
 // @NOTE skipped to help with CI failures
 // The search code is not used in production & we should switch it out for tests on the search proxy interface
@@ -10,6 +11,7 @@ describe.skip('pds actor search views', () => {
   let agent: AtpAgent
   let sc: SeedClient
   let headers: { [s: string]: string }
+  let headersTypeahead: { [s: string]: string }
 
   beforeAll(async () => {
     network = await TestNetwork.create({
@@ -41,10 +43,14 @@ describe.skip('pds actor search views', () => {
     await network.bsky.sub.restart()
     await network.processAll(50000)
     headers = await network.serviceHeaders(
+      Object.values(sc.dids)[0],
+      ids.AppBskyActorSearchActors,
+    )
+    headersTypeahead = await network.serviceHeaders(
       Object.values(sc.dids)[0],
       ids.AppBskyActorSearchActorsTypeahead,
     )
-  })
+  }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
     await network.close()
@@ -53,7 +59,7 @@ describe.skip('pds actor search views', () => {
   it('typeahead gives relevant results', async () => {
     const result = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: 'car' },
-      { headers },
+      { headers: headersTypeahead },
     )
 
     const handles = result.data.actors.map((u) => u.handle)
@@ -91,7 +97,7 @@ describe.skip('pds actor search views', () => {
   it('typeahead gives empty result set when provided empty term', async () => {
     const result = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: '' },
-      { headers },
+      { headers: headersTypeahead },
     )
 
     expect(result.data.actors).toEqual([])
@@ -100,14 +106,14 @@ describe.skip('pds actor search views', () => {
   it('typeahead applies limit', async () => {
     const full = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: 'p' },
-      { headers },
+      { headers: headersTypeahead },
     )
 
     expect(full.data.actors.length).toBeGreaterThan(5)
 
     const limited = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: 'p', limit: 5 },
-      { headers },
+      { headers: headersTypeahead },
     )
 
     // @NOTE it's expected that searchActorsTypeahead doesn't have stable pagination
@@ -129,7 +135,7 @@ describe.skip('pds actor search views', () => {
     const { data: authed } =
       await agent.api.app.bsky.actor.searchActorsTypeahead(
         { term: 'car' },
-        { headers },
+        { headers: headersTypeahead },
       )
     const { data: unauthed } =
       await agent.api.app.bsky.actor.searchActorsTypeahead({
@@ -246,7 +252,7 @@ describe.skip('pds actor search views', () => {
     })
     const result = await agent.api.app.bsky.actor.searchActorsTypeahead(
       { term: 'car' },
-      { headers },
+      { headers: headersTypeahead },
     )
     const handles = result.data.actors.map((u) => u.handle)
     expect(handles).toContain('carlos6.test')

package/tests/views/age-assurance-v2.test.ts

@@ -3,6 +3,16 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application, json } from 'express'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import {
   AppBskyAgeassuranceBegin,
   AppBskyAgeassuranceDefs,
@@ -15,19 +25,19 @@ import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   type KWSWebhookAgeVerified,
   serializeKWSAgeVerifiedStatus,
-} from '../../src/api/age-assurance/kws/age-verified'
+} from '../../src/api/age-assurance/kws/age-verified.js'
 import {
   KWSExternalPayloadVersion,
   serializeKWSExternalPayloadV1,
   serializeKWSExternalPayloadV2,
-} from '../../src/api/age-assurance/kws/external-payload'
-import { KwsWebhookBody } from '../../src/api/kws/types'
+} from '../../src/api/age-assurance/kws/external-payload.js'
+import { KwsWebhookBody } from '../../src/api/kws/types.js'
 
 type Database = TestNetwork['bsky']['db']
 
 const BSKY_REDIRECT_URL = 'http://bsky'
 
-jest.mock('../../dist/api/age-assurance/const.js', () => {
+vi.mock('../../dist/api/age-assurance/const.js', () => {
   const AGE_ASSURANCE_CONFIG: AppBskyAgeassuranceDefs.Config = {
     regions: [
       {
@@ -69,8 +79,10 @@ jest.mock('../../dist/api/age-assurance/const.js', () => {
   }
 })
 
-jest.mock('../../dist/api/age-assurance/kws/const.js', () => {
-  const actual = jest.requireActual('../../dist/api/age-assurance/kws/const.js')
+vi.mock('../../dist/api/age-assurance/kws/const.js', async () => {
+  const actual = await vi.importActual<Record<string, unknown>>(
+    '../../dist/api/age-assurance/kws/const.js',
+  )
   const KWS_V2_COUNTRIES = new Set(['AA'])
   return {
     ...actual,
@@ -85,9 +97,9 @@ describe('age assurance v2 views', () => {
   let sc: SeedClient
   let kws: MockKwsServer
 
-  const kwsOauthMock = jest.fn()
-  const kwsSendAgeVerifiedFlowEmailMock = jest.fn()
-  const kwsSendAdultVerifiedFlowEmailMock = jest.fn()
+  const kwsOauthMock = vi.fn<MockHandler>()
+  const kwsSendAgeVerifiedFlowEmailMock = vi.fn<MockHandler>()
+  const kwsSendAdultVerifiedFlowEmailMock = vi.fn<MockHandler>()
   const actor = {
     did: '',
     email: '',
@@ -155,7 +167,7 @@ describe('age assurance v2 views', () => {
   })
 
   afterEach(async () => {
-    jest.resetAllMocks()
+    vi.resetAllMocks()
     await clearPrivateData(db)
     await clearActorAgeAssurance(db)
   })
@@ -645,6 +657,8 @@ const clearActorAgeAssurance = async (db: Database) => {
     .execute()
 }
 
+type MockHandler = (req: express.Request, res: express.Response) => void
+
 class MockKwsServer {
   verificationSecret = 'verificationSecret' // unused here
   webhookSecret = 'webhookSecret' // unused here
@@ -660,9 +674,9 @@ class MockKwsServer {
     sendAgeVerifiedFlowEmailMock,
     sendAdultVerifiedFlowEmailMock,
   }: {
-    oauthMock: jest.Mock
-    sendAgeVerifiedFlowEmailMock: jest.Mock
-    sendAdultVerifiedFlowEmailMock: jest.Mock
+    oauthMock: ReturnType<typeof vi.fn<MockHandler>>
+    sendAgeVerifiedFlowEmailMock: ReturnType<typeof vi.fn<MockHandler>>
+    sendAdultVerifiedFlowEmailMock: ReturnType<typeof vi.fn<MockHandler>>
   }) {
     this.app = express()
       .use(json())

package/tests/views/age-assurance.test.ts

@@ -3,17 +3,27 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
   KwsExternalPayload,
   KwsVerificationQuery,
   KwsWebhookBody,
-} from '../../src/api/kws/types'
+} from '../../src/api/kws/types.js'
 import {
   parseExternalPayload,
   serializeExternalPayload,
-} from '../../src/api/kws/util'
+} from '../../src/api/kws/util.js'
 
 type Database = TestNetwork['bsky']['db']
 
@@ -31,8 +41,8 @@ describe('age assurance views', () => {
   let actorDid: string
 
   let kwsServer: MockKwsServer
-  const authMock = jest.fn()
-  const sendEmailMock = jest.fn()
+  const authMock = vi.fn<MockHandler>()
+  const sendEmailMock = vi.fn<MockHandler>()
 
   beforeAll(async () => {
     kwsServer = new MockKwsServer({
@@ -87,7 +97,7 @@ describe('age assurance views', () => {
   })
 
   afterEach(async () => {
-    jest.resetAllMocks()
+    vi.resetAllMocks()
     await clearPrivateData(db)
     await clearActorAgeAssurance(db)
   })
@@ -224,7 +234,7 @@ describe('age assurance views', () => {
       lastInitiatedAt: expect.any(String),
     })
 
-    await expect(initAgeAssurance(actor)).rejects.toThrowError(
+    await expect(initAgeAssurance(actor)).rejects.toThrow(
       `Cannot initiate age assurance flow from current state: assured`,
     )
   })
@@ -362,6 +372,8 @@ const clearActorAgeAssurance = async (db: Database) => {
     .execute()
 }
 
+type MockHandler = (req: express.Request, res: express.Response) => void
+
 class MockKwsServer {
   private verificationSecret: string
   private webhookSecret: string
@@ -376,8 +388,8 @@ class MockKwsServer {
   }: {
     verificationSecret: string
     webhookSecret: string
-    authMock: jest.Mock
-    sendEmailMock: jest.Mock
+    authMock: ReturnType<typeof vi.fn<MockHandler>>
+    sendEmailMock: ReturnType<typeof vi.fn<MockHandler>>
   }) {
     this.verificationSecret = verificationSecret
     this.webhookSecret = webhookSecret

package/tests/views/author-feed.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyActorProfile,
   AppBskyEmbedImages,
@@ -12,13 +13,13 @@ import {
   ids,
 } from '@atproto/api'
 import { SeedClient, TestNetwork, authorFeedSeed } from '@atproto/dev-env'
-import { uriToDid } from '../../src/util/uris'
+import { uriToDid } from '../../src/util/uris.js'
 import {
   forSnapshot,
   paginateAll,
   stripViewer,
   stripViewerFromPost,
-} from '../_util'
+} from '../_util.js'
 
 const isValidReplyRef = asPredicate(AppBskyFeedPost.validateReplyRef)
 const isValidProfile = asPredicate(AppBskyActorProfile.validateRecord)
@@ -50,7 +51,7 @@ describe('pds author feed views', () => {
     carol = sc.dids.carol
     dan = sc.dids.dan
     eve = sc.dids.eve
-  })
+  }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
     await network.close()

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

@@ -1,6 +1,7 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { forSnapshot } from '../_util.js'
 
 describe('pds views with blocking from block lists', () => {
   let network: TestNetwork

package/tests/views/blocks.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyEmbedRecord,
   AppBskyFeedDefs,
@@ -7,7 +8,7 @@ import {
   ids,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { assertIsThreadViewPost, forSnapshot } from '../_util'
+import { assertIsThreadViewPost, forSnapshot } from '../_util.js'
 
 describe('pds views with blocking', () => {
   let network: TestNetwork

package/tests/views/bookmarks.test.ts

@@ -1,4 +1,13 @@
 import assert from 'node:assert'
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import {
   $Typed,
   AppBskyBookmarkCreateBookmark,
@@ -10,7 +19,7 @@ import {
   ids,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll } from '../_util'
+import { forSnapshot, paginateAll } from '../_util.js'
 
 type Database = TestNetwork['bsky']['db']
 
@@ -43,7 +52,7 @@ describe('appview bookmarks views', () => {
   })
 
   afterEach(async () => {
-    jest.resetAllMocks()
+    vi.resetAllMocks()
     await clearPrivateData(db)
     await clearBookmarks(db)
   })

package/tests/views/drafts.test.ts

@@ -1,3 +1,12 @@
+import {
+  afterAll,
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest'
 import {
   AppBskyDraftCreateDraft,
   AppBskyDraftDefs,
@@ -7,7 +16,7 @@ import {
 } from '@atproto/api'
 import { TID } from '@atproto/common'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { paginateAll } from '../_util'
+import { paginateAll } from '../_util.js'
 
 type Database = TestNetwork['bsky']['db']
 
@@ -41,7 +50,7 @@ describe('appview drafts views', () => {
   })
 
   afterEach(async () => {
-    jest.resetAllMocks()
+    vi.resetAllMocks()
     await clearDrafts(db)
   })
 

package/tests/views/feed-hidden-replies.test.ts

@@ -1,6 +1,7 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { Users, feedHiddenRepliesSeed } from '../seed/feed-hidden-replies'
+import { Users, feedHiddenRepliesSeed } from '../seed/feed-hidden-replies.js'
 
 describe('feed hidden replies', () => {
   let network: TestNetwork

package/tests/views/feed-view-post.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyFeedDefs, AtUri, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 

package/tests/views/follows.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyGraphGetFollowers,
   AppBskyGraphGetFollows,
@@ -5,7 +6,7 @@ import {
   ids,
 } from '@atproto/api'
 import { SeedClient, TestNetwork, followsSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll, stripViewer } from '../_util'
+import { forSnapshot, paginateAll, stripViewer } from '../_util.js'
 
 describe('pds follow views', () => {
   let agent: AtpAgent
@@ -24,7 +25,7 @@ describe('pds follow views', () => {
     await followsSeed(sc)
     await network.processAll()
     alice = sc.dids.alice
-  })
+  }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
     await network.close()

package/tests/views/get-config.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import AtpAgent from '@atproto/api'
 import { TestNetwork } from '@atproto/dev-env'
 

package/tests/views/get-suggested-onboarding-users.test.ts

@@ -2,6 +2,7 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyUnspeccedGetOnboardingSuggestedUsersSkeleton,
   AtpAgent,

package/tests/views/get-suggested-starter-packs.test.ts

@@ -2,6 +2,7 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyUnspeccedGetSuggestedStarterPacksSkeleton,
   AtpAgent,
@@ -12,7 +13,7 @@ import {
   StarterPacks,
   Users,
   starterPacksSeed,
-} from '../seed/get-suggested-starter-packs'
+} from '../seed/get-suggested-starter-packs.js'
 
 describe('getSuggestedStarterPacks', () => {
   let network: TestNetwork

package/tests/views/get-trends.test.ts

@@ -3,9 +3,10 @@ import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
 import express, { Application } from 'express'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyUnspeccedGetTrendsSkeleton, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { Users, trendsSeed } from '../seed/get-trends'
+import { Users, trendsSeed } from '../seed/get-trends.js'
 
 describe('getTrends', () => {
   let network: TestNetwork

package/tests/views/known-followers.test.ts

@@ -1,6 +1,7 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork } from '@atproto/dev-env'
-import { knownFollowersSeed } from '../seed/known-followers'
+import { knownFollowersSeed } from '../seed/known-followers.js'
 
 describe('known followers (social proof)', () => {
   let network: TestNetwork

package/tests/views/labeler-service.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyEmbedRecord,
   AppBskyLabelerDefs,
@@ -7,7 +8,7 @@ import {
   ids,
 } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, stripViewerFromLabeler } from '../_util'
+import { forSnapshot, stripViewerFromLabeler } from '../_util.js'
 
 describe('labeler service views', () => {
   let network: TestNetwork

package/tests/views/labels-needs-review.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyFeedDefs, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 

package/tests/views/labels-takedown.test.ts

@@ -1,4 +1,5 @@
 import assert from 'node:assert'
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyLabelerDefs, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 

package/tests/views/likes.test.ts

@@ -1,6 +1,12 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyFeedGetLikes, AtpAgent, ids } from '@atproto/api'
 import { SeedClient, TestNetwork, likesSeed } from '@atproto/dev-env'
-import { constantDate, forSnapshot, paginateAll, stripViewer } from '../_util'
+import {
+  constantDate,
+  forSnapshot,
+  paginateAll,
+  stripViewer,
+} from '../_util.js'
 
 describe('pds like views', () => {
   let network: TestNetwork
@@ -31,7 +37,7 @@ describe('pds like views', () => {
     bob = sc.dids.bob
     carol = sc.dids.carol
     frankie = sc.dids.frankie
-  })
+  }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
     await network.close()

package/tests/views/list-feed.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyFeedGetListFeed, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
 import {
@@ -5,7 +6,7 @@ import {
   paginateAll,
   stripViewer,
   stripViewerFromPost,
-} from '../_util'
+} from '../_util.js'
 
 describe('list feed views', () => {
   let network: TestNetwork

package/tests/views/lists.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import {
   AppBskyGraphGetLists,
   AppBskyGraphGetListsWithMembership,
@@ -5,7 +6,7 @@ import {
   ids,
 } from '@atproto/api'
 import { SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { forSnapshot, paginateAll } from '../_util'
+import { forSnapshot, paginateAll } from '../_util.js'
 
 describe('bsky actor likes feed views', () => {
   let network: TestNetwork

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

@@ -1,6 +1,7 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AtUri, AtpAgent, ids } from '@atproto/api'
 import { RecordRef, SeedClient, TestNetwork, basicSeed } from '@atproto/dev-env'
-import { forSnapshot } from '../_util'
+import { forSnapshot } from '../_util.js'
 
 describe('bsky views with mutes from mute lists', () => {
   let network: TestNetwork

package/tests/views/mutes.test.ts

@@ -1,3 +1,4 @@
+import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 import { AppBskyGraphGetMutes, AtpAgent, ids } from '@atproto/api'
 import {
   SeedClient,
@@ -5,7 +6,7 @@ import {
   basicSeed,
   usersBulkSeed,
 } from '@atproto/dev-env'
-import { forSnapshot, paginateAll } from '../_util'
+import { forSnapshot, paginateAll } from '../_util.js'
 
 describe('mute views', () => {
   let network: TestNetwork
@@ -53,7 +54,7 @@ describe('mute views', () => {
         },
       )
     }
-  })
+  }, 20_000) // @NOTE seeding can take a while
 
   afterAll(async () => {
     await network.close()