fluencelabs/js-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/js-libp2p synced 2025-04-25 10:32:14 +00:00
Code Issues Projects Releases Wiki Activity

chore: update websockets (#806)

Browse Source 
* chore: update websockets
This commit is contained in:
Vasco Santos 2020-11-24 14:39:22 +01:00 committed by GitHub
parent b5e38def32
commit c6fd23af88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -109,7 +109,7 @@
"libp2p-secio": "^0.13.1",
"libp2p-tcp": "^0.15.1",
"libp2p-webrtc-star": "^0.20.0",
"libp2p-websockets": "^0.14.0",
"libp2p-websockets": "^0.15.0",
"multihashes": "^3.0.1",
"nock": "^13.0.3",
"p-defer": "^3.0.0",

53
test/dialing/direct.spec.js
View File

@ -7,6 +7,7 @@ const pDefer = require('p-defer')
const pWaitFor = require('p-wait-for')
const delay = require('delay')
const Transport = require('libp2p-websockets')
const filters = require('libp2p-websockets/src/filters')
const Muxer = require('libp2p-mplex')
const { NOISE: Crypto } = require('libp2p-noise')
const multiaddr = require('multiaddr')
@ -41,7 +42,7 @@ describe('Dialing (direct, WebSockets)', () => {
upgrader: mockUpgrader,
onConnection: () => {}
})
localTM.add(Transport.prototype[Symbol.toStringTag], Transport)
localTM.add(Transport.prototype[Symbol.toStringTag], Transport, { filter: filters.all })
})
afterEach(() => {
@ -292,6 +293,7 @@ describe('Dialing (direct, WebSockets)', () => {
})
describe('libp2p.dialer', () => {
const transportKey = Transport.prototype[Symbol.toStringTag]
let libp2p
afterEach(async () => {
@ -307,6 +309,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})
@ -330,6 +339,13 @@ describe('Dialing (direct, WebSockets)', () => {
maxParallelDials: 10,
maxDialsPerPeer: 1,
dialTimeout: 1e3 // 30 second dial timeout per peer
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
}
libp2p = await Libp2p.create(config)
@ -347,6 +363,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})
@ -370,6 +393,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})
@ -397,6 +427,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})
@ -414,6 +451,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})
@ -427,6 +471,13 @@ describe('Dialing (direct, WebSockets)', () => {
transport: [Transport],
streamMuxer: [Muxer],
connEncryption: [Crypto]
},
config: {
transport: {
[transportKey]: {
filter: filters.all
}
}
}
})

3
test/dialing/resolver.spec.js
View File

@ -37,11 +37,12 @@ describe('Dialing (resolvable addresses)', () => {
[libp2p, remoteLibp2p] = await peerUtils.createPeer({
number: 2,
config: {
modules: baseOptions.modules,
...baseOptions,
addresses: {
listen: [multiaddr(`${relayAddr}/p2p-circuit`)]
},
config: {
...baseOptions.config,
peerDiscovery: {
autoDial: false
}

9
test/transports/transport-manager.spec.js
View File

@ -6,6 +6,7 @@ const sinon = require('sinon')
const multiaddr = require('multiaddr')
const Transport = require('libp2p-websockets')
const filters = require('libp2p-websockets/src/filters')
const { NOISE: Crypto } = require('libp2p-noise')
const AddressManager = require('../../src/address-manager')
const TransportManager = require('../../src/transport-manager')
@ -39,7 +40,7 @@ describe('Transport Manager (WebSockets)', () => {
})
it('should be able to add and remove a transport', async () => {
tm.add(Transport.prototype[Symbol.toStringTag], Transport)
tm.add(Transport.prototype[Symbol.toStringTag], Transport, { filter: filters.all })
expect(tm._transports.size).to.equal(1)
await tm.remove(Transport.prototype[Symbol.toStringTag])
})
@ -66,7 +67,7 @@ describe('Transport Manager (WebSockets)', () => {
})
it('should be able to dial', async () => {
tm.add(Transport.prototype[Symbol.toStringTag], Transport)
tm.add(Transport.prototype[Symbol.toStringTag], Transport, { filter: filters.all })
const addr = MULTIADDRS_WEBSOCKETS[0]
const connection = await tm.dial(addr)
expect(connection).to.exist()
@ -74,7 +75,7 @@ describe('Transport Manager (WebSockets)', () => {
})
it('should fail to dial an unsupported address', async () => {
tm.add(Transport.prototype[Symbol.toStringTag], Transport)
tm.add(Transport.prototype[Symbol.toStringTag], Transport, { filter: filters.all })
const addr = multiaddr('/ip4/127.0.0.1/tcp/0')
await expect(tm.dial(addr))
.to.eventually.be.rejected()
@ -82,7 +83,7 @@ describe('Transport Manager (WebSockets)', () => {
})
it('should fail to listen with no valid address', async () => {
tm.add(Transport.prototype[Symbol.toStringTag], Transport)
tm.add(Transport.prototype[Symbol.toStringTag], Transport, { filter: filters.all })
await expect(tm.listen([listenAddr]))
.to.eventually.be.rejected()

8
test/utils/base-options.browser.js
View File

@ -1,9 +1,12 @@
'use strict'
const Transport = require('libp2p-websockets')
const filters = require('libp2p-websockets/src/filters')
const Muxer = require('libp2p-mplex')
const { NOISE: Crypto } = require('libp2p-noise')
const transportKey = Transport.prototype[Symbol.toStringTag]
module.exports = {
modules: {
transport: [Transport],
@ -16,6 +19,11 @@ module.exports = {
hop: {
enabled: false
}
},
transport: {
[transportKey]: {
filter: filters.all
}
}
}
}