react-native-update 10.43.3 → 10.45.0

package/src/provider.tsx

@@ -2,6 +2,7 @@ import React, {
   ReactNode,
   useCallback,
   useEffect,
+  useMemo,
   useRef,
   useState,
 } from 'react';
@@ -24,10 +25,10 @@ import {
   ProgressData,
   UpdateTestPayload,
 } from './type';
-import { UpdateContext } from './context';
+import { ProgressContext, UpdateContext } from './context';
 import { URL } from 'react-native-url-polyfill';
 import { resolveCheckResult } from './resolveCheckResult';
-import { assertWeb, log } from './utils';
+import { assertWeb, log, noop } from './utils';
 
 export const UpdateProvider = ({
   client,
@@ -44,7 +45,6 @@ export const UpdateProvider = ({
   const updateInfoRef = useRef(updateInfo);
   const [progress, setProgress] = useState<ProgressData>();
   const [lastError, setLastError] = useState<Error>();
-  const lastChecking = useRef(0);
 
   const throwErrorIfEnabled = useCallback(
     (e: Error) => {
@@ -108,7 +108,6 @@ export const UpdateProvider = ({
         if (!hash) {
           return false;
         }
-        stateListener.current && stateListener.current.remove();
 
         if (
           options.afterDownloadUpdate &&
@@ -162,15 +161,12 @@ export const UpdateProvider = ({
 
   const checkUpdate = useCallback(
     async ({ extra }: { extra?: Partial<{ toHash: string }> } = {}) => {
-      const now = Date.now();
-      if (lastChecking.current && now - lastChecking.current < 1000) {
-        client.notifyAfterCheckUpdate({ status: 'skipped' });
-        return;
-      }
-      lastChecking.current = now;
+      // No throttle here: the client already dedupes checks via its 5s
+      // response cache, and a second throttle layer silently returned
+      // undefined, indistinguishable from a failed check.
       let rootInfo: CheckResult | undefined;
       try {
-        rootInfo = { ...(await client.checkUpdate(extra)) };
+        rootInfo = await client.checkUpdate(extra);
       } catch (e: any) {
         setLastError(e);
         alertError(client.t('error_update_check_failed'), e.message);
@@ -178,6 +174,8 @@ export const UpdateProvider = ({
         return;
       }
       if (!rootInfo) {
+        // Check was skipped or failed with no cached result; keep the last
+        // known updateInfo instead of overwriting it with an empty object.
         return;
       }
       const info = resolveCheckResult(rootInfo);
@@ -198,7 +196,7 @@ export const UpdateProvider = ({
         if (downloadUrl && sharedState.apkStatus === null) {
           if (options.updateStrategy === 'silentAndNow') {
             if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
-              downloadAndInstallApk(downloadUrl);
+              downloadAndInstallApk(downloadUrl).catch(noop);
             } else {
               Linking.openURL(downloadUrl);
             }
@@ -215,7 +213,7 @@ export const UpdateProvider = ({
                     Platform.OS === 'android' &&
                     downloadUrl.endsWith('.apk')
                   ) {
-                    downloadAndInstallApk(downloadUrl);
+                    downloadAndInstallApk(downloadUrl).catch(noop);
                   } else {
                     Linking.openURL(downloadUrl);
                   }
@@ -229,7 +227,7 @@ export const UpdateProvider = ({
           options.updateStrategy === 'silentAndNow' ||
           options.updateStrategy === 'silentAndLater'
         ) {
-          downloadUpdate(info);
+          downloadUpdate(info).catch(noop);
           return info;
         }
         alertUpdate(
@@ -244,7 +242,7 @@ export const UpdateProvider = ({
               text: client.t('alert_confirm'),
               style: 'default',
               onPress: () => {
-                downloadUpdate();
+                downloadUpdate().catch(noop);
               },
             },
           ],
@@ -272,9 +270,10 @@ export const UpdateProvider = ({
     if (!assertWeb()) {
       return;
     }
-    const { checkStrategy, dismissErrorAfter, autoMarkSuccess } = options;
+    const { checkStrategy, autoMarkSuccess } = options;
+    let markSuccessTimer: ReturnType<typeof setTimeout> | undefined;
     if (autoMarkSuccess) {
-      setTimeout(() => {
+      markSuccessTimer = setTimeout(() => {
         markSuccess();
       }, 1000);
     }
@@ -283,26 +282,38 @@ export const UpdateProvider = ({
         'change',
         nextAppState => {
           if (nextAppState === 'active') {
-            checkUpdate();
+            checkUpdate().catch(noop);
           }
         },
       );
     }
     if (checkStrategy === 'both' || checkStrategy === 'onAppStart') {
-      checkUpdate();
-    }
-    let dismissErrorTimer: ReturnType<typeof setTimeout>;
-    if (typeof dismissErrorAfter === 'number' && dismissErrorAfter > 0) {
-      dismissErrorTimer = setTimeout(() => {
-        dismissError();
-      }, dismissErrorAfter);
+      checkUpdate().catch(noop);
     }
     return () => {
+      if (markSuccessTimer) {
+        clearTimeout(markSuccessTimer);
+      }
       stateListener.current && stateListener.current.remove();
-      clearTimeout(dismissErrorTimer);
     };
   }, [checkUpdate, options, dismissError, markSuccess, client]);
 
+  useEffect(() => {
+    const { dismissErrorAfter } = options;
+    if (
+      lastError &&
+      typeof dismissErrorAfter === 'number' &&
+      dismissErrorAfter > 0
+    ) {
+      const dismissErrorTimer = setTimeout(() => {
+        dismissError();
+      }, dismissErrorAfter);
+      return () => {
+        clearTimeout(dismissErrorTimer);
+      };
+    }
+  }, [lastError, options, dismissError]);
+
   const parseTestPayload = useCallback(
     (payload: UpdateTestPayload) => {
       if (payload && payload.type && payload.type.startsWith('__rnPushy')) {
@@ -314,15 +325,19 @@ export const UpdateProvider = ({
         if (payload.type === '__rnPushyVersionHash') {
           const toHash = payload.data;
           sharedState.toHash = toHash;
-          checkUpdate({ extra: { toHash } }).then(() => {
-            if (updateInfoRef.current && updateInfoRef.current.upToDate) {
-              Alert.alert(
-                client.t('alert_info'),
-                client.t('alert_no_update_wait'),
-              );
-            }
-            options.logger = logger;
-          });
+          checkUpdate({ extra: { toHash } })
+            .then(() => {
+              if (updateInfoRef.current && updateInfoRef.current.upToDate) {
+                Alert.alert(
+                  client.t('alert_info'),
+                  client.t('alert_no_update_wait'),
+                );
+              }
+            })
+            .catch(noop)
+            .finally(() => {
+              options.logger = logger;
+            });
         }
         return true;
       }
@@ -377,28 +392,48 @@ export const UpdateProvider = ({
     };
   }, [parseTestPayload]);
 
+  // progress lives in its own context (see context.ts), so this value only
+  // changes when the update state itself changes, not on every progress tick.
+  const contextValue = useMemo(
+    () => ({
+      checkUpdate,
+      switchVersion,
+      switchVersionLater,
+      dismissError,
+      updateInfo,
+      lastError,
+      markSuccess,
+      client,
+      downloadUpdate,
+      packageVersion,
+      currentHash: currentVersion,
+      downloadAndInstallApk,
+      getCurrentVersionInfo,
+      currentVersionInfo,
+      parseTestQrCode,
+      restartApp,
+    }),
+    [
+      checkUpdate,
+      switchVersion,
+      switchVersionLater,
+      dismissError,
+      updateInfo,
+      lastError,
+      markSuccess,
+      client,
+      downloadUpdate,
+      downloadAndInstallApk,
+      parseTestQrCode,
+      restartApp,
+    ],
+  );
+
   return (
-    <UpdateContext.Provider
-      value={{
-        checkUpdate,
-        switchVersion,
-        switchVersionLater,
-        dismissError,
-        updateInfo,
-        lastError,
-        markSuccess,
-        client,
-        downloadUpdate,
-        packageVersion,
-        currentHash: currentVersion,
-        progress,
-        downloadAndInstallApk,
-        getCurrentVersionInfo,
-        currentVersionInfo,
-        parseTestQrCode,
-        restartApp,
-      }}>
-      {children}
+    <UpdateContext.Provider value={contextValue}>
+      <ProgressContext.Provider value={progress}>
+        {children}
+      </ProgressContext.Provider>
     </UpdateContext.Provider>
   );
 };

package/src/utils.ts

@@ -22,6 +22,10 @@ export const DEFAULT_FETCH_TIMEOUT_MS = 5000;
 
 export function promiseAny<T>(promises: Promise<T>[]) {
   return new Promise<T>((resolve, reject) => {
+    if (!promises.length) {
+      reject(Error(i18n.t('error_all_promises_rejected')));
+      return;
+    }
     let count = 0;
 
     promises.forEach(promise => {
@@ -84,7 +88,7 @@ export function joinUrls(paths: string[], fileName?: string) {
   }
 }
 
-export const testUrls = async (urls?: string[]) => {
+export const testUrls = async (urls?: string[]): Promise<string | null> => {
   if (!urls?.length) {
     return null;
   }
@@ -93,7 +97,7 @@ export const testUrls = async (urls?: string[]) => {
     const ret = await promiseAny(urls.map(ping));
     if (ret) {
       log('ping success, use url:', ret);
-      return ret;
+      return ret as string;
     }
   } catch {}
   log('all ping failed, use first url:', urls[0]);
@@ -118,21 +122,50 @@ export const fetchWithTimeout = (
   params: Parameters<typeof fetch>[1],
   timeoutMs = DEFAULT_FETCH_TIMEOUT_MS,
 ): Promise<Response> => {
-  let timeoutId: ReturnType<typeof setTimeout> | undefined;
-
-  return Promise.race([
-    enhancedFetch(url, params),
-    new Promise<Response>((_, reject) => {
-      timeoutId = setTimeout(() => {
-        log('fetch timeout', url);
-        reject(Error(i18n.t('error_ping_timeout')));
-      }, timeoutMs);
-    }),
-  ]).finally(() => {
-    if (timeoutId) {
+  // AbortController landed in the RN fetch polyfill around 0.60; we support
+  // older peers, so fall back to a plain timer race when it is unavailable
+  // (the losing fetch keeps running there — old runtimes can't do better).
+  if (typeof AbortController === 'undefined') {
+    let timeoutId: ReturnType<typeof setTimeout> | undefined;
+    return Promise.race([
+      enhancedFetch(url, params),
+      new Promise<Response>((_, reject) => {
+        timeoutId = setTimeout(() => {
+          log('fetch timeout', url);
+          reject(Error(i18n.t('error_ping_timeout')));
+        }, timeoutMs);
+      }),
+    ]).finally(() => {
+      if (timeoutId) {
+        clearTimeout(timeoutId);
+      }
+    });
+  }
+
+  // Abort the underlying request on timeout instead of racing a timer: with
+  // Promise.race the losing fetch kept running (and kept the connection busy)
+  // long after the caller had already moved on.
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => {
+    log('fetch timeout', url);
+    controller.abort();
+  }, timeoutMs);
+
+  return enhancedFetch(url, { ...params, signal: controller.signal })
+    .catch((e: any) => {
+      if (controller.signal.aborted) {
+        throw Error(i18n.t('error_ping_timeout'));
+      }
+      throw e;
+    })
+    .finally(() => {
       clearTimeout(timeoutId);
-    }
-  });
+    });
+};
+
+const isIdempotentRequest = (params: Parameters<typeof fetch>[1]) => {
+  const method = params?.method?.toUpperCase() ?? 'GET';
+  return method === 'GET' || method === 'HEAD';
 };
 
 export const enhancedFetch = async (
@@ -143,10 +176,17 @@ export const enhancedFetch = async (
   return fetch(url, params)
     .catch(e => {
       log('fetch error', url, e);
-      if (isRetry) {
+      if (
+        isRetry ||
+        (params as any)?.signal?.aborted ||
+        !url.startsWith('https:') ||
+        // Never replay non-idempotent requests (e.g. the checkUpdate POST)
+        // over plaintext http: the server may have processed the original.
+        !isIdempotentRequest(params)
+      ) {
         throw e;
       }
       log('trying fallback to http');
-      return enhancedFetch(url.replace('https', 'http'), params, true);
+      return enhancedFetch(url.replace(/^https:/, 'http:'), params, true);
     });
 };

package/android/jni/DownloadTask.c

@@ -1,56 +0,0 @@
-//
-// Created by DengYun on 3/31/16.
-//
-
-#include "cn_reactnative_modules_update_DownloadTask.h"
-
-#include "hpatch.h"
-#define _check(v,errInfo) do{ if (!(v)) {  _isError=hpatch_TRUE; _errInfo=errInfo; goto _clear;  } }while(0)
-
-JNIEXPORT jbyteArray JNICALL Java_cn_reactnative_modules_update_DownloadTask_hdiffPatch
-        (JNIEnv *env, jobject self, jbyteArray origin, jbyteArray patch){
-    hpatch_BOOL  _isError=hpatch_FALSE; 
-    const char* _errInfo="";
-
-    jbyte* originPtr = (*env)->GetByteArrayElements(env, origin, NULL);
-    size_t originLength = (*env)->GetArrayLength(env, origin);
-    jbyte* patchPtr = (*env)->GetByteArrayElements(env, patch, NULL);
-    size_t patchLength = (*env)->GetArrayLength(env, patch);
-    jbyteArray ret = NULL;
-    jbyte* outPtr = NULL;
-    size_t newsize = 0;
-    hpatch_singleCompressedDiffInfo patInfo;
-
-    _check(((originLength==0)||originPtr) && patchPtr && (patchLength>0),"Corrupt patch");
-    _check(kHPatch_ok==hpatch_getInfo_by_mem(&patInfo,(const uint8_t*)patchPtr,patchLength),"Error info in hpatch");
-    _check(originLength==patInfo.oldDataSize,"Error oldDataSize in hpatch");
-    newsize=(size_t)patInfo.newDataSize;
-    if (sizeof(size_t)!=sizeof(hpatch_StreamPos_t))
-        _check(newsize==patInfo.newDataSize,"Error newDataSize in hpatch");
-    
-    ret = (*env)->NewByteArray(env,newsize);
-    _check(ret,"Error JNIEnv::NewByteArray()");
-    if (newsize>0) {
-        outPtr = (*env)->GetByteArrayElements(env, ret, NULL);
-        _check(outPtr,"Corrupt JNIEnv::GetByteArrayElements");
-    }
-
-    _check(kHPatch_ok==hpatch_by_mem((const uint8_t*)originPtr,originLength,(uint8_t*)outPtr,newsize,
-                                     (const uint8_t*)patchPtr,patchLength,&patInfo),"hpacth");
-
-_clear:
-    if (outPtr) (*env)->ReleaseByteArrayElements(env, ret, outPtr, (_isError?JNI_ABORT:0));
-    if (originPtr) (*env)->ReleaseByteArrayElements(env, origin, originPtr, JNI_ABORT);
-    if (patchPtr) (*env)->ReleaseByteArrayElements(env, patch, patchPtr, JNI_ABORT);
-    if (_isError){
-        jclass newExcCls = NULL;
-        if (ret){
-            (*env)->DeleteLocalRef(env, ret);
-            ret = NULL;
-        }
-        newExcCls = (*env)->FindClass(env, "java/lang/Error");
-        if (newExcCls != NULL) // Unable to find the new exception class, give up.
-            (*env)->ThrowNew(env, newExcCls, _errInfo);
-    }
-    return ret;
-}

package/android/jni/cn_reactnative_modules_update_DownloadTask.h

@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class cn_reactnative_modules_update_DownloadTask */
-
-#ifndef _Included_cn_reactnative_modules_update_DownloadTask
-#define _Included_cn_reactnative_modules_update_DownloadTask
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     cn_reactnative_modules_update_DownloadTask
- * Method:    hdiffPatch
- * Signature: ([B[B)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_cn_reactnative_modules_update_DownloadTask_hdiffPatch
-  (JNIEnv *, jclass, jbyteArray, jbyteArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

package/harmony/pushy/src/main/cpp/pushy.c

@@ -1,117 +0,0 @@
-#include "pushy.h"
-#include "hpatch.h"
-#include <napi/native_api.h>
-#include <js_native_api.h>
-#include <js_native_api_types.h>
-
-#define _check(v,errInfo) do { \
-    if (!(v)) { \
-        _isError = hpatch_TRUE; \
-        _errInfo = errInfo; \
-        goto _clear; \
-    } \
-} while(0)
-
-napi_value HdiffPatch(napi_env env, napi_callback_info info) {
-    napi_status status;
-    size_t argc = 2;
-    napi_value args[2];
-    hpatch_BOOL _isError = hpatch_FALSE;
-    const char* _errInfo = "";
-
-    // 获取参数
-    status = napi_get_cb_info(env, info, &argc, args, NULL, NULL);
-    if (status != napi_ok || argc < 2) {
-        napi_throw_error(env, NULL, "Wrong number of arguments");
-        return NULL;
-    }
-
-    // 获取origin buffer
-    bool isTypedArray;
-    status = napi_is_typedarray(env, args[0], &isTypedArray);
-    if (status != napi_ok || !isTypedArray) {
-        napi_throw_error(env, NULL, "First argument must be a TypedArray");
-        return NULL;
-    }
-
-    uint8_t* originPtr;
-    size_t originLength;
-    status = napi_get_typedarray_info(env, args[0], NULL, &originLength, 
-                                     (void**)&originPtr, NULL, NULL);
-    if (status != napi_ok) {
-        napi_throw_error(env, NULL, "Failed to get origin buffer");
-        return NULL;
-    }
-
-    // 获取patch buffer
-    status = napi_is_typedarray(env, args[1], &isTypedArray);
-    if (status != napi_ok || !isTypedArray) {
-        napi_throw_error(env, NULL, "Second argument must be a TypedArray");
-        return NULL;
-    }
-
-    uint8_t* patchPtr;
-    size_t patchLength;
-    status = napi_get_typedarray_info(env, args[1], NULL, &patchLength, 
-                                     (void**)&patchPtr, NULL, NULL);
-    if (status != napi_ok) {
-        napi_throw_error(env, NULL, "Failed to get patch buffer");
-        return NULL;
-    }
-
-    // 执行patch操作
-    hpatch_singleCompressedDiffInfo patInfo;
-    
-    _check(((originLength==0)||originPtr) && patchPtr && (patchLength>0), "Corrupt patch");
-    _check(kHPatch_ok==hpatch_getInfo_by_mem(&patInfo, patchPtr, patchLength), "Error info in hpatch");
-    _check(originLength==patInfo.oldDataSize, "Error oldDataSize in hpatch");
-    size_t newsize = (size_t)patInfo.newDataSize;
-    if (sizeof(size_t)!=sizeof(hpatch_StreamPos_t))
-        _check(newsize==patInfo.newDataSize, "Error newDataSize in hpatch");
-
-    // 创建结果buffer
-    napi_value resultBuffer;
-    uint8_t* outPtr;
-    void* data;
-
-    status = napi_create_arraybuffer(env, newsize, &data, &resultBuffer);
-    if (status != napi_ok) {
-        napi_throw_error(env, NULL, "Failed to create result buffer");
-        return NULL;
-    }
-    outPtr = (uint8_t*)data;
-
-    // 执行patch
-    _check(kHPatch_ok==hpatch_by_mem(originPtr, originLength, outPtr, newsize,
-                                    patchPtr, patchLength, &patInfo), "hpatch");
-    return resultBuffer;
-
-_clear:
-    if (_isError) {
-        napi_throw_error(env, NULL, _errInfo);
-        return NULL;
-    }
-    return NULL;
-}
-
-// 模块初始化
-napi_value Init(napi_env env, napi_value exports) {
-    napi_status status;
-    napi_value fn;
-
-    status = napi_create_function(env, NULL, 0, HdiffPatch, NULL, &fn);
-    if (status != napi_ok) {
-        napi_throw_error(env, NULL, "Unable to wrap native function");
-        return NULL;
-    }
-
-    status = napi_set_named_property(env, exports, "hdiffPatch", fn);
-    if (status != napi_ok) {
-        napi_throw_error(env, NULL, "Unable to populate exports");
-        return NULL;
-    }
-
-    return exports;
-}
-
-NAPI_MODULE(NODE_GYP_MODULE_NAME, Init)

package/harmony/pushy/src/main/cpp/pushy.h

@@ -1,8 +0,0 @@
-#ifndef _DOWNLOAD_TASK_H_
-#define _DOWNLOAD_TASK_H_
-
-#include <napi/native_api.h>
-
-napi_value HdiffPatch(napi_env env, napi_callback_info info);
-
-#endif // _DOWNLOAD_TASK_H_

package/src/__tests__/setup.ts

@@ -1,44 +0,0 @@
-import { mock } from 'bun:test';
-
-mock.module('react-native', () => {
-  return {
-    Platform: {
-      OS: 'ios',
-      Version: 13,
-    },
-    DeviceEventEmitter: {
-      addListener: () => ({ remove: () => {} }),
-    },
-    NativeModules: {
-      Pushy: {
-        currentVersionInfo: '{}',
-        downloadRootDir: '/tmp',
-        packageVersion: '1.0.0',
-        currentVersion: 'hash',
-        isFirstTime: false,
-        rolledBackVersion: '',
-        buildTime: '2023-01-01',
-        uuid: 'uuid',
-        setLocalHashInfo: () => {},
-        getLocalHashInfo: () => Promise.resolve('{}'),
-        setUuid: () => {},
-      },
-    },
-    NativeEventEmitter: class {
-      addListener = () => ({ remove: () => {} });
-      removeAllListeners = () => {};
-    },
-  };
-});
-
-mock.module('../i18n', () => {
-  return {
-    default: {
-      t: (key: string, params?: any) => `${key}${params ? JSON.stringify(params) : ''}`,
-    },
-  };
-});
-
-mock.module('react-native/Libraries/Core/ReactNativeVersion', () => ({
-  version: { major: 0, minor: 73, patch: 0 },
-}));