Skip to content
This repository was archived by the owner on Feb 12, 2024. It is now read-only.

Commit 5e0123b

Browse files
committed
feat: add WebRTC by default as a multiaddr
1 parent 637250d commit 5e0123b

6 files changed

+74
-14
lines changed

src/init-files/default-config-browser.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{
22
"Addresses": {
3-
"Swarm": [],
4-
"API": "/ip4/127.0.0.1/tcp/5002",
5-
"Gateway": "/ip4/127.0.0.1/tcp/9090"
3+
"Swarm": [
4+
"/libp2p-webrtc-star/dns4/star-signal.cloud.ipfs.team/wss"
5+
],
6+
"API": "",
7+
"Gateway": ""
68
},
79
"Discovery": {
810
"MDNS": {

src/init-files/default-config-node.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"Addresses": {
33
"Swarm": [
44
"/ip4/0.0.0.0/tcp/4002",
5-
"/ip4/127.0.0.1/tcp/4003/ws"
5+
"/ip4/127.0.0.1/tcp/4003/ws",
6+
"/libp2p-webrtc-star/dns4/star-signal.cloud.ipfs.team/wss"
67
],
78
"API": "/ip4/127.0.0.1/tcp/5002",
89
"Gateway": "/ip4/127.0.0.1/tcp/9090"

test/core/bitswap.spec.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ const multiaddr = require('multiaddr')
1818
const isNode = require('detect-node')
1919
const multihashing = require('multihashing-async')
2020
const CID = require('cids')
21+
const Buffer = require('safe-buffer').Buffer
2122

2223
// This gets replaced by '../utils/create-repo-browser.js' in the browser
2324
const createTempRepo = require('../utils/create-repo-node.js')
2425

2526
const IPFS = require('../../src/core')
2627

2728
function makeBlock (cb) {
28-
const d = new Buffer(`IPFS is awesome ${Math.random()}`)
29+
const d = Buffer.from(`IPFS is awesome ${Math.random()}`)
30+
2931
multihashing(d, 'sha2-256', (err, multihash) => {
3032
if (err) {
3133
return cb(err)
@@ -59,6 +61,9 @@ describe('bitswap', () => {
5961
inProcNode = new IPFS({
6062
repo: repo,
6163
config: {
64+
Addresses: {
65+
Swarm: [ '/ip4/127.0.0.1/tcp/0' ]
66+
},
6267
Discovery: {
6368
MDNS: {
6469
Enabled: false

test/core/bootstrap.spec.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ describe('bootstrap', () => {
2727
},
2828
EXPERIMENTAL: {
2929
pubsub: true
30+
},
31+
config: {
32+
Addresses: {
33+
Swarm: ['/ip4/127.0.0.1/tcp/0']
34+
}
3035
}
3136
})
3237

test/core/create-node.spec.js

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ const createTempRepo = require('../utils/create-repo-node.js')
1818
describe('create node', () => {
1919
it('custom repoPath', (done) => {
2020
const node = new IPFS({
21-
repo: '/tmp/ipfs-repo-' + Math.random()
21+
repo: '/tmp/ipfs-repo-' + Math.random(),
22+
config: {
23+
Addresses: {
24+
Swarm: []
25+
}
26+
}
2227
})
2328

2429
node.once('start', (err) => {
@@ -36,7 +41,12 @@ describe('create node', () => {
3641

3742
it('custom repo', (done) => {
3843
const node = new IPFS({
39-
repo: createTempRepo()
44+
repo: createTempRepo(),
45+
config: {
46+
Addresses: {
47+
Swarm: []
48+
}
49+
}
4050
})
4151

4252
node.once('start', (err) => {
@@ -53,7 +63,12 @@ describe('create node', () => {
5363

5464
it('IPFS.createNode', (done) => {
5565
const node = IPFS.createNode({
56-
repo: createTempRepo()
66+
repo: createTempRepo(),
67+
config: {
68+
Addresses: {
69+
Swarm: []
70+
}
71+
}
5772
})
5873

5974
node.once('start', (err) => {
@@ -76,6 +91,11 @@ describe('create node', () => {
7691
repo: createTempRepo(),
7792
init: {
7893
bits: 1024
94+
},
95+
config: {
96+
Addresses: {
97+
Swarm: []
98+
}
7999
}
80100
})
81101

@@ -94,7 +114,12 @@ describe('create node', () => {
94114
it('init: false errors (start default: true)', (done) => {
95115
const node = new IPFS({
96116
repo: createTempRepo(),
97-
init: false
117+
init: false,
118+
config: {
119+
Addresses: {
120+
Swarm: []
121+
}
122+
}
98123
})
99124
node.once('error', (err) => {
100125
expect(err).to.exist()
@@ -106,7 +131,12 @@ describe('create node', () => {
106131
const node = new IPFS({
107132
repo: createTempRepo(),
108133
init: false,
109-
start: false
134+
start: false,
135+
config: {
136+
Addresses: {
137+
Swarm: []
138+
}
139+
}
110140
})
111141

112142
let happened = false
@@ -131,6 +161,9 @@ describe('create node', () => {
131161
init: true,
132162
start: false,
133163
config: {
164+
Addresses: {
165+
Swarm: []
166+
},
134167
Bootstrap: []
135168
}
136169
})
@@ -148,6 +181,9 @@ describe('create node', () => {
148181
init: true,
149182
start: false,
150183
config: {
184+
Addresses: {
185+
Swarm: []
186+
},
151187
Bootstrap: []
152188
}
153189
})
@@ -192,6 +228,9 @@ describe('create node', () => {
192228
const node = new IPFS({
193229
repo: createTempRepo(),
194230
config: {
231+
Addresses: {
232+
Swarm: []
233+
},
195234
Bootstrap: []
196235
}
197236
})
@@ -208,6 +247,9 @@ describe('create node', () => {
208247
const options = {
209248
repo: createTempRepo(),
210249
config: {
250+
Addresses: {
251+
Swarm: []
252+
},
211253
Bootstrap: []
212254
}
213255
}

test/core/files-sharding.spec.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const dirtyChai = require('dirty-chai')
77
const expect = chai.expect
88
chai.use(dirtyChai)
99
const pull = require('pull-stream')
10+
const Buffer = require('safe-buffer').Buffer
1011

1112
const IPFS = require('../../src/core')
1213
const createTempRepo = require('../utils/create-repo-node.js')
@@ -16,7 +17,7 @@ describe('files dir', () => {
1617
for (let i = 0; i < 1005; i++) {
1718
files.push({
1819
path: 'test-folder/' + i,
19-
content: new Buffer('some content ' + i)
20+
content: Buffer.from('some content ' + i)
2021
})
2122
}
2223

@@ -27,15 +28,16 @@ describe('files dir', () => {
2728
ipfs = new IPFS({
2829
repo: createTempRepo(),
2930
config: {
31+
Addresses: {
32+
Swarm: []
33+
},
3034
Bootstrap: []
3135
}
3236
})
3337
ipfs.once('start', done)
3438
})
3539

36-
after((done) => {
37-
ipfs.stop(done)
38-
})
40+
after((done) => ipfs.stop(done))
3941

4042
it('should be able to add dir without sharding', (done) => {
4143
pull(
@@ -63,6 +65,9 @@ describe('files dir', () => {
6365
ipfs = new IPFS({
6466
repo: createTempRepo(),
6567
config: {
68+
Addresses: {
69+
Swarm: []
70+
},
6671
Bootstrap: []
6772
},
6873
EXPERIMENTAL: {

0 commit comments

Comments
 (0)