daveappserver 0.5.27 → 0.5.31

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.5.27", myProductName = "daveAppServer";  
+var myVersion = "0.5.31", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -55,6 +55,8 @@ var stats = {
 	};
 const fnameStats = "stats.json";
 
+
+
 function statsChanged () {
 	flStatsChanged = true;
 	}
@@ -534,13 +536,15 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				}
 			function writethefile (flprivate) {
 				var f = getFilePath (screenname, relpath, flprivate);
-				fs.writeFile (f, filetext, function (err) {
-					if (err) {
-						callback (err);
-						}
-					else {
-						callback (undefined);
-						}
+				utils.sureFilePath (f, function () { //9/15/21 by DW
+					fs.writeFile (f, filetext, function (err) {
+						if (err) {
+							callback (err);
+							}
+						else {
+							callback (undefined);
+							}
+						});
 					});
 				}
 			readone (false, function (err, data) {
@@ -553,6 +557,9 @@ function cleanFileStats (stats) { //4/19/21 by DW
 				});
 			});
 		}
+	function getPublicUrl (screenname, relpath) { //8/24/21 by DW
+		return (config.urlServerForClient + screenname + "/" + relpath);
+		}
 	function getFileInfo (screenname, relpath, callback) { //4/1/21 by DW
 		if (config.flStorageEnabled) {
 			findFile (screenname, relpath, function (err, stats) {
@@ -568,7 +575,8 @@ function cleanFileStats (stats) { //4/19/21 by DW
 						whenAccessed: formatDate (stats.atime), //when last red
 						whenCreated: formatDate (stats.birthtime),
 						whenModified: formatDate (stats.mtime),
-						flPrivate: stats.flPrivate
+						flPrivate: stats.flPrivate,
+						urlPublic: (stats.flPrivate) ? undefined : getPublicUrl (screenname, relpath) //8/24/21 by DW
 						});
 					}
 				});
@@ -867,11 +875,24 @@ function startup (options, callback) {
 				function returnPlainText (s) {
 					theRequest.httpReturn (200, "text/plain", s.toString ());
 					}
+				
+				function getFileContent (screenname, relpath, flprivate, callback) { //9/8/21 by DW
+					var f = getFilePath (screenname, relpath, flprivate);
+					fs.readFile (f, function (err, filetext) {
+						if (err) {
+							callback (err);
+							}
+						else {
+							callback (undefined, filetext);
+							}
+						});
+					}
+				
 				var path = utils.stringDelete (theRequest.path, 1, 1); //delete leading slash
 				var screenname = utils.stringNthField (path, "/", 1);
 				var relpath = utils.stringDelete (path, 1, screenname.length + 1);
 				var flprivate = false;
-				getFile (screenname, relpath, flprivate, function (err, data) {
+				getFileContent (screenname, relpath, flprivate, function (err, filedata) {
 					if (err) {
 						return404 ();
 						}
@@ -883,7 +904,7 @@ function startup (options, callback) {
 						else {
 							type = utils.httpExt2MIME (ext, config.defaultContentType);
 							}
-						theRequest.httpReturn (200, type, data.filedata);
+						theRequest.httpReturn (200, type, filedata);
 						}
 					});
 				}

package/package.json

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

package/readme.md

@@ -50,3 +50,9 @@ The second section configures the HTTP server and the connection to Twitter for
 
 4. twitterConsumerKey and twitterConsumerSecret are the values that identify the app for Twitter, as assigned on developer.twitter.com. 
 
+### Updates
+
+v0.5.31 -- 9/15/21 by DW
+
+writeWholeFile was meant to be sure the path to the file exists before writing the file. It wasn't doing it, now it does. 
+

package/readme.opml

@@ -44,5 +44,10 @@
 				<outline text="4. twitterConsumerKey and twitterConsumerSecret are the values that identify the app for Twitter, as assigned on developer.twitter.com. "></outline>
 				</outline>
 			</outline>
+		<outline created="Wed, 15 Sep 2021 14:19:02 GMT" text="### Updates">
+			<outline created="Wed, 15 Sep 2021 14:19:10 GMT" text="v0.5.31 -- 9/15/21 by DW">
+				<outline created="Wed, 15 Sep 2021 14:19:12 GMT" text="writeWholeFile was meant to be sure the path to the file exists before writing the file. It wasn't doing it, now it does. "></outline>
+				</outline>
+			</outline>
 		</body>
 	</opml>