|
- |
- |
- | - ${message} -
- |
- |
- |
- |
- |
-
- ${main_message}
- | This may take a while. - -
- |
- | - - | |||
Returning from whence you came...
"; + message += "SSID verifcation may be required to perform a manual deletion.
Returning from whence you came...
"; message += `Click here if you are not automatically redirected.`; } } else { diff --git a/zefie_wtvp_minisrv/WTVClientSessionData.js b/zefie_wtvp_minisrv/WTVClientSessionData.js index d44c948d..1737eda2 100644 --- a/zefie_wtvp_minisrv/WTVClientSessionData.js +++ b/zefie_wtvp_minisrv/WTVClientSessionData.js @@ -4,55 +4,109 @@ class WTVClientSessionData { fs = require('fs'); path = require('path'); + ssid = null; data_store = null; session_store = null; login_security = null; capabilities = null; session_storage = ""; - hide_ssid_in_logs = true; + minisrv_config = []; + wtvshared = null; + wtvmime = null; - filterSSID(obj) { - if (this.hide_ssid_in_logs === true) { - if (typeof (obj) == "string") { - if (obj.substr(0, 8) == "MSTVSIMU") { - return obj.substr(0, 10) + ('*').repeat(10) + obj.substr(20); - } else if (obj.substr(0, 5) == "1SEGA") { - return obj.substr(0, 6) + ('*').repeat(6) + obj.substr(13); - } else { - return obj.substr(0, 6) + ('*').repeat(9); - } - } else { - if (obj["wtv-client-serial-number"]) { - var ssid = obj["wtv-client-serial-number"]; - if (ssid.substr(0, 8) == "MSTVSIMU") { - obj["wtv-client-serial-number"] = ssid.substr(0, 10) + ('*').repeat(10) + ssid.substr(20); - } else if (ssid.substr(0, 5) == "1SEGA") { - obj["wtv-client-serial-number"] = ssid.substr(0, 6) + ('*').repeat(6) + ssid.substr(13); - } else { - obj["wtv-client-serial-number"] = ssid.substr(0, 6) + ('*').repeat(9); - } - } - return obj; - } - } else { - return obj; - } - } + constructor(minisrv_config, ssid) { + if (!minisrv_config) throw ("minisrv_config required"); + var WTVShared = require('./WTVShared.js')['WTVShared']; + var WTVMime = require('./WTVMime.js'); + this.minisrv_config = minisrv_config; + this.wtvshared = new WTVShared(minisrv_config); + this.wtvmime = new WTVMime(minisrv_config); - constructor(ssid, hide_ssid_in_logs, session_storage_directory) { this.ssid = ssid; - if (hide_ssid_in_logs) this.hide_ssid_in_logs = hide_ssid_in_logs; - if (!session_storage_directory) session_storage_directory = __dirname + "/SessionStore"; - this.session_storage = session_storage_directory; this.data_store = new Array(); this.session_store = {}; } - getUTCTime(offset = 0) { - return new Date((new Date).getTime() + offset).toUTCString(); + /** + * Returns the absolute path to the user's file store, or false if unregistered + * @returns {string|boolean} Absolute path to the user's file store, or false if unregistered + */ + getUserStoreDirectory() { + if (!this.isRegistered()) return false; + return this.minisrv_config.config.SessionStore + this.path.sep + this.ssid + this.path.sep; } + /** + * Store a file in the user's file store + * @param {string} path Relative path to User's file store + * @param {Buffer} data File data + * @param {number|null} last_modified Unix timestamp to set last modified date to + * @param {boolean} overwrite Overwrite if file exists + * @returns {boolean} Whether or not the file was written + */ + storeUserStoreFile(path, data, last_modified = null, overwrite = true) { + var store_dir = this.getUserStoreDirectory(); + if (!store_dir) return false; // unregistered + var result = false; + var path_split = path.split('/'); + var file_name = path_split.pop(); + var store_dir_path = this.wtvshared.makeSafePath(store_dir, path_split.join('/').replace('/', this.path.sep)); + var store_full_path = this.wtvshared.makeSafePath(store_dir_path, file_name); + + try { + if (!this.fs.existsSync(store_dir_path)) this.fs.mkdirSync(store_dir_path, { recursive: true }); + var file_exists = this.fs.existsSync(store_full_path); + if (!file_exists || (file_exists && overwrite)) result = this.fs.writeFileSync(store_full_path, data); + if (result !== false && last_modified) { + var file_timestamp = new Date(last_modified * 1000); + fs.utimesSync(store_full_path, Date.now(), file_timestamp) + } + } catch (e) { + console.error(" # User File Store failed", e); + } + return (result === false) ? false : true; + } + + /** + * Retrieves a file from the user store + * @param {string} path Path relative to the User File Store + * @returns {Buffer|false} Buffer data, or false if could not open file + */ + getUserStoreFile(path) { + var store_dir = this.getUserStoreDirectory(); + if (!store_dir) return false; // unregistered + var store_dir_path = this.wtvshared.makeSafePath(store_dir, path.replace('/', this.path.sep)); + if (this.fs.existsSync(store_dir_path)) return this.fs.readFileSync(store_dir_path); + else return false; + } + + /** + * Retrieves a file from the user store with a file://Disk/ url + * @param {string} url file://Disk/ base url + * @returns {Buffer|false} Buffer data, or false if could not open file + */ + getUserStoreFileByURL(url) { + var path_split = url.split('/'); + path_split.shift(); + path_split.shift(); + var store_dir_path = path_split.join('/').replace('/', this.path.sep); + return this.getUserStoreFile(store_dir_path); + } + + /** + * Retrieves the Content-Type of a User Store File + * @param {string} path Path relative to the User File Store + * @returns {string|false} Content-Type, or false if could not open file + */ + getUserStoreContentType(path) { + return this.wtvmime.getSimpleContentType(path); + } + + /** + * Returns the number of user cookies + * @returns {number} Number of cookies + */ countCookies() { return Object.keys(this.session_store.cookies).length || 0; } @@ -60,7 +114,7 @@ class WTVClientSessionData { resetCookies() { this.session_store.cookies = {}; // webtv likes to have at least one cookie in the list, set a dummy cookie for zefie's site expiring in 1 year. - this.addCookie("wtv.zefie.com", "/", this.getUTCTime(365 * 86400000), "cookie_type=chocolatechip"); + this.addCookie("wtv.zefie.com", "/", this.wtvshared.getUTCTime(365 * 86400000), "cookie_type=chocolatechip"); } addCookie(domain, path = null, expires = null, data = null) { @@ -174,8 +228,8 @@ class WTVClientSessionData { loadSessionData(raw_data = false) { try { - if (this.fs.lstatSync(this.session_storage + this.path.sep + this.ssid + ".json")) { - var json_data = this.fs.readFileSync(this.session_storage + this.path.sep + this.ssid + ".json", 'Utf8') + if (this.fs.lstatSync(this.minisrv_config.config.SessionStore + this.path.sep + this.ssid + ".json")) { + var json_data = this.fs.readFileSync(this.minisrv_config.config.SessionStore + this.path.sep + this.ssid + ".json", 'Utf8') if (raw_data) return json_data; var session_data = JSON.parse(json_data); @@ -184,12 +238,12 @@ class WTVClientSessionData { } } catch (e) { // Don't log error 'file not found', it just means the client isn't registered yet - if (e.code != "ENOENT") console.error(" # Error loading session data for", this.filterSSID(this.ssid), e); + if (e.code != "ENOENT") console.error(" # Error loading session data for", this.wtvshared.filterSSID(this.ssid), e); return false; } } - saveSessionData() { + saveSessionData(force_write = false) { if (this.isRegistered()) { // load data from disk and merge new data var temp_store = this.session_store; @@ -198,17 +252,18 @@ class WTVClientSessionData { temp_store = null; } else { // do not write file if user is not registered, return true because this is not an error - return true; + // force write needed to set the initial reg + if (!force_write) return true; } try { // only save if file has changed var json_save_data = JSON.stringify(this.session_store); var json_load_data = this.loadSessionData(true); - if (json_save_data != json_load_data) this.fs.writeFileSync(this.session_storage + this.path.sep + this.ssid + ".json", JSON.stringify(this.session_store), "Utf8"); + if (json_save_data != json_load_data) this.fs.writeFileSync(this.minisrv_config.config.SessionStore + this.path.sep + this.ssid + ".json", JSON.stringify(this.session_store), "Utf8"); return true; } catch (e) { - console.error(" # Error saving session data for", this.filterSSID(this.ssid), e); + console.error(" # Error saving session data for", this.wtvshared.filterSSID(this.ssid), e); return false; } } @@ -218,9 +273,9 @@ class WTVClientSessionData { return this.loadSessionData(); } - storeSessionData() { + storeSessionData(force_write = false) { // alias - return this.saveSessionData(); + return this.saveSessionData(force_write); } SaveIfRegistered() { @@ -231,7 +286,7 @@ class WTVClientSessionData { isRegistered() { var self = this; var ssid_match = false; - this.fs.readdirSync(this.session_storage).forEach(file => { + this.fs.readdirSync(this.minisrv_config.config.SessionStore).forEach(file => { if (!file.match(/.*\.json/ig)) return; if (ssid_match) return; if (file.split('.')[0] == self.ssid) ssid_match = true; @@ -240,15 +295,19 @@ class WTVClientSessionData { } unregisterBox() { + var user_store_base = this.wtvshared.makeSafePath(this.wtvshared.getAbsolutePath(this.minisrv_config.config.SessionStore), this.path.sep + this.ssid); try { - if (this.fs.lstatSync(this.session_storage + this.path.sep + this.ssid + ".json")) { - this.fs.unlinkSync(this.session_storage + this.path.sep + this.ssid + ".json"); + if (this.fs.existsSync(user_store_base + ".json")) { + this.fs.unlinkSync(user_store_base + ".json"); this.session_store = {}; - return true; } + if (this.fs.existsSync(user_store_base)) { + this.fs.rmdirSync(user_store_base, { recursive: true }); + } + return true; } catch (e) { // Don't log error 'file not found', it just means the client isn't registered yet - console.error(" # Error deleting session data for", this.filterSSID(this.ssid), e); + console.error(" # Error deleting session data for", this.wtvshared.filterSSID(this.ssid), e); return false; } } diff --git a/zefie_wtvp_minisrv/WTVDownloadList.js b/zefie_wtvp_minisrv/WTVDownloadList.js new file mode 100644 index 00000000..9daa7e45 --- /dev/null +++ b/zefie_wtvp_minisrv/WTVDownloadList.js @@ -0,0 +1,310 @@ +/** + * wtv/download-list creation helper class + * By: zefie + */ +class WTVDownloadList { + + download_list = ""; + service_name = ""; + content_type = "wtv/download-list"; + wtvshared = null; + clientShowAlert = null; + minisrv_config = []; + + /** + * Constructs the WTVDownloadList Class + * @param {string} service_name Service name to use in wtv-urls + */ + constructor(minisrv_config, service_name = "wtv-disk") { + var { WTVShared, clientShowAlert } = require('./WTVShared.js'); + this.minisrv_config = minisrv_config; + this.wtvshared = new WTVShared(minisrv_config); + this.clientShowAlert = clientShowAlert; + this.service_name = service_name + this.clear(); + } + + /** + * Clears the download list + */ + clear() { + this.download_list = ""; + } + + /** + * Alias to clear() (clears the download list) + */ + reset() { + this.clear(); + } + + /** + * Returns the download list. + * @returns {string} Download list for client; + */ + getDownloadList() { + return this.download_list; + } + + /** + * Adds a DISPLAY command to the download list + * @param {string} message Message to display to the client + */ + display(message) { + this.download_list += "DISPLAY " + message + "\n\n"; + } + + /** + * Adds an EXECUTE command to the download list + * @param {string} command client command to execute + */ + execute(command) { + this.download_list += "EXECUTE " + command + "\n\n"; + } + + /** + * Adds a CREATE partition command to the download list + * @param {string} path file://Disk/ path to desired partition + * @param {string} size Size of the desired partition + */ + createPartition(path, size) { + this.download_list += "CREATE " + path + "\n"; + this.download_list += "partition-size: " + size + "\n\n"; + } + + /** + * Adds a CREATE-GROUP command to the download list + * @param {string} name Group name + * @param {string} path file://Disk/ path of desired group + * @param {string} state Group state + * @param {boolean|null} service_owned Sets service owned flag. (null = don't set) + */ + createGroup(name, path, state = 'invalid', service_owned = null) { + this.download_list += "CREATE-GROUP " + name + "\n"; + this.download_list += "state: " + state + "\n"; + if (service_owned !== null) this.download_list += "service-owned: " + service_owned + "\n"; + this.download_list += "base: " + path + "\n\n"; + } + + /** + * An alias for createGroup() that handles creating the '-UPDATE' group for you + * @param {string} name Group name + * @param {string} path file://Disk/ path of desired group + * @param {string} state Group state + * @param {boolean} service_owned Sets service owned flag. + */ + createUpdateGroup(name, path, state = 'invalid', service_owned = false) { + this.createGroup(name + "-UPDATE", path, state); + this.createGroup(name, path, state, service_owned); + } + + /** + * Adds a DELETE command to the download list + * @param {string} path Non-absolute path of client destination file (relative to group base) if group defined, otherwise absolute file://Disk/ path to delete + * @param {string} group Group to which it belongs + */ + delete(path, group = null) { + path = this.wtvshared.stripGzipFromPath(path); + this.download_list += "DELETE " + path + "\n"; + if (group !== null) this.download_list += "group: " + group + "\n\n"; + } + + /** + * Adds a PUT command to the download list + * @param {string} path Absolute file://Disk/ path of a file to upload to the service + * @param {string} destination Destination address (wtv url on service) in which to POST upload the file to + */ + put(path, destination) { + this.download_list += "PUT " + path + "\n"; + this.download_list += "location: " + destination + "\n\n"; + } + + /** + * Alias to put() for User Store + * @param {string} path Absolute file://Disk/ path of a file to upload to the service + * @param {string} destination Destination file path in the User Store + */ + putUserStoreDest(path, destination) { + this.put(path, this.service_name + ":/userstore?partialPath=" + escape(destination)); + } + + /** + * Alias to putUserStoreDest() that generates the destination + * @param {any} path + */ + putUserStore(path) { + var destination = path.replace("file://", ""); + this.putUserStoreDest(path, destination); + } + /** + * Adds a GET command to the download list + * @param {string} file Non-absolute path of client destination file (relative to group base) + * @param {string} path Absolute file://Disk/ path of destination + * @param {string} source wtv-url to fetch file from + * @param {string} group Group this file belongs to + * @param {string} display Message to display while working on this file + * @param {string} checksum md5sum of the file + * @param {string} file_permission File permissions + */ + get(file, path, source, group, checksum = null, uncompressed_size = null, original_filename = null, file_permission = 'r') { + if (original_filename) { + file = file.split('/'); + var file_name = file[file.length - 1]; + path = path.replace(file_name, original_filename); + file.pop(); + if (file.length > 0) file = file.join('/') + '/' + original_filename; + else file = original_filename; + } + this.download_list += "GET " + file + "\n"; + + this.download_list += "group: " + group + "-UPDATE\n"; + this.download_list += "location: " + source + "\n"; + this.download_list += "file-permission: " + file_permission + "\n"; + if (checksum != null) this.download_list += "wtv-checksum: " + checksum + "\n"; + if (uncompressed_size != null) this.download_list += "wtv-uncompressed-filesize: " + uncompressed_size + "\n"; + this.download_list += "service-source-location: /webtv/content/" + source.substr(source.indexOf('-') + 1, source.indexOf(':/') - source.indexOf('-') - 1) + "d/" + source.substr(source.indexOf(':/') + 2) + "\n"; + this.download_list += "client-dest-location: " + path + "\n\n"; + } + + /** + * Adds a RENAME command to the download list + * @param {string} srcfile Non-absolute path of client source file (relative to source group base) + * @param {string} destfile Non-absolute path of client destination file (relative to destination group base) + * @param {string} srcgroup Source Group + * @param {string} destgroup Destination Group + */ + rename(srcfile, destfile, srcgroup, destgroup) { + srcfile = this.wtvshared.stripGzipFromPath(srcfile); + destfile = this.wtvshared.stripGzipFromPath(destfile); + this.download_list += "RENAME " + srcfile + "\n"; + this.download_list += "group: " + srcgroup + "-UPDATE\n"; + this.download_list += "destination-group: " + destgroup + "\n"; + this.download_list += "location: " + destfile + "\n\n"; + } + + /** + * Adds a SET-GROUP command to the download list + * @param {string} group Group to set state of + * @param {string} state State to set group to + * @param {string} version Version to set group to + */ + setGroup(group, state, version) { + this.download_list += "SET-GROUP " + group + "\n"; + this.download_list += "state: " + state + "\n"; + this.download_list += "version: " + version + "\n"; + this.download_list += "last-checkup-time: " + new Date().toUTCString().replace("GMT", "+0000") + "\n\n"; + } + + /** + * Adds a DELETE-GROUP command to the download list + * @param {string} group Group to delete + */ + deleteGroup(group) { + this.download_list += "DELETE-GROUP " + group + "\n\n"; + } + + /** + * An alias for deleteGroup() that handles deleting the '-UPDATE' group files for you + * @param {string} group Group to delete + * @param {string} path Group base path + */ + deleteGroupUpdate(group, path) { + this.deleteGroup(group + "-UPDATE"); + this.delete(path + ".GROUP-UPDATE/"); + } + + /** + * Generates the Download page + * @param {object} minisrv_config minisrv config object + * @param {string} title Page title + * @param {string} group + * @param {string|null} diskmap + * @param {string|null} main_message Message displayed in the center of the page + * @param {string|null} message Initial progress bar message + * @param {boolean|null} force_update Force this update even if the client reports the files are synced + * @param {string|null} success_url Where the client goes when the process succeeds + * @param {string|null} fail_url Where the client goes when the process fails. + * @param {string|null} url Use your own URL for client:fetch?source= instead of our generated one + * @returns {string} HTML Download Page + */ + getSyncPage(title, group, diskmap = null, main_message = null, message = null, force_update = null, success_url = null, fail_url = null, url = null) { + // Begin Set defaults + if (main_message === null) main_message = "Your receiver is downloading files."; + + if (message === null) message = "Retrieving files"; + + if (force_update === null) force_update = false; + + if (url === null) url = this.service_name + ":/sync?diskmap=" + escape(diskmap) + "&force=" + force_update; + + if (success_url === null) success_url = new this.clientShowAlert({ + 'image': this.minisrv_config.config.service_logo, + 'message': "Download successful!", + 'buttonlabel1': "Okay", + 'buttonaction1': "client:goback", + 'noback': true, + }).getURL(); + + if (fail_url === null) fail_url = new this.clientShowAlert({ + 'image': this.minisrv_config.config.service_logo, + 'message': "Download failed...", + 'buttonlabel1': "Fuck!", + 'buttonaction1': "client:goback", + 'noback': true, + }).getURL(); + // End set defaults + return ` + + +
|
+ |
+ |
+ | + ${message} +
+ |
+ |
+ |
+ |
+ |
+
+ ${main_message}
+ | This may take a while. + +
+ |
+ | + + | |||
Got " + (socket_sessions[socket.id].post_data.length / 2) + ", expected " + socket_sessions[socket.id].post_data_length); + } else if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) { + // got too much data ? ... should not ever reach this code (section 2) + var errpage = doErrorPage(400, "Received too much data in POST request
Got " + (socket_sessions[socket.id].post_data.length / 2) + ", expected " + socket_sessions[socket.id].post_data_length) + " (2)"; headers = errpage[0]; data = errpage[1]; sendToClient(socket, headers, data); return; - } + } else { + // expecting more data (see below) + socket_sessions[socket.id].expecting_post_data = true; + if (!socket_sessions[socket.id].post_data) socket_sessions[socket.id].post_data = ''; + socket_sessions[socket.id].post_data += CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data); + console.log(" * Incoming", post_string, "request on", socket.id, "from", wtvshared.filterSSID(socket.ssid), "to", headers['request_url'], "(expecting", socket_sessions[socket.id].post_data_length, "bytes of data from client...)"); + } return; } else { delete socket_sessions[socket.id].headers; @@ -1306,15 +1184,12 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq console.log(" * ", Math.floor(new Date().getTime() / 1000), "Receiving", post_string, "data on", socket.id, "[", socket_sessions[socket.id].post_data.length / 2, "of", socket_sessions[socket.id].post_data_length, "bytes ]"); } else { // calculate and display percentage of data received - var getPercentage = function (partialValue, totalValue) { - return Math.floor((100 * partialValue) / totalValue); - } - var postPercent = getPercentage(socket_sessions[socket.id].post_data.length, (socket_sessions[socket.id].post_data_length * 2)); + var postPercent = wtvshared.getPercentage(socket_sessions[socket.id].post_data.length, (socket_sessions[socket.id].post_data_length * 2)); if (minisrv_config.config.post_percentages) { if (minisrv_config.config.post_percentages.includes(postPercent)) { if (!socket_sessions[socket.id].post_data_percents_shown) socket_sessions[socket.id].post_data_percents_shown = new Array(); if (!socket_sessions[socket.id].post_data_percents_shown[postPercent]) { - console.log(" * Received", postPercent, "% of", socket_sessions[socket.id].post_data_length, "bytes on", socket.id, "from", filterSSID(socket.ssid)); + console.log(" * Received", postPercent, "% of", socket_sessions[socket.id].post_data_length, "bytes on", socket.id, "from", wtvshared.filterSSID(socket.ssid)); socket_sessions[socket.id].post_data_percents_shown[postPercent] = true; } if (postPercent == 100) delete socket_sessions[socket.id].post_data_percents_shown; @@ -1325,20 +1200,21 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq if (socket_sessions[socket.id].post_data.length == (socket_sessions[socket.id].post_data_length * 2)) { // got all expected data if (socket_sessions[socket.id].expecting_post_data) delete socket_sessions[socket.id].expecting_post_data; + socket.setTimeout(minisrv_config.config.socket_timeout * 1000); headers.post_data = CryptoJS.enc.Hex.parse(socket_sessions[socket.id].post_data); if (socket_sessions[socket.id].secure == true) { - if (zdebug) console.log(" # Encrypted POST Content (SECURE ON)", "on", socket.id, "[", headers.post_data.sigBytes, "bytes ]"); + if (minisrv_config.config.debug_flags.debug) console.log(" # Encrypted POST Content (SECURE ON)", "on", socket.id, "[", headers.post_data.sigBytes, "bytes ]"); } else { - if (zdebug) console.log(" # Unencrypted POST Content", "on", socket.id); + if (minisrv_config.config.debug_flags.debug) console.log(" # Unencrypted POST Content", "on", socket.id); } delete socket_sessions[socket.id].headers; delete socket_sessions[socket.id].post_data; delete socket_sessions[socket.id].post_data_length; processURL(socket, headers); return; - } - if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) { + } else if (socket_sessions[socket.id].post_data.length > (socket_sessions[socket.id].post_data_length * 2)) { if (socket_sessions[socket.id].expecting_post_data) delete socket_sessions[socket.id].expecting_post_data; + socket.setTimeout(minisrv_config.config.socket_timeout * 1000); // got too much data ? ... should not ever reach this code var errpage = doErrorPage(400, "Received too much data in POST request
Got " + (socket_sessions[socket.id].post_data.length / 2) + ", expected " + socket_sessions[socket.id].post_data_length); headers = errpage[0]; @@ -1350,7 +1226,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq } else if (!skipSecure) { if (!encryptedRequest) { if (socket_sessions[socket.id].secure != true) { - socket_sessions[socket.id].wtvsec = new WTVSec(1, zdebug); + socket_sessions[socket.id].wtvsec = new WTVSec(minisrv_config); socket_sessions[socket.id].wtvsec.IssueChallenge(); socket_sessions[socket.id].wtvsec.SecureOn(); socket_sessions[socket.id].secure = true; @@ -1414,7 +1290,7 @@ async function processRequest(socket, data_hex, skipSecure = false, encryptedReq async function cleanupSocket(socket) { try { if (socket_sessions[socket.id]) { - if (!zquiet) console.log(" * Cleaning up disconnected socket", socket.id); + if (!minisrv_config.config.debug_flags.quiet) console.log(" * Cleaning up disconnected socket", socket.id); delete socket_sessions[socket.id]; } if (socket.ssid) { @@ -1434,7 +1310,7 @@ async function cleanupSocket(socket) { // set timeout to check ssid_sessions[socket.ssid].data_store.socket_check = setTimeout(function (ssid) { if (ssid_sessions[ssid].currentConnections() === 0) { - if (!zquiet) console.log(" * WebTV SSID", filterSSID(ssid), " has not been seen in", (timeout / 1000), "seconds, cleaning up session data for this SSID"); + if (!minisrv_config.config.debug_flags.quiet) console.log(" * WebTV SSID", wtvshared.filterSSID(ssid), " has not been seen in", (timeout / 1000), "seconds, cleaning up session data for this SSID"); delete ssid_sessions[ssid]; } }, timeout, socket.ssid); @@ -1453,21 +1329,25 @@ async function handleSocket(socket) { socket_sessions[socket.id] = []; socket.minisrv_pc_mode = false; socket.setEncoding('hex'); //set data encoding (Text: 'ascii', 'utf8' ~ Binary: 'hex', 'base64' (do not trust 'binary' encoding)) - socket.setTimeout(10800000); // 3 hours + socket.setTimeout(minisrv_config.config.socket_timeout * 1000); socket.on('data', function (data_hex) { - if (!socket_sessions[socket.id].secure && !socket_sessions[socket.id].expecting_post_data) { - // buffer unencrypted data until we see the classic double-newline, or get blank - if (!socket_sessions[socket.id].header_buffer) socket_sessions[socket.id].header_buffer = ""; - socket_sessions[socket.id].header_buffer += data_hex; - if (socket_sessions[socket.id].header_buffer.indexOf("0d0a0d0a") != -1 || socket_sessions[socket.id].header_buffer.indexOf("0a0a") != -1) { - data_hex = socket_sessions[socket.id].header_buffer; - delete socket_sessions[socket.id].header_buffer; + if (socket_sessions[socket.id]) { + if (!socket_sessions[socket.id].secure && !socket_sessions[socket.id].expecting_post_data) { + // buffer unencrypted data until we see the classic double-newline, or get blank + if (!socket_sessions[socket.id].header_buffer) socket_sessions[socket.id].header_buffer = ""; + socket_sessions[socket.id].header_buffer += data_hex; + if (socket_sessions[socket.id].header_buffer.indexOf("0d0a0d0a") != -1 || socket_sessions[socket.id].header_buffer.indexOf("0a0a") != -1) { + data_hex = socket_sessions[socket.id].header_buffer; + delete socket_sessions[socket.id].header_buffer; + processRequest(this, data_hex); + } + } else { + // stream encrypted requests through the processor + if (socket_sessions[socket.id].header_buffer) delete socket_sessions[socket.id].header_buffer; processRequest(this, data_hex); } } else { - // stream encrypted requests through the processor - if (socket_sessions[socket.id].header_buffer) delete socket_sessions[socket.id].header_buffer; - processRequest(this, data_hex); + cleanupSocket(socket); } }); @@ -1563,7 +1443,7 @@ try { } } } catch (e) { - if (zdebug) console.error(" * Notice: Could not find user configuration (user_config.json). Using default configuration."); + if (minisrv_config.config.debug_flags.debug) console.error(" * Notice: Could not find user configuration (user_config.json). Using default configuration."); } if (throw_me) { @@ -1645,40 +1525,41 @@ process.on('uncaughtException', function (err) { }); // defaults -var zdebug = false; -var zquiet = true; // will squash zdebug even if its true -var zshowheaders = false; +minisrv_config.config.debug_flags = []; +minisrv_config.config.debug_flags.debug = false; +minisrv_config.config.debug_flags.quiet = true; // will squash minisrv_config.config.debug_flags.debug even if its true +minisrv_config.config.debug_flags.show_headers = false; if (minisrv_config.config.verbosity) { switch (minisrv_config.config.verbosity) { case 0: - zdebug = false; - zquiet = true; - zshowheaders = false; + minisrv_config.config.debug_flags.debug = false; + minisrv_config.config.debug_flags.quiet = true; + minisrv_config.config.debug_flags.show_headers = false; console.log(" * Console Verbosity level 0 (quietest)") break; case 1: - zdebug = false; - zquiet = true; - zshowheaders = true; + minisrv_config.config.debug_flags.debug = false; + minisrv_config.config.debug_flags.quiet = true; + minisrv_config.config.debug_flags.show_headers = true; console.log(" * Console Verbosity level 1 (headers shown)") break; case 2: - zdebug = true; - zquiet = true; - zshowheaders = false; + minisrv_config.config.debug_flags.debug = true; + minisrv_config.config.debug_flags.quiet = true; + minisrv_config.config.debug_flags.show_headers = false; console.log(" * Console Verbosity level 2 (verbose without headers)") break; case 3: - zdebug = true; - zquiet = true; - zshowheaders = true; + minisrv_config.config.debug_flags.debug = true; + minisrv_config.config.debug_flags.quiet = true; + minisrv_config.config.debug_flags.show_headers = true; console.log(" * Console Verbosity level 3 (verbose with headers)") break; default: - zdebug = true; - zquiet = false; - zshowheaders = true; + minisrv_config.config.debug_flags.debug = true; + minisrv_config.config.debug_flags.quiet = false; + minisrv_config.config.debug_flags.show_headers = true; console.log(" * Console Verbosity level 4 (debug verbosity)") break; } @@ -1702,6 +1583,8 @@ bind_ports.forEach(function (v) { initstring = initstring.substring(0, initstring.length - 2); +const wtvshared = new WTVShared(minisrv_config); +const wtvmime = new WTVMime(minisrv_config); console.log(" * Started server on ports " + initstring + "...") var listening_ip_string = (minisrv_config.config.bind_ip != "0.0.0.0") ? "IP: " + minisrv_config.config.bind_ip : "all interfaces"; diff --git a/zefie_wtvp_minisrv/config.json b/zefie_wtvp_minisrv/config.json index 80bd772d..db14be70 100644 --- a/zefie_wtvp_minisrv/config.json +++ b/zefie_wtvp_minisrv/config.json @@ -13,12 +13,15 @@ "hide_ssid_in_logs": true, "post_percentages": [ 0, 25, 50, 100 ], "verbosity": 2, + "socket_timeout": 86400, + "post_data_socket_timeout": 30, "error_log_file": "errors.log", "catchall_file_name": "catchall.js", "enable_lzpf_compression": false, "enable_gzip_compression": true, "pc_server_hidden_service": "http_pc", "pc_server_hidden_service_enabled": false, + "show_diskmap": false, "allow_guests": true }, "services": { diff --git a/zefie_wtvp_minisrv/package.json b/zefie_wtvp_minisrv/package.json index f16d9473..3486c8d5 100644 --- a/zefie_wtvp_minisrv/package.json +++ b/zefie_wtvp_minisrv/package.json @@ -1,6 +1,6 @@ { "name": "zefie_wtvp_minisrv", - "version": "0.9.16", + "version": "0.9.18", "description": "WebTV Service (WTVP) Emulation Server", "main": "app.js", "homepage": "https://github.com/zefie/zefie_wtvp_minisrv", diff --git a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj index 17205247..29397b0b 100644 --- a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj +++ b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj @@ -52,6 +52,10 @@