v10.2.6

.eslintrc

@@ -1,4 +0,0 @@
-{
-  "root": true,
-  "extends": "@react-native"
-}

.eslintrc.js

@@ -0,0 +1,4 @@
+module.exports = {
+  root: true,
+  extends: '@react-native',
+};

.github/workflows/scripts/functions/src/testFunctionDefaultRegion.ts

@@ -41,14 +41,17 @@ export const testFunctionDefaultRegion = functions.https.onCall(data => {
 
   const { type, asError, inputData } = data;
   if (!Object.hasOwnProperty.call(SAMPLE_DATA, type)) {
-    throw new functions.https.HttpsError('invalid-argument', 'Invalid test requested.');
+    throw new functions.https.HttpsError(
+      'invalid-argument',
+      'Invalid test requested.',
+    );
   }
 
   const outputData = SAMPLE_DATA[type];
 
   try {
     assert.deepEqual(outputData, inputData);
-  } catch (e) {
+  } catch (e: any) {
     console.error(e);
     throw new functions.https.HttpsError(
       'invalid-argument',

.prettierrc.js

@@ -1,4 +1,6 @@
 module.exports = {
-  trailingComma: 'all',
+  arrowParens: 'avoid',
+  bracketSameLine: true,
   singleQuote: true,
+  trailingComma: 'all',
 };

Example/testHotUpdate/src/TestConsole.js

@@ -19,23 +19,25 @@ const UUID = '00000000-0000-0000-0000-000000000000';
 const DownloadUrl =
   'http://cos.pgyer.com/697913e94d7441f20c686e2b0996a1aa.apk?sign=7a8f11b1df82cba45c8ac30b1acec88c&t=1680404102&response-content-disposition=attachment%3Bfilename%3DtestHotupdate_1.0.apk';
 
+const CustomDialog = ({title, visible, onConfirm}) => {
+  if (!visible) {
+    return null;
+  }
 
-  const CustomDialog = ({title, visible, onConfirm}) => {
-    if (!visible) {
-      return null;
-    }
-  
-    return (
-      <View style={styles.overlay}>
-        <View style={styles.dialog}>
-          <Text style={styles.title}>{title}</Text>
-          <TouchableOpacity testID='done' style={styles.button} onLongPress={onConfirm}>
-            <Text style={styles.buttonText}>确认</Text>
-          </TouchableOpacity>
-        </View>
+  return (
+    <View style={styles.overlay}>
+      <View style={styles.dialog}>
+        <Text style={styles.title}>{title}</Text>
+        <TouchableOpacity
+          testID="done"
+          style={styles.button}
+          onLongPress={onConfirm}>
+          <Text style={styles.buttonText}>确认</Text>
+        </TouchableOpacity>
       </View>
-    );
-  };
+    </View>
+  );
+};
 export default function TestConsole({visible}) {
   const [text, setText] = useState('');
   const [running, setRunning] = useState(false);
@@ -132,9 +134,8 @@ export default function TestConsole({visible}) {
           testID={NativeTestMethod[i].name}
           onLongPress={() => {
             NativeTestMethod[i].invoke();
-          }}
-        >
-        <Text>{NativeTestMethod[i].name}</Text>
+          }}>
+          <Text>{NativeTestMethod[i].name}</Text>
         </TouchableOpacity>,
       );
     }
@@ -164,8 +165,14 @@ export default function TestConsole({visible}) {
         />
         {running && <ActivityIndicator />}
         <TouchableOpacity
-        style={{backgroundColor:'rgb(0,140,237)', justifyContent: 'center',
-        alignItems: 'center',paddingTop:10,paddingBottom:10,marginBottom:5}}
+          style={{
+            backgroundColor: 'rgb(0,140,237)',
+            justifyContent: 'center',
+            alignItems: 'center',
+            paddingTop: 10,
+            paddingBottom: 10,
+            marginBottom: 5,
+          }}
           testID="submit"
           onLongPress={async () => {
             setRunning(true);
@@ -195,17 +202,18 @@ export default function TestConsole({visible}) {
               setAlertMsg(e.message);
             }
             setRunning(false);
-          }}
-        >
-          <Text style={{color:'white'}}>执行</Text>
+          }}>
+          <Text style={{color: 'white'}}>执行</Text>
         </TouchableOpacity>
-         <Button title="重置" onPress={() => setText('')} />
-          {renderTestView()}
-          <CustomDialog
-            title={alertMsg}
-            visible={alertVisible}
-            onConfirm={()=>{setAlertVisible(false)}}
-      />
+        <Button title="重置" onPress={() => setText('')} />
+        {renderTestView()}
+        <CustomDialog
+          title={alertMsg}
+          visible={alertVisible}
+          onConfirm={() => {
+            setAlertVisible(false);
+          }}
+        />
       </SafeAreaView>
     </Modal>
   );

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: ['module:@react-native/babel-preset'],
+};

