@libp2p/interface-compliance-tests 1.0.1 → 1.0.5

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

@@ -1,6 +1,5 @@
 import { expect } from 'aegir/utils/chai.js';
-// @ts-expect-error no types
-import pair from 'it-pair';
+import { pair } from 'it-pair';
 import { PeerId } from '@libp2p/peer-id';
 import * as PeerIdFactory from '@libp2p/peer-id-factory';
 /**
@@ -81,8 +80,7 @@ async function createConnection(maConn, direction) {
                 reset: () => { },
                 timeline: {
                     open: 0
-                },
-                [Symbol.asyncIterator]: echo.source
+                }
             };
             const streamData = {
                 protocol: protocols[0],

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

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

package/package.json

@@ -1,81 +1,48 @@
 {
   "name": "@libp2p/interface-compliance-tests",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Compliance tests for JS libp2p interfaces",
-  "type": "module",
-  "files": [
-    "src",
-    "dist"
+  "license": "Apache-2.0 OR MIT",
+  "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interface-compliance-tests#readme",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/libp2p/js-libp2p-interfaces.git"
+  },
+  "bugs": {
+    "url": "https://github.com/libp2p/js-libp2p-interfaces/issues"
+  },
+  "keywords": [
+    "interface",
+    "libp2p"
   ],
-  "types": "dist/src/index.d.ts",
+  "engines": {
+    "node": ">=16.0.0",
+    "npm": ">=7.0.0"
+  },
+  "type": "module",
+  "types": "./dist/src/index.d.ts",
   "typesVersions": {
     "*": {
       "*": [
+        "*",
+        "dist/*",
+        "dist/src/*",
+        "dist/src/*/index"
+      ],
+      "src/*": [
+        "*",
+        "dist/*",
         "dist/src/*",
         "dist/src/*/index"
       ]
     }
   },
