Finalize PDS in-process AppView removal

.github/workflows/build-and-push-bsky-aws.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - simplify-pds
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

.github/workflows/build-and-push-bsky-ghcr.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - simplify-pds
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

package.json

@@ -13,8 +13,8 @@
     "verify": "lerna run verify --stream",
     "prettier": "lerna run prettier",
     "build": "lerna run build",
-    "test": "NODE_ENV=development lerna run test --stream",
-    "test:withFlags": "NODE_ENV=development lerna run test --stream --"
+    "test": "LOG_ENABLED=false NODE_ENV=development lerna run test --stream",
+    "test:withFlags": "LOG_ENABLED=false NODE_ENV=development lerna run test --stream --"
   },
   "devDependencies": {
     "@babel/core": "^7.18.6",

packages/api/package.json

@@ -29,6 +29,6 @@
   },
   "devDependencies": {
     "@atproto/lex-cli": "*",
-    "@atproto/pds": "*"
+    "@atproto/pds": "* | >=0.2.0-beta.0"
   }
 }

packages/api/tests/agent.test.ts

@@ -197,7 +197,7 @@ describe('agent', () => {
 
     // put the agent through the auth flow
     AtpAgent.configure({ fetch: tokenExpiredFetchHandler })
-    const res1 = await agent.api.app.bsky.feed.getTimeline()
+    const res1 = await createPost(agent)
     AtpAgent.configure({ fetch: defaultFetchHandler })
 
     expect(res1.success).toEqual(true)
@@ -267,9 +267,9 @@ describe('agent', () => {
     // put the agent through the auth flow
     AtpAgent.configure({ fetch: tokenExpiredFetchHandler })
     const [res1, res2, res3] = await Promise.all([
-      agent.api.app.bsky.feed.getTimeline(),
-      agent.api.app.bsky.feed.getTimeline(),
-      agent.api.app.bsky.feed.getTimeline(),
+      createPost(agent),
+      createPost(agent),
+      createPost(agent),
     ])
     AtpAgent.configure({ fetch: defaultFetchHandler })
 
@@ -462,3 +462,14 @@ describe('agent', () => {
     })
   })
 })
+
+const createPost = async (agent: AtpAgent) => {
+  return agent.api.com.atproto.repo.createRecord({
+    repo: agent.session?.did ?? '',
+    collection: 'app.bsky.feed.post',
+    record: {
+      text: 'hello there',
+      createdAt: new Date().toISOString(),
+    },
+  })
+}

packages/api/tests/bsky-agent.test.ts

@@ -20,6 +20,20 @@ describe('agent', () => {
     await close()
   })
 
