@lodestar/api 1.49.0-dev.ae6cc426f1 → 1.49.0-dev.c535e94f25
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/beacon/server/events.d.ts +5 -0
- package/lib/beacon/server/events.d.ts.map +1 -1
- package/lib/beacon/server/events.js +14 -0
- package/lib/beacon/server/events.js.map +1 -1
- package/lib/keymanager/routes.d.ts +1 -1
- package/lib/keymanager/routes.d.ts.map +1 -1
- package/lib/keymanager/routes.js +4 -2
- package/lib/keymanager/routes.js.map +1 -1
- package/package.json +6 -6
- package/src/beacon/server/events.ts +16 -0
- package/src/keymanager/routes.ts +7 -3
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
2
|
import { ApplicationMethods, FastifyRoutes } from "../../utils/server/index.js";
|
|
3
3
|
import { Endpoints } from "../routes/events.js";
|
|
4
|
+
/**
|
|
5
|
+
* A stream with no events otherwise exceeds the idle timeout of a reverse proxy or consumer, commonly 60 seconds,
|
|
6
|
+
* and events are not replayed. https://html.spec.whatwg.org/multipage/server-sent-events.html#authoring-notes
|
|
7
|
+
*/
|
|
8
|
+
export declare const SSE_KEEP_ALIVE_INTERVAL_MS = 15000;
|
|
4
9
|
export declare function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<Endpoints>): FastifyRoutes<Endpoints>;
|
|
5
10
|
export declare function serializeSSEEvent(chunk: {
|
|
6
11
|
event: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/beacon/server/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAW,kBAAkB,EAAE,aAAa,EAAsB,MAAM,6BAA6B,CAAC;AAC7G,OAAO,EAAC,SAAS,EAA6C,MAAM,qBAAqB,CAAC;AAE1F,wBAAgB,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/beacon/server/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAW,kBAAkB,EAAE,aAAa,EAAsB,MAAM,6BAA6B,CAAC;AAC7G,OAAO,EAAC,SAAS,EAA6C,MAAM,qBAAqB,CAAC;AAE1F;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAGjD,wBAAgB,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,CAgFnH;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAC,GAAG,MAAM,CAE/E"}
|
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
import { ApiError, createFastifyRoutes } from "../../utils/server/index.js";
|
|
2
2
|
import { eventTypes, getDefinitions, getEventSerdes } from "../routes/events.js";
|
|
3
|
+
/**
|
|
4
|
+
* A stream with no events otherwise exceeds the idle timeout of a reverse proxy or consumer, commonly 60 seconds,
|
|
5
|
+
* and events are not replayed. https://html.spec.whatwg.org/multipage/server-sent-events.html#authoring-notes
|
|
6
|
+
*/
|
|
7
|
+
export const SSE_KEEP_ALIVE_INTERVAL_MS = 15_000;
|
|
8
|
+
const SSE_KEEP_ALIVE_COMMENT = ":\n\n";
|
|
3
9
|
export function getRoutes(config, methods) {
|
|
4
10
|
const eventSerdes = getEventSerdes(config);
|
|
5
11
|
const serverRoutes = createFastifyRoutes(getDefinitions(config), methods);
|
|
@@ -15,6 +21,7 @@ export function getRoutes(config, methods) {
|
|
|
15
21
|
}
|
|
16
22
|
}
|
|
17
23
|
const controller = new AbortController();
|
|
24
|
+
let keepAliveTimer;
|
|
18
25
|
try {
|
|
19
26
|
// Add injected headers from other plugins. This is required for fastify-cors for example
|
|
20
27
|
// From: https://github.com/NodeFactoryIo/fastify-sse-v2/blob/b1686a979fbf655fb9936c0560294a0c094734d4/src/plugin.ts
|
|
@@ -31,6 +38,12 @@ export function getRoutes(config, methods) {
|
|
|
31
38
|
// infinitely buffering it. http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_buffering
|
|
32
39
|
// Source: https://stackoverflow.com/questions/13672743/eventsource-server-sent-events-through-nginx
|
|
33
40
|
res.raw.setHeader("X-Accel-Buffering", "no");
|
|
41
|
+
keepAliveTimer = setInterval(() => {
|
|
42
|
+
if (!res.raw.writableEnded && !res.raw.destroyed)
|
|
43
|
+
res.raw.write(SSE_KEEP_ALIVE_COMMENT);
|
|
44
|
+
}, SSE_KEEP_ALIVE_INTERVAL_MS);
|
|
45
|
+
// Headers are otherwise only sent with the first event, a reverse proxy times out waiting for them
|
|
46
|
+
res.raw.flushHeaders();
|
|
34
47
|
await new Promise((resolve, reject) => {
|
|
35
48
|
void methods.eventstream({
|
|
36
49
|
topics: req.query.topics,
|
|
@@ -57,6 +70,7 @@ export function getRoutes(config, methods) {
|
|
|
57
70
|
});
|
|
58
71
|
}
|
|
59
72
|
finally {
|
|
73
|
+
clearInterval(keepAliveTimer);
|
|
60
74
|
controller.abort();
|
|
61
75
|
// Always end the response. If an error is thrown after the headers were sent, fastify can
|
|
62
76
|
// no longer write a status code and would leave the socket open, the client then waits
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/beacon/server/events.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAqC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAC7G,OAAO,EAAY,UAAU,EAAE,cAAc,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAE1F,MAAM,UAAU,SAAS,CAAC,MAAuB,EAAE,OAAsC;IACvF,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE1E,OAAO;QACL,2CAA2C;QAC3C,WAAW,EAAE;YACX,GAAG,YAAY,CAAC,WAAW;YAC3B,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC1B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;gBACvD,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBACrC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;wBAC5B,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,kBAAkB,KAAK,EAAE,CAAC,CAAC;oBACrD,CAAC;gBACH,CAAC;gBAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/beacon/server/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ export type BuilderBoostFactorData = ValueOf<typeof BuilderBoostFactorDataType>;
|
|
|
69
69
|
export type BuilderEntryConfig = {
|
|
70
70
|
/** URL the bid requests for this entry are sent to */
|
|
71
71
|
url: string;
|
|
72
|
-
/** Auth data hex string as agreed with the builder, derived from the
|
|
72
|
+
/** Auth data hex string as agreed with the builder, derived from the builder url hostname when omitted */
|
|
73
73
|
authData?: string;
|
|
74
74
|
/** Builder BLS pubkeys this entry accepts bids from, empty or omitted accepts any builder */
|
|
75
75
|
builderPubkeys?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/keymanager/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAOjD,OAAO,EAAC,KAAK,EAAE,MAAM,EAAkB,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EACL,SAAS,EACT,SAAS,EAET,YAAY,EAGZ,iBAAiB,EAGlB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAS,MAAM,mBAAmB,CAAC;AAGrE,oBAAY,YAAY;IACtB,mFAAmF;IACnF,QAAQ,aAAa;IACrB,2DAA2D;IAC3D,SAAS,cAAc;IACvB,kFAAkF;IAClF,KAAK,UAAU;CAChB;AAED,oBAAY,cAAc;IACxB,iCAAiC;IACjC,OAAO,YAAY;IACnB,+DAA+D;IAC/D,UAAU,eAAe;IACzB,4EAA4E;IAC5E,SAAS,cAAc;IACvB,uPAAuP;IACvP,KAAK,UAAU;CAChB;AAED,oBAAY,qBAAqB;IAC/B,6EAA6E;IAC7E,QAAQ,aAAa;IACrB,mEAAmE;IACnE,SAAS,cAAc;IACvB,gEAAgE;IAChE,KAAK,UAAU;CAChB;AAED,oBAAY,qBAAqB;IAC/B,iCAAiC;IACjC,OAAO,YAAY;IACnB,sCAAsC;IACtC,SAAS,cAAc;IACvB;;;;OAIG;IACH,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,cAAc,CAAC,MAAM,IAAI;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;EAMhC,CAAC;AACF,eAAO,MAAM,gBAAgB;;;EAM5B,CAAC;AACF,eAAO,MAAM,gBAAgB;;;EAM5B,CAAC;AACF,eAAO,MAAM,0BAA0B;;;EAMtC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACpE,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC5D,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAC5D,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAEhF,8DAA8D;AAC9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,sDAAsD;IACtD,GAAG,EAAE,MAAM,CAAC;IACZ,
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/keymanager/routes.ts"],"names":[],"mappings":"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"}
|
package/lib/keymanager/routes.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ContainerType } from "@chainsafe/ssz";
|
|
2
2
|
import { MAX_BUILDER_AUTH_DATA_SIZE, MAX_BUILDER_ENTRIES, MAX_BUILDER_PUBKEYS, MAX_BUILDER_URL_SIZE, } from "@lodestar/params";
|
|
3
3
|
import { ssz, stringType } from "@lodestar/types";
|
|
4
|
-
import { isValidAsciiHttpUrl } from "@lodestar/utils";
|
|
4
|
+
import { isValidAsciiHttpUrl, toAsciiHttpUrl } from "@lodestar/utils";
|
|
5
5
|
import { EmptyMetaCodec, EmptyRequestCodec, EmptyResponseCodec, JsonOnlyReq, JsonOnlyResponseCodec, } from "../utils/codecs.js";
|
|
6
6
|
import { Schema } from "../utils/index.js";
|
|
7
7
|
import { WireFormat } from "../utils/wireFormat.js";
|
|
@@ -125,7 +125,9 @@ export function builderConfigDataFromJson(json) {
|
|
|
125
125
|
throw Error(`builders[${i}].url must not exceed ${MAX_BUILDER_URL_SIZE} bytes`);
|
|
126
126
|
}
|
|
127
127
|
if (!isValidAsciiHttpUrl(url)) {
|
|
128
|
-
|
|
128
|
+
const asciiUrl = toAsciiHttpUrl(url);
|
|
129
|
+
throw Error(`builders[${i}].url must be a valid HTTP or HTTPS URL using only ASCII characters` +
|
|
130
|
+
(asciiUrl !== null ? `, use ${asciiUrl} instead` : ""));
|
|
129
131
|
}
|
|
130
132
|
if (auth_data !== undefined && (typeof auth_data !== "string" || !BUILDER_AUTH_DATA_PATTERN.test(auth_data))) {
|
|
131
133
|
throw Error(`builders[${i}].auth_data must be a non-empty hex string of at most ${MAX_BUILDER_AUTH_DATA_SIZE} bytes`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/keymanager/routes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/keymanager/routes.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.49.0-dev.
|
|
14
|
+
"version": "1.49.0-dev.c535e94f25",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -76,10 +76,10 @@
|
|
|
76
76
|
"dependencies": {
|
|
77
77
|
"@chainsafe/persistent-merkle-tree": "^1.3.1",
|
|
78
78
|
"@chainsafe/ssz": "^1.8.0",
|
|
79
|
-
"@lodestar/config": "^1.49.0-dev.
|
|
80
|
-
"@lodestar/params": "^1.49.0-dev.
|
|
81
|
-
"@lodestar/types": "^1.49.0-dev.
|
|
82
|
-
"@lodestar/utils": "^1.49.0-dev.
|
|
79
|
+
"@lodestar/config": "^1.49.0-dev.c535e94f25",
|
|
80
|
+
"@lodestar/params": "^1.49.0-dev.c535e94f25",
|
|
81
|
+
"@lodestar/types": "^1.49.0-dev.c535e94f25",
|
|
82
|
+
"@lodestar/utils": "^1.49.0-dev.c535e94f25",
|
|
83
83
|
"eventsource": "^2.0.2",
|
|
84
84
|
"qs": "^6.14.2"
|
|
85
85
|
},
|
|
@@ -96,5 +96,5 @@
|
|
|
96
96
|
"api",
|
|
97
97
|
"blockchain"
|
|
98
98
|
],
|
|
99
|
-
"gitHead": "
|
|
99
|
+
"gitHead": "1789247c3a6dcb0e8045ed9060def92e4325c7b9"
|
|
100
100
|
}
|
|
@@ -2,6 +2,13 @@ import {ChainForkConfig} from "@lodestar/config";
|
|
|
2
2
|
import {ApiError, ApplicationMethods, FastifyRoutes, createFastifyRoutes} from "../../utils/server/index.js";
|
|
3
3
|
import {Endpoints, eventTypes, getDefinitions, getEventSerdes} from "../routes/events.js";
|
|
4
4
|
|
|
5
|
+
/**
|
|
6
|
+
* A stream with no events otherwise exceeds the idle timeout of a reverse proxy or consumer, commonly 60 seconds,
|
|
7
|
+
* and events are not replayed. https://html.spec.whatwg.org/multipage/server-sent-events.html#authoring-notes
|
|
8
|
+
*/
|
|
9
|
+
export const SSE_KEEP_ALIVE_INTERVAL_MS = 15_000;
|
|
10
|
+
const SSE_KEEP_ALIVE_COMMENT = ":\n\n";
|
|
11
|
+
|
|
5
12
|
export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<Endpoints>): FastifyRoutes<Endpoints> {
|
|
6
13
|
const eventSerdes = getEventSerdes(config);
|
|
7
14
|
const serverRoutes = createFastifyRoutes(getDefinitions(config), methods);
|
|
@@ -19,6 +26,7 @@ export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<E
|
|
|
19
26
|
}
|
|
20
27
|
|
|
21
28
|
const controller = new AbortController();
|
|
29
|
+
let keepAliveTimer: NodeJS.Timeout | undefined;
|
|
22
30
|
|
|
23
31
|
try {
|
|
24
32
|
// Add injected headers from other plugins. This is required for fastify-cors for example
|
|
@@ -37,6 +45,13 @@ export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<E
|
|
|
37
45
|
// Source: https://stackoverflow.com/questions/13672743/eventsource-server-sent-events-through-nginx
|
|
38
46
|
res.raw.setHeader("X-Accel-Buffering", "no");
|
|
39
47
|
|
|
48
|
+
keepAliveTimer = setInterval(() => {
|
|
49
|
+
if (!res.raw.writableEnded && !res.raw.destroyed) res.raw.write(SSE_KEEP_ALIVE_COMMENT);
|
|
50
|
+
}, SSE_KEEP_ALIVE_INTERVAL_MS);
|
|
51
|
+
|
|
52
|
+
// Headers are otherwise only sent with the first event, a reverse proxy times out waiting for them
|
|
53
|
+
res.raw.flushHeaders();
|
|
54
|
+
|
|
40
55
|
await new Promise<void>((resolve, reject) => {
|
|
41
56
|
void methods.eventstream({
|
|
42
57
|
topics: req.query.topics,
|
|
@@ -64,6 +79,7 @@ export function getRoutes(config: ChainForkConfig, methods: ApplicationMethods<E
|
|
|
64
79
|
req.socket.once("end", () => resolve());
|
|
65
80
|
});
|
|
66
81
|
} finally {
|
|
82
|
+
clearInterval(keepAliveTimer);
|
|
67
83
|
controller.abort();
|
|
68
84
|
// Always end the response. If an error is thrown after the headers were sent, fastify can
|
|
69
85
|
// no longer write a status code and would leave the socket open, the client then waits
|
package/src/keymanager/routes.ts
CHANGED
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
MAX_BUILDER_URL_SIZE,
|
|
8
8
|
} from "@lodestar/params";
|
|
9
9
|
import {Epoch, phase0, ssz, stringType} from "@lodestar/types";
|
|
10
|
-
import {isValidAsciiHttpUrl} from "@lodestar/utils";
|
|
10
|
+
import {isValidAsciiHttpUrl, toAsciiHttpUrl} from "@lodestar/utils";
|
|
11
11
|
import {
|
|
12
12
|
EmptyArgs,
|
|
13
13
|
EmptyMeta,
|
|
@@ -107,7 +107,7 @@ export type BuilderBoostFactorData = ValueOf<typeof BuilderBoostFactorDataType>;
|
|
|
107
107
|
export type BuilderEntryConfig = {
|
|
108
108
|
/** URL the bid requests for this entry are sent to */
|
|
109
109
|
url: string;
|
|
110
|
-
/** Auth data hex string as agreed with the builder, derived from the
|
|
110
|
+
/** Auth data hex string as agreed with the builder, derived from the builder url hostname when omitted */
|
|
111
111
|
authData?: string;
|
|
112
112
|
/** Builder BLS pubkeys this entry accepts bids from, empty or omitted accepts any builder */
|
|
113
113
|
builderPubkeys?: string[];
|
|
@@ -194,7 +194,11 @@ export function builderConfigDataFromJson(json: unknown): BuilderConfigData {
|
|
|
194
194
|
throw Error(`builders[${i}].url must not exceed ${MAX_BUILDER_URL_SIZE} bytes`);
|
|
195
195
|
}
|
|
196
196
|
if (!isValidAsciiHttpUrl(url)) {
|
|
197
|
-
|
|
197
|
+
const asciiUrl = toAsciiHttpUrl(url);
|
|
198
|
+
throw Error(
|
|
199
|
+
`builders[${i}].url must be a valid HTTP or HTTPS URL using only ASCII characters` +
|
|
200
|
+
(asciiUrl !== null ? `, use ${asciiUrl} instead` : "")
|
|
201
|
+
);
|
|
198
202
|
}
|
|
199
203
|
if (auth_data !== undefined && (typeof auth_data !== "string" || !BUILDER_AUTH_DATA_PATTERN.test(auth_data))) {
|
|
200
204
|
throw Error(
|