From c4e7e3768dc6f67e3b7fa2a312dc203546512076 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 6 Jun 2020 20:37:55 +0800 Subject: [PATCH] luci-app-clash: sync with upstream source --- package/ntlf9t/luci-app-clash/Makefile | 5 +- .../luasrc/controller/clash.lua | 2 +- .../luasrc/model/cbi/clash/client.lua | 5 -- .../luasrc/view/clash/core_check.htm | 20 +++++--- .../luasrc/view/clash/geoip.htm | 11 +---- .../luasrc/view/clash/status_log.htm | 18 ++++--- .../luci-app-clash/root/etc/init.d/clash | 14 +++--- .../root/usr/share/clash/clash.sh | 16 ++++-- .../img/33343e6117c37aaef8886179007ba6b5.png | Bin 0 -> 6115 bytes .../js/1.bundle.0bddb85299f970595cb5.min.js | 2 + .../js/bundle.0bddb85299f970595cb5.min.js | 1 + .../dashboard/main.0bddb85299f970595cb5.css | 27 ++++++++++ .../root/usr/share/clash/luci_version | 2 +- .../root/usr/share/clash/restore.sh | 46 ++++++++---------- 14 files changed, 95 insertions(+), 74 deletions(-) create mode 100644 package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png create mode 100644 package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/js/1.bundle.0bddb85299f970595cb5.min.js create mode 100644 package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/js/bundle.0bddb85299f970595cb5.min.js create mode 100644 package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/main.0bddb85299f970595cb5.css diff --git a/package/ntlf9t/luci-app-clash/Makefile b/package/ntlf9t/luci-app-clash/Makefile index 14c5da4b72..f9dca789f0 100644 --- a/package/ntlf9t/luci-app-clash/Makefile +++ b/package/ntlf9t/luci-app-clash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-clash -PKG_VERSION:=1.7.0 +PKG_VERSION:=1.7.1 PKG_MAINTAINER:=frainzy1477 @@ -101,7 +101,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/usr/share/ $(INSTALL_DIR) $(1)/usr/share/clash - $(INSTALL_DIR) $(1)/usr/share/clash/rules $(INSTALL_DIR) $(1)/usr/share/clash/rules/g_rules $(INSTALL_DIR) $(1)/usr/share/clash/dashboard @@ -137,8 +136,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) ./root/usr/share/clash/logstatus_check $(1)/usr/share/clash/ $(INSTALL_BIN) ./root/usr/share/clash/clash.txt $(1)/usr/share/clash/ - - $(INSTALL_BIN) ./root/usr/share/clash/dashboard/index.html $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/main.1560b07adc97ac0ac265.css $(1)/usr/share/clash/dashboard/ $(INSTALL_BIN) ./root/usr/share/clash/dashboard/img/ffac0fa1d89f15922b4594863b8b32e9.png $(1)/usr/share/clash/dashboard/img/ diff --git a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua index 0d1b042521..2d3726bf0d 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/controller/clash.lua @@ -13,7 +13,7 @@ function index() local page = entry({"admin", "services", "clash"},alias("admin", "services", "clash", "overview"), _("Clash"), 5) page.dependent = true - page.acl_depends = { "luci-app-clash" } + page.acl_depends = {"luci-app-clash"} entry({"admin", "services", "clash", "overview"},cbi("clash/overview"),_("Overview"), 10).leaf = true entry({"admin", "services", "clash", "client"},cbi("clash/client"),_("Client"), 20).leaf = true diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client.lua index 821fff2ef6..60dd78193e 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/client.lua @@ -29,11 +29,6 @@ o:value("4", translate("Clash(dTun)")) end o.description = translate("Select core, clashr support ssr while clash does not.") - -o = s:option(Flag, "old_conf", translate("Old Config")) -o.description = translate("Proxy/Proxy Groups/Rule") - - o = s:option(ListValue, "g_rules", translate("Game Rules")) o.default = "0" o:value("0", translate("Disable")) diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm index 0ef89e80b1..3f796728d4 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/core_check.htm @@ -1,5 +1,6 @@ <%+cbi/valueheader%> <%local fs=require"nixio.fs"%> +

