Mirror/zapret-openwrt
1
0
Fork 0
mirror of https://github.com/remittor/zapret-openwrt.git synced 2026-01-27 12:50:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci: updater: Using 3 buttons and fix execAndRead

Browse Source
This commit is contained in:
remittor
2026-01-18 13:34:55 +03:00
parent 2d32f04071
commit 05b84183d9
2 changed files with 118 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/tools.js
View File

@@ -639,61 +639,62 @@ return baseclass.extend({
} }
let lastLen = 0; let lastLen = 0;
let retCode = -1; let retCode = -1;
let timerBusy = false; return await new Promise(async (resolve, reject) => {
let timer = setInterval(async () => { async function poll()
if (timerBusy) {
return; // skip iteration try {
timerBusy = true; let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt);
try { if (res.stdout && res.stdout.length > lastLen) {
let res = await fs.exec('/bin/cat', [ logFile ], null, rpc_opt); let log = res.stdout.slice(lastLen);
if (res.stdout && res.stdout.length > lastLen) { hide_rows.forEach(re => {
let log = res.stdout.slice(lastLen); log = log.replace(re, '');
hide_rows.forEach(re => { });
log = log.replace(re, ''); appendLog(log, '');
}); lastLen = res.stdout.length;
appendLog(log, ''); }
lastLen = res.stdout.length; if (retCode < 0) {
} let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt);
if (retCode < 0) { if (rc.code != 0) {
let rc = await fs.exec('/bin/cat', [ rcFile ], null, rpc_opt); fixLogEnd();
if (rc.code != 0) { resolve(callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'));
clearInterval(timer); return;
}
if (rc.stdout) {
retCode = parseInt(rc.stdout.trim(), 10);
}
}
if (retCode >= 0) {
fixLogEnd(); fixLogEnd();
return callback(cbarg, 545, 'ERROR: cannot read file "' + rcFile + '"'); if (retCode == 0 && res.stdout) {
resolve(callback(cbarg, 0, res.stdout));
return;
}
resolve(callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode));
return;
} }
if (rc.stdout) { setTimeout(poll, 500);
retCode = parseInt(rc.stdout.trim(), 10); } catch (e) {
let skip_err = false;
if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
skip_err = true;
}
if (e.message?.includes('XHR request timed out')) {
skip_err = true;
}
if (skip_err) {
console.warn('WARN: execAndRead: ' + e.message);
setTimeout(poll, 500);
return; // goto next poll iteration
} }
}
if (retCode >= 0) {
clearInterval(timer);
fixLogEnd(); fixLogEnd();
if (retCode == 0 && res.stdout) { let errtxt = 'ERROR: execAndRead: ' + e.message;
return callback(cbarg, 0, res.stdout); errtxt += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
} callback(cbarg, 540, errtxt);
return callback(cbarg, retCode, 'ERROR: Process failed with error ' + retCode); reject(e);
} }
} catch (e) {
let skip_err = false;
if (e.message?.includes('RPC call to file/exec failed with error -32000: Object not found')) {
skip_err = true;
}
if (e.message?.includes('XHR request timed out')) {
skip_err = true;
}
if (skip_err) {
console.warn('WARN: execAndRead: ' + e.message);
return; // goto next timer iteration
}
clearInterval(timer);
fixLogEnd();
let errtxt = 'ERROR: execAndRead: ' + e.message;
errtxt += 'ERROR: execAndRead: ' + e.stack?.trim().split('\n')[0];
return callback(cbarg, 540, errtxt);
} finally {
timerBusy = false;
} }
}, 500); poll();
});
}, },
}); });

132
luci-app-zapret2/htdocs/luci-static/resources/view/zapret2/updater.js
View File

