自动生成 gfw.pac: 自动生成 gfw.pac: 添加部分小红书和字节系域名

.github/workflows/auto-generate-pac.yml

@@ -0,0 +1,41 @@
+name: Auto Generate PAC File
+
+on:
+  schedule:
+    - cron: '10 0 * * 4'
+  push:
+    paths-ignore:
+      - 'README.md'
+      - 'LICENSE'
+      - 'gfw.pac'
+      - '.gitignore'
+      - '.github/**'
+  workflow_dispatch:
+
+jobs:
+  update-gfw-pac:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Download the latest cn.txt
+        run: curl -L https://raw.githubusercontent.com/Loyalsoldier/geoip/release/text/cn.txt -o cidrs-cn.txt
+
+      - name: Run gfw-pac.py script
+        run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt
+
+      - name: Commit and push changes
+        run: |
+          last_commit_message=$(git log -1 --pretty=%B)
+          $GITHUB_EVENT_NAME == 'schedule' && commit_message="定期更新数据并生成 gfw.pac" || commit_message="自动生成 gfw.pac: $last_commit_message"
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add -A
+          git commit -a -m "${commit_message}"
+          git push
+
+      - name: Trigger Auto-Release
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          workflow: Auto Generate Release

.github/workflows/auto-release.yml

@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         with:
           fetch-depth: 0
 
@@ -23,20 +21,17 @@ jobs:
           git config --global user.name "GitHub Actions"
           git config --global user.email "actions@github.com"
 
-      - name: Get commit count for today
+      - name: Generate Release Name
         id: commit_count
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
-          today=$(date +%Y%m%d)
+          today=$(TZ=Asia/Shanghai date +%Y%m%d)
           commit_count=$(TZ=Asia/Shanghai git log --date=local --since="$today 00:00:00" --until="$today 23:59:59" --pretty=format: --name-only | grep -c '^gfw.pac$')
           echo "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV
           echo "RELEASE_NAME=v$(TZ='Asia/Shanghai' date +%Y%m%d).$commit_count" >> $GITHUB_ENV
+          echo "COMMIT_MESSAGE=$(git log -1 --pretty=%B)" >> $GITHUB_ENV
 
       - name: Create Tag
         id: create_tag
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         run: |
           git tag "${{ env.RELEASE_NAME }}"
           git push origin ${{ env.RELEASE_NAME }}
@@ -44,16 +39,10 @@ jobs:
       - name: Create Release
         id: create_release
         uses: softprops/action-gh-release@v2
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
         with:
           tag_name: "${{ env.RELEASE_NAME }}"
           name: "${{ env.RELEASE_NAME }}"
-          body: "Automatically generated release for pac file update"
+          body: "${{ env.COMMIT_MESSAGE }}"
           draft: false
           prerelease: false
-          files: gfw.pac
-
-      - name: Verify Release
-        run: |
-          echo "Release created with name ${{ env.RELEASE_NAME }}"
+          files: gfw.pac

.github/workflows/auto-update-gfw-pac.yml

@@ -1,38 +0,0 @@
-name: GFW PAC Update
-
-on:
-  schedule:
-    - cron: '0 0 */7 * *'
-  workflow_dispatch:
-
-jobs:
-  update-gfw-pac:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        uses: actions/checkout@v4
-
-      - name: Download cn.txt
-        run: curl https://raw.githubusercontent.com/Loyalsoldier/geoip/refs/heads/release/text/cn.txt -o cidrs-cn.txt
-
-      - name: Run gfw-pac.py script
-        run: ./gfw-pac.py -f gfw.pac -p "PROXY 127.0.0.1:3128" --proxy-domains=proxy-domains.txt --direct-domains=direct-domains.txt --localtld-domains=local-tlds.txt --ip-file=cidrs-cn.txt
-
-      - name: Commit changes
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git commit -a -m "自动更新 gfw.pac"
-
-      - name: Push changes
-        uses: ad-m/github-push-action@master
-        env:
-          GH_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
-        with:
-          github_token: ${{ secrets.PERSONAL_TOKEN }}
-          branch: master

