Merge pull request #485 from ipfs/fast-keys

Async Crypto + Less magic to 'run in the browser'
ipfs · Nov 12, 2016 · 219ef2c · 219ef2c
2 parents 6cc2d4a + 4aad341
commit 219ef2c
Show file tree

Hide file tree

Showing 52 changed files with 686 additions and 791 deletions.
diff --git a/.aegir.js b/.aegir.js
@@ -1,22 +1,12 @@
 'use strict'
 
-const path = require('path')
-
 module.exports = {
-  webpack: {
-    resolve: {
-      alias: {
-        'libp2p-ipfs': 'libp2p-ipfs-browser',
-        'node-forge': path.resolve(
-          path.dirname(require.resolve('libp2p-crypto')),
-          '../vendor/forge.bundle.js'
-        )
-      }
-    },
-    externals: {
-      mkdirp: '{}',
-      glob: '{}',
-      'simple-websocket-server': '{}'
-    }
+  karma: {
+    files: [{
+      pattern: 'node_modules/interface-ipfs-core/test/fixtures/**/*',
+      watched: false,
+      served: true,
+      included: false
+    }]
   }
-}
+}
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,16 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - 5
-  - stable
+
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -22,9 +29,6 @@ before_script:
 after_success:
   - npm run coverage-publish
 
-env:
-  - CXX=g++-4.8
-
 addons:
   firefox: 'latest'
   apt:

