@atproto/bsky 0.0.79 → 0.0.81

package/src/lexicon/types/app/bsky/embed/video.ts

@@ -0,0 +1,67 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import * as AppBskyEmbedDefs from './defs'
+
+export interface Main {
+  video: BlobRef
+  captions?: Caption[]
+  /** Alt text description of the video, for accessibility. */
+  alt?: string
+  aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  [k: string]: unknown
+}
+
+export function isMain(v: unknown): v is Main {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    (v.$type === 'app.bsky.embed.video#main' ||
+      v.$type === 'app.bsky.embed.video')
+  )
+}
+
+export function validateMain(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.embed.video#main', v)
+}
+
+export interface Caption {
+  lang: string
+  file: BlobRef
+  [k: string]: unknown
+}
+
+export function isCaption(v: unknown): v is Caption {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.embed.video#caption'
+  )
+}
+
+export function validateCaption(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.embed.video#caption', v)
+}
+
+export interface View {
+  cid: string
+  playlist: string
+  thumbnail?: string
+  alt?: string
+  aspectRatio?: AppBskyEmbedDefs.AspectRatio
+  [k: string]: unknown
+}
+
+export function isView(v: unknown): v is View {
+  return (
+    isObj(v) && hasProp(v, '$type') && v.$type === 'app.bsky.embed.video#view'
+  )
+}
+
+export function validateView(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.embed.video#view', v)
+}

package/src/lexicon/types/app/bsky/feed/defs.ts

@@ -7,6 +7,7 @@ import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import * as AppBskyActorDefs from '../actor/defs'
 import * as AppBskyEmbedImages from '../embed/images'
+import * as AppBskyEmbedVideo from '../embed/video'
 import * as AppBskyEmbedExternal from '../embed/external'
 import * as AppBskyEmbedRecord from '../embed/record'
 import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
