Migrate to p2p-websocket-star: Part 2/2 - Fix #1

libp2p · Sep 5, 2017 · c215da9 · c215da9
1 parent d2689f5
commit c215da9
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 57 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,8 +33,8 @@
     "debug": "^3.0.1",
     "interface-connection": "^0.3.2",
     "libp2p-crypto": "^0.10.0",
-    "mafmt": "^3.0.0",
-    "multiaddr": "^3.0.0",
+    "mafmt": "mkg20001/js-mafmt#patch-1",
+    "multiaddr": "^3.0.1",
     "once": "^1.4.0",
     "peer-id": "^0.10.0",
     "peer-info": "^0.11.0",

diff --git a/sig-server/package-lock.json b/sig-server/package-lock.json
diff --git a/sig-server/package.json b/sig-server/package.json
@@ -39,10 +39,10 @@
     "hapi": "^16.5.2",
     "inert": "^4.2.1",
     "libp2p-crypto": "^0.10.0",
-    "mafmt": "^3.0.0",
+    "mafmt": "mkg20001/js-mafmt#patch-1",
     "merge-recursive": "0.0.3",
     "minimist": "^1.2.0",
-    "multiaddr": "^3.0.0",
+    "multiaddr": "^3.0.1",
     "once": "^1.4.0",
     "peer-id": "^0.10.0",
     "peer-info": "^0.11.0",

