pymecli 0.3.5__tar.gz → 0.3.7__tar.gz

{pymecli-0.3.5 → pymecli-0.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymecli
-Version: 0.3.5
+Version: 0.3.7
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli

{pymecli-0.3.5 → pymecli-0.3.7}/cli/baidu.py

@@ -20,7 +20,7 @@ def acsToken(
         help="request url",
     ),
     timeout: int = typer.Option(
-        3,
+        10,
         "--timeout",
         "-t",
         help="timeout内如果没有请求完整,会强制中断,然后从已有的请求中获取数据",

{pymecli-0.3.5 → pymecli-0.3.7}/cli/bitget.py

@@ -44,7 +44,7 @@ def sync(
 def spot(
     symbols: str,
     proxy: str = typer.Option(
-        None, "--proxy", "-p", help="代理服务器地址，例如: http://127.0.0.1:7890"
+        None, "--proxy", "-p", help="代理服务器地址，例如: http://127.0.0.1:7897"
     ),
 ):
     """
@@ -60,7 +60,7 @@ def spot(
 def mix(
     symbols: str,
     proxy: str = typer.Option(
-        None, "--proxy", "-p", help="代理服务器地址，例如: http://127.0.0.1:7890"
+        None, "--proxy", "-p", help="代理服务器地址，例如: http://127.0.0.1:7897"
     ),
 ):
     """

{pymecli-0.3.5 → pymecli-0.3.7}/cli/fast.py

@@ -151,7 +151,7 @@ def run_app(
         None,
         "--proxy",
         "-p",
-        help="服务器代理,传入则通过代理转换Clash订阅,比如:socks5://127.0.0.1:7890",
+        help="服务器代理,传入则通过代理转换Clash订阅,比如:socks5://127.0.0.1:7897",
     ),
 ):
     clash_config = ClashConfig(rule, my_rule, proxy)

{pymecli-0.3.5 → pymecli-0.3.7}/core/clash.py

@@ -104,12 +104,16 @@ class ClashYamlGenerator:
 
         # 获取rules
         rule_list = [
-            [f"{self.my_rule_base_url}/direct.yaml", "DIRECT,no-resolve"],
+            [f"{self.my_rule_base_url}/direct.yaml", "DIRECT"],
             [f"{self.my_rule_base_url}/proxy.yaml", "全局选择"],
             [
                 f"{self.my_rule_base_url}/round.yaml",
                 "轮询",
             ],
+            [
+                f"{self.my_rule_base_url}/xbox.yaml",
+                "全局选择",
+            ],
         ]
 
         for item in rule_list:
@@ -128,6 +132,7 @@ class ClashYamlGenerator:
             {
                 "applications": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "classical",
                     "url": f"{self.rule_base_url}/applications.txt",
                     "path": "./ruleset/applications.yaml",
@@ -135,6 +140,7 @@ class ClashYamlGenerator:
                 },
                 "private": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/private.txt",
                     "path": "./ruleset/private.yaml",
@@ -142,6 +148,7 @@ class ClashYamlGenerator:
                 },
                 "icloud": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/icloud.txt",
                     "path": "./ruleset/icloud.yaml",
@@ -149,6 +156,7 @@ class ClashYamlGenerator:
                 },
                 "apple": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/apple.txt",
                     "path": "./ruleset/apple.yaml",
@@ -156,6 +164,7 @@ class ClashYamlGenerator:
                 },
                 "google": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/google.txt",
                     "path": "./ruleset/google.yaml",
@@ -163,6 +172,7 @@ class ClashYamlGenerator:
                 },
                 "proxy": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/proxy.txt",
                     "path": "./ruleset/proxy.yaml",
@@ -170,6 +180,7 @@ class ClashYamlGenerator:
                 },
                 "direct": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "domain",
                     "url": f"{self.rule_base_url}/direct.txt",
                     "path": "./ruleset/direct.yaml",
