Merge pull request #73 from ckb-cell/develop

fix ElectrsAPINotFoundError

package.json

@@ -1,6 +1,6 @@
 {
   "name": "btc-assets-api",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "title": "Bitcoin/RGB++ Assets API",
   "description": "",
   "main": "index.js",

src/app.ts

@@ -20,7 +20,7 @@ import cors from './plugins/cors';
 import { NetworkType } from './constants';
 import rgbppRoutes from './routes/rgbpp';
 import cronRoutes from './routes/cron';
-import { ElectrsAPIError } from './services/electrs';
+import { ElectrsAPIError, ElectrsAPINotFoundError } from './services/electrs';
 import { BitcoinRPCError } from './services/bitcoind';
 import { AppErrorCode } from './error';
 import { provider } from 'std-env';
@@ -63,13 +63,17 @@ async function routes(fastify: FastifyInstance) {
   }
 
   fastify.addHook('onRequest', async (request) => {
-    Sentry.setTag('routePath', request.routerPath);
+    Sentry.setTag('url', request.url);
     Sentry.setContext('params', request.params ?? {});
     Sentry.setContext('query', request.query ?? {});
   });
 
   fastify.setErrorHandler((error, _, reply) => {
-    if (error instanceof ElectrsAPIError || error instanceof BitcoinRPCError) {
+    if (
+      error instanceof ElectrsAPIError ||
+      error instanceof ElectrsAPINotFoundError ||
+      error instanceof BitcoinRPCError
+    ) {
       reply
         .status(error.statusCode ?? HttpStatusCode.InternalServerError)
         .send({ code: error.errorCode, message: error.message });

src/services/electrs.ts

@@ -1,4 +1,4 @@
-import axios, { AxiosError, AxiosInstance, AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosInstance, AxiosResponse, HttpStatusCode } from 'axios';
 import { Block, Transaction, UTXO } from '../routes/bitcoin/types';
 import * as Sentry from '@sentry/node';
 import { Cradle } from '../container';
@@ -46,6 +46,9 @@ export class ElectrsAPIError extends Error {
 }
 
 export class ElectrsAPINotFoundError extends Error {
+  public errorCode = HttpStatusCode.NotFound;
+  public statusCode = HttpStatusCode.NotFound;
+
   constructor(message: string) {
     super(message);
     this.name = this.constructor.name;
@@ -69,7 +72,7 @@ export default class ElectrsAPI {
         return response;
       } catch (err) {
         if (err instanceof AxiosError) {
-          if (err.status === 404) {
+          if (err.status === 404 || err.response?.status === 404) {
             throw new ElectrsAPINotFoundError(err.message);
           }
 

src/services/transaction.ts

@@ -389,6 +389,7 @@ export default class TransactionManager implements ITransactionManager {
         await this.moveJobToDelayed(job, token);
         return;
       }
+      Sentry.setTag('txid', txid);
       Sentry.setContext('job', {
         txid,
         ckbVirtualResult: {