fix: update all deps (#176)

package.json

@@ -154,7 +154,7 @@
     "release": "aegir release"
   },
   "dependencies": {
-    "@libp2p/interface-connection": "^2.0.0",
+    "@libp2p/interface-connection": "^3.0.1",
     "@libp2p/interface-transport": "^1.0.0",
     "@libp2p/interfaces": "^3.0.1",
     "@libp2p/logger": "^2.0.0",
@@ -166,21 +166,23 @@
     "err-code": "^3.0.1",
     "it-ws": "^5.0.0",
     "p-defer": "^4.0.0",
-    "p-timeout": "^5.0.2",
+    "p-timeout": "^6.0.0",
     "wherearewe": "^1.0.0"
   },
   "devDependencies": {
-    "@libp2p/interface-mocks": "^3.0.1",
-    "@libp2p/interface-transport-compliance-tests": "^2.0.0",
+    "@libp2p/interface-mocks": "^4.0.1",
+    "@libp2p/interface-transport-compliance-tests": "^2.0.5",
     "@types/ws": "^8.2.2",
     "aegir": "^37.2.0",
     "is-loopback-addr": "^2.0.1",
     "it-all": "^1.0.6",
     "it-drain": "^1.0.5",
     "it-goodbye": "^4.0.1",
     "it-pipe": "^2.0.3",
+    "it-stream-types": "^1.0.4",
     "it-take": "^1.0.2",
-    "p-wait-for": "^4.1.0",
+    "p-wait-for": "^5.0.0",
+    "uint8arraylist": "^2.3.2",
     "uint8arrays": "^3.0.0"
   },
   "browser": {

src/socket-to-conn.ts

@@ -43,7 +43,9 @@ export function socketToMaConn (stream: DuplexWebSocket, remoteAddr: Multiaddr,
       const start = Date.now()
 
       try {
-        await pTimeout(stream.close(), CLOSE_TIMEOUT)
+        await pTimeout(stream.close(), {
+          milliseconds: CLOSE_TIMEOUT
+        })
       } catch (err) {
         const { host, port } = maConn.remoteAddr.toOptions()
         log('timeout closing stream to %s:%s after %dms, destroying it manually',

test/browser.ts

@@ -36,7 +36,7 @@ describe('libp2p-websockets', () => {
       async (source) => await all(source)
     )
 
-    expect(res).to.deep.equal([data])
+    expect(res[0].subarray()).to.equalBytes(data)
   })
 
   it('should filter out no DNS websocket addresses', function () {
@@ -65,7 +65,7 @@ describe('libp2p-websockets', () => {
         async (source) => await all(source)
       )
 
-      expect(res).to.deep.equal([data])
+      expect(res[0].subarray()).to.deep.equal(data)
     })
 
     it('many writes', async function () {
@@ -81,7 +81,7 @@ describe('libp2p-websockets', () => {
         async (source) => await all(source)
       )
 
-      expect(res).to.deep.equal(data)
+      expect(res.map(list => list.subarray())).to.deep.equal(data)
     })
   })
 

test/node.ts

@@ -17,9 +17,16 @@ import { WebSockets } from '../src/index.js'
 import * as filters from '../src/filters.js'
 import drain from 'it-drain'
 import type { Listener } from '@libp2p/interface-transport'
-
+import type { Uint8ArrayList } from 'uint8arraylist'
+import type { Source } from 'it-stream-types'
 import './compliance.node.js'
 
+async function * toBuffers (source: Source<Uint8ArrayList>) {
+  for await (const list of source) {
+    yield * list
+  }
+}
+
 const protocol = '/say-hello/1.0.0'
 const registrar = mockRegistrar()
 void registrar.handle(protocol, (evt) => {
@@ -238,7 +245,7 @@ describe('dial', () => {
       const conn = await ws.dial(ma, { upgrader })
       const stream = await conn.newStream([protocol])
 
-      await expect(all(stream.source)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
+      expect((await all(stream.source)).map(list => list.subarray())).to.deep.equal([uint8ArrayFromString('hey')])
       await conn.close()
     })
 
@@ -247,7 +254,7 @@ describe('dial', () => {
       const conn = await ws.dial(ma, { upgrader })
       const stream = await conn.newStream([protocol])
 
-      await expect(all(stream.source)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
+      expect((await all(stream.source)).map(list => list.subarray())).to.deep.equal([uint8ArrayFromString('hey')])
       await conn.close()
     })
 
@@ -319,7 +326,12 @@ describe('dial', () => {
       const s = goodbye({ source: [uint8ArrayFromString('hey')], sink: all })
       const stream = await conn.newStream([protocol])
 
-      await expect(pipe(s, stream, s)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
+      await expect(pipe(
+        s,
+        stream,
+        toBuffers,
+        s
+      )).to.eventually.deep.equal([uint8ArrayFromString('hey')])
     })
   })
 
@@ -363,7 +375,7 @@ describe('dial', () => {
       const s = goodbye({ source: [uint8ArrayFromString('hey')], sink: all })
       const stream = await conn.newStream([protocol])
 
-      const res = await pipe(s, stream, s)
+      const res = await pipe(s, stream, toBuffers, s)
 
       expect(res[0]).to.equalBytes(uint8ArrayFromString('hey'))
       await conn.close()
@@ -395,7 +407,7 @@ describe('dial', () => {
       const s = goodbye({ source: [uint8ArrayFromString('hey')], sink: all })
       const stream = await conn.newStream([protocol])
 
-      await expect(pipe(s, stream, s)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
+      await expect(pipe(s, stream, toBuffers, s)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
     })
 
     it('dial with p2p Id', async () => {
@@ -408,7 +420,7 @@ describe('dial', () => {
       })
       const stream = await conn.newStream([protocol])
 
-      await expect(pipe(s, stream, s)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
+      await expect(pipe(s, stream, toBuffers, s)).to.eventually.deep.equal([uint8ArrayFromString('hey')])
     })
   })
 })