react-native-update 9.2.1 → 9.2.3

package/lib/endpoint.ts

@@ -1,4 +1,4 @@
-import { logger } from './utils';
+import { logger, promiseAny } from './utils';
 
 let currentEndpoint = 'https://update.react-native.cn/api';
 let backupEndpoints: string[] = [
@@ -13,8 +13,8 @@ let backupEndpointsQueryUrls = [
 export async function updateBackupEndpoints() {
   if (backupEndpointsQueryUrls) {
     try {
-      const resp = await Promise.race(
-        backupEndpointsQueryUrls.map((queryUrl) => fetch(queryUrl)),
+      const resp = await promiseAny(
+        backupEndpointsQueryUrls.map(queryUrl => fetch(queryUrl)),
       );
       const remoteEndpoints = await resp.json();
       if (Array.isArray(remoteEndpoints)) {

package/lib/main.ts

@@ -16,7 +16,7 @@ import {
   UpdateAvailableResult,
   UpdateEventsListener,
 } from './type';
-import { assertRelease, logger, testUrls } from './utils';
+import { assertRelease, logger, promiseAny, testUrls } from './utils';
 export { setCustomEndpoints };
 const {
   version: v,
@@ -167,8 +167,8 @@ export async function checkUpdate(APPKEY: string) {
     const backupEndpoints = await updateBackupEndpoints();
     if (backupEndpoints) {
       try {
-        resp = await Promise.race(
-          backupEndpoints.map((endpoint) =>
+        resp = await promiseAny(
+          backupEndpoints.map(endpoint =>
             fetch(getCheckUrl(APPKEY, endpoint), fetchPayload),
           ),
         );
@@ -205,7 +205,7 @@ function checkOperation(
   if (!Array.isArray(op)) {
     return;
   }
-  op.forEach((action) => {
+  op.forEach(action => {
     if (action.type === 'block') {
       blockUpdate = {
         reason: action.reason,
@@ -250,7 +250,7 @@ export async function downloadUpdate(
       const downloadCallback = eventListeners.onDownloadProgress;
       progressHandler = eventEmitter.addListener(
         'RCTPushyDownloadProgress',
-        (progressData) => {
+        progressData => {
           if (progressData.hash === options.hash) {
             downloadCallback(progressData);
           }

package/lib/utils.ts

@@ -1,9 +1,26 @@
-import { Platform } from "react-native";
+import { Platform } from 'react-native';
 
 export function logger(...args: any[]) {
   console.log('Pushy: ', ...args);
 }
 
+export function promiseAny<T>(promises: Promise<T>[]) {
+  return new Promise<T>((resolve, reject) => {
+    let count = 0;
+
+    promises.forEach((promise) => {
+      Promise.resolve(promise)
+        .then(resolve)
+        .catch(() => {
+          count++;
+          if (count === promises.length) {
+            reject(new Error('All promises were rejected'));
+          }
+        });
+    });
+  });
+}
+
 export function assertRelease() {
   if (__DEV__) {
     throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
@@ -13,20 +30,44 @@ export function assertRelease() {
 const ping =
   Platform.OS === 'web'
     ? Promise.resolve
-    : async (url: string) =>
-        Promise.race([
+    : async (url: string) => {
+        let pingFinished = false;
+        return Promise.race([
           fetch(url, {
             method: 'HEAD',
           })
-            .then(({ status }) => (status === 200 ? url : null))
-            .catch(() => null),
-          new Promise(r => setTimeout(() => r(null), 2000)),
+            .then(({ status, statusText }) => {
+              pingFinished = true;
+              if (status === 200) {
+                return url;
+              }
+              logger('ping failed', url, status, statusText);
+              return null;
+            })
+            .catch((e) => {
+              pingFinished = true;
+              logger('ping error', url, e);
+              return null;
+            }),
+          new Promise((r) =>
+            setTimeout(() => {
+              r(null);
+              if (!pingFinished) {
+                logger('ping timeout', url);
+              }
+            }, 2000),
+          ),
         ]);
-
+      };
 
 export const testUrls = async (urls?: string[]) => {
   if (!urls?.length) {
     return null;
   }
-  return Promise.race(urls.map(ping)).catch(() => null);
+  const ret = await promiseAny(urls.map(ping));
+  if (ret) {
+    return ret;
+  }
+  logger('all ping failed, use first url:', urls[0]);
+  return urls[0];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "9.2.1",
+  "version": "9.2.3",
   "description": "react-native hot update",
   "main": "lib/index.ts",
   "scripts": {
@@ -67,5 +67,6 @@
     "react-native": "^0.72.6",
     "ts-jest": "^29.0.3",
     "typescript": "^5.2.2"
-  }
+  },
+  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
 }