@atproto/bsky 0.0.251 → 0.0.253

package/src/hydration/external.test.ts

@@ -1,281 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { siteStandardRecordKey } from '../util/standard-site.js'
-import {
-  SiteStandardDocument,
-  SiteStandardDocuments,
-  SiteStandardPublication,
-  SiteStandardPublications,
-  getSiteStandardRecordsFromHydrationMapsByDocumentUri,
-  getSiteStandardRecordsFromHydrationMapsByRefs,
-} from './external.js'
-import { HydrationMap } from './util.js'
-
-const docDid = 'did:plc:doc'
-const pubDid = 'did:plc:pub'
-const otherPubDid = 'did:plc:other'
-
-const docUri = `at://${docDid}/site.standard.document/abc`
-const pubUri = `at://${pubDid}/site.standard.publication/self`
-const otherPubUri = `at://${otherPubDid}/site.standard.publication/self`
-
-const docCid = 'bafydoc'
-const pubCid = 'bafypub'
-const otherPubCid = 'bafyother'
-
-const makeDocInfo = (
-  record: { site: string; path?: string; title?: string },
-  cid = docCid,
-): SiteStandardDocument =>
-  ({
-    record,
-    cid,
-    sortedAt: new Date(0),
-    indexedAt: new Date(0),
-    takedownRef: undefined,
-  }) as unknown as SiteStandardDocument
-
-const makePubInfo = (
-  record: { url: string; name?: string },
-  cid = pubCid,
-): SiteStandardPublication =>
-  ({
-    record,
-    cid,
-    sortedAt: new Date(0),
-    indexedAt: new Date(0),
-    takedownRef: undefined,
-  }) as unknown as SiteStandardPublication
-
-const makeDocuments = (
-  entries: [uri: string, cid: string, info: SiteStandardDocument | null][] = [],
-): SiteStandardDocuments => {
-  const map: SiteStandardDocuments = new HydrationMap()
-  for (const [uri, cid, info] of entries) {
-    map.set(siteStandardRecordKey(uri, cid), info)
-  }
-  return map
-}
-
-const makePublications = (
-  entries: [
-    uri: string,
-    cid: string,
-    info: SiteStandardPublication | null,
-  ][] = [],
-): SiteStandardPublications => {
-  const map: SiteStandardPublications = new HydrationMap()
-  for (const [uri, cid, info] of entries) {
-    map.set(siteStandardRecordKey(uri, cid), info)
-  }
-  return map
-}
-
-describe(getSiteStandardRecordsFromHydrationMapsByRefs, () => {
-  it('returns both slots when refs resolve and doc.site matches the publication', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByRefs(
-        [
-          { uri: docUri, cid: docCid },
-          { uri: pubUri, cid: pubCid },
-        ],
-        docs,
-        pubs,
-      )
-    expect(document?.ref).toEqual({ uri: docUri, cid: docCid })
-    expect(publication?.ref).toEqual({ uri: pubUri, cid: pubCid })
-  })
-
-  it('rejects the whole pair when doc.site does not match the resolved publication', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: otherPubUri })],
-    ])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    const result = getSiteStandardRecordsFromHydrationMapsByRefs(
-      [
-        { uri: docUri, cid: docCid },
-        { uri: pubUri, cid: pubCid },
-      ],
-      docs,
-      pubs,
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('rejects the whole pair when doc declares an at-uri site but no publication ref was supplied', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications()
-    const result = getSiteStandardRecordsFromHydrationMapsByRefs(
-      [{ uri: docUri, cid: docCid }],
-      docs,
-      pubs,
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('returns only the doc when site is a web URL (loose doc)', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: 'https://example.com' })],
-    ])
-    const pubs = makePublications()
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByRefs(
-        [{ uri: docUri, cid: docCid }],
-        docs,
-        pubs,
-      )
-    expect(document?.ref).toEqual({ uri: docUri, cid: docCid })
-    expect(publication).toBeUndefined()
-  })
-
-  it('returns only the publication when no doc ref is supplied', () => {
-    const docs = makeDocuments()
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByRefs(
-        [{ uri: pubUri, cid: pubCid }],
-        docs,
-        pubs,
-      )
-    expect(document).toBeUndefined()
-    expect(publication?.ref).toEqual({ uri: pubUri, cid: pubCid })
-  })
-
-  it('returns nothing when the version-exact lookup misses', () => {
-    // Doc indexed at one cid; ref points at a different cid.
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications()
-    const result = getSiteStandardRecordsFromHydrationMapsByRefs(
-      [{ uri: docUri, cid: 'bafy-different' }],
-      docs,
-      pubs,
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('returns nothing when associatedRefs is empty or undefined', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    expect(
-      getSiteStandardRecordsFromHydrationMapsByRefs([], docs, pubs),
-    ).toEqual({ document: undefined, publication: undefined })
-    expect(
-      getSiteStandardRecordsFromHydrationMapsByRefs(undefined, docs, pubs),
-    ).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('skips null entries (taken-down records) and reports them as misses', () => {
-    const docs = makeDocuments([[docUri, docCid, null]])
-    const pubs = makePublications()
-    const result = getSiteStandardRecordsFromHydrationMapsByRefs(
-      [{ uri: docUri, cid: docCid }],
-      docs,
-      pubs,
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-})
-
-describe(getSiteStandardRecordsFromHydrationMapsByDocumentUri, () => {
-  it('pairs the first hydrated doc with the publication its site points to', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByDocumentUri(docs, pubs)
-    expect(document?.ref).toEqual({ uri: docUri, cid: docCid })
-    expect(publication?.ref).toEqual({ uri: pubUri, cid: pubCid })
-  })
-
-  it('rejects the pair when the declared publication was not hydrated', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications()
-    const result = getSiteStandardRecordsFromHydrationMapsByDocumentUri(
-      docs,
-      pubs,
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('returns only the doc when site is a web URL (loose doc)', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: 'https://example.com' })],
-    ])
-    const pubs = makePublications()
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByDocumentUri(docs, pubs)
-    expect(document?.ref).toEqual({ uri: docUri, cid: docCid })
-    expect(publication).toBeUndefined()
-  })
-
-  it('falls through to first hydrated publication when no doc was hydrated', () => {
-    const docs = makeDocuments()
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByDocumentUri(docs, pubs)
-    expect(document).toBeUndefined()
-    expect(publication?.ref).toEqual({ uri: pubUri, cid: pubCid })
-  })
-
-  it('ignores extraneous publications not referenced by the doc', () => {
-    const docs = makeDocuments([
-      [docUri, docCid, makeDocInfo({ site: pubUri })],
-    ])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-      [
-        otherPubUri,
-        otherPubCid,
-        makePubInfo({ url: 'https://other.com' }, otherPubCid),
-      ],
-    ])
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByDocumentUri(docs, pubs)
-    expect(document?.ref.uri).toBe(docUri)
-    expect(publication?.ref.uri).toBe(pubUri)
-  })
-
-  it('returns nothing when both maps are empty', () => {
-    const result = getSiteStandardRecordsFromHydrationMapsByDocumentUri(
-      makeDocuments(),
-      makePublications(),
-    )
-    expect(result).toEqual({ document: undefined, publication: undefined })
-  })
-
-  it('skips null entries (taken-down records)', () => {
-    const docs = makeDocuments([[docUri, docCid, null]])
-    const pubs = makePublications([
-      [pubUri, pubCid, makePubInfo({ url: 'https://example.com' })],
-    ])
-    // No live doc -> falls through to publication-only.
-    const { document, publication } =
-      getSiteStandardRecordsFromHydrationMapsByDocumentUri(docs, pubs)
-    expect(document).toBeUndefined()
-    expect(publication?.ref.uri).toBe(pubUri)
-  })
-})

