@libp2p/interface-compliance-tests 1.1.6 → 1.1.10

package/src/pubsub/two-nodes.ts

@@ -5,13 +5,16 @@ import pDefer from 'p-defer'
 import pWaitFor from 'p-wait-for'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import { connectPeers, mockRegistrar } from '../mocks/registrar.js'
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
+import { CustomEvent } from '@libp2p/interfaces'
+import delay from 'delay'
 import type { TestSetup } from '../index.js'
-import type { PubSub, Message } from '@libp2p/interfaces/pubsub'
-import {
-  first,
-  expectSet
-} from './utils.js'
+import type { Message, PubSubOptions } from '@libp2p/interfaces/pubsub'
 import type { EventMap } from './index.js'
+import type { PeerId } from '@libp2p/interfaces/src/peer-id'
+import type { Registrar } from '@libp2p/interfaces/src/registrar'
+import type { PubsubBaseProtocol } from '@libp2p/pubsub'
 
 const topic = 'foo'
 
@@ -19,28 +22,50 @@ function shouldNotHappen () {
   expect.fail()
 }
 
-export default (common: TestSetup<PubSub<EventMap>>) => {
+export default (common: TestSetup<PubsubBaseProtocol<EventMap>, PubSubOptions>) => {
   describe('pubsub with two nodes', () => {
-    let psA: PubSub<EventMap>
-    let psB: PubSub<EventMap>
+    let psA: PubsubBaseProtocol<EventMap>
+    let psB: PubsubBaseProtocol<EventMap>
+    let peerIdA: PeerId
+    let peerIdB: PeerId
+    let registrarA: Registrar
+    let registrarB: Registrar
 
     // Create pubsub nodes and connect them
     before(async () => {
-      psA = await common.setup()
-      psB = await common.setup()
+      peerIdA = await createEd25519PeerId()
+      peerIdB = await createEd25519PeerId()
 
-      expect(psA.peers.size).to.be.eql(0)
-      expect(psB.peers.size).to.be.eql(0)
+      registrarA = mockRegistrar()
+      registrarB = mockRegistrar()
+
+      psA = await common.setup({
+        peerId: peerIdA,
+        registrar: registrarA,
+        emitSelf: true
+      })
+      psB = await common.setup({
+        peerId: peerIdB,
+        registrar: registrarB
+      })
 
       // Start pubsub and connect nodes
       await psA.start()
       await psB.start()
 
-      // @ts-expect-error protected property
-      await psA._libp2p.dial(psB.peerId)
+      expect(psA.getPeers()).to.be.empty()
+      expect(psB.getPeers()).to.be.empty()
+
+      await connectPeers(psA.multicodecs[0], {
+        peerId: peerIdA,
+        registrar: registrarA
+      }, {
+        peerId: peerIdB,
+        registrar: registrarB
+      })
 
       // Wait for peers to be ready in pubsub
-      await pWaitFor(() => psA.peers.size === 1 && psB.peers.size === 1)
+      await pWaitFor(() => psA.getPeers().length === 1 && psB.getPeers().length === 1)
     })
 
     after(async () => {
@@ -57,12 +82,12 @@ export default (common: TestSetup<PubSub<EventMap>>) => {
 
       psB.addEventListener('pubsub:subscription-change', (evt) => {
         const { peerId: changedPeerId, subscriptions: changedSubs } = evt.detail
-        expectSet(psA.subscriptions, [topic])
-        expect(psB.peers.size).to.equal(1)
-        expectSet(psB.topics.get(topic), [psA.peerId.toString()])
-        expect(changedPeerId.toString()).to.equal(first(psB.peers).id.toString())
+        expect(psA.getTopics()).to.deep.equal([topic])
+        expect(psB.getPeers()).to.have.lengthOf(1)
+        expect(psB.getSubscribers(topic).map(p => p.toString())).to.deep.equal([peerIdA.toString()])
+        expect(changedPeerId).to.deep.equal(psB.getPeers()[0])
         expect(changedSubs).to.have.lengthOf(1)
-        expect(changedSubs[0].topicID).to.equal(topic)
+        expect(changedSubs[0].topic).to.equal(topic)
         expect(changedSubs[0].subscribe).to.equal(true)
         defer.resolve()
       }, {
@@ -89,7 +114,9 @@ export default (common: TestSetup<PubSub<EventMap>>) => {
         once: true
       })
 
-      void psA.publish(topic, uint8ArrayFromString('hey'))
+      await delay(100)
+
+      void psA.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('hey') }))
 
       return await defer.promise
     })
@@ -118,7 +145,9 @@ export default (common: TestSetup<PubSub<EventMap>>) => {
         once: true
       })
 
-      void psB.publish(topic, uint8ArrayFromString('banana'))
+      await delay(100)
+
+      void psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('banana') }))
 
       return await defer.promise
     })
