Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-02-01 07:10:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

updater: Fix error "XHR request timed out"

Browse Source
This commit is contained in:
remittor
2026-01-31 16:50:21 +03:00
parent 85a07b1ff0
commit 0dead01ffa
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -766,7 +766,7 @@ return baseclass.extend({
return document.body.classList.contains('modal-overlay-active'); return document.body.classList.contains('modal-overlay-active');
}, },
execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ], rpc_timeout = 5, rpc_root = false } = {}) execAndRead: async function({ cmd = [ ], log = '', logArea = null, callback = null, ctx = null, hiderow = [ ] } = {})
{ {
function appendLog(msg, end = '\n') function appendLog(msg, end = '\n')
{ {
@@ -780,36 +780,49 @@ return baseclass.extend({
} }
} }
let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ]; let hide_rows = Array.isArray(hiderow) ? hiderow : [ hiderow ];
let rpc_opt = { "timeout": rpc_timeout*1000 };
if (rpc_root) {
rpc_opt.uid = 0; // run under root
}
const logFile = log; // file for reading: '/tmp/zapret_pkg_install.log' const logFile = log; // file for reading: '/tmp/zapret_pkg_install.log'
const rcFile = logFile + '.rc'; const rcFile = logFile + '.rc';
try { try {
await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null, rpc_opt); await fs.exec('/bin/busybox', [ 'rm', '-f', logFile + '*' ], null);
appendLog('Output file cleared!'); appendLog('Output file cleared!');
} catch (e) { } catch (e) {
return callback.call(ctx, 500, 'ERROR: Failed to clear output file'); return callback.call(ctx, 500, 'ERROR: Failed to clear output file');
} }
let processStarted = false;
let opt_list = [ logFile ];
try { try {
let opt_list = [ logFile ];
opt_list.push(...cmd); opt_list.push(...cmd);
let res = await fs.exec(this.appDir+'/script-exec.sh', opt_list, null, rpc_opt); //console.log('script-exec.sh ... '+JSON.stringify(opt_list));
if (res.code != 0) { let proc = new Promise((resolve) => {
return callback.call(ctx, 525, 'ERROR: cannot run "' + cmd[0] + '" script! (error = ' + res.code + ')'); fs.exec(this.appDir+'/script-exec.sh', opt_list, null)
} .then (() => { resolve(); })
appendLog('Process started...'); .catch(() => { resolve(); });
});
} catch (e) { } catch (e) {
return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message); return callback.call(ctx, 520, 'ERROR: Failed on execute process: ' + e.message);
} }
let lastLen = 0; let lastLen = 0;
let retCode = -1; let retCode = -1;
return await new Promise(async (resolve, reject) => { return await new Promise(async (resolve, reject) => {
let ticks = 0;
async function epoll() async function epoll()
{ {
ticks += 1;
try { try {
let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt); let res = await fs.exec('/bin/cat', [ logFile ], null);
if (res.code != 0) {
if (ticks > 1) {
console.log('ERROR: execAndRead: '+JSON.stringify(opt_list));
resolve(callback.call(ctx, 541, 'ERROR: Failed on read process log: code = ' + res.code));
return;
}
setTimeout(epoll, 500);
return; // skip first step with error
}
if (!processStarted) {
appendLog('Process started...');
processStarted = true;
}
if (res.stdout && res.stdout.length > lastLen) { if (res.stdout && res.stdout.length > lastLen) {
let log = res.stdout.slice(lastLen); let log = res.stdout.slice(lastLen);
hide_rows.forEach(re => { hide_rows.forEach(re => {
@@ -819,7 +832,7 @@ return baseclass.extend({
lastLen = res.stdout.length; lastLen = res.stdout.length;
} }
if (retCode < 0) { if (retCode < 0) {
let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt); let rc = await fs.exec('/bin/cat', [ rcFile ], null);
if (rc.code != 0) { if (rc.code != 0) {
fixLogEnd(); fixLogEnd();
resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"')); resolve(callback.call(ctx, 545, 'ERROR: cannot read file "' + rcFile + '"'));

21
zapret/script-exec.sh
View File

@@ -1,15 +1,22 @@
#!/bin/sh #!/bin/sh
# Copyright (c) 2024 remittor # Copyright (c) 2024 remittor
PID_FILE=/tmp/zapret-script-exec.pid
[ -f $PID_FILE ] && exit 70
LOG_FILE=$1 LOG_FILE=$1
RC_FILE=$1.rc RC_FILE=$1.rc
shift 1 SH_FILE=$2
shift 2
[ ! -f $SH_FILE ] && exit 71
: > $LOG_FILE : > $LOG_FILE
: > $RC_FILE : > $RC_FILE
( start-stop-daemon -S -b -p $PID_FILE -x /bin/sh -- -c '
exec </dev/null >/dev/null 2>&1 LOG_FILE=$1
"$@" >> $LOG_FILE 2>&1 RC_FILE=$2
RETCODE=$? SH_FILE=$3
shift 3
sh $SH_FILE "$@" > $LOG_FILE 2>&1
RET_CODE=$?
sleep 1 sleep 1
echo $RETCODE > $RC_FILE echo $RET_CODE > $RC_FILE
) & ' sh $LOG_FILE $RC_FILE $SH_FILE "$@"
exit 0 exit 0