share logic between typeahead and next button

src/logger/metrics.ts

@@ -68,7 +68,6 @@ export type MetricEvents = {
     backgroundCount: number
   }
   'signup:handleTaken': {typeahead?: boolean}
-  'signup:handleReserved': {typeahead?: boolean}
   'signup:handleAvailable': {typeahead?: boolean}
   'signup:handleSuggestionSelected': {method: string}
   'signin:hostingProviderPressed': {

src/screens/Signup/StepHandle.tsx

@@ -18,7 +18,10 @@ import {
   validateServiceHandle,
 } from '#/lib/strings/handles'
 import {logger} from '#/logger'
-import {useHandleAvailabilityQuery} from '#/state/queries/handle-availablility'
+import {
+  checkHandleAvailability,
+  useHandleAvailabilityQuery,
+} from '#/state/queries/handle-availability'
 import {useAgent} from '#/state/session'
 import {ScreenTransition} from '#/screens/Login/ScreenTransition'
 import {useSignupContext} from '#/screens/Signup/state'
@@ -67,24 +70,24 @@ export function StepHandle() {
       return
     }
 
-    try {
     dispatch({type: 'setIsLoading', value: true})
 
-      const res = await agent.resolveHandle({
+    try {
-        handle: createFullHandle(handle, state.userDomain),
+      const {available: handleAvailable} = await checkHandleAvailability(
-      })
+        agent,
+        handle,
+        state.serviceDescription?.did ?? 'UNKNOWN',
+        {typeahead: false},
+      )
 
-      if (res.data.did) {
+      if (!handleAvailable) {
         dispatch({
           type: 'setError',
           value: _(msg`That username is already taken`),
           field: 'handle',
         })
-        logger.metric('signup:handleTaken', {}, {statsig: true})
         return
       }
-    } catch (e) {
-      // Don't have to handle
     } finally {
       dispatch({type: 'setIsLoading', value: false})
     }

src/state/queries/handle-availability.ts

@@ -0,0 +1,132 @@
+import {useMemo} from 'react'
+import {Agent, ComAtprotoTempCheckHandleAvailability} from '@atproto/api'
+import {useQuery} from '@tanstack/react-query'
+
+import {
+  BSKY_SERVICE,
+  BSKY_SERVICE_DID,
+  PUBLIC_BSKY_SERVICE,
+} from '#/lib/constants'
+import {createFullHandle} from '#/lib/strings/handles'
+import {logger} from '#/logger'
+import {useDebouncedValue} from '#/components/live/utils'
+import * as bsky from '#/types/bsky'
+
+export const RQKEY_handleAvailability = (
+  handle: string,
+  domain: string,
+  serviceDid: string,
+) => ['handle-availability', {handle, domain, serviceDid}]
+
+export function useHandleAvailabilityQuery(
+  {
+    username,
+    serviceDomain,
+    serviceDid,
+    enabled,
+    birthDate,
+    email,
+  }: {
+    username: string
+    serviceDomain: string
+    serviceDid: string
+    enabled: boolean
+    birthDate?: string
+    email?: string
+  },
+  debounceDelayMs = 500,
+) {
+  const name = username.trim()
+  const debouncedHandle = useDebouncedValue(name, debounceDelayMs)
+  const agent = useMemo(() => {
+    if (serviceDid === BSKY_SERVICE_DID) {
+      return new Agent({service: BSKY_SERVICE})
+    } else {
+      return new Agent({service: PUBLIC_BSKY_SERVICE})
+    }
+  }, [serviceDid])
+
+  return {
+    enabled: enabled && name === debouncedHandle,
+    query: useQuery({
+      enabled: enabled && name === debouncedHandle,
+      queryKey: RQKEY_handleAvailability(
+        debouncedHandle,
+        serviceDomain,
+        serviceDid,
+      ),
+      queryFn: async () => {
+        const handle = createFullHandle(name, serviceDomain)
+        return await checkHandleAvailability(agent, handle, serviceDid, {
+          email,
+          birthDate,
+          typeahead: true,
+        })
+      },
+    }),
+  }
+}
+
+export async function checkHandleAvailability(
+  agent: Agent,
+  handle: string,
+  serviceDid: string,
+  {
+    email,
+    birthDate,
+    typeahead,
+  }: {
+    email?: string
+    birthDate?: string
+    typeahead?: boolean
+  },
+) {
+  if (serviceDid === BSKY_SERVICE_DID) {
+    // entryway has a special API for handle availability
+    const {data} = await agent.com.atproto.temp.checkHandleAvailability({
+      handle,
+      birthDate,
+      email,
+    })
+
+    if (
+      bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultAvailable>(
+        data.result,
+        ComAtprotoTempCheckHandleAvailability.isResultAvailable,
+      )
+    ) {
+      logger.metric('signup:handleAvailable', {typeahead}, {statsig: true})
+
+      return {available: true} as const
+    } else if (
+      bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultUnavailable>(
+        data.result,
+        ComAtprotoTempCheckHandleAvailability.isResultUnavailable,
+      )
+    ) {
+      logger.metric('signup:handleTaken', {typeahead}, {statsig: true})
+      return {
+        available: false,
+        suggestions: data.result.suggestions,
+      } as const
+    } else {
+      throw new Error(
+        `Unexpected result of \`checkHandleAvailability\`: ${JSON.stringify(data.result)}`,
+      )
+    }
+  } else {
+    // 3rd party PDSes won't have this API so just try and resolve the handle
+    try {
+      const res = await agent.resolveHandle({
+        handle,
+      })
+
+      if (res.data.did) {
+        logger.metric('signup:handleTaken', {typeahead}, {statsig: true})
+        return {available: false} as const
+      }
+    } catch {}
+    logger.metric('signup:handleAvailable', {typeahead}, {statsig: true})
+    return {available: true} as const
+  }
+}

src/state/queries/handle-availablility.ts

@@ -1,116 +0,0 @@
-import {useMemo} from 'react'
-import {Agent, ComAtprotoTempCheckHandleAvailability} from '@atproto/api'
-import {useQuery} from '@tanstack/react-query'
-
-import {
-  BSKY_SERVICE,
-  BSKY_SERVICE_DID,
-  PUBLIC_BSKY_SERVICE,
-} from '#/lib/constants'
-import {createFullHandle} from '#/lib/strings/handles'
-import {logger} from '#/logger'
-import {useDebouncedValue} from '#/components/live/utils'
-import * as bsky from '#/types/bsky'
-
-export const RQKEY_handleAvailability = (
-  handle: string,
-  domain: string,
-  serviceDid: string,
-) => ['handle-availability', {handle, domain, serviceDid}]
-
-export function useHandleAvailabilityQuery(
-  {
-    username,
-    serviceDomain,
-    serviceDid,
-    enabled,
-    birthDate,
-    email,
-  }: {
-    username: string
-    serviceDomain: string
-    serviceDid: string
-    enabled: boolean
-    birthDate?: string
-    email?: string
-  },
-  debounceDelayMs = 500,
-) {
-  const name = username.trim()
-  const debouncedHandle = useDebouncedValue(name, debounceDelayMs)
-  const agent = useMemo(() => {
-    if (serviceDid === BSKY_SERVICE_DID) {
-      return new Agent({service: BSKY_SERVICE})
-    } else {
-      return new Agent({service: PUBLIC_BSKY_SERVICE})
-    }
-  }, [serviceDid])
-
-  return {
-    enabled: enabled && name === debouncedHandle,
-    query: useQuery({
-      enabled: enabled && name === debouncedHandle,
-      queryKey: RQKEY_handleAvailability(
-        debouncedHandle,
-        serviceDomain,
-        serviceDid,
-      ),
-      queryFn: async () => {
-        const handle = createFullHandle(name, serviceDomain)
-        if (serviceDid === BSKY_SERVICE_DID) {
-          // entryway has a special API for handle availability
-          const {data} = await agent.com.atproto.temp.checkHandleAvailability({
-            handle,
-            birthDate,
-            email,
-          })
-
-          if (
-            bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultAvailable>(
-              data.result,
-              ComAtprotoTempCheckHandleAvailability.isResultAvailable,
-            )
-          ) {
-            return {available: true} as const
-          } else if (
-            bsky.dangerousIsType<ComAtprotoTempCheckHandleAvailability.ResultUnavailable>(
-              data.result,
-              ComAtprotoTempCheckHandleAvailability.isResultUnavailable,
-            )
-          ) {
-            return {
-              available: false,
-              suggestions: data.result.suggestions,
-            } as const
-          } else {
-            throw new Error(
-              `Unexpected result of \`checkHandleAvailability\`: ${JSON.stringify(data.result)}`,
-            )
-          }
-        } else {
-          // 3rd party services won't have this API so just try and resolve the handle
-          try {
-            const res = await agent.resolveHandle({
-              handle,
-            })
-
-            if (res.data.did) {
-              logger.metric(
-                'signup:handleReserved',
-                {typeahead: true},
-                {statsig: true},
-              )
-              return {available: false} as const
-            }
-          } catch {}
-          logger.metric(
-            'signup:handleAvailable',
-            {typeahead: true},
-            {statsig: true},
-          )
-          return {available: true} as const
-        }
-      },
-    }),
-  }
-}