@atproto/pds 0.4.91 → 0.4.92

package/src/error.ts

@@ -1,7 +1,7 @@
-import { XRPCError } from '@atproto/xrpc-server'
 import { ErrorRequestHandler } from 'express'
-import { httpLogger as log } from './logger'
 import { OAuthError } from '@atproto/oauth-provider'
+import { XRPCError } from '@atproto/xrpc-server'
+import { httpLogger as log } from './logger'
 
 export const handler: ErrorRequestHandler = (err, _req, res, next) => {
   log.error(err, 'unexpected internal server error')

package/src/handle/index.ts

@@ -1,8 +1,8 @@
 import * as ident from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { reservedSubdomains } from './reserved'
+import { AppContext } from '../context'
 import { hasExplicitSlur } from './explicit-slurs'
-import AppContext from '../context'
+import { reservedSubdomains } from './reserved'
 
 export const normalizeAndValidateHandle = async (opts: {
   ctx: AppContext

package/src/image/image-url-builder.ts

@@ -0,0 +1,16 @@
+import { BskyAppView } from '../bsky-app-view'
+import { ids } from '../lexicon/lexicons'
+
+export class ImageUrlBuilder {
+  constructor(
+    readonly pdsHostname: string,
+    readonly bskyAppView?: BskyAppView,
+  ) {}
+
+  build(pattern: string, did: string, cid: string): string {
+    return (
+      this.bskyAppView?.getImageUrl(pattern, did, cid) ??
+      `https://${this.pdsHostname}/xrpc/${ids.ComAtprotoSyncGetBlob}?did=${did}&cid=${cid}`
+    )
+  }
+}

package/src/image/index.ts

@@ -1,5 +1,5 @@
-import { Readable } from 'stream'
-import { pipeline } from 'stream/promises'
+import { Readable } from 'node:stream'
+import { pipeline } from 'node:stream/promises'
 import sharp from 'sharp'
 import { errHasMsg } from '@atproto/common'
 

package/src/index.ts

@@ -4,27 +4,29 @@
 // leave at top of file before importing Routes
 import 'express-async-errors'
 
-import express from 'express'
+import events from 'node:events'
+import http from 'node:http'
+import { PlcClientError } from '@did-plc/lib'
 import cors from 'cors'
-import http from 'http'
-import events from 'events'
-import { Options as XrpcServerOptions } from '@atproto/xrpc-server'
+import express from 'express'
+import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import { DAY, HOUR, MINUTE, SECOND } from '@atproto/common'
-import { XRPCError, ResponseType } from '@atproto/xrpc-server'
-import { PlcClientError } from '@did-plc/lib'
-
+import {
+  Options as XrpcServerOptions,
+  ResponseType,
+  XRPCError,
+} from '@atproto/xrpc-server'
 import API from './api'
 import * as authRoutes from './auth-routes'
 import * as basicRoutes from './basic-routes'
-import * as wellKnown from './well-known'
-import * as error from './error'
-import { loggerMiddleware } from './logger'
 import { ServerConfig, ServerSecrets } from './config'
+import { AppContext, AppContextOptions } from './context'
+import * as error from './error'
 import { createServer } from './lexicon'
-import { createHttpTerminator, HttpTerminator } from 'http-terminator'
-import AppContext, { AppContextOptions } from './context'
-import compression from './util/compression'
+import { loggerMiddleware } from './logger'
 import { proxyHandler } from './pipethrough'
+import compression from './util/compression'
+import * as wellKnown from './well-known'
 
 export * from './config'
 export { Database } from './db'

package/src/lexicon/lexicons.ts

@@ -4381,6 +4381,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#hiddenPostsPref',
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
+            'lex:app.bsky.actor.defs#postInteractionSettingsPref',
           ],
         },
       },
@@ -4714,6 +4715,38 @@ export const schemaDict = {
           },
         },
       },
