@atproto/dev-env 0.3.215 → 0.4.0

package/dist/service-profile-ozone.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-profile-ozone.js","sourceRoot":"","sources":["../src/service-profile-ozone.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { Secp256k1Keypair } from '@atproto/crypto'\nimport { TestPds } from './pds'\nimport {\n  ServiceMigrationOptions,\n  ServiceProfile,\n  ServiceUserDetails,\n} from './service-profile'\n\nexport class OzoneServiceProfile extends ServiceProfile {\n  static async create(\n    pds: TestPds,\n    ozoneUrl: string,\n    userDetails = {\n      email: 'mod-authority@test.com',\n      handle: 'mod-authority.test',\n      password: 'hunter2',\n    },\n  ) {\n    const client = pds.getClient()\n    await client.createAccount(userDetails)\n\n    const key = await Secp256k1Keypair.create({ exportable: true })\n\n    return new OzoneServiceProfile(pds, client, userDetails, ozoneUrl, key)\n  }\n\n  protected constructor(\n    pds: TestPds,\n    client: AtpAgent,\n    userDetails: ServiceUserDetails,\n    readonly ozoneUrl: string,\n    readonly key: Secp256k1Keypair,\n  ) {\n    super(pds, client, userDetails)\n  }\n\n  async createAppPasswordForVerification() {\n    const { data } = await this.client.com.atproto.server.createAppPassword({\n      name: 'ozone-verifier',\n    })\n    return data.password\n  }\n\n  async migrateTo(pds: TestPds, options: ServiceMigrationOptions = {}) {\n    await super.migrateTo(pds, {\n      ...options,\n      services: {\n        ...options.services,\n        atproto_labeler: {\n          type: 'AtprotoLabeler',\n          endpoint: this.ozoneUrl,\n        },\n      },\n      verificationMethods: {\n        ...options.verificationMethods,\n        atproto_label: this.key.did(),\n      },\n    })\n  }\n\n  async createRecords() {\n    await this.client.app.bsky.actor.profile.create(\n      { repo: this.did },\n      {\n        displayName: 'Dev-env Moderation',\n        description: `The pretend version of mod.bsky.app`,\n      },\n    )\n\n    await this.client.app.bsky.labeler.service.create(\n      { repo: this.did, rkey: 'self' },\n      {\n        policies: {\n          labelValues: [\n            '!hide',\n            '!warn',\n            'porn',\n            'sexual',\n            'nudity',\n            'sexual-figurative',\n            'graphic-media',\n            'self-harm',\n            'sensitive',\n            'extremist',\n            'intolerant',\n            'threat',\n            'rude',\n            'illicit',\n            'security',\n            'unsafe-link',\n            'impersonation',\n            'misinformation',\n            'scam',\n            'engagement-farming',\n            'spam',\n            'rumor',\n            'misleading',\n            'inauthentic',\n          ],\n          labelValueDefinitions: [\n            {\n              identifier: 'spam',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Spam',\n                  description:\n                    'Unwanted, repeated, or unrelated actions that bother users.',\n                },\n              ],\n            },\n            {\n              identifier: 'impersonation',\n              blurs: 'none',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Impersonation',\n                  description:\n                    'Pretending to be someone else without permission.',\n                },\n              ],\n            },\n            {\n              identifier: 'scam',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Scam',\n                  description: 'Scams, phishing & fraud.',\n                },\n              ],\n            },\n            {\n              identifier: 'intolerant',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Intolerance',\n                  description: 'Discrimination against protected groups.',\n                },\n              ],\n            },\n            {\n              identifier: 'self-harm',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Self-Harm',\n                  description:\n                    'Promotes self-harm, including graphic images, glorifying discussions, or triggering stories.',\n                },\n              ],\n            },\n            {\n              identifier: 'security',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Security Concerns',\n                  description:\n                    'May be unsafe and could harm your device, steal your info, or get your account hacked.',\n                },\n              ],\n            },\n            {\n              identifier: 'misleading',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Misleading',\n                  description:\n                    'Altered images/videos, deceptive links, or false statements.',\n                },\n              ],\n            },\n            {\n              identifier: 'threat',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Threats',\n                  description:\n                    'Promotes violence or harm towards others, including threats, incitement, or advocacy of harm.',\n                },\n              ],\n            },\n            {\n              identifier: 'unsafe-link',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Unsafe link',\n                  description:\n                    'Links to harmful sites with malware, phishing, or violating content that risk security and privacy.',\n                },\n              ],\n            },\n            {\n              identifier: 'illicit',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Illicit',\n                  description:\n                    'Promoting or selling potentially illicit goods, services, or activities.',\n                },\n              ],\n            },\n            {\n              identifier: 'misinformation',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Misinformation',\n                  description:\n                    'Spreading false or misleading info, including unverified claims and harmful conspiracy theories.',\n                },\n              ],\n            },\n            {\n              identifier: 'rumor',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Rumor',\n                  description:\n                    'Approach with caution, as these claims lack evidence from credible sources.',\n                },\n              ],\n            },\n            {\n              identifier: 'rude',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Rude',\n                  description:\n                    'Rude or impolite, including crude language and disrespectful comments, without constructive purpose.',\n                },\n              ],\n            },\n            {\n              identifier: 'extremist',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Extremist',\n                  description:\n                    'Radical views advocating violence, hate, or discrimination against individuals or groups.',\n                },\n              ],\n            },\n            {\n              identifier: 'sensitive',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Sensitive',\n                  description:\n                    'May be upsetting, covering topics like substance abuse or mental health issues, cautioning sensitive viewers.',\n                },\n              ],\n            },\n            {\n              identifier: 'engagement-farming',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Engagement Farming',\n                  description:\n                    'Insincere content or bulk actions aimed at gaining followers, including frequent follows, posts, and likes.',\n                },\n              ],\n            },\n            {\n              identifier: 'inauthentic',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Inauthentic Account',\n                  description: 'Bot or a person pretending to be someone else.',\n                },\n              ],\n            },\n            {\n              identifier: 'sexual-figurative',\n              blurs: 'media',\n              severity: 'none',\n              defaultSetting: 'show',\n              adultOnly: true,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Sexually Suggestive (Cartoon)',\n                  description:\n                    'Art with explicit or suggestive sexual themes, including provocative imagery or partial nudity.',\n                },\n              ],\n            },\n          ],\n        },\n        createdAt: new Date().toISOString(),\n      },\n    )\n  }\n}\n"]}
+{"version":3,"file":"service-profile-ozone.js","sourceRoot":"","sources":["../src/service-profile-ozone.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { Secp256k1Keypair } from '@atproto/crypto'\nimport { TestPds } from './pds'\nimport {\n  ServiceMigrationOptions,\n  ServiceProfile,\n  ServiceUserDetails,\n} from './service-profile'\n\nexport class OzoneServiceProfile extends ServiceProfile {\n  static async create(\n    pds: TestPds,\n    ozoneUrl: string,\n    userDetails = {\n      email: 'mod-authority@test.com',\n      handle: 'mod-authority.test',\n      password: 'hunter2',\n    },\n  ) {\n    const agent = pds.getAgent()\n    await agent.createAccount(userDetails)\n\n    const key = await Secp256k1Keypair.create({ exportable: true })\n\n    return new OzoneServiceProfile(pds, agent, userDetails, ozoneUrl, key)\n  }\n\n  protected constructor(\n    pds: TestPds,\n    agent: AtpAgent,\n    userDetails: ServiceUserDetails,\n    readonly ozoneUrl: string,\n    readonly key: Secp256k1Keypair,\n  ) {\n    super(pds, agent, userDetails)\n  }\n\n  async createAppPasswordForVerification() {\n    const { data } = await this.agent.com.atproto.server.createAppPassword({\n      name: 'ozone-verifier',\n    })\n    return data.password\n  }\n\n  async migrateTo(pds: TestPds, options: ServiceMigrationOptions = {}) {\n    await super.migrateTo(pds, {\n      ...options,\n      services: {\n        ...options.services,\n        atproto_labeler: {\n          type: 'AtprotoLabeler',\n          endpoint: this.ozoneUrl,\n        },\n      },\n      verificationMethods: {\n        ...options.verificationMethods,\n        atproto_label: this.key.did(),\n      },\n    })\n  }\n\n  async createRecords() {\n    await this.agent.app.bsky.actor.profile.create(\n      { repo: this.did },\n      {\n        displayName: 'Dev-env Moderation',\n        description: `The pretend version of mod.bsky.app`,\n      },\n    )\n\n    await this.agent.app.bsky.labeler.service.create(\n      { repo: this.did, rkey: 'self' },\n      {\n        policies: {\n          labelValues: [\n            '!hide',\n            '!warn',\n            'porn',\n            'sexual',\n            'nudity',\n            'sexual-figurative',\n            'graphic-media',\n            'self-harm',\n            'sensitive',\n            'extremist',\n            'intolerant',\n            'threat',\n            'rude',\n            'illicit',\n            'security',\n            'unsafe-link',\n            'impersonation',\n            'misinformation',\n            'scam',\n            'engagement-farming',\n            'spam',\n            'rumor',\n            'misleading',\n            'inauthentic',\n          ],\n          labelValueDefinitions: [\n            {\n              identifier: 'spam',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Spam',\n                  description:\n                    'Unwanted, repeated, or unrelated actions that bother users.',\n                },\n              ],\n            },\n            {\n              identifier: 'impersonation',\n              blurs: 'none',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Impersonation',\n                  description:\n                    'Pretending to be someone else without permission.',\n                },\n              ],\n            },\n            {\n              identifier: 'scam',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Scam',\n                  description: 'Scams, phishing & fraud.',\n                },\n              ],\n            },\n            {\n              identifier: 'intolerant',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Intolerance',\n                  description: 'Discrimination against protected groups.',\n                },\n              ],\n            },\n            {\n              identifier: 'self-harm',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Self-Harm',\n                  description:\n                    'Promotes self-harm, including graphic images, glorifying discussions, or triggering stories.',\n                },\n              ],\n            },\n            {\n              identifier: 'security',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Security Concerns',\n                  description:\n                    'May be unsafe and could harm your device, steal your info, or get your account hacked.',\n                },\n              ],\n            },\n            {\n              identifier: 'misleading',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Misleading',\n                  description:\n                    'Altered images/videos, deceptive links, or false statements.',\n                },\n              ],\n            },\n            {\n              identifier: 'threat',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Threats',\n                  description:\n                    'Promotes violence or harm towards others, including threats, incitement, or advocacy of harm.',\n                },\n              ],\n            },\n            {\n              identifier: 'unsafe-link',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Unsafe link',\n                  description:\n                    'Links to harmful sites with malware, phishing, or violating content that risk security and privacy.',\n                },\n              ],\n            },\n            {\n              identifier: 'illicit',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Illicit',\n                  description:\n                    'Promoting or selling potentially illicit goods, services, or activities.',\n                },\n              ],\n            },\n            {\n              identifier: 'misinformation',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Misinformation',\n                  description:\n                    'Spreading false or misleading info, including unverified claims and harmful conspiracy theories.',\n                },\n              ],\n            },\n            {\n              identifier: 'rumor',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Rumor',\n                  description:\n                    'Approach with caution, as these claims lack evidence from credible sources.',\n                },\n              ],\n            },\n            {\n              identifier: 'rude',\n              blurs: 'content',\n              severity: 'inform',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Rude',\n                  description:\n                    'Rude or impolite, including crude language and disrespectful comments, without constructive purpose.',\n                },\n              ],\n            },\n            {\n              identifier: 'extremist',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Extremist',\n                  description:\n                    'Radical views advocating violence, hate, or discrimination against individuals or groups.',\n                },\n              ],\n            },\n            {\n              identifier: 'sensitive',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'warn',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Sensitive',\n                  description:\n                    'May be upsetting, covering topics like substance abuse or mental health issues, cautioning sensitive viewers.',\n                },\n              ],\n            },\n            {\n              identifier: 'engagement-farming',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Engagement Farming',\n                  description:\n                    'Insincere content or bulk actions aimed at gaining followers, including frequent follows, posts, and likes.',\n                },\n              ],\n            },\n            {\n              identifier: 'inauthentic',\n              blurs: 'content',\n              severity: 'alert',\n              defaultSetting: 'hide',\n              adultOnly: false,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Inauthentic Account',\n                  description: 'Bot or a person pretending to be someone else.',\n                },\n              ],\n            },\n            {\n              identifier: 'sexual-figurative',\n              blurs: 'media',\n              severity: 'none',\n              defaultSetting: 'show',\n              adultOnly: true,\n              locales: [\n                {\n                  lang: 'en',\n                  name: 'Sexually Suggestive (Cartoon)',\n                  description:\n                    'Art with explicit or suggestive sexual themes, including provocative imagery or partial nudity.',\n                },\n              ],\n            },\n          ],\n        },\n        createdAt: new Date().toISOString(),\n      },\n    )\n  }\n}\n"]}

