retold-data-service 2.0.6 → 2.0.8

package/Dockerfile_Service

@@ -0,0 +1,50 @@
+FROM debian:latest
+MAINTAINER steven velozo
+
+RUN echo "...installing debian dependencies..."
+RUN apt update
+RUN apt install vim curl tmux -y
+
+RUN echo "Building service image..."
+
+RUN echo "...configuring mariadb (mysql) server..."
+RUN apt install default-mysql-server default-mysql-client -y
+RUN sed -i "s|bind-address|#bind-address|g" /etc/mysql/mariadb.conf.d/50-server.cnf
+COPY ./debug/model/manual_scripts/MySQL-Security.sql /root/MySQL-Configure-Security.sql
+COPY ./debug/model/manual_scripts/MySQL-Laden-Entry-ServicesOnly.sh /usr/bin/MySQL-Laden-Entry-NoSudo.sh
+RUN ( mysqld_safe --skip-grant-tables --skip-networking & ) && sleep 5 &&  mysql -u root < /root/MySQL-Configure-Security.sql
+
+# Import the initial database
+COPY ./debug/model/sql_create/BookStore-CreateDatabase.mysql.sql /root/MySQL-Create-Databases.sql
+COPY ./debug/model/sql_create/BookStore-CreateAndPopulateTables.sql /root/BookStore-CreateAndPopulateTables.sql
+RUN service mariadb restart && sleep 5 && mysql -u root -p"123456789" -e "CREATE DATABASE bookstore;"
+RUN echo "...creating and populating database..."
+RUN service mariadb restart && sleep 5 && mysql -u root -p"123456789" bookstore < /root/MySQL-Create-Databases.sql
+RUN service mariadb restart && sleep 5 && mysql -u root -p"123456789" bookstore < /root/BookStore-CreateAndPopulateTables.sql
+RUN echo "...database creation and population complmete."
+
+RUN echo "...mapping library specific volumes..."
+
+VOLUME /retold-data-service
+
+SHELL ["/bin/bash", "-c"]
+
+RUN echo "...installing node version manager..."
+
+# Because there is a .bashrc chicken/egg problem, we will create one here to simulate logging in.  This is not great.
+RUN touch /root/.bashrc && chmod +x /root/.bashrc
+RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash
+
+ENV NODE_VERSION=14
+ENV NVM_DIR=/root/.nvm
+RUN . "$NVM_DIR/nvm.sh" && nvm install ${NODE_VERSION}
+RUN . "$NVM_DIR/nvm.sh" && nvm use v${NODE_VERSION}
+RUN . "$NVM_DIR/nvm.sh" && nvm alias default v${NODE_VERSION}
+ENV PATH="/root/.nvm/versions/node/v${NODE_VERSION}/bin/:${PATH}"
+RUN . /root/.nvm/nvm.sh && source /root/.bashrc && node --version
+RUN . /root/.nvm/nvm.sh && npm --version
+
+WORKDIR /retold-data-service
+
+COPY ./debug/model/manual_scripts/MySQL-Laden-Entry-ServicesOnly.sh /root/MySQL-Laden-Entry-ServicesOnly.sh
+ENTRYPOINT ["/root/MySQL-Laden-Entry-ServicesOnly.sh"]

package/debug/Harness.js

@@ -1,14 +1,60 @@
-const _Settings = require('./bookstore-configuration.json');
+const _Settings = (
+	{
+		"Product": "MeadowEndpointsTestHarness",
+
+		"ProductVersion": "1.0.0",
+		"UUID":
+			{
+				"DataCenter": 0,
+				"Worker": 0
+			},
+		"LogStreams":
+			[
+				{
+					"streamtype": "console"
+				}
+			],
+
+		"APIServerPort": 8087,
+
+		"RetoldDataServiceOptions":
+		{
+			"StorageProvider": "MySQL",
+			"StorageProviderModule": "meadow-connection-mysql",
+
+			"FullMeadowSchemaPath": `${__dirname}/../test/model/`,
+			"FullMeadowSchemaFilename": `MeadowModel-Extended.json`,
+		},
+
+		"MySQL":
+			{
+				"Server": "127.0.0.1",
+				"Port": 31306,
+				"User": "root",
+				"Password": "123456789",
+				"Database": "bookstore",
+				"ConnectionPoolLimit": 20
+			},
+		"MeadowConnectionMySQLAutoConnect": true
+	});
 
 const libFable = require('fable');
 
 _Fable = new libFable(_Settings);
 
