From fee8b768fc38dfda401c9c0db539a40386c88cef Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Sun, 2 Oct 2022 17:09:19 -0400
Subject: [PATCH] fix wtv-flashrom catch-all error messages

---
 .../wtv-flashrom/content/content-serve.js       |  2 --
 zefie_wtvp_minisrv/app.js                       | 17 +++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

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 51e8d521..1c30448d 100644
--- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
+++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
@@ -1,6 +1,4 @@
 var minisrv_service_file = true;
-
-const WTVFlashrom = require("./WTVFlashrom.js");
 request_is_async = true;
 
 var bf0app_update = false;
diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index 0026ec27..f469652d 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -140,6 +140,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
         clientShowAlert: clientShowAlert,
         WTVClientSessionData: WTVClientSessionData,
         WTVClientCapabilities: WTVClientCapabilities,
+		WTVFlashrom: WTVFlashrom,
         strftime: strftime,
         CryptoJS: CryptoJS,
         fs: fs,
@@ -390,16 +391,16 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
                                     var eval_ctx = new vm.Script(script_data, {
                                         "filename": catchall_file
                                     })
-                                    eval_ctx.runInNewContext(contextObj, {
-                                        "breakOnSigint": true
-                                    });
-
-                                    // Here we read back certain data from the ServiceVault Script Context Object
-                                    updateFromVM.forEach((item) => {
-                                        eval(item[0] + ' = contextObj["' + item[1] + '"]');
-                                    })
+									eval_ctx.runInNewContext(contextObj, {
+										"breakOnSigint": true
+									});
 
+									// Here we read back certain data from the ServiceVault Script Context Object
+									updateFromVM.forEach((item) => {
+										eval(item[0] +' = contextObj["'+item[1]+'"]');
+									})
                                     if (request_is_async && !minisrv_config.config.debug_flags.quiet) console.log(" * Script requested Asynchronous mode");
+									break;
                                 } else {
                                     service_check_dir.pop();
                                 }