@atproto/pds 0.4.212 → 0.4.214

package/src/lexicon/lexicons.ts

@@ -1028,6 +1028,10 @@ export const schemaDict = {
               },
               recId: {
                 type: 'integer',
+                description: 'DEPRECATED: use recIdStr instead.',
+              },
+              recIdStr: {
+                type: 'string',
                 description:
                   'Snowflake for this recommendation, use when submitting recommendation events.',
               },
@@ -4947,6 +4951,10 @@ export const schemaDict = {
             type: 'object',
             required: ['interactions'],
             properties: {
+              feed: {
+                type: 'string',
+                format: 'at-uri',
+              },
               interactions: {
                 type: 'array',
                 items: {
@@ -8103,6 +8111,10 @@ export const schemaDict = {
                 },
               },
               recId: {
+                type: 'string',
+                description: 'DEPRECATED: use recIdStr instead.',
+              },
+              recIdStr: {
                 type: 'string',
                 description:
                   'Snowflake for this recommendation, use when submitting recommendation events.',
@@ -8437,6 +8449,10 @@ export const schemaDict = {
                 },
               },
               recId: {
+                type: 'string',
+                description: 'DEPRECATED: use recIdStr instead.',
+              },
+              recIdStr: {
                 type: 'string',
                 description:
                   'Snowflake for this recommendation, use when submitting recommendation events.',
@@ -8564,6 +8580,10 @@ export const schemaDict = {
                 },
               },
               recId: {
+                type: 'string',
+                description: 'DEPRECATED: use recIdStr instead.',
+              },
+              recIdStr: {
                 type: 'string',
                 description:
                   'Snowflake for this recommendation, use when submitting recommendation events.',
@@ -8617,6 +8637,10 @@ export const schemaDict = {
                 },
               },
               recId: {
+                type: 'string',
+                description: 'DEPRECATED: use recIdStr instead.',
+              },
+              recIdStr: {
                 type: 'string',
                 description:
                   'Snowflake for this recommendation, use when submitting recommendation events.',

package/src/lexicon/types/app/bsky/actor/getSuggestions.ts

@@ -24,8 +24,10 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   actors: AppBskyActorDefs.ProfileView[]
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  /** DEPRECATED: use recIdStr instead. */
   recId?: number
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
 }
 
 export type HandlerInput = void

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

@@ -18,6 +18,7 @@ const id = 'app.bsky.feed.sendInteractions'
 export type QueryParams = {}
 
 export interface InputSchema {
+  feed?: string
   interactions: AppBskyFeedDefs.Interaction[]
 }
 

package/src/lexicon/types/app/bsky/unspecced/getOnboardingSuggestedUsersSkeleton.ts

@@ -25,8 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   dids: string[]
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  /** DEPRECATED: use recIdStr instead. */
   recId?: string
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
 }
 
 export type HandlerInput = void

package/src/lexicon/types/app/bsky/unspecced/getSuggestedOnboardingUsers.ts

@@ -24,8 +24,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  /** DEPRECATED: use recIdStr instead. */
   recId?: string
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
 }
 
 export type HandlerInput = void

package/src/lexicon/types/app/bsky/unspecced/getSuggestedUsers.ts

@@ -24,8 +24,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   actors: AppBskyActorDefs.ProfileView[]
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  /** DEPRECATED: use recIdStr instead. */
   recId?: string
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
 }
 
 export type HandlerInput = void

package/src/lexicon/types/app/bsky/unspecced/getSuggestedUsersSkeleton.ts

@@ -25,8 +25,10 @@ export type InputSchema = undefined
 
 export interface OutputSchema {
   dids: string[]
-  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  /** DEPRECATED: use recIdStr instead. */
   recId?: string
+  /** Snowflake for this recommendation, use when submitting recommendation events. */
+  recIdStr?: string
 }
 
 export type HandlerInput = void

package/src/pipethrough.ts

@@ -9,13 +9,13 @@ import {
   streamToNodeBuffer,
 } from '@atproto/common'
 import { RpcPermissionMatch } from '@atproto/oauth-scopes'
-import { ResponseType, XRPCError as XRPCClientError } from '@atproto/xrpc'
 import {
   CatchallHandler,
   HandlerPipeThroughBuffer,
   HandlerPipeThroughStream,
   InternalServerError,
   InvalidRequestError,
+  ResponseType,
   XRPCError as XRPCServerError,
   excludeErrorResult,
   parseReqNsid,
@@ -301,15 +301,9 @@ async function pipethroughStream(
           const passThrough = new PassThrough()
 
           void tryParsingError(upstream.headers, passThrough).then((parsed) => {
-            const xrpcError = new XRPCClientError(
-              upstream.statusCode === 500
-                ? ResponseType.UpstreamFailure
-                : upstream.statusCode,
-              parsed.error,
-              parsed.message,
-              Object.fromEntries(responseHeaders(upstream.headers, false)),
-              { cause: dispatchOptions },
-            )
+            const xrpcError = new PipethroughUpstreamError(upstream, parsed, {
+              cause: dispatchOptions,
+            })
 
             reject(xrpcError)
           }, reject)
@@ -356,18 +350,9 @@ async function pipethroughRequest(
   if (upstream.statusCode >= 400) {
     const parsed = await tryParsingError(upstream.headers, upstream.body)
 
-    // Note "XRPCClientError" is used instead of "XRPCServerError" in order to
-    // allow users of this function to capture & handle these errors (namely in
-    // "app.bsky.feed.getPostThread").
-    throw new XRPCClientError(
-      upstream.statusCode === 500
-        ? ResponseType.UpstreamFailure
-        : upstream.statusCode,
-      parsed.error,
-      parsed.message,
-      Object.fromEntries(responseHeaders(upstream.headers, false)),
-      { cause: dispatchOptions },
-    )
+    throw new PipethroughUpstreamError(upstream, parsed, {
+      cause: dispatchOptions,
+    })
   }
 
   return upstream
@@ -635,3 +620,29 @@ const safeString = (str: unknown): string | undefined => {
 function logResponseError(this: ServerResponse, err: unknown): void {
   httpLogger.warn({ err }, 'error forwarding upstream response')
 }
+
+export class PipethroughUpstreamError extends XRPCServerError {
+  constructor(
+    readonly upstream: {
+      statusCode: number
+      headers: IncomingHttpHeaders
+    },
+    payload: { message?: string; error?: string },
+    options?: ErrorOptions,
+  ) {
+    const status =
+      upstream.statusCode === 500
+        ? ResponseType.UpstreamFailure
+        : upstream.statusCode
+
+    super(status, payload.message, payload.error, options)
+  }
+
+  get headers(): Record<string, string> {
+    return Object.fromEntries(responseHeaders(this.upstream.headers, false))
+  }
+
+  get error() {
+    return this.customErrorName ?? this.typeName
+  }
+}