@aztec/p2p 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.75.0

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.
Files changed (216) hide show
  1. package/dest/bootstrap/bootstrap.d.ts +38 -0
  2. package/dest/bootstrap/bootstrap.d.ts.map +1 -0
  3. package/dest/bootstrap/bootstrap.js +29 -41
  4. package/dest/client/factory.d.ts +19 -0
  5. package/dest/client/factory.d.ts.map +1 -0
  6. package/dest/client/factory.js +10 -8
  7. package/dest/client/index.d.ts +3 -0
  8. package/dest/client/index.d.ts.map +1 -0
  9. package/dest/client/index.js +1 -0
  10. package/dest/client/p2p_client.d.ts +332 -0
  11. package/dest/client/p2p_client.d.ts.map +1 -0
  12. package/dest/client/p2p_client.js +535 -513
  13. package/dest/config.d.ts +171 -0
  14. package/dest/config.d.ts.map +1 -0
  15. package/dest/config.js +39 -44
  16. package/dest/errors/reqresp.error.d.ts +28 -0
  17. package/dest/errors/reqresp.error.d.ts.map +1 -0
  18. package/dest/errors/reqresp.error.js +10 -6
  19. package/dest/index.d.ts +9 -0
  20. package/dest/index.d.ts.map +1 -0
  21. package/dest/index.js +1 -0
  22. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts +57 -0
  23. package/dest/mem_pools/attestation_pool/attestation_pool.d.ts.map +1 -0
  24. package/dest/mem_pools/attestation_pool/attestation_pool.js +2 -6
  25. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts +3 -0
  26. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.d.ts.map +1 -0
  27. package/dest/mem_pools/attestation_pool/attestation_pool_test_suite.js +32 -64
  28. package/dest/mem_pools/attestation_pool/index.d.ts +3 -0
  29. package/dest/mem_pools/attestation_pool/index.d.ts.map +1 -0
  30. package/dest/mem_pools/attestation_pool/index.js +1 -0
  31. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts +22 -0
  32. package/dest/mem_pools/attestation_pool/kv_attestation_pool.d.ts.map +1 -0
  33. package/dest/mem_pools/attestation_pool/kv_attestation_pool.js +19 -22
  34. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts +17 -0
  35. package/dest/mem_pools/attestation_pool/memory_attestation_pool.d.ts.map +1 -0
  36. package/dest/mem_pools/attestation_pool/memory_attestation_pool.js +26 -22
  37. package/dest/mem_pools/attestation_pool/mocks.d.ts +18 -0
  38. package/dest/mem_pools/attestation_pool/mocks.d.ts.map +1 -0
  39. package/dest/mem_pools/attestation_pool/mocks.js +6 -10
  40. package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts +7 -0
  41. package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.d.ts.map +1 -0
  42. package/dest/mem_pools/epoch_proof_quote_pool/epoch_proof_quote_pool.js +2 -1
  43. package/dest/mem_pools/epoch_proof_quote_pool/index.d.ts +4 -0
  44. package/dest/mem_pools/epoch_proof_quote_pool/index.d.ts.map +1 -0
  45. package/dest/mem_pools/epoch_proof_quote_pool/index.js +1 -0
  46. package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts +12 -0
  47. package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.d.ts.map +1 -0
  48. package/dest/mem_pools/epoch_proof_quote_pool/memory_epoch_proof_quote_pool.js +4 -5
  49. package/dest/mem_pools/epoch_proof_quote_pool/test_utils.d.ts +8 -0
  50. package/dest/mem_pools/epoch_proof_quote_pool/test_utils.d.ts.map +1 -0
  51. package/dest/mem_pools/epoch_proof_quote_pool/test_utils.js +3 -2
  52. package/dest/mem_pools/index.d.ts +5 -0
  53. package/dest/mem_pools/index.d.ts.map +1 -0
  54. package/dest/mem_pools/index.js +2 -1
  55. package/dest/mem_pools/instrumentation.d.ts +31 -0
  56. package/dest/mem_pools/instrumentation.d.ts.map +1 -0
  57. package/dest/mem_pools/instrumentation.js +42 -37
  58. package/dest/mem_pools/interface.d.ts +13 -0
  59. package/dest/mem_pools/interface.d.ts.map +1 -0
  60. package/dest/mem_pools/interface.js +2 -3
  61. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts +66 -0
  62. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.d.ts.map +1 -0
  63. package/dest/mem_pools/tx_pool/aztec_kv_tx_pool.js +134 -127
  64. package/dest/mem_pools/tx_pool/index.d.ts +4 -0
  65. package/dest/mem_pools/tx_pool/index.d.ts.map +1 -0
  66. package/dest/mem_pools/tx_pool/index.js +1 -0
  67. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts +56 -0
  68. package/dest/mem_pools/tx_pool/memory_tx_pool.d.ts.map +1 -0
  69. package/dest/mem_pools/tx_pool/memory_tx_pool.js +43 -45
  70. package/dest/mem_pools/tx_pool/priority.d.ts +8 -0
  71. package/dest/mem_pools/tx_pool/priority.d.ts.map +1 -0
  72. package/dest/mem_pools/tx_pool/priority.js +3 -1
  73. package/dest/mem_pools/tx_pool/tx_pool.d.ts +66 -0
  74. package/dest/mem_pools/tx_pool/tx_pool.d.ts.map +1 -0
  75. package/dest/mem_pools/tx_pool/tx_pool.js +2 -3
  76. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts +7 -0
  77. package/dest/mem_pools/tx_pool/tx_pool_test_suite.d.ts.map +1 -0
  78. package/dest/mem_pools/tx_pool/tx_pool_test_suite.js +37 -107
  79. package/dest/mocks/index.d.ts +54 -0
  80. package/dest/mocks/index.d.ts.map +1 -0
  81. package/dest/mocks/index.js +38 -47
  82. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts +8 -0
  83. package/dest/msg_validators/attestation_validator/attestation_validator.d.ts.map +1 -0
  84. package/dest/msg_validators/attestation_validator/attestation_validator.js +3 -3
  85. package/dest/msg_validators/attestation_validator/index.d.ts +2 -0
  86. package/dest/msg_validators/attestation_validator/index.d.ts.map +1 -0
  87. package/dest/msg_validators/attestation_validator/index.js +1 -0
  88. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts +8 -0
  89. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.d.ts.map +1 -0
  90. package/dest/msg_validators/block_proposal_validator/block_proposal_validator.js +2 -2
  91. package/dest/msg_validators/block_proposal_validator/index.d.ts +2 -0
  92. package/dest/msg_validators/block_proposal_validator/index.d.ts.map +1 -0
  93. package/dest/msg_validators/block_proposal_validator/index.js +1 -0
  94. package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.d.ts +8 -0
  95. package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.d.ts.map +1 -0
  96. package/dest/msg_validators/epoch_proof_quote_validator/epoch_proof_quote_validator.js +2 -2
  97. package/dest/msg_validators/epoch_proof_quote_validator/index.d.ts +2 -0
  98. package/dest/msg_validators/epoch_proof_quote_validator/index.d.ts.map +1 -0
  99. package/dest/msg_validators/epoch_proof_quote_validator/index.js +1 -0
  100. package/dest/msg_validators/index.d.ts +4 -0
  101. package/dest/msg_validators/index.d.ts.map +1 -0
  102. package/dest/msg_validators/index.js +1 -0
  103. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts +7 -0
  104. package/dest/msg_validators/tx_validator/aggregate_tx_validator.d.ts.map +1 -0
  105. package/dest/msg_validators/tx_validator/aggregate_tx_validator.js +11 -9
  106. package/dest/msg_validators/tx_validator/block_header_validator.d.ts +11 -0
  107. package/dest/msg_validators/tx_validator/block_header_validator.d.ts.map +1 -0
  108. package/dest/msg_validators/tx_validator/block_header_validator.js +12 -17
  109. package/dest/msg_validators/tx_validator/data_validator.d.ts +6 -0
  110. package/dest/msg_validators/tx_validator/data_validator.d.ts.map +1 -0
  111. package/dest/msg_validators/tx_validator/data_validator.js +32 -41
  112. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts +12 -0
  113. package/dest/msg_validators/tx_validator/double_spend_validator.d.ts.map +1 -0
  114. package/dest/msg_validators/tx_validator/double_spend_validator.js +14 -22
  115. package/dest/msg_validators/tx_validator/index.d.ts +7 -0
  116. package/dest/msg_validators/tx_validator/index.d.ts.map +1 -0
  117. package/dest/msg_validators/tx_validator/index.js +1 -0
  118. package/dest/msg_validators/tx_validator/metadata_validator.d.ts +10 -0
  119. package/dest/msg_validators/tx_validator/metadata_validator.d.ts.map +1 -0
  120. package/dest/msg_validators/tx_validator/metadata_validator.js +26 -29
  121. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts +8 -0
  122. package/dest/msg_validators/tx_validator/tx_proof_validator.d.ts.map +1 -0
  123. package/dest/msg_validators/tx_validator/tx_proof_validator.js +12 -17
  124. package/dest/services/data_store.d.ts +27 -0
  125. package/dest/services/data_store.d.ts.map +1 -0
  126. package/dest/services/data_store.js +57 -57
  127. package/dest/services/discv5/discV5_service.d.ts +36 -0
  128. package/dest/services/discv5/discV5_service.d.ts.map +1 -0
  129. package/dest/services/discv5/discV5_service.js +23 -31
  130. package/dest/services/dummy_service.d.ts +82 -0
  131. package/dest/services/dummy_service.d.ts.map +1 -0
  132. package/dest/services/dummy_service.js +58 -40
  133. package/dest/services/encoding.d.ts +31 -0
  134. package/dest/services/encoding.d.ts.map +1 -0
  135. package/dest/services/encoding.js +9 -10
  136. package/dest/services/index.d.ts +3 -0
  137. package/dest/services/index.d.ts.map +1 -0
  138. package/dest/services/index.js +1 -0
  139. package/dest/services/libp2p/libp2p_service.d.ts +225 -0
  140. package/dest/services/libp2p/libp2p_service.d.ts.map +1 -0
  141. package/dest/services/libp2p/libp2p_service.js +695 -709
  142. package/dest/services/peer-manager/metrics.d.ts +12 -0
  143. package/dest/services/peer-manager/metrics.d.ts.map +1 -0
  144. package/dest/services/peer-manager/metrics.js +7 -14
  145. package/dest/services/peer-manager/peer_manager.d.ts +76 -0
  146. package/dest/services/peer-manager/peer_manager.d.ts.map +1 -0
  147. package/dest/services/peer-manager/peer_manager.js +342 -340
  148. package/dest/services/peer-manager/peer_scoring.d.ts +28 -0
  149. package/dest/services/peer-manager/peer_scoring.d.ts.map +1 -0
  150. package/dest/services/peer-manager/peer_scoring.js +18 -20
  151. package/dest/services/reqresp/config.d.ts +16 -0
  152. package/dest/services/reqresp/config.d.ts.map +1 -0
  153. package/dest/services/reqresp/config.js +5 -4
  154. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts +45 -0
  155. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.d.ts.map +1 -0
  156. package/dest/services/reqresp/connection-sampler/batch_connection_sampler.js +28 -35
  157. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts +61 -0
  158. package/dest/services/reqresp/connection-sampler/connection_sampler.d.ts.map +1 -0
  159. package/dest/services/reqresp/connection-sampler/connection_sampler.js +59 -60
  160. package/dest/services/reqresp/index.d.ts +6 -0
  161. package/dest/services/reqresp/index.d.ts.map +1 -0
  162. package/dest/services/reqresp/index.js +3 -1
  163. package/dest/services/reqresp/interface.d.ts +107 -0
  164. package/dest/services/reqresp/interface.d.ts.map +1 -0
  165. package/dest/services/reqresp/interface.js +30 -25
  166. package/dest/services/reqresp/metrics.d.ts +15 -0
  167. package/dest/services/reqresp/metrics.d.ts.map +1 -0
  168. package/dest/services/reqresp/metrics.js +10 -23
  169. package/dest/services/reqresp/protocols/block.d.ts +4 -0
  170. package/dest/services/reqresp/protocols/block.d.ts.map +1 -0
  171. package/dest/services/reqresp/protocols/block.js +2 -1
  172. package/dest/services/reqresp/protocols/goodbye.d.ts +51 -0
  173. package/dest/services/reqresp/protocols/goodbye.d.ts.map +1 -0
  174. package/dest/services/reqresp/protocols/goodbye.js +40 -35
  175. package/dest/services/reqresp/protocols/index.d.ts +9 -0
  176. package/dest/services/reqresp/protocols/index.d.ts.map +1 -0
  177. package/dest/services/reqresp/protocols/index.js +3 -1
  178. package/dest/services/reqresp/protocols/ping.d.ts +9 -0
  179. package/dest/services/reqresp/protocols/ping.d.ts.map +1 -0
  180. package/dest/services/reqresp/protocols/ping.js +3 -1
  181. package/dest/services/reqresp/protocols/status.d.ts +9 -0
  182. package/dest/services/reqresp/protocols/status.d.ts.map +1 -0
  183. package/dest/services/reqresp/protocols/status.js +3 -1
  184. package/dest/services/reqresp/protocols/tx.d.ts +13 -0
  185. package/dest/services/reqresp/protocols/tx.d.ts.map +1 -0
  186. package/dest/services/reqresp/protocols/tx.js +8 -5
  187. package/dest/services/reqresp/rate-limiter/index.d.ts +2 -0
  188. package/dest/services/reqresp/rate-limiter/index.d.ts.map +1 -0
  189. package/dest/services/reqresp/rate-limiter/index.js +1 -0
  190. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts +102 -0
  191. package/dest/services/reqresp/rate-limiter/rate_limiter.d.ts.map +1 -0
  192. package/dest/services/reqresp/rate-limiter/rate_limiter.js +36 -42
  193. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts +3 -0
  194. package/dest/services/reqresp/rate-limiter/rate_limits.d.ts.map +1 -0
  195. package/dest/services/reqresp/rate-limiter/rate_limits.js +17 -16
  196. package/dest/services/reqresp/reqresp.d.ts +161 -0
  197. package/dest/services/reqresp/reqresp.d.ts.map +1 -0
  198. package/dest/services/reqresp/reqresp.js +395 -461
  199. package/dest/services/service.d.ts +85 -0
  200. package/dest/services/service.d.ts.map +1 -0
  201. package/dest/services/service.js +4 -3
  202. package/dest/services/types.d.ts +38 -0
  203. package/dest/services/types.d.ts.map +1 -0
  204. package/dest/services/types.js +23 -16
  205. package/dest/util.d.ts +53 -0
  206. package/dest/util.d.ts.map +1 -0
  207. package/dest/util.js +34 -23
  208. package/package.json +8 -8
  209. package/src/mem_pools/index.ts +3 -3
  210. package/src/mem_pools/instrumentation.ts +2 -3
  211. package/src/services/reqresp/interface.ts +0 -11
  212. package/src/services/reqresp/rate-limiter/rate_limiter.ts +1 -3
  213. package/src/services/reqresp/rate-limiter/rate_limits.ts +2 -2
  214. package/src/services/reqresp/reqresp.ts +24 -111
  215. package/dest/services/reqresp/status.js +0 -51
  216. package/src/services/reqresp/status.ts +0 -59
