yanistyle/podkop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 86 Wiki Activity

refactor: simplify label fetching and decoding in podkop.js

Browse Source
This commit is contained in:
Ivan K
2025-02-22 09:52:04 +03:00
parent a278918e77
commit 25107a0481
2 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
luci-app-podkop/htdocs/luci-static/resources/view/podkop/podkop.js
View File

@@ -53,36 +53,17 @@ function createConfigSection(section, map, network) {
o.rows = 5; o.rows = 5;
o.ucisection = s.section; o.ucisection = s.section;
o.load = function (section_id) { o.load = function (section_id) {
return new Promise((resolve, reject) => { return fs.exec('/etc/init.d/podkop', ['get_proxy_label', section_id]).then(res => {
const timeout = setTimeout(() => { if (res.stdout) {
console.error('Label fetch timeout'); try {
resolve(this.super('load', section_id)); const decodedLabel = decodeURIComponent(res.stdout.trim());
}, 5000); // 5 second timeout this.description = _('Current config: ') + decodedLabel;
} catch (e) {
fs.exec('/etc/init.d/podkop', ['get_proxy_label', section_id]) console.error('Error decoding label:', e);
.then(res => { this.description = _('Current config: ') + res.stdout.trim();
clearTimeout(timeout); }
if (res.stdout) { }
try { return this.super('load', section_id);
const chunks = res.stdout.trim().split('\n');
const fullLabel = chunks.join('');
const decodedLabel = decodeURIComponent(fullLabel);
this.description = _('Current config: ') + decodedLabel;
} catch (e) {
console.error('Error processing label:', e);
// If decoding fails, try to display the raw chunks
const chunks = res.stdout.trim().split('\n');
const fullLabel = chunks.join('');
this.description = _('Current config: ') + fullLabel;
}
}
resolve(this.super('load', section_id));
})
.catch(error => {
clearTimeout(timeout);
console.error('Error fetching label:', error);
resolve(this.super('load', section_id));
});
}); });
}; };
o.validate = function (section_id, value) { o.validate = function (section_id, value) {

10
podkop/files/etc/init.d/podkop
View File

@@ -1840,19 +1840,11 @@ get_proxy_label() {
local section="$1" local section="$1"
local proxy_string local proxy_string
local label="" local label=""
local chunk_size=50
local start=0
config_get proxy_string "$section" "proxy_string" config_get proxy_string "$section" "proxy_string"
if [ -n "$proxy_string" ]; then if [ -n "$proxy_string" ]; then
label=$(echo "$proxy_string" | sed -n 's/.*#\(.*\)$/\1/p') label=$(echo "$proxy_string" | sed -n 's/.*#\(.*\)$/\1/p')
if [ -n "$label" ]; then echo "$label"
# Split label into chunks and output one at a time
while [ $start -lt ${#label} ]; do
echo "${label:$start:$chunk_size}"
start=$((start + chunk_size))
done
fi
fi fi
} }