chore: update deps (#128)

BREAKING CHANGE: uses new peer id, multiaddr, etc

Author: achingbrain

.aegir.js

@@ -5,7 +5,6 @@ const pipe = require('it-pipe')
 const { Multiaddr } = require('multiaddr')
 
 const ma = new Multiaddr('/ip4/127.0.0.1/tcp/12345/http/p2p-webrtc-direct')
-let listener
 
 const mockUpgrader = {
   upgradeInbound: maConn => maConn,
@@ -14,25 +13,28 @@ const mockUpgrader = {
 
 function before () {
   const wd = new WebRTCDirect({ upgrader: mockUpgrader })
-
-  listener = wd.createListener((conn) => pipe(conn, conn))
+  const listener = wd.createListener((conn) => pipe(conn, conn))
   listener.on('listening', () => {
     console.log('listener started on:', ma.toString())
   })
   listener.on('error', console.error)
-  return listener.listen(ma)
+  listener.listen(ma)
+
+  return {
+    listener
+  }
 }
 
-async function after () {
-  await listener.close()
+async function after (testOptions, beforeReturn) {
+  await beforeReturn.listener.close()
   // TODO: Temporary fix per wrtc issue
   // https://github.com/node-webrtc/node-webrtc/issues/636
   process.exit(0)
 }
 
 module.exports = {
-  hooks: {
-    pre: before,
-    post: after
+  test: {
+    before,
+    after
   }
 }

.github/dependabot.yml

@@ -6,9 +6,3 @@ updates:
     interval: daily
     time: "11:00"
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: aegir
-    versions:
-    - 31.0.0
-    - 31.0.1
-    - 31.0.3

package.json

@@ -13,9 +13,9 @@
     "lint": "aegir lint",
     "build": "aegir build",
     "docs": "aegir docs",
-    "test": "aegir test --target node --target browser",
-    "test:node": "aegir test --target node",
-    "test:browser": "aegir test --target browser",
+    "test": "aegir test --target node --target browser --timeout 60000 -- --exit",
+    "test:node": "aegir test --target node --timeout 60000 -- --exit",
+    "test:browser": "aegir test --target browser --timeout 60000 -- --exit",
     "release": "aegir release --target node --target browser",
     "release-minor": "aegir release --type minor --target node --target browser",
     "release-major": "aegir release --type major --target node --target browser",
@@ -43,12 +43,13 @@
     "node": ">=14.0.0"
   },
   "devDependencies": {
-    "aegir": "^30.3.0",
+    "aegir": "^33.2.2",
     "chai": "^4.3.4",
     "dirty-chai": "^2.0.1",
     "it-pipe": "^1.1.0",
-    "multiaddr": "^9.0.1",
-    "streaming-iterables": "^5.0.3",
+    "libp2p-interfaces-compliance-tests": "https://gitpkg.now.sh/libp2p/js-libp2p-interfaces/packages/compliance-tests?chore/skip-abort-while-reading-for-webrtc",
+    "multiaddr": "^10.0.0",
+    "streaming-iterables": "^6.0.0",
     "webrtcsupport": "^2.2.0"
   },
   "dependencies": {
@@ -58,11 +59,10 @@
     "debug": "^4.3.1",
     "detect-node": "^2.0.4",
     "err-code": "^3.0.0",
-    "libp2p-interfaces": "libp2p/js-interfaces#chore/skip-abort-while-reading-for-webrtc",
-    "libp2p-utils": "^0.3.0",
+    "libp2p-utils": "^0.4.1",
     "libp2p-webrtc-peer": "^10.0.1",
-    "mafmt": "^9.0.0",
-    "multibase": "^4.0.4",
+    "mafmt": "^10.0.0",
+    "multiformats": "^9.2.0",
     "once": "^1.4.0",
     "request": "^2.88.0",
     "stream-to-it": "^0.2.2",

src/index.js

@@ -10,11 +10,12 @@ const wrtc = require('wrtc')
 const SimplePeer = require('libp2p-webrtc-peer')
 const isNode = require('detect-node')
 const mafmt = require('mafmt')
-const multibase = require('multibase')
+const { base58btc } = require('multiformats/bases/base58')
 const request = require('request')
 const withIs = require('class-is')
 const { AbortError } = require('abortable-iterator')
 const toString = require('uint8arrays/to-string')
+const fromString = require('uint8arrays/from-string')
 
 const { CODE_CIRCUIT, CODE_P2P } = require('./constants')
 const toConnection = require('./socket-to-conn')
@@ -129,14 +130,15 @@ class WebRTCDirect {
       channel.on('signal', (signal) => {
         const signalStr = JSON.stringify(signal)
         const url = 'http://' + cOpts.host + ':' + cOpts.port
-        const path = '/?signal=' + toString(multibase.encode('base58btc', new TextEncoder().encode(signalStr)))
+        const path = '/?signal=' + base58btc.encode(fromString(signalStr))
+
         const uri = url + path
 
         request.get(uri, (err, res) => {
           if (err) {
             return reject(err)
           }
-          const incSignalBuf = multibase.decode(res.body)
+          const incSignalBuf = base58btc.decode(res.body)
           const incSignalStr = toString(incSignalBuf)
           const incSignal = JSON.parse(incSignalStr)
           channel.signal(incSignal)

src/listener.js

@@ -9,8 +9,9 @@ log.error = debug('libp2p:webrtcdirect:listener:error')
 const isNode = require('detect-node')
 const wrtc = require('wrtc')
 const SimplePeer = require('libp2p-webrtc-peer')
-const multibase = require('multibase')
+const { base58btc } = require('multiformats/bases/base58')
 const toString = require('uint8arrays/to-string')
+const fromString = require('uint8arrays/from-string')
 const toMultiaddr = require('libp2p-utils/src/ip-port-to-multiaddr')
 
 const toConnection = require('./socket-to-conn')
@@ -30,7 +31,7 @@ module.exports = ({ handler, upgrader }, options = {}) => {
 
     const path = req.url
     const incSignalStr = path.split('?signal=')[1]
-    const incSignalBuf = multibase.decode(incSignalStr)
+    const incSignalBuf = base58btc.decode(incSignalStr)
     const incSignal = JSON.parse(toString(incSignalBuf))
 
     options = {
@@ -54,8 +55,8 @@ module.exports = ({ handler, upgrader }, options = {}) => {
     })
     channel.on('signal', (signal) => {
       const signalStr = JSON.stringify(signal)
-      const signalEncoded = multibase.encode('base58btc', new TextEncoder().encode(signalStr))
-      res.end(toString(signalEncoded))
+      const signalEncoded = base58btc.encode(fromString(signalStr))
+      res.end(Buffer.from(signalEncoded))
     })
 
     channel.signal(incSignal)

test/compliance.js

@@ -1,7 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
-const tests = require('libp2p-interfaces/src/transport/tests')
+const tests = require('libp2p-interfaces-compliance-tests/src/transport')
 const { Multiaddr } = require('multiaddr')
 
 const WDirect = require('../src')