8
8
handleServiceResponse ,
9
9
validateRequest ,
10
10
} from "@/common/utils/httpHandlers"
11
+ import { log , logProd , logRouteTime } from "@/common/utils/logs"
11
12
import { findSwaps } from "@/swapService/runner"
12
13
import type { SwapParams } from "@/swapService/types"
13
14
import {
@@ -53,15 +54,22 @@ swapRouter.get(
53
54
validateRequest ( getSwapSchema ) ,
54
55
async ( req : Request , res : Response ) => {
55
56
try {
56
- const swaps = await findSwaps ( parseRequest ( req ) )
57
+ const swapParams = parseRequest ( req )
58
+
59
+ const startTime = process . hrtime ( )
60
+ const swaps = await findSwaps ( swapParams )
61
+ const elapsedSeconds = parseHrtimeToSeconds ( process . hrtime ( startTime ) )
62
+
63
+ logRouteTime ( swapParams , elapsedSeconds )
64
+
57
65
return handleServiceResponse (
58
66
ServiceResponse . success < SwapResponseSingle > ( swaps [ 0 ] ) ,
59
67
res ,
60
68
)
61
69
} catch ( error ) {
62
70
return handleServiceResponse ( createFailureResponse ( req , error ) , res )
63
71
} finally {
64
- console . log ( "===== SWAP END =====" )
72
+ log ( "===== SWAP END =====" )
65
73
}
66
74
} ,
67
75
)
@@ -71,49 +79,35 @@ swapRouter.get(
71
79
validateRequest ( getSwapSchema ) ,
72
80
async ( req : Request , res : Response ) => {
73
81
try {
74
- const startTime = process . hrtime ( )
75
82
const swapParams = parseRequest ( req )
83
+
84
+ const startTime = process . hrtime ( )
76
85
const swaps = await findSwaps ( swapParams )
77
86
const elapsedSeconds = parseHrtimeToSeconds ( process . hrtime ( startTime ) )
78
- console . log ( "ROUTE EXECUTING" )
79
- if ( elapsedSeconds > 10 ) {
80
- console . log (
81
- `SLOW ROUTE [10]: ${ swapParams . swapperMode } ${ elapsedSeconds } s` ,
82
- )
83
- } else if ( elapsedSeconds > 5 ) {
84
- console . log (
85
- `SLOW ROUTE [5]: ${ swapParams . swapperMode } ${ elapsedSeconds } s` ,
86
- )
87
- } else if ( elapsedSeconds > 3 ) {
88
- console . log (
89
- `SLOW ROUTE [3]: ${ swapParams . swapperMode } ${ elapsedSeconds } s` ,
90
- )
91
- } else if ( elapsedSeconds > 1 ) {
92
- console . log (
93
- `SLOW ROUTE [1]: ${ swapParams . swapperMode } ${ elapsedSeconds } s` ,
94
- )
95
- }
87
+
88
+ logRouteTime ( swapParams , elapsedSeconds )
89
+
96
90
return handleServiceResponse (
97
91
ServiceResponse . success < SwapResponse > ( swaps ) ,
98
92
res ,
99
93
)
100
94
} catch ( error ) {
101
95
return handleServiceResponse ( createFailureResponse ( req , error ) , res )
102
96
} finally {
103
- console . log ( "===== SWAPS END =====" )
97
+ log ( "===== SWAPS END =====" )
104
98
}
105
99
} ,
106
100
)
107
101
108
102
function createFailureResponse ( req : Request , error : any ) {
109
- console . log (
110
- "error: ",
111
- error . statusCode ,
112
- error . message ,
113
- error . errorMessage ,
114
- JSON . stringify ( error . data ) ,
115
- req . url ,
116
- )
103
+ logProd ( {
104
+ name : "[ERROR] ",
105
+ statusCode : error . statusCode ,
106
+ message : error . message ,
107
+ errorMessage : error . errorMessage ,
108
+ data : error . data ,
109
+ url : req . url ,
110
+ } )
117
111
if ( error instanceof ApiError ) {
118
112
return ServiceResponse . failure ( error . message , error . statusCode , error . data )
119
113
}
0 commit comments