fix(Error): return errorCode in sdkError case

allbridge-io · Jul 22, 2024 · 3595b2b · 3595b2b
1 parent 66b7dc8
commit 3595b2b
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 31 deletions.
diff --git a/rest-api/package.json b/rest-api/package.json
@@ -4,7 +4,7 @@
   "description": "",
   "scripts": {
     "build": "tsoa spec && nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "format": "prettier --write \"src/**/*.ts\"",
     "start": "nest start",
     "start:dev": "tsoa spec && nest start --watch",
     "start:debug": "nest start --debug --watch",

diff --git a/rest-api/src/controller/rest.controller.ts b/rest-api/src/controller/rest.controller.ts
@@ -32,6 +32,7 @@ import {
   SolanaTxFeeParamsMethod,
   SwapCalcInfo,
 } from '../service/sdk.service';
+import { httpException } from '../error/errors';
 
 type RawTransaction =
   | VersionedTransaction
@@ -54,7 +55,7 @@ export class RestController {
     try {
       return this.sdkService.chainDetailsMap();
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -68,7 +69,7 @@ export class RestController {
     try {
       return this.sdkService.getTokens();
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -103,7 +104,7 @@ export class RestController {
         amount: amount,
       });
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -212,7 +213,7 @@ export class RestController {
     try {
       return await this.sdkService.send(params);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -395,7 +396,7 @@ export class RestController {
     try {
       return await this.sdkService.send(sendParams);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -415,7 +416,7 @@ export class RestController {
         sender,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -459,7 +460,7 @@ export class RestController {
         messengerEnum,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -480,7 +481,7 @@ export class RestController {
     try {
       return await this.sdkService.getTransferStatus(chainEnum, txId);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -506,7 +507,7 @@ export class RestController {
         }),
       };
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -530,7 +531,7 @@ export class RestController {
         chainSymbol: chainSymbol,
       });
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -551,7 +552,7 @@ export class RestController {
         address,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -595,7 +596,7 @@ export class RestController {
         messengerEnum,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -616,7 +617,7 @@ export class RestController {
     try {
       return await this.sdkService.getGasBalance(chainSymbol, address);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -648,7 +649,7 @@ export class RestController {
         destinationTokenObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -686,7 +687,7 @@ export class RestController {
         destinationTokenObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -730,7 +731,7 @@ export class RestController {
         destinationTokenObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -774,7 +775,7 @@ export class RestController {
         destinationTokenObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -837,7 +838,7 @@ export class RestController {
         feeFloat,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -900,7 +901,7 @@ export class RestController {
         feeFloat,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -975,7 +976,7 @@ export class RestController {
     try {
       return await this.sdkService.deposit(params);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1050,7 +1051,7 @@ export class RestController {
     try {
       return await this.sdkService.withdraw(params);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1120,7 +1121,7 @@ export class RestController {
     try {
       return await this.sdkService.claimRewards(params);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1137,7 +1138,7 @@ export class RestController {
     try {
       return await this.sdkService.checkBalanceLine(address, token);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1184,7 +1185,7 @@ export class RestController {
         gasFeePaymentMethod: feePaymentMethodEnum,
       });
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1207,7 +1208,7 @@ export class RestController {
     try {
       return await this.sdkService.getPoolInfoFromServer(poolAddressObj);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1230,7 +1231,7 @@ export class RestController {
     try {
       return await this.sdkService.getPoolInfoFromBlockchain(poolAddressObj);
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1267,7 +1268,7 @@ export class RestController {
         gasFeePaymentMethod: feePaymentMethodEnum,
       });
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1294,7 +1295,7 @@ export class RestController {
         poolAddressObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1325,7 +1326,7 @@ export class RestController {
         tokenAddressObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 
@@ -1362,7 +1363,7 @@ export class RestController {
         tokenAddressObj,
       );
     } catch (e) {
-      throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+      httpException(e);
     }
   }
 }
diff --git a/rest-api/src/error/errors.ts b/rest-api/src/error/errors.ts
@@ -1,5 +1,8 @@
 /*eslint @typescript-eslint/no-useless-constructor: "off"*/
 
+import { HttpException, HttpStatus } from '@nestjs/common';
+import { SdkRootError } from '@allbridge/bridge-core-sdk';
+
 export abstract class RestSDKError extends Error {
   protected constructor(message?: string) {
     super(message);
@@ -11,3 +14,17 @@ export class ConfigError extends RestSDKError {
     super(message);
   }
 }
+
+export const httpException = (e) => {
+  if (e instanceof SdkRootError) {
+    throw new HttpException(
+      {
+        statusCode: HttpStatus.BAD_REQUEST,
+        errorCode: e.errorCode,
+        message: e.message,
+      },
+      HttpStatus.BAD_REQUEST,
+    );
+  }
+  throw new HttpException(e.message, HttpStatus.BAD_REQUEST);
+};