@@ -16,14 +17,15 @@ function apply_update(){ function poll_check(){ var lv = document.getElementById('core_download'); lv.style.display="inline" - lv.innerText = "" XHR.poll(2, '<%=url([[admin]], [[services]], [[clash]], [[check]])%>', null, - function(x, data) { - if(x && x.status === 200) { - if(typeof(x.responseText) === "string") { - lv.insertAdjacentText("beforeend", x.responseText); - lv.scrollTop = lv.scrollHeight; - }}}); + function(x, data) { + var lv = document.getElementById('core_download'); + if (x.responseText && lv) { + lv.innerHTML += x.responseText; + lv.scrollTop = lv.scrollHeight; + } + } +); } @@ -54,11 +56,13 @@ function hide(){ btn.value = '<%:Download%>'; } + + <% if fs.access("/var/run/core_update") then %> var btn = document.getElementById('apply_update_button'); btn.disabled = true; btn.value = '<%:Downloading...%>'; -poll_check(); + poll_check(); <%end%> diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm index bbd46646c7..79ea6dcee9 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/geoip.htm @@ -17,14 +17,12 @@ function apply_update(){ function poll_check(){ var lv = document.getElementById('geoip_download'); lv.style.display="inline" - lv.innerText = "" XHR.poll(2, '<%=url([[admin]], [[services]], [[clash]], [[check_geoip]])%>', null, function(x, data) { - scroll(); var lv = document.getElementById('geoip_download'); if (x.responseText && lv) { - lv.innerHTML += x.responseText; - lv.scrollTop = lv.scrollHeight; + lv.innerHTML += x.responseText; + lv.scrollTop = lv.scrollHeight; } } ); @@ -60,11 +58,6 @@ function hide(){ } -/*function scroll(){ - var textarea = document.getElementById('geoip_download'); - textarea.scrollTop = textarea.scrollHeight; -}*/ - <% if fs.access("/var/run/geoip_update") then %> var btn = document.getElementById('apply_update_geoip'); diff --git a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm index 7aff7b46f8..0c392bb933 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm +++ b/package/ntlf9t/luci-app-clash/luasrc/view/clash/status_log.htm @@ -1,18 +1,22 @@ <%+cbi/valueheader%> + <%+cbi/valuefooter%> diff --git a/package/ntlf9t/luci-app-clash/root/etc/init.d/clash b/package/ntlf9t/luci-app-clash/root/etc/init.d/clash index 048fe556fd..5f11889530 100644 --- a/package/ntlf9t/luci-app-clash/root/etc/init.d/clash +++ b/package/ntlf9t/luci-app-clash/root/etc/init.d/clash @@ -205,10 +205,10 @@ yml_dns_change(){ check(){ - sed -i 's/Proxy Group:/proxy-groups:/g' "$CONFIG_YAML" - sed -i 's/proxy-provider:/proxy-providers:/g' "$CONFIG_YAML" - sed -i 's/Proxy:/proxies:/g' "$CONFIG_YAML" - sed -i 's/Rule:/rules:/g' "$CONFIG_YAML" + sed -i 's/^Proxy Group:/proxy-groups:/g' "$CONFIG_YAML" + sed -i 's/^proxy-provider:/proxy-providers:/g' "$CONFIG_YAML" + sed -i 's/^Proxy:/proxies:/g' "$CONFIG_YAML" + sed -i 's/^Rule:/rules:/g' "$CONFIG_YAML" } @@ -455,7 +455,7 @@ enable=$(uci get clash.config.enable 2>/dev/null) core=$(uci get clash.config.core 2>/dev/null) mode=$(uci get clash.config.mode 2>/dev/null) tun_mode=$(uci get clash.config.tun_mode 2>/dev/null) -old_conf=$(uci get clash.config.old_conf 2>/dev/null) + if [ -f /etc/clash/config.yaml ];then @@ -508,11 +508,9 @@ elif [ "${core}" -eq 3 ] && [ ! -f /etc/clash/clashtun/clash ]; then echo "Clash for OpenWRT" >$REAL_LOG exit 0 else -if [ -f $CONFIG_YAML ] && [ "$(ls -l $CONFIG_YAML|awk '{print int($5/1024)}')" -ne 0 ] ; then +if [ -f $CONFIG_YAML ] && [ "$(ls -l $CONFIG_YAML|awk '{print int($5)}')" -ne 0 ] ; then - if [ -z "$old_conf" ];then check >/dev/null 2>&1 - fi yml_change >/dev/null 2>&1 diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/clash.sh b/package/ntlf9t/luci-app-clash/root/usr/share/clash/clash.sh index b04a5cb0cb..b551470f32 100755 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/clash.sh +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/clash.sh @@ -19,13 +19,19 @@ if [ $config_name == "" ] || [ -z $config_name ];then fi sleep 5 echo "Clash for OpenWRT" >$REAL_LOG - exit 0 + exit 0 fi - +if [ ! -f "/usr/share/clashbackup/confit_list.conf" ];then + touch /usr/share/clashbackup/confit_list.conf +fi + + check_name=$(grep -F "${config_name}.yaml" "/usr/share/clashbackup/confit_list.conf") + + if [ ! -z $check_name ];then if [ $lang == "en" ] || [ $lang == "auto" ];then @@ -48,14 +54,14 @@ else sleep 1 if [ "$subtype" = "clash" ];then - curl -sL --connect-timeout 10 --retry 2 "$clash_url" -O 2>&1 >1 $CONFIG_YAML + wget -c4 --no-check-certificate --user-agent="Clash/OpenWRT" "$clash_url" -O 2>&1 >1 $CONFIG_YAML if [ "$?" -eq "0" ]; then echo "${config_name}.yaml#$clash_url#$subtype" >>/usr/share/clashbackup/confit_list.conf fi fi if [ "$subtype" = "ssr2clash" ];then - curl -sL --connect-timeout 10 --retry 2 "https://ssrsub2clashr.herokuapp.com/ssrsub2clash?sub=$ssr_url" -O 2>&1 >1 $CONFIG_YAML + wget -c4 --no-check-certificate --user-agent="Clash/OpenWRT" "https://gfwsb.114514.best/sub?target=clashr&url=$ssr_url" -O 2>&1 >1 $CONFIG_YAML if [ "$?" -eq "0" ]; then echo "${config_name}.yaml#$ssr_url#$subtype" >>/usr/share/clashbackup/confit_list.conf CONFIG_YAMLL="/tmp/conf" @@ -100,7 +106,7 @@ else fi if [ "$subtype" = "v2clash" ];then - curl -sL --connect-timeout 10 --retry 2 "https://tgbot.lbyczf.com/v2rayn2clash?url=$v2_url" -O 2>&1 >1 $CONFIG_YAML + wget -c4 --no-check-certificate --user-agent="Clash/OpenWRT" "https://tgbot.lbyczf.com/v2rayn2clash?url=$v2_url" -O 2>&1 >1 $CONFIG_YAML if [ "$?" -eq "0" ]; then echo "${config_name}.yaml#$v2_url#$subtype" >>/usr/share/clashbackup/confit_list.conf fi diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png b/package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/img/33343e6117c37aaef8886179007ba6b5.png new file mode 100644 index 0000000000000000000000000000000000000000..6798639d0f6c0e0656751c3c81e3a086242559e5 GIT binary patch literal 6115 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 literal 0 HcmV?d00001 diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/js/1.bundle.0bddb85299f970595cb5.min.js b/package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/js/1.bundle.0bddb85299f970595cb5.min.js new file mode 100644 index 0000000000..7bc830d892 --- /dev/null +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/dashboard/js/1.bundle.0bddb85299f970595cb5.min.js @@ -0,0 +1,2 @@ +/*! For license information please see 1.bundle.0bddb85299f970595cb5.min.js.LICENSE */ +(window.webpackJsonp=window.webpackJsonp||[]).push([[1],[function(e,t,n){"use strict";e.exports=n(51)},function(e,t,n){e.exports=n(55)()},function(e,t,n){var r;!function(){"use strict";var n={}.hasOwnProperty;function o(){for(var e=[],t=0;t=0||(o[n]=e[n]);return o}n.d(t,"a",(function(){return r}))},,,,function(e,t,n){"use strict";!function e(){if("undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE){0;try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(e)}catch(t){console.error(t)}}}(),e.exports=n(52)},function(e,t,n){var r=n(42)(Object,"create");e.exports=r},function(e,t,n){var r=n(110);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(116);e.exports=function(e,t){var n=e.__data__;return r(t)?n["string"==typeof t?"string":"hash"]:n.map}},function(e,t,n){"use strict";var r=Array.isArray,o=Object.keys,i=Object.prototype.hasOwnProperty;e.exports=function e(t,n){if(t===n)return!0;if(t&&n&&"object"==typeof t&&"object"==typeof n){var a,u,l,c=r(t),s=r(n);if(c&&s){if((u=t.length)!=n.length)return!1;for(a=u;0!=a--;)if(!e(t[a],n[a]))return!1;return!0}if(c!=s)return!1;var f=t instanceof Date,d=n instanceof Date;if(f!=d)return!1;if(f&&d)return t.getTime()==n.getTime();var p=t instanceof RegExp,h=n instanceof RegExp;if(p!=h)return!1;if(p&&h)return t.toString()==n.toString();var m=o(t);if((u=m.length)!==o(n).length)return!1;for(a=u;0!=a--;)if(!i.call(n,m[a]))return!1;for(a=u;0!=a--;)if(!e(t[l=m[a]],n[l]))return!1;return!0}return t!=t&&n!=n}},,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){var n=Array.isArray;e.exports=n},function(e,t,n){var r=n(41),o=n(89),i="[object Symbol]";e.exports=function(e){return"symbol"==typeof e||o(e)&&r(e)==i}},function(e,t,n){var r=n(23).Symbol;e.exports=r},function(e,t,n){var r=n(86),o="object"==typeof self&&self&&self.Object===Object&&self,i=r||o||Function("return this")();e.exports=i},function(e,t,n){e.exports=function(){"use strict";var e="millisecond",t="second",n="minute",r="hour",o="day",i="week",a="month",u="quarter",l="year",c=/^(\d{4})-?(\d{1,2})-?(\d{0,2})[^0-9]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?.?(\d{1,3})?$/,s=/\[([^\]]+)]|Y{2,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,f=function(e,t,n){var r=String(e);return!r||r.length>=t?e:""+Array(t+1-r.length).join(n)+e},d={s:f,z:function(e){var t=-e.utcOffset(),n=Math.abs(t),r=Math.floor(n/60),o=n%60;return(t<=0?"+":"-")+f(r,2,"0")+":"+f(o,2,"0")},m:function(e,t){var n=12*(t.year()-e.year())+(t.month()-e.month()),r=e.clone().add(n,a),o=t-r<0,i=e.clone().add(n+(o?-1:1),a);return Number(-(n+(t-r)/(o?r-i:i-r))||0)},a:function(e){return e<0?Math.ceil(e)||0:Math.floor(e)},p:function(c){return{M:a,y:l,w:i,d:o,h:r,m:n,s:t,ms:e,Q:u}[c]||String(c||"").toLowerCase().replace(/s$/,"")},u:function(e){return void 0===e}},p={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_")},h="en",m={};m[h]=p;var v=function(e){return e instanceof w},g=function(e,t,n){var r;if(!e)return h;if("string"==typeof e)m[e]&&(r=e),t&&(m[e]=t,r=e);else{var o=e.name;m[o]=e,r=o}return n||(h=r),r},y=function(e,t,n){if(v(e))return e.clone();var r=t?"string"==typeof t?{format:t,pl:n}:t:{};return r.date=e,new w(r)},b=d;b.l=g,b.i=v,b.w=function(e,t){return y(e,{locale:t.$L,utc:t.$u,$offset:t.$offset})};var w=function(){function f(e){this.$L=this.$L||g(e.locale,null,!0),this.parse(e)}var d=f.prototype;return d.parse=function(e){this.$d=function(e){var t=e.date,n=e.utc;if(null===t)return new Date(NaN);if(b.u(t))return new Date;if(t instanceof Date)return new Date(t);if("string"==typeof t&&!/Z$/i.test(t)){var r=t.match(c);if(r)return n?new Date(Date.UTC(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)):new Date(r[1],r[2]-1,r[3]||1,r[4]||0,r[5]||0,r[6]||0,r[7]||0)}return new Date(t)}(e),this.init()},d.init=function(){var e=this.$d;this.$y=e.getFullYear(),this.$M=e.getMonth(),this.$D=e.getDate(),this.$W=e.getDay(),this.$H=e.getHours(),this.$m=e.getMinutes(),this.$s=e.getSeconds(),this.$ms=e.getMilliseconds()},d.$utils=function(){return b},d.isValid=function(){return!("Invalid Date"===this.$d.toString())},d.isSame=function(e,t){var n=y(e);return this.startOf(t)<=n&&n<=this.endOf(t)},d.isAfter=function(e,t){return y(e)=0;d--){var p=o[d];"."===p?s(o,d):".."===p?(s(o,d),f++):f&&(s(o,d),f--)}if(!u)for(;f--;f)o.unshift("..");!u||""===o[0]||o[0]&&c(o[0])||o.unshift("");var h=o.join("/");return n&&"/"!==h.substr(-1)&&(h+="/"),h};function d(e){return e.valueOf?e.valueOf():Object.prototype.valueOf.call(e)}var p=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])}));if("object"==typeof t||"object"==typeof n){var r=d(t),o=d(n);return r!==t||o!==n?e(r,o):Object.keys(Object.assign({},t,n)).every((function(r){return e(t[r],n[r])}))}return!1},h=!0,m="Invariant failed";var v=function(e,t){if(!e)throw h?new Error(m):new Error(m+": "+(t||""))};function g(e){return"/"===e.charAt(0)?e:"/"+e}function y(e){return"/"===e.charAt(0)?e.substr(1):e}function b(e,t){return function(e,t){return 0===e.toLowerCase().indexOf(t.toLowerCase())&&-1!=="/?#".indexOf(e.charAt(t.length))}(e,t)?e.substr(t.length):e}function w(e){return"/"===e.charAt(e.length-1)?e.slice(0,-1):e}function x(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 S(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(l.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=f(o.pathname,r.pathname)):o.pathname=r.pathname:o.pathname||(o.pathname="/"),o}function E(){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;rt?n.splice(t,n.length-t,r):n.push(r),f({action:"PUSH",location:r,index:t,entries:n})}}))},replace:function(e,t){var r=S(e,t,d(),g.location);s.confirmTransitionTo(r,"REPLACE",n,(function(e){e&&(g.entries[g.index]=r,f({action:"REPLACE",location:r}))}))},go:v,goBack:function(){v(-1)},goForward:function(){v(1)},canGo:function(e){var t=g.index+e;return t>=0&&t=0;t--){var n=e[t][a];n.modified||(Array.isArray(n.base)?K(n)&&A(n):w(n.base)?Q(n)&&A(n):S(n.base)?X(n)&&A(n):G(n)&&A(n))}}function G(e){for(var t=e.base,n=e.draft,r=Object.keys(n),o=r.length-1;o>=0;o--){var i=r[o],u=t[i];if(void 0===u&&!m(t,i))return!0;var l=n[i],c=l&&l[a];if(c?c.base!==u:!g(l,u))return!0}return r.length!==Object.keys(t).length}function K(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)}function Q(e){var t=e.base,n=e.draft;if(t.size!==n.size)return!0;var r=!1;return n.forEach((function(e,n){r||(r=l(e)?e.modified:e!==t.get(n))})),r}function X(e){var t=e.base,n=e.draft;if(t.size!==n.size)return!0;var r=!1;return n.forEach((function(e,n){r||(r=l(e)?e.modified:!t.has(n))})),r}var J,Z,ee=Object.freeze({__proto__:null,willFinalize:function(e,t,n){e.drafts.forEach((function(e){e[a].finalizing=!0})),n?u(t)&&t[a].scope===e&&Y(e.drafts):(e.patches&&function e(t){if(!t||"object"!=typeof t)return;var n=t[a];if(!n)return;var r=n.base,o=n.draft,i=n.assigned;if(Array.isArray(t)){if(K(n)){if(A(n),i.length=!0,o.lengths&&a[f-1]===u[f+c-1];)--f;for(var d=s;d=f;--d){p=t.concat([d]);n[h+d-f]={op:"add",path:p,value:u[d]},r.push({op:"remove",path:p})}}function he(e,t,n,r){var o=e.base,i=e.copy;p(e.assigned,(function(e,a){var u=v(o,e),l=v(i,e),c=a?m(o,e)?"replace":"add":"remove";if(u!==l||"replace"!==c){var s=t.concat(e);n.push("remove"===c?{op:c,path:s}:{op:c,path:s,value:l}),r.push("add"===c?{op:"remove",path:s}:"remove"===c?{op:"add",path:s,value:u}:{op:"replace",path:s,value:u})}}))}function me(e,t,n,r){var o=e.base,i=e.copy,a=0;o.forEach((function(e){if(!i.has(e)){var o=t.concat([a]);n.push({op:"remove",path:o,value:e}),r.unshift({op:"add",path:o,value:e})}a++})),a=0,i.forEach((function(e){if(!o.has(e)){var i=t.concat([a]);n.push({op:"add",path:i,value:e}),r.unshift({op:"remove",path:i,value:e})}a++}))}function ve(e,t){return t.forEach((function(t){var n=t.path,r=t.op;if(!n.length)throw new Error("Illegal state");for(var o=e,i=0;i=0;n--){var r=t[n];if(0===r.path.length&&"replace"===r.op){e=r.value;break}}return u(e)?ve(e,t):this.produce(e,(function(e){return ve(e,t.slice(n+1))}))},e.prototype.processResult=function(e,t){var n=t.drafts[0],r=void 0!==e&&e!==n;if(this.willFinalize(t,e,r),r){if(n[a].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.");l(e)&&(e=this.finalize(e,null,t),this.maybeFreeze(e)),t.patches&&(t.patches.push({op:"replace",path:[],value:e}),t.inversePatches.push({op:"replace",path:[],value:n[a].base}))}else e=this.finalize(n,[],t);return t.revoke(),t.patches&&t.patchListener(t.patches,t.inversePatches),e!==o?e:void 0},e.prototype.finalize=function(e,t,n){var r=this,o=e[a];if(!o)return Object.isFrozen(e)?e:this.finalizeTree(e,null,n);if(o.scope!==n)return e;if(!o.modified)return this.maybeFreeze(o.base,!0),o.base;if(!o.finalized){if(o.finalized=!0,this.finalizeTree(o.draft,t,n),this.onDelete&&!S(o.base))if(this.useProxies){p(o.assigned,(function(e,t){var n,i;t||null===(i=(n=r).onDelete)||void 0===i||i.call(n,o,e)}))}else{var i=o.base,u=o.copy;p(i,(function(e){var t,n;m(u,e)||null===(n=(t=r).onDelete)||void 0===n||n.call(t,o,e)}))}this.onCopy&&this.onCopy(o),this.autoFreeze&&n.canAutoFreeze&&P(o.copy,!1),t&&n.patches&&function(e,t,n,r){(Array.isArray(e.base)?pe:S(e.base)?me:he)(e,t,n,r)}(o,t,n.patches,n.inversePatches)}return o.copy},e.prototype.finalizeTree=function(e,t,n){var r=this,o=e[a];o&&(this.useProxies||(o.copy=d(o.draft,!0)),e=o.copy);var i=!!t&&!!n.patches,c=function(a,s,f){if(s===f)throw Error("Immer forbids circular references");var d=!!o&&f===e,y=S(f);if(u(s)){var b=d&&i&&!y&&!m(o.assigned,a)?t.concat(a):null;if(function(e,t,n){w(e)?e.set(t,n):S(e)?(e.delete(t),e.add(n)):Array.isArray(e)||h(e,t)?e[t]=n:Object.defineProperty(e,t,{value:n,writable:!0,configurable:!0})}(f,a,s=r.finalize(s,b,n)),u(s)&&(n.canAutoFreeze=!1),d&&s===v(o.base,a))return}else{if(d&&g(s,v(o.base,a)))return;l(s)&&!Object.isFrozen(s)&&(p(s,c),r.maybeFreeze(s))}d&&r.onAssign&&!y&&r.onAssign(o,a,s)};return p(e,c),e},e.prototype.maybeFreeze=function(e,t){void 0===t&&(t=!1),this.autoFreeze&&!u(e)&&P(e,t)},e}()),be=ye.produce;ye.produceWithPatches.bind(ye),ye.setAutoFreeze.bind(ye),ye.setUseProxies.bind(ye),ye.applyPatches.bind(ye),ye.createDraft.bind(ye),ye.finishDraft.bind(ye);t.a=be}).call(this,n(35))},function(e,t,n){"use strict";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),c=1;c=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(35))},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,c=[],s=!1,f=-1;function d(){s&&l&&(s=!1,l.length?c=l.concat(c):f=-1,c.length&&p())}function p(){if(!s){var e=u(d);s=!0;for(var t=c.length;t;){for(l=c,c=[];++f1)for(var n=1;nM.length&&M.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?"."+N(t,0):n),1;if(l=0,n=""===n?".":n+":",Array.isArray(t))for(var c=0;c