From 1fc087d79e7233ff67317d2556b42330b03e5691 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Thu, 14 Mar 2019 13:30:20 +0100 Subject: [PATCH 1/7] feat: update to the latest switch --- package.json | 2 +- src/index.js | 5 ++--- test/stream-muxing.node.js | 6 +++--- test/transports.node.js | 4 +++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 32b3529889..d585857e9a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "libp2p-connection-manager": "~0.0.2", "libp2p-floodsub": "~0.15.7", "libp2p-ping": "~0.8.5", - "libp2p-switch": "~0.41.5", + "libp2p-switch": "github:libp2p/js-libp2p-switch#feat/dial-queue", "libp2p-websockets": "~0.12.1", "mafmt": "^6.0.4", "multiaddr": "^6.0.3", diff --git a/src/index.js b/src/index.js index ca01865af1..0496401c63 100644 --- a/src/index.js +++ b/src/index.js @@ -274,13 +274,12 @@ class Node extends EventEmitter { this._getPeerInfo(peer, (err, peerInfo) => { if (err) { return callback(err) } - const connFSM = this._switch.dialFSM(peerInfo, protocol, (err) => { + this._switch.dialFSM(peerInfo, protocol, (err, connFSM) => { if (!err) { this.peerBook.put(peerInfo) } + callback(err, connFSM) }) - - callback(null, connFSM) }) } diff --git a/test/stream-muxing.node.js b/test/stream-muxing.node.js index 2e200d3d4b..3aa8e0f1ae 100644 --- a/test/stream-muxing.node.js +++ b/test/stream-muxing.node.js @@ -326,10 +326,10 @@ describe('stream muxing', () => { expect(Object.keys(nodeA._switch.muxers)).to.have.length(1) expect(Object.keys(nodeB._switch.muxers)).to.have.length(1) - nodeA.dial(nodeB.peerInfo, (err) => { + nodeA.dialFSM(nodeB.peerInfo, (err, connFSM) => { expect(err).to.not.exist() - expect(nodeA._switch.connection.getAll()).to.have.length(0) - cb() + // The connection should fall back to 'unmuxed' + connFSM.once('unmuxed', () => cb()) }) }, (cb) => teardown(nodeA, nodeB, cb) diff --git a/test/transports.node.js b/test/transports.node.js index 0b3661228d..776d306a77 100644 --- a/test/transports.node.js +++ b/test/transports.node.js @@ -37,7 +37,9 @@ describe('transports', () => { node.handle('/echo/1.0.0', echo) node.start(cb) }) - ], done) + ], (err) => { + done(err) + }) }) after((done) => { From 1d22d2dd04e5ca133728bdd3743c65a6ab51bcd6 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Thu, 14 Mar 2019 13:32:18 +0100 Subject: [PATCH 2/7] chore: revent unnecessary change --- test/transports.node.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/transports.node.js b/test/transports.node.js index 776d306a77..0b3661228d 100644 --- a/test/transports.node.js +++ b/test/transports.node.js @@ -37,9 +37,7 @@ describe('transports', () => { node.handle('/echo/1.0.0', echo) node.start(cb) }) - ], (err) => { - done(err) - }) + ], done) }) after((done) => { From 1b1ef9e313aea6129332682c174d7a61e5f517c2 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Fri, 15 Mar 2019 16:07:12 +0100 Subject: [PATCH 3/7] chore: update deps --- package.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index d585857e9a..f2fc93a267 100644 --- a/package.json +++ b/package.json @@ -38,17 +38,17 @@ "./test/utils/bundle-nodejs": "./test/utils/bundle-browser" }, "dependencies": { - "async": "^2.6.1", - "debug": "^4.1.0", + "async": "^2.6.2", + "debug": "^4.1.1", "err-code": "^1.1.2", "fsm-event": "^2.1.0", "libp2p-connection-manager": "~0.0.2", - "libp2p-floodsub": "~0.15.7", + "libp2p-floodsub": "~0.15.8", "libp2p-ping": "~0.8.5", "libp2p-switch": "github:libp2p/js-libp2p-switch#feat/dial-queue", - "libp2p-websockets": "~0.12.1", - "mafmt": "^6.0.4", - "multiaddr": "^6.0.3", + "libp2p-websockets": "~0.12.2", + "mafmt": "^6.0.7", + "multiaddr": "^6.0.6", "once": "^1.4.0", "peer-book": "~0.9.1", "peer-id": "~0.12.2", @@ -57,34 +57,34 @@ }, "devDependencies": { "@nodeutils/defaults-deep": "^1.1.0", - "aegir": "^18.2.0", + "aegir": "^18.2.1", "chai": "^4.2.0", "chai-checkmark": "^1.0.1", - "cids": "~0.5.5", + "cids": "~0.5.8", "dirty-chai": "^2.0.1", "electron-webrtc": "~0.3.0", "interface-datastore": "~0.6.0", - "libp2p-bootstrap": "~0.9.3", - "libp2p-circuit": "~0.3.0", + "libp2p-bootstrap": "~0.9.7", + "libp2p-circuit": "~0.3.6", "libp2p-delegated-content-routing": "~0.2.2", "libp2p-delegated-peer-routing": "~0.2.2", - "libp2p-kad-dht": "~0.14.5", - "libp2p-mdns": "~0.12.0", + "libp2p-kad-dht": "~0.14.8", + "libp2p-mdns": "~0.12.2", "libp2p-mplex": "~0.8.4", - "libp2p-secio": "~0.11.0", - "libp2p-spdy": "~0.13.0", + "libp2p-secio": "~0.11.1", + "libp2p-spdy": "github:libp2p/js-libp2p-spdy#fix/end", "libp2p-tcp": "~0.13.0", - "libp2p-webrtc-star": "~0.15.5", - "libp2p-websocket-star": "~0.10.1", + "libp2p-webrtc-star": "~0.15.8", + "libp2p-websocket-star": "~0.10.2", "libp2p-websocket-star-rendezvous": "~0.3.0", "lodash.times": "^4.3.2", - "nock": "^10.0.2", + "nock": "^10.0.6", "pull-goodbye": "0.0.2", - "pull-mplex": "~0.1.0", + "pull-mplex": "~0.1.2", "pull-serializer": "~0.3.2", "pull-stream": "^3.6.9", - "sinon": "^7.2.4", - "wrtc": "~0.3.2" + "sinon": "^7.2.7", + "wrtc": "~0.3.5" }, "contributors": [ "Alan Shaw ", From ebce91fcacfead58dc672dacc419f5cbe26967e8 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Mon, 18 Mar 2019 11:34:38 +0100 Subject: [PATCH 4/7] chore: update spdy version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2fc93a267..56c9d6a690 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "libp2p-mdns": "~0.12.2", "libp2p-mplex": "~0.8.4", "libp2p-secio": "~0.11.1", - "libp2p-spdy": "github:libp2p/js-libp2p-spdy#fix/end", + "libp2p-spdy": "~0.13.2", "libp2p-tcp": "~0.13.0", "libp2p-webrtc-star": "~0.15.8", "libp2p-websocket-star": "~0.10.2", From dfa7221ac407931355c071daedd39148aa855b57 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Thu, 21 Mar 2019 09:59:42 +0100 Subject: [PATCH 5/7] chore: update switch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 56c9d6a690..3bd63ac7e6 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "libp2p-connection-manager": "~0.0.2", "libp2p-floodsub": "~0.15.8", "libp2p-ping": "~0.8.5", - "libp2p-switch": "github:libp2p/js-libp2p-switch#feat/dial-queue", + "libp2p-switch": "~0.42.0", "libp2p-websockets": "~0.12.2", "mafmt": "^6.0.7", "multiaddr": "^6.0.6", From da621bc1564cc7f0a4528100aa8935b4f3e30b82 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Thu, 21 Mar 2019 12:19:41 +0100 Subject: [PATCH 6/7] chore: update switch branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bd63ac7e6..91152b06cc 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "libp2p-connection-manager": "~0.0.2", "libp2p-floodsub": "~0.15.8", "libp2p-ping": "~0.8.5", - "libp2p-switch": "~0.42.0", + "libp2p-switch": "github:libp2p/js-libp2p-switch#fix/peerinfo", "libp2p-websockets": "~0.12.2", "mafmt": "^6.0.7", "multiaddr": "^6.0.6", From 6f6dd0e595f07e890cde1ba02851b168e8f84486 Mon Sep 17 00:00:00 2001 From: Jacob Heun Date: Thu, 21 Mar 2019 13:15:17 +0100 Subject: [PATCH 7/7] chore: update switch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91152b06cc..c39670680e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "libp2p-connection-manager": "~0.0.2", "libp2p-floodsub": "~0.15.8", "libp2p-ping": "~0.8.5", - "libp2p-switch": "github:libp2p/js-libp2p-switch#fix/peerinfo", + "libp2p-switch": "~0.42.1", "libp2p-websockets": "~0.12.2", "mafmt": "^6.0.7", "multiaddr": "^6.0.6",