daveappserver 0.7.15 → 0.8.1

package/appserver.js

@@ -1,4 +1,4 @@
-var myVersion = "0.7.15", myProductName = "daveAppServer";    
+var myVersion = "0.8.1", myProductName = "daveAppServer";    
 
 exports.start = startup; 
 exports.notifySocketSubscribers = notifySocketSubscribers;
@@ -14,7 +14,7 @@ const fs = require ("fs");
 var dns = require ("dns");
 var os = require ("os");
 const request = require ("request");
-const websocket = require ("nodejs-websocket"); 
+const websocket = require ("ws"); 
 const utils = require ("daveutils");
 const davehttp = require ("davehttp");
 const davetwitter = require ("davetwitter");
@@ -285,7 +285,8 @@ function cleanFileStats (stats) { //4/19/21 by DW
 					payload = utils.jsonStringify (payload);
 					}
 				}
-			theWsServer.connections.forEach (function (conn, ix) {
+			console.log ("\nnotifySocketSubscribers: getOpenSocketsArray () == " + utils.jsonStringify (getOpenSocketsArray ()) + "\n"); //6/7/21 by DW
+			theWsServer.clients.forEach (function (conn, ix) {
 				ctTotalSockets++;
 				if (conn.appData !== undefined) { //it's one of ours
 					var flnotify = true;
@@ -294,13 +295,14 @@ function cleanFileStats (stats) { //4/19/21 by DW
 						}
 					if (flnotify) {
 						try {
-							conn.sendText (verb + "\r" + payload);
+							console.log ("notifySocketSubscribers: conn.appData.emailAddress == " + conn.appData.emailAddress); //5/25/25 by DW
+							conn.send (verb + "\r" + payload); //5/25/25 by DW
 							conn.appData.whenLastUpdate = now;
 							conn.appData.ctUpdates++;
 							ctUpdates++;
 							}
 						catch (err) {
-							console.log ("notifySocketSubscribers: socket #" + i + ": error updating");
+							console.log ("notifySocketSubscribers: err.message == " + err.message);
 							}
 						}
 					}
@@ -314,20 +316,23 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			return (0);
 			}
 		else {
-			return (theWsServer.connections.length);
+			return (theWsServer.clients.length);
 			}
 		}
 	function getOpenSocketsArray () { //return an array with data about open sockets
 		var theArray = new Array ();
-		theWsServer.connections.forEach (function (conn, ix) {
+		function viewTime (when) { //5/21/25 by DW -- wanted to see more detail in time, include seconds
+			return (new Date (when).toLocaleTimeString ());
+			}
+		theWsServer.clients.forEach (function (conn, ix) {
 			if (conn.appData !== undefined) { //it's one of ours
 				theArray.push ({
-					arrayIndex: ix,
 					lastVerb: conn.appData.lastVerb,
 					urlToWatch: conn.appData.urlToWatch,
 					domain: conn.appData.domain,
-					whenStarted: utils.viewDate (conn.appData.whenStarted),
-					whenLastUpdate: utils.viewDate (conn.appData.whenLastUpdate)
+					whenStarted: viewTime (conn.appData.whenStarted),
+					whenLastUpdate: viewTime (conn.appData.whenLastUpdate),
+					emailAddress: conn.appData.emailAddress //5/21/25 by DW
 					});
 				}
 			});
@@ -335,6 +340,7 @@ function cleanFileStats (stats) { //4/19/21 by DW
 		}
 	function handleWebSocketConnection (conn) { 
 		var now = new Date ();
+		
 		conn.appData = { //initialize
 			whenStarted: now,
 			ctUpdates: 0,
@@ -343,12 +349,13 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			urlToWatch: undefined,
 			domain: undefined
 			};
+		console.log ("\nhandleWebSocketConnection: getOpenSocketsArray () == " + utils.jsonStringify (getOpenSocketsArray ()) + "\n"); //6/7/21 by DW
 		
 		function logToConsole (conn, verb, value) {
-			getDomainName (conn.socket.remoteAddress, function (theName) { //log the request
+			getDomainName (conn._socket.remoteAddress, function (theName) { //log the request
 				var freemem = utils.gigabyteString (os.freemem ()), method = "WS:" + verb, now = new Date (); 
 				if (theName === undefined) {
-					theName = conn.socket.remoteAddress;
+					theName = conn._socket.remoteAddress;
 					}
 				console.log (now.toLocaleTimeString () + " " + freemem + " " + method + " " + value + " " + theName);
 				conn.appData.domain = theName; 
@@ -356,19 +363,20 @@ function cleanFileStats (stats) { //4/19/21 by DW
 			}
 		
 		function kissOtherLogonsGoodnight (screenname, theNewConnection) { //12/14/21 by DW
-			theWsServer.connections.forEach (function (conn, ix) {
+			theWsServer.clients.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) {
 							console.log ("kissOtherLogonsGoodnight: \"" + conn.appData.screenname + "\" = \"" + screenname + "\""); //2/12/23 by DW
-							conn.sendText ("goodnight");
+							conn.send ("goodnight"); //5/25/25 by DW
 							}
 						}
 					}
 				});
 			}
 		
-		conn.on ("text", function (s) {
+		conn.on ("message", function (s) {
+			s = s.toString (); //5/25/25 by DW
 			var words = s.split (" ");
 			if (words.length > 1) { //new protocol as of 11/29/15 by DW
 				conn.appData.whenLastUpdate = now;
@@ -402,6 +410,8 @@ function cleanFileStats (stats) { //4/19/21 by DW
 									logToConsole (conn, conn.appData.lastVerb, conn.appData.screenname);
 									}
 								});
+							conn.appData.emailAddress = emailAddress; //5/21/25 by DW
+							conn.appData.emailSecret = emailSecret;
 							}
 						break;
 					
@@ -419,7 +429,8 @@ function cleanFileStats (stats) { //4/19/21 by DW
 	function webSocketStartup () {
 		if (config.flWebsocketEnabled) {
 			try {
-				theWsServer = websocket.createServer (handleWebSocketConnection);
+				theWsServer = new websocket.Server({port: config.websocketPort}); //5/25/25 by DW
+				theWsServer.on ("connection", handleWebSocketConnection); //5/25/25 by DW
 				console.log ("webSocketStartup: config.websocketPort == " + config.websocketPort);
 				theWsServer.listen (config.websocketPort);
 				}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "daveappserver",
 	"description": "Factored code that was appearing in all my servers.",
-	"version": "0.7.15",
+	"version": "0.8.1",
 	"main": "appserver.js",
 	"repository": {
 		"type" : "git",
@@ -14,7 +14,7 @@
 	"dependencies" : {
 		"querystring": "*",
 		"request": "*",
-		"nodejs-websocket": "*",
+		"ws": "*",
 		"require-from-string": "*",
 		"daveutils": "*",
 		"davefilesystem": "*",
@@ -25,6 +25,6 @@
 		"daves3": "*",
 		"davehttp": "*",
 		"davemail": "*",
-		"wpidentity": "^0.4.14"
+		"wpidentity": "^0.5.27"
 		}
 	}