@atproto/dev-env 0.4.9 → 0.5.0

package/src/mock/index.ts

@@ -1,11 +1,14 @@
-import { AtpAgent, COM_ATPROTO_MODERATION } from '@atproto/api'
-import { ConflictingQueueError } from '@atproto/api/dist/client/types/tools/ozone/queue/createQueue'
+import {
+  AtpAgent,
+  COM_ATPROTO_MODERATION,
+  ToolsOzoneQueueCreateQueue,
+} from '@atproto/api'
 import { Database } from '@atproto/bsky'
 import { AtUri, AtUriString } from '@atproto/syntax'
-import { EXAMPLE_LABELER, RecordRef, TestNetwork } from '../index'
-import { postTexts, replyTexts } from './data'
-import blurHashB64 from './img/blur-hash-avatar-b64'
-import labeledImgB64 from './img/labeled-img-b64'
+import { EXAMPLE_LABELER, RecordRef, TestNetwork } from '../index.js'
+import { postTexts, replyTexts } from './data.js'
+import blurHashB64 from './img/blur-hash-avatar-b64.js'
+import labeledImgB64 from './img/labeled-img-b64.js'
 
 // NOTE
 // deterministic date generator
@@ -127,7 +130,7 @@ export async function generateMockSetup(env: TestNetwork) {
         headers: await adminHeaders('tools.ozone.queue.createQueue'),
       })
     } catch (err) {
-      if (!(err instanceof ConflictingQueueError)) {
+      if (!(err instanceof ToolsOzoneQueueCreateQueue.ConflictingQueueError)) {
         throw err
       }
     }
@@ -623,7 +626,7 @@ export async function generateMockSetup(env: TestNetwork) {
   await setVerifier(env.bsky.db, alice.assertDid)
 
   // @TODO These are useful when testing complex threads, but don't need to be enabled all the time. We could make it configurable.
-  // import * as seedThreadV2 from '../seed/thread-v2'
+  // import * as seedThreadV2 from '../seed/thread-v2.js'
   // const sc = env.getSeedClient()
   // await seedThreadV2.simple(sc)
   // await seedThreadV2.long(sc)

package/src/moderator-client.ts

@@ -2,13 +2,14 @@ import {
   AtpAgent,
   ToolsOzoneModerationDefs,
   ToolsOzoneModerationEmitEvent as EmitModerationEvent,
+  ToolsOzoneModerationGetReporterStats as _GetReporterStats, // includes types for getReporterStats()
   ToolsOzoneModerationQueryEvents as QueryModerationEvents,
   ToolsOzoneModerationQueryStatuses as QueryModerationStatuses,
   ToolsOzoneReportQueryReports as QueryModerationReports,
   ToolsOzoneSettingRemoveOptions,
   ToolsOzoneSettingUpsertOption,
 } from '@atproto/api'
-import { TestOzone } from './ozone'
+import { TestOzone } from './ozone.js'
 
 type TakeActionInput = EmitModerationEvent.InputSchema
 type QueryStatusesParams = QueryModerationStatuses.QueryParams

package/src/network-no-appview.ts

@@ -1,10 +1,10 @@
 import { SkeletonHandler } from '@atproto/pds'
-import { TestFeedGen } from './feed-gen'
-import { TestPds } from './pds'
-import { TestPlc } from './plc'
-import { SeedClient } from './seed/client'
-import { TestServerParams } from './types'
-import { mockNetworkUtilities } from './util'
+import { TestFeedGen } from './feed-gen.js'
+import { TestPds } from './pds.js'
+import { TestPlc } from './plc.js'
+import { SeedClient } from './seed/client.js'
+import { TestServerParams } from './types.js'
+import { mockNetworkUtilities } from './util.js'
 
 export class TestNetworkNoAppView {
   feedGens: TestFeedGen[] = []

package/src/network.ts

@@ -3,17 +3,17 @@ import getPort from 'get-port'
 import * as uint8arrays from 'uint8arrays'
 import { wait } from '@atproto/common-web'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { TestBsky } from './bsky'
-import { EXAMPLE_LABELER } from './const'
-import { IntrospectServer } from './introspect'
-import { TestNetworkNoAppView } from './network-no-appview'
-import { TestOzone } from './ozone'
-import { TestPds } from './pds'
-import { TestPlc } from './plc'
-import { LexiconAuthorityProfile } from './service-profile-lexicon'
-import { OzoneServiceProfile } from './service-profile-ozone'
-import { TestServerParams } from './types'
-import { mockNetworkUtilities } from './util'
+import { TestBsky } from './bsky.js'
+import { EXAMPLE_LABELER } from './const.js'
+import { IntrospectServer } from './introspect.js'
+import { TestNetworkNoAppView } from './network-no-appview.js'
+import { TestOzone } from './ozone.js'
+import { TestPds } from './pds.js'
+import { TestPlc } from './plc.js'
+import { LexiconAuthorityProfile } from './service-profile-lexicon.js'
+import { OzoneServiceProfile } from './service-profile-ozone.js'
+import { TestServerParams } from './types.js'
+import { mockNetworkUtilities } from './util.js'
 
 const ADMIN_USERNAME = 'admin'
 const ADMIN_PASSWORD = 'admin-pass'

package/src/ozone.ts

@@ -5,10 +5,10 @@ import { AtpAgent } from '@atproto/api'
 import { Keypair, Secp256k1Keypair } from '@atproto/crypto'
 import * as ozone from '@atproto/ozone'
 import { createServiceJwt } from '@atproto/xrpc-server'
-import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const'
-import { ModeratorClient } from './moderator-client'
-import { DidAndKey, OzoneConfig } from './types'
-import { createDidAndKey } from './util'
+import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const.js'
+import { ModeratorClient } from './moderator-client.js'
+import { DidAndKey, OzoneConfig } from './types.js'
+import { createDidAndKey } from './util.js'
 
 export class TestOzone {
   constructor(

package/src/pds.ts

@@ -8,8 +8,8 @@ import { Secp256k1Keypair, randomStr } from '@atproto/crypto'
 import { Client } from '@atproto/lex'
 import * as pds from '@atproto/pds'
 import { createSecretKeyObject } from '@atproto/pds'
-import { ADMIN_PASSWORD, EXAMPLE_LABELER, JWT_SECRET } from './const'
-import { PdsConfig } from './types'
+import { ADMIN_PASSWORD, EXAMPLE_LABELER, JWT_SECRET } from './const.js'
+import { PdsConfig } from './types.js'
 
 export class TestPds {
   constructor(

package/src/plc.ts

@@ -1,7 +1,7 @@
 import { Client as PlcClient } from '@did-plc/lib'
 import * as plc from '@did-plc/server'
 import getPort from 'get-port'
-import { PlcConfig } from './types'
+import { PlcConfig } from './types.js'
 
 export class TestPlc {
   constructor(

package/src/seed/author-feed.ts

@@ -1,5 +1,5 @@
-import basicSeed from './basic'
-import { SeedClient } from './client'
+import basicSeed from './basic.js'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/src/seed/basic.ts

@@ -1,9 +1,9 @@
-import { TestBsky } from '../bsky'
-import { EXAMPLE_LABELER } from '../const'
-import { TestNetwork } from '../network'
-import { TestNetworkNoAppView } from '../network-no-appview'
-import { SeedClient } from './client'
-import usersSeed from './users'
+import { TestBsky } from '../bsky.js'
+import { EXAMPLE_LABELER } from '../const.js'
+import { TestNetworkNoAppView } from '../network-no-appview.js'
+import { TestNetwork } from '../network.js'
+import { SeedClient } from './client.js'
+import usersSeed from './users.js'
 
 export default async (
   sc: SeedClient<TestNetwork | TestNetworkNoAppView>,

package/src/seed/client.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises'
 import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { CID } from 'multiformats/cid'
 import {
   AppBskyActorProfile,
@@ -17,7 +18,7 @@ import {
 import { CidString, Client } from '@atproto/lex'
 import { BlobRef } from '@atproto/lexicon'
 import { AtUri, AtUriString, DidString } from '@atproto/syntax'
-import { TestNetworkNoAppView } from '../network-no-appview'
+import { TestNetworkNoAppView } from '../network-no-appview.js'
 
 // Makes it simple to create data via the XRPC client,
 // and keeps track of all created data in memory for convenience.
@@ -26,6 +27,7 @@ let AVATAR_IMG: Uint8Array | undefined
 
 // AVATAR_PATH is defined in a non-CWD-dependant way, so this works
 // for any consumer of this package, even outside the atproto repo.
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const AVATAR_PATH = path.resolve(
   __dirname,
   '../../assets/key-portrait-small.jpg',

package/src/seed/follows.ts

@@ -1,4 +1,4 @@
-import { SeedClient } from './client'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await sc.createAccount('alice', users.alice)

package/src/seed/index.ts

@@ -1,11 +1,11 @@
-export * from './client'
+export * from './client.js'
 
-export { default as authorFeedSeed } from './author-feed'
-export { default as basicSeed } from './basic'
-export { default as followsSeed } from './follows'
-export { default as likesSeed } from './likes'
-export { default as quotesSeed } from './quotes'
-export { default as repostsSeed } from './reposts'
-export { default as usersBulkSeed } from './users-bulk'
-export { default as usersSeed } from './users'
-export { default as verificationsSeed } from './verifications'
+export { default as authorFeedSeed } from './author-feed.js'
+export { default as basicSeed } from './basic.js'
+export { default as followsSeed } from './follows.js'
+export { default as likesSeed } from './likes.js'
+export { default as quotesSeed } from './quotes.js'
+export { default as repostsSeed } from './reposts.js'
+export { default as usersBulkSeed } from './users-bulk.js'
+export { default as usersSeed } from './users.js'
+export { default as verificationsSeed } from './verifications.js'

package/src/seed/likes.ts

@@ -1,5 +1,5 @@
-import basicSeed from './basic'
-import { SeedClient } from './client'
+import basicSeed from './basic.js'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/src/seed/quotes.ts

@@ -1,5 +1,5 @@
-import { default as basicSeed } from './basic'
-import { SeedClient } from './client'
+import { default as basicSeed } from './basic.js'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/src/seed/reposts.ts

@@ -1,5 +1,5 @@
-import basicSeed from './basic'
-import { SeedClient } from './client'
+import basicSeed from './basic.js'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await basicSeed(sc)

package/src/seed/thread-v2.ts

@@ -1,8 +1,8 @@
 import { AppBskyFeedPost } from '@atproto/api'
 import type { DatabaseSchema } from '@atproto/bsky'
-import { TestNetwork } from '../network'
-import { TestNetworkNoAppView } from '../network-no-appview'
-import { RecordRef, SeedClient } from './client'
+import { TestNetworkNoAppView } from '../network-no-appview.js'
+import { TestNetwork } from '../network.js'
+import { RecordRef, SeedClient } from './client.js'
 
 type User = {
   id: string
@@ -107,8 +107,10 @@ const rootReplyFnBuilder = <T extends TestNetworkNoAppView>(
     )
     posts[breadcrumbs] = reply
     // Await for this post to be processed before replying to it.
-    replyCb && (await sc.network.processAll())
-    await replyCb?.(rootReplyFnBuilder(sc, root, reply.ref, breadcrumbs, posts))
+    if (replyCb) {
+      await sc.network.processAll()
+      await replyCb(rootReplyFnBuilder(sc, root, reply.ref, breadcrumbs, posts))
+    }
   }
 }
 
@@ -139,10 +141,12 @@ const createThread = async <T extends TestNetworkNoAppView>(
     overrides,
   )
   // Await for this post to be processed before replying to it.
-  replyCb && (await sc.network.processAll())
-  await replyCb?.(
-    rootReplyFnBuilder(sc, root.ref, root.ref, breadcrumbs, replies),
-  )
+  if (replyCb) {
+    await sc.network.processAll()
+    await replyCb(
+      rootReplyFnBuilder(sc, root.ref, root.ref, breadcrumbs, replies),
+    )
+  }
   return { root, replies }
 }
 

package/src/seed/users-bulk.ts

@@ -1,5 +1,5 @@
 import { chunkArray } from '@atproto/common-web'
-import { SeedClient } from './client'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient, max = Infinity) => {
   // @TODO when these are run in parallel, seem to get an intermittent

package/src/seed/users.ts

@@ -1,4 +1,4 @@
-import { SeedClient } from './client'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient) => {
   await sc.createAccount('alice', users.alice)

package/src/seed/verifications.ts

@@ -1,6 +1,6 @@
 import { INVALID_HANDLE } from '@atproto/syntax'
-import { TestNetwork } from '../network'
-import { SeedClient } from './client'
+import { TestNetwork } from '../network.js'
+import { SeedClient } from './client.js'
 
 export default async (sc: SeedClient<TestNetwork>) => {
   const labelerDid = sc.network.bsky.ctx.cfg.modServiceDid

package/src/service-profile-lexicon.ts

@@ -1,6 +1,6 @@
 import { LexiconDoc } from '@atproto/lexicon'
-import { TestPds } from './pds'
-import { ServiceProfile } from './service-profile'
+import { TestPds } from './pds.js'
+import { ServiceProfile } from './service-profile.js'
 
 const LEXICONS: readonly LexiconDoc[] = [
   {

package/src/service-profile-ozone.ts

@@ -1,11 +1,11 @@
 import { AtpAgent } from '@atproto/api'
 import { Secp256k1Keypair } from '@atproto/crypto'
-import { TestPds } from './pds'
+import { TestPds } from './pds.js'
 import {
   ServiceMigrationOptions,
   ServiceProfile,
   ServiceUserDetails,
-} from './service-profile'
+} from './service-profile.js'
 
 export class OzoneServiceProfile extends ServiceProfile {
   static async create(

package/src/service-profile.ts

@@ -1,6 +1,6 @@
 import { AtpAgent } from '@atproto/api'
 import { DidString } from '@atproto/lex'
-import { TestPds } from './pds'
+import { TestPds } from './pds.js'
 
 export type ServiceUserDetails = {
   email: string

package/src/util.ts

@@ -2,9 +2,9 @@ import * as plc from '@did-plc/lib'
 import { request } from 'undici'
 import { Secp256k1Keypair } from '@atproto/crypto'
 import { IdResolver } from '@atproto/identity'
-import { TestBsky } from './bsky'
-import { TestPds } from './pds'
-import { DidAndKey } from './types'
+import { TestBsky } from './bsky.js'
+import { TestPds } from './pds.js'
+import { DidAndKey } from './types.js'
 
 export const mockNetworkUtilities = (pds: TestPds, bsky?: TestBsky) => {
   mockResolvers(pds.ctx.idResolver, pds)

package/tsconfig.build.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/bin.ts","./src/bsky.ts","./src/bsync.ts","./src/const.ts","./src/env.ts","./src/feed-gen.ts","./src/index.ts","./src/introspect.ts","./src/moderator-client.ts","./src/network-no-appview.ts","./src/network.ts","./src/ozone.ts","./src/pds.ts","./src/plc.ts","./src/service-profile-lexicon.ts","./src/service-profile-ozone.ts","./src/service-profile.ts","./src/types.ts","./src/util.ts","./src/mock/data.ts","./src/mock/index.ts","./src/mock/img/blur-hash-avatar-b64.ts","./src/mock/img/labeled-img-b64.ts","./src/seed/author-feed.ts","./src/seed/basic.ts","./src/seed/client.ts","./src/seed/follows.ts","./src/seed/index.ts","./src/seed/likes.ts","./src/seed/quotes.ts","./src/seed/reposts.ts","./src/seed/thread-v2.ts","./src/seed/users-bulk.ts","./src/seed/users.ts","./src/seed/verifications.ts"],"version":"5.8.2"}
+{"root":["./src/bin.ts","./src/bsky.ts","./src/bsync.ts","./src/const.ts","./src/env.ts","./src/feed-gen.ts","./src/index.ts","./src/introspect.ts","./src/moderator-client.ts","./src/network-no-appview.ts","./src/network.ts","./src/ozone.ts","./src/pds.ts","./src/plc.ts","./src/service-profile-lexicon.ts","./src/service-profile-ozone.ts","./src/service-profile.ts","./src/types.ts","./src/util.ts","./src/mock/data.ts","./src/mock/index.ts","./src/mock/img/blur-hash-avatar-b64.ts","./src/mock/img/labeled-img-b64.ts","./src/seed/author-feed.ts","./src/seed/basic.ts","./src/seed/client.ts","./src/seed/follows.ts","./src/seed/index.ts","./src/seed/likes.ts","./src/seed/quotes.ts","./src/seed/reposts.ts","./src/seed/thread-v2.ts","./src/seed/users-bulk.ts","./src/seed/users.ts","./src/seed/verifications.ts"],"version":"6.0.3"}