@libp2p/interface-compliance-tests 1.1.4 → 1.1.8

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.
Files changed (92) hide show
  1. package/dist/src/mocks/connection.d.ts +9 -2
  2. package/dist/src/mocks/connection.d.ts.map +1 -1
  3. package/dist/src/mocks/connection.js +45 -21
  4. package/dist/src/mocks/connection.js.map +1 -1
  5. package/dist/src/mocks/multiaddr-connection.d.ts +2 -1
  6. package/dist/src/mocks/multiaddr-connection.d.ts.map +1 -1
  7. package/dist/src/mocks/multiaddr-connection.js +2 -2
  8. package/dist/src/mocks/multiaddr-connection.js.map +1 -1
  9. package/dist/src/mocks/muxer.d.ts +2 -2
  10. package/dist/src/mocks/muxer.d.ts.map +1 -1
  11. package/dist/src/mocks/muxer.js +175 -26
  12. package/dist/src/mocks/muxer.js.map +1 -1
  13. package/dist/src/mocks/registrar.d.ts +7 -2
  14. package/dist/src/mocks/registrar.d.ts.map +1 -1
  15. package/dist/src/mocks/registrar.js +54 -5
  16. package/dist/src/mocks/registrar.js.map +1 -1
  17. package/dist/src/mocks/upgrader.d.ts.map +1 -1
  18. package/dist/src/mocks/upgrader.js +8 -4
  19. package/dist/src/mocks/upgrader.js.map +1 -1
  20. package/dist/src/pubsub/api.d.ts +2 -2
  21. package/dist/src/pubsub/api.d.ts.map +1 -1
  22. package/dist/src/pubsub/api.js +15 -7
  23. package/dist/src/pubsub/api.js.map +1 -1
  24. package/dist/src/pubsub/connection-handlers.d.ts +2 -2
  25. package/dist/src/pubsub/connection-handlers.d.ts.map +1 -1
  26. package/dist/src/pubsub/connection-handlers.js +53 -51
  27. package/dist/src/pubsub/connection-handlers.js.map +1 -1
  28. package/dist/src/pubsub/emit-self.d.ts +2 -2
  29. package/dist/src/pubsub/emit-self.d.ts.map +1 -1
  30. package/dist/src/pubsub/emit-self.js +12 -2
  31. package/dist/src/pubsub/emit-self.js.map +1 -1
  32. package/dist/src/pubsub/index.d.ts +3 -3
  33. package/dist/src/pubsub/index.d.ts.map +1 -1
  34. package/dist/src/pubsub/index.js.map +1 -1
  35. package/dist/src/pubsub/messages.d.ts +2 -2
  36. package/dist/src/pubsub/messages.d.ts.map +1 -1
  37. package/dist/src/pubsub/messages.js +36 -32
  38. package/dist/src/pubsub/messages.js.map +1 -1
  39. package/dist/src/pubsub/multiple-nodes.d.ts +2 -2
  40. package/dist/src/pubsub/multiple-nodes.d.ts.map +1 -1
  41. package/dist/src/pubsub/multiple-nodes.js +105 -53
  42. package/dist/src/pubsub/multiple-nodes.js.map +1 -1
  43. package/dist/src/pubsub/two-nodes.d.ts +2 -2
  44. package/dist/src/pubsub/two-nodes.d.ts.map +1 -1
  45. package/dist/src/pubsub/two-nodes.js +31 -17
  46. package/dist/src/pubsub/two-nodes.js.map +1 -1
  47. package/dist/src/stream-muxer/base-test.js +1 -1
  48. package/dist/src/stream-muxer/base-test.js.map +1 -1
  49. package/dist/src/stream-muxer/close-test.d.ts.map +1 -1
  50. package/dist/src/stream-muxer/close-test.js +12 -10
  51. package/dist/src/stream-muxer/close-test.js.map +1 -1
  52. package/dist/src/transport/dial-test.d.ts.map +1 -1
  53. package/dist/src/transport/dial-test.js +2 -1
  54. package/dist/src/transport/dial-test.js.map +1 -1
  55. package/dist/src/transport/filter-test.js +1 -1
  56. package/dist/src/transport/filter-test.js.map +1 -1
  57. package/dist/src/transport/listen-test.d.ts.map +1 -1
  58. package/dist/src/transport/listen-test.js +2 -1
  59. package/dist/src/transport/listen-test.js.map +1 -1
  60. package/dist/src/utils/is-valid-tick.d.ts +6 -0
  61. package/dist/src/utils/is-valid-tick.d.ts.map +1 -0
  62. package/dist/src/utils/is-valid-tick.js +15 -0
  63. package/dist/src/utils/is-valid-tick.js.map +1 -0
  64. package/package.json +7 -5
  65. package/src/mocks/connection.ts +63 -21
  66. package/src/mocks/multiaddr-connection.ts +3 -2
  67. package/src/mocks/muxer.ts +230 -28
  68. package/src/mocks/registrar.ts +69 -7
  69. package/src/mocks/upgrader.ts +8 -5
  70. package/src/pubsub/api.ts +19 -9
  71. package/src/pubsub/connection-handlers.ts +61 -55
  72. package/src/pubsub/emit-self.ts +14 -4
  73. package/src/pubsub/index.ts +3 -3
  74. package/src/pubsub/messages.ts +50 -36
  75. package/src/pubsub/multiple-nodes.ts +120 -55
  76. package/src/pubsub/two-nodes.ts +37 -22
  77. package/src/stream-muxer/base-test.ts +1 -1
  78. package/src/stream-muxer/close-test.ts +13 -12
  79. package/src/transport/dial-test.ts +2 -1
  80. package/src/transport/filter-test.ts +1 -1
  81. package/src/transport/listen-test.ts +2 -1
  82. package/src/utils/is-valid-tick.ts +18 -0
  83. package/dist/src/pubsub/utils.d.ts +0 -3
  84. package/dist/src/pubsub/utils.d.ts.map +0 -1
  85. package/dist/src/pubsub/utils.js +0 -11
  86. package/dist/src/pubsub/utils.js.map +0 -1
  87. package/dist/src/transport/utils/index.d.ts +0 -15
  88. package/dist/src/transport/utils/index.d.ts.map +0 -1
  89. package/dist/src/transport/utils/index.js +0 -137
  90. package/dist/src/transport/utils/index.js.map +0 -1
  91. package/src/pubsub/utils.ts +0 -13
  92. package/src/transport/utils/index.ts +0 -172
