From 344058828eeb4524b565f242e14bdaa8b6e8da1c Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Wed, 21 Jul 2021 15:54:02 -0400
Subject: [PATCH] v0.9.3  - fix: wtv-home:/home: remove `nostatus` to enable
 loading progress bar for outgoing links  - fix: wtv-1800:/finish-prereg: swap
 error message location for better debugging  - fix: app.js: Properly clean up
 old sockets  - fix: wtv-flashrom: fix search for local flashrom files  -
 update: wtv-home:/home: add link to access downloaded DealerDemo

---
 .../ServiceVault/wtv-1800/finish-prereg.js    |  6 ++--
 .../ServiceVault/wtv-flashrom/get-by-path.js  |  9 ++++--
 .../ServiceVault/wtv-flashrom/get-lc2-page.js | 10 ++++--
 .../ServiceVault/wtv-home/home.js             |  4 +--
 zefie_wtvp_minisrv/app.js                     | 32 +++++++++++--------
 zefie_wtvp_minisrv/package.json               |  2 +-
 6 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js
index abc141e0..3ee2a2a0 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/finish-prereg.js
@@ -5,7 +5,8 @@ if (socket.ssid != null) {
 		ssid_sessions[socket.ssid].data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]);
 	}
 } else {
-	var errpage = doErrorCode(400);
+	console.log(" * Something bad happened (we don't know the client ssid???)");
+	var errpage = doErrorCode(400)
 	headers = errpage[0];
 	data = errpage[1];
 }
@@ -63,8 +64,7 @@ wtv-client-date: `+ strftime("%a, %d %b %Y %H:%M:%S", new Date(new Date().toUTCS
 		});
 	}
 } else {
-	console.log(" * Something bad happened (we don't know the client ssid???)");
-	var errpage = doErrorCode(400)
+	var errpage = doErrorCode(400);
 	headers = errpage[0];
 	data = errpage[1];
 }
\ No newline at end of file
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
index a18c64a6..ccaf410c 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
@@ -26,8 +26,13 @@ function doLocalFlashROM(flashrom_file_path) {
 if (request_headers.query.raw) {
 	if ((/\.brom$/).test(request_path)) headers += "Content-Type: binary/x-wtv-bootrom"; // maybe?
 	else headers += "Content-Type: binary/x-wtv-flashblock";
-	var flashrom_file_path = service_dir + '/' + request_path;
-	if (minisrv_config.services[service_name].use_zefie_server && !fs.existsSync(flashrom_file_path)) {
+	var flashrom_file_path = null;
+	Object.keys(service_vaults).forEach(function (g) {
+		if (flashrom_file_path != null) return;
+		flashrom_file_path = service_vaults[g].path + "/" + service_name + "/" + request_path;
+		if (!fs.existsSync(flashrom_file_path)) flashrom_file_path = null;
+	});
+	if (minisrv_config.services[service_name].use_zefie_server && !flashrom_file_path) {
 		// get flashrom files from archive.midnightchannel.net
 		var options = {
 			host: "archive.midnightchannel.net",
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
index 051eb77c..5f1e2050 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
@@ -26,8 +26,14 @@ if (!request_headers.query.path) {
 	data = errpage[1];
 } else {
 	var request_path = unescape(request_headers.query.path);
-	var flashrom_file_path = service_dir + '/' + request_path;
-	if (minisrv_config.services[service_name].use_zefie_server && !fs.existsSync(flashrom_file_path)) {
+	var flashrom_file_path = null;
+	Object.keys(service_vaults).forEach(function (g) {
+		if (flashrom_file_path != null) return;
+		flashrom_file_path = service_vaults[g].path + "/" + service_name + "/" + request_path;
+		if (!fs.existsSync(flashrom_file_path)) flashrom_file_path = null;
+	});
+	
+	if (minisrv_config.services[service_name].use_zefie_server && !flashrom_file_path) {
 		// read first 256 bytes of flashrom file from archive.midnightchannel.net
 		// to get `flashrom_message` and `numparts` if missing
 		var options = {
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
index f5c2065c..51e21954 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
@@ -14,7 +14,7 @@ if (ssid_sessions[socket.ssid].get('box-does-psuedo-encryption')) {
 data =`<html>
 <head>
 <title>Home for minisrv</title>
-<DISPLAY NoLogo NoStatus hideoptions noscroll>
+<DISPLAY NoLogo hideoptions noscroll>
 </head>
 <body bgcolor="black" link="gold" vlink="gold" alink="gold" text="gold">
 <script>
@@ -31,7 +31,7 @@ Connection Speed: &rate;
 <li><a href="wtv-tricks:/blastcache?return_to=wtv-home:/home">Clear Cache</a></li>
 <li><a href="wtv-flashrom:/willie">Ultra Willies</a></li>
 <li><a href="wtv-music:/demo/index">MIDI Music Demo</a></li>