@@ -25,35 +25,28 @@ return baseclass.extend({
this.logArea.scrollTop = this.logArea.scrollHeight; this.logArea.scrollTop = this.logArea.scrollHeight;
}, },
setBtnMode: function(enable) setBtnMode: function(check, install, cancel)
{ {
this.btn_cancel.disabled = enable ? false : true; this.btn_check.disabled = check ? false : true;
this.btn_action.disabled = (enable == 2) ? false : true; this.btn_install.disabled = install ? false : true;
this.btn_cancel.disabled = cancel ? false : true;
}, },
setStage: function(stage, btn_flag = true) setStage: function(stage, btn_flag = true)
{ {
if (stage == 0) { if (stage == 0) this.setBtnMode(1, 0, 1);
this.btn_action.textContent = _('Check for updates'); if (stage == 1) this.setBtnMode(0, 0, 1);
this.btn_action.classList.remove('hidden'); if (stage == 2) this.setBtnMode(1, 1, 1);
} else if (stage == 3) this.setBtnMode(0, 0, 0);
if (stage == 1) { if (stage == 8) this.setBtnMode(0, 0, 1);
this.btn_action.textContent = _('Update packages'); if (stage >= 9) this.setBtnMode(0, 0, 0);
this.btn_action.classList.remove('hidden');
} else {
this.btn_action.classList.add('hidden');
}
if (stage > 1 && typeof(this.btn_action) == 'object') {
this.setBtnMode(1);
}
this.stage = stage; this.stage = stage;
}, },
checkUpdates: async function() checkUpdates: async function(ev)
{ {
this._action = 'checkUpdates'; this._action = 'checkUpdates';
this.setStage(0); this.setStage(1);
this.setBtnMode(0);
this.pkg_url = null; this.pkg_url = null;
this.appendLog(_('Checking for updates...')); this.appendLog(_('Checking for updates...'));
let cmd = [ fn_update_pkg_sh, '-c' ]; // check for updates let cmd = [ fn_update_pkg_sh, '-c' ]; // check for updates
@@ -61,33 +54,38 @@ return baseclass.extend({
cmd.push('-p'); // include prereleases ZIP-files cmd.push('-p'); // include prereleases ZIP-files
} }
this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked; this.forced_reinstall = document.getElementById('cfg_forced_reinstall').checked;
let log = '/tmp/'+tools.appName+'_pkg_check.log'; return tools.execAndRead({
let callback = this.execAndReadCallback; cmd: cmd,
let wnd = this; log: '/tmp/'+tools.appName+'_pkg_check.log',
return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, callback: callback, cbarg: wnd }); logArea: this.logArea,
callback: this.execAndReadCallback,
cbarg: this, // wnd
});
}, },
installUpdates: async function() installUpdates: async function(ev)
{ {
this._action = 'installUpdates';
this.setStage(1);
this.setBtnMode(0);
if (!this.pkg_url || this.pkg_url.length < 10) { if (!this.pkg_url || this.pkg_url.length < 10) {
this.appendLog('ERROR: pkg_url = null'); this.appendLog('ERROR: pkg_url = null');
this.setStage(999); this.setStage(9);
return; return;
} }
this._action = 'installUpdates';
this.setStage(3);
this.appendLog(_('Install updates...')); this.appendLog(_('Install updates...'));
let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ]; // update packages let cmd = [ fn_update_pkg_sh, '-u', this.pkg_url ]; // update packages
if (document.getElementById('cfg_forced_reinstall').checked == true) { if (document.getElementById('cfg_forced_reinstall').checked == true) {
cmd.push('-f'); // forced reinstall if same version cmd.push('-f'); // forced reinstall if same version
} }
//this._test = 1; cmd.push('-t'); cmd.push('45'); // only for testing //this._test = 1; cmd.push('-t'); cmd.push('45'); // only for testing
let log = '/tmp/'+tools.appName+'_pkg_install.log'; return tools.execAndRead({
let hiderow = /^ \* resolve_conffiles.*(?:\r?\n|$)/gm; cmd: cmd,
let callback = this.execAndReadCallback; log: '/tmp/'+tools.appName+'_pkg_install.log',
let wnd = this; logArea: this.logArea,
return tools.execAndRead({ cmd: cmd, log: log, logArea: this.logArea, hiderow: hiderow, callback: callback, cbarg: wnd }); hiderow: /^ \* resolve_conffiles.*(?:\r?\n|$)/gm,
callback: this.execAndReadCallback,
cbarg: this, // wnd
});
}, },
execAndReadCallback: function(wnd, rc, txt = '') execAndReadCallback: function(wnd, rc, txt = '')
@@ -96,30 +94,32 @@ return baseclass.extend({
if (rc == 0 && txt) { if (rc == 0 && txt) {
let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m); let code = txt.match(/^RESULT:\s*\(([^)]+)\)\s+.+$/m);
if (wnd._action == 'checkUpdates') { if (wnd._action == 'checkUpdates') {
wnd.appendLog('=========================================================');
if (code && code[1] == 'E') {
wnd.btn_install.textContent = _('Reinstall');
} else {
wnd.btn_install.textContent = _('Install');
}
let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m); let pkg_url = txt.match(/^ZAP_PKG_URL\s*=\s*(.+)$/m);
if (code && pkg_url) { if (code && pkg_url) {
wnd.appendLog('========================================================='); if (code[1] == 'E' && !wnd.forced_reinstall) {
wnd.pkg_url = pkg_url[1]; wnd.setStage(0); // install not needed
code = code[1];
if (code == 'E' && !wnd.forced_reinstall) {
wnd.setStage(999); // install not needed
return; return;
} }
wnd.setStage(1); wnd.pkg_url = pkg_url[1];
wnd.setBtnMode(2); // enable all buttons wnd.setStage(2); // enable all buttons
return; // install allowed return; // install allowed
} }
} }
if (wnd._action == 'installUpdates') { if (wnd._action == 'installUpdates') {
if (wnd._test || (code && code[1] == '+')) { if (wnd._test || (code && code[1] == '+')) {
wnd.stage = 999; wnd.setStage(9);
wnd.btn_action.textContent = _('OK'); wnd.appendLog('Please update WEB-page (press F5)');
wnd.btn_action.disabled = false;
wnd.btn_cancel.disabled = true;
return; return;
} }
} }
} }
wnd.setStage(0);
if (rc >= 500) { if (rc >= 500) {
if (txt) { if (txt) {
wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt); wnd.appendLog(txt.startsWith('ERROR') ? txt : 'ERROR: ' + txt);
@@ -129,10 +129,7 @@ return baseclass.extend({
} else { } else {
wnd.appendLog('ERROR: Process finished with retcode = ' + rc); wnd.appendLog('ERROR: Process finished with retcode = ' + rc);
} }
wnd.setStage(999); wnd.appendLog('=========================================================');
if (wnd._action == 'checkUpdates') {
wnd.appendLog('=========================================================');
}
}, },
openUpdateDialog: function(pkg_arch) openUpdateDialog: function(pkg_arch)
@@ -166,25 +163,30 @@ return baseclass.extend({
}, _('Cancel')); }, _('Cancel'));
this.btn_cancel.onclick = ui.hideModal; this.btn_cancel.onclick = ui.hideModal;
this.btn_action = E('button', { this.btn_check = E('button', {
'id': 'btn_action', 'id': 'btn_check',
'name': 'btn_action', 'name': 'btn_check',
'class': btn_style_action, 'class': btn_style_action,
}, 'BUTTON_ACTION'); }, _('Check'));
this.btn_action.onclick = ui.createHandlerFn(this, () => { this.btn_check.onclick = ui.createHandlerFn(this, this.checkUpdates);
if (this.stage == 0) {
return this.checkUpdates(); this.btn_install = E('button', {
'id': 'btn_install',
'name': 'btn_install',
'class': btn_style_positive,
}, _('Install'));
this.btn_install.onclick = ui.createHandlerFn(this, async () => {
let res = await this.installUpdates();
if (true) {
setTimeout(() => {
this.btn_install.disabled = true;
}, 0);
} }
if (this.stage == 1) {
return this.installUpdates();
}
return ui.hideModal();
}); });
this.setStage(0); this.setStage(0);
this.setBtnMode(2);
ui.showModal(_('Package update'), [ ui.showModal(_('Check for updates and install'), [
E('div', { 'class': 'cbi-section' }, [ E('div', { 'class': 'cbi-section' }, [
exclude_prereleases, exclude_prereleases,
E('br'), E('br'), E('br'), E('br'),
@@ -194,9 +196,11 @@ return baseclass.extend({
this.logArea, this.logArea,
]), ]),
E('div', { 'class': 'right' }, [ E('div', { 'class': 'right' }, [
this.btn_cancel, this.btn_check,
' ', ' ',
this.btn_action, this.btn_install,
' ',
this.btn_cancel,
]) ])
]); ]);
} }