From d89622f441150bb28f7375e2701a4c6852f4dd9d Mon Sep 17 00:00:00 2001
From: oruke <orukefeng@gmail.com>
Date: Thu, 30 Apr 2026 11:08:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(clash):=20Google=20=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=9B=86=E7=8B=AC=E7=AB=8B=E4=B8=BA=20google-all.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 ruleset/google-all.yaml 覆盖所有 Google 域名:
  核心域名、API/CDN、YouTube、基础设施 (goog/recaptcha.net/1e100.net)、CN变体
- 移除 config.yaml 中的内联 DOMAIN-KEYWORD/DOMAIN-SUFFIX 规则
- 移除冗余的 google-custom 引用 (已被 google-all 覆盖)
- 以 RULE-SET 形式引用，保持配置整洁
---
 clash/config.yaml             | 24 +++-------
 clash/ruleset/google-all.yaml | 88 +++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 17 deletions(-)
 create mode 100644 clash/ruleset/google-all.yaml

diff --git a/clash/config.yaml b/clash/config.yaml
index 900c6cf..63e061e 100644
--- a/clash/config.yaml
+++ b/clash/config.yaml
@@ -463,6 +463,12 @@ rule-providers:
     url: https://git.nas.594186.xyz:16666/oruke/resources/raw/branch/main/clash/ruleset/jp-content.yaml
     path: ./ruleset/jp-content.yaml
 
+  google-all:
+    type: http
+    behavior: classical
+    url: https://git.nas.594186.xyz:16666/oruke/resources/raw/branch/main/clash/ruleset/google-all.yaml
+    path: ./ruleset/google-all.yaml
+
 # ══════════════════════════════════════════════════════════
 # 分流规则 (按优先级从高到低)
 # ══════════════════════════════════════════════════════════
@@ -482,22 +488,7 @@ rules:
   - RULE-SET,tailscale-custom,Tailscale
 
   # ─── Google 全家桶 (必须在 reject/direct 之前！) ───
-  # DOMAIN-KEYWORD,google 抓不到不含"google"的 Google 基础设施域名
-  # recaptcha.net / pki.goog 等被 Loyalsoldier direct 列表标记为直连 → 国内不可达
-  - DOMAIN-KEYWORD,google,Google
-  - DOMAIN-SUFFIX,googleapis.com,Google
-  - DOMAIN-SUFFIX,gstatic.com,Google
-  - DOMAIN-SUFFIX,googleusercontent.com,Google
-  - DOMAIN-SUFFIX,gvt1.com,Google
-  - DOMAIN-SUFFIX,gvt2.com,Google
-  - DOMAIN-SUFFIX,ggpht.com,Google
-  - DOMAIN-SUFFIX,youtube.com,Google
-  - DOMAIN-SUFFIX,ytimg.com,Google
-  - DOMAIN-SUFFIX,youtu.be,Google
-  # 不含"google"的 Google 域名
-  - DOMAIN-SUFFIX,goog,Google
-  - DOMAIN-SUFFIX,recaptcha.net,Google
-  - DOMAIN-SUFFIX,1e100.net,Google
+  - RULE-SET,google-all,Google
 
   # ─── 广告拦截 ───
   - RULE-SET,reject,REJECT
@@ -541,7 +532,6 @@ rules:
   # ─── 平台服务 ───
   - RULE-SET,icloud,Apple
   - RULE-SET,apple,Apple
-  - RULE-SET,google-custom,Google
   - RULE-SET,microsoft-custom,Microsoft
   - RULE-SET,microsoft,Microsoft
 