@@ -21,6 +22,7 @@ export interface PostView {
   record: {}
   embed?:
     | AppBskyEmbedImages.View
+    | AppBskyEmbedVideo.View
     | AppBskyEmbedExternal.View
     | AppBskyEmbedRecord.View
     | AppBskyEmbedRecordWithMedia.View

package/src/lexicon/types/app/bsky/feed/post.ts

@@ -7,6 +7,7 @@ import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import * as AppBskyRichtextFacet from '../richtext/facet'
 import * as AppBskyEmbedImages from '../embed/images'
+import * as AppBskyEmbedVideo from '../embed/video'
 import * as AppBskyEmbedExternal from '../embed/external'
 import * as AppBskyEmbedRecord from '../embed/record'
 import * as AppBskyEmbedRecordWithMedia from '../embed/recordWithMedia'
@@ -23,6 +24,7 @@ export interface Record {
   reply?: ReplyRef
   embed?:
     | AppBskyEmbedImages.Main
+    | AppBskyEmbedVideo.Main
     | AppBskyEmbedExternal.Main
     | AppBskyEmbedRecord.Main
     | AppBskyEmbedRecordWithMedia.Main

package/src/lexicon/types/app/bsky/video/defs.ts

@@ -0,0 +1,32 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface JobStatus {
+  jobId: string
+  did: string
+  /** The state of the video processing job. All values not listed as a known value indicate that the job is in process. */
+  state: 'JOB_STATE_COMPLETED' | 'JOB_STATE_FAILED' | (string & {})
+  /** Progress within the current processing state. */
+  progress?: number
+  blob?: BlobRef
+  error?: string
+  message?: string
+  [k: string]: unknown
+}
+
+export function isJobStatus(v: unknown): v is JobStatus {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.video.defs#jobStatus'
+  )
+}
+
+export function validateJobStatus(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.video.defs#jobStatus', v)
+}

package/src/lexicon/types/app/bsky/video/getJobStatus.ts

@@ -0,0 +1,46 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as AppBskyVideoDefs from './defs'
+
+export interface QueryParams {
+  jobId: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  jobStatus: AppBskyVideoDefs.JobStatus
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/app/bsky/video/getUploadLimits.ts

@@ -0,0 +1,47 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+
+export interface QueryParams {}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  canUpload: boolean
+  remainingDailyVideos?: number
+  remainingDailyBytes?: number
+  message?: string
+  error?: string
+  [k: string]: unknown
+}
+
+export type HandlerInput = undefined
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/app/bsky/video/uploadVideo.ts

@@ -0,0 +1,48 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express'
+import stream from 'stream'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as AppBskyVideoDefs from './defs'
+
+export interface QueryParams {}
+
+export type InputSchema = string | Uint8Array | Blob
+
+export interface OutputSchema {
+  jobStatus: AppBskyVideoDefs.JobStatus
+  [k: string]: unknown
+}
+
+export interface HandlerInput {
+  encoding: 'video/mp4'
+  body: stream.Readable
+}
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
+export type HandlerReqCtx<HA extends HandlerAuth = never> = {
+  auth: HA
+  params: QueryParams
+  input: HandlerInput
+  req: express.Request
+  res: express.Response
+}
+export type Handler<HA extends HandlerAuth = never> = (
+  ctx: HandlerReqCtx<HA>,
+) => Promise<HandlerOutput> | HandlerOutput

package/src/lexicon/types/com/atproto/repo/applyWrites.ts

@@ -7,32 +7,45 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ComAtprotoRepoDefs from './defs'
 
 export interface QueryParams {}
 
 export interface InputSchema {
   /** The handle or DID of the repo (aka, current account). */
   repo: string
-  /** Can be set to 'false' to skip Lexicon schema validation of record data, for all operations. */
-  validate: boolean
+  /** Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. */
+  validate?: boolean
   writes: (Create | Update | Delete)[]
   /** If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. */
   swapCommit?: string
   [k: string]: unknown
 }
 
+export interface OutputSchema {
+  commit?: ComAtprotoRepoDefs.CommitMeta
+  results?: (CreateResult | UpdateResult | DeleteResult)[]
+  [k: string]: unknown
+}
+
 export interface HandlerInput {
   encoding: 'application/json'
   body: InputSchema
 }
 
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
 export interface HandlerError {
   status: number
   message?: string
   error?: 'InvalidSwap'
 }
 
-export type HandlerOutput = HandlerError | void
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   auth: HA
   params: QueryParams
@@ -102,3 +115,57 @@ export function isDelete(v: unknown): v is Delete {
 export function validateDelete(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.repo.applyWrites#delete', v)
 }
+
+export interface CreateResult {
+  uri: string
+  cid: string
+  validationStatus?: 'valid' | 'unknown' | (string & {})
+  [k: string]: unknown
+}
+
+export function isCreateResult(v: unknown): v is CreateResult {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.repo.applyWrites#createResult'
+  )
+}
+
+export function validateCreateResult(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.repo.applyWrites#createResult', v)
+}
+
+export interface UpdateResult {
+  uri: string
+  cid: string
+  validationStatus?: 'valid' | 'unknown' | (string & {})
+  [k: string]: unknown
+}
+
+export function isUpdateResult(v: unknown): v is UpdateResult {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.repo.applyWrites#updateResult'
+  )
+}
+
+export function validateUpdateResult(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.repo.applyWrites#updateResult', v)
+}
+
+export interface DeleteResult {
+  [k: string]: unknown
+}
+
+export function isDeleteResult(v: unknown): v is DeleteResult {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.repo.applyWrites#deleteResult'
+  )
+}
+
+export function validateDeleteResult(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.repo.applyWrites#deleteResult', v)
+}

package/src/lexicon/types/com/atproto/repo/createRecord.ts

@@ -7,6 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ComAtprotoRepoDefs from './defs'
 
 export interface QueryParams {}
 
