From fc21e31cc236f555f10b38c628d5bd1877b09462 Mon Sep 17 00:00:00 2001 From: zefie Date: Mon, 31 Oct 2022 12:15:47 -0400 Subject: [PATCH 1/3] remove debugging --- zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js | 1 - 1 file changed, 1 deletion(-) 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 aa99a39d..3667ab34 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -26,7 +26,6 @@ async function processLC2DownloadPage(flashrom_info, headers, numparts = null) { } if (numparts != null) flashrom_info.part_count = parseInt(numparts); if (!flashrom_info.part_count) flashrom_info.part_count = parseInt(flashrom_info.message.substring(flashrom_info.message.length - 4).replace(/\D/g, '')); - console.log(flashrom_info); if (parseInt(flashrom_info.part_number) >= 0 && flashrom_info.rompath && flashrom_info.next_rompath) { if (!flashrom_info.message && flashrom_info.is_bootrom) { flashrom_info.message = "BootRom Part " + (flashrom_info.part_number + 1) + " of " + flashrom_info.part_count; From 93460b5798561efc4b5bb724808c09cf64c221d6 Mon Sep 17 00:00:00 2001 From: zefie Date: Mon, 31 Oct 2022 12:22:18 -0400 Subject: [PATCH 2/3] minor updates to flashrom --- .../ServiceVault/wtv-flashrom/get-lc2-page.js | 8 ++++++-- zefie_wtvp_minisrv/includes/WTVFlashrom.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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 3667ab34..1d86f5fb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -20,7 +20,9 @@ async function processLC2DownloadPage(flashrom_info, headers, numparts = null) { if (typeof flashrom_info === 'string') { // zefie_flashrom_server error data = flashrom_info; - headers += "\nminisrv-no-mail-count: true\nwtv-expire-all: wtv-flashrom:/get-lc2-page?"; + headers += "\nminisrv-no-mail-count: true"; + headers += "\nwtv-expire-all: wtv-flashrom:/get-lc2-page?"; + headers += "\nwtv-expire-all: wtv-flashrom:/content"; sendToClient(socket, headers, data); return false; } @@ -149,7 +151,9 @@ ${flashrom_info.message} } else { var errpage = wtvshared.doErrorPage(400) headers = errpage[0]; - headers += "\nminisrv-no-mail-count: true\nwtv-expire-all: wtv-flashrom:/get-lc2-page?"; + headers += "\nminisrv-no-mail-count: true"; + headers += "\nwtv-expire-all: wtv-flashrom:/get-lc2-page?"; + headers += "\nwtv-expire-all: wtv-flashrom:/content"; data = errpage[1]; } sendToClient(socket, headers, data); diff --git a/zefie_wtvp_minisrv/includes/WTVFlashrom.js b/zefie_wtvp_minisrv/includes/WTVFlashrom.js index 2e80509d..669eea57 100644 --- a/zefie_wtvp_minisrv/includes/WTVFlashrom.js +++ b/zefie_wtvp_minisrv/includes/WTVFlashrom.js @@ -164,7 +164,7 @@ class WTVFlashrom { }) res.on('end', function () { - if (self.minisrv_config.config.debug_flags.debug) console.log(` * Zefie's FlashROM Server HTTP Status: ${res.statusCode} ${res.statusMessage}`) + if (self.minisrv_config.config.debug_flags.debug) console.log(` * zefie's FlashROM Server HTTP Status: ${res.statusCode} ${res.statusMessage}`) if (res.statusCode == 200) { var data = Buffer.from(data_hex, 'hex'); } else if (res.statusCode == 206) { From ae6bc22b9aa1c9c4687a92bc82cb43eb49331c17 Mon Sep 17 00:00:00 2001 From: zefie Date: Mon, 31 Oct 2022 12:23:29 -0400 Subject: [PATCH 3/3] correct a typo --- zefie_wtvp_minisrv/app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 17bc21d6..57f0c375 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -1926,9 +1926,9 @@ if (minisrv_config.config.SessionStore) { if (minisrv_config.config.ServiceDeps) { var ServiceDeps = wtvshared.returnAbsolutePath(minisrv_config.config.ServiceDeps); - console.log(" * Configured Service Dependancies at", ServiceDeps); + console.log(" * Configured Service Dependencies at", ServiceDeps); } else { - throw ("ERROR: No Service Dependancies Directory (SessionDeps) defined!"); + throw ("ERROR: No Service Dependencies Directory (SessionDeps) defined!"); } var service_ip = minisrv_config.config.service_ip;