daveappserver 0.7.5 → 0.7.6

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.7.5", myProductName = "daveAppServer";  
+var myVersion = "0.7.6", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -478,44 +478,49 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			});
 		}
 	function publishFile (screenname, relpath, type, flprivate, filetext, callback) {
-		if (config.flStorageEnabled) {
-			if (config.flUseS3ForStorage) { 
-				saveFileToS3 (screenname, relpath, type, flprivate, filetext, callback);
-				}
-			else {
-				var f = getFilePath (screenname, relpath, flprivate);
-				utils.sureFilePath (f, function () {
-					var now = new Date ();
-					fs.writeFile (f, filetext, function (err) {
-						if (err) {
-							callback (err);
-							}
-						else {
-							var url = (flprivate) ? undefined : config.urlServerForClient + screenname + "/" + relpath;
-							if (config.publishFile !== undefined) { //3/18/22 by DW
-								config.publishFile (f, screenname, relpath, type, flprivate, filetext, url);
+		if (config.publishStaticFile !== undefined) { //9/20/23 by DW
+			config.publishStaticFile (screenname, relpath, type, flprivate, filetext, callback);
+			}
+		else {
+			if (config.flStorageEnabled) {
+				if (config.flUseS3ForStorage) { 
+					saveFileToS3 (screenname, relpath, type, flprivate, filetext, callback);
+					}
+				else {
+					var f = getFilePath (screenname, relpath, flprivate);
+					utils.sureFilePath (f, function () {
+						var now = new Date ();
+						fs.writeFile (f, filetext, function (err) {
+							if (err) {
+								callback (err);
 								}
-							if (!flprivate) {
-								notifySocketSubscribers ("update", filetext, true, function (conn) { //3/6/2 by DW -- payload is a string
-									if (conn.appData.urlToWatch == url) {
-										return (true);
-										}
-									else {
-										return (false);
-										}
+							else {
+								var url = (flprivate) ? undefined : config.urlServerForClient + screenname + "/" + relpath;
+								if (config.publishFile !== undefined) { //3/18/22 by DW
+									config.publishFile (f, screenname, relpath, type, flprivate, filetext, url);
+									}
+								if (!flprivate) {
+									notifySocketSubscribers ("update", filetext, true, function (conn) { //3/6/2 by DW -- payload is a string
+										if (conn.appData.urlToWatch == url) {
+											return (true);
+											}
+										else {
+											return (false);
+											}
+										});
+									}
+								callback (undefined, {
+									url,
+									whenLastUpdate: now
 									});
 								}
-							callback (undefined, {
-								url,
-								whenLastUpdate: now
-								});
-							}
+							});
 						});
-					});
+					}
+				}
+			else {
+				callback ({message: "Can't publish the file because the feature is not enabled on the server."});
 				}
-			}
-		else {
-			callback ({message: "Can't publish the file because the feature is not enabled on the server."});
 			}
 		}
 	function getFile (screenname, relpath, flprivate, callback) {
@@ -526,35 +531,50 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			callback (err);
 			}
-		if (config.flStorageEnabled) {
-			if (config.flUseS3ForStorage) {
-				getFileFromS3 (screenname, relpath, flprivate, callback);
+		function getFromStaticFIlesystem () {
+			if (config.flStorageEnabled) {
+				if (config.flUseS3ForStorage) {
+					getFileFromS3 (screenname, relpath, flprivate, callback);
+					}
+				else {
+					var f = getFilePath (screenname, relpath, flprivate);
+					fs.readFile (f, function (err, filetext) {
+						if (err) {
+							errcallback (err);
+							}
+						else {
+							fs.stat (f, function (err, stats) {
+								if (err) {
+									errcallback (err);
+									}
+								else {
+									var data = {
+										filedata: filetext.toString (),
+										filestats: cleanFileStats (stats)
+										};
+									callback (undefined, data);
+									}
+								});
+							}
+						});
+					}
 				}
 			else {
-				var f = getFilePath (screenname, relpath, flprivate);
-				fs.readFile (f, function (err, filetext) {
-					if (err) {
-						errcallback (err);
-						}
-					else {
-						fs.stat (f, function (err, stats) {
-							if (err) {
-								errcallback (err);
-								}
-							else {
-								var data = {
-									filedata: filetext.toString (),
-									filestats: cleanFileStats (stats)
-									};
-								callback (undefined, data);
-								}
-							});
-						}
-					});
+				callback ({message: "Can't get the file because the feature is not enabled on the server."});
 				}
 			}
+		if (config.getStaticFile !== undefined) { //9/20/23 by DW
+			config.getStaticFile (screenname, relpath, flprivate, function (err, data) {
+				if (err) {
+					getFromStaticFIlesystem ();
+					}
+				else {
+					callback (undefined, data);
+					}
+				});
+			}
 		else {
-			callback ({message: "Can't publish the file because the feature is not enabled on the server."});
+			getFromStaticFIlesystem ();
 			}
 		}
 	function getFileList (screenname, flprivate, callback) {
@@ -1791,7 +1811,6 @@ function startup (options, callback) {
 			}
 		}
 	
-	
 	utils.copyScalars (options, config); //1/22/21 by DW
 	readConfigJson (function () { //readConfig (fnameConfig, config, true, function () { //anything can be overridden by config.json
 		readConfig (fnameStats, stats, false, function () {

package/package.json

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