Appview: timeout polo, fail open (#3007)

* appview: timeout getFollowsFollowing, fail open * build
bluesky-social · Nov 19, 2024 · 0f7f536 · 0f7f536
1 parent 2d9a2a8
commit 0f7f536
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/build-and-push-bsky-aws.yaml b/.github/workflows/build-and-push-bsky-aws.yaml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - divy/timeout-polo
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

diff --git a/.github/workflows/build-and-push-bsky-ghcr.yaml b/.github/workflows/build-and-push-bsky-ghcr.yaml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - bsky-use-native-crypto
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

diff --git a/packages/bsky/src/hydration/actor.ts b/packages/bsky/src/hydration/actor.ts
@@ -189,11 +189,17 @@ export class ActorHydrator {
     viewer: string | null,
   ): Promise<KnownFollowers> {
     if (!viewer) return new HydrationMap<ProfileViewerState['knownFollowers']>()
-    const { results: knownFollowersResults } =
-      await this.dataplane.getFollowsFollowing({
-        actorDid: viewer,
-        targetDids: dids,
-      })
+    const { results: knownFollowersResults } = await this.dataplane
+      .getFollowsFollowing(
+        {
+          actorDid: viewer,
+          targetDids: dids,
+        },
+        {
+          signal: AbortSignal.timeout(100),
+        },
+      )
+      .catch(() => ({ results: [] }))
     return dids.reduce((acc, did, i) => {
       const result = knownFollowersResults[i]?.dids
       return acc.set(