[pull] main from frankiejun:main

.github/workflows/deploy.yml

@@ -1,32 +1,45 @@
-name: 批量保活进程
-
-on:
-  schedule:
-    # 使用cron表达式定义任务运行的时间
-    # github使用utc时间
-    - cron: '3 2 * * *' #波兰凌晨3点3分
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: 安装依赖
-        run: |
-          sudo apt-get install sshpass
-          sudo apt-get install jq
-
-      - name: 登录各个serv00并执行保活脚本
-        env:
-          HOSTS_JSON: ${{ secrets.HOSTS_JSON }}
-          TELEGRAM_TOKEN: ${{secrets.TELEGRAM_TOKEN}}
-          TELEGRAM_USERID: ${{secrets.TELEGRAM_USERID}}
-          WXSENDKEY: ${{secrets.WXSENDKEY}}
-          SENDTYPE: ${{secrets.SENDTYPE}}
-        run: |
-          chmod +x ./revive.sh
-          ./revive.sh
+name: 批量保活进程
+
+on:
+  schedule:
+    # 使用cron表达式定义任务运行的时间
+    # github使用utc时间
+    - cron: '3 22 * * *' #北京时间6点
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: 安装依赖
+        run: |
+          sudo apt-get install sshpass
+          sudo apt-get install jq
+          sudo apt-get install connect-proxy
+          sudo apt-get install -y netcat-openbsd
+
+      - name: 登录各个serv00并执行保活脚本
+        env:
+          HOSTS_JSON: ${{ secrets.HOSTS_JSON }}
+          TELEGRAM_TOKEN: ${{secrets.TELEGRAM_TOKEN}}
+          TELEGRAM_USERID: ${{secrets.TELEGRAM_USERID}}
+          WXSENDKEY: ${{secrets.WXSENDKEY}}
+          WXPUSH_URL: ${{secrets.WXPUSH_URL}}
+          WX_TOKEN: ${{secrets.WX_TOKEN}}
+          SENDTYPE: ${{secrets.SENDTYPE}}
+          BUTTON_URL: ${{secrets.BUTTON_URL}}
+          AUTOUPDATE: ${{vars.AUTOUPDATE}}
+          LOGININFO: ${{vars.LOGININFO}}
+          LOGINONCE: ${{vars.LOGINONCE}}
+          PROXY_HOST: ${{secrets.PROXY_HOST}}
+          PROXY_PORT: ${{secrets.PROXY_PORT}}
+          PROXY_USER: ${{secrets.PROXY_USER}}
+          PROXY_PASS: ${{secrets.PROXY_PASS}}
+
+        run: |
+          chmod +x ./revive.sh
+          ./revive.sh

.github/workflows/keep.yml

@@ -0,0 +1,36 @@
+name: 批量访问保活进程
+
+on:
+  schedule:
+    # 使用cron表达式定义任务运行的时间
+    #github最小时间间隔为10分钟
+    - cron: '*/10 * * * *'
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: 安装依赖
+        run: |
+          sudo apt-get install jq
+
+      - name: 访问各个serv00并执行保活脚本
+        env:
+          HOSTS_JSON: ${{ secrets.HOSTS_JSON }}
+          TELEGRAM_TOKEN: ${{secrets.TELEGRAM_TOKEN}}
+          TELEGRAM_USERID: ${{secrets.TELEGRAM_USERID}}
+          WXPUSH_URL: ${{secrets.WXPUSH_URL}}
+          WX_TOKEN: ${{secrets.WX_TOKEN}}
+          SENDTYPE: ${{secrets.SENDTYPE}}
+          BUTTON_URL: ${{secrets.BUTTON_URL}}
+          AUTOUPDATE: ${{vars.AUTOUPDATE}}
+          LOGININFO: ${{vars.LOGININFO}}
+          TOKEN: ${{secrets.TOKEN}}
+        run: |
+          chmod +x ./revive_node.sh
+          ./revive_node.sh

.github/workflows/sync.yml

@@ -1,40 +1,40 @@
-name: Sync Fork with Upstream
-
-on:
-  schedule:
-    - cron: '0 19 * * *'
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-jobs:
- sync_latest_from_upstream:
-    name: Sync latest commits from upstream repo
-    runs-on: ubuntu-latest
-    if: ${{ github.event.repository.fork }}
-
-    steps:
-      # Step 1: run a standard checkout action
-      - name: Checkout target repo
-        uses: actions/checkout@v3
-
-      # Step 2: run the sync action
-      - name: Sync upstream changes
-        id: sync
-        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
-        with:
-          upstream_sync_repo: frankiejun/serv00-play
-          upstream_sync_branch: main
-          target_sync_branch: main
-          target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
-          exclude: |
-            .github/workflows/sync.yml
-
-      - name: Check for errors
-        if: failure()
-        run: echo "Sync failed! Please check the logs for more details."
-
-      - name: Sync success message
-        if: success()
-        run: echo "Sync completed successfully!"
+name: Sync Fork with Upstream
+
+on:
+  schedule:
+    - cron: '0 19 * * *'
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+ sync_latest_from_upstream:
+    name: Sync latest commits from upstream repo
+    runs-on: ubuntu-latest
+    if: ${{ github.event.repository.fork }}
+
+    steps:
+      # Step 1: run a standard checkout action
+      - name: Checkout target repo
+        uses: actions/checkout@v3
+
+      # Step 2: run the sync action
+      - name: Sync upstream changes
+        id: sync
+        uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
+        with:
+          upstream_sync_repo: frankiejun/serv00-play
+          upstream_sync_branch: main
+          target_sync_branch: main
+          target_repo_token: ${{ secrets.GITHUB_TOKEN }} # automatically generated, no need to set
+          exclude: |
+            .github/workflows/sync.yml
+
+      - name: Check for errors
+        if: failure()
+        run: echo "Sync failed! Please check the logs for more details."
+
+      - name: Sync success message
+        if: success()
+        run: echo "Sync completed successfully!"

.gitignore

@@ -1,11 +1,12 @@
-*.log
-*.json
-*.out
-*.js
-a.*
-*.swp
-vmess/node_modules
-vmess/list
-vmess/cloudflared
-vless/node_modules
-tools/
+*.log
+*.json
+*.out
+*test
+a.*
+*.swp
+vmess/node_modules
+vmess/list
+vmess/cloudflared
+vless/node_modules
+tools/
+.vscode/

LICENSE

@@ -1,13 +1,13 @@
-Copyright [2024] [饭奇骏]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright [2024] [饭奇骏]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.