@atproto/bsky 0.0.224 → 0.0.225

package/src/hydration/util.ts

@@ -2,19 +2,24 @@ import { Timestamp } from '@bufbuild/protobuf'
 import {
   AtUriString,
   Cid,
-  Infer,
+  InferInput,
+  InferOutput,
   LexParseOptions,
   LexValue,
   RecordSchema,
   Schema,
   TypedLexMap,
   ValidateOptions,
-  lexParse,
+  lexParseJsonBytes,
   parseCidSafe,
 } from '@atproto/lex'
 import { AtUri } from '@atproto/syntax'
 import { Record as RecordEntry } from '../proto/bsky_pb'
 
+const PARSE_OPTIONS: LexParseOptions & ValidateOptions = {
+  strict: false,
+}
+
 export class HydrationMap<K, T> extends Map<K, T | null> implements Merges {
   merge(map: HydrationMap<K, T>): this {
     for (const [key, val] of map) {
@@ -28,8 +33,8 @@ export interface Merges {
   merge<T extends this>(map: T): this
 }
 
-export type RecordInfo<T extends { $type: string }> = {
-  record: T & TypedLexMap
+export type RecordInfo<T extends TypedLexMap> = {
+  record: T
   cid: string
   sortedAt: Date
   indexedAt: Date
@@ -70,17 +75,32 @@ export function parseRecord<TSchema extends RecordSchema>(
   recordSchema: TSchema,
   recordEntry: RecordEntry,
   includeTakedowns: boolean,
-): RecordInfo<Infer<TSchema>> | undefined {
+): RecordInfo<InferInput<TSchema>> | undefined {
   if (!includeTakedowns && recordEntry.takenDown) {
     return undefined
   }
 
   const cid = recordEntry.cid
-  if (!cid) return
+  if (!cid) {
+    return undefined
+  }
+
+  if (recordEntry.record.byteLength === 0) {
+    return undefined
+  }
 
-  const record = parseJsonBytes(recordSchema, recordEntry.record)
+  const record = lexParseJsonBytes(recordEntry.record, PARSE_OPTIONS)
   if (!record) {
-    return
+    return undefined
+  }
+
+  // @NOTE We cannot use parse mode here. We must return the original to ensure
+  // that the caller gets the same data as what is stored in the PDS (in case of
+  // records). This is important because the receiver of the data should be able
+  // to compute the right record CID.
+
+  if (!recordSchema.$matches(record, PARSE_OPTIONS)) {
+    return undefined
   }
 
   return {
@@ -92,23 +112,22 @@ export function parseRecord<TSchema extends RecordSchema>(
   }
 }
 
+/**
+ * Decodes binary data containing a JSON representation of a Lex value, and
+ * validates it against the provided schema, in parse mode (i.e., allowing
+ * coercion & defaults).
+ *
+ * Returns undefined if the input is empty (from dataplane's empty value
+ * convention), or if the validation fails.
+ */
 export const parseJsonBytes = <TSchema extends Schema<LexValue>>(
   schema: TSchema,
   bytes: Uint8Array | undefined,
-  options: LexParseOptions & ValidateOptions = { strict: false },
-): Infer<TSchema> | undefined => {
+): InferOutput<TSchema> | undefined => {
   if (!bytes || bytes.byteLength === 0) return undefined
-
-  // @NOTE Buffer.from(bytes) creates a copy of the ArrayBuffer
-  const jsonBuffer = Buffer.from(
-    bytes.buffer,
-    bytes.byteOffset,
-    bytes.byteLength,
-  )
-  const jsonString = jsonBuffer.toString('utf8')
-
-  const value = lexParse(jsonString, options)
-  return schema.ifMatches(value, options)
+  const value = lexParseJsonBytes(bytes, PARSE_OPTIONS)
+  const result = schema.safeParse(value, PARSE_OPTIONS)
+  return result.success ? result.value : undefined
 }
 
 export const parseString = <T extends string | undefined>(

package/src/views/index.ts

@@ -1,5 +1,11 @@
 import { HOUR, MINUTE, mapDefined } from '@atproto/common'
-import { $Typed, Un$Typed, Unknown$TypedObject, UriString } from '@atproto/lex'
+import {
+  $Typed,
+  Un$Typed,
+  Unknown$TypedObject,
+  UriString,
+  getBlobCidString,
+} from '@atproto/lex'
 import {
   AtUri,
   AtUriString,
@@ -104,12 +110,7 @@ import {
   isSelfLabelsType,
   isVideoEmbedType,
 } from './types.js'
-import {
-  VideoUriBuilder,
-  cidFromBlobJson,
-  parsePostgate,
-  parseThreadGate,
-} from './util'
+import { VideoUriBuilder, parsePostgate, parseThreadGate } from './util'
 
 const notificationDeletedRecord =
   app.bsky.notification.defs.recordDeleted.$build({})
@@ -169,6 +170,7 @@ export class Views {
   }
 
   viewerBlockExists(did: DidString, state: HydrationState): boolean {
+    if (state.ctx?.skipViewerBlocks) return false
     const viewer = state.profileViewers?.get(did)
     if (!viewer) return false
     return !!(
@@ -277,7 +279,7 @@ export class Views {
         ? this.imgUriBuilder.getPresetUri(
             'banner',
             did,
-            cidFromBlobJson(actor.profile.banner),
+            getBlobCidString(actor.profile.banner),
           )
         : undefined,
       followersCount: profileAggs?.followers ?? 0,
@@ -356,7 +358,7 @@ export class Views {
         ? this.imgUriBuilder.getPresetUri(
             'avatar',
             did,
-            cidFromBlobJson(actor.profile.avatar),
+            getBlobCidString(actor.profile.avatar),
           )
         : undefined,
       // associated.feedgens and associated.lists info not necessarily included
@@ -576,6 +578,7 @@ export class Views {
     }
 
     const uri = AtUri.make(did, app.bsky.actor.status.$nsid, 'self').toString()
+    const labels = state.labels?.getBySubject(uri)
 
     const minDuration = 5 * MINUTE
     const maxDuration = 4 * HOUR
@@ -602,6 +605,7 @@ export class Views {
         record.embed && isExternalEmbedType(record.embed)
           ? this.externalEmbed(did, record.embed)
           : undefined,
+      labels,
       expiresAt,
       isActive,
     }
@@ -672,7 +676,7 @@ export class Views {
         ? this.imgUriBuilder.getPresetUri(
             'avatar',
             creator,
-            cidFromBlobJson(list.record.avatar),
+            getBlobCidString(list.record.avatar),
           )
         : undefined,
       listItemCount: listAgg?.listItems ?? 0,
@@ -916,7 +920,7 @@ export class Views {
         ? this.imgUriBuilder.getPresetUri(
             'avatar',
             creatorDid,
-            cidFromBlobJson(feedgen.record.avatar),
+            getBlobCidString(feedgen.record.avatar),
           )
         : undefined,
       likeCount: aggs?.likes ?? 0,
@@ -2076,12 +2080,12 @@ export class Views {
       thumb: this.imgUriBuilder.getPresetUri(
         'feed_thumbnail',
         did,
-        cidFromBlobJson(img.image),
+        getBlobCidString(img.image),
       ),
       fullsize: this.imgUriBuilder.getPresetUri(
         'feed_fullsize',
         did,
-        cidFromBlobJson(img.image),
+        getBlobCidString(img.image),
       ),
       alt: img.alt,
       aspectRatio: img.aspectRatio,
@@ -2092,7 +2096,7 @@ export class Views {
   }
 
   videoEmbed(did: DidString, embed: VideoEmbed): $Typed<VideoEmbedView> {
-    const cid = cidFromBlobJson(embed.video)
+    const cid = getBlobCidString(embed.video)
     return app.bsky.embed.video.view.$build({
       cid,
       playlist: this.videoUriBuilder.playlist({ did, cid }),
@@ -2117,7 +2121,7 @@ export class Views {
           ? this.imgUriBuilder.getPresetUri(
               'feed_thumbnail',
               did,
-              cidFromBlobJson(thumb),
+              getBlobCidString(thumb),
             )
           : undefined,
       },

package/src/views/util.ts

@@ -1,5 +1,5 @@
 import * as util from 'node:util'
-import { AtUriString, BlobRef, DidString, UriString } from '@atproto/lex'
+import { AtUriString, DidString, UriString } from '@atproto/lex'
 import {
   GateRecord,
   PostRecord,
@@ -59,10 +59,6 @@ type ParsedThreadGate = {
   allowListUris?: AtUriString[]
 }
 
-export const cidFromBlobJson = (json: BlobRef): string => {
-  return json.ref.toString()
-}
-
 export const parsePostgate = ({
   gate,
   viewerDid,

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

@@ -722,6 +722,7 @@ Object {
   "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": true,
   "isDisabled": false,
+  "labels": Array [],
   "record": Object {
     "$type": "app.bsky.actor.status",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -755,6 +756,7 @@ Object {
   "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": false,
   "isDisabled": false,
+  "labels": Array [],
   "record": Object {
     "$type": "app.bsky.actor.status",
     "createdAt": "1970-01-01T00:00:00.000Z",
@@ -788,6 +790,7 @@ Object {
   "expiresAt": "1970-01-01T00:00:00.000Z",
   "isActive": true,
   "isDisabled": true,
+  "labels": Array [],
   "record": Object {
     "$type": "app.bsky.actor.status",
     "createdAt": "1970-01-01T00:00:00.000Z",

package/tests/views/blocks.test.ts

@@ -817,4 +817,73 @@ describe('pds views with blocking', () => {
     expect(knownFollowers?.count).toBe(1)
     expect(knownFollowers?.followers).toHaveLength(0)
   })
+
+  describe('mod service sees through blocks', () => {
+    let modServiceDid: string
+
+    beforeAll(async () => {
+      modServiceDid = network.bsky.ctx.cfg.modServiceDid
+      // alice blocks the mod service
+      await pdsAgent.app.bsky.graph.block.create(
+        { repo: alice },
+        { createdAt: new Date().toISOString(), subject: modServiceDid },
+        sc.getHeaders(alice),
+      )
+      await network.processAll()
+    })
+
+    it('mod service viewer preserves block state on getProfile', async () => {
+      // alice blocked the mod service, mod service views alice's profile
+      const res = await agent.app.bsky.actor.getProfile(
+        { actor: alice },
+        {
+          headers: await network.serviceHeaders(
+            modServiceDid,
+            ids.AppBskyActorGetProfile,
+          ),
+        },
+      )
+      // block state is still present on the viewer
+      expect(res.data.viewer?.blockedBy).toBe(true)
+      expect(res.data.viewer?.blocking).toBeUndefined()
+    })
+
+    it('mod service sees through blocks on getPostThread', async () => {
+      // alice has posts; mod service should see them even though alice blocked mod service
+      const { data } = await agent.app.bsky.feed.getPostThread(
+        { depth: 1, uri: sc.posts[alice][0].ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            modServiceDid,
+            ids.AppBskyFeedGetPostThread,
+          ),
+        },
+      )
+      assertIsThreadViewPost(data.thread)
+      expect(data.thread.post.uri).toBe(sc.posts[alice][0].ref.uriStr)
+    })
+
+    it('mod service sees through blocks on getPostThreadV2', async () => {
+      const { data } = await agent.app.bsky.unspecced.getPostThreadV2(
+        { anchor: sc.posts[alice][0].ref.uriStr },
+        {
+          headers: await network.serviceHeaders(
+            modServiceDid,
+            ids.AppBskyUnspeccedGetPostThreadV2,
+          ),
+        },
+      )
+      expect(data.thread).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            uri: sc.posts[alice][0].ref.uriStr,
+            depth: 0,
+            value: expect.objectContaining({
+              $type: 'app.bsky.unspecced.defs#threadItemPost',
+            }),
+          }),
+        ]),
+      )
+    })
+  })
 })

package/tests/views/profile.test.ts

@@ -16,6 +16,7 @@ describe('pds profile views', () => {
   let agent: AtpAgent
   let pdsAgent: AtpAgent
   let sc: SeedClient
+  let labelerDid: string
 
   // account dids, for convenience
   let alice: string
@@ -32,6 +33,7 @@ describe('pds profile views', () => {
     agent = network.bsky.getAgent()
     pdsAgent = network.pds.getAgent()
     sc = network.getSeedClient()
+    labelerDid = network.bsky.ctx.cfg.labelsFromIssuerDids[0]
     await basicSeed(sc)
 
     await sc.createAccount('eve', {
@@ -499,6 +501,60 @@ describe('pds profile views', () => {
       })
     })
 
+    describe('labeled', () => {
+      beforeAll(async () => {
+        const res = await sc.agent.com.atproto.repo.putRecord(
+          {
+            repo: alice,
+            collection: ids.AppBskyActorStatus,
+            rkey: 'self',
+            record: {
+              status: 'app.bsky.actor.status#live',
+              embed,
+              durationMinutes: 10,
+              createdAt: new Date().toISOString(),
+            },
+          },
+          {
+            headers: sc.getHeaders(alice),
+            encoding: 'application/json',
+          },
+        )
+        await network.processAll()
+
+        await createLabel({
+          src: labelerDid,
+          uri: res.data.uri,
+          cid: res.data.cid,
+          val: 'spam',
+        })
+        await network.processAll()
+      })
+
+      it('returns labels on statusView', async () => {
+        const { data } = await agent.api.app.bsky.actor.getProfile(
+          { actor: alice },
+          {
+            headers: {
+              'atproto-accept-labelers': labelerDid,
+              ...(await network.serviceHeaders(
+                bob,
+                ids.AppBskyActorGetProfile,
+              )),
+            },
+          },
+        )
+
+        expect(data.status?.labels).toBeDefined()
+        expect(data.status?.labels?.length).toBe(1)
+        expect(data.status?.labels?.at(0)?.val).toBe('spam')
+      })
+    })
+
+    /*
+     * THIS ONE MUST BE LAST, since a takedown of a `self` rkey record prevents
+     * subsequent hydrations of that record.
+     */
     describe('when taken down', () => {
       beforeAll(async () => {
         const res = await sc.agent.com.atproto.repo.putRecord(
@@ -655,4 +711,25 @@ describe('pds profile views', () => {
       { headers: sc.getHeaders(did), encoding: 'application/json' },
     )
   }
+
+  const createLabel = async (opts: {
+    src?: string
+    uri: string
+    cid: string
+    val: string
+    exp?: string
+  }) => {
+    await network.bsky.db.db
+      .insertInto('label')
+      .values({
+        uri: opts.uri,
+        cid: opts.cid,
+        val: opts.val,
+        cts: new Date().toISOString(),
+        exp: opts.exp ?? null,
+        neg: false,
+        src: opts.src ?? labelerDid,
+      })
+      .execute()
+  }
 })