@lodestar/beacon-node 1.39.0-dev.3bf4734ba9 → 1.39.0-dev.d4a47659a5
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/network/core/events.d.ts +1 -1
- package/lib/network/core/events.d.ts.map +1 -1
- package/lib/network/core/events.js +1 -1
- package/lib/network/core/events.js.map +1 -1
- package/lib/network/events.d.ts +6 -1
- package/lib/network/events.d.ts.map +1 -1
- package/lib/network/events.js +7 -1
- package/lib/network/events.js.map +1 -1
- package/lib/util/workerEvents.d.ts +1 -6
- package/lib/util/workerEvents.d.ts.map +1 -1
- package/lib/util/workerEvents.js +8 -8
- package/lib/util/workerEvents.js.map +1 -1
- package/package.json +14 -14
- package/src/network/core/events.ts +1 -1
- package/src/network/events.ts +7 -1
- package/src/util/workerEvents.ts +9 -8
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ResponseIncoming, ResponseOutgoing } from "@lodestar/reqresp";
|
|
2
2
|
import { AsyncIterableEventBus, IteratorEvent, RequestEvent } from "../../util/asyncIterableToEvents.js";
|
|
3
3
|
import { StrictEventEmitterSingleArg } from "../../util/strictEvents.js";
|
|
4
|
-
import { EventDirection } from "
|
|
4
|
+
import { EventDirection } from "../events.js";
|
|
5
5
|
import { IncomingRequestArgs, OutgoingRequestArgs } from "../reqresp/types.js";
|
|
6
6
|
export declare enum ReqRespBridgeEvent {
|
|
7
7
|
outgoingRequest = "reqresp.outgoingRequest",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/network/core/events.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAC,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,qCAAqC,CAAC;AACvG,OAAO,EAAC,2BAA2B,EAAC,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAC,cAAc,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/network/core/events.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAC,qBAAqB,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,qCAAqC,CAAC;AACvG,OAAO,EAAC,2BAA2B,EAAC,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAE7E,oBAAY,kBAAkB;IAC5B,eAAe,4BAA4B;IAC3C,gBAAgB,6BAA6B;IAC7C,eAAe,4BAA4B;IAC3C,gBAAgB,6BAA6B;CAC9C;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACxE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACxE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC;CACxE,CAAC;AAEF,KAAK,sBAAsB,GAAG,2BAA2B,CAAC,sBAAsB,CAAC,CAAC;0CAEtB;IAAC,QAAQ,sBAAsB,CAAA;CAAC;AAA5F,qBAAa,qBAAsB,SAAQ,0BAAkD;CAAG;AAGhG,eAAO,MAAM,2BAA2B,EAAE,MAAM,CAAC,kBAAkB,EAAE,cAAc,CAKlF,CAAC;AAEF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,sBAAsB,GAC7B,qBAAqB,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAO9D;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,sBAAsB,GAC7B,qBAAqB,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CAO9D;AAED,oBAAY,4BAA4B;IACtC,YAAY,iBAAiB;IAC7B,mBAAmB,wBAAwB;CAC5C"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import EventEmitter from "node:events";
|
|
2
|
-
import { EventDirection } from "
|
|
2
|
+
import { EventDirection } from "../events.js";
|
|
3
3
|
export var ReqRespBridgeEvent;
|
|
4
4
|
(function (ReqRespBridgeEvent) {
|
|
5
5
|
ReqRespBridgeEvent["outgoingRequest"] = "reqresp.outgoingRequest";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/network/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAC,cAAc,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/network/core/events.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAC,cAAc,EAAC,MAAM,cAAc,CAAC;AAG5C,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,iEAA2C,CAAA;IAC3C,mEAA6C,CAAA;IAC7C,iEAA2C,CAAA;IAC3C,mEAA6C,CAAA;AAC/C,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAWD,MAAM,OAAO,qBAAsB,SAAS,YAAiD;CAAG;AAEhG,gFAAgF;AAChF,MAAM,CAAC,MAAM,2BAA2B,GAA+C;IACrF,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,cAAc,CAAC,YAAY;IACjE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,YAAY;IAClE,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE,cAAc,CAAC,YAAY;IACjE,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,YAAY;CACnE,CAAC;AAEF,MAAM,UAAU,yBAAyB,CACvC,MAA8B;IAE9B,OAAO;QACL,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC;QAC5E,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,IAAI,CAAC;QAC9E,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,eAAe,EAAE,EAAE,CAAC;QACpE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CACxC,MAA8B;IAE9B,OAAO;QACL,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC;QAC5E,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,IAAI,CAAC;QAC9E,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,eAAe,EAAE,EAAE,CAAC;QACpE,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,EAAE,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,MAAM,CAAN,IAAY,4BAGX;AAHD,WAAY,4BAA4B;IACtC,6DAA6B,CAAA;IAC7B,2EAA2C,CAAA;AAC7C,CAAC,EAHW,4BAA4B,KAA5B,4BAA4B,QAGvC"}
|
package/lib/network/events.d.ts
CHANGED
|
@@ -2,7 +2,6 @@ import { PeerId, TopicValidatorResult } from "@libp2p/interface";
|
|
|
2
2
|
import { CustodyIndex, Status } from "@lodestar/types";
|
|
3
3
|
import { PeerIdStr } from "../util/peerId.js";
|
|
4
4
|
import { StrictEventEmitterSingleArg } from "../util/strictEvents.js";
|
|
5
|
-
import { EventDirection } from "../util/workerEvents.js";
|
|
6
5
|
import { PendingGossipsubMessage } from "./processor/types.js";
|
|
7
6
|
import { RequestTypedContainer } from "./reqresp/ReqRespBeaconNode.js";
|
|
8
7
|
export declare enum NetworkEvent {
|
|
@@ -38,6 +37,12 @@ export type NetworkEventData = {
|
|
|
38
37
|
acceptance: TopicValidatorResult;
|
|
39
38
|
};
|
|
40
39
|
};
|
|
40
|
+
export declare enum EventDirection {
|
|
41
|
+
workerToMain = 0,
|
|
42
|
+
mainToWorker = 1,
|
|
43
|
+
/** Event not emitted through worker boundary */
|
|
44
|
+
none = 2
|
|
45
|
+
}
|
|
41
46
|
export declare const networkEventDirection: Record<NetworkEvent, EventDirection>;
|
|
42
47
|
export type INetworkEventBus = StrictEventEmitterSingleArg<NetworkEventData>;
|
|
43
48
|
declare const NetworkEventBus_base: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/network/events.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,oBAAoB,EAAC,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAC,YAAY,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,2BAA2B,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../src/network/events.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,oBAAoB,EAAC,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAC,YAAY,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,2BAA2B,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,uBAAuB,EAAC,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAC,qBAAqB,EAAC,MAAM,gCAAgC,CAAC;AAErE,oBAAY,YAAY;IACtB,4DAA4D;IAC5D,aAAa,gCAAgC;IAC7C,mCAAmC;IACnC,gBAAgB,mCAAmC;IACnD,cAAc,qBAAqB;IAGnC,gEAAgE;IAChE,uBAAuB,mCAAmC;IAC1D,2DAA2D;IAC3D,6BAA6B,mCAAmC;CACjE;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAC5B,IAAI,EAAE,SAAS,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,YAAY,EAAE,CAAC;QAC/B,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE;QAAC,IAAI,EAAE,SAAS,CAAA;KAAC,CAAC;IACnD,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE;QAAC,OAAO,EAAE,qBAAqB,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAC,CAAC;IAClG,CAAC,YAAY,CAAC,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAChE,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAAE;QAC5C,KAAK,EAAE,MAAM,CAAC;QACd,iBAAiB,EAAE,SAAS,CAAC;QAC7B,UAAU,EAAE,oBAAoB,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,oBAAY,cAAc;IACxB,YAAY,IAAA;IACZ,YAAY,IAAA;IACZ,gDAAgD;IAChD,IAAI,IAAA;CACL;AAED,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,YAAY,EAAE,cAAc,CAMtE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;oCAEvB;IAAC,QAAQ,gBAAgB,CAAA;CAAC;AAAhF,qBAAa,eAAgB,SAAQ,oBAA4C;CAAG"}
|
package/lib/network/events.js
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { EventEmitter } from "node:events";
|
|
2
|
-
import { EventDirection } from "../util/workerEvents.js";
|
|
3
2
|
export var NetworkEvent;
|
|
4
3
|
(function (NetworkEvent) {
|
|
5
4
|
/** A relevant peer has connected or has been re-STATUS'd */
|
|
@@ -13,6 +12,13 @@ export var NetworkEvent;
|
|
|
13
12
|
/** (App -> Network) A gossip message has been validated */
|
|
14
13
|
NetworkEvent["gossipMessageValidationResult"] = "gossip.messageValidationResult";
|
|
15
14
|
})(NetworkEvent || (NetworkEvent = {}));
|
|
15
|
+
export var EventDirection;
|
|
16
|
+
(function (EventDirection) {
|
|
17
|
+
EventDirection[EventDirection["workerToMain"] = 0] = "workerToMain";
|
|
18
|
+
EventDirection[EventDirection["mainToWorker"] = 1] = "mainToWorker";
|
|
19
|
+
/** Event not emitted through worker boundary */
|
|
20
|
+
EventDirection[EventDirection["none"] = 2] = "none";
|
|
21
|
+
})(EventDirection || (EventDirection = {}));
|
|
16
22
|
export const networkEventDirection = {
|
|
17
23
|
[NetworkEvent.peerConnected]: EventDirection.workerToMain,
|
|
18
24
|
[NetworkEvent.peerDisconnected]: EventDirection.workerToMain,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/network/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/network/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAQzC,MAAM,CAAN,IAAY,YAYX;AAZD,WAAY,YAAY;IACtB,4DAA4D;IAC5D,6DAA6C,CAAA;IAC7C,mCAAmC;IACnC,mEAAmD,CAAA;IACnD,mDAAmC,CAAA;IAEnC,2BAA2B;IAC3B,gEAAgE;IAChE,0EAA0D,CAAA;IAC1D,2DAA2D;IAC3D,gFAAgE,CAAA;AAClE,CAAC,EAZW,YAAY,KAAZ,YAAY,QAYvB;AAmBD,MAAM,CAAN,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,mEAAY,CAAA;IACZ,mEAAY,CAAA;IACZ,gDAAgD;IAChD,mDAAI,CAAA;AACN,CAAC,EALW,cAAc,KAAd,cAAc,QAKzB;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAyC;IACzE,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC,YAAY;IACzD,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,cAAc,CAAC,YAAY;IAC5D,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,sCAAsC;IAC1F,CAAC,YAAY,CAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,YAAY;IACnE,CAAC,YAAY,CAAC,6BAA6B,CAAC,EAAE,cAAc,CAAC,YAAY;CAC1E,CAAC;AAIF,MAAM,OAAO,eAAgB,SAAS,YAA2C;CAAG"}
|
|
@@ -3,6 +3,7 @@ import { Thread } from "@chainsafe/threads";
|
|
|
3
3
|
import { Logger } from "@lodestar/logger";
|
|
4
4
|
import { Metrics } from "../metrics/metrics.js";
|
|
5
5
|
import { NetworkCoreWorkerMetrics } from "../network/core/metrics.js";
|
|
6
|
+
import { EventDirection } from "../network/events.js";
|
|
6
7
|
import { StrictEventEmitterSingleArg } from "./strictEvents.js";
|
|
7
8
|
export type WorkerBridgeEvent<EventData> = {
|
|
8
9
|
type: string;
|
|
@@ -10,12 +11,6 @@ export type WorkerBridgeEvent<EventData> = {
|
|
|
10
11
|
posted: [number, number];
|
|
11
12
|
data: EventData[keyof EventData];
|
|
12
13
|
};
|
|
13
|
-
export declare enum EventDirection {
|
|
14
|
-
workerToMain = 0,
|
|
15
|
-
mainToWorker = 1,
|
|
16
|
-
/** Event not emitted through worker boundary */
|
|
17
|
-
none = 2
|
|
18
|
-
}
|
|
19
14
|
/**
|
|
20
15
|
* Bridges events from worker to main thread
|
|
21
16
|
* Each event can only have one direction:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerEvents.d.ts","sourceRoot":"","sources":["../../src/util/workerEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"workerEvents.d.ts","sourceRoot":"","sources":["../../src/util/workerEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,MAAM,EAAC,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAC,MAAM,EAAC,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAC,cAAc,EAAe,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAC,2BAA2B,EAAC,MAAM,mBAAmB,CAAC;AAI9D,MAAM,MAAM,iBAAiB,CAAC,SAAS,IAAI;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,SAAS,CAAC;IACvB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC,MAAM,SAAS,CAAC,CAAC;CAClC,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAChD,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,EAC9C,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,wBAAwB,GAAG,IAAI,EACxC,cAAc,EAAE;KAAE,CAAC,IAAI,MAAM,SAAS,GAAG,cAAc;CAAC,GACvD,IAAI,CAuCN;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAC9C,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,2BAA2B,CAAC,SAAS,CAAC,EAC9C,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,aAAa,CAAC,EAC1C,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,cAAc,EAAE;KAAE,CAAC,IAAI,MAAM,SAAS,GAAG,cAAc;CAAC,GACvD,IAAI,CAiCN;AAED,wBAAsB,qBAAqB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,UAAU,EACV,MAAM,GACP,EAAE;IACD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBhB"}
|
package/lib/util/workerEvents.js
CHANGED
|
@@ -1,13 +1,7 @@
|
|
|
1
1
|
import { Thread } from "@chainsafe/threads";
|
|
2
2
|
import { sleep } from "@lodestar/utils";
|
|
3
|
+
import { EventDirection, NetworkEvent } from "../network/events.js";
|
|
3
4
|
const NANO_TO_SECOND_CONVERSION = 1e9;
|
|
4
|
-
export var EventDirection;
|
|
5
|
-
(function (EventDirection) {
|
|
6
|
-
EventDirection[EventDirection["workerToMain"] = 0] = "workerToMain";
|
|
7
|
-
EventDirection[EventDirection["mainToWorker"] = 1] = "mainToWorker";
|
|
8
|
-
/** Event not emitted through worker boundary */
|
|
9
|
-
EventDirection[EventDirection["none"] = 2] = "none";
|
|
10
|
-
})(EventDirection || (EventDirection = {}));
|
|
11
5
|
/**
|
|
12
6
|
* Bridges events from worker to main thread
|
|
13
7
|
* Each event can only have one direction:
|
|
@@ -37,7 +31,13 @@ export function wireEventsOnWorkerThread(mainEventName, events, parentPort, metr
|
|
|
37
31
|
posted: process.hrtime(),
|
|
38
32
|
data,
|
|
39
33
|
};
|
|
40
|
-
|
|
34
|
+
let transferList = undefined;
|
|
35
|
+
if (eventName === NetworkEvent.pendingGossipsubMessage) {
|
|
36
|
+
const payload = data;
|
|
37
|
+
// Transfer the underlying ArrayBuffer to avoid copy for PendingGossipsubMessage
|
|
38
|
+
transferList = [payload.msg.data.buffer];
|
|
39
|
+
}
|
|
40
|
+
parentPort.postMessage(workerEvent, transferList);
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workerEvents.js","sourceRoot":"","sources":["../../src/util/workerEvents.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workerEvents.js","sourceRoot":"","sources":["../../src/util/workerEvents.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.39.0-dev.
|
|
14
|
+
"version": "1.39.0-dev.d4a47659a5",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -140,18 +140,18 @@
|
|
|
140
140
|
"@libp2p/peer-id": "^5.1.0",
|
|
141
141
|
"@libp2p/prometheus-metrics": "^4.3.15",
|
|
142
142
|
"@libp2p/tcp": "^10.1.8",
|
|
143
|
-
"@lodestar/api": "1.39.0-dev.
|
|
144
|
-
"@lodestar/config": "1.39.0-dev.
|
|
145
|
-
"@lodestar/db": "1.39.0-dev.
|
|
146
|
-
"@lodestar/fork-choice": "1.39.0-dev.
|
|
147
|
-
"@lodestar/light-client": "1.39.0-dev.
|
|
148
|
-
"@lodestar/logger": "1.39.0-dev.
|
|
149
|
-
"@lodestar/params": "1.39.0-dev.
|
|
150
|
-
"@lodestar/reqresp": "1.39.0-dev.
|
|
151
|
-
"@lodestar/state-transition": "1.39.0-dev.
|
|
152
|
-
"@lodestar/types": "1.39.0-dev.
|
|
153
|
-
"@lodestar/utils": "1.39.0-dev.
|
|
154
|
-
"@lodestar/validator": "1.39.0-dev.
|
|
143
|
+
"@lodestar/api": "1.39.0-dev.d4a47659a5",
|
|
144
|
+
"@lodestar/config": "1.39.0-dev.d4a47659a5",
|
|
145
|
+
"@lodestar/db": "1.39.0-dev.d4a47659a5",
|
|
146
|
+
"@lodestar/fork-choice": "1.39.0-dev.d4a47659a5",
|
|
147
|
+
"@lodestar/light-client": "1.39.0-dev.d4a47659a5",
|
|
148
|
+
"@lodestar/logger": "1.39.0-dev.d4a47659a5",
|
|
149
|
+
"@lodestar/params": "1.39.0-dev.d4a47659a5",
|
|
150
|
+
"@lodestar/reqresp": "1.39.0-dev.d4a47659a5",
|
|
151
|
+
"@lodestar/state-transition": "1.39.0-dev.d4a47659a5",
|
|
152
|
+
"@lodestar/types": "1.39.0-dev.d4a47659a5",
|
|
153
|
+
"@lodestar/utils": "1.39.0-dev.d4a47659a5",
|
|
154
|
+
"@lodestar/validator": "1.39.0-dev.d4a47659a5",
|
|
155
155
|
"@multiformats/multiaddr": "^12.1.3",
|
|
156
156
|
"datastore-core": "^10.0.2",
|
|
157
157
|
"datastore-fs": "^10.0.6",
|
|
@@ -186,5 +186,5 @@
|
|
|
186
186
|
"beacon",
|
|
187
187
|
"blockchain"
|
|
188
188
|
],
|
|
189
|
-
"gitHead": "
|
|
189
|
+
"gitHead": "ece402e986e6babc414c33018cbe7337c68ffd67"
|
|
190
190
|
}
|
|
@@ -2,7 +2,7 @@ import EventEmitter from "node:events";
|
|
|
2
2
|
import {ResponseIncoming, ResponseOutgoing} from "@lodestar/reqresp";
|
|
3
3
|
import {AsyncIterableEventBus, IteratorEvent, RequestEvent} from "../../util/asyncIterableToEvents.js";
|
|
4
4
|
import {StrictEventEmitterSingleArg} from "../../util/strictEvents.js";
|
|
5
|
-
import {EventDirection} from "
|
|
5
|
+
import {EventDirection} from "../events.js";
|
|
6
6
|
import {IncomingRequestArgs, OutgoingRequestArgs} from "../reqresp/types.js";
|
|
7
7
|
|
|
8
8
|
export enum ReqRespBridgeEvent {
|
package/src/network/events.ts
CHANGED
|
@@ -3,7 +3,6 @@ import {PeerId, TopicValidatorResult} from "@libp2p/interface";
|
|
|
3
3
|
import {CustodyIndex, Status} from "@lodestar/types";
|
|
4
4
|
import {PeerIdStr} from "../util/peerId.js";
|
|
5
5
|
import {StrictEventEmitterSingleArg} from "../util/strictEvents.js";
|
|
6
|
-
import {EventDirection} from "../util/workerEvents.js";
|
|
7
6
|
import {PendingGossipsubMessage} from "./processor/types.js";
|
|
8
7
|
import {RequestTypedContainer} from "./reqresp/ReqRespBeaconNode.js";
|
|
9
8
|
|
|
@@ -38,6 +37,13 @@ export type NetworkEventData = {
|
|
|
38
37
|
};
|
|
39
38
|
};
|
|
40
39
|
|
|
40
|
+
export enum EventDirection {
|
|
41
|
+
workerToMain,
|
|
42
|
+
mainToWorker,
|
|
43
|
+
/** Event not emitted through worker boundary */
|
|
44
|
+
none,
|
|
45
|
+
}
|
|
46
|
+
|
|
41
47
|
export const networkEventDirection: Record<NetworkEvent, EventDirection> = {
|
|
42
48
|
[NetworkEvent.peerConnected]: EventDirection.workerToMain,
|
|
43
49
|
[NetworkEvent.peerDisconnected]: EventDirection.workerToMain,
|
package/src/util/workerEvents.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import {MessagePort, Worker} from "node:worker_threads";
|
|
2
|
+
import {Message} from "@libp2p/interface";
|
|
2
3
|
import {Thread} from "@chainsafe/threads";
|
|
3
4
|
import {Logger} from "@lodestar/logger";
|
|
4
5
|
import {sleep} from "@lodestar/utils";
|
|
5
6
|
import {Metrics} from "../metrics/metrics.js";
|
|
6
7
|
import {NetworkCoreWorkerMetrics} from "../network/core/metrics.js";
|
|
8
|
+
import {EventDirection, NetworkEvent} from "../network/events.js";
|
|
7
9
|
import {StrictEventEmitterSingleArg} from "./strictEvents.js";
|
|
8
10
|
|
|
9
11
|
const NANO_TO_SECOND_CONVERSION = 1e9;
|
|
@@ -15,13 +17,6 @@ export type WorkerBridgeEvent<EventData> = {
|
|
|
15
17
|
data: EventData[keyof EventData];
|
|
16
18
|
};
|
|
17
19
|
|
|
18
|
-
export enum EventDirection {
|
|
19
|
-
workerToMain,
|
|
20
|
-
mainToWorker,
|
|
21
|
-
/** Event not emitted through worker boundary */
|
|
22
|
-
none,
|
|
23
|
-
}
|
|
24
|
-
|
|
25
20
|
/**
|
|
26
21
|
* Bridges events from worker to main thread
|
|
27
22
|
* Each event can only have one direction:
|
|
@@ -63,7 +58,13 @@ export function wireEventsOnWorkerThread<EventData>(
|
|
|
63
58
|
posted: process.hrtime(),
|
|
64
59
|
data,
|
|
65
60
|
};
|
|
66
|
-
|
|
61
|
+
let transferList: ArrayBuffer[] | undefined = undefined;
|
|
62
|
+
if (eventName === NetworkEvent.pendingGossipsubMessage) {
|
|
63
|
+
const payload = data as {msg: Message};
|
|
64
|
+
// Transfer the underlying ArrayBuffer to avoid copy for PendingGossipsubMessage
|
|
65
|
+
transferList = [payload.msg.data.buffer as ArrayBuffer];
|
|
66
|
+
}
|
|
67
|
+
parentPort.postMessage(workerEvent, transferList);
|
|
67
68
|
});
|
|
68
69
|
}
|
|
69
70
|
}
|