package/src/hydration/external.ts

@@ -1,268 +0,0 @@
-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,
-} from '../proto/bsky_pb.js'
-import {
-  parseSiteStandardRecordKey,
-  siteStandardRecordKey,
-} from '../util/standard-site.js'
-import {
-  SiteStandardDocumentRecord,
-  SiteStandardPublicationRecord,
-} from '../views/types.js'
-import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util.js'
-
-export type SiteStandardDocument = RecordInfo<SiteStandardDocumentRecord>
-export type SiteStandardPublication = RecordInfo<SiteStandardPublicationRecord>
-
-/**
- * Keyed by `${uri}@${cid}` — see `siteStandardRecordKey`. A single hydration
- * batch can pull more than one version of the same URI (different posts
- * pinning different cids), so the composite key is needed for O(1)
- * version-exact lookups.
- */
-export type SiteStandardDocuments = HydrationMap<string, SiteStandardDocument>
-/**
- * Keyed by `${uri}@${cid}`. See `SiteStandardDocuments` for the rationale.
- */
-export type SiteStandardPublications = HydrationMap<
-  string,
-  SiteStandardPublication
->
-export type SiteStandardRecords = {
-  documents: SiteStandardDocuments
-  publications: SiteStandardPublications
-}
-
-export type AssociatedSiteStandardRecord<T> = {
-  ref: { uri: AtUriString; cid: string }
-  info: T
-}
-
-export class ExternalHydrator {
-  constructor(public dataplane: DataPlaneClient) {}
-
-  async getSiteStandardRecordsByRef(
-    refs: ItemRef[],
-    includeTakedowns = false,
-  ): Promise<SiteStandardRecords> {
-    if (!refs.length) return emptySiteStandardRecords()
-
-    const res = await this.dataplane.getSiteStandardRecordsByRef({
-      refs: refs.map(({ uri, cid }) => ({ uri, cid: cid ?? '' })),
-    })
-    return buildSiteStandardRecordsHydrationMaps(res, includeTakedowns)
-  }
-
-  async getSiteStandardRecordsByURI(
-    uris: AtUriString[],
-    includeTakedowns = false,
-  ): Promise<SiteStandardRecords> {
-    if (!uris.length) return emptySiteStandardRecords()
-
-    const res = await this.dataplane.getSiteStandardRecordsByURI({ uris })
-    return buildSiteStandardRecordsHydrationMaps(res, includeTakedowns)
-  }
-}
-
-const emptySiteStandardRecords = (): SiteStandardRecords => ({
-  documents: new HydrationMap(),
-  publications: new HydrationMap(),
-})
-
-const buildSiteStandardRecordsHydrationMaps = (
-  res:
-    | GetSiteStandardRecordsByURIResponse
-    | GetSiteStandardRecordsByRefResponse,
-  includeTakedowns: boolean,
-): SiteStandardRecords => {
-  const documents: SiteStandardDocuments = new HydrationMap()
-  for (const { ref, record } of res.documents) {
-    if (!ref?.uri || !ref.cid || !record) continue
-    documents.set(
-      siteStandardRecordKey(ref.uri, ref.cid),
-      parseRecord(site.standard.document.main, record, includeTakedowns) ??
-        null,
-    )
-  }
-  const publications: SiteStandardPublications = new HydrationMap()
-  for (const { ref, record } of res.publications) {
-    if (!ref?.uri || !ref.cid || !record) continue
-    publications.set(
-      siteStandardRecordKey(ref.uri, ref.cid),
-      parseRecord(site.standard.publication.main, record, includeTakedowns) ??
-        null,
-    )
-  }
-  return { documents, publications }
-}
-
-/**
- * Read-path resolution: caller pinned a set of `(uri, cid)` strongRefs in
- * the post at write time, and we honor those exact versions. Any pair
- * that doesn't structurally agree is rejected, so downstream callers can
- * trust the returned shape.
- *
- * Same observable contract as
- * `getSiteStandardRecordsFromHydrationMapsByDocumentUri` (the compose-path
- * sister) — both functions guarantee that a returned `(doc, pub)` pair
- * has matching site/uri, and reject orphan docs that claim a
- * non-hydrated publication. They differ only in how upstream availability
- * is asserted: this one trusts caller-supplied refs; the sister derives
- * everything from the dataplane response.
- *
- * Pairing rules:
- * - Both slots referenced: `doc.site` must equal `publication.ref.uri`,
- *   else both come back `undefined`.
- * - Doc with at-uri `site` referenced but no matching publication ref:
- *   reject the whole pairing (doc claims a publication that should have
- *   been pinned, but wasn't).
- * - Loose doc (web-URL `site`) referenced: publication stays `undefined`.
- * - Only a publication referenced: document stays `undefined`.
- *
- * Each returned slot carries the matching `ref` so callers can recover
- * the owner DID for blob-cdn URL building, etc.
- */
-export const getSiteStandardRecordsFromHydrationMapsByRefs = (
-  associatedRefs: readonly { uri: AtUriString; cid: string }[] | undefined,
-  documents: SiteStandardDocuments | undefined,
-  publications: SiteStandardPublications | undefined,
-): {
-  document: AssociatedSiteStandardRecord<SiteStandardDocument> | undefined
-  publication: AssociatedSiteStandardRecord<SiteStandardPublication> | undefined
-} => {
-  if (!associatedRefs?.length) {
-    return { document: undefined, publication: undefined }
-  }
-
-  // Resolve each ref against the hydration maps, taking the first hit on
-  // each side.
-  let document: AssociatedSiteStandardRecord<SiteStandardDocument> | undefined
-  let publication:
-    | AssociatedSiteStandardRecord<SiteStandardPublication>
-    | undefined
-  for (const ref of associatedRefs) {
-    const key = siteStandardRecordKey(ref.uri, ref.cid)
-    if (!document) {
-      const hit = documents?.get(key)
-      if (hit) document = { ref, info: hit }
-    }
-    if (!publication) {
-      const hit = publications?.get(key)
-      if (hit) publication = { ref, info: hit }
-    }
-    if (document && publication) break
-  }
-
-  // Both refs resolved: enforce that the doc's `site` actually points at
-  // the supplied publication. Mismatch means the post was misconstructed
-  // (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 }
-    }
-  }
-
-  // Doc with at-uri `site` but no publication: the post should have
-  // pinned the publication too. Treat as misconstructed — same contract
-  // as the compose-path lookup.
-  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 }
-    }
-  }
-
-  return { document, publication }
-}
-
-/**
- * Compose-path resolution: no caller-supplied refs — the dataplane
- * returned the latest version of each record (including any
- * publications it auto-resolved from a document's `site` field). Take
- * the first hydrated document and pair it with the publication its
- * `site` field points at.
- *
- * Same observable contract as
- * `getSiteStandardRecordsFromHydrationMapsByRefs` (the read-path
- * sister) — both functions guarantee that a returned `(doc, pub)` pair
- * has matching site/uri, and reject orphan docs that claim a
- * non-hydrated publication. They differ only in how upstream
- * availability is asserted: this one walks whatever was returned by the
- * dataplane; the sister checks against caller-supplied refs.
- *
- * Pairing rules:
- * - Doc with at-uri `site`: must find a hydrated publication at that
- *   URI. If none was hydrated, the doc/publication chain is incomplete
- *   and the function returns `undefined` for both slots; the doc alone
- *   isn't useful without its source (can't verify the pub)
- * - Doc with web-URL `site` (loose): no publication.
- * - No doc hydrated: fall through to the first hydrated publication for
- *   the publication-only resolution flow.
- */
-export const getSiteStandardRecordsFromHydrationMapsByDocumentUri = (
-  documents: SiteStandardDocuments | undefined,
-  publications: SiteStandardPublications | undefined,
-): {
-  document: AssociatedSiteStandardRecord<SiteStandardDocument> | undefined
-  publication: AssociatedSiteStandardRecord<SiteStandardPublication> | undefined
-} => {
-  // First hydrated doc.
-  let document: AssociatedSiteStandardRecord<SiteStandardDocument> | undefined
-  for (const [key, info] of documents ?? []) {
-    if (!info) continue
-    document = { ref: parseSiteStandardRecordKey(key), info }
-    break
-  }
-
-  let publication:
-    | AssociatedSiteStandardRecord<SiteStandardPublication>
-    | undefined
-  if (document) {
-    const site = document.info.record.site
-    if (site && site.startsWith('at://')) {
-      // Doc declared an at-uri publication; we need it.
-      for (const [key, info] of publications ?? []) {
-        if (!info) continue
-        const ref = parseSiteStandardRecordKey(key)
-        if (ref.uri === site) {
-          publication = { ref, info }
-          break
-        }
-      }
-      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 }
-      }
-    }
-    // else: loose doc (web-URL site), no publication needed.
-  } else {
-    // Publication-only flow: no doc, take the first hydrated publication.
-    for (const [key, info] of publications ?? []) {
-      if (!info) continue
-      publication = { ref: parseSiteStandardRecordKey(key), info }
-      break
-    }
-  }
-
-  return { document, publication }
-}