diff --git a/sig-server/src/utils.js b/sig-server/src/utils.js
@@ -9,13 +9,13 @@ function cleanUrlSIO(ma) {
   const maStrSplit = ma.toString().split('/')
 
   if (!multiaddr.isName(ma)) {
-    return 'http://' + maStrSplit[3] + ':' + maStrSplit[5]
+    return 'http://' + maStrSplit[2] + ':' + maStrSplit[4]
   } else {
-    const wsProto = ma.protos()[2].name
+    const wsProto = ma.protos()[1].name
     if (wsProto === 'ws') {
-      return 'http://' + maStrSplit[3]
+      return 'http://' + maStrSplit[2]
     } else if (wsProto === 'wss') {
-      return 'https://' + maStrSplit[3]
+      return 'https://' + maStrSplit[2]
     } else {
       throw new Error('invalid multiaddr' + ma.toString())
     }
@@ -92,4 +92,4 @@ exports.validate = validate
 exports.Protocol = Protocol
 exports.getIdAndValidate = getIdAndValidate
 exports.validateMa = (ma) =>
-  mafmt.WebSocketsStar.matches(multiaddr(ma))
+  mafmt.WebSocketStar.matches(multiaddr(ma))
diff --git a/src/index.js b/src/index.js
@@ -197,10 +197,9 @@ class WebsocketStar {
   }
 
   filter(multiaddrs) {
-    if (!Array.isArray(multiaddrs)) {
+    if (!Array.isArray(multiaddrs))
       multiaddrs = [multiaddrs]
-    }
-    return multiaddrs.filter((ma) => mafmt.WebSocketsStar.matches(ma))
+    return multiaddrs.filter((ma) => mafmt.WebSocketStar.matches(ma))
   }
 
   _peerDiscovered(socket, maStr) {

diff --git a/src/utils.js b/src/utils.js
@@ -9,13 +9,13 @@ function cleanUrlSIO(ma) {
   const maStrSplit = ma.toString().split('/')
 
   if (!multiaddr.isName(ma)) {
-    return 'http://' + maStrSplit[3] + ':' + maStrSplit[5]
+    return 'http://' + maStrSplit[2] + ':' + maStrSplit[4]
   } else {
-    const wsProto = ma.protos()[2].name
+    const wsProto = ma.protos()[1].name
     if (wsProto === 'ws') {
-      return 'http://' + maStrSplit[3]
+      return 'http://' + maStrSplit[2]
     } else if (wsProto === 'wss') {
-      return 'https://' + maStrSplit[3]
+      return 'https://' + maStrSplit[2]
     } else {
       throw new Error('invalid multiaddr' + ma.toString())
     }
@@ -92,4 +92,4 @@ exports.validate = validate
 exports.Protocol = Protocol
 exports.getIdAndValidate = getIdAndValidate
 exports.validateMa = (ma) =>
-  mafmt.WebSocketsStar.matches(multiaddr(ma))
+  mafmt.WebSocketStar.matches(multiaddr(ma))
diff --git a/test/sig-server.js b/test/sig-server.js
@@ -25,10 +25,10 @@ describe('signalling', () => {
   let c3
   let c4
 
-  let c1mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1')
-  let c2mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo2')
-  let c3mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo3')
-  let c4mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4')
+  let c1mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1')
+  let c2mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo2')
+  let c3mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo3')
+  let c4mh = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4')
 
   it('start and stop signalling server (default port)', (done) => {
     sigServer.start((err, server) => {

diff --git a/test/transport/dial.js b/test/transport/dial.js
@@ -23,7 +23,7 @@ module.exports = (create) => {
     const maHSIP = '/ip4/148.251.206.162/tcp/9090'
 
     const maLS = '/ip4/127.0.0.1/tcp/15555'
-    const maGen = (base, id) => multiaddr(`/${base}/p2p-websockets-star/ws/ipfs/${id}`) // https
+    const maGen = (base, id) => multiaddr(`/${base}/p2p-websocket-star/ws/ipfs/${id}`) // https
     // const maGen = (base, id) => multiaddr(`/libp2p-webrtc-star${base}/ws/ipfs/${id}`)
 
     if (process.env.WEBRTC_STAR_REMOTE_SIGNAL_DNS && false) { //does not exist yet
@@ -77,7 +77,7 @@ module.exports = (create) => {
     })
 
     it('dial offline / non-exist()ent node on IPv4, check callback', (done) => {
-      let maOffline = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/ABCD')
+      let maOffline = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/ABCD')
       ws1.dial(maOffline, (err, conn) => {
         expect(err).to.exist()
         done()

diff --git a/test/transport/discovery.js b/test/transport/discovery.js
@@ -11,10 +11,10 @@ const multiaddr = require('multiaddr')
 module.exports = (create) => {
   describe('peer discovery', () => {
     let ws1
-    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo3A')
+    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo3A')
 
     let ws2
-    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo3B')
+    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo3B')
 
     it('listen on the first', (done) => {
       ws1 = create()

diff --git a/test/transport/filter.js b/test/transport/filter.js
@@ -13,16 +13,17 @@ module.exports = (create) => {
       const ws = create()
 
       const maArr = [
-        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
-        multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/9090/ws'),
-        multiaddr('/dns/libp2p.io/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
-        multiaddr('/dns/signal.libp2p.io/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
-        multiaddr('/libp2p-webrtc-star/dns/signal.libp2p.io/wss/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
-        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo2'),
-        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo3'),
-        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4'),
+        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
+        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star'),
+        multiaddr('/dns/libp2p.io/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
+        multiaddr('/dns/signal.libp2p.io/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
+        multiaddr('/dns/signal.libp2p.io/wss/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1'),
+        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo2'),
+        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo3'),
+        multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4'),
         multiaddr('/ip4/127.0.0.1/tcp/9090/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4'),
-        multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/9090/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4')
+        multiaddr('/ip4/127.0.0.1/tcp/9090/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4'),
+        multiaddr('/p2p-websocket-star/ip4/127.0.0.1/tcp/9090/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo4')
       ]
 
       const filtered = ws.filter(maArr)
@@ -31,7 +32,7 @@ module.exports = (create) => {
 
     it('filter a single addr for this transport', () => {
       const ws = create()
-      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1')
+      const ma = multiaddr('/ip4/127.0.0.1/tcp/9090/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSoooo1')
 
       const filtered = ws.filter(ma)
       expect(filtered.length).to.equal(1)

diff --git a/test/transport/listen.js b/test/transport/listen.js
@@ -12,7 +12,7 @@ module.exports = (create) => {
   describe('listen', () => {
     let ws
 
-    const ma = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooooA')
+    const ma = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooooA')
 
     before(() => {
       ws = create()

diff --git a/test/transport/reconnect.node.js b/test/transport/reconnect.node.js
@@ -15,13 +15,13 @@ module.exports = (create) => {
   describe('reconnect to signaling server', () => {
     let sigS
     let ws1
-    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6A')
+    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6A')
 
     let ws2
-    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6B')
+    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6B')
 
     let ws3
-    const ma3 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6C')
+    const ma3 = multiaddr('/ip4/127.0.0.1/tcp/13580/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo6C')
 
     before((done) => {
       sigS = sigServer.start({ port: SERVER_PORT, cryptoChallenge: false }, done)

diff --git a/test/transport/valid-connection.js b/test/transport/valid-connection.js
@@ -12,10 +12,10 @@ const pull = require('pull-stream')
 module.exports = (create) => {
   describe('valid Connection', () => {
     let ws1
-    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo5a')
+    const ma1 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo5a')
 
     let ws2
-    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websockets-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo5b')
+    const ma2 = multiaddr('/ip4/127.0.0.1/tcp/15555/ws/p2p-websocket-star/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo5b')
 
     let conn