@atproto/bsky 0.0.71 → 0.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -40,14 +40,14 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.12.27",
+    "@atproto/api": "^0.12.29",
     "@atproto/common": "^0.4.1",
     "@atproto/crypto": "^0.4.0",
     "@atproto/identity": "^0.4.0",
     "@atproto/lexicon": "^0.4.0",
     "@atproto/repo": "^0.4.1",
     "@atproto/syntax": "^0.3.0",
-    "@atproto/xrpc-server": "^0.5.3"
+    "@atproto/xrpc-server": "^0.6.0"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.28.1",
@@ -62,9 +62,9 @@
     "axios": "^0.27.2",
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
-    "@atproto/api": "^0.12.27",
+    "@atproto/api": "^0.12.29",
     "@atproto/lex-cli": "^0.4.0",
-    "@atproto/pds": "^0.4.44",
+    "@atproto/pds": "^0.4.46",
     "@atproto/xrpc": "^0.5.0"
   },
   "scripts": {
@@ -73,7 +73,7 @@
     "start": "node --enable-source-maps dist/bin.js",
     "test": "../dev-infra/with-test-redis-and-db.sh jest",
     "test:log": "tail -50 test.log | pino-pretty",
-    "test:updateSnapshot": "jest --updateSnapshot",
+    "test:updateSnapshot": "../dev-infra/with-test-redis-and-db.sh jest --updateSnapshot",
     "migration:create": "ts-node ./bin/migration-create.ts",
     "buf:gen": "buf generate ../bsync/proto && buf generate ./proto"
   }

package/proto/bsky.proto

@@ -122,14 +122,6 @@ message GetThreadGateRecordsResponse {
   repeated Record records = 1;
 }
 
-message GetDetachRecordsRequest {
-  repeated string uris = 1;
-}
-
-message GetDetachRecordsResponse {
-  repeated Record records = 1;
-}
-
 message GetLabelerRecordsRequest {
   repeated string uris = 1;
 }
@@ -1076,7 +1068,6 @@ service Service {
   rpc GetActorChatDeclarationRecords(GetActorChatDeclarationRecordsRequest) returns (GetActorChatDeclarationRecordsResponse);
   rpc GetRepostRecords(GetRepostRecordsRequest) returns (GetRepostRecordsResponse);
   rpc GetThreadGateRecords(GetThreadGateRecordsRequest) returns (GetThreadGateRecordsResponse);
-  rpc GetDetachRecords(GetDetachRecordsRequest) returns (GetDetachRecordsResponse);
   rpc GetLabelerRecords(GetLabelerRecordsRequest) returns (GetLabelerRecordsResponse);
   rpc GetStarterPackRecords(GetStarterPackRecordsRequest) returns (GetStarterPackRecordsResponse);
 

package/src/auth-verifier.ts

@@ -248,7 +248,12 @@ export class AuthVerifier {
     if (!jwtStr) {
       throw new AuthRequiredError('missing jwt', 'MissingJwt')
     }
-    const payload = await verifyServiceJwt(jwtStr, opts.aud, getSigningKey)
+    const payload = await verifyServiceJwt(
+      jwtStr,
+      opts.aud,
+      null,
+      getSigningKey,
+    )
     return { iss: payload.iss, aud: payload.aud }
   }
 

package/src/context.ts

@@ -3,7 +3,6 @@ import * as plc from '@did-plc/lib'
 import { IdResolver } from '@atproto/identity'
 import AtpAgent from '@atproto/api'
 import { Keypair } from '@atproto/crypto'
-import { createServiceJwt } from '@atproto/xrpc-server'
 import { ServerConfig } from './config'
 import { DataPlaneClient } from './data-plane/client'
 import { Hydrator } from './hydration/hydrator'
@@ -89,15 +88,6 @@ export class AppContext {
     return this.opts.featureGates
   }
 
-  async serviceAuthJwt(aud: string) {
-    const iss = this.cfg.serverDid
-    return createServiceJwt({
-      iss,
-      aud,
-      keypair: this.signingKey,
-    })
-  }
-
   reqLabelers(req: express.Request): ParsedLabelers {
     const val = req.header('atproto-accept-labelers')
     let parsed: ParsedLabelers | null

package/src/hydration/hydrator.ts

@@ -738,7 +738,7 @@ export class Hydrator {
     })
   }
 
