daveappserver 0.5.39 → 0.5.44

package/appserver.js

@@ -1,10 +1,11 @@
-var myVersion = "0.5.39", myProductName = "daveAppServer";  
+var myVersion = "0.5.44", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
 exports.saveStats = saveStats;
 exports.getStats = getStats; //6/28/21 by DW
 exports.getConfig = getConfig;
+exports.publishFile = publishFile; //12/13/21 by DW
 
 const fs = require ("fs");
 var dns = require ("dns");
@@ -281,6 +282,18 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				});
 			}
 		
+		function kissOtherLogonsGoodnight (screenname, theNewConnection) { //12/14/21 by DW
+			theWsServer.connections.forEach (function (conn, ix) {
+				if (conn.appData !== undefined) { //it's one of ours
+					if (conn != theNewConnection) { //it's not the new one
+						if (conn.appData.screenname == screenname) {
+							conn.sendText ("goodnight");
+							}
+						}
+					}
+				});
+			}
+		
 		conn.on ("text", function (s) {
 			var words = s.split (" ");
 			if (words.length > 1) { //new protocol as of 11/29/15 by DW
@@ -299,6 +312,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 						conn.appData.urlToWatch = "";
 						davetwitter.getScreenName (token, secret, function (screenname) {
 							conn.appData.screenname = screenname;
+							kissOtherLogonsGoodnight (screenname, conn); //12/14/21 by DW
 							logToConsole (conn, conn.appData.lastVerb, conn.appData.screenname);
 							});
 						break;
@@ -364,6 +378,9 @@ function cleanFileStats (stats) { //4/19/21 by DW
 						}
 					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) {
@@ -605,6 +622,10 @@ function cleanFileStats (stats) { //4/19/21 by DW
 							callback (err);
 							}
 						else {
+							if (config.publishFile !== undefined) { //3/18/22 by DW
+								var url = (flprivate) ? undefined : config.urlServerForClient + screenname + "/" + relpath;
+								config.publishFile (f, screenname, relpath, type, flprivate, filetext, url);
+								}
 							callback (undefined);
 							}
 						});
@@ -985,31 +1006,46 @@ function startup (options, callback) {
 				});
 			}
 		function returnServerHomePage () {
-			request (config.urlServerHomePageSource, function (error, response, templatetext) {
-				if (!error && response.statusCode == 200) {
-					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,
-						idGitHubClient: config.githubClientId //11/9/21 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);
+			function servePage (templatetext) {
+				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,
+					idGitHubClient: config.githubClientId //11/9/21 by DW
+					};
+				if (theRequest.addToPagetable !== undefined) { //3/9/21 by DW
+					for (var x in theRequest.addToPagetable) {
+						pagetable [x] = theRequest.addToPagetable [x];
 						}
-					var pagetext = utils.multipleReplaceAll (templatetext, pagetable, false, "[%", "%]");
-					returnHtml (pagetext);
 					}
-				});
+				if (config.addMacroToPagetable !== undefined) {
+					config.addMacroToPagetable (pagetable);
+					}
+				var pagetext = utils.multipleReplaceAll (templatetext.toString (), pagetable, false, "[%", "%]");
+				returnHtml (pagetext);
+				}
+			if (config.pathServerHomePageSource !== undefined) {
+				fs.readFile (config.pathServerHomePageSource, function (err, templatetext) {
+					if (err) {
+						console.log ("returnServerHomePage: err.message == " + err.message + ", f == " + config.pathServerHomePageSource);
+						}
+					else {
+						servePage (templatetext);
+						}
+					});
+				}
+			else {
+				request (config.urlServerHomePageSource, function (err, response, templatetext) {
+					if (!err && response.statusCode == 200) {
+						servePage (templatetext);
+						}
+					});
+				}
 			}
 		function callWithScreenname (callback) {
 			davetwitter.getScreenName (token, secret, function (screenname) {

package/package.json

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

package/readme.md

@@ -52,6 +52,12 @@ The second section configures the HTTP server and the connection to Twitter for
 
 ### Updates
 
+#### v0.5.44 -- 3/18/22 by DW
+
+New callback, config.publishFile. If defined we call back with the file, screenname, relpath, flprivate, filetext and the url of the file if it's public.
+
+It's called when we handle a /publishfile or /writewholefile message.
+
 #### v0.5.32 -- 12/4/21 by DW
 
 Added a new callback, publicFileSaved, which is called when the user updates a public file. 

package/readme.opml

@@ -2,7 +2,7 @@
 <opml version="2.0">
 	<head>
 		<title>readme.md</title>
-		<dateModified>&lt;%dateModified%></dateModified>
+		<dateModified>Fri, 18 Mar 2022 14:26:35 GMT</dateModified>
 		<expansionState></expansionState>
 		<vertScrollState>1</vertScrollState>
 		<windowTop>300</windowTop>
@@ -45,6 +45,10 @@
 				</outline>
 			</outline>
 		<outline created="Wed, 15 Sep 2021 14:19:02 GMT" text="### Updates">
+			<outline created="Fri, 18 Mar 2022 14:21:28 GMT" text="#### v0.5.44 -- 3/18/22 by DW">
+				<outline created="Fri, 18 Mar 2022 14:21:59 GMT" text="New callback, config.publishFile. If defined we call back with the file, screenname, relpath, flprivate, filetext and the url of the file if it's public."></outline>
+				<outline created="Fri, 18 Mar 2022 14:22:36 GMT" text="It's called when we handle a /publishfile or /writewholefile message."></outline>
+				</outline>
 			<outline created="Sat, 04 Dec 2021 21:29:57 GMT" text="#### v0.5.32 -- 12/4/21 by DW">
 				<outline created="Sat, 04 Dec 2021 21:30:33 GMT" text="Added a new callback, publicFileSaved, which is called when the user updates a public file. "></outline>
 				<outline created="Sat, 04 Dec 2021 21:29:58 GMT" text="Fixed a bug where a user couldn't create a new file if their public files folder was empty. "></outline>