+  const getProfileDisplayName = async (
+    agent: BskyAgent,
+  ): Promise<string | undefined> => {
+    try {
+      const res = await agent.api.app.bsky.actor.profile.get({
+        repo: agent.session?.did || '',
+        rkey: 'self',
+      })
+      return res.value.displayName ?? ''
+    } catch (err) {
+      return undefined
+    }
+  }
+
   it('upsertProfile correctly creates and updates profiles.', async () => {
     const agent = new BskyAgent({ service: server.url })
 
@@ -29,8 +43,8 @@ describe('agent', () => {
       password: 'password',
     })
 
-    const profile1 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile1.data.displayName).toBeFalsy()
+    const displayName1 = await await getProfileDisplayName(agent)
+    expect(displayName1).toBeFalsy()
 
     await agent.upsertProfile((existing) => {
       expect(existing).toBeFalsy()
@@ -39,8 +53,8 @@ describe('agent', () => {
       }
     })
 
-    const profile2 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile2.data.displayName).toBe('Bob')
+    const displayName2 = await await getProfileDisplayName(agent)
+    expect(displayName2).toBe('Bob')
 
     await agent.upsertProfile((existing) => {
       expect(existing).toBeTruthy()
@@ -49,8 +63,8 @@ describe('agent', () => {
       }
     })
 
-    const profile3 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile3.data.displayName).toBe('BOB')
+    const displayName3 = await await getProfileDisplayName(agent)
+    expect(displayName3).toBe('BOB')
   })
 
   it('upsertProfile correctly handles CAS failures.', async () => {
@@ -62,8 +76,8 @@ describe('agent', () => {
       password: 'password',
     })
 
-    const profile1 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile1.data.displayName).toBeFalsy()
+    const displayName1 = await await getProfileDisplayName(agent)
+    expect(displayName1).toBeFalsy()
 
     let hasConflicted = false
     let ranTwice = false
@@ -88,8 +102,8 @@ describe('agent', () => {
     })
     expect(ranTwice).toBe(true)
 
-    const profile2 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile2.data.displayName).toBe('Bob')
+    const displayName2 = await await getProfileDisplayName(agent)
+    expect(displayName2).toBe('Bob')
   })
 
   it('upsertProfile wont endlessly retry CAS failures.', async () => {
@@ -101,8 +115,8 @@ describe('agent', () => {
       password: 'password',
     })
 
-    const profile1 = await agent.getProfile({ actor: agent.session?.did || '' })
-    expect(profile1.data.displayName).toBeFalsy()
+    const displayName1 = await await getProfileDisplayName(agent)
+    expect(displayName1).toBeFalsy()
 
     const p = agent.upsertProfile(async (existing) => {
       await agent.com.atproto.repo.putRecord({

packages/bsky/package.json

@@ -60,7 +60,7 @@
     "@atproto/api": "*",
     "@atproto/dev-env": "*",
     "@atproto/lex-cli": "*",
-    "@atproto/pds": "*",
+    "@atproto/pds": "* | >=0.2.0-beta.0",
     "@atproto/xrpc": "*",
     "@did-plc/server": "^0.0.1",
     "@types/cors": "^2.8.12",

packages/common/src/logger.ts

@@ -7,7 +7,7 @@ const enabledSystems = (process.env.LOG_SYSTEMS || '')
 
 const enabledEnv = process.env.LOG_ENABLED
 const enabled =
-  enabledEnv === 'true' || enabledEnv === 't' || enabledEnv === '1'
+  enabledEnv !== 'false' && enabledEnv !== 'f' && enabledEnv !== '0'
 
 const level = process.env.LOG_LEVEL || 'info'
 

packages/dev-env/package.json

@@ -25,7 +25,7 @@
     "@atproto/bsky": "*",
     "@atproto/crypto": "*",
     "@atproto/identity": "*",
-    "@atproto/pds": "*",
+    "@atproto/pds": "* | >=0.2.0-beta.0",
     "@atproto/uri": "*",
     "@atproto/xrpc-server": "*",
     "@did-plc/lib": "^0.0.1",

packages/dev-env/src/bin.ts

@@ -13,7 +13,7 @@ const run = async () => {
 [ created by Bluesky ]`)
 
   const network = await TestNetworkNoAppView.create({
-    pds: { port: 2583, publicUrl: 'http://localhost:2583' },
+    pds: { port: 2583, hostname: 'localhost' },
     plc: { port: 2582 },
   })
   await generateMockSetup(network)

packages/dev-env/src/mock/index.ts

@@ -186,30 +186,31 @@ export async function generateMockSetup(env: TestNetworkNoAppView) {
     },
   )
 
-  const ctx = env.pds.ctx
-  if (ctx) {
-    await ctx.db.db
-      .insertInto('label')
-      .values([
-        {
-          src: ctx.cfg.labelerDid,
-          uri: labeledPost.uri,
-          cid: labeledPost.cid,
-          val: 'nudity',
-          neg: 0,
-          cts: new Date().toISOString(),
-        },
-        {
-          src: ctx.cfg.labelerDid,
-          uri: filteredPost.uri,
-          cid: filteredPost.cid,
-          val: 'dmca-violation',
-          neg: 0,
-          cts: new Date().toISOString(),
-        },
-      ])
-      .execute()
-  }
+  // @TODO get from appview instead
+  // const ctx = env.pds.ctx
+  // if (ctx) {
+  //   await ctx.db.db
+  //     .insertInto('label')
+  //     .values([
+  //       {
+  //         src: ctx.cfg.labelerDid,
+  //         uri: labeledPost.uri,
+  //         cid: labeledPost.cid,
+  //         val: 'nudity',
+  //         neg: 0,
+  //         cts: new Date().toISOString(),
+  //       },
+  //       {
+  //         src: ctx.cfg.labelerDid,
+  //         uri: filteredPost.uri,
+  //         cid: filteredPost.cid,
+  //         val: 'dmca-violation',
+  //         neg: 0,
+  //         cts: new Date().toISOString(),
+  //       },
+  //     ])
+  //     .execute()
+  // }
 
   // a set of replies
   for (let i = 0; i < 100; i++) {

packages/dev-env/src/network-no-appview.ts

@@ -15,12 +15,16 @@ export class TestNetworkNoAppView {
     const dbPostgresUrl = params.dbPostgresUrl || process.env.DB_POSTGRES_URL
     const dbPostgresSchema =
       params.dbPostgresSchema || process.env.DB_POSTGRES_SCHEMA
+    const dbSqliteLocation =
+      dbPostgresUrl === undefined ? ':memory:' : undefined
 
     const plc = await TestPlc.create(params.plc ?? {})
     const pds = await TestPds.create({
       dbPostgresUrl,
       dbPostgresSchema,
-      plcUrl: plc.url,
+      dbPostgresPoolSize: 5,
+      dbSqliteLocation,
+      didPlcUrl: plc.url,
       ...params.pds,
     })
 

packages/dev-env/src/network.ts

@@ -42,8 +42,9 @@ export class TestNetwork extends TestNetworkNoAppView {
       port: pdsPort,
       dbPostgresUrl,
       dbPostgresSchema,
-      plcUrl: plc.url,
-      bskyAppViewEndpoint: bsky.url,
+      dbPostgresPoolSize: 5,
+      didPlcUrl: plc.url,
+      bskyAppViewUrl: bsky.url,
       bskyAppViewDid: bsky.ctx.cfg.serverDid,
       ...params.pds,
     })