@atproto/api 0.3.2 → 0.3.4

package/docs/rn-fetch-handler.ts

@@ -74,7 +74,7 @@ async function fetchHandler(
     } else if (resMimeType.startsWith('text/')) {
       resBody = await res.text()
     } else {
-      throw new Error('TODO: non-textual response body')
+      resBody = await res.blob()
     }
   }
 

package/jest.bench.config.js

@@ -0,0 +1,8 @@
+const base = require('./jest.config')
+
+module.exports = {
+  ...base,
+  roots: ['<rootDir>/bench'],
+  testRegex: '(.*.bench.ts)',
+  testTimeout: 3000000,
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "main": "dist/index.js",
   "scripts": {
     "codegen": "lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",
@@ -10,7 +10,9 @@
     "update-main-to-src": "node ./update-pkg.js --update-main-to-src",
     "prepublish": "npm run update-main-to-dist",
     "postpublish": "npm run update-main-to-src",
-    "test": "jest"
+    "test": "jest",
+    "bench": "jest --config jest.bench.config.js",
+    "bench:profile": "node --inspect-brk ../../node_modules/.bin/jest --config jest.bench.config.js"
   },
   "license": "MIT",
   "repository": {

package/src/client/index.ts

@@ -71,10 +71,12 @@ import * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOf
 import * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
 import * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
 import * as AppBskyActorDefs from './types/app/bsky/actor/defs'
+import * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
 import * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
 import * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
 import * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
 import * as AppBskyActorProfile from './types/app/bsky/actor/profile'
+import * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
 import * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
 import * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
 import * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
@@ -177,10 +179,12 @@ export * as ComAtprotoSyncNotifyOfUpdate from './types/com/atproto/sync/notifyOf
 export * as ComAtprotoSyncRequestCrawl from './types/com/atproto/sync/requestCrawl'
 export * as ComAtprotoSyncSubscribeRepos from './types/com/atproto/sync/subscribeRepos'
 export * as AppBskyActorDefs from './types/app/bsky/actor/defs'
+export * as AppBskyActorGetPreferences from './types/app/bsky/actor/getPreferences'
 export * as AppBskyActorGetProfile from './types/app/bsky/actor/getProfile'
 export * as AppBskyActorGetProfiles from './types/app/bsky/actor/getProfiles'
 export * as AppBskyActorGetSuggestions from './types/app/bsky/actor/getSuggestions'
 export * as AppBskyActorProfile from './types/app/bsky/actor/profile'
+export * as AppBskyActorPutPreferences from './types/app/bsky/actor/putPreferences'
 export * as AppBskyActorSearchActors from './types/app/bsky/actor/searchActors'
 export * as AppBskyActorSearchActorsTypeahead from './types/app/bsky/actor/searchActorsTypeahead'
 export * as AppBskyEmbedExternal from './types/app/bsky/embed/external'
@@ -1012,6 +1016,17 @@ export class ActorNS {
     this.profile = new ProfileRecord(service)
   }
 
+  getPreferences(
+    params?: AppBskyActorGetPreferences.QueryParams,
+    opts?: AppBskyActorGetPreferences.CallOptions,
+  ): Promise<AppBskyActorGetPreferences.Response> {
+    return this._service.xrpc
+      .call('app.bsky.actor.getPreferences', params, undefined, opts)
+      .catch((e) => {
+        throw AppBskyActorGetPreferences.toKnownErr(e)
+      })
+  }
+
   getProfile(
     params?: AppBskyActorGetProfile.QueryParams,
     opts?: AppBskyActorGetProfile.CallOptions,
@@ -1045,6 +1060,17 @@ export class ActorNS {
       })
   }
 
+  putPreferences(
+    data?: AppBskyActorPutPreferences.InputSchema,
+    opts?: AppBskyActorPutPreferences.CallOptions,
+  ): Promise<AppBskyActorPutPreferences.Response> {
+    return this._service.xrpc
+      .call('app.bsky.actor.putPreferences', opts?.qp, data, opts)
+      .catch((e) => {
+        throw AppBskyActorPutPreferences.toKnownErr(e)
+      })
+  }
+
   searchActors(
     params?: AppBskyActorSearchActors.QueryParams,
     opts?: AppBskyActorSearchActors.CallOptions,

package/src/client/lexicons.ts

@@ -100,7 +100,9 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.admin.defs#repoView',
+              'lex:com.atproto.admin.defs#repoViewNotFound',
               'lex:com.atproto.admin.defs#recordView',
+              'lex:com.atproto.admin.defs#recordViewNotFound',
             ],
           },
           subjectBlobs: {
@@ -274,7 +276,9 @@ export const schemaDict = {
             type: 'union',
             refs: [
               'lex:com.atproto.admin.defs#repoView',
+              'lex:com.atproto.admin.defs#repoViewNotFound',
               'lex:com.atproto.admin.defs#recordView',
+              'lex:com.atproto.admin.defs#recordViewNotFound',
             ],
           },
           reportedBy: {
@@ -396,6 +400,16 @@ export const schemaDict = {
           },
         },
       },
