Mirror/luci-app-internet-detector
1
0
Fork 0
mirror of https://github.com/gSpotx2f/luci-app-internet-detector.git synced 2025-12-06 19:46:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-internet-detector fixes for 21.02.2

Browse Source
This commit is contained in:
gSpot
2022-02-19 18:50:13 +03:00
parent cb4ddc4062
commit 7a879809c7
7 changed files with 160 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -24,9 +24,9 @@ Internet-detector is an application for checking the availability of the Interne
/etc/init.d/internet-detector start /etc/init.d/internet-detector start
/etc/init.d/internet-detector enable /etc/init.d/internet-detector enable
wget --no-check-certificate -O /tmp/luci-app-internet-detector_0.5-0_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_0.5-0_all.ipk wget --no-check-certificate -O /tmp/luci-app-internet-detector_0.5-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-app-internet-detector_0.5-1_all.ipk
opkg install /tmp/luci-app-internet-detector_0.5-0_all.ipk opkg install /tmp/luci-app-internet-detector_0.5-1_all.ipk
rm /tmp/luci-app-internet-detector_0.5-0_all.ipk rm /tmp/luci-app-internet-detector_0.5-1_all.ipk
/etc/init.d/rpcd restart /etc/init.d/rpcd restart
Email notification: Email notification:
@@ -35,9 +35,9 @@ Email notification:
i18n-ru: i18n-ru:
wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_0.5-0_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_0.5-0_all.ipk wget --no-check-certificate -O /tmp/luci-i18n-internet-detector-ru_0.5-1_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/current/luci-i18n-internet-detector-ru_0.5-1_all.ipk
opkg install /tmp/luci-i18n-internet-detector-ru_0.5-0_all.ipk opkg install /tmp/luci-i18n-internet-detector-ru_0.5-1_all.ipk
rm /tmp/luci-i18n-internet-detector-ru_0.5-0_all.ipk rm /tmp/luci-i18n-internet-detector-ru_0.5-1_all.ipk
**[OpenWrt 19.07](https://github.com/gSpotx2f/luci-app-internet-detector/tree/19.07)** **[OpenWrt 19.07](https://github.com/gSpotx2f/luci-app-internet-detector/tree/19.07)**

2
internet-detector/files/etc/config/internet-detector
View File

@@ -31,7 +31,7 @@ config module 'mod_network_restart'
config module 'mod_modem_restart' config module 'mod_modem_restart'
option enabled '0' option enabled '0'
option dead_period '600' option dead_period '600'
option any_band '1' option any_band '0'
config module 'mod_email' config module 'mod_email'
option enabled '0' option enabled '0'

2
luci-app-internet-detector/Makefile
View File

@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=0.5-0 PKG_VERSION:=0.5-1
LUCI_TITLE:=LuCI support for internet-detector LUCI_TITLE:=LuCI support for internet-detector
LUCI_DEPENDS:=+internet-detector LUCI_DEPENDS:=+internet-detector
LUCI_PKGARCH:=all LUCI_PKGARCH:=all

241
luci-app-internet-detector/htdocs/luci-static/resources/view/internet-detector.js
View File

@@ -91,7 +91,6 @@ return view.extend({
inetStatusLabel : E('span', { 'class': 'label' }), inetStatusLabel : E('span', { 'class': 'label' }),
inetStatusSpinner : E('span', { 'class': 'spinning', 'style': 'margin-top:1em' }, ' '), inetStatusSpinner : E('span', { 'class': 'spinning', 'style': 'margin-top:1em' }, ' '),
serviceStatusLabel : E('em'), serviceStatusLabel : E('em'),
serviceButton : null,
initButton : null, initButton : null,
uiPollCounter : 0, uiPollCounter : 0,
uiPollState : null, uiPollState : null,
@@ -173,10 +172,10 @@ return view.extend({
}, },
}), }),
CBIBlockService: form.Value.extend({ CBIBlockInetStatus: form.Value.extend({
__name__ : 'CBI.BlockService', __name__ : 'CBI.BlockInetStatus',
__init__ : function(map, section, ctx) { __init__ : function(map, section, ctx) {
this.map = map; this.map = map;
this.section = section; this.section = section;
this.ctx = ctx; this.ctx = ctx;
@@ -185,11 +184,56 @@ return view.extend({
}, },
renderWidget: function(section_id, option_index, cfgvalue) { renderWidget: function(section_id, option_index, cfgvalue) {
this.ctx.serviceButton = E('button', { this.ctx.setInternetStatus(true);
'class': btnStyleApply,
'click': ui.createHandlerFn(this.ctx, this.ctx.serviceRestart), return E([
}, _('Restart')); E('label', { 'class': 'cbi-value-title' },
this.ctx.initButton = E('button', { _('Internet status')
),
E('div', { 'class': 'cbi-value-field' }, [
this.ctx.inetStatusLabel,
(!this.ctx.inetStatus) ? this.ctx.inetStatusSpinner : '',
]),
])
},
}),
CBIBlockServiceStatus: form.Value.extend({
__name__ : 'CBI.BlockServiceStatuse',
__init__ : function(map, section, ctx) {
this.map = map;
this.section = section;
this.ctx = ctx;
this.optional = true;
this.rmempty = true;
},
renderWidget: function(section_id, option_index, cfgvalue) {
return E([
E('label', { 'class': 'cbi-value-title' },
_('Service')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.serviceStatusLabel
),
]);
},
}),
CBIBlockInitButton: form.Value.extend({
__name__ : 'CBI.BlockInitButton',
__init__ : function(map, section, ctx) {
this.map = map;
this.section = section;
this.ctx = ctx;
this.optional = true;
this.rmempty = true;
},
renderWidget: function(section_id, option_index, cfgvalue) {
this.ctx.initButton = E('button', {
'class': (!this.ctx.initStatus) ? btnStyleDisabled : btnStyleEnabled, 'class': (!this.ctx.initStatus) ? btnStyleDisabled : btnStyleEnabled,
'click': ui.createHandlerFn(this, () => { 'click': ui.createHandlerFn(this, () => {
return this.ctx.handleServiceAction( return this.ctx.handleServiceAction(
@@ -212,56 +256,14 @@ return view.extend({
}), }),
}, (!this.ctx.initStatus) ? _('Disabled') : _('Enabled')); }, (!this.ctx.initStatus) ? _('Disabled') : _('Enabled'));
this.ctx.setInternetStatus(true); return E( [
E('label', { 'class': 'cbi-value-title' },
let serviceItems = ''; _('Run service at startup')
if(this.ctx.currentAppMode === '2') { ),
serviceItems = E([ E('div', { 'class': 'cbi-value-field' },
E('div', { 'class': 'cbi-value' }, [ this.ctx.initButton
E('label', { 'class': 'cbi-value-title' }, ),
_('Service') ]);
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.serviceStatusLabel
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Restart service')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.serviceButton
),
]),
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Run service at startup')
),
E('div', { 'class': 'cbi-value-field' },
this.ctx.initButton
),
]),
]);
};
let internetStatus = (this.ctx.currentAppMode !== '0') ?
E('div', { 'class': 'cbi-value' }, [
E('label', { 'class': 'cbi-value-title' },
_('Internet status')
),
E('div', { 'class': 'cbi-value-field' }, [
this.ctx.inetStatusLabel,
(!this.ctx.inetStatus) ? this.ctx.inetStatusSpinner : '',
]),
])
: '';
return E('div', { 'class': 'cbi-section' },
E('div', { 'class': 'cbi-section-node' }, [
internetStatus,
serviceItems,
])
);
}, },
}), }),
@@ -285,11 +287,11 @@ return view.extend({
E('div', { 'class': 'cbi-section' }, E('div', { 'class': 'cbi-section' },
E('p', {}, E('p', {},
E('textarea', { E('textarea', {
'id': 'widget.modal_content', 'id' : 'widget.modal_content',
'class': 'cbi-input-textarea', 'class': 'cbi-input-textarea',
'style': 'width:100% !important', 'style': 'width:100% !important',
'rows': 10, 'rows' : 10,
'wrap': 'off', 'wrap' : 'off',
'spellcheck': 'false', 'spellcheck': 'false',
}, },
content) content)
@@ -313,7 +315,7 @@ return view.extend({
handleSave: function(ev) { handleSave: function(ev) {
let textarea = document.getElementById('widget.modal_content'); let textarea = document.getElementById('widget.modal_content');
let value = textarea.value.trim().replace(/\r\n/g, '\n') + '\n'; let value = textarea.value.trim().replace(/\r\n/g, '\n') + '\n';
return fs.write(this.file, value).then(rc => { return fs.write(this.file, value).then(rc => {
textarea.value = value; textarea.value = value;
@@ -366,15 +368,18 @@ return view.extend({
setInternetStatus: function(initial=false) { setInternetStatus: function(initial=false) {
if(this.inetStatus === 'up') { if(this.inetStatus === 'up') {
this.inetStatusLabel.style.background = '#46a546'; this.inetStatusLabel.style.background = '#46a546';
this.inetStatusLabel.textContent = _('Connected'); this.inetStatusLabel.textContent = _('Connected');
this.inetStatusLabel.style.color = '#ffffff';
} }
else if(this.inetStatus === 'down') { else if(this.inetStatus === 'down') {
this.inetStatusLabel.textContent = _('Disconnected'); this.inetStatusLabel.textContent = _('Disconnected');
this.inetStatusLabel.style.background = '#ff6c74'; this.inetStatusLabel.style.background = '#ff4953';
this.inetStatusLabel.style.color = '#ffffff';
} }
else { else {
this.inetStatusLabel.textContent = _('Undefined'); this.inetStatusLabel.textContent = _('Undefined');
this.inetStatusLabel.style.background = '#cccccc'; this.inetStatusLabel.style.background = '#9b9b9b';
this.inetStatusLabel.style.color = '#ffffff';
}; };
if(!initial && this.inetStatusSpinner) { if(!initial && this.inetStatusSpinner) {
@@ -408,7 +413,7 @@ return view.extend({
}, },
uiPoll: function() { uiPoll: function() {
let curInetStatus = null; let curInetStatus = null;
this.uiPollCounter = ++this.uiPollCounter; this.uiPollCounter = ++this.uiPollCounter;
if((this.uiPollState === 0 && this.uiPollCounter % this.uiCheckIntervalUp) || if((this.uiPollState === 0 && this.uiPollCounter % this.uiCheckIntervalUp) ||
@@ -473,12 +478,27 @@ return view.extend({
/* Service widget */ /* Service widget */
s = m.section(form.NamedSection, 'config', 'main'); s = m.section(form.NamedSection, 'config', 'main');
o = s.option(this.CBIBlockService, this); o = s.option(this.CBIBlockInetStatus, this);
if(this.currentAppMode === '2') {
o = s.option(this.CBIBlockServiceStatus, this);
// restart button
o = s.option(form.Button,
'_restart_btn', _('Restart service')
);
o.onclick = () => this.serviceRestart();
o.inputtitle = _('Restart');
o.inputstyle = btnStyleApply;
// init button
o = s.option(this.CBIBlockInitButton, this);
};
/* Main settings */ /* Main settings */
s = m.section(form.NamedSection, 'config', 'main'); s = m.section(form.NamedSection, 'config', 'main');
s.tab('main_configuration', _('Main settings')); s.tab('main_configuration', _('Main settings'));
@@ -653,7 +673,7 @@ return view.extend({
/* Modules */ /* Modules */
s = m.section(form.NamedSection, 'config', 'main', s = m.section(form.NamedSection, 'mod_led_control', 'module',
_('Service modules'), _('Service modules'),
_('Performing actions when connecting and disconnecting the Internet (available in the "Service" mode).')); _('Performing actions when connecting and disconnecting the Internet (available in the "Service" mode).'));
@@ -661,27 +681,27 @@ return view.extend({
s.tab('led_control', _('LED control')); s.tab('led_control', _('LED control'));
o = s.taboption('led_control', form.SectionValue, 'mod_led_control', form.NamedSection, o = s.taboption('led_control', form.DummyValue, '_dummy');
'mod_led_control', 'mod_led_control', o.rawhtml = true;
_('<abbr title="Light Emitting Diode">LED</abbr> control'), o.default = '<div class="cbi-section-descr">' +
_('<abbr title="Light Emitting Diode">LED</abbr> is on when Internet is available.')) _('<abbr title="Light Emitting Diode">LED</abbr> is on when Internet is available.') +
ss = o.subsection; '</div>';
if(this.leds.length > 0) { if(this.leds.length > 0) {
// enabled // enabled
o = ss.option(form.Flag, 'enabled', o = s.taboption('led_control', form.Flag, 'enabled',
_('Enable')); _('Enable'));
o.rmempty = false; o.rmempty = false;
// led_name // led_name
o = ss.option(form.ListValue, 'led_name', o = s.taboption('led_control', form.ListValue, 'led_name',
_('<abbr title="Light Emitting Diode">LED</abbr> Name')); _('<abbr title="Light Emitting Diode">LED</abbr> Name'));
o.depends({ enabled: '1' }); o.depends({ enabled: '1' });
this.leds.sort((a, b) => a.name > b.name); this.leds.sort((a, b) => a.name > b.name);
this.leds.forEach(e => o.value(e.name)); this.leds.forEach(e => o.value(e.name));
} else { } else {
o = ss.option(form.DummyValue, '_dummy'); o = s.taboption('led_control', form.DummyValue, '_dummy');
o.rawhtml = true; o.rawhtml = true;
o.default = '<label class="cbi-value-title"></label><div class="cbi-value-field"><em>' + o.default = '<label class="cbi-value-title"></label><div class="cbi-value-field"><em>' +
_('No <abbr title="Light Emitting Diode">LED</abbr>s available...') + _('No <abbr title="Light Emitting Diode">LED</abbr>s available...') +
@@ -692,10 +712,15 @@ return view.extend({
s.tab('reboot_device', _('Reboot device')); s.tab('reboot_device', _('Reboot device'));
o = s.taboption('reboot_device', form.DummyValue, '_dummy');
o.rawhtml = true;
o.default = '<div class="cbi-section-descr">' +
_('Device will be rebooted when the Internet is disconnected.') +
'</div>';
o = s.taboption('reboot_device', form.SectionValue, 'mod_reboot', form.NamedSection, o = s.taboption('reboot_device', form.SectionValue, 'mod_reboot', form.NamedSection,
'mod_reboot', 'mod_reboot', 'mod_reboot', 'mod_reboot'
_('Reboot device'), );
_('Device will be rebooted when the Internet is disconnected.'));
ss = o.subsection; ss = o.subsection;
// enabled // enabled
@@ -727,10 +752,15 @@ return view.extend({
s.tab('restart_network', _('Restart network')); s.tab('restart_network', _('Restart network'));
o = s.taboption('restart_network', form.DummyValue, '_dummy');
o.rawhtml = true;
o.default = '<div class="cbi-section-descr">' +
_('Network will be restarted when the Internet is disconnected.') +
'</div>';
o = s.taboption('restart_network', form.SectionValue, 'mod_network_restart', form.NamedSection, o = s.taboption('restart_network', form.SectionValue, 'mod_network_restart', form.NamedSection,
'mod_network_restart', 'mod_network_restart', 'mod_network_restart', 'mod_network_restart'
_('Restart network'), );
_('Network will be restarted when the Internet is disconnected.'));
ss = o.subsection; ss = o.subsection;
// enabled // enabled
@@ -782,10 +812,15 @@ return view.extend({
s.tab('restart_modem', _('Restart modem')); s.tab('restart_modem', _('Restart modem'));
o = s.taboption('restart_modem', form.DummyValue, '_dummy');
o.rawhtml = true;
o.default = '<div class="cbi-section-descr">' +
_('Modem will be restarted when the Internet is disconnected.') +
'</div>';
o = s.taboption('restart_modem', form.SectionValue, 'mod_modem_restart', form.NamedSection, o = s.taboption('restart_modem', form.SectionValue, 'mod_modem_restart', form.NamedSection,
'mod_modem_restart', 'mod_modem_restart', 'mod_modem_restart', 'mod_modem_restart'
_('Restart modem'), );
_('Modem will be restarted when the Internet is disconnected.'));
ss = o.subsection; ss = o.subsection;
if(this.mm) { if(this.mm) {
@@ -830,10 +865,15 @@ return view.extend({
s.tab('email', _('Email notification')); s.tab('email', _('Email notification'));
o = s.taboption('email', form.DummyValue, '_dummy');
o.rawhtml = true;
o.default = '<div class="cbi-section-descr">' +
_('An email will be sent when the internet connection is restored after being disconnected.') +
'</div>';
o = s.taboption('email', form.SectionValue, 'mod_email', form.NamedSection, o = s.taboption('email', form.SectionValue, 'mod_email', form.NamedSection,
'mod_email', 'mod_email', 'mod_email', 'mod_email'
_('Email notification'), );
_('An email will be sent when the internet connection is restored after being disconnected.'));
ss = o.subsection; ss = o.subsection;
if(this.mta) { if(this.mta) {
@@ -923,10 +963,15 @@ return view.extend({
s.tab('user_scripts', _('User scripts')); s.tab('user_scripts', _('User scripts'));
o = s.taboption('user_scripts', form.DummyValue, '_dummy');
o.rawhtml = true;
o.default = '<div class="cbi-section-descr">' +
_('Shell commands to run when connected or disconnected from the Internet.') +
'</div>';
o = s.taboption('user_scripts', form.SectionValue, 'mod_user_scripts', form.NamedSection, o = s.taboption('user_scripts', form.SectionValue, 'mod_user_scripts', form.NamedSection,
'mod_user_scripts', 'mod_user_scripts', 'mod_user_scripts', 'mod_user_scripts'
_('User scripts'), );
_('Shell commands to run when connected or disconnected from the Internet.'));
ss = o.subsection; ss = o.subsection;
// enabled // enabled
@@ -974,9 +1019,9 @@ return view.extend({
); );
}; };
let map_promise = m.render(); let mapPromise = m.render();
map_promise.then(node => node.classList.add('fade-in')); mapPromise.then(node => node.classList.add('fade-in'));
return map_promise; return mapPromise;
}, },
handleSaveApply: function(ev, mode) { handleSaveApply: function(ev, mode) {

16
luci-app-internet-detector/htdocs/luci-static/resources/view/status/include/00_internet.js
View File

@@ -37,7 +37,6 @@ return baseclass.extend({
return; return;
}; };
window.internetDetectorCounter = 0;
return L.resolveDefault(fs.exec(this.execPath, [ 'inet-status' ]), null); return L.resolveDefault(fs.exec(this.execPath, [ 'inet-status' ]), null);
} }
else { else {
@@ -66,16 +65,19 @@ return baseclass.extend({
let internetStatus = E('span', { 'class': 'label' }); let internetStatus = E('span', { 'class': 'label' });
if(window.internetDetectorState === 0) { if(window.internetDetectorState === 0) {
internetStatus.textContent = _('Connected'); internetStatus.textContent = _('Connected');
internetStatus.style.background = '#46a546'; internetStatus.style.background = '#46a546';
internetStatus.style.color = '#ffffff';
} }
else if(window.internetDetectorState === 1) { else if(window.internetDetectorState === 1) {
internetStatus.textContent = _('Disconnected'); internetStatus.textContent = _('Disconnected');
internetStatus.style.background = '#ff6c74'; internetStatus.style.background = '#ff4953';
internetStatus.style.color = '#ffffff';
} }
else { else {
internetStatus.textContent = _('Undefined'); internetStatus.textContent = _('Undefined');
internetStatus.background = '#cccccc'; internetStatus.style.background = '#9b9b9b';
internetStatus.style.color = '#ffffff';
}; };
return E('div', { return E('div', {

BIN
screenshots/01.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 232 KiB

BIN
screenshots/02.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 34 KiB