@lodestar/beacon-node 1.18.0-dev.65927c699c → 1.18.0-dev.6bd9af9c10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/rest/base.js +9 -5
- package/lib/api/rest/base.js.map +1 -1
- package/package.json +14 -14
package/lib/api/rest/base.js
CHANGED
|
@@ -30,7 +30,7 @@ export class RestApiServer {
|
|
|
30
30
|
});
|
|
31
31
|
this.activeSockets = new HttpActiveSocketsTracker(server.server, metrics);
|
|
32
32
|
// To parse our ApiError -> statusCode
|
|
33
|
-
server.setErrorHandler((err,
|
|
33
|
+
server.setErrorHandler((err, _req, res) => {
|
|
34
34
|
if (err.validation) {
|
|
35
35
|
void res.status(400).send(err.validation);
|
|
36
36
|
}
|
|
@@ -49,17 +49,17 @@ export class RestApiServer {
|
|
|
49
49
|
// Log all incoming request to debug (before parsing). TODO: Should we hook latter in the lifecycle? https://www.fastify.io/docs/latest/Lifecycle/
|
|
50
50
|
// Note: Must be an async method so fastify can continue the release lifecycle. Otherwise we must call done() or the request stalls
|
|
51
51
|
server.addHook("onRequest", async (req, _res) => {
|
|
52
|
-
const operationId = req
|
|
52
|
+
const operationId = getOperationId(req);
|
|
53
53
|
this.logger.debug(`Req ${req.id} ${req.ip} ${operationId}`);
|
|
54
54
|
metrics?.requests.inc({ operationId });
|
|
55
55
|
});
|
|
56
56
|
server.addHook("preHandler", async (req, _res) => {
|
|
57
|
-
const operationId = req
|
|
57
|
+
const operationId = getOperationId(req);
|
|
58
58
|
this.logger.debug(`Exec ${req.id} ${req.ip} ${operationId}`);
|
|
59
59
|
});
|
|
60
60
|
// Log after response
|
|
61
61
|
server.addHook("onResponse", async (req, res) => {
|
|
62
|
-
const operationId = req
|
|
62
|
+
const operationId = getOperationId(req);
|
|
63
63
|
this.logger.debug(`Res ${req.id} ${operationId} - ${res.raw.statusCode}`);
|
|
64
64
|
metrics?.responseTime.observe({ operationId }, res.elapsedTime / 1000);
|
|
65
65
|
});
|
|
@@ -68,7 +68,7 @@ export class RestApiServer {
|
|
|
68
68
|
// Don't log NodeISSyncing errors, they happen very frequently while syncing and the validator polls duties
|
|
69
69
|
if (err instanceof ErrorAborted || err instanceof NodeIsSyncing)
|
|
70
70
|
return;
|
|
71
|
-
const operationId = req
|
|
71
|
+
const operationId = getOperationId(req);
|
|
72
72
|
if (err instanceof ApiError) {
|
|
73
73
|
this.logger.warn(`Req ${req.id} ${operationId} failed`, { reason: err.message });
|
|
74
74
|
}
|
|
@@ -115,4 +115,8 @@ export class RestApiServer {
|
|
|
115
115
|
return false;
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
|
+
function getOperationId(req) {
|
|
119
|
+
// Note: `schema` will be `undefined` if route is not defined
|
|
120
|
+
return req.routeOptions.schema?.operationId ?? "unknown";
|
|
121
|
+
}
|
|
118
122
|
//# sourceMappingURL=base.js.map
|
package/lib/api/rest/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/api/rest/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,gBAAgB,EAAC,MAAM,IAAI,CAAC;AAC7C,OAAO,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/api/rest/base.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.18.0-dev.
|
|
14
|
+
"version": "1.18.0-dev.6bd9af9c10",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -120,18 +120,18 @@
|
|
|
120
120
|
"@libp2p/peer-id-factory": "^4.0.3",
|
|
121
121
|
"@libp2p/prometheus-metrics": "^3.0.10",
|
|
122
122
|
"@libp2p/tcp": "9.0.10",
|
|
123
|
-
"@lodestar/api": "1.18.0-dev.
|
|
124
|
-
"@lodestar/config": "1.18.0-dev.
|
|
125
|
-
"@lodestar/db": "1.18.0-dev.
|
|
126
|
-
"@lodestar/fork-choice": "1.18.0-dev.
|
|
127
|
-
"@lodestar/light-client": "1.18.0-dev.
|
|
128
|
-
"@lodestar/logger": "1.18.0-dev.
|
|
129
|
-
"@lodestar/params": "1.18.0-dev.
|
|
130
|
-
"@lodestar/reqresp": "1.18.0-dev.
|
|
131
|
-
"@lodestar/state-transition": "1.18.0-dev.
|
|
132
|
-
"@lodestar/types": "1.18.0-dev.
|
|
133
|
-
"@lodestar/utils": "1.18.0-dev.
|
|
134
|
-
"@lodestar/validator": "1.18.0-dev.
|
|
123
|
+
"@lodestar/api": "1.18.0-dev.6bd9af9c10",
|
|
124
|
+
"@lodestar/config": "1.18.0-dev.6bd9af9c10",
|
|
125
|
+
"@lodestar/db": "1.18.0-dev.6bd9af9c10",
|
|
126
|
+
"@lodestar/fork-choice": "1.18.0-dev.6bd9af9c10",
|
|
127
|
+
"@lodestar/light-client": "1.18.0-dev.6bd9af9c10",
|
|
128
|
+
"@lodestar/logger": "1.18.0-dev.6bd9af9c10",
|
|
129
|
+
"@lodestar/params": "1.18.0-dev.6bd9af9c10",
|
|
130
|
+
"@lodestar/reqresp": "1.18.0-dev.6bd9af9c10",
|
|
131
|
+
"@lodestar/state-transition": "1.18.0-dev.6bd9af9c10",
|
|
132
|
+
"@lodestar/types": "1.18.0-dev.6bd9af9c10",
|
|
133
|
+
"@lodestar/utils": "1.18.0-dev.6bd9af9c10",
|
|
134
|
+
"@lodestar/validator": "1.18.0-dev.6bd9af9c10",
|
|
135
135
|
"@multiformats/multiaddr": "^12.1.3",
|
|
136
136
|
"c-kzg": "^2.1.2",
|
|
137
137
|
"datastore-core": "^9.1.1",
|
|
@@ -170,5 +170,5 @@
|
|
|
170
170
|
"beacon",
|
|
171
171
|
"blockchain"
|
|
172
172
|
],
|
|
173
|
-
"gitHead": "
|
|
173
|
+
"gitHead": "2edce98fb06f2ace6a93a54d22e66d7a4a46091d"
|
|
174
174
|
}
|