@atproto/bsky 0.0.251 → 0.0.253

package/tests/hydration/util.test.ts

@@ -1,119 +0,0 @@
-import { Timestamp } from '@bufbuild/protobuf'
-import { describe, expect, it } from 'vitest'
-import {
-  HydrationMap,
-  mergeManyMaps,
-  mergeMaps,
-  mergeNestedMaps,
-  parseDate,
-} from '../../src/hydration/util.js'
-
-const mapToObj = (map: HydrationMap<string, unknown>) => {
-  return Object.fromEntries(map) as Record<string, unknown>
-}
-
-describe('hydration util', () => {
-  it(`mergeMaps: merges two maps`, () => {
-    const compare = new HydrationMap<string, string>()
-    compare.set('a', 'a')
-    compare.set('b', 'b')
-
-    const a = new HydrationMap<string, string>().set('a', 'a')
-    const b = new HydrationMap<string, string>().set('b', 'b')
-    const merged = mergeMaps(a, b)
-
-    expect(mapToObj(merged!)).toEqual(mapToObj(compare))
-  })
-
-  it(`mergeManyMaps: merges three maps`, () => {
-    const compare = new HydrationMap<string, string>()
-    compare.set('a', 'a')
-    compare.set('b', 'b')
-    compare.set('c', 'c')
-
-    const a = new HydrationMap<string, string>().set('a', 'a')
-    const b = new HydrationMap<string, string>().set('b', 'b')
-    const c = new HydrationMap<string, string>().set('c', 'c')
-    const merged = mergeManyMaps(a, b, c)
-
-    expect(mapToObj(merged!)).toEqual(mapToObj(compare))
-  })
-
-  it(`mergeNestedMaps: merges two nested maps`, () => {
-    const compare = new HydrationMap<string, HydrationMap<string, string>>()
-    const compareA = new HydrationMap<string, string>().set('a', 'a')
-    const compareB = new HydrationMap<string, string>().set('b', 'b')
-    compare.set('a', compareA)
-    compare.set('b', compareB)
-
-    const a = new HydrationMap<string, HydrationMap<string, string>>().set(
-      'a',
-      new HydrationMap<string, string>().set('a', 'a'),
-    )
-    const b = new HydrationMap<string, HydrationMap<string, string>>().set(
-      'b',
-      new HydrationMap<string, string>().set('b', 'b'),
-    )
-    const merged = mergeNestedMaps(a, b)
-
-    expect(mapToObj(merged!)).toEqual(mapToObj(compare))
-  })
-
-  it(`mergeNestedMaps: merges two nested maps with common keys`, () => {
-    const compare = new HydrationMap<string, HydrationMap<string, boolean>>()
-    const compareA = new HydrationMap<string, boolean>()
-    compareA.set('b', true)
-    compareA.set('c', true)
-    compare.set('a', compareA)
-
-    const a = new HydrationMap<string, HydrationMap<string, boolean>>().set(
-      'a',
-      new HydrationMap<string, boolean>().set('b', true),
-    )
-    const b = new HydrationMap<string, HydrationMap<string, boolean>>().set(
-      'a',
-      new HydrationMap<string, boolean>().set('c', true),
-    )
-    const merged = mergeNestedMaps(a, b)
-
-    expect(mapToObj(merged!)).toEqual(mapToObj(compare))
-  })
-
-  describe('parseDate', () => {
-    it('returns undefined for undefined input', () => {
-      expect(parseDate(undefined)).toBeUndefined()
-    })
-
-    it('returns undefined for Go zero-value date (year 0001)', () => {
-      // Go zero-value for time.Time is 0001-01-01 00:00:00 UTC
-      // which is -62135596800000ms from epoch
-      const goZeroDate = new Date(-62135596800000)
-      const goZeroTimestamp = Timestamp.fromDate(goZeroDate)
-      expect(parseDate(goZeroTimestamp)).toBeUndefined()
-    })
-
-    it('returns the date for valid dates', () => {
-      const validDate = new Date('2024-01-01T00:00:00Z')
-      const validTimestamp = Timestamp.fromDate(validDate)
-      expect(parseDate(validTimestamp)).toEqual(validDate)
-    })
-
-    it('returns the date for dates close to but not equal to Go zero-value', () => {
-      const nearZeroDate = new Date(-62135596800000 + 1000) // 1 second after
-      const nearZeroTimestamp = Timestamp.fromDate(nearZeroDate)
-      expect(parseDate(nearZeroTimestamp)).toEqual(nearZeroDate)
-    })
-
-    it('returns the date for epoch (1970-01-01)', () => {
-      const epochDate = new Date(0)
-      const epochTimestamp = Timestamp.fromDate(epochDate)
-      expect(parseDate(epochTimestamp)).toEqual(epochDate)
-    })
-
-    it('returns the date for recent dates', () => {
-      const recentDate = new Date('2026-03-17T00:00:00Z')
-      const recentTimestamp = Timestamp.fromDate(recentDate)
-      expect(parseDate(recentTimestamp)).toEqual(recentDate)
-    })
-  })
-})