@@ -135,9 +164,9 @@ export default (common: TestSetup<PubSub<EventMap>>) => {
       function receivedMsg (evt: CustomEvent<Message>) {
         const msg = evt.detail
         expect(uint8ArrayToString(msg.data)).to.equal('banana')
-        expect(msg.from).to.be.eql(psB.peerId.toString())
-        expect(msg.seqno).to.be.a('Uint8Array')
-        expect(msg.topicIDs).to.be.eql([topic])
+        expect(msg.from.toString()).to.equal(peerIdB.toString())
+        expect(msg.seqno).to.be.a('BigInt')
+        expect(msg.topic).to.be.equal(topic)
 
         if (++counter === 10) {
           psA.removeEventListener(topic, receivedMsg)
@@ -147,52 +176,71 @@ export default (common: TestSetup<PubSub<EventMap>>) => {
         }
       }
 
-      Array.from({ length: 10 }, async (_, i) => await psB.publish(topic, uint8ArrayFromString('banana')))
+      await delay(100)
+
+      Array.from({ length: 10 }, (_, i) => psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('banana') })))
 
       return await defer.promise
     })
 
     it('Unsubscribe from topic in nodeA', async () => {
       const defer = pDefer()
-
-      psA.unsubscribe(topic)
-      expect(psA.subscriptions.size).to.equal(0)
+      let callCount = 0
 
       psB.addEventListener('pubsub:subscription-change', (evt) => {
-        const { peerId: changedPeerId, subscriptions: changedSubs } = evt.detail
-        expect(psB.peers.size).to.equal(1)
-        expectSet(psB.topics.get(topic), [])
-        expect(changedPeerId.toString()).to.equal(first(psB.peers).id.toString())
-        expect(changedSubs).to.have.lengthOf(1)
-        expect(changedSubs[0].topicID).to.equal(topic)
-        expect(changedSubs[0].subscribe).to.equal(false)
+        callCount++
+
+        if (callCount === 1) {
+          // notice subscribe
+          const { peerId: changedPeerId, subscriptions: changedSubs } = evt.detail
+          expect(psB.getPeers()).to.have.lengthOf(1)
+          expect(psB.getTopics()).to.be.empty()
+          expect(changedPeerId).to.deep.equal(psB.getPeers()[0])
+          expect(changedSubs).to.have.lengthOf(1)
+          expect(changedSubs[0].topic).to.equal(topic)
+          expect(changedSubs[0].subscribe).to.equal(true)
+        } else {
+          // notice unsubscribe
+          const { peerId: changedPeerId, subscriptions: changedSubs } = evt.detail
+          expect(psB.getPeers()).to.have.lengthOf(1)
+          expect(psB.getTopics()).to.be.empty()
+          expect(changedPeerId).to.deep.equal(psB.getPeers()[0])
+          expect(changedSubs).to.have.lengthOf(1)
+          expect(changedSubs[0].topic).to.equal(topic)
+          expect(changedSubs[0].subscribe).to.equal(false)
 
-        defer.resolve()
-      }, {
-        once: true
+          defer.resolve()
+        }
       })
 
+      psA.subscribe(topic)
+      expect(psA.getTopics()).to.not.be.empty()
+
+      psA.unsubscribe(topic)
+      expect(psA.getTopics()).to.be.empty()
+
       return await defer.promise
     })
 
