@atproto/dev-env 0.3.215 → 0.4.0

package/src/service-profile-ozone.ts

@@ -17,26 +17,26 @@ export class OzoneServiceProfile extends ServiceProfile {
       password: 'hunter2',
     },
   ) {
-    const client = pds.getClient()
-    await client.createAccount(userDetails)
+    const agent = pds.getAgent()
+    await agent.createAccount(userDetails)
 
     const key = await Secp256k1Keypair.create({ exportable: true })
 
-    return new OzoneServiceProfile(pds, client, userDetails, ozoneUrl, key)
+    return new OzoneServiceProfile(pds, agent, userDetails, ozoneUrl, key)
   }
 
   protected constructor(
     pds: TestPds,
-    client: AtpAgent,
+    agent: AtpAgent,
     userDetails: ServiceUserDetails,
     readonly ozoneUrl: string,
     readonly key: Secp256k1Keypair,
   ) {
-    super(pds, client, userDetails)
+    super(pds, agent, userDetails)
   }
 
   async createAppPasswordForVerification() {
-    const { data } = await this.client.com.atproto.server.createAppPassword({
+    const { data } = await this.agent.com.atproto.server.createAppPassword({
       name: 'ozone-verifier',
     })
     return data.password
@@ -60,7 +60,7 @@ export class OzoneServiceProfile extends ServiceProfile {
   }
 
   async createRecords() {
-    await this.client.app.bsky.actor.profile.create(
+    await this.agent.app.bsky.actor.profile.create(
       { repo: this.did },
       {
         displayName: 'Dev-env Moderation',
@@ -68,7 +68,7 @@ export class OzoneServiceProfile extends ServiceProfile {
       },
     )
 
-    await this.client.app.bsky.labeler.service.create(
+    await this.agent.app.bsky.labeler.service.create(
       { repo: this.did, rkey: 'self' },
       {
         policies: {

package/src/service-profile.ts

@@ -1,4 +1,5 @@
 import { AtpAgent } from '@atproto/api'
+import { DidString } from '@atproto/lex'
 import { TestPds } from './pds'
 
 export type ServiceUserDetails = {
@@ -16,25 +17,25 @@ export class ServiceProfile {
   protected constructor(
     protected pds: TestPds,
     /** @note assumes the session is already authenticated */
-    protected client: AtpAgent,
+    protected agent: AtpAgent,
     protected userDetails: ServiceUserDetails,
   ) {}
 
-  get did() {
-    return this.client.assertDid
+  get did(): DidString {
+    return this.agent.assertDid
   }
 
   async migrateTo(newPds: TestPds, options: ServiceMigrationOptions = {}) {
-    const newClient = newPds.getClient()
+    const newAgent = newPds.getAgent()
 
-    const newPdsDesc = await newClient.com.atproto.server.describeServer()
-    const serviceAuth = await this.client.com.atproto.server.getServiceAuth({
+    const newPdsDesc = await newAgent.com.atproto.server.describeServer()
+    const serviceAuth = await this.agent.com.atproto.server.getServiceAuth({
       aud: newPdsDesc.data.did,
       lxm: 'com.atproto.server.createAccount',
     })
 
     const inviteCode = newPds.ctx.cfg.invites.required
-      ? await newClient.com.atproto.server
+      ? await newAgent.com.atproto.server
           .createInviteCode(
             { useCount: 1 },
             {
@@ -45,7 +46,7 @@ export class ServiceProfile {
           .then((res) => res.data.code)
       : undefined
 
-    await newClient.createAccount(
+    await newAgent.createAccount(
       {
         ...this.userDetails,
         inviteCode,
@@ -62,12 +63,12 @@ export class ServiceProfile {
     // process of migrating, that didDoc references the old PDS. In order to
     // avoid calling the old PDS, let's clear the pdsUrl, which will result in
     // the (new) serviceUrl being used.
-    newClient.sessionManager.pdsUrl = undefined
+    newAgent.sessionManager.pdsUrl = undefined
 
     const newDidCredentialsRes =
-      await newClient.com.atproto.identity.getRecommendedDidCredentials()
+      await newAgent.com.atproto.identity.getRecommendedDidCredentials()
 
-    await this.client.com.atproto.identity.requestPlcOperationSignature()
+    await this.agent.com.atproto.identity.requestPlcOperationSignature()
     const { token } = await this.pds.ctx.accountManager.db.db
       .selectFrom('email_token')
       .select('token')
@@ -80,15 +81,15 @@ export class ServiceProfile {
     Object.assign((op.verificationMethods ??= {}), options.verificationMethods)
 
     const signedPlcOperation =
-      await this.client.com.atproto.identity.signPlcOperation(op)
+      await this.agent.com.atproto.identity.signPlcOperation(op)
 
-    await newClient.com.atproto.identity.submitPlcOperation({
+    await newAgent.com.atproto.identity.submitPlcOperation({
       operation: signedPlcOperation.data.operation,
     })
 
-    await newClient.com.atproto.server.activateAccount()
+    await newAgent.com.atproto.server.activateAccount()
 
     this.pds = newPds
-    this.client = newClient
+    this.agent = newAgent
   }
 }