fix DealerDemo and other stuff

zefie_wtvp_minisrv/ServiceVault/wtv-disk/sync.js

@@ -210,42 +210,45 @@ if (request_headers['wtv-request-type'] == 'download') {
         var wtv_download_list = new Array();
         var newest_file_epoch = version;
         Object.keys(diskmap_group_data.files).forEach(function (k) {
-            if (!diskmap_group_data.files[k].location) diskmap_group_data.files[k].location = wtvshared.makeSafePath(diskmap_group_data.location,diskmap_group_data.files[k].file.replace(diskmap_group_data.base, ""));
+            if (!diskmap_group_data.files[k].location) diskmap_group_data.files[k].location = wtvshared.makeSafePath(diskmap_group_data.location,diskmap_group_data.files[k].file.replace(diskmap_group_data.base, ""), true);
             var diskmap_data_file = null;
             Object.keys(service_vaults).forEach(function (g) {
                 if (diskmap_data_file != null) return;
                 diskmap_data_file = service_vaults[g] + "/" + service_name + "/" + diskmap_group_data.files[k].location;
+                console.log(diskmap_data_file)
                 if (!fs.existsSync(diskmap_data_file)) diskmap_data_file = null;
             });
 
-            var diskmap_file_stat = fs.lstatSync(diskmap_data_file);
-            var diskmap_file_data = new Buffer.from(fs.readFileSync(diskmap_data_file, {
-                encoding: null,
-                flags: 'r'
-            }));
-            diskmap_group_data.files[k].base = diskmap_group_data.base;
-            diskmap_group_data.files[k].last_modified = (new Date(new Date(diskmap_file_stat.mtime).toUTCString()) / 1000);
-            diskmap_group_data.files[k].content_length = diskmap_file_stat.size;
-            diskmap_group_data.files[k].action = (diskmap_group_data.files[k].action) ? diskmap_group_data.files[k].action.toUpperCase() : "GET";            
+            if (diskmap_data_file) {
+                var diskmap_file_stat = fs.lstatSync(diskmap_data_file);
+                var diskmap_file_data = new Buffer.from(fs.readFileSync(diskmap_data_file, {
+                    encoding: null,
+                    flags: 'r'
+                }));
+                diskmap_group_data.files[k].base = diskmap_group_data.base;
+                diskmap_group_data.files[k].last_modified = (new Date(new Date(diskmap_file_stat.mtime).toUTCString()) / 1000);
+                diskmap_group_data.files[k].content_length = diskmap_file_stat.size;
+                diskmap_group_data.files[k].action = (diskmap_group_data.files[k].action) ? diskmap_group_data.files[k].action.toUpperCase() : "GET";
 
-            // we need the checksum of the uncompressed data
-            if (wtvshared.getFileExt(diskmap_data_file).toLowerCase() == "gz") {
-                var gunzipped = zlib.gunzipSync(diskmap_file_data);
-                diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
-                var gzip_fn_end = diskmap_file_data.indexOf("\0", 10);
-                if (!diskmap_group_data.files[k].dont_extract_filename) {
-                    diskmap_group_data.files[k].original_filename = diskmap_file_data.toString('utf8', 10, gzip_fn_end);
+                // we need the checksum of the uncompressed data
+                if (wtvshared.getFileExt(diskmap_data_file).toLowerCase() == "gz") {
+                    var gunzipped = zlib.gunzipSync(diskmap_file_data);
+                    diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(gunzipped)).toString(CryptoJS.enc.Hex).toLowerCase();
+                    var gzip_fn_end = diskmap_file_data.indexOf("\0", 10);
+                    if (!diskmap_group_data.files[k].dont_extract_filename) {
+                        diskmap_group_data.files[k].original_filename = diskmap_file_data.toString('utf8', 10, gzip_fn_end);
+                    }
+                    diskmap_group_data.files[k].uncompressed_size = gunzipped.byteLength;
+                    gunzipped = null;
+                } else {
+                    diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(diskmap_file_data)).toString(CryptoJS.enc.Hex).toLowerCase();
                 }
-                diskmap_group_data.files[k].uncompressed_size = gunzipped.byteLength;
-                gunzipped = null;
-            } else {
-                diskmap_group_data.files[k].checksum = CryptoJS.MD5(CryptoJS.lib.WordArray.create(diskmap_file_data)).toString(CryptoJS.enc.Hex).toLowerCase();
+
+                if (parseInt(diskmap_group_data.files[k].last_modified) > newest_file_epoch) newest_file_epoch = parseInt(diskmap_group_data.files[k].last_modified);
+
+                diskmap_group_data.files[k].invalid = true;
+                wtv_download_list.push(diskmap_group_data.files[k]);
             }
-
-            if (parseInt(diskmap_group_data.files[k].last_modified) > newest_file_epoch) newest_file_epoch = parseInt(diskmap_group_data.files[k].last_modified);
-
-            diskmap_group_data.files[k].invalid = true;
-            wtv_download_list.push(diskmap_group_data.files[k]);
         });
         // check to see if client says they have this version
         diskmap_group_data.version = newest_file_epoch;

zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js

@@ -46,8 +46,6 @@ novtilebg
 nohtilebg
 bgcolor=191919
 text="AA9B4A" link=189cd6 vlink=189cd6 hspace=0 fontsize="large">
-<LINK href="ROMCache/TopBackground_Classic.jpg" rel=next>
-<LINK href="ROMCache/Community.gif" rel=next>
 <LINK href="ROMCache/UtilityBullet.gif" rel=next>
 <form action=/ValidateLogin enctype="x-www-form-encoded" method=post>
 <input type="hidden" NAME="target-url" VALUE="">

zefie_wtvp_minisrv/ServiceVault/wtv-mail/DiplomaMail.js

@@ -21,7 +21,7 @@ bgcolor=00292f
 <table cellspacing=0 cellpadding=0>
 <tr>
 <td width=560 height=96 valign=top>
-<table background="wtv-guide:/ROMCache/help/common/helpMastheadBlank.swf" width=560 height=96 cellspacing=0 cellpadding=0>
+<table background="wtv-mail:/ROMCache/help/common/helpMastheadBlank.swf" width=560 height=96 cellspacing=0 cellpadding=0>
 <tr>
 <td width=107 height=96 valign=top rowspan=2>
 <spacer type=vertical height=7><br>

zefie_wtvp_minisrv/ServiceVault/wtv-mail/listmail.js

@@ -281,6 +281,7 @@ ${username}@${minisrv_config.config.service_name}
 `;
                 Object.keys(message_list).forEach(function (k) {
                     var message = message_list[k];
+                    if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject);
                     var message_font_open = "<font color=#7A9FCC>";
                     var message_font_close = "</font>";
                     if (message.unread) {

zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js

@@ -40,6 +40,7 @@ Location: wtv-mail:/listmail`;
                 headers = `200 OK
 Content-type: text/html`;
 
+                if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject);
                 data = `<wtvnoscript>
 <sendpanel
 action	= "wtv-mail:/sendmail?message_forward_id=14&mailbox_name=inbox"
@@ -258,7 +259,6 @@ ${wtvshared.htmlEntitize(message.to_addr)} ${(message.to_name) ? '(' + wtvshared
 Subject: <td>
 <td>`;
               
