@atproto/pds 0.4.91 → 0.4.93

package/src/api/com/atproto/server/index.ts

@@ -1,39 +1,30 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-
-import describeServer from './describeServer'
-
+import activateAccount from './activateAccount'
+import checkAccountStatus from './checkAccountStatus'
+import confirmEmail from './confirmEmail'
 import createAccount from './createAccount'
+import createAppPassword from './createAppPassword'
 import createInviteCode from './createInviteCode'
 import createInviteCodes from './createInviteCodes'
-import getAccountInviteCodes from './getAccountInviteCodes'
-import reserveSigningKey from './reserveSigningKey'
-
-import requestDelete from './requestAccountDelete'
-import deleteAccount from './deleteAccount'
-
-import requestPasswordReset from './requestPasswordReset'
-import resetPassword from './resetPassword'
-
-import requestEmailConfirmation from './requestEmailConfirmation'
-import confirmEmail from './confirmEmail'
-
-import requestEmailUpdate from './requestEmailUpdate'
-import updateEmail from './updateEmail'
-
 import createSession from './createSession'
+import deactivateAccount from './deactivateAccount'
+import deleteAccount from './deleteAccount'
 import deleteSession from './deleteSession'
+import describeServer from './describeServer'
+import getAccountInviteCodes from './getAccountInviteCodes'
+import getServiceAuth from './getServiceAuth'
 import getSession from './getSession'
-import refreshSession from './refreshSession'
-
-import createAppPassword from './createAppPassword'
 import listAppPasswords from './listAppPasswords'
+import refreshSession from './refreshSession'
+import requestDelete from './requestAccountDelete'
+import requestEmailConfirmation from './requestEmailConfirmation'
+import requestEmailUpdate from './requestEmailUpdate'
+import requestPasswordReset from './requestPasswordReset'
+import reserveSigningKey from './reserveSigningKey'
+import resetPassword from './resetPassword'
 import revokeAppPassword from './revokeAppPassword'
