retold-data-service 2.0.0 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "retold-data-service",
-    "version": "2.0.0",
+    "version": "2.0.4",
     "description": "Serve up a whole model!",
     "main": "source/Retold-Data-Service.js",
     "scripts": {
@@ -54,7 +54,7 @@
         "meadow": "^2.0.15",
         "meadow-connection-mysql": "^1.0.4",
         "meadow-endpoints": "^4.0.5",
-        "orator": "^4.0.2",
-        "orator-serviceserver-restify": "^2.0.2"
+        "orator": "^4.0.3",
+        "orator-serviceserver-restify": "^2.0.3"
     }
 }

package/source/Retold-Data-Service.js

@@ -52,75 +52,123 @@ class RetoldDataService extends libFableServiceProviderBase
 		// Create DAL objects for each table in the schema
 		// These will be unnecessary when meadow and meadow-endpoints are full fledged fable services
 		this._DAL = {};
-		this.fable.DAL = this._DAL;
 		this._MeadowEndpoints = {};
+
+		// Decorate fable with the same -- this is a temporary hack until meadow and meadow-endpoints are full fledged fable services
+		this.fable.DAL = this._DAL;
 		this.fable.MeadowEndpoints = this._MeadowEndpoints;
+
+		// Storage for the model and entities
+		this.fullModel = false;
+		this.entityList = false;
+
+		this.serviceInitialized = false;
+	}
+
+	onBeforeInitialize(fCallback)
+	{
+		return fCallback();
+	}
+	onInitialize(fCallback)
+	{
+		return fCallback();
+	}
+	onAfterInitialize(fCallback)
+	{
+		return fCallback();
+	}
+
+	initializePersistenceEngine(fCallback)
+	{
+		// 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'));
+		return fCallback();
+	}
+	initializeDataEndpoints(fCallback)
+	{
+		this.fable.log.info("Retold Data Service initializing Endpoints...");
+
+		// Create DAL objects for each table in the schema
+
+		// 1. Load full compiled schema of the model from stricture
+		_Fable.log.info(`...loading full model stricture schema...`);
+		this.fullModel = require (`${this.options.FullMeadowSchemaPath}${this.options.FullMeadowSchemaFilename}`);
+		_Fable.log.info(`...full model stricture schema loaded.`);
+
+		// 2. Extract an array of each table in the schema
+		_Fable.log.info(`...getting entity list...`);
+		this.entityList = Object.keys(this.fullModel.Tables);
+
+		// 3. Enumerate each entry in the compiled model and load a DAL for that table
+		_Fable.log.info(`...initializing ${this.entityList.length} DAL objects and corresponding Meadow Endpoints...`);
+		for (let i = 0; i < this.entityList.length; i++)
+		{
+			// 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`
+			_Fable.log.info(`Initializing the ${tmpDALEntityName} DAL from [${tmpDALPackageFile}]...`);
+			this._DAL[tmpDALEntityName] = this._Meadow.loadFromPackage(tmpDALPackageFile);
+			// 5. Tell this DAL object to use MySQL
+			_Fable.log.info(`...defaulting the ${tmpDALEntityName} DAL to use MySQL`);
+			this._DAL[tmpDALEntityName].setProvider('MySQL');
+			// 6. Create a Meadow Endpoints class for this DAL
+			_Fable.log.info(`...initializing the ${tmpDALEntityName} Meadow Endpoints to use MySQL`);
+			this._MeadowEndpoints[tmpDALEntityName] = libMeadowEndpoints.new(this._DAL[tmpDALEntityName]);
+			// 8. Expose the meadow endpoints on Orator
+			_Fable.log.info(`...mapping the ${tmpDALEntityName} Meadow Endpoints to Orator`);
+			this._MeadowEndpoints[tmpDALEntityName].connectRoutes(this.fable.OratorServiceServer);
+		}
+
+		return fCallback();
 	}
 
 	initializeService(fCallback)
 	{
 		if (this.serviceInitialized)
 		{
-			this.fable.log.error("Retold Data Service Application is being initialized but has already been initialized...");
 			return fCallback(new Error("Retold Data Service Application is being initialized but has already been initialized..."));
 		}
 		else
 		{
+			let tmpAnticipate = this.fable.newAnticipate();
+
 			this.fable.log.info(`The Retold Data Service is Auto Starting Orator`);
-			this.fable.Orator.startWebServer(
-				(pError) =>
+
+			tmpAnticipate.anticipate(this.onBeforeInitialize.bind(this));
+
+			tmpAnticipate.anticipate(
+				(fCallback) =>
 				{
-					if (pError)
+					if (this.options.AutoStartOrator)
 					{
-						console.log(`Error auto-starting Orator: ${pError}`, pError);
-						return fCallback(pError);
+						this.fable.Orator.startWebServer(fCallback);
 					}
+					else
+					{
+						return fCallback();
+					}
+				});
 
-					// 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
-					_Fable.serviceManager.addAndInstantiateServiceType('MeadowMySQLProvider', require('meadow-connection-mysql'));
-
-					this.fullModel = false;
-					this.entityList = false;
-
-					this.serviceInitialized = false;
-
-					this.fable.log.info("Retold Data Service Application is starting up...");
+			tmpAnticipate.anticipate(this.initializePersistenceEngine.bind(this));
 
-					// Create DAL objects for each table in the schema
+			tmpAnticipate.anticipate(this.onInitialize.bind(this));
 
-					// 1. Load full compiled schema of the model from stricture
-					_Fable.log.info(`...loading full model stricture schema...`);
-					this.fullModel = require (`${this.options.FullMeadowSchemaPath}${this.options.FullMeadowSchemaFilename}`);
-					_Fable.log.info(`...full model stricture schema loaded.`);
+			tmpAnticipate.anticipate(this.initializeDataEndpoints.bind(this));
 
-					// 2. Extract an array of each table in the schema
-					_Fable.log.info(`...getting entity list...`);
-					this.entityList = Object.keys(this.fullModel.Tables);
+			tmpAnticipate.anticipate(this.onAfterInitialize.bind(this));
 
-					// 3. Enumerate each entry in the compiled model and load a DAL for that table
-					_Fable.log.info(`...initializing ${this.entityList.length} DAL objects and corresponding Meadow Endpoints...`);
-					for (let i = 0; i < this.entityList.length; i++)
+			tmpAnticipate.wait(
+				(pError)=>
+				{
+					if (pError)
 					{
-						// 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`
-						_Fable.log.info(`Initializing the ${tmpDALEntityName} DAL from [${tmpDALPackageFile}]...`);
-						this._DAL[tmpDALEntityName] = this._Meadow.loadFromPackage(tmpDALPackageFile);
-						// 5. Tell this DAL object to use MySQL
-						_Fable.log.info(`...defaulting the ${tmpDALEntityName} DAL to use MySQL`);
-						this._DAL[tmpDALEntityName].setProvider('MySQL');
-						// 6. Create a Meadow Endpoints class for this DAL
-						_Fable.log.info(`...initializing the ${tmpDALEntityName} Meadow Endpoints to use MySQL`);
-						this._MeadowEndpoints[tmpDALEntityName] = libMeadowEndpoints.new(this._DAL[tmpDALEntityName]);
-						// 8. Expose the meadow endpoints on Orator
-						_Fable.log.info(`...mapping the ${tmpDALEntityName} Meadow Endpoints to Orator`);
-						this._MeadowEndpoints[tmpDALEntityName].connectRoutes(this.fable.Orator.webServer);
+						this.log.error(`Error initializing Retold Data Service: ${pError}`);
+						return fCallback(pError);
 					}
-
+					this.fable.Orator.startWebServer.bind(this.fable.Orator);
 					this.serviceInitialized = true;
-
-					return fCallback(pError);
+					return fCallback();
 				});
 		}
 	}