cassproject 1.5.19 → 1.5.22

package/README.md

@@ -49,6 +49,13 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 # Changelog
 
+## 1.5.22
+* Code cleanup
+* Better certificate authority support by setting global.ca
+
+## 1.5.20
+* Added history fetch (fetches a list of results)
+
 ## 1.5.19
 * No longer use the selectedServerProxy URL to communicate in any context.
 

package/index.js

@@ -6,12 +6,12 @@ if (typeof window !== "undefined" && window) {
 require("./src/org/cassproject/general/AuditLogger.js");
 
 global.generateUUID = function () {
-    var d = new Date().getTime();
+    let d = new Date().getTime();
     if (typeof window !== "undefined" && window && window.performance && typeof window.performance.now === "function") {
         d += performance.now(); // use high-precision timer if available
     }
-    var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        var r = (d + Math.random() * 16) % 16 | 0;
+    let uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+        let r = (d + Math.random() * 16) % 16 | 0;
         d = Math.floor(d / 16);
         return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
     });
@@ -67,8 +67,6 @@ try {
 
 if (global.forge === undefined)
     global.forge = require("node-forge");
-else
-    var forge = global.forge;
 
 let JavalikeEquals = function (value) {
     if (value == null)
@@ -88,7 +86,7 @@ if (!String.prototype.equals) {
 }
 if (!String.prototype.startsWith) {
     String.prototype.startsWith = function (start, from) {
-        var f = from != null ? from : 0;
+        let f = from != null ? from : 0;
         return this.substring(f, f + start.length) == start;
     };
 }
@@ -166,8 +164,8 @@ if (!String.prototype.regionMatches) {
         }
         if (toffset < 0 || ooffset < 0 || other == null || toffset + len > this.length || ooffset + len > other.length)
             return false;
-        var s1 = this.substring(toffset, toffset + len);
-        var s2 = other.substring(ooffset, ooffset + len);
+        let s1 = this.substring(toffset, toffset + len);
+        let s2 = other.substring(ooffset, ooffset + len);
         return ignoreCase ? s1.equalsIgnoreCase(s2) : s1 === s2;
     };
 }
@@ -189,12 +187,12 @@ String.valueOf = function (value) {
 };
 
 /* Number */
