Skip to content

Commit

Permalink
fix: instrument yamux over mplex (libp2p#1578)
Browse files Browse the repository at this point in the history
  • Loading branch information
@maschad
maschad committed Mar 7, 2023
1 parent ad215a0 commit 104d3a4
Show file tree
Hide file tree
Showing 44 changed files with 139 additions and 150 deletions.
4 changes: 2 additions & 2 deletions .aegir.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ export default {
webSockets()
],
streamMuxers: [
mplex(),
yamux()
yamux(),
mplex()
],
connectionEncryption: [
noise(),
Expand Down
38 changes: 19 additions & 19 deletions doc/CONFIGURATION.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ const node = await createLibp2p({
tcp(),
webSockets()
],
streamMuxers: [mplex(),yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
peerDiscovery: [MulticastDNS],
dht: kadDHT(),
Expand All @@ -271,7 +271,7 @@ import { bootstrap } from '@libp2p/bootstrap'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(),yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
peerDiscovery: [
mdns({
Expand Down Expand Up @@ -315,8 +315,8 @@ const node = await createLibp2p({
webRtc.discovery
],
streamMuxers: [
mplex(),
yamux()
yamux(),
mplex()
],
connectionEncryption: [
noise()
Expand All @@ -340,8 +340,7 @@ const node = await createLibp2p({
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand All @@ -368,6 +367,7 @@ const node = await createLibp2p({
tcp()
],
streamMuxers: [
yamux(),
mplex()
],
connectionEncryption: [
Expand Down Expand Up @@ -409,7 +409,7 @@ const delegatedContentRouting = new DelegatedContentRouting(peerId, ipfsHttpClie

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
contentRouting: [
delegatedContentRouting
Expand Down Expand Up @@ -439,7 +439,7 @@ import { noise } from '@chainsafe/libp2p-noise'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
relay: { // Circuit Relay options
enabled: true, // Allows you to dial and accept relayed connections. Does not make you a relay.
Expand Down Expand Up @@ -476,7 +476,7 @@ import { noise } from '@chainsafe/libp2p-noise'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()]
relay: { // Circuit Relay options (this config is part of libp2p core configurations)
enabled: true, // Allows you to dial and accept relayed connections. Does not make you a relay.
Expand Down Expand Up @@ -510,7 +510,7 @@ await datastore.open()

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
keychain: {
pass: 'notsafepassword123456789',
Expand Down Expand Up @@ -547,7 +547,7 @@ import { publicAddressesFirst } from '@libp2p-utils/address-sort'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
dialer: {
maxParallelDials: 100,
Expand All @@ -574,7 +574,7 @@ import { noise } from '@chainsafe/libp2p-noise'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
connectionManager: {
maxConnections: Infinity,
Expand Down Expand Up @@ -725,7 +725,7 @@ import { FaultTolerance } from '@libp2p/interface-transport'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
transportManager: {
faultTolerance: FaultTolerance.NO_FATAL
Expand Down Expand Up @@ -756,7 +756,7 @@ import { noise } from '@chainsafe/libp2p-noise'

const node = await createLibp2p({
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()]
metrics: {
enabled: true,
Expand Down Expand Up @@ -799,7 +799,7 @@ await datastore.open() // level database must be ready before node boot
const node = await createLibp2p({
datastore, // pass the opened datastore
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
peerStore: {
persistence: true,
Expand Down Expand Up @@ -832,8 +832,8 @@ const node = await createLibp2p({
webRTC.discovery
],
streamMuxers: [
mplex(),
yamux()
yamux(), mplex()

],
connectionEncryption: [
noise()
Expand Down Expand Up @@ -862,8 +862,8 @@ const node = await createLibp2p({
webRTC.discovery
],
streamMuxers: [
mplex(),
yamux()
yamux(), mplex()

],
connectionEncryption: [
noise()
Expand Down
6 changes: 3 additions & 3 deletions doc/GETTING_STARTED.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ import { yamux } from '@chainsafe/libp2p-yamux',
const node = await createLibp2p({
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()]
streamMuxers: [yamux(), mplex()]
})
```

Expand Down Expand Up @@ -144,7 +144,7 @@ const node = await createLibp2p({
},
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()]
streamMuxers: [yamux(), mplex()]
})

// start libp2p
Expand Down Expand Up @@ -203,7 +203,7 @@ const bootstrapMultiaddrs = [
const node = await createLibp2p({
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
peerDiscovery: [
bootstrap({
list: bootstrapMultiaddrs, // provide array of multiaddrs
Expand Down
6 changes: 3 additions & 3 deletions examples/auto-relay/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { yamux } from '@chainsafe/libp2p-yamux',
const node = await createLibp2p({
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
addresses: {
listen: ['/ip4/0.0.0.0/tcp/0/ws']
// TODO check "What is next?" section
Expand Down Expand Up @@ -82,7 +82,7 @@ if (!relayAddr) {
const node = await createLibp2p({
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
relay: {
enabled: true,
autoRelay: {
Expand Down Expand Up @@ -146,7 +146,7 @@ if (!autoRelayNodeAddr) {
const node = await createLibp2p({
transports: [webSockets()],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()]
streamMuxers: [yamux(), mplex()]
})

console.log(`Node started with id ${node.peerId.toString()}`)
Expand Down
3 changes: 1 addition & 2 deletions examples/auto-relay/dialer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ async function main () {
noise()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
]
})

Expand Down
3 changes: 1 addition & 2 deletions examples/auto-relay/listener.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ async function main () {
noise()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
relay: {
enabled: true,
Expand Down
3 changes: 1 addition & 2 deletions examples/auto-relay/relay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ async function main () {
noise()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
relay: {
enabled: true,
Expand Down
3 changes: 1 addition & 2 deletions examples/chat/src/libp2p.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ export async function createLibp2p (_options) {
webSockets()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand Down
2 changes: 1 addition & 1 deletion examples/connection-encryption/1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const createNode = async () => {
listen: ['/ip4/0.0.0.0/tcp/0']
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()]
})

Expand Down
2 changes: 1 addition & 1 deletion examples/delegated-routing/src/libp2p-bundle.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function Libp2pBundle ({ peerInfo, peerBook }) {
webSockets()
],
streamMuxers: [
mplex(), yamux()
yamux(), mplex()
],
peerDiscovery: [
wrtcstar.discovery
Expand Down
2 changes: 1 addition & 1 deletion examples/discovery-mechanisms/1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import bootstrapers from './bootstrappers.js'
listen: ['/ip4/0.0.0.0/tcp/0']
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
peerDiscovery: [
bootstrap({
Expand Down
3 changes: 1 addition & 2 deletions examples/discovery-mechanisms/2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ const createNode = async () => {
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand Down
4 changes: 2 additions & 2 deletions examples/discovery-mechanisms/3.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const createNode = async (bootstrappers) => {
listen: ['/ip4/0.0.0.0/tcp/0']
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
pubsub: floodsub(),
peerDiscovery: [
Expand All @@ -39,7 +39,7 @@ const createNode = async (bootstrappers) => {
]
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
pubsub: floodsub(),
peerDiscovery: [
Expand Down
16 changes: 7 additions & 9 deletions examples/discovery-mechanisms/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ const node = await createLibp2p({
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),
mplex()
],
connectionEncryption: [
noise()
Expand Down Expand Up @@ -65,8 +65,8 @@ const node = await createLibp2p({
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),
mplex()
],
connectionEncryption: [
noise()
Expand Down Expand Up @@ -132,8 +132,7 @@ const createNode = () => {
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand Down Expand Up @@ -193,8 +192,7 @@ const createNode = async (bootstrapers) => {
tcp()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand Down Expand Up @@ -225,7 +223,7 @@ const relay = await createLibp2p({
]
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
pubsub: gossipsub({ allowPublishToZeroPeers: true }),
peerDiscovery: [
Expand Down
3 changes: 1 addition & 2 deletions examples/echo/src/libp2p.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ export async function createLibp2p (_options) {
webSockets()
],
streamMuxers: [
mplex(),
yamux()
yamux(),mplex()
],
connectionEncryption: [
noise()
Expand Down
2 changes: 1 addition & 1 deletion examples/libp2p-in-the-browser/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ document.addEventListener('DOMContentLoaded', async () => {
wrtcStar.transport
],
connectionEncryption: [noise()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
peerDiscovery: [
wrtcStar.discovery,
bootstrap({
Expand Down
2 changes: 1 addition & 1 deletion examples/peer-and-content-routing/1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const createNode = async () => {
listen: ['/ip4/0.0.0.0/tcp/0']
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
dht: kadDHT()
})
Expand Down
2 changes: 1 addition & 1 deletion examples/peer-and-content-routing/2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const createNode = async () => {
listen: ['/ip4/0.0.0.0/tcp/0']
},
transports: [tcp()],
streamMuxers: [mplex(), yamux()],
streamMuxers: [yamux(), mplex()],
connectionEncryption: [noise()],
dht: kadDHT()
})
Expand Down
Loading

0 comments on commit 104d3a4

Please sign in to comment.