diff --git a/clash/ruleset/google-all.yaml b/clash/ruleset/google-all.yaml
new file mode 100644
index 0000000..2695564
--- /dev/null
+++ b/clash/ruleset/google-all.yaml
@@ -0,0 +1,88 @@
+payload:
+  # ══════════════════════════════════════════════════════════
+  # Google 全家桶 — 所有 Google 拥有的域名
+  # 用于确保 OAuth 登录等需要 IP 一致性的场景
+  # ══════════════════════════════════════════════════════════
+
+  # ── 核心域名 ──
+  - DOMAIN-SUFFIX,google.com
+  - DOMAIN-SUFFIX,google.co.jp
+  - DOMAIN-SUFFIX,google.co.kr
+  - DOMAIN-SUFFIX,google.co.uk
+  - DOMAIN-SUFFIX,google.com.hk
+  - DOMAIN-SUFFIX,google.com.tw
+  - DOMAIN-SUFFIX,google.com.sg
+  - DOMAIN-SUFFIX,google.de
+  - DOMAIN-SUFFIX,google.fr
+  - DOMAIN-SUFFIX,google.nl
+  - DOMAIN-SUFFIX,google.ca
+  - DOMAIN-SUFFIX,google.com.au
+
+  # ── API / 静态资源 / CDN ──
+  - DOMAIN-SUFFIX,googleapis.com
+  - DOMAIN-SUFFIX,gstatic.com
+  - DOMAIN-SUFFIX,googleusercontent.com
+  - DOMAIN-SUFFIX,gvt1.com
+  - DOMAIN-SUFFIX,gvt2.com
+  - DOMAIN-SUFFIX,ggpht.com
+  - DOMAIN-SUFFIX,googleadservices.com
+  - DOMAIN-SUFFIX,googlesyndication.com
+  - DOMAIN-SUFFIX,googletagmanager.com
+  - DOMAIN-SUFFIX,googletagservices.com
+  - DOMAIN-SUFFIX,googleanalytics.com
+  - DOMAIN-SUFFIX,google-analytics.com
+  - DOMAIN-SUFFIX,googleoptimize.com
+  - DOMAIN-SUFFIX,googletraveladservices.com
+
+  # ── YouTube ──
+  - DOMAIN-SUFFIX,youtube.com
+  - DOMAIN-SUFFIX,ytimg.com
+  - DOMAIN-SUFFIX,youtu.be
+  - DOMAIN-SUFFIX,youtube-nocookie.com
+  - DOMAIN-SUFFIX,youtubeeducation.com
+  - DOMAIN-SUFFIX,youtubekids.com
+  - DOMAIN-SUFFIX,googlevideo.com
+
+  # ── 不含 "google" 的 Google 基础设施 ──
+  - DOMAIN-SUFFIX,goog
+  - DOMAIN-SUFFIX,recaptcha.net
+  - DOMAIN-SUFFIX,1e100.net
+  - DOMAIN-SUFFIX,withgoogle.com
+  - DOMAIN-SUFFIX,withyoutube.com
+  - DOMAIN-SUFFIX,blogspot.com
+  - DOMAIN-SUFFIX,blogger.com
+  - DOMAIN-SUFFIX,ampproject.org
+  - DOMAIN-SUFFIX,abc.xyz
+  - DOMAIN-SUFFIX,chrome.com
+  - DOMAIN-SUFFIX,chromium.org
+  - DOMAIN-SUFFIX,android.com
+  - DOMAIN-SUFFIX,firebase.com
+  - DOMAIN-SUFFIX,firebaseio.com
+  - DOMAIN-SUFFIX,firebaseapp.com
+  - DOMAIN-SUFFIX,firebase.google.com
+  - DOMAIN-SUFFIX,waze.com
+  - DOMAIN-SUFFIX,blog.google
+  - DOMAIN-SUFFIX,deepmind.com
+  - DOMAIN-SUFFIX,deepmind.google
+  - DOMAIN-SUFFIX,waymo.com
+  - DOMAIN-SUFFIX,x.company
+  - DOMAIN-SUFFIX,doubleclick.net
+
+  # ── CN 变体 (被 Loyalsoldier direct 列表标记为直连的) ──
+  - DOMAIN-SUFFIX,googleapis-cn.com
+  - DOMAIN-SUFFIX,gstatic-cn.com
+  - DOMAIN-SUFFIX,googleadservices-cn.com
+  - DOMAIN-SUFFIX,googlesyndication-cn.com
+  - DOMAIN-SUFFIX,googletagmanager-cn.com
+  - DOMAIN-SUFFIX,googletagservices-cn.com
+  - DOMAIN-SUFFIX,googleoptimize-cn.com
+  - DOMAIN-SUFFIX,googletraveladservices-cn.com
+  - DOMAIN-SUFFIX,googlevads-cn.com
+  - DOMAIN-SUFFIX,googleflights-cn.net
+  - DOMAIN-SUFFIX,google-analytics-cn.com
+  - DOMAIN-SUFFIX,googleapps-cn.com
+  - DOMAIN-SUFFIX,dartsearch-cn.net
+  - DOMAIN-SUFFIX,doubleclick-cn.net
+  - DOMAIN-SUFFIX,recaptcha-cn.net
+  - DOMAIN-SUFFIX,gvt1-cn.com
+  - DOMAIN-SUFFIX,gvt2-cn.com