package/tests/image/server.test.ts

@@ -1,97 +0,0 @@
-import { Readable } from 'node:stream'
-import { afterAll, beforeAll, describe, expect, it } from 'vitest'
-import { cidForCbor } from '@atproto/common'
-import { TestNetwork, basicSeed } from '@atproto/dev-env'
-import { Cid } from '@atproto/lex'
-import { getInfo } from '../../src/image/sharp.js'
-import { ImageUriBuilder } from '../../src/image/uri.js'
-
-describe('image processing server', () => {
-  let network: TestNetwork
-  let fileDid: string
-  let fileCid: Cid
-
-  beforeAll(async () => {
-    network = await TestNetwork.create({
-      dbPostgresSchema: 'bsky_image_processing_server',
-    })
-    const sc = network.getSeedClient()
-    await basicSeed(sc)
-    await network.processAll()
-    fileDid = sc.dids.carol
-    fileCid = sc.posts[fileDid][0].images[0].image.ref
-  })
-
-  afterAll(async () => {
-    await network?.close()
-  })
-
-  it('processes image from blob resolver.', async () => {
-    const res = await fetch(
-      new URL(
-        `/img${ImageUriBuilder.getPath({
-          preset: 'feed_fullsize',
-          did: fileDid,
-          cid: fileCid.toString(),
-        })}`,
-        network.bsky.url,
-      ),
-    )
-
-    const bytes = new Uint8Array(await res.arrayBuffer())
-    const info = await getInfo(Readable.from([bytes]))
-
-    expect(info).toEqual({
-      height: 580,
-      width: 1000,
-      mime: 'image/webp',
-      size: 46594,
-    })
-    expect(Object.fromEntries(res.headers)).toEqual(
-      expect.objectContaining({
-        'content-type': 'image/webp',
-        'cache-control': 'public, max-age=31536000',
-        'content-length': '46594',
-      }),
-    )
-  })
-
-  it('caches results.', async () => {
-    const path = ImageUriBuilder.getPath({
-      preset: 'avatar',
-      did: fileDid,
-      cid: fileCid.toString(),
-    })
-    const url = new URL(`/img${path}`, network.bsky.url)
-
-    const res1 = await fetch(url)
-    expect(res1.headers.get('x-cache')).toEqual('miss')
-    const bytes1 = new Uint8Array(await res1.arrayBuffer())
-    const res2 = await fetch(url)
-    expect(res2.headers.get('x-cache')).toEqual('hit')
-    const bytes2 = new Uint8Array(await res2.arrayBuffer())
-    const res3 = await fetch(url)
-    expect(res3.headers.get('x-cache')).toEqual('hit')
-    const bytes3 = new Uint8Array(await res3.arrayBuffer())
-    expect(Buffer.compare(bytes1, bytes2)).toEqual(0)
-    expect(Buffer.compare(bytes1, bytes3)).toEqual(0)
-  })
-
-  it('errors on missing file.', async () => {
-    const missingCid = await cidForCbor('missing-file')
-
-    const path = ImageUriBuilder.getPath({
-      preset: 'feed_fullsize',
-      did: fileDid,
-      cid: missingCid.toString(),
-    })
-
-    const url = new URL(`/img${path}`, network.bsky.url)
-
-    const res = await fetch(url)
-    expect(res.status).toEqual(404)
-    await expect(res.json()).resolves.toMatchObject({
-      message: 'Blob not found',
-    })
-  })
-})

