Merge pull request #4 from englercj/master

Add fallback to browser is secp256k1

browser.js

@@ -7,7 +7,7 @@
 var EC = require("elliptic").ec;
 
 var ec = new EC("secp256k1");
-var cryptoObj = window.crypto || window.msCrypto || {};
+var cryptoObj = global.crypto || global.msCrypto || {};
 var subtle = cryptoObj.subtle || cryptoObj.webkitSubtle;
 
 function assert(condition, message) {
@@ -18,7 +18,7 @@ function assert(condition, message) {
 
 function randomBytes(size) {
   var arr = new Uint8Array(size);
-  window.crypto.getRandomValues(arr);
+  global.crypto.getRandomValues(arr);
   return new Buffer(arr);
 }
 

index.js

@@ -9,10 +9,17 @@ var promise = typeof Promise === "undefined" ?
               require("es6-promise").Promise :
               Promise;
 var crypto = require("crypto");
-// TODO(Kagami): We may fallback to pure JS implementation
-// (`browser.js`) if this modules are failed to load.
+// try to use secp256k1, fallback to browser implementation
+try {
   var secp256k1 = require("secp256k1");
   var ecdh = require("./build/Release/ecdh");
+} catch (e) {
+  if (process.env.ECCRYPTO_NO_FALLBACK) {
+    throw e;
+  } else {
+    return (module.exports = require("./browser"));
+  }
+}
 
 function assert(condition, message) {
   if (!condition) {

package.json

@@ -6,7 +6,7 @@
   "browser": "browser.js",
   "scripts": {
     "install": "node-gyp rebuild || exit 0",
-    "test": "mocha && xvfb-run -a karma start && jshint .",
+    "test": "ECCRYPTO_NO_FALLBACK=1 mocha && xvfb-run -a karma start && jshint .",
     "m": "mocha",
     "k": "xvfb-run -a karma start",
     "kc": "xvfb-run -a karma start --browsers Chromium",