diff --git a/package/cnsztl/luci-app-openclash/Makefile b/package/cnsztl/luci-app-openclash/Makefile index c5efa6dd8f..96b618cbc1 100644 --- a/package/cnsztl/luci-app-openclash/Makefile +++ b/package/cnsztl/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.34.6 +PKG_VERSION:=0.34.7 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash index e683742f36..8f7dc47e5c 100755 --- a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash +++ b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash @@ -43,12 +43,16 @@ del_cron() } change_dns() { - uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1 - uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" - uci delete dhcp.@dnsmasq[0].resolvfile - uci set dhcp.@dnsmasq[0].noresolv=1 - uci set dhcp.@dnsmasq[0].cachesize=0 - uci commit dhcp + if [ "$1" -ne "0" ]; then + uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1 + uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#"$dns_port" + uci delete dhcp.@dnsmasq[0].resolvfile + uci set dhcp.@dnsmasq[0].noresolv=1 + [ "$2" -eq "1" ] && { + uci set dhcp.@dnsmasq[0].cachesize=0 + } + uci commit dhcp + fi } revert_dns() { @@ -353,6 +357,7 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then enable_redirect_dns=$(uci get openclash.config.enable_redirect_dns 2>/dev/null) lan_ip=$(uci get network.lan.ipaddr 2>/dev/null) direct_dns=$(uci get openclash.config.direct_dns 2>/dev/null) + disable_masq_cache=$(uci get openclash.config.disable_masq_cache 2>/dev/null) echo "第二步: 配置文件检查..." >$START_LOG yml_check "$en_mode" "$enable_custom_dns" "$CONFIG_FILE" "$BACKUP_FILE" "$START_BACKUP" grep "^ \{0,\}Proxy:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Proxy Group:" $CONFIG_FILE >/dev/null 2>&1 && grep "^ \{0,\}Rule:" $CONFIG_FILE >/dev/null 2>&1 @@ -433,9 +438,7 @@ EOF echo "${LOGTIME} Warring: OpenClash May Can Not Take Over DNS, Please Use OpenClash for Upstream DNS Resolve Server" >> $LOG_FILE sleep 5 fi - [ "$enable_redirect_dns" != "0" ] && { - change_dns - } + change_dns "$enable_redirect_dns" "$disable_masq_cache" fake_block "$en_mode" "$direct_dns" /etc/init.d/dnsmasq restart >/dev/null 2>&1 if pidof clash >/dev/null; then diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/ConnersHua.yaml b/package/cnsztl/luci-app-openclash/files/etc/openclash/ConnersHua.yaml index 7897dd7275..bbe6bac9eb 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/openclash/ConnersHua.yaml +++ b/package/cnsztl/luci-app-openclash/files/etc/openclash/ConnersHua.yaml @@ -1,58 +1,7 @@ Rule: ##source:ConnersHua -# Feeb -- DOMAIN-KEYWORD,epochtimes,REJECT -- DOMAIN-SUFFIX,881903.com,REJECT -- DOMAIN-SUFFIX,aboluowang.com,REJECT -- DOMAIN-SUFFIX,bannedbook.org,REJECT -- DOMAIN-SUFFIX,bldaily.com,REJECT -- DOMAIN-SUFFIX,china21.org,REJECT -- DOMAIN-SUFFIX,chinaaffairs.org,REJECT -- DOMAIN-SUFFIX,dajiyuan.com,REJECT -- DOMAIN-SUFFIX,dalianmeng.org,REJECT -- DOMAIN-SUFFIX,dkn.tv,REJECT -- DOMAIN-SUFFIX,dongtaiwang.com,REJECT -- DOMAIN-SUFFIX,edoors.com,REJECT -- DOMAIN-SUFFIX,epochweekly.com,REJECT -- DOMAIN-SUFFIX,falundafa.org,REJECT -- DOMAIN-SUFFIX,fgmtv.org,REJECT -- DOMAIN-SUFFIX,gardennetworks.com,REJECT -- DOMAIN-SUFFIX,gongyiluntan.org,REJECT -- DOMAIN-SUFFIX,gpass1.com,REJECT -- DOMAIN-SUFFIX,hrichina.org,REJECT -- DOMAIN-SUFFIX,huanghuagang.org,REJECT -- DOMAIN-SUFFIX,internetfreedom.org,REJECT -- DOMAIN-SUFFIX,kanzhongguo.com,REJECT -- DOMAIN-SUFFIX,lagranepoca.com,REJECT -- DOMAIN-SUFFIX,mh4u.org,REJECT -- DOMAIN-SUFFIX,mhradio.org,REJECT -- DOMAIN-SUFFIX,minghui.org,REJECT -- DOMAIN-SUFFIX,newrealmstudios.ca,REJECT -- DOMAIN-SUFFIX,ntdtv.com,REJECT -- DOMAIN-SUFFIX,ogate.org,REJECT -- DOMAIN-SUFFIX,open.com.hk,REJECT -- DOMAIN-SUFFIX,organcare.org.tw,REJECT -- DOMAIN-SUFFIX,qxbbs.org,REJECT -- DOMAIN-SUFFIX,renminbao.com,REJECT -- DOMAIN-SUFFIX,secretchina.com,REJECT -- DOMAIN-SUFFIX,shenyun.com,REJECT -- DOMAIN-SUFFIX,shenyunperformingarts.org,REJECT -- DOMAIN-SUFFIX,shenzhoufilm.com,REJECT -- DOMAIN-SUFFIX,soundofhope.org,REJECT -- DOMAIN-SUFFIX,theepochtimes.com,REJECT -- DOMAIN-SUFFIX,tiandixing.org,REJECT -- DOMAIN-SUFFIX,tuidang.org,REJECT -- DOMAIN-SUFFIX,velkaepocha.sk,REJECT -- DOMAIN-SUFFIX,watchinese.com,REJECT -- DOMAIN-SUFFIX,wixsite.com,REJECT -- DOMAIN-SUFFIX,wujie.net,REJECT -- DOMAIN-SUFFIX,wujieliulan.com,REJECT -- DOMAIN-SUFFIX,xinsheng.net,REJECT -- DOMAIN-SUFFIX,zhengjian.org,REJECT -- DOMAIN-SUFFIX,zhuichaguoji.org,REJECT - -# > Unbreak -# >> Firebase Cloud Messaging +# Unbreak +# > Firebase Cloud Messaging - DOMAIN,mtalk.google.com,DIRECT # Internet Service Provider Hijacking 运营商劫持 @@ -77,7 +26,6 @@ Rule: - DOMAIN-SUFFIX,akuai.top,Hijacking - DOMAIN-SUFFIX,atplay.cn,Hijacking - DOMAIN-SUFFIX,baiwanchuangyi.com,Hijacking -- DOMAIN-SUFFIX,bayimob.com,Hijacking - DOMAIN-SUFFIX,beerto.cn,Hijacking - DOMAIN-SUFFIX,beilamusi.com,Hijacking - DOMAIN-SUFFIX,benshiw.net,Hijacking @@ -104,6 +52,7 @@ Rule: - DOMAIN-SUFFIX,gouwubang.com,Hijacking - DOMAIN-SUFFIX,gzxnlk.com,Hijacking - DOMAIN-SUFFIX,haoshengtoys.com,Hijacking +- DOMAIN-SUFFIX,hyunke.com,Hijacking - DOMAIN-SUFFIX,ichaosheng.com,Hijacking - DOMAIN-SUFFIX,ishop789.com,Hijacking - DOMAIN-SUFFIX,jdkic.com,Hijacking @@ -208,10 +157,10 @@ Rule: # Infamous 声名狼藉 - DOMAIN-SUFFIX,kuaizip.com,Hijacking - DOMAIN-SUFFIX,mackeeper.com,Hijacking -# > Adobe +# > Adobe 奥多比 - DOMAIN-SUFFIX,flash.cn,Hijacking - DOMAIN,geo2.adobe.com,Hijacking -# > CJ Marketing +# > CJ Marketing 思杰马克丁软件 - DOMAIN-SUFFIX,4009997658.com,Hijacking - DOMAIN-SUFFIX,abbyychina.com,Hijacking - DOMAIN-SUFFIX,bartender.cc,Hijacking @@ -224,6 +173,8 @@ Rule: - DOMAIN-SUFFIX,codesoftchina.com,Hijacking - DOMAIN-SUFFIX,coreldrawchina.com,Hijacking - DOMAIN-SUFFIX,crossoverchina.com,Hijacking +- DOMAIN-SUFFIX,dongmansoft.com,Hijacking +- DOMAIN-SUFFIX,earmasterchina.cn,Hijacking - DOMAIN-SUFFIX,easyrecoverychina.com,Hijacking - DOMAIN-SUFFIX,ediuschina.com,Hijacking - DOMAIN-SUFFIX,flstudiochina.com,Hijacking @@ -237,6 +188,7 @@ Rule: - DOMAIN-SUFFIX,keyshot.cc,Hijacking - DOMAIN-SUFFIX,kingdeecn.cn,Hijacking - DOMAIN-SUFFIX,logoshejishi.com,Hijacking +- DOMAIN-SUFFIX,luping.net.cn,Hijacking - DOMAIN-SUFFIX,mairuan.cn,Hijacking - DOMAIN-SUFFIX,mairuan.com,Hijacking - DOMAIN-SUFFIX,mairuan.com.cn,Hijacking @@ -245,6 +197,7 @@ Rule: - DOMAIN-SUFFIX,makeding.com,Hijacking - DOMAIN-SUFFIX,mathtype.cn,Hijacking - DOMAIN-SUFFIX,mindmanager.cc,Hijacking +- DOMAIN-SUFFIX,mindmanager.cn,Hijacking - DOMAIN-SUFFIX,mindmapper.cc,Hijacking - DOMAIN-SUFFIX,mycleanmymac.com,Hijacking - DOMAIN-SUFFIX,nicelabel.cc,Hijacking @@ -253,6 +206,7 @@ Rule: - DOMAIN-SUFFIX,overturechina.com,Hijacking - DOMAIN-SUFFIX,passwordrecovery.cn,Hijacking - DOMAIN-SUFFIX,pdfexpert.cc,Hijacking +- DOMAIN-SUFFIX,photozoomchina.com,Hijacking - DOMAIN-SUFFIX,shankejingling.com,Hijacking - DOMAIN-SUFFIX,ultraiso.net,Hijacking - DOMAIN-SUFFIX,vegaschina.cn,Hijacking @@ -265,6 +219,34 @@ Rule: # Global Area Network # (ForeignMedia) +# (Music) +# > Deezer +# USER-AGENT,Deezer*,ForeignMedia +- DOMAIN-SUFFIX,deezer.com,ForeignMedia +- DOMAIN-SUFFIX,dzcdn.net,ForeignMedia +# > KKBOX +- DOMAIN-SUFFIX,kkbox.com,ForeignMedia +- DOMAIN-SUFFIX,kkbox.com.tw,ForeignMedia +- DOMAIN-SUFFIX,kfs.io,ForeignMedia +# > JOOX +# USER-AGENT,WeMusic*,ForeignMedia +# USER-AGENT,JOOX*,ForeignMedia +- DOMAIN-SUFFIX,joox.com,ForeignMedia +# > Pandora +# USER-AGENT,Pandora*,ForeignMedia +- DOMAIN-SUFFIX,pandora.com,ForeignMedia +# > Spotify +# USER-AGENT,Spotify*,ForeignMedia +- DOMAIN-SUFFIX,pscdn.co,ForeignMedia +- DOMAIN-SUFFIX,scdn.co,ForeignMedia +- DOMAIN-SUFFIX,spotify.com,ForeignMedia +- DOMAIN-SUFFIX,spoti.fi,ForeignMedia +# > TIDAL +# USER-AGENT,TIDAL*,ForeignMedia +- DOMAIN-SUFFIX,tidal.com,ForeignMedia +# > YoutubeMusic +# USER-AGENT,com.google.ios.youtubemusic*,ForeignMedia +# USER-AGENT,YouTubeMusic*,ForeignMedia # (Video) # > All4 # USER-AGENT,All4*,ForeignMedia @@ -282,6 +264,11 @@ Rule: # > Amazon Prime Video # USER-AGENT,InstantVideo.US*,ForeignMedia # USER-AGENT,Prime%20Video*,ForeignMedia +- DOMAIN-SUFFIX,aiv-cdn.net,ForeignMedia +- DOMAIN-SUFFIX,aiv-delivery.net,ForeignMedia +- DOMAIN-SUFFIX,amazonvideo.com,ForeignMedia +- DOMAIN-SUFFIX,llnwd.net,ForeignMedia +- DOMAIN-SUFFIX,media-amazon.com,ForeignMedia - DOMAIN-SUFFIX,primevideo.com,ForeignMedia # > Bahamut # USER-AGENT,Anime*,ForeignMedia @@ -296,12 +283,13 @@ Rule: - DOMAIN-KEYWORD,bbcfmt,ForeignMedia - DOMAIN-KEYWORD,uk-live,ForeignMedia # > DAZN +# USER-AGENT,DAZN*,ForeignMedia - DOMAIN-SUFFIX,dazn.com,ForeignMedia # > encoreTVB # USER-AGENT,encoreTVB*,ForeignMedia - DOMAIN-SUFFIX,encoretvb.com,ForeignMedia -- DOMAIN,content.jwplatform.com,ForeignMedia -- DOMAIN,videos-f.jwpsrv.com,ForeignMedia +- DOMAIN,edge.api.brightcove.com,ForeignMedia +- DOMAIN,bcbolt446c5271-a.akamaihd.net,ForeignMedia # > Fox+ & Fox Now # USER-AGENT,FOX%20NOW*,ForeignMedia # USER-AGENT,FOXPlus*,ForeignMedia @@ -330,6 +318,11 @@ Rule: - DOMAIN-SUFFIX,hulu.com,ForeignMedia - DOMAIN-SUFFIX,huluim.com,ForeignMedia - DOMAIN-SUFFIX,hulustream.com,ForeignMedia +# > ITV +# USER-AGENT,ITV_Player*,ForeignMedia +- DOMAIN-SUFFIX,itv.com,ForeignMedia +- DOMAIN-SUFFIX,itvstatic.com,ForeignMedia +- DOMAIN,itvpnpmobile-a.akamaihd.net,ForeignMedia # > KKTV # USER-AGENT,KKTV*,ForeignMedia # USER-AGENT,com.kktv.ios.kktv*,ForeignMedia @@ -346,6 +339,11 @@ Rule: # > LiTV - DOMAIN-SUFFIX,litv.tv,ForeignMedia - DOMAIN,litvfreemobile-hichannel.cdn.hinet.net,ForeignMedia +# > My5 +# USER-AGENT,My5*,ForeignMedia +- DOMAIN-SUFFIX,channel5.com,ForeignMedia +- DOMAIN-SUFFIX,my5.tv,ForeignMedia +- DOMAIN,d349g9zuie06uo.cloudfront.net,ForeignMedia # > myTV_SUPER # USER-AGENT,mytv*,ForeignMedia - DOMAIN-SUFFIX,mytvsuper.com,ForeignMedia @@ -379,7 +377,7 @@ Rule: - DOMAIN-SUFFIX,twitch.tv,ForeignMedia - DOMAIN-SUFFIX,twitchcdn.net,ForeignMedia - DOMAIN-SUFFIX,ttvnw.net,ForeignMedia -# > Viu(TV) +# > ViuTV # USER-AGENT,Viu*,ForeignMedia # USER-AGENT,ViuTV*,ForeignMedia - DOMAIN-SUFFIX,viu.com,ForeignMedia @@ -395,33 +393,6 @@ Rule: - DOMAIN-SUFFIX,youtube.com,ForeignMedia - DOMAIN,youtubei.googleapis.com,ForeignMedia -# (Music) -# > Deezer -# USER-AGENT,Deezer*,ForeignMedia -- DOMAIN-SUFFIX,deezer.com,ForeignMedia -- DOMAIN-SUFFIX,dzcdn.net,ForeignMedia -# > KKBOX -- DOMAIN-SUFFIX,kkbox.com,ForeignMedia -- DOMAIN-SUFFIX,kkbox.com.tw,ForeignMedia -- DOMAIN-SUFFIX,kfs.io,ForeignMedia -# > JOOX -# USER-AGENT,WeMusic*,ForeignMedia -# USER-AGENT,JOOX*,ForeignMedia -- DOMAIN-SUFFIX,joox.com,ForeignMedia -# > Pandora -# USER-AGENT,Pandora*,ForeignMedia -- DOMAIN-SUFFIX,pandora.com,ForeignMedia -# > Spotify -# USER-AGENT,Spotify*,ForeignMedia -- DOMAIN-SUFFIX,pscdn.co,ForeignMedia -- DOMAIN-SUFFIX,scdn.co,ForeignMedia -- DOMAIN-SUFFIX,spotify.com,ForeignMedia -- DOMAIN-SUFFIX,spoti.fi,ForeignMedia -- IP-CIDR,35.186.224.47/32,ForeignMedia -# > TIDAL -# USER-AGENT,TIDAL*,ForeignMedia -- DOMAIN-SUFFIX,tidal.com,ForeignMedia - # (DomesticMedia) # > 愛奇藝台灣站 - DOMAIN-SUFFIX,iqiyi.com,DomesticMedia @@ -461,6 +432,12 @@ Rule: - DOMAIN-SUFFIX,whatsapp.com,PROXY - DOMAIN-SUFFIX,whatsapp.net,PROXY - DOMAIN-KEYWORD,facebook,PROXY +- IP-CIDR,3.123.36.126/32,PROXY +- IP-CIDR,52.58.209.134/32,PROXY +- IP-CIDR,54.93.124.31/32,PROXY +- IP-CIDR,54.173.34.141/32,PROXY +- IP-CIDR,54.235.23.242/32,PROXY +- IP-CIDR,169.45.248.118/32,PROXY # > Twitter - DOMAIN-SUFFIX,pscp.tv,PROXY - DOMAIN-SUFFIX,periscope.tv,PROXY @@ -536,12 +513,12 @@ Rule: - DOMAIN-SUFFIX,book.com.tw,PROXY - DOMAIN-SUFFIX,booklive.jp,PROXY - DOMAIN-SUFFIX,books.com.tw,PROXY +- DOMAIN-SUFFIX,boslife.net,PROXY - DOMAIN-SUFFIX,box.com,PROXY - DOMAIN-SUFFIX,businessinsider.com,PROXY - DOMAIN-SUFFIX,bwh1.net,PROXY - DOMAIN-SUFFIX,castbox.fm,PROXY - DOMAIN-SUFFIX,cbc.ca,PROXY -- DOMAIN-SUFFIX,cccat.cc,PROXY - DOMAIN-SUFFIX,cdw.com,PROXY - DOMAIN-SUFFIX,change.org,PROXY - DOMAIN-SUFFIX,ck101.com,PROXY @@ -566,6 +543,7 @@ Rule: - DOMAIN-SUFFIX,discordapp.com,PROXY - DOMAIN-SUFFIX,discordapp.net,PROXY - DOMAIN-SUFFIX,disqus.com,PROXY +- DOMAIN-SUFFIX,dlercloud.com,PROXY - DOMAIN-SUFFIX,dns2go.com,PROXY - DOMAIN-SUFFIX,dowjones.com,PROXY - DOMAIN-SUFFIX,dropbox.com,PROXY @@ -580,6 +558,7 @@ Rule: - DOMAIN-SUFFIX,edu,PROXY - DOMAIN-SUFFIX,elpais.com,PROXY - DOMAIN-SUFFIX,enanyang.my,PROXY +- DOMAIN-SUFFIX,encyclopedia.com,PROXY - DOMAIN-SUFFIX,esoir.be,PROXY - DOMAIN-SUFFIX,euronews.com,PROXY - DOMAIN-SUFFIX,feedly.com,PROXY @@ -587,8 +566,12 @@ Rule: - DOMAIN-SUFFIX,flickr.com,PROXY - DOMAIN-SUFFIX,flitto.com,PROXY - DOMAIN-SUFFIX,foreignpolicy.com,PROXY +- DOMAIN-SUFFIX,freebrowser.org,PROXY +- DOMAIN-SUFFIX,freewechat.com,PROXY +- DOMAIN-SUFFIX,freeweibo.com,PROXY - DOMAIN-SUFFIX,friday.tw,PROXY - DOMAIN-SUFFIX,ftchinese.com,PROXY +- DOMAIN-SUFFIX,ftimg.net,PROXY - DOMAIN-SUFFIX,gate.io,PROXY - DOMAIN-SUFFIX,getlantern.org,PROXY - DOMAIN-SUFFIX,getsync.com,PROXY @@ -597,6 +580,7 @@ Rule: - DOMAIN-SUFFIX,goodreads.com,PROXY - DOMAIN-SUFFIX,gov,PROXY - DOMAIN-SUFFIX,gov.tw,PROXY +- DOMAIN-SUFFIX,greatfire.org,PROXY - DOMAIN-SUFFIX,gumroad.com,PROXY - DOMAIN-SUFFIX,hbg.com,PROXY - DOMAIN-SUFFIX,heroku.com,PROXY @@ -642,6 +626,7 @@ Rule: - DOMAIN-SUFFIX,mailchimp.com,PROXY - DOMAIN-SUFFIX,marc.info,PROXY - DOMAIN-SUFFIX,matters.news,PROXY +- DOMAIN-SUFFIX,maying.co,PROXY - DOMAIN-SUFFIX,medium.com,PROXY - DOMAIN-SUFFIX,mega.nz,PROXY - DOMAIN-SUFFIX,mil,PROXY @@ -652,6 +637,7 @@ Rule: - DOMAIN-SUFFIX,nanyang.com,PROXY - DOMAIN-SUFFIX,naver.com,PROXY - DOMAIN-SUFFIX,newstapa.org,PROXY +- DOMAIN-SUFFIX,nexitally.com,PROXY - DOMAIN-SUFFIX,nhk.or.jp,PROXY - DOMAIN-SUFFIX,nicovideo.jp,PROXY - DOMAIN-SUFFIX,nii.ac.jp,PROXY @@ -673,6 +659,7 @@ Rule: - DOMAIN-SUFFIX,orientaldaily.com.my,PROXY - DOMAIN-SUFFIX,overcast.fm,PROXY - DOMAIN-SUFFIX,paltalk.com,PROXY +- DOMAIN-SUFFIX,pao-pao.net,PROXY - DOMAIN-SUFFIX,pbxes.com,PROXY - DOMAIN-SUFFIX,pcdvd.com.tw,PROXY - DOMAIN-SUFFIX,pchome.com.tw,PROXY @@ -683,6 +670,7 @@ Rule: - DOMAIN-SUFFIX,player.fm,PROXY - DOMAIN-SUFFIX,plurk.com,PROXY - DOMAIN-SUFFIX,po18.tw,PROXY +- DOMAIN-SUFFIX,potatso.com,PROXY - DOMAIN-SUFFIX,prism-break.org,PROXY - DOMAIN-SUFFIX,proxifier.com,PROXY - DOMAIN-SUFFIX,pts.org.tw,PROXY @@ -699,6 +687,7 @@ Rule: - DOMAIN-SUFFIX,resilio.com,PROXY - DOMAIN-SUFFIX,reuters.com,PROXY - DOMAIN-SUFFIX,rfi.fr,PROXY +- DOMAIN-SUFFIX,rixcloud.com,PROXY - DOMAIN-SUFFIX,roadshow.hk,PROXY - DOMAIN-SUFFIX,scmp.com,PROXY - DOMAIN-SUFFIX,scribd.com,PROXY @@ -708,6 +697,7 @@ Rule: - DOMAIN-SUFFIX,slideshare.net,PROXY - DOMAIN-SUFFIX,softfamous.com,PROXY - DOMAIN-SUFFIX,soundcloud.com,PROXY +- DOMAIN-SUFFIX,ssrcloud.org,PROXY - DOMAIN-SUFFIX,startpage.com,PROXY - DOMAIN-SUFFIX,steamcommunity.com,PROXY - DOMAIN-SUFFIX,steemit.com,PROXY @@ -717,6 +707,7 @@ Rule: - DOMAIN-SUFFIX,teco-hk.org,PROXY - DOMAIN-SUFFIX,teco-mo.org,PROXY - DOMAIN-SUFFIX,teddysun.com,PROXY +- DOMAIN-SUFFIX,textnow.me,PROXY - DOMAIN-SUFFIX,theguardian.com,PROXY - DOMAIN-SUFFIX,theinitium.com,PROXY - DOMAIN-SUFFIX,tineye.com,PROXY @@ -753,6 +744,8 @@ Rule: - DOMAIN-SUFFIX,wsj.com,PROXY - DOMAIN-SUFFIX,wsj.net,PROXY - DOMAIN-SUFFIX,xhamster.com,PROXY +- DOMAIN-SUFFIX,xn--90wwvt03e.com,PROXY +- DOMAIN-SUFFIX,xn--i2ru8q2qg.com,PROXY - DOMAIN-SUFFIX,xnxx.com,PROXY - DOMAIN-SUFFIX,xvideos.com,PROXY - DOMAIN-SUFFIX,yahoo.com,PROXY @@ -762,10 +755,12 @@ Rule: - DOMAIN-SUFFIX,yes-news.com,PROXY - DOMAIN-SUFFIX,yomiuri.co.jp,PROXY - DOMAIN-SUFFIX,you-get.org,PROXY +- DOMAIN-SUFFIX,yoyutrans.com,PROXY - DOMAIN-SUFFIX,zaobao.com,PROXY - DOMAIN-SUFFIX,zb.com,PROXY - DOMAIN-SUFFIX,zello.com,PROXY - DOMAIN-SUFFIX,zeronet.io,PROXY +- DOMAIN-SUFFIX,zoom.us,PROXY - DOMAIN-KEYWORD,github,PROXY - DOMAIN-KEYWORD,jav,PROXY - DOMAIN-KEYWORD,pinterest,PROXY @@ -778,6 +773,7 @@ Rule: - DOMAIN-SUFFIX,bankmobilevibe.com,PROXY - DOMAIN-SUFFIX,bing.com,PROXY - DOMAIN-SUFFIX,booktopia.com.au,PROXY +- DOMAIN-SUFFIX,cccat.io,PROXY - DOMAIN-SUFFIX,centauro.com.br,PROXY - DOMAIN-SUFFIX,clearsurance.com,PROXY - DOMAIN-SUFFIX,costco.com,PROXY @@ -800,7 +796,6 @@ Rule: - DOMAIN-SUFFIX,here.com,PROXY - DOMAIN-SUFFIX,jcpenney.com,PROXY - DOMAIN-SUFFIX,jiehua.tv,PROXY -- DOMAIN-SUFFIX,kknews.cc,PROXY - DOMAIN-SUFFIX,mailfence.com,PROXY - DOMAIN-SUFFIX,nationwide.com,PROXY - DOMAIN-SUFFIX,nbc.com,PROXY @@ -808,7 +803,6 @@ Rule: - DOMAIN-SUFFIX,nordstrom.com,PROXY - DOMAIN-SUFFIX,nordstromimage.com,PROXY - DOMAIN-SUFFIX,nordstromrack.com,PROXY -- DOMAIN-SUFFIX,read01.com,PROXY - DOMAIN-SUFFIX,superpages.com,PROXY - DOMAIN-SUFFIX,target.com,PROXY - DOMAIN-SUFFIX,thinkgeek.com,PROXY @@ -839,15 +833,6 @@ Rule: - DOMAIN,api-glb-sea.smoot.apple.com,PROXY # >> Dictionary - DOMAIN,lookup-api.apple.com,PROXY -# >> Apple News and Apple Map TOMTOM Version -- DOMAIN,gspe1-ssl.ls.apple.com,PROXY -# USER-AGENT,AppleNews*,PROXY -# USER-AGENT,com.apple.news*,PROXY -- DOMAIN-SUFFIX,apple.news,PROXY -- DOMAIN,news-client.apple.com,PROXY -- DOMAIN,news-edge.apple.com,PROXY -- DOMAIN,news-events.apple.com,PROXY -- DOMAIN,apple.comscoreresearch.com,PROXY # > Google - DOMAIN-SUFFIX,abc.xyz,PROXY - DOMAIN-SUFFIX,android.com,PROXY @@ -895,12 +880,15 @@ Rule: - DOMAIN-SUFFIX,yt.be,PROXY - DOMAIN-SUFFIX,ytimg.com,PROXY # > Microsoft +# >> Microsoft OneDrive - DOMAIN-SUFFIX,1drv.com,PROXY - DOMAIN-SUFFIX,1drv.ms,PROXY -- DOMAIN-SUFFIX,live.com,PROXY -- DOMAIN-SUFFIX,live.net,PROXY +- DOMAIN-SUFFIX,blob.core.windows.net,PROXY - DOMAIN-SUFFIX,livefilestore.com,PROXY +- DOMAIN-SUFFIX,onedrive.com,PROXY +- DOMAIN-SUFFIX,storage.live.com,PROXY - DOMAIN-SUFFIX,storage.msn.com,PROXY +- DOMAIN,oneclient.sfx.ms,PROXY # > Other - DOMAIN-SUFFIX,0rz.tw,PROXY - DOMAIN-SUFFIX,4bluestones.biz,PROXY @@ -933,6 +921,7 @@ Rule: - DOMAIN-SUFFIX,hk-pub.com,PROXY - DOMAIN-SUFFIX,hosting.co.uk,PROXY - DOMAIN-SUFFIX,hwcdn.net,PROXY +- DOMAIN-SUFFIX,ifixit.com,PROXY - DOMAIN-SUFFIX,iphone4hongkong.com,PROXY - DOMAIN-SUFFIX,iphonetaiwan.org,PROXY - DOMAIN-SUFFIX,iptvbin.com,PROXY @@ -959,6 +948,8 @@ Rule: - DOMAIN-SUFFIX,wolframalpha.com,PROXY - DOMAIN-SUFFIX,x-art.com,PROXY - DOMAIN-SUFFIX,yimg.com,PROXY +- DOMAIN,api.steampowered.com,PROXY +- DOMAIN,store.steampowered.com,PROXY # China Area Network # > 360 @@ -978,7 +969,10 @@ Rule: - DOMAIN-SUFFIX,alikunlun.com,DIRECT - DOMAIN-SUFFIX,alipay.com,DIRECT - DOMAIN-SUFFIX,amap.com,DIRECT +- DOMAIN-SUFFIX,autonavi.com,DIRECT - DOMAIN-SUFFIX,dingtalk.com,DIRECT +- DOMAIN-SUFFIX,mxhichina.com,DIRECT +- DOMAIN-SUFFIX,soku.com,DIRECT - DOMAIN-SUFFIX,taobao.com,DIRECT - DOMAIN-SUFFIX,tmall.com,DIRECT - DOMAIN-SUFFIX,tmall.hk,DIRECT @@ -1003,11 +997,13 @@ Rule: - DOMAIN-SUFFIX,baidu.com,DIRECT - DOMAIN-SUFFIX,baidubcr.com,DIRECT - DOMAIN-SUFFIX,bdstatic.com,DIRECT +- DOMAIN-SUFFIX,yunjiasu-cdn.net,DIRECT # > bilibili - DOMAIN-SUFFIX,acgvideo.com,DIRECT - DOMAIN-SUFFIX,biliapi.com,DIRECT - DOMAIN-SUFFIX,biliapi.net,DIRECT - DOMAIN-SUFFIX,bilibili.com,DIRECT +- DOMAIN-SUFFIX,bilibili.tv,DIRECT - DOMAIN-SUFFIX,hdslb.com,DIRECT # > Blizzard - DOMAIN-SUFFIX,blizzard.com,DIRECT @@ -1019,6 +1015,14 @@ Rule: - DOMAIN-SUFFIX,snssdk.com,DIRECT - DOMAIN-SUFFIX,iesdouyin.com,DIRECT - DOMAIN-SUFFIX,toutiao.com,DIRECT +# > CCTV +- DOMAIN-SUFFIX,cctv.com,DIRECT +- DOMAIN-SUFFIX,cctvpic.com,DIRECT +- DOMAIN-SUFFIX,livechina.com,DIRECT +# > DiDi +- DOMAIN-SUFFIX,didialift.com,DIRECT +- DOMAIN-SUFFIX,didiglobal.com,DIRECT +- DOMAIN-SUFFIX,udache.com,DIRECT # > 蛋蛋赞 - DOMAIN-SUFFIX,343480.com,DIRECT - DOMAIN-SUFFIX,baduziyuan.com,DIRECT @@ -1039,6 +1043,7 @@ Rule: # > JD - DOMAIN-SUFFIX,jd.com,DIRECT - DOMAIN-SUFFIX,jd.hk,DIRECT +- DOMAIN-SUFFIX,jdpay.com,DIRECT - DOMAIN-SUFFIX,360buyimg.com,DIRECT # > Kingsoft - DOMAIN-SUFFIX,iciba.com,DIRECT @@ -1052,13 +1057,17 @@ Rule: - DOMAIN-SUFFIX,duokan.com,DIRECT - DOMAIN-SUFFIX,mi-img.com,DIRECT - DOMAIN-SUFFIX,miui.com,DIRECT +- DOMAIN-SUFFIX,miwifi.com,DIRECT - DOMAIN-SUFFIX,xiaomi.com,DIRECT # > Microsoft - DOMAIN-SUFFIX,microsoft.com,DIRECT +- DOMAIN-SUFFIX,msecnd.net,DIRECT +- DOMAIN-SUFFIX,office365.com,DIRECT +- DOMAIN-SUFFIX,outlook.com,DIRECT +- DOMAIN-SUFFIX,s-microsoft.com,DIRECT +- DOMAIN-SUFFIX,visualstudio.com,DIRECT - DOMAIN-SUFFIX,windows.com,DIRECT - DOMAIN-SUFFIX,windowsupdate.com,DIRECT -- DOMAIN-SUFFIX,visualstudio.com,DIRECT -- DOMAIN-SUFFIX,msecnd.net,DIRECT - DOMAIN,officecdn-microsoft-com.akamaized.net,DIRECT # > NetEase # USER-AGENT,NeteaseMusic*,DIRECT @@ -1068,10 +1077,12 @@ Rule: - DOMAIN-SUFFIX,127.net,DIRECT - DOMAIN-SUFFIX,163yun.com,DIRECT - DOMAIN-SUFFIX,lofter.com,DIRECT +- DOMAIN-SUFFIX,netease.com,DIRECT - DOMAIN-SUFFIX,ydstatic.com,DIRECT # > Sina - DOMAIN-SUFFIX,sina.com,DIRECT - DOMAIN-SUFFIX,weibo.com,DIRECT +- DOMAIN-SUFFIX,weibocdn.com,DIRECT # > Sohu - DOMAIN-SUFFIX,sohu.com,DIRECT - DOMAIN-SUFFIX,sohucs.com,DIRECT @@ -1089,11 +1100,18 @@ Rule: - DOMAIN-SUFFIX,steamcontent.com,DIRECT - DOMAIN-SUFFIX,steamstatic.com,DIRECT - DOMAIN-SUFFIX,steamcdn-a.akamaihd.net,DIRECT +- DOMAIN-SUFFIX,steamstat.us,DIRECT # > Tencent # USER-AGENT,MicroMessenger%20Client,DIRECT # USER-AGENT,WeChat*,DIRECT +- DOMAIN-SUFFIX,gtimg.com,DIRECT +- DOMAIN-SUFFIX,idqqimg.com,DIRECT +- DOMAIN-SUFFIX,igamecj.com,DIRECT +- DOMAIN-SUFFIX,myapp.com,DIRECT +- DOMAIN-SUFFIX,myqcloud.com,DIRECT - DOMAIN-SUFFIX,qq.com,DIRECT - DOMAIN-SUFFIX,tencent.com,DIRECT +- DOMAIN-SUFFIX,tencent-cloud.net,DIRECT # > YYeTs # USER-AGENT,YYeTs*,DIRECT - DOMAIN-SUFFIX,jstucdn.com,DIRECT @@ -1104,9 +1122,13 @@ Rule: - DOMAIN-SUFFIX,zmzapi.net,DIRECT - DOMAIN-SUFFIX,zmzfile.com,DIRECT # > Content Delivery Network +- DOMAIN-SUFFIX,ccgslb.com,DIRECT +- DOMAIN-SUFFIX,ccgslb.net,DIRECT - DOMAIN-SUFFIX,chinanetcenter.com,DIRECT -- DOMAIN-SUFFIX,wangsu.com,DIRECT - DOMAIN-SUFFIX,meixincdn.com,DIRECT +- DOMAIN-SUFFIX,ourdvs.com,DIRECT +- DOMAIN-SUFFIX,staticdn.net,DIRECT +- DOMAIN-SUFFIX,wangsu.com,DIRECT # > IP Query - DOMAIN-SUFFIX,ipip.net,DIRECT - DOMAIN-SUFFIX,ip.la,DIRECT @@ -1114,7 +1136,6 @@ Rule: - DOMAIN-SUFFIX,ipv6-test.com,DIRECT - DOMAIN-SUFFIX,test-ipv6.com,DIRECT - DOMAIN-SUFFIX,whatismyip.com,DIRECT -- DOMAIN,ip.bjango.com,DIRECT # > Speed Test # - DOMAIN-SUFFIX,speedtest.net,DIRECT - DOMAIN-SUFFIX,netspeedtestmaster.com,DIRECT @@ -1143,54 +1164,107 @@ Rule: - DOMAIN-SUFFIX,totheglory.im,DIRECT # > Other - DOMAIN-SUFFIX,cn,DIRECT +- DOMAIN-SUFFIX,360in.com,DIRECT +- DOMAIN-SUFFIX,51ym.me,DIRECT - DOMAIN-SUFFIX,8686c.com,DIRECT +- DOMAIN-SUFFIX,abchina.com,DIRECT +- DOMAIN-SUFFIX,accuweather.com,DIRECT +- DOMAIN-SUFFIX,aicoinstorge.com,DIRECT +- DOMAIN-SUFFIX,air-matters.com,DIRECT +- DOMAIN-SUFFIX,air-matters.io,DIRECT - DOMAIN-SUFFIX,aixifan.com,DIRECT +- DOMAIN-SUFFIX,amd.com,DIRECT +- DOMAIN-SUFFIX,b612.net,DIRECT +- DOMAIN-SUFFIX,bdatu.com,DIRECT - DOMAIN-SUFFIX,beitaichufang.com,DIRECT +- DOMAIN-SUFFIX,bjango.com,DIRECT - DOMAIN-SUFFIX,booking.com,DIRECT - DOMAIN-SUFFIX,bstatic.com,DIRECT - DOMAIN-SUFFIX,cailianpress.com,DIRECT +- DOMAIN-SUFFIX,camera360.com,DIRECT +- DOMAIN-SUFFIX,chinaso.com,DIRECT +- DOMAIN-SUFFIX,chua.pro,DIRECT +- DOMAIN-SUFFIX,chuimg.com,DIRECT - DOMAIN-SUFFIX,chunyu.mobi,DIRECT - DOMAIN-SUFFIX,chushou.tv,DIRECT - DOMAIN-SUFFIX,cmbchina.com,DIRECT - DOMAIN-SUFFIX,cmbimg.com,DIRECT - DOMAIN-SUFFIX,ctrip.com,DIRECT - DOMAIN-SUFFIX,dfcfw.com,DIRECT +- DOMAIN-SUFFIX,docschina.org,DIRECT - DOMAIN-SUFFIX,douban.com,DIRECT - DOMAIN-SUFFIX,doubanio.com,DIRECT - DOMAIN-SUFFIX,douyu.com,DIRECT - DOMAIN-SUFFIX,dxycdn.com,DIRECT +- DOMAIN-SUFFIX,dytt8.net,DIRECT - DOMAIN-SUFFIX,eastmoney.com,DIRECT +- DOMAIN-SUFFIX,eudic.net,DIRECT +- DOMAIN-SUFFIX,feng.com,DIRECT +- DOMAIN-SUFFIX,fengkongcloud.com,DIRECT +- DOMAIN-SUFFIX,frdic.com,DIRECT +- DOMAIN-SUFFIX,futu5.com,DIRECT - DOMAIN-SUFFIX,futunn.com,DIRECT - DOMAIN-SUFFIX,geilicdn.com,DIRECT +- DOMAIN-SUFFIX,getpricetag.com,DIRECT +- DOMAIN-SUFFIX,gifshow.com,DIRECT +- DOMAIN-SUFFIX,godic.net,DIRECT - DOMAIN-SUFFIX,hicloud.com,DIRECT +- DOMAIN-SUFFIX,hongxiu.com,DIRECT - DOMAIN-SUFFIX,hostbuf.com,DIRECT +- DOMAIN-SUFFIX,huxiucdn.com,DIRECT - DOMAIN-SUFFIX,huya.com,DIRECT - DOMAIN-SUFFIX,infinitynewtab.com,DIRECT - DOMAIN-SUFFIX,ithome.com,DIRECT +- DOMAIN-SUFFIX,java.com,DIRECT +- DOMAIN-SUFFIX,jidian.im,DIRECT +- DOMAIN-SUFFIX,kaiyanapp.com,DIRECT +- DOMAIN-SUFFIX,kaspersky-labs.com,DIRECT - DOMAIN-SUFFIX,keepcdn.com,DIRECT - DOMAIN-SUFFIX,kkmh.com,DIRECT +- DOMAIN-SUFFIX,licdn.com,DIRECT +- DOMAIN-SUFFIX,linkedin.com,DIRECT +- DOMAIN-SUFFIX,loli.net,DIRECT - DOMAIN-SUFFIX,luojilab.com,DIRECT +- DOMAIN-SUFFIX,maoyan.com,DIRECT - DOMAIN-SUFFIX,maoyun.tv,DIRECT +- DOMAIN-SUFFIX,meituan.com,DIRECT - DOMAIN-SUFFIX,meituan.net,DIRECT - DOMAIN-SUFFIX,mobike.com,DIRECT - DOMAIN-SUFFIX,mubu.com,DIRECT - DOMAIN-SUFFIX,myzaker.com,DIRECT +- DOMAIN-SUFFIX,nim-lang-cn.org,DIRECT - DOMAIN-SUFFIX,nvidia.com,DIRECT +- DOMAIN-SUFFIX,oracle.com,DIRECT - DOMAIN-SUFFIX,paypal.com,DIRECT - DOMAIN-SUFFIX,paypalobjects.com,DIRECT +- DOMAIN-SUFFIX,qdaily.com,DIRECT +- DOMAIN-SUFFIX,qidian.com,DIRECT - DOMAIN-SUFFIX,qyer.com,DIRECT - DOMAIN-SUFFIX,qyerstatic.com,DIRECT +- DOMAIN-SUFFIX,raychase.net,DIRECT - DOMAIN-SUFFIX,ronghub.com,DIRECT - DOMAIN-SUFFIX,ruguoapp.com,DIRECT +- DOMAIN-SUFFIX,sankuai.com,DIRECT +- DOMAIN-SUFFIX,scomper.me,DIRECT +- DOMAIN-SUFFIX,seafile.com,DIRECT +- DOMAIN-SUFFIX,sm.ms,DIRECT - DOMAIN-SUFFIX,smzdm.com,DIRECT - DOMAIN-SUFFIX,snapdrop.net,DIRECT +- DOMAIN-SUFFIX,snwx.com,DIRECT +- DOMAIN-SUFFIX,s-reader.com,DIRECT - DOMAIN-SUFFIX,sspai.com,DIRECT +- DOMAIN-SUFFIX,takungpao.com,DIRECT - DOMAIN-SUFFIX,teamviewer.com,DIRECT - DOMAIN-SUFFIX,tianyancha.com,DIRECT - DOMAIN-SUFFIX,udacity.com,DIRECT - DOMAIN-SUFFIX,uning.com,DIRECT +- DOMAIN-SUFFIX,vmware.com,DIRECT - DOMAIN-SUFFIX,weather.com,DIRECT +- DOMAIN-SUFFIX,weico.cc,DIRECT - DOMAIN-SUFFIX,weidian.com,DIRECT +- DOMAIN-SUFFIX,xiachufang.com,DIRECT +- DOMAIN-SUFFIX,ximalaya.com,DIRECT +- DOMAIN-SUFFIX,xinhuanet.com,DIRECT - DOMAIN-SUFFIX,xmcdn.com,DIRECT - DOMAIN-SUFFIX,yangkeduo.com,DIRECT - DOMAIN-SUFFIX,zhangzishi.cc,DIRECT diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/Country.mmdb b/package/cnsztl/luci-app-openclash/files/etc/openclash/Country.mmdb index e0b37bfd6e..ec9a981dbb 100644 Binary files a/package/cnsztl/luci-app-openclash/files/etc/openclash/Country.mmdb and b/package/cnsztl/luci-app-openclash/files/etc/openclash/Country.mmdb differ diff --git a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version index f6496780bc..c6cbd85cbb 100644 --- a/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/cnsztl/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.34.6-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjc2NkIxMzQ4RTFGMTExRTk5MEUyQTVBQjE4RjI4REIwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjc2NkIxMzQ5RTFGMTExRTk5MEUyQTVBQjE4RjI4REIwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NzY2QjEzNDZFMUYxMTFFOTkwRTJBNUFCMThGMjhEQjAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NzY2QjEzNDdFMUYxMTFFOTkwRTJBNUFCMThGMjhEQjAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz643pWdAAADAFBMVEVsbGw9PT0ka5IGcKwFXI7R4uyFhYVFgKK6uroig7pFmsoHZ50lhLrR5vKStcmTvdWizOWCgoKenp7a2toJeLilpaVTiqpknbx4eHgGXpGGv9/f399jlbLn5+cKaqE/Pz/GxsahoaHOzs4IXY5paWlXpdKRkZF3t9twcHAFbam/v79FRUWDs84JdbSsrKy1tbU0dJoEYJUJca2y1uplrNXKysoJZJliYmIEWIgXgL1kqtIEU4BLS0tDQ0Pg4OCTxeGLi4ujwNF2dnbAwMCcnJwGdLLDw8NBQUGx0OIGVYJGirFFkbwFZZtCQkImcZy2trY4lMijxdiXl5eCrsfw9fcmicI2kcYXYo3S0tLB1eDQ0NBHnM1lZWUrjseNjY1zobuxzdwFaaIFcrA0fKWvr69hYWGiyN4chsMJWIWDqsEZdapJns5yn7iUlJQIbKXB2ugEYphKns90dHQFa6ajzuayytg7l8uJweIwk8tDfqB0sdUahMFFiK0Kebg1h7VnrtYIYZURgsMCc7QBcrNRUVFUVFRVVVVSUlILfL0FdrdWVlYHeLkKe7wEdrYDdbUDdLUEdbYOgMAOf8ADdLQSg8NXV1cSg8QShMQAcrIThMUGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJe7sJersJero6OjqqqqrU1NTV1dWrq6tISEipqak7OzuAgIB+fn7w9/vC3u5JSUmBgYHq6uqEvN3z8/NMTEz19fWEvd3h7/f09PTB3u7B3e2DvNx/f3+Fvt4GVYGErMLv9PeCqcChv9Dg6u+JiYnC3+/g6vDB3e7A1N/o6OgUXokIaJ/D3+8EVYPW1taFvd6Dq8IHVoTg7vYFZ58LdLALerlGm8uEtNBVos90tNg5lcmAudlInc0IWYfR4OiSuc8GdbSDr8gLb6iFvd3B1+Pv9voJcKwVaJfg7/dInc4Zg8AnhryDrcXP5PFTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////9HhLrgAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADFBJREFUeNrsVwlUFFcWrQaC20CkEW0QbEUlYCsoRlFoEOMALkQTx42JjtFo1LivMTFGZ0YEgVkyM8xiNkC2xtAgsmtU3LeYSDQxmmh2k5hMzzhOIBgu8/6vqu6qBgxnkuM53cd7Dv+/9/579/26v7qqEFpaKhcMuOUM+IcDYOPT5pYWoSVmzS3nwN8cAhs9WoTK4EYnwV8dAxvNwgJnkbzxLw6Cp4Xg750Fv3YQbBS+v6f53YYTaf5vR4HwrdPgnuZ3H/9yFAj/dRrc0/zu4wVHgfAfp8GfHAVtau4VGhr6q+CfXpXZXl6zrU6wl1dHanReug6yv9guNjzg98AG++ALiwb6+fmtVsXmrN7QunrOFj+/BxapY37we/H/hnDTHhFTKsERMzXi5o+EV6iXyq/EVKs9DiM6QvEm3uxgs5fawaI3+OW8sUgVnSNGUT1QETPjDfvqDWLeanWUNG+v3Uur/Va/dEe00lxXBngXarWB1Mjrx2oeilClmzYIMdajBYJ+Ws1fbgfHcV+vib3uw3FVdClw7dChsdOApXJokQfskl5+eQswbeyhQ9eWqsMHcKC9dndc4xBuqxERg3JBryEYteVet38kSHOVHwzIDaeiPKUjFAaNoYPNXmkbW3Bi5uLFi2dOwxZleOlYl8UsfALr5JAHpuG4uphO5hBLW3xRHSddX2kPd1rjEFqpVB6hiS41Gg0aTdqAjmqr81Idj5eX0LbmpgD0k8wCTGmWknVtM0bYaS6om0TIGTJebRvDMbf/Jxc/6X8Iw5Xhi4sX+/bpM/LqIRyXIusw1uZIqCbJr3br06f/RXWcdH311TlLryhCS2WPr1mDqhwR9ppXQqvfxq00IzMKsId7e1AgjVNjgMLbhSiMKKTHEFstZC+AykKeB0RwtyCCOyKs7Nu0KJMEBILTSLhxbL0s9raK/Ha/Mh5mlIUQiWN5aFyElCnwwinKradKGIhqyarGwNRUM57bTPY7nWBOVeDiyB5seudDPCkGDuDazG9Q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 \ No newline at end of file +v0.34.7-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTkgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkQ2REEzNjlFRTNBQjExRTk4RjQzQTFDNDQ1NjIxMTgwIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkQ2REEzNjlGRTNBQjExRTk4RjQzQTFDNDQ1NjIxMTgwIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RDZEQTM2OUNFM0FCMTFFOThGNDNBMUM0NDU2MjExODAiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RDZEQTM2OURFM0FCMTFFOThGNDNBMUM0NDU2MjExODAiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz44R3YsAAADAFBMVEUGVYKEhIQGZp26urokhLtFmspFgKIGcKwFXI4ahMHR5vKCgoKenp7a2tpjlbGlpaXR4epTiqpknLt4eHgGXpHf39/n5+c/Pz/GxsYXgb2hoaHOzs5paWmizOWGv98JZJkJdbRXpdKTvNSRkZFxcXG/v79GRkasrKy1tbU0dZtmrdYFbakJca0FWokka5LKysp2ttpiYmKTxeFLS0tDQ0MIXY3g4OCLi4sFYJVkq9OiwNEJaqCStcgGdLJ2dnYXYo2y1urAwMCcnJzw9ffCwsJBQUGx0eMEU4BGirFCQkImcJtsbGy2trajx9yEss2Xl5eDrcYnicE4lMg2kcbS0tIFaaLQ0NAKYZNKn89FkbxlZWWNjY2DtNDB1OBHnM1zobuxzdwFcrArjsevr6+DqsEIaJ5gYGAFa6UFZZujyd9vb28Zdapyn7iUlJQHbKXB2ecJWIVJns50dHSyytgEYpikzuaJweIwk8t0sdUKebhDfqA1h7VGhakodqIRgsMCc7QBcrNRUVFUVFRVVVVSUlIFdrcLfL1WVlYHeLkKe7wGd7gOf8ADdLUDdbUEdrYOgMAEdbYDdLQSg8NXV1cSg8QShMQAcrIThMUOf78Nfr8Nfr4Mfb4Mfb0JersJe7sIebkIeboJero6OjqqqqrU1NTV1dWrq6tISEg9PT2pqak7OzuAgIB+fn48PDzw9/sHVoTC3u5JSUmBgYGEvd3q6uqEvN3z8/P19fVMTEzh7/f09PTB3u5/f3+DvNyFvt7B3e3g6u+CqcDB1eDv9PfC3++JiYno6Ojg6vDB3e7D3+/A1N87l8uErMKDq8Khv9AUXomFvd7W1tbg7vYFZ590s9gHWIcLerlGm8tInc05lckEWIiCutsKeLfv9vqFvd0KdLCDr8gVaJcGdbTB1+NVos8Lb6jg7/cEVYMJcKxkp82jxdiyz+DP5PGRuM/B2+pTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////8M/V9oAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADBZJREFUeNrsmAtUVHUex+/44uEA6iCjoqKiAwpiOCP4InWVMHFTU9d03czUJNPymbnV7orEiO2bfdgWiLwxGECQl6k8fGU+KjXTLHvjtttO67pBGF/29//fe2funQHjbB3PmTl+zun+f//f897vf7gzJrS1Va4YeNMd+KsLsPVpS1ub0Ba18aZ78GeXYKt3m1A5vNlN+JNrsNUirHAXyZv/6CI8LQz/1l34hYuwVfj2ruZ3GjfS/N+ugvC123BX8zvPV66C8F+34a7md57fuQrCf9yGF12FdjXXhISE/HTND6/KEo1miW2zRqPpTI1Oo+tk990d8sY9g+95w9H5ldfQwYMHP6TyPfqQOu2Nh2yoA4MxePf/jXDDkcjZleBEzYm88T3RhGhU+0rMsdnTMKYzLd7CW50c9lIHeL3OH+d1rxeV3kdFL6qHKnwWvK4qlXJ4uSpAmnc07qUNgze8dFucNNeVAz65Wm0gzdF8X81DEKLcmkcgyna0QPAPq/nfOuAoevWZ2acXjqq8G4Bep09PnA5skDy7vbyhTto9rF7ihEP1YRzuaNxtYxzhlprIKFSs0TOM2oqet74npLlqPxyIl8w5qEjqTAuD3tDJYS+3zyicmLJ+/fop0zFK6d4wMWI9c5/AFtnljek4qqpdtF6iHo+rAqTryx1xuxhHcFKpIlJvKjUaDXq9eWBntdX1VB1Pz57x7WueF4ABkpmD2a1Ssq79jpEOmserh0TKGTKvtM9ULBv32bXPxp3GVKX72vr14yZNWnXxNI5Kni2YaN+IrFok8hzwvCpAur7yyqMbLitcG+Qdj9mcqhwRR80rodVv55bZyIwc7Oe7/ciRrnOigNxbuciNzKXXEIvmsi+AylyeB0TybU4k34jYum/XolwSEFhjJuGmsXh59C1V81sDyrmbtcyF2Diau6ZFSpnxvHC28taTJYaiWrKqMTQ52YLn3iH7nedgSVZwLegqW975Eo+LjsPoNWUuSpLboxoTg1QO0nVoNf82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 \ No newline at end of file diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index c5a4339907..b67e6c5cb1 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -85,6 +85,12 @@ o:value("0", translate("Disable")) o:value("1", translate("Enable")) o.default=0 +o = s:taboption("dns", ListValue, "disable_masq_cache", translate("Disable Dnsmasq's DNS Cache")) +o.description = translate("Recommended Enabled For Avoiding Some Connection Errors") +o:value("0", translate("Disable")) +o:value("1", translate("Enable")) +o.default=0 + o = s:taboption("dns", ListValue, "dns_advanced_setting", translate("Advanced Setting")) o.description = translate("DNS Advanced Settings") o:value("0", translate("Disable")) diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/index.html b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/index.html index 308ffdca4b..d44005490d 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/index.html +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/index.html @@ -5,8 +5,8 @@ Clash - +
- + diff --git a/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.713d27062536ff3ce5dc.min.js b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.713d27062536ff3ce5dc.min.js new file mode 100644 index 0000000000..63e7fb4713 --- /dev/null +++ b/package/cnsztl/luci-app-openclash/files/usr/share/openclash/dashboard/js/1.bundle.713d27062536ff3ce5dc.min.js @@ -0,0 +1,57 @@ +(window.webpackJsonp=window.webpackJsonp||[]).push([[1],[function(e,t,n){"use strict";e.exports=n(47)},function(e,t,n){"use strict";function r(){return(r=Object.assign||function(e){for(var t=1;t=0||(o[n]=e[n]);return o}n.d(t,"a",function(){return r})},,,function(e,t,n){e.exports=n(51)()},function(e,t,n){"use strict";!function e(){if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(t){console.error(t)}}(),e.exports=n(48)},function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(r){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){var r=n(40)(Object,"create");e.exports=r},function(e,t,n){var r=n(107);e.exports=function(e,t){for(var n=e.length;n--;)if(r(e[n][0],t))return n;return-1}},function(e,t,n){var r=n(113);e.exports=function(e,t){var n=e.__data__;return r(t)?n["string"==typeof t?"string":"hash"]:n.map}},,function(e,t){var n,r,o=e.exports={};function i(){throw new Error("setTimeout has not been defined")}function a(){throw new Error("clearTimeout has not been defined")}function u(e){if(n===setTimeout)return setTimeout(e,0);if((n===i||!n)&&setTimeout)return n=setTimeout,setTimeout(e,0);try{return n(e,0)}catch(t){try{return n.call(null,e,0)}catch(t){return n.call(this,e,0)}}}!function(){try{n="function"==typeof setTimeout?setTimeout:i}catch(e){n=i}try{r="function"==typeof clearTimeout?clearTimeout:a}catch(e){r=a}}();var l,s=[],c=!1,f=-1;function p(){c&&l&&(c=!1,l.length?s=l.concat(s):f=-1,s.length&&d())}function d(){if(!c){var e=u(p);c=!0;for(var t=s.length;t;){for(l=s,s=[];++f1)for(var n=1;n1&&void 0!==arguments[1]?arguments[1]:"",n=e&&e.split("/")||[],r=t&&t.split("/")||[],o=e&&m(e),i=t&&m(t),a=o||i;if(e&&m(e)?r=n:n.length&&(r.pop(),r=r.concat(n)),!r.length)return"/";var u=void 0;if(r.length){var l=r[r.length-1];u="."===l||".."===l||""===l}else u=!1;for(var s=0,c=r.length;c>=0;c--){var f=r[c];"."===f?v(r,c):".."===f?(v(r,c),s++):s&&(v(r,c),s--)}if(!a)for(;s--;s)r.unshift("..");!a||""===r[0]||r[0]&&m(r[0])||r.unshift("");var p=r.join("/");return u&&"/"!==p.substr(-1)&&(p+="/"),p},g="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};var b=function e(t,n){if(t===n)return!0;if(null==t||null==n)return!1;if(Array.isArray(t))return Array.isArray(n)&&t.length===n.length&&t.every(function(t,r){return e(t,n[r])});var r=void 0===t?"undefined":g(t);if(r!==(void 0===n?"undefined":g(n)))return!1;if("object"===r){var o=t.valueOf(),i=n.valueOf();if(o!==t||i!==n)return e(o,i);var a=Object.keys(t),u=Object.keys(n);return a.length===u.length&&a.every(function(r){return e(t[r],n[r])})}return!1},w=!0,x="Invariant failed";var _=function(e,t){if(!e)throw w?new Error(x):new Error(x+": "+(t||""))};function S(e){return"/"===e.charAt(0)?e:"/"+e}function T(e){return"/"===e.charAt(0)?e.substr(1):e}function k(e,t){return function(e,t){return new RegExp("^"+t+"(\\/|\\?|#|$)","i").test(e)}(e,t)?e.substr(t.length):e}function C(e){return"/"===e.charAt(e.length-1)?e.slice(0,-1):e}function E(e){var t=e.pathname,n=e.search,r=e.hash,o=t||"/";return n&&"?"!==n&&(o+="?"===n.charAt(0)?n:"?"+n),r&&"#"!==r&&(o+="#"===r.charAt(0)?r:"#"+r),o}function P(e,t,n,r){var o;"string"==typeof e?(o=function(e){var t=e||"/",n="",r="",o=t.indexOf("#");-1!==o&&(r=t.substr(o),t=t.substr(0,o));var i=t.indexOf("?");return-1!==i&&(n=t.substr(i),t=t.substr(0,i)),{pathname:t,search:"?"===n?"":n,hash:"#"===r?"":r}}(e)).state=t:(void 0===(o=Object(h.a)({},e)).pathname&&(o.pathname=""),o.search?"?"!==o.search.charAt(0)&&(o.search="?"+o.search):o.search="",o.hash?"#"!==o.hash.charAt(0)&&(o.hash="#"+o.hash):o.hash="",void 0!==t&&void 0===o.state&&(o.state=t));try{o.pathname=decodeURI(o.pathname)}catch(i){throw i instanceof URIError?new URIError('Pathname "'+o.pathname+'" could not be decoded. This is likely caused by an invalid percent-encoding.'):i}return n&&(o.key=n),r?o.pathname?"/"!==o.pathname.charAt(0)&&(o.pathname=y(o.pathname,r.pathname)):o.pathname=r.pathname:o.pathname||(o.pathname="/"),o}function O(e,t){return e.pathname===t.pathname&&e.search===t.search&&e.hash===t.hash&&e.key===t.key&&b(e.state,t.state)}function R(){var e=null;var t=[];return{setPrompt:function(t){return e=t,function(){e===t&&(e=null)}},confirmTransitionTo:function(t,n,r,o){if(null!=e){var i="function"==typeof e?e(t,n):e;"string"==typeof i?"function"==typeof r?r(i,o):o(!0):o(!1!==i)}else o(!0)},appendListener:function(e){var n=!0;function r(){n&&e.apply(void 0,arguments)}return t.push(r),function(){n=!1,t=t.filter(function(e){return e!==r})}},notifyListeners:function(){for(var e=arguments.length,n=new Array(e),r=0;r=0?t:0)+"#"+e)}function $(e){void 0===e&&(e={}),M||_(!1);var t=window.history,n=(window.navigator.userAgent.indexOf("Firefox"),e),r=n.getUserConfirmation,o=void 0===r?I:r,i=n.hashType,a=void 0===i?"slash":i,u=e.basename?C(S(e.basename)):"",l=L[a],s=l.encodePath,c=l.decodePath;function f(){var e=c(U());return u&&(e=k(e,u)),P(e)}var p=R();function d(e){Object(h.a)(A,e),A.length=t.length,p.notifyListeners(A.location,A.action)}var m=!1,v=null;function y(){var e=U(),t=s(e);if(e!==t)F(t);else{var n=f(),r=A.location;if(!m&&O(r,n))return;if(v===E(n))return;v=null,function(e){if(m)m=!1,d();else{p.confirmTransitionTo(e,"POP",o,function(t){t?d({action:"POP",location:e}):function(e){var t=A.location,n=x.lastIndexOf(E(t));-1===n&&(n=0);var r=x.lastIndexOf(E(e));-1===r&&(r=0);var o=n-r;o&&(m=!0,T(o))}(e)})}}(n)}}var g=U(),b=s(g);g!==b&&F(b);var w=f(),x=[E(w)];function T(e){t.go(e)}var z=0;function N(e){1===(z+=e)&&1===e?window.addEventListener(D,y):0===z&&window.removeEventListener(D,y)}var j=!1;var A={length:t.length,action:"POP",location:w,createHref:function(e){return"#"+s(u+E(e))},push:function(e,t){var n=P(e,void 0,void 0,A.location);p.confirmTransitionTo(n,"PUSH",o,function(e){if(e){var t=E(n),r=s(u+t);if(U()!==r){v=t,function(e){window.location.hash=e}(r);var o=x.lastIndexOf(E(A.location)),i=x.slice(0,-1===o?0:o+1);i.push(t),x=i,d({action:"PUSH",location:n})}else d()}})},replace:function(e,t){var n=P(e,void 0,void 0,A.location);p.confirmTransitionTo(n,"REPLACE",o,function(e){if(e){var t=E(n),r=s(u+t);U()!==r&&(v=t,F(r));var o=x.indexOf(E(A.location));-1!==o&&(x[o]=t),d({action:"REPLACE",location:n})}})},go:T,goBack:function(){T(-1)},goForward:function(){T(1)},block:function(e){void 0===e&&(e=!1);var t=p.setPrompt(e);return j||(N(1),j=!0),function(){return j&&(j=!1,N(-1)),t()}},listen:function(e){var t=p.appendListener(e);return N(1),function(){N(-1),t()}}};return A}function W(e,t,n){return Math.min(Math.max(e,t),n)}var H=n(26),B=n.n(H),V=(n(29),n(8)),q=n(44),Q=n.n(q),K=function(e){var t=d();return t.displayName=e,t}("Router"),Y=function(e){function t(t){var n;return(n=e.call(this,t)||this).state={location:t.history.location},n._isMounted=!1,n._pendingLocation=null,t.staticContext||(n.unlisten=t.history.listen(function(e){n._isMounted?n.setState({location:e}):n._pendingLocation=e})),n}Object(r.a)(t,e),t.computeRootMatch=function(e){return{path:"/",url:"/",params:{},isExact:"/"===e}};var n=t.prototype;return n.componentDidMount=function(){this._isMounted=!0,this._pendingLocation&&this.setState({location:this._pendingLocation})},n.componentWillUnmount=function(){this.unlisten&&this.unlisten()},n.render=function(){return i.a.createElement(K.Provider,{children:this.props.children||null,value:{history:this.props.history,location:this.state.location,match:t.computeRootMatch(this.state.location.pathname),staticContext:this.props.staticContext}})},t}(i.a.Component);var X=function(e){function t(){for(var t,n=arguments.length,r=new Array(n),o=0;ot?n.splice(t,n.length-t,r):n.push(r),c({action:"PUSH",location:r,index:t,entries:n})}})},replace:function(e,t){var r=P(e,t,f(),y.location);s.confirmTransitionTo(r,"REPLACE",n,function(e){e&&(y.entries[y.index]=r,c({action:"REPLACE",location:r}))})},go:v,goBack:function(){v(-1)},goForward:function(){v(1)},canGo:function(e){var t=y.index+e;return t>=0&&t=0;t--){var n=e[t][i];n.modified||(Array.isArray(n.base)?P(n)&&_(n):E(n)&&_(n))}}function E(e){for(var t=e.base,n=e.draft,r=Object.keys(n),o=r.length-1;o>=0;o--){var a=r[o],u=t[a];if(void 0===u&&!d(t,a))return!0;var l=n[a],s=l&&l[i];if(s?s.base!==u:!h(l,u))return!0}return r.length!==Object.keys(t).length}function P(e){var t=e.draft;if(t.length!==e.base.length)return!0;var n=Object.getOwnPropertyDescriptor(t,t.length-1);return!(!n||n.get)}var O=Object.freeze({willFinalize:function(e,t,n){e.drafts.forEach(function(e){e[i].finalizing=!0}),n?a(t)&&t[i].scope===e&&C(e.drafts):(e.patches&&function e(t){if(!t||"object"!=typeof t)return;var n=t[i];if(!n)return;var r=n.base;var o=n.draft;var a=n.assigned;if(Array.isArray(t)){if(P(n)){if(_(n),a.length=!0,o.lengthc&&a[f-1]===u[f+s-1];)--f;for(var p=c;p=f;--v){var y=t.concat([v]);n[m+v-f]={op:"add",path:y,value:u[v]},h&&r.push({op:"remove",path:y})}h||r.push({op:"replace",path:t.concat(["length"]),value:a.length})}(e,t,n,r):function(e,t,n,r){var o=e.base,i=e.copy;f(e.assigned,function(e,a){var u=o[e],l=i[e],s=a?e in o?"replace":"add":"remove";if(u!==l||"replace"!==s){var c=t.concat(e);n.push("remove"===s?{op:s,path:c}:{op:s,path:c,value:l}),r.push("add"===s?{op:"remove",path:c}:"remove"===s?{op:"add",path:c,value:u}:{op:"replace",path:c,value:u})}})}(e,t,n,r)}function L(e,t){for(var n=0;n0;)r[o]=arguments[o+1];return l.produce(e,function(e){return t.call.apply(t,[n,e].concat(r))})}}if("function"!=typeof t)throw new Error("The first or second argument to `produce` must be a function");if(void 0!==n&&"function"!=typeof n)throw new Error("The third argument to `produce` must be a function or undefined");if(u(e)){var s=m.enter(),c=this.createProxy(e),f=!0;try{o=t(c),f=!1}finally{f?s.revoke():s.leave()}return o instanceof Promise?o.then(function(e){return s.usePatches(n),i.processResult(e,s)},function(e){throw s.revoke(),e}):(s.usePatches(n),this.processResult(o,s))}return void 0===(o=t(e))?e:o!==r?o:void 0},F.prototype.produceWithPatches=function(e,t,n){var r,o,i=this;if("function"==typeof e)return function(t){for(var n=[],r=arguments.length-1;r-- >0;)n[r]=arguments[r+1];return i.produceWithPatches(t,function(t){return e.apply(void 0,[t].concat(n))})};if(n)throw new Error("A patch listener cannot be passed to produceWithPatches");return[this.produce(e,t,function(e,t){r=e,o=t}),r,o]},F.prototype.createDraft=function(e){if(!u(e))throw new Error("First argument to `createDraft` must be a plain object, an array, or an immerable object");var t=m.enter(),n=this.createProxy(e);return n[i].isManual=!0,t.leave(),n},F.prototype.finishDraft=function(e,t){var n=e&&e[i];if(!n||!n.isManual)throw new Error("First argument to `finishDraft` must be a draft returned by `createDraft`");if(n.finalized)throw new Error("The given draft is already finalized");var r=n.scope;return r.usePatches(t),this.processResult(void 0,r)},F.prototype.setAutoFreeze=function(e){this.autoFreeze=e},F.prototype.setUseProxies=function(e){this.useProxies=e,l(this,e?A:O)},F.prototype.applyPatches=function(e,t){var n;for(n=t.length-1;n>=0;n--){var r=t[n];if(0===r.path.length&&"replace"===r.op){e=r.value;break}}return a(e)?L(e,t):this.produce(e,function(e){return L(e,t.slice(n+1))})},F.prototype.processResult=function(e,t){var n=t.drafts[0],o=void 0!==e&&e!==n;if(this.willFinalize(t,e,o),o){if(n[i].modified)throw t.revoke(),new Error("An immer producer returned a new value *and* modified its draft. Either return a new value *or* modify the draft.");u(e)&&(e=this.finalize(e,null,t)),t.patches&&(t.patches.push({op:"replace",path:[],value:e}),t.inversePatches.push({op:"replace",path:[],value:n[i].base}))}else e=this.finalize(n,[],t);return t.revoke(),t.patches&&t.patchListener(t.patches,t.inversePatches),e!==r?e:void 0},F.prototype.finalize=function(e,t,n){var r=this,o=e[i];if(!o)return Object.isFrozen(e)?e:this.finalizeTree(e,null,n);if(o.scope!==n)return e;if(!o.modified)return o.base;if(!o.finalized){if(o.finalized=!0,this.finalizeTree(o.draft,t,n),this.onDelete)if(this.useProxies){var a=o.assigned;for(var u in a)a[u]||this.onDelete(o,u)}else{var l=o.base,s=o.copy;f(l,function(e){d(s,e)||r.onDelete(o,e)})}this.onCopy&&this.onCopy(o),this.autoFreeze&&n.canAutoFreeze&&Object.freeze(o.copy),t&&n.patches&&D(o,t,n.patches,n.inversePatches)}return o.copy},F.prototype.finalizeTree=function(e,t,n){var r=this,o=e[i];o&&(this.useProxies||(o.copy=c(o.draft,!0)),e=o.copy);var l=!!t&&!!n.patches,s=function(i,c,d){if(c===d)throw Error("Immer forbids circular references");var m=!!o&&d===e;if(a(c)){var v=m&&l&&!o.assigned[i]?t.concat(i):null;if(a(c=r.finalize(c,v,n))&&(n.canAutoFreeze=!1),Array.isArray(d)||p(d,i)?d[i]=c:Object.defineProperty(d,i,{value:c}),m&&c===o.base[i])return}else{if(m&&h(c,o.base[i]))return;u(c)&&!Object.isFrozen(c)&&f(c,s)}m&&r.onAssign&&r.onAssign(o,i,c)};return f(e,s),e};var $=new F,W=$.produce;$.produceWithPatches.bind($),$.setAutoFreeze.bind($),$.setUseProxies.bind($),$.applyPatches.bind($),$.createDraft.bind($),$.finishDraft.bind($);t.a=W}).call(this,n(18))},function(e,t,n){"use strict"; +/* +object-assign +(c) Sindre Sorhus +@license MIT +*/var r=Object.getOwnPropertySymbols,o=Object.prototype.hasOwnProperty,i=Object.prototype.propertyIsEnumerable;function a(e){if(null==e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}e.exports=function(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;if("0123456789"!==Object.getOwnPropertyNames(t).map(function(e){return t[e]}).join(""))return!1;var r={};return"abcdefghijklmnopqrst".split("").forEach(function(e){r[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},r)).join("")}catch(o){return!1}}()?Object.assign:function(e,t){for(var n,u,l=a(e),s=1;s=200&&e<300}};l.headers={common:{Accept:"application/json, text/plain, */*"}},r.forEach(["delete","get","head"],function(e){l.headers[e]={}}),r.forEach(["post","put","patch"],function(e){l.headers[e]=r.merge(i)}),e.exports=l}).call(this,n(18))},function(e,t,n){"use strict";var r=n(4),o=n(64),i=n(31),a=n(66),u=n(67),l=n(35);e.exports=function(e){return new Promise(function(t,s){var c=e.data,f=e.headers;r.isFormData(c)&&delete f["Content-Type"];var p=new XMLHttpRequest;if(e.auth){var d=e.auth.username||"",h=e.auth.password||"";f.Authorization="Basic "+btoa(d+":"+h)}if(p.open(e.method.toUpperCase(),i(e.url,e.params,e.paramsSerializer),!0),p.timeout=e.timeout,p.onreadystatechange=function(){if(p&&4===p.readyState&&(0!==p.status||p.responseURL&&0===p.responseURL.indexOf("file:"))){var n="getAllResponseHeaders"in p?a(p.getAllResponseHeaders()):null,r={data:e.responseType&&"text"!==e.responseType?p.response:p.responseText,status:p.status,statusText:p.statusText,headers:n,config:e,request:p};o(t,s,r),p=null}},p.onabort=function(){p&&(s(l("Request aborted",e,"ECONNABORTED",p)),p=null)},p.onerror=function(){s(l("Network Error",e,null,p)),p=null},p.ontimeout=function(){s(l("timeout of "+e.timeout+"ms exceeded",e,"ECONNABORTED",p)),p=null},r.isStandardBrowserEnv()){var m=n(68),v=(e.withCredentials||u(e.url))&&e.xsrfCookieName?m.read(e.xsrfCookieName):void 0;v&&(f[e.xsrfHeaderName]=v)}if("setRequestHeader"in p&&r.forEach(f,function(e,t){void 0===c&&"content-type"===t.toLowerCase()?delete f[t]:p.setRequestHeader(t,e)}),e.withCredentials&&(p.withCredentials=!0),e.responseType)try{p.responseType=e.responseType}catch(y){if("json"!==e.responseType)throw y}"function"==typeof e.onDownloadProgress&&p.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&p.upload&&p.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then(function(e){p&&(p.abort(),s(e),p=null)}),void 0===c&&(c=null),p.send(c)})}},function(e,t,n){"use strict";var r=n(65);e.exports=function(e,t,n,o,i){var a=new Error(e);return r(a,t,n,o,i)}},function(e,t,n){"use strict";var r=n(4);e.exports=function(e,t){t=t||{};var n={};return r.forEach(["url","method","params","data"],function(e){void 0!==t[e]&&(n[e]=t[e])}),r.forEach(["headers","auth","proxy"],function(o){r.isObject(t[o])?n[o]=r.deepMerge(e[o],t[o]):void 0!==t[o]?n[o]=t[o]:r.isObject(e[o])?n[o]=r.deepMerge(e[o]):void 0!==e[o]&&(n[o]=e[o])}),r.forEach(["baseURL","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"],function(r){void 0!==t[r]?n[r]=t[r]:void 0!==e[r]&&(n[r]=e[r])}),n}},function(e,t,n){"use strict";function r(e){this.message=e}r.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},r.prototype.__CANCEL__=!0,e.exports=r},function(e,t,n){"use strict";var r=Object.prototype.hasOwnProperty,o="~";function i(){}function a(e,t,n){this.fn=e,this.context=t,this.once=n||!1}function u(e,t,n,r,i){if("function"!=typeof n)throw new TypeError("The listener must be a function");var u=new a(n,r||e,i),l=o?o+t:t;return e._events[l]?e._events[l].fn?e._events[l]=[e._events[l],u]:e._events[l].push(u):(e._events[l]=u,e._eventsCount++),e}function l(e,t){0==--e._eventsCount?e._events=new i:delete e._events[t]}function s(){this._events=new i,this._eventsCount=0}Object.create&&(i.prototype=Object.create(null),(new i).__proto__||(o=!1)),s.prototype.eventNames=function(){var e,t,n=[];if(0===this._eventsCount)return n;for(t in e=this._events)r.call(e,t)&&n.push(o?t.slice(1):t);return Object.getOwnPropertySymbols?n.concat(Object.getOwnPropertySymbols(e)):n},s.prototype.listeners=function(e){var t=o?o+e:e,n=this._events[t];if(!n)return[];if(n.fn)return[n.fn];for(var r=0,i=n.length,a=new Array(i);rI.length&&I.push(e)}function j(e,t,n){return null==e?0:function e(t,n,r,o){var u=typeof t;"undefined"!==u&&"boolean"!==u||(t=null);var l=!1;if(null===t)l=!0;else switch(u){case"string":case"number":l=!0;break;case"object":switch(t.$$typeof){case i:case a:l=!0}}if(l)return r(o,t,""===n?"."+A(t,0):n),1;if(l=0,n=""===n?".":n+":",Array.isArray(t))for(var s=0;sthis.eventPool.length&&this.eventPool.push(e)}function fe(e){e.eventPool=[],e.getPooled=se,e.release=ce}o(le.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=ae)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=ae)},persist:function(){this.isPersistent=ae},isPersistent:ue,destructor:function(){var e,t=this.constructor.Interface;for(e in t)this[e]=null;this.nativeEvent=this._targetInst=this.dispatchConfig=null,this.isPropagationStopped=this.isDefaultPrevented=ue,this._dispatchInstances=this._dispatchListeners=null}}),le.Interface={type:null,target:null,currentTarget:function(){return null},eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null},le.extend=function(e){function t(){}function n(){return r.apply(this,arguments)}var r=this;t.prototype=r.prototype;var i=new t;return o(i,n.prototype),n.prototype=i,n.prototype.constructor=n,n.Interface=o({},r.Interface,e),n.extend=r.extend,fe(n),n},fe(le);var pe=le.extend({data:null}),de=le.extend({data:null}),he=[9,13,27,32],me=V&&"CompositionEvent"in window,ve=null;V&&"documentMode"in document&&(ve=document.documentMode);var ye=V&&"TextEvent"in window&&!ve,ge=V&&(!me||ve&&8=ve),be=String.fromCharCode(32),we={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["compositionend","keypress","textInput","paste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:"blur compositionend keydown keypress keyup mousedown".split(" ")},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:"blur compositionstart keydown keypress keyup mousedown".split(" ")},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:"blur compositionupdate keydown keypress keyup mousedown".split(" ")}},xe=!1;function _e(e,t){switch(e){case"keyup":return-1!==he.indexOf(t.keyCode);case"keydown":return 229!==t.keyCode;case"keypress":case"mousedown":case"blur":return!0;default:return!1}}function Se(e){return"object"==typeof(e=e.detail)&&"data"in e?e.data:null}var Te=!1;var ke={eventTypes:we,extractEvents:function(e,t,n,r){var o=void 0,i=void 0;if(me)e:{switch(e){case"compositionstart":o=we.compositionStart;break e;case"compositionend":o=we.compositionEnd;break e;case"compositionupdate":o=we.compositionUpdate;break e}o=void 0}else Te?_e(e,n)&&(o=we.compositionEnd):"keydown"===e&&229===n.keyCode&&(o=we.compositionStart);return o?(ge&&"ko"!==n.locale&&(Te||o!==we.compositionStart?o===we.compositionEnd&&Te&&(i=ie()):(re="value"in(ne=r)?ne.value:ne.textContent,Te=!0)),o=pe.getPooled(o,t,n,r),i?o.data=i:null!==(i=Se(n))&&(o.data=i),B(o),i=o):i=null,(e=ye?function(e,t){switch(e){case"compositionend":return Se(t);case"keypress":return 32!==t.which?null:(xe=!0,be);case"textInput":return(e=t.data)===be&&xe?null:e;default:return null}}(e,n):function(e,t){if(Te)return"compositionend"===e||!me&&_e(e,t)?(e=ie(),oe=re=ne=null,Te=!1,e):null;switch(e){case"paste":return null;case"keypress":if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1