@atproto/bsky 0.0.234 → 0.0.235

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.234",
+  "version": "0.0.235",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -50,12 +50,12 @@
     "zod": "3.23.8",
     "@atproto-labs/fetch-node": "^0.3.0",
     "@atproto-labs/xrpc-utils": "^0.1.0",
-    "@atproto/api": "^0.20.5",
+    "@atproto/api": "^0.20.6",
     "@atproto/common": "^0.6.1",
     "@atproto/crypto": "^0.5.0",
-    "@atproto/did": "^0.4.0",
+    "@atproto/did": "^0.5.0",
     "@atproto/identity": "^0.5.0",
-    "@atproto/lex": "^0.1.2",
+    "@atproto/lex": "^0.1.3",
     "@atproto/repo": "^0.10.0",
     "@atproto/sync": "^0.3.1",
     "@atproto/syntax": "^0.6.1",
@@ -74,7 +74,7 @@
     "ts-node": "^10.8.2",
     "typescript": "^6.0.3",
     "vitest": "^4.0.16",
-    "@atproto/pds": "^0.5.0"
+    "@atproto/pds": "^0.5.1"
   },
   "type": "module",
   "exports": {

package/src/hydration/external.ts

@@ -1,6 +1,7 @@
 import { AtUriString } from '@atproto/syntax'
 import { DataPlaneClient } from '../data-plane/client/index.js'
 import { site } from '../lexicons/index.js'
+import { hydrationLogger } from '../logger.js'
 import {
   GetSiteStandardRecordsByRefResponse,
   GetSiteStandardRecordsByURIResponse,
@@ -162,6 +163,14 @@ export const getSiteStandardRecordsFromHydrationMapsByRefs = (
   // (or tampered with), so reject the whole pairing.
   if (document && publication) {
     if (document.info.record.site !== publication.ref.uri) {
+      hydrationLogger.warn(
+        {
+          documentUri: document.ref.uri,
+          documentSite: document.info.record.site,
+          publicationUri: publication.ref.uri,
+        },
+        'site.standard byRefs lookup failed: doc.site does not match hydrated publication.uri',
+      )
       return { document: undefined, publication: undefined }
     }
   }
@@ -172,6 +181,10 @@ export const getSiteStandardRecordsFromHydrationMapsByRefs = (
   if (document && !publication) {
     const site = document.info.record.site
     if (site && site.startsWith('at://')) {
+      hydrationLogger.warn(
+        { documentUri: document.ref.uri, documentSite: site },
+        'site.standard byRefs lookup failed: document.site is AT URI but no matching publication was hydrated',
+      )
       return { document: undefined, publication: undefined }
     }
   }
@@ -234,6 +247,10 @@ export const getSiteStandardRecordsFromHydrationMapsByDocumentUri = (
         }
       }
       if (!publication) {
+        hydrationLogger.warn(
+          { documentUri: document.ref.uri, documentSite: site },
+          'site.standard byDocumentUri lookup failed: document.site is AT URI but no matching publication was hydrated',
+        )
         return { document: undefined, publication: undefined }
       }
     }

package/src/util/standard-site.test.ts

@@ -101,6 +101,13 @@ describe(validateStandardSiteForUrl, () => {
         validateStandardSiteForUrl(undefined, pub, 'https://other.com'),
       ).toBe(false)
     })
+
+    it('accepts when assumedUrl has a trailing slash and publication.url does not', () => {
+      const pub = makePub({ url: 'https://atproto.com/blog' })
+      expect(
+        validateStandardSiteForUrl(undefined, pub, 'https://atproto.com/blog/'),
+      ).toBe(true)
+    })
   })
 
   describe('neither', () => {

package/src/views/index.ts

@@ -1,4 +1,4 @@
-import { HOUR, MINUTE, mapDefined } from '@atproto/common'
+import { HOUR, MINUTE, dedupeStrs, mapDefined } from '@atproto/common'
 import {
   $Typed,
   Un$Typed,
@@ -2141,14 +2141,6 @@ export class Views {
       state,
       assumedUrl: embed.external.uri,
     })
-    // Profiles of the owners of pinned `associatedRefs`. Hydrator covers
-    // these DIDs alongside post-author profiles, so misses here only
-    // happen when an actor is unavailable (suspended, deleted, etc.) —
-    // drop those rather than emit `undefined` slots.
-    const associatedProfiles = mapDefined(
-      embed.external.associatedRefs ?? [],
-      (ref) => this.profileBasic(uriToDid(ref.uri), state),
-    ) as ProfileViewBasic[]
     return app.bsky.embed.external.view.$build({
       external: {
         uri: embed.external.uri,
@@ -2163,9 +2155,6 @@ export class Views {
           : undefined,
         ...ssView,
         associatedRefs: embed.external.associatedRefs,
-        associatedProfiles: associatedProfiles.length
-          ? associatedProfiles
-          : undefined,
       },
     })
   }
@@ -2263,7 +2252,7 @@ export class Views {
           documentUri: document?.ref.uri,
           publicationUri: publication?.ref.uri,
         },
-        'SS record(s) failed URL validation for external embed',
+        'site.standard URL validation failed',
       )
       return undefined
     }
@@ -2333,6 +2322,21 @@ export class Views {
       overlay.source = this.externalEmbedSource(publication)
     }
 
+    // Profiles of the owners of the records backing this embed. Hydrator
+    // covers these DIDs alongside post-author profiles, so misses here
+    // only happen when an actor is unavailable (suspended, deleted, etc.)
+    // — drop those rather than emit `undefined` slots.
+    const uniqueDids = dedupeStrs(
+      mapDefined([document?.ref.uri, publication?.ref.uri], (uri) =>
+        uri ? uriToDid(uri) : undefined,
+      ) as DidString[],
+    )
+    const associatedProfiles = mapDefined(uniqueDids, (did) =>
+      this.profileBasic(did, state),
+    ) as ProfileViewBasic[]
+    if (associatedProfiles.length)
+      overlay.associatedProfiles = associatedProfiles
+
     return overlay
   }
 

package/tests/views/profile.test.ts

@@ -724,18 +724,14 @@ describe('pds profile views', () => {
   })
 
   it('filters out Go zero-value dates from dataplane', async () => {
-    // Spy on the dataplane getActors method
-    const getActorsSpy = vi.spyOn(network.bsky.ctx.dataplane, 'getActors')
+    using getActorsSpy = vi.spyOn(network.bsky.ctx.dataplane, 'getActors')
 
-    // Call the original implementation but modify the result
     getActorsSpy.mockImplementationOnce(async (req) => {
-      // Call the real method
       const result = await network.bsky.ctx.dataplane.getActors(req)
 
-      // Modify the result to inject a Go zero-value date
+      // Inject a Go zero-value date (0001-01-01 00:00:00 UTC)
       if (result.actors.length > 0 && result.actors[0]) {
         const actor = result.actors[0]
-        // Create a Timestamp with Go zero-value (0001-01-01 00:00:00 UTC)
         const goZeroDate = new Date(-62135596800000)
         actor.createdAt = Timestamp.fromDate(goZeroDate)
       }
@@ -750,11 +746,8 @@ describe('pds profile views', () => {
       },
     )
 
-    // The createdAt should be undefined because the hydration layer filters it out
+    // The hydration layer filters Go zero-values out
     expect(data.createdAt).toBeUndefined()
-
-    // Clean up
-    getActorsSpy.mockRestore()
   })
 
   async function updateProfile(did: string, record: Record<string, unknown>) {