Remove getSession waterfall (#2112)

package.json

@@ -110,6 +110,7 @@
     "fast-text-encoding": "^1.0.6",
     "history": "^5.3.0",
     "js-sha256": "^0.9.0",
+    "jwt-decode": "^4.0.0",
     "lande": "^1.0.10",
     "lodash.chunk": "^4.2.0",
     "lodash.debounce": "^4.0.8",

src/state/session/index.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import {BskyAgent, AtpPersistSessionHandler} from '@atproto/api'
 import {useQueryClient} from '@tanstack/react-query'
+import {jwtDecode} from 'jwt-decode'
 
 import {networkRetry} from '#/lib/async/retry'
 import {logger} from '#/logger'
@@ -327,34 +328,65 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
         ),
       })
 
-      await networkRetry(3, () =>
+      let canReusePrevSession = false
-        agent.resumeSession({
+      try {
-          accessJwt: account.accessJwt || '',
+        if (account.accessJwt) {
-          refreshJwt: account.refreshJwt || '',
+          const decoded = jwtDecode(account.accessJwt)
-          did: account.did,
+          if (decoded.exp) {
-          handle: account.handle,
+            const didExpire = Date.now() >= decoded.exp * 1000
-        }),
+            if (!didExpire) {
-      )
+              canReusePrevSession = true
-
+            }
-      if (!agent.session) {
+          }
-        throw new Error(`session: initSession failed to establish a session`)
+        }
+      } catch (e) {
+        console.error('Could not decode jwt.')
       }
 
-      // ensure changes in handle/email etc are captured on reload
+      const prevSession = {
-      const freshAccount: SessionAccount = {
+        accessJwt: account.accessJwt || '',
-        service: agent.service.toString(),
+        refreshJwt: account.refreshJwt || '',
-        did: agent.session.did,
+        did: account.did,
-        handle: agent.session.handle,
+        handle: account.handle,
-        email: agent.session.email,
-        emailConfirmed: agent.session.emailConfirmed || false,
-        refreshJwt: agent.session.refreshJwt,
-        accessJwt: agent.session.accessJwt,
       }
 
-      __globalAgent = agent
+      if (canReusePrevSession) {
-      queryClient.clear()
+        agent.session = prevSession
-      upsertAccount(freshAccount)
+        __globalAgent = agent
-      emitSessionLoaded(freshAccount, agent)
+        queryClient.clear()
+        upsertAccount(account)
+        emitSessionLoaded(account, agent)
+        // Intentionally not awaited to unblock the UI:
+        resumeSessionWithFreshAccount().then(async freshAccount => {
+          if (JSON.stringify(account) !== JSON.stringify(freshAccount)) {
+            upsertAccount(freshAccount)
+            emitSessionLoaded(freshAccount, agent)
+          }
+        })
+      } else {
+        const freshAccount = await resumeSessionWithFreshAccount()
+        __globalAgent = agent
+        queryClient.clear()
+        upsertAccount(freshAccount)
+        emitSessionLoaded(freshAccount, agent)
+      }
+
+      async function resumeSessionWithFreshAccount(): Promise<SessionAccount> {
+        await networkRetry(3, () => agent.resumeSession(prevSession))
+        if (!agent.session) {
+          throw new Error(`session: initSession failed to establish a session`)
+        }
+        // ensure changes in handle/email etc are captured on reload
+        return {
+          service: agent.service.toString(),
+          did: agent.session.did,
+          handle: agent.session.handle,
+          email: agent.session.email,
+          emailConfirmed: agent.session.emailConfirmed || false,
+          refreshJwt: agent.session.refreshJwt,
+          accessJwt: agent.session.accessJwt,
+        }
+      }
     },
     [upsertAccount, queryClient],
   )

yarn.lock

@@ -14279,6 +14279,11 @@ jws@^3.2.2:
     jwa "^1.4.1"
     safe-buffer "^5.0.1"
 
+jwt-decode@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
+  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
+
 key-encoder@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/key-encoder/-/key-encoder-2.0.3.tgz#77073bb48ff1fe2173bb2088b83b91152c8fa4ba"