diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
index e0dbb27a..e39e6741 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
@@ -1,5 +1,6 @@
var minisrv_service_file = true;
-request_is_async = true;
+
+var request_is_async = true;
var bf0app_update = false;
var request_path = request_headers.request_url.replace(service_name + ":/", "");
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js
index af6f82d8..854b6a16 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js
@@ -1,6 +1,5 @@
var minisrv_service_file = true;
-const WTVFlashrom = require(classPath + "/WTVFlashrom.js");
request_is_async = true;
// this build can be local or on zefie's server
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
index 4f480948..b9194f66 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
@@ -1,6 +1,5 @@
var minisrv_service_file = true;
-const WTVFlashrom = require(classPath + "/WTVFlashrom.js");
request_is_async = true;
var bf0app_update = false;
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 f4ab9230..7f0e2a8d 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
@@ -1,6 +1,5 @@
var minisrv_service_file = true;
-const WTVFlashrom = require(classPath + "/WTVFlashrom.js");
var wtvflashrom;
request_is_async = true;
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js
index d3ba940f..bcfa0c22 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js
@@ -1,6 +1,5 @@
var minisrv_service_file = true;
-const WTVFlashrom = require(classPath + "/WTVFlashrom.js");
request_is_async = true;
// this build can be local or on zefie's server
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index e23d9fb8..0dc9db12 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -332,7 +332,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
]
if (!pc_services) {
- updateFromVM.push([`ssid_sessions[${socket.ssid}]`, "session_data"]); // user-specific session data from unprivileged scripts
+ updateFromVM.push([`ssid_sessions['${socket.ssid}']`, "session_data"]); // user-specific session data from unprivileged scripts
}
var privileged = false;
@@ -509,7 +509,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
try {
if (typeof vmResults[item[1]] !== "undefined") eval(item[0] + ' = vmResults["' + item[1] + '"]');
} catch (e) {
-
+ console.error("vm readback error", e, item[0] + ' = vmResults[' + item[1] + ']');
}
})
@@ -544,14 +544,16 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
request_headers.service_file_path = catchall_file;
var script_data = fs.readFileSync(catchall_file).toString();
- runScriptInVM(script_data, contextObj, privileged, catchall_file);
+ var vmResults = runScriptInVM(script_data, contextObj, privileged, catchall_file);
- // Here we read back certain data from the ServiceVault Script Context Object
- try {
- if (typeof vmResults[item[1]] !== "undefined") eval(item[0] + ' = vmResults["' + item[1] + '"]');
- } catch (e) {
-
- }
+ updateFromVM.forEach((item) => {
+ // Here we read back certain data from the ServiceVault Script Context Object
+ try {
+ if (typeof vmResults[item[1]] !== "undefined") eval(item[0] + ' = vmResults["' + item[1] + '"]');
+ } catch (e) {
+ console.error("vm readback error", e);
+ }
+ });
if (request_is_async && !minisrv_config.config.debug_flags.quiet) console.log(" * Script requested Asynchronous mode");
break;
diff --git a/zefie_wtvp_minisrv/includes/WTVFlashrom.js b/zefie_wtvp_minisrv/includes/WTVFlashrom.js
index 9fd1a10f..48ac60db 100644
--- a/zefie_wtvp_minisrv/includes/WTVFlashrom.js
+++ b/zefie_wtvp_minisrv/includes/WTVFlashrom.js
@@ -1,7 +1,7 @@
class WTVFlashrom {
fs = require('fs');
- https = require('https');
+ https = require('follow-redirects').https;
use_zefie_server = true;
bf0app_update = false;
service_vaults = new Array();
@@ -170,7 +170,6 @@ class WTVFlashrom {
} else if (res.statusCode == 206) {
var data = self.getFlashromInfo(Buffer.from(data_hex, 'hex'), request_path);
} else if (res.statusCode == 404) {
- console.log(request_path);
var errpage = self.wtvshared.doErrorPage(404, "The service could not find the requested ROM on zefie's server.")
headers = errpage[0];
var data = errpage[1];
diff --git a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
index 2209402f..c0c1c3d5 100644
--- a/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
+++ b/zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
@@ -188,6 +188,7 @@
+