Merge pull request #129 from ckb-cell/fix/catch-bitcoin-client-error-…

…message

fix: fix bitcoin client error message handle

src/plugins/sentry.ts

@@ -3,7 +3,7 @@ import fastifySentry from '@immobiliarelabs/fastify-sentry';
 import { ProfilingIntegration } from '@sentry/profiling-node';
 import pkg from '../../package.json';
 import { env } from '../env';
-import { HttpStatusCode, AxiosError } from 'axios';
+import { HttpStatusCode, isAxiosError } from 'axios';
 import { BitcoinClientAPIError } from '../services/bitcoin';
 
 export default fp(async (fastify) => {
@@ -23,7 +23,7 @@ export default fp(async (fastify) => {
         return;
       }
 
-      if (error instanceof AxiosError) {
+      if (isAxiosError(error)) {
         const { response } = error;
         reply.status(response?.status ?? HttpStatusCode.InternalServerError).send({
           message: response?.data ?? error.message,

src/services/bitcoin/index.ts

@@ -1,4 +1,4 @@
-import { AxiosError, HttpStatusCode } from 'axios';
+import { HttpStatusCode, isAxiosError } from 'axios';
 import * as Sentry from '@sentry/node';
 import { Cradle } from '../../container';
 import { IBitcoinBroadcastBackuper, IBitcoinDataProvider } from './interface';
@@ -115,10 +115,10 @@ export default class BitcoinClient implements IBitcoinClient {
       return result;
     } catch (err) {
       this.cradle.logger.error(err);
-      if ((err as AxiosError).isAxiosError) {
-        const error = new BitcoinClientAPIError((err as AxiosError).message);
-        if ((err as AxiosError).response) {
-          error.statusCode = (err as AxiosError).response?.status || 500;
+      if (isAxiosError(err)) {
+        const error = new BitcoinClientAPIError(err.response?.data ?? err.message);
+        if (err.response?.status) {
+          error.statusCode = err.response.status;
         }
         throw error;
       }

test/routes/bitcoin/__snapshots__/transaction.test.ts.snap

@@ -1,5 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`Get not exists transaction 1`] = `
+{
+  "message": "Transaction not found",
+}
+`;
+
 exports[`Get transaction by txid 1`] = `
 {
   "fee": 141,

test/routes/bitcoin/transaction.test.ts

@@ -58,9 +58,7 @@ describe('/bitcoin/v1/transaction', () => {
     const data = await response.json();
 
     expect(response.statusCode).toBe(404);
-    expect(data).toEqual({
-      message: 'Request failed with status code 404',
-    });
+    expect(data).toMatchSnapshot();
 
     await fastify.close();
   });