4 Commits

Author SHA1 Message Date
riglen
b29e245ff5 gitignore 2026-07-29 13:54:04 +08:00
riglen
3feab7d5d8 gitignore 2026-07-29 13:53:01 +08:00
riglen
9bb7858d42 配置 2026-05-28 17:11:57 +08:00
riglen
28c49ce299 配置 2026-04-22 10:25:01 +08:00
7 changed files with 141 additions and 4 deletions

View File

@@ -4,6 +4,10 @@ HOST=0.0.0.0
PORT=18080 PORT=18080
LOG_LEVEL=info LOG_LEVEL=info
# 上游订阅抓取时使用的 User-Agent。
# 如果机场对默认 UA 返回 406可改成你客户端实际使用的 UA例如 Clash Party 抓包得到的值。
UPSTREAM_USER_AGENT=sub-provider/0.2
# 对外访问前缀,尽量改成足够长的随机字符串 # 对外访问前缀,尽量改成足够长的随机字符串
PUBLIC_PATH=change-me-random-hash-path PUBLIC_PATH=change-me-random-hash-path

2
.gitignore vendored
View File

@@ -207,3 +207,5 @@ cython_debug/
marimo/_static/ marimo/_static/
marimo/_lsp/ marimo/_lsp/
__marimo__/ __marimo__/
output/
data/

View File

@@ -74,6 +74,7 @@ cp .env.example .env
- `PUBLIC_PATH` 改成足够长的随机字符串 - `PUBLIC_PATH` 改成足够长的随机字符串
- `PUBLIC_BASE_URL` 建议填写你反代后的最终访问地址,例如 `https://sub.example.com` - `PUBLIC_BASE_URL` 建议填写你反代后的最终访问地址,例如 `https://sub.example.com`
- 如果上游订阅地址对默认 UA 返回 `406`,可在 `.env` 里设置 `UPSTREAM_USER_AGENT`,填成你客户端实际使用的 UA例如 Clash Party 抓包出来的值
- `AIRPORT_A_URL` / `AIRPORT_B_URL` / `AIRPORT_C_URL` 都可以直接填订阅地址,项目会自动判断是 YAML 还是 URI 订阅 - `AIRPORT_A_URL` / `AIRPORT_B_URL` / `AIRPORT_C_URL` 都可以直接填订阅地址,项目会自动判断是 YAML 还是 URI 订阅
- 也可以直接填本地文件路径,例如 `/app/data/sources/airport-b.txt``file:///app/data/sources/airport-b.txt` - 也可以直接填本地文件路径,例如 `/app/data/sources/airport-b.txt``file:///app/data/sources/airport-b.txt`
- 允许把其中一个留空;留空时这个机场会自动跳过 - 允许把其中一个留空;留空时这个机场会自动跳过
@@ -271,3 +272,15 @@ python scripts/compare_conf_outputs.py --sample-source C:\path\to\sample.yaml
- `sources` 填多个机场源:**只取第一个**机场源的 `Subscription-Userinfo` - `sources` 填多个机场源:**只取第一个**机场源的 `Subscription-Userinfo`
这样 Stash、Clash Party 这类客户端读取配置订阅头时,行为是稳定可预期的。 这样 Stash、Clash Party 这类客户端读取配置订阅头时,行为是稳定可预期的。
---
## 上游 `406` 处理
上游订阅抓取默认使用 `sub-provider/0.2` 作为 `User-Agent`。如果机场对这个 UA 返回 `406 Not Acceptable`,可以直接在 `.env` 里覆盖:
```env
UPSTREAM_USER_AGENT=Clash Party/<你的版本号或抓包值>
```
代码里也兼容旧变量名 `DEFAULT_USER_AGENT`,但建议后续统一用 `UPSTREAM_USER_AGENT`

View File

