Merge branch 'main' into http-logger-stack-trace

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'
 }