@libp2p/interface-compliance-tests 1.1.11 → 1.1.12
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/src/mocks/connection.d.ts +0 -2
- package/dist/src/mocks/connection.d.ts.map +1 -1
- package/dist/src/mocks/connection.js +5 -5
- package/dist/src/mocks/connection.js.map +1 -1
- package/dist/src/mocks/muxer.d.ts.map +1 -1
- package/dist/src/mocks/muxer.js +201 -131
- package/dist/src/mocks/muxer.js.map +1 -1
- package/dist/src/mocks/upgrader.d.ts +2 -2
- package/dist/src/mocks/upgrader.d.ts.map +1 -1
- package/dist/src/mocks/upgrader.js +2 -2
- package/dist/src/mocks/upgrader.js.map +1 -1
- package/dist/src/stream-muxer/base-test.d.ts.map +1 -1
- package/dist/src/stream-muxer/base-test.js +27 -21
- package/dist/src/stream-muxer/base-test.js.map +1 -1
- package/dist/src/stream-muxer/close-test.d.ts.map +1 -1
- package/dist/src/stream-muxer/close-test.js +25 -28
- package/dist/src/stream-muxer/close-test.js.map +1 -1
- package/dist/src/stream-muxer/spawner.d.ts.map +1 -1
- package/dist/src/stream-muxer/spawner.js +2 -3
- package/dist/src/stream-muxer/spawner.js.map +1 -1
- package/dist/src/transport/dial-test.d.ts.map +1 -1
- package/dist/src/transport/dial-test.js +16 -5
- package/dist/src/transport/dial-test.js.map +1 -1
- package/dist/src/transport/listen-test.d.ts.map +1 -1
- package/dist/src/transport/listen-test.js +13 -2
- package/dist/src/transport/listen-test.js.map +1 -1
- package/package.json +5 -2
- package/src/mocks/connection.ts +5 -7
- package/src/mocks/muxer.ts +271 -147
- package/src/mocks/upgrader.ts +4 -4
- package/src/stream-muxer/base-test.ts +35 -24
- package/src/stream-muxer/close-test.ts +32 -29
- package/src/stream-muxer/spawner.ts +3 -6
- package/src/transport/dial-test.ts +23 -6
- package/src/transport/listen-test.ts +16 -2
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import type { MultiaddrConnection } from '@libp2p/interfaces/transport';
|
|
2
2
|
import type { Connection, Stream } from '@libp2p/interfaces/connection';
|
|
3
|
-
import type { Muxer } from '@libp2p/interfaces/stream-muxer';
|
|
4
3
|
import type { Duplex } from 'it-stream-types';
|
|
5
4
|
import type { PeerId } from '@libp2p/interfaces/src/peer-id';
|
|
6
5
|
import type { Registrar } from '@libp2p/interfaces/registrar';
|
|
7
6
|
export interface MockConnectionOptions {
|
|
8
7
|
direction?: 'inbound' | 'outbound';
|
|
9
|
-
muxer?: Muxer;
|
|
10
8
|
registrar?: Registrar;
|
|
11
9
|
}
|
|
12
10
|
export declare function mockConnection(maConn: MultiaddrConnection, opts?: MockConnectionOptions): Connection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAA4B,MAAM,+BAA+B,CAAA;AACjG,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAA4B,MAAM,+BAA+B,CAAA;AACjG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAE5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAQ7D,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAAA;IAClC,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,wBAAgB,cAAc,CAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,GAAE,qBAA0B,GAAG,UAAU,CAiGzG;AAED,wBAAgB,UAAU,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAW9D;AAED,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,wBAAgB,cAAc,CAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,GAAG,CAAE,UAAU,EAAE,UAAU,CAAE,CAe5E"}
|
|
@@ -10,7 +10,7 @@ import { CustomEvent } from '@libp2p/interfaces';
|
|
|
10
10
|
const log = logger('libp2p:mock-connection');
|
|
11
11
|
export function mockConnection(maConn, opts = {}) {
|
|
12
12
|
const remoteAddr = maConn.remoteAddr;
|
|
13
|
-
const remotePeerIdStr = remoteAddr.getPeerId();
|
|
13
|
+
const remotePeerIdStr = remoteAddr.getPeerId() ?? '12D3KooWCrhmFM1BCPGBkNzbPfDk4cjYmtAYSpZwUBC69Qg2kZyq';
|
|
14
14
|
if (remotePeerIdStr == null) {
|
|
15
15
|
throw new Error('Remote multiaddr must contain a peer id');
|
|
16
16
|
}
|
|
@@ -19,8 +19,8 @@ export function mockConnection(maConn, opts = {}) {
|
|
|
19
19
|
const streams = [];
|
|
20
20
|
const direction = opts.direction ?? 'inbound';
|
|
21
21
|
const registrar = opts.registrar ?? mockRegistrar();
|
|
22
|
-
const muxer =
|
|
23
|
-
|
|
22
|
+
const muxer = mockMuxer({
|
|
23
|
+
onIncomingStream: (muxedStream) => {
|
|
24
24
|
const mss = new Listener(muxedStream);
|
|
25
25
|
try {
|
|
26
26
|
mss.handle(registrar.getProtocols())
|
|
@@ -40,8 +40,8 @@ export function mockConnection(maConn, opts = {}) {
|
|
|
40
40
|
log.error(err);
|
|
41
41
|
}
|
|
42
42
|
},
|
|
43
|
-
onStreamEnd: (
|
|
44
|
-
connection.removeStream(
|
|
43
|
+
onStreamEnd: (muxedStream) => {
|
|
44
|
+
connection.removeStream(muxedStream.id);
|
|
45
45
|
}
|
|
46
46
|
});
|
|
47
47
|
void pipe(maConn, muxer, maConn);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"muxer.d.ts","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"muxer.d.ts","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAsV1E,wBAAgB,SAAS,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,KAAK,CAiBxD"}
|
package/dist/src/mocks/muxer.js
CHANGED
|
@@ -2,185 +2,255 @@ import { pushable } from 'it-pushable';
|
|
|
2
2
|
import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
|
|
3
3
|
import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
|
|
4
4
|
import { abortableSource } from 'abortable-iterator';
|
|
5
|
+
import { anySignal } from 'any-signal';
|
|
6
|
+
import errCode from 'err-code';
|
|
7
|
+
import { logger } from '@libp2p/logger';
|
|
8
|
+
import * as ndjson from 'it-ndjson';
|
|
9
|
+
import { pipe } from 'it-pipe';
|
|
10
|
+
import map from 'it-map';
|
|
11
|
+
let muxers = 0;
|
|
12
|
+
let streams = 0;
|
|
5
13
|
class MuxedStream {
|
|
6
14
|
constructor(opts) {
|
|
7
|
-
const { id, push, onEnd } = opts;
|
|
15
|
+
const { id, type, push, onEnd } = opts;
|
|
16
|
+
this.log = logger(`libp2p:mock-muxer:stream:${id}:${type}`);
|
|
8
17
|
this.id = id;
|
|
9
|
-
this.
|
|
10
|
-
this.
|
|
11
|
-
this.
|
|
12
|
-
this.
|
|
13
|
-
this.
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
18
|
+
this.type = type;
|
|
19
|
+
this.abortController = new AbortController();
|
|
20
|
+
this.resetController = new AbortController();
|
|
21
|
+
this.sourceEnded = false;
|
|
22
|
+
this.sinkEnded = false;
|
|
23
|
+
let endErr;
|
|
24
|
+
const onSourceEnd = (err) => {
|
|
25
|
+
if (this.sourceEnded) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
this.log('onSourceEnd sink ended? %s', this.sinkEnded);
|
|
29
|
+
this.sourceEnded = true;
|
|
30
|
+
if (err != null && endErr == null) {
|
|
31
|
+
endErr = err;
|
|
32
|
+
}
|
|
33
|
+
if (this.sinkEnded) {
|
|
34
|
+
this.stream.timeline.close = Date.now();
|
|
35
|
+
if (onEnd != null) {
|
|
36
|
+
onEnd(endErr);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
const onSinkEnd = (err) => {
|
|
41
|
+
if (this.sinkEnded) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
this.log('onSinkEnd source ended? %s', this.sourceEnded);
|
|
45
|
+
this.sinkEnded = true;
|
|
46
|
+
if (err != null && endErr == null) {
|
|
47
|
+
endErr = err;
|
|
17
48
|
}
|
|
49
|
+
if (this.sourceEnded) {
|
|
50
|
+
this.stream.timeline.close = Date.now();
|
|
51
|
+
if (onEnd != null) {
|
|
52
|
+
onEnd(endErr);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
};
|
|
56
|
+
this.input = pushable({
|
|
57
|
+
onEnd: onSourceEnd
|
|
18
58
|
});
|
|
19
59
|
this.stream = {
|
|
20
60
|
id,
|
|
21
61
|
sink: async (source) => {
|
|
22
|
-
source = abortableSource(source,
|
|
62
|
+
source = abortableSource(source, anySignal([
|
|
63
|
+
this.abortController.signal,
|
|
64
|
+
this.resetController.signal
|
|
65
|
+
]));
|
|
23
66
|
try {
|
|
67
|
+
if (this.type === 'initiator') {
|
|
68
|
+
// If initiator, open a new stream
|
|
69
|
+
const createMsg = {
|
|
70
|
+
id: this.id,
|
|
71
|
+
type: 'create',
|
|
72
|
+
direction: this.type
|
|
73
|
+
};
|
|
74
|
+
push.push(createMsg);
|
|
75
|
+
}
|
|
24
76
|
for await (const chunk of source) {
|
|
25
77
|
const dataMsg = {
|
|
26
78
|
id,
|
|
27
79
|
type: 'data',
|
|
28
|
-
chunk: uint8ArrayToString(chunk, 'base64')
|
|
80
|
+
chunk: uint8ArrayToString(chunk, 'base64'),
|
|
81
|
+
direction: this.type
|
|
29
82
|
};
|
|
30
83
|
push.push(dataMsg);
|
|
31
84
|
}
|
|
32
|
-
const closeMsg = {
|
|
33
|
-
id,
|
|
34
|
-
type: 'close'
|
|
35
|
-
};
|
|
36
|
-
push.push(closeMsg);
|
|
37
85
|
}
|
|
38
86
|
catch (err) {
|
|
39
|
-
if (
|
|
40
|
-
|
|
87
|
+
if (err.type === 'aborted' && err.message === 'The operation was aborted') {
|
|
88
|
+
if (this.resetController.signal.aborted) {
|
|
89
|
+
err.message = 'stream reset';
|
|
90
|
+
err.code = 'ERR_STREAM_RESET';
|
|
91
|
+
}
|
|
92
|
+
if (this.abortController.signal.aborted) {
|
|
93
|
+
err.message = 'stream aborted';
|
|
94
|
+
err.code = 'ERR_STREAM_ABORT';
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// Send no more data if this stream was remotely reset
|
|
98
|
+
if (err.code !== 'ERR_STREAM_RESET') {
|
|
99
|
+
const resetMsg = {
|
|
100
|
+
id,
|
|
101
|
+
type: 'reset',
|
|
102
|
+
direction: this.type
|
|
103
|
+
};
|
|
104
|
+
push.push(resetMsg);
|
|
41
105
|
}
|
|
106
|
+
this.log('sink erred', err);
|
|
107
|
+
this.input.end(err);
|
|
108
|
+
onSinkEnd(err);
|
|
109
|
+
return;
|
|
42
110
|
}
|
|
43
|
-
this.
|
|
44
|
-
|
|
45
|
-
source: this.input,
|
|
46
|
-
close: () => {
|
|
111
|
+
this.log('sink ended');
|
|
112
|
+
onSinkEnd();
|
|
47
113
|
const closeMsg = {
|
|
48
114
|
id,
|
|
49
|
-
type: 'close'
|
|
115
|
+
type: 'close',
|
|
116
|
+
direction: this.type
|
|
50
117
|
};
|
|
51
118
|
push.push(closeMsg);
|
|
52
|
-
this.closeSink();
|
|
53
|
-
this.closeSource();
|
|
54
119
|
},
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
};
|
|
60
|
-
push.push(resetMsg);
|
|
61
|
-
this.closeSink();
|
|
62
|
-
this.closeSource();
|
|
120
|
+
source: this.input,
|
|
121
|
+
// Close for reading
|
|
122
|
+
close: () => {
|
|
123
|
+
this.input.end();
|
|
63
124
|
},
|
|
125
|
+
// Close for reading and writing (local error)
|
|
126
|
+
abort: (err) => {
|
|
127
|
+
// End the source with the passed error
|
|
128
|
+
this.input.end();
|
|
129
|
+
this.abortController.abort();
|
|
130
|
+
onSinkEnd(err);
|
|
131
|
+
},
|
|
132
|
+
// Close immediately for reading and writing (remote error)
|
|
64
133
|
reset: () => {
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
push.push(resetMsg);
|
|
70
|
-
this.closeSink();
|
|
71
|
-
this.closeSource();
|
|
134
|
+
const err = errCode(new Error('stream reset'), 'ERR_STREAM_RESET');
|
|
135
|
+
this.resetController.abort();
|
|
136
|
+
this.input.end(err);
|
|
137
|
+
onSinkEnd(err);
|
|
72
138
|
},
|
|
73
139
|
timeline: {
|
|
74
140
|
open: Date.now()
|
|
75
141
|
}
|
|
76
142
|
};
|
|
77
143
|
}
|
|
78
|
-
maybeEndStream() {
|
|
79
|
-
if (this.stream.timeline.close != null) {
|
|
80
|
-
// already ended
|
|
81
|
-
return;
|
|
82
|
-
}
|
|
83
|
-
if (this.sinkClosed && this.sourceClosed) {
|
|
84
|
-
this.stream.timeline.close = Date.now();
|
|
85
|
-
this.onEnd();
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
closeSource() {
|
|
89
|
-
this.sourceClosed = true;
|
|
90
|
-
this.input.end();
|
|
91
|
-
}
|
|
92
|
-
closeSink() {
|
|
93
|
-
this.sinkClosed = true;
|
|
94
|
-
this.controller.abort();
|
|
95
|
-
this.maybeEndStream();
|
|
96
|
-
}
|
|
97
144
|
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
145
|
+
class MockMuxer {
|
|
146
|
+
constructor(options) {
|
|
147
|
+
this.name = `muxer:${muxers++}`;
|
|
148
|
+
this.log = logger(`libp2p:mock-muxer:${this.name}`);
|
|
149
|
+
this.registryInitiatorStreams = new Map();
|
|
150
|
+
this.registryRecipientStreams = new Map();
|
|
151
|
+
this.log('create muxer');
|
|
152
|
+
this.options = options ?? {};
|
|
153
|
+
// receives data from the muxer at the other end of the stream
|
|
154
|
+
this.source = this.input = pushable({
|
|
155
|
+
onEnd: (err) => {
|
|
156
|
+
this.log('closing muxed streams');
|
|
157
|
+
for (const stream of this.streams) {
|
|
158
|
+
stream.abort(err);
|
|
159
|
+
}
|
|
106
160
|
}
|
|
161
|
+
});
|
|
162
|
+
// receives messages from all of the muxed streams
|
|
163
|
+
this.streamInput = pushable();
|
|
164
|
+
}
|
|
165
|
+
// receive incoming messages
|
|
166
|
+
async sink(source) {
|
|
167
|
+
try {
|
|
168
|
+
await pipe(source, (source) => map(source, buf => uint8ArrayToString(buf)), ndjson.parse, async (source) => {
|
|
169
|
+
for await (const message of source) {
|
|
170
|
+
this.log('-> %s %s %s', message.type, message.direction, message.id);
|
|
171
|
+
this.handleMessage(message);
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
this.log('muxed stream ended');
|
|
175
|
+
this.input.end();
|
|
107
176
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
})
|
|
177
|
+
catch (err) {
|
|
178
|
+
this.log('muxed stream errored', err);
|
|
179
|
+
this.input.end(err);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
handleMessage(message) {
|
|
183
|
+
let muxedStream;
|
|
184
|
+
const registry = message.direction === 'initiator' ? this.registryRecipientStreams : this.registryInitiatorStreams;
|
|
185
|
+
if (message.type === 'create') {
|
|
186
|
+
if (registry.has(message.id)) {
|
|
187
|
+
throw new Error(`Already had stream for ${message.id}`);
|
|
119
188
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
})));
|
|
189
|
+
muxedStream = this.createStream(message.id, 'recipient');
|
|
190
|
+
registry.set(muxedStream.stream.id, muxedStream);
|
|
191
|
+
if (this.options.onIncomingStream != null) {
|
|
192
|
+
this.options.onIncomingStream(muxedStream.stream);
|
|
125
193
|
}
|
|
126
194
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
195
|
+
muxedStream = registry.get(message.id);
|
|
196
|
+
if (muxedStream == null) {
|
|
197
|
+
throw new Error(`No stream found for ${message.id}`);
|
|
198
|
+
}
|
|
199
|
+
if (message.type === 'data') {
|
|
200
|
+
muxedStream.input.push(uint8ArrayFromString(message.chunk, 'base64'));
|
|
201
|
+
}
|
|
202
|
+
else if (message.type === 'reset') {
|
|
203
|
+
this.log('-> reset stream %s %s', muxedStream.type, muxedStream.stream.id);
|
|
204
|
+
muxedStream.stream.reset();
|
|
205
|
+
}
|
|
206
|
+
else if (message.type === 'close') {
|
|
207
|
+
this.log('-> closing stream %s %s', muxedStream.type, muxedStream.stream.id);
|
|
208
|
+
muxedStream.stream.close();
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
get streams() {
|
|
212
|
+
return Array.from(this.registryRecipientStreams.values())
|
|
213
|
+
.concat(Array.from(this.registryInitiatorStreams.values()))
|
|
214
|
+
.map(({ stream }) => stream);
|
|
215
|
+
}
|
|
216
|
+
newStream(name) {
|
|
217
|
+
this.log('newStream %s', name);
|
|
218
|
+
const storedStream = this.createStream(name, 'initiator');
|
|
219
|
+
this.registryInitiatorStreams.set(storedStream.stream.id, storedStream);
|
|
220
|
+
return storedStream.stream;
|
|
221
|
+
}
|
|
222
|
+
createStream(name, type = 'initiator') {
|
|
223
|
+
const id = name ?? `${this.name}:stream:${streams++}`;
|
|
224
|
+
this.log('createStream %s %s', type, id);
|
|
130
225
|
const muxedStream = new MuxedStream({
|
|
131
226
|
id,
|
|
132
|
-
|
|
227
|
+
type,
|
|
228
|
+
push: this.streamInput,
|
|
133
229
|
onEnd: () => {
|
|
134
|
-
|
|
135
|
-
if (
|
|
136
|
-
|
|
230
|
+
this.log('stream ended %s %s', type, id);
|
|
231
|
+
if (type === 'initiator') {
|
|
232
|
+
this.registryInitiatorStreams.delete(id);
|
|
233
|
+
}
|
|
234
|
+
else {
|
|
235
|
+
this.registryRecipientStreams.delete(id);
|
|
236
|
+
}
|
|
237
|
+
if (this.options.onStreamEnd != null) {
|
|
238
|
+
this.options.onStreamEnd(muxedStream.stream);
|
|
137
239
|
}
|
|
138
240
|
}
|
|
139
241
|
});
|
|
140
242
|
return muxedStream;
|
|
141
243
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
244
|
+
}
|
|
245
|
+
export function mockMuxer(options) {
|
|
246
|
+
const mockMuxer = new MockMuxer(options);
|
|
247
|
+
void Promise.resolve().then(async () => {
|
|
248
|
+
void pipe(mockMuxer.streamInput, ndjson.stringify, (source) => map(source, str => uint8ArrayFromString(str)), async (source) => {
|
|
145
249
|
for await (const buf of source) {
|
|
146
|
-
|
|
147
|
-
let muxedStream = streams.get(message.id);
|
|
148
|
-
if (muxedStream == null) {
|
|
149
|
-
muxedStream = createStream(message.id);
|
|
150
|
-
streams.set(muxedStream.stream.id, muxedStream);
|
|
151
|
-
if (options?.onStream != null) {
|
|
152
|
-
options.onStream(muxedStream.stream);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
if (message.type === 'data') {
|
|
156
|
-
muxedStream.input.push(uint8ArrayFromString(message.chunk, 'base64'));
|
|
157
|
-
}
|
|
158
|
-
else if (message.type === 'reset') {
|
|
159
|
-
muxedStream.closeSink();
|
|
160
|
-
muxedStream.closeSource();
|
|
161
|
-
}
|
|
162
|
-
else if (message.type === 'close') {
|
|
163
|
-
muxedStream.closeSource();
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
for (const muxedStream of streams.values()) {
|
|
167
|
-
muxedStream.stream.close();
|
|
250
|
+
mockMuxer.input.push(buf);
|
|
168
251
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
get streams() {
|
|
173
|
-
return Array.from(streams.values()).map(({ stream }) => stream);
|
|
174
|
-
},
|
|
175
|
-
newStream(name) {
|
|
176
|
-
const storedStream = createStream(name);
|
|
177
|
-
streams.set(storedStream.stream.id, storedStream);
|
|
178
|
-
if (options?.onStream != null) {
|
|
179
|
-
options.onStream(storedStream.stream);
|
|
180
|
-
}
|
|
181
|
-
return storedStream.stream;
|
|
182
|
-
}
|
|
183
|
-
};
|
|
184
|
-
return muxer;
|
|
252
|
+
});
|
|
253
|
+
});
|
|
254
|
+
return mockMuxer;
|
|
185
255
|
}
|
|
186
256
|
//# sourceMappingURL=muxer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"muxer.js","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,QAAQ,IAAI,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"muxer.js","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Upgrader } from '@libp2p/interfaces/transport';
|
|
2
|
-
import type {
|
|
2
|
+
import type { Registrar } from '@libp2p/interfaces/registrar';
|
|
3
3
|
export interface MockUpgraderOptions {
|
|
4
|
-
|
|
4
|
+
registrar?: Registrar;
|
|
5
5
|
}
|
|
6
6
|
export declare function mockUpgrader(options?: MockUpgraderOptions): Upgrader;
|
|
7
7
|
//# sourceMappingURL=upgrader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrader.d.ts","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,8BAA8B,CAAA;AACjF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"upgrader.d.ts","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,8BAA8B,CAAA;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAE7D,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YA0B9D"}
|
|
@@ -12,14 +12,14 @@ export function mockUpgrader(options = {}) {
|
|
|
12
12
|
ensureProps(multiaddrConnection);
|
|
13
13
|
return mockConnection(multiaddrConnection, {
|
|
14
14
|
direction: 'outbound',
|
|
15
|
-
|
|
15
|
+
registrar: options.registrar
|
|
16
16
|
});
|
|
17
17
|
},
|
|
18
18
|
async upgradeInbound(multiaddrConnection) {
|
|
19
19
|
ensureProps(multiaddrConnection);
|
|
20
20
|
return mockConnection(multiaddrConnection, {
|
|
21
21
|
direction: 'inbound',
|
|
22
|
-
|
|
22
|
+
registrar: options.registrar
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAQhD,MAAM,UAAU,YAAY,CAAE,UAA+B,EAAE;IAC7D,MAAM,WAAW,GAAG,CAAC,mBAAwC,EAAE,EAAE;QAC/D,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnE,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,mBAAmB,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,QAAQ,GAAa;QACzB,KAAK,CAAC,eAAe,CAAE,mBAAmB;YACxC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,cAAc,CAAC,mBAAmB,EAAE;gBACzC,SAAS,EAAE,UAAU;gBACrB,
|
|
1
|
+
{"version":3,"file":"upgrader.js","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAQhD,MAAM,UAAU,YAAY,CAAE,UAA+B,EAAE;IAC7D,MAAM,WAAW,GAAG,CAAC,mBAAwC,EAAE,EAAE;QAC/D,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnE,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,OAAO,mBAAmB,CAAA;IAC5B,CAAC,CAAA;IAED,MAAM,QAAQ,GAAa;QACzB,KAAK,CAAC,eAAe,CAAE,mBAAmB;YACxC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,cAAc,CAAC,mBAAmB,EAAE;gBACzC,SAAS,EAAE,UAAU;gBACrB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAA;QACJ,CAAC;QACD,KAAK,CAAC,cAAc,CAAE,mBAAmB;YACvC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,cAAc,CAAC,mBAAmB,EAAE;gBACzC,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-test.d.ts","sourceRoot":"","sources":["../../../src/stream-muxer/base-test.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;iCAOlD,UAAU,KAAK,EAAE,YAAY,CAAC;AAAtD,
|
|
1
|
+
{"version":3,"file":"base-test.d.ts","sourceRoot":"","sources":["../../../src/stream-muxer/base-test.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;iCAOlD,UAAU,KAAK,EAAE,YAAY,CAAC;AAAtD,wBAgKC"}
|