OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2023-10-31 09:12:53

This commit is contained in:
github-actions[bot] 2023-10-31 09:12:53 +08:00
parent 3225987449
commit 6170b6adb5
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
luci-app-xray/README.md
View File

@ -40,6 +40,7 @@ Then find `luci-app-xray` under `Extra Packages`.
* 2023-10-25 fix: set required for some fields; remove unused code * 2023-10-25 fix: set required for some fields; remove unused code
* 2023-10-26 fix: allow empty selection for extra inbound outbound balancer * 2023-10-26 fix: allow empty selection for extra inbound outbound balancer
* 2023-10-30 fix: blocked as nxdomain for IPv6 * 2023-10-30 fix: blocked as nxdomain for IPv6
* 2023-10-31 chore: bump version to 3.1.1
## Changelog since 3.0.0 ## Changelog since 3.0.0

2
luci-app-xray/core/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-xray PKG_NAME:=luci-app-xray
PKG_VERSION:=3.1.0 PKG_VERSION:=3.1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=MPLv2 PKG_LICENSE:=MPLv2

5
luci-app-xray/core/root/usr/share/xray/gen_config.uc
View File

@ -280,8 +280,9 @@ function gen_config() {
const fakedns = map(filter(keys(config), k => config[k][".type"] == "fakedns") || [], k => config[k]); const fakedns = map(filter(keys(config), k => config[k][".type"] == "fakedns") || [], k => config[k]);
const extra_inbound = map(filter(keys(config), k => config[k][".type"] == "extra_inbound") || [], k => config[k]); const extra_inbound = map(filter(keys(config), k => config[k][".type"] == "extra_inbound") || [], k => config[k]);
const manual_tproxy = map(filter(keys(config), k => config[k][".type"] == "manual_tproxy") || [], k => config[k]); const manual_tproxy = map(filter(keys(config), k => config[k][".type"] == "manual_tproxy") || [], k => config[k]);
const custom_configuration_hook = loadstring(general["custom_configuration_hook"] || "return i => i;")();
return { return custom_configuration_hook({
inbounds: inbounds(general, config, extra_inbound), inbounds: inbounds(general, config, extra_inbound),
outbounds: outbounds(general, config, manual_tproxy, bridge, extra_inbound, fakedns), outbounds: outbounds(general, config, manual_tproxy, bridge, extra_inbound, fakedns),
dns: dns_conf(general, config, manual_tproxy, fakedns), dns: dns_conf(general, config, manual_tproxy, fakedns),
@ -302,7 +303,7 @@ function gen_config() {
rules: rules(geoip_existence, general, bridge, manual_tproxy, extra_inbound, fakedns), rules: rules(geoip_existence, general, bridge, manual_tproxy, extra_inbound, fakedns),
balancers: balancers(general, extra_inbound, fakedns, balancer_strategy) balancers: balancers(general, extra_inbound, fakedns, balancer_strategy)
} }
}; });
} }
print(gen_config()); print(gen_config());

6
luci-app-xray/core/root/www/luci-static/resources/view/xray/preview.js
View File

@ -259,6 +259,12 @@ return view.extend({
let ttl_hop_limit_match = s.taboption('dynamic_direct', form.Value, 'ttl_hop_limit_match', _('TTL / Hop Limit Match'), _("Only override TTL / hop limit for packets with specific TTL / hop limit.")); let ttl_hop_limit_match = s.taboption('dynamic_direct', form.Value, 'ttl_hop_limit_match', _('TTL / Hop Limit Match'), _("Only override TTL / hop limit for packets with specific TTL / hop limit."));
ttl_hop_limit_match.datatype = 'uinteger'; ttl_hop_limit_match.datatype = 'uinteger';
s.tab('custom_options', _('Custom Options'));
let custom_configuration_hook = s.taboption('custom_options', form.TextValue, 'custom_configuration_hook', _('Custom Configuration Hook'), _('Have full control over the configuration file here. Read <a href="https://ucode.mein.io/">ucode Documentation</a> for the language used.'));
custom_configuration_hook.placeholder = "return function(config) {\n return config;\n};";
custom_configuration_hook.monospace = true;
custom_configuration_hook.rows = 10;
return m.render(); return m.render();
} }
}); });

3
luci-app-xray/status/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-xray-status PKG_NAME:=luci-app-xray-status
PKG_VERSION:=3.1.0 PKG_VERSION:=3.1.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=MPLv2 PKG_LICENSE:=MPLv2
@ -16,6 +16,7 @@ define Package/$(PKG_NAME)
CATEGORY:=Extra packages CATEGORY:=Extra packages
TITLE:=LuCI Support for Xray (status page) TITLE:=LuCI Support for Xray (status page)
DEPENDS:=luci-app-xray +wget DEPENDS:=luci-app-xray +wget
PKGARCH:=all
endef endef
define Package/$(PKG_NAME)/description define Package/$(PKG_NAME)/description