@@ -2,7 +2,14 @@ import type { MultiaddrConnection } from '@libp2p/interfaces/transport';
2
2
  import type { Connection, Stream } from '@libp2p/interfaces/connection';
3
3
  import type { Muxer } from '@libp2p/interfaces/stream-muxer';
4
4
  import type { Duplex } from 'it-stream-types';
5
- export declare function mockConnection(maConn: MultiaddrConnection, direction?: 'inbound' | 'outbound', muxer?: Muxer): Promise<Connection>;
5
+ import type { PeerId } from '@libp2p/interfaces/src/peer-id';
6
+ import type { Registrar } from '@libp2p/interfaces/registrar';
7
+ export interface MockConnectionOptions {
8
+ direction?: 'inbound' | 'outbound';
9
+ muxer?: Muxer;
10
+ registrar?: Registrar;
11
+ }
12
+ export declare function mockConnection(maConn: MultiaddrConnection, opts?: MockConnectionOptions): Connection;
6
13
  export declare function mockStream(stream: Duplex<Uint8Array>): Stream;
7
- export declare function connectionPair(): [Connection, Connection];
14
+ export declare function connectionPair(peerA: PeerId, peerB: PeerId): [Connection, Connection];
8
15
  //# sourceMappingURL=connection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAA4B,MAAM,+BAA+B,CAAA;AACjG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAG7C,wBAAsB,cAAc,CAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,GAAE,SAAS,GAAG,UAAsB,EAAE,KAAK,GAAE,KAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,CAwDjK;AAED,wBAAgB,UAAU,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAW9D;AAED,wBAAgB,cAAc,IAAK,CAAE,UAAU,EAAE,UAAU,CAAE,CAmB5D"}
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,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAC5D,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,KAAK,CAAC,EAAE,KAAK,CAAA;IACb,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,wBAAgB,cAAc,CAAE,MAAM,EAAE,mBAAmB,EAAE,IAAI,GAAE,qBAA0B,GAAG,UAAU,CA4FzG;AAED,wBAAgB,UAAU,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAW9D;AAED,wBAAgB,cAAc,CAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,CAAE,UAAU,EAAE,UAAU,CAAE,CAWxF"}
@@ -1,17 +1,52 @@
1
- import { PeerId } from '@libp2p/peer-id';
2
- import { createEd25519PeerId } from '@libp2p/peer-id-factory';
1
+ import { peerIdFromString } from '@libp2p/peer-id';
3
2
  import { pipe } from 'it-pipe';
4
3
  import { duplexPair } from 'it-pair/duplex';
5
4
  import { mockMuxer } from './muxer.js';