-                if (typeof message.subject == "object") message.subject = new Buffer.from(message.subject).toString('latin1');
                 data += `
 ${(message.subject) ? wtvshared.htmlEntitize(message.subject) : '(No subject)'}
 <tr>
@@ -278,7 +278,7 @@ ${wtvshared.htmlEntitize(message.body, true)}
 <br>
 <br>`;
                 if (message.signature) {
-                    data += ssid_sessions[socket.ssid].mailstore.sanitizeSignature(message.signature);
+                    data += wtvshared.sanitizeSignature(message.signature);
                 }
                 data += `<p>
 `;

zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js

@@ -61,7 +61,7 @@ Content-Type: audio/wav`;
     } else {
 
         var username = ssid_sessions[socket.ssid].getSessionData("subscriber_username");
-        var userdisplayname = html_entities.encode(ssid_sessions[socket.ssid].getSessionData("subscriber_name"));
+        var userdisplayname = wtvshared.htmlEntitize(ssid_sessions[socket.ssid].getSessionData("subscriber_name"));
         var address = username + "@" + minisrv_config.config.service_name
         var notImplementedAlert = new clientShowAlert({
             'image': minisrv_config.config.service_logo,
@@ -413,7 +413,7 @@ vlink=#62B362
 vspace=0
 hspace=0>`;
             if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) {
-                data += ssid_sessions[socket.ssid].mailstore.sanitizeSignature(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"));
+                data += wtvshared.sanitizeSignature(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"));
             }
             data += `
 <td abswidth=2 bgcolor=#000000>

zefie_wtvp_minisrv/WTVMail.js

@@ -3,7 +3,6 @@ class WTVMail {
     fs = require('fs');
     path = require('path');
     uuid = require('uuid');
-
     ssid = null;
     unread_mail = 0;
     inbox_store = null;
@@ -124,14 +123,6 @@ class WTVMail {
         return this.uuid.v1();
     }
 
-    sanitizeSignature(string) {
-        // placeholder ~ not yet implemented
-        // todo: strip <script>, </script> and everything inbetween
-        // todo: add missing user open tags (eg </i> if user did not close it)
-        // todo: figure out bgcolor and text color voodoo
-        return string;
-    }
-
     createMessage(mailboxid, from_addr, to_addr, msgbody, subject = null, from_name = null, to_name = null, signature = null,  date = null, known_sender = false, attachments = []) {
         if (this.createMailbox(mailboxid)) {
             if (!date) date = Math.floor(Date.now() / 1000);

zefie_wtvp_minisrv/WTVShared.js

@@ -8,6 +8,9 @@ class WTVShared {
     path = require('path');
     fs = require('fs');
     html_entities = require('html-entities'); // used externally by service scripts
+    sanitizeHtml = require('sanitize-html');
+    iconv = require('iconv-lite');
+
     minisrv_config = [];
     
     constructor(minisrv_config) {
@@ -26,10 +29,21 @@ class WTVShared {
 
     htmlEntitize(string, process_newline = false) {
         string = this.html_entities.encode(string).replace(/'/g, "'");
+
         if (process_newline) string = string.replace(/\n/gi, "<br>").replace(/\r/gi, "");
         return string;
     }
 
+    sanitizeSignature(string) {
+        const clean = this.sanitizeHtml(string, {
+            allowedTags: ['a', 'audioscope', 'b', 'bgsound', 'big', 'blackface', 'blockquote', 'bq', 'br', 'caption', 'center', 'cite', 'c', 'dd', 'dfn', 'div', 'dl', 'dt', 'fn', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'html', 'i', 'img', 'label', 'li', 'link', 'listing', 'em', 'marquee', 'nobr', 'note', 'ol', 'p', 'plaintext', 'pre', 's', 'samp', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 'tbody', 'table', 'td', 'th', 'tr', 'tt', 'u', 'ul'], allowedAttributes: false
+        })
+        // todo: add missing user open tags (eg </i> if user did not close it) (might be done by sanitize-html?)
+        // todo: figure out bgcolor and text color voodoo
+        return clean;
+    }
+
+
     isASCII(str) {
         for (var i = 0, strLen = str.length; i < strLen; ++i) {
             if (str.charCodeAt(i) > 127) return false;
@@ -41,11 +55,28 @@ class WTVShared {
         return /<[a-z][\s\S]*>/i.test(str);
     }
 
+    utf8Decode(utf8String) {
+        if (typeof utf8String != 'string') throw new TypeError('parameter <20>utf8String<6E> is not a string');
+        // note: decode 3-byte chars first as decoded 2-byte strings could appear to be 3-byte char!
+        const unicodeString = utf8String.replace(
+            /[\u00e0-\u00ef][\u0080-\u00bf][\u0080-\u00bf]/g,  // 3-byte chars
+            function (c) {  // (note parentheses for precedence)
+                var cc = ((c.charCodeAt(0) & 0x0f) << 12) | ((c.charCodeAt(1) & 0x3f) << 6) | (c.charCodeAt(2) & 0x3f);
+                return String.fromCharCode(cc);
+            }
+        ).replace(
+            /[\u00c0-\u00df][\u0080-\u00bf]/g,                 // 2-byte chars
+            function (c) {  // (note parentheses for precedence)
+                var cc = (c.charCodeAt(0) & 0x1f) << 6 | c.charCodeAt(1) & 0x3f;
+                return String.fromCharCode(cc);
+            }
+        );
+        return unicodeString;
+    }
+
     decodeBufferText(buf) {
         var out = "";
-        for (var i = 0; i < buf.data.length; i++) {
-            out += String.fromCharCode(buf.data[i]);
-        }
+        out = this.utf8Decode(this.iconv.decode(Buffer.from(buf),'ISO-8859-1'));
         return out;
     }
 
@@ -334,16 +365,17 @@ class WTVShared {
      * @param {string} base Base path
      * @param {string} target Sub path
      */
-    makeSafePath(base, target = null) {
+    makeSafePath(base, target = null, force_forward_slash = false) {
         if (target) {
             target.replace(/[\|\&\;\$\%\@\"\<\>\+\,\\]/g, "");
             var targetPath = this.path.posix.normalize(target)
-            return this.fixPathSlashes(base + this.path.sep + targetPath);
+            var output = this.fixPathSlashes(base + this.path.sep + targetPath);
         } else {
             base.replace(/[\|\&\;\$\%\@\"\<\>\+\,\\]/g, "");
             var targetPath = this.path.posix.normalize(base)
-            return this.fixPathSlashes(base);
+            var output = this.fixPathSlashes(targetPath);
         }
+        return (force_forward_slash) ? output.replace(this.path.sep, '/') : output;
     }
 
     makeSafeUsername(username) {

zefie_wtvp_minisrv/app.js

@@ -117,6 +117,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
                         var service_path_romcache = service_path_presplit.join(path.sep);
                         var service_vault_file_path_romcache = wtvshared.returnAbsolutePath(wtvshared.makeSafePath(service_path_romcache));
                         if (fs.existsSync(service_vault_file_path_romcache)) {
+
                             service_path = service_path.replace(wtvshared.fixPathSlashes(minisrv_config.config.SharedROMCache), 'ROMCache');
                             service_vault_file_path = service_vault_file_path_romcache;
                             usingSharedROMCache = true;
@@ -449,7 +450,7 @@ Location: " + minisrv_config.config.unauthorized_url`;
             var service_name = shortURL.split(':/')[0];
             var urlToPath = wtvshared.fixPathSlashes(service_name + path.sep + shortURL.split(':/')[1]);
             var shared_romcache = null;
-            if (shortURL.indexOf("/ROMCache/") != -1 && minisrv_config.config.enable_shared_romcache) {
+            if (shortURL.indexOf(":/ROMCache/") != -1 && minisrv_config.config.enable_shared_romcache) {
                 shared_romcache = wtvshared.fixPathSlashes(minisrv_config.config.SharedROMCache + path.sep + shortURL.split(':/')[1]);
             }
             if (minisrv_config.config.debug_flags.show_headers) console.log(" * Incoming headers on socket ID", socket.id, (await wtvshared.decodePostData(wtvshared.filterSSID(Object.assign({}, request_headers)))));

zefie_wtvp_minisrv/config.json

@@ -124,10 +124,6 @@
       "external_proxy_host": "127.0.0.1",
       "external_proxy_port": 1080,
       "flags": "0x00000001"
-    },
-    "wtv-guide": {
-      "port": 1621,
-      "connections": 3
     }
   }
 }

