update 2022-07-08 08:53:20

luci-app-bypass/luasrc/controller/bypass.lua

@@ -2,7 +2,6 @@ module("luci.controller.bypass",package.seeall)
 local http = require "luci.http"
 local api = require "luci.model.cbi.bypass.api"
 local xray = require "luci.model.cbi.bypass.xray"
-local trojan_go = require "luci.model.cbi.bypass.trojan_go"
 function index()
 	if not nixio.fs.access("/etc/config/bypass") then
 		return
@@ -29,8 +28,6 @@ function index()
 	entry({"admin", "services", "bypass", "xray_update"}, call("xray_update")).leaf = true
 	entry({"admin", "services", "bypass", "v2ray_check"}, call("v2ray_check")).leaf = true
 	entry({"admin", "services", "bypass", "v2ray_update"}, call("v2ray_update")).leaf = true
-	entry({"admin", "services", "bypass", "trojan_go_check"}, call("trojan_go_check")).leaf = true
-	entry({"admin", "services", "bypass", "trojan_go_update"}, call("trojan_go_update")).leaf = true
 	entry({'admin', 'services', "bypass", 'ip'}, call('check_ip')) -- 获取ip情况
 	entry({"admin", "services", "bypass", "status"}, call("status")).leaf = true
 	entry({"admin", "services", "bypass", "socks_status"}, call("socks_status")).leaf = true
@@ -155,25 +152,6 @@ function xray_update()
 	http_write_json(json)
 end
 
-function trojan_go_check()
-	local json = trojan_go.to_check("")
-	http_write_json(json)
-end
-
-function trojan_go_update()
-	local json = nil
-	local task = http.formvalue("task")
-	if task == "extract" then
-		json = trojan_go.to_extract(http.formvalue("file"), http.formvalue("subfix"))
-	elseif task == "move" then
-		json = trojan_go.to_move(http.formvalue("file"))
-	else
-		json = trojan_go.to_download(http.formvalue("url"))
-	end
-
-	http_write_json(json)
-end
-
 function get_iso(ip)
     local mm = require 'maxminddb'
     local db = mm.open('/usr/share/bypass/GeoLite2-Country.mmdb')

luci-app-bypass/luasrc/model/cbi/bypass/servers.lua

@@ -25,13 +25,13 @@ o.rmempty=false
 o=s:option(DynamicList,"subscribe_url",translate("Subscribe URL"))
 o.rmempty=true
 
-o=s:option(ListValue,"filter_mode",translate("Filter Words Mode"))
+o = s:option(Value, "filter_words", translate("Subscribe Filter Words"))
-o:value("",translate("Discard Mode"))
+o.rmempty = true
-o:value(1,translate("Keep Mode"))
+o.description = translate("Filter Words splited by /")
 
-o=s:option(Value,"filter_words",translate("Subscribe Filter Words"))
+o = s:option(Value, "save_words", translate("Subscribe Save Words"))
-o.rmempty=true
+o.rmempty = true
-o.description=translate("Filter Words splited by /")
+o.description = translate("Save Words splited by /")
 
 o=s:option(Button,"update_Sub",translate("Update Subscribe List"))
 o.inputstyle="reload"

luci-app-bypass/root/etc/uci-defaults/luci-bypass

@@ -16,7 +16,7 @@ EOF
 
 if [[ "$(grep "option type 'vless'" /etc/config/bypass)" || "$(grep "option type 'vmess'" /etc/config/bypass)" ]]; then
 sed -i "s/option uuid/option vmess_id/" /etc/config/bypass
-for i in {1..100}
+for i in {0..100}
 do
 	uci -q set bypass.@servers[$i].type='v2ray'
 	[ "$(uci -q get bypass.@servers[$i].type)" == 'vless' ] && uci -q set bypass.@servers[$i].v2ray_protocol='vless' || uci -q set bypass.@servers[$i].v2ray_protocol='vmess'

luci-app-bypass/root/usr/share/bypass/by-switch

@@ -122,12 +122,12 @@ curl_check(){
 	case $type in
 		ss|ssr)
 			$cmd -c $J >/dev/null 2>&1 &;;
