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

major fix in app.js, also fix favorites

Browse Source
This commit is contained in:
zefie
2025-08-10 21:39:18 -04:00
parent 288ab5d129
commit 6a20881e12
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zefie_wtvp_minisrv/app.js
View File

@@ -917,9 +917,14 @@ async function processURL(socket, request_headers, pc_services = false) {
var original_service_name = ""; var original_service_name = "";
var allow_double_slash = false, enable_multi_query = false, use_external_proxy = false; var allow_double_slash = false, enable_multi_query = false, use_external_proxy = false;
request_headers.query = {}; request_headers.query = {};
if (request_headers.request_url) { if (request_headers.request_url) {
service_name = socket.service_name; service_name = socket.service_name || verifyServicePort(unescape(request_headers.request_url).split(':/')[0], socket);
if (minisrv_config.services[service_name]) {
allow_double_slash = minisrv_config.services[service_name].allow_double_slash || false;
enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
use_external_proxy = minisrv_config.services[service_name].use_external_proxy || false;
}
if (pc_services) { if (pc_services) {
original_service_name = socket.service_name; // store service name original_service_name = socket.service_name; // store service name
service_name = verifyServicePort(socket.service_name, socket); // get the actual ServiceVault path service_name = verifyServicePort(socket.service_name, socket); // get the actual ServiceVault path
@@ -934,6 +939,7 @@ async function processURL(socket, request_headers, pc_services = false) {
const k = qraw_split[0]; const k = qraw_split[0];
const value = unescape(qraw_split[1].replace(/\+/g, "%20")); const value = unescape(qraw_split[1].replace(/\+/g, "%20"));
if (request_headers.query[k] && enable_multi_query) { if (request_headers.query[k] && enable_multi_query) {
console.log("yes")
if (typeof request_headers.query[k] === 'string') { if (typeof request_headers.query[k] === 'string') {
request_headers.query[k] = [request_headers.query[k]]; request_headers.query[k] = [request_headers.query[k]];
} }
@@ -1067,15 +1073,7 @@ minisrv-no-mail-count: true`;
var ssl = (socket.ssl) ? true : false; var ssl = (socket.ssl) ? true : false;
if (original_service_name == service_name) console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + service_name + " for " + request_headers.request_url, 'on', socket.id); if (original_service_name == service_name) console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + service_name + " for " + request_headers.request_url, 'on', socket.id);
else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id); else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id);
} else { }
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
}
if (minisrv_config.services[service_name]) {
allow_double_slash = minisrv_config.services[service_name].allow_double_slash || false;
enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
use_external_proxy = minisrv_config.services[service_name].use_external_proxy || false;
}
if ((shortURL.includes(':/')) && (!shortURL.includes('://') || (shortURL.includes('://') && allow_double_slash))) { if ((shortURL.includes(':/')) && (!shortURL.includes('://') || (shortURL.includes('://') && allow_double_slash))) {
var ssid = socket.ssid; var ssid = socket.ssid;

4
zefie_wtvp_minisrv/includes/classes/WTVFavorites.js
View File

@@ -90,7 +90,7 @@ class WTVFavorites {
var self = this; var self = this;
if (folder_templates[folder]) { if (folder_templates[folder]) {
Object.keys(folder_templates[folder]).forEach(function (k) { Object.keys(folder_templates[folder]).forEach(function (k) {
self.createFavorite(folder_templates[folder][k].title, folder_templates[folder][k].url, folder, (folder_templates[folder][k].image_type == "image/wtv-bitmap") ? btoa(folder_templates[folder][k].image) : folder_templates[folder][k].image, folder_templates[folder][k].image_type); self.createFavorite(folder_templates[folder][k].title, folder_templates[folder][k].url, folder, (folder_templates[folder][k].image_type == "image/wtv-bitmap") ? atob(folder_templates[folder][k].image) : folder_templates[folder][k].image, folder_templates[folder][k].image_type);
}) })
} }
} }
@@ -149,7 +149,7 @@ class WTVFavorites {
var favoritefile = favoriteid + this.favFileExt; var favoritefile = favoriteid + this.favFileExt;
var favoritefileout = folderpath + favoritefile; var favoritefileout = folderpath + favoritefile;
if (imagetype != "url") if (imagetype != "url")
image = atob(image); image = btoa(image);
title = decodeURIComponent(title).replaceAll("+", " "); title = decodeURIComponent(title).replaceAll("+", " ");
url = decodeURIComponent(url) url = decodeURIComponent(url)