@libp2p/utils 6.7.2-8484de8a2 → 6.7.2-87bc8d4fb
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/README.md +1 -1
- package/dist/index.min.js +1 -6
- package/dist/index.min.js.map +4 -4
- package/dist/src/abort-options.d.ts +7 -0
- package/dist/src/abort-options.d.ts.map +1 -0
- package/dist/src/abort-options.js +14 -0
- package/dist/src/abort-options.js.map +1 -0
- package/dist/src/abstract-stream.d.ts +130 -14
- package/dist/src/abstract-stream.d.ts.map +1 -1
- package/dist/src/abstract-stream.js +321 -39
- package/dist/src/abstract-stream.js.map +1 -1
- package/dist/src/array-equals.d.ts +24 -0
- package/dist/src/array-equals.d.ts.map +1 -0
- package/dist/src/array-equals.js +31 -0
- package/dist/src/array-equals.js.map +1 -0
- package/dist/src/close-source.d.ts +4 -0
- package/dist/src/close-source.d.ts.map +1 -0
- package/dist/src/close-source.js +11 -0
- package/dist/src/close-source.js.map +1 -0
- package/dist/src/close.d.ts +21 -0
- package/dist/src/close.d.ts.map +1 -0
- package/dist/src/close.js +49 -0
- package/dist/src/close.js.map +1 -0
- package/dist/src/errors.d.ts +0 -8
- package/dist/src/errors.d.ts.map +1 -1
- package/dist/src/errors.js +0 -8
- package/dist/src/errors.js.map +1 -1
- package/dist/src/get-thin-waist-addresses.browser.d.ts +1 -1
- package/dist/src/get-thin-waist-addresses.browser.d.ts.map +1 -1
- package/dist/src/get-thin-waist-addresses.browser.js +3 -4
- package/dist/src/get-thin-waist-addresses.browser.js.map +1 -1
- package/dist/src/get-thin-waist-addresses.d.ts +1 -1
- package/dist/src/get-thin-waist-addresses.d.ts.map +1 -1
- package/dist/src/get-thin-waist-addresses.js +9 -7
- package/dist/src/get-thin-waist-addresses.js.map +1 -1
- package/dist/src/index.d.ts +1 -33
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +1 -33
- package/dist/src/index.js.map +1 -1
- package/dist/src/multiaddr/is-global-unicast.d.ts.map +1 -1
- package/dist/src/multiaddr/is-global-unicast.js +9 -8
- package/dist/src/multiaddr/is-global-unicast.js.map +1 -1
- package/dist/src/multiaddr/is-ip-based.d.ts +6 -0
- package/dist/src/multiaddr/is-ip-based.d.ts.map +1 -0
- package/dist/src/multiaddr/is-ip-based.js +18 -0
- package/dist/src/multiaddr/is-ip-based.js.map +1 -0
- package/dist/src/multiaddr/is-link-local.d.ts.map +1 -1
- package/dist/src/multiaddr/is-link-local.js +16 -11
- package/dist/src/multiaddr/is-link-local.js.map +1 -1
- package/dist/src/multiaddr/is-loopback.d.ts.map +1 -1
- package/dist/src/multiaddr/is-loopback.js +5 -12
- package/dist/src/multiaddr/is-loopback.js.map +1 -1
- package/dist/src/multiaddr/is-network-address.d.ts.map +1 -1
- package/dist/src/multiaddr/is-network-address.js +16 -4
- package/dist/src/multiaddr/is-network-address.js.map +1 -1
- package/dist/src/multiaddr/is-private.d.ts.map +1 -1
- package/dist/src/multiaddr/is-private.js +10 -9
- package/dist/src/multiaddr/is-private.js.map +1 -1
- package/dist/src/queue/index.d.ts +0 -3
- package/dist/src/queue/index.d.ts.map +1 -1
- package/dist/src/queue/index.js +4 -20
- package/dist/src/queue/index.js.map +1 -1
- package/dist/src/rate-limiter.d.ts +15 -1
- package/dist/src/rate-limiter.d.ts.map +1 -1
- package/dist/src/rate-limiter.js +14 -1
- package/dist/src/rate-limiter.js.map +1 -1
- package/dist/src/stream-to-ma-conn.d.ts +23 -0
- package/dist/src/stream-to-ma-conn.d.ts.map +1 -0
- package/dist/src/stream-to-ma-conn.js +75 -0
- package/dist/src/stream-to-ma-conn.js.map +1 -0
- package/package.json +163 -19
- package/src/abort-options.ts +20 -0
- package/src/abstract-stream.ts +464 -51
- package/src/array-equals.ts +34 -0
- package/src/close-source.ts +14 -0
- package/src/close.ts +65 -0
- package/src/errors.ts +0 -10
- package/src/get-thin-waist-addresses.browser.ts +4 -5
- package/src/get-thin-waist-addresses.ts +12 -8
- package/src/index.ts +1 -33
- package/src/multiaddr/is-global-unicast.ts +11 -8
- package/src/multiaddr/is-ip-based.ts +21 -0
- package/src/multiaddr/is-link-local.ts +20 -11
- package/src/multiaddr/is-loopback.ts +7 -12
- package/src/multiaddr/is-network-address.ts +19 -4
- package/src/multiaddr/is-private.ts +14 -9
- package/src/queue/index.ts +4 -24
- package/src/rate-limiter.ts +30 -3
- package/src/stream-to-ma-conn.ts +106 -0
- package/dist/src/abstract-message-stream.d.ts +0 -129
- package/dist/src/abstract-message-stream.d.ts.map +0 -1
- package/dist/src/abstract-message-stream.js +0 -389
- package/dist/src/abstract-message-stream.js.map +0 -1
- package/dist/src/abstract-multiaddr-connection.d.ts +0 -26
- package/dist/src/abstract-multiaddr-connection.d.ts.map +0 -1
- package/dist/src/abstract-multiaddr-connection.js +0 -66
- package/dist/src/abstract-multiaddr-connection.js.map +0 -1
- package/dist/src/abstract-stream-muxer.d.ts +0 -53
- package/dist/src/abstract-stream-muxer.d.ts.map +0 -1
- package/dist/src/abstract-stream-muxer.js +0 -169
- package/dist/src/abstract-stream-muxer.js.map +0 -1
- package/dist/src/length-prefixed-decoder.d.ts +0 -37
- package/dist/src/length-prefixed-decoder.d.ts.map +0 -1
- package/dist/src/length-prefixed-decoder.js +0 -64
- package/dist/src/length-prefixed-decoder.js.map +0 -1
- package/dist/src/message-queue.d.ts +0 -61
- package/dist/src/message-queue.d.ts.map +0 -1
- package/dist/src/message-queue.js +0 -93
- package/dist/src/message-queue.js.map +0 -1
- package/dist/src/mock-muxer.d.ts +0 -57
- package/dist/src/mock-muxer.d.ts.map +0 -1
- package/dist/src/mock-muxer.js +0 -204
- package/dist/src/mock-muxer.js.map +0 -1
- package/dist/src/mock-stream.d.ts +0 -31
- package/dist/src/mock-stream.d.ts.map +0 -1
- package/dist/src/mock-stream.js +0 -69
- package/dist/src/mock-stream.js.map +0 -1
- package/dist/src/multiaddr/get-net-config.d.ts +0 -55
- package/dist/src/multiaddr/get-net-config.d.ts.map +0 -1
- package/dist/src/multiaddr/get-net-config.js +0 -54
- package/dist/src/multiaddr/get-net-config.js.map +0 -1
- package/dist/src/multiaddr/index.d.ts +0 -7
- package/dist/src/multiaddr/index.d.ts.map +0 -1
- package/dist/src/multiaddr/index.js +0 -7
- package/dist/src/multiaddr/index.js.map +0 -1
- package/dist/src/multiaddr/utils.d.ts +0 -5
- package/dist/src/multiaddr/utils.d.ts.map +0 -1
- package/dist/src/multiaddr/utils.js +0 -32
- package/dist/src/multiaddr/utils.js.map +0 -1
- package/dist/src/multiaddr-connection-pair.d.ts +0 -25
- package/dist/src/multiaddr-connection-pair.d.ts.map +0 -1
- package/dist/src/multiaddr-connection-pair.js +0 -103
- package/dist/src/multiaddr-connection-pair.js.map +0 -1
- package/dist/src/socket-writer.browser.d.ts +0 -2
- package/dist/src/socket-writer.browser.d.ts.map +0 -1
- package/dist/src/socket-writer.browser.js +0 -4
- package/dist/src/socket-writer.browser.js.map +0 -1
- package/dist/src/socket-writer.d.ts +0 -19
- package/dist/src/socket-writer.d.ts.map +0 -1
- package/dist/src/socket-writer.js +0 -43
- package/dist/src/socket-writer.js.map +0 -1
- package/dist/src/stream-pair.d.ts +0 -42
- package/dist/src/stream-pair.d.ts.map +0 -1
- package/dist/src/stream-pair.js +0 -40
- package/dist/src/stream-pair.js.map +0 -1
- package/dist/src/stream-utils.d.ts +0 -198
- package/dist/src/stream-utils.d.ts.map +0 -1
- package/dist/src/stream-utils.js +0 -369
- package/dist/src/stream-utils.js.map +0 -1
- package/src/abstract-message-stream.ts +0 -549
- package/src/abstract-multiaddr-connection.ts +0 -93
- package/src/abstract-stream-muxer.ts +0 -239
- package/src/length-prefixed-decoder.ts +0 -98
- package/src/message-queue.ts +0 -156
- package/src/mock-muxer.ts +0 -304
- package/src/mock-stream.ts +0 -101
- package/src/multiaddr/get-net-config.ts +0 -112
- package/src/multiaddr/index.ts +0 -6
- package/src/multiaddr/utils.ts +0 -46
- package/src/multiaddr-connection-pair.ts +0 -147
- package/src/socket-writer.browser.ts +0 -3
- package/src/socket-writer.ts +0 -64
- package/src/stream-pair.ts +0 -90
- package/src/stream-utils.ts +0 -873
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
import { isPrivateIp } from '../private-ip.js';
|
|
2
|
-
import {
|
|
2
|
+
import { isIpBased } from './is-ip-based.js';
|
|
3
3
|
/**
|
|
4
4
|
* Check if a given multiaddr starts with a private address
|
|
5
5
|
*/
|
|
6
6
|
export function isPrivate(ma) {
|
|
7
7
|
try {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
case 'ip6':
|
|
12
|
-
return isPrivateIp(config.host) ?? false;
|
|
13
|
-
default:
|
|
14
|
-
return config.host === 'localhost';
|
|
8
|
+
if (!isIpBased(ma)) {
|
|
9
|
+
// not an IP based multiaddr, cannot be private
|
|
10
|
+
return false;
|
|
15
11
|
}
|
|
12
|
+
const [[, value]] = ma.stringTuples();
|
|
13
|
+
if (value == null) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
return isPrivateIp(value) ?? false;
|
|
16
17
|
}
|
|
17
18
|
catch {
|
|
18
|
-
return false;
|
|
19
19
|
}
|
|
20
|
+
return true;
|
|
20
21
|
}
|
|
21
22
|
//# sourceMappingURL=is-private.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-private.js","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"is-private.js","sourceRoot":"","sources":["../../../src/multiaddr/is-private.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAG5C;;GAEG;AACH,MAAM,UAAU,SAAS,CAAE,EAAa;IACtC,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;YACnB,+CAA+C;YAC/C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,YAAY,EAAE,CAAA;QAErC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC"}
|
|
@@ -104,12 +104,9 @@ export declare class Queue<JobReturnType = unknown, JobOptions extends AbortOpti
|
|
|
104
104
|
queue: Array<Job<JobOptions, JobReturnType>>;
|
|
105
105
|
private pending;
|
|
106
106
|
private readonly sort?;
|
|
107
|
-
private paused;
|
|
108
107
|
constructor(init?: QueueInit<JobReturnType, JobOptions>);
|
|
109
108
|
emitEmpty(): void;
|
|
110
109
|
emitIdle(): void;
|
|
111
|
-
pause(): void;
|
|
112
|
-
resume(): void;
|
|
113
110
|
private tryToStartAnother;
|
|
114
111
|
private enqueue;
|
|
115
112
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/queue/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/queue/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/queue/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { AbortError } from '@libp2p/interface';
|
|
2
2
|
import { pushable } from 'it-pushable';
|
|
3
3
|
import { TypedEventEmitter } from 'main-event';
|
|
4
|
-
import {
|
|
4
|
+
import { raceEvent } from 'race-event';
|
|
5
5
|
import { debounce } from '../debounce.js';
|
|
6
6
|
import { QueueFullError } from '../errors.js';
|
|
7
7
|
import { Job } from './job.js';
|
|
@@ -17,13 +17,11 @@ export class Queue extends TypedEventEmitter {
|
|
|
17
17
|
queue;
|
|
18
18
|
pending;
|
|
19
19
|
sort;
|
|
20
|
-
paused;
|
|
21
20
|
constructor(init = {}) {
|
|
22
21
|
super();
|
|
23
22
|
this.concurrency = init.concurrency ?? Number.POSITIVE_INFINITY;
|
|
24
23
|
this.maxSize = init.maxSize ?? Number.POSITIVE_INFINITY;
|
|
25
24
|
this.pending = 0;
|
|
26
|
-
this.paused = false;
|
|
27
25
|
if (init.metricName != null) {
|
|
28
26
|
init.metrics?.registerMetricGroup(init.metricName, {
|
|
29
27
|
calculate: () => {
|
|
@@ -52,20 +50,7 @@ export class Queue extends TypedEventEmitter {
|
|
|
52
50
|
}
|
|
53
51
|
this.safeDispatchEvent('idle');
|
|
54
52
|
}
|
|
55
|
-
pause() {
|
|
56
|
-
this.paused = true;
|
|
57
|
-
}
|
|
58
|
-
resume() {
|
|
59
|
-
if (!this.paused) {
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
this.paused = false;
|
|
63
|
-
this.tryToStartAnother();
|
|
64
|
-
}
|
|
65
53
|
tryToStartAnother() {
|
|
66
|
-
if (this.paused) {
|
|
67
|
-
return false;
|
|
68
|
-
}
|
|
69
54
|
if (this.size === 0) {
|
|
70
55
|
this.emitEmpty();
|
|
71
56
|
if (this.running === 0) {
|
|
@@ -166,7 +151,7 @@ export class Queue extends TypedEventEmitter {
|
|
|
166
151
|
if (this.size === 0) {
|
|
167
152
|
return;
|
|
168
153
|
}
|
|
169
|
-
await
|
|
154
|
+
await raceEvent(this, 'empty', options?.signal);
|
|
170
155
|
}
|
|
171
156
|
/**
|
|
172
157
|
* @returns A promise that settles when the queue size is less than the given
|
|
@@ -184,8 +169,7 @@ export class Queue extends TypedEventEmitter {
|
|
|
184
169
|
if (this.size < limit) {
|
|
185
170
|
return;
|
|
186
171
|
}
|
|
187
|
-
await
|
|
188
|
-
...options,
|
|
172
|
+
await raceEvent(this, 'next', options?.signal, {
|
|
189
173
|
filter: () => this.size < limit
|
|
190
174
|
});
|
|
191
175
|
}
|
|
@@ -202,7 +186,7 @@ export class Queue extends TypedEventEmitter {
|
|
|
202
186
|
if (this.pending === 0 && this.size === 0) {
|
|
203
187
|
return;
|
|
204
188
|
}
|
|
205
|
-
await
|
|
189
|
+
await raceEvent(this, 'idle', options?.signal);
|
|
206
190
|
}
|
|
207
191
|
/**
|
|
208
192
|
* Size of the queue including running items
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/queue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/queue/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,18 @@ export interface RateLimiterInit {
|
|
|
17
17
|
* @default 0
|
|
18
18
|
*/
|
|
19
19
|
blockDuration?: number;
|
|
20
|
+
/**
|
|
21
|
+
* Execute allowed actions evenly over duration
|
|
22
|
+
*
|
|
23
|
+
* @default false
|
|
24
|
+
*/
|
|
25
|
+
execEvenly?: boolean;
|
|
26
|
+
/**
|
|
27
|
+
* ms, works with execEvenly=true option
|
|
28
|
+
*
|
|
29
|
+
* @default duration * 1000 / points
|
|
30
|
+
*/
|
|
31
|
+
execEvenlyMinDelayMs?: number;
|
|
20
32
|
/**
|
|
21
33
|
* @default "rlflx"
|
|
22
34
|
*/
|
|
@@ -41,9 +53,11 @@ export declare class RateLimiter {
|
|
|
41
53
|
protected points: number;
|
|
42
54
|
protected duration: number;
|
|
43
55
|
protected blockDuration: number;
|
|
56
|
+
protected execEvenly: boolean;
|
|
57
|
+
protected execEvenlyMinDelayMs: number;
|
|
44
58
|
protected keyPrefix: string;
|
|
45
59
|
constructor(opts?: RateLimiterInit);
|
|
46
|
-
consume(key: string, pointsToConsume?: number, options?: GetKeySecDurationOptions): RateLimiterResult
|
|
60
|
+
consume(key: string, pointsToConsume?: number, options?: GetKeySecDurationOptions): Promise<RateLimiterResult>;
|
|
47
61
|
penalty(key: string, points?: number, options?: GetKeySecDurationOptions): RateLimiterResult;
|
|
48
62
|
reward(key: string, points?: number, options?: GetKeySecDurationOptions): RateLimiterResult;
|
|
49
63
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../src/rate-limiter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rate-limiter.d.ts","sourceRoot":"","sources":["../../src/rate-limiter.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IAEjB;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAA;IAEpB;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAE7B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,wBAAwB;IACvC,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,eAAe,EAAE,MAAM,CAAA;IACvB,YAAY,EAAE,MAAM,CAAA;IACpB,cAAc,EAAE,MAAM,CAAA;IACtB,iBAAiB,EAAE,OAAO,CAAA;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,IAAI,CAAA;IAChB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAA;CAC1C;AAED,qBAAa,WAAW;IACtB,SAAgB,aAAa,EAAE,aAAa,CAAA;IAC5C,SAAS,CAAC,MAAM,EAAE,MAAM,CAAA;IACxB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAA;IAC1B,SAAS,CAAC,aAAa,EAAE,MAAM,CAAA;IAC/B,SAAS,CAAC,UAAU,EAAE,OAAO,CAAA;IAC7B,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAA;IACtC,SAAS,CAAC,SAAS,EAAE,MAAM,CAAA;gBAEd,IAAI,GAAE,eAAoB;IAUjC,OAAO,CAAE,GAAG,EAAE,MAAM,EAAE,eAAe,GAAE,MAAU,EAAE,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IA2B5H,OAAO,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,EAAE,OAAO,GAAE,wBAA6B,GAAG,iBAAiB;IASpG,MAAM,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,EAAE,OAAO,GAAE,wBAA6B,GAAG,iBAAiB;IASnG;;;;;OAKG;IACH,KAAK,CAAE,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,iBAAiB;IAc3D,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU,GAAG,iBAAiB;IAa7E,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAUhD,MAAM,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAI1B,OAAO,CAAC,kBAAkB;IAQ1B,MAAM,CAAE,GAAG,EAAE,MAAM,GAAG,MAAM;IAI5B,QAAQ,CAAE,KAAK,EAAE,MAAM,GAAG,MAAM;CAGjC;AAED,qBAAa,aAAa;IACxB,SAAgB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;;IAMhD,MAAM,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,iBAAiB;IA0B3E,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,iBAAiB;IAiCxE,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAgBhD,MAAM,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO;CAc9B"}
|
package/dist/src/rate-limiter.js
CHANGED
|
@@ -1,18 +1,23 @@
|
|
|
1
|
+
import delay from 'delay';
|
|
1
2
|
import { RateLimitError } from './errors.js';
|
|
2
3
|
export class RateLimiter {
|
|
3
4
|
memoryStorage;
|
|
4
5
|
points;
|
|
5
6
|
duration;
|
|
6
7
|
blockDuration;
|
|
8
|
+
execEvenly;
|
|
9
|
+
execEvenlyMinDelayMs;
|
|
7
10
|
keyPrefix;
|
|
8
11
|
constructor(opts = {}) {
|
|
9
12
|
this.points = opts.points ?? 4;
|
|
10
13
|
this.duration = opts.duration ?? 1;
|
|
11
14
|
this.blockDuration = opts.blockDuration ?? 0;
|
|
15
|
+
this.execEvenly = opts.execEvenly ?? false;
|
|
16
|
+
this.execEvenlyMinDelayMs = opts.execEvenlyMinDelayMs ?? (this.duration * 1000 / this.points);
|
|
12
17
|
this.keyPrefix = opts.keyPrefix ?? 'rlflx';
|
|
13
18
|
this.memoryStorage = new MemoryStorage();
|
|
14
19
|
}
|
|
15
|
-
consume(key, pointsToConsume = 1, options = {}) {
|
|
20
|
+
async consume(key, pointsToConsume = 1, options = {}) {
|
|
16
21
|
const rlKey = this.getKey(key);
|
|
17
22
|
const secDuration = this._getKeySecDuration(options);
|
|
18
23
|
let res = this.memoryStorage.incrby(rlKey, pointsToConsume, secDuration);
|
|
@@ -25,6 +30,14 @@ export class RateLimiter {
|
|
|
25
30
|
}
|
|
26
31
|
throw new RateLimitError('Rate limit exceeded', res);
|
|
27
32
|
}
|
|
33
|
+
else if (this.execEvenly && res.msBeforeNext > 0 && !res.isFirstInDuration) {
|
|
34
|
+
// Execute evenly
|
|
35
|
+
let delayMs = Math.ceil(res.msBeforeNext / (res.remainingPoints + 2));
|
|
36
|
+
if (delayMs < this.execEvenlyMinDelayMs) {
|
|
37
|
+
delayMs = res.consumedPoints * this.execEvenlyMinDelayMs;
|
|
38
|
+
}
|
|
39
|
+
await delay(delayMs);
|
|
40
|
+
}
|
|
28
41
|
return res;
|
|
29
42
|
}
|
|
30
43
|
penalty(key, points = 1, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../src/rate-limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"rate-limiter.js","sourceRoot":"","sources":["../../src/rate-limiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { Logger, MultiaddrConnection, Stream } from '@libp2p/interface';
|
|
2
|
+
import type { Multiaddr } from '@multiformats/multiaddr';
|
|
3
|
+
import type { Uint8ArrayList } from 'uint8arraylist';
|
|
4
|
+
export interface StreamProperties {
|
|
5
|
+
stream: Stream;
|
|
6
|
+
remoteAddr: Multiaddr;
|
|
7
|
+
localAddr: Multiaddr;
|
|
8
|
+
log: Logger;
|
|
9
|
+
/**
|
|
10
|
+
* A callback invoked when data is read from the stream
|
|
11
|
+
*/
|
|
12
|
+
onDataRead?(buf: Uint8ArrayList | Uint8Array): void;
|
|
13
|
+
/**
|
|
14
|
+
* A callback invoked when data is written to the stream
|
|
15
|
+
*/
|
|
16
|
+
onDataWrite?(buf: Uint8ArrayList | Uint8Array): void;
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Convert a duplex iterable into a MultiaddrConnection.
|
|
20
|
+
* https://github.com/libp2p/interface-transport#multiaddrconnection
|
|
21
|
+
*/
|
|
22
|
+
export declare function streamToMaConnection(props: StreamProperties): MultiaddrConnection;
|
|
23
|
+
//# sourceMappingURL=stream-to-ma-conn.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-to-ma-conn.d.ts","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAEpD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,SAAS,CAAA;IACrB,SAAS,EAAE,SAAS,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IAEX;;OAEG;IACH,UAAU,CAAC,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAA;IAEnD;;OAEG;IACH,WAAW,CAAC,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,GAAG,IAAI,CAAA;CACrD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAE,KAAK,EAAE,gBAAgB,GAAG,mBAAmB,CA8ElF"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import forEach from 'it-foreach';
|
|
2
|
+
import { pipe } from 'it-pipe';
|
|
3
|
+
/**
|
|
4
|
+
* Convert a duplex iterable into a MultiaddrConnection.
|
|
5
|
+
* https://github.com/libp2p/interface-transport#multiaddrconnection
|
|
6
|
+
*/
|
|
7
|
+
export function streamToMaConnection(props) {
|
|
8
|
+
const { stream, remoteAddr, log, onDataRead, onDataWrite } = props;
|
|
9
|
+
let closedRead = false;
|
|
10
|
+
let closedWrite = false;
|
|
11
|
+
// piggyback on `stream.close` invocations to close multiaddr connection
|
|
12
|
+
const streamClose = stream.close.bind(stream);
|
|
13
|
+
stream.close = async (options) => {
|
|
14
|
+
await streamClose(options);
|
|
15
|
+
close(true);
|
|
16
|
+
};
|
|
17
|
+
// piggyback on `stream.abort` invocations to close multiaddr connection
|
|
18
|
+
const streamAbort = stream.abort.bind(stream);
|
|
19
|
+
stream.abort = (err) => {
|
|
20
|
+
streamAbort(err);
|
|
21
|
+
close(true);
|
|
22
|
+
};
|
|
23
|
+
// piggyback on `stream.sink` invocations to close multiaddr connection
|
|
24
|
+
const streamSink = stream.sink.bind(stream);
|
|
25
|
+
stream.sink = async (source) => {
|
|
26
|
+
try {
|
|
27
|
+
await streamSink(pipe(source, (source) => forEach(source, buf => onDataWrite?.(buf))));
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
maConn.log.error('errored - %e', err);
|
|
31
|
+
// If aborted we can safely ignore
|
|
32
|
+
if (err.type !== 'aborted') {
|
|
33
|
+
// If the source errored the socket will already have been destroyed by
|
|
34
|
+
// toIterable.duplex(). If the socket errored it will already be
|
|
35
|
+
// destroyed. There's nothing to do here except log the error & return.
|
|
36
|
+
maConn.log.error('%s error in sink - %e', remoteAddr, err);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
finally {
|
|
40
|
+
closedWrite = true;
|
|
41
|
+
close();
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
const maConn = {
|
|
45
|
+
log: log.newScope('stream-to-maconn'),
|
|
46
|
+
sink: stream.sink,
|
|
47
|
+
source: (async function* () {
|
|
48
|
+
try {
|
|
49
|
+
for await (const buf of stream.source) {
|
|
50
|
+
onDataRead?.(buf);
|
|
51
|
+
yield buf;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
finally {
|
|
55
|
+
closedRead = true;
|
|
56
|
+
close();
|
|
57
|
+
}
|
|
58
|
+
}()),
|
|
59
|
+
remoteAddr,
|
|
60
|
+
timeline: { open: Date.now(), close: undefined },
|
|
61
|
+
close: stream.close,
|
|
62
|
+
abort: stream.abort
|
|
63
|
+
};
|
|
64
|
+
function close(force) {
|
|
65
|
+
if (force === true) {
|
|
66
|
+
closedRead = true;
|
|
67
|
+
closedWrite = true;
|
|
68
|
+
}
|
|
69
|
+
if (closedRead && closedWrite && maConn.timeline.close == null) {
|
|
70
|
+
maConn.timeline.close = Date.now();
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return maConn;
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=stream-to-ma-conn.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream-to-ma-conn.js","sourceRoot":"","sources":["../../src/stream-to-ma-conn.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/utils",
|
|
3
|
-
"version": "6.7.2-
|
|
3
|
+
"version": "6.7.2-87bc8d4fb",
|
|
4
4
|
"description": "Package to aggregate shared logic and dependencies for the libp2p ecosystem",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/utils#readme",
|
|
@@ -17,6 +17,22 @@
|
|
|
17
17
|
},
|
|
18
18
|
"type": "module",
|
|
19
19
|
"types": "./dist/src/index.d.ts",
|
|
20
|
+
"typesVersions": {
|
|
21
|
+
"*": {
|
|
22
|
+
"*": [
|
|
23
|
+
"*",
|
|
24
|
+
"dist/*",
|
|
25
|
+
"dist/src/*",
|
|
26
|
+
"dist/src/*/index"
|
|
27
|
+
],
|
|
28
|
+
"src/*": [
|
|
29
|
+
"*",
|
|
30
|
+
"dist/*",
|
|
31
|
+
"dist/src/*",
|
|
32
|
+
"dist/src/*/index"
|
|
33
|
+
]
|
|
34
|
+
}
|
|
35
|
+
},
|
|
20
36
|
"files": [
|
|
21
37
|
"src",
|
|
22
38
|
"dist",
|
|
@@ -27,6 +43,135 @@
|
|
|
27
43
|
".": {
|
|
28
44
|
"types": "./dist/src/index.d.ts",
|
|
29
45
|
"import": "./dist/src/index.js"
|
|
46
|
+
},
|
|
47
|
+
"./abort-options": {
|
|
48
|
+
"types": "./dist/src/abort-options.d.ts",
|
|
49
|
+
"import": "./dist/src/abort-options.js"
|
|
50
|
+
},
|
|
51
|
+
"./abstract-stream": {
|
|
52
|
+
"types": "./dist/src/abstract-stream.d.ts",
|
|
53
|
+
"import": "./dist/src/abstract-stream.js"
|
|
54
|
+
},
|
|
55
|
+
"./adaptive-timeout": {
|
|
56
|
+
"types": "./dist/src/adaptive-timeout.d.ts",
|
|
57
|
+
"import": "./dist/src/adaptive-timeout.js"
|
|
58
|
+
},
|
|
59
|
+
"./array-equals": {
|
|
60
|
+
"types": "./dist/src/array-equals.d.ts",
|
|
61
|
+
"import": "./dist/src/array-equals.js"
|
|
62
|
+
},
|
|
63
|
+
"./close": {
|
|
64
|
+
"types": "./dist/src/close.d.ts",
|
|
65
|
+
"import": "./dist/src/close.js"
|
|
66
|
+
},
|
|
67
|
+
"./close-source": {
|
|
68
|
+
"types": "./dist/src/close-source.d.ts",
|
|
69
|
+
"import": "./dist/src/close-source.js"
|
|
70
|
+
},
|
|
71
|
+
"./debounce": {
|
|
72
|
+
"types": "./dist/src/debounce.d.ts",
|
|
73
|
+
"import": "./dist/src/debounce.js"
|
|
74
|
+
},
|
|
75
|
+
"./filters": {
|
|
76
|
+
"types": "./dist/src/filters/index.d.ts",
|
|
77
|
+
"import": "./dist/src/filters/index.js"
|
|
78
|
+
},
|
|
79
|
+
"./get-thin-waist-addresses": {
|
|
80
|
+
"types": "./dist/src/get-thin-waist-addresses.d.ts",
|
|
81
|
+
"browser": "./dist/src/get-thin-waist-addresses.browser.js",
|
|
82
|
+
"import": "./dist/src/get-thin-waist-addresses.js"
|
|
83
|
+
},
|
|
84
|
+
"./global-unicast-ip": {
|
|
85
|
+
"types": "./dist/src/global-unicast-ip.d.ts",
|
|
86
|
+
"import": "./dist/src/global-unicast-ip.js"
|
|
87
|
+
},
|
|
88
|
+
"./ip-port-to-multiaddr": {
|
|
89
|
+
"types": "./dist/src/ip-port-to-multiaddr.d.ts",
|
|
90
|
+
"import": "./dist/src/ip-port-to-multiaddr.js"
|
|
91
|
+
},
|
|
92
|
+
"./is-async-generator": {
|
|
93
|
+
"types": "./dist/src/is-async-generator.d.ts",
|
|
94
|
+
"import": "./dist/src/is-async-generator.js"
|
|
95
|
+
},
|
|
96
|
+
"./is-generator": {
|
|
97
|
+
"types": "./dist/src/is-generator.d.ts",
|
|
98
|
+
"import": "./dist/src/is-generator.js"
|
|
99
|
+
},
|
|
100
|
+
"./is-promise": {
|
|
101
|
+
"types": "./dist/src/is-promise.d.ts",
|
|
102
|
+
"import": "./dist/src/is-promise.js"
|
|
103
|
+
},
|
|
104
|
+
"./link-local-ip": {
|
|
105
|
+
"types": "./dist/src/link-local-ip.d.ts",
|
|
106
|
+
"import": "./dist/src/link-local-ip.js"
|
|
107
|
+
},
|
|
108
|
+
"./merge-options": {
|
|
109
|
+
"types": "./dist/src/merge-options.d.ts",
|
|
110
|
+
"import": "./dist/src/merge-options.js"
|
|
111
|
+
},
|
|
112
|
+
"./moving-average": {
|
|
113
|
+
"types": "./dist/src/moving-average.d.ts",
|
|
114
|
+
"import": "./dist/src/moving-average.js"
|
|
115
|
+
},
|
|
116
|
+
"./multiaddr/is-global-unicast": {
|
|
117
|
+
"types": "./dist/src/multiaddr/is-global-unicast.d.ts",
|
|
118
|
+
"import": "./dist/src/multiaddr/is-global-unicast.js"
|
|
119
|
+
},
|
|
120
|
+
"./multiaddr/is-ip-based": {
|
|
121
|
+
"types": "./dist/src/multiaddr/is-ip-based.d.ts",
|
|
122
|
+
"import": "./dist/src/multiaddr/is-ip-based.js"
|
|
123
|
+
},
|
|
124
|
+
"./multiaddr/is-link-local": {
|
|
125
|
+
"types": "./dist/src/multiaddr/is-link-local.d.ts",
|
|
126
|
+
"import": "./dist/src/multiaddr/is-link-local.js"
|
|
127
|
+
},
|
|
128
|
+
"./multiaddr/is-loopback": {
|
|
129
|
+
"types": "./dist/src/multiaddr/is-loopback.d.ts",
|
|
130
|
+
"import": "./dist/src/multiaddr/is-loopback.js"
|
|
131
|
+
},
|
|
132
|
+
"./multiaddr/is-network-address": {
|
|
133
|
+
"types": "./dist/src/multiaddr/is-network-address.d.ts",
|
|
134
|
+
"import": "./dist/src/multiaddr/is-network-address.js"
|
|
135
|
+
},
|
|
136
|
+
"./multiaddr/is-private": {
|
|
137
|
+
"types": "./dist/src/multiaddr/is-private.d.ts",
|
|
138
|
+
"import": "./dist/src/multiaddr/is-private.js"
|
|
139
|
+
},
|
|
140
|
+
"./peer-queue": {
|
|
141
|
+
"types": "./dist/src/peer-queue.d.ts",
|
|
142
|
+
"import": "./dist/src/peer-queue.js"
|
|
143
|
+
},
|
|
144
|
+
"./priority-queue": {
|
|
145
|
+
"types": "./dist/src/priority-queue.d.ts",
|
|
146
|
+
"import": "./dist/src/priority-queue.js"
|
|
147
|
+
},
|
|
148
|
+
"./private-ip": {
|
|
149
|
+
"types": "./dist/src/private-ip.d.ts",
|
|
150
|
+
"import": "./dist/src/private-ip.js"
|
|
151
|
+
},
|
|
152
|
+
"./queue": {
|
|
153
|
+
"types": "./dist/src/queue/index.d.ts",
|
|
154
|
+
"import": "./dist/src/queue/index.js"
|
|
155
|
+
},
|
|
156
|
+
"./rate-limiter": {
|
|
157
|
+
"types": "./dist/src/rate-limiter.d.ts",
|
|
158
|
+
"import": "./dist/src/rate-limiter.js"
|
|
159
|
+
},
|
|
160
|
+
"./repeating-task": {
|
|
161
|
+
"types": "./dist/src/repeating-task.d.ts",
|
|
162
|
+
"import": "./dist/src/repeating-task.js"
|
|
163
|
+
},
|
|
164
|
+
"./stream-to-ma-conn": {
|
|
165
|
+
"types": "./dist/src/stream-to-ma-conn.d.ts",
|
|
166
|
+
"import": "./dist/src/stream-to-ma-conn.js"
|
|
167
|
+
},
|
|
168
|
+
"./tracked-list": {
|
|
169
|
+
"types": "./dist/src/tracked-list.d.ts",
|
|
170
|
+
"import": "./dist/src/tracked-list.js"
|
|
171
|
+
},
|
|
172
|
+
"./tracked-map": {
|
|
173
|
+
"types": "./dist/src/tracked-map.d.ts",
|
|
174
|
+
"import": "./dist/src/tracked-map.js"
|
|
30
175
|
}
|
|
31
176
|
},
|
|
32
177
|
"scripts": {
|
|
@@ -46,47 +191,46 @@
|
|
|
46
191
|
"dependencies": {
|
|
47
192
|
"@chainsafe/is-ip": "^2.1.0",
|
|
48
193
|
"@chainsafe/netmask": "^2.0.0",
|
|
49
|
-
"@libp2p/crypto": "5.1.8-
|
|
50
|
-
"@libp2p/interface": "2.11.0-
|
|
51
|
-
"@libp2p/logger": "5.2.0-
|
|
52
|
-
"@multiformats/multiaddr": "^
|
|
194
|
+
"@libp2p/crypto": "5.1.8-87bc8d4fb",
|
|
195
|
+
"@libp2p/interface": "2.11.0-87bc8d4fb",
|
|
196
|
+
"@libp2p/logger": "5.2.0-87bc8d4fb",
|
|
197
|
+
"@multiformats/multiaddr": "^12.4.4",
|
|
53
198
|
"@sindresorhus/fnv1a": "^3.1.0",
|
|
54
199
|
"any-signal": "^4.1.1",
|
|
55
|
-
"cborg": "^4.2.14",
|
|
56
200
|
"delay": "^6.0.0",
|
|
201
|
+
"get-iterator": "^2.0.1",
|
|
57
202
|
"is-loopback-addr": "^2.0.2",
|
|
58
203
|
"is-plain-obj": "^4.1.0",
|
|
59
|
-
"it-
|
|
204
|
+
"it-foreach": "^2.1.3",
|
|
60
205
|
"it-pipe": "^3.0.1",
|
|
61
206
|
"it-pushable": "^3.2.3",
|
|
62
207
|
"it-stream-types": "^2.0.2",
|
|
63
208
|
"main-event": "^1.0.1",
|
|
64
209
|
"netmask": "^2.0.2",
|
|
65
210
|
"p-defer": "^4.0.1",
|
|
66
|
-
"
|
|
67
|
-
"race-signal": "^
|
|
68
|
-
"uint8-varint": "^2.0.4",
|
|
211
|
+
"race-event": "^1.3.0",
|
|
212
|
+
"race-signal": "^1.1.3",
|
|
69
213
|
"uint8arraylist": "^2.4.8",
|
|
70
214
|
"uint8arrays": "^5.1.0"
|
|
71
215
|
},
|
|
72
216
|
"devDependencies": {
|
|
73
|
-
"@libp2p/peer-id": "5.1.9-
|
|
217
|
+
"@libp2p/peer-id": "5.1.9-87bc8d4fb",
|
|
74
218
|
"@types/netmask": "^2.0.5",
|
|
75
|
-
"aegir": "^47.0.
|
|
219
|
+
"aegir": "^47.0.14",
|
|
76
220
|
"benchmark": "^2.1.4",
|
|
77
|
-
"
|
|
78
|
-
"it-
|
|
79
|
-
"
|
|
221
|
+
"delay": "^6.0.0",
|
|
222
|
+
"it-all": "^3.0.8",
|
|
223
|
+
"it-drain": "^3.0.9",
|
|
224
|
+
"it-pair": "^2.0.6",
|
|
225
|
+
"sinon": "^20.0.0",
|
|
80
226
|
"sinon-ts": "^2.0.0",
|
|
81
227
|
"wherearewe": "^2.0.1"
|
|
82
228
|
},
|
|
83
229
|
"browser": {
|
|
84
|
-
"./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.browser.js"
|
|
85
|
-
"./dist/src/socket-writer.js": "./dist/src/socket-writer.browser.js"
|
|
230
|
+
"./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.browser.js"
|
|
86
231
|
},
|
|
87
232
|
"react-native": {
|
|
88
|
-
"./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.js"
|
|
89
|
-
"./dist/src/socket-writer.js": "./dist/src/socket-writer.js"
|
|
233
|
+
"./dist/src/get-thin-waist-addresses.js": "./dist/src/get-thin-waist-addresses.js"
|
|
90
234
|
},
|
|
91
235
|
"sideEffects": false
|
|
92
236
|
}
|