@@ -1,23 +1,17 @@
1
+ import { __esDecorate, __runInitializers } from "tslib";
1
2
  // @attribution: lodestar impl for inspiration
2
- function _ts_decorate(decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- }
8
3
  import { PeerErrorSeverity } from '@aztec/circuit-types';
9
4
  import { createLogger } from '@aztec/foundation/log';
10
5
  import { executeTimeout } from '@aztec/foundation/timer';
11
6
  import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
12
7
  import { pipe } from 'it-pipe';
13
- import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError, InvalidResponseError } from '../../errors/reqresp.error.js';
8
+ import { CollectiveReqRespTimeoutError, IndividualReqRespTimeoutError, InvalidResponseError, } from '../../errors/reqresp.error.js';
14
9
  import { SnappyTransform } from '../encoding.js';
15
10
  import { BatchConnectionSampler } from './connection-sampler/batch_connection_sampler.js';
16
11
  import { ConnectionSampler } from './connection-sampler/connection_sampler.js';
17
- import { DEFAULT_SUB_PROTOCOL_HANDLERS, DEFAULT_SUB_PROTOCOL_VALIDATORS, ReqRespSubProtocol, subProtocolMap } from './interface.js';
12
+ import { DEFAULT_SUB_PROTOCOL_HANDLERS, DEFAULT_SUB_PROTOCOL_VALIDATORS, subProtocolMap, } from './interface.js';
18
13
  import { ReqRespMetrics } from './metrics.js';
19
14
  import { RequestResponseRateLimiter } from './rate-limiter/rate_limiter.js';