-  // provides partial hydration state withing getFollows / getFollowers, mainly for applying rules
+  // provides partial hydration state within getFollows / getFollowers, mainly for applying rules
   async hydrateFollows(uris: string[]): Promise<HydrationState> {
     const follows = await this.graph.getFollows(uris)
     const pairs: RelationshipPair[] = []

package/src/lexicon/lexicons.ts

@@ -891,7 +891,7 @@ export const schemaDict = {
       labelValueDefinition: {
         type: 'object',
         description:
-          'Declares a label value and its expected interpertations and behaviors.',
+          'Declares a label value and its expected interpretations and behaviors.',
         required: ['identifier', 'severity', 'blurs', 'locales'],
         properties: {
           identifier: {
@@ -2607,6 +2607,17 @@ export const schemaDict = {
               description:
                 'The DID of the service that the token will be used to authenticate with',
             },
+            exp: {
+              type: 'integer',
+              description:
+                'The time in Unix Epoch seconds that the JWT expires. Defaults to 60 seconds in the future. The service may enforce certain time bounds on tokens depending on the requested scope.',
+            },
+            lxm: {
+              type: 'string',
+              format: 'nsid',
+              description:
+                'Lexicon (XRPC) method to bind the requested token to',
+            },
           },
         },
         output: {
@@ -2621,6 +2632,13 @@ export const schemaDict = {
             },
           },
         },
+        errors: [
+          {
+            name: 'BadExpiration',
+            description:
+              'Indicates that the requested expiration date is not a valid. May be in the past or may be reliant on the requested scopes.',
+          },
+        ],
       },
     },
   },
@@ -5482,7 +5500,7 @@ export const schemaDict = {
           feedContext: {
             type: 'string',
             description:
-              'Context on a feed item that was orginally supplied by the feed generator on getFeedSkeleton.',
+              'Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton.',
             maxLength: 2000,
           },
         },
@@ -5596,42 +5614,6 @@ export const schemaDict = {
       },
     },
   },