diff --git a/README.md b/README.md
@@ -13,7 +13,10 @@
 [![](https://img.shields.io/badge/pm-waffle-yellow.svg?style=flat-square)](https://waffle.io/ipfs/js-ipfs)
 [![](https://img.shields.io/badge/interface--ipfs--core-API%20Docs-blue.svg)](https://github.com/ipfs/interface-ipfs-core)
 [![](https://img.shields.io/badge/interface--ipfs--core-Updates-blue.svg)](https://github.com/ipfs/interface-ipfs-core/issues/55)
+![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
 
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/js-ipfs.svg)](https://saucelabs.com/u/js-ipfs)
 
 > IPFS JavaScript implementation.
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -11,7 +11,7 @@ let nodes = []
 function startNode (num, done) {
   createTempNode(num, (err, node) => {
     if (err) {
-      throw err
+      return done(err)
     }
 
     const api = new API(node.repo.path())
@@ -25,6 +25,7 @@ gulp.task('libnode:start', (done) => {
   parallel([
     (cb) => startNode(7, cb),
     (cb) => startNode(8, cb),
+    (cb) => startNode(12, cb),
     (cb) => startNode(13, cb)
   ], done)
 })

diff --git a/package.json b/package.json
@@ -5,21 +5,31 @@
   "bin": {
     "jsipfs": "src/cli/bin.js"
   },
-  "main": "lib/core/index.js",
-  "jsnext:main": "src/core/index.js",
+  "main": "src/core/index.js",
+  "browser": {
+    "libp2p-ipfs": "libp2p-ipfs-browser",
+    "./src/core/default-repo.js": "./src/core/default-repo-browser.js",
+    "./src/core/components/init-assets.js": false,
+    "./test/utils/temp-repo.js": "./test/utils/temp-repo-browser.js",
+    "stream": "readable-stream"
+  },
+  "engines": {
+    "node": ">=4.0.0",
+    "npm": ">=3.0.0"
+  },
   "scripts": {
     "lint": "aegir-lint",
     "coverage": "gulp coverage",
-    "test": "PHANTOM=off gulp test",
+    "test": "gulp test",
     "test:node": "gulp test:node",
     "test:node:core": "TEST=core npm run test:node",
     "test:node:http": "TEST=http npm run test:node",
     "test:node:cli": "TEST=cli npm run test:node",
-    "test:browser": "PHANTOM=off gulp test:browser",
+    "test:browser": "gulp test:browser",
     "build": "gulp build",
-    "release": "PHANTOM=off gulp release",
-    "release-minor": "PHANTOM=off gulp release --type minor",
-    "release-major": "PHANTOM=off gulp release --type major",
+    "release": "gulp release",
+    "release-minor": "gulp release --type minor",
+    "release-major": "gulp release --type major",
     "coverage-publish": "aegir-coverage publish"
   },
   "pre-commit": [
@@ -40,17 +50,18 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs#readme",
   "devDependencies": {
-    "aegir": "^8.1.2",
+    "aegir": "^9.1.1",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
+    "detect-node": "^2.0.3",
     "execa": "^0.5.0",
     "expose-loader": "^0.7.1",
-    "form-data": "^2.0.0",
+    "form-data": "^2.1.2",
     "fs-pull-blob-store": "^0.4.1",
     "gulp": "^3.9.1",
-    "interface-ipfs-core": "^0.16.6",
-    "left-pad": "^1.1.1",
-    "lodash": "^4.15.0",
+    "interface-ipfs-core": "^0.18.4",
+    "left-pad": "^1.1.3",
+    "lodash": "^4.16.6",
     "ncp": "^2.0.0",
     "nexpect": "^0.5.0",
     "pre-commit": "^1.1.3",
@@ -59,62 +70,57 @@
     "transform-loader": "^0.2.3"
   },
   "dependencies": {
-    "async": "^2.0.1",
-    "babel-runtime": "^6.11.6",
+    "async": "^2.1.2",
     "bl": "^1.1.2",
-    "boom": "^4.0.0",
-    "bs58": "^3.0.0",
-    "debug": "^2.2.0",
-    "detect-node": "^2.0.3",
+    "boom": "^4.2.0",
+    "debug": "^2.3.2",
     "fs-pull-blob-store": "^0.3.0",
-    "glob": "^7.0.6",
+    "glob": "^7.1.1",
     "hapi": "^15.2.0",
+    "hapi-set-header": "^1.0.2",
     "idb-pull-blob-store": "^0.5.1",
-    "ipfs-api": "^10.0.0",
-    "ipfs-bitswap": "^0.7.0",
-    "ipfs-block": "^0.4.0",
-    "ipfs-block-service": "^0.6.0",
+    "ipfs-api": "^11.1.0",
+    "ipfs-bitswap": "^0.8.1",
+    "ipfs-block": "^0.5.0",
+    "ipfs-block-service": "^0.7.0",
     "ipfs-multipart": "^0.1.0",
-    "ipfs-repo": "^0.10.0",
-    "ipfs-unixfs": "^0.1.4",
-    "ipfs-unixfs-engine": "^0.12.0",
-    "ipld-resolver": "^0.1.1",
+    "ipfs-repo": "^0.11.1",
+    "ipfs-unixfs": "^0.1.5",
+    "ipfs-unixfs-engine": "^0.13.0",
+    "ipld-resolver": "^0.2.0",
     "isstream": "^0.1.2",
-    "joi": "^9.0.4",
-    "libp2p-ipfs": "^0.14.1",
-    "libp2p-ipfs-browser": "^0.15.1",
+    "joi": "^9.2.0",
+    "libp2p-ipfs": "^0.15.0",
+    "libp2p-ipfs-browser": "^0.16.0",
     "lodash.flatmap": "^4.5.0",
     "lodash.get": "^4.4.2",
     "lodash.has": "^4.5.2",
     "lodash.set": "^4.3.2",
     "lodash.sortby": "^4.7.0",
     "lodash.values": "^4.3.0",
     "mafmt": "^2.1.2",
-    "map-limit": "0.0.1",
     "multiaddr": "^2.0.3",
     "multihashes": "^0.2.2",
     "path-exists": "^3.0.0",
     "peer-book": "^0.3.0",
-    "peer-id": "^0.7.0",
-    "peer-info": "^0.7.1",
-    "promisify-es6": "^1.0.1",
+    "peer-id": "^0.8.0",
+    "peer-info": "^0.8.0",
+    "promisify-es6": "^1.0.2",
     "pull-file": "^1.0.0",
-    "pull-paramap": "^1.1.6",
+    "pull-paramap": "^1.2.1",
     "pull-pushable": "^2.0.1",
     "pull-sort": "^1.0.0",
-    "pull-stream": "^3.4.5",
+    "pull-stream": "^3.5.0",
     "pull-stream-to-stream": "^1.3.3",
-    "pull-zip": "^2.0.0",
-    "read-pkg-up": "^1.0.1",
-    "run-parallel": "^1.1.6",
-    "run-parallel-limit": "^1.0.3",
-    "run-series": "^1.1.4",
-    "run-waterfall": "^1.1.3",
-    "stream-to-pull-stream": "^1.7.0",
+    "pull-zip": "^2.0.1",
+    "read-pkg-up": "^2.0.0",
+    "readable-stream": "^1.1.14",
+    "stream-to-pull-stream": "^1.7.2",
+    "tar-stream": "^1.5.2",
     "temp": "^0.8.3",
     "through2": "^2.0.1",
     "update-notifier": "^1.0.2",
-    "yargs": "^6.0.0"
+    "yargs": "^6.3.0"
   },
   "contributors": [
     "Andrew de Andrade <andrew@deandrade.com.br>",

diff --git a/src/cli/commands/block/get.js b/src/cli/commands/block/get.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -19,11 +19,11 @@ module.exports = {
         throw err
       }
 
-      const mh = utils.isDaemonOn()
+      const hash = utils.isDaemonOn()
         ? argv.key
-        : new Buffer(bs58.decode(argv.key))
+        : mh.fromB58String(argv.key)
 
-      ipfs.block.get(mh, (err, block) => {
+      ipfs.block.get(hash, (err, block) => {
         if (err) {
           throw err
         }

diff --git a/src/cli/commands/block/put.js b/src/cli/commands/block/put.js
@@ -1,10 +1,11 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const bl = require('bl')
 const fs = require('fs')
 const Block = require('ipfs-block')
+const waterfall = require('async/waterfall')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -15,14 +16,15 @@ function addBlock (buf) {
       throw err
     }
 
-    const block = new Block(buf)
-
-    ipfs.block.put(block, (err, block) => {
+    waterfall([
+      (cb) => ipfs.block.put(new Block(buf), cb),
+      (block, cb) => block.key(cb)
+    ], (err, key) => {
       if (err) {
         throw err
       }
 
-      console.log(bs58.encode(block.key()).toString())
+      console.log(mh.toB58String(key))
     })
   })
 }

diff --git a/src/cli/commands/block/rm.js b/src/cli/commands/block/rm.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const utils = require('../../utils')
-const bs58 = require('bs58')
+const mh = require('multihashes')
 const debug = require('debug')
 const log = debug('cli:block')
 log.error = debug('cli:block:error')
@@ -24,9 +24,7 @@ module.exports = {
         throw new Error('rm block with daemon running is not yet implemented')
       }
 
-      const mh = new Buffer(bs58.decode(argv.key))
-
-      ipfs.block.del(mh, (err) => {
+      ipfs.block.del(mh.fromB58String(argv.key), (err) => {
         if (err) {
           throw err
         }

diff --git a/src/cli/commands/object/get.js b/src/cli/commands/object/get.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const waterfall = require('async/waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,24 +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, nodeJson) => {
       if (err) {
         throw err
       }
 
-      ipfs.object.get(argv.key, {enc: 'base58'}, (err, node) => {
-        if (err) {
-          throw err
-        }
-
-        node.toJSON((err, nodeJSON) => {
-          if (err) {
-            throw err
-          }
-          nodeJSON.Data = nodeJSON.Data ? nodeJSON.Data.toString() : ''
-          console.log(JSON.stringify(nodeJSON))
-        })
-      })
+      nodeJson.Data = nodeJson.Data ? nodeJson.Data.toString() : ''
+      console.log(JSON.stringify(nodeJson))
     })
   }
 }
diff --git a/src/cli/commands/object/new.js b/src/cli/commands/object/new.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const waterfall = require('async/waterfall')
 const utils = require('../../utils')
 const debug = require('debug')
 const log = debug('cli:object')
@@ -13,23 +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
-        }
-
-        node.toJSON((err, nodeJSON) => {
-          if (err) {
-            throw err
-          }
-          console.log(nodeJSON.Hash)
-        })
-      })
+      console.log(node.Hash)
     })
   }
 }