-_Fable.serviceManager.addAndInstantiateServiceType('RetoldDataService', require('../source/Retold-Data-Service.js'));
+_Fable.serviceManager.addServiceType('RetoldDataService', require('../source/Retold-Data-Service.js'));
+_Fable.serviceManager.instantiateServiceProvider('RetoldDataService', _Settings.RetoldDataServiceOptions);
 
 _Fable.RetoldDataService.initializeService(
 	(pError) =>
 	{
+		if (pError)
+		{
+			_Fable.log.error(`Error initializing the Retold Data Service: ${pError}`);
+			throw pError;
+		}
+
+		// Inject a behavior to load all authors for a book on single record read
 		_Fable.MeadowEndpoints.Book.controller.BehaviorInjection.setBehavior('Read-PostOperation',
 			(pRequest, pRequestState, fComplete) =>
 			{
@@ -37,4 +83,37 @@ _Fable.RetoldDataService.initializeService(
 						}
 					});
 			});
+
+		const fGracefullyStopService = function ()
+		{
+				if (_Fable.RetoldDataService.serviceInitialized)
+				{
+					_Fable.RetoldDataService.stopService(
+						function (pStopError)
+						{
+							if (pStopError)
+							{
+								_Fable.log.error(`Error stopping Retold Data Service: ${pStopError}`);
+							}
+							else
+							{
+								_Fable.log.info('Retold Data Service stopped. Exiting.');
+							}
+						});
+				}
+		};
+
+		process.on('SIGINT', 
+			function ()
+			{
+				_Fable.log.info('Received SIGINT. Shutting down gracefully...');
+				fGracefullyStopService();
+			});
+
+		process.on('SIGTERM',
+			function ()
+			{
+				_Fable.log.info('Received SIGTERM. Shutting down gracefully...');
+				fGracefullyStopService();
+			});
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-data-service",
-    "version": "2.0.6",
+    "version": "2.0.8",
     "description": "Serve up a whole model!",
     "main": "source/Retold-Data-Service.js",
     "scripts": {
@@ -8,9 +8,14 @@
         "coverage": "./node_modules/.bin/nyc --reporter=lcov --reporter=text-lcov ./node_modules/mocha/bin/_mocha -- -u tdd -R spec",
         "test": "./node_modules/.bin/mocha -u tdd -R spec",
         "build": "npx quack build",
+        "build-test-model": "cd test && npx stricture -i model/ddl/BookStore.ddl",
         "docker-dev-build": "docker build ./ -f Dockerfile_LUXURYCode -t retold-data-service-image:local",
         "docker-dev-run": "docker run -it -d --name retold-data-service-dev -p 44444:8080 -p 43306:3306 -p 48086:8086 -v \"$PWD/.config:/home/coder/.config\"  -v \"$PWD:/home/coder/retold-data-service\" -u \"$(id -u):$(id -g)\" -e \"DOCKER_USER=$USER\" retold-data-service-image:local",
-        "docker-dev-shell": "docker exec -it retold-data-service-dev /bin/bash"
+        "docker-dev-shell": "docker exec -it retold-data-service-dev /bin/bash",
+        "docker-service-build": "docker build ./ -f Dockerfile_Service -t retold-data-service-server-image:local",
+        "docker-service-run-test": "docker run -it --init -d --name retold-data-service -p 8086:8086 -p 43306:3306 -v \"$(pwd):/retold-data-service:z\" -u \"$(id -u):$(id -g)\" retold-data-service-server-image:local",
+        "docker-service-run": "docker run -it --init -d --name retold-data-service -p 8086:8086 -p 43306:3306 -v \"$(pwd):/retold-data-service:z\" retold-data-service-server-image:local",
+        "docker-service-shell": "docker exec -it retold-data-service /bin/bash"
     },
     "mocha": {
         "diff": true,
@@ -46,15 +51,18 @@
     },
     "homepage": "https://github.com/stevenvelozo/retold-data-service",
     "devDependencies": {
-        "quackage": "^1.0.28"
+        "quackage": "^1.0.41",
+        "stricture": "^1.0.37"
     },
     "dependencies": {
-        "fable": "^3.0.112",
-        "fable-serviceproviderbase": "^3.0.12",
+        "fable": "^3.1.11",
+        "fable-serviceproviderbase": "^3.0.15",
         "meadow": "^2.0.15",
         "meadow-connection-mysql": "^1.0.4",
         "meadow-endpoints": "^4.0.5",
-        "orator": "^4.0.3",
-        "orator-serviceserver-restify": "^2.0.3"
+        "orator": "^5.0.1",
+        "orator-http-proxy": "^1.0.1",
+        "orator-serviceserver-restify": "^2.0.4",
+        "orator-static-server": "^1.0.1"
     }
 }

package/source/Retold-Data-Service.js

