feat: improve backup endpoints

lib/endpoint.ts

@@ -1,75 +1,26 @@
+import { logger } from './utils';
+
 let currentEndpoint = 'https://update.react-native.cn/api';
+let backupEndpoints: string[] = ['https://update.reactnative.cn/api'];
+let backupEndpointsQueryUrl: string | null = null;
 
-function ping(url: string, rejectImmediate?: boolean) {
+export async function updateBackupEndpoints() {
-  return new Promise((resolve, reject) => {
+  if (backupEndpointsQueryUrl) {
-    const xhr = new XMLHttpRequest();
-    xhr.onreadystatechange = (e) => {
-      if (xhr.readyState !== 4) {
-        return;
-      }
-      if (xhr.status === 200) {
-        resolve(url);
-      } else {
-        rejectImmediate ? reject() : setTimeout(reject, 5000);
-      }
-    };
-    xhr.open('HEAD', url);
-    xhr.send();
-    xhr.timeout = 5000;
-    xhr.ontimeout = reject;
-  });
-}
-
-function logger(...args: any[]) {
-  console.log('Pushy: ', ...args);
-}
-
-let backupEndpoints: string[] = [];
-let backupEndpointsQueryUrl: string | null =
-  'https://cdn.jsdelivr.net/gh/reactnativecn/react-native-pushy@master/endpoints.json';
-
-export async function tryBackupEndpoints() {
-  if (!backupEndpoints.length && !backupEndpointsQueryUrl) {
-    return;
-  }
-  try {
-    await ping(getStatusUrl(), true);
-    logger('current endpoint ok', currentEndpoint);
-    return;
-  } catch (e) {
-    logger('current endpoint failed', currentEndpoint);
-  }
-  if (!backupEndpoints.length && backupEndpointsQueryUrl) {
     try {
       const resp = await fetch(backupEndpointsQueryUrl);
-      backupEndpoints = await resp.json();
+      const remoteEndpoints = await resp.json();
-      logger('get remote endpoints:', backupEndpoints);
+      if (Array.isArray(remoteEndpoints)) {
-    } catch (e) {
+        backupEndpoints = Array.from(
-      logger('get remote endpoints failed');
+          new Set([...backupEndpoints, ...remoteEndpoints]),
-      return;
-    }
-  }
-  await pickFatestAvailableEndpoint();
-}
-
-async function pickFatestAvailableEndpoint(endpoints = backupEndpoints) {
-  const fastestEndpoint = await Promise.race(
-    endpoints.map(pingAndReturnEndpoint),
         );
-  if (typeof fastestEndpoint === 'string') {
+        logger('fetch remote endpoints:', remoteEndpoints);
-    logger(`pick endpoint: ${fastestEndpoint}`);
+        logger('merged backup endpoints:', backupEndpoints);
-    currentEndpoint = fastestEndpoint;
-  } else {
-    logger('all remote endpoints failed');
       }
-}
+    } catch (e) {
-
+      logger('fetch remote endpoints failed');
-async function pingAndReturnEndpoint(endpoint = currentEndpoint) {
+    }
-  return ping(getStatusUrl(endpoint)).then(() => endpoint);
+  }
-}
+  return backupEndpoints;
-
-function getStatusUrl(endpoint = currentEndpoint) {
-  return `${endpoint}/status`;
 }
 
 export function getCheckUrl(APPKEY, endpoint = currentEndpoint) {
@@ -95,7 +46,6 @@ export function setCustomEndpoints({
   backupEndpointsQueryUrl = null;
   if (Array.isArray(backups) && backups.length > 0) {
     backupEndpoints = backups;
-    pickFatestAvailableEndpoint();
   }
   if (typeof backupQueryUrl === 'string') {
     backupEndpointsQueryUrl = backupQueryUrl;

lib/main.ts

@@ -1,5 +1,5 @@
 import {
-  tryBackupEndpoints,
+  updateBackupEndpoints,
   getCheckUrl,
   setCustomEndpoints,
 } from './endpoint';
@@ -16,6 +16,7 @@ import {
   UpdateAvailableResult,
   UpdateEventsListener,
 } from './type';
+import { assertRelease, logger } from './utils';
 export { setCustomEndpoints };
 const {
   version: v,
@@ -74,10 +75,6 @@ if (!uuid) {
   PushyModule.setUuid(uuid);
 }
 
-function logger(...args: string[]) {
-  console.log('Pushy: ', ...args);
-}
-
 const noop = () => {};
 let reporter: UpdateEventsListener = noop;
 
@@ -125,16 +122,10 @@ export const cInfo = {
   uuid,
 };
 
-function assertRelease() {
-  if (__DEV__) {
-    throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
-  }
-}
-
 let lastChecking;
 const empty = {};
 let lastResult: CheckResult;
-export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
+export async function checkUpdate(APPKEY: string) {
   assertRelease();
   const now = Date.now();
   if (lastResult && lastChecking && now - lastChecking < 1000 * 60) {
@@ -152,9 +143,7 @@ export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
     return lastResult || empty;
   }
   report({ type: 'checking' });
-  let resp;
+  const fetchPayload = {
-  try {
-    resp = await fetch(getCheckUrl(APPKEY), {
     method: 'POST',
     headers: {
       Accept: 'application/json',
@@ -166,18 +155,33 @@ export async function checkUpdate(APPKEY: string, isRetry?: boolean) {
       buildTime,
       cInfo,
     }),
-    });
+  };
+  let resp;
+  try {
+    resp = await fetch(getCheckUrl(APPKEY), fetchPayload);
   } catch (e) {
-    if (isRetry) {
+    report({
+      type: 'errorChecking',
+      message: '无法连接主更新服务器，尝试备用节点',
+    });
+    const backupEndpoints = await updateBackupEndpoints();
+    if (backupEndpoints) {
+      try {
+        resp = await Promise.race(
+          backupEndpoints.map((endpoint) =>
+            fetch(getCheckUrl(APPKEY, endpoint), fetchPayload),
+          ),
+        );
+      } catch {}
+    }
+  }
+  if (!resp) {
     report({
       type: 'errorChecking',
       message: '无法连接更新服务器，请检查网络连接后重试',
     });
     return lastResult || empty;
   }
-    await tryBackupEndpoints();
-    return checkUpdate(APPKEY, true);
-  }
   const result: CheckResult = await resp.json();
 
   lastResult = result;

lib/utils.ts

@@ -0,0 +1,9 @@
+export function logger(...args: any[]) {
+  console.log('Pushy: ', ...args);
+}
+
+export function assertRelease() {
+  if (__DEV__) {
+    throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
+  }
+}

package.json

@@ -39,7 +39,7 @@
     "url": "https://github.com/reactnativecn/react-native-pushy/issues"
   },
   "peerDependencies": {
-    "react-native": ">=0.27.0"
+    "react-native": ">=0.57.0"
   },
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
@@ -63,6 +63,6 @@
     "jest": "^29.2.1",
     "pod-install": "^0.1.37",
     "ts-jest": "^29.0.3",
-    "typescript": "^4.1.3"
+    "typescript": "^5.2.2"
   }
 }

yarn.lock

@@ -6023,10 +6023,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^4.1.3:
+typescript@^5.2.2:
-  version "4.9.5"
+  version "5.2.2"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
-  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"