-		v2ray)
+		v2ray|hysteria)
-			$S/genv2config $1 tcp 0 $lport $ip > $J
+			$S/gen_config $1 tcp 0 $lport $ip > $J
 			sed -i 's/\\//g' $J
 			$cmd -c $J >/dev/null 2>&1 &;;
 		trojan)
-			$S/gentrojanconfig $1 client $lport $ip > $J
+			$S/gen_config $1 client $lport $ip > $J
 			sed -i 's/\\//g' $J
 			$cmd --config $J >/dev/null 2>&1 &;;
 		naiveproxy)

luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt

@@ -3325,6 +3325,7 @@
 6feb9e3f20.com
 6ff2f7bf3d.com
 6fxtpu64lxyt.com
+6glece4homah8dweracea.com
 6gt.cc
 6gustis.xyz
 6h04j.bemobtrk.com
@@ -10569,6 +10570,7 @@ affiz.net
 afflat3a1.com
 affluencepaymentlandscape.com
 affluentlathe.com
+affluentmirth.com
 affluentshinymulticultural.com
 affordspoonsgray.com
 affpixel.adfalcon.com
@@ -11818,6 +11820,7 @@ amersports.demdex.net
 amersports.tt.omtrdc.net
 amethyst.zappos.com
 amexcadrillon.com
+amfennekinom.com
 amfi.gou.sogou.com
 amgardevoirtor.com
 amgdgt.com
@@ -13040,6 +13043,7 @@ anti-bot.baidu.com
 anti-cheat.info
 anti.allcryptoz.net
 antiadblocksystems.com
+antibioticborough.com
 antiblock.info
 anticipatedlying.com
 anticipationbelieved.com
@@ -15247,6 +15251,7 @@ atconnect.npo.nl
 atdeerlinga.com
 atdmt.com
 atdmt.speedera.net
+atdrifblimor.com
 atdrilburr.com
 atedquali.one
 atedra.com
@@ -15276,6 +15281,7 @@ athletethrong.com
 athleticssoften.com
 athyouglas.xyz
 ati-a1.946d001b783803c1.xhst.bbci.co.uk
+atici.net
 atifwears.com
 atilohdxsg.com
 atinternet.com
@@ -15313,6 +15319,7 @@ atmasroofy.com
 atmetagrossan.com
 atmib.com
 atmnjcinews.pro
+atmosphereblankjustly.com
 atmosphericpenitentgate.com
 atmotechsolution.co.in
 atmyeducat.xyz
@@ -15333,6 +15340,7 @@ atozpumps.com
 atp.io
 atpanchama.com
 atpanel.com
+atperson.com
 atplay.cn
 atr.adsmovil.com
 atrace.chelaile.net.cn
@@ -16293,6 +16301,7 @@ axion.iad.appboy.com
 axioux.com
 axisbank.tt.omtrdc.net
 axislogger.appspot.com
+axisnuisance.com
 axiwyni.cn
 axjfkc.kobayashi.co.jp
 axjraxoegws.xyz
@@ -16798,6 +16807,7 @@ baetrf.com
 baffledzein.com
 bafsxyiknk.xyz
 bagbeam.com
+bagfuladjectiveinvade.com
 baggageaccomplishfrom.com
 baggageconservationcaught.com
 baggernuclein.com
@@ -17824,6 +17834,7 @@ beap.adss.yahoo.com
 beap.gemini.yahoo.com
 beap1.cb.g01.yahoodns.net
 bearad.com
+bearagriculture.com
 bearcatpumps.com.cn
 bearlocker.com
 bearsdisdainmathematics.com
@@ -18653,6 +18664,7 @@ bigmining.com
 bigmir.net
 bigmobileads.com
 bigosext69.com
+bigotpenniless.com
 bigpipes.co
 bigprizesonline.com
 bigpulpit.com
@@ -19634,6 +19646,7 @@ bookbudd.com
 bookfurry.com
 bookgr8.com
 bookierenewprovidence.com
+bookieunreasonablepriority.com
 bookingdragon.com
 bookljlihooli.com
 booklstfree.com
@@ -21294,6 +21307,7 @@ ca4-bid.adsrvr.org
 ca4.revieworbit.com
 ca4363f2035eb8674cc42e2787ffb3bb.bar
 ca4ec6874a33a13.com
