@libp2p/interface-compliance-tests 1.1.7 → 1.1.11

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 (63) hide show
  1. package/dist/src/mocks/connection.d.ts +12 -2
  2. package/dist/src/mocks/connection.d.ts.map +1 -1
  3. package/dist/src/mocks/connection.js +59 -33
  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/registrar.d.ts +11 -2
  10. package/dist/src/mocks/registrar.d.ts.map +1 -1
  11. package/dist/src/mocks/registrar.js +47 -5
  12. package/dist/src/mocks/registrar.js.map +1 -1
  13. package/dist/src/mocks/upgrader.d.ts.map +1 -1
  14. package/dist/src/mocks/upgrader.js +8 -2
  15. package/dist/src/mocks/upgrader.js.map +1 -1
  16. package/dist/src/pubsub/api.d.ts +3 -2
  17. package/dist/src/pubsub/api.d.ts.map +1 -1
  18. package/dist/src/pubsub/api.js +23 -13
  19. package/dist/src/pubsub/api.js.map +1 -1
  20. package/dist/src/pubsub/connection-handlers.d.ts +3 -2
  21. package/dist/src/pubsub/connection-handlers.d.ts.map +1 -1
  22. package/dist/src/pubsub/connection-handlers.js +165 -69
  23. package/dist/src/pubsub/connection-handlers.js.map +1 -1
  24. package/dist/src/pubsub/emit-self.d.ts +3 -2
  25. package/dist/src/pubsub/emit-self.d.ts.map +1 -1
  26. package/dist/src/pubsub/emit-self.js +15 -4
  27. package/dist/src/pubsub/emit-self.js.map +1 -1
  28. package/dist/src/pubsub/index.d.ts +6 -3
  29. package/dist/src/pubsub/index.d.ts.map +1 -1
  30. package/dist/src/pubsub/index.js.map +1 -1
  31. package/dist/src/pubsub/messages.d.ts +3 -2
  32. package/dist/src/pubsub/messages.d.ts.map +1 -1
  33. package/dist/src/pubsub/messages.js +42 -39
  34. package/dist/src/pubsub/messages.js.map +1 -1
  35. package/dist/src/pubsub/multiple-nodes.d.ts +3 -2
  36. package/dist/src/pubsub/multiple-nodes.d.ts.map +1 -1
  37. package/dist/src/pubsub/multiple-nodes.js +172 -89
  38. package/dist/src/pubsub/multiple-nodes.js.map +1 -1
  39. package/dist/src/pubsub/two-nodes.d.ts +3 -2
  40. package/dist/src/pubsub/two-nodes.d.ts.map +1 -1
  41. package/dist/src/pubsub/two-nodes.js +96 -40
  42. package/dist/src/pubsub/two-nodes.js.map +1 -1
  43. package/dist/src/pubsub/utils.d.ts +2 -2
  44. package/dist/src/pubsub/utils.d.ts.map +1 -1
  45. package/dist/src/pubsub/utils.js +7 -9
  46. package/dist/src/pubsub/utils.js.map +1 -1
  47. package/dist/src/stream-muxer/close-test.d.ts.map +1 -1
  48. package/dist/src/stream-muxer/close-test.js +5 -2
  49. package/dist/src/stream-muxer/close-test.js.map +1 -1
  50. package/package.json +8 -5
  51. package/src/mocks/connection.ts +83 -34
  52. package/src/mocks/multiaddr-connection.ts +3 -2
  53. package/src/mocks/registrar.ts +65 -7
  54. package/src/mocks/upgrader.ts +8 -2
  55. package/src/pubsub/api.ts +29 -15
  56. package/src/pubsub/connection-handlers.ts +186 -75
  57. package/src/pubsub/emit-self.ts +19 -7
  58. package/src/pubsub/index.ts +6 -3
  59. package/src/pubsub/messages.ts +59 -44
  60. package/src/pubsub/multiple-nodes.ts +197 -102
  61. package/src/pubsub/two-nodes.ts +111 -48
  62. package/src/pubsub/utils.ts +9 -10
  63. package/src/stream-muxer/close-test.ts +5 -2
@@ -3,7 +3,17 @@ 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
5
  import type { PeerId } from '@libp2p/interfaces/src/peer-id';
6
- export declare function mockConnection(maConn: MultiaddrConnection, direction?: 'inbound' | 'outbound', muxer?: Muxer): Promise<Connection>;
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;
7
13
  export declare function mockStream(stream: Duplex<Uint8Array>): Stream;
