diff --git a/Dockerfile b/Dockerfile index 359972e..774bd0a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 MAINTAINER Stille -ENV VERSION v0.2.7 +ENV VERSION v0.3.0 WORKDIR /base RUN apk add wget && \ diff --git a/pref.ini b/pref.ini index e9aa6e5..cb9c5db 100644 --- a/pref.ini +++ b/pref.ini @@ -27,6 +27,12 @@ surfboard_rule_base=surfboard.conf ;Mellow config base used by the generator, supports local files/URL mellow_rule_base=mellow.conf +;Quantumult X config base used by the generator, supports local files/URL +quan_rule_base=quan.conf + +;Quantumult X config base used by the generator, supports local files/URL +quanx_rule_base=quanx.conf + ;Proxy used to download rulesets or subscriptions, set to NONE or empty to disable it, set to SYSTEM to use system proxy. ;Accept cURL-supported proxies (http:// https:// socks4a:// socks5://) proxy_ruleset=SYSTEM @@ -35,6 +41,21 @@ proxy_subscription=NONE ;Append a proxy type string ([SS] [SSR] [VMess]) to node remark. append_proxy_type=false +[userinfo] +;Rules to extract stream data from node +;Format: full_match_regex|new_format_regex +;where new_format_regex should be like "total=$1&left=$2&used=$3" +stream_rule=^剩余流量:(.*?) (.*)$|total=$1&left=$2 +stream_rule=^Bandwidth: (.*?)/(.*)$|used=$1&total=$2 +stream_rule=^\[.*?\]剩余(.*?)@(?:.*)$|total=$1 + +;Rules to extract expire time data from node +;Format: full_match_regex|new_format_regex +;where new_format_regex should follow this example: yyyy:mm:dd:hh:mm:ss +time_rule=^过期时间:(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)$|$1:$2:$3:$4:$5:$6 +time_rule=^到期时间:(\d+)-(\d+)-(\d+)$|$1:$2:$3:0:0:0 +time_rule=^Smart Access expire: (\d+)/(\d+)/(\d+)$|$1:$2:$3:0:0:0 + [node_pref] udp_flag=false tcp_fast_open_flag=false @@ -128,8 +149,8 @@ rule=ES,🇪🇸 rule=EU,🇪🇺 rule=(Finland|芬兰|赫尔辛基),🇫🇮 rule=(FR|France|法国|巴黎),🇫🇷 -rule=(UK|England|UnitedKingdom|英国|英|伦敦),🇬🇧 -rule=(HK|HongKong|香港|深港|沪港|呼港|HKT|HKBN|HGC|WTT|CMI|穗港|京港|港),🇭🇰 +rule=(UK|England|United.*?Kingdom|英国|英|伦敦),🇬🇧 +rule=(?i)(HK|Hong.*?Kong|香港|深港|沪港|呼港|HKT|HKBN|HGC|WTT|CMI|穗港|京港|港),🇭🇰 rule=(Indonesia|印尼|印度尼西亚|雅加达),🇮🇩 rule=(Ireland|爱尔兰|都柏林),🇮🇪 rule=(India|印度|孟买),🇮🇳