@atproto/pds 0.4.223 → 0.4.224

package/src/scripts/sequencer-recovery/recoverer.ts

@@ -13,19 +13,24 @@ import {
 import {
   AccountManager,
   AccountStatus,
-} from '../../account-manager/account-manager'
-import { ActorStore } from '../../actor-store/actor-store'
-import { ActorStoreTransactor } from '../../actor-store/actor-store-transactor'
-import { countAll } from '../../db'
+} from '../../account-manager/account-manager.js'
+import { ActorStoreTransactor } from '../../actor-store/actor-store-transactor.js'
+import { ActorStore } from '../../actor-store/actor-store.js'
+import { countAll } from '../../db/index.js'
 import {
   PreparedWrite,
   prepareCreate,
   prepareDelete,
   prepareUpdate,
-} from '../../repo'
-import { AccountEvt, CommitEvt, SeqEvt, Sequencer } from '../../sequencer'
-import { RecoveryDb } from './recovery-db'
-import { UserQueues } from './user-queues'
+} from '../../repo/index.js'
+import {
+  AccountEvt,
+  CommitEvt,
+  SeqEvt,
+  Sequencer,
+} from '../../sequencer/index.js'
+import { RecoveryDb } from './recovery-db.js'
+import { UserQueues } from './user-queues.js'
 
 export type RecovererContextNoDb = {
   sequencer: Sequencer

package/src/scripts/sequencer-recovery/recovery-db.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { Kysely } from 'kysely'
 import { DidString } from '@atproto/syntax'
-import { Database, Migrator } from '../../db'
+import { Database, Migrator } from '../../db/index.js'
 
 export interface NewAccount {
   did: DidString

package/src/scripts/sequencer-recovery/repair-repos.ts

@@ -1,12 +1,12 @@
 import { DidString } from '@atproto/syntax'
-import { parseRepoSeqRows } from '../../sequencer'
-import { rebuildRepo } from '../rebuild-repo'
+import { parseRepoSeqRows } from '../../sequencer/index.js'
+import { rebuildRepo } from '../rebuild-repo.js'
 import {
   RecovererContext,
   RecovererContextNoDb,
   processSeqEvt,
-} from './recoverer'
-import { getRecoveryDbFromSequencerLoc } from './recovery-db'
+} from './recoverer.js'
+import { getRecoveryDbFromSequencerLoc } from './recovery-db.js'
 
 export const repairRepos = async (ctx: RecovererContextNoDb) => {
   const recoveryDb = await getRecoveryDbFromSequencerLoc(

package/src/scripts/sequencer-recovery/user-queues.ts

@@ -1,7 +1,10 @@
 import PQueue from 'p-queue'
+
+type Queue = InstanceType<typeof PQueue>
+
 export class UserQueues {
-  main: PQueue
-  queues = new Map<string, PQueue>()
+  main: Queue
+  queues: Map<string, Queue> = new Map()
 
   constructor(concurrency: number) {
     this.main = new PQueue({ concurrency })

package/src/sequencer/db/index.ts

@@ -1,8 +1,8 @@
-import { Database, Migrator } from '../../db'
-import migrations from './migrations'
-import { SequencerDbSchema } from './schema'
+import { Database, Migrator } from '../../db/index.js'
+import migrations from './migrations/index.js'
+import { SequencerDbSchema } from './schema.js'
 
-export * from './schema'
+export * from './schema.js'
 
 export type SequencerDb = Database<SequencerDbSchema>
 

package/src/sequencer/db/migrations/index.ts

@@ -1,4 +1,4 @@
-import * as init from './001-init'
+import * as init from './001-init.js'
 
 export default {
   '001': init,

package/src/sequencer/events.ts

@@ -10,9 +10,9 @@ import {
 } from '@atproto/lex'
 import { encode as cborEncode } from '@atproto/lex-cbor'
 import { BlockMap, blocksToCarFile } from '@atproto/repo'
-import { AccountStatus } from '../account-manager/account-manager'
-import { CommitDataWithOps, SyncEvtData } from '../repo'
-import { RepoSeqInsert } from './db'
+import { AccountStatus } from '../account-manager/account-manager.js'
+import { CommitDataWithOps, SyncEvtData } from '../repo/index.js'
+import { RepoSeqInsert } from './db/index.js'
 
 export const formatSeqCommit = async (
   did: string,

package/src/sequencer/index.ts

@@ -1,3 +1,3 @@
-export * from './sequencer'
-export * from './outbox'
-export * from './events'
+export * from './sequencer.js'
+export * from './outbox.js'
+export * from './events.js'

package/src/sequencer/outbox.ts

@@ -1,6 +1,6 @@
 import { AsyncBuffer, AsyncBufferFullError } from '@atproto/common'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { SeqEvt, Sequencer } from '.'
+import { SeqEvt, Sequencer } from './index.js'
 
 export type OutboxOpts = {
   maxBufferSize: number

package/src/sequencer/sequencer.ts

@@ -1,19 +1,19 @@
 import EventEmitter from 'node:events'
-import TypedEmitter from 'typed-emitter'
+import type TypedEmitter from 'typed-emitter'
 import { SECOND, wait } from '@atproto/common'
 import { decode as cborDecode } from '@atproto/lex-cbor'
 import { DatetimeString, DidString, HandleString } from '@atproto/syntax'
-import { AccountStatus } from '../account-manager/helpers/account'
-import { Crawlers } from '../crawlers'
-import { seqLogger as log } from '../logger'
-import { CommitDataWithOps, SyncEvtData } from '../repo'
+import { AccountStatus } from '../account-manager/helpers/account.js'
+import { Crawlers } from '../crawlers.js'
+import { seqLogger as log } from '../logger.js'
+import { CommitDataWithOps, SyncEvtData } from '../repo/index.js'
 import {
   RepoSeqEntry,
   RepoSeqInsert,
   SequencerDb,
   getDb,
   getMigrator,
-} from './db'
+} from './db/index.js'
 import {
   AccountEvt,
   CommitEvt,
@@ -24,9 +24,9 @@ import {
   formatSeqCommit,
   formatSeqIdentityEvt,
   formatSeqSyncEvt,
-} from './events'
+} from './events.js'
 
-export * from './events'
+export * from './events.js'
 
 export class Sequencer extends (EventEmitter as new () => SequencerEmitter) {
   db: SequencerDb
@@ -258,6 +258,6 @@ type SequencerEvents = {
   close: () => void
 }
 
-export type SequencerEmitter = TypedEmitter<SequencerEvents>
+export type SequencerEmitter = TypedEmitter.default<SequencerEvents>
 
 export default Sequencer

package/src/well-known.ts

@@ -1,6 +1,6 @@
 import { Router } from 'express'
 import { HandleString } from '@atproto/syntax'
-import { AppContext } from './context'
+import { AppContext } from './context.js'
 
 export const createRouter = (ctx: AppContext): Router => {
   const router = Router()

package/tests/__snapshots__/takedown-appeal.test.ts.snap

@@ -1,8 +1,8 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`appeal account takedown actor takedown allows appeal request. 1`] = `
-Object {
-  "accountStats": Object {
+{
+  "accountStats": {
     "$type": "tools.ozone.moderation.defs#accountStats",
     "appealCount": 0,
     "escalateCount": 0,
@@ -13,7 +13,7 @@ Object {
   "ageAssuranceState": "unknown",
   "appealed": true,
   "createdAt": "1970-01-01T00:00:00.000Z",
-  "hosting": Object {
+  "hosting": {
     "$type": "tools.ozone.moderation.defs#accountHosting",
     "status": "unknown",
   },
@@ -23,17 +23,17 @@ Object {
   "lastReviewedAt": "1970-01-01T00:00:00.000Z",
   "lastReviewedBy": "user(0)",
   "priorityScore": 0,
-  "recordsStats": Object {
+  "recordsStats": {
     "$type": "tools.ozone.moderation.defs#recordsStats",
   },
   "reviewState": "tools.ozone.moderation.defs#reviewEscalated",
-  "subject": Object {
+  "subject": {
     "$type": "com.atproto.admin.defs#repoRef",
     "did": "user(1)",
   },
-  "subjectBlobCids": Array [],
+  "subjectBlobCids": [],
   "subjectRepoHandle": "jeff.test",
-  "tags": Array [
+  "tags": [
     "lang:und",
     "report:appeal",
   ],

package/tests/_types.d.ts

@@ -0,0 +1,16 @@
+declare module 'nodemailer/lib/mailer' {
+  namespace Mail {
+    interface Options {
+      from?: string | { name?: string; address: string }
+      to?: string | string[]
+      subject?: string
+      text?: string
+      html?: string
+      [key: string]: any
+    }
+  }
+  class Mail {
+    constructor(transporter: any)
+  }
+  export = Mail
+}

package/tests/account-deletion.test.ts

@@ -5,17 +5,17 @@ import { AtpAgent } from '@atproto/api'
 import { fileExists } from '@atproto/common'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
-import { AppContext } from '../src'
 import {
   Account,
   AppPassword,
   EmailToken,
   RefreshToken,
   RepoRoot,
-} from '../src/account-manager/db'
-import { ServerMailer } from '../src/mailer'
-import { RepoSeq } from '../src/sequencer/db'
-import basicSeed from './seeds/basic'
+} from '../src/account-manager/db/index.js'
+import { AppContext } from '../src/index.js'
+import { ServerMailer } from '../src/mailer/index.js'
+import { RepoSeq } from '../src/sequencer/db/index.js'
+import basicSeed from './seeds/basic.js'
 
 describe('account deletion', () => {
   let network: TestNetworkNoAppView

package/tests/account-manager.test.ts

@@ -1,3 +1,4 @@
+import { jest } from '@jest/globals'
 import { type Browser, launch } from 'puppeteer'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { PageHelper } from './_puppeteer.js'
@@ -129,7 +130,7 @@ describe('account manager', () => {
 
     expect(sendResetPasswordMock).toHaveBeenCalledTimes(1)
 
-    const [params] = sendResetPasswordMock.mock.lastCall
+    const [params] = sendResetPasswordMock.mock.lastCall!
     expect(params).toEqual({
       handle: 'bob.test',
       token: expect.any(String),

package/tests/account.test.ts

@@ -7,8 +7,8 @@ import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { IdResolver } from '@atproto/identity'
 import { isDidString } from '@atproto/lex'
 import { DidString } from '@atproto/syntax'
-import { AppContext } from '../src'
-import { ServerMailer } from '../src/mailer'
+import { AppContext } from '../src/index.js'
+import { ServerMailer } from '../src/mailer/index.js'
 
 const email = 'alice@test.com'
 const handle = 'alice.test'

package/tests/auth.test.ts

@@ -2,7 +2,7 @@ import * as jose from 'jose'
 import { request as undiciRequest } from 'undici'
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { createRefreshToken } from '../src/account-manager/helpers/auth'
+import { createRefreshToken } from '../src/account-manager/helpers/auth.js'
 
 describe('auth', () => {
   let network: TestNetworkNoAppView

package/tests/blob-deletes.test.ts

@@ -1,6 +1,6 @@
 import { AtpAgent, BlobRef } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { AppContext } from '../src'
+import { AppContext } from '../src/index.js'
 
 describe('blob deletes', () => {
   let network: TestNetworkNoAppView

package/tests/create-post.test.ts

@@ -7,7 +7,7 @@ import {
   Un$Typed,
 } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import basicSeed from './seeds/basic'
+import basicSeed from './seeds/basic.js'
 
 describe('pds posts record creation', () => {
   let network: TestNetworkNoAppView

package/tests/crud.test.ts

@@ -11,8 +11,8 @@ import { TID, cidForCbor, ui8ToArrayBuffer } from '@atproto/common'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
 import { AtUri } from '@atproto/syntax'
-import { AppContext } from '../src/context'
-import { forSnapshot, paginateAll } from './_util'
+import { AppContext } from '../src/context.js'
+import { forSnapshot, paginateAll } from './_util.js'
 
 describe('crud operations', () => {
   let network: TestNetworkNoAppView

package/tests/db.test.ts

@@ -1,6 +1,6 @@
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 // Importing from `dist` to circumvent circular dependency typing issues
-import { AccountDb } from '../dist/account-manager/db'
+import { AccountDb } from '../dist/account-manager/db/index.js'
 
 describe('db', () => {
   let network: TestNetworkNoAppView

package/tests/email-confirmation.test.ts

@@ -1,13 +1,13 @@
 import { EventEmitter, once } from 'node:events'
-import Mail from 'nodemailer/lib/mailer'
+import { SendMailOptions } from 'nodemailer'
 import {
   AtpAgent,
   ComAtprotoServerConfirmEmail,
   ComAtprotoServerUpdateEmail,
 } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { ServerMailer } from '../src/mailer'
-import userSeed from './seeds/users'
+import { ServerMailer } from '../src/mailer/index.js'
+import userSeed from './seeds/users.js'
 
 describe('email confirmation', () => {
   let network: TestNetworkNoAppView
@@ -45,12 +45,12 @@ describe('email confirmation', () => {
     await network.close()
   })
 
-  const getMailFrom = async (promise): Promise<Mail.Options> => {
+  const getMailFrom = async (promise): Promise<SendMailOptions> => {
     const result = await Promise.all([once(mailCatcher, 'mail'), promise])
     return result[0][0]
   }
 
-  const getTokenFromMail = (mail: Mail.Options) =>
+  const getTokenFromMail = (mail: SendMailOptions) =>
     mail.html?.toString().match(/>([a-z0-9]{5}-[a-z0-9]{5})</i)?.[1]
 
   it('starts a user out unverified', async () => {

package/tests/entryway-mock.ts

@@ -3,7 +3,7 @@ import * as http from 'node:http'
 import * as plcLib from '@did-plc/lib'
 import { HttpTerminator, createHttpTerminator } from 'http-terminator'
 import * as jose from 'jose'
-import KeyEncoder from 'key-encoder'
+import KeyEncoderModule from 'key-encoder'
 import * as ui8 from 'uint8arrays'
 import { AtpAgent } from '@atproto/api'
 import { getVerificationMaterial } from '@atproto/common'
@@ -16,9 +16,15 @@ import {
   parseReqNsid,
   verifyJwt as verifyServiceJwt,
 } from '@atproto/xrpc-server'
-import { bearerTokenFromReq, createPublicKeyObject } from '../src/auth-verifier'
+import {
+  bearerTokenFromReq,
+  createPublicKeyObject,
+} from '../src/auth-verifier.js'
 import { com } from '../src/lexicons/index.js'
 
+// key-encoder is CJS with exports.default; Node ESM interop wraps it as { default: Class }
+const KeyEncoder = ((m) => m.default ?? m)(KeyEncoderModule)
+
 interface Account {
   did: DidString
   handle: HandleString

package/tests/entryway.test.ts

@@ -6,7 +6,7 @@ import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestPds, TestPlc, mockResolvers } from '@atproto/dev-env'
 import { isDidString } from '@atproto/lex'
 import { DidString } from '@atproto/syntax'
-import { MockEntryway } from './entryway-mock'
+import { MockEntryway } from './entryway-mock.js'
 
 describe('entryway', () => {
   let plc: TestPlc

package/tests/file-uploads.test.ts

@@ -10,11 +10,11 @@ import {
   getBlobCidString,
   isTypedBlobRef,
 } from '@atproto/lex-data'
-import { AppContext } from '../src'
-import { ActorDb } from '../src/actor-store/db'
-import { DiskBlobStore } from '../src/disk-blobstore'
+import { ActorDb } from '../src/actor-store/db/index.js'
+import { DiskBlobStore } from '../src/disk-blobstore.js'
+import { AppContext } from '../src/index.js'
 import { app } from '../src/lexicons/index.js'
-import { users } from './seeds/users'
+import { users } from './seeds/users.js'
 
 describe('file uploads', () => {
   let network: TestNetworkNoAppView
@@ -46,7 +46,7 @@ describe('file uploads', () => {
   })
 
   let smallBlob: TypedBlobRef
-  let smallFile: Uint8Array
+  let smallFile: Uint8Array<ArrayBuffer>
 
   it('handles client abort', async () => {
     const abortController = new AbortController()
@@ -130,7 +130,7 @@ describe('file uploads', () => {
   })
 
   let largeBlob: TypedBlobRef
-  let largeFile: Uint8Array
+  let largeFile: Uint8Array<ArrayBuffer>
 
   it('does not allow referencing a file that is outside blob constraints', async () => {
     largeFile = await fs.readFile('../dev-env/assets/hd-key.jpg')

package/tests/handle-validation.test.ts

@@ -1,5 +1,5 @@
 import { isValidTld } from '@atproto/syntax'
-import { ensureHandleServiceConstraints } from '../src/handle'
+import { ensureHandleServiceConstraints } from '../src/handle/index.js'
 
 describe('handle validation', () => {
   it('validates service constraints', () => {

package/tests/handles.test.ts

@@ -1,15 +1,14 @@
-import { AtpAgent } from '@atproto/api'
-import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
-import { IdResolver } from '@atproto/identity'
+import { jest } from '@jest/globals'
+import { type AtpAgent } from '@atproto/api'
+import { type SeedClient } from '@atproto/dev-env'
 import { AtIdentifierString, DidString } from '@atproto/syntax'
-import { AppContext } from '../src'
-import basicSeed from './seeds/basic'
+import { type AppContext } from '../src/index.js'
 
 // outside of suite so they can be used in mock
 let alice: DidString
 let bob: DidString
 
-jest.mock('node:dns/promises', () => {
+jest.unstable_mockModule('node:dns/promises', () => {
   return {
     resolveTxt: (domain: string) => {
       if (domain === '_atproto.alice.external') {
@@ -23,12 +22,19 @@ jest.mock('node:dns/promises', () => {
   }
 })
 
+// Dynamic imports so jest.unstable_mockModule() registers before these modules
+// load node:dns/promises. Static imports link the full dep graph before any code
+// evaluates, which would bypass the mock. Remove once migrated to vitest.
+const { IdResolver } = await import('@atproto/identity')
+const { TestNetworkNoAppView } = await import('@atproto/dev-env')
+const { default: basicSeed } = await import('./seeds/basic.js')
+
 describe('handles', () => {
-  let network: TestNetworkNoAppView
+  let network: InstanceType<typeof TestNetworkNoAppView>
   let agent: AtpAgent
   let sc: SeedClient
   let ctx: AppContext
-  let idResolver: IdResolver
+  let idResolver: InstanceType<typeof IdResolver>
 
   const newHandle = 'alice2.test'
 

package/tests/invite-codes.test.ts

@@ -3,8 +3,8 @@ import { DAY } from '@atproto/common'
 import * as crypto from '@atproto/crypto'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { toDatetimeString } from '@atproto/lex'
-import { AppContext } from '../src'
-import { genInvCodes } from '../src/api/com/atproto/server/util'
+import { genInvCodes } from '../src/api/com/atproto/server/util.js'
+import { AppContext } from '../src/index.js'
 
 describe('account', () => {
   let network: TestNetworkNoAppView

package/tests/moderation.test.ts

@@ -7,7 +7,7 @@ import {
 } from '@atproto/api'
 import { ImageRef, SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { BlobNotFoundError } from '@atproto/repo'
-import basicSeed from './seeds/basic'
+import basicSeed from './seeds/basic.js'
 
 describe('moderation', () => {
   let network: TestNetworkNoAppView

package/tests/moderator-auth.test.ts

@@ -6,7 +6,7 @@ import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import { $Typed } from '@atproto/lex'
 import { createServiceAuthHeaders } from '@atproto/xrpc-server'
 import { com } from '../src/lexicons/index.js'
-import usersSeed from './seeds/users'
+import usersSeed from './seeds/users.js'
 
 describe('moderator auth', () => {
   let network: TestNetworkNoAppView

package/tests/oauth.test.ts

@@ -1,6 +1,7 @@
 import { once } from 'node:events'
 import { Server, createServer } from 'node:http'
 import { AddressInfo } from 'node:net'
+import { jest } from '@jest/globals'
 import { type Browser, launch } from 'puppeteer'
 import { TestNetworkNoAppView } from '@atproto/dev-env'
 import { oauthClientAssetsMiddleware } from './_oauth_client_assets_middleware.js'
@@ -156,7 +157,7 @@ describe('oauth', () => {
 
     expect(sendTemplateMock).toHaveBeenCalledTimes(1)
 
-    const [params] = sendTemplateMock.mock.lastCall
+    const [params] = sendTemplateMock.mock.lastCall!
     expect(params).toEqual({
       handle: 'alice.test',
       token: expect.any(String),

package/tests/plc-operations.test.ts

@@ -1,13 +1,12 @@
 import assert from 'node:assert'
-import { once } from 'node:events'
-import { EventEmitter } from 'node:stream'
+import { EventEmitter, once } from 'node:events'
 import * as plc from '@did-plc/lib'
-import Mail from 'nodemailer/lib/mailer'
+import { SendMailOptions } from 'nodemailer'
 import { AtpAgent } from '@atproto/api'
 import { check } from '@atproto/common'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { SeedClient, TestNetworkNoAppView, basicSeed } from '@atproto/dev-env'
-import { AppContext } from '../src'
+import { AppContext } from '../src/index.js'
 
 describe('plc operations', () => {
   let network: TestNetworkNoAppView
@@ -52,12 +51,12 @@ describe('plc operations', () => {
     await network.close()
   })
 
-  const getMailFrom = async (promise): Promise<Mail.Options> => {
+  const getMailFrom = async (promise): Promise<SendMailOptions> => {
     const result = await Promise.all([once(mailCatcher, 'mail'), promise])
     return result[0][0]
   }
 
-  const getTokenFromMail = (mail: Mail.Options) =>
+  const getTokenFromMail = (mail: SendMailOptions) =>
     mail.html?.toString().match(/>([a-z0-9]{5}-[a-z0-9]{5})</i)?.[1]
 
   const signOp = async (did: string, op: Partial<plc.Operation>) => {

package/tests/preferences.test.ts

@@ -1,7 +1,7 @@
 import { AtpAgent } from '@atproto/api'
 import { SeedClient, TestNetworkNoAppView } from '@atproto/dev-env'
 import type { Unknown$Type } from '@atproto/lex'
-import usersSeed from './seeds/users'
+import usersSeed from './seeds/users.js'
 
 describe('user preferences', () => {
   let network: TestNetworkNoAppView