-  AppBskyFeedDetach: {
-    lexicon: 1,
-    id: 'app.bsky.feed.detach',
-    defs: {
-      main: {
-        type: 'record',
-        key: 'tid',
-        description:
-          'Record defining post URIs detached from a root post. The record key (rkey) of the detach record must match the record key of the root post in question, and that record must be in the same repository.',
-        record: {
-          type: 'object',
-          required: ['post', 'targets', 'updatedAt'],
-          properties: {
-            post: {
-              type: 'string',
-              format: 'at-uri',
-              description: 'Reference (AT-URI) to the post record.',
-            },
-            targets: {
-              type: 'array',
-              maxLength: 50,
-              items: {
-                type: 'string',
-                format: 'at-uri',
-              },
-              description: 'List of detached post URIs.',
-            },
-            updatedAt: {
-              type: 'string',
-              format: 'datetime',
-            },
-          },
-        },
-      },
-    },
-  },
   AppBskyFeedGenerator: {
     lexicon: 1,
     id: 'app.bsky.feed.generator',
@@ -10080,7 +10062,6 @@ export const ids = {
   AppBskyEmbedRecordWithMedia: 'app.bsky.embed.recordWithMedia',
   AppBskyFeedDefs: 'app.bsky.feed.defs',
   AppBskyFeedDescribeFeedGenerator: 'app.bsky.feed.describeFeedGenerator',
-  AppBskyFeedDetach: 'app.bsky.feed.detach',
   AppBskyFeedGenerator: 'app.bsky.feed.generator',
   AppBskyFeedGetActorFeeds: 'app.bsky.feed.getActorFeeds',
   AppBskyFeedGetActorLikes: 'app.bsky.feed.getActorLikes',

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

@@ -332,7 +332,7 @@ export interface Interaction {
     | 'app.bsky.feed.defs#interactionQuote'
     | 'app.bsky.feed.defs#interactionShare'
     | (string & {})
-  /** Context on a feed item that was orginally supplied by the feed generator on getFeedSkeleton. */
+  /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
   [k: string]: unknown
 }

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

@@ -78,7 +78,7 @@ export function validateSelfLabel(v: unknown): ValidationResult {
   return lexicons.validate('com.atproto.label.defs#selfLabel', v)
 }
 
-/** Declares a label value and its expected interpertations and behaviors. */
+/** Declares a label value and its expected interpretations and behaviors. */
 export interface LabelValueDefinition {
   /** The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). */
   identifier: string

package/src/lexicon/types/com/atproto/server/getServiceAuth.ts

@@ -11,6 +11,10 @@ import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server'
 export interface QueryParams {
   /** The DID of the service that the token will be used to authenticate with */
   aud: string
+  /** The time in Unix Epoch seconds that the JWT expires. Defaults to 60 seconds in the future. The service may enforce certain time bounds on tokens depending on the requested scope. */
+  exp?: number
+  /** Lexicon (XRPC) method to bind the requested token to */
+  lxm?: string
 }
 
 export type InputSchema = undefined
@@ -31,6 +35,7 @@ export interface HandlerSuccess {
 export interface HandlerError {
   status: number
   message?: string
+  error?: 'BadExpiration'
 }
 
 export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough

package/src/proto/bsky_connect.ts

@@ -66,8 +66,6 @@ import {
   GetBlocksResponse,
   GetCountsForUsersRequest,
   GetCountsForUsersResponse,
-  GetDetachRecordsRequest,
-  GetDetachRecordsResponse,
   GetDidsByHandlesRequest,
   GetDidsByHandlesResponse,
   GetFeedGeneratorRecordsRequest,
@@ -311,15 +309,6 @@ export const Service = {
       O: GetThreadGateRecordsResponse,
       kind: MethodKind.Unary,
     },
-    /**
-     * @generated from rpc bsky.Service.GetDetachRecords
-     */
-    getDetachRecords: {
-      name: 'GetDetachRecords',
-      I: GetDetachRecordsRequest,
-      O: GetDetachRecordsResponse,
-      kind: MethodKind.Unary,
-    },
     /**
      * @generated from rpc bsky.Service.GetLabelerRecords
      */

package/src/proto/bsky_pb.ts

@@ -1608,122 +1608,6 @@ export class GetThreadGateRecordsResponse extends Message<GetThreadGateRecordsRe
   }
 }
 
-/**
- * @generated from message bsky.GetDetachRecordsRequest
- */
-export class GetDetachRecordsRequest extends Message<GetDetachRecordsRequest> {
-  /**
-   * @generated from field: repeated string uris = 1;
-   */
-  uris: string[] = []
-
-  constructor(data?: PartialMessage<GetDetachRecordsRequest>) {
-    super()
-    proto3.util.initPartial(data, this)
-  }
-
-  static readonly runtime: typeof proto3 = proto3
-  static readonly typeName = 'bsky.GetDetachRecordsRequest'
-  static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    {
-      no: 1,
-      name: 'uris',
-      kind: 'scalar',
-      T: 9 /* ScalarType.STRING */,
-      repeated: true,
-    },
-  ])
-
-  static fromBinary(
-    bytes: Uint8Array,
-    options?: Partial<BinaryReadOptions>,
-  ): GetDetachRecordsRequest {
-    return new GetDetachRecordsRequest().fromBinary(bytes, options)
-  }
-
-  static fromJson(
-    jsonValue: JsonValue,
-    options?: Partial<JsonReadOptions>,
-  ): GetDetachRecordsRequest {
-    return new GetDetachRecordsRequest().fromJson(jsonValue, options)
-  }
-
-  static fromJsonString(
-    jsonString: string,
-    options?: Partial<JsonReadOptions>,
-  ): GetDetachRecordsRequest {
-    return new GetDetachRecordsRequest().fromJsonString(jsonString, options)
-  }
-
-  static equals(
-    a:
-      | GetDetachRecordsRequest
-      | PlainMessage<GetDetachRecordsRequest>
-      | undefined,
-    b:
-      | GetDetachRecordsRequest
-      | PlainMessage<GetDetachRecordsRequest>
-      | undefined,
-  ): boolean {
-    return proto3.util.equals(GetDetachRecordsRequest, a, b)
-  }
-}
-
-/**
- * @generated from message bsky.GetDetachRecordsResponse
- */
-export class GetDetachRecordsResponse extends Message<GetDetachRecordsResponse> {
-  /**
-   * @generated from field: repeated bsky.Record records = 1;
-   */
-  records: Record[] = []
-
-  constructor(data?: PartialMessage<GetDetachRecordsResponse>) {
-    super()
-    proto3.util.initPartial(data, this)
-  }
-
-  static readonly runtime: typeof proto3 = proto3
-  static readonly typeName = 'bsky.GetDetachRecordsResponse'
-  static readonly fields: FieldList = proto3.util.newFieldList(() => [
-    { no: 1, name: 'records', kind: 'message', T: Record, repeated: true },
-  ])
-
-  static fromBinary(
-    bytes: Uint8Array,
-    options?: Partial<BinaryReadOptions>,
-  ): GetDetachRecordsResponse {
-    return new GetDetachRecordsResponse().fromBinary(bytes, options)
-  }
-
-  static fromJson(
-    jsonValue: JsonValue,
-    options?: Partial<JsonReadOptions>,
-  ): GetDetachRecordsResponse {
-    return new GetDetachRecordsResponse().fromJson(jsonValue, options)
-  }
-
-  static fromJsonString(
-    jsonString: string,
-    options?: Partial<JsonReadOptions>,
-  ): GetDetachRecordsResponse {
-    return new GetDetachRecordsResponse().fromJsonString(jsonString, options)
-  }
-
-  static equals(
-    a:
-      | GetDetachRecordsResponse
-      | PlainMessage<GetDetachRecordsResponse>
-      | undefined,
-    b:
-      | GetDetachRecordsResponse
-      | PlainMessage<GetDetachRecordsResponse>
-      | undefined,
-  ): boolean {
-    return proto3.util.equals(GetDetachRecordsResponse, a, b)
-  }
-}
-
 /**
  * @generated from message bsky.GetLabelerRecordsRequest
  */

package/tests/admin/admin-auth.test.ts

@@ -71,6 +71,7 @@ describe('admin auth', () => {
     const headers = await createServiceAuthHeaders({
       iss: modServiceDid,
       aud: bskyDid,
+      lxm: null,
       keypair: modServiceKey,
     })
     await agent.api.com.atproto.admin.updateSubjectStatus(
@@ -96,6 +97,7 @@ describe('admin auth', () => {
     const headers = await createServiceAuthHeaders({
       iss: altModDid,
       aud: bskyDid,
+      lxm: null,
       keypair: modServiceKey,
     })
     const attempt = agent.api.com.atproto.admin.updateSubjectStatus(
@@ -116,6 +118,7 @@ describe('admin auth', () => {
     const headers = await createServiceAuthHeaders({
       iss: sc.dids.alice,
       aud: bskyDid,
+      lxm: null,
       keypair: aliceKey,
     })
     const attempt = agent.api.com.atproto.admin.updateSubjectStatus(
@@ -136,6 +139,7 @@ describe('admin auth', () => {
     const headers = await createServiceAuthHeaders({
       iss: modServiceDid,
       aud: bskyDid,
+      lxm: null,
       keypair: badKey,
     })
     const attempt = agent.api.com.atproto.admin.updateSubjectStatus(
@@ -158,6 +162,7 @@ describe('admin auth', () => {
     const headers = await createServiceAuthHeaders({
       iss: modServiceDid,
       aud: sc.dids.alice,
+      lxm: null,
       keypair: modServiceKey,
     })
     const attempt = agent.api.com.atproto.admin.updateSubjectStatus(

package/tests/auth.test.ts

@@ -29,6 +29,7 @@ describe('auth', () => {
       const jwt = await createServiceJwt({
         iss: issuer,
         aud: network.bsky.ctx.cfg.serverDid,
+        lxm: null,
         keypair,
       })
       return agent.api.app.bsky.actor.getProfile(

package/dist/lexicon/types/app/bsky/feed/detach.d.ts

@@ -1,15 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import { ValidationResult } from '@atproto/lexicon';
-export interface Record {
-    /** Reference (AT-URI) to the post record. */
-    post: string;
-    /** List of detached post URIs. */
-    targets: string[];
-    updatedAt: string;
-    [k: string]: unknown;
-}
-export declare function isRecord(v: unknown): v is Record;
-export declare function validateRecord(v: unknown): ValidationResult;
-//# sourceMappingURL=detach.d.ts.map

package/dist/lexicon/types/app/bsky/feed/detach.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"detach.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/feed/detach.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,gBAAgB,EAAW,MAAM,kBAAkB,CAAA;AAK5D,MAAM,WAAW,MAAM;IACrB,6CAA6C;IAC7C,IAAI,EAAE,MAAM,CAAA;IACZ,kCAAkC;IAClC,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;IACjB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAOhD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAE3D"}

package/dist/lexicon/types/app/bsky/feed/detach.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateRecord = exports.isRecord = void 0;
-const lexicons_1 = require("../../../../lexicons");
-const util_1 = require("../../../../util");
-function isRecord(v) {
-    return ((0, util_1.isObj)(v) &&
-        (0, util_1.hasProp)(v, '$type') &&
-        (v.$type === 'app.bsky.feed.detach#main' ||
-            v.$type === 'app.bsky.feed.detach'));
-}
-exports.isRecord = isRecord;
-function validateRecord(v) {
-    return lexicons_1.lexicons.validate('app.bsky.feed.detach#main', v);
-}
-exports.validateRecord = validateRecord;
-//# sourceMappingURL=detach.js.map

package/dist/lexicon/types/app/bsky/feed/detach.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"detach.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/app/bsky/feed/detach.ts"],"names":[],"mappings":";;;AAIA,mDAA+C;AAC/C,2CAAiD;AAYjD,SAAgB,QAAQ,CAAC,CAAU;IACjC,OAAO,CACL,IAAA,YAAK,EAAC,CAAC,CAAC;QACR,IAAA,cAAO,EAAC,CAAC,EAAE,OAAO,CAAC;QACnB,CAAC,CAAC,CAAC,KAAK,KAAK,2BAA2B;YACtC,CAAC,CAAC,KAAK,KAAK,sBAAsB,CAAC,CACtC,CAAA;AACH,CAAC;AAPD,4BAOC;AAED,SAAgB,cAAc,CAAC,CAAU;IACvC,OAAO,mBAAQ,CAAC,QAAQ,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC;AAFD,wCAEC"}

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

@@ -1,29 +0,0 @@
-/**
- * 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 Record {
-  /** Reference (AT-URI) to the post record. */
-  post: string
-  /** List of detached post URIs. */
-  targets: string[]
-  updatedAt: string
-  [k: string]: unknown
-}
-
-export function isRecord(v: unknown): v is Record {
-  return (
-    isObj(v) &&
-    hasProp(v, '$type') &&
-    (v.$type === 'app.bsky.feed.detach#main' ||
-      v.$type === 'app.bsky.feed.detach')
-  )
-}
-
-export function validateRecord(v: unknown): ValidationResult {
-  return lexicons.validate('app.bsky.feed.detach#main', v)
-}