README.md

@@ -2,7 +2,7 @@
 
 科学上网 PAC 文件以及生成器。通过自定义域名和 CNIP 地址生成 PAC(Proxy auto-config) 文件。对存在于自定义域名和解析出的IP不是CNIP的域名使用代理，支持IPv6。
 
-**此仓库每 7 天自动通过 GitHub Action 从 `Loyalsoldier/geoip` 获取国内地址段并更新 `gfw.pac` 文件**
+**此仓库每周四自动通过 GitHub Action 从 `Loyalsoldier/geoip` 同步数据并更新 `gfw.pac` 文件**
 
 ## 特性
 * 开箱即用，直接可用的 `gfw.pac` 包含了常用的直连域名和代理域名以及国内IPv4/IPv6地址段

cidrs-cn.txt

@@ -946,7 +946,6 @@
 45.192.189.0/24
 45.192.190.0/24
 45.195.6.0/24
-45.202.69.0/24
 45.248.8.0/22
 45.248.80.0/22
 45.248.88.0/22
@@ -1793,7 +1792,6 @@
 103.59.76.0/22
 103.59.112.0/21
 103.59.120.0/24
-103.59.123.0/24
 103.59.124.0/22
 103.59.128.0/22
 103.59.148.0/22
@@ -1968,7 +1966,6 @@
 103.79.192.0/20
 103.79.208.0/21
 103.79.228.0/23
-103.80.28.0/22
 103.80.44.0/22
 103.80.72.0/22
 103.80.176.0/21
@@ -2646,7 +2643,6 @@
 103.185.80.0/23
 103.186.4.0/23
 103.186.108.0/23
-103.186.158.0/23
 103.186.228.0/23
 103.189.92.0/23
 103.189.140.0/23
@@ -4774,7 +4770,9 @@
 154.208.144.0/20
 154.208.160.0/21
 154.208.172.0/23
+154.209.2.0/24
 154.209.251.0/24
+154.212.129.0/24
 154.213.4.0/23
 154.218.7.0/24
 154.223.168.0/23
@@ -5160,6 +5158,7 @@
 185.75.172.0/23
 185.75.174.0/24
 185.78.106.0/23
+185.241.43.0/24
 185.241.211.0/24
 185.255.152.0/24
 188.131.128.0/17
@@ -7097,7 +7096,7 @@
 2001:470:8:19a::/64
 2001:470:8:1af::/64
 2001:470:8:1b5::/64
-2001:470:8:1c8::/63
+2001:470:8:1c9::/64
 2001:470:8:1d8::/64
 2001:470:8:1dd::/64
 2001:470:8:1de::/64
@@ -7343,6 +7342,9 @@
 2001:470:b:4f0::/63
 2001:470:b:4fe::/64
 2001:470:b:509::/64
+2001:470:b:511::/64
+2001:470:b:514::/64
+2001:470:b:517::/64
 2001:470:b:521::/64
 2001:470:b:527::/64
 2001:470:b:564::/64
@@ -7752,9 +7754,10 @@
 2001:470:d:500::/64
 2001:470:d:502::/64
 2001:470:d:504::/64
-2001:470:d:507::/64
+2001:470:d:506::/63
 2001:470:d:509::/64
 2001:470:d:50a::/64
+2001:470:d:50c::/64
 2001:470:d:522::/63
 2001:470:d:52a::/64
 2001:470:d:52f::/64
@@ -8079,7 +8082,6 @@
 2001:470:d:aaf::/64
 2001:470:d:ab0::/63
 2001:470:d:ab5::/64
-2001:470:d:aba::/64
 2001:470:d:abc::/64
 2001:470:d:ac1::/64
 2001:470:d:ac2::/64
@@ -9032,7 +9034,6 @@
 2001:470:19:3d5::/64
 2001:470:19:3d7::/64
 2001:470:19:3d8::/62
