libves 2.0.3 → 2.1.0

package/libVES.node.js

@@ -34,13 +34,17 @@
  * @author Jim Zubov <jz@vesvault.com> (VESvault Corp)
  *
  ***************************************************************************/
+crypto = require('crypto');
+crypto.subtle = require('subtle');
+XMLHttpRequest = require('xhr2');
 
-if (!window.libVES) window.libVES = function(optns) {
+
+if (typeof(libVES) != 'function') function libVES(optns) {
     try {
-	if (!window.crypto.subtle.digest) throw new libVES.Error('Init','crypto.subtle is improperly implemented?');
+	if (!crypto.subtle.digest) throw new libVES.Error('Init', 'crypto.subtle is unavailable or improperly implemented');
     } catch (e) {
 	if (e instanceof libVES.Error) throw e;
-	throw new libVES.Error('Init','crypto.subtle is not usable' + (document.location.protocol.match(/https/) ? '' : ' (try https?)'));
+	throw new libVES.Error('Init', 'crypto.subtle is not available');
     }
     for (var k in optns) this[k] = optns[k];
     if (this.domain) this.type = 'secondary';
@@ -586,7 +590,7 @@ libVES.prototype = {
 	}
 	if (!optns || !optns.n) return Promise.reject(new libVES.Error('InvalidValue','optns.n must be an integer'));
 	var rkey = new Uint8Array(32);
-	window.crypto.getRandomValues(rkey);
+	crypto.getRandomValues(rkey);
 	var algo = optns.v ? libVES.Scramble.algo[optns.v] : libVES.Scramble.RDX;
 	if (!algo) return Promise.reject(new libVES.Error('InvalidValue','Unknown scramble algorithm: ' + optns.v));
 	var s = new algo(optns.n);
@@ -1587,7 +1591,7 @@ libVES.Math.Shifter.prototype = {
 
 libVES.Object = function(data) {
     for (var k in data) this[k] = data[k];
-    if (window.Trigger) this.trigger = Trigger.resolve(this);
+    if (typeof(Trigger) != 'undefined') this.trigger = Trigger.resolve(this);
 };
 
 libVES.Object.prototype = {
@@ -2426,7 +2430,6 @@ libVES.Algo = {
 		case 'public':
 		    return crypto.subtle.exportKey('spki', data).then(function(der) {
 			var asn = libVES.Util.ASN1.decode(new Uint8Array(der))[0];
-			console.log(asn);
 			switch (String(asn[0][0])) {
 			    case '1.2.840.10045.2.1':
 				return der;
@@ -2546,7 +2549,7 @@ libVES.Algo = {
     },
     acquire: function(key,optns) {
 	return Promise.resolve(key).then(function(k) {
-	    if (k instanceof window.CryptoKey) return k;
+	    if (typeof(CryptoKey) != 'undefined' && (k instanceof CryptoKey)) return k;
 	    else if (typeof(k) == 'object') {
 		if (k.privateKey) return k.privateKey;
 		else if (k.publicKey) return k.publicKey;
@@ -2838,7 +2841,7 @@ libVES.Scramble.RDX.prototype = {
 	var u = [sc];
 	for (var i = 1; i < this.size; i++) {
 	    u[i] = new Uint8Array(sc.length);
-	    window.crypto.getRandomValues(u[i]);
+	    crypto.getRandomValues(u[i]);
 	}
 	var v = [];
 	for (var i = 0; i < this.size - 1; i++) v[i] = (function(ui,ui1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libves",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "Simple, safe and secure end-to-end encryption for data at-rest",
   "main": "libVES.node.js",
   "scripts": {
@@ -17,7 +17,8 @@
     "e2e",
     "at-rest",
     "end-to-end",
-    "browser encryption",
+    "browser",
+    "browser-encryption",
     "pin"
   ],
   "author": "jz@vesvault.com",