8
- export declare function connectionPair(peerA: PeerId, peerB: PeerId): Promise<[Connection, Connection]>;
14
+ export interface Peer {
15
+ peerId: PeerId;
16
+ registrar: Registrar;
17
+ }
18
+ export declare function connectionPair(a: Peer, b: Peer): [Connection, Connection];
9
19
  //# 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;AAE7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAA;AAI5D,wBAAsB,cAAc,CAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,GAAE,SAAS,GAAG,UAAsB,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,UAAU,CAAC,CAyDpJ;AAED,wBAAgB,UAAU,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAW9D;AAED,wBAAsB,cAAc,CAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAE,UAAU,EAAE,UAAU,CAAE,CAAC,CAsBvG"}
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,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"}
@@ -1,20 +1,51 @@
1
1
  import { peerIdFromString } from '@libp2p/peer-id';
2
- import { createEd25519PeerId } from '@libp2p/peer-id-factory';
3
2
  import { pipe } from 'it-pipe';
4
3
  import { duplexPair } from 'it-pair/duplex';
5
4
  import { mockMuxer } from './muxer.js';
6
5
  import { mockMultiaddrConnection } from './multiaddr-connection.js';
7
- import { Multiaddr } from '@multiformats/multiaddr';
8
- export async function mockConnection(maConn, direction = 'inbound', muxer) {
6
+ import { mockRegistrar } from './registrar.js';
7
+ import { Dialer, 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 = {}) {
9
12
  const remoteAddr = maConn.remoteAddr;
10
13
  const remotePeerIdStr = remoteAddr.getPeerId();
11
- const remotePeer = remotePeerIdStr != null ? peerIdFromString(remotePeerIdStr) : await createEd25519PeerId();
14
+ if (remotePeerIdStr == null) {
15
+ throw new Error('Remote multiaddr must contain a peer id');
16
+ }
17
+ const remotePeer = peerIdFromString(remotePeerIdStr);
12
18
  const registry = new Map();
13
19
  const streams = [];
14
- let streamId = 0;
15
- const mux = muxer ?? mockMuxer();
16
- void pipe(maConn, mux, maConn);
17
- return {
20
+ const direction = opts.direction ?? 'inbound';
21
+ const registrar = opts.registrar ?? mockRegistrar();
22
+ const muxer = opts.muxer ?? mockMuxer({
23
+ onStream: (muxedStream) => {
24
+ const mss = new Listener(muxedStream);
25
+ try {
26
+ mss.handle(registrar.getProtocols())
27
+ .then(({ stream, protocol }) => {
28
+ log('%s: incoming stream opened on %s', direction, protocol);
29
+ muxedStream = { ...muxedStream, ...stream };
30
+ connection.addStream(muxedStream, { protocol, metadata: {} });
31
+ const handler = registrar.getHandler(protocol);
32
+ handler(new CustomEvent('incomingStream', {
33
+ detail: { connection, stream: muxedStream, protocol }
34
+ }));
35
+ }).catch(err => {
36
+ log.error(err);
37
+ });
38
+ }
39
+ catch (err) {
40
+ log.error(err);
41
+ }
42
+ },
43
+ onStreamEnd: (stream) => {
44
+ connection.removeStream(stream.id);
45
+ }
46
+ });
47
+ void pipe(maConn, muxer, maConn);
48
+ const connection = {
18
49
  id: 'mock-connection',
19
50
  remoteAddr,
20
51
  remotePeer,
@@ -35,11 +66,16 @@ export async function mockConnection(maConn, direction = 'inbound', muxer) {
35
66
  if (protocols.length === 0) {
36
67
  throw new Error('protocols must have a length');
37
68
  }
38
- const id = `${streamId++}`;
39
- const stream = mux.newStream(id);
69
+ const id = `${Math.random()}`;
70
+ const stream = muxer.newStream(id);
71
+ const mss = new Dialer(stream);
72
+ const result = await mss.select(protocols);
40
73
  const streamData = {
41
- protocol: protocols[0],
42
- stream
74
+ protocol: result.protocol,
75
+ stream: {
76
+ ...stream,
77
+ ...result.stream
78
+ }
43
79
  };
44
80
  registry.set(id, streamData);
45
81
  return streamData;
@@ -53,6 +89,7 @@ export async function mockConnection(maConn, direction = 'inbound', muxer) {
53
89
  await maConn.close();
54
90
  }
55
91
  };
92
+ return connection;
56
93
  }
57
94
  export function mockStream(stream) {
58
95
  return {
@@ -66,26 +103,15 @@ export function mockStream(stream) {
66
103
  id: `stream-${Date.now()}`
67
104
  };
68
105
  }
69
- export async function connectionPair(peerA, peerB) {
70
- const [d0, d1] = duplexPair();
71
- return [{
72
- ...await mockConnection(mockMultiaddrConnection({
73
- ...d0,
74
- remoteAddr: new Multiaddr(`/ip4/127.0.0.1/tcp/4001/p2p/${peerA.toString()}`)
75
- })),
76
- newStream: async (multicodecs) => await Promise.resolve({
77
- stream: mockStream(d0),
78
- protocol: multicodecs[0]
79
- })
80
- }, {
81
- ...await mockConnection(mockMultiaddrConnection({
82
- ...d1,
83
- remoteAddr: new Multiaddr(`/ip4/127.0.0.1/tcp/4001/p2p/${peerB.toString()}`)
84
- })),
85
- newStream: async (multicodecs) => await Promise.resolve({
86
- stream: mockStream(d1),
87
- protocol: multicodecs[0]
88
- })
89
- }];
106
+ export function connectionPair(a, b) {
107
+ const [peerBtoPeerA, peerAtoPeerB] = duplexPair();
108
+ return [
109
+ mockConnection(mockMultiaddrConnection(peerAtoPeerB, b.peerId), {
110
+ registrar: a.registrar
111
+ }),
112
+ mockConnection(mockMultiaddrConnection(peerBtoPeerA, a.peerId), {
113
+ registrar: b.registrar
114
+ })
115
+ ];
90
116
  }
91
117
  //# 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":"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"}
@@ -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,14 +1,23 @@
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 interface Peer {
19
+ peerId: PeerId;
20
+ registrar: Registrar;
21
+ }
22
+ export declare function connectPeers(protocol: string, a: Peer, b: Peer): Promise<void>;
14
23
  //# 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;CAWhC;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,MAAM,WAAW,IAAI;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,SAAS,EAAE,SAAS,CAAA;CACrB;AAED,wBAAsB,YAAY,CAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,iBAWrE"}
@@ -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)) {
@@ -50,10 +68,34 @@ export class MockRegistrar {
50
68
  output.push(topology);
51
69
  }
52
70
  }
53
- return output;
71
+ if (output.length > 0) {
72
+ return output;
73
+ }
74
+ throw new Error(`No topologies registered for protocol ${protocol}`);
54
75
  }
55
76
  }
56
77
  export function mockRegistrar() {
57
78
  return new MockRegistrar();
58
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, a, b) {
92
+ // Notify peers of connection
93
+ const [aToB, bToA] = connectionPair(a, b);
94
+ for (const topology of a.registrar.getTopologies(protocol)) {
95
+ await topology.onConnect(b.peerId, aToB);
96
+ }
97
+ for (const topology of b.registrar.getTopologies(protocol)) {
98
+ await topology.onConnect(a.peerId, bToA);
99
+ }
100
+ }
59
101
  //# 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;IAmErG,CAAC;IAjEC,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,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;YAC9D,IAAI,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBAChC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;aACtB;SACF;QAED,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":"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,YAoB9D"}
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"}
@@ -10,11 +10,17 @@ export function mockUpgrader(options = {}) {
10
10
  const upgrader = {
11
11
  async upgradeOutbound(multiaddrConnection) {
12
12
  ensureProps(multiaddrConnection);
13
- return await mockConnection(multiaddrConnection, 'outbound', options.muxer);
13
+ return mockConnection(multiaddrConnection, {
14
+ direction: 'outbound',
15
+ muxer: options.muxer
16
+ });
14
17
  },
15
18
  async upgradeInbound(multiaddrConnection) {
16
19
  ensureProps(multiaddrConnection);
17
- return await mockConnection(multiaddrConnection, 'inbound', options.muxer);
20
+ return mockConnection(multiaddrConnection, {
21
+ direction: 'inbound',
22
+ muxer: options.muxer
23
+ });
18
24
  }
19
25
  };
20
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,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,MAAM,cAAc,CAAC,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC7E,CAAC;QACD,KAAK,CAAC,cAAc,CAAE,mBAAmB;YACvC,WAAW,CAAC,mBAAmB,CAAC,CAAA;YAChC,OAAO,MAAM,cAAc,CAAC,mBAAmB,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC5E,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,7 @@
1
1
  import type { TestSetup } from '../index.js';
2
- import type { PubSub } from '@libp2p/interfaces/pubsub';
2
+ import type { PubSubOptions } from '@libp2p/interfaces/pubsub';
3
3
  import type { EventMap } from './index.js';
4
- declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
4
+ import type { PubsubBaseProtocol } from '@libp2p/pubsub';
5
+ declare const _default: (common: TestSetup<PubsubBaseProtocol<EventMap>, PubSubOptions>) => void;
5
6
  export default _default;
6
7
  //# 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":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAU,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAKhC,UAAU,mBAAmB,QAAQ,CAAC,EAAE,aAAa,CAAC;AAA9E,wBAmFC"}
@@ -3,14 +3,24 @@ import sinon from 'sinon';
3
3
  import pDefer from 'p-defer';
4
4
  import pWaitFor from 'p-wait-for';
5
5
  import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string';
6
+ import { mockRegistrar } from '../mocks/registrar.js';
7
+ import { createEd25519PeerId } from '@libp2p/peer-id-factory';
8
+ import delay from 'delay';
9
+ import { CustomEvent } from '@libp2p/interfaces';
6
10
  const topic = 'foo';
7
11
  const data = uint8ArrayFromString('bar');
8
12
  export default (common) => {
9
13
  describe('pubsub api', () => {
10
14
  let pubsub;
15
+ let registrar;
11
16
  // Create pubsub router
12
17
  beforeEach(async () => {
13
- pubsub = await common.setup();
18
+ registrar = mockRegistrar();
19
+ pubsub = await common.setup({
20
+ peerId: await createEd25519PeerId(),
21
+ registrar,
22
+ emitSelf: true
23
+ });
14
24
  });
15
25
  afterEach(async () => {
16
26
  sinon.restore();
@@ -18,45 +28,45 @@ export default (common) => {
18
28
  await common.teardown();
19
29
  });
20
30
  it('can start correctly', async () => {
21
- sinon.spy(pubsub.registrar, 'register');
31
+ sinon.spy(registrar, 'register');
22
32
  await pubsub.start();
23
- expect(pubsub.started).to.eql(true);
24
- expect(pubsub.registrar.register).to.have.property('callCount', 1);
33
+ expect(pubsub.isStarted()).to.equal(true);
34
+ expect(registrar.register).to.have.property('callCount', 1);
25
35
  });
26
36
  it('can stop correctly', async () => {
27
- sinon.spy(pubsub.registrar, 'unregister');
37
+ sinon.spy(registrar, 'unregister');
28
38
  await pubsub.start();
29
39
  await pubsub.stop();
30
- expect(pubsub.started).to.eql(false);
31
- expect(pubsub.registrar.unregister).to.have.property('callCount', 1);
40
+ expect(pubsub.isStarted()).to.equal(false);
41
+ expect(registrar.unregister).to.have.property('callCount', 1);
32
42
  });
33
43
  it('can subscribe and unsubscribe correctly', async () => {
34
44
  const handler = () => {
35
45
  throw new Error('a message should not be received');
36
46
  };
37
47
  await pubsub.start();
38
- pubsub.subscribe(topic);
39
- pubsub.addEventListener('topic', handler);
48
+ pubsub.addEventListener(topic, handler);
40
49
  await pWaitFor(() => {
41
50
  const topics = pubsub.getTopics();
42
51
  return topics.length === 1 && topics[0] === topic;
43
52
  });
44
- pubsub.unsubscribe(topic);
53
+ pubsub.removeEventListener(topic, handler);
45
54
  await pWaitFor(() => pubsub.getTopics().length === 0);
46
55
  // Publish to guarantee the handler is not called
47
- await pubsub.publish(topic, data);
56
+ pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
57
+ // handlers are called async
58
+ await delay(100);
48
59
  await pubsub.stop();
49
60
  });
50
61
  it('can subscribe and publish correctly', async () => {
51
62
  const defer = pDefer();
52
63
  await pubsub.start();
53
- pubsub.subscribe(topic);
54
64
  pubsub.addEventListener(topic, (evt) => {
55
65
  const msg = evt.detail;
56
66
  expect(msg).to.not.eql(undefined);
57
67
  defer.resolve();
58
68
  });
59
- await pubsub.publish(topic, data);
69
+ pubsub.dispatchEvent(new CustomEvent(topic, { detail: data }));
60
70
  await defer.promise;
61
71
  await pubsub.stop();
62
72
  });
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/pubsub/api.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { TestSetup } from '../index.js';
2
- import type { PubSub } from '@libp2p/interfaces/pubsub';
2
+ import type { PubSubOptions } from '@libp2p/interfaces/pubsub';
3
3
  import type { EventMap } from './index.js';
4
- declare const _default: (common: TestSetup<PubSub<EventMap>>) => void;
4
+ import type { PubsubBaseProtocol } from '@libp2p/pubsub';
5
+ declare const _default: (common: TestSetup<PubsubBaseProtocol<EventMap>, PubSubOptions>) => void;
5
6
  export default _default;
6
7
  //# sourceMappingURL=connection-handlers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connection-handlers.d.ts","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAW,MAAM,2BAA2B,CAAA;AAChE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;iCAElB,UAAU,OAAO,QAAQ,CAAC,CAAC;AAAnD,wBAiWC"}
1
+ {"version":3,"file":"connection-handlers.d.ts","sourceRoot":"","sources":["../../../src/pubsub/connection-handlers.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAW,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAG1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;iCAEhC,UAAU,mBAAmB,QAAQ,CAAC,EAAE,aAAa,CAAC;AAA9E,wBA2cC"}