cwx/op-packages
1
0 Fork 0
mirror of https://github.com/kiddin9/op-packages.git synced 2026-11-03 07:53:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎉 Sync 2026-08-04 00:17:08

Browse Source
This commit is contained in:
github-actions[bot] committed 2026-08-04 00:17:08 +08:00
1 parent 6e23f4416b
commit e03a23fe6b
18 files changed
+352 -171
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

luci-app-fchomo/htdocs/luci-static/resources/fchomo.js
+3 -3
View File
@@ -204,8 +204,8 @@ const outbound_type = [
['hysteria2', _('Hysteria2') + ' - ' + _('UDP')],
['shadowquic', _('ShadowQUIC') + ' - ' + _('UDP')],
['trusttunnel', _('TrustTunnel') + ' - ' + _('TCP/UDP')],
['wireguard', _('WireGuard') + ' - ' + _('UDP')],
['masque', _('Masque') + ' - ' + _('UDP')], // https://blog.cloudflare.com/post-quantum-warp/
['wireguard', _('WireGuard') + ' - ' + _('UDP')], // Endpoint
['masque', _('Masque') + ' - ' + _('UDP')], // Endpoint // https://blog.cloudflare.com/post-quantum-warp/
['ssh', _('SSH') + ' - ' + _('TCP')]
];
@@ -1806,7 +1806,7 @@ function validateCommonPort(section_id, value) {
for (let custom of arr) {
if (!routing_port_type.map(e => e[0]).includes(custom)) {
let ports = [];
for (let i of custom.split(',')) {
for (let i of custom.split(this.hm_separator ?? ',')) {
if (!stubValidator.apply('port', i) && !stubValidator.apply('portrange', i))
return _('Expecting: %s').format(_('valid port value'));
if (ports.includes(i))
luci-app-fchomo/htdocs/luci-static/resources/fchomo/listeners.js
+4 -4
View File
@@ -151,11 +151,11 @@ function renderListeners(s, uciconfig, isClient) {
o.placeholder = '::';
o.modalonly = true;
o = s.taboption('field_general', form.Value, 'port', _('Listen port') + ' / ' + _('Ports pool'));
o.datatype = 'or(port, portrange)';
//o.placeholder = '1080,2079-2080,3080'; // @fw4 does not support port lists with commas
o = s.taboption('field_general', form.Value, 'listen_port', _('Listen port') + ' / ' + _('Ports pool'));
//o.datatype = 'or(port, portrange)'; // ⬇️ migrated to validate
o.placeholder = '1080,2079-2080,3080';
o.rmempty = false;
//o.validate = hm.validateCommonPort; // @fw4 does not support port lists with commas
o.validate = hm.validateCommonPort;
/* HTTP / SOCKS fields */
/* hm.validateAuth */
luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/client.js
+14 -2
View File
@@ -595,11 +595,23 @@ function renderPayload(s, total, uciconfig) {
initPayload(o, n, 'factor', uciconfig);
o = s.option(form.Value, prefix + 'port', _('Factor') + ` ${n+1}`);
o.datatype = 'or(port, portrange)';
//o.datatype = 'or(port, portrange)'; // ⬇️ migrated to validate
o.placeholder = '1080/2079-2080/3080';
if (n === 0)
o.depends({type: /\bPORT\b/});
o.depends(Object.fromEntries([[prefix + 'type', /\bPORT\b/]]));
initPayload(o, n, 'factor', uciconfig);
// if validate is already defined in initPayload
const port_old_validate = o.validate;
o.validate = function(section_id, value) {
const result = port_old_validate.apply(this, arguments);
if (result === true) {
this.hm_separator = '/';
return hm.validateCommonPort.apply(this, arguments);
}
return result;
}
o = s.option(form.ListValue, prefix + 'l4', _('Factor') + ` ${n+1}`);
o.value('udp', _('UDP'));
@@ -1919,7 +1931,7 @@ return view.extend({
_('Lazy query.'));
so.default = so.disabled;
so.validate = function(section_id, value) {
let desc = this.getUIElement(section_id).node.nextSibling;
const desc = this.getUIElement(section_id).node.nextSibling;
value = this.formvalue(section_id);
if (value == 1)
luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/global.js
+1 -1
View File
@@ -823,7 +823,7 @@ return view.extend({
_('As the TOP upstream of dnsmasq.'));
so.default = so.disabled;
so.validate = function(section_id, value) {
let desc = this.getUIElement(section_id).node.nextSibling;
const desc = this.getUIElement(section_id).node.nextSibling;
value = this.formvalue(section_id);
if (value == 1)
luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/node.js
+89 -64
View File
@@ -238,6 +238,7 @@ return view.extend({
ss.tab('field_vless_encryption', _('Vless Encryption fields'));
ss.tab('field_hysteria2_realm', _('Hysteria2 Realm fields'));
ss.tab('field_tls', _('TLS fields'));
ss.tab('field_vpn', _('VPN fields'));
ss.tab('field_transport', _('Transport fields'));
ss.tab('field_multiplex', _('Multiplex fields'));
ss.tab('field_dial', _('Dial fields'));
@@ -782,20 +783,6 @@ return view.extend({
so.modalonly = true;
/* WireGuard fields */
so = ss.taboption('field_general', form.Value, 'wireguard_ip', _('Local address'),
_('The %s address used by local machine in the Wireguard network.').format('IPv4'));
so.datatype = 'ip4addr(1)';
so.placeholder = '172.16.0.2';
so.rmempty = false;
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'wireguard_ipv6', _('Local IPv6 address'),
_('The %s address used by local machine in the Wireguard network.').format('IPv6'));
so.datatype = 'ip6addr(1)';
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'wireguard_private_key', _('Private key'),
_('WireGuard requires base64-encoded private keys.'));
so.password = true;
@@ -804,7 +791,7 @@ return view.extend({
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'wireguard_peer_public_key', _('Peer pubkic key'),
so = ss.taboption('field_general', form.Value, 'wireguard_peer_public_key', _('Peer public key'),
_('WireGuard peer public key.'));
so.validate = L.bind(hm.validateBase64Key, so, 44);
so.rmempty = false;
@@ -836,23 +823,6 @@ return view.extend({
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'wireguard_mtu', _('MTU'));
so.datatype = 'range(0,9000)';
so.placeholder = '1408';
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.Flag, 'wireguard_remote_dns_resolve', _('Remote DNS resolve'),
_('Force DNS remote resolution.'));
so.default = so.disabled;
so.depends('type', 'wireguard');
so.modalonly = true;
so = ss.taboption('field_general', form.DynamicList, 'wireguard_dns', _('DNS server'));
so.datatype = 'or(host, hostport)';
so.depends('wireguard_remote_dns_resolve', '1');
so.modalonly = true;
/* Masque fields */
so = ss.taboption('field_general', form.Value, 'masque_private_key', _('Private key'),
_('Base64 encoded ECDSA private key on the NIST P-256 curve.'));
@@ -862,33 +832,13 @@ return view.extend({
so.depends('type', 'masque');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'masque_endpoint_public_key', _('Endpoint pubkic key'),
so = ss.taboption('field_general', form.Value, 'masque_endpoint_public_key', _('Endpoint public key'),
_('Base64 encoded ECDSA public key on the NIST P-256 curve.'));
so.validate = L.bind(hm.validateBase64Key, so, 124);
so.rmempty = false;
so.depends('type', 'masque');
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'masque_ip', _('Local address'),
_('The %s address used by local machine in the Cloudflare WARP network.').format('IPv4'));
so.datatype = 'ip4addr(1)';
so.placeholder = '172.16.0.2';
so.rmempty = false;
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'masque_ipv6', _('Local IPv6 address'),
_('The %s address used by local machine in the Cloudflare WARP network.').format('IPv6'));
so.datatype = 'ip6addr(1)';
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_general', form.Value, 'masque_mtu', _('MTU'));
so.datatype = 'range(0,9000)';
so.placeholder = '1280';
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_general', form.ListValue, 'masque_network', _('Network'));
so.default = '';
so.value('', _('h3'));
@@ -909,17 +859,6 @@ return view.extend({
so.depends('type', 'masque');
so.modalonly = true;
so = ss.taboption('field_general', form.Flag, 'masque_remote_dns_resolve', _('Remote DNS resolve'),
_('Force DNS remote resolution.'));
so.default = so.disabled;
so.depends('type', 'masque');
so.modalonly = true;
so = ss.taboption('field_general', form.DynamicList, 'masque_dns', _('DNS server'));
so.datatype = 'or(host, hostport)';
so.depends('masque_remote_dns_resolve', '1');
so.modalonly = true;
/* SSH fields */
so = ss.taboption('field_general', form.TextValue, 'ssh_priv_key', _('Priv-key'));
so.depends('type', 'ssh');
@@ -1375,6 +1314,92 @@ return view.extend({
// @VMess-TLSmirror fields
/* VPN fields */
so = ss.taboption('field_vpn', form.Value, 'endpoint_ip', _('Virtual address'),
_('The %s address used by local machine in the %s network.').format(_('IPv4'), _('VPN')));
so.datatype = 'or(ip4addr(1), cidr4)';
so.placeholder = '172.16.0.2';
so.validate = function(section_id, value) {
const type = this.section.getOption('type').formvalue(section_id);
const desc = this.getUIElement(section_id).node.nextSibling;
switch (type) {
case 'wireguard':
desc.innerHTML = _('The %s address used by local machine in the %s network.')
.format(_('IPv4'), _('Wireguard'));
break;
case 'masque':
desc.innerHTML = _('The %s address used by local machine in the %s network.')
.format(_('IPv4'), _('Cloudflare WARP'));
break;
}
return true;
}
so.rmempty = false;
so.depends('type', 'wireguard');
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_vpn', form.Value, 'endpoint_ipv6', _('Virtual IPv6 address'),
_('The %s address used by local machine in the %s network.').format(_('IPv6'), _('VPN')));
so.datatype = 'or(ip6addr(1), cidr6)';
so.validate = function(section_id, value) {
const type = this.section.getOption('type').formvalue(section_id);
const desc = this.getUIElement(section_id).node.nextSibling;
switch (type) {
case 'wireguard':
desc.innerHTML = _('The %s address used by local machine in the %s network.')
.format(_('IPv6'), _('Wireguard'));
break;
case 'masque':
desc.innerHTML = _('The %s address used by local machine in the %s network.')
.format(_('IPv6'), _('Cloudflare WARP'));
break;
}
return true;
}
so.depends('type', 'wireguard');
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_vpn', form.Value, 'endpoint_mtu', _('MTU'));
so.datatype = 'range(0,9000)';
so.placeholder = '1400';
so.validate = function(section_id, value) {
const type = this.section.getOption('type').formvalue(section_id);
const UIEl = this.getUIElement(section_id);
let def_mtu;
switch (type) {
case 'wireguard':
def_mtu = '1408';
break;
case 'masque':
def_mtu = '1280';
break;
}
UIEl.node.querySelector('input').placeholder = def_mtu;
return true;
}
so.depends('type', 'wireguard');
so.depends({type: 'masque', masque_network: /^(|h2)$/});
so.modalonly = true;
so = ss.taboption('field_vpn', form.Flag, 'endpoint_remote_dns_resolve', _('Remote DNS resolve'),
_('Force DNS remote resolution.'));
so.default = so.disabled;
so.depends({type: /^(wireguard|masque)$/});
so.modalonly = true;
so = ss.taboption('field_vpn', form.DynamicList, 'endpoint_dns', _('DNS server'));
so.datatype = 'or(host, hostport)';
so.depends('endpoint_remote_dns_resolve', '1');
so.modalonly = true;
/* Transport fields */
so = ss.taboption('field_general', form.Flag, 'transport_enabled', _('Transport'));
so.default = so.disabled;