-2001:470:19:3df::/64
 2001:470:19:3e0::/63
 2001:470:19:3e3::/64
 2001:470:19:3e4::/63
@@ -9294,7 +9295,7 @@
 2001:470:19:686::/64
 2001:470:19:689::/64
 2001:470:19:68b::/64
-2001:470:19:68c::/63
+2001:470:19:68c::/64
 2001:470:19:68e::/64
 2001:470:19:691::/64
 2001:470:19:693::/64
@@ -9996,8 +9997,9 @@
 2001:470:19:de5::/64
 2001:470:19:de8::/64
 2001:470:19:deb::/64
-2001:470:19:ded::/64
+2001:470:19:dec::/63
 2001:470:19:def::/64
+2001:470:19:df0::/64
 2001:470:19:df2::/64
 2001:470:19:df7::/64
 2001:470:19:dfb::/64
@@ -10265,7 +10267,7 @@
 2001:470:24:9a::/64
 2001:470:24:9d::/64
 2001:470:24:9f::/64
-2001:470:24:a0::/63
+2001:470:24:a0::/64
 2001:470:24:a8::/64
 2001:470:24:ad::/64
 2001:470:24:ae::/64
@@ -10494,7 +10496,7 @@
 2001:470:24:40c::/63
 2001:470:24:410::/64
 2001:470:24:416::/64
-2001:470:24:418::/64
+2001:470:24:418::/63
 2001:470:24:41d::/64
 2001:470:24:421::/64
 2001:470:24:423::/64
@@ -10503,9 +10505,10 @@
 2001:470:24:42c::/63
 2001:470:24:42e::/64
 2001:470:24:430::/64
-2001:470:24:432::/64
+2001:470:24:432::/63
 2001:470:24:435::/64
 2001:470:24:436::/64
+2001:470:24:439::/64
 2001:470:24:43b::/64
 2001:470:24:43d::/64
 2001:470:24:44a::/64
@@ -10637,7 +10640,8 @@
 2001:470:24:68d::/64
 2001:470:24:691::/64
 2001:470:24:694::/64
-2001:470:24:698::/62
+2001:470:24:699::/64
+2001:470:24:69a::/63
 2001:470:24:6a8::/63
 2001:470:24:6ab::/64
 2001:470:24:6ac::/64
@@ -10777,7 +10781,7 @@
 2001:470:36:9b::/64
 2001:470:36:9f::/64
 2001:470:36:a2::/64
-2001:470:36:a4::/63
+2001:470:36:a5::/64
 2001:470:36:ad::/64
 2001:470:36:ae::/64
 2001:470:36:b9::/64
@@ -10901,8 +10905,9 @@
 2001:470:36:405::/64
 2001:470:36:407::/64
 2001:470:36:40a::/63
-2001:470:36:40e::/63
+2001:470:36:40f::/64
 2001:470:36:416::/64
+2001:470:36:41f::/64
 2001:470:36:420::/64
 2001:470:36:42e::/64
 2001:470:36:43e::/64
@@ -11431,7 +11436,6 @@
 2001:470:67:379::/64
 2001:470:67:37c::/64
 2001:470:67:386::/64
-2001:470:67:38e::/64
 2001:470:67:39a::/64
 2001:470:67:3a7::/64
 2001:470:67:3ab::/64
@@ -11744,6 +11748,7 @@
 2001:470:1f05:f9::/64
 2001:470:1f05:fb::/64
 2001:470:1f05:ff::/64
+2001:470:1f05:104::/64
 2001:470:1f05:107::/64
 2001:470:1f05:109::/64
 2001:470:1f05:10a::/64
@@ -12436,7 +12441,6 @@
 2001:470:1f0f:90::/64
 2001:470:1f0f:95::/64
 2001:470:1f0f:a6::/64