package/dist/service-profile.d.ts

@@ -1,4 +1,5 @@
 import { AtpAgent } from '@atproto/api';
+import { DidString } from '@atproto/lex';
 import { TestPds } from './pds';
 export type ServiceUserDetails = {
     email: string;
@@ -12,12 +13,12 @@ export type ServiceMigrationOptions = {
 export declare class ServiceProfile {
     protected pds: TestPds;
     /** @note assumes the session is already authenticated */
-    protected client: AtpAgent;
+    protected agent: AtpAgent;
     protected userDetails: ServiceUserDetails;
     protected constructor(pds: TestPds, 
     /** @note assumes the session is already authenticated */
-    client: AtpAgent, userDetails: ServiceUserDetails);
-    get did(): string;
+    agent: AtpAgent, userDetails: ServiceUserDetails);
+    get did(): DidString;
     migrateTo(newPds: TestPds, options?: ServiceMigrationOptions): Promise<void>;
 }
 //# sourceMappingURL=service-profile.d.ts.map

package/dist/service-profile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-profile.d.ts","sourceRoot":"","sources":["../src/service-profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9C,CAAA;AAED,qBAAa,cAAc;IAEvB,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,yDAAyD;IACzD,SAAS,CAAC,MAAM,EAAE,QAAQ;IAC1B,SAAS,CAAC,WAAW,EAAE,kBAAkB;IAJ3C,SAAS,aACG,GAAG,EAAE,OAAO;IACtB,yDAAyD;IAC/C,MAAM,EAAE,QAAQ,EAChB,WAAW,EAAE,kBAAkB;IAG3C,IAAI,GAAG,WAEN;IAEK,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,GAAE,uBAA4B;CAmEvE"}
+{"version":3,"file":"service-profile.d.ts","sourceRoot":"","sources":["../src/service-profile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAClC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9C,CAAA;AAED,qBAAa,cAAc;IAEvB,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,yDAAyD;IACzD,SAAS,CAAC,KAAK,EAAE,QAAQ;IACzB,SAAS,CAAC,WAAW,EAAE,kBAAkB;IAJ3C,SAAS,aACG,GAAG,EAAE,OAAO;IACtB,yDAAyD;IAC/C,KAAK,EAAE,QAAQ,EACf,WAAW,EAAE,kBAAkB;IAG3C,IAAI,GAAG,IAAI,SAAS,CAEnB;IAEK,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,GAAE,uBAA4B;CAmEvE"}

package/dist/service-profile.js

@@ -4,18 +4,18 @@ exports.ServiceProfile = void 0;
 class ServiceProfile {
     constructor(pds, 
     /** @note assumes the session is already authenticated */
-    client, userDetails) {
+    agent, userDetails) {
         Object.defineProperty(this, "pds", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: pds
         });
-        Object.defineProperty(this, "client", {
+        Object.defineProperty(this, "agent", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: client
+            value: agent
         });
         Object.defineProperty(this, "userDetails", {
             enumerable: true,
@@ -25,24 +25,24 @@ class ServiceProfile {
         });
     }
     get did() {
-        return this.client.assertDid;
+        return this.agent.assertDid;
     }
     async migrateTo(newPds, options = {}) {
-        const newClient = newPds.getClient();
-        const newPdsDesc = await newClient.com.atproto.server.describeServer();
-        const serviceAuth = await this.client.com.atproto.server.getServiceAuth({
+        const newAgent = newPds.getAgent();
+        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 }, {
                 encoding: 'application/json',
                 headers: newPds.adminAuthHeaders(),
             })
                 .then((res) => res.data.code)
             : undefined;
-        await newClient.createAccount({
+        await newAgent.createAccount({
             ...this.userDetails,
             inviteCode,
             did: this.did,
@@ -55,9 +55,9 @@ 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;
-        const newDidCredentialsRes = await newClient.com.atproto.identity.getRecommendedDidCredentials();
-        await this.client.com.atproto.identity.requestPlcOperationSignature();
+        newAgent.sessionManager.pdsUrl = undefined;
+        const newDidCredentialsRes = await newAgent.com.atproto.identity.getRecommendedDidCredentials();
+        await this.agent.com.atproto.identity.requestPlcOperationSignature();
         const { token } = await this.pds.ctx.accountManager.db.db
             .selectFrom('email_token')
             .select('token')
@@ -67,13 +67,13 @@ class ServiceProfile {
         const op = { ...newDidCredentialsRes.data, token };
         Object.assign((op.services ?? (op.services = {})), options.services);
         Object.assign((op.verificationMethods ?? (op.verificationMethods = {})), options.verificationMethods);
-        const signedPlcOperation = await this.client.com.atproto.identity.signPlcOperation(op);
-        await newClient.com.atproto.identity.submitPlcOperation({
+        const signedPlcOperation = await this.agent.com.atproto.identity.signPlcOperation(op);
+        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;
     }
 }
 exports.ServiceProfile = ServiceProfile;

package/dist/service-profile.js.map

@@ -1 +1 @@
-{"version":3,"file":"service-profile.js","sourceRoot":"","sources":["../src/service-profile.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { TestPds } from './pds'\n\nexport type ServiceUserDetails = {\n  email: string\n  handle: string\n  password: string\n}\n\nexport type ServiceMigrationOptions = {\n  services?: Record<string, unknown>\n  verificationMethods?: Record<string, unknown>\n}\n\nexport class ServiceProfile {\n  protected constructor(\n    protected pds: TestPds,\n    /** @note assumes the session is already authenticated */\n    protected client: AtpAgent,\n    protected userDetails: ServiceUserDetails,\n  ) {}\n\n  get did() {\n    return this.client.assertDid\n  }\n\n  async migrateTo(newPds: TestPds, options: ServiceMigrationOptions = {}) {\n    const newClient = newPds.getClient()\n\n    const newPdsDesc = await newClient.com.atproto.server.describeServer()\n    const serviceAuth = await this.client.com.atproto.server.getServiceAuth({\n      aud: newPdsDesc.data.did,\n      lxm: 'com.atproto.server.createAccount',\n    })\n\n    const inviteCode = newPds.ctx.cfg.invites.required\n      ? await newClient.com.atproto.server\n          .createInviteCode(\n            { useCount: 1 },\n            {\n              encoding: 'application/json',\n              headers: newPds.adminAuthHeaders(),\n            },\n          )\n          .then((res) => res.data.code)\n      : undefined\n\n    await newClient.createAccount(\n      {\n        ...this.userDetails,\n        inviteCode,\n        did: this.did,\n      },\n      {\n        encoding: 'application/json',\n        headers: { authorization: `Bearer ${serviceAuth.data.token}` },\n      },\n    )\n\n    // The session manager will use the \"didDoc\" in the result of\n    // \"createAccount\" in order to setup the pdsUrl. However, since are in the\n    // process of migrating, that didDoc references the old PDS. In order to\n    // avoid calling the old PDS, let's clear the pdsUrl, which will result in\n    // the (new) serviceUrl being used.\n    newClient.sessionManager.pdsUrl = undefined\n\n    const newDidCredentialsRes =\n      await newClient.com.atproto.identity.getRecommendedDidCredentials()\n\n    await this.client.com.atproto.identity.requestPlcOperationSignature()\n    const { token } = await this.pds.ctx.accountManager.db.db\n      .selectFrom('email_token')\n      .select('token')\n      .where('did', '=', this.did)\n      .where('purpose', '=', 'plc_operation')\n      .executeTakeFirstOrThrow()\n\n    const op = { ...newDidCredentialsRes.data, token }\n    Object.assign((op.services ??= {}), options.services)\n    Object.assign((op.verificationMethods ??= {}), options.verificationMethods)\n\n    const signedPlcOperation =\n      await this.client.com.atproto.identity.signPlcOperation(op)\n\n    await newClient.com.atproto.identity.submitPlcOperation({\n      operation: signedPlcOperation.data.operation,\n    })\n\n    await newClient.com.atproto.server.activateAccount()\n\n    this.pds = newPds\n    this.client = newClient\n  }\n}\n"]}
+{"version":3,"file":"service-profile.js","sourceRoot":"","sources":["../src/service-profile.ts"],"names":[],"mappings":"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","sourcesContent":["import { AtpAgent } from '@atproto/api'\nimport { DidString } from '@atproto/lex'\nimport { TestPds } from './pds'\n\nexport type ServiceUserDetails = {\n  email: string\n  handle: string\n  password: string\n}\n\nexport type ServiceMigrationOptions = {\n  services?: Record<string, unknown>\n  verificationMethods?: Record<string, unknown>\n}\n\nexport class ServiceProfile {\n  protected constructor(\n    protected pds: TestPds,\n    /** @note assumes the session is already authenticated */\n    protected agent: AtpAgent,\n    protected userDetails: ServiceUserDetails,\n  ) {}\n\n  get did(): DidString {\n    return this.agent.assertDid\n  }\n\n  async migrateTo(newPds: TestPds, options: ServiceMigrationOptions = {}) {\n    const newAgent = newPds.getAgent()\n\n    const newPdsDesc = await newAgent.com.atproto.server.describeServer()\n    const serviceAuth = await this.agent.com.atproto.server.getServiceAuth({\n      aud: newPdsDesc.data.did,\n      lxm: 'com.atproto.server.createAccount',\n    })\n\n    const inviteCode = newPds.ctx.cfg.invites.required\n      ? await newAgent.com.atproto.server\n          .createInviteCode(\n            { useCount: 1 },\n            {\n              encoding: 'application/json',\n              headers: newPds.adminAuthHeaders(),\n            },\n          )\n          .then((res) => res.data.code)\n      : undefined\n\n    await newAgent.createAccount(\n      {\n        ...this.userDetails,\n        inviteCode,\n        did: this.did,\n      },\n      {\n        encoding: 'application/json',\n        headers: { authorization: `Bearer ${serviceAuth.data.token}` },\n      },\n    )\n\n    // The session manager will use the \"didDoc\" in the result of\n    // \"createAccount\" in order to setup the pdsUrl. However, since are in the\n    // process of migrating, that didDoc references the old PDS. In order to\n    // avoid calling the old PDS, let's clear the pdsUrl, which will result in\n    // the (new) serviceUrl being used.\n    newAgent.sessionManager.pdsUrl = undefined\n\n    const newDidCredentialsRes =\n      await newAgent.com.atproto.identity.getRecommendedDidCredentials()\n\n    await this.agent.com.atproto.identity.requestPlcOperationSignature()\n    const { token } = await this.pds.ctx.accountManager.db.db\n      .selectFrom('email_token')\n      .select('token')\n      .where('did', '=', this.did)\n      .where('purpose', '=', 'plc_operation')\n      .executeTakeFirstOrThrow()\n\n    const op = { ...newDidCredentialsRes.data, token }\n    Object.assign((op.services ??= {}), options.services)\n    Object.assign((op.verificationMethods ??= {}), options.verificationMethods)\n\n    const signedPlcOperation =\n      await this.agent.com.atproto.identity.signPlcOperation(op)\n\n    await newAgent.com.atproto.identity.submitPlcOperation({\n      operation: signedPlcOperation.data.operation,\n    })\n\n    await newAgent.com.atproto.server.activateAccount()\n\n    this.pds = newPds\n    this.agent = newAgent\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/dev-env",
-  "version": "0.3.215",
+  "version": "0.4.0",
   "license": "MIT",
   "description": "Local development environment helper for atproto development",
   "keywords": [
@@ -14,7 +14,7 @@
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "bin": "dist/bin.js",
+  "bin": "bin.js",
   "engines": {
     "node": ">=18.7.0"
   },
@@ -27,18 +27,19 @@
     "multiformats": "^9.9.0",
     "uint8arrays": "3.0.0",
     "undici": "^6.14.1",
-    "@atproto/api": "^0.19.4",
-    "@atproto/bsky": "^0.0.221",
+    "@atproto/api": "^0.19.5",
+    "@atproto/bsky": "^0.0.222",
     "@atproto/bsync": "^0.0.25",
     "@atproto/common-web": "^0.4.19",
     "@atproto/crypto": "^0.4.5",
     "@atproto/identity": "^0.4.12",
+    "@atproto/lex": "^0.0.23",
     "@atproto/lexicon": "^0.6.2",
-    "@atproto/ozone": "^0.1.167",
-    "@atproto/pds": "^0.4.216",
-    "@atproto/sync": "^0.1.40",
-    "@atproto/syntax": "^0.5.1",
-    "@atproto/xrpc-server": "^0.10.17"
+    "@atproto/ozone": "^0.1.168",
+    "@atproto/pds": "^0.4.217",
+    "@atproto/sync": "^0.2.0",
+    "@atproto/syntax": "^0.5.2",
+    "@atproto/xrpc-server": "^0.10.18"
   },
   "devDependencies": {
     "@types/express": "^4.17.13",

package/src/bsky.ts

@@ -4,6 +4,7 @@ import * as ui8 from 'uint8arrays'
 import { AtpAgent } from '@atproto/api'
 import * as bsky from '@atproto/bsky'
 import { Secp256k1Keypair } from '@atproto/crypto'
+import { Client } from '@atproto/lex'
 import { ADMIN_PASSWORD, EXAMPLE_LABELER } from './const'
 import { BskyConfig } from './types'
 export * from '@atproto/bsky'
@@ -130,12 +131,18 @@ export class TestBsky {
     return this.server.ctx
   }
 
-  getClient(): AtpAgent {
+  getAgent(): AtpAgent {
     const agent = new AtpAgent({ service: this.url })
     agent.configureLabelers([EXAMPLE_LABELER])
     return agent
   }
 
+  getClient(): Client {
+    const client = new Client({ service: this.url })
+    client.setLabelers([EXAMPLE_LABELER])
+    return client
+  }
+
   adminAuth(): string {
     const [password] = this.ctx.cfg.adminPasswords
     return (

package/src/feed-gen.ts

@@ -1,11 +1,11 @@
 import events from 'node:events'
 import http from 'node:http'
 import * as plc from '@did-plc/lib'
-import express from 'express'
 import getPort from 'get-port'
 import { Secp256k1Keypair } from '@atproto/crypto'
-import { SkeletonHandler, createLexiconServer } from '@atproto/pds'
-import { InvalidRequestError } from '@atproto/xrpc-server'
+import { SkeletonHandler, app } from '@atproto/pds'
+import { AtUriString, DidString } from '@atproto/syntax'
+import { InvalidRequestError, createServer } from '@atproto/xrpc-server'
 
 export class TestFeedGen {
   destroyed = false
@@ -22,10 +22,9 @@ export class TestFeedGen {
   ): Promise<TestFeedGen> {
     const port = await getPort()
     const did = await createFgDid(plcUrl, port)
-    const app = express()
-    const lexServer = createLexiconServer()
+    const xrpcServer = createServer()
 
-    lexServer.app.bsky.feed.getFeedSkeleton(async (args) => {
+    xrpcServer.add(app.bsky.feed.getFeedSkeleton, async (args) => {
       const handler = feeds[args.params.feed]
       if (!handler) {
         throw new InvalidRequestError('unknown feed', 'UnknownFeed')
@@ -33,22 +32,21 @@ export class TestFeedGen {
       return handler(args)
     })
 
-    lexServer.app.bsky.feed.describeFeedGenerator(async () => {
+    xrpcServer.add(app.bsky.feed.describeFeedGenerator, async () => {
       return {
-        encoding: 'application/json',
+        encoding: 'application/json' as const,
         body: {
-          did,
-          feeds: Object.keys(feeds).map((uri) => ({
+          did: did as DidString,
+          feeds: (Object.keys(feeds) as AtUriString[]).map((uri) => ({
             uri,
           })),
         },
       }
     })
 
-    app.use(lexServer.xrpc.router)
-    const server = app.listen(port)
-    await events.once(server, 'listening')
-    return new TestFeedGen(port, server, did)
+    const httpServer = xrpcServer.listen(port)
+    await events.once(httpServer, 'listening')
+    return new TestFeedGen(port, httpServer, did)
   }
 
   close(): Promise<void> {
@@ -63,7 +61,10 @@ export class TestFeedGen {
   }
 }
 
-const createFgDid = async (plcUrl: string, port: number): Promise<string> => {
+const createFgDid = async (
+  plcUrl: string,
+  port: number,
+): Promise<DidString> => {
   const keypair = await Secp256k1Keypair.create()
   const plcClient = new plc.Client(plcUrl)
   const op = await plc.signOperation(
@@ -86,5 +87,5 @@ const createFgDid = async (plcUrl: string, port: number): Promise<string> => {
   )
   const did = await plc.didForCreateOp(op)
   await plcClient.sendOperation(did, op)
-  return did
+  return did as DidString
 }

package/src/mock/index.ts

@@ -1,6 +1,6 @@
 import { AtpAgent, COM_ATPROTO_MODERATION } from '@atproto/api'
 import { Database } from '@atproto/bsky'
-import { AtUri } from '@atproto/syntax'
+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'
@@ -78,19 +78,19 @@ export async function generateMockSetup(env: TestNetwork) {
 
   const userAgents = await Promise.all(
     users.map(async (user) => {
-      const client: AtpAgent = env.pds.getClient()
-      await client.createAccount(user)
-      client.assertAuthenticated()
+      const agent: AtpAgent = env.pds.getAgent()
+      await agent.createAccount(user)
+      agent.assertAuthenticated()
       if (user.displayName || user.description) {
-        await client.app.bsky.actor.profile.create(
-          { repo: client.did },
+        await agent.app.bsky.actor.profile.create(
+          { repo: agent.did },
           {
             displayName: user.displayName,
             description: user.description,
           },
         )
       }
-      return client
+      return agent
     }),
   )
 
@@ -269,7 +269,7 @@ export async function generateMockSetup(env: TestNetwork) {
     [fg1Uri.toString()]: async () => {
       const feed = posts
         .filter(() => rand(2) === 0)
-        .map((post) => ({ post: post.uri }))
+        .map((post) => ({ post: post.uri as AtUriString }))
       return {
         encoding: 'application/json',
         body: {
@@ -323,7 +323,7 @@ export async function generateMockSetup(env: TestNetwork) {
     [fg2Uri.toString()]: async () => {
       const feed = posts
         .filter(() => rand(2) === 0)
-        .map((post) => ({ post: post.uri }))
+        .map((post) => ({ post: post.uri as AtUriString }))
       return {
         encoding: 'application/json',
         body: {
@@ -362,7 +362,7 @@ export async function generateMockSetup(env: TestNetwork) {
     [fg3Uri.toString()]: async () => {
       const feed = posts
         .filter(() => rand(2) === 0)
-        .map((post) => ({ post: post.uri }))
+        .map((post) => ({ post: post.uri as AtUriString }))
       return {
         encoding: 'application/json',
         body: {

package/src/moderator-client.ts

@@ -17,7 +17,7 @@ type ModLevel = 'admin' | 'moderator' | 'triage'
 export class ModeratorClient {
   agent: AtpAgent
   constructor(public ozone: TestOzone) {
-    this.agent = ozone.getClient()
+    this.agent = ozone.getAgent()
   }
 
   async getEvent(id: number, role?: ModLevel) {

package/src/network-no-appview.ts

@@ -36,8 +36,9 @@ export class TestNetworkNoAppView {
   }
 
   getSeedClient(): SeedClient<typeof this> {
-    const agent = this.pds.getClient()
-    return new SeedClient(this, agent)
+    const agent = this.pds.getAgent()
+    const client = this.pds.getClient()
+    return new SeedClient(this, agent, client)
   }
 
   async processAll() {

package/src/ozone.ts

@@ -103,7 +103,7 @@ export class TestOzone {
     return this.server.ctx
   }
 
-  getClient(): AtpAgent {
+  getAgent(): AtpAgent {
     const agent = new AtpAgent({ service: this.url })
     agent.configureLabelers([EXAMPLE_LABELER])
     return agent

package/src/pds.ts

@@ -5,6 +5,7 @@ import getPort from 'get-port'
 import * as ui8 from 'uint8arrays'
 import { AtpAgent } from '@atproto/api'
 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'
@@ -77,12 +78,18 @@ export class TestPds {
     return this.server.ctx
   }
 
-  getClient(): AtpAgent {
+  getAgent(): AtpAgent {
     const agent = new AtpAgent({ service: this.url })
     agent.configureLabelers([EXAMPLE_LABELER])
     return agent
   }
 
+  getClient(): Client {
+    const client = new Client({ service: this.url })
+    client.setLabelers([EXAMPLE_LABELER])
+    return client
+  }
+
   adminAuth(): string {
     return (
       'Basic ' +

package/src/seed/client.ts

@@ -14,8 +14,9 @@ import {
   AtpAgent,
   ComAtprotoModerationCreateReport,
 } from '@atproto/api'
+import { CidString, Client } from '@atproto/lex'
 import { BlobRef } from '@atproto/lexicon'
-import { AtUri } from '@atproto/syntax'
+import { AtUri, AtUriString, DidString } from '@atproto/syntax'
 import { TestNetworkNoAppView } from '../network-no-appview'
 
 // Makes it simple to create data via the XRPC client,
@@ -44,18 +45,18 @@ export class RecordRef {
     this.cid = CID.parse(cid.toString())
   }
 
-  get raw(): { uri: string; cid: string } {
+  get raw(): { uri: AtUriString; cid: CidString } {
     return {
       uri: this.uri.toString(),
       cid: this.cid.toString(),
     }
   }
 
-  get uriStr(): string {
+  get uriStr(): AtUriString {
     return this.uri.toString()
   }
 
-  get cidStr(): string {
+  get cidStr(): CidString {
     return this.cid.toString()
   }
 }
@@ -66,7 +67,7 @@ export class SeedClient<
   accounts: Record<
     string,
     {
-      did: string
+      did: DidString
       accessJwt: string
       refreshJwt: string
       handle: string
@@ -120,11 +121,12 @@ export class SeedClient<
 
   verifications: Record<string, Record<string, AtUri>>
 
-  dids: Record<string, string>
+  dids: Record<string, DidString>
 
   constructor(
     public network: Network,
     public agent: AtpAgent,
+    public client: Client,
   ) {
     this.accounts = {}
     this.profiles = {}
@@ -153,9 +155,11 @@ export class SeedClient<
   ) {
     const { data: account } =
       await this.agent.com.atproto.server.createAccount(params)
-    this.dids[shortName] = account.did
+    const did = account.did as DidString
+    this.dids[shortName] = did
     this.accounts[account.did] = {
       ...account,
+      did,
       email: params.email,
       password: params.password,
     }

package/src/service-profile-lexicon.ts

@@ -77,14 +77,14 @@ export class LexiconAuthorityProfile extends ServiceProfile {
       password: 'hunter2',
     },
   ) {
-    const client = pds.getClient()
-    await client.createAccount(userDetails)
+    const agent = pds.getAgent()
+    await agent.createAccount(userDetails)
 
-    return new LexiconAuthorityProfile(pds, client, userDetails)
+    return new LexiconAuthorityProfile(pds, agent, userDetails)
   }
 
   async createRecords() {
-    await this.client.app.bsky.actor.profile.create(
+    await this.agent.app.bsky.actor.profile.create(
       { repo: this.did },
       {
         displayName: 'Lexicon Authority',
@@ -93,7 +93,7 @@ export class LexiconAuthorityProfile extends ServiceProfile {
     )
 
     for (const doc of LEXICONS) {
-      await this.client.com.atproto.repo.createRecord({
+      await this.agent.com.atproto.repo.createRecord({
         repo: this.did,
         collection: 'com.atproto.lexicon.schema',
         rkey: doc.id,