@@ -177,6 +188,7 @@ class ClashYamlGenerator:
                 },
                 "lancidr": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "ipcidr",
                     "url": f"{self.rule_base_url}/lancidr.txt",
                     "path": "./ruleset/lancidr.yaml",
@@ -184,6 +196,7 @@ class ClashYamlGenerator:
                 },
                 "cncidr": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "ipcidr",
                     "url": f"{self.rule_base_url}/cncidr.txt",
                     "path": "./ruleset/cncidr.yaml",
@@ -191,6 +204,7 @@ class ClashYamlGenerator:
                 },
                 "telegramcidr": {
                     "type": "http",
+                    "format": "yaml",
                     "behavior": "ipcidr",
                     "url": f"{self.rule_base_url}/telegramcidr.txt",
                     "path": "./ruleset/telegramcidr.yaml",
@@ -210,8 +224,8 @@ class ClashYamlGenerator:
                 "RULE-SET,google,全局选择",
                 "RULE-SET,proxy,全局选择",
                 "RULE-SET,direct,DIRECT",
-                "RULE-SET,lancidr,DIRECT",
-                "RULE-SET,cncidr,DIRECT",
+                "RULE-SET,lancidr,DIRECT,no-resolve",
+                "RULE-SET,cncidr,DIRECT,no-resolve",
                 "RULE-SET,telegramcidr,全局选择",
                 "GEOIP,LAN,DIRECT,no-resolve",
                 "GEOIP,CN,DIRECT,no-resolve",

pymecli-0.3.7/data/template.yaml

@@ -0,0 +1,120 @@
+mixed-port: 7897
+allow-lan: false
+mode: rule
+log-level: warning
+external-controller: "127.0.0.1:9097"
+global-client-fingerprint: chrome
+unified-delay: true
+ipv6: false
+profile:
+  store-selected: true
+tun:
+  mtu: 1500
+dns:
+  enable: true
+  listen: ":53"
+  enhanced-mode: "fake-ip"
+  fake-ip-range: "198.18.0.1/16"
+  fake-ip-filter-mode: "blacklist"
+  prefer-h3: false
+  respect-rules: false
+  use-hosts: false
+  use-system-hosts: false
+  ipv6: false
+  cache-algorithm: arc
+  fake-ip-filter:
+    - "*.lan"
+    - "*.local"
+    - "*.arpa"
+    - "*.time.*"
+    - "*.ntp.*"
+    - "*.music.*"
+    - "*.msftncsi.com"
+    - "*.msftconnecttest.com"
+    - "+.market.xiaomi.com"
+    - "localhost.ptlogin2.qq.com"
+    - "stun.*"
+    - "*.srv.nintendo.net"
+    - "*.stun.playstation.net"
+    - "xbox.*.microsoft.com"
+    - "*.ipv6.microsoft.com"
+    - "*.xboxlive.com"
+    - "speedtest.cros.wr.pvp.net"
+  default-nameserver:
+    - "223.5.5.5"
+    - "119.29.29.29"
+    - "1.1.1.1"
+    - "8.8.8.8"
+    - "2400:3200::1"
+    - "2001:4860:4860::8888"
+  nameserver:
+    # 国内DNS服务器↓
+    - "https://dns.alidns.com/dns-query" # 阿里云公共DNS
+    - "https://doh.pub/dns-query" # 腾讯DNSPod
+    - "https://doh.360.cn/dns-query" # 360安全DNS
+    - "https://1.1.1.1/dns-query" #  Cloudflare(主)
+    # 国外DNS服务器↓
+    - "https://1.0.0.1/dns-query" # Cloudflare(备)
+    - "https://208.67.222.222/dns-query" # OpenDNS(主)
+    - "https://208.67.220.220/dns-query" # OpenDNS(备)
+    - "https://194.242.2.2/dns-query" # Mullvad(主)
+    - "https://194.242.2.3/dns-query" # Mullvad(备)
+  direct-nameserver-follow-policy: false
+  fallback-filter:
+    geoip: true
+    geoip-code: "CN"
+    ipcidr:
+      - "240.0.0.0/4"
+      - "0.0.0.0/32"
+      - "127.0.0.1/32"
+      - "192.168.0.0/16"
+      - "10.0.0.0/8"
+      - "172.16.0.0/12"
+    domain:
+      - "+.google.com"
+      - "+.facebook.com"
+      - "+.twitter.com"
+      - "+.youtube.com"
+      - "+.googleapis.com"
+      - "+.gvt1.com"
+  fallback: []
+  proxy-server-nameserver:
+    # 国内DNS服务器↓
+    - "https://dns.alidns.com/dns-query" # 阿里云公共DNS
+    - "https://doh.pub/dns-query" # 腾讯DNSPod
+    - "https://doh.360.cn/dns-query" # 360安全DNS
+    # 国外DNS服务器↓
+    - "https://1.1.1.1/dns-query" # Cloudflare(主)
+    - "https://1.0.0.1/dns-query" # Cloudflare(备)
+    - "https://208.67.222.222/dns-query" # OpenDNS(主)
+    - "https://208.67.220.220/dns-query" # OpenDNS(备)
+    - "https://194.242.2.2/dns-query" # Mullvad(主)
+    - "https://194.242.2.3/dns-query" # Mullvad(备)
+  nameserver-policy:
+    "geosite:private,cn,geolocation-cn":
+      # 国内DNS服务器↓
+      - "https://dns.alidns.com/dns-query" # 阿里云公共DNS
+      - "https://doh.pub/dns-query" # 腾讯DNSPod
+      - "https://doh.360.cn/dns-query" # 360安全DNS
+    "geosite:google,youtube,telegram,gfw,geolocation-!cn":
+      # 国外DNS服务器↓
+      - "https://1.1.1.1/dns-query" # Cloudflare(主)
+      - "https://1.0.0.1/dns-query" # Cloudflare(备)
+      - "https://208.67.222.222/dns-query" # OpenDNS(主)
+      - "https://208.67.220.220/dns-query" # OpenDNS(备)
+      - "https://194.242.2.2/dns-query" # Mullvad(主)
+      - "https://194.242.2.3/dns-query" # Mullvad(备)
+  direct-nameserver:
+    # 国内DNS服务器↓
+    - "https://dns.alidns.com/dns-query" # 阿里云公共DNS
+    - "https://doh.pub/dns-query" # 腾讯DNSPod
+    - "https://doh.360.cn/dns-query" # 360安全DNS
+external-controller-cors:
+  allow-private-network: true
+  allow-origins:
+    - "*"
+proxies: []
+proxy-providers: {}
+proxy-groups: []
+rule-providers: {}
+rules: []

{pymecli-0.3.5 → pymecli-0.3.7}/pyproject.toml

@@ -30,7 +30,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.3.5"
+  version = "0.3.7"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"

pymecli-0.3.5/data/template.yaml

@@ -1,150 +0,0 @@
-mixed-port: 7897
-allow-lan: false
-mode: rule
-log-level: warning
-external-controller: "127.0.0.1:9097"
-global-client-fingerprint: chrome
-unified-delay: true
-ipv6: false
-profile:
-  store-selected: true
-tun:
-  mtu: 1500
-dns:
-  enable: true
-  ipv6: false
-  use-system-hosts: false
-  listen: "127.0.0.1:5335"
-  enhanced-mode: fake-ip
-  fake-ip-range: 198.18.0.1/16
-  fake-ip-filter:
-    [
-      "*.lan",
-      "stun.*.*.*",
-      "stun.*.*",
-      time.windows.com,
-      time.nist.gov,
-      time.apple.com,
-      time.asia.apple.com,
-      "*.ntp.org.cn",
-      "*.openwrt.pool.ntp.org",
-      time1.cloud.tencent.com,
-      time.ustc.edu.cn,
-      pool.ntp.org,
-      ntp.ubuntu.com,
-      ntp.aliyun.com,
-      ntp1.aliyun.com,
-      ntp2.aliyun.com,
-      ntp3.aliyun.com,
-      ntp4.aliyun.com,
-      ntp5.aliyun.com,
-      ntp6.aliyun.com,
-      ntp7.aliyun.com,
-      time1.aliyun.com,
-      time2.aliyun.com,
-      time3.aliyun.com,
-      time4.aliyun.com,
-      time5.aliyun.com,
-      time6.aliyun.com,
-      time7.aliyun.com,
-      "*.time.edu.cn",
-      time1.apple.com,
-      time2.apple.com,
-      time3.apple.com,
-      time4.apple.com,
-      time5.apple.com,
-      time6.apple.com,
-      time7.apple.com,
-      time1.google.com,
-      time2.google.com,
-      time3.google.com,
-      time4.google.com,
-      music.163.com,
-      "*.music.163.com",
-      "*.126.net",
-      musicapi.taihe.com,
-      music.taihe.com,
-      songsearch.kugou.com,
-      trackercdn.kugou.com,
-      "*.kuwo.cn",
-      api-jooxtt.sanook.com,
-      api.joox.com,
-      joox.com,
-      y.qq.com,
-      "*.y.qq.com",
-      streamoc.music.tc.qq.com,
-      mobileoc.music.tc.qq.com,
-      isure.stream.qqmusic.qq.com,
-      dl.stream.qqmusic.qq.com,
-      aqqmusic.tc.qq.com,
-      amobile.music.tc.qq.com,
-      "*.xiami.com",
-      "*.music.migu.cn",
-      music.migu.cn,
-      "*.msftconnecttest.com",
-      "*.msftncsi.com",
-      localhost.ptlogin2.qq.com,
-      "*.*.*.srv.nintendo.net",
-      "*.*.stun.playstation.net",
-      "xbox.*.*.microsoft.com",
-      "*.ipv6.microsoft.com",
-      "*.*.xboxlive.com",
-      speedtest.cros.wr.pvp.net,
-    ]
-  default-nameserver:
-    [
-      system,
-      180.76.76.76,
-      182.254.118.118,
-      8.8.8.8,
-      180.184.2.2,
-      "2400:3200::1",
-    ]
-  nameserver:
-    [
-      "https://223.5.5.5/dns-query#skip-cert-verify=true",
-      "https://doh.pub/dns-query#skip-cert-verify=true",
-      "https://dns.alidns.com/dns-query#skip-cert-verify=true",
-      "tls://223.5.5.5#skip-cert-verify=true",
-      "tls://dot.pub#skip-cert-verify=true",
-      "tls://dns.alidns.com#skip-cert-verify=true",
-      "https://223.6.6.6/dns-query#skip-cert-verify=true&h3=true",
-      "https://cloudflare-dns.com/dns-query#skip-cert-verify=true",
-    ]
-  proxy-server-nameserver:
-    [
-      "https://223.5.5.5/dns-query#skip-cert-verify=true",
-      "https://doh.pub/dns-query#skip-cert-verify=true",
-      "https://dns.alidns.com/dns-query#skip-cert-verify=true",
-      "tls://223.5.5.5#skip-cert-verify=true",
-      "tls://dot.pub#skip-cert-verify=true",
-      "tls://dns.alidns.com#skip-cert-verify=true",
-      "https://223.6.6.6/dns-query#skip-cert-verify=true&h3=true",
-      "https://cloudflare-dns.com/dns-query#skip-cert-verify=true",
-    ]
-  fallback-filter:
-    {
-      geoip: true,
-      ipcidr: [240.0.0.0/4, 0.0.0.0/32, 127.0.0.1/32],
-      domain:
-        [
-          +.google.com,
-          +.facebook.com,
-          +.twitter.com,
-          +.youtube.com,
-          +.xn--ngstr-lra8j.com,
-          +.google.cn,
-          +.googleapis.cn,
-          +.googleapis.com,
-          +.gvt1.com,
-        ],
-    }
-external-controller-cors:
-  allow-private-network: true
-  allow-origins:
-    - "*"
-proxies: []
-proxy-providers: {}
-proxy-groups: []
-rule-providers: {}
-rules: []