@libp2p/kad-dht 12.0.15-bfa7660d5 → 12.0.15-d9366f9aa
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/dist/index.min.js +3 -3
- package/dist/src/index.d.ts +0 -5
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/network.d.ts +0 -3
- package/dist/src/network.d.ts.map +1 -1
- package/dist/src/network.js +8 -33
- package/dist/src/network.js.map +1 -1
- package/package.json +12 -12
- package/src/index.ts +0 -6
- package/src/network.ts +9 -38
package/dist/src/index.d.ts
CHANGED
|
@@ -84,7 +84,6 @@ import { removePrivateAddressesMapper, removePublicAddressesMapper, passthroughM
|
|
|
84
84
|
import type { ProvidersInit } from './providers.js';
|
|
85
85
|
import type { Libp2pEvents, ComponentLogger, TypedEventTarget, Metrics, PeerId, PeerInfo, PeerStore, RoutingOptions } from '@libp2p/interface';
|
|
86
86
|
import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal';
|
|
87
|
-
import type { AdaptiveTimeoutInit } from '@libp2p/utils/src/adaptive-timeout.js';
|
|
88
87
|
import type { Datastore } from 'interface-datastore';
|
|
89
88
|
import type { CID } from 'multiformats/cid';
|
|
90
89
|
import type { ProgressEvent } from 'progress-events';
|
|
@@ -354,10 +353,6 @@ export interface KadDHTInit {
|
|
|
354
353
|
* with this filter.
|
|
355
354
|
*/
|
|
356
355
|
peerInfoMapper?(peer: PeerInfo): PeerInfo;
|
|
357
|
-
/**
|
|
358
|
-
* Dynamic network timeout settings for sending messages to peers
|
|
359
|
-
*/
|
|
360
|
-
networkDialTimeout?: Omit<AdaptiveTimeoutInit, 'metricsName' | 'metrics'>;
|
|
361
356
|
}
|
|
362
357
|
export interface KadDHTComponents {
|
|
363
358
|
peerId: PeerId;
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AACzG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAC9I,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAC9F,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AAEH,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgFG;AAEH,OAAO,EAAE,MAAM,IAAI,WAAW,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAQzG,OAAO,EAAE,YAAY,IAAI,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,CAAA;AAEvF;;GAEG;AACH,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IACpB,uDAAc,CAAA;IACd,6DAAa,CAAA;IACb,uDAAU,CAAA;IACV,yDAAW,CAAA;IACX,mDAAQ,CAAA;IACR,6CAAK,CAAA;IACL,mDAAQ,CAAA;IACR,qDAAS,CAAA;AACX,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AAED;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,CAAA;AAqTtB;;;GAGG;AACH,MAAM,UAAU,MAAM,CAAE,IAAgB;IACtC,OAAO,CAAC,UAA4B,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAA;AAC5E,CAAC"}
|
package/dist/src/network.d.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { TypedEventEmitter } from '@libp2p/interface';
|
|
2
|
-
import { type AdaptiveTimeoutInit } from '@libp2p/utils/adaptive-timeout';
|
|
3
2
|
import { Message } from './message/dht.js';
|
|
4
3
|
import type { KadDHTComponents, QueryEvent } from './index.js';
|
|
5
4
|
import type { AbortOptions, Stream, PeerId, PeerInfo, Startable, RoutingOptions } from '@libp2p/interface';
|
|
6
5
|
export interface NetworkInit {
|
|
7
6
|
protocol: string;
|
|
8
7
|
logPrefix: string;
|
|
9
|
-
timeout?: Omit<AdaptiveTimeoutInit, 'metricsName' | 'metrics'>;
|
|
10
8
|
}
|
|
11
9
|
interface NetworkEvents {
|
|
12
10
|
'peer': CustomEvent<PeerInfo>;
|
|
@@ -19,7 +17,6 @@ export declare class Network extends TypedEventEmitter<NetworkEvents> implements
|
|
|
19
17
|
private readonly protocol;
|
|
20
18
|
private running;
|
|
21
19
|
private readonly components;
|
|
22
|
-
private readonly timeout;
|
|
23
20
|
/**
|
|
24
21
|
* Create a new network
|
|
25
22
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAIrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAQ1C,OAAO,KAAK,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,UAAU,aAAa;IACrB,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;CAC9B;AAED;;GAEG;AACH,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,aAAa,CAAE,YAAW,SAAS;IAChF,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAQ;IACjC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkB;IAE7C;;OAEG;gBACU,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE,WAAW;IAU5D;;OAEG;IACG,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAQ7B;;OAEG;IACG,IAAI,IAAK,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACH,SAAS,IAAK,OAAO;IAIrB;;OAEG;IACK,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAE,cAAmB,GAAG,cAAc,CAAC,UAAU,CAAC;IAwCjH;;OAEG;IACK,WAAW,CAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAE,cAAmB,GAAG,cAAc,CAAC,UAAU,CAAC;IAiCjH;;OAEG;IACG,aAAa,CAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAMjG;;;;OAIG;IACG,iBAAiB,CAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CAuBzG"}
|
package/dist/src/network.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { TypedEventEmitter } from '@libp2p/interface';
|
|
2
2
|
import { Libp2pRecord } from '@libp2p/record';
|
|
3
|
-
import { AdaptiveTimeout } from '@libp2p/utils/adaptive-timeout';
|
|
4
3
|
import { pbStream } from 'it-protobuf-stream';
|
|
5
4
|
import { CodeError } from 'protons-runtime';
|
|
6
5
|
import { Message } from './message/dht.js';
|
|
@@ -14,7 +13,6 @@ export class Network extends TypedEventEmitter {
|
|
|
14
13
|
protocol;
|
|
15
14
|
running;
|
|
16
15
|
components;
|
|
17
|
-
timeout;
|
|
18
16
|
/**
|
|
19
17
|
* Create a new network
|
|
20
18
|
*/
|
|
@@ -25,11 +23,6 @@ export class Network extends TypedEventEmitter {
|
|
|
25
23
|
this.log = components.logger.forComponent(`${init.logPrefix}:network`);
|
|
26
24
|
this.running = false;
|
|
27
25
|
this.protocol = protocol;
|
|
28
|
-
this.timeout = new AdaptiveTimeout({
|
|
29
|
-
...(init.timeout ?? {}),
|
|
30
|
-
metrics: components.metrics,
|
|
31
|
-
metricName: `${init.logPrefix.replaceAll(':', '_')}_network_message_send_times_milliseconds`
|
|
32
|
-
});
|
|
33
26
|
}
|
|
34
27
|
/**
|
|
35
28
|
* Start the network
|
|
@@ -67,20 +60,10 @@ export class Network extends TypedEventEmitter {
|
|
|
67
60
|
yield dialPeerEvent({ peer: to }, options);
|
|
68
61
|
yield sendQueryEvent({ to, type }, options);
|
|
69
62
|
let stream;
|
|
70
|
-
const signal = this.timeout.getTimeoutSignal(options);
|
|
71
|
-
options = {
|
|
72
|
-
...options,
|
|
73
|
-
signal
|
|
74
|
-
};
|
|
75
63
|
try {
|
|
76
64
|
const connection = await this.components.connectionManager.openConnection(to, options);
|
|
77
|
-
stream = await connection.newStream(this.protocol, options);
|
|
65
|
+
const stream = await connection.newStream(this.protocol, options);
|
|
78
66
|
const response = await this._writeReadMessage(stream, msg, options);
|
|
79
|
-
stream.close(options)
|
|
80
|
-
.catch(err => {
|
|
81
|
-
this.log.error('error closing stream to %p', to, err);
|
|
82
|
-
stream?.abort(err);
|
|
83
|
-
});
|
|
84
67
|
yield peerResponseEvent({
|
|
85
68
|
from: to,
|
|
86
69
|
messageType: response.type,
|
|
@@ -90,12 +73,13 @@ export class Network extends TypedEventEmitter {
|
|
|
90
73
|
}, options);
|
|
91
74
|
}
|
|
92
75
|
catch (err) {
|
|
93
|
-
stream?.abort(err);
|
|
94
76
|
this.log.error('could not send %s to %p', msg.type, to, err);
|
|
95
77
|
yield queryErrorEvent({ from: to, error: err }, options);
|
|
96
78
|
}
|
|
97
79
|
finally {
|
|
98
|
-
|
|
80
|
+
if (stream != null) {
|
|
81
|
+
await stream.close();
|
|
82
|
+
}
|
|
99
83
|
}
|
|
100
84
|
}
|
|
101
85
|
/**
|
|
@@ -113,28 +97,19 @@ export class Network extends TypedEventEmitter {
|
|
|
113
97
|
yield dialPeerEvent({ peer: to }, options);
|
|
114
98
|
yield sendQueryEvent({ to, type }, options);
|
|
115
99
|
let stream;
|
|
116
|
-
const signal = this.timeout.getTimeoutSignal(options);
|
|
117
|
-
options = {
|
|
118
|
-
...options,
|
|
119
|
-
signal
|
|
120
|
-
};
|
|
121
100
|
try {
|
|
122
101
|
const connection = await this.components.connectionManager.openConnection(to, options);
|
|
123
|
-
stream = await connection.newStream(this.protocol, options);
|
|
102
|
+
const stream = await connection.newStream(this.protocol, options);
|
|
124
103
|
await this._writeMessage(stream, msg, options);
|
|
125
|
-
stream.close(options)
|
|
126
|
-
.catch(err => {
|
|
127
|
-
this.log.error('error closing stream to %p', to, err);
|
|
128
|
-
stream?.abort(err);
|
|
129
|
-
});
|
|
130
104
|
yield peerResponseEvent({ from: to, messageType: type }, options);
|
|
131
105
|
}
|
|
132
106
|
catch (err) {
|
|
133
|
-
stream?.abort(err);
|
|
134
107
|
yield queryErrorEvent({ from: to, error: err }, options);
|
|
135
108
|
}
|
|
136
109
|
finally {
|
|
137
|
-
|
|
110
|
+
if (stream != null) {
|
|
111
|
+
await stream.close();
|
|
112
|
+
}
|
|
138
113
|
}
|
|
139
114
|
}
|
|
140
115
|
/**
|
package/dist/src/network.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/network.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/kad-dht",
|
|
3
|
-
"version": "12.0.15-
|
|
3
|
+
"version": "12.0.15-d9366f9aa",
|
|
4
4
|
"description": "JavaScript implementation of the Kad-DHT for libp2p",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/kad-dht#readme",
|
|
@@ -57,13 +57,13 @@
|
|
|
57
57
|
"doc-check": "aegir doc-check"
|
|
58
58
|
},
|
|
59
59
|
"dependencies": {
|
|
60
|
-
"@libp2p/crypto": "4.1.1-
|
|
61
|
-
"@libp2p/interface": "1.3.1-
|
|
62
|
-
"@libp2p/interface-internal": "1.2.0-
|
|
63
|
-
"@libp2p/peer-collections": "5.2.0-
|
|
64
|
-
"@libp2p/peer-id": "4.1.1-
|
|
65
|
-
"@libp2p/record": "4.0.1-
|
|
66
|
-
"@libp2p/utils": "5.4.0-
|
|
60
|
+
"@libp2p/crypto": "4.1.1-d9366f9aa",
|
|
61
|
+
"@libp2p/interface": "1.3.1-d9366f9aa",
|
|
62
|
+
"@libp2p/interface-internal": "1.2.0-d9366f9aa",
|
|
63
|
+
"@libp2p/peer-collections": "5.2.0-d9366f9aa",
|
|
64
|
+
"@libp2p/peer-id": "4.1.1-d9366f9aa",
|
|
65
|
+
"@libp2p/record": "4.0.1-d9366f9aa",
|
|
66
|
+
"@libp2p/utils": "5.4.0-d9366f9aa",
|
|
67
67
|
"@multiformats/multiaddr": "^12.2.1",
|
|
68
68
|
"any-signal": "^4.1.1",
|
|
69
69
|
"hashlru": "^2.3.0",
|
|
@@ -90,10 +90,10 @@
|
|
|
90
90
|
"uint8arrays": "^5.0.3"
|
|
91
91
|
},
|
|
92
92
|
"devDependencies": {
|
|
93
|
-
"@libp2p/interface-compliance-tests": "5.4.3-
|
|
94
|
-
"@libp2p/logger": "4.0.12-
|
|
95
|
-
"@libp2p/peer-id-factory": "4.1.1-
|
|
96
|
-
"@libp2p/peer-store": "10.0.17-
|
|
93
|
+
"@libp2p/interface-compliance-tests": "5.4.3-d9366f9aa",
|
|
94
|
+
"@libp2p/logger": "4.0.12-d9366f9aa",
|
|
95
|
+
"@libp2p/peer-id-factory": "4.1.1-d9366f9aa",
|
|
96
|
+
"@libp2p/peer-store": "10.0.17-d9366f9aa",
|
|
97
97
|
"@types/lodash.random": "^3.2.9",
|
|
98
98
|
"@types/lodash.range": "^3.2.9",
|
|
99
99
|
"@types/sinon": "^17.0.3",
|
package/src/index.ts
CHANGED
|
@@ -86,7 +86,6 @@ import { removePrivateAddressesMapper, removePublicAddressesMapper, passthroughM
|
|
|
86
86
|
import type { ProvidersInit } from './providers.js'
|
|
87
87
|
import type { Libp2pEvents, ComponentLogger, TypedEventTarget, Metrics, PeerId, PeerInfo, PeerStore, RoutingOptions } from '@libp2p/interface'
|
|
88
88
|
import type { AddressManager, ConnectionManager, Registrar } from '@libp2p/interface-internal'
|
|
89
|
-
import type { AdaptiveTimeoutInit } from '@libp2p/utils/src/adaptive-timeout.js'
|
|
90
89
|
import type { Datastore } from 'interface-datastore'
|
|
91
90
|
import type { CID } from 'multiformats/cid'
|
|
92
91
|
import type { ProgressEvent } from 'progress-events'
|
|
@@ -406,11 +405,6 @@ export interface KadDHTInit {
|
|
|
406
405
|
* with this filter.
|
|
407
406
|
*/
|
|
408
407
|
peerInfoMapper?(peer: PeerInfo): PeerInfo
|
|
409
|
-
|
|
410
|
-
/**
|
|
411
|
-
* Dynamic network timeout settings for sending messages to peers
|
|
412
|
-
*/
|
|
413
|
-
networkDialTimeout?: Omit<AdaptiveTimeoutInit, 'metricsName' | 'metrics'>
|
|
414
408
|
}
|
|
415
409
|
|
|
416
410
|
export interface KadDHTComponents {
|
package/src/network.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { TypedEventEmitter } from '@libp2p/interface'
|
|
2
2
|
import { Libp2pRecord } from '@libp2p/record'
|
|
3
|
-
import { AdaptiveTimeout, type AdaptiveTimeoutInit } from '@libp2p/utils/adaptive-timeout'
|
|
4
3
|
import { pbStream } from 'it-protobuf-stream'
|
|
5
4
|
import { CodeError } from 'protons-runtime'
|
|
6
5
|
import { Message } from './message/dht.js'
|
|
@@ -17,7 +16,6 @@ import type { AbortOptions, Logger, Stream, PeerId, PeerInfo, Startable, Routing
|
|
|
17
16
|
export interface NetworkInit {
|
|
18
17
|
protocol: string
|
|
19
18
|
logPrefix: string
|
|
20
|
-
timeout?: Omit<AdaptiveTimeoutInit, 'metricsName' | 'metrics'>
|
|
21
19
|
}
|
|
22
20
|
|
|
23
21
|
interface NetworkEvents {
|
|
@@ -32,7 +30,6 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
|
|
|
32
30
|
private readonly protocol: string
|
|
33
31
|
private running: boolean
|
|
34
32
|
private readonly components: KadDHTComponents
|
|
35
|
-
private readonly timeout: AdaptiveTimeout
|
|
36
33
|
|
|
37
34
|
/**
|
|
38
35
|
* Create a new network
|
|
@@ -45,11 +42,6 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
|
|
|
45
42
|
this.log = components.logger.forComponent(`${init.logPrefix}:network`)
|
|
46
43
|
this.running = false
|
|
47
44
|
this.protocol = protocol
|
|
48
|
-
this.timeout = new AdaptiveTimeout({
|
|
49
|
-
...(init.timeout ?? {}),
|
|
50
|
-
metrics: components.metrics,
|
|
51
|
-
metricName: `${init.logPrefix.replaceAll(':', '_')}_network_message_send_times_milliseconds`
|
|
52
|
-
})
|
|
53
45
|
}
|
|
54
46
|
|
|
55
47
|
/**
|
|
@@ -96,23 +88,12 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
|
|
|
96
88
|
yield sendQueryEvent({ to, type }, options)
|
|
97
89
|
|
|
98
90
|
let stream: Stream | undefined
|
|
99
|
-
const signal = this.timeout.getTimeoutSignal(options)
|
|
100
|
-
|
|
101
|
-
options = {
|
|
102
|
-
...options,
|
|
103
|
-
signal
|
|
104
|
-
}
|
|
105
91
|
|
|
106
92
|
try {
|
|
107
93
|
const connection = await this.components.connectionManager.openConnection(to, options)
|
|
108
|
-
stream = await connection.newStream(this.protocol, options)
|
|
109
|
-
const response = await this._writeReadMessage(stream, msg, options)
|
|
94
|
+
const stream = await connection.newStream(this.protocol, options)
|
|
110
95
|
|
|
111
|
-
|
|
112
|
-
.catch(err => {
|
|
113
|
-
this.log.error('error closing stream to %p', to, err)
|
|
114
|
-
stream?.abort(err)
|
|
115
|
-
})
|
|
96
|
+
const response = await this._writeReadMessage(stream, msg, options)
|
|
116
97
|
|
|
117
98
|
yield peerResponseEvent({
|
|
118
99
|
from: to,
|
|
@@ -122,11 +103,12 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
|
|
|
122
103
|
record: response.record == null ? undefined : Libp2pRecord.deserialize(response.record)
|
|
123
104
|
}, options)
|
|
124
105
|
} catch (err: any) {
|
|
125
|
-
stream?.abort(err)
|
|
126
106
|
this.log.error('could not send %s to %p', msg.type, to, err)
|
|
127
107
|
yield queryErrorEvent({ from: to, error: err }, options)
|
|
128
108
|
} finally {
|
|
129
|
-
|
|
109
|
+
if (stream != null) {
|
|
110
|
+
await stream.close()
|
|
111
|
+
}
|
|
130
112
|
}
|
|
131
113
|
}
|
|
132
114
|
|
|
@@ -149,31 +131,20 @@ export class Network extends TypedEventEmitter<NetworkEvents> implements Startab
|
|
|
149
131
|
yield sendQueryEvent({ to, type }, options)
|
|
150
132
|
|
|
151
133
|
let stream: Stream | undefined
|
|
152
|
-
const signal = this.timeout.getTimeoutSignal(options)
|
|
153
|
-
|
|
154
|
-
options = {
|
|
155
|
-
...options,
|
|
156
|
-
signal
|
|
157
|
-
}
|
|
158
134
|
|
|
159
135
|
try {
|
|
160
136
|
const connection = await this.components.connectionManager.openConnection(to, options)
|
|
161
|
-
stream = await connection.newStream(this.protocol, options)
|
|
137
|
+
const stream = await connection.newStream(this.protocol, options)
|
|
162
138
|
|
|
163
139
|
await this._writeMessage(stream, msg, options)
|
|
164
140
|
|
|
165
|
-
stream.close(options)
|
|
166
|
-
.catch(err => {
|
|
167
|
-
this.log.error('error closing stream to %p', to, err)
|
|
168
|
-
stream?.abort(err)
|
|
169
|
-
})
|
|
170
|
-
|
|
171
141
|
yield peerResponseEvent({ from: to, messageType: type }, options)
|
|
172
142
|
} catch (err: any) {
|
|
173
|
-
stream?.abort(err)
|
|
174
143
|
yield queryErrorEvent({ from: to, error: err }, options)
|
|
175
144
|
} finally {
|
|
176
|
-
|
|
145
|
+
if (stream != null) {
|
|
146
|
+
await stream.close()
|
|
147
|
+
}
|
|
177
148
|
}
|
|
178
149
|
}
|
|
179
150
|
|