Use js-ipfs directly instead of ipfs-daemon

Author: haadcode

examples/ipfm/src/App.js

@@ -31,9 +31,11 @@ class App extends Component {
     // Initialize our DataStore, ie. start IPFS
     dataStore = DataStore.init({
       // Directory to which save IPFS data to
-      IpfsDataDir: '/tmp/ipfm/public222',
+      IpfsDataDir: '/ipfs/ipfd-2',
       // IPFS dev server: webrtc-star-signalling.cloud.ipfs.team
       SignalServer: '188.166.203.82:20000',
+      // Localhost webrtc-star server
+      // SignalServer: '127.0.0.1:9090',
     })
 
     dataStore.on('error', (e) => console.error(e))
@@ -94,10 +96,13 @@ class App extends Component {
   }
 
   showPeers (show) {
-    console.log("Show peers", show)
     this.setState({ showPeers: show })
   }
 
+  connectTo (multiaddr) {
+    dataStore.connectToPeer(multiaddr)
+  }
+
   onDragEnter () {
     this.setState({ dragActive: true })
   }
@@ -127,8 +132,11 @@ class App extends Component {
 
     const instructions = this.props.params && this.props.params.hash === undefined 
         ? <div className='App-instructions'>
-            Open a feed by adding the feed name to the URL, eg.<br/>
+            Open a file drop by adding the a name to the URL, eg.<br/>
             <a href="/hello-world">http://localhost:3000/hello-world</a>
+            <br/>
+            Share the link with others and once connected, <br/>
+            you'll be able to share files between you.
           </div>
         : null
 
@@ -149,7 +157,9 @@ class App extends Component {
       : null
 
     const peersElement = this.state.showPeers
-      ? <Peers peers={peers} onClick={this.showPeers.bind(this, false)}/>
+      ? <Peers peers={peers}
+               onConnectTo={this.connectTo.bind(this)}
+               onClick={this.showPeers.bind(this, false)}/>
       : null
 
     return (
@@ -159,7 +169,7 @@ class App extends Component {
         {previewElement}
         {peersElement}
         <img src={logo} className='App-logo' alt='logo' />
-        <h1>InterPlanetary File Manager</h1>
+        <h1>InterPlanetary File Exchange</h1>
         <Status className='App-status' text={status}/>
         {dropzone}
         {feedElement}

examples/ipfm/src/DataStore.js

@@ -1,7 +1,7 @@
  // Need to include this to make webpack happy
-import { Buffer } from 'buffer' // eslint-disable-line no-unused-vars
+import { Buffer } from 'buffer/' // eslint-disable-line no-unused-vars
 import EventEmitter from 'events'
-import IPFS from 'ipfs-daemon/src/ipfs-browser-daemon'
+import IPFS from './ipfs'
 import OrbitDB from 'orbit-db'
 import { readFileContents } from './read-file'
 
@@ -10,21 +10,24 @@ let instance
 class DataStore extends EventEmitter {
   constructor (options) {
     super()
-    this.ipfs = new IPFS(options)
-    this.ipfs.on('error', (e) => console.error(e))
-    this.ipfs.on('ready', () => {
-      this.timer = setInterval(() => this._updatePeers(), 1000)
+    IPFS.create(options, (err, node) => {
+      if (err) {
+        console.log(err)
+      }
+      this.ipfs = node
       this.emit('ready')
     })
   }
 
   // Open an orbit-db database and hook up to the emitted events
   openFeed (name) {
     this.orbitdb = new OrbitDB(this.ipfs)
-    this.feed = this.orbitdb.feed(name, { cachePath: '/ipfm22/ipfm.cache' })
+    this.feed = this.orbitdb.feed(name, { cachePath: '/ipfd/ipfd2.db' })
     this.feed.events.on('ready', () => this.emit('feed'))
     this.feed.events.on('history', () => this.emit('update'))
     this.feed.events.on('data', () => this.emit('update'))
+    if (this.timer) clearInterval(this.timer)
+    this.timer = setInterval(() => this._updatePeers(name), 1000)
   }
 
   getFile (hash) {
@@ -76,9 +79,16 @@ class DataStore extends EventEmitter {
       .catch((e) => console.error(e))
   }
 
+  connectToPeer (multiaddr) {
+    console.log("Connect to:", multiaddr)
+    this.ipfs.swarm.connect(multiaddr)
+      .then((res) => console.log("Connected to", multiaddr))
+      .catch((e) => console.error(e))
+  }
+
   // Get peers from IPFS and emit 'peers' event after updated
-  _updatePeers () {
-    this.ipfs.swarm.peers()
+  _updatePeers (feed) {
+    this.ipfs.pubsub.peers(feed)
       .then((peers) => this.emit('peers', peers))
       .catch((e) => console.error(e))
   }

examples/ipfm/src/ipfs.js

@@ -0,0 +1,51 @@
+// import { Buffer } from 'buffer' // eslint-disable-line no-unused-vars
+const IPFS = require('ipfs')
+
+function create (options, callback) {
+  const repoPath = options.IpfsDataDir || '/ipfd/tmp/'
+
+  const node = new IPFS(repoPath)
+
+  node.init({ emptyRepo: true, bits: 2048 }, (err) => {
+    if (err && err.message !== 'repo already exists') {
+      return callback(err)
+    }
+
+    node.config.get((err, config) => {
+      if (err) {
+        return callback(err)
+      }
+
+      const host = options.SignalServer.split(':')[0] || '127.0.0.1'
+      const port = options.SignalServer.split(':')[1] || 9090
+      const signalServer = `/libp2p-webrtc-star/ip4/${host}/tcp/${port}/ws/ipfs/${config.Identity.PeerID}`
+      
+      config.Addresses = {
+        Swarm: [
+          signalServer
+        ],
+        API: '',
+        Gateway: ''
+      }
+
+      config.Discovery.MDNS.Enabled = false
+
+      node.config.replace(config, (err) => {
+        if (err) { return callback(err) }
+
+        node.load((err) => {
+          if (err) { return callback(err) }
+          node.goOnline((err) => {
+            if (err) { return callback(err) }
+            console.log('IPFS node is ready')
+            callback(null, node)
+          })
+        })
+      })
+    })
+  })
+}
+
+module.exports = {
+  create: create
+}