diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 046bf910..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Warning: This file is automatically synced from https://github.com/ipfs/ci-sync so if you want to change it, please change it there and ask someone to sync all repositories. -version: "{build}" - -environment: - matrix: - - nodejs_version: "6" - - nodejs_version: "8" - -matrix: - fast_finish: true - -install: - # Install Node.js - - ps: Install-Product node $env:nodejs_version - - # Upgrade npm - - npm install -g npm - - # Output our current versions for debugging - - node --version - - npm --version - - # Install our package dependencies - - npm install - -test_script: - - npm run test:node - -build: off diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 9019b1b1..00000000 --- a/circle.yml +++ /dev/null @@ -1,22 +0,0 @@ -machine: - node: - version: 8.11.3 - -test: - post: - - npm run coverage -- --upload --providers coveralls - -dependencies: - pre: - - google-chrome --version - - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - - for v in $(curl http://archive.ubuntu.com/ubuntu/pool/main/n/nss/ | grep "href=" | grep "libnss3.*deb\"" -o | grep -o "libnss3.*deb" | grep "3.28" | grep "14.04"); do curl -L -o $v http://archive.ubuntu.com/ubuntu/pool/main/n/nss/$v; done && rm libnss3-tools*_i386.deb libnss3-dev*_i386.deb - - sudo dpkg -i google-chrome.deb || true - - sudo dpkg -i libnss3*.deb || true - - sudo apt-get update - - sudo apt-get install -f || true - - sudo dpkg -i libnss3*.deb - - sudo apt-get install -f - - sudo apt-get install --only-upgrade lsb-base - - sudo dpkg -i google-chrome.deb - - google-chrome --version diff --git a/examples/chat/README.md b/examples/chat/README.md index c63582a2..23fe4c5d 100644 --- a/examples/chat/README.md +++ b/examples/chat/README.md @@ -10,4 +10,4 @@ This example creates a simple chat app in your terminal. 1. Run the listener in window 1, `node listener.js` 2. Run the dialer in window 2, `node dialer.js` 3. Type a message in either window and hit _enter_ -4. Tell youself secrets to your hearts content! +4. Tell yourself secrets to your hearts content! diff --git a/examples/chat/src/libp2p-bundle.js b/examples/chat/src/libp2p-bundle.js index 8f84e9d5..c45b4cfa 100644 --- a/examples/chat/src/libp2p-bundle.js +++ b/examples/chat/src/libp2p-bundle.js @@ -3,7 +3,7 @@ const TCP = require('libp2p-tcp') const MulticastDNS = require('libp2p-mdns') const WS = require('libp2p-websockets') -const Bootstrap = require('libp2p-railing') +const Bootstrap = require('libp2p-bootstrap') const spdy = require('libp2p-spdy') const KadDHT = require('libp2p-kad-dht') const mplex = require('libp2p-mplex') diff --git a/examples/delegated-routing/README.md b/examples/delegated-routing/README.md index debd1540..b2fdfbff 100644 --- a/examples/delegated-routing/README.md +++ b/examples/delegated-routing/README.md @@ -18,8 +18,8 @@ various Peer Discovery modules and see the impact it has on your Peer count. 1. Install IPFS locally if you dont already have it. [Install Guide](https://docs.ipfs.io/introduction/install/) 2. Run the IPFS daemon: `ipfs daemon` 3. The daemon will output a line about its API address, like `API server listening on /ip4/127.0.0.1/tcp/8080` -4. In another window output the addresses of the node: `ipfs id`. Make note of the websocket address, is will contain `/ws/` in the address. -5. In `./src/libp2p-bundle.js` replace the `delegatedApiOptions` host and port of your node if they are different. +4. In another window output the addresses of the node: `ipfs id`. Make note of the websocket address, it will contain `/ws/` in the address. +5. In `./src/libp2p-bundle.js` check if the host and port of your node are correct, according to the previous step. If they are different, replace them. 6. In `./src/App.js` replace `BootstrapNode` with your nodes Websocket address from step 4. 7. Start this example: diff --git a/examples/discovery-mechanisms/1.js b/examples/discovery-mechanisms/1.js index 13d389a0..38b3f514 100644 --- a/examples/discovery-mechanisms/1.js +++ b/examples/discovery-mechanisms/1.js @@ -6,7 +6,7 @@ const TCP = require('libp2p-tcp') const Mplex = require('libp2p-mplex') const SECIO = require('libp2p-secio') const PeerInfo = require('peer-info') -const Bootstrap = require('libp2p-railing') +const Bootstrap = require('libp2p-bootstrap') const waterfall = require('async/waterfall') const defaultsDeep = require('@nodeutils/defaults-deep') diff --git a/examples/echo/src/libp2p-bundle.js b/examples/echo/src/libp2p-bundle.js index 8f84e9d5..c45b4cfa 100644 --- a/examples/echo/src/libp2p-bundle.js +++ b/examples/echo/src/libp2p-bundle.js @@ -3,7 +3,7 @@ const TCP = require('libp2p-tcp') const MulticastDNS = require('libp2p-mdns') const WS = require('libp2p-websockets') -const Bootstrap = require('libp2p-railing') +const Bootstrap = require('libp2p-bootstrap') const spdy = require('libp2p-spdy') const KadDHT = require('libp2p-kad-dht') const mplex = require('libp2p-mplex') diff --git a/examples/encrypted-communications/README.md b/examples/encrypted-communications/README.md index a1ec9b33..844f1be6 100644 --- a/examples/encrypted-communications/README.md +++ b/examples/encrypted-communications/README.md @@ -37,4 +37,4 @@ And that's it, from now on, all your libp2p communications are encrypted. Try ru If you want to want to learn more about how SECIO works, you can read the [great write up done by Dominic Tarr](https://github.com/auditdrivencrypto/secure-channel/blob/master/prior-art.md#ipfss-secure-channel). -Importante note: SECIO hasn't been audited and so, we do not recommend to trust its security. We intent to move to TLS 1.3 once the specification is finalized and an implementation exists that we can use. +Important note: SECIO hasn't been audited and so, we do not recommend to trust its security. We intent to move to TLS 1.3 once the specification is finalized and an implementation exists that we can use. diff --git a/examples/libp2p-in-the-browser/1/src/browser-bundle.js b/examples/libp2p-in-the-browser/1/src/browser-bundle.js index c59474b2..adb94eff 100644 --- a/examples/libp2p-in-the-browser/1/src/browser-bundle.js +++ b/examples/libp2p-in-the-browser/1/src/browser-bundle.js @@ -11,7 +11,7 @@ const defaultsDeep = require('@nodeutils/defaults-deep') const libp2p = require('../../../../') // Find this list at: https://github.com/ipfs/js-ipfs/blob/master/src/core/runtime/config-browser.json -const bootstrapers = [ +const bootstrapList = [ '/dns4/ams-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd', '/dns4/sfo-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLju6m7xTh3DuokvT3886QRYqxAzb1kShaanJgW36yx', '/dns4/lon-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3', @@ -20,8 +20,8 @@ const bootstrapers = [ '/dns4/sgp-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu', '/dns4/nyc-1.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm', '/dns4/nyc-2.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmSoLV4Bbm51jM9C4gDYZQ9Cy3U6aXMJDAbzgu2fzaDs64', - '/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', - '/dns4/wss1.bootstrap.libp2p.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6' + '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic', + '/dns4/node0.preload.ipfs.io/tcp/443/wss/ipfs/Qmbut9Ywz9YEDrz8ySBSgWyJk41Uvm2QJPhwDJzJyGFsD6' ] class Node extends libp2p { @@ -60,7 +60,7 @@ class Node extends libp2p { bootstrap: { interval: 10000, enabled: true, - list: bootstrapers + list: bootstrapList } }, relay: { diff --git a/examples/libp2p-in-the-browser/1/src/index.js b/examples/libp2p-in-the-browser/1/src/index.js index b47bbb12..3b2923f9 100644 --- a/examples/libp2p-in-the-browser/1/src/index.js +++ b/examples/libp2p-in-the-browser/1/src/index.js @@ -17,24 +17,22 @@ domReady(() => { let connections = {} node.on('peer:discovery', (peerInfo) => { - console.log('Discovered a peer') const idStr = peerInfo.id.toB58String() - console.log('Discovered: ' + idStr) if (connections[idStr]) { // If we're already trying to connect to this peer, dont dial again return } + console.log('Discovered a peer:', idStr) connections[idStr] = true node.dial(peerInfo, (err, conn) => { - let timeToNextDial = 0 if (err) { // Prevent immediate connection retries from happening - timeToNextDial = 30 * 1000 + // and include a 10s jitter + const timeToNextDial = 25 * 1000 + (Math.random(0) * 10000).toFixed(0) console.log('Failed to dial:', idStr) + setTimeout(() => delete connections[idStr], timeToNextDial) } - - setTimeout(() => delete connections[idStr], timeToNextDial) }) }) @@ -49,8 +47,10 @@ domReady(() => { node.on('peer:disconnect', (peerInfo) => { const idStr = peerInfo.id.toB58String() + delete connections[idStr] console.log('Lost connection to: ' + idStr) - document.getElementById(idStr).remove() + const el = document.getElementById(idStr) + el && el.remove() }) node.start((err) => { diff --git a/package.json b/package.json index 28c340d2..1e345a3f 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "libp2p-mdns": "~0.12.0", "libp2p-mplex": "~0.8.2", "libp2p-secio": "~0.10.1", - "libp2p-spdy": "~0.12.1", + "libp2p-spdy": "~0.13.0", "libp2p-tcp": "~0.13.0", "libp2p-webrtc-star": "~0.15.5", "libp2p-websocket-star": "~0.9.0",