-  "eslintConfig": {
-    "extends": "ipfs"
-  },
-  "scripts": {
-    "lint": "aegir lint",
-    "dep-check": "aegir dep-check dist/src/**/*.js",
-    "build": "tsc",
-    "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/**/*.js",
-    "test:chrome": "npm run test -- -t browser",
-    "test:chrome-webworker": "npm run test -- -t webworker",
-    "test:firefox": "npm run test -- -t browser -- --browser firefox",
-    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
-    "test:node": "npm run test -- -t node --cov",
-    "test:electron-main": "npm run test -- -t electron-main"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/libp2p/js-libp2p-interfaces.git"
-  },
-  "keywords": [
-    "libp2p",
-    "interface"
+  "files": [
+    "src",
+    "dist/src",
+    "!dist/test",
+    "!**/*.tsbuildinfo"
   ],
-  "author": "",
-  "license": "(Apache-2.0 OR MIT)",
-  "bugs": {
-    "url": "https://github.com/libp2p/js-libp2p-interfaces/issues"
-  },
-  "homepage": "https://github.com/libp2p/js-libp2p-interfaces/tree/master/packages/libp2p-interfaces-compliance-tests#readme",
-  "dependencies": {
-    "@libp2p/connection": "^1.0.0",
-    "@libp2p/crypto": "^0.22.2",
-    "@libp2p/interfaces": "^1.0.0",
-    "@libp2p/peer-id": "^1.0.0",
-    "@libp2p/peer-id-factory": "^1.0.0",
-    "@libp2p/pubsub": "^1.0.0",
-    "@libp2p/topology": "^1.0.0",
-    "@multiformats/multiaddr": "^10.1.1",
-    "abort-controller": "^3.0.0",
-    "abortable-iterator": "^3.0.0",
-    "aegir": "^36.1.3",
-    "chai": "^4.3.4",
-    "chai-checkmark": "^1.0.1",
-    "delay": "^5.0.0",
-    "it-goodbye": "^3.0.0",
-    "it-pair": "^1.0.0",
-    "it-pipe": "^1.1.0",
-    "multiformats": "^9.4.10",
-    "p-defer": "^4.0.0",
-    "p-limit": "^4.0.0",
-    "p-wait-for": "^4.1.0",
-    "sinon": "^12.0.1",
-    "streaming-iterables": "^6.0.0",
-    "uint8arrays": "^3.0.0",
-    "util": "^0.12.4"
-  },
-  "devDependencies": {
-    "it-handshake": "^2.0.0"
-  },
   "exports": {
     ".": {
       "import": "./dist/src/index.js",
@@ -121,5 +88,134 @@
       "import": "./dist/src/utils/peers.js",
       "types": "./dist/src/utils/peers.d.ts"
     }
+  },
+  "eslintConfig": {
+    "extends": "ipfs",
+    "parserOptions": {
+      "sourceType": "module"
+    }
+  },
+  "release": {
+    "branches": [
+      "master"
+    ],
+    "plugins": [
+      [
+        "@semantic-release/commit-analyzer",
+        {
+          "preset": "conventionalcommits",
+          "releaseRules": [
+            {
+              "breaking": true,
+              "release": "major"
+            },
+            {
+              "revert": true,
+              "release": "patch"
+            },
+            {
+              "type": "feat",
+              "release": "minor"
+            },
+            {
+              "type": "fix",
+              "release": "patch"
+            },
+            {
+              "type": "chore",
+              "release": "patch"
+            },
+            {
+              "type": "docs",
+              "release": "patch"
+            },
+            {
+              "type": "test",
+              "release": "patch"
+            },
+            {
+              "scope": "no-release",
+              "release": false
+            }
+          ]
+        }
+      ],
+      [
+        "@semantic-release/release-notes-generator",
+        {
+          "preset": "conventionalcommits",
+          "presetConfig": {
+            "types": [
+              {
+                "type": "feat",
+                "section": "Features"
+              },
+              {
+                "type": "fix",
+                "section": "Bug Fixes"
+              },
+              {
+                "type": "chore",
+                "section": "Trivial Changes"
+              },
+              {
+                "type": "docs",
+                "section": "Trivial Changes"
+              },
+              {
+                "type": "test",
+                "section": "Tests"
+              }
+            ]
+          }
+        }
+      ],
+      "@semantic-release/changelog",
+      "@semantic-release/npm",
+      "@semantic-release/github",
+      "@semantic-release/git"
+    ]
+  },
+  "scripts": {
+    "lint": "aegir lint",
+    "dep-check": "aegir dep-check dist/src/**/*.js",
+    "build": "tsc",
+    "pretest": "npm run build",
+    "test": "aegir test -f ./dist/test/**/*.js",
+    "test:chrome": "npm run test -- -t browser",
+    "test:chrome-webworker": "npm run test -- -t webworker",
+    "test:firefox": "npm run test -- -t browser -- --browser firefox",
+    "test:firefox-webworker": "npm run test -- -t webworker -- --browser firefox",
+    "test:node": "npm run test -- -t node --cov",
+    "test:electron-main": "npm run test -- -t electron-main"
+  },
+  "dependencies": {
+    "@libp2p/connection": "^1.0.0",
+    "@libp2p/crypto": "^0.22.2",
+    "@libp2p/interfaces": "^1.0.0",
+    "@libp2p/peer-id": "^1.0.0",
+    "@libp2p/peer-id-factory": "^1.0.0",
+    "@libp2p/pubsub": "^1.0.0",
+    "@libp2p/topology": "^1.0.0",
+    "@multiformats/multiaddr": "^10.1.1",
+    "abortable-iterator": "^4.0.0",
+    "aegir": "^36.1.3",
+    "delay": "^5.0.0",
+    "it-all": "^1.0.6",
+    "it-drain": "^1.0.5",
+    "it-goodbye": "^4.0.1",
+    "it-map": "^1.0.6",
+    "it-pair": "^2.0.0",
+    "it-pipe": "^2.0.2",
+    "multiformats": "^9.4.10",
+    "p-defer": "^4.0.0",
+    "p-limit": "^4.0.0",
+    "p-wait-for": "^4.1.0",
+    "sinon": "^12.0.1",
+    "uint8arrays": "^3.0.0",
+    "util": "^0.12.4"
+  },
+  "devDependencies": {
+    "it-handshake": "^3.0.0"
   }
 }

package/src/crypto/index.ts

@@ -1,15 +1,15 @@
 import { expect } from 'aegir/utils/chai.js'
-// @ts-expect-error no types
-import duplexPair from 'it-pair/duplex.js'
 import { pipe } from 'it-pipe'
 import * as PeerIdFactory from '@libp2p/peer-id-factory'
-import { collect } from 'streaming-iterables'
+import all from 'it-all'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
 import peers from '../utils/peers.js'
 import { UnexpectedPeerError } from '@libp2p/interfaces/crypto/errors'
+import { createMaConnPair } from './utils/index.js'
 import type { TestSetup } from '../index.js'
 import type { Crypto } from '@libp2p/interfaces/crypto'
 import type { PeerId } from '@libp2p/interfaces/peer-id'
