Merge pull request #1603 from session-foundation/fix/fetch-displayname-form-whole-swarm

fix: fetch display name from whole swarm on seed recovery

Author: Bilb

ts/session/apis/snode_api/swarmPolling.ts

@@ -12,7 +12,6 @@ import {
   isEmpty,
   last,
   omit,
-  sample,
   sampleSize,
   toNumber,
   uniqBy,
@@ -990,9 +989,8 @@ export class SwarmPolling {
     const pubkey = UserUtils.getOurPubKeyFromCache();
 
     const swarmSnodes = await SnodePool.getSwarmFor(pubkey.key);
-    const toPollFrom = sample(swarmSnodes);
 
-    if (!toPollFrom) {
+    if (!swarmSnodes.length) {
       throw new Error(
         `[pollOnceForOurDisplayName] no snode in swarm for ${ed25519Str(pubkey.key)}`
       );
@@ -1004,23 +1002,35 @@ export class SwarmPolling {
       );
     }
 
-    // Note: always print something so we know if the polling is hanging
-    window.log.info(
-      `[onboarding] about to pollOnceForOurDisplayName of ${ed25519Str(pubkey.key)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${[SnodeNamespaces.UserProfile]} `
-    );
+    const allResultsFromUserProfile = await Promise.allSettled(
+      swarmSnodes.map(async toPollFrom => {
+        // Note: always print something so we know if the polling is hanging
+        window.log.info(
+          `[onboarding] about to pollOnceForOurDisplayName of ${ed25519Str(pubkey.key)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${[SnodeNamespaces.UserProfile]} `
+        );
+        const retrieved = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries(
+          toPollFrom,
+          pubkey.key,
+          [{ lastHash: '', namespace: SnodeNamespaces.UserProfile }],
+          pubkey.key,
+          null,
+          false
+        );
 
-    const resultsFromUserProfile = await SnodeAPIRetrieve.retrieveNextMessagesNoRetries(
-      toPollFrom,
-      pubkey.key,
-      [{ lastHash: '', namespace: SnodeNamespaces.UserProfile }],
-      pubkey.key,
-      null,
-      false
+        // Note: always print something so we know if the polling is hanging
+        window.log.info(
+          `[onboarding] pollOnceForOurDisplayName of ${ed25519Str(pubkey.key)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${[SnodeNamespaces.UserProfile]} returned: ${retrieved?.length}`
+        );
+        return retrieved;
+      })
     );
 
-    // Note: always print something so we know if the polling is hanging
-    window.log.info(
-      `[onboarding] pollOnceForOurDisplayName of ${ed25519Str(pubkey.key)} from snode: ${ed25519Str(toPollFrom.pubkey_ed25519)} namespaces: ${[SnodeNamespaces.UserProfile]} returned: ${resultsFromUserProfile?.length}`
+    const resultsFromUserProfile = flatten(
+      compact(
+        allResultsFromUserProfile
+          .filter(promise => promise.status === 'fulfilled')
+          .map(promise => promise.value)
+      )
     );
 
     // check if we just fetched the details from the config namespaces.