rebase on main

.github/workflows/repo.yaml

@@ -15,6 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - run: |
+          sudo apt-get update
+          sudo apt-get install jq
       - uses: pnpm/action-setup@v2
         with:
           version: 8

packages/bsky/package.json

@@ -43,7 +43,7 @@
     "@isaacs/ttlcache": "^1.4.1",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
-    "express": "^4.17.2",
+    "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
     "form-data": "^4.0.0",
     "http-errors": "^2.0.0",
@@ -67,7 +67,7 @@
     "@atproto/xrpc": "workspace:^",
     "@did-plc/server": "^0.0.1",
     "@types/cors": "^2.8.12",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.20",
     "@types/express-serve-static-core": "^4.17.36",
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",

packages/dev-env/package.json

@@ -36,6 +36,7 @@
     "@atproto/xrpc-server": "workspace:^",
     "@did-plc/lib": "^0.0.1",
     "@did-plc/server": "^0.0.1",
+    "axios": "^0.27.2",
     "better-sqlite3": "^7.6.2",
     "chalk": "^5.0.1",
     "dotenv": "^16.0.3",

packages/dev-env/src/util.ts

@@ -1,3 +1,4 @@
+import axios from 'axios'
 import { IdResolver } from '@atproto/identity'
 import { TestPds } from './pds'
 import { TestBsky } from './bsky'
@@ -39,8 +40,8 @@ export const mockResolvers = (idResolver: IdResolver, pds: TestPds) => {
 
     const url = `${pds.url}/.well-known/atproto-did`
     try {
-      const res = await fetch(url, { headers: { host: handle } })
-      return await res.text()
+      const res = await axios.get(url, { headers: { host: handle } })
+      return res.data
     } catch (err) {
       return undefined
     }

packages/dev-infra/_common.sh

@@ -8,7 +8,9 @@ get_container_id() {
     exit 1
   fi
 
+  # first line of jq normalizes for docker compose breaking change, see docker/compose#10958
   docker compose -f $compose_file ps --format json --status running \
+    | jq -sc '.[] | if type=="array" then .[] else . end' | jq -s \
     | jq -r '.[]? | select(.Service == "'${service}'") | .ID'
 }
 

packages/pds/package.json

@@ -48,7 +48,7 @@
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "disposable-email": "^0.2.3",
-    "express": "^4.17.2",
+    "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
     "file-type": "^16.5.4",
     "form-data": "^4.0.0",
@@ -78,14 +78,14 @@
     "@did-plc/server": "^0.0.1",
     "@types/cors": "^2.8.12",
     "@types/disposable-email": "^0.2.0",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.20",
     "@types/express-serve-static-core": "^4.17.36",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/nodemailer": "^6.4.6",
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
-    "ws": "^8.12.0"
+    "ws": "^8.14.2"
   }
 }

packages/xrpc-server/package.json

@@ -29,18 +29,18 @@
     "@atproto/crypto": "workspace:^",
     "@atproto/lexicon": "workspace:^",
     "cbor-x": "^1.5.1",
-    "express": "^4.17.2",
+    "express": "^4.18.2",
     "http-errors": "^2.0.0",
     "mime-types": "^2.1.35",
     "rate-limiter-flexible": "^2.4.1",
     "uint8arrays": "3.0.0",
-    "ws": "^8.12.0",
+    "ws": "^8.14.2",
     "zod": "^3.21.4"
   },
   "devDependencies": {
     "@atproto/crypto": "workspace:^",
     "@atproto/xrpc": "workspace:^",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.20",
     "@types/express-serve-static-core": "^4.17.36",
     "@types/http-errors": "^2.0.1",
     "@types/ws": "^8.5.4",