package.json

@@ -1,10 +1,11 @@
 {
   "name": "react-native-update",
-  "version": "10.2.1",
+  "version": "10.2.6",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {
-    "prepublish": "yarn submodule",
+    "prepack": "yarn submodule && yarn lint",
+    "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",
     "submodule": "git submodule update --init --recursive",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build-lib": "yarn submodule && $ANDROID_HOME/ndk/20.1.5948944/ndk-build NDK_PROJECT_PATH=android APP_BUILD_SCRIPT=android/jni/Android.mk NDK_APPLICATION_MK=android/jni/Application.mk NDK_LIBS_OUT=android/lib",
@@ -56,16 +57,20 @@
     ]
   },
   "devDependencies": {
+    "@babel/core": "^7.24.0",
+    "@react-native/babel-preset": "^0.73.21",
     "@react-native/eslint-config": "^0.73.2",
+    "@react-native/typescript-config": "^0.74.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.2.1",
     "@types/node": "^20.8.9",
     "@types/react": "^18.2.46",
     "detox": "^20.5.0",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
+    "eslint-plugin-ft-flow": "^3.0.7",
     "firebase-tools": "^11.24.1",
     "fs-extra": "^9.1.0",
-    "jest": "^29.2.1",
+    "jest": "^29.7.0",
     "pod-install": "^0.1.37",
     "prettier": "^2",
     "react": "18.2.0",

src/client.tsx

@@ -37,11 +37,11 @@ export class Pushy {
     logger: noop,
   };
 
-  lastChecking: number;
-  lastResult: CheckResult;
+  lastChecking?: number;
+  lastRespJson?: Promise<any>;
 
   progressHandlers: Record<string, EmitterSubscription> = {};
-  downloadedHash: string;
+  downloadedHash?: string;
 
   marked = false;
   applyingUpdate = false;
@@ -57,6 +57,7 @@ export class Pushy {
   setOptions = (options: Partial<PushyOptions>) => {
     for (const [key, value] of Object.entries(options)) {
       if (value !== undefined) {
+        // @ts-expect-error
         this.options[key] = value;
         if (key === 'logger') {
           if (isRolledBack) {
@@ -139,11 +140,11 @@ export class Pushy {
     assertRelease();
     const now = Date.now();
     if (
-      this.lastResult &&
+      this.lastRespJson &&
       this.lastChecking &&
       now - this.lastChecking < 1000 * 5
     ) {
-      return this.lastResult;
+      return await this.lastRespJson;
     }
     this.lastChecking = now;
     this.report({ type: 'checking' });
@@ -163,7 +164,7 @@ export class Pushy {
     let resp;
     try {
       resp = await fetch(this.getCheckUrl(), fetchPayload);
-    } catch (e) {
+    } catch (e: any) {
       this.report({
         type: 'errorChecking',
         message: 'Can not connect to update server. Trying backup endpoints.',
@@ -172,7 +173,7 @@ export class Pushy {
       if (backupEndpoints) {
         try {
           resp = await Promise.race(
-            backupEndpoints.map((endpoint) =>
+            backupEndpoints.map(endpoint =>
               fetch(this.getCheckUrl(endpoint), fetchPayload),
             ),
           );
@@ -184,11 +185,11 @@ export class Pushy {
         type: 'errorChecking',
         message: 'Can not connect to update server. Please check your network.',
       });
-      return this.lastResult || empty;
+      return this.lastRespJson ? await this.lastRespJson : empty;
     }
-    const result: CheckResult = await resp.json();
+    this.lastRespJson = resp.json();
 
-    this.lastResult = result;
+    const result: CheckResult = await this.lastRespJson;
 
     if (resp.status !== 200) {
       this.report({
@@ -214,7 +215,7 @@ export class Pushy {
             new Set([...(server.backups || []), ...remoteEndpoints]),
           );
         }
-      } catch (e) {
+      } catch (e: any) {
         log('failed to fetch endpoints from: ', server.queryUrl);
       }
     }
@@ -254,7 +255,7 @@ export class Pushy {
     if (onDownloadProgress) {
       this.progressHandlers[hash] = pushyNativeEventEmitter.addListener(
         'RCTPushyDownloadProgress',
-        (progressData) => {
+        progressData => {
           if (progressData.hash === hash) {
             onDownloadProgress(progressData);
           }
@@ -273,7 +274,7 @@ export class Pushy {
           originHash: currentVersion,
         });
         succeeded = true;
-      } catch (e) {
+      } catch (e: any) {
         log(`diff error: ${e.message}, try pdiff`);
       }
     }
@@ -286,7 +287,7 @@ export class Pushy {
           hash,
         });
         succeeded = true;
-      } catch (e) {
+      } catch (e: any) {
         log(`pdiff error: ${e.message}, try full patch`);
       }
     }
@@ -299,7 +300,7 @@ export class Pushy {
           hash,
         });
         succeeded = true;
-      } catch (e) {
+      } catch (e: any) {
         log(`full patch error: ${e.message}`);
       }
     }
@@ -338,7 +339,7 @@ export class Pushy {
         if (granted !== PermissionsAndroid.RESULTS.GRANTED) {
           return this.report({ type: 'rejectStoragePermission' });
         }
-      } catch (err) {
+      } catch (e: any) {
         return this.report({ type: 'errorStoragePermission' });
       }
     }

src/core.ts

@@ -4,7 +4,9 @@ const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
-const isTurboModuleEnabled = global.__turboModuleProxy != null;
+const isTurboModuleEnabled =
+  // @ts-expect-error
+  global.__turboModuleProxy != null;
 
 export const PushyModule = isTurboModuleEnabled
   ? require('./turboModuleSpec').default

src/provider.tsx

@@ -32,8 +32,10 @@ export const PushyProvider = ({
   const { options } = client;
   const stateListener = useRef<NativeEventSubscription>();
   const [updateInfo, setUpdateInfo] = useState<CheckResult>();
+  const updateInfoRef = useRef(updateInfo);
   const [progress, setProgress] = useState<ProgressData>();
   const [lastError, setLastError] = useState<Error>();
+  const lastChecking = useRef(0);
 
   const dismissError = useCallback(() => {
     setLastError(undefined);
@@ -60,37 +62,40 @@ export const PushyProvider = ({
     }
   }, [client, updateInfo]);
 
-  const downloadUpdate = useCallback(async () => {
-    if (!updateInfo || !updateInfo.update) {
-      return;
-    }
-    try {
-      const hash = await client.downloadUpdate(updateInfo, setProgress);
-      if (!hash) {
+  const downloadUpdate = useCallback(
+    async (info: CheckResult | undefined = updateInfoRef.current) => {
+      if (!info || !info.update) {
         return;
       }
-      stateListener.current && stateListener.current.remove();
-      showAlert('提示', '下载完毕，是否立即更新?', [
-        {
-          text: '下次再说',
-          style: 'cancel',
-          onPress: () => {
-            client.switchVersionLater(hash);
+      try {
+        const hash = await client.downloadUpdate(info, setProgress);
+        if (!hash) {
+          return;
+        }
+        stateListener.current && stateListener.current.remove();
+        showAlert('提示', '下载完毕，是否立即更新?', [
+          {
+            text: '下次再说',
+            style: 'cancel',
+            onPress: () => {
+              client.switchVersionLater(hash);
+            },
           },
-        },
-        {
-          text: '立即更新',
-          style: 'default',
-          onPress: () => {
-            client.switchVersion(hash);
+          {
+            text: '立即更新',
+            style: 'default',
+            onPress: () => {
+              client.switchVersion(hash);
+            },
           },
-        },
-      ]);
-    } catch (err) {
-      setLastError(err);
-      showAlert('更新失败', err.message);
-    }
-  }, [client, showAlert, updateInfo]);
+        ]);
+      } catch (e: any) {
+        setLastError(e);
+        showAlert('更新失败', e.message);
+      }
+    },
+    [client, showAlert],
+  );
 
   const downloadAndInstallApk = useCallback(
     async (downloadUrl: string) => {
@@ -102,14 +107,20 @@ export const PushyProvider = ({
   );
 
   const checkUpdate = useCallback(async () => {
+    const now = Date.now();
+    if (lastChecking.current && now - lastChecking.current < 1000) {
+      return;
+    }
+    lastChecking.current = now;
     let info: CheckResult;
     try {
       info = await client.checkUpdate();
-    } catch (err) {
-      setLastError(err);
-      showAlert('更新检查失败', err.message);
+    } catch (e: any) {
+      setLastError(e);
+      showAlert('更新检查失败', e.message);
       return;
     }
+    updateInfoRef.current = info;
     setUpdateInfo(info);
     if (info.expired) {
       const { downloadUrl } = info;
@@ -148,6 +159,10 @@ export const PushyProvider = ({
   const markSuccess = client.markSuccess;
 
   useEffect(() => {
+    if (__DEV__) {
+      console.info('检测到在DEV环境，不会进行热更新检查');
+      return;
+    }
     const { strategy, dismissErrorAfter, autoMarkSuccess } = options;
     if (isFirstTime && autoMarkSuccess) {
       markSuccess();
@@ -155,7 +170,7 @@ export const PushyProvider = ({
     if (strategy === 'both' || strategy === 'onAppResume') {
       stateListener.current = AppState.addEventListener(
         'change',
-        (nextAppState) => {
+        nextAppState => {
           if (nextAppState === 'active') {
             checkUpdate();
           }
@@ -194,8 +209,7 @@ export const PushyProvider = ({
         progress,
         downloadAndInstallApk,
         getCurrentVersionInfo,
-      }}
-    >
+      }}>
       {children}
     </PushyContext.Provider>
   );

src/utils.ts

@@ -9,10 +9,12 @@ export function assertRelease() {
 }
 
 const ping = async (url: string) =>
-  fetch(url, {
-    method: 'HEAD',
-    redirect: 'follow',
-  }).then(({ status }) => status === 200);
+  Promise.race([
+    fetch(url, {
+      method: 'HEAD',
+    }).then(({ status }) => status === 200),
+    new Promise<false>(r => setTimeout(() => r(false), 2000)),
+  ]);
 
 const canUseGoogle = ping('https://www.google.com');
 
@@ -20,7 +22,7 @@ export const testUrls = async (urls?: string[]) => {
   if (!urls?.length || (await canUseGoogle)) {
     return null;
   }
-  return Promise.race(urls.map((url) => ping(url).then(() => url))).catch(
+  return Promise.race(urls.map(url => ping(url).then(() => url))).catch(
     () => null,
   );
 };

tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "@react-native/typescript-config/tsconfig.json",
+  "include": ["src/**/*"]
+}