Merge pull request #247 from radixdlt/develop

Develop
radixdlt · Jul 26, 2024 · 2309d51 · 2309d51
2 parents 6683d23 + e69c7f0
commit 2309d51
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/examples/simple-dapp/public/.well-known/radix.json b/examples/simple-dapp/public/.well-known/radix.json
@@ -1,5 +1,4 @@
 {
-  "callbackPath": "/connect",
   "dApps": [
     {
       "dAppDefinitionAddress": "account_tdx_2_12yf9gd53yfep7a669fv2t3wm7nz9zeezwd04n02a433ker8vza6rhe"

diff --git a/packages/dapp-toolkit/src/error.ts b/packages/dapp-toolkit/src/error.ts
@@ -31,14 +31,21 @@ const defaultErrorMessage = new Map<string, string>()
   .set(ErrorType.rejectedByUser, 'user rejected request')
   .set(ErrorType.canceledByUser, 'user has canceled the request')
 
-export type SdkError = ReturnType<typeof SdkError>
+export type SdkError = {
+  error: string
+  interactionId: string
+  message?: string
+  jsError?: unknown
+}
 
 export const SdkError = (
   error: string,
   interactionId: string,
   message?: string,
-) => ({
+  jsError?: unknown,
+): SdkError => ({
   error,
   interactionId,
   message: message || defaultErrorMessage.get(error) || '',
+  jsError,
 })
diff --git a/packages/dapp-toolkit/src/modules/gateway/gateway.module.ts b/packages/dapp-toolkit/src/modules/gateway/gateway.module.ts
@@ -1,6 +1,6 @@
 import { GatewayApiService } from './gateway.service'
 import type { Result } from 'neverthrow'
-import { ResultAsync, err } from 'neverthrow'
+import { ResultAsync, err, ok } from 'neverthrow'
 import { filter, first, firstValueFrom, switchMap } from 'rxjs'
 import {
   ExponentialBackoffInput,
@@ -41,7 +41,16 @@ export const GatewayModule = (input: {
         retry.withBackoff$.pipe(
           switchMap((result) => {
             if (result.isErr())
-              return [err(SdkError('failedToPollSubmittedTransaction', ''))]
+              return [
+                err(
+                  SdkError('failedToPollSubmittedTransaction', '', undefined, {
+                    error: result.error,
+                    context:
+                      'GatewayModule.pollTransactionStatus.retry.withBackoff$',
+                    transactionIntentHash,
+                  }),
+                ),
+              ]
 
             logger?.debug(`pollingTxStatus retry #${result.value + 1}`)
 
@@ -54,9 +63,25 @@ export const GatewayModule = (input: {
                 retry.trigger.next()
                 return
               })
-              .mapErr((response) => {
+              .orElse((response) => {
+                if (response.reason === 'FailedToFetch') {
+                  logger?.debug({
+                    error: response,
+                    context: 'unexpected error, retrying',
+                  })
+                  retry.trigger.next()
+                  return ok(undefined)
+                }
+
                 logger?.debug(response)
-                return SdkError('failedToPollSubmittedTransaction', '')
+                return err(
+                  SdkError('failedToPollSubmittedTransaction', '', undefined, {
+                    error: response,
+                    transactionIntentHash,
+                    context:
+                      'GatewayModule.pollTransactionStatus.getTransactionStatus',
+                  }),
+                )
               })
           }),
           filter(