添加Hysteria协议支持、优化项目结构、加入测速筛选功能

.github/workflows/Collector.yml

@@ -1,41 +1,78 @@
 name: Collector
 on:
   workflow_dispatch:
-  
+
   schedule:
-    - cron: "0 */5 * * *"
+    - cron: "0 */6 * * *"
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
+      - name: Delete old Releases and Workflows
+        uses: ophub/delete-releases-workflows@main
+        with:
+          gh_token: ${{secrets.GITHUB_TOKEN}}
+          delete_releases: true
+          releases_keep_latest: 3
+          delete_tags: true
+          delete_workflows: true
+          workflows_keep_day: 3
+
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    - uses: actions/setup-go@v4
-      with:
-        go-version: '>=1.21.3'
-    - run: go version
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ">=1.21.3"
+      - run: go version
 
-    - name: Build and run Golang file
-      run: |
+      - name: Build and run Golang file
+        run: |
           go build -o myapp
-          ./myapp -sort
-
-    - name: Commit Changes
-      run: |
-        git config --local user.email "actions@github.com"
-        git config --local user.name "GitHub Actions"
-        git pull origin main
-        git add ./vmess_iran.txt
-        git add ./trojan_iran.txt
-        git add ./vless_iran.txt
-        git add ./ss_iran.txt
-        git add ./mixed_iran.txt
-        git checkout main
-        git commit -m "✔️ $(date '+%Y-%m-%d %H:%M:%S') Collected"
-    - name: Push Changes
-      uses: ad-m/github-push-action@master
-      with:
-        branch: main
+          ./myapp -sort -log warn
+
+      - name: Speedtest
+        run: |
+          ./tool/speedTest_singtools/singtools test   -i ./results/mixed.txt -o ./results/mixed_tested.json -e fatal -f ""
+
+      - name: Convert to mixed with base64encode
+        run: |
+          ./tool/subconverter/subconverter &
+
+          until curl -s http://0.0.0.0:25500 >/dev/null; do
+            sleep 1
+          done
+
+          # curl -o ./results/mixed_tested.txt http://0.0.0.0:25500/sub\?target\=mixed\&url\=./results/mixed_tested.json
+
+          # 执行 curl 命令并将结果保存到文件，同时添加错误检查
+          full_url="http://0.0.0.0:25500/sub?target=mixed&url=$GITHUB_WORKSPACE/results/mixed_tested.json"
+
+          echo "\n------------------"
+          echo "Full URL: $full_url"
+          echo "\n------------------"
+
+          if ! curl -o ./results/mixed_tested.txt $full_url; then
+            echo "curl 请求失败，退出步骤"
+            exit 1
+          fi
+          # 检查文件是否成功下载
+          if [ ! -f "./results/mixed_tested.txt" ]; then
+            echo "下载的文件未找到，退出步骤"
+            exit 1
+          fi
+
+      - name: Commit Changes
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "GitHub Actions"
+          git pull origin main
+          git add ./results/*
+          git checkout main
+          git commit -m "✔️ $(date '+%Y-%m-%d %H:%M:%S') Collected"
+      - name: Push Changes
+        uses: ad-m/github-push-action@master
+        with:
+          branch: main

.gitignore

@@ -0,0 +1 @@
+.history

channels.csv

@@ -1,4 +1,8 @@
 URL,AllMessagesFlag
+https://t.me/s/wxgmrjdcc,true
+https://t.me/s/ShareCentrePro,true
+https://t.me/s/wxdy666,true
+https://t.me/s/freevpntg,true
 https://t.me/FreeV2rays,true
 https://t.me/configV2rayNG,true
 https://t.me/vpnmasi,true
@@ -155,4 +159,4 @@ https://t.me/SafeNet_Server,false
 https://t.me/V2RAYROZ,false
 https://t.me/V2Graphy,false
 https://t.me/svn3team,false
-https://t.me/v20reyng,false
+https://t.me/v20reyng,false