@@ -15,12 +15,11 @@ const libMeadowEndpoints = require('meadow-endpoints');
 
 const defaultDataServiceSettings = (
 	{
-		FullMeadowSchemaPath: `${process.cwd()}/model/`,
-		FullMeadowSchemaFilename: `Model-Extended.json`,
+		StorageProvider: 'MySQL',
+		StorageProviderModule: 'meadow-connection-mysql',
 
-		DALMeadowSchemaPath: `${process.cwd()}/model/meadow/`,
-		DALMeadowSchemaPrefix: `Model-MeadowSchema-`,
-		DALMeadowSchemaPostfix: ``,
+		FullMeadowSchemaPath: `${process.cwd()}/model/`,
+		FullMeadowSchemaFilename: `MeadowModel-Extended.json`,
 
 		AutoInitializeDataService: true,
 		AutoStartOrator: true
@@ -71,10 +70,12 @@ class RetoldDataService extends libFableServiceProviderBase
 	{
 		return fCallback();
 	}
+
 	onInitialize(fCallback)
 	{
 		return fCallback();
 	}
+
 	onAfterInitialize(fCallback)
 	{
 		return fCallback();
@@ -84,9 +85,10 @@ class RetoldDataService extends libFableServiceProviderBase
 	{
 		// TODO: Change this to an option (e.g. we might want to do ALASQL)
 		// Load the mysql connection for meadow if it doesn't exist yet
-		this.fable.serviceManager.addAndInstantiateServiceType('MeadowMySQLProvider', require('meadow-connection-mysql'));
+		this.fable.serviceManager.addAndInstantiateServiceType(`Meadow${this.options.StorageProvider}Provider`, require(this.options.StorageProviderModule));
 		return fCallback();
 	}
+
 	initializeDataEndpoints(fCallback)
 	{
 		this.fable.log.info("Retold Data Service initializing Endpoints...");
@@ -108,14 +110,15 @@ class RetoldDataService extends libFableServiceProviderBase
 		{
 			// 4. Create the DAL for each entry (e.g. it would be at _DAL.Movie for the Movie entity)
 			let tmpDALEntityName = this.entityList[i];
-			let tmpDALPackageFile = `${this.options.DALMeadowSchemaPath}${this.options.DALMeadowSchemaPrefix}${tmpDALEntityName}${this.options.DALMeadowSchemaPostfix}.json`
-			this.fable.log.info(`Initializing the ${tmpDALEntityName} DAL from [${tmpDALPackageFile}]...`);
-			this._DAL[tmpDALEntityName] = this._Meadow.loadFromPackage(tmpDALPackageFile);
-			// 5. Tell this DAL object to use MySQL
-			this.fable.log.info(`...defaulting the ${tmpDALEntityName} DAL to use MySQL`);
-			this._DAL[tmpDALEntityName].setProvider('MySQL');
+			let tmpDALPackageObject = this.fullModel.Tables[tmpDALEntityName];
+			// We no longer need to load it from a package file; it's all in the full model
+			this.fable.log.info(`Initializing the ${tmpDALEntityName} DAL...`);
+			this._DAL[tmpDALEntityName] = this._Meadow.loadFromPackageObject(tmpDALPackageObject.MeadowSchema);
+			// 5. Tell this DAL object to use the specified storage provider
+			this.fable.log.info(`...defaulting the ${tmpDALEntityName} DAL to use ${this.options.StorageProvider}`);
+			this._DAL[tmpDALEntityName].setProvider(this.options.StorageProvider);
 			// 6. Create a Meadow Endpoints class for this DAL
-			this.fable.log.info(`...initializing the ${tmpDALEntityName} Meadow Endpoints to use MySQL`);
+			this.fable.log.info(`...initializing the ${tmpDALEntityName} Meadow Endpoints to use ${this.options.StorageProvider}`);
 			this._MeadowEndpoints[tmpDALEntityName] = libMeadowEndpoints.new(this._DAL[tmpDALEntityName]);
 			// 8. Expose the meadow endpoints on Orator
 			this.fable.log.info(`...mapping the ${tmpDALEntityName} Meadow Endpoints to Orator`);
@@ -174,6 +177,34 @@ class RetoldDataService extends libFableServiceProviderBase
 				});
 		}
 	}
+
+	stopService(fCallback)
+	{
+		if (!this.serviceInitialized)
+		{
+			return fCallback(new Error("Retold Data Service Application is being stopped but is not initialized..."));
+		}
+		else
+		{
+			this.fable.log.info(`The Retold Data Service is stopping Orator`);
+
+			let tmpAnticipate = this.fable.newAnticipate();
+
+			tmpAnticipate.anticipate(this.fable.Orator.stopWebServer.bind(this.fable.Orator));
+
+			tmpAnticipate.wait(
+				(pError)=>
+				{
+					if (pError)
+					{
+						this.log.error(`Error stopping Retold Data Service: ${pError}`);
+						return fCallback(pError);
+					}
+					this.serviceInitialized = false;
+					return fCallback();
+				});
+		}
+	}
 }
 
 module.exports = RetoldDataService;

package/test/RetoldDataService_tests.js

@@ -42,7 +42,12 @@ suite
 								AutoStartOrator: true
 							});
 
-						tmpRetoldDataService.initializeService(()=>{return fDone()});
+						tmpRetoldDataService.initializeService(
+							()=>
+							{
+								// The data service created an orator
+								_Fable.Orator.stopService(fDone);
+							});
 					}
 				);
 			}