fix async methods everyhwere

Author: dignifiedquire

package.json

@@ -10,7 +10,12 @@
   "browser": {
     "libp2p-ipfs": "libp2p-ipfs-browser",
     "./src/core/default-repo.js": "./src/core/default-repo-browser.js",
-    "./lib/core/default-repo.js": "./lib/core/default-repo-browser.js"
+    "./lib/core/default-repo.js": "./lib/core/default-repo-browser.js",
+    "./src/core/components/init-assets.js": false,
+    "./lib/core/components/init-assets.js": false,
+    "fs-pull-blob-store": false,
+    "glob": false,
+    "rimraf": false
   },
   "scripts": {
     "lint": "aegir-lint",
@@ -115,6 +120,7 @@
     "run-series": "^1.1.4",
     "run-waterfall": "^1.1.3",
     "stream-to-pull-stream": "^1.7.0",
+    "tar-stream": "^1.5.2",
     "temp": "^0.8.3",
     "through2": "^2.0.1",
     "update-notifier": "^1.0.2",

src/cli/commands/object/get.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const waterfall = require('run-waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,20 +14,17 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    utils.getIPFS((err, ipfs) => {
+    waterfall([
+      (cb) => utils.getIPFS(cb),
+      (ipfs, cb) => ipfs.object.get(argv.key, {enc: 'base58'}, cb),
+      (node, cb) => node.toJSON(cb)
+    ], (err, res) => {
       if (err) {
         throw err
       }
 
-      ipfs.object.get(argv.key, {enc: 'base58'}, (err, node) => {
-        if (err) {
-          throw err
-        }
-
-        const res = node.toJSON()
-        res.Data = res.Data ? res.Data.toString() : ''
-        console.log(JSON.stringify(res))
-      })
+      res.Data = res.Data ? res.Data.toString() : ''
+      console.log(JSON.stringify(res))
     })
   }
 }

src/cli/commands/object/new.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const waterfall = require('run-waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,18 +14,16 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    utils.getIPFS((err, ipfs) => {
+    waterfall([
+      (cb) => utils.getIPFS(cb),
+      (ipfs, cb) => ipfs.object.new(cb),
+      (node, cb) => node.toJSON(cb)
+    ], (err, node) => {
       if (err) {
         throw err
       }
 
-      ipfs.object.new((err, node) => {
-        if (err) {
-          throw err
-        }
-
-        console.log(node.toJSON().Hash)
-      })
+      console.log(node.Hash)
     })
   }
 }

src/cli/commands/object/patch/add-link.js

