@atproto/bsky 0.0.238 → 0.0.239

package/src/data-plane/server/routes/search.ts

@@ -8,9 +8,12 @@ import {
 } from '../db/pagination.js'
 import { parsePostSearchQuery } from '../util.js'
 
-export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
-  // @TODO actor search endpoints still fall back to search service
-  async searchActors(req) {
+export default (db: Database): Partial<ServiceImpl<typeof Service>> => {
+  const searchActorsImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { ref } = db.db.dynamic
     let builder = db.db
@@ -35,10 +38,13 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       dids: res.map((row) => row.did),
       cursor: keyset.packFromResult(res),
     }
-  },
+  }
 
-  // @TODO post search endpoint still falls back to search service
-  async searchPosts(req) {
+  const searchPostsImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { q, author } = parsePostSearchQuery(term)
 
@@ -75,9 +81,13 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       uris: res.map((row) => row.uri),
       cursor: keyset.packFromResult(res),
     }
-  },
+  }
 
-  async searchStarterPacks(req) {
+  const searchStarterPacksImpl = async (req: {
+    term: string
+    limit: number
+    cursor?: string
+  }) => {
     const { term, limit, cursor } = req
     const { ref } = db.db.dynamic
     let builder = db.db
@@ -99,14 +109,72 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
 
     const res = await builder.execute()
 
-    const cur = keyset.packFromResult(res)
-
     return {
       uris: res.map((row) => row.uri),
-      cursor: cur,
+      cursor: keyset.packFromResult(res),
     }
-  },
-})
+  }
+
+  return {
+    // @TODO actor search endpoints still fall back to search service
+    searchActors: searchActorsImpl,
+
+    // @TODO post search endpoint still falls back to search service
+    searchPosts: searchPostsImpl,
+
+    searchStarterPacks: searchStarterPacksImpl,
+
+    // V2 endpoints reuse the V1 SQL for dev env and reshape the response.
+    async searchActorsV2(req) {
+      const { dids, cursor } = await searchActorsImpl({
+        term: req.params?.query ?? '',
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        actors: dids.map((did) => ({ did, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+
+    async searchActorsTypeahead(req) {
+      const { dids } = await searchActorsImpl({
+        term: req.query,
+        limit: req.limit || 10,
+      })
+      return {
+        actors: dids.map((did) => ({ did, score: 0 })),
+      }
+    },
+
+    async searchPostsV2(req) {
+      const author = req.filters?.authors?.[0]
+      const baseQuery = req.params?.query ?? ''
+      const term = author ? `${baseQuery} from:${author}` : baseQuery
+      const { uris, cursor } = await searchPostsImpl({
+        term,
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        posts: uris.map((uri) => ({ uri, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+
+    async searchStarterPacksV2(req) {
+      const { uris, cursor } = await searchStarterPacksImpl({
+        term: req.params?.query ?? '',
+        limit: req.params?.limit ?? 25,
+        cursor: req.params?.cursor,
+      })
+      return {
+        starterPacks: uris.map((uri) => ({ uri, score: 0 })),
+        pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
+      }
+    },
+  }
+}
 
 // Remove leading @ in case a handle is input that way
 const cleanQuery = (query: string) => query.trim().replace(/^@/g, '')

package/src/feature-gates/gates.ts

@@ -11,6 +11,7 @@ export enum Gate {
   SuggestedUsersForExploreEnable = 'suggested_users:for_explore:enable',
   SuggestedUsersForDiscoverEnable = 'suggested_users:for_discover:enable',
   SuggestedUsersForSeeMoreEnable = 'suggested_users:for_see_more:enable',
+  SearchV2Enable = 'search:v2:enable',
 
   // temp
   AATest = 'aa-test-appview',

package/tests/data-plane/handle-invalidation.test.ts

@@ -116,7 +116,8 @@ describe('handle invalidation', () => {
 
   it('deals with handle contention', async () => {
     await backdateIndexedAt(bob)
-    // update alices handle so that the pds will let bob take her old handle
+    // make alice lose her handle so that the pds will let bob take her old handle
+    mockHandles['not-alice.test'] = null
     await network.pds.ctx.accountManager.updateHandle(alice, 'not-alice.test')
 
     await pdsAgent.api.com.atproto.identity.updateHandle(

package/tsconfig.build.json

@@ -3,8 +3,8 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",
-    "noUnusedLocals": false
+    "noUnusedLocals": false,
   },
   "include": ["./src"],
-  "exclude": ["./src/**/*.test.ts"]
+  "exclude": ["./src/**/*.test.ts"],
 }

package/tsconfig.json

@@ -2,6 +2,6 @@
   "include": [],
   "references": [
     { "path": "./tsconfig.build.json" },
-    { "path": "./tsconfig.tests.json" }
-  ]
+    { "path": "./tsconfig.tests.json" },
+  ],
 }

package/tsconfig.tests.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig/vitest.json",
   "compilerOptions": {
     "rootDir": ".",
-    "noUnusedLocals": false
+    "noUnusedLocals": false,
   },
-  "include": ["./tests", "./src/**/*.test.ts"]
+  "include": ["./tests", "./src/**/*.test.ts"],
 }