-2001:470:1f0f:b3::/64
 2001:470:1f0f:b4::/64
 2001:470:1f0f:be::/64
 2001:470:1f0f:d0::/63
@@ -12694,7 +12698,6 @@
 2001:470:1f15:1b5::/64
 2001:470:1f15:242::/64
 2001:470:1f15:278::/64
-2001:470:1f15:289::/64
 2001:470:1f15:2cf::/64
 2001:470:1f15:2f7::/64
 2001:470:1f15:2fe::/64
@@ -12871,7 +12874,6 @@
 2001:470:1f19:1aa::/64
 2001:470:1f19:1b1::/64
 2001:470:1f19:1b5::/64
-2001:470:1f19:1b6::/64
 2001:470:1f19:1ba::/64
 2001:470:1f19:1c3::/64
 2001:470:1f19:1d0::/64
@@ -12948,6 +12950,7 @@
 2001:470:1f1d:1eb::/64
 2001:470:1f1d:1ec::/64
 2001:470:1f1d:1ef::/64
+2001:470:1f1d:207::/64
 2001:470:1f1d:23e::/64
 2001:470:1f1d:2f6::/64
 2001:470:1f1d:304::/64
@@ -13108,6 +13111,7 @@
 2001:470:1f2b:b7::/64
 2001:470:1f2b:14f::/64
 2001:470:1f2b:1b1::/64
+2001:470:1f2b:1d7::/64
 2001:470:1f2b:1e4::/64
 2001:470:1f2b:1f4::/64
 2001:470:1f2b:208::/64
@@ -13263,7 +13267,7 @@
 2001:470:284b::/48
 2001:470:2852::/48
 2001:470:2858::/48
-2001:470:2888::/47
+2001:470:2889::/48
 2001:470:289e::/48
 2001:470:28a5::/48
 2001:470:28b4::/48
@@ -13453,6 +13457,7 @@
 2001:470:48d4::/47
 2001:470:48d9::/48
 2001:470:48da::/48
+2001:470:48df::/48
 2001:470:48e3::/48
 2001:470:48f3::/48
 2001:470:48f6::/48
@@ -13499,7 +13504,6 @@
 2001:470:4a84::/48
 2001:470:4a8e::/48
 2001:470:4a92::/48
-2001:470:4aa8::/48
 2001:470:4aca::/48
 2001:470:4ae5::/48
 2001:470:4af1::/48
@@ -13575,6 +13579,7 @@
 2001:470:8072::/48
 2001:470:8074::/48
 2001:470:8076::/47
+2001:470:807e::/48
 2001:470:8090::/48
 2001:470:80a0::/48
 2001:470:80a4::/48
@@ -13762,7 +13767,7 @@
 2001:470:b834::/48
 2001:470:b84b::/48
 2001:470:b854::/48
-2001:470:b85e::/47
+2001:470:b85f::/48
 2001:470:b873::/48
 2001:470:b87b::/48
 2001:470:b87f::/48
@@ -13874,7 +13879,6 @@
 2001:470:e074::/48
 2001:470:e095::/48
 2001:470:e0c4::/48
-2001:470:e0f0::/48
 2001:470:e102::/48
 2001:470:e106::/48
 2001:470:e120::/48
@@ -14133,6 +14137,7 @@
 2001:470:f1be::/48
 2001:470:f1c0::/48
 2001:470:f1c5::/48
+2001:470:f1d2::/48
 2001:470:f1d4::/48
 2001:470:f1d9::/48
 2001:470:f1db::/48
@@ -14338,6 +14343,7 @@
 2001:470:f8d2::/47
 2001:470:f8d4::/47
 2001:470:f8dc::/48
+2001:470:f8de::/48
 2001:470:f8e2::/48
 2001:470:f8e4::/48
 2001:470:f8e6::/47
@@ -14504,7 +14510,6 @@
 2001:470:fa81::/48
 2001:470:fa82::/48
 2001:470:fa87::/48
