fix: update interfaces (#32)

package.json

@@ -43,14 +43,6 @@
     ".": {
       "import": "./dist/src/index.js"
     },
-    "./multiaddr/is-loopback": {
-      "import": "./dist/src/multiaddr/is-loopback.js",
-      "types": "./dist/src/multiaddr/is-loopback.d.ts"
-    },
-    "./multiaddr/is-private": {
-      "import": "./dist/src/multiaddr/is-private.js",
-      "types": "./dist/src/multiaddr/is-private.d.ts"
-    },
     "./address-sort": {
       "import": "./dist/src/address-sort.js",
       "types": "./dist/src/address-sort.d.ts"
@@ -63,6 +55,14 @@
       "import": "./dist/src/ip-port-to-multiaddr.js",
       "types": "./dist/src/ip-port-to-multiaddr.d.ts"
     },
+    "./multiaddr/is-loopback": {
+      "import": "./dist/src/multiaddr/is-loopback.js",
+      "types": "./dist/src/multiaddr/is-loopback.d.ts"
+    },
+    "./multiaddr/is-private": {
+      "import": "./dist/src/multiaddr/is-private.js",
+      "types": "./dist/src/multiaddr/is-private.d.ts"
+    },
     "./stream-to-ma-conn": {
       "import": "./dist/src/stream-to-ma-connr.js",
       "types": "./dist/src/stream-to-ma-connr.d.ts"
@@ -160,8 +160,8 @@
     "dep-check": "aegir dep-check dist/src/**/*.js dist/test/**/*.js",
     "build": "tsc",
     "pretest": "npm run build",
-    "test": "aegir test -f ./dist/test/**/*.js",
-    "test:chrome": "npm run test -- -t browser",
+    "test": "aegir test -f ./dist/test/*.js -f ./dist/test/**/*.js",
+    "test:chrome": "npm run test -- -t browser --cov",
     "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",
@@ -171,20 +171,18 @@
   },
   "dependencies": {
     "@achingbrain/ip-address": "^8.1.0",
+    "@libp2p/logger": "^1.0.1",
     "@multiformats/multiaddr": "^10.1.1",
     "abortable-iterator": "^4.0.2",
-    "debug": "^4.3.0",
     "err-code": "^3.0.1",
     "is-loopback-addr": "^2.0.1",
     "private-ip": "^2.1.1"
   },
   "devDependencies": {
     "@libp2p/interfaces": "^1.0.3",
-    "@types/debug": "^4.1.5",
     "aegir": "^36.1.2",
+    "it-all": "^1.0.6",
     "it-pair": "^2.0.2",
-    "it-pipe": "^2.0.2",
-    "streaming-iterables": "^6.0.0",
-    "util": "^0.12.3"
+    "it-pipe": "^2.0.2"
   }
 }

src/ip-port-to-multiaddr.ts

@@ -1,11 +1,9 @@
-import debug from 'debug'
+import { logger } from '@libp2p/logger'
 import { Multiaddr } from '@multiformats/multiaddr'
 import errCode from 'err-code'
 import { Address4, Address6 } from '@achingbrain/ip-address'
 
-const log = Object.assign(debug('libp2p:ip-port-to-multiaddr'), {
-  error: debug('libp2p:ip-port-to-multiaddr:err')
-})
+const log = logger('libp2p:ip-port-to-multiaddr')
 
 export const Errors = {
   ERR_INVALID_IP_PARAMETER: 'ERR_INVALID_IP_PARAMETER',

src/stream-to-ma-conn.ts

@@ -1,10 +1,10 @@
 import { abortableSource } from 'abortable-iterator'
-import debug from 'debug'
-import type { MuxedStream } from '@libp2p/interfaces/stream-muxer'
+import { logger } from '@libp2p/logger'
+import type { Stream } from '@libp2p/interfaces/connection'
 import type { Multiaddr } from '@multiformats/multiaddr'
 import type { MultiaddrConnection } from '@libp2p/interfaces/transport'
 
-const log = debug('libp2p:stream:converter')
+const log = logger('libp2p:stream:converter')
 
 /**
  * @typedef {Object} Timeline
@@ -36,7 +36,7 @@ interface StreamOptions {
 }
 
 interface StreamProperties {
-  stream: MuxedStream
+  stream: Stream
   remoteAddr: Multiaddr
   localAddr: Multiaddr
 }
@@ -46,7 +46,7 @@ interface StreamProperties {
  * https://github.com/libp2p/interface-transport#multiaddrconnection
  */
 export function streamToMaConnection (props: StreamProperties, options: StreamOptions = {}) {
-  const { stream, remoteAddr, localAddr } = props
+  const { stream, remoteAddr } = props
   const { sink, source } = stream
   const maConn: MultiaddrConnection = {
     async sink (source) {
@@ -68,8 +68,6 @@ export function streamToMaConnection (props: StreamProperties, options: StreamOp
       }
     },
     source: (options.signal != null) ? abortableSource(source, options.signal) : source,
-    conn: stream,
-    localAddr,
     remoteAddr,
     /** @type {Timeline} */
     timeline: { open: Date.now(), close: undefined },

test/stream-to-ma-conn.spec.ts

@@ -3,15 +3,15 @@
 import { expect } from 'aegir/utils/chai.js'
 import { pair } from 'it-pair'
 import { pipe } from 'it-pipe'
-import { collect } from 'streaming-iterables'
 import { Multiaddr } from '@multiformats/multiaddr'
 import { streamToMaConnection } from '../src/stream-to-ma-conn.js'
 import { fromString as uint8ArrayFromString } from 'uint8arrays/from-string'
-import type { MuxedStream } from '@libp2p/interfaces/stream-muxer'
+import all from 'it-all'
+import type { Stream } from '@libp2p/interfaces/connection'
 import type { Duplex } from 'it-stream-types'
 
 function toMuxedStream (stream: Duplex<Uint8Array>) {
-  const muxedStream: MuxedStream = {
+  const muxedStream: Stream = {
     ...stream,
     close: () => {},
     abort: () => {},
@@ -41,7 +41,6 @@ describe('Convert stream into a multiaddr connection', () => {
     expect(maConn).to.exist()
     expect(maConn.sink).to.exist()
     expect(maConn.source).to.exist()
-    expect(maConn.localAddr).to.eql(localAddr)
     expect(maConn.remoteAddr).to.eql(remoteAddr)
     expect(maConn.timeline).to.exist()
     expect(maConn.timeline.open).to.exist()
@@ -63,7 +62,7 @@ describe('Convert stream into a multiaddr connection', () => {
     const streamData = await pipe(
       [data],
       maConn,
-      collect
+      async (source) => await all(source)
     )
 
     expect(streamData).to.eql([data])