@@ -4,6 +4,8 @@ const utils = require('../../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
 const mDAG = require('ipfs-merkle-dag')
+const waterfall = require('run-waterfall')
+const parallel = require('run-parallel')
 const DAGLink = mDAG.DAGLink
 log.error = debug('cli:object:error')
 
@@ -15,23 +17,29 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    utils.getIPFS((err, ipfs) => {
+    waterfall([
+      (cb) => utils.getIPFS(cb),
+      (ipfs, cb) => waterfall([
+        (cb) => ipfs.object.get(argv.ref, {enc: 'base58'}, cb),
+        (linkedObj, cb) => parallel([
+          (cb) => linkedObj.size(cb),
+          (cb) => linkedObj.multihash(cb)
+        ], cb)
+      ], (err, stats) => {
+        if (err) {
+          return cb(err)
+        }
+
+        const link = new DAGLink(argv.name, stats[0], stats[1])
+        ipfs.object.patch.addLink(argv.root, link, {enc: 'base58'}, cb)
+      }),
+      (node, cb) => node.toJSON(cb)
+    ], (err, node) => {
       if (err) {
         throw err
       }
 
-      ipfs.object.get(argv.ref, {enc: 'base58'}).then((linkedObj) => {
-        const link = new DAGLink(
-          argv.name,
-          linkedObj.size(),
-          linkedObj.multihash()
-        )
-        return ipfs.object.patch.addLink(argv.root, link, {enc: 'base58'})
-      }).then((node) => {
-        console.log(node.toJSON().Hash)
-      }).catch((err) => {
-        throw err
-      })
+      console.log(node.Hash)
     })
   }
 }

src/cli/commands/object/patch/append-data.js

@@ -3,23 +3,22 @@
 const utils = require('../../../utils')
 const bl = require('bl')
 const fs = require('fs')
+const waterfall = require('run-waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
 
 function appendData (key, data) {
-  utils.getIPFS((err, ipfs) => {
+  waterfall([
+    (cb) => utils.getIPFS(cb),
+    (ipfs, cb) => ipfs.object.patch.appendData(key, data, {enc: 'base58'}, cb),
+    (node, cb) => node.toJSON(cb)
+  ], (err, node) => {
     if (err) {
       throw err
     }
 
-    ipfs.object.patch.appendData(key, data, {enc: 'base58'}, (err, node) => {
-      if (err) {
-        throw err
-      }
-
-      console.log(node.toJSON().Hash)
-    })
+    console.log(node.Hash)
   })
 }
 

src/cli/commands/object/patch/rm-link.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const waterfall = require('run-waterfall')
 const DAGLink = require('ipfs-merkle-dag').DAGLink
 const utils = require('../../../utils')
 const debug = require('debug')
@@ -14,20 +15,18 @@ module.exports = {
   builder: {},
 
   handler (argv) {
-    utils.getIPFS((err, ipfs) => {
+    const dLink = new DAGLink(argv.link)
+
+    waterfall([
+      (cb) => utils.getIPFS(cb),
+      (ipfs, cb) => ipfs.object.patch.rmLink(argv.root, dLink, {enc: 'base58'}, cb),
+      (node, cb) => node.toJSON(cb)
+    ], (err, node) => {
       if (err) {
         throw err
       }
 
-      const dLink = new DAGLink(argv.link)
-
-      ipfs.object.patch.rmLink(argv.root, dLink, {enc: 'base58'}, (err, node) => {
-        if (err) {
-          throw err
-        }
-
-        console.log(node.toJSON().Hash)
-      })
+      console.log(node.Hash)
     })
   }
 }

src/cli/commands/object/patch/set-data.js

@@ -3,23 +3,22 @@
 const utils = require('../../../utils')
 const bl = require('bl')
 const fs = require('fs')
+const waterfall = require('run-waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
 
 function parseAndAddNode (key, data) {
-  utils.getIPFS((err, ipfs) => {
+  waterfall([
+    (cb) => utils.getIPFS(cb),
+    (ipfs, cb) => ipfs.object.patch.setData(key, data, {enc: 'base58'}, cb),
+    (node, cb) => node.toJSON(cb)
+  ], (err, node) => {
     if (err) {
       throw err
     }
 
-    ipfs.object.patch.setData(key, data, {enc: 'base58'}, (err, node) => {
-      if (err) {
-        throw err
-      }
-
-      console.log(node.toJSON().Hash)
-    })
+    console.log(node.Hash)
   })
 }
 

src/cli/commands/object/put.js

@@ -3,23 +3,22 @@
 const utils = require('../../utils')
 const bl = require('bl')
 const fs = require('fs')
+const waterfall = require('run-waterfall')
 const debug = require('debug')
 const log = debug('cli:object')
 log.error = debug('cli:object:error')
 
 function putNode (buf, enc) {
-  utils.getIPFS((err, ipfs) => {
+  waterfall([
+    (cb) => utils.getIPFS(cb),
+    (ipfs, cb) => ipfs.object.put(buf, {enc}, cb),
+    (node, cb) => node.toJSON(cb)
+  ], (err, node) => {
     if (err) {
       throw err
     }
 
-    ipfs.object.put(buf, {enc}, (err, node) => {
-      if (err) {
-        throw err
-      }
-
-      console.log('added', node.toJSON().Hash)
-    })
+    console.log('added', node.Hash)
   })
 }
 

src/core/components/files.js

@@ -11,6 +11,7 @@ const pull = require('pull-stream')
 const sort = require('pull-sort')
 const toStream = require('pull-stream-to-stream')
 const toPull = require('stream-to-pull-stream')
+const waterfall = require('run-waterfall')
 
 module.exports = function files (self) {
   const createAddPullStream = () => {
@@ -96,15 +97,20 @@ module.exports = function files (self) {
 
 function prepareFile (self, file, cb) {
   const bs58mh = multihashes.toB58String(file.multihash)
-  self.object.get(file.multihash, (err, node) => {
-    if (err) return cb(err)
 
-    cb(null, {
-      path: file.path || bs58mh,
-      hash: bs58mh,
-      size: node.size()
+  waterfall([
+    (cb) => self.object.get(file.multihash, cb),
+    (node, cb) => node.size((err, size) => {
+      if (err) {
+        return cb(err)
+      }
+      cb(null, {
+        path: file.path || bs58mh,
+        hash: bs58mh,
+        size: size
+      })
     })
-  })
+  ], cb)
 }
 
 function normalizeContent (content) {

src/core/components/init-assets.js

@@ -0,0 +1,55 @@
+'use strict'
+
+const BlockService = require('ipfs-block-service')
+const DagService = require('ipfs-merkle-dag').DAGService
+const path = require('path')
+const fs = require('fs')
+const glob = require('glob')
+const importer = require('ipfs-unixfs-engine').importer
+const pull = require('pull-stream')
+const file = require('pull-file')
+const mh = require('multihashes')
+
+// Add the default assets to the repo.
+module.exports = function addDefaultAssets (self, log, callback) {
+  const blocks = new BlockService(self._repo)
+  const dag = new DagService(blocks)
+
+  const initDocsPath = path.join(__dirname, '../../init-files/init-docs')
+  const index = __dirname.lastIndexOf('/')
+
+  pull(
+    pull.values([initDocsPath]),
+    pull.asyncMap((val, cb) => {
+      glob(path.join(val, '/**/*'), cb)
+    }),
+    pull.flatten(),
+    pull.map((element) => {
+      const addPath = element.substring(index + 1, element.length)
+      if (fs.statSync(element).isDirectory()) return
+
+      return {
+        path: addPath,
+        content: file(element)
+      }
+    }),
+    pull.filter(Boolean),
+    importer(dag),
+    pull.through((el) => {
+      if (el.path === 'files/init-docs/docs') {
+        const hash = mh.toB58String(el.multihash)
+        log('to get started, enter:')
+        log()
+        log(`\t jsipfs files cat /ipfs/${hash}/readme`)
+        log()
+      }
+    }),
+    pull.collect((err) => {
+      if (err) {
+        return callback(err)
+      }
+
+      callback(null, true)
+    })
+  )
+}