+ca4psell23a4bur.com
 ca58d94915.com
 ca638b6c5a45059.com
 ca65b1531c.com
@@ -23239,6 +23253,7 @@ cephalanthuseoccidu4entalis.com
 cephidelixed.com
 ceppartner.com
 ceqmuhkawv.xyz
+cer43asett2iu5m.com
 ceraitoa.com
 ceramel.com.br
 ceramicalafortaleza.com
@@ -23663,6 +23678,7 @@ chenhao.name
 chenjie.site
 chenliang.link
 chenmujiang.com.cn
+cheno3yp5odt7iume.com
 chenqi.vip
 chenqinghui.xyz
 chenshengyu.cn
@@ -23699,6 +23715,7 @@ cheynewalk.com
 chezalice.co.za
 chfpgcbe.com
 chgdf.cn
+chgzguhkue.com
 chhajjaart.com
 chhetrapal.edu.np
 chhlbdyxexdswcr.xyz
@@ -25365,6 +25382,7 @@ cod.southmoney.com
 cod1-ruv.anonimayzer.site
 codacy.pubmatic.com
 codata.ru
+codbankauthors.com
 codblessit.com
 code.33shangyou.com
 code.37cs.com
@@ -25524,6 +25542,7 @@ coinsicmp.com
 coinsprofit.com
 coinstake.io
 cointent.com
+cointrade.world
 cointraffic.io
 coinversus.com
 coinverti.com
@@ -26353,6 +26372,8 @@ computerworldcom.112.2o7.net
 computeterrifyingobdurate.com
 comr.me
 comrade.by
+comradecrumblehari.com
+comradespoon.com
 comsatnet.com
 comscore.com
 comtamutthang.com
@@ -29509,6 +29530,7 @@ d7dc491d44.com
 d7dza8s7j2am6.cloudfront.net
 d7f0c3ee7442.bitsngo.net
 d7f18644.dr.youme.im
+d7ig4ieghb8arika.com
 d7s26.xyz
 d8.mobaders.com
 d8.sina.com.cn
@@ -30158,6 +30180,7 @@ dawin.tv
 dawmal.com
 dawn3host.com
 dawnnationaladvertiser.com
+dawtona.dev.goldensystem.pl
 dawwscr.cn
 dawyjkcdmfxuqh.xyz
 daxinghuo.com
@@ -30179,6 +30202,7 @@ dazhantai.com
 dazhi360.cn
 dazhonghua.cn
 dazibenwm.com
+dazzlecollections.co.za
 dazzlevents.co.uk
 db-ip.com
 db.cjtcc.cn
@@ -30467,6 +30491,7 @@ dealerobjections.com
 dealerrelations.cargurus.com
 dealersuccess.drivedominion.com
 dealingdisarrayanniversary.com
+dealingincrease.com
 deals.macupdate.com
 dealsnbuy.com
 dealspure.com
@@ -30960,6 +30985,7 @@ desktopmessages.com
 desktopnotificationshub.com
 desky.xyz
 deslncsiq.com
+desnumelom.com
 desolatethings.com
 desolatewreck.com
 despairpsalmmuch.com
@@ -32818,6 +32844,7 @@ draggedlockdown.com
 dragon.moneycoach.io
 dragoncent.com
 dragonfly-cbd.us
+dragonfruitting.com
 dragonsniffcashmere.com
 dragonspontaneous.com
 dragzebra.com
@@ -34342,6 +34369,7 @@ e65386d3.api.splkmobile.com
 e6603.g.akamaiedge.net
 e66gg.com
 e672t.bemobtrk.com
+e67repidwnfu7gcha.com
 e6g804q.cn
 e7.espncdn.shop
 e70.xyz
@@ -34512,6 +34540,7 @@ earphonesvehicleexploded.com
 earplugmolka.com
 earth.24x7wpsupport.com
 earthlnkpsplive.122.2o7.net
+earthmach.co.za
 earthmotherpublishing.com
 earthquakeend.com
 earthquakescarf.com
@@ -36073,6 +36102,7 @@ engineerpopular.com
 engineseeker.com
 enginsquawks.cam
 englandhogmane.com
