fable 3.0.36 → 3.0.37

package/.config/configstore/update-notifier-npm.json

@@ -1,4 +1,4 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1683755358488
+	"lastUpdateCheck": 1684097390274
 }

package/.config/vscode-sqltools/runningInfo.json

@@ -1,7 +1,7 @@
 {
   "numericVersion": 10000,
   "releaseNotes": "https://vscode-sqltools.mteixeira.dev/changelog#v-1-0-0",
-  "run": 1683758393396,
+  "run": 1684098518216,
   "updated": false,
   "version": "1.0.0",
   "lastNotificationDate": 0,

package/Dockerfile_LUXURYCode

@@ -56,12 +56,12 @@ RUN code-server --install-extension mtxr.sqltools-driver-mysql
 
 RUN echo "...configuring mariadb (mysql) server...."
 RUN sudo sed -i "s|bind-address|#bind-address|g" /etc/mysql/mariadb.conf.d/50-server.cnf
-ADD ./.config/retold-harness/MySQL-Security.sql /home/coder/MySQL-Configure-Security.sql
-ADD ./.config/retold-harness/MySQL-Laden-Entry.sh /usr/bin/MySQL-Laden-Entry.sh
+ADD ./retold-harness/MySQL-Security.sql /home/coder/MySQL-Configure-Security.sql
+ADD ./retold-harness/MySQL-Laden-Entry.sh /usr/bin/MySQL-Laden-Entry.sh
 RUN ( sudo mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&  mysql -u root < /home/coder/MySQL-Configure-Security.sql
 
 # Import the initial database
-COPY ./.config/retold-harness//model/sql_create/BookStore-CreateDatabase.mysql.sql /home/coder/MySQL-Create-Databases.sql
+COPY ./retold-harness/model/sql_create/BookStore-CreateDatabase.mysql.sql /home/coder/MySQL-Create-Databases.sql
 RUN sudo service mariadb restart && sleep 5 && mysql -u root -p"123456789" -e "CREATE DATABASE bookstore;"
 RUN sudo service mariadb restart && sleep 5 && mysql -u root -p"123456789" bookstore < /home/coder/MySQL-Create-Databases.sql
 
@@ -82,11 +82,9 @@ RUN echo "...installing node version 14 as the default..."
 RUN . ~/.nvm/nvm.sh && source ~/.bashrc && nvm install 14
 RUN . ~/.nvm/nvm.sh && source ~/.bashrc && nvm alias default 14
 
-WORKDIR /home/coder/fable/.config/retold-harness
-
-RUN . ~/.nvm/nvm.sh && source ~/.bashrc && npm install
-# RUN ./Bookstore-Import-Books.sh
-
 WORKDIR /home/coder/fable
 
+# RUN . ~/.nvm/nvm.sh && source ~/.bashrc && npm install
+# RUN . /home/coder/fable/retold-harness/Bookstore-Import-Books.sh
+
 ENTRYPOINT ["/usr/bin/MySQL-Laden-Entry.sh"]

package/debug/Harness.js

@@ -1,3 +1,5 @@
+let libBookstore = require('../retold-harness/bookstore-serve-meadow-endpoint-apis-run.js');
+/*
 const libFable = require('../source/Fable.js');
 
 class SimpleService extends libFable.ServiceProviderBase
@@ -39,7 +41,4 @@ tmpRestClient.getJSON('https://en.wiktionary.org/w/api.php?action=parse&prop=wik
     {
         testFable.log.info('Response received!');
     });
-
-var fable = new libFable();
-
-fable.log.info('What are you doing, Dave?', {SomeColorSetting: 'Red', CurrentFolder: __dirname });
+*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fable",
-  "version": "3.0.36",
+  "version": "3.0.37",
   "description": "An entity behavior management and API bundling library.",
   "main": "source/Fable.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "build": "./node_modules/.bin/gulp build",
     "build-compatible": "GULP_CUSTOM_BUILD_TARGET=compatible ./node_modules/.bin/gulp build",
     "docker-dev-build-image": "docker build ./ -f Dockerfile_LUXURYCode -t retold/fable:local",
-    "docker-dev-run": "docker run -it -d --name retold-fable-dev -p 30001:8080 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/fable\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/fable:local"
+    "docker-dev-run": "docker run -it -d --name retold-fable-dev -p 30001:8080 -p 8086:8086 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/fable\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold/fable:local"
   },
   "mocha": {
     "diff": true,

package/retold-harness/bookstore-serve-meadow-endpoint-apis-run.js

@@ -0,0 +1,6 @@
+const libServer = require('./bookstore-serve-meadow-endpoint-apis.js'); 
+let _Orator = libServer(
+	()=>
+	{
+		console.log('API service is started!');
+	});

package/{.config/retold-harness → retold-harness}/bookstore-serve-meadow-endpoint-apis.js

@@ -74,13 +74,16 @@ let fStartServiceServer = (fInitializeCallback) =>
 				_MeadowEndpoints[tmpDALEntityName].connectRoutes(_Orator.webServer);
 			}
 
+			let tmpNames = Object.keys(_MeadowEndpoints.Book);
+			console.log(JSON.stringify(tmpNames));
+
 			// 100. Add a post processing hook to the Book DAL on single reads
 			/*
 				This post processing step will look for all book author joins then 
 				load all appropriate authors and stuff them in the book record before 
 				returning it.
 			*/
-			_MeadowEndpoints.Book.controller.BehaviorInjection.setBehavior('Read-PostOperation',
+			_MeadowEndpoints.Book.behaviorModifications.setBehavior('Read-PostOperation',
 				(pRequest, pRequestState, fComplete) =>
 				{
 					// Get the join records

package/{.config/retold-harness → retold-harness}/package.json

@@ -4,6 +4,7 @@
   "description": "Harness data import and server.",
   "main": "bookstore-serve-meadow-endpoints-apis.js",
   "scripts": {
+    "start": "node bookstore-serve-meadow-endpoint-apis-run.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -15,6 +16,7 @@
     "meadow-endpoints": "^3.0.7",
     "mysql2": "^3.3.0",
     "orator": "^3.0.11",
+    "orator-serviceserver-restify": "^1.0.4",
     "papaparse": "^5.4.1"
   }
 }

package/source/services/Fable-Service-RestClient.js

@@ -19,64 +19,88 @@ class FableServiceRestClient extends libFableServiceBase
 		this.serviceType = 'RestClient';
 	}
 
-	getJSON(pOptionsOrURL, fCallback)
+	executeChunkedRequest(pOptions, fCallback)
 	{
-		return this.getRaw(pOptionsOrURL, 
-			(pError, pResponse, pResult) =>
+		pOptions.RequestStartTime = this.fable.log.getTimeStamp();
+
+		if (this.TraceLog)
+		{
+			this.fable.log.debug(`Beginning ${pOptions.method} request to ${pOptions.url} at ${pOptions.RequestStartTime}`);
+		}
+
+		return libSimpleGet(pOptions,
+			(pError, pResponse)=>
 			{
 				if (pError)
 				{
-					return fCallback(pError, pResponse, pResult);
+					return fCallback(pError, pResponse);
 				}
 
-				if (pResponse.statusCode != 200)
+				if (this.TraceLog)
 				{
-					return fCallback(new Error(`Invalid status code ${pResponse.statusCode}`), pResponse, pResult);
+					let tmpConnectTime = this.fable.log.getTimeStamp();
+					this.fable.log.debug(`--> ${pOptions.method} connected in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpConnectTime)}ms code ${pResponse.statusCode}`);
 				}
 
-				return fCallback(pError, pResponse, JSON.parse(pResult));
+				let tmpData = '';
+
+				pResponse.on('data', (pChunk) =>
+					{
+						// For JSON, the chunk is the serialized object.
+						if (this.TraceLog)
+						{
+							let tmpChunkTime = this.fable.log.getTimeStamp();
+							this.fable.log.debug(`--> ${pOptions.method} data chunk size ${pChunk.length}b received in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpChunkTime)}ms`);
+						}
+						tmpData += pChunk;
+					});
+
+				pResponse.on('end', ()=>
+					{
+						if (this.TraceLog)
+						{
+							let tmpCompletionTime = this.fable.log.getTimeStamp();
+							this.fable.log.debug(`==> ${pOptions.method} completed data size ${tmpData.length}b received in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpCompletionTime)}ms`);
+						}
+						return fCallback(pError, pResponse, tmpData);
+					});
 			});
 	}
 
-	getRaw(pOptionsOrURL, fCallback)
+	executeJSONRequest(pOptions, fCallback)
 	{
-		let tmpRequestOptions = (typeof(pOptions) == 'object') ? pOptions : {};
-		if (typeof(pOptionsOrURL) == 'string')
-		{
-			tmpRequestOptions.url = pOptionsOrURL;
-		}
+		pOptions.json = true;
+
+		pOptions.RequestStartTime = this.fable.log.getTimeStamp();
 
-		let tmpRequestStartTime = this.fable.log.getTimeStamp();
 		if (this.TraceLog)
 		{
-			let tmpConnectTime = this.fable.log.getTimeStamp();
-			this.fable.log.debug(`Beginning GET request to ${tmpRequestOptions.url} at ${tmpRequestStartTime}`);
+			this.fable.log.debug(`Beginning ${pOptions.method} JSON request to ${pOptions.url} at ${pOptions.RequestStartTime}`);
 		}
 
-		libSimpleGet.get(tmpRequestOptions,
+		return libSimpleGet(pOptions,
 			(pError, pResponse)=>
 			{
 				if (pError)
 				{
-					return fCallback(pError, pResponse, tmpRequestOptions);
+					return fCallback(pError, pResponse);
 				}
 
 				if (this.TraceLog)
 				{
 					let tmpConnectTime = this.fable.log.getTimeStamp();
-					this.fable.log.debug(`--> GET connected in ${this.dataFormat.formatTimeDelta(tmpRequestStartTime, tmpConnectTime)}ms code ${pResponse.statusCode}`);
+					this.fable.log.debug(`--> JSON ${pOptions.method} connected in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpConnectTime)}ms code ${pResponse.statusCode}`);
 				}
 
-				let tmpData = '';
-
-				pResponse.on('data', (pChunk)=>
+				pResponse.on('data', (pChunk) =>
 					{
 						if (this.TraceLog)
 						{
 							let tmpChunkTime = this.fable.log.getTimeStamp();
-							this.fable.log.debug(`--> GET data chunk size ${pChunk.length}b received in ${this.dataFormat.formatTimeDelta(tmpRequestStartTime, tmpChunkTime)}ms`);
+							this.fable.log.debug(`--> JSON ${pOptions.method} data chunk size ${pChunk.length}b received in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpChunkTime)}ms`);
 						}
-						tmpData += pChunk;
+						// In a JSON request, the chunk is the serialized method.
+						return fCallback(pError, pResponse, JSON.parse(pChunk));
 					});
 
 				pResponse.on('end', ()=>
@@ -84,12 +108,92 @@ class FableServiceRestClient extends libFableServiceBase
 						if (this.TraceLog)
 						{
 							let tmpCompletionTime = this.fable.log.getTimeStamp();
-							this.fable.log.debug(`==> GET completed data size ${tmpData.length}b received in ${this.dataFormat.formatTimeDelta(tmpRequestStartTime, tmpCompletionTime)}ms`);
+							this.fable.log.debug(`==> JSON ${pOptions.method} completed - received in ${this.dataFormat.formatTimeDelta(pOptions.RequestStartTime, tmpCompletionTime)}ms`);
 						}
-						return fCallback(pError, pResponse, tmpData);
 					});
 			});
 	}
+
+	getJSON(pOptionsOrURL, fCallback)
+	{
+		let tmpRequestOptions = (typeof(pOptions) == 'object') ? pOptions : {};
+		if (typeof(pOptionsOrURL) == 'string')
+		{
+			tmpRequestOptions.url = pOptionsOrURL;
+		}
+
+		tmpRequestOptions.method = 'GET';
+
+		return this.executeJSONRequest(tmpRequestOptions, fCallback);
+	}
+
+	putJSON(pOptions, fCallback)
+	{
+		if (typeof(pOptions.body) != 'object')
+		{
+			return fCallback(new Error(`PUT JSON Error Invalid options object`));
+		}
+
+		pOptions.method = 'PUT';
+
+		return this.executeJSONRequest(pOptions, fCallback);
+	}
+
+	postJSON(pOptions, fCallback)
+	{
+		if (typeof(pOptions.body) != 'object')
+		{
+			return fCallback(new Error(`POST JSON Error Invalid options object`));
+		}
+
+		pOptions.method = 'POST';
+
+		return this.executeJSONRequest(pOptions, fCallback);
+	}
+
+	patchJSON(pOptions, fCallback)
+	{
+		if (typeof(pOptions.body) != 'object')
+		{
+			return fCallback(new Error(`PATCH JSON Error Invalid options object`));
+		}
+
+		pOptions.method = 'PATCH';
+
+		return this.executeJSONRequest(pOptions, fCallback);
+	}
+
+	headJSON(pOptions, fCallback)
+	{
+		if (typeof(pOptions.body) != 'object')
+		{
+			return fCallback(new Error(`HEAD JSON Error Invalid options object`));
+		}
+
+		pOptions.method = 'HEAD';
+
+		return this.executeJSONRequest(pOptions, fCallback);
+	}
+	
+	delJSON(pOptions, fCallback)
+	{
+		pOptions.method = 'DELETE';
+
+		return this.executeJSONRequest(pOptions, fCallback);
+	}
+
+	getRawText(pOptionsOrURL, fCallback)
+	{
+		let tmpRequestOptions = (typeof(pOptions) == 'object') ? pOptions : {};
+		if (typeof(pOptionsOrURL) == 'string')
+		{
+			tmpRequestOptions.url = pOptionsOrURL;
+		}
+
+		tmpRequestOptions.method = 'GET';
+
+		return this.executeChunkedRequest(tmpRequestOptions, fCallback);
+	}
 }
 
 module.exports = FableServiceRestClient;

package/test/RestClient_test.js

@@ -38,16 +38,82 @@ suite
                         let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', {TraceLog: true}, 'RestClient-99');
 
 						// Download the wiktionary entry for dog!
-						tmpRestClient.getJSON('https://en.wiktionary.org/w/api.php?action=parse&prop=wikitext&format=json&page=dog',
+						tmpRestClient.getJSON('http://localhost:8086/1.0/Author/1',
 							(pError, pResponse, pBody)=>
 							{
 								Expect(pBody).to.be.an('object');
-								Expect(pBody.hasOwnProperty('parse')).to.equal(true);
-								Expect(pBody.parse.title).to.equal('dog');
+								Expect(pBody.hasOwnProperty('Name')).to.equal(true);
+								Expect(pBody.Name).to.equal('J.K. Rowling');
 								fTestComplete();
 							});
 					}
 				);
+				test
+				(
+					'Perform a POST request.',
+					function(fTestComplete)
+					{
+						let testFable = new libFable();
+						// Instantiate the RestClient Service Provider
+                        let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', {TraceLog: true}, 'RestClient-99');
+
+						// Download the wiktionary entry for dog!
+						tmpRestClient.postJSON({url: 'http://localhost:8086/1.0/Author', body:{Name:'Test Author'}},
+							(pError, pResponse, pBody)=>
+							{
+								Expect(pBody).to.be.an('object');
+								Expect(pBody.hasOwnProperty('Name')).to.equal(true);
+								Expect(pBody.Name).to.equal('Test Author');
+								fTestComplete();
+							});
+					}
+				);
+				test
+				(
+					'Perform a PUT request.',
+					function(fTestComplete)
+					{
+						let testFable = new libFable();
+						// Instantiate the RestClient Service Provider
+                        let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', {TraceLog: true}, 'RestClient-99');
+
+						// Download the wiktionary entry for dog!
+						tmpRestClient.putJSON({url: 'http://localhost:8086/1.0/Author/Upsert', body:{GUIDAuthor:'TestAuthor', Name:'Test Author 2'}},
+							(pError, pResponse, pBody)=>
+							{
+								Expect(pBody).to.be.an('object');
+								Expect(pBody.hasOwnProperty('Name')).to.equal(true);
+								Expect(pBody.Name).to.equal('Test Author 2');
+								fTestComplete();
+							});
+					}
+				);
+				test
+				(
+					'Perform an UPSERT request then a DELETE.',
+					function(fTestComplete)
+					{
+						let testFable = new libFable();
+						// Instantiate the RestClient Service Provider
+                        let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', {TraceLog: true}, 'RestClient-99');
+
+						// Download the wiktionary entry for dog!
+						tmpRestClient.putJSON({url: 'http://localhost:8086/1.0/Author/Upsert', body:{Name:'Test Author 2 DELETE'}},
+							(pError, pResponse, pBody)=>
+							{
+								Expect(pBody).to.be.an('object');
+								Expect(pBody.hasOwnProperty('Name')).to.equal(true);
+								Expect(pBody.Name).to.equal('Test Author 2 DELETE');
+								tmpRestClient.delJSON({url: `http://localhost:8086/1.0/Author/${pBody.IDAuthor}`},
+								(pDeleteError, pDeleteResponse, pDeleteBody) =>
+								{
+									Expect(pDeleteBody.Count)
+										.to.equal(1);
+									fTestComplete();
+								});
+							});
+					}
+				);
 			}
 		);
 	}