@@ -1,9 +1,10 @@
from __future__ import annotations from __future__ import annotations
import os
from functools import lru_cache from functools import lru_cache
from pathlib import Path from pathlib import Path
from pydantic import Field from pydantic import AliasChoices, Field, field_validator
from pydantic_settings import BaseSettings, SettingsConfigDict from pydantic_settings import BaseSettings, SettingsConfigDict
@@ -25,7 +26,10 @@ class Settings(BaseSettings):
cache_ttl_seconds: int = 900 cache_ttl_seconds: int = 900
bundle_cache_ttl_seconds: int = 600 bundle_cache_ttl_seconds: int = 600
max_proxy_name_length: int = 80 max_proxy_name_length: int = 80
default_user_agent: str = "sub-provider/0.2" default_user_agent: str = Field(
default="sub-provider/0.2",
validation_alias=AliasChoices("UPSTREAM_USER_AGENT", "DEFAULT_USER_AGENT"),
)
sources_file: Path = CONFIG_DIR / "sources.yaml" sources_file: Path = CONFIG_DIR / "sources.yaml"
conf_base_file: Path = CONFIG_DIR / "conf" / "base.conf" conf_base_file: Path = CONFIG_DIR / "conf" / "base.conf"
@@ -40,6 +44,16 @@ class Settings(BaseSettings):
extra="ignore", extra="ignore",
) )
@field_validator("default_user_agent", mode="before")
@classmethod
def _coalesce_default_user_agent(cls, value: str) -> str:
if isinstance(value, str) and value.strip():
return value
legacy = os.getenv("DEFAULT_USER_AGENT", "").strip()
if legacy:
return legacy
return "sub-provider/0.2"
@lru_cache(maxsize=1) @lru_cache(maxsize=1)
def get_settings() -> Settings: def get_settings() -> Settings:

View File

@@ -76,7 +76,7 @@ module = pt,../rules/acl4ssr/PrivateTracker.yaml,🎮 PT平台,125,true
module = cn-domain,../rules/acl4ssr/ChinaDomain.yaml,🎯 全球直连,130,true module = cn-domain,../rules/acl4ssr/ChinaDomain.yaml,🎯 全球直连,130,true
module = cn-company-ip,../rules/acl4ssr/ChinaCompanyIp.yaml,🎯 全球直连,131,true module = cn-company-ip,../rules/acl4ssr/ChinaCompanyIp.yaml,🎯 全球直连,131,true
module = download,../rules/acl4ssr/Download.yaml,🎯 全球直连,132,true module = download,../rules/acl4ssr/Download.yaml,🎯 全球直连,132,true
module = proxy-gfw,../rules/acl4ssr/ProxyGFWlist.yaml,🚀 节点选择,140,true module = proxy-gfw,../rules/acl4ssr/ProxyGFWlistLite.yaml,🚀 节点选择,140,true
builtin = geoip_cn,GEOIP,CN,🎯 全球直连,9000,true builtin = geoip_cn,GEOIP,CN,🎯 全球直连,9000,true
builtin = final,FINAL,,🚀 节点选择,9999,true builtin = final,FINAL,,🚀 节点选择,9999,true

View File