+      repoViewNotFound: {
+        type: 'object',
+        required: ['did'],
+        properties: {
+          did: {
+            type: 'string',
+            format: 'did',
+          },
+        },
+      },
       repoRef: {
         type: 'object',
         required: ['did'],
@@ -501,6 +515,16 @@ export const schemaDict = {
           },
         },
       },
+      recordViewNotFound: {
+        type: 'object',
+        required: ['uri'],
+        properties: {
+          uri: {
+            type: 'string',
+            format: 'at-uri',
+          },
+        },
+      },
       moderation: {
         type: 'object',
         required: [],
@@ -835,6 +859,15 @@ export const schemaDict = {
             resolved: {
               type: 'boolean',
             },
+            actionType: {
+              type: 'string',
+              knownValues: [
+                'com.atproto.admin.defs#takedown',
+                'com.atproto.admin.defs#flag',
+                'com.atproto.admin.defs#acknowledge',
+                'com.atproto.admin.defs#escalate',
+              ],
+            },
             limit: {
               type: 'integer',
               minimum: 1,
@@ -896,6 +929,11 @@ export const schemaDict = {
             ref: 'lex:com.atproto.admin.defs#recordViewDetail',
           },
         },
+        errors: [
+          {
+            name: 'RecordNotFound',
+          },
+        ],
       },
     },
   },
@@ -923,6 +961,11 @@ export const schemaDict = {
             ref: 'lex:com.atproto.admin.defs#repoViewDetail',
           },
         },
+        errors: [
+          {
+            name: 'RepoNotFound',
+          },
+        ],
       },
     },
   },
@@ -2114,6 +2157,10 @@ export const schemaDict = {
                 type: 'string',
                 format: 'handle',
               },
+              did: {
+                type: 'string',
+                format: 'did',
+              },
               inviteCode: {
                 type: 'string',
               },
@@ -2165,6 +2212,12 @@ export const schemaDict = {
           {
             name: 'UnsupportedDomain',
           },
+          {
+            name: 'UnresolvableDid',
+          },
+          {
+            name: 'IncompatibleDidDoc',
+          },
         ],
       },
     },
@@ -3509,6 +3562,66 @@ export const schemaDict = {
           },
         },
       },
