mirror of
https://github.com/kenzok8/small-package
synced 2025-04-04 03:01:27 +08:00
update 2025-03-09 00:20:30
This commit is contained in:
kenzok8
parent
80c713d0c3
commit
1be406647e
@ -261,6 +261,102 @@ const vless_flow = [
|
||||
];
|
||||
|
||||
/* Prototype */
|
||||
const CBIGridSection = form.GridSection.extend({
|
||||
modaltitle(/* ... */) {
|
||||
return loadModalTitle.call(this, ...this.hm_modaltitle || [null,null], ...arguments)
|
||||
},
|
||||
|
||||
sectiontitle(/* ... */) {
|
||||
return loadDefaultLabel.call(this, ...arguments);
|
||||
},
|
||||
|
||||
renderSectionAdd(extra_class) {
|
||||
const prefmt = this.hm_prefmt;
|
||||
const LC = this.hm_lowcase_only;
|
||||
|
||||
let el = form.GridSection.prototype.renderSectionAdd.call(this, extra_class),
|
||||
nameEl = el.querySelector('.cbi-section-create-name');
|
||||
|
||||
ui.addValidator(nameEl, 'uciname', true, (v) => {
|
||||
let button = el.querySelector('.cbi-section-create > .cbi-button-add');
|
||||
const prefix = prefmt?.prefix ? prefmt.prefix : '';
|
||||
const suffix = prefmt?.suffix ? prefmt.suffix : '';
|
||||
|
||||
if (!v) {
|
||||
button.disabled = true;
|
||||
return true;
|
||||
} else if (LC && (v !== v.toLowerCase())) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('Lowercase only'));
|
||||
} else if (uci.get(this.config, v)) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('unique UCI identifier'));
|
||||
} else if (uci.get(this.config, prefix + v + suffix)) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('unique identifier'));
|
||||
} else {
|
||||
button.disabled = null;
|
||||
return true;
|
||||
}
|
||||
}, 'blur', 'keyup');
|
||||
|
||||
return el;
|
||||
},
|
||||
|
||||
handleAdd(ev, name) {
|
||||
const prefmt = this.hm_prefmt;
|
||||
const prefix = prefmt?.prefix ? prefmt.prefix : '';
|
||||
const suffix = prefmt?.suffix ? prefmt.suffix : '';
|
||||
|
||||
return form.GridSection.prototype.handleAdd.call(this, ev, prefix + name + suffix);
|
||||
}
|
||||
});
|
||||
|
||||
const CBIhandleImport = baseclass.extend(/** @lends hm.handleImport.prototype */ {
|
||||
__init__(map, section, title, description) {
|
||||
this.map = map;
|
||||
this.section = section;
|
||||
this.title = title ?? '';
|
||||
this.description = description ?? '';
|
||||
this.placeholder = '';
|
||||
|
||||
this.handleFn = this.handleFn.bind(this.section);
|
||||
},
|
||||
|
||||
handleFn(textarea, save) {
|
||||
if (save) {
|
||||
return uci.save()
|
||||
.then(L.bind(this.map.load, this.map))
|
||||
.then(L.bind(this.map.reset, this.map))
|
||||
.then(L.ui.hideModal)
|
||||
.catch(() => {});
|
||||
} else
|
||||
return ui.hideModal();
|
||||
},
|
||||
|
||||
render() {
|
||||
const textarea = new ui.Textarea('', {
|
||||
placeholder: this.placeholder
|
||||
});
|
||||
|
||||
ui.showModal(this.title, [
|
||||
E('p', this.description),
|
||||
textarea.render(),
|
||||
E('div', { class: 'right' }, [
|
||||
E('button', {
|
||||
class: 'btn',
|
||||
click: ui.hideModal
|
||||
}, [ _('Cancel') ]),
|
||||
' ',
|
||||
E('button', {
|
||||
class: 'btn cbi-button-action',
|
||||
click: ui.createHandlerFn(this, 'handleFn', textarea)
|
||||
}, [ _('Import') ])
|
||||
])
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
const CBIDynamicList = form.DynamicList.extend({
|
||||
__name__: 'CBI.DynamicList',
|
||||
|
||||
@ -294,9 +390,9 @@ const CBIGenValue = form.Value.extend({
|
||||
node.classList.add('control-group');
|
||||
|
||||
(node.querySelector('.control-group') || node).appendChild(E('button', {
|
||||
'class': 'cbi-button cbi-button-add',
|
||||
'title': _('Generate'),
|
||||
'click': ui.createHandlerFn(this, handleGenKey, this.hm_asymmetric || this.option)
|
||||
class: 'cbi-button cbi-button-add',
|
||||
title: _('Generate'),
|
||||
click: ui.createHandlerFn(this, handleGenKey, this.hm_asymmetric || this.option)
|
||||
}, [ _('Generate') ]));
|
||||
|
||||
return node;
|
||||
@ -344,12 +440,12 @@ const CBITextValue = form.TextValue.extend({
|
||||
const UIDynamicList = ui.DynamicList.extend({
|
||||
addItem(dl, value, text, flash) {
|
||||
if (this.options.allowduplicates) {
|
||||
const new_item = E('div', { 'class': flash ? 'item flash' : 'item', 'tabindex': 0, 'draggable': !less_24_10 }, [
|
||||
const new_item = E('div', { class: flash ? 'item flash' : 'item', tabindex: 0, draggable: !less_24_10 }, [
|
||||
E('span', {}, [ text ?? value ]),
|
||||
E('input', {
|
||||
'type': 'hidden',
|
||||
'name': this.options.name,
|
||||
'value': value })]);
|
||||
type: 'hidden',
|
||||
name: this.options.name,
|
||||
value: value })]);
|
||||
|
||||
const ai = dl.querySelector('.add-item');
|
||||
ai.parentNode.insertBefore(new_item, ai);
|
||||
@ -660,15 +756,15 @@ function renderStatus(ElId, isRunning, instance, noGlobal) {
|
||||
|
||||
return E([
|
||||
E('button', {
|
||||
'class': 'cbi-button cbi-button-apply' + (noGlobal ? ' hidden' : ''),
|
||||
'click': ui.createHandlerFn(this, handleReload, instance)
|
||||
class: 'cbi-button cbi-button-apply' + (noGlobal ? ' hidden' : ''),
|
||||
click: ui.createHandlerFn(this, handleReload, instance)
|
||||
}, [ _('Reload') ]),
|
||||
updateStatus(E('span', { id: ElId, style: 'border: unset; font-style: italic; font-weight: bold' }), isRunning ? true : false),
|
||||
E('a', {
|
||||
'class': 'cbi-button cbi-button-apply %s'.format(visible ? '' : 'hidden'),
|
||||
'href': visible ? getDashURL(isRunning) : '',
|
||||
'target': '_blank',
|
||||
'rel': 'noreferrer noopener'
|
||||
class: 'cbi-button cbi-button-apply %s'.format(visible ? '' : 'hidden'),
|
||||
href: visible ? getDashURL(isRunning) : '',
|
||||
target: '_blank',
|
||||
rel: 'noreferrer noopener'
|
||||
}, [ _('Open Dashboard') ])
|
||||
]);
|
||||
}
|
||||
@ -728,42 +824,6 @@ function renderResDownload(section_id) {
|
||||
return El;
|
||||
}
|
||||
|
||||
function renderSectionAdd(prefmt, LC, extra_class) {
|
||||
let el = form.GridSection.prototype.renderSectionAdd.apply(this, [ extra_class ]),
|
||||
nameEl = el.querySelector('.cbi-section-create-name');
|
||||
ui.addValidator(nameEl, 'uciname', true, (v) => {
|
||||
let button = el.querySelector('.cbi-section-create > .cbi-button-add');
|
||||
const prefix = prefmt?.prefix ? prefmt.prefix : '';
|
||||
const suffix = prefmt?.suffix ? prefmt.suffix : '';
|
||||
|
||||
if (!v) {
|
||||
button.disabled = true;
|
||||
return true;
|
||||
} else if (LC && (v !== v.toLowerCase())) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('Lowercase only'));
|
||||
} else if (uci.get(this.config, v)) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('unique UCI identifier'));
|
||||
} else if (uci.get(this.config, prefix + v + suffix)) {
|
||||
button.disabled = true;
|
||||
return _('Expecting: %s').format(_('unique identifier'));
|
||||
} else {
|
||||
button.disabled = null;
|
||||
return true;
|
||||
}
|
||||
}, 'blur', 'keyup');
|
||||
|
||||
return el;
|
||||
}
|
||||
|
||||
function handleAdd(prefmt, ev, name) {
|
||||
const prefix = prefmt?.prefix ? prefmt.prefix : '';
|
||||
const suffix = prefmt?.suffix ? prefmt.suffix : '';
|
||||
|
||||
return form.GridSection.prototype.handleAdd.apply(this, [ ev, prefix + name + suffix ]);
|
||||
}
|
||||
|
||||
function handleGenKey(option) {
|
||||
const section_id = this.section.section;
|
||||
const type = this.section.getOption('type').formvalue(section_id);
|
||||
@ -1195,6 +1255,8 @@ return baseclass.extend({
|
||||
vless_flow,
|
||||
|
||||
/* Prototype */
|
||||
GridSection: CBIGridSection,
|
||||
handleImport: CBIhandleImport,
|
||||
DynamicList: CBIDynamicList,
|
||||
GenValue: CBIGenValue,
|
||||
ListValue: CBIListValue,
|
||||
@ -1222,8 +1284,6 @@ return baseclass.extend({
|
||||
updateStatus,
|
||||
getDashURL,
|
||||
renderResDownload,
|
||||
renderSectionAdd,
|
||||
handleAdd,
|
||||
handleGenKey,
|
||||
handleReload,
|
||||
handleRemoveIdles,
|
||||
|
||||
@ -608,17 +608,15 @@ return view.extend({
|
||||
o.default = o.disabled;
|
||||
|
||||
/* Proxy Group */
|
||||
o = s.taboption('group', form.SectionValue, '_group', form.GridSection, 'proxy_group', null);
|
||||
o = s.taboption('group', form.SectionValue, '_group', hm.GridSection, 'proxy_group', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': 'group_', 'suffix': '' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Proxy Group'), _('Add a proxy group'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, true);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('Proxy Group'), _('Add a proxy group') ];
|
||||
ss.hm_prefmt = { 'prefix': 'group_', 'suffix': '' };
|
||||
ss.hm_lowcase_only = true;
|
||||
|
||||
ss.tab('field_general', _('General fields'));
|
||||
ss.tab('field_override', _('Override fields'));
|
||||
@ -816,17 +814,15 @@ return view.extend({
|
||||
s.tab('rules', _('Routing rule'));
|
||||
|
||||
/* Routing rules */
|
||||
o = s.taboption('rules', form.SectionValue, '_rules', form.GridSection, 'rules', null);
|
||||
o = s.taboption('rules', form.SectionValue, '_rules', hm.GridSection, 'rules', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': '', 'suffix': '_host' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Routing rule'), _('Add a routing rule'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, false);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('Routing rule'), _('Add a routing rule') ];
|
||||
ss.hm_prefmt = { 'prefix': '', 'suffix': '_host' };
|
||||
ss.hm_lowcase_only = false;
|
||||
|
||||
so = ss.option(form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hm.loadDefaultLabel, so);
|
||||
@ -868,17 +864,15 @@ return view.extend({
|
||||
s.tab('subrules', _('Sub rule'));
|
||||
|
||||
/* Sub rules */
|
||||
o = s.taboption('subrules', form.SectionValue, '_subrules', form.GridSection, 'subrules', null);
|
||||
o = s.taboption('subrules', form.SectionValue, '_subrules', hm.GridSection, 'subrules', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': '', 'suffix': '_subhost' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Sub rule'), _('Add a sub rule'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, false);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('Sub rule'), _('Add a sub rule') ];
|
||||
ss.hm_prefmt = { 'prefix': '', 'suffix': '_subhost' };
|
||||
ss.hm_lowcase_only = false;
|
||||
|
||||
so = ss.option(form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hm.loadDefaultLabel, so);
|
||||
@ -955,17 +949,15 @@ return view.extend({
|
||||
s.tab('dns_server', _('DNS server'));
|
||||
|
||||
/* DNS server */
|
||||
o = s.taboption('dns_server', form.SectionValue, '_dns_server', form.GridSection, 'dns_server', null);
|
||||
o = s.taboption('dns_server', form.SectionValue, '_dns_server', hm.GridSection, 'dns_server', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': 'dns_', 'suffix': '' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('DNS server'), _('Add a DNS server'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, true);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('DNS server'), _('Add a DNS server') ];
|
||||
ss.hm_prefmt = { 'prefix': 'dns_', 'suffix': '' };
|
||||
ss.hm_lowcase_only = true;
|
||||
|
||||
so = ss.option(form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hm.loadDefaultLabel, so);
|
||||
@ -1096,17 +1088,15 @@ return view.extend({
|
||||
s.tab('dns_policy', _('DNS policy'));
|
||||
|
||||
/* DNS policy */
|
||||
o = s.taboption('dns_policy', form.SectionValue, '_dns_policy', form.GridSection, 'dns_policy', null);
|
||||
o = s.taboption('dns_policy', form.SectionValue, '_dns_policy', hm.GridSection, 'dns_policy', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': '', 'suffix': '_domain' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('DNS policy'), _('Add a DNS policy'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, false);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('DNS policy'), _('Add a DNS policy') ];
|
||||
ss.hm_prefmt = { 'prefix': '', 'suffix': '_domain' };
|
||||
ss.hm_lowcase_only = false;
|
||||
|
||||
so = ss.option(form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hm.loadDefaultLabel, so);
|
||||
|
||||
@ -25,17 +25,15 @@ return view.extend({
|
||||
s.tab('node', _('Proxy Node'));
|
||||
|
||||
/* Proxy Node */
|
||||
o = s.taboption('node', form.SectionValue, '_node', form.GridSection, 'node', null);
|
||||
o = s.taboption('node', form.SectionValue, '_node', hm.GridSection, 'node', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': 'node_', 'suffix': '' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Node'), _('Add a Node'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, true);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('Node'), _('Add a Node') ];
|
||||
ss.hm_prefmt = { 'prefix': 'node_', 'suffix': '' };
|
||||
ss.hm_lowcase_only = true;
|
||||
|
||||
ss.tab('field_general', _('General fields'));
|
||||
ss.tab('field_tls', _('TLS fields'));
|
||||
@ -807,18 +805,18 @@ return view.extend({
|
||||
s.tab('provider', _('Provider'));
|
||||
|
||||
/* Provider */
|
||||
o = s.taboption('provider', form.SectionValue, '_provider', form.GridSection, 'provider', null);
|
||||
o = s.taboption('provider', form.SectionValue, '_provider', hm.GridSection, 'provider', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': 'sub_', 'suffix': '' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Provider'), _('Add a provider'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.hm_modaltitle = [ _('Provider'), _('Add a provider') ];
|
||||
ss.hm_prefmt = { 'prefix': 'sub_', 'suffix': '' };
|
||||
ss.hm_lowcase_only = false;
|
||||
/* Remove idle files start */
|
||||
ss.renderSectionAdd = function(/* ... */) {
|
||||
let el = hm.renderSectionAdd.apply(this, [prefmt, false].concat(Array.prototype.slice.call(arguments)));
|
||||
let el = hm.GridSection.prototype.renderSectionAdd.apply(this, arguments);
|
||||
|
||||
el.appendChild(E('button', {
|
||||
'class': 'cbi-button cbi-button-add',
|
||||
@ -828,7 +826,6 @@ return view.extend({
|
||||
|
||||
return el;
|
||||
}
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
/* Remove idle files end */
|
||||
|
||||
ss.tab('field_general', _('General fields'));
|
||||
@ -1075,17 +1072,15 @@ return view.extend({
|
||||
s.tab('dialer_proxy', _('Proxy chain'));
|
||||
|
||||
/* Proxy chain */
|
||||
o = s.taboption('dialer_proxy', form.SectionValue, '_dialer_proxy', form.GridSection, 'dialer_proxy', null);
|
||||
o = s.taboption('dialer_proxy', form.SectionValue, '_dialer_proxy', hm.GridSection, 'dialer_proxy', null);
|
||||
ss = o.subsection;
|
||||
var prefmt = { 'prefix': 'chain_', 'suffix': '' };
|
||||
ss.addremove = true;
|
||||
ss.rowcolors = true;
|
||||
ss.sortable = true;
|
||||
ss.nodescriptions = true;
|
||||
ss.modaltitle = L.bind(hm.loadModalTitle, ss, _('Proxy chain'), _('Add a proxy chain'));
|
||||
ss.sectiontitle = L.bind(hm.loadDefaultLabel, ss);
|
||||
ss.renderSectionAdd = L.bind(hm.renderSectionAdd, ss, prefmt, true);
|
||||
ss.handleAdd = L.bind(hm.handleAdd, ss, prefmt);
|
||||
ss.hm_modaltitle = [ _('Proxy chain'), _('Add a proxy chain') ];
|
||||
ss.hm_prefmt = { 'prefix': 'chain_', 'suffix': '' };
|
||||
ss.hm_lowcase_only = true;
|
||||
|
||||
so = ss.option(form.Value, 'label', _('Label'));
|
||||
so.load = L.bind(hm.loadDefaultLabel, so);
|
||||
|
||||
@ -103,76 +103,58 @@ return view.extend({
|
||||
|
||||
/* Rule set START */
|
||||
/* Rule set settings */
|
||||
var prefmt = { 'prefix': 'rule_', 'suffix': '' };
|
||||
s = m.section(form.GridSection, 'ruleset');
|
||||
s = m.section(hm.GridSection, 'ruleset');
|
||||
s.addremove = true;
|
||||
s.rowcolors = true;
|
||||
s.sortable = true;
|
||||
s.nodescriptions = true;
|
||||
s.modaltitle = L.bind(hm.loadModalTitle, s, _('Rule set'), _('Add a rule set'));
|
||||
s.sectiontitle = L.bind(hm.loadDefaultLabel, s);
|
||||
s.hm_modaltitle = [ _('Rule set'), _('Add a rule set') ];
|
||||
s.hm_prefmt = { 'prefix': 'rule_', 'suffix': '' };
|
||||
s.hm_lowcase_only = false;
|
||||
/* Import rule-set links and Remove idle files start */
|
||||
s.handleLinkImport = function() {
|
||||
let textarea = new ui.Textarea('', {
|
||||
'placeholder': 'http(s)://github.com/ACL4SSR/ACL4SSR/raw/refs/heads/master/Clash/Providers/BanAD.yaml?fmt=yaml&behav=classical&rawq=good%3Djob#BanAD\n' +
|
||||
'file:///example.txt?fmt=text&behav=domain&fill=LmNuCg#CN%20TLD\n' +
|
||||
'inline://LSAnLmhrJwoK?behav=domain#HK%20TLD\n'
|
||||
});
|
||||
ui.showModal(_('Import rule-set links'), [
|
||||
E('p', _('Supports rule-set links of type: <code>%s</code> and format: <code>%s</code>.</br>')
|
||||
.format('file, http, inline', 'text, yaml, mrs') +
|
||||
_('Please refer to <a href="%s" target="_blank">%s</a> for link format standards.')
|
||||
.format(hm.rulesetdoc, _('Ruleset-URI-Scheme'))),
|
||||
textarea.render(),
|
||||
E('div', { class: 'right' }, [
|
||||
E('button', {
|
||||
class: 'btn',
|
||||
click: ui.hideModal
|
||||
}, [ _('Cancel') ]),
|
||||
' ',
|
||||
E('button', {
|
||||
class: 'btn cbi-button-action',
|
||||
click: ui.createHandlerFn(this, function() {
|
||||
let input_links = textarea.getValue().trim().split('\n');
|
||||
if (input_links && input_links[0]) {
|
||||
/* Remove duplicate lines */
|
||||
input_links = input_links.reduce((pre, cur) =>
|
||||
(!pre.includes(cur) && pre.push(cur), pre), []);
|
||||
const o = new hm.handleImport(this.map, this, _('Import rule-set links'),
|
||||
_('Supports rule-set links of type: <code>%s</code> and format: <code>%s</code>.</br>')
|
||||
.format('file, http, inline', 'text, yaml, mrs') +
|
||||
_('Please refer to <a href="%s" target="_blank">%s</a> for link format standards.')
|
||||
.format(hm.rulesetdoc, _('Ruleset-URI-Scheme')));
|
||||
o.placeholder = 'http(s)://github.com/ACL4SSR/ACL4SSR/raw/refs/heads/master/Clash/Providers/BanAD.yaml?fmt=yaml&behav=classical&rawq=good%3Djob#BanAD\n' +
|
||||
'file:///example.txt?fmt=text&behav=domain&fill=LmNuCg#CN%20TLD\n' +
|
||||
'inline://LSAnLmhrJwoK?behav=domain#HK%20TLD\n';
|
||||
o.handleFn = L.bind(function(textarea, save) {
|
||||
let input_links = textarea.getValue().trim().split('\n');
|
||||
let imported_count = 0;
|
||||
if (input_links && input_links[0]) {
|
||||
/* Remove duplicate lines */
|
||||
input_links = input_links.reduce((pre, cur) =>
|
||||
(!pre.includes(cur) && pre.push(cur), pre), []);
|
||||
|
||||
let imported_ruleset = 0;
|
||||
input_links.forEach((l) => {
|
||||
let config = parseRulesetLink(l);
|
||||
if (config) {
|
||||
let sid = uci.add(data[0], 'ruleset', config.id);
|
||||
config.id = null;
|
||||
Object.keys(config).forEach((k) => {
|
||||
uci.set(data[0], sid, k, config[k] || '');
|
||||
});
|
||||
imported_ruleset++;
|
||||
}
|
||||
});
|
||||
input_links.forEach((l) => {
|
||||
let config = parseRulesetLink(l);
|
||||
if (config) {
|
||||
let sid = uci.add(data[0], 'ruleset', config.id);
|
||||
config.id = null;
|
||||
Object.keys(config).forEach((k) => {
|
||||
uci.set(data[0], sid, k, config[k] || '');
|
||||
});
|
||||
imported_count++;
|
||||
}
|
||||
});
|
||||
|
||||
if (imported_ruleset === 0)
|
||||
ui.addNotification(null, E('p', _('No valid rule-set link found.')));
|
||||
else
|
||||
ui.addNotification(null, E('p', _('Successfully imported %s rule-set of total %s.').format(
|
||||
imported_ruleset, input_links.length)));
|
||||
if (imported_count === 0)
|
||||
ui.addNotification(null, E('p', _('No valid rule-set link found.')));
|
||||
else
|
||||
ui.addNotification(null, E('p', _('Successfully imported %s rule-set of total %s.').format(
|
||||
imported_count, input_links.length)));
|
||||
}
|
||||
|
||||
return uci.save()
|
||||
.then(L.bind(this.map.load, this.map))
|
||||
.then(L.bind(this.map.reset, this.map))
|
||||
.then(L.ui.hideModal)
|
||||
.catch(() => {});
|
||||
} else {
|
||||
return ui.hideModal();
|
||||
}
|
||||
})
|
||||
}, [ _('Import') ])
|
||||
])
|
||||
])
|
||||
return hm.handleImport.prototype.handleFn.call(this, textarea, imported_count);
|
||||
}, this);
|
||||
|
||||
return o.render();
|
||||
}
|
||||
s.renderSectionAdd = function(/* ... */) {
|
||||
let el = hm.renderSectionAdd.apply(this, [prefmt, false].concat(Array.prototype.slice.call(arguments)));
|
||||
let el = hm.GridSection.prototype.renderSectionAdd.apply(this, arguments);
|
||||
|
||||
el.appendChild(E('button', {
|
||||
'class': 'cbi-button cbi-button-add',
|
||||
@ -188,7 +170,6 @@ return view.extend({
|
||||
|
||||
return el;
|
||||
}
|
||||
s.handleAdd = L.bind(hm.handleAdd, s, prefmt);
|
||||
/* Import rule-set links and Remove idle files end */
|
||||
|
||||
o = s.option(form.Value, 'label', _('Label'));
|
||||
|
||||
@ -54,16 +54,14 @@ return view.extend({
|
||||
o.default = o.disabled;
|
||||
|
||||
/* Server settings START */
|
||||
s = m.section(form.GridSection, 'server', null);
|
||||
var prefmt = { 'prefix': 'server_', 'suffix': '' };
|
||||
s = m.section(hm.GridSection, 'server', null);
|
||||
s.addremove = true;
|
||||
s.rowcolors = true;
|
||||
s.sortable = true;
|
||||
s.nodescriptions = true;
|
||||
s.modaltitle = L.bind(hm.loadModalTitle, s, _('Server'), _('Add a server'));
|
||||
s.sectiontitle = L.bind(hm.loadDefaultLabel, s);
|
||||
s.renderSectionAdd = L.bind(hm.renderSectionAdd, s, prefmt, false);
|
||||
s.handleAdd = L.bind(hm.handleAdd, s, prefmt);
|
||||
s.hm_modaltitle = [ _('Server'), _('Add a server') ];
|
||||
s.hm_prefmt = { 'prefix': 'server_', 'suffix': '' };
|
||||
s.hm_lowcase_only = false;
|
||||
|
||||
s.tab('field_general', _('General fields'));
|
||||
s.tab('field_tls', _('TLS fields'));
|
||||
|
||||
@ -6,12 +6,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-passwall
|
||||
PKG_VERSION:=25.3.2
|
||||
PKG_VERSION:=25.3.9
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Geoview \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy \
|
||||
@ -35,7 +36,7 @@ LUCI_PKGARCH:=all
|
||||
LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
|
||||
+chinadns-ng +dns2socks +dnsmasq-full +ip-full \
|
||||
+libuci-lua +lua +luci-compat +luci-lib-jsonc \
|
||||
+microsocks +resolveip +tcping +geoview
|
||||
+microsocks +resolveip +tcping
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
menu "Configuration"
|
||||
@ -63,6 +64,11 @@ config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy
|
||||
select PACKAGE_kmod-nft-nat
|
||||
default y if PACKAGE_firewall4
|
||||
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_Geoview
|
||||
bool "Include Geoview"
|
||||
select PACKAGE_geoview
|
||||
default y if aarch64||arm||i386||x86_64
|
||||
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
|
||||
bool "Include Haproxy"
|
||||
select PACKAGE_haproxy
|
||||
|
||||
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||
PKG_NAME:=v2dat
|
||||
PKG_SOURCE_DATE:=2022-12-15
|
||||
PKG_SOURCE_VERSION:=47b8ee51fb528e11e1a83453b7e767a18d20d1f7
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_DATE).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/urlesistiana/v2dat/tar.gz/$(PKG_SOURCE_VERSION)?
|
||||
|
||||
@ -7,8 +7,6 @@ Subject: [PATCH] format logtime
|
||||
mlog/logger.go | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mlog/logger.go b/mlog/logger.go
|
||||
index c8b08a9..b44c88d 100644
|
||||
--- a/mlog/logger.go
|
||||
+++ b/mlog/logger.go
|
||||
@@ -1,17 +1,28 @@
|
||||
@ -42,6 +40,3 @@ index c8b08a9..b44c88d 100644
|
||||
func L() *zap.Logger {
|
||||
return logger
|
||||
}
|
||||
--
|
||||
2.34.8
|
||||
|
||||
|
||||
96
v2dat/patches/101-v2dat-update-dependencies.patch
Normal file
96
v2dat/patches/101-v2dat-update-dependencies.patch
Normal file
@ -0,0 +1,96 @@
|
||||
From d5d61b6027b2fe4c75887d33d8a5f98a3ec0795f Mon Sep 17 00:00:00 2001
|
||||
From: sbwml <admin@cooluc.com>
|
||||
Date: Sat, 8 Mar 2025 20:26:40 +0800
|
||||
Subject: [PATCH] v2dat: update dependencies
|
||||
|
||||
Signed-off-by: sbwml <admin@cooluc.com>
|
||||
---
|
||||
go.mod | 14 ++++++--------
|
||||
go.sum | 41 +++++++++++++----------------------------
|
||||
2 files changed, 19 insertions(+), 36 deletions(-)
|
||||
|
||||
--- a/go.mod
|
||||
+++ b/go.mod
|
||||
@@ -1,18 +1,16 @@
|
||||
module github.com/urlesistiana/v2dat
|
||||
|
||||
-go 1.19
|
||||
+go 1.21
|
||||
|
||||
require (
|
||||
- github.com/spf13/cobra v1.6.1
|
||||
- go.uber.org/zap v1.24.0
|
||||
- google.golang.org/protobuf v1.28.1
|
||||
+ github.com/spf13/cobra v1.9.1
|
||||
+ go.uber.org/zap v1.27.0
|
||||
+ google.golang.org/protobuf v1.36.5
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/google/go-cmp v0.5.9 // indirect
|
||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||
- github.com/spf13/pflag v1.0.5 // indirect
|
||||
- github.com/stretchr/testify v1.8.1 // indirect
|
||||
- go.uber.org/atomic v1.10.0 // indirect
|
||||
- go.uber.org/multierr v1.9.0 // indirect
|
||||
+ github.com/spf13/pflag v1.0.6 // indirect
|
||||
+ go.uber.org/multierr v1.11.0 // indirect
|
||||
)
|
||||
--- a/go.sum
|
||||
+++ b/go.sum
|
||||
@@ -1,42 +1,27 @@
|
||||
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
|
||||
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
|
||||
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
||||
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
||||
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
-github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||
-github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
|
||||
-github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
|
||||
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
|
||||
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
|
||||
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
|
||||
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
|
||||
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
||||
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
|
||||
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
|
||||
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
|
||||
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
|
||||
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
|
||||
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
|
||||
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
|
||||
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
||||
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
|
||||
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
||||
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
||||
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
||||
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
||||
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
|
||||
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
Loading…
x
Reference in New Issue
Block a user