[pull] master from FQrabbit:master

.github/ISSUE_TEMPLATE/new_rule_request.yml

@@ -0,0 +1,34 @@
+name: 请求新增规则
+description: 请求新增规则的想法
+body:
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: 欢迎
+      options:
+        - label: 若未使用自动抓ip工具，且在issue中说明已使用的，此issue将会被忽略或关闭。
+          required: true
+        - label: 请使用[自动抓IP工具](https://github.com/oooldtoy/SSTAP_ip_crawl_tool)来帮助我们编写规则，并详细写明游戏细节，如哪个服，哪个版本。
+          required: true
+  - type: input
+    attributes:
+      label: 名称
+      description: 请将需要增加游戏\程序名字填入此区域
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 运行环境
+      description: 该游戏\程序的运行环境
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 代理部分
+      description: 该游戏\程序哪部分需要代理
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 特殊情况
+      description: 如果还有特殊想说明的请在这里描述.

.github/ISSUE_TEMPLATE/rule_bug_report.yml

@@ -0,0 +1,32 @@
+name: 规则失效以及其他错误
+description: 创建报告以帮助我们改进
+body:
+  - type: input
+    attributes:
+      label: 问题描述
+      description: 简单清晰的说一下问题的描述.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 从哪里开始出现这个问题
+      description: |-
+        例如
+        ``某游戏的登陆页面``、
+        ``内置的网页``、
+        ``游戏房间内部``、
+        ``商店页面`` 等
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 截图
+      description: 如果可以，请添加截图以帮助解释您的问题.
+  - type: textarea
+    attributes:
+      label: 运行环境
+      description: |-
+        请说明当前的运行环境
+        例如：
+        ``操作系统``
+        ``网络环境``(如 运营商等

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/.github"
+    schedule:
+      interval: "daily"
+      timezone: "Asia/Hong_Kong"
+      time: "06:00"
+    pull-request-branch-name:
+      separator: "-"

.github/workflows/updategeoip-cn.yaml

@@ -1,4 +1,4 @@
-name: Update China IP list and generate BypassCN.rule
+name: Update China IP
 
 on:  
   workflow_dispatch:
@@ -7,43 +7,129 @@ on:
     - cron:  '0 2 */3 * *'
 
 jobs:
-  build:
-    name: Generate BypassCN.rule
+  prepare:
+    name: Set up
     runs-on: ubuntu-latest
     steps:
-
-    - name: Check out code into directory
-      uses: actions/checkout@v3
 
-    - name: Run the updategeoip-cn.sh
-      run: ./tools/updategeoip-cn.sh
-      shell: bash
+    - name: Check out code into directory
+      uses: actions/checkout@v4
 
-    - name: Git Add BypassCNandLan.rules
+    - name: Git config
       run: |
         git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
         git config user.name "github-actions[bot]"
-        git fetch
-        cp ./BypassCNandLan.rules ./rules/BypassCNandLan.rules
-        git add ./rules/BypassCNandLan.rules
-        if ! git commit -am "Updated at $(date)"; then
-          curl -oL ./ https://github.com/FQrabbit/SSTap-Rule/raw/master/rules/BypassCNandLan.rules         
-          hash1=$(sha256sum "./BypassCNandLan.rules" | awk '{print $1}')
-          hash2=$(sha256sum "./rules/BypassCNandLan.rules" | awk '{print $1}')
-          if [ "$hash1" == "$hash2" ]; then
-            echo "Hashes match. The files are identical."
-            echo "Upstream not updated"
-          else
-            echo "Hashes do not match. The files are different."
-            echo "ERROR! Upstream updated! There's something went WRONG!"
-            exit 1
-          fi
+        git fetch --unshallow
+      shell: bash
+
+    - name: Save Cache
+      uses: actions/cache/save@v3
+      with:
+        path: ./
+        key: restore-${{ github.sha }}-${{ github.run_number }}
+
+  rules:
+    name: Generate rules
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+
+    - name: Restore Cache
+      uses: actions/cache/restore@v3
+      with:
+        path: ./
+        key: restore-
+
+    - name: Get CIDR field
+      run: |
+        echo "#BypassCNandLan,绕过大陆和局域网,1,1,1,0,0,0," >> BypassCNandLan.rules
+
+        curl https://raw.githubusercontent.com/Hackl0us/GeoIP2-CN/release/CN-ip-cidr.txt >> BypassCNandLan.rules
+
+        sed -i '2{/^$/d;}' BypassCNandLan.rules
+        echo 10.0.0.0/8 >> BypassCNandLan.rules
+        echo 172.16.0.0/12 >> BypassCNandLan.rules
+        echo 192.168.0.0/16 >> BypassCNandLan.rules
+      shell: bash
+
+    - name: Compare New file and Old file
+      run: |
+        hash1=$(sha256sum "./BypassCNandLan.rules" | awk '{print $1}')
+        hash2=$(sha256sum "./rules/BypassCNandLan.rules" | awk '{print $1}')
+        echo -e "hash1=$hash1\nhash2=$hash2"
+        if [ "$hash1" == "$hash2" ]; then
+          echo "Hashes match. The files are identical."
+          echo "Upstream not updated"
+          echo "STATUS=1" >> $GITHUB_ENV
+          exit 0
+        else
+          echo "Hashes do not match. The files are different."
+          echo "Upstream updated."
+          echo "STATUS=0" >> $GITHUB_ENV
+          cp ./BypassCNandLan.rules ./rules/BypassCNandLan.rules
+          echo "MESSAGE=\"Update at $(TZ=Asia/Shanghai date)\"" >> $GITHUB_ENV
         fi
+      shell: bash
+
+    - uses: planetscale/ghcommit-action@v0.1.6
+      if: env.STATUS == '0'
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      with:
+        commit_message: "${{ env.MESSAGE }}"
+        repo: ${{ github.repository }}
+        branch: ${{ github.head_ref || github.ref_name }}
+        file_pattern: './rules/BypassCNandLan.rules'
+
+  someip:
+    name: Generate rules (someip)
+    runs-on: ubuntu-latest
+    needs: prepare
+    steps:
+
+    - name: Restore Cache
+      uses: actions/cache/restore@v3
+      with:
+        path: ./
+        key: restore-
 
-
-    - name: GitHub Push
-      uses: ad-m/github-push-action@v0.6.0
+    - name: Get CIDR field
+      run: |
+        echo "#BypassCNandLan,绕过大陆和局域网someip,1,1,1,0,0,0," >> BypassCNandLan_someip.rules
+
+        curl https://raw.githubusercontent.com/0x2E/someip/build/cidr.txt >> BypassCNandLan_someip.rules
+
+        sed -i '2{/^$/d;}' BypassCNandLan_someip.rules
+        echo 10.0.0.0/8 >> BypassCNandLan_someip.rules
+        echo 172.16.0.0/12 >> BypassCNandLan_someip.rules
+        echo 192.168.0.0/16 >> BypassCNandLan_someip.rules
+      shell: bash
+
+    - name: Compare New file and Old file
+      run: |
+        hash1=$(sha256sum "./BypassCNandLan_someip.rules" | awk '{print $1}')
+        hash2=$(sha256sum "./rules/BypassCNandLan_someip.rules" | awk '{print $1}')
+        echo -e "hash1=$hash1\nhash2=$hash2"
+        if [ "$hash1" == "$hash2" ]; then
+          echo "Hashes match. The files are identical."
+          echo "Upstream not updated"
+          echo "STATUS=1" >> $GITHUB_ENV
+          exit 0
+        else
+          echo "Hashes do not match. The files are different."
+          echo "Upstream updated."
+          echo "STATUS=0" >> $GITHUB_ENV
+          cp ./BypassCNandLan_someip.rules ./rules/BypassCNandLan_someip.rules
+          echo "MESSAGE=\"Update at $(TZ=Asia/Shanghai date)\"" >> $GITHUB_ENV
+        fi
+      shell: bash
+
+    - uses: planetscale/ghcommit-action@v0.1.6
+      if: env.STATUS == '0'
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: master
-        force: true
+        commit_message: "${{ env.MESSAGE }}"
+        repo: ${{ github.repository }}
+        branch: ${{ github.head_ref || github.ref_name }}
+        file_pattern: './rules/BypassCNandLan_someip.rules'

Changelog.md

@@ -1,5 +1,13 @@
 # 更新日志 Change Log
 
+### 2024年1月3日
+
+By @izumiChan16
+
+新增 `Stardew Valley,星露谷物语` 游戏规则
+
+新增 `Lethal Company,致命公司` 游戏规则
+
 ### 2023年8月11日
 
 By @zhangdiming

README.md

@@ -17,6 +17,14 @@
 
 在这里会不定时的更新各个游戏的路由表规则，你只要下载所需的规则或规则包导入对应文件夹即可使用。
 
+## 关于两个GEOIP源
+[GEOIPCN.1](rules/BypassCNandLan.rules?raw=true)  ||   [GEOIPCN.2](rules/BypassCNandLan_someip.rules?raw=true)
+
+- GEOIPCN.1 是[Hackl0us/GeoIP2-CN](https://github.com/Hackl0us/GeoIP2-CN)的完整版本
+- GEOIPCN.2 而是[0x2E/someip](https://github.com/0x2E/someip)的简化版本    
+两者在使用上一般不会有什么差距。  
+如果追求最小错误率请选择GEOIPCN.1，最求最高效率请选择GEOIPCN.2
+
 ## 规则使用方法
 
 -  [点我进入规则包下载页面](https://github.com/FQrabbit/SSTap-Rule/releases)