@libp2p/interface-compliance-tests 5.4.2-e1923b0a7 → 5.4.3-9d13a2f6a
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/transport/dial-test.d.ts.map +1 -1
- package/dist/src/transport/dial-test.js +9 -8
- package/dist/src/transport/dial-test.js.map +1 -1
- package/dist/src/transport/filter-test.d.ts.map +1 -1
- package/dist/src/transport/filter-test.js +10 -5
- package/dist/src/transport/filter-test.js.map +1 -1
- package/dist/src/transport/index.d.ts +2 -1
- package/dist/src/transport/index.d.ts.map +1 -1
- package/dist/src/transport/index.js.map +1 -1
- package/dist/src/transport/listen-test.d.ts.map +1 -1
- package/dist/src/transport/listen-test.js +13 -12
- package/dist/src/transport/listen-test.js.map +1 -1
- package/package.json +9 -9
- package/src/transport/dial-test.ts +9 -8
- package/src/transport/filter-test.ts +11 -5
- package/src/transport/index.ts +2 -1
- package/src/transport/listen-test.ts +13 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dial-test.d.ts","sourceRoot":"","sources":["../../../src/transport/dial-test.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAa,MAAM,YAAY,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAKpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,
|
|
1
|
+
{"version":3,"file":"dial-test.d.ts","sourceRoot":"","sources":["../../../src/transport/dial-test.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,qBAAqB,EAAa,MAAM,YAAY,CAAA;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAKpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,wBA4GC"}
|
|
@@ -11,7 +11,8 @@ export default (common) => {
|
|
|
11
11
|
describe('dial', () => {
|
|
12
12
|
let upgrader;
|
|
13
13
|
let registrar;
|
|
14
|
-
let
|
|
14
|
+
let listenAddrs;
|
|
15
|
+
let dialAddrs;
|
|
15
16
|
let transport;
|
|
16
17
|
let connector;
|
|
17
18
|
let listener;
|
|
@@ -21,7 +22,7 @@ export default (common) => {
|
|
|
21
22
|
registrar,
|
|
22
23
|
events: new TypedEventEmitter()
|
|
23
24
|
});
|
|
24
|
-
({
|
|
25
|
+
({ listenAddrs, dialAddrs, transport, connector } = await common.setup());
|
|
25
26
|
});
|
|
26
27
|
after(async () => {
|
|
27
28
|
await common.teardown();
|
|
@@ -30,7 +31,7 @@ export default (common) => {
|
|
|
30
31
|
listener = transport.createListener({
|
|
31
32
|
upgrader
|
|
32
33
|
});
|
|
33
|
-
await listener.listen(
|
|
34
|
+
await listener.listen(listenAddrs[0]);
|
|
34
35
|
});
|
|
35
36
|
afterEach(async () => {
|
|
36
37
|
sinon.restore();
|
|
@@ -45,7 +46,7 @@ export default (common) => {
|
|
|
45
46
|
], data.stream, drain);
|
|
46
47
|
});
|
|
47
48
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound');
|
|
48
|
-
const conn = await transport.dial(
|
|
49
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
49
50
|
upgrader
|
|
50
51
|
});
|
|
51
52
|
const stream = await conn.newStream([protocol]);
|
|
@@ -58,7 +59,7 @@ export default (common) => {
|
|
|
58
59
|
});
|
|
59
60
|
it('can close connections', async () => {
|
|
60
61
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound');
|
|
61
|
-
const conn = await transport.dial(
|
|
62
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
62
63
|
upgrader
|
|
63
64
|
});
|
|
64
65
|
expect(upgradeSpy.callCount).to.equal(1);
|
|
@@ -68,7 +69,7 @@ export default (common) => {
|
|
|
68
69
|
});
|
|
69
70
|
it('to non existent listener', async () => {
|
|
70
71
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound');
|
|
71
|
-
await expect(transport.dial(
|
|
72
|
+
await expect(transport.dial(dialAddrs[1], {
|
|
72
73
|
upgrader
|
|
73
74
|
})).to.eventually.be.rejected();
|
|
74
75
|
expect(upgradeSpy.callCount).to.equal(0);
|
|
@@ -77,7 +78,7 @@ export default (common) => {
|
|
|
77
78
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound');
|
|
78
79
|
const controller = new AbortController();
|
|
79
80
|
controller.abort();
|
|
80
|
-
const conn = transport.dial(
|
|
81
|
+
const conn = transport.dial(dialAddrs[0], { signal: controller.signal, upgrader });
|
|
81
82
|
await expect(conn).to.eventually.be.rejected().with.property('code', AbortError.code);
|
|
82
83
|
expect(upgradeSpy.callCount).to.equal(0);
|
|
83
84
|
});
|
|
@@ -87,7 +88,7 @@ export default (common) => {
|
|
|
87
88
|
// progress
|
|
88
89
|
connector.delay(100);
|
|
89
90
|
const controller = new AbortController();
|
|
90
|
-
const conn = transport.dial(
|
|
91
|
+
const conn = transport.dial(dialAddrs[0], { signal: controller.signal, upgrader });
|
|
91
92
|
setTimeout(() => { controller.abort(); }, 50);
|
|
92
93
|
await expect(conn).to.eventually.be.rejected().with.property('code', AbortError.code);
|
|
93
94
|
expect(upgradeSpy.callCount).to.equal(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dial-test.js","sourceRoot":"","sources":["../../../src/transport/dial-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,GAAG,MAAM,QAAQ,CAAA;AACxB,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAO/D,eAAe,CAAC,MAAwC,EAAQ,EAAE;IAChE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;QACpB,IAAI,QAAkB,CAAA;QACtB,IAAI,SAAoB,CAAA;QACxB,IAAI,
|
|
1
|
+
{"version":3,"file":"dial-test.js","sourceRoot":"","sources":["../../../src/transport/dial-test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-test.d.ts","sourceRoot":"","sources":["../../../src/transport/filter-test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAIpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,
|
|
1
|
+
{"version":3,"file":"filter-test.d.ts","sourceRoot":"","sources":["../../../src/transport/filter-test.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAIpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,wBAwBC"}
|
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import { expect } from 'aegir/chai';
|
|
2
2
|
export default (common) => {
|
|
3
3
|
describe('filter', () => {
|
|
4
|
-
let
|
|
4
|
+
let listenAddrs;
|
|
5
|
+
let dialAddrs;
|
|
5
6
|
let transport;
|
|
6
7
|
before(async () => {
|
|
7
|
-
({
|
|
8
|
+
({ listenAddrs, dialAddrs, transport } = await common.setup());
|
|
8
9
|
});
|
|
9
10
|
after(async () => {
|
|
10
11
|
await common.teardown();
|
|
11
12
|
});
|
|
12
|
-
it('filters addresses', () => {
|
|
13
|
-
const filteredAddrs = transport.
|
|
14
|
-
expect(filteredAddrs).to.eql(
|
|
13
|
+
it('filters listen addresses', () => {
|
|
14
|
+
const filteredAddrs = transport.listenFilter(listenAddrs);
|
|
15
|
+
expect(filteredAddrs).to.eql(listenAddrs);
|
|
16
|
+
});
|
|
17
|
+
it('filters dial addresses', () => {
|
|
18
|
+
const filteredAddrs = transport.dialFilter(dialAddrs);
|
|
19
|
+
expect(filteredAddrs).to.eql(dialAddrs);
|
|
15
20
|
});
|
|
16
21
|
});
|
|
17
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-test.js","sourceRoot":"","sources":["../../../src/transport/filter-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAMnC,eAAe,CAAC,MAAwC,EAAQ,EAAE;IAChE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,IAAI,
|
|
1
|
+
{"version":3,"file":"filter-test.js","sourceRoot":"","sources":["../../../src/transport/filter-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAMnC,eAAe,CAAC,MAAwC,EAAQ,EAAE;IAChE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,IAAI,WAAwB,CAAA;QAC5B,IAAI,SAAsB,CAAA;QAC1B,IAAI,SAAoB,CAAA;QAExB,MAAM,CAAC,KAAK,IAAI,EAAE;YAChB,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,KAAK,IAAI,EAAE;YACf,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;QACzB,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,0BAA0B,EAAE,GAAG,EAAE;YAClC,MAAM,aAAa,GAAG,SAAS,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;YACzD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;YAChC,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;YACrD,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transport/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/transport/index.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAExD,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,OAAO,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,SAAS,EAAE,CAAA;IACxB,SAAS,EAAE,SAAS,EAAE,CAAA;IACtB,SAAS,EAAE,SAAS,CAAA;IACpB,SAAS,EAAE,SAAS,CAAA;CACrB;iCAEuB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,wBAMC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transport/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,MAAM,MAAM,kBAAkB,CAAA;AACrC,OAAO,MAAM,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transport/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,gBAAgB,CAAA;AACjC,OAAO,MAAM,MAAM,kBAAkB,CAAA;AACrC,OAAO,MAAM,MAAM,kBAAkB,CAAA;AAiBrC,eAAe,CAAC,MAAwC,EAAQ,EAAE;IAChE,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,IAAI,CAAC,MAAM,CAAC,CAAA;QACZ,MAAM,CAAC,MAAM,CAAC,CAAA;QACd,MAAM,CAAC,MAAM,CAAC,CAAA;IAChB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listen-test.d.ts","sourceRoot":"","sources":["../../../src/transport/listen-test.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAKpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,
|
|
1
|
+
{"version":3,"file":"listen-test.d.ts","sourceRoot":"","sources":["../../../src/transport/listen-test.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;iCAKpB,UAAU,qBAAqB,CAAC,KAAG,IAAI;AAA/D,wBA6KC"}
|
|
@@ -12,7 +12,8 @@ import { mockUpgrader, mockRegistrar } from '../mocks/index.js';
|
|
|
12
12
|
export default (common) => {
|
|
13
13
|
describe('listen', () => {
|
|
14
14
|
let upgrader;
|
|
15
|
-
let
|
|
15
|
+
let listenAddrs;
|
|
16
|
+
let dialAddrs;
|
|
16
17
|
let transport;
|
|
17
18
|
let registrar;
|
|
18
19
|
before(async () => {
|
|
@@ -21,7 +22,7 @@ export default (common) => {
|
|
|
21
22
|
registrar,
|
|
22
23
|
events: new TypedEventEmitter()
|
|
23
24
|
});
|
|
24
|
-
({ transport,
|
|
25
|
+
({ transport, listenAddrs, dialAddrs } = await common.setup());
|
|
25
26
|
});
|
|
26
27
|
after(async () => {
|
|
27
28
|
await common.teardown();
|
|
@@ -33,7 +34,7 @@ export default (common) => {
|
|
|
33
34
|
const listener = transport.createListener({
|
|
34
35
|
upgrader
|
|
35
36
|
});
|
|
36
|
-
await listener.listen(
|
|
37
|
+
await listener.listen(listenAddrs[0]);
|
|
37
38
|
await listener.close();
|
|
38
39
|
});
|
|
39
40
|
it('close listener with connections, through timeout', async () => {
|
|
@@ -50,13 +51,13 @@ export default (common) => {
|
|
|
50
51
|
}
|
|
51
52
|
});
|
|
52
53
|
// Listen
|
|
53
|
-
await listener.listen(
|
|
54
|
+
await listener.listen(listenAddrs[0]);
|
|
54
55
|
// Create two connections to the listener
|
|
55
56
|
const [conn1] = await Promise.all([
|
|
56
|
-
transport.dial(
|
|
57
|
+
transport.dial(dialAddrs[0], {
|
|
57
58
|
upgrader
|
|
58
59
|
}),
|
|
59
|
-
transport.dial(
|
|
60
|
+
transport.dial(dialAddrs[0], {
|
|
60
61
|
upgrader
|
|
61
62
|
})
|
|
62
63
|
]);
|
|
@@ -84,9 +85,9 @@ export default (common) => {
|
|
|
84
85
|
upgrader
|
|
85
86
|
});
|
|
86
87
|
// Listen
|
|
87
|
-
await listener.listen(
|
|
88
|
+
await listener.listen(listenAddrs[0]);
|
|
88
89
|
// Create a connection to the listener
|
|
89
|
-
const conn = await transport.dial(
|
|
90
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
90
91
|
upgrader
|
|
91
92
|
});
|
|
92
93
|
await pWaitFor(() => typeof conn.timeline.close === 'number');
|
|
@@ -105,8 +106,8 @@ export default (common) => {
|
|
|
105
106
|
deferred.resolve();
|
|
106
107
|
});
|
|
107
108
|
void (async () => {
|
|
108
|
-
await listener.listen(
|
|
109
|
-
await transport.dial(
|
|
109
|
+
await listener.listen(listenAddrs[0]);
|
|
110
|
+
await transport.dial(dialAddrs[0], {
|
|
110
111
|
upgrader
|
|
111
112
|
});
|
|
112
113
|
})();
|
|
@@ -122,7 +123,7 @@ export default (common) => {
|
|
|
122
123
|
listener.addEventListener('listening', () => {
|
|
123
124
|
listener.close().then(done, done);
|
|
124
125
|
});
|
|
125
|
-
void listener.listen(
|
|
126
|
+
void listener.listen(listenAddrs[0]);
|
|
126
127
|
});
|
|
127
128
|
it('error', (done) => {
|
|
128
129
|
const listener = transport.createListener({
|
|
@@ -142,7 +143,7 @@ export default (common) => {
|
|
|
142
143
|
});
|
|
143
144
|
listener.addEventListener('close', () => { done(); });
|
|
144
145
|
void (async () => {
|
|
145
|
-
await listener.listen(
|
|
146
|
+
await listener.listen(listenAddrs[0]);
|
|
146
147
|
await listener.close();
|
|
147
148
|
})();
|
|
148
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listen-test.js","sourceRoot":"","sources":["../../../src/transport/listen-test.ts"],"names":[],"mappings":"AAAA,+CAA+C;AAC/C,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,MAAM,UAAU,CAAA;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,MAAM,SAAS,CAAA;AAC3B,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAO/D,eAAe,CAAC,MAAwC,EAAQ,EAAE;IAChE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,IAAI,QAAkB,CAAA;QACtB,IAAI,
|
|
1
|
+
{"version":3,"file":"listen-test.js","sourceRoot":"","sources":["../../../src/transport/listen-test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@libp2p/interface-compliance-tests",
|
|
3
|
-
"version": "5.4.
|
|
3
|
+
"version": "5.4.3-9d13a2f6a",
|
|
4
4
|
"description": "Compliance tests for JS libp2p interfaces",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/interface-compliance-tests#readme",
|
|
@@ -112,14 +112,14 @@
|
|
|
112
112
|
"test:electron-main": "aegir test -t electron-main"
|
|
113
113
|
},
|
|
114
114
|
"dependencies": {
|
|
115
|
-
"@libp2p/interface": "1.3.
|
|
116
|
-
"@libp2p/interface-internal": "1.
|
|
117
|
-
"@libp2p/logger": "4.0.
|
|
118
|
-
"@libp2p/multistream-select": "5.1.
|
|
119
|
-
"@libp2p/peer-collections": "5.
|
|
120
|
-
"@libp2p/peer-id": "4.1.
|
|
121
|
-
"@libp2p/peer-id-factory": "4.1.
|
|
122
|
-
"@libp2p/utils": "5.
|
|
115
|
+
"@libp2p/interface": "1.3.1-9d13a2f6a",
|
|
116
|
+
"@libp2p/interface-internal": "1.2.0-9d13a2f6a",
|
|
117
|
+
"@libp2p/logger": "4.0.12-9d13a2f6a",
|
|
118
|
+
"@libp2p/multistream-select": "5.1.9-9d13a2f6a",
|
|
119
|
+
"@libp2p/peer-collections": "5.2.0-9d13a2f6a",
|
|
120
|
+
"@libp2p/peer-id": "4.1.1-9d13a2f6a",
|
|
121
|
+
"@libp2p/peer-id-factory": "4.1.1-9d13a2f6a",
|
|
122
|
+
"@libp2p/utils": "5.4.0-9d13a2f6a",
|
|
123
123
|
"@multiformats/multiaddr": "^12.2.1",
|
|
124
124
|
"abortable-iterator": "^5.0.1",
|
|
125
125
|
"aegir": "^42.2.5",
|
|
@@ -17,7 +17,8 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
17
17
|
describe('dial', () => {
|
|
18
18
|
let upgrader: Upgrader
|
|
19
19
|
let registrar: Registrar
|
|
20
|
-
let
|
|
20
|
+
let listenAddrs: Multiaddr[]
|
|
21
|
+
let dialAddrs: Multiaddr[]
|
|
21
22
|
let transport: Transport
|
|
22
23
|
let connector: Connector
|
|
23
24
|
let listener: Listener
|
|
@@ -29,7 +30,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
29
30
|
events: new TypedEventEmitter()
|
|
30
31
|
});
|
|
31
32
|
|
|
32
|
-
({
|
|
33
|
+
({ listenAddrs, dialAddrs, transport, connector } = await common.setup())
|
|
33
34
|
})
|
|
34
35
|
|
|
35
36
|
after(async () => {
|
|
@@ -40,7 +41,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
40
41
|
listener = transport.createListener({
|
|
41
42
|
upgrader
|
|
42
43
|
})
|
|
43
|
-
await listener.listen(
|
|
44
|
+
await listener.listen(listenAddrs[0])
|
|
44
45
|
})
|
|
45
46
|
|
|
46
47
|
afterEach(async () => {
|
|
@@ -61,7 +62,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
61
62
|
})
|
|
62
63
|
|
|
63
64
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound')
|
|
64
|
-
const conn = await transport.dial(
|
|
65
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
65
66
|
upgrader
|
|
66
67
|
})
|
|
67
68
|
|
|
@@ -77,7 +78,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
77
78
|
|
|
78
79
|
it('can close connections', async () => {
|
|
79
80
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound')
|
|
80
|
-
const conn = await transport.dial(
|
|
81
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
81
82
|
upgrader
|
|
82
83
|
})
|
|
83
84
|
|
|
@@ -90,7 +91,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
90
91
|
it('to non existent listener', async () => {
|
|
91
92
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound')
|
|
92
93
|
|
|
93
|
-
await expect(transport.dial(
|
|
94
|
+
await expect(transport.dial(dialAddrs[1], {
|
|
94
95
|
upgrader
|
|
95
96
|
})).to.eventually.be.rejected()
|
|
96
97
|
expect(upgradeSpy.callCount).to.equal(0)
|
|
@@ -100,7 +101,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
100
101
|
const upgradeSpy = sinon.spy(upgrader, 'upgradeOutbound')
|
|
101
102
|
const controller = new AbortController()
|
|
102
103
|
controller.abort()
|
|
103
|
-
const conn = transport.dial(
|
|
104
|
+
const conn = transport.dial(dialAddrs[0], { signal: controller.signal, upgrader })
|
|
104
105
|
|
|
105
106
|
await expect(conn).to.eventually.be.rejected().with.property('code', AbortError.code)
|
|
106
107
|
expect(upgradeSpy.callCount).to.equal(0)
|
|
@@ -113,7 +114,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
113
114
|
connector.delay(100)
|
|
114
115
|
|
|
115
116
|
const controller = new AbortController()
|
|
116
|
-
const conn = transport.dial(
|
|
117
|
+
const conn = transport.dial(dialAddrs[0], { signal: controller.signal, upgrader })
|
|
117
118
|
setTimeout(() => { controller.abort() }, 50)
|
|
118
119
|
|
|
119
120
|
await expect(conn).to.eventually.be.rejected().with.property('code', AbortError.code)
|
|
@@ -6,20 +6,26 @@ import type { Multiaddr } from '@multiformats/multiaddr'
|
|
|
6
6
|
|
|
7
7
|
export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
8
8
|
describe('filter', () => {
|
|
9
|
-
let
|
|
9
|
+
let listenAddrs: Multiaddr[]
|
|
10
|
+
let dialAddrs: Multiaddr[]
|
|
10
11
|
let transport: Transport
|
|
11
12
|
|
|
12
13
|
before(async () => {
|
|
13
|
-
({
|
|
14
|
+
({ listenAddrs, dialAddrs, transport } = await common.setup())
|
|
14
15
|
})
|
|
15
16
|
|
|
16
17
|
after(async () => {
|
|
17
18
|
await common.teardown()
|
|
18
19
|
})
|
|
19
20
|
|
|
20
|
-
it('filters addresses', () => {
|
|
21
|
-
const filteredAddrs = transport.
|
|
22
|
-
expect(filteredAddrs).to.eql(
|
|
21
|
+
it('filters listen addresses', () => {
|
|
22
|
+
const filteredAddrs = transport.listenFilter(listenAddrs)
|
|
23
|
+
expect(filteredAddrs).to.eql(listenAddrs)
|
|
24
|
+
})
|
|
25
|
+
|
|
26
|
+
it('filters dial addresses', () => {
|
|
27
|
+
const filteredAddrs = transport.dialFilter(dialAddrs)
|
|
28
|
+
expect(filteredAddrs).to.eql(dialAddrs)
|
|
23
29
|
})
|
|
24
30
|
})
|
|
25
31
|
}
|
package/src/transport/index.ts
CHANGED
|
@@ -18,7 +18,8 @@ import type { Multiaddr } from '@multiformats/multiaddr'
|
|
|
18
18
|
export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
19
19
|
describe('listen', () => {
|
|
20
20
|
let upgrader: Upgrader
|
|
21
|
-
let
|
|
21
|
+
let listenAddrs: Multiaddr[]
|
|
22
|
+
let dialAddrs: Multiaddr[]
|
|
22
23
|
let transport: Transport
|
|
23
24
|
let registrar: Registrar
|
|
24
25
|
|
|
@@ -29,7 +30,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
29
30
|
events: new TypedEventEmitter()
|
|
30
31
|
});
|
|
31
32
|
|
|
32
|
-
({ transport,
|
|
33
|
+
({ transport, listenAddrs, dialAddrs } = await common.setup())
|
|
33
34
|
})
|
|
34
35
|
|
|
35
36
|
after(async () => {
|
|
@@ -44,7 +45,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
44
45
|
const listener = transport.createListener({
|
|
45
46
|
upgrader
|
|
46
47
|
})
|
|
47
|
-
await listener.listen(
|
|
48
|
+
await listener.listen(listenAddrs[0])
|
|
48
49
|
await listener.close()
|
|
49
50
|
})
|
|
50
51
|
|
|
@@ -65,14 +66,14 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
65
66
|
})
|
|
66
67
|
|
|
67
68
|
// Listen
|
|
68
|
-
await listener.listen(
|
|
69
|
+
await listener.listen(listenAddrs[0])
|
|
69
70
|
|
|
70
71
|
// Create two connections to the listener
|
|
71
72
|
const [conn1] = await Promise.all([
|
|
72
|
-
transport.dial(
|
|
73
|
+
transport.dial(dialAddrs[0], {
|
|
73
74
|
upgrader
|
|
74
75
|
}),
|
|
75
|
-
transport.dial(
|
|
76
|
+
transport.dial(dialAddrs[0], {
|
|
76
77
|
upgrader
|
|
77
78
|
})
|
|
78
79
|
])
|
|
@@ -112,10 +113,10 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
112
113
|
})
|
|
113
114
|
|
|
114
115
|
// Listen
|
|
115
|
-
await listener.listen(
|
|
116
|
+
await listener.listen(listenAddrs[0])
|
|
116
117
|
|
|
117
118
|
// Create a connection to the listener
|
|
118
|
-
const conn = await transport.dial(
|
|
119
|
+
const conn = await transport.dial(dialAddrs[0], {
|
|
119
120
|
upgrader
|
|
120
121
|
})
|
|
121
122
|
|
|
@@ -138,8 +139,8 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
138
139
|
})
|
|
139
140
|
|
|
140
141
|
void (async () => {
|
|
141
|
-
await listener.listen(
|
|
142
|
-
await transport.dial(
|
|
142
|
+
await listener.listen(listenAddrs[0])
|
|
143
|
+
await transport.dial(dialAddrs[0], {
|
|
143
144
|
upgrader
|
|
144
145
|
})
|
|
145
146
|
})()
|
|
@@ -158,7 +159,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
158
159
|
listener.addEventListener('listening', () => {
|
|
159
160
|
listener.close().then(done, done)
|
|
160
161
|
})
|
|
161
|
-
void listener.listen(
|
|
162
|
+
void listener.listen(listenAddrs[0])
|
|
162
163
|
})
|
|
163
164
|
|
|
164
165
|
it('error', (done) => {
|
|
@@ -181,7 +182,7 @@ export default (common: TestSetup<TransportTestFixtures>): void => {
|
|
|
181
182
|
listener.addEventListener('close', () => { done() })
|
|
182
183
|
|
|
183
184
|
void (async () => {
|
|
184
|
-
await listener.listen(
|
|
185
|
+
await listener.listen(listenAddrs[0])
|
|
185
186
|
await listener.close()
|
|
186
187
|
})()
|
|
187
188
|
})
|