Merge pull request #9 from xianshenglu/dev

feat: support full cloudflare ip v4 nodes
xianshenglu · May 12, 2022 · 0baa67b · 0baa67b
2 parents 91c220b + d8f9e0c
commit 0baa67b
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 2,856 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -3,11 +3,10 @@ name: Android Build ## name of the workflow
 on:
   push:
   pull_request:
-    branches:
-      - '!main'
 
 jobs:
   android-build:
+    if: ${{ github.ref_name != 'main' }}
     name: Android Build
     runs-on: ubuntu-latest # using ubuntu latest version / or you can use a specific version
 
@@ -59,8 +58,8 @@ jobs:
       - name: test
         id: test
         run: |
-          echo "$GITHUB_WORKSPACE/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[0] }}"
-          echo "$GITHUB_WORKSPACE/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[1] }}"
-          echo "$GITHUB_WORKSPACE/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[2] }}"
-          echo "$GITHUB_WORKSPACE/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[3] }}"
-          echo "$GITHUB_WORKSPACE/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[4] }}"
+          echo "${{ github.workspace }}/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[0] }}"
+          echo "${{ github.workspace }}/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[1] }}"
+          echo "${{ github.workspace }}/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[2] }}"
+          echo "${{ github.workspace }}/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[3] }}"
+          echo "${{ github.workspace }}/${{ fromJson(steps.sign_app.outputs.signedReleaseFiles)[4] }}"
diff --git a/apis/index.ts b/apis/index.ts
@@ -1,9 +1,8 @@
 import { getInitialCfIpResponse } from "./../screens/TestRunScreen/utils/index";
 import { RequestStatus } from "@/typings/index";
-import { getRandomItems } from "@/utils/index";
+import { getCfIpV4List, getRandomItems } from "@/utils/index";
 import axios from "axios";
 import { bufferCount, concatMap, from, map, mergeMap } from "rxjs";
-import { CfIpListV4 } from "@/constants/CfIpListV4";
 import urlParse from "url-parse";
 import { round } from "lodash-es";
 import { CfIpResponse } from "@/screens/TestRunScreen/model";
@@ -149,6 +148,6 @@ export const getCfNodesDownloadTestTime = (
   );
 };
 export const getRandomCfIpList = (totalCount: number) => {
-  const ipList = getRandomItems(CfIpListV4, totalCount);
+  const ipList = getRandomItems(getCfIpV4List(), totalCount);
   return ipList;
-};
+};