update 2023-03-27 09:19:38

This commit is contained in:
github-actions[bot] 2023-03-27 09:19:38 +08:00
parent dba28a1cbc
commit 921fa725fe
8 changed files with 398 additions and 91 deletions

View File

@ -1082,7 +1082,7 @@ return view.extend({
so.depends({'tls': '1', 'type': /^((?!hysteria$).)+$/});
so.validate = function(section_id, value) {
if (section_id) {
let tls_reality = this.map.lookupOption('tls_reality', section_id)[0].formvalue(section_id);
let tls_reality = this.map.findElement('id', 'cbid.homeproxy.%s.tls_reality'.format(section_id)).firstElementChild;
if (tls_reality.checked && !value)
return _('Expecting: %s').format(_('non-empty value'));
@ -1097,7 +1097,7 @@ return view.extend({
so = ss.option(form.Flag, 'tls_reality', _('REALITY'));
so.default = so.disabled;
so.depends('tls', '1');
so.depends({'tls': '1', 'type': 'vless'});
so.modalonly = true;
so = ss.option(form.Value, 'tls_reality_public_key', _('REALITY public key'));

View File

@ -32,7 +32,8 @@ return view.extend({
o.rmempty = false;
o = s.option(form.Flag, 'auto_firewall', _('Auto configure firewall'));
o.default = o.enabled;
o.default = o.disabled;
o.rmempty = false;
s = m.section(form.GridSection, 'server');
s.addremove = true;

View File

@ -67,6 +67,20 @@ export function cURL(url) {
const output = executeCommand(`/usr/bin/curl -fsL --connect-timeout '10' --retry '3' ${shellQuote(url)}`) || {};
return trim(output.stdout);
};
export function getTime(epoch) {
const local_time = localtime(epoch);
return sprintf(
'%s-%s-%s %s:%s:%s',
local_time.year,
(local_time.mon >= 10) ? local_time.mon : ('0' + local_time.mon),
(local_time.mday >= 10) ? local_time.mday : ('0' + local_time.mday),
(local_time.hour >= 10) ? local_time.hour : ('0' + local_time.hour),
(local_time.min >= 10) ? local_time.min : ('0' + local_time.min),
(local_time.sec >= 10) ? local_time.sec : ('0' + local_time.sec)
);
};
/* Utilities end */
/* String helper start */

View File

@ -16,7 +16,7 @@ import { init_action } from 'luci.sys';
import {
calcStringMD5, cURL, executeCommand, decodeBase64Str,
isEmpty, parseURL, validation,
getTime, isEmpty, parseURL, validation,
HP_DIR, RUN_DIR
} from 'homeproxy';
@ -74,10 +74,8 @@ const sing_features = ubus.call('luci.homeproxy', 'singbox_get_features', {}) ||
/* Log */
system(`mkdir -p ${RUN_DIR}`);
function log(...args) {
const logtime = trim(executeCommand('date "+%Y-%m-%d %H:%M:%S"').stdout);
const logfile = open(`${RUN_DIR}/homeproxy.log`, 'a');
logfile.write(`${logtime} [SUBSCRIBE] ${join(' ', args)}\n`);
logfile.write(`${getTime()} [SUBSCRIBE] ${join(' ', args)}\n`);
logfile.close();
}

View File

@ -1291,7 +1291,6 @@
16466.com
165123.com
16587.com
16595.com
166.com
166.net
166161.com
@ -1993,7 +1992,6 @@
21our.com
21qa.net
21qphr.com
21rcw.com
21rv.com
21shhr.com
21shipin.com
@ -2208,7 +2206,6 @@
25752.com
258.com
258288.com
25838yn.com
25847.com
25863.com
2588qq.com
@ -4068,6 +4065,7 @@
51world.win
51wp.com
51wtp.com
51wuditu.com
51wxjz.com
51wydj.com
51wyfl.com
@ -4767,7 +4765,6 @@
59di.com
59dun.com
59edu.com
59hs.com
59iedu.com
59ni.com
59pk.net
@ -7507,7 +7504,6 @@ age06.com
agefans.app
agenge.com
agenow.com
agentzh.org
aggresmart.com
aghcdn.com
agile-china.com
@ -7756,7 +7752,6 @@ aijikong.com
aijishu.com
aiju.com
aik.com
aikac.com
aikaixin.com
aikaiyuan.com
aikan8.com
@ -7965,7 +7960,6 @@ aizhan.com
aizhengli.com
aizhenrong.com
aizhet.com
aizhi.biz
aizhibaby.com
aizhuizhui.com
aiziti.net
@ -10011,7 +10005,6 @@ bbbvip.com
bbchin.com
bbcss.com
bbctop.com
bbcyw.com
bbdservice.com
bbdup.com
bbercn.com
@ -11594,7 +11587,6 @@ boyunso.com
boyuonline.com
bozhihua.com
bozhong.com
bozhou666.com
bphetaomiao.com
bpimg.com
bppan.com
@ -13521,7 +13513,6 @@ checkip.pw
checkoo.com
checkpass.net
checkzeit.com
chedan5.com
chediandian.com
cheduo.com
cheerfun.dev
@ -14596,7 +14587,6 @@ chuangcdn.com
chuangchangnet.com
chuangchenwangluo.com
chuangcifang.com
chuangd.com
chuangduyouyue.com
chuangen.com
chuangfeixin.com
@ -15295,7 +15285,6 @@ cmsjournal.net
cmskcrm.com
cmsn.biz
cmstop.com
cmt178.com
cmt7.com
cmtdi.com
cmtech.net
@ -15693,7 +15682,6 @@ cnmsl.net
cnmsn.net
cnmstl.net
cnmtpt.com
cnmxk.com
cnmysql.com
cnnaihuo.com
cnnb.com
@ -16466,7 +16454,6 @@ cqxingyun.com
cqxyfl.com
cqyc.net
cqyestar.com
cqyeze.com
cqyfgs.com
cqyingang.com
cqyouloft.com
@ -17173,6 +17160,7 @@ d77777777.com
d7ol.com
d7vg.com
d8th.com
d9ym.com
da-qian.com
da-quan.net
da.anythinktech.com
@ -18357,7 +18345,6 @@ dididapiao.com
dididawo.com
dididi88.com
didiglobal.com
didiling.com
didimobility.co.jp
didipay.com
didiqiche.com
@ -21764,7 +21751,6 @@ fengji.me
fengji.net
fengjing.com
fengjr.com
fengjunzi.com
fengkongcloud.com
fengkuangzaoren.com
fengkui.net
@ -21781,7 +21767,6 @@ fengniaojr.com
fengone.com
fengpengjun.com
fengpintech.com
fengqu.com
fengread.com
fengshangweekly.com
fengshi.tech
@ -22737,6 +22722,7 @@ fxl1950.com
fxlbb.com
fxltsbl.com
fxm.so
fxngpih.com
fxo2opt.com
fxpan.com
fxsw.net
@ -27001,7 +26987,6 @@ hnsfdc.com
hnshengben.com
hnsimeng.com
hnsiwei.com
hnsjxcl.com
hnsktc.com
hnsmj.org
hnsqtg.com
@ -32339,7 +32324,6 @@ jnkason.com
jnky.com
jnlab.com
jnlc.com
jnliyu.com
jnlou.net
jnltwy.com
jnmama.com
@ -35092,7 +35076,6 @@ larksuitecdn.com
larmb.com
larsonlimited.com
laruence.com
laryoo.com
las1001boda.com
las88889999.com
lascn.net
@ -37060,6 +37043,7 @@ luxianpo.com
luxiao.com
luxiwang.com
luxiyun.com
luxshare-ict.com
luxst.com
luxtarget.com
luxuqing.com
@ -38729,8 +38713,6 @@ minhangshi.com
minhow.com
mini-audio.com
mini-program.net
mini5cn-1.opera-mini.net
mini5cn.opera-mini.net
miniadx.com
miniaixue.com
miniappss.com
@ -41543,8 +41525,6 @@ openmidas.com
openos.org
openqa.com
openredcloud.com
openresty.com
openresty.org
openrice.com
openset.wang
opensoce.com
@ -43488,7 +43468,6 @@ qdcaijing.com
qdccb.com
qdccdl.com
qdcdpjw.com
qdcent.com
qdcu.com
qdcypf.com
qdcz.com
@ -43733,7 +43712,6 @@ qianlong.com
qianluxiaoshuo.com
qianmaiapp.com
qianmaidao.com
qianmh.com
qianmi.com
qianmingyun.com
qianmo.info
@ -44342,6 +44320,7 @@ qoocc.com
qooic.com
qookar.com
qoqaoligei.com
qoqkkhy.com
qosq.com
qp110.com
qp46.com
@ -54239,7 +54218,6 @@ vpsaa.com
vpsaa.net
vpsaff.com
vpscang.com
vpsdawanjia.com
vpsdx.com
vpser.net
vpsjxw.com
@ -54691,7 +54669,6 @@ wangzhengzhen.com
wangzhennan.com
wangziru.com
wanh5.com
wanhedoors.com
wanheweb.com
wanhi.com
wanhongji.com
@ -56751,7 +56728,6 @@ wuhanrt.com
wuhansailingclub.com
wuhantest.com
wuhantianqi114.com
wuhantianrun.com
wuhantskj.com
wuhanunion.com
wuhanxingfuwan.com
@ -57742,6 +57718,7 @@ xiaobaodt.com
xiaobaoonline.com
xiaobaostudio.com
xiaobd.net
xiaobianli8.com
xiaobingxitong.com
xiaobu121.com
xiaocanhulian.com
@ -59451,7 +59428,6 @@ xxmh21.com
xxmh223.com
xxmh225.com
xxmh226.com
xxmh460.com
xxminizu.com
xxnets.net
xxnmcd.com
@ -62420,7 +62396,6 @@ yyhao.com
yyhh.com
yyhhaa.com
yyhn365.com
yyhomer.com
yyjxcloud.com
yyjzt.com
yyk100.com
@ -65012,7 +64987,6 @@ zxip.com
zxjg66.com
zxjsq.net
zxlib.com
zxlmx.com
zxmall.com
zxmn2018.com
zxmseed.com

View File

@ -1198,6 +1198,7 @@
3movs.com
3movs.xyz
3musketeers.com
3naked.com
3pornstarmovies.com
3ren.blog
3ssee.com
@ -1207,6 +1208,7 @@
3xplanet.com
3xplanet.net
3xplanetimg.com
3xxx.pro
40030d.com
400ks.com
4022011.com
@ -1851,6 +1853,8 @@
69tubesex.com
69vj.com
69xporn.com
69xx.one
69xx560.xyz
6amc.com
6arabs.com
6asianporn.com
@ -2352,6 +2356,7 @@
91dizhi.com
91fans.org
91gay.me
91md.me
91pic.net
91porn.best
91porn.com
@ -2705,6 +2710,8 @@ aaa935.net
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com
aaagradeheadphones.com
aaakk.org
aabb1802.com
aabb1803.com
aabc.gq
aabc.ml
aac91.com
@ -6484,6 +6491,7 @@ brazzers-porno.online
brazzers-xxx.net
brazzers.com
brazzersnetwork.com
brazzersporn.mobi
brazzerstveurope.com
brazzfan.com
brdteengal.com
@ -11635,7 +11643,9 @@ financialadvisoriq.com
finchvpn.com
find-apple.com
findacard.com
findasians.live
findbare.com
findcams.live
findelasia.com
findhername.net
findjiayi.jigsy.com
@ -13944,6 +13954,7 @@ hclips.net
hcomic.net
hcomicbook.com
hcpdts.com
hd-tubes.com
hd.cssyz.xyz
hd.port0.org
hd1565.com
@ -14581,6 +14592,7 @@ homemadeanalporn.com
homemadefucktube.com
homemademoviez.com
homemadepornclip.com
homemadevids.net
homemoviestube.com
homenet.org
homeperversion.com
@ -15615,6 +15627,7 @@ innermongolia.org
innovations-i.com
inoreader.com
inpatnet.org
inporn.com
inquirer.net
insecam.org
insidefilms.com
@ -16449,6 +16462,7 @@ jennylist.xyz
jeongfamily.net
jepic.org
jerk-porn.com
jerk24.com
jerkdolls.com
jerkdude.com
jerkmate.com
@ -17984,6 +17998,7 @@ louislegrand.org
lout.com
love100girl.com
love4fm.com
love4porn.com
love6.tv
love7.xyz
loveamateurfacials.com
@ -18268,6 +18283,7 @@ ma
ma.hao123.com
ma1lib.org
ma8009.com
maa1809.com
maa1815.com
maasstadbv.com
mabelleepoque.ch
@ -18617,6 +18633,7 @@ matthias.wimmer.tel
mattwilcox.net
mature-amateur-sex.com
mature-porn-flix.com
maturefuck.cc
maturejp.com
matureladiesxxx.com
matureporner.com
@ -19343,9 +19360,11 @@ mol.im
molesports.com
molihua.org
mom-gfs.com
mom-sex-videos.com
mom50.com
momami18.livedoor.blog
momentumms.com
momfucktube.com
momhomeporn.com
mommyfucktube.com
mommystoytime.com
@ -22620,6 +22639,7 @@ pornoreino.com
pornorips.com
pornos.live
pornoscanner.com
pornosex.cam
pornosfilmes.com
pornoslon.me
pornosphere.com
@ -22701,6 +22721,7 @@ pornwebmasters.com
pornwhite.com
pornwhitelist.com
pornworms.com
pornxnxxmovies.com
pornxp.com
pornxp.net
pornxp.org
@ -24565,6 +24586,7 @@ sexgamesbox.com
sexgamesclub.com
sexgangsters.com
sexharlot.com
sexhd.fun
sexhd.pics
sexhdmovs.com
sexhdxxx.com
@ -24575,6 +24597,7 @@ sexhub.red
sexhubhd.com
sexidude.com
sexiframe.com
sexindians.cc
sexinsex.net
sexiranian.party
sexix.net
@ -24583,6 +24606,7 @@ sexjobs.it
sexkorea.net
sexlikereal.com
sexmadeathome.com
sexmature.club
sexmerci.com
sexmix.net
sexmomsex.com
@ -24633,7 +24657,9 @@ sexualhentai.net
sexuhot.com
sexuria.com
sexvideo12com.pro
sexvideos.host
sexvideos.tel
sexvids.cc
sexvr.com
sexwebvideo.com
sexwithhorse.net
@ -26389,6 +26415,7 @@ teenporngallery.net
teenport.com
teenqueens.net
teenrave.org
teensex.me
teensinasia.com
teensloveanal.com
teensloveporn.net
@ -29498,6 +29525,7 @@ wikinews.org
wikipedia.com
wikipedia.moesalih.com
wikipedia.org
wikiporn.tv
wikiquote.org
wikisexguide.com
wikisource.org
@ -33913,6 +33941,7 @@ xnxx-com.cfd
xnxx-sex-tube.com
xnxx-sex-videos.com
xnxx-teens.com
xnxx-tv.net
xnxx-xxx.win
xnxx.com
xnxx.health
@ -34094,6 +34123,7 @@ xxmap1.xyz
xxmap2.club
xxmhost.cc
xxmovz.com
xxnx.rest
xxnxx-porn.com
xxnxx-sex.com
xxset.net
@ -34194,6 +34224,7 @@ xxxtubenote.com
xxxtubeset.com
xxxtubezoo.com
xxxv.mobi
xxxvideo.one
xxxvideo.vip
xxxvideo.world
xxxvideoamatoriali.com
@ -34597,6 +34628,7 @@ yourtango.com
yourtrap.com
yourvoyeurvideos.com
yourwifemymeat.com
yourxxxvideos.pro
yousekan.com
yousendit.com
youshun12.com

File diff suppressed because it is too large Load Diff

View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sing-box
PKG_VERSION:=1.2.0
PKG_VERSION:=1.2.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=ec70c2eecf85788e82c29ec4ca129e25292d5fc66a510b4b713fe337650740a9
PKG_HASH:=0f304b75c2e9f61e3f7808f23fe8fbe08161553475d9bec0dea4a5acf4452d2d
PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILE:=LICENSE