-var Byte = Number;
-var Double = Number;
-var Float = Number;
-var Integer = Number;
-var Long = Number;
-var Short = Number;
+let Byte = Number;
+let Double = Number;
+let Float = Number;
+let Integer = Number;
+let Long = Number;
+let Short = Number;
 
 /* type conversion - approximative as Javascript only has integers and doubles */
 if (!Number.prototype.intValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cassproject",
-	"version": "1.5.19",
+	"version": "1.5.22",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
@@ -9,9 +9,9 @@
 		"multitest": "concurrently --kill-others --kill-others-on-fail \"npm run test15\" \"npm run test14\" \"npm run test13\" \"npm run test12\"",
 		"testCassTest": "npm run testkill && docker run -d --name cass-test -p80:80 -e CASS_LOOPBACK cass-test && wait-on http://localhost/api/ping && npm run testNode18 && npm run testNode18Fips && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testCypressEdge && npm run testCypress && npm run testkill",
 		"testDevHttps": "npm run testkill && docker run -d --name cass-test -p443:80 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:dev && wait-on https://localhost/api/ping && npm run testNode18HttpsFips && npm run testNode18Https && npm run testNode16Https && npm run testNode15Https && npm run testNode14Https && npm run testNode13Https && npm run testNode12Https && npm run testCypressEdgeHttps && npm run testCypressHttps",
-		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.18 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
-		"test15Https11": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.18 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
-		"test15": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.18 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
+		"test15Https": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true cassproject/cass:1.5.21 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
+		"test15Https11": "npm run testkill && docker run -d --name cass-test -p443:443 -e CASS_LOOPBACK -e HTTPS=true -e HTTP2=false cassproject/cass:1.5.21 && wait-on https://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypressHttps\" \"npm run testNode18HttpsFips\" \"npm run testNode18Https\" \"npm run testNode16Https\" && npm run testkill",
+		"test15": "export CASS_LOOPBACK=http://localhost/api/|| set CASS_LOOPBACK=http://localhost/api/&& npm run testkill15 && docker run -d -e CASS_LOOPBACK --name cass-test15 -p80:80 cassproject/cass:1.5.21 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode18\" \"npm run testNode18Fips\" \"npm run testNode16\" && npm run testkill15",
 		"test14": "npm run testkill14 && docker run -d -e CASS_LOOPBACK --name cass-test14 -p80:80 cassproject/cass:1.4.4 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill14",
 		"test13": "npm run testkill13 && docker run -d -e CASS_LOOPBACK --name cass-test13 -p80:80 cassproject/cass:1.3.18 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill13",
 		"test12": "npm run testkill12 && docker run -d -e CASS_LOOPBACK --name cass-test12 -p80:80 cassproject/cass:1.2.44 && wait-on http://localhost/api/ping && concurrently --kill-others-on-fail \"npm run testCypress\" \"npm run testNode16\" && npm run testkill12",
@@ -46,7 +46,7 @@
 		"mocha:dev": "export CASS_LOOPBACK=https://dev.cassproject.org/api/|| set CASS_LOOPBACK=https://dev.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --timeout 300000 -b src/**/*.test.js",
 		"mocha:demo": "export CASS_LOOPBACK=https://demo.cassproject.org/api/|| set CASS_LOOPBACK=https://demo.cassproject.org/api/&& export HTTP2=false|| set HTTP2=false&& mocha --timeout 300000 -b src/**/*.test.js",
 		"mochaGraph": "mocha --timeout 15000 -b src/com/eduworks/ec/graph/**/*.test.js",
-		"automocha": "nodemon --exec \"npm run mocha:clientSideCertificates\"",
+		"automocha": "nodemon --exec \"npm run mocha:https\"",
 		"automochaGraph": "nodemon --exec \"npm run mochaGraph\"",
 		"automocha:clientSideCertificates": "nodemon --exec \"npm run mocha:clientSideCertificates\"",
 		"lint": "eslint src -c .eslintrc.js --ext .js --fix",
@@ -90,7 +90,7 @@
 		}
 	],
 	"dependencies": {
-		"axios": "^1.1.3",
+		"axios": "1.1.3",
 		"base64-arraybuffer": "^1.0.2",
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
@@ -125,25 +125,24 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.20.2",
+		"@babel/core": "^7.20.12",
 		"@babel/preset-env": "^7.20.2",
 		"@cypress/browserify-preprocessor": "^3.0.2",
-		"@cypress/vite-dev-server": "^4.0.1",
-		"@cypress/webpack-preprocessor": "^5.15.5",
+		"@cypress/vite-dev-server": "^5.0.2",
+		"@cypress/webpack-preprocessor": "^5.16.1",
 		"babel-eslint": "^10.1.0",
-		"babel-loader": "^9.1.0",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
 		"chai": "^4.3.7",
-		"concurrently": "^7.5.0",
+		"concurrently": "^7.6.0",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^11.0.1",
-		"eslint": "^8.27.0",
-		"mocha": "^10.1.0",
+		"cypress": "^12.3.0",
+		"eslint": "^8.31.0",
+		"mocha": "^10.2.0",
 		"node-polyfill-webpack-plugin": "^2.0.1",
 		"nodemon": "^2.0.20",
 		"nyc": "^15.1.0",
-		"wait-on": "^6.0.1",
+		"wait-on": "^7.0.1",
 		"webpack": "^5.75.0",
-		"webpack-cli": "^4.10.0"
+		"webpack-cli": "^5.0.1"
 	}
 }

package/src/com/eduworks/ec/array/EcArray.js

