update WTVFlashrom class to accept debug config flag, also change default bf0app build

This commit is contained in:
zefie
2021-08-08 11:36:40 -04:00
parent 9c68dc5585
commit 3376b5ada2
6 changed files with 33 additions and 6 deletions

View File

@@ -22,7 +22,7 @@ if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_se
} }
if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) {
ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update, minisrv_config.services[service_name].debug);
} }
ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) {

View File

@@ -15,7 +15,7 @@ if ((romtype == "bf0app" || !romtype) && (bootver == "105" || !bootver)) {
if (request_headers.query.raw || bf0app_update) { if (request_headers.query.raw || bf0app_update) {
if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) {
ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update, minisrv_config.services[service_name].debug);
} }
ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) {

View File

@@ -8,7 +8,7 @@ if (!request_headers.query.path) {
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
} else { } else {
var wtvflashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server); var wtvflashrom = new WTVFlashrom(service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, minisrv_config.services[service_name].debug);
var request_path = unescape(request_headers.query.path); var request_path = unescape(request_headers.query.path);
// read flashrom header info into array using WTVFlashrom class // read flashrom header info into array using WTVFlashrom class

View File

@@ -22,7 +22,7 @@ if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_se
} }
if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) {
ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, 0, minisrv_config.services[service_name].use_zefie_server, bf0app_update); ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(service_vaults, service_name, 0, minisrv_config.services[service_name].use_zefie_server, bf0app_update, minisrv_config.services[service_name].debug);
} }
ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) {

View File

@@ -14,9 +14,35 @@ class WTVFlashrom {
this.service_name = service_name; this.service_name = service_name;
this.use_zefie_server = use_zefie_server; this.use_zefie_server = use_zefie_server;
this.bf0app_update = bf0app_update; this.bf0app_update = bf0app_update;
this.zdebug = debug; this.zdebug = true;
} }
doErrorPage(code, data = null) {
var headers = null;
switch (code) {
case 404:
if (data === null) data = "The service could not find the requested page.";
headers = "404 " + data + "\r\n";
headers += "Content-Type: text/html\r\n";
break;
case 400:
if (data === null) data = "HackTV ran into a technical problem.";
headers = "400 " + data + "\r\n";
headers += "Content-Type: text/html\r\n";
break;
default:
// what we send when we did not detect a wtv-url.
// e.g. when a pc browser connects
headers = "HTTP/1.1 200 OK\r\n";
headers += "Content-Type: text/html\r\n";
break;
}
console.error("doErrorPage Called:", code, data);
return new Array(headers, data);
}
async doLocalFlashROM(flashrom_file_path, callback, info_only = false) { async doLocalFlashROM(flashrom_file_path, callback, info_only = false) {
// use local flashrom files; // use local flashrom files;
console.log(info_only); console.log(info_only);

View File

@@ -50,8 +50,9 @@
"wtv-flashrom": { "wtv-flashrom": {
"port": 1618, "port": 1618,
"flags": "0x00000040", "flags": "0x00000040",
"debug": false,
"use_zefie_server": true, "use_zefie_server": true,
"bf0app_default_rom": "content/artemis-webtv-000/build7181/daily-nondebug/bf0app-part000.rom" "bf0app_default_rom": "content/artemis-webtv-000/build1235/lusernondebug-internal/bf0app-part000.rom"
}, },
"wtv-setup": { "wtv-setup": {
"port": 1613, "port": 1613,