-
-import getServiceAuth from './getServiceAuth'
-import checkAccountStatus from './checkAccountStatus'
-import activateAccount from './activateAccount'
-import deactivateAccount from './deactivateAccount'
+import updateEmail from './updateEmail'
 
 export default function (server: Server, ctx: AppContext) {
   describeServer(server, ctx)

package/src/api/com/atproto/server/listAppPasswords.ts

@@ -1,6 +1,5 @@
 import assert from 'node:assert'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 import { resultPassthru } from '../../../proxy'

package/src/api/com/atproto/server/refreshSession.ts

@@ -1,12 +1,11 @@
 import { INVALID_HANDLE } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-
 import { formatAccountStatus } from '../../../../account-manager'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { softDeleted } from '../../../../db/util'
 import { Server } from '../../../../lexicon'
-import { didDocForSession } from './util'
 import { authPassthru, resultPassthru } from '../../../proxy'
+import { didDocForSession } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.refreshSession({

package/src/api/com/atproto/server/requestAccountDelete.ts

@@ -1,9 +1,7 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 

package/src/api/com/atproto/server/requestEmailConfirmation.ts

@@ -1,9 +1,7 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 

package/src/api/com/atproto/server/requestEmailUpdate.ts

@@ -1,12 +1,10 @@
 import assert from 'node:assert'
-
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { resultPassthru } from '../../../proxy'
 import { ids } from '../../../../lexicon/lexicons'
+import { resultPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.requestEmailUpdate({

package/src/api/com/atproto/server/requestPasswordReset.ts

@@ -1,6 +1,6 @@
 import { DAY, HOUR } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 

package/src/api/com/atproto/server/reserveSigningKey.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.reserveSigningKey({

package/src/api/com/atproto/server/resetPassword.ts

@@ -1,6 +1,6 @@
-import AppContext from '../../../../context'
-import { Server } from '../../../../lexicon'
 import { MINUTE } from '@atproto/common'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { authPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/server/revokeAppPassword.ts

@@ -1,6 +1,5 @@
 import assert from 'node:assert'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 

package/src/api/com/atproto/server/updateEmail.ts

@@ -1,11 +1,9 @@
 import assert from 'node:assert'
-
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
-
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { UserAlreadyExistsError } from '../../../../account-manager/helpers/account'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
 

package/src/api/com/atproto/server/util.ts

@@ -1,10 +1,10 @@
+import { getPdsEndpoint, getSigningDidKey } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import { DidDocument } from '@atproto/identity'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ServerConfig } from '../../../../config'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { httpLogger } from '../../../../logger'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { getPdsEndpoint, getSigningDidKey } from '@atproto/common'
 
 // generate an invite code preceded by the hostname
 // with '.'s replaced by '-'s so it is not mistakable for a link

package/src/api/com/atproto/sync/deprecated/getCheckout.ts

@@ -1,5 +1,5 @@
+import { AppContext } from '../../../../../context'
 import { Server } from '../../../../../lexicon'
-import AppContext from '../../../../../context'
 import { getCarStream } from '../getRepo'
 import { assertRepoAvailability } from '../util'
 

package/src/api/com/atproto/sync/deprecated/getHead.ts

@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../../context'
 import { Server } from '../../../../../lexicon'
-import AppContext from '../../../../../context'
 import { assertRepoAvailability } from '../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/sync/getBlob.ts

@@ -1,10 +1,10 @@
 import { CID } from 'multiformats/cid'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { BlobNotFoundError } from '@atproto/repo'
-import { assertRepoAvailability } from './util'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getBlob({

package/src/api/com/atproto/sync/getBlocks.ts

@@ -1,9 +1,9 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { byteIterableToStream } from '@atproto/common'
 import { blocksToCarStream } from '@atproto/repo'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/sync/getLatestCommit.ts

@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/sync/getRecord.ts

@@ -1,11 +1,11 @@
-import stream from 'stream'
+import stream from 'node:stream'
 import { CID } from 'multiformats/cid'
+import { byteIterableToStream } from '@atproto/common'
 import * as repo from '@atproto/repo'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { byteIterableToStream } from '@atproto/common'
 import { SqlRepoReader } from '../../../../actor-store/repo/sql-repo-reader'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/sync/getRepo.ts

@@ -1,13 +1,13 @@
-import stream from 'stream'
+import stream from 'node:stream'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
   RepoRootNotFoundError,
   SqlRepoReader,
 } from '../../../../actor-store/repo/sql-repo-reader'
-import { assertRepoAvailability } from './util'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { assertRepoAvailability } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getRepo({

package/src/api/com/atproto/sync/getRepoStatus.ts

@@ -1,7 +1,7 @@
+import { formatAccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
-import { formatAccountStatus } from '../../../../account-manager'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.getRepoStatus({

package/src/api/com/atproto/sync/index.ts

@@ -1,16 +1,16 @@
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
+import getCheckout from './deprecated/getCheckout'
+import getHead from './deprecated/getHead'
 import getBlob from './getBlob'
 import getBlocks from './getBlocks'
 import getLatestCommit from './getLatestCommit'
-import getRepoStatus from './getRepoStatus'
 import getRecord from './getRecord'
 import getRepo from './getRepo'
-import subscribeRepos from './subscribeRepos'
+import getRepoStatus from './getRepoStatus'
 import listBlobs from './listBlobs'
 import listRepos from './listRepos'
-import getCheckout from './deprecated/getCheckout'
-import getHead from './deprecated/getHead'
+import subscribeRepos from './subscribeRepos'
 
 export default function (server: Server, ctx: AppContext) {
   getBlob(server, ctx)

package/src/api/com/atproto/sync/listBlobs.ts

@@ -1,7 +1,7 @@
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { assertRepoAvailability } from './util'
-import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.listBlobs({

package/src/api/com/atproto/sync/listRepos.ts

@@ -1,8 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { Cursor, GenericKeyset, paginate } from '../../../../db/pagination'
 import { formatAccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
+import { Cursor, GenericKeyset, paginate } from '../../../../db/pagination'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.listRepos(async ({ params }) => {

package/src/api/com/atproto/sync/subscribeRepos.ts

@@ -1,8 +1,8 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import Outbox from '../../../../sequencer/outbox'
 import { httpLogger } from '../../../../logger'
+import { Outbox } from '../../../../sequencer/outbox'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.sync.subscribeRepos(async function* ({ params, signal }) {

package/src/api/com/atproto/sync/util.ts

@@ -1,6 +1,6 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
 import { ActorAccount } from '../../../../account-manager/helpers/account'
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 
 export const assertRepoAvailability = async (
   ctx: AppContext,

package/src/api/com/atproto/temp/checkSignupQueue.ts

@@ -1,7 +1,7 @@
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { authPassthru, resultPassthru } from '../../../proxy'
-import { AuthScope } from '../../../../auth-verifier'
 
 // THIS IS A TEMPORARY UNSPECCED ROUTE
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/temp/index.ts

@@ -1,4 +1,4 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import checkSignupQueue from './checkSignupQueue'
 

package/src/api/index.ts

@@ -1,7 +1,7 @@
+import { AppContext } from '../context'
 import { Server } from '../lexicon'
-import comAtproto from './com/atproto'
 import appBsky from './app/bsky'
-import AppContext from '../context'
+import comAtproto from './com/atproto'
 
 export default function (server: Server, ctx: AppContext) {
   comAtproto(server, ctx)

package/src/api/proxy.ts

@@ -1,6 +1,6 @@
+import { IncomingMessage } from 'node:http'
 import { Headers } from '@atproto/xrpc'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { IncomingMessage } from 'node:http'
 
 export const resultPassthru = <T>(result: { headers: Headers; data: T }) => {
   // @TODO pass through any headers that we always want to forward along

package/src/auth-routes.ts

@@ -1,7 +1,6 @@
-import { oauthProtectedResourceMetadataSchema } from '@atproto/oauth-provider'
 import { Router } from 'express'
-
-import AppContext from './context'
+import { oauthProtectedResourceMetadataSchema } from '@atproto/oauth-provider'
+import { AppContext } from './context'
 
 export const createRouter = ({ authProvider, cfg }: AppContext): Router => {
   const router = Router()

package/src/auth-verifier.ts

@@ -1,6 +1,7 @@
 import { KeyObject, createPublicKey, createSecretKey } from 'node:crypto'
 import { IncomingMessage, ServerResponse } from 'node:http'
-
+import * as jose from 'jose'
+import KeyEncoder from 'key-encoder'
 import { getVerificationMaterial } from '@atproto/common'
 import { IdResolver, getDidKeyFromMultibase } from '@atproto/identity'
 import {
@@ -18,8 +19,6 @@ import {
   parseReqNsid,
   verifyJwt as verifyServiceJwt,
 } from '@atproto/xrpc-server'
-import * as jose from 'jose'
-import KeyEncoder from 'key-encoder'
 import { AccountManager } from './account-manager'
 import { softDeleted } from './db'
 

package/src/basic-routes.ts

@@ -1,9 +1,9 @@
-import express from 'express'
+import { Router } from 'express'
 import { sql } from 'kysely'
-import AppContext from './context'
+import { AppContext } from './context'
 
-export const createRouter = (ctx: AppContext): express.Router => {
-  const router = express.Router()
+export const createRouter = (ctx: AppContext): Router => {
+  const router = Router()
 
   router.get('/', function (req, res) {
     res.type('text/plain')

package/src/bsky-app-view.ts

@@ -0,0 +1,26 @@
+import { format } from 'node:util'
+import { AtpAgent } from '@atproto/api'
+
+export type AppViewOptions = {
+  url: string
+  did: string
+  cdnUrlPattern?: string
+}
+
+export class BskyAppView {
+  public did: string
+  public url: string
+  public agent: AtpAgent
+  private cdnUrlPattern?: string
+
+  constructor(options: AppViewOptions) {
+    this.did = options.did
+    this.url = options.url
+    this.agent = new AtpAgent({ service: options.url })
+    this.cdnUrlPattern = options.cdnUrlPattern
+  }
+
+  getImageUrl(pattern: string, did: string, cid: string): string | undefined {
+    if (this.cdnUrlPattern) return format(this.cdnUrlPattern, pattern, did, cid)
+  }
+}

package/src/config/config.ts

@@ -1,5 +1,5 @@
-import path from 'node:path'
 import assert from 'node:assert'
+import path from 'node:path'
 import { DAY, HOUR, SECOND } from '@atproto/common'
 import { Customization } from '@atproto/oauth-provider'
 import { ServerEnvironment } from './env'

package/src/config/env.ts

@@ -1,4 +1,4 @@
-import { envInt, envStr, envBool, envList } from '@atproto/common'
+import { envBool, envInt, envList, envStr } from '@atproto/common'
 
 export const readEnv = (): ServerEnvironment => {
   return {