+englerbraw.com
 englingedrxa.club
 englishcereals.com
 englishheadlight.com
@@ -36252,6 +36282,7 @@ ep4p.com
 epac.dz
 epacash.com
 epailseptox.com
+epam.vip
 epauwhee.com
 epcocmthiaam.com
 epdgdoifkbdq.xyz
@@ -36401,6 +36432,7 @@ erkesi.cn
 erkhxw.com
 erlier.com
 erlpbwy.cn
+erm5aranwt7hucs.com
 ermitteedi.biz
 erna.xyz
 ernestindeedtradition.com
@@ -38056,6 +38088,7 @@ faucetduck.com
 faucons.viessmann.fr
 faultsderange.com
 faultspiano.com
+faultsspeck.com
 faultycanvas.com
 faultyfowl.com
 faunlesnuff.co
@@ -38442,6 +38475,7 @@ festaporno.com
 festinus.xyz
 festivaldelicious.com
 festivalwalletmuggy.com
+festivefranchisetorrent.com
 festusthedrag.com
 festyy.com
 fesurvivial.club
@@ -38766,6 +38800,7 @@ finnan2you.org
 finplus.umeng.com
 finsmart.ro
 fintechpi.com
+finvest.rs
 fioienuqldw.com
 fiorenetwork.com
 fiowtf.hyggee.com
@@ -43771,6 +43806,7 @@ gynietrooe.com
 gynojxmgj.xyz
 gyofhxepanmkgx.com
 gyofsmowj.com
+gyoyunikimchoe.com
 gyppedsquiss.com
 gypsiedjilt.com
 gypsyardently.com
@@ -45171,6 +45207,7 @@ hit.8digits.com
 hit.acstat.com
 hit.analytics.nexonm.com
 hit.api.useinsider.com
+hit.c97.org
 hit.darmoweliczniki.pl
 hit.demirorenteknoloji.com
 hit.duhnet.tv
@@ -47141,6 +47178,7 @@ id528.com
 id5576.al21.luxup.ru
 id6.me
 ida.cnool.net
+idahoanpavies.com
 idasai.com
 idbkfy.kango-roo.com
 idbqukcgdxvi.xyz
@@ -51810,6 +51848,7 @@ jugerfowells.com
 juggledcample.website
 jugglu.com
 jugojndgyggjdwo.xyz
+jugust.com
 juhepen.com
 juhuisuan.com
 juiceads.net
@@ -52122,6 +52161,7 @@ jzzd.ink
 k-analytix.com
 k-antiques.jp
 k-mart.co.in
+k-s-j.jp
 k-service.spb.ru
 k.16vcd.com
 k.85wa.cn
@@ -52515,6 +52555,7 @@ kennetting.club
 kenomal.com
 kensingtonglobalservices.co.uk
 kenskitscurt.com
+kentandcowines.com.au
 kenudo.net
 kenxn.com
 kenxq.com
@@ -53805,6 +53846,7 @@ lambdafoobar.de
 lamberserer.club
 lambingsyddir.com
 lambweston.ga
+lame7bsqu8barters.com
 lameguard.ru
 lameletters.com
 lamentrather.com
@@ -62318,6 +62360,7 @@ mossyitalian.com
 most-popular-info.g5e.com
 mostaboutm.biz
 mostat.wps.cn
+mostlytreasure.com
 motability.report-uri.io
 motefiles.com
 motfanner.com
@@ -69751,9 +69794,11 @@ persuadesupport.com
 pertapie.net
 pertclinic.com
 pertersacstyli.com
+pertfair.com
 pertholin.com
 pertyvaluati.com
 peruse.ai
+peruseinvitation.com
 pervas.top
 pervasivebacksrate.com
 pervertmine.com
@@ -70310,6 +70355,7 @@ pilgrimarym.club
 piliangzhuce.cn
 pilipala.info
 pillageacting.com
+pillarvolcano.com
 pillowspopes.com
 pillsmeals.com
 pillsofecho.com
@@ -73742,6 +73788,7 @@ portscalculateappease.com
 portserratic.com
 portsquiz.com
 portugueseexcessivelygospel.com
+portulacaolera.com
 poruvosty.com
 pos.appsdemo.xyz
 pos.baidu.com
