Merge remote-tracking branch 'origin/main' into eric/mute-words-enhan…

…cements

* origin/main: (181 commits)
  Minor OAuth client fixes (#2640)
  Version packages (#2639)
  OAuth: 2FA (#2633)
  Version packages (#2622)
  Update data source for `getSuggestedFollowsByActor` (#2630)
  Add in-memory did cache to Ozone backend (#2635)
  Filter out reference lists from `getLists` (#2629)
  lexicons: add missing ozone Tag event type to unions (#2632)
  ✨ Add ozone proxy for getLikes and getRepostedBy (#2624)
  Upgrade pnpm/action-setup in workflows (#2625)
  ✨ Add proxy for user typeahead through ozone (#2612)
  Fix development commands (#2623)
  Add starter packs to post hydration (#2613)
  Social proof blocks (#2603)
  Appview: apply hosting status in getRecord (#2620)
  Add `labelersPref` to `getPreferences` union return types (#2554)
  Version packages (#2618)
  Add new preference and api for bsky app state; also put preference updates within transactional lock regions (#2492)
  remove mentions of sandbox (#2611)
  Appview: simple fix for no-hosted known followers (#2609)
  ...

.eslintrc

@@ -13,20 +13,12 @@
     "plugin:prettier/recommended",
     "prettier"
   ],
-  "ignorePatterns": [
-    "dist",
-    "node_modules",
-    "jest.config.base.js",
-    "jest.bench.config.js",
-    "jest.config.js",
-    "babel.config.js",
-    "build.js",
-    "update-pkg.js"
-  ],
+  "ignorePatterns": ["dist", "node_modules"],
   "rules": {
     "no-var": "error",
     "prefer-const": "warn",
     "no-misleading-character-class": "warn",
+    "eqeqeq": ["error", "always", { "null": "ignore" }],
     "@typescript-eslint/no-unused-vars": [
       "warn",
       { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
@@ -36,5 +28,21 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-empty-function": "off",
     "@typescript-eslint/no-explicit-any": "off"
-  }
+  },
+  "overrides": [
+    {
+      "files": ["jest.config.js"],
+      "env": { "commonjs": true }
+    },
+    {
+      "files": ["jest.setup.js"],
+      "env": { "jest": true }
+    },
+    {
+      "files": "*.js",
+      "rules": {
+        "@typescript-eslint/no-var-requires": "off"
+      }
+    }
+  ]
 }

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

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - divy/appview-getrecord-nohost
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

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

@@ -2,8 +2,7 @@ name: build-and-push-bsync-aws
 on:
   push:
     branches:
-      - bsync-build
-      - services/bsync
+      - main
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

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

@@ -2,8 +2,7 @@ name: build-and-push-bsync-ghcr
 on:
   push:
     branches:
-      - bsync-build
-      - services/bsync
+      - main
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

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

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - divy/starter-packs
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

.github/workflows/publish.yaml

@@ -19,14 +19,15 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
       - uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
+      - run: pnpm build
       - run: pnpm verify
       - name: Publish
         id: changesets

.github/workflows/repo.yaml

@@ -14,44 +14,64 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
-      - uses: actions/setup-node@v3
+          run_install: false
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
       - run: pnpm build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: |
+            packages/*/dist
+            packages/*/*/dist
+          retention-days: 1
   test:
     name: Test
+    needs: build
     strategy:
       matrix:
         shard: [1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8, 8/8]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
-      - uses: actions/setup-node@v3
+          run_install: false
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - run: pnpm i --frozen-lockfile
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: packages
       - run: pnpm test:withFlags --maxWorkers=1 --shard=${{ matrix.shard }} --passWithNoTests
   verify:
     name: Verify
+    needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
-      - uses: actions/setup-node@v3
+          run_install: false
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
-      - run: pnpm install --frozen-lockfile
+      - run: pnpm i --frozen-lockfile
+      - uses: actions/download-artifact@v4
+        with:
+          name: dist
+          path: packages
       - run: pnpm verify

.gitignore

@@ -2,14 +2,14 @@ node_modules
 lerna-debug.log
 npm-debug.log
 yarn-error.log
-packages/*/dist
+packages/**/dist
 .idea
 packages/*/coverage
 .vscode/
 test.sqlite
 .DS_Store
 *.log
-tsconfig.build.tsbuildinfo
+*.tsbuildinfo
 .*.env
 .env
 \#*\#

CONTRIBUTORS.md

@@ -15,3 +15,5 @@ ATProto receives so many contributions that we could never list everyone who des
 #### [TowhidKashem](https://github.com/TowhidKashem), Security disclosure, May 2023
 
 #### [DavidBuchanan314](https://github.com/DavidBuchanan314), Security disclosure, May 2023
+
+#### [goeo\_](https://bsky.app/profile/did:web:genco.me), Security disclosure, May 2024

Makefile

@@ -20,11 +20,11 @@ test: ## Run all tests
 
 .PHONY: run-dev-env
 run-dev-env: ## Run a "development environment" shell
-	cd packages/dev-env; pnpm run start
+	cd packages/dev-env; NODE_ENV=development pnpm run start
 
 .PHONY: run-dev-env-logged
 run-dev-env-logged: ## Run a "development environment" shell (with logging)
-	LOG_ENABLED=true cd packages/dev-env; pnpm run start | pnpm exec pino-pretty
+	LOG_ENABLED=true cd packages/dev-env; NODE_ENV=development pnpm run start | pnpm exec pino-pretty
 
 .PHONY: codegen
 codegen: ## Re-generate packages from lexicon/ files

README.md

@@ -23,7 +23,7 @@ This repository contains Bluesky's reference implementation of AT Protocol, and
 
 **TypeScript Services:**
 
-- `pds`: "Personal Data Server", hosting repo content for atproto accounts. Most implementation code in `packages/pds`, with runtime wrapper in `services/pds`. See [bluesky-social/pds](https://github.com/bluesky-social/pds) for directions on self-hosting in the [federation sandbox network](https://atproto.com/blog/federation-developer-sandbox).
+- `pds`: "Personal Data Server", hosting repo content for atproto accounts. Most implementation code in `packages/pds`, with runtime wrapper in `services/pds`. See [bluesky-social/pds](https://github.com/bluesky-social/pds) for directions on self-hosting.
 - `bsky`: AppView implementation of the `app.bsky.*` API endpoints. Running on main network at `api.bsky.app`. Most implementation code in `packages/bsky`, with runtime wrapper in `services/bsky`.
 
 **Lexicons:** for both the `com.atproto.*` and `app.bsky.*` are canonically versioned in this repo, for now, under `./lexicons/`. These are JSON files in the [Lexicon schema definition language](https://atproto.com/specs/lexicon), similar to JSON Schema or OpenAPI.

jest.config.js

@@ -1,7 +1,4 @@
-// jest.config.js
-const base = require('./jest.config.base.js')
-
+/** @type {import('jest').Config} */
 module.exports = {
-  ...base,
   projects: ['<rootDir>/packages/*/jest.config.js'],
 }