daveappserver 0.7.3 → 0.7.5

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.7.3", myProductName = "daveAppServer";  
+var myVersion = "0.7.5", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -1411,69 +1411,76 @@ function startup (options, callback) {
 				});
 			}
 		function returnServerHomePage () {
-			function servePage (templatetext) {
-				
-				function arrayToParam (theArray) { //7/21/22 by DW
-					if (theArray === undefined) {
-						return (undefined);
-						}
-					else {
-						return (JSON.stringify (theArray));
-						}
-					}
-				
-				var pagetable = {
-					productName: config.productName, 
-					productNameForDisplay: config.productNameForDisplay, 
-					version: config.version,
-					urlServerForClient: config.urlServerForClient,
-					urlWebsocketServerForClient: config.urlWebsocketServerForClient,
-					flEnableLogin: config.flEnableLogin,
-					prefsPath: config.prefsPath,
-					docsPath: config.docsPath,
-					flUseTwitterIdentity: config.flUseTwitterIdentity, //2/6/23 by DW
-					idGitHubClient: config.githubClientId, //11/9/21 by DW
-					flWebsocketEnabled: config.flWebsocketEnabled //2/8/23 by DW
-					};
-				if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
-					for (var x in theRequest.addToPagetable) {
-						pagetable [x] = theRequest.addToPagetable [x];
-						}
-					}
-				if (config.addMacroToPagetable !== undefined) {
-					config.addMacroToPagetable (pagetable, theRequest); //8/10/22 by DW
-					}
-				
-				function replaceAllAndReturnHtml () {
-					var pagetext = utils.multipleReplaceAll (templatetext.toString (), pagetable, false, "[%", "%]");
-					returnHtml (pagetext);
-					}
-				if (config.asyncAddMacroToPagetable !== undefined) { //8/10/22 by DW
-					config.asyncAddMacroToPagetable (pagetable, theRequest, function () {
-						replaceAllAndReturnHtml ();
+			var pagetable = {
+				productName: config.productName, 
+				productNameForDisplay: config.productNameForDisplay, 
+				version: config.version,
+				urlServerForClient: config.urlServerForClient,
+				urlWebsocketServerForClient: config.urlWebsocketServerForClient,
+				flEnableLogin: config.flEnableLogin,
+				prefsPath: config.prefsPath,
+				docsPath: config.docsPath,
+				flUseTwitterIdentity: config.flUseTwitterIdentity, //2/6/23 by DW
+				idGitHubClient: config.githubClientId, //11/9/21 by DW
+				flWebsocketEnabled: config.flWebsocketEnabled, //2/8/23 by DW
+				urlServerHomePageSource: config.urlServerHomePageSource, //9/16/23 by DW
+				pathServerHomePageSource: config.pathServerHomePageSource //9/16/23 by DW
+				};
+			function getTemplateText (callback) {
+				if (pagetable.pathServerHomePageSource !== undefined) {
+					fs.readFile (pagetable.pathServerHomePageSource, function (err, templatetext) {
+						if (err) {
+							callback (err);
+							}
+						else {
+							callback (undefined, templatetext);
+							}
 						});
 					}
 				else {
-					replaceAllAndReturnHtml ();
+					request (pagetable.urlServerHomePageSource, function (err, response, templatetext) {
+						if (err) {
+							callback (err);
+							}
+						else {
+							if ((response.statusCode >= 200) && (response.statusCode <= 299)) {
+								callback (undefined, templatetext);
+								}
+							else {
+								const message = "HTTP error == " + response.statusCode;
+								callback ({message});
+								}
+							}
+						});
 					}
 				}
-			if (config.pathServerHomePageSource !== undefined) {
-				fs.readFile (config.pathServerHomePageSource, function (err, templatetext) {
+			function buildAndServeHomepage () {
+				getTemplateText (function (err, templatetext) {
 					if (err) {
-						console.log ("returnServerHomePage: err.message == " + err.message + ", f == " + config.pathServerHomePageSource);
+						returnError (err);
 						}
 					else {
-						servePage (templatetext);
+						const pagetext = utils.multipleReplaceAll (templatetext.toString (), pagetable, false, "[%", "%]");
+						returnHtml (pagetext);
 						}
 					});
 				}
-			else {
-				request (config.urlServerHomePageSource, function (err, response, templatetext) {
-					if (!err && response.statusCode == 200) {
-						servePage (templatetext);
-						}
+			if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
+				for (var x in theRequest.addToPagetable) {
+					pagetable [x] = theRequest.addToPagetable [x];
+					}
+				}
+			if (config.addMacroToPagetable !== undefined) {
+				config.addMacroToPagetable (pagetable, theRequest); //8/10/22 by DW
+				}
+			if (config.asyncAddMacroToPagetable !== undefined) { //8/10/22 by DW
+				config.asyncAddMacroToPagetable (pagetable, theRequest, function () {
+					buildAndServeHomepage ();
 					});
 				}
+			else {
+				buildAndServeHomepage ();
+				}
 			}
 		function callWithScreenname (callback) {
 			if (config.flUseTwitterIdentity) { //2/6/23 by DW

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.7.3",
+	"version": "0.7.5",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",