| 
4 | 4 | const multiaddr = require('multiaddr')  | 
5 | 5 | const CID = require('cids')  | 
6 | 6 | const delay = require('delay')  | 
7 |  | -const { isNode } = require('ipfs-utils/src/env')  | 
 | 7 | +const { isNode, isBrowser } = require('ipfs-utils/src/env')  | 
8 | 8 | const { getDescribe, getIt, expect } = require('../utils/mocha')  | 
9 | 9 | 
 
  | 
10 | 10 | /** @typedef { import("ipfsd-ctl/src/factory") } Factory */  | 
@@ -103,19 +103,24 @@ module.exports = (common, options) => {  | 
103 | 103 |         '/ip4/127.0.0.1/tcp/16543',  | 
104 | 104 |         '/ip4/127.0.0.1/tcp/16544'  | 
105 | 105 |       ] : [  | 
106 |  | -        '/ip4/127.0.0.1/tcp/14578/wss/p2p-webrtc-star',  | 
107 |  | -        '/ip4/127.0.0.1/tcp/14579/wss/p2p-webrtc-star'  | 
 | 106 | +        '/ip4/127.0.0.1/tcp/14578/ws/p2p-webrtc-star',  | 
 | 107 | +        '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'  | 
108 | 108 |       ])  | 
109 | 109 |       const configB = getConfig(isNode || (common.opts && common.opts.type === 'go') ? [  | 
110 | 110 |         '/ip4/127.0.0.1/tcp/26545/ws',  | 
111 | 111 |         '/ip4/127.0.0.1/tcp/26546/ws'  | 
112 | 112 |       ] : [  | 
113 |  | -        '/ip4/127.0.0.1/tcp/14578/wss/p2p-webrtc-star',  | 
114 |  | -        '/ip4/127.0.0.1/tcp/14579/wss/p2p-webrtc-star'  | 
 | 113 | +        '/ip4/127.0.0.1/tcp/14578/ws/p2p-webrtc-star',  | 
 | 114 | +        '/ip4/127.0.0.1/tcp/14579/ws/p2p-webrtc-star'  | 
115 | 115 |       ])  | 
116 | 116 |       const nodeA = (await common.spawn({ ipfsOptions: { config: configA } })).api  | 
117 | 117 |       const nodeB = (await common.spawn({ ipfsOptions: { config: configB } })).api  | 
118 |  | -      await nodeA.swarm.connect(nodeB.peerId.addresses[0])  | 
 | 118 | + | 
 | 119 | +      // TODO: the webrtc-star transport only keeps the last listened on address around  | 
 | 120 | +      // so the browser has to use 1 as the array index  | 
 | 121 | +      // await nodeA.swarm.connect(nodeB.peerId.addresses[0])  | 
 | 122 | +      await nodeA.swarm.connect(nodeB.peerId.addresses[isBrowser ? 1 : 0])  | 
 | 123 | + | 
119 | 124 |       await delay(1000)  | 
120 | 125 |       const peersA = await nodeA.swarm.peers()  | 
121 | 126 |       const peersB = await nodeB.swarm.peers()  | 
 | 
0 commit comments