@@ -17,8 +18,8 @@ export interface InputSchema {
   collection: string
   /** The Record Key. */
   rkey?: string
-  /** Can be set to 'false' to skip Lexicon schema validation of record data. */
-  validate: boolean
+  /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
+  validate?: boolean
   /** The record itself. Must contain a $type field. */
   record: {}
   /** Compare and swap with the previous commit by CID. */
@@ -29,6 +30,8 @@ export interface InputSchema {
 export interface OutputSchema {
   uri: string
   cid: string
+  commit?: ComAtprotoRepoDefs.CommitMeta
+  validationStatus?: 'valid' | 'unknown' | (string & {})
   [k: string]: unknown
 }
 

package/src/lexicon/types/com/atproto/repo/defs.ts

@@ -0,0 +1,25 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { lexicons } from '../../../../lexicons'
+import { isObj, hasProp } from '../../../../util'
+import { CID } from 'multiformats/cid'
+
+export interface CommitMeta {
+  cid: string
+  rev: string
+  [k: string]: unknown
+}
+
+export function isCommitMeta(v: unknown): v is CommitMeta {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.repo.defs#commitMeta'
+  )
+}
+
+export function validateCommitMeta(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.repo.defs#commitMeta', v)
+}

package/src/lexicon/types/com/atproto/repo/deleteRecord.ts

@@ -7,6 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ComAtprotoRepoDefs from './defs'
 
 export interface QueryParams {}
 
@@ -24,18 +25,29 @@ export interface InputSchema {
   [k: string]: unknown
 }
 
+export interface OutputSchema {
+  commit?: ComAtprotoRepoDefs.CommitMeta
+  [k: string]: unknown
+}
+
 export interface HandlerInput {
   encoding: 'application/json'
   body: InputSchema
 }
 
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
 export interface HandlerError {
   status: number
   message?: string
   error?: 'InvalidSwap'
 }
 
-export type HandlerOutput = HandlerError | void
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough
 export type HandlerReqCtx<HA extends HandlerAuth = never> = {
   auth: HA
   params: QueryParams

package/src/lexicon/types/com/atproto/repo/putRecord.ts

@@ -7,6 +7,7 @@ import { lexicons } from '../../../../lexicons'
 import { isObj, hasProp } from '../../../../util'
 import { CID } from 'multiformats/cid'
 import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
+import * as ComAtprotoRepoDefs from './defs'
 
 export interface QueryParams {}
 
@@ -17,8 +18,8 @@ export interface InputSchema {
   collection: string
   /** The Record Key. */
   rkey: string
-  /** Can be set to 'false' to skip Lexicon schema validation of record data. */
-  validate: boolean
+  /** Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. */
+  validate?: boolean
   /** The record to write. */
   record: {}
   /** Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation */
@@ -31,6 +32,8 @@ export interface InputSchema {
 export interface OutputSchema {
   uri: string
   cid: string
+  commit?: ComAtprotoRepoDefs.CommitMeta
+  validationStatus?: 'valid' | 'unknown' | (string & {})
   [k: string]: unknown
 }
 

package/src/views/index.ts

@@ -28,7 +28,12 @@ import {
   StarterPackView,
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
-import { parseThreadGate, parsePostgate, cidFromBlobJson } from './util'
+import {
+  parseThreadGate,
+  cidFromBlobJson,
+  VideoUriBuilder,
+  parsePostgate,
+} from './util'
 import { uriToDid as creatorFromUri } from '../util/uris'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
@@ -50,10 +55,13 @@ import {
   RecordEmbedViewInternal,
   RecordWithMedia,
   RecordWithMediaView,
+  VideoEmbed,
+  VideoEmbedView,
   isExternalEmbed,
   isImagesEmbed,
   isRecordEmbed,
   isRecordWithMedia,
+  isVideoEmbed,
 } from './types'
 import { Label } from '../hydration/label'
 import { FeedItem, Post, Repost } from '../hydration/feed'
@@ -66,7 +74,10 @@ import { Notification } from '../proto/bsky_pb'
 import { postUriToThreadgateUri, postUriToPostgateUri } from '../util/uris'
 
 export class Views {
-  constructor(public imgUriBuilder: ImageUriBuilder) {}
+  constructor(
+    public imgUriBuilder: ImageUriBuilder,
+    public videoUriBuilder: VideoUriBuilder,
+  ) {}
 
   // Actor
   // ------------
@@ -841,6 +852,8 @@ export class Views {
   ): EmbedView | undefined {
     if (isImagesEmbed(embed)) {
       return this.imagesEmbed(creatorFromUri(postUri), embed)
+    } else if (isVideoEmbed(embed)) {
+      return this.videoEmbed(creatorFromUri(postUri), embed)
     } else if (isExternalEmbed(embed)) {
       return this.externalEmbed(creatorFromUri(postUri), embed)
     } else if (isRecordEmbed(embed)) {
@@ -873,6 +886,18 @@ export class Views {
     }
   }
 
+  videoEmbed(did: string, embed: VideoEmbed): VideoEmbedView {
+    const cid = cidFromBlobJson(embed.video)
+    return {
+      $type: 'app.bsky.embed.video#view',
+      cid,
+      playlist: this.videoUriBuilder.playlist({ did, cid }),
+      thumbnail: this.videoUriBuilder.thumbnail({ did, cid }),
+      alt: embed.alt,
+      aspectRatio: embed.aspectRatio,
+    }
+  }
+
   externalEmbed(did: string, embed: ExternalEmbed): ExternalEmbedView {
     const { uri, title, description, thumb } = embed.external
     return {
@@ -1027,9 +1052,11 @@ export class Views {
     depth: number,
   ): RecordWithMediaView | undefined {
     const creator = creatorFromUri(postUri)
-    let mediaEmbed: ImagesEmbedView | ExternalEmbedView
+    let mediaEmbed: ImagesEmbedView | VideoEmbedView | ExternalEmbedView
     if (isImagesEmbed(embed.media)) {
       mediaEmbed = this.imagesEmbed(creator, embed.media)
+    } else if (isVideoEmbed(embed.media)) {
+      mediaEmbed = this.videoEmbed(creator, embed.media)
     } else if (isExternalEmbed(embed.media)) {
       mediaEmbed = this.externalEmbed(creator, embed.media)
     } else {

package/src/views/types.ts

@@ -2,6 +2,10 @@ import {
   Main as ImagesEmbed,
   View as ImagesEmbedView,
 } from '../lexicon/types/app/bsky/embed/images'
+import {
+  Main as VideoEmbed,
+  View as VideoEmbedView,
+} from '../lexicon/types/app/bsky/embed/video'
 import {
   Main as ExternalEmbed,
   View as ExternalEmbedView,
@@ -29,6 +33,11 @@ export type {
   View as ImagesEmbedView,
 } from '../lexicon/types/app/bsky/embed/images'
 export { isMain as isImagesEmbed } from '../lexicon/types/app/bsky/embed/images'
+export type {
+  Main as VideoEmbed,
+  View as VideoEmbedView,
+} from '../lexicon/types/app/bsky/embed/video'
+export { isMain as isVideoEmbed } from '../lexicon/types/app/bsky/embed/video'
 export type {
   Main as ExternalEmbed,
   View as ExternalEmbedView,
@@ -59,10 +68,16 @@ export type { ListView } from '../lexicon/types/app/bsky/graph/defs'
 
 export type { Notification as NotificationView } from '../lexicon/types/app/bsky/notification/listNotifications'
 
-export type Embed = ImagesEmbed | ExternalEmbed | RecordEmbed | RecordWithMedia
+export type Embed =
+  | ImagesEmbed
+  | VideoEmbed
+  | ExternalEmbed
+  | RecordEmbed
+  | RecordWithMedia
 
 export type EmbedView =
   | ImagesEmbedView
+  | VideoEmbedView
   | ExternalEmbedView
   | RecordEmbedView
   | RecordWithMediaView

package/src/views/util.ts

@@ -1,3 +1,4 @@
+import * as util from 'node:util'
 import { BlobRef } from '@atproto/lexicon'
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import {
@@ -92,3 +93,26 @@ type ParsedPostgate = {
     canEmbed: boolean
   }
 }
+
+export class VideoUriBuilder {
+  constructor(
+    private opts: {
+      playlistUrlPattern: string // e.g. https://hostname/vid/%s/%s/playlist.m3u8
+      thumbnailUrlPattern: string // e.g. https://hostname/vid/%s/%s/thumbnail.jpg
+    },
+  ) {}
+  playlist({ did, cid }: { did: string; cid: string }) {
+    return util.format(
+      this.opts.playlistUrlPattern,
+      encodeURIComponent(did),
+      encodeURIComponent(cid),
+    )
+  }
+  thumbnail({ did, cid }: { did: string; cid: string }) {
+    return util.format(
+      this.opts.thumbnailUrlPattern,
+      encodeURIComponent(did),
+      encodeURIComponent(cid),
+    )
+  }
+}

package/tests/_util.ts

@@ -80,6 +80,15 @@ export const forSnapshot = (obj: unknown) => {
       const [, did, cid] = match
       return str.replace(did, take(users, did)).replace(cid, take(cids, cid))
     }
+    if (str.match(/\/vid\/did%3Aplc%3A[^/]+\/[^/]+\/[^/]+$/)) {
+      // Match video urls
+      const match = str.match(/\/vid\/(did%3Aplc%3A[^/]+)\/([^/]+)\/[^/]+$/)
+      if (!match) return str
+      const [, did, cid] = match
+      return str
+        .replace(did, take(users, decodeURIComponent(did)))
+        .replace(cid, take(cids, cid))
+    }
     let isCid: boolean
     try {
       CID.parse(str)