cassproject 0.5.30 → 1.5.0

package/README.md

@@ -21,10 +21,10 @@ Running `npm test` requires Docker.
 
 ## Release testing
 
- * `npm test` - Runs unit tests in docker images against the CaSS 0.5, 1.2, 1.3, and 1.4 repositories using Node versions 12-16 and Cypress against Edge, Chrome, Firefox and Electron. Takes some time.
+ * `npm test` - Runs unit tests in docker images against the CaSS 1.5, 1.2, 1.3, and 1.4 repositories using Node versions 12-16 and Cypress against Edge, Chrome, Firefox and Electron. Takes some time.
 
 ## Development unit testing
-Development unit tests presume you have a CaSS Repository running on `localhost:80`. You may get one by running `docker run -d --name cass-test -p80:80 cassproject/cass:0.5.1`
+Development unit tests presume you have a CaSS Repository running on `localhost:80`. You may get one by running `docker run -d --name cass-test -p80:80 cassproject/cass:1.5.0`
 
  * `npm automocha` - Runs mocha unit tests against current Node environment. Will rerun unit tests on-save.
  * `npm mocha` - Runs mocha unit tests.
@@ -35,15 +35,24 @@ Development unit tests presume you have a CaSS Repository running on `localhost:
 
 ## Publish checklist
 
- * `npm test` - Must not fail any tests.
+ * Review dependencies, autocomplete version numbers
  * Increment version number in package.json and yuidoc.json
- * `npm run docs`
+ * Update documentation, `npm run docs`
+ * Delete yuidoc elements from devDependencies in package.json
+ * Delete package-lock.json and node_modules, `npm install`
+ * `npm test` - Must not fail any tests.
  * Commit changes to GitHub.
  * Tag release with semantic version from package.json, push tag.
  * `npm publish` (must be `npm login`ed) 
 
 # Changelog
 
+## 1.5.0
+* Version increment
+
+## 0.5.31
+* Optimized performance of EcFrameworkGraph
+
 ## 0.5.30
 * Optimized performance of EcFrameworkGraph
 * Library Updates

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "cassproject",
-	"version": "0.5.30",
+	"version": "1.5.0",
 	"description": "Competency and Skills Service",
 	"main": "index.js",
 	"scripts": {
 		"test": "npm run test05 && npm run test14 && npm run test13 && npm run test12",
 		"testCassTest": "npm run testkill && docker run -d --name cass-test -p80:80 cass-test && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
-		"test05": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:0.5.6 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
+		"test05": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.5.0 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
 		"test14": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.4.4 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
 		"test13": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.3.18 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
 		"test12": "npm run testkill && docker run -d --name cass-test -p80:80 cassproject/cass:1.2.44 && wait-on http://localhost/api/ping && npm run testCypressEdge && npm run testCypress && npm run testNode16 && npm run testNode15 && npm run testNode14 && npm run testNode13 && npm run testNode12 && npm run testkill",
@@ -21,11 +21,13 @@
 		"autotest": "nodemon test.js",
 		"autoindex": "nodemon index.js",
 		"mocha": "mocha -b src/**/*.test.js",
+		"mochaGraph": "mocha -b src/com/eduworks/ec/graph/**/*.test.js",
 		"automocha": "nodemon --exec \"npm run mocha\"",
+		"automochaGraph": "nodemon --exec \"npm run mochaGraph\"",
 		"automocha:clientSideCertificates": "set CASS_LOOPBACK=https://localhost/api/&& nodemon --exec \"npm run mocha\"",
 		"lint": "eslint src -c .eslintrc.js --ext .js --fix",
-		"docs": "yuidoc -c yuidoc.json -o docs -e .js src",
-		"doclint": "yuidoc --lint -c yuidoc.json -o docs -e .js src",
+		"docs": "npm install yuidocjs yuidoc-ember-cli-theme && yuidoc -c yuidoc.json -o docs -e .js src && npm remove yuidocjs yuidoc-ember-cli-theme",
+		"doclint": "npm install yuidocjs yuidoc-ember-cli-theme && yuidoc --lint -c yuidoc.json -o docs -e .js src",
 		"browserify:cypress:open": "cypress open --config-file cypressBrowserify.json",
 		"webpack:cypress:open": "cypress open --config-file cypressWebpack.json",
 		"browserify:cypress": "cypress run --config-file cypressBrowserify.json --headless --browser chrome",
@@ -52,8 +54,8 @@
 		}
 	],
 	"dependencies": {
-		"axios": "^0.24.0",
-		"base64-arraybuffer": "^1.0.1",
+		"axios": "^0.25.0",
+		"base64-arraybuffer": "^1.0.2",
 		"forge": "^2.3.0",
 		"form-data": "^4.0.0",
 		"jsonld": "^5.2.0",
@@ -62,7 +64,7 @@
 		"pem-jwk": "^2.0.0",
 		"promise-worker": "^2.0.1",
 		"rdf-canonize": "^3.0.0",
-		"web-worker": "^1.1.0"
+		"web-worker": "^1.2.0"
 	},
 	"files": [
 		"lib/",
@@ -86,26 +88,22 @@
 	},
 	"homepage": "https://github.com/cassproject/cass-npm#readme",
 	"devDependencies": {
-		"@babel/core": "^7.16.5",
-		"@babel/preset-env": "^7.16.5",
-		"@cypress/browserify-preprocessor": "^3.0.1",
+		"@babel/core": "^7.17.0",
+		"@babel/preset-env": "^7.16.11",
+		"@cypress/browserify-preprocessor": "^3.0.2",
 		"@cypress/webpack-preprocessor": "^5.11.0",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.2.3",
 		"babel-plugin-transform-remove-strict-mode": "^0.0.2",
-		"chai": "^4.3.4",
+		"chai": "^4.3.6",
 		"convert-hrtime": "^5.0.0",
-		"cypress": "^9.2.0",
-		"eslint": "^8.5.0",
-		"mocha": "^9.1.2",
-		"node-polyfill-webpack-plugin": "^1.1.3",
-		"nodemon": "^2.0.7",
-		"prettier": "^2.2.1",
-		"tap": "^15.0.9",
+		"cypress": "^9.4.1",
+		"eslint": "^8.8.0",
+		"mocha": "^9.2.0",
+		"node-polyfill-webpack-plugin": "^1.1.4",
+		"nodemon": "^2.0.15",
 		"wait-on": "^6.0.0",
-		"webpack": "^5.39.1",
-		"webpack-cli": "^4.8.0",
-		"yuidoc-ember-cli-theme": "^1.0.4",
-		"yuidocjs": "^0.10.2"
+		"webpack": "^5.68.0",
+		"webpack-cli": "^4.9.2"
 	}
 }

package/src/com/eduworks/ec/graph/EcFrameworkGraph.js

@@ -6,6 +6,7 @@ const EcRemoteLinkedData = require("../../../../org/cassproject/schema/general/E
 const EcArray = require("../array/EcArray.js");
 const { cassPromisify } = require("../promises/helpers.js");
 const EcDirectedGraph = require("./EcDirectedGraph.js");
+const Triple = require("./Triple.js");
 
 /**
  *  Graph for working with a framework. Additional computed data (such as profile data) can be overlaid on the graph through the use of "metaverticies" and "metaedges" that hold additional information.
@@ -110,7 +111,7 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 		let competencies = {};
 		await Promise.all(
 			assertions.map(async (assertion) => {
-				if (!this.containsVertexById(assertion.competency)) {
+				if (!this.containsVertexById(assertion.competency)) { //O(1)
 					return;
 				}
 				let negative = await assertion.getNegative();
@@ -125,12 +126,14 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 		await Promise.all(
 			Object.keys(competencies).map(async (label) => {
 				let competency = await this.getCompetency(label);
+				//if (competencies[label].negatives.length > 0)
 				await this.processAssertionsBooleanPerAssertion(
 					competencies[label].negatives,
 					true,
 					competency,
 					[]
 				);
+				//if (competencies[label].positives.length > 0)
 				await this.processAssertionsBooleanPerAssertion(
 					competencies[label].positives,
 					false,
@@ -356,5 +359,57 @@ module.exports = class EcFrameworkGraph extends EcDirectedGraph {
 	}
 	getDefaultEdgeType() {
 		return EcAlignment.NARROWS;
+	}	
+	inEdgeCache = {};
+	outEdgeCache = {};
+	getInEdges(vertex) {
+		if (this.inEdgeCache[vertex.shortId()] == null) return [];
+		return [...this.inEdgeCache[vertex.shortId()]];
+	}
+	getOutEdges(vertex) {
+		if (this.outEdgeCache[vertex.shortId()] == null) return [];
+		return [...this.outEdgeCache[vertex.shortId()]];
+	}
+	addEdge(e, v1, v2) {
+		this.addVertexSafely(v1);
+		this.addVertexSafely(v2);
+		var t = new Triple();
+		t.source = v1;
+		t.destination = v2;
+		t.edge = e;
+		this.edges.push(t);
+		this.cacheEdges(t);
+		return true;
+	}
+	addEdgeUnsafely(e, v1, v2) {
+		var t = new Triple();
+		t.source = v1;
+		t.destination = v2;
+		t.edge = e;
+		this.edges.push(t);
+		this.cacheEdges(t);
+		return true;
+	}
+	addEdgeSafely(e, v1, v2) {
+		this.addVertexSafely(v1);
+		this.addVertexSafely(v2);
+		var t = new Triple();
+		t.source = v1;
+		t.destination = v2;
+		t.edge = e;
+		if (EcArray.has(this.edges, t)) return false;
+		this.edges.push(t);
+		this.cacheEdges(t);
+		return true;
+	}
+	cacheEdges(e)
+	{
+		//TODO: Remove cached stuff when edges are removed.
+		if (this.inEdgeCache[e.destination.shortId()] == null)
+			this.inEdgeCache[e.destination.shortId()] = [];
+		this.inEdgeCache[e.destination.shortId()].push(e.edge);
+		if (this.outEdgeCache[e.source.shortId()] == null)
+			this.outEdgeCache[e.source.shortId()] = [];
+		this.outEdgeCache[e.source.shortId()].push(e.edge);
 	}
 };

package/src/com/eduworks/ec/graph/EcFrameworkGraph.test.js

@@ -248,7 +248,6 @@ describe("EcFrameworkGraph", () => {
                 () => {}
             ).then(() => {
                 let result = [];
-                console.log(fg.getMetaStateCompetency(c));
                 result.push(fg.getMetaStateCompetency(c)["positiveAssertion"]?.length);
                 result.push(fg.getMetaStateCompetency(c)["negativeAssertion"]?.length);
                 return result;

package/src/org/json/ld/EcLinkedData.js

@@ -301,7 +301,7 @@ global.jsonld = require("jsonld");
 	toSignableJson() {
 		var d = JSON.parse(this.toJson());
 		if (
-			this.type.indexOf("http://schema.eduworks.com/") != -1 &&
+			this.type.indexOf("http://schema.eduworks.com/") == 0 &&
 			this.type.indexOf("/0.1/") != -1
 		) {
 			delete d["signature"];

package/src/org/schema/EcOrganization.js

@@ -147,13 +147,7 @@ module.exports = class EcOrganization extends schema.Organization {
 	async addOrgKey(newOrgPpk) {
 		var orgKeys = await this.getOrgKeys();
 		orgKeys.push(newOrgPpk);
-		var newKeys = await EcEncryptedValue.encryptValue(
-			this.ppkListToPemArrayString(orgKeys),
-			EcOrganization.ORG_PPK_SET_KEY,
-			this.owner,
-			this.reader
-		);
-		this[EcOrganization.ORG_PPK_SET_KEY] = newKeys;
+		this[EcOrganization.ORG_PPK_SET_KEY] = orgKeys;
 	}
 	/**
 	 *  Performs a rekey operation and saves the organization details to the server
@@ -248,13 +242,15 @@ module.exports = class EcOrganization extends schema.Organization {
 	async getOrgKeys(eim) {
 		var orgKeys = [];
 		var o = this[EcOrganization.ORG_PPK_SET_KEY];
-		if (o != null) {
+		if (o != null && (o.type === 'EncryptedValue' || o["@type"] === 'EncryptedValue')) {
 			var ev = new EcEncryptedValue();
 			ev.copyFrom(o);
 			var orgKeysPPKPems = JSON.parse(await ev.decryptIntoString(null, null, eim));
 			for (var i = 0; i < orgKeysPPKPems.length; i++) {
 				orgKeys.push(EcPpk.fromPem(orgKeysPPKPems[i]));
 			}
+		} else if (o) {
+			orgKeys = o;
 		}
 		return orgKeys;
 	}