自动生成 gfw.pac: onedrive客户端部分域名加入直连名单

.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)
+          commit_message=$([[ "${{ github.event_name }}" == "schedule" ]] && echo "定期更新数据并生成 gfw.pac" || echo "自动生成 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

@@ -1,49 +1,48 @@
 name: Auto Generate Release
 
 on:
-  workflow_dispatch:
   push:
     paths:
-      - 'gfw.pac'  # 替换为你要监控的文件路径
+      - 'gfw.pac'
+  workflow_dispatch:
 
 jobs:
   generate-release:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
+      - name: Checkout repository
-      uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-    - name: Set up Git
+      - name: Set up Git
-      run: |
+        run: |
-        git config --global user.name "GitHub Actions"
+          git config --global user.name "GitHub Actions"
-        git config --global user.email "actions@github.com"
+          git config --global user.email "actions@github.com"
 
-    - name: Get commit count for today
+      - name: Generate Release Name
-      id: commit_count
+        id: commit_count
-      run: |
+        run: |
-        today=$(date +%Y%m%d)
+          today=$(TZ=Asia/Shanghai date +%Y%m%d)
-        commit_count=$(git log --since="$today 00:00:00" --until="$today 23:59:59" --pretty=format: --name-only | grep -c '^gfw.pac$')
+          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 "COMMIT_COUNT=$commit_count" >> $GITHUB_ENV
-        echo "RELEASE_NAME=v$(TZ='Asia/Shanghai' date +%Y%m%d).$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
+      - name: Create Tag
-      id: create_tag
+        id: create_tag
-      run: |
+        run: |
-        git tag "${{ env.RELEASE_NAME }}"
+          git tag "${{ env.RELEASE_NAME }}"
-        git push origin ${{ env.RELEASE_NAME }}
+          git push origin ${{ env.RELEASE_NAME }}
 
-    - name: Create Release
+      - name: Create Release
-      id: create_release
+        id: create_release
-      uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2
-      with:
+        with:
-        tag_name: "${{ env.RELEASE_NAME }}"
+          tag_name: "${{ env.RELEASE_NAME }}"
-        name: "${{ env.RELEASE_NAME }}"
+          name: "${{ env.RELEASE_NAME }}"
-        body: "Automatically generated release for pac file update"
+          body: "${{ env.COMMIT_MESSAGE }}"
-        draft: false
+          draft: false
-        prerelease: false
+          prerelease: false
-        files: gfw.pac  # 替换为你要上传的文件路径
+          files: gfw.pac
-
-    - name: Verify Release
-      run: |
-        echo "Release created with name ${{ env.RELEASE_NAME }}"

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

@@ -1,32 +0,0 @@
-name: GFW PAC Update
-
-on:
-  schedule:
-    - cron: '0 0 */14 * *'
-  workflow_dispatch:
-
-jobs:
-  update-gfw-pac:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download delegated-apnic-latest
-        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 gfw.pac
-        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
-        with:
-          github_token: ${{ secrets.PUSH_TOKEN }}
-          branch: master

README.md

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

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,72 +90,49 @@ 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
-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
 ocsp.globalsign.com
 ocsp2.globalsign.com
 ocsp.digicert.cn
-ocsp.dcocsp.cn
+ocsp.dcocsp.cn
+api.onedrive.com
+storage.live.com
+skyapi.live.net
+roaming.officeapps.live.com
+blob.core.windows.net
+default.exp-tas.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
+ent.com
-gstatic.com
-ggpht.com
-googleusercontent.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