zefie_wtvp_minisrv/package-lock.json

@@ -1,20 +1,22 @@
 {
   "name": "zefie_wtvp_minisrv",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "zefie_wtvp_minisrv",
-      "version": "0.9.25",
+      "version": "0.9.26",
       "license": "GPL3",
       "dependencies": {
         "crypto-js": "^4.1.1",
         "easy-crc": "0.0.2",
         "endianness": "^8.0.2",
         "html-entities": "^2.3.2",
+        "iconv-lite": "^0.6.3",
         "mime-types": "^2.1.33",
         "proxy-agent": "^5.0.0",
+        "sanitize-html": "^2.7.0",
         "socks-proxy-agent": "^6.1.1",
         "strftime": "^0.10.0",
         "uuid": "^8.3.2"
@@ -101,6 +103,14 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/degenerator": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz",
@@ -123,6 +133,57 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/dom-serializer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/domhandler": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
     "node_modules/easy-crc": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/easy-crc/-/easy-crc-0.0.2.tgz",
@@ -136,6 +197,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/escodegen": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
@@ -249,6 +329,24 @@
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
       "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
     },
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
     "node_modules/http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -289,6 +387,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -299,6 +408,14 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -356,6 +473,17 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "node_modules/nanoid": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
@@ -425,6 +553,33 @@
         "node": ">= 8"
       }
     },