-<li><a href="wtv-update:/DealerDemo">Download old MSNTV DealerDemo</a></li>
+<li>Old MSNTV DealerDemo: <a href="wtv-update:/DealerDemo">Download</a> ~ <a href="file://Disk/Demo/index.html">Access (after Download)</a></li>
 <li><a href="http://duckduckgo.com/lite/">DuckDuckGo Lite</a></li>
 <li><input name=url `;
 
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index 5e20e8fe..9758b6c7 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -596,9 +596,9 @@ async function processRequest(socket, data_hex, returnHeadersBeforeSecure = fals
                 socket.ssid = headers["wtv-client-serial-number"];
                 if (!ssid_sessions[socket.ssid]) {
                     ssid_sessions[socket.ssid] = new ClientSessionData();
-                    ssid_sessions[socket.ssid].sockets = new Array();
-                    ssid_sessions[socket.ssid].sockets.push(socket.id);
                 }
+                if (!ssid_sessions[socket.ssid].data_store.sockets) ssid_sessions[socket.ssid].data_store.sockets = new Array();
+                ssid_sessions[socket.ssid].data_store.sockets.push(socket.id);
             }
 
 
@@ -750,19 +750,20 @@ async function checkForPostData(socket, headers, data, data_hex) {
 }
 
 async function cleanupSocket(socket) {
-    try {
-        if (!zquiet) console.log(" * Destroying old WTVSec instance on disconnected socket", socket.id);
-        delete socket_sessions[socket.id].buffer;
-        delete socket_sessions[socket.id].wtvsec;
-        delete socket_sessions[socket.id];
+    try {        
+        if (socket_sessions[socket.id]) {
+            if (!zquiet) console.log(" * Cleaning up disconnected socket", socket.id);
+            delete socket_sessions[socket.id];
+        }
         if (socket.ssid) {
-            if (ssid_sessions[socket.ssid].sockets.findIndex(element => element = socket.id) != -1) {
-                ssid_sessions[socket.ssid].sockets.splice(ssid_sessions[socket.ssid].sockets.findIndex(element => element = socket.id));
+            var socket_array_index = ssid_sessions[socket.ssid].data_store.sockets.findIndex(element => element = socket.id);
+            if (socket_array_index != -1) {
+                ssid_sessions[socket.ssid].data_store.sockets.splice(socket_array_index,1);
             }
-            var fuckyou = ssid_sessions[socket.ssid].sockets;
-            if (ssid_sessions[socket.ssid].sockets.length === 0 && ssid_sessions[socket.ssid].get("wtvsec_login")) {
+
+            if (ssid_sessions[socket.ssid].data_store.sockets.length === 0 && ssid_sessions[socket.ssid].data_store.wtvsec_login) {
                 // if last socket for SSID disconnected, destroy login session
-                if (!zquiet) console.log(" * Last socket from WebTV SSID", filterSSID(socket.ssid),"disconnected, destroying initial WTVSec instance");
+                if (!zquiet) console.log(" * Last socket from WebTV SSID", filterSSID(socket.ssid),"disconnected, cleaning up primary WTVSec instance for this SSID");
                 ssid_sessions[socket.ssid].delete("wtvsec_login");
             }
         }
@@ -776,7 +777,7 @@ async function cleanupSocket(socket) {
 async function handleSocket(socket) {
     // create unique socket id with client address and port
     socket.id = parseInt(crc16('CCITT-FALSE', Buffer.from(String(socket.remoteAddress) + String(socket.remotePort), "utf8")).toString(16), 16);
-    socket_sessions[socket.id] = [];
+    socket_sessions[socket.id] = [];    
     socket.setEncoding('hex'); //set data encoding (Text: 'ascii', 'utf8' ~ Binary: 'hex', 'base64' (do not trust 'binary' encoding))
 
     // NOTE: As it stands we use a 'timeout' to start processing data when we have not recieved any data
@@ -814,6 +815,11 @@ async function handleSocket(socket) {
         // Attempt to clean up all of our WTVSec instances
         cleanupSocket(socket);
     });
+
+    socket.on('close', function () {
+        // Attempt to clean up all of our WTVSec instances
+        cleanupSocket(socket);
+    });
 }
 
 function integrateConfig(main, user) {
diff --git a/zefie_wtvp_minisrv/package.json b/zefie_wtvp_minisrv/package.json
index 73193312..4d9dba7f 100644
--- a/zefie_wtvp_minisrv/package.json
+++ b/zefie_wtvp_minisrv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zefie_wtvp_minisrv",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "WebTV Service (WTVP) Emulation Server",
   "main": "app.js",
   "homepage": "https://github.com/zefie/zefie_wtvp_minisrv",