🌴 Sync 2026-03-05 23:51:42

This commit is contained in:
github-actions[bot] committed 2026-03-05 23:51:42 +08:00
1 parent 97c049ed0a
commit 0acff03804
14253 files changed
+3893239

No files matched your search

+17
View File
@@ -0,0 +1,17 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for subconverter
LUCI_DEPENDS:=+subconverter +sub-web +luci-base
LUCI_PKGARCH:=all
PKG_VERSION:=1.0.0
PKG_RELEASE:=1
define Package/luci-app-subconverter/conffiles
/etc/config/subconverter
/etc/subconverter/
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
@@ -0,0 +1,109 @@
// SPDX-License-Identifier: Apache-2.0
'use strict';
'require form';
'require poll';
'require rpc';
'require uci';
'require validation';
'require view';
const callServiceList = rpc.declare({
object: 'service',
method: 'list',
params: ['name'],
expect: { '': {} }
});
function getServiceStatus() {
return L.resolveDefault(callServiceList('subconverter'), {}).then(function (res) {
var isRunning = false;
try {
isRunning = res['subconverter']['instances']['instance1']['running'];
} catch (e) { }
return isRunning;
});
}
function renderStatus(isRunning, port) {
var spanTemp = '<span style="color:%s"><strong>%s %s</strong></span>';
var renderHTML;
if (isRunning) {
var button = String.format('&#160;<a class="btn cbi-button" href="%s//%s/%s" target="_blank" rel="noreferrer noopener">%s</a>',
window.location.protocol, window.location.hostname, "sub-web", _('Open Web Interface'));
renderHTML = spanTemp.format('green', _('subconverter'), _('RUNNING')) + button;
} else {
renderHTML = spanTemp.format('red', _('subconverter'), _('NOT RUNNING'));
}
return renderHTML;
}
var stubValidator = {
factory: validation,
apply: function(type, value, args) {
if (value != null)
this.value = value;
return validation.types[type].apply(this, args);
},
assert: function(condition) {
return !!condition;
}
};
return view.extend({
load: function() {
return Promise.all([
uci.load('subconverter')
]);
},
render: function(data) {
let m, s, o;
var webport = uci.get(data[0], 'config', 'port') || '25500';
m = new form.Map('subconverter', _('subconverter'),
_('A modern UI for subconverter management.'));
s = m.section(form.TypedSection);
s.anonymous = true;
s.render = function () {
poll.add(function () {
return L.resolveDefault(getServiceStatus()).then(function (res) {
var view = document.getElementById('service_status');
view.innerHTML = renderStatus(res, webport);
});
});
return E('div', { class: 'cbi-section', id: 'status_bar' }, [
E('p', { id: 'service_status' }, _('Collecting data...'))
]);
}
s = m.section(form.NamedSection, 'config', 'subconverter');
o = s.option(form.Flag, 'enabled', _('Enable'));
o.default = o.disabled;
o.rmempty = false;
o = s.option(form.Value, 'listen_addr', _('Listen address'));
o.placeholder = '0.0.0.0';
o.validate = function(section_id, value) {
if (section_id && value) {
var m4 = value.match(/^([^\[\]:]+)$/),
m6 = value.match(/^\[(.+)\]$/ );
if ((!m4 && !m6) || !stubValidator.apply('ipaddr', m4 ? m4[1] : m6[1]))
return _('Expecting: %s').format(_('valid IP address'));
}
return true;
}
o = s.option(form.Value, 'port', _('Listen port'));
o.datatype = 'port';
o.placeholder = '25500';
return m.render();
}
});
@@ -0,0 +1,38 @@
'use strict';
'require form';
'require view';
'require fs';
'require ui';
// 创建视图页面
return view.extend({
render: function() {
var m, s, o;
// 创建表单映射
m = new form.Map('subconverter', _('Subconverter'),
_('Edit subconverter configuration file'));
// 创建配置节
s = m.section(form.NamedSection, 'config', 'subconverter');
// 创建文件编辑器选项
o = s.option(form.TextValue, '_pref',
_('Edit pref.example.ini'),
_('This is the content of /etc/subconverter/pref.example.ini'));
// 读取文件内容
o.rows = 25;
o.wrap = 'off';
o.cfgvalue = function(section_id) {
return fs.trimmed('/etc/subconverter/pref.example.ini');
};
// 保存文件内容
o.write = function(section_id, formvalue) {
return fs.write('/etc/subconverter/pref.example.ini', formvalue.trim() + '\n');
};
return m.render();
}
});
@@ -0,0 +1,75 @@
// SPDX-License-Identifier: Apache-2.0
'use strict';
'require dom';
'require fs';
'require poll';
'require uci';
'require view';
return view.extend({
render: function() {
/* Thanks to luci-app-aria2 */
var css = ' \
#log_textarea { \
padding: 10px; \
text-align: left; \
} \
#log_textarea pre { \
padding: .5rem; \
word-break: break-all; \
margin: 0; \
} \
.description { \
background-color: #33ccff; \
}';
var log_textarea = E('div', { 'id': 'log_textarea' },
E('img', {
'src': L.resource('icons/loading.gif'),
'alt': _('Loading...'),
'style': 'vertical-align:middle'
}, _('Collecting data...'))
);
poll.add(L.bind(function() {
return fs.read_direct('/var/log/subconverter.log', 'text')
.then(function(res) {
var log = E('pre', { 'wrap': 'pre' }, [
res.trim() || _('Log is empty.')
]);
dom.content(log_textarea, log);
}).catch(function(err) {
var log;
if (err.toString().includes('NotFoundError'))
log = E('pre', { 'wrap': 'pre' }, [
_('Log file does not exist.')
]);
else
log = E('pre', { 'wrap': 'pre' }, [
_('Unknown error: %s').format(err)
]);
dom.content(log_textarea, log);
});
}));
return E([
E('style', [ css ]),
E('div', {'class': 'cbi-map'}, [
E('div', {'class': 'cbi-section'}, [
log_textarea,
E('div', {'style': 'text-align:right'},
E('small', {}, _('Refresh every %s seconds.').format(L.env.pollinterval))
)
])
])
]);
},
handleSaveApply: null,
handleSave: null,
handleReset: null
});
@@ -0,0 +1,3 @@
config subconverter 'config'
option enabled '0'
option port '25500'
+39
View File
@@ -0,0 +1,39 @@
#!/bin/sh /etc/rc.common
START=99
USE_PROCD=1
PROG=/usr/bin/subconverter
CONF=/etc/subconverter/pref.example.ini
LOG_FILE="/tmp/log/subconverter.log"
get_config() {
config_get_bool enabled $1 enabled 0
config_get port $1 port 25500
config_get host $1 host 0.0.0.0
}
start_service() {
config_load subconverter
config_foreach get_config subconverter
[ "$enabled" -eq 0 ] && return 1
if [ -f "$CONF" ]; then
sed -i "s/^port=.*/port=$port/" "$CONF"
sed -i "s/^listen=.*/listen=$host/" "$CONF"
fi
procd_open_instance
procd_set_param command $PROG
procd_append_param command -f "$CONF"
procd_append_param command -l "$LOG_FILE"
procd_set_param stderr 1
procd_set_param stdout 1
procd_set_param respawn
procd_close_instance
}
service_triggers() {
procd_add_reload_trigger "subconverter"
}
@@ -0,0 +1,40 @@
{
"admin/services/subconverter": {
"title": "subconverter",
"order": 30,
"action": {
"type": "firstchild"
},
"depends": {
"acl": [ "luci-app-subconverter" ],
"uci": { "subconverter": true }
}
},
"admin/services/subconverter/config": {
"title": "Configuration",
"order": 10,
"action": {
"type": "view",
"path": "subconverter/config"
}
},
"admin/services/subconverter/file": {
"title": "Edit Configuration File",
"order": 20,
"action": {
"type": "view",
"path": "subconverter/file"
}
},
"admin/services/subconverter/log": {
"title": "Log",
"order": 30,
"action": {
"type": "view",
"path": "subconverter/log"
}
}
}
@@ -0,0 +1,26 @@
{
"luci-app-subconverter": {
"description": "Grant UCI access for luci-app-subconverter",
"read": {
"file": {
"/etc/subconverter/pref.example.ini": [ "read" ],
"/var/log/subconverter.log": [ "read" ]
},
"ubus": {
"service": [ "list" ],
"file": [ "read" ]
},
"uci": [ "subconverter" ]
},
"write": {
"file": {
"/etc/subconverter/pref.example.ini": [ "write" ]
},
"ubus": {
"service": [ "list" ],
"file": [ "write" ]
},
"uci": [ "subconverter" ]
}
}
}