-2001:470:fa89::/48
 2001:470:fa8a::/48
 2001:470:fa8f::/48
 2001:470:fa94::/47
@@ -15161,7 +15166,6 @@
 2401:cc0::/32
 2401:d40::/32
 2401:e00::/32
-2401:e60:10::/44
 2401:1000::/32
 2401:1160::/32
 2401:11a0::/32
@@ -17362,6 +17366,7 @@
 2600:70ff:c27a::/47
 2600:70ff:c27c::/48
 2600:70ff:c8ac::/48
+2600:70ff:c8dd::/48
 2600:70ff:c96e::/48
 2600:70ff:d00c::/48
 2600:70ff:d02f::/48
@@ -17658,8 +17663,7 @@
 2a06:9f81:5100::/40
 2a06:9f81:5400::/40
 2a06:9f81:6100::/40
-2a06:9f81:640a::/48
-2a06:9f81:640f::/48
+2a06:9f81:641a::/47
 2a06:9f81:6488::/48
 2a06:9f81:64a1::/48
 2a06:a005:260::/43
@@ -17678,7 +17682,17 @@
 2a07:f480::/29
 2a09:2700:2800::/40
 2a09:2702:48::/48
-2a09:54c6:c000::/40
+2a09:54c1:62::/48
+2a09:54c1:75::/48
+2a09:54c1:76::/47
+2a09:54c1:79::/48
+2a09:54c1:133::/48
+2a09:54c1:153::/48
+2a09:54c6:c200::/39
+2a09:54c6:c400::/40
+2a09:54c6:c700::/40
+2a09:54c6:c800::/40
+2a09:54c6:cf00::/40
 2a09:7c45:0:1::/64
 2a09:7c45:0:2::/63
 2a09:7c45:0:4::/62
@@ -18772,7 +18786,6 @@
 2a0a:6040:d740::/48
 2a0a:6040:ec00::/40
 2a0a:6042:4100::/40
-2a0a:6044:7a00::/40
 2a0a:6044:b800::/40
 2a0a:8f40:9::/48
 2a0b:b87:ffb5::/48
@@ -18863,7 +18876,7 @@
 2a0e:aa07:e151::/48
 2a0e:aa07:e16a::/48
 2a0e:aa07:e192::/48
-2a0e:aa07:e1a0::/44
+2a0e:aa07:e1a0::/43
 2a0e:aa07:e1e1::/48
 2a0e:aa07:e1e2::/47
 2a0e:aa07:e200::/44
@@ -18928,16 +18941,15 @@
 2a0f:7804:da00::/40
 2a0f:85c1:816::/48
 2a0f:85c1:89a::/48
-2a0f:9400:6119::/48
 2a0f:9400:7700::/48
 2a0f:9407:f000::/36
+2a0f:ac00::/29
 2a0f:dec0::/29
 2a10:500:4600::/40
 2a10:2f00:15a::/48
 2a10:9007:5:3::/64
 2a10:c5c1:f016::/48
 2a10:cc40:190::/48
-2a10:ccc6:6660::/44
 2a12:3fc2:1200::/44
 2a12:3fc2:df11::/48
 2a12:3fc2:e100::/44
@@ -19003,10 +19015,9 @@
 2a14:7c0:5208::/48
 2a14:4b00:5c00::/38
 2a14:4c41::/32
-2a14:7580:5000::/36
+2a14:7580:6000::/36
 2a14:7581:b20::/48
 2a14:7581:ffb::/48
-2a14:7581:9900::/40
 2a14:7583::/32
 2c0f:f7a8:8011::/48
 2c0f:f7a8:8050::/48

direct-domains.txt

@@ -69,8 +69,18 @@ douyinstatic.com
 douyinvod.com
 supercachenode.com
 bytedance.com
+bytedanceapi.com
 bytescm.com
 bytecdn.cn