-    it('Publish to a topic:Z in nodeA nodeB', async () => {
+    it.skip('Publish to a topic:Z in nodeA nodeB', async () => {
       const defer = pDefer()
+      const topic = 'Z'
 
-      psA.addEventListener('Z', shouldNotHappen, {
+      psA.addEventListener(topic, shouldNotHappen, {
         once: true
       })
-      psB.addEventListener('Z', shouldNotHappen, {
+      psB.addEventListener(topic, shouldNotHappen, {
         once: true
       })
 
       setTimeout(() => {
-        psA.removeEventListener('Z', shouldNotHappen)
-        psB.removeEventListener('Z', shouldNotHappen)
+        psA.removeEventListener(topic, shouldNotHappen)
+        psB.removeEventListener(topic, shouldNotHappen)
         defer.resolve()
       }, 100)
 
-      void psB.publish('Z', uint8ArrayFromString('banana'))
-      void psA.publish('Z', uint8ArrayFromString('banana'))
+      void psB.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('banana') }))
+      void psA.dispatchEvent(new CustomEvent(topic, { detail: uint8ArrayFromString('banana') }))
 
       return await defer.promise
     })

package/src/stream-muxer/base-test.ts

@@ -7,7 +7,7 @@ import all from 'it-all'
 import defer from 'p-defer'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { isValidTick } from '../transport/utils/index.js'
+import { isValidTick } from '../utils/is-valid-tick.js'
 import type { DeferredPromise } from 'p-defer'
 import type { TestSetup } from '../index.js'
 import type { Stream } from '@libp2p/interfaces/connection'

package/src/stream-muxer/close-test.ts

@@ -4,14 +4,13 @@ import { duplexPair } from 'it-pair/duplex'
 import { abortableSource, abortableDuplex } from 'abortable-iterator'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import drain from 'it-drain'
-import { mockUpgrader, mockMultiaddrConnection } from '../transport/utils/index.js'
+import { mockUpgrader } from '../mocks/upgrader.js'
+import { mockMultiaddrConnection } from '../mocks/multiaddr-connection.js'
+import { expect } from 'aegir/utils/chai.js'
+import delay from 'delay'
 import type { TestSetup } from '../index.js'
 import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer'
-import { expect } from 'aegir/utils/chai.js'
-
-async function pause (ms: number) {
-  return await new Promise(resolve => setTimeout(resolve, ms))
-}
+import { createEd25519PeerId } from '@libp2p/peer-id-factory'
 
 function randomBuffer () {
   return uint8ArrayFromString(Math.random().toString())
@@ -21,7 +20,7 @@ const infiniteRandom = {
   [Symbol.asyncIterator]: async function * () {
     while (true) {
       yield randomBuffer()
-      await pause(10)
+      await delay(50)
     }
   }
 }
@@ -29,9 +28,11 @@ const infiniteRandom = {
 export default (common: TestSetup<Muxer, MuxerOptions>) => {
   describe('close', () => {
     it('closing underlying socket closes streams', async () => {
+      const localPeer = await createEd25519PeerId()
+      const remotePeer = await createEd25519PeerId()
       const muxer = await common.setup({
         onStream: (stream) => {
-          void pipe(stream, stream)
+          void pipe(stream, drain)
         }
       })
       const upgrader = mockUpgrader({ muxer })
@@ -42,8 +43,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
         returnOnAbort: true
       })
 
-      await upgrader.upgradeInbound(mockMultiaddrConnection(abortableRemote))
-      const dialerConn = await upgrader.upgradeOutbound(mockMultiaddrConnection(local))
+      await upgrader.upgradeInbound(mockMultiaddrConnection(abortableRemote, localPeer))
+      const dialerConn = await upgrader.upgradeOutbound(mockMultiaddrConnection(local, remotePeer))
 
       const s1 = await dialerConn.newStream([''])
       const s2 = await dialerConn.newStream([''])
@@ -93,12 +94,12 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
       })
 
       // Pause, and then send some data and close the first stream
-      await pause(50)
+      await delay(50)
       await pipe([randomBuffer()], stream, drain)
       closed = true
 
       // Abort all the other streams later
-      await pause(50)
+      await delay(50)
       controllers.forEach(c => c.abort())
 
       // These should now all resolve without error

package/src/transport/dial-test.ts

@@ -1,5 +1,6 @@
 import { expect } from 'aegir/utils/chai.js'
-import { isValidTick, mockUpgrader } from './utils/index.js'
+import { isValidTick } from '../utils/is-valid-tick.js'
+import { mockUpgrader } from '../mocks/upgrader.js'
 import { goodbye } from 'it-goodbye'
 import all from 'it-all'
 import { pipe } from 'it-pipe'

package/src/transport/filter-test.ts

@@ -1,5 +1,5 @@
 import { expect } from 'aegir/utils/chai.js'
-import { mockUpgrader } from './utils/index.js'
+import { mockUpgrader } from '../mocks/upgrader.js'
 import type { TestSetup } from '../index.js'
 import type { Transport } from '@libp2p/interfaces/transport'
 import type { TransportTestFixtures, SetupArgs } from './index.js'

package/src/transport/listen-test.ts

@@ -4,7 +4,8 @@ import sinon from 'sinon'
 import pWaitFor from 'p-wait-for'
 import { pipe } from 'it-pipe'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import { isValidTick, mockUpgrader } from './utils/index.js'
+import { isValidTick } from '../utils/is-valid-tick.js'
+import { mockUpgrader } from '../mocks/upgrader.js'
 import defer from 'p-defer'
 import { CustomEvent } from '@libp2p/interfaces'
 import type { TestSetup } from '../index.js'

package/src/utils/is-valid-tick.ts

@@ -0,0 +1,18 @@
+
+/**
+ * A tick is considered valid if it happened between now
+ * and `ms` milliseconds ago
+ */
+export function isValidTick (date?: number, ms: number = 5000) {
+  if (date == null) {
+    throw new Error('date must be a number')
+  }
+
+  const now = Date.now()
+
+  if (date > now - ms && date <= now) {
+    return true
+  }
+
+  return false
+}

package/dist/src/pubsub/utils.d.ts

@@ -1,3 +0,0 @@
-export declare function first<V>(map: Map<any, V>): V;
-export declare function expectSet<T>(set?: Set<T>, subs?: T[]): void;
-//# sourceMappingURL=utils.d.ts.map

package/dist/src/pubsub/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/pubsub/utils.ts"],"names":[],"mappings":"AAEA,wBAAgB,KAAK,CAAE,CAAC,EAAG,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAE9C;AAED,wBAAgB,SAAS,CAAE,CAAC,EAAG,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,EAAE,QAMtD"}

package/dist/src/pubsub/utils.js

@@ -1,11 +0,0 @@
-import { expect } from 'aegir/utils/chai.js';
-export function first(map) {
-    return map.values().next().value;
-}
-export function expectSet(set, subs) {
-    if ((set == null) || (subs == null)) {
-        throw new Error('No set or subs passed');
-    }
-    expect(Array.from(set.values())).to.eql(subs);
-}
-//# sourceMappingURL=utils.js.map

package/dist/src/pubsub/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/pubsub/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,MAAM,UAAU,KAAK,CAAM,GAAgB;IACzC,OAAO,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAA;AAClC,CAAC;AAED,MAAM,UAAU,SAAS,CAAM,GAAY,EAAE,IAAU;IACrD,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE;QACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;KACzC;IAED,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;AAC/C,CAAC"}

package/dist/src/transport/utils/index.d.ts

@@ -1,15 +0,0 @@
-import type { Upgrader, MultiaddrConnection } from '@libp2p/interfaces/transport';
-import type { Muxer } from '@libp2p/interfaces/stream-muxer';
-import type { Duplex } from 'it-stream-types';
-/**
- * A tick is considered valid if it happened between now
- * and `ms` milliseconds ago
- */
-export declare function isValidTick(date?: number, ms?: number): boolean;
-export declare function mockMultiaddrConnection(source: Duplex<Uint8Array>): MultiaddrConnection;
-export declare function mockMuxer(): Muxer;
-export interface MockUpgraderOptions {
-    muxer?: Muxer;
-}
-export declare function mockUpgrader(options?: MockUpgraderOptions): Upgrader;
-//# sourceMappingURL=index.d.ts.map

package/dist/src/transport/utils/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/transport/utils/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAEjF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAE7C;;;GAGG;AACH,wBAAgB,WAAW,CAAE,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,GAAE,MAAa,WAY5D;AAED,wBAAgB,uBAAuB,CAAE,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GAAG,mBAAmB,CAaxF;AAED,wBAAgB,SAAS,IAAK,KAAK,CAoClC;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,CAAC,EAAE,KAAK,CAAA;CACd;AAED,wBAAgB,YAAY,CAAE,OAAO,GAAE,mBAAwB,YAuB9D"}

package/dist/src/transport/utils/index.js

@@ -1,137 +0,0 @@
-import { expect } from 'aegir/utils/chai.js';
-import { pair } from 'it-pair';
-import { peerIdFromString } from '@libp2p/peer-id';
-import * as PeerIdFactory from '@libp2p/peer-id-factory';
-import { pushable } from 'it-pushable';
-import drain from 'it-drain';
-import { Multiaddr } from '@multiformats/multiaddr';
-import { pipe } from 'it-pipe';
-/**
- * A tick is considered valid if it happened between now
- * and `ms` milliseconds ago
- */
-export function isValidTick(date, ms = 5000) {
-    if (date == null) {
-        throw new Error('date must be a number');
-    }
-    const now = Date.now();
-    if (date > now - ms && date <= now) {
-        return true;
-    }
-    return false;
-}
-export function mockMultiaddrConnection(source) {
-    const maConn = {
-        ...source,
-        async close() {
-        },
-        timeline: {
-            open: Date.now()
-        },
-        remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001')
-    };
-    return maConn;
-}
-export function mockMuxer() {
-    let streamId = 0;
-    let streams = [];
-    const p = pushable();
-    const muxer = {
-        source: p,
-        sink: async (source) => {
-            await drain(source);
-        },
-        get streams() {
-            return streams;
-        },
-        newStream: (name) => {
-            const echo = pair();
-            const id = `${streamId++}`;
-            const stream = {
-                id,
-                sink: echo.sink,
-                source: echo.source,
-                close: () => {
-                    streams = streams.filter(s => s !== stream);
-                },
-                abort: () => { },
-                reset: () => { },
-                timeline: {
-                    open: 0
-                }
-            };
-            return stream;
-        }
-    };
-    return muxer;
-}
-export function mockUpgrader(options = {}) {
-    const ensureProps = (multiaddrConnection) => {
-        ['sink', 'source', 'remoteAddr', 'timeline', 'close'].forEach(prop => {
-            expect(multiaddrConnection).to.have.property(prop);
-        });
-        expect(isValidTick(multiaddrConnection.timeline.open)).to.equal(true);
-        return multiaddrConnection;
-    };
-    const muxer = options.muxer ?? mockMuxer();
-    const upgrader = {
-        async upgradeOutbound(multiaddrConnection) {
-            ensureProps(multiaddrConnection);
-            return await createConnection(multiaddrConnection, 'outbound', muxer);
-        },
-        async upgradeInbound(multiaddrConnection) {
-            ensureProps(multiaddrConnection);
-            return await createConnection(multiaddrConnection, 'inbound', muxer);
-        }
-    };
-    return upgrader;
-}
-async function createConnection(maConn, direction, muxer) {
-    const remoteAddr = maConn.remoteAddr;
-    const remotePeerIdStr = remoteAddr.getPeerId();
-    const remotePeer = remotePeerIdStr != null ? peerIdFromString(remotePeerIdStr) : await PeerIdFactory.createEd25519PeerId();
-    const streams = [];
-    let streamId = 0;
-    const registry = new Map();
-    void pipe(maConn, muxer, maConn);
-    return {
-        id: 'mock-connection',
-        remoteAddr,
-        remotePeer,
-        stat: {
-            status: 'OPEN',
-            direction,
-            timeline: maConn.timeline,
-            multiplexer: 'test-multiplexer',
-            encryption: 'yes-yes-very-secure'
-        },
-        registry,
-        tags: [],
-        streams,
-        newStream: async (protocols) => {
-            if (!Array.isArray(protocols)) {
-                protocols = [protocols];
-            }
-            if (protocols.length === 0) {
-                throw new Error('protocols must have a length');
-            }
-            const id = `${streamId++}`;
-            const stream = muxer.newStream(id);
-            const streamData = {
-                protocol: protocols[0],
-                stream
-            };
-            registry.set(id, streamData);
-            return streamData;
-        },
-        addStream: (stream, metadata) => {
-        },
-        removeStream: (id) => {
-            registry.delete(id);
-        },
-        close: async () => {
-            await maConn.close();
-        }
-    };
-}
-//# sourceMappingURL=index.js.map

package/dist/src/transport/utils/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/transport/utils/index.ts"],"names":[],"mappings":"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"}

package/src/pubsub/utils.ts

@@ -1,13 +0,0 @@
-import { expect } from 'aegir/utils/chai.js'
-
-export function first <V> (map: Map<any, V>): V {
-  return map.values().next().value
-}
-
-export function expectSet <T> (set?: Set<T>, subs?: T[]) {
-  if ((set == null) || (subs == null)) {
-    throw new Error('No set or subs passed')
-  }
-
-  expect(Array.from(set.values())).to.eql(subs)
-}