- numerous bug fixes
 - wtv-mail system
 - user account updates
 - viewergen alpha (experimental webtv viewer patcher on pc_service)
 - implement wtv-favorites with huge help from @JarHead4
 - add wtv-ticket store api
 - Bump vm2 from 3.9.5 to 3.9.7 in /zefie_wtvp_minisrv
 - fix bf0app default rom
 - Add wtv-1800 service to wtv-1800:/noflash
 - handle webtvism:
   - allow get/post variables to be the same name multiple times
   - rather than overwrite, the server will now change the variable from a string to an array.
 - Rewrite script processing a bit
   - Instead of using eval() we now use a proper VM Context
   - As a result, any scripting errors will now give a more useful filename and line number.
   - However, some things may break, if they are dependant on variables we are not allowing in the context.
 - BREAKING CHANGES:
   - `ssid_sessions[socket.ssid]` is now `session_data`
   - `require` is no longer allowed in user scripts
 - add star service
 - change how we handle modules for services in the VM
 - fixed wtv-disk:/sync always failed the first time
 - implement production-like wtv-star handling (when a service port becomes unavailable, it requests the url over the wtv-star port to show an error page)
 - renamed WTVDownloadList.js to WTVDisk.js
 - a bit more work on WTVNews (created class)
 - probably more stuff I can't remember
This commit is contained in:
zefie
2021-11-10 23:38:15 -05:00
parent 4544e815cb
commit 1165b245ce
1411 changed files with 31570 additions and 2198 deletions

View File

@@ -0,0 +1,138 @@
var minisrv_service_file = true;
var request_is_async = true;
var max_redirects = 3;
var redirects = 0;
function hex_to_ascii(POST)
{
var hex = POST.toString();
var str = '';
for (var n = 0; n < hex.length; n += 2) {
str += String.fromCharCode(parseInt(hex.substr(n, 2), 16));
}
return str;
}
if (request_headers.post_data) {
var POST = request_headers.post_data;
var image = hex_to_ascii(POST);
}
function getTitle(url) {
return new Promise(function (resolve, reject) {
var page_title = "Web Page";
var request_type = (url.substring(0, 5) == "https") ? "https" : "http";
var proxy_agent = null;
switch (request_type) {
case "https":
var proxy_agent = require('https');
break;
case "http":
var proxy_agent = require('http');;
break;
}
if (proxy_agent) {
var options = {
method: 'GET'
}
const request = proxy_agent.get(url, options, (response) => {
let req_data = '';
if (response.statusCode == 301 || response.statusCode == 302) {
redirects++;
if (redirects < max_redirects) resolve(getTitle(response.headers.location));
else reject(`Too many redirects. Max: ${max_redirects}, Current: ${redirects}`);
}
response.on('data', (chunk) => {
req_data += chunk.toString();
});
response.on('end', () => {
let match = req_data.match(/<title>([^<]*)<\/title>/) // regular expression to parse contents of the <title> tag
if (match && typeof match[1] === 'string') page_title = match[1];
resolve(page_title);
});
});
request.on('error', (error) => {
console.log(' *** Error getting title for wtv-favorite', error);
reject();
});
}
});
}
async function saveFavorite(favstore, title, folder, imagetype, favurl) {
var headers, data = '';
if (!favstore.favstoreExists()) {
// create favstore if the user hasn't already navigated to favorites
favstore.createFavstore();
}
if (favstore.favstoreExists()) {
var default_folder = "Personal"; // default to "Personal"
var favoritenum = 0;
if (!folder) folder = default_folder;
if (!favstore.folderExists(folder)) {
// user did not define a folder, and the default folder does not exist
// so choose the user's first available folder
var favfolders = favstore.getFolders();
if (favfolders.length > 0) folder = favfolders[0];
}
if (!folder) {
// user has no folders, forcefully recreate "Personal"
folder = default_folder;
favstore.createTemplateFolder(folder);
}
var favarray = favstore.listFavorites(folder);
favoritenum = Object.keys(favarray).length;
if (!title) {
try {
await getTitle(favurl).then(function (res) {
title = res;
if (!minisrv_config.config.debug_flags.quiet) console.log(" * Client sent favorite-url without title, got title:", title);
});
} catch (e) {
console.error(" * Error: Client sent favorite-url without title, and we could not get the title from the server:", e);
}
}
if (!image) {
imagetype = "url";
image = "canned/favorite_default.gif"
}
if (favoritenum == minisrv_config.services[service_name].max_favorites_per_folder) {
headers = `400 You can only have ${minisrv_config.services[service_name].max_favorites_per_folder} favorites in a folder. Discard some favorites or choose a different folder, then try again.`
} else {
var createresult = favstore.createFavorite(title, favurl, folder, image, imagetype);
if (!createresult) { // true if fail
headers = `200 OK
wtv-expire: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
} else {
var err = wtvshared.doErrorPage(500);
headers = err[0];
data = err[1];
}
sendToClient(socket, headers, data);
}
} else {
var err = wtvshared.doErrorPage(500);
headers = err[0];
data = err[1];
sendToClient(socket, headers, data);
}
}
var title = request_headers.query['favorite-title'];
var folder = request_headers.query['favorite-category'];
if (folder) folder = folder.replaceAll("+", " ")
var imagetype = request_headers.query['favorite-thumbnail-type']
var favurl = request_headers.query['favorite-url'];
saveFavorite(session_data.favstore, title, folder, imagetype, favurl);