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

dont send pc services to webtv client

Browse Source 
+ fix stuff
This commit is contained in:
zefie
2022-11-30 20:19:38 -05:00
parent 24dc795680
commit 3ffadd8422
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zefie_wtvp_minisrv/app.js
View File

@@ -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 = {}) { function getServiceString(service, overrides = {}) {
// used externally by service scripts // used externally by service scripts
if (service === "all") { if (service === "all") {
var out = ""; var out = "";
Object.keys(minisrv_config.services).forEach(function (k) { 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) { if (overrides.exceptions) {
Object.keys(overrides.exceptions).forEach(function (j) { Object.keys(overrides.exceptions).forEach(function (j) {
if (k != overrides.exceptions[j]) out += minisrv_config.services[k].toString(overrides) + "\n"; 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 // try to make the debug name
var debug_name = (filename) ? filename.split(path.sep) : null; var debug_name = (filename) ? filename.split(path.sep) : null;
if (debug_name) { if (debug_name) {
if (wtvshared.isConfiguredService(debug_name[debug_name.length - 2])) if (isConfiguredService(debug_name[debug_name.length - 2]))
// service:/filename // service:/filename
debug_name = debug_name[debug_name.length - 2] + ":/" + debug_name[debug_name.length - 1]; debug_name = debug_name[debug_name.length - 2] + ":/" + debug_name[debug_name.length - 1];
else else
@@ -613,7 +623,7 @@ async function processPath(socket, service_vault_file_path, request_headers = ne
headers = errpage[0]; headers = errpage[0];
data = errpage[1]; data = errpage[1];
if (pc_services) { 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>"; data += "<br><br>The interpreter said:<br><pre>" + e.stack + "</pre>";
} }
console.error(" * Scripting error:", e); console.error(" * Scripting error:", e);

30
zefie_wtvp_minisrv/includes/classes/WTVShared.js
View File

@@ -175,36 +175,6 @@ class WTVShared {
return JSON.parse(new_str.join("")); 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) { parseBool(val) {
if (typeof val === 'string') if (typeof val === 'string')
val = val.toLowerCase(); val = val.toLowerCase();