+import type { Source } from 'it-stream-types'
 
 export default (common: TestSetup<Crypto>) => {
   describe('interface-crypto compliance tests', () => {
@@ -42,7 +42,7 @@ export default (common: TestSetup<Crypto>) => {
     })
 
     it('it wraps the provided duplex connection', async () => {
-      const [localConn, remoteConn] = duplexPair()
+      const [localConn, remoteConn] = createMaConnPair()
 
       const [
         inboundResult,
@@ -53,7 +53,7 @@ export default (common: TestSetup<Crypto>) => {
       ])
 
       // Echo server
-      pipe(inboundResult.conn, inboundResult.conn)
+      void pipe(inboundResult.conn, inboundResult.conn)
 
       // Send some data and collect the result
       const input = uint8ArrayFromString('data to encrypt')
@@ -61,19 +61,19 @@ export default (common: TestSetup<Crypto>) => {
         [input],
         outboundResult.conn,
         // Convert BufferList to Buffer via slice
-        (source: AsyncIterable<Uint8Array>) => (async function * toBuffer () {
+        (source: Source<Uint8Array>) => (async function * toBuffer () {
           for await (const chunk of source) {
             yield chunk.slice()
           }
         })(),
-        collect
+        async (source) => await all(source)
       )
 
       expect(result).to.eql([input])
     })
 
     it('should return the remote peer id', async () => {
-      const [localConn, remoteConn] = duplexPair()
+      const [localConn, remoteConn] = createMaConnPair()
 
       const [
         inboundResult,
@@ -90,7 +90,7 @@ export default (common: TestSetup<Crypto>) => {
     })
 
     it('inbound connections should verify peer integrity if known', async () => {
-      const [localConn, remoteConn] = duplexPair()
+      const [localConn, remoteConn] = createMaConnPair()
 
       await Promise.all([
         crypto.secureInbound(remotePeer, localConn, mitmPeer),

package/src/crypto/utils/index.ts

@@ -0,0 +1,24 @@
+import { duplexPair } from 'it-pair/duplex'
+import { Multiaddr } from '@multiformats/multiaddr'
+import type { MultiaddrConnection } from '@libp2p/interfaces/transport'
+import type { Duplex } from 'it-stream-types'
+
+export function createMaConnPair (): [MultiaddrConnection, MultiaddrConnection] {
+  const [local, remote] = duplexPair<Uint8Array>()
+
+  function duplexToMaConn (duplex: Duplex<Uint8Array>): MultiaddrConnection {
+    const output: MultiaddrConnection = {
+      ...duplex,
+      close: async () => {},
+      conn: {},
+      remoteAddr: new Multiaddr('/ip4/127.0.0.1/tcp/4001'),
+      timeline: {
+        open: Date.now()
+      }
+    }
+
+    return output
+  }
+
+  return [duplexToMaConn(local), duplexToMaConn(remote)]
+}

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

@@ -1,22 +1,26 @@
 import { expect } from 'aegir/utils/chai.js'
-// @ts-expect-error no types
-import pair from 'it-pair/duplex.js'
+import { duplexPair } from 'it-pair/duplex'
 import { pipe } from 'it-pipe'
-import { collect, map, consume } from 'streaming-iterables'
+import drain from 'it-drain'
+import map from 'it-map'
+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 type { DeferredPromise } from 'p-defer'
 import type { TestSetup } from '../index.js'
 import type { Muxer, MuxerOptions, MuxedStream } from '@libp2p/interfaces/stream-muxer'
-import { isValidTick } from '../transport/utils/index.js'
+import type { Source } from 'it-stream-types'
 
-function close (stream: MuxedStream) {
-  return pipe([], stream, consume)
+async function close (stream: MuxedStream) {
+  return await pipe([], stream, drain)
 }
 
 export default (common: TestSetup<Muxer, MuxerOptions>) => {
   describe('base', () => {
     it('Open a stream from the dialer', async () => {
-      const p = pair()
+      const p = duplexPair<Uint8Array>()
       const dialer = await common.setup()
       const onStreamPromise: DeferredPromise<MuxedStream> = defer()
       const onStreamEndPromise: DeferredPromise<MuxedStream> = defer()
@@ -30,8 +34,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
         }
       })
 
-      pipe(p[0], dialer, p[0])
-      pipe(p[1], listener, p[1])
+      void pipe(p[0], dialer.newStream('/test/stream'), p[0])
+      void pipe(p[1], listener.newStream('/test/stream'), p[1])
 
       const conn = dialer.newStream()
       expect(dialer.streams).to.include(conn)
@@ -41,7 +45,7 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
       expect(isValidTick(stream.timeline.open)).to.equal(true)
       // Make sure the stream is being tracked
       expect(listener.streams).to.include(stream)
-      close(stream)
+      void close(stream)
 
       // Make sure stream is closed properly
       const endedStream = await onStreamEndPromise.promise
@@ -62,7 +66,7 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
     })
 
     it('Open a stream from the listener', async () => {
-      const p = pair()
+      const p = duplexPair<Uint8Array>()
       const onStreamPromise: DeferredPromise<MuxedStream> = defer()
       const dialer = await common.setup({
         onStream: stream => {
@@ -72,8 +76,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
 
       const listener = await common.setup()
 
-      pipe(p[0], dialer, p[0])
-      pipe(p[1], listener, p[1])
+      void pipe(p[0], dialer.newStream('/test/stream'), p[0])
+      void pipe(p[1], listener.newStream('/test/stream'), p[1])
 
       const conn = listener.newStream()
 
@@ -87,7 +91,7 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
     })
 
     it('Open a stream on both sides', async () => {
-      const p = pair()
+      const p = duplexPair<Uint8Array>()
       const onDialerStreamPromise: DeferredPromise<MuxedStream> = defer()
       const onListenerStreamPromise: DeferredPromise<MuxedStream> = defer()
       const dialer = await common.setup({
@@ -101,8 +105,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
         }
       })
 
-      pipe(p[0], dialer, p[0])
-      pipe(p[1], listener, p[1])
+      void pipe(p[0], dialer.newStream('/test/stream'), p[0])
+      void pipe(p[1], listener.newStream('/test/stream'), p[1])
 
       const listenerConn = listener.newStream()
       const dialerConn = dialer.newStream()
@@ -118,8 +122,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
     })
 
     it('Open a stream on one side, write, open a stream on the other side', async () => {
-      const toString = map((c: string) => c.slice().toString())
-      const p = pair()
+      const toString = (source: Source<Uint8Array>) => map(source, (u) => uint8ArrayToString(u))
+      const p = duplexPair<Uint8Array>()
       const onDialerStreamPromise: DeferredPromise<MuxedStream> = defer()
       const onListenerStreamPromise: DeferredPromise<MuxedStream> = defer()
       const dialer = await common.setup({
@@ -133,22 +137,22 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
         }
       })
 
-      pipe(p[0], dialer, p[0])
-      pipe(p[1], listener, p[1])
+      void pipe(p[0], dialer.newStream('/test/stream'), p[0])
+      void pipe(p[1], listener.newStream('/test/stream'), p[1])
 
       const dialerConn = dialer.newStream()
       const listenerConn = listener.newStream()
 
-      pipe(['hey'], dialerConn)
-      pipe(['hello'], listenerConn)
+      void pipe([uint8ArrayFromString('hey')], dialerConn)
+      void pipe([uint8ArrayFromString('hello')], listenerConn)
 
       const listenerStream = await onListenerStreamPromise.promise
       const dialerStream = await onDialerStreamPromise.promise
 
-      const listenerChunks = await pipe(listenerStream, toString, collect)
+      const listenerChunks = await pipe(listenerStream, toString, async (source) => await all(source))
       expect(listenerChunks).to.be.eql(['hey'])
 
-      const dialerChunks = await pipe(dialerStream, toString, collect)
+      const dialerChunks = await pipe(dialerStream, toString, async (source) => await all(source))
       expect(dialerChunks).to.be.eql(['hello'])
     })
   })

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

@@ -1,11 +1,9 @@
 /* eslint max-nested-callbacks: ["error", 8] */
-// @ts-expect-error no types
-import pair from 'it-pair/duplex.js'
 import { pipe } from 'it-pipe'
-import { consume } from 'streaming-iterables'
-import { source, duplex } from 'abortable-iterator'
-import AbortController from 'abort-controller'
+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 type { TestSetup } from '../index.js'
 import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer'
 import type { Connection } from '@libp2p/interfaces/connection'
@@ -47,16 +45,16 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
       const mockUpgrade = async (maConn: any) => {
         const muxer = await common.setup({
           onStream: (stream) => {
-            pipe(stream, stream)
+            void pipe(stream, stream)
           }
         })
-        pipe(maConn, muxer, maConn)
+        pipe(maConn, muxer.newStream('/test/stream'), maConn)
         return mockConn(muxer)
       }
 
-      const [local, remote] = pair()
+      const [local, remote] = duplexPair<Uint8Array>()
       const controller = new AbortController()
-      const abortableRemote = duplex(remote, controller.signal, {
+      const abortableRemote = abortableDuplex(remote, controller.signal, {
         returnOnAbort: true
       })
 
@@ -69,8 +67,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
       // close the remote in a bit
       setTimeout(() => controller.abort(), 50)
 
-      const s1Result = pipe(infiniteRandom, s1, consume)
-      const s2Result = pipe(infiniteRandom, s2, consume)
+      const s1Result = pipe(infiniteRandom, s1.stream, drain)
+      const s2Result = pipe(infiniteRandom, s2.stream, drain)
 
       // test is complete when all muxed streams have closed
       await s1Result
@@ -78,16 +76,16 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
     })
 
     it('closing one of the muxed streams doesn\'t close others', async () => {
-      const p = pair()
+      const p = duplexPair<Uint8Array>()
       const dialer = await common.setup()
 
       // Listener is echo server :)
       const listener = await common.setup({
-        onStream: (stream) => pipe(stream, stream)
+        onStream: async (stream) => await pipe(stream, stream)
       })
 
-      pipe(p[0], dialer, p[0])
-      pipe(p[1], listener, p[1])
+      void pipe(p[0], dialer.newStream('/test/stream'), p[0])
+      void pipe(p[1], listener.newStream('/test/stream'), p[1])
 
       const stream = dialer.newStream()
       const streams = Array.from(Array(5), () => dialer.newStream())
@@ -99,8 +97,8 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
         controllers.push(controller)
 
         try {
-          const abortableRand = source(infiniteRandom, controller.signal, { abortCode: 'ERR_TEST_ABORT' })
-          await pipe(abortableRand, stream, consume)
+          const abortableRand = abortableSource(infiniteRandom, controller.signal, { abortCode: 'ERR_TEST_ABORT' })
+          await pipe(abortableRand, stream, drain)
         } catch (err: any) {
           if (err.code !== 'ERR_TEST_ABORT') throw err
         }
@@ -110,7 +108,7 @@ export default (common: TestSetup<Muxer, MuxerOptions>) => {
 
       // Pause, and then send some data and close the first stream
       await pause(50)
-      await pipe([randomBuffer()], stream, consume)
+      await pipe([randomBuffer()], stream, drain)
       closed = true
 
       // Abort all the other streams later

package/src/stream-muxer/spawner.ts

@@ -1,44 +1,45 @@
 import { expect } from 'aegir/utils/chai.js'
-// @ts-expect-error no types
-import pair from 'it-pair/duplex.js'
+import { duplexPair } from 'it-pair/duplex'
 import { pipe } from 'it-pipe'
 import pLimit from 'p-limit'
-import { collect, consume } from 'streaming-iterables'
+import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
+import drain from 'it-drain'
+import all from 'it-all'
 import type { Muxer, MuxerOptions } from '@libp2p/interfaces/stream-muxer'
 
 export default async (createMuxer: (options?: MuxerOptions) => Promise<Muxer>, nStreams: number, nMsg: number, limit?: number) => {
-  const [dialerSocket, listenerSocket] = pair()
+  const [dialerSocket, listenerSocket] = duplexPair<Uint8Array>()
 
-  const msg = 'simple msg'
+  const msg = uint8ArrayFromString('simple msg')
 
   const listener = await createMuxer({
     onStream: async (stream) => {
       await pipe(
         stream,
-        consume
+        drain
       )
 
-      pipe([], stream)
+      void pipe([], stream)
     }
   })
 
   const dialer = await createMuxer()
 
-  pipe(listenerSocket, listener, listenerSocket)
-  pipe(dialerSocket, dialer, dialerSocket)
+  void pipe(listenerSocket, listener.newStream('/test/stream'), listenerSocket)
+  void pipe(dialerSocket, dialer.newStream('/test/stream'), dialerSocket)
 
   const spawnStream = async () => {
     const stream = dialer.newStream()
     expect(stream).to.exist // eslint-disable-line
 
     const res = await pipe(
-      (function * () {
+      (async function * () {
         for (let i = 0; i < nMsg; i++) {
-          yield new Promise(resolve => resolve(msg))
+          yield msg
         }
-      })(),
+      }()),
       stream,
-      collect
+      async (source) => await all(source)
     )
 
     expect(res).to.be.eql([])