@lodestar/reqresp 1.48.0-dev.f22c5ce63e → 1.48.0-dev.ff9749be2c
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/rate_limiter/rateLimiterGRCA.d.ts.map +1 -1
- package/lib/rate_limiter/rateLimiterGRCA.js +3 -4
- package/lib/rate_limiter/rateLimiterGRCA.js.map +1 -1
- package/lib/utils/snappyUncompress.d.ts.map +1 -1
- package/lib/utils/snappyUncompress.js +13 -3
- package/lib/utils/snappyUncompress.js.map +1 -1
- package/package.json +10 -10
- package/src/rate_limiter/rateLimiterGRCA.ts +3 -4
- package/src/utils/snappyUncompress.ts +15 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimiterGRCA.d.ts","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,gBAAgB;IAC/B,oDAAoD;IACpD,WAAW,EAAE,WAAW,CAAC;IACzB,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,eAAe,CAAC,GAAG;IAM5B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C;IACE,kFAAkF;IACjE,WAAW,EAAE,WAAW;IACzC,uCAAuC;IACtB,UAAU,EAAE,WAAW,EACtC;IAEJ,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,CAUnE;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"rateLimiterGRCA.d.ts","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,gBAAgB;IAC/B,oDAAoD;IACpD,WAAW,EAAE,WAAW,CAAC;IACzB,yFAAyF;IACzF,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;GAWG;AACH,qBAAa,eAAe,CAAC,GAAG;IAM5B,kFAAkF;IAClF,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,uCAAuC;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,gGAAgG;IAChG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAE1C;IACE,kFAAkF;IACjE,WAAW,EAAE,WAAW;IACzC,uCAAuC;IACtB,UAAU,EAAE,WAAW,EACtC;IAEJ,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,gBAAgB,GAAG,eAAe,CAAC,GAAG,CAAC,CAUnE;IAED,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CA8BxC;IAED,kEAAkE;IAClE,WAAW,CAAC,SAAS,EAAE,WAAW,GAAG,IAAI,CAOxC;IAED,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAEzB;CACF"}
|
|
@@ -36,12 +36,11 @@ export class RateLimiterGRCA {
|
|
|
36
36
|
return new RateLimiterGRCA(msPerBucket, msPerToken);
|
|
37
37
|
}
|
|
38
38
|
allows(key, tokens) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
39
|
+
// Defense in depth: a non-positive count must still be charged, not skipped.
|
|
40
|
+
const chargedTokens = Math.max(1, tokens);
|
|
42
41
|
const msSinceStart = Date.now() - this.startTimeMs;
|
|
43
42
|
/** how long does it take to replenish these tokens */
|
|
44
|
-
const additionalTime = this.msPerToken *
|
|
43
|
+
const additionalTime = this.msPerToken * chargedTokens;
|
|
45
44
|
if (additionalTime > this.msPerBucket) {
|
|
46
45
|
// the time required to process this amount of tokens is longer than the time that makes the bucket full.
|
|
47
46
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimiterGRCA.js","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,eAAe;IAOP,WAAW;IAEX,UAAU;IAR7B,gGAAgG;IAC/E,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE1C;IACE,kFAAkF;IACjE,WAAwB;IACzC,uCAAuC;IACtB,UAAuB;2BAFvB,WAAW;0BAEX,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,SAAS,CAAM,KAAuB;QAC3C,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7C,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,MAAc;QAC7B,
|
|
1
|
+
{"version":3,"file":"rateLimiterGRCA.js","sourceRoot":"","sources":["../../src/rate_limiter/rateLimiterGRCA.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,eAAe;IAOP,WAAW;IAEX,UAAU;IAR7B,gGAAgG;IAC/E,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE1C;IACE,kFAAkF;IACjE,WAAwB;IACzC,uCAAuC;IACtB,UAAuB;2BAFvB,WAAW;0BAEX,UAAU;IAC1B,CAAC;IAEJ,MAAM,CAAC,SAAS,CAAM,KAAuB;QAC3C,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACzD,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACtC,IAAI,WAAW,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7C,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,GAAQ,EAAE,MAAc;QAC7B,6EAA6E;QAC7E,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAEnD,sDAAsD;QACtD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;QAEvD,IAAI,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YACtC,yGAAyG;YACzG,OAAO,KAAK,CAAC;QACf,CAAC;QAED,gGAAgG;QAChG,IAAI,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,eAAe,GAAG,YAAY,CAAC;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC3C,CAAC;QAED,2CAA2C;QAC3C,MAAM,YAAY,GAAG,eAAe,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC;QACzE,IAAI,YAAY,GAAG,YAAY,EAAE,CAAC;YAChC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,cAAc,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,kEAAkE;IAClE,WAAW,CAAC,SAAsB;QAChC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAC7C,mCAAmC;YACnC,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAQ;QACjB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snappyUncompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyUncompress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snappyUncompress.d.ts","sourceRoot":"","sources":["../../src/utils/snappyUncompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAC,SAAS,EAA2C,MAAM,mBAAmB,CAAC;AAKtF,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,GAAG;IAAC,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAQ/F;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,GAAG,UAAU,GAAG,IAAI,CAiD3F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,cAAc,CAoCnE"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { uncompress } from "snappyjs";
|
|
2
1
|
import { Uint8ArrayList } from "uint8arraylist";
|
|
2
|
+
import snappyWasm from "@chainsafe/snappy-wasm";
|
|
3
3
|
import { ChunkType, IDENTIFIER, UNCOMPRESSED_CHUNK_SIZE, crc } from "./snappyCommon.js";
|
|
4
|
+
// Match gossip's WASM + Buffer.alloc pattern; native snappy's default buffers retained more RSS in local tests.
|
|
5
|
+
const decoder = new snappyWasm.Decoder();
|
|
4
6
|
export function parseSnappyFrameHeader(header) {
|
|
5
7
|
if (header.length !== 4) {
|
|
6
8
|
throw new Error("malformed input: incomplete frame header");
|
|
@@ -26,11 +28,19 @@ export function decodeSnappyFrameData(type, frame) {
|
|
|
26
28
|
}
|
|
27
29
|
const checksum = frame.subarray(0, 4);
|
|
28
30
|
const data = frame.subarray(4);
|
|
29
|
-
|
|
31
|
+
// Snappy's uint32 length occupies at most five bytes; validate it before allocating output.
|
|
32
|
+
const uncompressedLength = snappyWasm.decompress_len(data.subarray(0, 5));
|
|
33
|
+
if (uncompressedLength > UNCOMPRESSED_CHUNK_SIZE) {
|
|
34
|
+
throw new Error("malformed input: too large");
|
|
35
|
+
}
|
|
36
|
+
const uncompressed = Buffer.alloc(uncompressedLength);
|
|
37
|
+
decoder.decompress_into(data, uncompressed);
|
|
30
38
|
if (crc(uncompressed).compare(checksum) !== 0) {
|
|
31
39
|
throw new Error("malformed input: bad checksum");
|
|
32
40
|
}
|
|
33
|
-
return
|
|
41
|
+
return Buffer.isBuffer(data)
|
|
42
|
+
? uncompressed
|
|
43
|
+
: new Uint8Array(uncompressed.buffer, uncompressed.byteOffset, uncompressed.byteLength);
|
|
34
44
|
}
|
|
35
45
|
case ChunkType.UNCOMPRESSED: {
|
|
36
46
|
if (frame.length < 4) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snappyUncompress.js","sourceRoot":"","sources":["../../src/utils/snappyUncompress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"snappyUncompress.js","sourceRoot":"","sources":["../../src/utils/snappyUncompress.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.48.0-dev.
|
|
14
|
+
"version": "1.48.0-dev.ff9749be2c",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -45,22 +45,22 @@
|
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
47
|
"@chainsafe/fast-crc32c": "^4.2.0",
|
|
48
|
+
"@chainsafe/snappy-wasm": "^0.5.2",
|
|
48
49
|
"@libp2p/interface": "^3.3.0",
|
|
49
50
|
"@libp2p/utils": "^7.4.0",
|
|
50
|
-
"@lodestar/config": "^1.48.0-dev.
|
|
51
|
-
"@lodestar/params": "^1.48.0-dev.
|
|
52
|
-
"@lodestar/utils": "^1.48.0-dev.
|
|
53
|
-
"snappy": "^7.
|
|
54
|
-
"snappyjs": "^0.7.0",
|
|
51
|
+
"@lodestar/config": "^1.48.0-dev.ff9749be2c",
|
|
52
|
+
"@lodestar/params": "^1.48.0-dev.ff9749be2c",
|
|
53
|
+
"@lodestar/utils": "^1.48.0-dev.ff9749be2c",
|
|
54
|
+
"snappy": "^7.4.3",
|
|
55
55
|
"uint8-varint": "^2.0.2",
|
|
56
56
|
"uint8arraylist": "^3.0.2"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@chainsafe/ssz": "^1.
|
|
59
|
+
"@chainsafe/ssz": "^1.8.0",
|
|
60
60
|
"@libp2p/crypto": "^5.1.23",
|
|
61
61
|
"@libp2p/peer-id": "^6.0.15",
|
|
62
|
-
"@lodestar/logger": "^1.48.0-dev.
|
|
63
|
-
"@lodestar/types": "^1.48.0-dev.
|
|
62
|
+
"@lodestar/logger": "^1.48.0-dev.ff9749be2c",
|
|
63
|
+
"@lodestar/types": "^1.48.0-dev.ff9749be2c",
|
|
64
64
|
"libp2p": "3.3.9"
|
|
65
65
|
},
|
|
66
66
|
"peerDependencies": {
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"reqresp",
|
|
75
75
|
"blockchain"
|
|
76
76
|
],
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "bb8a252f7ae741ea6943becf36aeeea93b08e36d"
|
|
78
78
|
}
|
|
@@ -44,14 +44,13 @@ export class RateLimiterGRCA<Key> {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
allows(key: Key, tokens: number): boolean {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
47
|
+
// Defense in depth: a non-positive count must still be charged, not skipped.
|
|
48
|
+
const chargedTokens = Math.max(1, tokens);
|
|
50
49
|
|
|
51
50
|
const msSinceStart = Date.now() - this.startTimeMs;
|
|
52
51
|
|
|
53
52
|
/** how long does it take to replenish these tokens */
|
|
54
|
-
const additionalTime = this.msPerToken *
|
|
53
|
+
const additionalTime = this.msPerToken * chargedTokens;
|
|
55
54
|
|
|
56
55
|
if (additionalTime > this.msPerBucket) {
|
|
57
56
|
// the time required to process this amount of tokens is longer than the time that makes the bucket full.
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import {uncompress} from "snappyjs";
|
|
2
1
|
import {Uint8ArrayList} from "uint8arraylist";
|
|
2
|
+
import snappyWasm from "@chainsafe/snappy-wasm";
|
|
3
3
|
import {ChunkType, IDENTIFIER, UNCOMPRESSED_CHUNK_SIZE, crc} from "./snappyCommon.js";
|
|
4
4
|
|
|
5
|
+
// Match gossip's WASM + Buffer.alloc pattern; native snappy's default buffers retained more RSS in local tests.
|
|
6
|
+
const decoder = new snappyWasm.Decoder();
|
|
7
|
+
|
|
5
8
|
export function parseSnappyFrameHeader(header: Uint8Array): {type: ChunkType; frameSize: number} {
|
|
6
9
|
if (header.length !== 4) {
|
|
7
10
|
throw new Error("malformed input: incomplete frame header");
|
|
@@ -30,11 +33,20 @@ export function decodeSnappyFrameData(type: ChunkType, frame: Uint8Array): Uint8
|
|
|
30
33
|
|
|
31
34
|
const checksum = frame.subarray(0, 4);
|
|
32
35
|
const data = frame.subarray(4);
|
|
33
|
-
|
|
36
|
+
// Snappy's uint32 length occupies at most five bytes; validate it before allocating output.
|
|
37
|
+
const uncompressedLength = snappyWasm.decompress_len(data.subarray(0, 5));
|
|
38
|
+
if (uncompressedLength > UNCOMPRESSED_CHUNK_SIZE) {
|
|
39
|
+
throw new Error("malformed input: too large");
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const uncompressed = Buffer.alloc(uncompressedLength);
|
|
43
|
+
decoder.decompress_into(data, uncompressed);
|
|
34
44
|
if (crc(uncompressed).compare(checksum) !== 0) {
|
|
35
45
|
throw new Error("malformed input: bad checksum");
|
|
36
46
|
}
|
|
37
|
-
return
|
|
47
|
+
return Buffer.isBuffer(data)
|
|
48
|
+
? uncompressed
|
|
49
|
+
: new Uint8Array(uncompressed.buffer, uncompressed.byteOffset, uncompressed.byteLength);
|
|
38
50
|
}
|
|
39
51
|
case ChunkType.UNCOMPRESSED: {
|
|
40
52
|
if (frame.length < 4) {
|