+      postInteractionSettingsPref: {
+        type: 'object',
+        description:
+          'Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly.',
+        required: [],
+        properties: {
+          threadgateAllowRules: {
+            description:
+              'Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: [
+                'lex:app.bsky.feed.threadgate#mentionRule',
+                'lex:app.bsky.feed.threadgate#followingRule',
+                'lex:app.bsky.feed.threadgate#listRule',
+              ],
+            },
+          },
+          postgateEmbeddingRules: {
+            description:
+              'Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
+            type: 'array',
+            maxLength: 5,
+            items: {
+              type: 'union',
+              refs: ['lex:app.bsky.feed.postgate#disableRule'],
+            },
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -7120,6 +7153,8 @@ export const schemaDict = {
                 'List of AT-URIs embedding this post that the author has detached from.',
             },
             embeddingRules: {
+              description:
+                'List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed.',
               type: 'array',
               maxLength: 5,
               items: {
@@ -7333,6 +7368,8 @@ export const schemaDict = {
               description: 'Reference (AT-URI) to the post record.',
             },
             allow: {
+              description:
+                'List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply.',
               type: 'array',
               maxLength: 5,
               items: {

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

@@ -8,6 +8,8 @@ import { CID } from 'multiformats/cid'
 import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs'
 import * as AppBskyGraphDefs from '../graph/defs'
 import * as ComAtprotoRepoStrongRef from '../../../com/atproto/repo/strongRef'
+import * as AppBskyFeedThreadgate from '../feed/threadgate'
+import * as AppBskyFeedPostgate from '../feed/postgate'
 
 export interface ProfileViewBasic {
   did: string
@@ -188,6 +190,7 @@ export type Preferences = (
   | HiddenPostsPref
   | BskyAppStatePref
   | LabelersPref
+  | PostInteractionSettingsPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -532,3 +535,36 @@ export function isNux(v: unknown): v is Nux {
 export function validateNux(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#nux', v)
 }
+
+/** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
+export interface PostInteractionSettingsPref {
+  /** Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
+  threadgateAllowRules?: (
+    | AppBskyFeedThreadgate.MentionRule
+    | AppBskyFeedThreadgate.FollowingRule
+    | AppBskyFeedThreadgate.ListRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  /** Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
+  postgateEmbeddingRules?: (
+    | AppBskyFeedPostgate.DisableRule
+    | { $type: string; [k: string]: unknown }
+  )[]
+  [k: string]: unknown
+}
+
+export function isPostInteractionSettingsPref(
+  v: unknown,
+): v is PostInteractionSettingsPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#postInteractionSettingsPref'
+  )
+}
+
+export function validatePostInteractionSettingsPref(
+  v: unknown,
+): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#postInteractionSettingsPref', v)
+}

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

@@ -12,6 +12,7 @@ export interface Record {
   post: string
   /** List of AT-URIs embedding this post that the author has detached from. */
   detachedEmbeddingUris?: string[]
+  /** List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. */
   embeddingRules?: (DisableRule | { $type: string; [k: string]: unknown })[]
   [k: string]: unknown
 }

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

@@ -9,6 +9,7 @@ import { CID } from 'multiformats/cid'
 export interface Record {
   /** Reference (AT-URI) to the post record. */
   post: string
+  /** List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. */
   allow?: (
     | MentionRule
     | FollowingRule

package/src/logger.ts

@@ -1,6 +1,6 @@
 import { type IncomingMessage } from 'node:http'
 import { stdSerializers } from 'pino'
-import pinoHttp from 'pino-http'
+import { pinoHttp } from 'pino-http'
 import { obfuscateHeaders, subsystemLogger } from '@atproto/common'
 
 export const dbLogger = subsystemLogger('pds:db')

package/src/mailer/index.ts

@@ -1,10 +1,9 @@
 import { Transporter } from 'nodemailer'
-import { htmlToText } from 'nodemailer-html-to-text'
 import Mail from 'nodemailer/lib/mailer'
 import SMTPTransport from 'nodemailer/lib/smtp-transport'
+import { htmlToText } from 'nodemailer-html-to-text'
 import { ServerConfig } from '../config'
 import { mailerLogger } from '../logger'
-
 import * as templates from './templates'
 
 export class ServerMailer {

package/src/mailer/moderation.ts

@@ -1,7 +1,7 @@
 import { Transporter } from 'nodemailer'
 import Mail from 'nodemailer/lib/mailer'
-import { htmlToText } from 'nodemailer-html-to-text'
 import SMTPTransport from 'nodemailer/lib/smtp-transport'
+import { htmlToText } from 'nodemailer-html-to-text'
 import { ServerConfig } from '../config'
 import { mailerLogger } from '../logger'
 

package/src/mailer/templates/confirm-email.d.ts

@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template

package/src/mailer/templates/delete-account.d.ts

@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template

package/src/mailer/templates/plc-operation.d.ts

@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template

package/src/mailer/templates/reset-password.d.ts

@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string; handle: string }>
 export default template

package/src/mailer/templates/update-email.d.ts

@@ -1,4 +1,4 @@
-import { TemplateDelegate } from "handlebars";
+import { TemplateDelegate } from 'handlebars'
 
 declare const template: TemplateDelegate<{ token: string }>
 export default template

package/src/oauth/provider.ts

@@ -3,17 +3,11 @@ import {
   OAuthProvider,
   OAuthProviderOptions,
 } from '@atproto/oauth-provider'
-
 import { AccountManager } from '../account-manager/index'
-import { ActorStore } from '../actor-store/index'
 import { oauthLogger } from '../logger'
-import { LocalViewerCreator } from '../read-after-write/index'
-import { DetailedAccountStore } from './detailed-account-store'
 
 export type AuthProviderOptions = {
   accountManager: AccountManager
-  actorStore: ActorStore
-  localViewer: LocalViewerCreator
 } & Pick<
   OAuthProviderOptions,
   'issuer' | 'redis' | 'keyset' | 'dpopSecret' | 'customization'
@@ -23,8 +17,6 @@ export type AuthProviderOptions = {
 export class PdsOAuthProvider extends OAuthProvider {
   constructor({
     accountManager,
-    actorStore,
-    localViewer,
     keyset,
     redis,
     dpopSecret,
@@ -39,6 +31,7 @@ export class PdsOAuthProvider extends OAuthProvider {
       redis,
       safeFetch,
       customization,
+      store: accountManager,
       metadata: {
         // PdsOAuthProvider is used when the PDS is both an authorization server
         // & resource server, in which case the issuer origin is also the
@@ -48,15 +41,6 @@ export class PdsOAuthProvider extends OAuthProvider {
         scopes_supported: ['transition:generic', 'transition:chat.bsky'],
       },
 
-      accountStore: new DetailedAccountStore(
-        accountManager,
-        actorStore,
-        localViewer,
-      ),
-      requestStore: accountManager,
-      deviceStore: accountManager,
-      tokenStore: accountManager,
-
       // If the PDS is both an authorization server & resource server (no
       // entryway), there is no need to use JWTs as access tokens. Instead,
       // the PDS can use tokenId as access tokens. This allows the PDS to

package/src/pipethrough.ts

@@ -1,9 +1,7 @@
-import express from 'express'
 import { IncomingHttpHeaders, ServerResponse } from 'node:http'
 import { PassThrough, Readable } from 'node:stream'
+import express from 'express'
 import { Dispatcher } from 'undici'
-
-import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils'
 import {
   decodeStream,
   getServiceEndpoint,
@@ -17,11 +15,11 @@ import {
   HandlerPipeThroughStream,
   InternalServerError,
   InvalidRequestError,
-  parseReqNsid,
   XRPCError as XRPCServerError,
+  parseReqNsid,
 } from '@atproto/xrpc-server'
-
-import AppContext from './context'
+import { buildProxiedContentEncoding } from '@atproto-labs/xrpc-utils'
+import { AppContext } from './context'
 import { ids } from './lexicon/lexicons'
 import { httpLogger } from './logger'
 

package/src/read-after-write/types.ts

@@ -1,8 +1,8 @@
-import { Headers } from '@atproto/xrpc'
-import { AtUri } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
-import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
+import { AtUri } from '@atproto/syntax'
+import { Headers } from '@atproto/xrpc'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
+import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post'
 import { LocalViewer } from './viewer'
 
 export type LocalRecords = {

package/src/read-after-write/util.ts

@@ -1,3 +1,4 @@
+import express from 'express'
 import { jsonToLex } from '@atproto/lexicon'
 import { HeadersMap } from '@atproto/xrpc'
 import {
@@ -5,9 +6,7 @@ import {
   HandlerPipeThroughBuffer,
   parseReqNsid,
 } from '@atproto/xrpc-server'
-import express from 'express'
-
-import AppContext from '../context'
+import { AppContext } from '../context'
 import { lexicons } from '../lexicon/lexicons'
 import { readStickyLogger as log } from '../logger'
 import {
@@ -16,7 +15,6 @@ import {
   pipethrough,
 } from '../pipethrough'
 import { HandlerResponse, LocalRecords, MungeFn } from './types'
-import { getRecordsSinceRev } from './viewer'
 
 const REPO_REV_HEADER = 'atproto-repo-rev'
 
@@ -62,7 +60,7 @@ export const pipethroughReadAfterWrite = async <T>(
     const lxm = parseReqNsid(req)
 
     return await ctx.actorStore.read(requester, async (store) => {
-      const local = await getRecordsSinceRev(store, rev)
+      const local = await store.record.getRecordsSinceRev(rev)
       if (local.count === 0) return streamRes
 
       const { buffer } = (bufferRes = await asPipeThroughBuffer(streamRes))