+    "node_modules/parse-srcset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
+      "integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE="
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/postcss": {
+      "version": "8.4.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
+      "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
+      "dependencies": {
+        "nanoid": "^3.2.0",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -510,6 +665,19 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "node_modules/sanitize-html": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz",
+      "integrity": "sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==",
+      "dependencies": {
+        "deepmerge": "^4.2.2",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^6.0.0",
+        "is-plain-object": "^5.0.0",
+        "parse-srcset": "^1.0.2",
+        "postcss": "^8.3.11"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -559,6 +727,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -716,6 +892,11 @@
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
+    },
     "degenerator": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-3.0.1.tgz",
@@ -732,6 +913,39 @@
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
+    "dom-serializer": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz",
+      "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      }
+    },
+    "domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+    },
+    "domhandler": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz",
+      "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==",
+      "requires": {
+        "domelementtype": "^2.2.0"
+      }
+    },
+    "domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "requires": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      }
+    },
     "easy-crc": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/easy-crc/-/easy-crc-0.0.2.tgz",
@@ -742,6 +956,16 @@
       "resolved": "https://registry.npmjs.org/endianness/-/endianness-8.0.2.tgz",
       "integrity": "sha512-IU+77+jJ7lpw2qZ3NUuqBZFy3GuioNgXUdsL1L9tooDNTaw0TgOnwNuc+8Ns+haDaTifK97QLzmOANJtI/rGvw=="
     },