6
- export async function mockConnection(maConn, direction = 'inbound', muxer = mockMuxer()) {
5
+ import { mockMultiaddrConnection } from './multiaddr-connection.js';
6
+ import { mockRegistrar } from './registrar.js';
7
+ import { Listener } from '@libp2p/multistream-select';
8
+ import { logger } from '@libp2p/logger';
9
+ import { CustomEvent } from '@libp2p/interfaces';
10
+ const log = logger('libp2p:mock-connection');
11
+ export function mockConnection(maConn, opts = {}) {
7
12
  const remoteAddr = maConn.remoteAddr;
8
13
  const remotePeerIdStr = remoteAddr.getPeerId();
9
- const remotePeer = remotePeerIdStr != null ? PeerId.fromString(remotePeerIdStr) : await createEd25519PeerId();
14
+ if (remotePeerIdStr == null) {
15
+ throw new Error('Remote multiaddr must contain a peer id');
16
+ }
17
+ const remotePeer = peerIdFromString(remotePeerIdStr);
10
18
  const registry = new Map();
11
19
  const streams = [];
12
20
  let streamId = 0;
21
+ const direction = opts.direction ?? 'inbound';
22
+ const registrar = opts.registrar ?? mockRegistrar();
23
+ const muxer = opts.muxer ?? mockMuxer({
24
+ onStream: (muxedStream) => {
25
+ const mss = new Listener(muxedStream);
26
+ try {
27
+ mss.handle(registrar.getProtocols())
28
+ .then(({ stream, protocol }) => {
29
+ log('%s: incoming stream opened on %s', direction, protocol);
30
+ muxedStream = { ...muxedStream, ...stream };
31
+ connection.addStream(muxedStream, { protocol, metadata: {} });
32
+ const handler = registrar.getHandler(protocol);
33
+ handler(new CustomEvent('incomingStream', {
34
+ detail: { connection, stream: muxedStream, protocol }
35
+ }));
36
+ }).catch(err => {
37
+ log.error(err);
38
+ });
39
+ }
40
+ catch (err) {
41
+ log.error(err);
42
+ }
43
+ },
44
+ onStreamEnd: (stream) => {
45
+ connection.removeStream(stream.id);
46
+ }
47
+ });
13
48
  void pipe(maConn, muxer, maConn);
14
- return {
49
+ const connection = {
15
50
  id: 'mock-connection',
16
51
  remoteAddr,
17
52
  remotePeer,
@@ -50,6 +85,7 @@ export async function mockConnection(maConn, direction = 'inbound', muxer = mock
50
85
  await maConn.close();
51
86
  }
52
87
  };
88
+ return connection;
53
89
  }
54
90
  export function mockStream(stream) {
55
91
  return {
@@ -63,23 +99,11 @@ export function mockStream(stream) {
63
99
  id: `stream-${Date.now()}`
64
100
  };
65
101
  }
66
- export function connectionPair() {
67
- const [d0, d1] = duplexPair();
102
+ export function connectionPair(peerA, peerB) {
103
+ const [peerBtoPeerA, peerAtoPeerB] = duplexPair();
68
104
  return [
69
- // @ts-expect-error not a complete implementation
70
- {
71
- newStream: async (multicodecs) => await Promise.resolve({
72
- stream: mockStream(d0),
73
- protocol: multicodecs[0]
74
- })
75
- },
76
- // @ts-expect-error not a complete implementation
77
- {
78
- newStream: async (multicodecs) => await Promise.resolve({
79
- stream: mockStream(d1),
80
- protocol: multicodecs[0]
81
- })
82
- }
105
+ mockConnection(mockMultiaddrConnection(peerBtoPeerA, peerA)),
106
+ mockConnection(mockMultiaddrConnection(peerAtoPeerB, peerB))
83
107
  ];
84
108
  }
85
109
  //# sourceMappingURL=connection.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/mocks/connection.ts"],"names":[],"mappings":"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"}
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;AAK3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD,MAAM,GAAG,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAA;AAQ5C,MAAM,UAAU,cAAc,CAAE,MAA2B,EAAE,OAA8B,EAAE;IAC3F,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;IACpC,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,EAAE,CAAA;IAE9C,IAAI,eAAe,IAAI,IAAI,EAAE;QAC3B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;KAC3D;IAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAA;IACpD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAA;IAC1B,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,SAAS,CAAA;IAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,aAAa,EAAE,CAAA;IAEnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;QACpC,QAAQ,EAAE,CAAC,WAAW,EAAE,EAAE;YACxB,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,CAAA;YACrC,IAAI;gBACF,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;qBACjC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;oBAC7B,GAAG,CAAC,kCAAkC,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;oBAC5D,WAAW,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,MAAM,EAAE,CAAA;oBAE3C,UAAU,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAA;oBAC7D,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;oBAE9C,OAAO,CAAC,IAAI,WAAW,CAAC,gBAAgB,EAAE;wBACxC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE;qBACtD,CAAC,CAAC,CAAA;gBACL,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBACb,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBAChB,CAAC,CAAC,CAAA;aACL;YAAC,OAAO,GAAQ,EAAE;gBACjB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACf;QACH,CAAC;QACD,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE;YACtB,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACpC,CAAC;KACF,CAAC,CAAA;IAEF,KAAK,IAAI,CACP,MAAM,EAAE,KAAK,EAAE,MAAM,CACtB,CAAA;IAED,MAAM,UAAU,GAAe;QAC7B,EAAE,EAAE,iBAAiB;QACrB,UAAU;QACV,UAAU;QACV,IAAI,EAAE;YACJ,MAAM,EAAE,MAAM;YACd,SAAS;YACT,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,WAAW,EAAE,kBAAkB;YAC/B,UAAU,EAAE,qBAAqB;SAClC;QACD,QAAQ;QACR,IAAI,EAAE,EAAE;QACR,OAAO;QACP,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;YAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBAC7B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;aACxB;YAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;aAChD;YAED,MAAM,EAAE,GAAG,GAAG,QAAQ,EAAE,EAAE,CAAA;YAC1B,MAAM,MAAM,GAAW,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;YAC1C,MAAM,UAAU,GAAmB;gBACjC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;gBACtB,MAAM;aACP,CAAA;YAED,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,UAAU,CAAC,CAAA;YAE5B,OAAO,UAAU,CAAA;QACnB,CAAC;QACD,SAAS,EAAE,CAAC,MAAc,EAAE,QAAkB,EAAE,EAAE;QAElD,CAAC;QACD,YAAY,EAAE,CAAC,EAAU,EAAE,EAAE;YAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;QACD,KAAK,EAAE,KAAK,IAAI,EAAE;YAChB,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;KACF,CAAA;IAED,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,MAA0B;IACpD,OAAO;QACL,GAAG,MAAM;QACT,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB;QACD,EAAE,EAAE,UAAU,IAAI,CAAC,GAAG,EAAE,EAAE;KAC3B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAE,KAAa,EAAE,KAAa;IAC1D,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,UAAU,EAAc,CAAA;IAE7D,OAAO;QACL,cAAc,CACZ,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,CAC7C;QACD,cAAc,CACZ,uBAAuB,CAAC,YAAY,EAAE,KAAK,CAAC,CAC7C;KACF,CAAA;AACH,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import type { MultiaddrConnection } from '@libp2p/interfaces/transport';
2
2
  import type { Duplex } from 'it-stream-types';
3
- export declare function mockMultiaddrConnection(source: Duplex<Uint8Array> & Partial<MultiaddrConnection>): MultiaddrConnection;
3
+ import type { PeerId } from '@libp2p/interfaces/peer-id';
4
+ export declare function mockMultiaddrConnection(source: Duplex<Uint8Array> & Partial<MultiaddrConnection>, peerId: PeerId): MultiaddrConnection;
4
5
  //# sourceMappingURL=multiaddr-connection.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"multiaddr-connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C,wBAAgB,uBAAuB,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG,mBAAmB,CAavH"}
1
+ {"version":3,"file":"multiaddr-connection.d.ts","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,wBAAgB,uBAAuB,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,mBAAmB,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAavI"}
@@ -1,12 +1,12 @@
1
1
  import { Multiaddr } from '@multiformats/multiaddr';
2
- export function mockMultiaddrConnection(source) {
2
+ export function mockMultiaddrConnection(source, peerId) {
3
3
  const maConn = {
4
4
  async close() {
5
5
  },
6
6
  timeline: {
7
7
  open: Date.now()
8
8
  },
9
- remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001'),
9
+ remoteAddr: new Multiaddr(`/ip4/127.0.0.1/tcp/4001/p2p/${peerId.toString()}`),
10
10
  ...source
11
11
  };
12
12
  return maConn;
@@ -1 +1 @@
1
- {"version":3,"file":"multiaddr-connection.js","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAInD,MAAM,UAAU,uBAAuB,CAAE,MAAyD;IAChG,MAAM,MAAM,GAAwB;QAClC,KAAK,CAAC,KAAK;QAEX,CAAC;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB;QACD,UAAU,EAAE,IAAI,SAAS,CAAC,yBAAyB,CAAC;QACpD,GAAG,MAAM;KACV,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
1
+ {"version":3,"file":"multiaddr-connection.js","sourceRoot":"","sources":["../../../src/mocks/multiaddr-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAKnD,MAAM,UAAU,uBAAuB,CAAE,MAAyD,EAAE,MAAc;IAChH,MAAM,MAAM,GAAwB;QAClC,KAAK,CAAC,KAAK;QAEX,CAAC;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB;QACD,UAAU,EAAE,IAAI,SAAS,CAAC,+BAA+B,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC7E,GAAG,MAAM;KACV,CAAA;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
@@ -1,3 +1,3 @@
1
- import type { Muxer } from '@libp2p/interfaces/stream-muxer';
2
- export declare function mockMuxer(): Muxer;
1
+ import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer';
2
+ export declare function mockMuxer(options?: MuxerOptions): Muxer;
3
3
  //# sourceMappingURL=muxer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"muxer.d.ts","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,wBAAgB,SAAS,IAAK,KAAK,CAoClC"}
1
+ {"version":3,"file":"muxer.d.ts","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAwI1E,wBAAgB,SAAS,CAAE,OAAO,CAAC,EAAE,YAAY,GAAG,KAAK,CAuGxD"}
@@ -1,35 +1,184 @@
1
- import { pair } from 'it-pair';
2
1
  import { pushable } from 'it-pushable';
3
- import drain from 'it-drain';
4
- export function mockMuxer() {
2
+ import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
3
+ import { toString as uint8ArrayToString } from 'uint8arrays/to-string';
4
+ import { abortableSource } from 'abortable-iterator';
5
+ class MuxedStream {
6
+ constructor(opts) {
7
+ const { id, push, onEnd } = opts;
8
+ this.id = id;
9
+ this.controller = new AbortController();
10
+ this.onEnd = onEnd;
11
+ this.sourceClosed = false;
12
+ this.sinkClosed = false;
13
+ this.input = pushable({
14
+ onEnd: () => {
15
+ this.sourceClosed = true;
16
+ this.maybeEndStream();
17
+ }
18
+ });
19
+ this.stream = {
20
+ id,
21
+ sink: async (source) => {
22
+ source = abortableSource(source, this.controller.signal);
23
+ try {
24
+ for await (const chunk of source) {
25
+ const dataMsg = {
26
+ id,
27
+ type: 'data',
28
+ chunk: uint8ArrayToString(chunk, 'base64')
29
+ };
30
+ push.push(dataMsg);
31
+ }
32
+ const closeMsg = {
33
+ id,
34
+ type: 'close'
35
+ };
36
+ push.push(closeMsg);
37
+ }
38
+ catch (err) {
39
+ if (!this.controller.signal.aborted) {
40
+ throw err;
41
+ }
42
+ }
43
+ this.closeSink();
44
+ },
45
+ source: this.input,
46
+ close: () => {
47
+ const closeMsg = {
48
+ id,
49
+ type: 'close'
50
+ };
51
+ push.push(closeMsg);
52
+ this.closeSink();
53
+ this.closeSource();
54
+ },
55
+ abort: () => {
56
+ const resetMsg = {
57
+ id,
58
+ type: 'reset'
59
+ };
60
+ push.push(resetMsg);
61
+ this.closeSink();
62
+ this.closeSource();
63
+ },
64
+ reset: () => {
65
+ const resetMsg = {
66
+ id,
67
+ type: 'reset'
68
+ };
69
+ push.push(resetMsg);
70
+ this.closeSink();
71
+ this.closeSource();
72
+ },
73
+ timeline: {
74
+ open: Date.now()
75
+ }
76
+ };
77
+ }
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
+ }
98
+ export function mockMuxer(options) {
5
99
  let streamId = 0;
6
- let streams = [];
7
- const p = pushable();
100
+ const streams = new Map();
101
+ // process incoming messages from the other muxer
102
+ const muxerSource = pushable({
103
+ onEnd: () => {
104
+ for (const muxedStream of streams.values()) {
105
+ muxedStream.stream.close();
106
+ }
107
+ }
108
+ });
109
+ // receives messages from all of the muxed streams
110
+ const push = pushable();
111
+ void Promise.resolve().then(async () => {
112
+ for await (const message of push) {
113
+ if (message.type === 'data') {
114
+ muxerSource.push(uint8ArrayFromString(JSON.stringify({
115
+ id: message.id,
116
+ type: message.type,
117
+ chunk: message.chunk
118
+ })));
119
+ }
120
+ else {
121
+ muxerSource.push(uint8ArrayFromString(JSON.stringify({
122
+ id: message.id,
123
+ type: message.type
124
+ })));
125
+ }
126
+ }
127
+ });
128
+ function createStream(name) {
129
+ const id = name ?? `${streamId++}`;
130
+ const muxedStream = new MuxedStream({
131
+ id,
132
+ push,
133
+ onEnd: () => {
134
+ streams.delete(id);
135
+ if (options?.onStreamEnd != null) {
136
+ options?.onStreamEnd(muxedStream.stream);
137
+ }
138
+ }
139
+ });
140
+ return muxedStream;
141
+ }
8
142
  const muxer = {
9
- source: p,
10
- sink: async (source) => {
11
- await drain(source);
143
+ // receive incoming messages
144
+ async sink(source) {
145
+ for await (const buf of source) {
146
+ const message = JSON.parse(uint8ArrayToString(buf));
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();
168
+ }
169
+ muxerSource.end();
12
170
  },
171
+ source: muxerSource,
13
172
  get streams() {
14
- return streams;
173
+ return Array.from(streams.values()).map(({ stream }) => stream);
15
174
  },
16
- newStream: (name) => {
17
- const echo = pair();
18
- const id = `${streamId++}`;
19
- const stream = {
20
- id,
21
- sink: echo.sink,
22
- source: echo.source,
23
- close: () => {
24
- streams = streams.filter(s => s !== stream);
25
- },
26
- abort: () => { },
27
- reset: () => { },
28
- timeline: {
29
- open: 0
30
- }
31
- };
32
- return stream;
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;
33
182
  }
34
183
  };
35
184
  return muxer;
@@ -1 +1 @@
1
- {"version":3,"file":"muxer.js","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACtC,OAAO,KAAK,MAAM,UAAU,CAAA;AAI5B,MAAM,UAAU,SAAS;IACvB,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,MAAM,CAAC,GAAG,QAAQ,EAAc,CAAA;IAEhC,MAAM,KAAK,GAAU;QACnB,MAAM,EAAE,CAAC;QACT,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACrB,MAAM,KAAK,CAAC,MAAM,CAAC,CAAA;QACrB,CAAC;QACD,IAAI,OAAO;YACT,OAAO,OAAO,CAAA;QAChB,CAAC;QACD,SAAS,EAAE,CAAC,IAAa,EAAE,EAAE;YAC3B,MAAM,IAAI,GAAG,IAAI,EAAc,CAAA;YAE/B,MAAM,EAAE,GAAG,GAAG,QAAQ,EAAE,EAAE,CAAA;YAC1B,MAAM,MAAM,GAAW;gBACrB,EAAE;gBACF,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,GAAG,EAAE;oBACV,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;gBAC7C,CAAC;gBACD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;gBACf,QAAQ,EAAE;oBACR,IAAI,EAAE,CAAC;iBACR;aACF,CAAA;YAED,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}
1
+ {"version":3,"file":"muxer.js","sourceRoot":"","sources":["../../../src/mocks/muxer.ts"],"names":[],"mappings":"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"}
@@ -1,14 +1,19 @@
1
- import type { Registrar, StreamHandler } from '@libp2p/interfaces/registrar';
1
+ import type { IncomingStreamData, Registrar, StreamHandler } from '@libp2p/interfaces/registrar';
2
+ import type { Connection } from '@libp2p/interfaces/src/connection';
3
+ import type { PeerId } from '@libp2p/interfaces/src/peer-id';
2
4
  import type { Topology } from '@libp2p/interfaces/topology';
3
5
  export declare class MockRegistrar implements Registrar {
4
6
  private readonly topologies;
5
7
  private readonly handlers;
8
+ getProtocols(): string[];
6
9
  handle(protocols: string | string[], handler: StreamHandler): Promise<string>;
7
10
  unhandle(id: string): Promise<void>;
8
- getHandlers(protocol: string): StreamHandler[];
11
+ getHandler(protocol: string): StreamHandler;
9
12
  register(protocols: string | string[], topology: Topology): string;
10
13
  unregister(id: string | string[]): void;
11
14
  getTopologies(protocol: string): Topology[];
12
15
  }
13
16
  export declare function mockRegistrar(): MockRegistrar;
17
+ export declare function mockIncomingStreamEvent(protocol: string, conn: Connection, remotePeer: PeerId): Promise<CustomEvent<IncomingStreamData>>;
18
+ export declare function connectPeers(protocol: string, registrarA: Registrar, registrarB: Registrar, peerIdA: PeerId, peerIdB: PeerId): Promise<void>;
14
19
  //# sourceMappingURL=registrar.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"registrar.d.ts","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAE3D,qBAAa,aAAc,YAAW,SAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsE;IACjG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0E;IAE7F,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa;IAe5D,QAAQ,CAAE,EAAE,EAAE,MAAM;IAI1B,WAAW,CAAE,QAAQ,EAAE,MAAM;IAY7B,QAAQ,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ;IAe1D,UAAU,CAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAQjC,aAAa,CAAE,QAAQ,EAAE,MAAM;CAKhC;AAED,wBAAgB,aAAa,kBAE5B"}
1
+ {"version":3,"file":"registrar.d.ts","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAChG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AACnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAA;AAI3D,qBAAa,aAAc,YAAW,SAAS;IAC7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsE;IACjG,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0E;IAEnG,YAAY;IAcN,MAAM,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa;IAuB5D,QAAQ,CAAE,EAAE,EAAE,MAAM;IAI1B,UAAU,CAAE,QAAQ,EAAE,MAAM;IAU5B,QAAQ,CAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ;IAe1D,UAAU,CAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE;IAQjC,aAAa,CAAE,QAAQ,EAAE,MAAM;CAehC;AAED,wBAAgB,aAAa,kBAE5B;AAED,wBAAsB,uBAAuB,CAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,CAU/I;AAED,wBAAsB,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAcnI"}
@@ -1,12 +1,31 @@
1
+ import { connectionPair } from './connection.js';
2
+ import { CustomEvent } from '@libp2p/interfaces';
1
3
  export class MockRegistrar {
2
4
  constructor() {
3
5
  this.topologies = new Map();
4
6
  this.handlers = new Map();
5
7
  }
8
+ getProtocols() {
9
+ const protocols = new Set();
10
+ for (const topology of this.topologies.values()) {
11
+ topology.protocols.forEach(protocol => protocols.add(protocol));
12
+ }
13
+ for (const handler of this.handlers.values()) {
14
+ handler.protocols.forEach(protocol => protocols.add(protocol));
15
+ }
16
+ return Array.from(protocols).sort();
17
+ }
6
18
  async handle(protocols, handler) {
7
19
  if (!Array.isArray(protocols)) {
8
20
  protocols = [protocols];
9
21
  }
22
+ for (const protocol of protocols) {
23
+ for (const { protocols } of this.handlers.values()) {
24
+ if (protocols.includes(protocol)) {
25
+ throw new Error(`Handler already registered for protocol ${protocol}`);
26
+ }
27
+ }
28
+ }
10
29
  const id = `handler-id-${Math.random()}`;
11
30
  this.handlers.set(id, {
12
31
  handler,
@@ -17,14 +36,13 @@ export class MockRegistrar {
17
36
  async unhandle(id) {
18
37
  this.handlers.delete(id);
19
38
  }
20
- getHandlers(protocol) {
21
- const output = [];
39
+ getHandler(protocol) {
22
40
  for (const { handler, protocols } of this.handlers.values()) {
23
41
  if (protocols.includes(protocol)) {
24
- output.push(handler);
42
+ return handler;
25
43
  }
26
44
  }
27
- return output;
45
+ throw new Error(`No handler registered for protocol ${protocol}`);
28
46
  }
29
47
  register(protocols, topology) {
30
48
  if (!Array.isArray(protocols)) {
@@ -45,10 +63,41 @@ export class MockRegistrar {
45
63
  }
46
64
  getTopologies(protocol) {
47
65
  const output = [];
48
- return output;
66
+ for (const { topology, protocols } of this.topologies.values()) {
67
+ if (protocols.includes(protocol)) {
68
+ output.push(topology);
69
+ }
70
+ }
71
+ if (output.length > 0) {
72
+ return output;
73
+ }
74
+ throw new Error(`No topologies registered for protocol ${protocol}`);
49
75
  }
50
76
  }
51
77
  export function mockRegistrar() {
52
78
  return new MockRegistrar();
53
79
  }
80
+ export async function mockIncomingStreamEvent(protocol, conn, remotePeer) {
81
+ // @ts-expect-error incomplete implementation
82
+ return new CustomEvent('incomingStream', {
83
+ detail: {
84
+ ...await conn.newStream([protocol]),
85
+ connection: {
86
+ remotePeer
87
+ }
88
+ }
89
+ });
90
+ }
91
+ export async function connectPeers(protocol, registrarA, registrarB, peerIdA, peerIdB) {
92
+ const topologyA = registrarA.getTopologies(protocol)[0];
93
+ const topologyB = registrarB.getTopologies(protocol)[0];
94
+ // const handlerA = registrarA.getHandler(protocol)
95
+ // const handlerB = registrarB.getHandler(protocol)
96
+ // Notify peers of connection
97
+ const [bToA, aToB] = connectionPair(peerIdA, peerIdB);
98
+ await topologyA.onConnect(peerIdB, aToB);
99
+ // await handlerA(await mockIncomingStreamEvent(protocol, aToB, peerIdB))
100
+ await topologyB.onConnect(peerIdA, bToA);
101
+ // await handlerB(await mockIncomingStreamEvent(protocol, bToA, peerIdA))
102
+ }
54
103
  //# sourceMappingURL=registrar.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"registrar.js","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,aAAa;IAA1B;QACmB,eAAU,GAA6D,IAAI,GAAG,EAAE,CAAA;QAChF,aAAQ,GAAiE,IAAI,GAAG,EAAE,CAAA;IA6DrG,CAAC;IA3DC,KAAK,CAAC,MAAM,CAAE,SAA4B,EAAE,OAAsB;QAChE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;SACxB;QAED,MAAM,EAAE,GAAG,cAAc,IAAI,CAAC,MAAM,EAAE,EAAE,CAAA;QAExC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE;YACpB,OAAO;YACP,SAAS;SACV,CAAC,CAAA;QAEF,OAAO,EAAE,CAAA;IACX,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,EAAU;QACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAC1B,CAAC;IAED,WAAW,CAAE,QAAgB;QAC3B,MAAM,MAAM,GAAoB,EAAE,CAAA;QAElC,KAAK,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YAC3D,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAChC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aACrB;SACF;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,QAAQ,CAAE,SAA4B,EAAE,QAAkB;QACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAC7B,SAAS,GAAG,CAAC,SAAS,CAAC,CAAA;SACxB;QAED,MAAM,EAAE,GAAG,eAAe,IAAI,CAAC,MAAM,EAAE,EAAE,CAAA;QAEzC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE;YACtB,QAAQ;YACR,SAAS;SACV,CAAC,CAAA;QAEF,OAAO,EAAE,CAAA;IACX,CAAC;IAED,UAAU,CAAE,EAAqB;QAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;YACtB,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;SACV;QAED,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9C,CAAC;IAED,aAAa,CAAE,QAAgB;QAC7B,MAAM,MAAM,GAAe,EAAE,CAAA;QAE7B,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,IAAI,aAAa,EAAE,CAAA;AAC5B,CAAC"}
1
+ {"version":3,"file":"registrar.js","sourceRoot":"","sources":["../../../src/mocks/registrar.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"upgrader.d.ts","sourceRoot":"","sources":["../../../src/mocks/upgrader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAuB,MAAM,8BAA8B,CAAA;AACjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YAsB9D"}
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,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAE5D,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YA0B9D"}
@@ -1,5 +1,4 @@
1
1
  import { expect } from 'aegir/utils/chai.js';
2
- import { mockMuxer } from './muxer.js';
3
2
  import { mockConnection } from './connection.js';
4
3
  export function mockUpgrader(options = {}) {
5
4
  const ensureProps = (multiaddrConnection) => {
@@ -8,15 +7,20 @@ export function mockUpgrader(options = {}) {
8
7
  });
9
8
  return multiaddrConnection;
10
9
  };
11
- const muxer = options.muxer ?? mockMuxer();
12
10
  const upgrader = {
13
11
  async upgradeOutbound(multiaddrConnection) {
14
12
  ensureProps(multiaddrConnection);
15
- return await mockConnection(multiaddrConnection, 'outbound', muxer);
13
+ return mockConnection(multiaddrConnection, {
14
+ direction: 'outbound',
15
+ muxer: options.muxer
16
+ });
16
17
  },
17
18
  async upgradeInbound(multiaddrConnection) {
18
19
  ensureProps(multiaddrConnection);
19
- return await mockConnection(multiaddrConnection, 'inbound', muxer);
20
+ return mockConnection(multiaddrConnection, {
21
+ direction: 'inbound',
22
+ muxer: options.muxer
23
+ });
20
24
  }
21
25
  };
22
26
  return upgrader;
@@ -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,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,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,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,SAAS,EAAE,CAAA;IAE1C,MAAM,QAAQ,GAAa;QACzB,KAAK,CAAC,eAAe,CAAE,mBAAmB;YACxC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAA;QACrE,CAAC;QACD,KAAK,CAAC,cAAc,CAAE,mBAAmB;YACvC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpE,CAAC;KACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}
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,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,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,KAAK,EAAE,OAAO,CAAC,KAAK;aACrB,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import type { TestSetup } from '../index.js';
2
- import type { PubSub } from '@libp2p/interfaces/pubsub';
2
+ import type { PubSub, PubSubOptions } from '@libp2p/interfaces/pubsub';
3
3
  import type { EventMap } from './index.js';
4
- declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
4
+ declare const _default: (common: TestSetup<PubSub<EventMap>, PubSubOptions>) => void;
5
5
  export default _default;
6
6
  //# sourceMappingURL=api.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAKlB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBA2EC"}
1
+ {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAQlB,UAAU,OAAO,QAAQ,CAAC,EAAE,aAAa,CAAC;AAAlE,wBAkFC"}