20
- import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqRespStatus } from './status.js';
21
15
  /**
22
16
  * The Request Response Service
23
17
  *
@@ -31,480 +25,420 @@ import { ReqRespStatus, ReqRespStatusError, parseStatusChunk, prettyPrintReqResp
31
25
  * so they get decompressed in readMessage
32
26
  *
33
27
  * see: https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/p2p-interface.md#the-reqresp-domain
34
- */ export class ReqResp {
35
- libp2p;
36
- peerScoring;
37
- logger;
38
- overallRequestTimeoutMs;
39
- individualRequestTimeoutMs;
40
- // Warning, if the `start` function is not called as the parent class constructor, then the default sub protocol handlers will be used ( not good )
41
- subProtocolHandlers;
42
- subProtocolValidators;
43
- connectionSampler;
44
- rateLimiter;
45
- snappyTransform;
46
- metrics;
47
- constructor(config, libp2p, peerScoring, telemetryClient = getTelemetryClient()){
48
- this.libp2p = libp2p;
49
- this.peerScoring = peerScoring;
50
- this.subProtocolHandlers = DEFAULT_SUB_PROTOCOL_HANDLERS;
51
- this.subProtocolValidators = DEFAULT_SUB_PROTOCOL_VALIDATORS;
52
- this.logger = createLogger('p2p:reqresp');
53
- this.overallRequestTimeoutMs = config.overallRequestTimeoutMs;
54
- this.individualRequestTimeoutMs = config.individualRequestTimeoutMs;
55
- this.rateLimiter = new RequestResponseRateLimiter(peerScoring);
56
- // Connection sampler is used to sample our connected peers
57
- this.connectionSampler = new ConnectionSampler(libp2p);
58
- this.snappyTransform = new SnappyTransform();
59
- this.metrics = new ReqRespMetrics(telemetryClient);
60
- }
61
- get tracer() {
62
- return this.metrics.tracer;
63
- }
64
- /**
65
- * Start the reqresp service
66
- */ async start(subProtocolHandlers, subProtocolValidators) {
67
- this.subProtocolHandlers = subProtocolHandlers;
68
- this.subProtocolValidators = subProtocolValidators;
69
- // Register all protocol handlers
70
- for (const subProtocol of Object.keys(this.subProtocolHandlers)){
71
- await this.libp2p.handle(subProtocol, (data)=>void this.streamHandler(subProtocol, data).catch((err)=>this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
72
- }
73
- this.rateLimiter.start();
74
- }
75
- /**
76
- * Stop the reqresp service
77
- */ async stop() {
78
- // Unregister handlers in parallel
79
- const unregisterPromises = Object.keys(this.subProtocolHandlers).map((protocol)=>this.libp2p.unhandle(protocol));
80
- await Promise.all(unregisterPromises);
81
- // Close connection sampler
82
- await this.connectionSampler.stop();
83
- this.logger.debug('ReqResp: Connection sampler stopped');
84
- // Close streams in parallel
85
- const closeStreamPromises = this.libp2p.getConnections().map((connection)=>connection.close());
86
- await Promise.all(closeStreamPromises);
87
- this.logger.debug('ReqResp: All active streams closed');
88
- this.rateLimiter.stop();
89
- this.logger.debug('ReqResp: Rate limiter stopped');
90
- // NOTE: We assume libp2p instance is managed by the caller
91
- }
92
- /**
93
- * Send a request to peers, returns the first response
94
- *
95
- * @param subProtocol - The protocol being requested
96
- * @param request - The request to send
97
- * @returns - The response from the peer, otherwise undefined
98
- *
99
- * @description
100
- * This method attempts to send a request to all active peers using the specified sub-protocol.
101
- * It opens a stream with each peer, sends the request, and awaits a response.
102
- * If a valid response is received, it returns the response; otherwise, it continues to the next peer.
103
- * If no response is received from any peer, it returns undefined.
104
- *
105
- * The method performs the following steps:
106
- * - Sample a peer to send the request to.
107
- * - Opens a stream with the peer using the specified sub-protocol.
108
- *
109
- * When a response is received, it is validated using the given sub protocols response validator.
110
- * To see the interface for the response validator - see `interface.ts`
111
- *
112
- * Failing a response validation requests in a severe peer penalty, and will
113
- * prompt the node to continue to search to the next peer.
114
- * For example, a transaction request validator will check that the payload returned does in fact
115
- * match the txHash that was requested. A peer that fails this check an only be an extremely naughty peer.
116
- *
117
- * This entire operation is wrapped in an overall timeout, that is independent of the
118
- * peer it is requesting data from.
119
- *
120
- */ async sendRequest(subProtocol, request) {
121
- const responseValidator = this.subProtocolValidators[subProtocol];
122
- const requestBuffer = request.toBuffer();
123
- const requestFunction = async ()=>{
124
- // Attempt to ask all of our peers, but sampled in a random order
125
- // This function is wrapped in a timeout, so we will exit the loop if we have not received a response
126
- const numberOfPeers = this.libp2p.getPeers().length;
127
- if (numberOfPeers === 0) {
128
- this.logger.debug('No active peers to send requests to');
129
- return undefined;
28
+ */
29
+ let ReqResp = (() => {
30
+ var _a;
31
+ let _instanceExtraInitializers = [];
32
+ let _sendBatchRequest_decorators;
33
+ let _sendRequestToPeer_decorators;
34
+ let _streamHandler_decorators;
35
+ return _a = class ReqResp {
36
+ constructor(config, libp2p, peerScoring, telemetryClient = getTelemetryClient()) {
37
+ this.libp2p = (__runInitializers(this, _instanceExtraInitializers), libp2p);
38
+ this.peerScoring = peerScoring;
39
+ // Warning, if the `start` function is not called as the parent class constructor, then the default sub protocol handlers will be used ( not good )
40
+ this.subProtocolHandlers = DEFAULT_SUB_PROTOCOL_HANDLERS;
41
+ this.subProtocolValidators = DEFAULT_SUB_PROTOCOL_VALIDATORS;
42
+ this.logger = createLogger('p2p:reqresp');
43
+ this.overallRequestTimeoutMs = config.overallRequestTimeoutMs;
44
+ this.individualRequestTimeoutMs = config.individualRequestTimeoutMs;
45
+ this.rateLimiter = new RequestResponseRateLimiter(peerScoring);
46
+ // Connection sampler is used to sample our connected peers
47
+ this.connectionSampler = new ConnectionSampler(libp2p);
48
+ this.snappyTransform = new SnappyTransform();
49
+ this.metrics = new ReqRespMetrics(telemetryClient);
130
50
  }
131
- const attemptedPeers = new Map();
132
- for(let i = 0; i < numberOfPeers; i++){
133
- // Sample a peer to make a request to
134
- const peer = this.connectionSampler.getPeer(attemptedPeers);
135
- this.logger.trace(`Attempting to send request to peer: ${peer?.toString()}`);
136
- if (!peer) {
137
- this.logger.debug('No peers available to send requests to');
138
- return undefined;
139
- }
140
- attemptedPeers.set(peer.toString(), true);
141
- this.logger.trace(`Sending request to peer: ${peer.toString()}`);
142
- const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffer);
143
- if (response && response.status !== ReqRespStatus.SUCCESS) {
144
- this.logger.debug(`Request to peer ${peer.toString()} failed with status ${prettyPrintReqRespStatus(response.status)}`);
145
- continue;
146
- }
147
- // If we get a response, return it, otherwise we iterate onto the next peer
148
- // We do not consider it a success if we have an empty buffer
149
- if (response && response.data.length > 0) {
150
- const object = subProtocolMap[subProtocol].response.fromBuffer(response.data);
151
- // The response validator handles peer punishment within
152
- const isValid = await responseValidator(request, object, peer);
153
- if (!isValid) {
154
- throw new InvalidResponseError();
155
- }
156
- return object;
51
+ get tracer() {
52
+ return this.metrics.tracer;
53
+ }
54
+ /**
55
+ * Start the reqresp service
56
+ */
57
+ async start(subProtocolHandlers, subProtocolValidators) {
58
+ this.subProtocolHandlers = subProtocolHandlers;
59
+ this.subProtocolValidators = subProtocolValidators;
60
+ // Register all protocol handlers
61
+ for (const subProtocol of Object.keys(this.subProtocolHandlers)) {
62
+ await this.libp2p.handle(subProtocol, (data) => void this.streamHandler(subProtocol, data).catch(err => this.logger.error(`Error on libp2p subprotocol ${subProtocol} handler`, err)));
157
63
  }
64
+ this.rateLimiter.start();
158
65
  }
159
- };
160
- try {
161
- return await executeTimeout(requestFunction, this.overallRequestTimeoutMs, ()=>new CollectiveReqRespTimeoutError());
162
- } catch (e) {
163
- this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
164
- return undefined;
165
- }
166
- }
167
- /**
168
- * Request multiple messages over the same sub protocol, balancing the requests across peers.
169
- *
170
- * @devnote
171
- * - The function prioritizes sending requests to free peers using a batch sampling strategy.
172
- * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
173
- * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
174
- * - Responses are validated using a custom validator for the sub-protocol.*
175
- *
176
- * Requests are sent in parallel to each peer, but multiple requests are sent to the same peer in series
177
- * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
178
- * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
179
- * - Responses are validated using a custom validator for the sub-protocol.*
180
- *
181
- * @param subProtocol
182
- * @param requests
183
- * @param timeoutMs
184
- * @param maxPeers
185
- * @returns
186
- *
187
- * @throws {CollectiveReqRespTimeoutError} - If the request batch exceeds the specified timeout (`timeoutMs`).
188
- */ async sendBatchRequest(subProtocol, requests, timeoutMs = 10000, maxPeers = Math.min(10, requests.length), maxRetryAttempts = 3) {
189
- const responseValidator = this.subProtocolValidators[subProtocol];
190
- const responses = new Array(requests.length);
191
- const requestBuffers = requests.map((req)=>req.toBuffer());
192
- const requestFunction = async ()=>{
193
- // Track which requests still need to be processed
194
- const pendingRequestIndices = new Set(requestBuffers.map((_, i)=>i));
195
- // Create batch sampler with the total number of requests and max peers
196
- const batchSampler = new BatchConnectionSampler(this.connectionSampler, requests.length, maxPeers);
197
- if (batchSampler.activePeerCount === 0) {
198
- this.logger.debug('No active peers to send requests to');
199
- return [];
66
+ /**
67
+ * Stop the reqresp service
68
+ */
69
+ async stop() {
70
+ // Unregister handlers in parallel
71
+ const unregisterPromises = Object.keys(this.subProtocolHandlers).map(protocol => this.libp2p.unhandle(protocol));
72
+ await Promise.all(unregisterPromises);
73
+ // Close connection sampler
74
+ await this.connectionSampler.stop();
75
+ this.logger.debug('ReqResp: Connection sampler stopped');
76
+ // Close streams in parallel
77
+ const closeStreamPromises = this.libp2p.getConnections().map(connection => connection.close());
78
+ await Promise.all(closeStreamPromises);
79
+ this.logger.debug('ReqResp: All active streams closed');
80
+ this.rateLimiter.stop();
81
+ this.logger.debug('ReqResp: Rate limiter stopped');
82
+ // NOTE: We assume libp2p instance is managed by the caller
200
83
  }
201
- // This is where it gets fun
202
- // The outer loop is the retry loop, we will continue to retry until we process all indices we have
203
- // not received a response for, or we have reached the max retry attempts
204
- // The inner loop is the batch loop, we will process all requests for each peer in parallel
205
- // We will then process the results of the requests, and resample any peers that failed to respond
206
- // We will continue to retry until we have processed all indices, or we have reached the max retry attempts
207
- let retryAttempts = 0;
208
- while(pendingRequestIndices.size > 0 && batchSampler.activePeerCount > 0 && retryAttempts < maxRetryAttempts){
209
- // Process requests in parallel for each available peer
210
- const requestBatches = new Map();
211
- // Group requests by peer
212
- for (const requestIndex of pendingRequestIndices){
213
- const peer = batchSampler.getPeerForRequest(requestIndex);
214
- if (!peer) {
215
- break;
84
+ /**
85
+ * Send a request to peers, returns the first response
86
+ *
87
+ * @param subProtocol - The protocol being requested
88
+ * @param request - The request to send
89
+ * @returns - The response from the peer, otherwise undefined
90
+ *
91
+ * @description
92
+ * This method attempts to send a request to all active peers using the specified sub-protocol.
93
+ * It opens a stream with each peer, sends the request, and awaits a response.
94
+ * If a valid response is received, it returns the response; otherwise, it continues to the next peer.
95
+ * If no response is received from any peer, it returns undefined.
96
+ *
97
+ * The method performs the following steps:
98
+ * - Sample a peer to send the request to.
99
+ * - Opens a stream with the peer using the specified sub-protocol.
100
+ *
101
+ * When a response is received, it is validated using the given sub protocols response validator.
102
+ * To see the interface for the response validator - see `interface.ts`
103
+ *
104
+ * Failing a response validation requests in a severe peer penalty, and will
105
+ * prompt the node to continue to search to the next peer.
106
+ * For example, a transaction request validator will check that the payload returned does in fact
107
+ * match the txHash that was requested. A peer that fails this check an only be an extremely naughty peer.
108
+ *
109
+ * This entire operation is wrapped in an overall timeout, that is independent of the
110
+ * peer it is requesting data from.
111
+ *
112
+ */
113
+ async sendRequest(subProtocol, request) {
114
+ const responseValidator = this.subProtocolValidators[subProtocol];
115
+ const requestBuffer = request.toBuffer();
116
+ const requestFunction = async () => {
117
+ // Attempt to ask all of our peers, but sampled in a random order
118
+ // This function is wrapped in a timeout, so we will exit the loop if we have not received a response
119
+ const numberOfPeers = this.libp2p.getPeers().length;
120
+ if (numberOfPeers === 0) {
121
+ this.logger.debug('No active peers to send requests to');
122
+ return undefined;
216
123
  }
217
- if (!requestBatches.has(peer)) {
218
- requestBatches.set(peer, []);
124
+ const attemptedPeers = new Map();
125
+ for (let i = 0; i < numberOfPeers; i++) {
126
+ // Sample a peer to make a request to
127
+ const peer = this.connectionSampler.getPeer(attemptedPeers);
128
+ this.logger.trace(`Attempting to send request to peer: ${peer?.toString()}`);
129
+ if (!peer) {
130
+ this.logger.debug('No peers available to send requests to');
131
+ return undefined;
132
+ }
133
+ attemptedPeers.set(peer.toString(), true);
134
+ this.logger.trace(`Sending request to peer: ${peer.toString()}`);
135
+ const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffer);
136
+ // If we get a response, return it, otherwise we iterate onto the next peer
137
+ // We do not consider it a success if we have an empty buffer
138
+ if (response && response.length > 0) {
139
+ const object = subProtocolMap[subProtocol].response.fromBuffer(response);
140
+ // The response validator handles peer punishment within
141
+ const isValid = await responseValidator(request, object, peer);
142
+ if (!isValid) {
143
+ throw new InvalidResponseError();
144
+ }
145
+ return object;
146
+ }
219
147
  }
220
- requestBatches.get(peer).push(requestIndex);
148
+ };
149
+ try {
150
+ return await executeTimeout(requestFunction, this.overallRequestTimeoutMs, () => new CollectiveReqRespTimeoutError());
151
+ }
152
+ catch (e) {
153
+ this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
154
+ return undefined;
221
155
  }
222
- // Make parallel requests for each peer's batch
223
- // A batch entry will look something like this:
224
- // PeerId0: [0, 1, 2, 3]
225
- // PeerId1: [4, 5, 6, 7]
226
- // Peer Id 0 will send requests 0, 1, 2, 3 in serial
227
- // while simultaneously Peer Id 1 will send requests 4, 5, 6, 7 in serial
228
- const batchResults = await Promise.all(Array.from(requestBatches.entries()).map(async ([peer, indices])=>{
229
- try {
230
- // Requests all going to the same peer are sent synchronously
231
- const peerResults = [];
232
- for (const index of indices){
233
- const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffers[index]);
234
- // Check the status of the response buffer
235
- if (response && response.status !== ReqRespStatus.SUCCESS) {
236
- this.logger.debug(`Request to peer ${peer.toString()} failed with status ${prettyPrintReqRespStatus(response.status)}`);
237
- // If we hit a rate limit or some failure, we remove the peer and return the results,
238
- // they will be split among remaining peers and the new sampled peer
156
+ }
157
+ /**
158
+ * Request multiple messages over the same sub protocol, balancing the requests across peers.
159
+ *
160
+ * @devnote
161
+ * - The function prioritizes sending requests to free peers using a batch sampling strategy.
162
+ * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
163
+ * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
164
+ * - Responses are validated using a custom validator for the sub-protocol.*
165
+ *
166
+ * Requests are sent in parallel to each peer, but multiple requests are sent to the same peer in series
167
+ * - If a peer fails to respond or returns an invalid response, it is removed from the sampling pool and replaced.
168
+ * - The function stops retrying once all requests are processed, no active peers remain, or the maximum retry attempts are reached.
169
+ * - Responses are validated using a custom validator for the sub-protocol.*
170
+ *
171
+ * @param subProtocol
172
+ * @param requests
173
+ * @param timeoutMs
174
+ * @param maxPeers
175
+ * @returns
176
+ *
177
+ * @throws {CollectiveReqRespTimeoutError} - If the request batch exceeds the specified timeout (`timeoutMs`).
178
+ */
179
+ async sendBatchRequest(subProtocol, requests, timeoutMs = 10000, maxPeers = Math.min(10, requests.length), maxRetryAttempts = 3) {
180
+ const responseValidator = this.subProtocolValidators[subProtocol];
181
+ const responses = new Array(requests.length);
182
+ const requestBuffers = requests.map(req => req.toBuffer());
183
+ const requestFunction = async () => {
184
+ // Track which requests still need to be processed
185
+ const pendingRequestIndices = new Set(requestBuffers.map((_, i) => i));
186
+ // Create batch sampler with the total number of requests and max peers
187
+ const batchSampler = new BatchConnectionSampler(this.connectionSampler, requests.length, maxPeers);
188
+ if (batchSampler.activePeerCount === 0) {
189
+ this.logger.debug('No active peers to send requests to');
190
+ return [];
191
+ }
192
+ // This is where it gets fun
193
+ // The outer loop is the retry loop, we will continue to retry until we process all indices we have
194
+ // not received a response for, or we have reached the max retry attempts
195
+ // The inner loop is the batch loop, we will process all requests for each peer in parallel
196
+ // We will then process the results of the requests, and resample any peers that failed to respond
197
+ // We will continue to retry until we have processed all indices, or we have reached the max retry attempts
198
+ let retryAttempts = 0;
199
+ while (pendingRequestIndices.size > 0 && batchSampler.activePeerCount > 0 && retryAttempts < maxRetryAttempts) {
200
+ // Process requests in parallel for each available peer
201
+ const requestBatches = new Map();
202
+ // Group requests by peer
203
+ for (const requestIndex of pendingRequestIndices) {
204
+ const peer = batchSampler.getPeerForRequest(requestIndex);
205
+ if (!peer) {
206
+ break;
207
+ }
208
+ if (!requestBatches.has(peer)) {
209
+ requestBatches.set(peer, []);
210
+ }
211
+ requestBatches.get(peer).push(requestIndex);
212
+ }
213
+ // Make parallel requests for each peer's batch
214
+ // A batch entry will look something like this:
215
+ // PeerId0: [0, 1, 2, 3]
216
+ // PeerId1: [4, 5, 6, 7]
217
+ // Peer Id 0 will send requests 0, 1, 2, 3 in serial
218
+ // while simultaneously Peer Id 1 will send requests 4, 5, 6, 7 in serial
219
+ const batchResults = await Promise.all(Array.from(requestBatches.entries()).map(async ([peer, indices]) => {
220
+ try {
221
+ // Requests all going to the same peer are sent synchronously
222
+ const peerResults = [];
223
+ for (const index of indices) {
224
+ const response = await this.sendRequestToPeer(peer, subProtocol, requestBuffers[index]);
225
+ if (response && response.length > 0) {
226
+ const object = subProtocolMap[subProtocol].response.fromBuffer(response);
227
+ const isValid = await responseValidator(requests[index], object, peer);
228
+ if (isValid) {
229
+ peerResults.push({ index, response: object });
230
+ }
231
+ }
232
+ }
233
+ return { peer, results: peerResults };
234
+ }
235
+ catch (error) {
236
+ this.logger.debug(`Failed batch request to peer ${peer.toString()}:`, error);
239
237
  batchSampler.removePeerAndReplace(peer);
240
- return {
241
- peer,
242
- results: peerResults
243
- };
238
+ return { peer, results: [] };
244
239
  }
245
- if (response && response.data.length > 0) {
246
- const object = subProtocolMap[subProtocol].response.fromBuffer(response.data);
247
- const isValid = await responseValidator(requests[index], object, peer);
248
- if (isValid) {
249
- peerResults.push({
250
- index,
251
- response: object
252
- });
240
+ }));
241
+ // Process results
242
+ for (const { results } of batchResults) {
243
+ for (const { index, response } of results) {
244
+ if (response) {
245
+ responses[index] = response;
246
+ pendingRequestIndices.delete(index);
253
247
  }
254
248
  }
255
249
  }
256
- return {
257
- peer,
258
- results: peerResults
259
- };
260
- } catch (error) {
261
- this.logger.debug(`Failed batch request to peer ${peer.toString()}:`, error);
262
- batchSampler.removePeerAndReplace(peer);
263
- return {
264
- peer,
265
- results: []
266
- };
250
+ retryAttempts++;
267
251
  }
268
- }));
269
- // Process results
270
- for (const { results } of batchResults){
271
- for (const { index, response } of results){
272
- if (response) {
273
- responses[index] = response;
274
- pendingRequestIndices.delete(index);
275
- }
252
+ if (retryAttempts >= maxRetryAttempts) {
253
+ this.logger.debug(`Max retry attempts ${maxRetryAttempts} reached for batch request`);
276
254
  }
255
+ return responses;
256
+ };
257
+ try {
258
+ return await executeTimeout(requestFunction, timeoutMs, () => new CollectiveReqRespTimeoutError());
259
+ }
260
+ catch (e) {
261
+ this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
262
+ return [];
277
263
  }
278
- retryAttempts++;
279
- }
280
- if (retryAttempts >= maxRetryAttempts) {
281
- this.logger.debug(`Max retry attempts ${maxRetryAttempts} reached for batch request`);
282
264
  }
283
- return responses;
284
- };
285
- try {
286
- return await executeTimeout(requestFunction, timeoutMs, ()=>new CollectiveReqRespTimeoutError());
287
- } catch (e) {
288
- this.logger.debug(`${e.message} | subProtocol: ${subProtocol}`);
289
- return [];
290
- }
291
- }
292
- /**
293
- * Sends a request to a specific peer
294
- *
295
- * We first dial a particular protocol for the peer, this ensures that the peer knows
296
- * what to respond with
297
- *
298
- *
299
- * @param peerId - The peer to send the request to
300
- * @param subProtocol - The protocol to use to request
301
- * @param payload - The payload to send
302
- * @returns If the request is successful, the response is returned, otherwise undefined
303
- *
304
- * @description
305
- * This method attempts to open a stream with the specified peer, send the payload,
306
- * and await a response.
307
- * If an error occurs, it penalizes the peer and returns undefined.
308
- *
309
- * The method performs the following steps:
310
- * - Opens a stream with the peer using the specified sub-protocol.
311
- * - Sends the payload and awaits a response with a timeout.
312
- *
313
- * If the stream is not closed by the dialled peer, and a timeout occurs, then
314
- * the stream is closed on the requester's end and sender (us) updates its peer score
315
- */ async sendRequestToPeer(peerId, subProtocol, payload) {
316
- let stream;
317
- try {
318
- this.metrics.recordRequestSent(subProtocol);
319
- stream = await this.connectionSampler.dialProtocol(peerId, subProtocol);
320
- // Open the stream with a timeout
321
- const result = await executeTimeout(()=>pipe([
322
- payload
323
- ], stream, this.readMessage.bind(this)), this.individualRequestTimeoutMs, ()=>new IndividualReqRespTimeoutError());
324
- return result;
325
- } catch (e) {
326
- this.metrics.recordRequestError(subProtocol);
327
- this.handleResponseError(e, peerId, subProtocol);
328
- } finally{
329
- // Only close the stream if we created it
330
- if (stream) {
265
+ /**
266
+ * Sends a request to a specific peer
267
+ *
268
+ * We first dial a particular protocol for the peer, this ensures that the peer knows
269
+ * what to respond with
270
+ *
271
+ *
272
+ * @param peerId - The peer to send the request to
273
+ * @param subProtocol - The protocol to use to request
274
+ * @param payload - The payload to send
275
+ * @returns If the request is successful, the response is returned, otherwise undefined
276
+ *
277
+ * @description
278
+ * This method attempts to open a stream with the specified peer, send the payload,
279
+ * and await a response.
280
+ * If an error occurs, it penalizes the peer and returns undefined.
281
+ *
282
+ * The method performs the following steps:
283
+ * - Opens a stream with the peer using the specified sub-protocol.
284
+ * - Sends the payload and awaits a response with a timeout.
285
+ *
286
+ * If the stream is not closed by the dialled peer, and a timeout occurs, then
287
+ * the stream is closed on the requester's end and sender (us) updates its peer score
288
+ */
289
+ async sendRequestToPeer(peerId, subProtocol, payload) {
290
+ let stream;
331
291
  try {
332
- await this.connectionSampler.close(stream.id);
333
- } catch (closeError) {
334
- this.logger.error(`Error closing stream: ${closeError instanceof Error ? closeError.message : 'Unknown error'}`);
292
+ this.metrics.recordRequestSent(subProtocol);
293
+ stream = await this.connectionSampler.dialProtocol(peerId, subProtocol);
294
+ // Open the stream with a timeout
295
+ const result = await executeTimeout(() => pipe([payload], stream, this.readMessage.bind(this)), this.individualRequestTimeoutMs, () => new IndividualReqRespTimeoutError());
296
+ return result;
297
+ }
298
+ catch (e) {
299
+ this.metrics.recordRequestError(subProtocol);
300
+ this.handleResponseError(e, peerId, subProtocol);
301
+ }
302
+ finally {
303
+ // Only close the stream if we created it
304
+ if (stream) {
305
+ try {
306
+ await this.connectionSampler.close(stream.id);
307
+ }
308
+ catch (closeError) {
309
+ this.logger.error(`Error closing stream: ${closeError instanceof Error ? closeError.message : 'Unknown error'}`);
310
+ }
311
+ }
335
312
  }
336
313
  }
337
- }
338
- }
339
- /**
340
- * Handle a response error
341
- *
342
- * ReqResp errors are punished differently depending on the severity of the offense
343
- *
344
- * @param e - The error
345
- * @param peerId - The peer id
346
- * @param subProtocol - The sub protocol
347
- * @returns If the error is non pubishable, then undefined is returned, otherwise the peer is penalized
348
- */ handleResponseError(e, peerId, subProtocol) {
349
- const severity = this.categorizeError(e, peerId, subProtocol);
350
- if (severity) {
351
- this.peerScoring.penalizePeer(peerId, severity);
352
- }
353
- }
354
- /**
355
- * Categorize the error and log it.
356
- */ categorizeError(e, peerId, subProtocol) {
357
- // Non punishable errors - we do not expect a response for goodbye messages
358
- if (subProtocol === ReqRespSubProtocol.GOODBYE) {
359
- this.logger.debug('Error encountered on goodbye sub protocol, no penalty', {
360
- peerId: peerId.toString(),
361
- subProtocol
362
- });
363
- return undefined;
364
- }
365
- // We do not punish a collective timeout, as the node triggers this interupt, independent of the peer's behaviour
366
- const logTags = {
367
- peerId: peerId.toString(),
368
- subProtocol
369
- };
370
- if (e instanceof CollectiveReqRespTimeoutError || e instanceof InvalidResponseError) {
371
- this.logger.debug(`Non-punishable error: ${e.message} | peerId: ${peerId.toString()} | subProtocol: ${subProtocol}`, logTags);
372
- return undefined;
373
- }
374
- // Pubishable errors
375
- // Connection reset errors in the networking stack are punished with high severity
376
- // it just signals an unreliable peer
377
- // We assume that the requesting node has a functioning networking stack.
378
- if (e?.code === 'ECONNRESET' || e?.code === 'EPIPE') {
379
- this.logger.debug(`Connection reset: ${peerId.toString()}`, logTags);
380
- return PeerErrorSeverity.HighToleranceError;
381
- }
382
- if (e?.code === 'ECONNREFUSED') {
383
- this.logger.debug(`Connection refused: ${peerId.toString()}`, logTags);
384
- return PeerErrorSeverity.HighToleranceError;
385
- }
386
- // Timeout errors are punished with high tolerance, they can be due to a geogrpahically far away peer or an
387
- // overloaded peer
388
- if (e instanceof IndividualReqRespTimeoutError) {
389
- this.logger.debug(`Timeout error: ${e.message} | peerId: ${peerId.toString()} | subProtocol: ${subProtocol}`, logTags);
390
- return PeerErrorSeverity.HighToleranceError;
391
- }
392
- // Catch all error
393
- this.logger.error(`Unexpected error sending request to peer`, e, logTags);
394
- return PeerErrorSeverity.HighToleranceError;
395
- }
396
- /**
397
- * Read a message returned from a stream into a single buffer
398
- *
399
- * The message is split into two components
400
- * - The first chunk should contain a control byte, indicating the status of the response see `ReqRespStatus`
401
- * - The second chunk should contain the response data
402
- */ async readMessage(source) {
403
- let statusBuffer;
404
- const chunks = [];
405
- try {
406
- for await (const chunk of source){
407
- if (statusBuffer === undefined) {
408
- const firstChunkBuffer = chunk.subarray();
409
- statusBuffer = parseStatusChunk(firstChunkBuffer);
410
- } else {
411
- chunks.push(chunk.subarray());
314
+ /**
315
+ * Handle a response error
316
+ *
317
+ * ReqResp errors are punished differently depending on the severity of the offense
318
+ *
319
+ * @param e - The error
320
+ * @param peerId - The peer id
321
+ * @param subProtocol - The sub protocol
322
+ * @returns If the error is non pubishable, then undefined is returned, otherwise the peer is penalized
323
+ */
324
+ handleResponseError(e, peerId, subProtocol) {
325
+ const severity = this.categorizeError(e, peerId, subProtocol);
326
+ if (severity) {
327
+ this.peerScoring.penalizePeer(peerId, severity);
412
328
  }
413
329
  }
414
- const messageData = Buffer.concat(chunks);
415
- const message = this.snappyTransform.inboundTransformNoTopic(messageData);
416
- return {
417
- status: statusBuffer ?? ReqRespStatus.UNKNOWN,
418
- data: message
419
- };
420
- } catch (e) {
421
- this.logger.debug(`Reading message failed: ${e.message}`);
422
- let status = ReqRespStatus.UNKNOWN;
423
- if (e instanceof ReqRespStatusError) {
424
- status = e.status;
330
+ /**
331
+ * Categorize the error and log it.
332
+ */
333
+ categorizeError(e, peerId, subProtocol) {
334
+ // Non pubishable errors
335
+ // We do not punish a collective timeout, as the node triggers this interupt, independent of the peer's behaviour
336
+ const logTags = {
337
+ peerId: peerId.toString(),
338
+ subProtocol,
339
+ };
340
+ if (e instanceof CollectiveReqRespTimeoutError || e instanceof InvalidResponseError) {
341
+ this.logger.debug(`Non-punishable error: ${e.message} | peerId: ${peerId.toString()} | subProtocol: ${subProtocol}`, logTags);
342
+ return undefined;
343
+ }
344
+ // Pubishable errors
345
+ // Connection reset errors in the networking stack are punished with high severity
346
+ // it just signals an unreliable peer
347
+ // We assume that the requesting node has a functioning networking stack.
348
+ if (e?.code === 'ECONNRESET' || e?.code === 'EPIPE') {
349
+ this.logger.debug(`Connection reset: ${peerId.toString()}`, logTags);
350
+ return PeerErrorSeverity.HighToleranceError;
351
+ }
352
+ if (e?.code === 'ECONNREFUSED') {
353
+ this.logger.debug(`Connection refused: ${peerId.toString()}`, logTags);
354
+ return PeerErrorSeverity.HighToleranceError;
355
+ }
356
+ // Timeout errors are punished with high tolerance, they can be due to a geogrpahically far away peer or an
357
+ // overloaded peer
358
+ if (e instanceof IndividualReqRespTimeoutError) {
359
+ this.logger.debug(`Timeout error: ${e.message} | peerId: ${peerId.toString()} | subProtocol: ${subProtocol}`, logTags);
360
+ return PeerErrorSeverity.HighToleranceError;
361
+ }
362
+ // Catch all error
363
+ this.logger.error(`Unexpected error sending request to peer`, e, logTags);
364
+ return PeerErrorSeverity.HighToleranceError;
425
365
  }
426
- return {
427
- status,
428
- data: Buffer.from([])
429
- };
430
- }
431
- }
432
- /**
433
- * Stream Handler
434
- * Reads the incoming stream, determines the protocol, then triggers the appropriate handler
435
- *
436
- * @param param0 - The incoming stream data
437
- *
438
- * @description
439
- * An individual stream handler will be bound to each sub protocol, and handles returning data back
440
- * to the requesting peer.
441
- *
442
- * The sub protocol handler interface is defined within `interface.ts` and will be assigned to the
443
- * req resp service on start up.
444
- *
445
- * We check rate limits for each peer, note the peer will be penalised within the rate limiter implementation
446
- * if they exceed their peer specific limits.
447
- */ async streamHandler(protocol, { stream, connection }) {
448
- this.metrics.recordRequestReceived(protocol);
449
- try {
450
- // Store a reference to from this for the async generator
451
- if (!this.rateLimiter.allow(protocol, connection.remotePeer)) {
452
- this.logger.warn(`Rate limit exceeded for ${protocol} from ${connection.remotePeer}`);
453
- throw new ReqRespStatusError(ReqRespStatus.RATE_LIMIT_EXCEEDED);
366
+ /**
367
+ * Read a message returned from a stream into a single buffer
368
+ */
369
+ async readMessage(source) {
370
+ const chunks = [];
371
+ for await (const chunk of source) {
372
+ chunks.push(chunk.subarray());
373
+ }
374
+ const messageData = Buffer.concat(chunks);
375
+ return this.snappyTransform.inboundTransformNoTopic(messageData);
454
376
  }
455
- const handler = this.subProtocolHandlers[protocol];
456
- const transform = this.snappyTransform;
457
- await pipe(stream, async function*(source) {
458
- for await (const chunkList of source){
459
- const msg = Buffer.from(chunkList.subarray());
460
- const response = await handler(connection.remotePeer, msg);
461
- // Send success code first, then the response
462
- const successChunk = Buffer.from([
463
- ReqRespStatus.SUCCESS
464
- ]);
465
- yield new Uint8Array(successChunk);
466
- yield new Uint8Array(transform.outboundTransformNoTopic(response));
377
+ /**
378
+ * Stream Handler
379
+ * Reads the incoming stream, determines the protocol, then triggers the appropriate handler
380
+ *
381
+ * @param param0 - The incoming stream data
382
+ *
383
+ * @description
384
+ * An individual stream handler will be bound to each sub protocol, and handles returning data back
385
+ * to the requesting peer.
386
+ *
387
+ * The sub protocol handler interface is defined within `interface.ts` and will be assigned to the
388
+ * req resp service on start up.
389
+ *
390
+ * We check rate limits for each peer, note the peer will be penalised within the rate limiter implementation
391
+ * if they exceed their peer specific limits.
392
+ */
393
+ async streamHandler(protocol, { stream, connection }) {
394
+ this.metrics.recordRequestReceived(protocol);
395
+ // Store a reference to from this for the async generator
396
+ if (!this.rateLimiter.allow(protocol, connection.remotePeer)) {
397
+ this.logger.warn(`Rate limit exceeded for ${protocol} from ${connection.remotePeer}`);
398
+ // TODO(#8483): handle changing peer scoring for failed rate limit, maybe differentiate between global and peer limits here when punishing
399
+ await stream.close();
400
+ return;
401
+ }
402
+ const handler = this.subProtocolHandlers[protocol];
403
+ const transform = this.snappyTransform;
404
+ try {
405
+ await pipe(stream, async function* (source) {
406
+ for await (const chunkList of source) {
407
+ const msg = Buffer.from(chunkList.subarray());
408
+ const response = await handler(connection.remotePeer, msg);
409
+ yield new Uint8Array(transform.outboundTransformNoTopic(response));
410
+ }
411
+ }, stream);
412
+ }
413
+ catch (e) {
414
+ this.logger.warn(e);
415
+ this.metrics.recordResponseError(protocol);
416
+ }
417
+ finally {
418
+ await stream.close();
467
419
  }
468
- }, stream);
469
- } catch (e) {
470
- this.logger.warn(e);
471
- this.metrics.recordResponseError(protocol);
472
- // If we receive a known error, we use the error status in the response chunk, otherwise we categorize as unknown
473
- let errorStatus = ReqRespStatus.UNKNOWN;
474
- if (e instanceof ReqRespStatusError) {
475
- errorStatus = e.status;
476
420
  }
477
- const sendErrorChunk = this.sendErrorChunk(errorStatus);
478
- // Return and yield the response chunk
479
- await pipe(stream, async function*(_source) {
480
- yield* sendErrorChunk;
481
- }, stream);
482
- } finally{
483
- await stream.close();
484
- }
485
- }
486
- async *sendErrorChunk(error) {
487
- const errorChunk = Buffer.from([
488
- error
489
- ]);
490
- yield new Uint8Array(errorChunk);
491
- }
492
- }
493
- _ts_decorate([
494
- trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests)=>({
495
- [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol,
496
- [Attributes.P2P_REQ_RESP_BATCH_REQUESTS_COUNT]: requests.length
497
- }))
498
- ], ReqResp.prototype, "sendBatchRequest", null);
499
- _ts_decorate([
500
- trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _)=>({
501
- [Attributes.P2P_ID]: peerId.toString(),
502
- [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol
503
- }))
504
- ], ReqResp.prototype, "sendRequestToPeer", null);
505
- _ts_decorate([
506
- trackSpan('ReqResp.streamHandler', (protocol, { connection })=>({
507
- [Attributes.P2P_REQ_RESP_PROTOCOL]: protocol,
508
- [Attributes.P2P_ID]: connection.remotePeer.toString()
509
- }))
510
- ], ReqResp.prototype, "streamHandler", null);
421
+ },
422
+ (() => {
423
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
424
+ _sendBatchRequest_decorators = [trackSpan('ReqResp.sendBatchRequest', (subProtocol, requests) => ({
425
+ [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol,
426
+ [Attributes.P2P_REQ_RESP_BATCH_REQUESTS_COUNT]: requests.length,
427
+ }))];
428
+ _sendRequestToPeer_decorators = [trackSpan('ReqResp.sendRequestToPeer', (peerId, subProtocol, _) => ({
429
+ [Attributes.P2P_ID]: peerId.toString(),
430
+ [Attributes.P2P_REQ_RESP_PROTOCOL]: subProtocol,
431
+ }))];
432
+ _streamHandler_decorators = [trackSpan('ReqResp.streamHandler', (protocol, { connection }) => ({
433
+ [Attributes.P2P_REQ_RESP_PROTOCOL]: protocol,
434
+ [Attributes.P2P_ID]: connection.remotePeer.toString(),
435
+ }))];
436
+ __esDecorate(_a, null, _sendBatchRequest_decorators, { kind: "method", name: "sendBatchRequest", static: false, private: false, access: { has: obj => "sendBatchRequest" in obj, get: obj => obj.sendBatchRequest }, metadata: _metadata }, null, _instanceExtraInitializers);
437
+ __esDecorate(_a, null, _sendRequestToPeer_decorators, { kind: "method", name: "sendRequestToPeer", static: false, private: false, access: { has: obj => "sendRequestToPeer" in obj, get: obj => obj.sendRequestToPeer }, metadata: _metadata }, null, _instanceExtraInitializers);
438
+ __esDecorate(_a, null, _streamHandler_decorators, { kind: "method", name: "streamHandler", static: false, private: false, access: { has: obj => "streamHandler" in obj, get: obj => obj.streamHandler }, metadata: _metadata }, null, _instanceExtraInitializers);
439
+ if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
440
+ })(),
441
+ _a;
442
+ })();
443
+ export { ReqResp };
444
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"reqresp.js","sourceRoot":"","sources":["../../../src/services/reqresp/reqresp.ts"],"names":[],"mappings":";AAAA,8CAA8C;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAe,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAwB,kBAAkB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAG1G,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAI/B,OAAO,EACL,6BAA6B,EAC7B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,kDAAkD,CAAC;AAC1F,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;AAC/E,OAAO,EACL,6BAA6B,EAC7B,+BAA+B,EAK/B,cAAc,GACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAE5E;;;;;;;;;;;;;GAaG;IACU,OAAO;;;;;;sBAAP,OAAO;YAiBlB,YACE,MAAwB,EAChB,MAAc,EACd,WAAwB,EAChC,kBAAmC,kBAAkB,EAAE;gBAF/C,WAAM,IAnBL,mDAAO,EAmBR,MAAM,EAAQ;gBACd,gBAAW,GAAX,WAAW,CAAa;gBAdlC,mJAAmJ;gBAC3I,wBAAmB,GAA+B,6BAA6B,CAAC;gBAChF,0BAAqB,GAAiC,+BAA+B,CAAC;gBAe5F,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,aAAa,CAAC,CAAC;gBAE1C,IAAI,CAAC,uBAAuB,GAAG,MAAM,CAAC,uBAAuB,CAAC;gBAC9D,IAAI,CAAC,0BAA0B,GAAG,MAAM,CAAC,0BAA0B,CAAC;gBAEpE,IAAI,CAAC,WAAW,GAAG,IAAI,0BAA0B,CAAC,WAAW,CAAC,CAAC;gBAE/D,2DAA2D;gBAC3D,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBAEvD,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC7C,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,MAAM;gBACR,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC7B,CAAC;YAED;;eAEG;YACH,KAAK,CAAC,KAAK,CAAC,mBAA+C,EAAE,qBAAmD;gBAC9G,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;gBAC/C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;gBAEnD,iCAAiC;gBACjC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC;oBAChE,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CACtB,WAAW,EACX,CAAC,IAAwB,EAAE,EAAE,CAC3B,KAAK,IAAI,CAAC,aAAa,CAAC,WAAiC,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAC3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,WAAW,UAAU,EAAE,GAAG,CAAC,CAC7E,CACJ,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAED;;eAEG;YACH,KAAK,CAAC,IAAI;gBACR,kCAAkC;gBAClC,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACjH,MAAM,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAEtC,2BAA2B;gBAC3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;gBACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;gBAEzD,4BAA4B;gBAC5B,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC/F,MAAM,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC;gBAExD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;gBACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;gBAEnD,2DAA2D;YAC7D,CAAC;YAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA4BG;YACH,KAAK,CAAC,WAAW,CACf,WAAwB,EACxB,OAA6D;gBAE7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBAClE,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAEzC,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;oBACjC,iEAAiE;oBACjE,qGAAqG;oBACrG,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;oBAEpD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;wBACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;wBACzD,OAAO,SAAS,CAAC;oBACnB,CAAC;oBAED,MAAM,cAAc,GAAyB,IAAI,GAAG,EAAE,CAAC;oBACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,EAAE,EAAE,CAAC;wBACvC,qCAAqC;wBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;wBAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uCAAuC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;wBAC7E,IAAI,CAAC,IAAI,EAAE,CAAC;4BACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;4BAC5D,OAAO,SAAS,CAAC;wBACnB,CAAC;wBAED,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;wBAE1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;wBACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;wBAEhF,2EAA2E;wBAC3E,6DAA6D;wBAC7D,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACpC,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;4BACzE,wDAAwD;4BACxD,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;4BAC/D,IAAI,CAAC,OAAO,EAAE,CAAC;gCACb,MAAM,IAAI,oBAAoB,EAAE,CAAC;4BACnC,CAAC;4BACD,OAAO,MAAM,CAAC;wBAChB,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC;gBAEF,IAAI,CAAC;oBACH,OAAO,MAAM,cAAc,CACzB,eAAe,EACf,IAAI,CAAC,uBAAuB,EAC5B,GAAG,EAAE,CAAC,IAAI,6BAA6B,EAAE,CAC1C,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,mBAAmB,WAAW,EAAE,CAAC,CAAC;oBAChE,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;YAED;;;;;;;;;;;;;;;;;;;;;eAqBG;YAQH,KAAK,CAAC,gBAAgB,CACpB,WAAwB,EACxB,QAAgE,EAChE,SAAS,GAAG,KAAK,EACjB,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,EACxC,gBAAgB,GAAG,CAAC;gBAEpB,MAAM,iBAAiB,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;gBAClE,MAAM,SAAS,GAA4D,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACtG,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAE3D,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;oBACjC,kDAAkD;oBAClD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;oBAEvE,uEAAuE;oBACvE,MAAM,YAAY,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;oBAEnG,IAAI,YAAY,CAAC,eAAe,KAAK,CAAC,EAAE,CAAC;wBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;wBACzD,OAAO,EAAE,CAAC;oBACZ,CAAC;oBAED,4BAA4B;oBAC5B,mGAAmG;oBACnG,yEAAyE;oBAEzE,2FAA2F;oBAC3F,kGAAkG;oBAClG,2GAA2G;oBAE3G,IAAI,aAAa,GAAG,CAAC,CAAC;oBACtB,OAAO,qBAAqB,CAAC,IAAI,GAAG,CAAC,IAAI,YAAY,CAAC,eAAe,GAAG,CAAC,IAAI,aAAa,GAAG,gBAAgB,EAAE,CAAC;wBAC9G,uDAAuD;wBACvD,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;wBAEnD,yBAAyB;wBACzB,KAAK,MAAM,YAAY,IAAI,qBAAqB,EAAE,CAAC;4BACjD,MAAM,IAAI,GAAG,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;4BAC1D,IAAI,CAAC,IAAI,EAAE,CAAC;gCACV,MAAM;4BACR,CAAC;4BAED,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gCAC9B,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;4BAC/B,CAAC;4BACD,cAAc,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBAC/C,CAAC;wBAED,+CAA+C;wBAC/C,+CAA+C;wBAC/C,wBAAwB;wBACxB,wBAAwB;wBAExB,oDAAoD;wBACpD,yEAAyE;wBAEzE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;4BACjE,IAAI,CAAC;gCACH,6DAA6D;gCAC7D,MAAM,WAAW,GACf,EAAE,CAAC;gCACL,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oCAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;oCAExF,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;wCACpC,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;wCACzE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;wCAEvE,IAAI,OAAO,EAAE,CAAC;4CACZ,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;wCAChD,CAAC;oCACH,CAAC;gCACH,CAAC;gCAED,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;4BACxC,CAAC;4BAAC,OAAO,KAAK,EAAE,CAAC;gCACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;gCAC7E,YAAY,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gCACxC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;4BAC/B,CAAC;wBACH,CAAC,CAAC,CACH,CAAC;wBAEF,kBAAkB;wBAClB,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,YAAY,EAAE,CAAC;4BACvC,KAAK,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,OAAO,EAAE,CAAC;gCAC1C,IAAI,QAAQ,EAAE,CAAC;oCACb,SAAS,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;oCAC5B,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gCACtC,CAAC;4BACH,CAAC;wBACH,CAAC;wBAED,aAAa,EAAE,CAAC;oBAClB,CAAC;oBAED,IAAI,aAAa,IAAI,gBAAgB,EAAE,CAAC;wBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,gBAAgB,4BAA4B,CAAC,CAAC;oBACxF,CAAC;oBAED,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC;gBAEF,IAAI,CAAC;oBACH,OAAO,MAAM,cAAc,CACzB,eAAe,EACf,SAAS,EACT,GAAG,EAAE,CAAC,IAAI,6BAA6B,EAAE,CAC1C,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,mBAAmB,WAAW,EAAE,CAAC,CAAC;oBAChE,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC;YAED;;;;;;;;;;;;;;;;;;;;;;;eAuBG;YAKI,KAAK,CAAC,iBAAiB,CAC5B,MAAc,EACd,WAA+B,EAC/B,OAAe;gBAEf,IAAI,MAA0B,CAAC;gBAC/B,IAAI,CAAC;oBACH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;oBAE5C,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;oBAExE,iCAAiC;oBACjC,MAAM,MAAM,GAAG,MAAM,cAAc,CACjC,GAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,MAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC5E,IAAI,CAAC,0BAA0B,EAC/B,GAAG,EAAE,CAAC,IAAI,6BAA6B,EAAE,CAC1C,CAAC;oBAEF,OAAO,MAAM,CAAC;gBAChB,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;oBAC7C,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBACnD,CAAC;wBAAS,CAAC;oBACT,yCAAyC;oBACzC,IAAI,MAAM,EAAE,CAAC;wBACX,IAAI,CAAC;4BACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAChD,CAAC;wBAAC,OAAO,UAAU,EAAE,CAAC;4BACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yBAAyB,UAAU,YAAY,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAC9F,CAAC;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;YAED;;;;;;;;;eASG;YACK,mBAAmB,CAAC,CAAM,EAAE,MAAc,EAAE,WAA+B;gBACjF,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAC9D,IAAI,QAAQ,EAAE,CAAC;oBACb,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAClD,CAAC;YACH,CAAC;YAED;;eAEG;YACK,eAAe,CAAC,CAAM,EAAE,MAAc,EAAE,WAA+B;gBAC7E,wBAAwB;gBACxB,iHAAiH;gBACjH,MAAM,OAAO,GAAG;oBACd,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACzB,WAAW;iBACZ,CAAC;gBACF,IAAI,CAAC,YAAY,6BAA6B,IAAI,CAAC,YAAY,oBAAoB,EAAE,CAAC;oBACpF,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,yBAAyB,CAAC,CAAC,OAAO,cAAc,MAAM,CAAC,QAAQ,EAAE,mBAAmB,WAAW,EAAE,EACjG,OAAO,CACR,CAAC;oBACF,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,oBAAoB;gBACpB,kFAAkF;gBAClF,qCAAqC;gBACrC,yEAAyE;gBACzE,IAAI,CAAC,EAAE,IAAI,KAAK,YAAY,IAAI,CAAC,EAAE,IAAI,KAAK,OAAO,EAAE,CAAC;oBACpD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qBAAqB,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;oBACrE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC;gBAC9C,CAAC;gBAED,IAAI,CAAC,EAAE,IAAI,KAAK,cAAc,EAAE,CAAC;oBAC/B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;oBACvE,OAAO,iBAAiB,CAAC,kBAAkB,CAAC;gBAC9C,CAAC;gBAED,2GAA2G;gBAC3G,kBAAkB;gBAClB,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;oBAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kBAAkB,CAAC,CAAC,OAAO,cAAc,MAAM,CAAC,QAAQ,EAAE,mBAAmB,WAAW,EAAE,EAC1F,OAAO,CACR,CAAC;oBACF,OAAO,iBAAiB,CAAC,kBAAkB,CAAC;gBAC9C,CAAC;gBAED,kBAAkB;gBAClB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0CAA0C,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC1E,OAAO,iBAAiB,CAAC,kBAAkB,CAAC;YAC9C,CAAC;YAED;;eAEG;YACK,KAAK,CAAC,WAAW,CAAC,MAAqC;gBAC7D,MAAM,MAAM,GAAiB,EAAE,CAAC;gBAChC,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;oBACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChC,CAAC;gBACD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC1C,OAAO,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,WAAW,CAAC,CAAC;YACnE,CAAC;YAED;;;;;;;;;;;;;;;eAeG;YAKK,KAAK,CAAC,aAAa,CAAC,QAA4B,EAAE,EAAE,MAAM,EAAE,UAAU,EAAsB;gBAClG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;gBAE7C,yDAAyD;gBACzD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,QAAQ,SAAS,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;oBAEtF,0IAA0I;oBAC1I,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;oBACrB,OAAO;gBACT,CAAC;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBACnD,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC;gBAEvC,IAAI,CAAC;oBACH,MAAM,IAAI,CACR,MAAM,EACN,KAAK,SAAS,CAAC,EAAE,MAAW;wBAC1B,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;4BACrC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;4BAC9C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;4BAC3D,MAAM,IAAI,UAAU,CAAC,SAAS,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,CAAC;wBACrE,CAAC;oBACH,CAAC,EACD,MAAM,CACP,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpB,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;gBAC7C,CAAC;wBAAS,CAAC;oBACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;YACH,CAAC;;;;4CA7TA,SAAS,CACR,0BAA0B,EAC1B,CAAC,WAA+B,EAAE,QAAuE,EAAE,EAAE,CAAC,CAAC;oBAC7G,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,WAAW;oBAC/C,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE,QAAQ,CAAC,MAAM;iBAChE,CAAC,CACH;6CA8IA,SAAS,CAAC,2BAA2B,EAAE,CAAC,MAAc,EAAE,WAA+B,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC;oBACvG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,EAAE;oBACtC,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,WAAW;iBAChD,CAAC,CAAC;yCAiIF,SAAS,CAAC,uBAAuB,EAAE,CAAC,QAA4B,EAAE,EAAE,UAAU,EAAsB,EAAE,EAAE,CAAC,CAAC;oBACzG,CAAC,UAAU,CAAC,qBAAqB,CAAC,EAAE,QAAQ;oBAC5C,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE;iBACtD,CAAC,CAAC;YApRH,iMAAM,gBAAgB,6DAmHrB;YA8BD,oMAAa,iBAAiB,6DAkC7B;YAkGD,wLAAc,aAAa,6DAiC1B;;;;;SA9fU,OAAO"}