+    "entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
+    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+    },
     "escodegen": {
       "version": "1.14.3",
       "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz",
@@ -821,6 +1045,17 @@
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.2.tgz",
       "integrity": "sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ=="
     },
+    "htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
     "http-errors": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -852,6 +1087,14 @@
         "debug": "4"
       }
     },
+    "iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      }
+    },
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -862,6 +1105,11 @@
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
       "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
     },
+    "is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+    },
     "isarray": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -910,6 +1158,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
+    "nanoid": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
+    },
     "netmask": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
@@ -966,6 +1219,26 @@
         "netmask": "^2.0.1"
       }
     },
+    "parse-srcset": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
+      "integrity": "sha1-8r0iH2zJcKk42IVWq8WJyqqiveE="
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "postcss": {
+      "version": "8.4.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.6.tgz",
+      "integrity": "sha512-OovjwIzs9Te46vlEx7+uXB0PLijpwjXGKXjVGGPIGubGpq7uh5Xgf6D6FiJ/SzJMBosHDp6a2hiXOS97iBXcaA==",
+      "requires": {
+        "nanoid": "^3.2.0",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      }
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -1040,6 +1313,19 @@
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
+    "sanitize-html": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz",
+      "integrity": "sha512-jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA==",
+      "requires": {
+        "deepmerge": "^4.2.2",
+        "escape-string-regexp": "^4.0.0",
+        "htmlparser2": "^6.0.0",
+        "is-plain-object": "^5.0.0",
+        "parse-srcset": "^1.0.2",
+        "postcss": "^8.3.11"
+      }
+    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
@@ -1075,6 +1361,11 @@
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "optional": true
     },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+    },
     "statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",

zefie_wtvp_minisrv/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zefie_wtvp_minisrv",
-  "version": "0.9.25",
+  "version": "0.9.26",
   "description": "WebTV Service (WTVP) Emulation Server",
   "main": "app.js",
   "homepage": "https://github.com/zefie/zefie_wtvp_minisrv",
@@ -31,8 +31,10 @@
     "easy-crc": "0.0.2",
     "endianness": "^8.0.2",
     "html-entities": "^2.3.2",
+    "iconv-lite": "^0.6.3",
     "mime-types": "^2.1.33",
     "proxy-agent": "^5.0.0",
+    "sanitize-html": "^2.7.0",
     "socks-proxy-agent": "^6.1.1",
     "strftime": "^0.10.0",
     "uuid": "^8.3.2"

zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj

@@ -439,7 +439,6 @@
     <Folder Include="ServiceDeps\premade_tellyscripts\LC2\" />
     <Folder Include="ServiceVault\" />
     <Folder Include="ServiceVault\http_pc\" />
-    <Folder Include="ServiceVault\wtv-guide\" />
     <Folder Include="ServiceVault\wtv-mail\" />
     <Folder Include="ServiceVault\wtv-chat\" />
     <Folder Include="ServiceVault\wtv-chat\images\" />