@atproto/pds 0.4.90 → 0.4.92

package/src/api/com/atproto/admin/enableAccountInvites.ts

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

package/src/api/com/atproto/admin/getAccountInfo.ts

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

package/src/api/com/atproto/admin/getAccountInfos.ts

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

package/src/api/com/atproto/admin/getInviteCodes.ts

@@ -1,13 +1,13 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { selectInviteCodesQb } from '../../../../account-manager/helpers/invite'
+import { AppContext } from '../../../../context'
 import {
-  LabeledResult,
   Cursor,
   GenericKeyset,
+  LabeledResult,
   paginate,
 } from '../../../../db/pagination'
-import { selectInviteCodesQb } from '../../../../account-manager/helpers/invite'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.getInviteCodes({

package/src/api/com/atproto/admin/getSubjectStatus.ts

@@ -1,8 +1,8 @@
 import { CID } from 'multiformats/cid'
 import { AtUri } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { OutputSchema } from '../../../../lexicon/types/com/atproto/admin/getSubjectStatus'
 
 export default function (server: Server, ctx: AppContext) {

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

@@ -1,18 +1,18 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import updateSubjectStatus from './updateSubjectStatus'
-import getSubjectStatus from './getSubjectStatus'
-import getAccountInfo from './getAccountInfo'
-import enableAccountInvites from './enableAccountInvites'
+import deleteAccount from './deleteAccount'
 import disableAccountInvites from './disableAccountInvites'
 import disableInviteCodes from './disableInviteCodes'
+import enableAccountInvites from './enableAccountInvites'
+import getAccountInfo from './getAccountInfo'
+import getAccountInfos from './getAccountInfos'
 import getInviteCodes from './getInviteCodes'
-import updateAccountHandle from './updateAccountHandle'
+import getSubjectStatus from './getSubjectStatus'
+import sendEmail from './sendEmail'
 import updateAccountEmail from './updateAccountEmail'
+import updateAccountHandle from './updateAccountHandle'
 import updateAccountPassword from './updateAccountPassword'
-import sendEmail from './sendEmail'
-import deleteAccount from './deleteAccount'
-import getAccountInfos from './getAccountInfos'
+import updateSubjectStatus from './updateSubjectStatus'
 
 export default function (server: Server, ctx: AppContext) {
   updateSubjectStatus(server, ctx)

package/src/api/com/atproto/admin/sendEmail.ts

@@ -1,9 +1,9 @@
 import assert from 'node:assert'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { resultPassthru } from '../../../proxy'
 import { ids } from '../../../../lexicon/lexicons'
+import { resultPassthru } from '../../../proxy'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.sendEmail({

package/src/api/com/atproto/admin/updateAccountEmail.ts

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

package/src/api/com/atproto/admin/updateAccountHandle.ts

@@ -1,7 +1,7 @@
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { normalizeAndValidateHandle } from '../../../../handle'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { httpLogger } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/admin/updateAccountPassword.ts

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

package/src/api/com/atproto/admin/updateSubjectStatus.ts

@@ -1,13 +1,13 @@
 import { CID } from 'multiformats/cid'
 import { AtUri } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import {
-  isRepoRef,
   isRepoBlobRef,
+  isRepoRef,
 } from '../../../../lexicon/types/com/atproto/admin/defs'
 import { isMain as isStrongRef } from '../../../../lexicon/types/com/atproto/repo/strongRef'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.admin.updateSubjectStatus({

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

@@ -1,6 +1,6 @@
 import express from 'express'
-import { ActorAccount } from '../../../../account-manager/helpers/account'
 import { INVALID_HANDLE } from '@atproto/syntax'
+import { ActorAccount } from '../../../../account-manager/helpers/account'
 import { CodeDetail } from '../../../../account-manager/helpers/invite'
 
 // Output designed to passed as second arg to AtpAgent methods.

package/src/api/com/atproto/identity/getRecommendedDidCredentials.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.identity.getRecommendedDidCredentials({

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

@@ -1,11 +1,11 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import resolveHandle from './resolveHandle'
-import updateHandle from './updateHandle'
 import getRecommendedDidCredentials from './getRecommendedDidCredentials'
 import requestPlcOperationSignature from './requestPlcOperationSignature'
+import resolveHandle from './resolveHandle'
 import signPlcOperation from './signPlcOperation'
 import submitPlcOperation from './submitPlcOperation'
+import updateHandle from './updateHandle'
 
 export default function (server: Server, ctx: AppContext) {
   resolveHandle(server, ctx)

package/src/api/com/atproto/identity/requestPlcOperationSignature.ts

@@ -1,11 +1,9 @@
 import assert from 'node:assert'
-
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import { ids } from '../../../../lexicon/lexicons'
-import { AuthScope } from '../../../../auth-verifier'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.requestPlcOperationSignature({

package/src/api/com/atproto/identity/resolveHandle.ts

@@ -1,8 +1,7 @@
-import { AtpAgent } from '@atproto/api'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as ident from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.resolveHandle(async ({ params }) => {
@@ -33,8 +32,16 @@ export default function (server: Server, ctx: AppContext) {
     }
 
     // this is not someone on our server, but we help with resolving anyway
-    if (!did && ctx.appViewAgent) {
-      did = await tryResolveFromAppView(ctx.appViewAgent, handle)
+    if (!did && ctx.bskyAppView) {
+      try {
+        const result =
+          await ctx.bskyAppView.agent.com.atproto.identity.resolveHandle({
+            handle,
+          })
+        did = result.data.did
+      } catch {
+        // Ignore
+      }
     }
 
     if (!did) {
@@ -51,14 +58,3 @@ export default function (server: Server, ctx: AppContext) {
     }
   })
 }
-
-async function tryResolveFromAppView(agent: AtpAgent, handle: string) {
-  try {
-    const result = await agent.api.com.atproto.identity.resolveHandle({
-      handle,
-    })
-    return result.data.did
-  } catch (_err) {
-    return
-  }
-}

package/src/api/com/atproto/identity/signPlcOperation.ts

@@ -1,10 +1,8 @@
 import assert from 'node:assert'
-
+import * as plc from '@did-plc/lib'
 import { check } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import * as plc from '@did-plc/lib'
-
-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/identity/submitPlcOperation.ts

@@ -1,8 +1,8 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import * as plc from '@did-plc/lib'
 import { check } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { httpLogger as log } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/identity/updateHandle.ts

@@ -1,11 +1,11 @@
 import assert from 'node:assert'
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { DAY, MINUTE } from '@atproto/common'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { normalizeAndValidateHandle } from '../../../../handle'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { httpLogger } from '../../../../logger'
 import { ids } from '../../../../lexicon/lexicons'
+import { httpLogger } from '../../../../logger'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.identity.updateHandle({

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

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

package/src/api/com/atproto/moderation/createReport.ts

@@ -1,9 +1,9 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { parseProxyInfo } from '../../../../pipethrough'
-import { ids } from '../../../../lexicon/lexicons'
 import { AtpAgent } from '@atproto/api'
 import { AuthScope } from '../../../../auth-verifier'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
+import { ids } from '../../../../lexicon/lexicons'
+import { parseProxyInfo } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.moderation.createReport({

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

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

package/src/api/com/atproto/repo/applyWrites.ts

@@ -1,23 +1,25 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError, AuthRequiredError } from '@atproto/xrpc-server'
 import { WriteOpAction } from '@atproto/repo'
-import { prepareCreate, prepareDelete, prepareUpdate } from '../../../../repo'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
+  CreateResult,
+  DeleteResult,
   HandlerInput,
+  UpdateResult,
   isCreate,
-  isUpdate,
   isDelete,
-  CreateResult,
-  UpdateResult,
-  DeleteResult,
+  isUpdate,
 } from '../../../../lexicon/types/com/atproto/repo/applyWrites'
 import {
   BadCommitSwapError,
   InvalidRecordError,
   PreparedWrite,
+  prepareCreate,
+  prepareDelete,
+  prepareUpdate,
 } from '../../../../repo'
-import AppContext from '../../../../context'
 
 const ratelimitPoints = ({ input }: { input: HandlerInput }) => {
   let points = 0

package/src/api/com/atproto/repo/createRecord.ts

@@ -1,14 +1,15 @@
 import { CID } from 'multiformats/cid'
-import { InvalidRequestError, AuthRequiredError } from '@atproto/xrpc-server'
 import { InvalidRecordKeyError } from '@atproto/syntax'
-import { prepareCreate, prepareDelete } from '../../../../repo'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import {
   BadCommitSwapError,
   InvalidRecordError,
   PreparedCreate,
+  prepareCreate,
+  prepareDelete,
 } from '../../../../repo'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.createRecord({

package/src/api/com/atproto/repo/deleteRecord.ts

@@ -1,9 +1,12 @@
+import { CID } from 'multiformats/cid'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { prepareDelete } from '../../../../repo'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { BadCommitSwapError, BadRecordSwapError } from '../../../../repo'
-import { CID } from 'multiformats/cid'
+import {
+  BadCommitSwapError,
+  BadRecordSwapError,
+  prepareDelete,
+} from '../../../../repo'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.deleteRecord({

package/src/api/com/atproto/repo/describeRepo.ts

@@ -1,8 +1,8 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import * as id from '@atproto/identity'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { INVALID_HANDLE } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { assertRepoAvailability } from '../sync/util'
 
 export default function (server: Server, ctx: AppContext) {

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

@@ -1,7 +1,7 @@
 import { AtUri } from '@atproto/syntax'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 import { pipethrough } from '../../../../pipethrough'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/com/atproto/repo/importRepo.ts

@@ -1,19 +1,18 @@
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
-import { ActorStoreTransactor } from '../../../../actor-store'
+import { CID } from 'multiformats/cid'
+import PQueue from 'p-queue'
 import { TID } from '@atproto/common'
+import { BlobRef, LexValue, RepoRecord } from '@atproto/lexicon'
 import {
-  Repo,
   WriteOpAction,
   getAndParseRecord,
   readCarStream,
   verifyDiff,
 } from '@atproto/repo'
-import { InvalidRequestError } from '@atproto/xrpc-server'
-import { CID } from 'multiformats/cid'
-import PQueue from 'p-queue'
 import { AtUri } from '@atproto/syntax'
-import { BlobRef, LexValue, RepoRecord } from '@atproto/lexicon'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.importRepo({
@@ -44,13 +43,7 @@ const importRepo = async (
   if (roots.length !== 1) {
     throw new InvalidRequestError('expected one root')
   }
-  const currRoot = await actorStore.db.db
-    .selectFrom('repo_root')
-    .selectAll()
-    .executeTakeFirst()
-  const currRepo = currRoot
-    ? await Repo.load(actorStore.repo.storage, CID.parse(currRoot.cid))
-    : null
+  const currRepo = await actorStore.repo.maybeLoadRepo()
   const diff = await verifyDiff(
     currRepo,
     blocks,
@@ -89,18 +82,10 @@ const importRepo = async (
               now,
             )
             const recordBlobs = findBlobRefs(parsedRecord)
-            const blobValues = recordBlobs.map((cid) => ({
-              recordUri: uri.toString(),
-              blobCid: cid.ref.toString(),
-            }))
-            const indexRecordBlobs =
-              blobValues.length > 0
-                ? actorStore.db.db
-                    .insertInto('record_blob')
-                    .values(blobValues)
-                    .onConflict((oc) => oc.doNothing())
-                    .execute()
-                : Promise.resolve()
+            const indexRecordBlobs = actorStore.repo.blob.insertBlobs(
+              uri.toString(),
+              recordBlobs,
+            )
             await Promise.all([indexRecord, indexRecordBlobs])
           }
         },

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

@@ -1,15 +1,15 @@
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
 import applyWrites from './applyWrites'
 import createRecord from './createRecord'
 import deleteRecord from './deleteRecord'
 import describeRepo from './describeRepo'
 import getRecord from './getRecord'
+import importRepo from './importRepo'
+import listMissingBlobs from './listMissingBlobs'
 import listRecords from './listRecords'
 import putRecord from './putRecord'
 import uploadBlob from './uploadBlob'
-import listMissingBlobs from './listMissingBlobs'
-import importRepo from './importRepo'
 
 export default function (server: Server, ctx: AppContext) {
   applyWrites(server, ctx)

package/src/api/com/atproto/repo/listMissingBlobs.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.repo.listMissingBlobs({

package/src/api/com/atproto/repo/listRecords.ts

@@ -1,7 +1,7 @@
-import { InvalidRequestError } from '@atproto/xrpc-server'
 import { AtUri } from '@atproto/syntax'
+import { InvalidRequestError } from '@atproto/xrpc-server'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.listRecords(async ({ params }) => {

package/src/api/com/atproto/repo/putRecord.ts

@@ -1,21 +1,22 @@
 import { CID } from 'multiformats/cid'
+import { BlobRef } from '@atproto/lexicon'
+import { CommitData } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
 import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { CommitData } from '@atproto/repo'
-import { BlobRef } from '@atproto/lexicon'
+import { ActorStoreTransactor } from '../../../../actor-store/actor-store-transactor'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { prepareUpdate, prepareCreate } from '../../../../repo'
-import AppContext from '../../../../context'
+import { ids } from '../../../../lexicon/lexicons'
+import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
 import {
   BadCommitSwapError,
   BadRecordSwapError,
   InvalidRecordError,
   PreparedCreate,
   PreparedUpdate,
+  prepareCreate,
+  prepareUpdate,
 } from '../../../../repo'
-import { ids } from '../../../../lexicon/lexicons'
-import { Record as ProfileRecord } from '../../../../lexicon/types/app/bsky/actor/profile'
-import { ActorStoreTransactor } from '../../../../actor-store'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.putRecord({

package/src/api/com/atproto/repo/uploadBlob.ts

@@ -1,8 +1,8 @@
 import { DAY } from '@atproto/common'
 import { UpstreamTimeoutError } from '@atproto/xrpc-server'
-import { Server } from '../../../../lexicon'
-import AppContext from '../../../../context'
 import { BlobMetadata } from '../../../../actor-store/blob/transactor'
+import { AppContext } from '../../../../context'
+import { Server } from '../../../../lexicon'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.repo.uploadBlob({

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

@@ -1,11 +1,10 @@
 import { CidSet } from '@atproto/repo'
 import { INVALID_HANDLE } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-
-import AppContext from '../../../../context'
+import { AppContext } from '../../../../context'
 import { Server } from '../../../../lexicon'
-import { assertValidDidDocumentForService } from './util'
 import { authPassthru } from '../../../proxy'
+import { assertValidDidDocumentForService } from './util'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.activateAccount({

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

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

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

@@ -1,8 +1,6 @@
 import assert from 'node:assert'
-
 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/createAccount.ts

@@ -1,20 +1,19 @@
-import { DidDocument, MINUTE, check } from '@atproto/common'
-import { AtprotoData, ensureAtpDocument } from '@atproto/identity'
-import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
-import { ExportableKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import * as plc from '@did-plc/lib'
 import { isEmailValid } from '@hapi/address'
 import { isDisposableEmail } from 'disposable-email-domains-js'
-
+import { DidDocument, MINUTE, check } from '@atproto/common'
+import { ExportableKeypair, Keypair, Secp256k1Keypair } from '@atproto/crypto'
+import { AtprotoData, ensureAtpDocument } from '@atproto/identity'
+import { AuthRequiredError, InvalidRequestError } from '@atproto/xrpc-server'
+import { AccountStatus } from '../../../../account-manager'
+import { AppContext } from '../../../../context'
 import {
   baseNormalizeAndValidate,
   normalizeAndValidateHandle,
 } from '../../../../handle'
 import { Server } from '../../../../lexicon'
 import { InputSchema as CreateAccountInput } from '../../../../lexicon/types/com/atproto/server/createAccount'
-import AppContext from '../../../../context'
 import { safeResolveDidDoc } from './util'
-import { AccountStatus } from '../../../../account-manager'
 
 export default function (server: Server, ctx: AppContext) {
   server.com.atproto.server.createAccount({

package/src/api/com/atproto/server/createAppPassword.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/createInviteCode.ts

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