fix: fix connecting multiples node in the browser

when running with a 'proc' pre-setup we could end up with multiples in-browser setup connecting to each other. whihc isnt a very useful situation.
with this the first node gets the pre-configured config and all the others get a JS daemon.

Author: hugomrdias

package.json

@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "aegir": "^20.3.2",
-    "ipfsd-ctl": "ipfs/js-ipfsd-ctl#feat/interface-tests"
+    "ipfsd-ctl": "github:ipfs/js-ipfsd-ctl#feat/interface-tests"
   },
   "contributors": [
     "Alan Shaw <alan.shaw@protocol.ai>",

src/bitswap/wantlist.js

@@ -25,7 +25,7 @@ module.exports = (common, options) => {
       this.timeout(60 * 1000)
 
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
       // Add key to the wantlist for ipfsB
       ipfsB.block.get(key).catch(() => {})

src/miscellaneous/resolve.js

@@ -81,15 +81,8 @@ module.exports = (common, options) => {
 
     it('should resolve IPNS link recursively', async function () {
       this.timeout(20 * 1000)
-
-      // Ensure another node exists for publishing to  - only required by go-ipfs
-      if (ipfs.peerId.agentVersion.includes('go-ipfs')) {
-        const node = await common.setup()
-
-        // this fails in the browser because there is no relay node available to connect the two
-        // nodes, but we only need this for go-ipfs as it doesn't support the `allowOffline` flag yet
-        await ipfs.swarm.connect(node.peerId.addresses.find((a) => a.includes('127.0.0.1')))
-      }
+      const node = await common.setup({ type: 'js' })
+      await ipfs.swarm.connect(node.peerId.addresses[0])
 
       const [{ path }] = await ipfs.add(Buffer.from('should resolve a record recursive === true'))
       const { id: keyId } = await ipfs.key.gen('key-name', { type: 'rsa', size: 2048 })

src/ping/ping-pull-stream.js

@@ -22,7 +22,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 

src/ping/ping-readable-stream.js

@@ -23,7 +23,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 

src/ping/ping.js

@@ -25,7 +25,7 @@ module.exports = (common, options) => {
       this.timeout(60 * 1000)
 
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 

src/pubsub/peers.js

@@ -23,8 +23,8 @@ module.exports = (common, options) => {
     let subscribedTopics = []
     before(async () => {
       ipfs1 = await common.setup()
-      ipfs2 = await common.setup()
-      ipfs3 = await common.setup()
+      ipfs2 = await common.setup({ type: 'js' })
+      ipfs3 = await common.setup({ type: 'js' })
 
       const ipfs2Addr = ipfs2.peerId.addresses.find((a) => a.includes('127.0.0.1'))
       const ipfs3Addr = ipfs3.peerId.addresses.find((a) => a.includes('127.0.0.1'))

src/pubsub/subscribe.js

@@ -30,7 +30,7 @@ module.exports = (common, options) => {
       this.timeout(100 * 1000)
 
       ipfs1 = await common.setup()
-      ipfs2 = await common.setup()
+      ipfs2 = await common.setup({ type: 'js' })
     })
 
     after(() => common.teardown())

src/swarm/addrs.js

@@ -21,7 +21,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 

src/swarm/connect.js

@@ -19,7 +19,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
     })
 
     after(() => common.teardown())

src/swarm/disconnect.js

@@ -20,7 +20,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
     })
 

src/swarm/peers.js

@@ -23,7 +23,7 @@ module.exports = (common, options) => {
 
     before(async () => {
       ipfsA = await common.setup()
-      ipfsB = await common.setup()
+      ipfsB = await common.setup({ type: 'js' })
       await ipfsA.swarm.connect(ipfsB.peerId.addresses[0])
       await delay(60 * 1000) // wait for open streams in the connection available
     })
@@ -84,10 +84,8 @@ module.exports = (common, options) => {
     }
 
     it('should list peers only once', async () => {
-      const config = getConfig(['/ip4/127.0.0.1/tcp/0'])
-
-      const nodeA = await common.setup({ spawnOptions: { config } })
-      const nodeB = await common.setup({ spawnOptions: { config } })
+      const nodeA = await common.setup()
+      const nodeB = await common.setup({ type: 'js' })
       await nodeA.swarm.connect(nodeB.peerId.addresses[0])
       await delay(1000)
       const peersA = await nodeA.swarm.peers()
@@ -103,11 +101,11 @@ module.exports = (common, options) => {
         '/ip4/127.0.0.1/tcp/16544'
       ])
       const configB = getConfig([
-        '/ip4/127.0.0.1/tcp/26545',
-        '/ip4/127.0.0.1/tcp/26546'
+        '/ip4/127.0.0.1/tcp/26545/ws',
+        '/ip4/127.0.0.1/tcp/26546/ws'
       ])
-      const nodeA = await common.setup({ spawnOptions: { config: configA } })
-      const nodeB = await common.setup({ spawnOptions: { config: configB } })
+      const nodeA = await common.setup({ ipfsOptions: { config: configA } })
+      const nodeB = await common.setup({ type: 'js', ipfsOptions: { config: configB } })
       await nodeA.swarm.connect(nodeB.peerId.addresses[0])
       await delay(1000)
       const peersA = await nodeA.swarm.peers()