zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add no_debug option to WTVFlashrom

Browse Source 
for get-lc2-page
This commit is contained in:
zefie
2021-08-11 02:08:11 -04:00
parent d16b979ea9
commit 0dd849b505
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
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(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server); var wtvflashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, true);
var request_path = request_headers.query.path; var request_path = request_headers.query.path;
// read flashrom header info into array using WTVFlashrom class // read flashrom header info into array using WTVFlashrom class

22
zefie_wtvp_minisrv/WTVFlashrom.js
View File

@@ -5,15 +5,17 @@ class WTVFlashrom {
use_zefie_server = true; use_zefie_server = true;
bf0app_update = false; bf0app_update = false;
service_vaults = new Array(); service_vaults = new Array();
no_debug = false;
service_name = ""; service_name = "";
minisrv_config = []; minisrv_config = [];
constructor(minisrv_config, service_vaults, service_name, use_zefie_server = true, bf0app_update = false) { constructor(minisrv_config, service_vaults, service_name, use_zefie_server = true, bf0app_update = false, no_debug = false) {
this.service_vaults = service_vaults; this.service_vaults = service_vaults;
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.no_debug = no_debug
this.minisrv_config = minisrv_config; this.minisrv_config = minisrv_config;
} }
@@ -95,31 +97,31 @@ class WTVFlashrom {
if (flashrom_info.magic == flashrom_magic) flashrom_info.valid_flashrom = true; if (flashrom_info.magic == flashrom_magic) flashrom_info.valid_flashrom = true;
if (!flashrom_info.valid_flashrom) console.error(" * Warning! FlashROM File Magic (" + flashrom_info.magic + ") did not match expected magic (" + flashrom_magic + ")..."); if (!flashrom_info.valid_flashrom) console.error(" * Warning! FlashROM File Magic (" + flashrom_info.magic + ") did not match expected magic (" + flashrom_magic + ")...");
if (this.minisrv_config.config.debug_flags.debug) console.log(" # FlashROM File Magic (" + flashrom_info.magic + "), expected magic (" + flashrom_magic + "), OK = " + flashrom_info.valid_flashrom + "..."); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # FlashROM File Magic (" + flashrom_info.magic + "), expected magic (" + flashrom_magic + "), OK = " + flashrom_info.valid_flashrom + "...");
flashrom_info.byte_progress = data.readUInt32BE(68); flashrom_info.byte_progress = data.readUInt32BE(68);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part Bytes Sent:", flashrom_info.byte_progress); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part Bytes Sent:", flashrom_info.byte_progress);
flashrom_info.compression_type = parseInt(part_header[16], 16); flashrom_info.compression_type = parseInt(part_header[16], 16);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part Compression Type:", flashrom_info.compression_type); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part Compression Type:", flashrom_info.compression_type);
flashrom_info.part_data_size = data.readUInt32BE(4); flashrom_info.part_data_size = data.readUInt32BE(4);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part Data Size:", flashrom_info.part_data_size); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part Data Size:", flashrom_info.part_data_size);
flashrom_info.part_total_size = flashrom_info.part_data_size + flashrom_info.header_length; flashrom_info.part_total_size = flashrom_info.part_data_size + flashrom_info.header_length;
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part Total Size:", flashrom_info.part_total_size); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part Total Size:", flashrom_info.part_total_size);
flashrom_info.total_parts_size = data.readUInt32BE(32); flashrom_info.total_parts_size = data.readUInt32BE(32);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom All Parts Total Size:", flashrom_info.total_parts_size); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom All Parts Total Size:", flashrom_info.total_parts_size);
// read current part number bit from part header // read current part number bit from part header
flashrom_info.part_number = data.readUInt16BE(28); flashrom_info.part_number = data.readUInt16BE(28);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Current Part Number:", flashrom_info.part_number); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Current Part Number:", flashrom_info.part_number);
// read current part display message from part header // read current part display message from part header
flashrom_info.message = new Buffer.from(part_header.toString('hex').substring(36 * 2, 68 * 2), 'hex').toString('ascii').replace(/[^0-9a-z\ \.\-]/gi, ""); flashrom_info.message = new Buffer.from(part_header.toString('hex').substring(36 * 2, 68 * 2), 'hex').toString('ascii').replace(/[^0-9a-z\ \.\-]/gi, "");
flashrom_info.is_last_part = ((flashrom_info.byte_progress + flashrom_info.part_total_size) == flashrom_info.total_parts_size) ? true : false; flashrom_info.is_last_part = ((flashrom_info.byte_progress + flashrom_info.part_total_size) == flashrom_info.total_parts_size) ? true : false;
flashrom_info.rompath = `wtv-flashrom:/${path}`; flashrom_info.rompath = `wtv-flashrom:/${path}`;
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part Bytes Sent (after this part):", flashrom_info.byte_progress + flashrom_info.part_total_size); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part Bytes Sent (after this part):", flashrom_info.byte_progress + flashrom_info.part_total_size);
if (this.minisrv_config.config.debug_flags.debug) console.log(" # Flashrom Part is Last Part", flashrom_info.is_last_part); if (this.minisrv_config.config.debug_flags.debug && !this.no_debug) console.log(" # Flashrom Part is Last Part", flashrom_info.is_last_part);
if (flashrom_info.is_last_part && this.bf0app_update) { if (flashrom_info.is_last_part && this.bf0app_update) {
flashrom_info.next_rompath = null; flashrom_info.next_rompath = null;