@@ -74261,6 +74308,7 @@ prhhqo.vintagevoyage.ru
 pri12mel.com
 priceplaneadulthood.com
 pricestern.top
+prickclenched.com
 pricklydebt.com
 pricklyplastic.com
 prickutmostperjury.com
@@ -76814,6 +76862,7 @@ qweewq2021.site
 qweqwe.mctvhp.cn
 qwer0001.top
 qwerfdx.com
+qwerol.gq
 qwertize.com
 qwerty24.net
 qwertysingapore.com
@@ -79745,6 +79794,7 @@ ru.redtram.com
 ru.track.uc.cn
 ru.ucweb.com
 ru4.com
+ru6sapasgs8tror.com
 ruamupr.com
 ruan.cn
 ruan88.com
@@ -81350,6 +81400,7 @@ schbmnibqpyuo.xyz
 schedu.teicrete.gr
 scheduleapi.xyz
 schemas.android.com
+schemas.medicareplanupgrade.xyz
 scheme.adywind.com
 schemea.prinit.net
 schemeabsolutejanuary.com
@@ -83604,6 +83655,7 @@ shorthouse.com
 shortpixel.ai
 shorug.cn
 shostobs.net
+shotstopers.com
 shotyhub.xyz
 shoubsee.net
 shoudan6.press
@@ -87716,6 +87768,7 @@ stargoug.com
 starinfotechcollege.com
 starkhelperidentifier.com
 starkpropagandaattacks.com
+starkshrewd.com
 starlayer.com
 starlizard.com.cn
 starluckycentre.com
@@ -89015,6 +89068,7 @@ stchurch.tw
 stcounter.com
 stdirection.com
 stdst.cn
+ste23allas5ri6va.com
 steadfastseat.com
 steadfastsound.com
 steadfastsystem.com
@@ -89576,6 +89630,7 @@ successcompassion.com
 successfulscent.com
 successfultogether.co.uk
 successionflimsy.com
+successivebaby.com
 successtorynm.carte-gr.total.fr
 suchmaschinen-ranking-hits.de
 suchshame.com
@@ -90895,6 +90950,7 @@ ta3nfsordd.com
 ta5ast2ffeyvhjitde.com
 ta80.com
 taadr.com
+taaqhr6axacd2um.com
 tab.dellrescue.com
 tabibmd.com
 tabici.com
@@ -91351,6 +91407,7 @@ taroads.com
 tarot-sunce.com
 tarrilyathenee.com
 tarsuscaul.com
+tartarsharped.com
 tartator.com
 tartinetmoi.fr
 tartoals.net
@@ -92789,6 +92846,7 @@ timessmalldraught.com
 timestampindia.com
 timesync.live
 timeterritory.com
+timetogof.at
 timetunnel.net
 timetwig.com
 timewarner.122.2o7.net
@@ -96714,6 +96772,7 @@ tumuta.xyz
 tunatastesentertained.com
 tundbjrjrqotjag.xyz
 tune-mobile.com
+tunefatigueclarify.com
 tunein.adswizz.com
 tuniaf.com
 tunihea.top
@@ -96869,6 +96928,7 @@ tw13b093.sandai.net
 tw2.adserver.yahoo.com
 twackle.com
 twaffdpnt.com
+twangedcored.com
 twart.myfirewall.org
 twazzyoidwlfe.com
 twb98.com
@@ -97803,6 +97863,7 @@ uncurstcrumbs.com
 undailysnout.com
 undard.com
 undedfracted.club
+undeenardoo.com
 undens.com
 under2given.com
 underarmour.tt.omtrdc.net
@@ -98993,6 +99054,7 @@ v4dwkcv.com
 v4ip.cyou
 v4r9z-3jgr1.ads.tremorhub.com
 v4r9z-fjydq.ads.tremorhub.com
+v4yleins27hv.com
 v5.cnzz.com
 v5.juzi.cn
 v5ad.com
@@ -102312,6 +102374,7 @@ wibengineering.com
 wickedlongingbelfry.com
 wickedreports.com
 wickoolt.com
+widaimty.com
 widdiesbrawns.com
 widenceaudges.com
 widenetworks.net