+      preferences: {
+        type: 'array',
+        items: {
+          type: 'union',
+          refs: [
+            'lex:app.bsky.actor.defs#adultContentPref',
+            'lex:app.bsky.actor.defs#contentLabelPref',
+          ],
+        },
+      },
+      adultContentPref: {
+        type: 'object',
+        required: ['enabled'],
+        properties: {
+          enabled: {
+            type: 'boolean',
+            default: false,
+          },
+        },
+      },
+      contentLabelPref: {
+        type: 'object',
+        required: ['label', 'visibility'],
+        properties: {
+          label: {
+            type: 'string',
+          },
+          visibility: {
+            type: 'string',
+            knownValues: ['show', 'warn', 'hide'],
+          },
+        },
+      },
+    },
+  },
+  AppBskyActorGetPreferences: {
+    lexicon: 1,
+    id: 'app.bsky.actor.getPreferences',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'Get private preferences attached to the account.',
+        parameters: {
+          type: 'params',
+          properties: {},
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['preferences'],
+            properties: {
+              preferences: {
+                type: 'ref',
+                ref: 'lex:app.bsky.actor.defs#preferences',
+              },
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetProfile: {
@@ -3655,6 +3768,29 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyActorPutPreferences: {
+    lexicon: 1,
+    id: 'app.bsky.actor.putPreferences',
+    defs: {
+      main: {
+        type: 'procedure',
+        description: 'Sets the private preferences attached to the account.',
+        input: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['preferences'],
+            properties: {
+              preferences: {
+                type: 'ref',
+                ref: 'lex:app.bsky.actor.defs#preferences',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
   AppBskyActorSearchActors: {
     lexicon: 1,
     id: 'app.bsky.actor.searchActors',
@@ -5659,10 +5795,12 @@ export const ids = {
   ComAtprotoSyncRequestCrawl: 'com.atproto.sync.requestCrawl',
   ComAtprotoSyncSubscribeRepos: 'com.atproto.sync.subscribeRepos',
   AppBskyActorDefs: 'app.bsky.actor.defs',
+  AppBskyActorGetPreferences: 'app.bsky.actor.getPreferences',
   AppBskyActorGetProfile: 'app.bsky.actor.getProfile',
   AppBskyActorGetProfiles: 'app.bsky.actor.getProfiles',
   AppBskyActorGetSuggestions: 'app.bsky.actor.getSuggestions',
   AppBskyActorProfile: 'app.bsky.actor.profile',
+  AppBskyActorPutPreferences: 'app.bsky.actor.putPreferences',
   AppBskyActorSearchActors: 'app.bsky.actor.searchActors',
   AppBskyActorSearchActorsTypeahead: 'app.bsky.actor.searchActorsTypeahead',
   AppBskyEmbedExternal: 'app.bsky.embed.external',

package/src/client/types/app/bsky/actor/defs.ts

@@ -103,3 +103,44 @@ export function isViewerState(v: unknown): v is ViewerState {
 export function validateViewerState(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#viewerState', v)
 }
+
+export type Preferences = (
+  | AdultContentPref
+  | ContentLabelPref
+  | { $type: string; [k: string]: unknown }
+)[]
+
+export interface AdultContentPref {
+  enabled: boolean
+  [k: string]: unknown
+}
+
+export function isAdultContentPref(v: unknown): v is AdultContentPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#adultContentPref'
+  )
+}
+
+export function validateAdultContentPref(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#adultContentPref', v)
+}
+
+export interface ContentLabelPref {
+  label: string
+  visibility: 'show' | 'warn' | 'hide' | (string & {})
+  [k: string]: unknown
+}
+
+export function isContentLabelPref(v: unknown): v is ContentLabelPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#contentLabelPref'
+  )
+}
+
+export function validateContentLabelPref(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#contentLabelPref', v)
+}

package/src/client/types/app/bsky/actor/getPreferences.ts

@@ -0,0 +1,34 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+import * as AppBskyActorDefs from './defs'
+
+export interface QueryParams {}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  preferences: AppBskyActorDefs.Preferences
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

package/src/client/types/app/bsky/actor/putPreferences.ts

@@ -0,0 +1,33 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult, BlobRef } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import { CID } from 'multiformats/cid'
+import * as AppBskyActorDefs from './defs'
+
+export interface QueryParams {}
+
+export interface InputSchema {
+  preferences: AppBskyActorDefs.Preferences
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+  qp?: QueryParams
+  encoding: 'application/json'
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

package/src/client/types/com/atproto/admin/defs.ts

@@ -43,7 +43,12 @@ export function validateActionView(v: unknown): ValidationResult {
 export interface ActionViewDetail {
   id: number
   action: ActionType
-  subject: RepoView | RecordView | { $type: string; [k: string]: unknown }
+  subject:
+    | RepoView
+    | RepoViewNotFound
+    | RecordView
+    | RecordViewNotFound
+    | { $type: string; [k: string]: unknown }
   subjectBlobs: BlobView[]
   createLabelVals?: string[]
   negateLabelVals?: string[]
@@ -150,7 +155,12 @@ export interface ReportViewDetail {
   id: number
   reasonType: ComAtprotoModerationDefs.ReasonType
   reason?: string
-  subject: RepoView | RecordView | { $type: string; [k: string]: unknown }
+  subject:
+    | RepoView
+    | RepoViewNotFound
+    | RecordView
+    | RecordViewNotFound
+    | { $type: string; [k: string]: unknown }
   reportedBy: string
   createdAt: string
   resolvedByActions: ActionView[]
@@ -219,6 +229,23 @@ export function validateRepoViewDetail(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#repoViewDetail', v)
 }
 
+export interface RepoViewNotFound {
+  did: string
+  [k: string]: unknown
+}
+
+export function isRepoViewNotFound(v: unknown): v is RepoViewNotFound {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#repoViewNotFound'
+  )
+}
+
+export function validateRepoViewNotFound(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#repoViewNotFound', v)
+}
+
 export interface RepoRef {
   did: string
   [k: string]: unknown
@@ -283,6 +310,23 @@ export function validateRecordViewDetail(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.admin.defs#recordViewDetail', v)
 }
 
+export interface RecordViewNotFound {
+  uri: string
+  [k: string]: unknown
+}
+
+export function isRecordViewNotFound(v: unknown): v is RecordViewNotFound {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'com.atproto.admin.defs#recordViewNotFound'
+  )
+}
+
+export function validateRecordViewNotFound(v: unknown): ValidationResult {
+  return lexicons.validate('com.atproto.admin.defs#recordViewNotFound', v)
+}
+
 export interface Moderation {
   currentAction?: ActionViewCurrent
   [k: string]: unknown

package/src/client/types/com/atproto/admin/getModerationReports.ts

@@ -11,6 +11,12 @@ import * as ComAtprotoAdminDefs from './defs'
 export interface QueryParams {
   subject?: string
   resolved?: boolean
+  actionType?:
+    | 'com.atproto.admin.defs#takedown'
+    | 'com.atproto.admin.defs#flag'
+    | 'com.atproto.admin.defs#acknowledge'
+    | 'com.atproto.admin.defs#escalate'
+    | (string & {})
   limit?: number
   cursor?: string
 }

package/src/client/types/com/atproto/admin/getRecord.ts

@@ -26,8 +26,15 @@ export interface Response {
   data: OutputSchema
 }
 
+export class RecordNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message)
+  }
+}
+
 export function toKnownErr(e: any) {
   if (e instanceof XRPCError) {
+    if (e.error === 'RecordNotFound') return new RecordNotFoundError(e)
   }
   return e
 }

package/src/client/types/com/atproto/admin/getRepo.ts

@@ -25,8 +25,15 @@ export interface Response {
   data: OutputSchema
 }
 
+export class RepoNotFoundError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message)
+  }
+}
+
 export function toKnownErr(e: any) {
   if (e instanceof XRPCError) {
+    if (e.error === 'RepoNotFound') return new RepoNotFoundError(e)
   }
   return e
 }

package/src/client/types/com/atproto/server/createAccount.ts

@@ -12,6 +12,7 @@ export interface QueryParams {}
 export interface InputSchema {
   email: string
   handle: string
+  did?: string
   inviteCode?: string
   password: string
   recoveryKey?: string
@@ -68,6 +69,18 @@ export class UnsupportedDomainError extends XRPCError {
   }
 }
 
+export class UnresolvableDidError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message)
+  }
+}
+
+export class IncompatibleDidDocError extends XRPCError {
+  constructor(src: XRPCError) {
+    super(src.status, src.error, src.message)
+  }
+}
+
 export function toKnownErr(e: any) {
   if (e instanceof XRPCError) {
     if (e.error === 'InvalidHandle') return new InvalidHandleError(e)
@@ -75,6 +88,8 @@ export function toKnownErr(e: any) {
     if (e.error === 'InvalidInviteCode') return new InvalidInviteCodeError(e)
     if (e.error === 'HandleNotAvailable') return new HandleNotAvailableError(e)
     if (e.error === 'UnsupportedDomain') return new UnsupportedDomainError(e)
+    if (e.error === 'UnresolvableDid') return new UnresolvableDidError(e)
+    if (e.error === 'IncompatibleDidDoc') return new IncompatibleDidDocError(e)
   }
   return e
 }

package/tests/agent.test.ts

@@ -398,4 +398,67 @@ describe('agent', () => {
     expect(sessions.length).toEqual(1)
     expect(sessions[0]?.accessJwt).toEqual(origAccessJwt)
   })
+
+  describe('setPersistSessionHandler', () => {
+    it('sets persist session handler', async () => {
+      let originalHandlerCallCount = 0
+      let newHandlerCallCount = 0
+
+      const persistSession = () => {
+        originalHandlerCallCount++
+      }
+      const newPersistSession = () => {
+        newHandlerCallCount++
+      }
+
+      const agent = new AtpAgent({ service: server.url, persistSession })
+
+      await agent.createAccount({
+        handle: 'user7.test',
+        email: 'user7@test.com',
+        password: 'password',
+      })
+
+      expect(originalHandlerCallCount).toEqual(1)
+
+      agent.setPersistSessionHandler(newPersistSession)
+
+      await agent.createAccount({
+        handle: 'user8.test',
+        email: 'user8@test.com',
+        password: 'password',
+      })
+
+      expect(originalHandlerCallCount).toEqual(1)
+      expect(newHandlerCallCount).toEqual(1)
+    })
+  })
+
+  describe('createAccount', () => {
+    it('persists an empty session on failure', async () => {
+      const events: string[] = []
+      const sessions: (AtpSessionData | undefined)[] = []
+      const persistSession = (evt: AtpSessionEvent, sess?: AtpSessionData) => {
+        events.push(evt)
+        sessions.push(sess)
+      }
+
+      const agent = new AtpAgent({ service: server.url, persistSession })
+
+      await expect(
+        agent.createAccount({
+          handle: '',
+          email: '',
+          password: 'password',
+        }),
+      ).rejects.toThrow()
+
+      expect(agent.hasSession).toEqual(false)
+      expect(agent.session).toEqual(undefined)
+      expect(events.length).toEqual(1)
+      expect(events[0]).toEqual('create-failed')
+      expect(sessions.length).toEqual(1)
+      expect(sessions[0]).toEqual(undefined)
+    })
+  })
 })