@@ -0,0 +1,104 @@
payload:
- DOMAIN-KEYWORD,facebook
- DOMAIN-KEYWORD,github
- DOMAIN-KEYWORD,instagram
- DOMAIN-KEYWORD,twitter
- DOMAIN-KEYWORD,whatsapp
- DOMAIN-SUFFIX,bbc.co
- DOMAIN-SUFFIX,bbc.co.uk
- DOMAIN-SUFFIX,bbc.com
- DOMAIN-SUFFIX,bbc.in
- DOMAIN-SUFFIX,bbcchinese.com
- DOMAIN-SUFFIX,bbci.co.uk
- DOMAIN-SUFFIX,bloomberg.cn
- DOMAIN-SUFFIX,bloomberg.com
- DOMAIN-SUFFIX,bloomberg.de
- DOMAIN-SUFFIX,bloombergview.com
- DOMAIN-SUFFIX,cdninstagram.com
- DOMAIN-SUFFIX,cloudflare-dns.com
- DOMAIN-SUFFIX,cloudflare-ipfs.com
- DOMAIN-SUFFIX,cloudflarestatus.com
- DOMAIN-SUFFIX,discord.co
- DOMAIN-SUFFIX,discord.com
- DOMAIN-SUFFIX,discord.gg
- DOMAIN-SUFFIX,discord.media
- DOMAIN-SUFFIX,discordapp.com
- DOMAIN-SUFFIX,discordapp.net
- DOMAIN-SUFFIX,economist.com
- DOMAIN-SUFFIX,facebook.br
- DOMAIN-SUFFIX,facebook.com
- DOMAIN-SUFFIX,facebook.de
- DOMAIN-SUFFIX,facebook.design
- DOMAIN-SUFFIX,facebook.hu
- DOMAIN-SUFFIX,facebook.in
- DOMAIN-SUFFIX,facebook.net
- DOMAIN-SUFFIX,facebook.nl
- DOMAIN-SUFFIX,facebook.se
- DOMAIN-SUFFIX,facebookmail.com
- DOMAIN-SUFFIX,fbcdn.com
- DOMAIN-SUFFIX,fbcdn.net
- DOMAIN-SUFFIX,github.blog
- DOMAIN-SUFFIX,github.com
- DOMAIN-SUFFIX,github.io
- DOMAIN-SUFFIX,githubapp.com
- DOMAIN-SUFFIX,githubassets.com
- DOMAIN-SUFFIX,githubcopilot.com
- DOMAIN-SUFFIX,githubmemory.com
- DOMAIN-SUFFIX,githubusercontent.com
- DOMAIN-SUFFIX,gitlab.com
- DOMAIN-SUFFIX,gitlab.io
- DOMAIN-SUFFIX,gitlab.net
- DOMAIN-SUFFIX,instagram.com
- DOMAIN-SUFFIX,jsdelivr.net
- DOMAIN-SUFFIX,medium.com
- DOMAIN-SUFFIX,netlify.app
- DOMAIN-SUFFIX,nytimes.com
- DOMAIN-SUFFIX,nytimes.map.fastly.net
- DOMAIN-SUFFIX,oraclecloud.com
- DOMAIN-SUFFIX,pages.dev
- DOMAIN-SUFFIX,pincong.rocks
- DOMAIN-SUFFIX,rawgithub.com
- DOMAIN-SUFFIX,redd.it
- DOMAIN-SUFFIX,reddit.com
- DOMAIN-SUFFIX,reddithelp.com
- DOMAIN-SUFFIX,redditlist.com
- DOMAIN-SUFFIX,redditmedia.com
- DOMAIN-SUFFIX,redditspace.com
- DOMAIN-SUFFIX,redditstatic.com
- DOMAIN-SUFFIX,reuters.com
- DOMAIN-SUFFIX,reutersmedia.net
- DOMAIN-SUFFIX,signal.org
- DOMAIN-SUFFIX,sourceforge.net
- DOMAIN-SUFFIX,static-economist.com
- DOMAIN-SUFFIX,substack.com
- DOMAIN-SUFFIX,thefacebook.com
- DOMAIN-SUFFIX,threads.com
- DOMAIN-SUFFIX,threads.net
- DOMAIN-SUFFIX,twitter.com
- DOMAIN-SUFFIX,twitter.jp
- DOMAIN-SUFFIX,twitter4j.org
- DOMAIN-SUFFIX,twittercounter.com
- DOMAIN-SUFFIX,twitterfeed.com
- DOMAIN-SUFFIX,twittergadget.com
- DOMAIN-SUFFIX,twitterkr.com
- DOMAIN-SUFFIX,twittermail.com
- DOMAIN-SUFFIX,twitterrific.com
- DOMAIN-SUFFIX,twittertim.es
- DOMAIN-SUFFIX,v2ex.com
- DOMAIN-SUFFIX,vercel.app
- DOMAIN-SUFFIX,whatsapp.com
- DOMAIN-SUFFIX,whatsapp.net
- DOMAIN-SUFFIX,wikibooks.org
- DOMAIN-SUFFIX,wikimedia.org
- DOMAIN-SUFFIX,wikinews.org
- DOMAIN-SUFFIX,wikipedia.com
- DOMAIN-SUFFIX,wikipedia.org
- DOMAIN-SUFFIX,wikiquote.org
- DOMAIN-SUFFIX,wikisource.org
- DOMAIN-SUFFIX,wikiversity.org
- DOMAIN-SUFFIX,wikivoyage.org
- DOMAIN-SUFFIX,wiktionary.org
- DOMAIN-SUFFIX,workers.dev
- DOMAIN-SUFFIX,wsj.com
- DOMAIN-SUFFIX,wsj.net
- DOMAIN-SUFFIX,wsjhk.com

View File

@@ -435,7 +435,7 @@ rules:
interval: 86400 interval: 86400
proxy-gfw: proxy-gfw:
file: acl4ssr/ProxyGFWlist.yaml file: acl4ssr/ProxyGFWlistLite.yaml
behavior: classical behavior: classical
format: yaml format: yaml
policy: "{{ main_policy }}" policy: "{{ main_policy }}"