@@ -102679,6 +102742,7 @@ wjyljl.cn
 wjyxi.wnerofro.online
 wk123.97sk.vip
 wk4x5rdtoz2tn0.com
+wka4jursurf6.com
 wka8.com
 wkacpqtl.com
 wkanc.51y5.net
@@ -103001,6 +103065,7 @@ worlanned.pro
 world-news-filter.info
 world.rw.yieldmo.com
 worldactualstories.com
+worldbusiness.life
 worldcupstreamme.imageshack.host
 worldeconomicnews.xyz
 worldflagcounter.com
@@ -103170,6 +103235,7 @@ wr-im.catad5959.com
 wr.da.netease.com
 wr.digitaldsp.com
 wr.yiyouliao.com
+wrangleexertion.com
 wrap.tradedoubler.com
 wrapper-vast.adsafeprotected.com
 wrapper.lemde.fr
@@ -104106,6 +104172,7 @@ www.alhayatlaundry.ae
 www.aliyoo999.com
 www.aljubab.com
 www.allenedmonds.com
+www.alleviatepracticableaddicted.com
 www.allhugeblog.com
 www.allhugenewz.com
 www.allnewsupdates.info
@@ -104785,6 +104852,7 @@ www.daughtersanything.com
 www.dava.ero-advertising.com
 www.davion.plus.com
 www.dawa.ero-advertising.com
+www.daxberger.at
 www.day66.com
 www.dazzlevents.co.uk
 www.dbg52463.moatads.com
@@ -107069,6 +107137,7 @@ www.suffocatepremise.com
 www.suitedeadlockhandsome.com
 www.summerhamster.com
 www.sun-inet.or.jp
+www.sunflowerlaboratory.in
 www.sunnyseries.com
 www.suozmtcc.com
 www.supera.com.br
@@ -108490,6 +108559,7 @@ xhydrs.cn
 xhz1.me
 xhzmjs.com
 xhzugaqnqo.com
+xhzz3moj1dsd.com
 xi.liuxiaoer.com
 xi666.com
 xi9p.com
@@ -110951,6 +111021,7 @@ za.ads.justpremium.com
 za.zdn.vn
 za.zingnews.vn
 za5.net
+zaamuvqteety.com
 zabanit.xyz
 zabavazaodrasle.com
 zacao.wang
@@ -111519,6 +111590,7 @@ zkads.cc
 zkbkcdhieqcoev.com
 zkc5.fleurancenature.fr
 zkczbti.cn
+zkczzltlhp6y.com
 zkit.club
 zkjh.info
 zkmhhr1fr79z.dictionary.basabali.org

luci-app-openclash/luasrc/view/openclash/sub_info_show.htm

@@ -40,8 +40,8 @@ function progressbar_<%=idname%>(v, m, pc, np, f, t, tr) {
 		return String.format(
 			'<div style="width:250px; max-width:500px; position:relative; border:1px solid #999999; border-radius: 6px">' +
 			(pc <= 50 ? '<div style="background-color:#9edd9e; width:%d%%; height:36px; border-radius: 6px">' : (pc > 50 && pc <= 80 ? '<div style="background-color:#ffc99f; width:%d%%; height:35px">' : '<div style="background-color:#ffb9b9; width:%d%%; height:35px">')) +
-			'<div style="position:absolute; left:0;' + (t == "null" ? 'top:12px;' : 'top:0;') + 'text-align:center; width:100%%">' +
+			'<div style="position:absolute; left:0;' + (tr == "null" ? 'top:12px;' : 'top:0;') + 'text-align:center; width:100%%">' +
-			'<small>%s '+ (f ? f : '/') +' %s ' + (np ? "" : '(%s%%)') + (t == "null" ? '<div style="visibility: hidden;">' : '<div style="visibility: visible;">') + '%s (<%:Remaining%> %s <%:days%>)</small>' +
+			'<small>%s '+ (f ? f : '/') +' %s ' + (np ? "" : '(%s%%)') + (tr == "null" ? '<div style="visibility: hidden;">' : '<div style="visibility: visible;">') + '%s (<%:Remaining%> %s <%:days%>)</small>' +
 			'</div>' +
 			'</div>' +
 			'</div>', pc, v, m, pc, t, tr