daveappserver 0.6.16 → 0.6.18

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.6.16", myProductName = "daveAppServer";  
+var myVersion = "0.6.18", myProductName = "daveAppServer";  
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -64,6 +64,8 @@ var config = {
 	
 	flSecureWebsocket: false, //2/8/23 by DW
 	
+	flUseS3ForStorage: false, //2/15/23 by DW
+	
 	isUserInDatabase: function (screenname, callback) { //2/6/23 by DW
 		callback (false);
 		},
@@ -238,7 +240,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		}
 	var cleanStats = {
 		size: stats.size, //number of bytes in file
-		whenAccessed: formatDate (stats.atime), //when last red
+		whenAccessed: formatDate (stats.atime), //when last read
 		whenCreated: formatDate (stats.birthtime),
 		whenModified: formatDate (stats.mtime),
 		flPrivate: stats.flPrivate
@@ -414,7 +416,23 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		}
 	
 	function getFileFromS3 (screenname, relpath, flprivate, callback) {
-		s3.getObject (getS3FilePath (screenname, relpath, flprivate), callback);
+		function formatDate (d) {
+			return (new Date (d).toUTCString ());
+			}
+		s3.getObject (getS3FilePath (screenname, relpath, flprivate), function (err, data) {
+			if (err) {
+				callback (err);
+				}
+			else {
+				var data = {
+					filedata: data.Body.toString (),
+					filestats: {
+						whenModified: formatDate (data.LastModified)
+						}
+					};
+				callback (undefined, data);
+				}
+			});
 		}
 	function saveFileToS3 (screenname, relpath, type, flprivate, filetext, callback) {
 		const acl = undefined; //use the default

package/package.json

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