webgl: fallback to ccurl

Author: Paul D Handy

app/js/ccurl-interface.js

@@ -1,8 +1,12 @@
 var ffi = require('ffi');
 var isInitialized = false;
 
-const libcurl = require('curl.lib.js');
-libcurl.init();
+let libcurl = require('curl.lib.js');
+let webglAvailable = false;
+try {
+  libcurl.init();
+  webglAvailable = true;
+} catch (e) {}
 const MAX_TIMESTAMP_VALUE = (Math.pow(3,27) - 1) / 2;
 
 var ccurlProvider = function(ccurlPath) {
@@ -162,7 +166,20 @@ var ccurlHashing = function(libccurl, trunkTransaction, branchTransaction, minWe
     var newTrytes = iotaObj.utils.transactionTrytes(txObject);
 
     switch (connection.ccurl) {
-      case 1: {
+      case 0: {
+        libcurl.pow({trytes: newTrytes, minWeight: minWeightMagnitude}).then(function(nonce) {
+          var returnedTrytes = newTrytes.substr(0, 2673-81).concat(nonce);
+          var newTxObject= iotaObj.utils.transactionObject(returnedTrytes);
+
+          // Assign the previousTxHash to this tx
+          var txHash = newTxObject.hash;
+          previousTxHash = txHash;
+
+          finalBundleTrytes.push(returnedTrytes);
+          callback(null);
+        }).catch(callback);
+      }
+      default: {
         // cCurl updates the nonce as well as the transaction hash
         libccurl.ccurl_pow.async(newTrytes, minWeightMagnitude, function(error, returnedTrytes) {
 
@@ -182,20 +199,6 @@ var ccurlHashing = function(libccurl, trunkTransaction, branchTransaction, minWe
 
           return callback(null);
         });
-        break;
-      }
-      default: {
-        libcurl.pow({trytes: newTrytes, minWeight: minWeightMagnitude}).then(function(nonce) {
-          var returnedTrytes = newTrytes.substr(0, 2673-81).concat(nonce);
-          var newTxObject= iotaObj.utils.transactionObject(returnedTrytes);
-
-          // Assign the previousTxHash to this tx
-          var txHash = newTxObject.hash;
-          previousTxHash = txHash;
-
-          finalBundleTrytes.push(returnedTrytes);
-          callback(null);
-        }).catch(callback);
       }
     }
   }

app/js/index.js

@@ -16,6 +16,13 @@ String.prototype.escapeHTML = function() {
   });
 }
 
+let webglAvailable = false;
+try {
+  require('curl.lib.js').init();
+  webglAvailable = true;
+} catch (e) {}
+
+
 var UI = (function(UI, undefined) {
   var showQuitAlert      = false;
   var isInitialized      = false;
@@ -598,11 +605,10 @@ var UI = (function(UI, undefined) {
         config.minWeightMagnitude = parseInt(document.getElementById("server_config_min_weight_magnitude").value, 10);
 
         var selectCurl = document.getElementById("server_config_curl_implementation_select")
-        if (selectCurl) {
-          config.ccurl = selectCurl.options[selectCurl.selectedIndex].value === 'ccurl' ? 1 : 0;
-        }
-        else {
-          config.ccurl = 0; 
+        if (selectCurl && webglAvailable) {
+            config.ccurl = selectCurl.options[selectCurl.selectedIndex].value === 'ccurl' ? 1 : 0;
+        } else {
+          config.ccurl = 1;
         }
 
       } else {

package.json

@@ -28,7 +28,7 @@
     "url": "https://github.com/iotaledger/wallet"
   },
   "dependencies": {
-    "curl.lib.js": "^1.0.21",
+    "curl.lib.js": "^1.0.22",
     "ffi": "^2.2.0",
     "fs-extra": "^1.0.0",
     "glob": "^7.1.2",

package.testnet.json

@@ -28,7 +28,7 @@
     "url": "https://github.com/iotaledger/wallet"
   },
   "dependencies": {
-    "curl.lib.js": "^1.0.21",
+    "curl.lib.js": "^1.0.22",
     "ffi": "^2.2.0",
     "fs-extra": "^1.0.0",
     "glob": "^7.1.2",