update 2022-09-27 23:51:11

This commit is contained in:
github-actions[bot] 2022-09-27 23:51:11 +08:00
parent 59cbdbe0b0
commit 794380b17a
8 changed files with 305 additions and 144 deletions

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for quickstart
LUCI_DEPENDS:=+quickstart +luci-app-store
LUCI_PKGARCH:=all
PKG_VERSION:=0.5.7-1
PKG_VERSION:=0.5.7-2
# PKG_RELEASE MUST be empty for luci.mk
PKG_RELEASE:=

View File

@ -31,16 +31,23 @@ function sink_socket(sock, io_err)
end
local function session_retrieve(sid, allowed_users)
local sdat = util.ubus("session", "get", { ubus_rpc_session = sid })
if type(sdat) == "table" and
type(sdat.values) == "table" and
type(sdat.values.token) == "string" and
(not allowed_users or
util.contains(allowed_users, sdat.values.username))
then
return sid, sdat.values
end
return nil, nil
local sdat = util.ubus("session", "get", { ubus_rpc_session = sid })
if type(sdat) == "table" and
type(sdat.values) == "table" and
type(sdat.values.token) == "string" and
(not allowed_users or
util.contains(allowed_users, sdat.values.username))
then
return sid, sdat.values
end
return nil, nil
end
local function get_session(sid)
if sid then
return session_retrieve(sid, nil)
end
return nil, nil
end
function istore_backend()
@ -63,13 +70,13 @@ function istore_backend()
input[#input+1] = string.sub(k, start_len+1, string.len(k)) .. ": " .. v
end
end
local sid = http.getcookie("sysauth")
if sid then
local sid, sdat = session_retrieve(sid, nil)
if sdat ~= nil then
input[#input+1] = "X-Forwarded-Sid: " .. sid
input[#input+1] = "X-Forwarded-Token: " .. sdat.token
end
local sid, sdat = get_session(http.getcookie("sysauth"))
if sdat == nil then
sid, sdat = get_session(http.getcookie('sysauth_%s' % { http.getenv("HTTPS") == "on" and "https" or "http" }))
end
if sdat ~= nil then
input[#input+1] = "X-Forwarded-Sid: " .. sid
input[#input+1] = "X-Forwarded-Token: " .. sdat.token
end
-- input[#input+1] = "X-Forwarded-For: " .. http.getenv("REMOTE_HOST") ..":".. http.getenv("REMOTE_PORT")
local num = tonumber(http.getenv("CONTENT_LENGTH")) or 0

View File

@ -68,7 +68,6 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
var mn = parseInt(sim.all) || 100;
var pc = Math.floor((100 / mn) * vn);
document.getElementById('usse').innerHTML=sim.use + " / " + sim.all + " " + '('+ pc + '%)';
}
);
@ -92,9 +91,7 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
cell4.innerHTML = "<input type='checkbox' name='smsn' id="+"btn"+json[d].index+" /><img src='<%=resource%>/icons/delsms.png'>"
cell3.innerHTML = json[d].sender;
cell2.innerHTML = json[d].timestamp;
cell1.innerHTML = json[d].content;
cell1.innerHTML = json[d].content;
}
}
@ -109,19 +106,30 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
MergeMySMS.forEach(function (o) {
if (!this[o.sender]) {
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
if(o.part > 0){
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content, contentparts: [] };
this[o.sender].contentparts[o.part] = o.content;
}else{
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content};
}
result.push(this[o.sender]);
return;
}
if (this[o.sender].total == o.total && this[o.sender].timestamp == o.timestamp && this[o.sender].sender == o.sender && this[o.sender].part > 0) {
this[o.sender].index += '-' + o.index;
this[o.sender].content += o.content;}
this[o.sender].index += '-' + o.index;
this[o.sender].contentparts[o.part] = o.content;}
else {
this[o.sender] = { index: o.index, sender: o.sender, timestamp: o.timestamp, part: o.part, total: o.total, content: o.content };
result.push(this[o.sender]);
return;
}
}, Object.create(null));
result.forEach(function(o) {
if(o.contentparts){
o.contentparts.shift();
o.content = o.contentparts.join('');
}
});
var data = JSON.stringify(result);
var json = JSON.parse(data);
@ -139,11 +147,7 @@ tr:nth-child(odd) {background-color: var(--background-color-medium)}
cell2.innerHTML = json[d].timestamp;
cell1.innerHTML = json[d].content;
}
}
}
@ -182,10 +186,8 @@ if (document.querySelectorAll('input[name="smsn"]:checked').length === document.
function()
{
}
);
return false;
}
@ -240,12 +242,10 @@ if (document.querySelectorAll('input[name="smsn"]:checked').length === document.
function()
{
}
);
return false;
}
}
}
}
@ -283,4 +283,3 @@ if (document.querySelectorAll('input[name="smsn"]:checked').length === document.
</div>
<%+footer%>

View File

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

View File

@ -7,9 +7,7 @@
'require tools.widgets as widgets';
function add_flow_and_stream_security_conf(s, tab_name, depends_field_name, protocol_name, have_xtls, client_side) {
var o;
o = s.taboption(tab_name, form.ListValue, `${protocol_name}_tls`, _(`[${protocol_name}] Stream Security`))
let o = s.taboption(tab_name, form.ListValue, `${protocol_name}_tls`, _(`[${protocol_name}] Stream Security`))
let odep = {}
odep[depends_field_name] = protocol_name
if (client_side) {
@ -156,8 +154,9 @@ return view.extend({
}
}
var m, s, o, ss;
m = new form.Map('xray', _('Xray'), status_text + " " + asset_file_status);
const m = new form.Map('xray', _('Xray'), status_text + " " + asset_file_status);
var s, o, ss;
s = m.section(form.TypedSection, 'general');
s.addremove = false;
@ -169,12 +168,12 @@ return view.extend({
o = s.taboption('general', form.ListValue, 'main_server', _('TCP Server'))
o.datatype = "uciname"
for (var v of uci.sections(config_data, "servers")) {
for (const v of uci.sections(config_data, "servers")) {
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
}
o = s.taboption('general', form.ListValue, 'tproxy_udp_server', _('UDP Server'))
for (var v of uci.sections(config_data, "servers")) {
for (const v of uci.sections(config_data, "servers")) {
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
}
@ -619,7 +618,7 @@ return view.extend({
o = ss.option(form.ListValue, 'force_forward_server_tcp', _('Force Forward server (TCP)'))
o.depends("force_forward", "1")
o.datatype = "uciname"
for (var v of uci.sections(config_data, "servers")) {
for (const v of uci.sections(config_data, "servers")) {
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
}
o.modalonly = true
@ -627,7 +626,7 @@ return view.extend({
o = ss.option(form.ListValue, 'force_forward_server_udp', _('Force Forward server (UDP)'))
o.depends("force_forward", "1")
o.datatype = "uciname"
for (var v of uci.sections(config_data, "servers")) {
for (const v of uci.sections(config_data, "servers")) {
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
}
o.modalonly = true
@ -746,7 +745,7 @@ return view.extend({
o = ss.option(form.ListValue, "upstream", _("Upstream"))
o.datatype = "uciname"
for (var v of uci.sections(config_data, "servers")) {
for (const v of uci.sections(config_data, "servers")) {
o.value(v[".name"], v.alias || v.server + ":" + v.server_port)
}

View File

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mosdns
PKG_VERSION:=a636786
PKG_VERSION:=e2497fd
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=mosdns-$(PKG_VERSION).tar.gz

View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=shadowsocks-rust
PKG_VERSION:=1.14.3
PKG_VERSION:=1.15.0-alpha.8
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION)
@ -16,29 +16,29 @@ PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-rust/releases/downloa
ifeq ($(ARCH),aarch64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=31968468017772e099e69741212520b15fce0ee67584d20706cc9654c7ce7e4c
PKG_HASH:=52a1da389148767e1d105232ccd3f3ab64e38169ef4c5cb2281fff388004856d
else ifeq ($(ARCH),arm)
# Referred to golang/golang-values.mk
ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
ifeq ($(ARM_CPU_FEATURES),)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER)
PKG_HASH:=066515d3a7ae07a44419472331866b4ad3ffb04b77a71ed8ecc8d20217abfcfb
PKG_HASH:=78dd75be5417fe5980ceb4a3df0107bf326ff67d52b9b992ae5c1fa53fcd1ff0
else
PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
PKG_HASH:=f9c336f94dc081a8e0f4aa7f398ceafedc00c5f7d1981989fdb03b63c298ac57
PKG_HASH:=45159e87d18f6d831625a32aae4db1dc3e711c37a00da35f4110d0377391bd05
endif
else ifeq ($(ARCH),i386)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=1734d2870f5ebdc5475f5100f78546574a99c96d37cd2cf08aad4ef0eb65ecf4
PKG_HASH:=fe8aa1f8cde55f4e98b1990ed9988bcc1170129fbb7dae7abd293735975f9069
else ifeq ($(ARCH),mips)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=8aa4544abf62f2cb1d3b55bbd67d5d371463da9426479fb1dde6cf2b63e267a4
PKG_HASH:=48f9a3cad7081ccc2dd2aa6af5e5861672d5b49e7f5d9f049cfac572668a37f8
else ifeq ($(ARCH),mipsel)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).mipsel-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=f89bfaf414dd4dadf5da0b909111d97c3b8194b929cdba2b781a8fd4175a48c1
PKG_HASH:=d7a0d688098e86bfaefab2c0eabcbe65792ab9cdb4447b5101781df61b13f091
else ifeq ($(ARCH),x86_64)
PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
PKG_HASH:=515e7e5e6bc426c7e81bff3beb42e713fd1460d4664fa47df855eb4175c9b8f4
PKG_HASH:=9d2c62e8e047596139ee5f54bac74bb8bf2d6bc7af43a34ba884e0193dcabf08
# Set the default value to make OpenWrt Package Checker happy
else
PKG_SOURCE:=dummy