@@ -29,8 +29,8 @@ module.exports = class EcArray {
 	 *  @memberOf EcArray
 	 */
 	static removeDuplicates = function (a) {
-		for (var i = 0; i < a.length; i++)
-			for (var j = i; j < a.length; j++) {
+		for (let i = 0; i < a.length; i++)
+			for (let j = i; j < a.length; j++) {
 				if (j == i) continue;
 				if (a[i] == a[j]) a.splice(j, 1);
 			}
@@ -70,7 +70,7 @@ module.exports = class EcArray {
 	 */
 	static has = function (a, o) {
 		if (EcObject.isObject(o))
-			for (var i = 0; i < a.length; i++) {
+			for (let i = 0; i < a.length; i++) {
 				if (a[i] === o) return true;
 				try {
 					if (a[i].equals(o)) return true;
@@ -79,7 +79,7 @@ module.exports = class EcArray {
 				}
 			}
 		else
-			for (var i = 0; i < a.length; i++) {
+			for (let i = 0; i < a.length; i++) {
 				if (a[i] === o) {
 					return true;
 				}
@@ -98,7 +98,7 @@ module.exports = class EcArray {
 	 */
 	static indexOf = function (a, o) {
 		if (EcObject.isObject(o))
-			for (var i = 0; i < a.length; i++) {
+			for (let i = 0; i < a.length; i++) {
 				if (a[i] === o) return i;
 				try {
 					if (a[i].equals(o)) return i;
@@ -107,7 +107,7 @@ module.exports = class EcArray {
 				}
 			}
 		else
-			for (var i = 0; i < a.length; i++) {
+			for (let i = 0; i < a.length; i++) {
 				if (a[i] === o) {
 					return i;
 				}

package/src/com/eduworks/ec/array/EcArray.test.js

@@ -1,9 +1,9 @@
 let EcArray = require("./EcArray.js");
 let chai = require("chai");
 
-var should = chai.should();
-var expect = chai.expect;
-var assert = chai.assert;
+let should = chai.should();
+let expect = chai.expect;
+let assert = chai.assert;
 
 describe("EcArray", () => {
     describe("isArray", () => {
@@ -19,9 +19,6 @@ describe("EcArray", () => {
     });
     it('Duplicates are removed', () => {
         let ary = [1, 1, 2, 3, 4];
-        console.log((eval("var __temp = null"), (typeof __temp === "undefined")) ? 
-    "strict": 
-    "non-strict");
         EcArray.removeDuplicates(ary);
         expect(ary.length).to.equal(4);
     });

package/src/com/eduworks/ec/array/EcAsyncHelper.js

@@ -33,11 +33,12 @@ module.exports = class EcAsyncHelper {
 	 *  @memberOf EcAsyncHelper
 	 */
 	each(array, each, after) {
-		var me = this;
 		this.counter = array.length;
 		if (array.length == 0) after(array);
-		for (var i = 0; i < array.length; i++) {
-			if (this.counter > 0) this.execute(array, each, after, me, i);
+		for (let i = 0; i < array.length; i++) {
+			if (this.counter > 0) {
+				this.execute(array, each, after, this, i);
+			}
 		}
 	}
 	/**
@@ -50,11 +51,12 @@ module.exports = class EcAsyncHelper {
 	 *  @memberOf EcAsyncHelper
 	 */
 	eachSet(array, each, after) {
-		var me = this;
 		this.counter = array.length;
 		if (array.length == 0) after(array);
-		for (var i = 0; i < array.length; i++) {
-			if (this.counter > 0) this.executeSet(array, each, after, me, i);
+		for (let i = 0; i < array.length; i++) {
+			if (this.counter > 0) {
+				this.executeSet(array, each, after, this, i);
+			}
 		}
 	}
 	execute(array, each, after, me, i) {
@@ -71,10 +73,7 @@ module.exports = class EcAsyncHelper {
 				array[i] = result;
 				me.counter--;
 				if (me.counter == 0) {
-					var finalArray = [];
-					for (var j = 0; j < array.length; j++)
-						if (array[j] != null) finalArray.push(array[j]);
-					after(finalArray);
+					after([...array].filter(n=>n));
 				}
 			});
 		});

package/src/com/eduworks/ec/array/EcObject.test.js

@@ -1,9 +1,9 @@
 let EcObject = require("./EcObject.js");
 let chai = require("chai");
 
-var should = chai.should();
-var expect = chai.expect;
-var assert = chai.assert;
+let should = chai.should();
+let expect = chai.expect;
+let assert = chai.assert;
 
 describe("EcObject", () => {
     describe("isObject", () => {

package/src/com/eduworks/ec/crypto/EcAes.test.js

@@ -1,9 +1,9 @@
 let EcAes = require("./EcAes.js");
 let chai = require("chai");
 
-var should = chai.should();
-var expect = chai.expect;
-var assert = chai.assert;
+let should = chai.should();
+let expect = chai.expect;
+let assert = chai.assert;
 
 describe("EcAes", () => {
     it('newSecret != null', () => {

package/src/com/eduworks/ec/crypto/EcAesCtr.js

@@ -34,14 +34,14 @@ module.exports = class EcAesCtr {
 			forge.util.decode64(iv).length == 16
 		)
 			return aesEncrypt(plaintext, iv, secret);
-		var c = forge.cipher.createCipher(
+		let c = forge.cipher.createCipher(
 			"AES-CTR",
 			forge.util.decode64(secret)
 		);
 		c.start({iv: forge.util.decode64(iv)});
 		c.update(forge.util.createBuffer(forge.util.encodeUtf8(plaintext)));
 		c.finish();
-		var encrypted = c.output;
+		let encrypted = c.output;
 		return forge.util.encode64(encrypted.bytes());
 	}
 	/**
@@ -64,7 +64,7 @@ module.exports = class EcAesCtr {
 			);
 		EcCrypto.deprecationNotice = true;
 		if (EcCrypto.caching) {
-			var cacheGet = EcCrypto.decryptionCache[secret + iv + ciphertext];
+			let cacheGet = EcCrypto.decryptionCache[secret + iv + ciphertext];
 			if (cacheGet != null) return cacheGet;
 		}
 		if (
@@ -72,19 +72,19 @@ module.exports = class EcAesCtr {
 			forge.util.decode64(secret).length == 16 &&
 			forge.util.decode64(iv).length == 16
 		) {
-			var result = aesDecrypt(ciphertext, iv, secret);
+			let result = aesDecrypt(ciphertext, iv, secret);
 			if (EcCrypto.caching)
 				EcCrypto.decryptionCache[secret + iv + ciphertext] = result;
 			return result;
 		}
-		var c = forge.cipher.createDecipher(
+		let c = forge.cipher.createDecipher(
 			"AES-CTR",
 			forge.util.decode64(secret)
 		);
 		c.start({iv: forge.util.decode64(iv)});
 		c.update(forge.util.createBuffer(forge.util.decode64(ciphertext)));
 		c.finish();
-		var decrypted = c.output;
+		let decrypted = c.output;
 		if (EcCrypto.caching)
 			EcCrypto.decryptionCache[
 				secret + iv + ciphertext

package/src/com/eduworks/ec/crypto/EcAesCtr.test.js

@@ -12,39 +12,39 @@ let hrtime = function() {
     return process.hrtime();
 };
 
-var should = chai.should();
-var expect = chai.expect;
-var assert = chai.assert;
+let should = chai.should();
+let expect = chai.expect;
+let assert = chai.assert;
 
 describe("EcAesCtr", () => {
     it('encryption then decryption', () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = EcAesCtr.encrypt(randomString, secret, iv);
-        var decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = EcAesCtr.encrypt(randomString, secret, iv);
+        let decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('encryption then decryption (utf-8)', () => {
-        var randomString =
+        let randomString =
             "abc\u16a0\u16c7\u16bb\u16eb\u16d2\u16e6\u16a6\u16eb\u16a0\u16b1\u16a9\u16a0\u16a2\u16b1\u16eb\u16a0\u16c1\u16b1\u16aa\u16eb\u16b7\u16d6\u16bb\u16b9\u16e6\u16da\u16b3\u16a2\u16d7";
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = EcAesCtr.encrypt(randomString, secret, iv);
-        var decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = EcAesCtr.encrypt(randomString, secret, iv);
+        let decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('large encryption then decryption w/caching', () => {
-        var randomString = EcAes.newIv(4096*16);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var hrTime = hrtime();
-        var encrypted = EcAesCtr.encrypt(randomString, secret, iv);
+        let randomString = EcAes.newIv(4096*16);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let hrTime = hrtime();
+        let encrypted = EcAesCtr.encrypt(randomString, secret, iv);
         let elapsed = (hrtime()[0]*1000000 + hrtime()[1]/1000 - hrTime[0] * 1000000 - hrTime[1] / 1000)/1000;
         console.log(randomString.length/1024+"KB encryption speed: " + elapsed+"ms");
         hrTime = hrtime();
         EcCrypto.caching = true;
-        var decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
+        let decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
         elapsed = (hrtime()[0]*1000000 + hrtime()[1]/1000 - hrTime[0] * 1000000 - hrTime[1] / 1000)/1000;
         console.log("decryption wout/caching speed: " + elapsed+"ms");
         hrTime = hrtime();

package/src/com/eduworks/ec/crypto/EcAesCtrAsync.js

@@ -1,15 +1,16 @@
-var base64 = require("base64-arraybuffer");
+let base64 = require("base64-arraybuffer");
 let forge = require("node-forge");
 require("../../../../org/cassproject/general/AuditLogger.js");
+let crypto = null;
 if (typeof crypto == 'undefined')
 {
 	if (typeof window !== 'undefined' && window != null && window !== undefined)
 		if (window.crypto != null)
-			var crypto = window.crypto;
+			crypto = window.crypto;
 	try {
 		let requireResult = require('crypto').webcrypto;
 		if (requireResult != null)
-			var crypto = requireResult;
+			crypto = requireResult;
 	} catch (err) {
 		global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.INFO, "EcAesCtrAsync", "Webcrypto not available. Tests will fail. Please upgrade, if possible, to Node 16. Non-test mode will fallback to slower cryptograpy methods.: " + err);
 	}
@@ -31,7 +32,6 @@ module.exports = class EcAesCtrAsync {
 		if (realCrypto.getFips() == 0)
 			try {
 				realCrypto.setFips(true);
-				//console.log("FIPS compliant crypto provider has been enabled.");
 			} catch (e) {
 				global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.INFO, "EcAesCtrAsyncFips", "ERR_CRYPTO_FIPS_UNAVAILABLE", e);
 			}
@@ -42,7 +42,6 @@ module.exports = class EcAesCtrAsync {
 		if (realCrypto.getFips() == 1)
 			try {
 				realCrypto.setFips(false);
-				//console.log("FIPS compliant crypto provider has been disabled.");
 			} catch (e) {
 				global.auditLogger.report(global.auditLogger.LogCategory.SYSTEM, global.auditLogger.Severity.INFO, "EcAesCtrAsyncFips", "ERR_CRYPTO_FIPS_UNAVAILABLE", e);
 			}
@@ -78,13 +77,13 @@ module.exports = class EcAesCtrAsync {
 			);
 		}
 		this.fipsOn();
-		var keyUsages = [];
+		let keyUsages = [];
 		keyUsages.push("encrypt", "decrypt");
-		var algorithm = {};
+		let algorithm = {};
 		algorithm.name = "AES-CTR";
 		algorithm.counter = base64.decode(iv);
 		algorithm.length = 128;
-		var data;
+		let data;
 		data = EcCrypto.str2ab(plaintext);
 		return cassPromisify(
 			crypto.subtle
@@ -123,7 +122,7 @@ module.exports = class EcAesCtrAsync {
 	 */
 	static decrypt(ciphertext, secret, iv, success, failure) {
 		if (EcCrypto.caching) {
-			var cacheGet = EcCrypto.decryptionCache[secret + iv + ciphertext];
+			let cacheGet = EcCrypto.decryptionCache[secret + iv + ciphertext];
 			if (cacheGet != null) {
 				return cassReturnAsPromise(cacheGet, success, failure);
 			}
@@ -143,12 +142,12 @@ module.exports = class EcAesCtrAsync {
 			);
 		}
 		this.fipsOn();
-		var keyUsages = ["encrypt", "decrypt"];
-		var algorithm = {};
+		let keyUsages = ["encrypt", "decrypt"];
+		let algorithm = {};
 		algorithm.name = "AES-CTR";
 		algorithm.counter = base64.decode(iv);
 		algorithm.length = 128;
-		var data;
+		let data;
 		data = base64.decode(ciphertext);
 		return cassPromisify(
 			crypto.subtle

package/src/com/eduworks/ec/crypto/EcAesCtrAsync.test.js

@@ -15,41 +15,41 @@ let hrtime = function() {
     return process.hrtime();
 };
 
-var should = chai.should();
-var expect = chai.expect;
-var assert = chai.assert;
+let should = chai.should();
+let expect = chai.expect;
+let assert = chai.assert;
 
 after(()=>EcRsaOaepAsyncWorker.teardown());
 
 describe("EcAesCtrAsync", () => {
     it('await encryption then await decryption', async () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
-        var decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
+        let decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('encryption then decryption (utf-8)', async () => {
-        var randomString =
+        let randomString =
             "abc\u16a0\u16c7\u16bb\u16eb\u16d2\u16e6\u16a6\u16eb\u16a0\u16b1\u16a9\u16a0\u16a2\u16b1\u16eb\u16a0\u16c1\u16b1\u16aa\u16eb\u16b7\u16d6\u16bb\u16b9\u16e6\u16da\u16b3\u16a2\u16d7";
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
-        var decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
+        let decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('large encryption then decryption w/caching', async () => {
-        var randomString = EcAes.newIv(4096*4);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var hrTime = typeof process === undefined ? [Math.round(performance.now()/1000), performance.now() * 1000] : hrtime();
-        var encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
+        let randomString = EcAes.newIv(4096*4);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let hrTime = typeof process === "undefined" ? [Math.round(performance.now()/1000), performance.now() * 1000] : hrtime();
+        let encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
         let elapsed = (hrtime()[0]*1000000 + hrtime()[1]/1000 - hrTime[0] * 1000000 - hrTime[1] / 1000)/1000;
         console.log(randomString.length/1024+"KB encryption speed: " + elapsed+"ms");
         hrTime = hrtime();
         EcCrypto.caching = true;
-        var decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
+        let decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
         elapsed = (hrtime()[0]*1000000 + hrtime()[1]/1000 - hrTime[0] * 1000000 - hrTime[1] / 1000)/1000;
         console.log("decryption wout/caching speed: " + elapsed+"ms");
         hrTime = hrtime();
@@ -81,35 +81,35 @@ describe("EcAesCtrAsync", () => {
         }
     }).timeout(10000);
     it('EcAesCtrAsync encryption then EcAesCtr decryption', async () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
-        var decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
+        let decrypted = EcAesCtr.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('EcAesCtr encryption then EcAesCtrAsync decryption', async () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = EcAesCtr.encrypt(randomString, secret, iv);
-        var decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = EcAesCtr.encrypt(randomString, secret, iv);
+        let decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('EcAesCtrAsync encryption then EcAesCtrAsyncWorker decryption', async () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
-        var decrypted = await EcAesCtrAsyncWorker.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = await EcAesCtrAsync.encrypt(randomString, secret, iv);
+        let decrypted = await EcAesCtrAsyncWorker.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
     it('EcAesCtrAsyncWorker encryption then EcAesCtrAsync decryption', async () => {
-        var randomString = EcAes.newIv(1024);
-        var secret = EcAes.newSecret(16);
-        var iv = EcAes.newIv(16);
-        var encrypted = await EcAesCtrAsyncWorker.encrypt(randomString, secret, iv);
-        var decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
+        let randomString = EcAes.newIv(1024);
+        let secret = EcAes.newSecret(16);
+        let iv = EcAes.newIv(16);
+        let encrypted = await EcAesCtrAsyncWorker.encrypt(randomString, secret, iv);
+        let decrypted = await EcAesCtrAsync.decrypt(encrypted, secret, iv);
         assert.isTrue(randomString == decrypted);
     });
 });

package/src/com/eduworks/ec/crypto/EcAesCtrAsyncWorker.js

@@ -37,9 +37,9 @@ module.exports = class EcAesCtrAsyncWorker {
 				failure
 			);
 		}
-		var worker = EcRsaOaepAsyncWorker.rotator++;
+		let worker = EcRsaOaepAsyncWorker.rotator++;
 		EcRsaOaepAsyncWorker.rotator = EcRsaOaepAsyncWorker.rotator % 8;
-		var o = {};
+		let o = {};
 		o["secret"] = secret;
 		o["iv"] = iv;
 		o["text"] = forge.util.encodeUtf8(plaintext);
@@ -62,7 +62,7 @@ module.exports = class EcAesCtrAsyncWorker {
 	 */
 	static decrypt(ciphertext, secret, iv, success, failure) {
 		if (EcCrypto.caching) {
-			var cacheGet = null;
+			let cacheGet = null;
 			cacheGet = EcCrypto.decryptionCache[secret + iv + ciphertext];
 			if (cacheGet != null) {
 				return cassReturnAsPromise(cacheGet, success, failure);
@@ -76,9 +76,9 @@ module.exports = class EcAesCtrAsyncWorker {
 				failure
 			);
 		}
-		var worker = EcRsaOaepAsyncWorker.rotator++;
+		let worker = EcRsaOaepAsyncWorker.rotator++;
 		EcRsaOaepAsyncWorker.rotator = EcRsaOaepAsyncWorker.rotator % 8;
-		var o = {};
+		let o = {};
 		o["secret"] = secret;
 		o["iv"] = iv;
 		o["text"] = ciphertext;