package/tests/image/sharp.test.ts

@@ -1,199 +0,0 @@
-import { createReadStream } from 'node:fs'
-import { pipeline } from 'node:stream/promises'
-import { describe, expect, it } from 'vitest'
-import {
-  Options,
-  createImageProcessor,
-  createImageUpscaler,
-  getInfo,
-} from '../../src/image/sharp.js'
-
-describe('sharp image processor', () => {
-  it('scales up to cover.', async () => {
-    const result = await processFixture('key-landscape-small.jpg', {
-      format: 'jpeg',
-      fit: 'cover',
-      width: 500,
-      height: 500,
-      min: true,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 500,
-        width: 500,
-      }),
-    )
-  })
-
-  it('scales up to inside (landscape).', async () => {
-    const result = await processFixture('key-landscape-small.jpg', {
-      format: 'jpeg',
-      fit: 'inside',
-      width: 500,
-      height: 500,
-      min: true,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 290,
-        width: 500,
-      }),
-    )
-  })
-
-  it('scales up to inside (portrait).', async () => {
-    const result = await processFixture('key-portrait-small.jpg', {
-      format: 'jpeg',
-      fit: 'inside',
-      width: 500,
-      height: 500,
-      min: true,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 500,
-        width: 290,
-      }),
-    )
-  })
-
-  it('scales up to min.', async () => {
-    const result = await processFixture('key-landscape-small.jpg', {
-      format: 'jpeg',
-      width: 500,
-      height: 500,
-      min: { height: 200, width: 200 },
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 200,
-        width: 345,
-      }),
-    )
-  })
-
-  it('does not scale image up when min is false.', async () => {
-    const result = await processFixture('key-landscape-small.jpg', {
-      format: 'jpeg',
-      width: 500,
-      height: 500,
-      min: false,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 87,
-        width: 150,
-        mime: 'image/jpeg',
-      }),
-    )
-  })
-
-  it('scales down to cover.', async () => {
-    const result = await processFixture('key-landscape-large.jpg', {
-      format: 'jpeg',
-      fit: 'cover',
-      width: 500,
-      height: 500,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 500,
-        width: 500,
-      }),
-    )
-  })
-
-  it('scales down to inside (landscape).', async () => {
-    const result = await processFixture('key-landscape-large.jpg', {
-      format: 'jpeg',
-      fit: 'inside',
-      width: 500,
-      height: 500,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 290,
-        width: 500,
-      }),
-    )
-  })
-
-  it('scales down to inside (portrait).', async () => {
-    const result = await processFixture('key-portrait-large.jpg', {
-      format: 'jpeg',
-      fit: 'inside',
-      width: 500,
-      height: 500,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 500,
-        width: 290,
-      }),
-    )
-  })
-
-  it('converts jpeg to png.', async () => {
-    const result = await processFixture('key-landscape-small.jpg', {
-      format: 'webp',
-      width: 500,
-      height: 500,
-      min: false,
-    })
-    expect(result).toEqual(
-      expect.objectContaining({
-        height: 87,
-        width: 150,
-        size: expect.any(Number),
-        mime: 'image/webp',
-      }),
-    )
-  })
-
-  it('controls quality (jpeg).', async () => {
-    const high = await processFixture('key-portrait-small.jpg', {
-      format: 'jpeg',
-      width: 500,
-      height: 500,
-      quality: 90,
-    })
-    const low = await processFixture('key-portrait-small.jpg', {
-      format: 'jpeg',
-      width: 500,
-      height: 500,
-      quality: 10,
-    })
-    expect(high.size).toBeGreaterThan(1000)
-    expect(low.size).toBeLessThan(1000)
-  })
-
-  it('controls quality (webp).', async () => {
-    const high = await processFixture('key-portrait-small.jpg', {
-      format: 'webp',
-      width: 500,
-      height: 500,
-      quality: 80,
-    })
-    const low = await processFixture('key-portrait-small.jpg', {
-      format: 'webp',
-      width: 500,
-      height: 500,
-      quality: 10,
-    })
-    expect(high.size).toBeGreaterThan(1000)
-    expect(low.size).toBeLessThan(1000)
-  })
-
-  async function processFixture(fixture: string, options: Options) {
-    const image = createReadStream(`../dev-env/assets/${fixture}`)
-    const upscaler = createImageUpscaler(options)
-    const processor = createImageProcessor(options)
-
-    const [info] = await Promise.all([
-      getInfo(processor),
-      pipeline([image, upscaler, processor]),
-    ])
-
-    return info
-  }
-})