+byteoc.com
+bytednsdoc.com
+bytetcc.com
+feishu.cn
+feishucdn.com
+toutiao.com
+toutiaoimg.com
+toutiaostatic.com
+yhgfb-cn-static.com
 cmbchina.com
 mi.com
 xiaomi.com
@@ -80,69 +90,39 @@ meituan.com
 meituan.net
 sogou.com
 dianping.com
-o.pki.goog
-www.googletagmanager.com
-www.google-analytics.com
-pagead2.googlesyndication.com
-adservice.google.com
-fonts.googleapis.com
-safebrowsing.googleapis.com
-fonts.gstatic.com
-www.gstatic.com
-ssl.gstatic.com
 quark.cn
+wps.cn
+wpscdn.cn
+xiaohongshu.com
+xhscdn.com
 push.apple.com
-time-ios.apple.com
-time.apple.com
-time-macos.apple.com
 setup.icloud.com
-www.apple.com.cn
-play.itunes.apple.com
 appldnld.apple.com
-configuration.apple.com
-mesu.apple.com
 oscdn.apple.com
 osrecovery.apple.com
-skl.apple.com
 swcdn.apple.com
 swdist.apple.com
 swdownload.apple.com
 swscan.apple.com
 updates-http.cdn-apple.com
 updates.cdn-apple.com
-xp.apple.com
 audiocontentdownload.apple.com
 devimages-cdn.apple.com
 devstreaming-cdn.apple.com
-icloud.cdn-apple.com
-iosdm-cn.cdn-apple.com
-js-cdn.music.apple.com
 oscdn.apple.com
-speed-test-cnc.cdn-apple.com
-download.developer.apple.com
-playgrounds-assets-cdn.apple.com
-sylvan.apple.com
-diagassets.apple.com
-doh.dns.apple.com
 certs.apple.com
-crl.apple.com
 ocsp.apple.com
 ocsp2.apple.com
 valid.apple.com
 appleid.cdn-apple.com
-apzones.com
 icloud.com.cn
 guzzoni.apple.com
 app-site-association.cdn-apple.com
 smp-device-content.apple.com
 idv.cdn-apple.com
-weatherkit.apple.com
 adcdownload.apple.com
 alpdownloadit.cdn-apple.com
 bricks.cdn-apple.com
-pancake.apple.com
-storage.live.com
-blob.core.windows.net
 self.events.data.microsoft.com
 mobile.events.data.microsoft.com
 browser.events.data.microsoft.com

gfw-pac.py

@@ -1,12 +1,10 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-import urllib.parse
 import json
 import urllib.request, urllib.error, urllib.parse
 from argparse import ArgumentParser
 import ipaddress
-import json
 
 def parse_args():
     parser = ArgumentParser()
@@ -22,7 +20,7 @@ def parse_args():
                         help='直连的域名文件，每行一个')
     parser.add_argument('--localtld-domains', dest='localtld_rule',
                         help='本地 TLD 规则文件, 不走代理, 每行一个，以 . 开头')
-    parser.add_argument('--ip-file', dest='ip_file',
+    parser.add_argument('--ip-file', dest='ip_file', required=True,
                         help='中国IP地址段文件')
     return parser.parse_args()
 

proxy-domains.txt

@@ -1,9 +1,5 @@
-google.com
 google.com.hk
-googleapis.com
-gstatic.com
-ggpht.com
-googleusercontent.com
+ent.com
 youtube.com
 googlevideo.com
 ytimg.com
@@ -14,12 +10,14 @@ githubassets.com
 bing.com
 bing.cn
 bing.net
+bingapis.com
 live.com
 stackoverflow.com
 wikipedia.org
 godaddy.com
 cloudflare.com
 twitter.com
+x.com
 twimg.com
 docker.com
 facebook.com
@@ -28,4 +26,10 @@ fbcdn.net
 segment.io
 unpkg.com
 jsdelivr.com
-tv.apple.com
+tv.apple.com
+instagram.com
+cdninstagram.com
+reddit.com
+redd.it
+whatsapp.com
+whatsapp.net