From 4ee4a37c5e791f790953bb4022170f19f21e3237 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:02:39 +0800 Subject: [PATCH] update 2022-09-22 09:02:39 --- .../root/etc/mosdns/rule/serverlist.txt | 46 +++++++++++++++++++ .../model/cbi/shadowsocksr/client-config.lua | 8 +++- luci-app-ssr-plus/po/zh-cn/ssr-plus.po | 3 ++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt index 83baf266d..34839d117 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt @@ -6924,6 +6924,7 @@ abogadosquito.ec abolishcareful.com aboriginalboats.com aboriginalhubby.com +aborld.com abort-count.smbeat.jp abortmaydesirable.com abostimp.com @@ -11922,6 +11923,7 @@ af4a.adj.st af7d9927.dr.youme.im af89dacd-4aec-4ac1-9d52-2a66ce5e4fb5.edge.permutive.app afa9bdfa63bf7.com +afaaugct.com afairweb.com afamedya.com afawqvvy.xyz @@ -12169,6 +12171,7 @@ afterdownloads.com afterthoughtdevil.com afterthoughthassledos.com afterwardscaress.com +afterwardspenal.com afterwardstationquestions.com aftist.com aftjohnanodes.com @@ -21676,6 +21679,7 @@ boat3deer.com boatheeh.com boatlyseljuk.com boatnet.cosmicstresser.cf +boatobservefreshman.com boayipids.com bob-recs.com bob.dmpxs.com @@ -22208,6 +22212,7 @@ brattyogor.com braun634.com bravebone.com bravecalculator.com +bravelynationalivory.com bravelywade.com bravenetmedianetwork.com bravestone.ru @@ -24324,6 +24329,7 @@ catalogdiscovery.com catalpaaxillae.com cataractdisinteresteddressing.com cataractencroach.com +cataractoutputprogramming.com cataractsallydeserves.com cataracttragedy.com catastropheillusive.com @@ -28783,6 +28789,7 @@ colssimo.fr colsuchy.com coltagainst.pro coltseaman.com +coluim.com columndatabasesglamour.com columnisterror.com colvk.viki.io @@ -28961,6 +28968,7 @@ compatexchange1.trafficmanager.net compdate.my03.com compe-nickel.fr compendtorulus.cam +compensationpropulsion.com compensions.pro comperesuccessive.com compesat.com @@ -29654,6 +29662,7 @@ convertfilenow.com convertflow.co convertglobal.com converti.se +convertibleconsculpture.com convertlanguage.com convertmb.com convertpdfpro.com @@ -29950,6 +29959,7 @@ cotchaug.com cotdrollback.com coterybulrush.com cothdesigns.com +cotihgcqkh.com cotlandguile.com couas.com couchcoaster.jp @@ -32298,6 +32308,7 @@ d3f4nuq5dskrej.cloudfront.net d3fkv551xkjrmm.cloudfront.net d3g.qq.com d3g5ovfngjw9bw.cloudfront.net +d3hib26r77jdus.cloudfront.net d3hitamb7drqut.cloudfront.net d3hj4iyx6t1waz.cloudfront.net d3hs51abvkuanv.cloudfront.net @@ -32598,6 +32609,7 @@ daima1.18tzx.com daimlerde.tt.omtrdc.net daimude.com dainaith.net +daincautela.com daineely.net dainifei3.com daipeept.net @@ -34268,6 +34280,7 @@ deviouscoupbrutally.com devisharpattalic.com devkywiamloc.com devlog-upload.mihoyo.com +devoidmoderateale.com devoidsagacious.com devotedvarnish.com devotionalclicks.amazingfacts.org @@ -37018,6 +37031,7 @@ dzhjmp.com dzhss.cn dzienkudrow.com dzjhok.teufelaudio.at +dzjv9gbu8a.com dzjzg.com dzl.baidu.com dzletao.com @@ -42668,6 +42682,7 @@ fl.a.ki fl.adpxl.co fl1rtyparty.com fl5dpe.oui.sncf +fla4n6ne7r8ydcohcojnnor.com flabbyyolkinfection.com flabsbosons.com flacnet.com @@ -48123,6 +48138,7 @@ handycam.alicdn.com handyfield.com handyfireman.com handymansurrender.com +hangersbozal.com hangfly.net hangihqcfpxlxqh.xyz hangoutairbags.com @@ -52588,6 +52604,7 @@ incomingmeritmaternal.com incommholdings.tt.omtrdc.net incompatiblemisterfarmer.com incompetentjoke.com +incomprehensibleacrid.com incomprehensibleanguishdisprove.com inconceivableascertained.com inconsistencyriskyan.com @@ -57830,6 +57847,7 @@ kt5850pjz0.com kta.etherscan.com ktautdkiixlunl.com ktdlsb.com +ktdowtedr.com ktfckd.com ktggbk.com kthwaalso.xyz @@ -57905,6 +57923,7 @@ kuku99.com kukumbara.com kukury2hf8nd09.com kulcdtw.cn +kuleqasfors.one kuloffer.com kuluckaci.com kuludelo.com @@ -59870,6 +59889,7 @@ literatelight.com literaturematt.com literpeore.com litestatis.ekatox.com +lithogsicket.com lithyphiomia.com litingrequarned.com litix.io @@ -64161,6 +64181,7 @@ matomo.tarnkappe.info matomo.unicaf.org matomy.adk2.co matomy.com +matqqagvkaaftr.com matrimoniale3x.ro matrimonyfiles.com matrix-cash.com @@ -68610,6 +68631,7 @@ nameads.com namedq.com namel.net nameluxuries.com +namelymutiny.com namelyvulgarquote.com namemek.com namesakeoscilloscopemarquis.com @@ -69104,6 +69126,7 @@ nesnts.cn nessainy.net nestcook.com nestledmph.com +nestleexperiment.com nesystersp.club neszmely.eu net-ad-vantage.com @@ -70346,6 +70369,7 @@ notify.traffic-media.co.uk notify.wps.cn notify1.brucelead.com notify6.com +notifycertainty.com notifyday.com notifyon.com notifypicture.info @@ -75216,6 +75240,7 @@ personalcredit-cardscreditjourney-com.stackstaging.com personalicanvas.com personalization.bloomberg.com personalized-tee-shirts.com +personallychar.com personallydf.com personalservice.vip personsboxingaddiction.com @@ -82897,6 +82922,7 @@ radar.imgsmail.ru radar.metrica.yandex.com radar.metrika.yandex.com radarconsultation.com +radarproposalunfortunately.com radarstats.com radarurl.com radarwitch.com @@ -83849,6 +83875,7 @@ refurt.com refuserates.com refutationexcessiveglamour.com refutationoverwhelming.com +refutationtiptoe.com refwkk.cas.sk refwkk.mojewypieki.com refwkk.topky.sk @@ -85134,6 +85161,7 @@ rodo.agora.pl rodoserv.pt rodplxlpc.com roduster.com +roebuckwagged.com roeraz.com roesdwaibly.com roewnand.biz @@ -87010,6 +87038,7 @@ sahfucdysloguyg.xyz sahishodilitt.info saicmotor.fr said3page.com +saidmakeoverfabric.com saifaldin.com saifusty.net saikeela.net @@ -89004,6 +89033,7 @@ sematext.com semenpadanghospital.co.id semescroute.com semi-cod.com +semidapt.com semifiboolongs.com semiglorifyseek.com seminaraileenreschedule.com @@ -90973,6 +91003,7 @@ slaunch.shopcanopy.com slaunch.spectrumtherapeutics.com slaveforgetfulsneak.com slaverylavatoryecho.com +slaveryourstender.com slavesenviablegrammar.com slavesubmarinebribery.com slavewindows.com @@ -91034,6 +91065,7 @@ slideboc.fr slidecaffeinecrown.com slidedeck.com slideff.com +slidehistoricchaos.com slides.discovery.tom.com slieindy.top slietap.com @@ -92670,6 +92702,7 @@ sodhef.com sodiumcupboard.com sodoit.com soeiwxbhpeuayi.xyz +sofcryingfo.xyz sofhoursdoin.biz sofinpushpile.com sofire.baidu.com @@ -98737,6 +98770,7 @@ tedo-stats.de tedropkinthenligh.pro tedruptcyfal.info tedxbissallard.com +teefuthe.com teeglimu.com teelikeableaspirant.com teemingaymoro.com @@ -99915,6 +99949,7 @@ timetunnel.net timetwig.com timewarner.122.2o7.net timi.pro +timidtraumaticterminate.com timingaskew.com timingrunaway.com timmerbedrijfduineveld.nl @@ -107469,6 +107504,7 @@ vindicosuite.com vinefsnuarlxsso.xyz vinegarfactorelevator.com vinegarweb.com +vinfdv6b4j.com vinkelvej12.dk vinksuwobuebn.com vinlens.com @@ -108044,6 +108080,7 @@ vounaipu.net vouruwou.com vouuuaycwefifmi.com vowcertainly.com +voweldeck.com vowrnpkfw.com vox.amp.permutive.com voxbal.com @@ -108681,6 +108718,7 @@ waldenfarms.com walgreens.demdex.net walgreens.sc.omtrdc.net walibao.com +walkamorous.com walkedcreak.com walkinghonoured.com walkinglive.org @@ -111263,6 +111301,7 @@ wueihlouuw.com wufel.ml wufmyky.me wugfxsvcgejx.com +wuihplrxyhht.com wujiupic.com wujrx.xyz wukelansm.top @@ -112671,6 +112710,7 @@ www.diannaodian.com www.dianomi.com www.dianru.com www.diarioaldia.com.ar +www.dictatepantry.com www.diddaisycuff.com www.die13weizen.at www.diediao.com @@ -113449,6 +113489,7 @@ www.improvedevictpanther.com www.imwinnerkur.com www.inattentivehandymanpresentiment.com www.incapablepasswordease.com +www.incomprehensibleacrid.com www.inconsistencyriskyan.com www.indefinitecommitment.com www.independentendure.com @@ -113651,6 +113692,7 @@ www.kanshuapp.com www.kardust.com www.katch.ne.jp www.kawo77.com +www.kazanwhoeveryowl.com www.kc9.cn www.kebuena.com.mx www.keepass.com @@ -114247,6 +114289,7 @@ www.optcrockery.com www.optimix.cn www.optimizely.com www.oralse.cx +www.orbmatchingenough.com www.orchestraanticipation.com www.org-upgrade.com www.orion.iad.appboy.com @@ -114621,6 +114664,7 @@ www.reefseasidejunkie.com www.reflectedintegrity.com www.reflexalright.com www.refresh-js.bitbucket.io +www.refutationtiptoe.com www.refyparlemantera.mg www.regardedsaid.com www.regflow.com @@ -119114,6 +119158,7 @@ zadcyacitht.com zadelm.com zae.gzzena.com zaehler.tv +zaglushkaaa.com zagrabiti.viessmann.hr zagtertda.com zagvee.com @@ -119275,6 +119320,7 @@ zedplays.com zedsapp.com zedwhyex.com zeechumy.com +zeecoomi.net zeegreen.net zeejuthu.com zeepmedia.com diff --git a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua index 50ee56802..691f60ee7 100644 --- a/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua +++ b/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua @@ -431,16 +431,20 @@ o:depends("transport", "ws") o.rmempty = true if is_finded("v2ray") then + -- 启用WS前置数据 + o = s:option(Flag, "ws_ed_enable", translate("Enable early data")) + o:depends("transport", "ws") + -- WS前置数据 o = s:option(Value, "ws_ed", translate("Max Early Data")) - o:depends("transport", "ws") + o:depends("ws_ed_enable", true) o.datatype = "uinteger" o.default = 2048 o.rmempty = true -- WS前置数据标头 o = s:option(Value, "ws_ed_header", translate("Early Data Header Name")) - o:depends("transport", "ws") + o:depends("ws_ed_enable", true) o.default = "Sec-WebSocket-Protocol" o.rmempty = true end diff --git a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po index 9be3eb183..8bafc95fc 100644 --- a/luci-app-ssr-plus/po/zh-cn/ssr-plus.po +++ b/luci-app-ssr-plus/po/zh-cn/ssr-plus.po @@ -727,6 +727,9 @@ msgstr "WebSocket 主机名" msgid "WebSocket Path" msgstr "WebSocket 路径" +msgid "Enable early data" +msgstr "启用前置数据" + msgid "Max Early Data" msgstr "最大前置数据"