From 3ffadd8422df2f850ad1c6b17afd7971da11f26b Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Wed, 30 Nov 2022 20:19:38 -0500
Subject: [PATCH] dont send pc services to webtv client + fix stuff

---
 zefie_wtvp_minisrv/app.js                     | 14 +++++++--
 .../includes/classes/WTVShared.js             | 30 -------------------
 2 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js
index b5ac7ead..b1d484bf 100644
--- a/zefie_wtvp_minisrv/app.js
+++ b/zefie_wtvp_minisrv/app.js
@@ -183,11 +183,21 @@ if (!Object.prototype.getCaseInsensitiveKey) {
     }
 }
 
+function isConfiguredService(service) {
+    if (minisrv_config.services[service]) {
+        if (!minisrv_config.services[service].disabled) return true;
+    }
+    return false;
+}
+
 function getServiceString(service, overrides = {}) {
     // used externally by service scripts
     if (service === "all") {
         var out = "";
         Object.keys(minisrv_config.services).forEach(function (k) {
+            if (!isConfiguredService(k)) return true;
+            if (minisrv_config.services[k].pc_services) return true;
+
             if (overrides.exceptions) {
                 Object.keys(overrides.exceptions).forEach(function (j) {
                     if (k != overrides.exceptions[j]) out += minisrv_config.services[k].toString(overrides) + "\n";
@@ -229,7 +239,7 @@ var runScriptInVM = function (script_data, user_contextObj = {}, privileged = fa
         // try to make the debug name
         var debug_name = (filename) ? filename.split(path.sep) : null;
         if (debug_name) {
-            if (wtvshared.isConfiguredService(debug_name[debug_name.length - 2]))
+            if (isConfiguredService(debug_name[debug_name.length - 2]))
                 // service:/filename
                 debug_name = debug_name[debug_name.length - 2] + ":/" + debug_name[debug_name.length - 1];
             else
@@ -613,7 +623,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
         headers = errpage[0];
         data = errpage[1];
         if (pc_services) {
-            if (minisrv_config.services.pc_services.show_verbose_errors)
+            if (minisrv_config.services[getServiceByVaultDir(service_name)].show_verbose_errors)
                 data += "<br><br>The interpreter said:<br><pre>" + e.stack + "</pre>";
         }
         console.error(" * Scripting error:", e);
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
index 70751dfe..7f853dd3 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
@@ -175,36 +175,6 @@ class WTVShared {
         return JSON.parse(new_str.join(""));
     }
 
-    isConfiguredService(service) {
-        if (this.minisrv_config.services[service]) {
-            if (!this.minisrv_config.services[service].disabled) return true;
-        }
-        return false;
-    }
-
-    getServiceString(service, overrides = {}) {
-        // used externally by service scripts
-        if (service === "all") {
-            var out = "";
-            Object.keys(minisrv_config.services).forEach(function (k) {
-                if (overrides.exceptions) {
-                    Object.keys(overrides.exceptions).forEach(function (j) {
-                        if (k != overrides.exceptions[j]) out += minisrv_config.services[k].toString(overrides) + "\n";
-                    });
-                } else {
-                    out += minisrv_config.services[k].toString(overrides) + "\n";
-                }
-            });
-            return out;
-        } else {
-            if (!this.minisrv_config.services[service]) {
-                throw ("SERVICE ERROR: Attempted to provision unconfigured service: " + service)
-            } else {
-                return this.minisrv_config.services[service].toString(overrides);
-            }
-        }
-    }
-
     parseBool(val) {
         if (typeof val === 'string')
             val = val.toLowerCase();