package/tests/image/uri.test.ts

@@ -1,106 +0,0 @@
-import { beforeAll, describe, expect, it } from 'vitest'
-import { cidForCbor } from '@atproto/common'
-import { Cid } from '@atproto/lex'
-import { BadPathError, ImageUriBuilder } from '../../src/image/uri.js'
-
-describe('image uri builder', () => {
-  const endpoint = 'https://example.com/img'
-  let uriBuilder: ImageUriBuilder
-  let cid: Cid
-  const did = 'did:plc:xyz'
-
-  beforeAll(async () => {
-    uriBuilder = new ImageUriBuilder(endpoint)
-    cid = await cidForCbor('test cid')
-  })
-
-  it('generates paths.', () => {
-    expect(
-      ImageUriBuilder.getPath({ preset: 'banner', did, cid: cid.toString() }),
-    ).toEqual(`/banner/plain/${did}/${cid.toString()}`)
-    expect(
-      ImageUriBuilder.getPath({
-        preset: 'feed_thumbnail',
-        did,
-        cid: cid.toString(),
-      }),
-    ).toEqual(`/feed_thumbnail/plain/${did}/${cid.toString()}`)
-  })
-
-  it('generates uris.', () => {
-    expect(uriBuilder.getPresetUri('banner', did, cid.toString())).toEqual(
-      `https://example.com/img/banner/plain/${did}/${cid.toString()}`,
-    )
-    expect(
-      uriBuilder.getPresetUri('feed_thumbnail', did, cid.toString()),
-    ).toEqual(
-      `https://example.com/img/feed_thumbnail/plain/${did}/${cid.toString()}`,
-    )
-  })
-
-  it('parses options.', () => {
-    expect(
-      ImageUriBuilder.getOptions(`/banner/plain/${did}/${cid.toString()}@jpeg`),
-    ).toEqual({
-      did: 'did:plc:xyz',
-      cid: cid.toString(),
-      fit: 'cover',
-      format: 'jpeg',
-      height: 1000,
-      min: true,
-      preset: 'banner',
-      width: 3000,
-    })
-    expect(
-      ImageUriBuilder.getOptions(
-        `/feed_thumbnail/plain/${did}/${cid.toString()}@jpeg`,
-      ),
-    ).toEqual({
-      did: 'did:plc:xyz',
-      cid: cid.toString(),
-      fit: 'inside',
-      format: 'jpeg',
-      height: 2000,
-      min: true,
-      preset: 'feed_thumbnail',
-      width: 2000,
-    })
-    expect(
-      ImageUriBuilder.getOptions(
-        `/feed_thumbnail/plain/${did}/${cid.toString()}`,
-      ),
-    ).toEqual({
-      did: 'did:plc:xyz',
-      cid: cid.toString(),
-      fit: 'inside',
-      format: 'webp',
-      height: 2000,
-      min: true,
-      preset: 'feed_thumbnail',
-      width: 2000,
-    })
-  })
-
-  it('errors on bad url pattern.', () => {
-    expect(tryGetOptions(`/a`)).toThrow(new BadPathError('Invalid path'))
-    expect(tryGetOptions(`/banner/plain/${did}@jpeg`)).toThrow(
-      new BadPathError('Invalid path'),
-    )
-  })
-
-  it('errors on bad preset.', () => {
-    expect(
-      tryGetOptions(`/bad_banner/plain/${did}/${cid.toString()}@jpeg`),
-    ).toThrow(new BadPathError('Invalid path: bad preset'))
-  })
-
-  it('errors on bad format.', () => {
-    expect(tryGetOptions(`/banner/plain/${did}/${cid.toString()}@gif`)).toThrow(
-      new BadPathError('Invalid path: bad format'),
-    )
-  })
-
-  function tryGetOptions(path: string) {
-    return () => ImageUriBuilder.getOptions(path)
-  }
-})