ipfs · alanshaw · Feb 3, 2020 · Jan 23, 2020 · Jan 24, 2020 · Jan 24, 2020
diff --git a/examples/browser-video-streaming/index.html b/examples/browser-video-streaming/index.html
@@ -2,7 +2,11 @@
   <body>
     <video id="video" controls></video>
     <script src="../../dist/index.js"></script>
+    <!--
+      TODO: uncomment once https://github.com/ipfs/js-ipfs/pull/2683 and
+      https://github.com/moshisushi/hlsjs-ipfs-loader/pull/16 are released
     <script src="https://unpkg.com/hlsjs-ipfs-loader@0.1.4/dist/index.js"></script>
+    -->
     <script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
     <script src="streaming.js"></script>
   </body>

diff --git a/examples/browser-video-streaming/streaming.js b/examples/browser-video-streaming/streaming.js
@@ -2,7 +2,6 @@
 
 /* global Hls Ipfs HlsjsIpfsLoader */
 /* eslint-env browser */
-
 document.addEventListener('DOMContentLoaded', async () => {
   const testHash = 'QmdpAidwAsBGptFB3b6A9Pyi5coEbgjHrL3K2Qrsutmj9K'
   const repoPath = 'ipfs-' + Math.random()
@@ -20,3 +19,145 @@ document.addEventListener('DOMContentLoaded', async () => {
     hls.on(Hls.Events.MANIFEST_PARSED, () => video.play())
   }
 })
+
+// TODO: remove everything below here once https://github.com/ipfs/js-ipfs/pull/2683
+// and https://github.com/moshisushi/hlsjs-ipfs-loader/pull/16 are released
+
+class HlsjsIpfsLoader {
+  constructor(config) {
+    this.ipfs = config.ipfs
+    this.hash = config.ipfsHash
+    if (config.debug === false) {
+      this.debug = function() {}
+    } else if (config.debug === true) {
+      this.debug = console.log
+    } else {
+      this.debug = config.debug
+    }
+    if(config.m3u8provider) {
+      this.m3u8provider = config.m3u8provider;
+    } else {
+      this.m3u8provider = null;
+    }
+    if(config.tsListProvider) {
+      this.tsListProvider = config.tsListProvider;
+    } else {
+      this.tsListProvider = null;
+    }
+  }
+
+  destroy() {
+  }
+
+  abort() {
+  }
+
+  load(context, config, callbacks) {
+    this.context = context
+    this.config = config
+    this.callbacks = callbacks
+    this.stats = { trequest: performance.now(), retry: 0 }
+    this.retryDelay = config.retryDelay
+    this.loadInternal()
+  }
+  /**
+   * Call this by getting the HLSIPFSLoader instance from hls.js hls.coreComponents[0].loaders.manifest.setM3U8Provider()
+   * @param {function} provider
+   */
+  setM3U8Provider(provider) {
+    this.m3u8provider = provider;
+  }
+  /**
+   *
+   * @param {function} provider
+   */
+  setTsListProvider(provider) {
+    this.tsListProvider = provider;
+  }
+
+  loadInternal() {
+    const { stats, context, callbacks } = this
+
+    stats.tfirst = Math.max(performance.now(), stats.trequest)
+    stats.loaded = 0
+
+    const urlParts = context.url.split("/")
+    const filename = urlParts[urlParts.length - 1]
+
+    if(filename.split(".")[1] === "m3u8" && this.m3u8provider !== null) {
+      const res = this.m3u8provider();
+      let data;
+      if(Buffer.isBuffer(res)) {
+        data = buf2str(res)
+      } else {
+        data = res;
+      }
+      const response = { url: context.url, data: data }
+      callbacks.onSuccess(response, stats, context)
+      return;
+    }
+    if(filename.split(".")[1] === "m3u8" && this.tsListProvider !== null) {
+      var tslist = this.tsListProvider();
+      var hash = tslist[filename];
+      if(hash) {
+        this.cat(hash).then(res => {
+          let data;
+          if(Buffer.isBuffer(res)) {
+            data = buf2str(res)
+          } else {
+            data = res;
+          }
+          stats.loaded = stats.total = data.length
+          stats.tload = Math.max(stats.tfirst, performance.now())
+          const response = { url: context.url, data: data }
+          callbacks.onSuccess(response, stats, context)
+        });
+      }
+      return;
+    }
+    getFile(this.ipfs, this.hash, filename, this.debug).then(res => {
+      const data = (context.responseType === 'arraybuffer') ? res : buf2str(res)
+      stats.loaded = stats.total = data.length
+      stats.tload = Math.max(stats.tfirst, performance.now())
+      const response = { url: context.url, data: data }
+      callbacks.onSuccess(response, stats, context)
+    }, console.error)
+  }
+}
+
+async function getFile(ipfs, rootHash, filename, debug) {
+  debug(`Fetching hash for '${rootHash}/${filename}'`)
+  if(filename === null) {
+    return cat(rootHash, ipfs, debug)
+  }
+
+  for await (const link of ipfs.ls(rootHash)) {
+    if (link.name !== filename) {
+      continue
+    }
+
+    debug(`Requesting '${link.path}'`)
+
+    return cat(link.cid, ipfs, debug)
+  }
+
+  throw new Error(`File not found: ${rootHash}/${filename}`)
+}
+
+function buf2str(buf) {
+  return String.fromCharCode.apply(null, new Uint8Array(buf))
+}
+
+async function cat (cid, ipfs, debug) {
+  let value = new Uint8Array(0)
+
+  for await (const buf of ipfs.cat(cid)) {
+    const newBuf = new Uint8Array(value.length + buf.length)
+    newBuf.set(value)
+    newBuf.set(buf, value.length)
+    value = newBuf
+  }
+
+  debug(`Received data for file '${cid}' size: ${value.length}`)
+  return value
+}
diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "dependencies": {
     "ipfs": "file:../../",
-    "ipfs-pubsub-room": "^1.4.0"
+    "ipfs-pubsub-room": "^2.0.0"
   },
   "devDependencies": {
     "aegir": "^20.0.0",

diff --git a/examples/circuit-relaying/src/helpers.js b/examples/circuit-relaying/src/helpers.js
@@ -15,7 +15,7 @@ const mkRoomName = (name) => {
 
 module.exports = (ipfs, peersSet) => {
   const createRoom = (name) => {
-    const room = Room(ipfs, mkRoomName(name))
+    const room = new Room(ipfs, mkRoomName(name))
 
     room.on('peer joined', (peer) => {
       console.log('peer ' + peer + ' joined')
@@ -31,9 +31,9 @@ module.exports = (ipfs, peersSet) => {
 
     // send and receive messages
     room.on('message', (message) => {
-      console.log('got message from ' + message.from + ': ' + message.data.toString())
+      console.log('got message from ' + message.from.toString() + ': ' + message.data.toString())
       const node = document.createElement(`li`)
-      node.innerText = `${message.from.substr(-4)}: ${message.data.toString()}`
+      node.innerText = `${message.from.toString().substr(-4)}: ${message.data.toString()}`
       $msgs.appendChild(node)
     })
 

diff --git a/examples/circuit-relaying/test.js b/examples/circuit-relaying/test.js
@@ -66,7 +66,7 @@ async function runTest () {
 
   try {
     const id = await ipfsd.api.id()
-    const address = id.addresses.filter(addr => addr.includes('/ws/ipfs/Qm')).pop()
+    const address = id.addresses.filter(addr => addr.includes('/ws/p2p/Qm')).pop()
 
     if (!address) {
       throw new Error(`Could not find web socket address in ${id.addresses}`)
@@ -145,8 +145,8 @@ module.exports[pkg.name] = function (browser) {
         .pause(1000)
         .click('#send')
 
-      browser.expect.element('#msgs').text.to.contain(`${remotePeerId.substr(-4)}: hello`)
-      browser.expect.element('#msgs').text.to.contain(`${localPeerId.substr(-4)}: hello`)
+      browser.expect.element('#msgs').text.to.contain(`${remotePeerId.toString().substr(-4)}: hello`)
+      browser.expect.element('#msgs').text.to.contain(`${localPeerId.toString().substr(-4)}: hello`)
     })
 
   browser.end()

diff --git a/examples/custom-ipfs-repo/index.js b/examples/custom-ipfs-repo/index.js
@@ -79,19 +79,23 @@ async function main () {
   console.log('Version:', version)
 
   // Once we have the version, let's add a file to IPFS
-  const filesAdded = await node.add({
+  for await (const file of node.add({
     path: 'test-data.txt',
     content: Buffer.from('We are using a customized repo!')
-  })
+  })) {
+    // Log out the added files metadata and cat the file from IPFS
+    console.log('\nAdded file:', file.path, file.cid)
 
-  // Log out the added files metadata and cat the file from IPFS
-  console.log('\nAdded file:', filesAdded[0].path, filesAdded[0].hash)
+    const bufs = []
 
-  const data = await node.cat(filesAdded[0].hash)
+    for await (const buf of node.cat(file.cid)) {
+      bufs.push(buf)
+    }
 
-  // Print out the files contents to console
-  console.log('\nFetched file content:')
-  process.stdout.write(data)
+    // Print out the files contents to console
+    console.log('\nFetched file content:')
+    process.stdout.write(Buffer.concat(bufs))
+  }
 
   // After everything is done, shut the node down
   console.log('\n\nStopping the node')

diff --git a/examples/custom-libp2p/index.js b/examples/custom-libp2p/index.js
@@ -1,14 +1,13 @@
 'use strict'
 
 const Libp2p = require('libp2p')
-const IPFS = require('ipfs')
+const IPFS = require('../../')
 const TCP = require('libp2p-tcp')
 const MulticastDNS = require('libp2p-mdns')
-const WebSocketStar = require('libp2p-websocket-star')
 const Bootstrap = require('libp2p-bootstrap')
 const SPDY = require('libp2p-spdy')
 const KadDHT = require('libp2p-kad-dht')
-const MPLEX = require('pull-mplex')
+const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 
 /**
@@ -32,11 +31,6 @@ const libp2pBundle = (opts) => {
   const peerBook = opts.peerBook
   const bootstrapList = opts.config.Bootstrap
 
-  // Create our WebSocketStar transport and give it our PeerId, straight from the ipfs node
-  const wsstar = new WebSocketStar({
-    id: peerInfo.id
-  })
-
   // Build and return our libp2p node
   return new Libp2p({
     peerInfo,
@@ -49,8 +43,7 @@ const libp2pBundle = (opts) => {
     },
     modules: {
       transport: [
-        TCP,
-        wsstar
+        TCP
       ],
       streamMuxer: [
         MPLEX,
@@ -61,8 +54,7 @@ const libp2pBundle = (opts) => {
       ],
       peerDiscovery: [
         MulticastDNS,
-        Bootstrap,
-        wsstar.discovery
+        Bootstrap
       ],
       dht: KadDHT
     },

diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json
@@ -9,18 +9,17 @@
   },
   "license": "MIT",
   "dependencies": {
-    "ipfs": "file:../../",
-    "libp2p": "^0.26.2",
-    "libp2p-bootstrap": "~0.9.7",
-    "libp2p-kad-dht": "~0.16.0",
-    "libp2p-mdns": "~0.12.2",
-    "libp2p-secio": "~0.11.1",
-    "libp2p-spdy": "~0.13.3",
-    "libp2p-tcp": "~0.13.0",
-    "libp2p-websocket-star": "~0.10.2",
-    "pull-mplex": "~0.1.0"
+    "libp2p": "^0.27.0-rc.0",
+    "libp2p-bootstrap": "^0.10.3",
+    "libp2p-kad-dht": "^0.18.3",
+    "libp2p-mdns": "^0.13.1",
+    "libp2p-mplex": "^0.9.3",
+    "libp2p-secio": "^0.12.2",
+    "libp2p-spdy": "^0.13.3",
+    "libp2p-tcp": "^0.14.3",
+    "libp2p-webrtc-star": "^0.17.2"
   },
   "devDependencies": {
-    "execa": "^3.2.0"
+    "execa": "^4.0.0"
   }
 }
diff --git a/examples/custom-libp2p/test.js b/examples/custom-libp2p/test.js
@@ -5,13 +5,11 @@ const execa = require('execa')
 const Libp2p = require('libp2p')
 const TCP = require('libp2p-tcp')
 const SPDY = require('libp2p-spdy')
-const MPLEX = require('pull-mplex')
+const MPLEX = require('libp2p-mplex')
 const SECIO = require('libp2p-secio')
 const PeerInfo = require('peer-info')
 const PeerId = require('peer-id')
 const multiaddr = require('multiaddr')
-const promisify = require('promisify-es6')
-const PeerBook = require('peer-book')
 
 async function test () {
   let output = ''
@@ -31,12 +29,11 @@ async function test () {
 
       console.info('Dialling', address)
 
-      const peerInfo = new PeerInfo(await promisify(PeerId.create)())
+      const peerInfo = new PeerInfo(await PeerId.create())
       peerInfo.multiaddrs.add(multiaddr('/ip4/127.0.0.1/tcp/0'))
 
       const libp2p = new Libp2p({
         peerInfo,
-        peerBook: new PeerBook(),
         modules: {
           transport: [
             TCP