Made prototypes in the util dir classes (#288)

* utils/utils.js classed

* utils/helpers.js classed

* util/crypto.js classed

* retrieved function deferred

* Helper function now cleaned up

* resolving codacy warning

lib/client/api/crypto_provider.js

@@ -46,7 +46,7 @@ module.exports = function (jiffClient) {
     msg = JSON.stringify(msg);
 
     // Setup deferred to handle receiving the result later.
-    jiffClient.deferreds[op_id] = new jiffClient.helpers.Deferred();
+    jiffClient.deferreds[op_id] = jiffClient.helpers.createDeferred();
     const result = jiffClient.deferreds[op_id].promise;
 
     // send a request to the server.

lib/client/arch/hooks.js

@@ -7,7 +7,8 @@
  * @namespace
  */
 
-const crypto = require('../util/crypto.js');
+const Crypto = require('../util/crypto.js');
+const cryptoInstance = new Crypto();
 const shamir_share = require('../protocols/shamir/share.js');
 const shamir_open = require('../protocols/shamir/open.js');
 
@@ -48,15 +49,15 @@ Hooks.prototype.reconstructShare = shamir_open.jiff_lagrange;
 // Crypto hooks
 Hooks.prototype.encryptSign = function (jiffClient, message) {
   if (jiffClient.sodium_ !== false) {
-    return crypto.encrypt_and_sign.apply(null, arguments);
+    return cryptoInstance.encrypt_and_sign.apply(null, arguments);
   } else {
     return message;
   }
 };
 
 Hooks.prototype.decryptSign = function (jiffClient, cipher) {
   if (jiffClient.sodium_ !== false) {
-    return crypto.decrypt_and_sign.apply(null, arguments);
+    return cryptoInstance.decrypt_and_sign.apply(null, arguments);
   } else {
     return cipher;
   }

lib/client/handlers/sharing.js

@@ -25,7 +25,7 @@ module.exports = function (jiffClient) {
     }
     if (jiffClient.deferreds[op_id][sender_id] == null) {
       // Share is received before deferred was setup, store it.
-      jiffClient.deferreds[op_id][sender_id] = new jiffClient.helpers.Deferred();
+      jiffClient.deferreds[op_id][sender_id] = jiffClient.helpers.createDeferred();
     }
 
     // Deferred is already setup, resolve it.

lib/client/preprocessing/api.js

@@ -139,7 +139,7 @@ module.exports = function (jiffClient) {
       id: null,
       params: params,
       protocols: protocols,
-      deferred: new jiffClient.helpers.Deferred()
+      deferred: jiffClient.helpers.createDeferred()
     };
 
     preprocessingTasks[preprocessingTasks.length - 1].add(task);

lib/client/preprocessing/daemon.js

@@ -7,8 +7,8 @@ module.exports = function (jiffClient) {
     if (task.count > 1) {
       const remainingTasks = Object.assign({}, task);
 
-      const deferred1 = new jiffClient.helpers.Deferred();
-      const deferred2 = new jiffClient.helpers.Deferred();
+      const deferred1 = jiffClient.helpers.createDeferred();
+      const deferred2 = jiffClient.helpers.createDeferred();
       Promise.all([deferred1.promise, deferred2.promise]).then(task.deferred.resolve);
       task.deferred = deferred1;
       remainingTasks.deferred = deferred2;
@@ -165,7 +165,7 @@ module.exports = function (jiffClient) {
         id: null,
         params: extra_params,
         protocols: task.protocols,
-        deferred: new jiffClient.helpers.Deferred()
+        deferred: jiffClient.helpers.createDeferred()
       };
 
       deferredChain.push(nextTask.deferred.promise);

lib/client/protocols/arrays/open.js

@@ -30,7 +30,7 @@ const open_ND_array = function (jiff, shares, receivers_list, senders_list, op_i
    *}
    */
 
-  const final_deferred = new jiff.helpers.Deferred();
+  const final_deferred = jiff.helpers.createDeferred();
   const final_promise = final_deferred.promise;
   const resolve_open = function (shares) {
     final_deferred.resolve(

lib/client/protocols/arrays/share.js

@@ -79,7 +79,7 @@ const share_2D_array = function (jiff, array, lengths, threshold, receivers_list
   }
 
   // wrap around result of share_array
-  const lengths_deferred = new jiff.helpers.Deferred();
+  const lengths_deferred = jiff.helpers.createDeferred();
   const lengths_promise = lengths_deferred.promise;
 
   // figure out lengths by having each party emit their length publicly
@@ -122,7 +122,7 @@ const share_2D_array = function (jiff, array, lengths, threshold, receivers_list
   }
 
   // Final results
-  const share_array_deferred = new jiff.helpers.Deferred();
+  const share_array_deferred = jiff.helpers.createDeferred();
   const share_array_promise = share_array_deferred.promise;
 
   // lengths are now set, start sharing
@@ -213,7 +213,7 @@ const share_array_single_sender = function (jiff, secrets, threshold, receivers_
     const isReceiving = receivers_list.indexOf(jiff.id) > -1;
     let deferred_array;
     if (isReceiving) {
-      deferred_array = new jiff.helpers.Deferred();
+      deferred_array = jiff.helpers.createDeferred();
       Promise.all(promised_array).then(function (array) {
         deferred_array.resolve(array);
       });
@@ -242,7 +242,7 @@ const share_ND_array_deferred = function (jiff, secrets, skeletons, threshold, r
   const final_deferreds = [];
   for (let i = 0; i < senders_list.length; i++) {
     const p_id = senders_list[i];
-    final_deferreds[p_id] = new jiff.helpers.Deferred();
+    final_deferreds[p_id] = jiff.helpers.createDeferred();
   }
 
   const share_from_skeleton = share_from_skeleton_unbound.bind(null, jiff).bind(null, {
@@ -277,7 +277,7 @@ const share_ND_array_deferred = function (jiff, secrets, skeletons, threshold, r
   }
 
   // Combine all promises and re-index final array map
-  const final_deferred = new jiff.helpers.Deferred();
+  const final_deferred = jiff.helpers.createDeferred();
   const final_promise = isReceiving ? final_deferred.promise : Promise.resolve({});
   Promise.all(
     (function () {

lib/client/protocols/bits/arithmetic.js

@@ -355,7 +355,7 @@ module.exports = {
     result = result.shares;
 
     // Resolve result when ready
-    const final_deferred = new jiff.helpers.Deferred();
+    const final_deferred = jiff.helpers.createDeferred();
     final_deferred.promise.then(jiff.utils.resolve_many_secrets.bind(null, deferreds));
 
     // get useless share of zero (just for padding)
@@ -432,7 +432,7 @@ module.exports = {
     result = result.shares;
 
     // Resolve result when ready
-    const final_deferred = new jiff.helpers.Deferred();
+    const final_deferred = jiff.helpers.createDeferred();
     final_deferred.promise.then(jiff.utils.resolve_many_secrets.bind(null, deferreds));
 
     // Loop over *shortest* array one bit at a time
@@ -507,7 +507,7 @@ module.exports = {
     remainder = remainder.shares;
 
     // Resolve result when ready
-    const final_deferred = new jiff.helpers.Deferred();
+    const final_deferred = jiff.helpers.createDeferred();
     final_deferred.promise.then(function (result) {
       jiff.utils.resolve_many_secrets(remainderDeferreds, result);
     });
@@ -613,7 +613,7 @@ module.exports = {
     remainder = remainder.shares;
 
     // Resolve result when ready
-    const final_deferred = new jiff.helpers.Deferred();
+    const final_deferred = jiff.helpers.createDeferred();
     final_deferred.promise.then(jiff.utils.resolve_many_secrets.bind(null, remainderDeferreds));
 
     const initial = []; // initial remainder
@@ -707,7 +707,7 @@ module.exports = {
     remainder = remainder.shares;
 
     // Resolve result when ready
-    const final_deferred = new jiff.helpers.Deferred();
+    const final_deferred = jiff.helpers.createDeferred();
     final_deferred.promise.then(jiff.utils.resolve_many_secrets.bind(null, remainderDeferreds));
 
     const initial = []; // initial remainder

lib/client/protocols/bits/comparison.js

@@ -58,7 +58,7 @@ module.exports = {
       return true;
     }
 
-    const deferred = new jiff.helpers.Deferred();
+    const deferred = jiff.helpers.createDeferred();
     const result = new jiff.SecretShare(deferred.promise, bits[0].holders, bits[0].threshold, bits[0].Zp);
 
     // big or of bitwise XORs
@@ -133,7 +133,7 @@ module.exports = {
     }
 
     // initialize result
-    const deferred = new jiff.helpers.Deferred();
+    const deferred = jiff.helpers.createDeferred();
     const result = new jiff.SecretShare(deferred.promise, bits[0].holders, bits[0].threshold, bits[0].Zp);
 
     // Subtract bits2 from bits1, only keeping track of borrow
@@ -249,7 +249,7 @@ module.exports = {
     bits2 = bits2.slice();
 
     // initialize result
-    const deferred = new jiff.helpers.Deferred();
+    const deferred = jiff.helpers.createDeferred();
     const result = new jiff.SecretShare(deferred.promise, bits1[0].holders, Math.max(bits1[0].threshold, bits2[0].threshold), bits1[0].Zp);
 
     // big or of bitwise XORs
@@ -311,7 +311,7 @@ module.exports = {
     bits2 = bits2.slice();
 
     // initialize result
-    const deferred = new jiff.helpers.Deferred();
+    const deferred = jiff.helpers.createDeferred();
     const result = new jiff.SecretShare(deferred.promise, bits1[0].holders, Math.max(bits1[0].threshold, bits2[0].threshold), bits1[0].Zp);
 
     // Subtract bits2 from bits1, only keeping track of borrow

lib/client/protocols/numbers/arithmetic.js

@@ -182,7 +182,7 @@ module.exports = function (SecretShare) {
     }
 
     // final result
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, Math.max(this.threshold, o.threshold), this.Zp);
 
@@ -354,7 +354,7 @@ module.exports = function (SecretShare) {
     }
 
     // Allocate share for result to which the answer will be resolved once available
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, this.threshold, this.Zp);
 

lib/client/protocols/numbers/comparison.js

@@ -113,7 +113,7 @@ module.exports = function (SecretShare) {
       op_id = this.jiff.counters.gen_op_id('slt', this.holders);
     }
 
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, Math.max(this.threshold, o.threshold), this.Zp);
 
@@ -184,7 +184,7 @@ module.exports = function (SecretShare) {
       op_id = this.jiff.counters.gen_op_id('cgt', this.holders);
     }
 
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, this.threshold, this.Zp);
 
@@ -255,7 +255,7 @@ module.exports = function (SecretShare) {
       op_id = this.jiff.counters.gen_op_id('clt', this.holders);
     }
 
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, this.threshold, this.Zp);
 
@@ -401,7 +401,7 @@ module.exports = function (SecretShare) {
     const bitLength = this.jiff.share_helpers['ceil'](this.jiff.helpers.bLog(share.Zp, 2));
 
     // Create result share
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, this.threshold, this.Zp);
 

lib/client/protocols/numbers/protocols.js

@@ -16,7 +16,7 @@ module.exports = function (SecretShare) {
     }
 
     // final result
-    const final_deferred = new this.jiff.helpers.Deferred();
+    const final_deferred = this.jiff.helpers.createDeferred();
     const final_promise = final_deferred.promise;
     const result = new this.jiff.SecretShare(final_promise, this.holders, this.threshold, this.Zp);
 

lib/client/protocols/shamir/open.js

@@ -81,7 +81,7 @@ module.exports = {
 
     // Party is a receiver
     if (parties.indexOf(jiff.id) > -1) {
-      const final_deferred = new jiff.helpers.Deferred(); // will be resolved when the final value is reconstructed
+      const final_deferred = jiff.helpers.createDeferred(); // will be resolved when the final value is reconstructed
       const final_promise = final_deferred.promise;
 
       if (jiff.deferreds[op_id] == null) {

lib/client/protocols/shamir/reshare.js

@@ -62,7 +62,7 @@ module.exports = function (jiff, share, threshold, receivers_list, senders_list,
   let final_deferred;
   let result = null;
   if (isReceiver) {
-    final_deferred = new jiff.helpers.Deferred();
+    final_deferred = jiff.helpers.createDeferred();
     result = new jiff.SecretShare(final_deferred.promise, receivers_list, threshold, Zp);
   }
 

lib/client/protocols/shamir/share.js

@@ -160,7 +160,7 @@ module.exports = {
         // check if a deferred is set up (maybe the message was previously received)
         if (jiff.deferreds[share_id][p_id] == null) {
           // not ready, setup a deferred
-          jiff.deferreds[share_id][p_id] = new jiff.helpers.Deferred();
+          jiff.deferreds[share_id][p_id] = jiff.helpers.createDeferred();
         }
 
         const promise = jiff.deferreds[share_id][p_id].promise;

lib/client/socket/mailbox.js

@@ -126,7 +126,7 @@ const safe_disconnect = function (free, callback) {
     }
   }
 
-  this.empty_deferred = new this.jiffClient.helpers.Deferred();
+  this.empty_deferred = this.jiffClient.helpers.createDeferred();
   this.empty_deferred.promise.then(this.safe_disconnect.bind(this, free, callback));
 };
 

lib/client/util/crypto.js

@@ -1,39 +1,42 @@
-/**
- * Encrypts and signs the given message.
- * @ignore
- * @memberof jiff.utils
- * @param {number|string} message - the message to encrypt.
- * @param {Uint8Array} encryption_public_key - ascii-armored public key to encrypt with.
- * @param {Uint8Array} signing_private_key - the private key of the encrypting party to sign with.
- * @returns {object} the signed cipher, includes two properties: 'cipher' and 'nonce'.
- */
-exports.encrypt_and_sign = function (jiff, message, encryption_public_key, signing_private_key) {
-  const nonce = jiff.sodium_.randombytes_buf(jiff.sodium_.crypto_box_NONCEBYTES);
-  const cipher = jiff.sodium_.crypto_box_easy(message, nonce, encryption_public_key, signing_private_key);
+class Crypto {
+  /**
+   * Encrypts and signs the given message.
+   * @ignore
+   * @memberof jiff.utils
+   * @param {number|string} message - the message to encrypt.
+   * @param {Uint8Array} encryption_public_key - ascii-armored public key to encrypt with.
+   * @param {Uint8Array} signing_private_key - the private key of the encrypting party to sign with.
+   * @returns {object} the signed cipher, includes two properties: 'cipher' and 'nonce'.
+   */
+  encrypt_and_sign(jiff, message, encryption_public_key, signing_private_key) {
+    const nonce = jiff.sodium_.randombytes_buf(jiff.sodium_.crypto_box_NONCEBYTES);
+    const cipher = jiff.sodium_.crypto_box_easy(message, nonce, encryption_public_key, signing_private_key);
 
-  const result = { nonce: '[' + nonce.toString() + ']', cipher: '[' + cipher.toString() + ']' };
-  return result;
-};
+    const result = { nonce: '[' + nonce.toString() + ']', cipher: '[' + cipher.toString() + ']' };
+    return result;
+  }
 
-/**
- * Decrypts and checks the signature of the given cipher text.
- * @ignore
- * @memberof jiff.utils
- * @param {object} cipher_text - the cipher text to decrypt, includes two properties: 'cipher' and 'nonce'.
- * @param {Uint8Array} decryption_secret_key - the secret key to decrypt with.
- * @param {Uint8Array} signing_public_key - ascii-armored public key to verify against signature.
- * @returns {number|string} the decrypted message if the signature was correct, the decrypted message type should
- *                          the type of operation, such that the returned value has the appropriate type and does
- *                          not need any type modifications.
- * @throws error if signature or nonce was forged/incorrect.
- */
-exports.decrypt_and_sign = function (jiff, cipher_text, decryption_secret_key, signing_public_key) {
-  const nonce = new Uint8Array(JSON.parse(cipher_text.nonce));
-  cipher_text = new Uint8Array(JSON.parse(cipher_text.cipher));
+  /**
+   * Decrypts and checks the signature of the given cipher text.
+   * @ignore
+   * @memberof jiff.utils
+   * @param {object} cipher_text - the cipher text to decrypt, includes two properties: 'cipher' and 'nonce'.
+   * @param {Uint8Array} decryption_secret_key - the secret key to decrypt with.
+   * @param {Uint8Array} signing_public_key - ascii-armored public key to verify against signature.
+   * @returns {number|string} the decrypted message if the signature was correct, the decrypted message type should
+   *                          the type of operation, such that the returned value has the appropriate type and does
+   *                          not need any type modifications.
+   * @throws error if signature or nonce was forged/incorrect.
+   */
+  decrypt_and_sign(jiff, cipher_text, decryption_secret_key, signing_public_key) {
+    const nonce = new Uint8Array(JSON.parse(cipher_text.nonce));
+    cipher_text = new Uint8Array(JSON.parse(cipher_text.cipher));
 
-  try {
-    return jiff.sodium_.crypto_box_open_easy(cipher_text, nonce, signing_public_key, decryption_secret_key, 'text');
-  } catch (_) {
-    throw new Error('Bad signature or Bad nonce: Cipher: ' + cipher_text + '.  DecSKey: ' + decryption_secret_key + '.  SignPKey: ' + signing_public_key);
+    try {
+      return jiff.sodium_.crypto_box_open_easy(cipher_text, nonce, signing_public_key, decryption_secret_key, 'text');
+    } catch (_) {
+      throw new Error('Bad signature or Bad nonce: Cipher: ' + cipher_text + '.  DecSKey: ' + decryption_secret_key + '.  SignPKey: ' + signing_public_key);
+    }
   }
-};
+}
+module.exports = Crypto;