v10.5.2

android/src/main/java/cn/reactnative/modules/update/UpdateContext.java

@@ -69,13 +69,6 @@ public class UpdateContext {
         return context.getString(R.string.pushy_build_time);
     }
 
-    public Map getBlockUpdate() {
-        return new HashMap<String, Object>() {{
-            put("until", sp.getInt("blockUntil", 0));
-            put("reason", sp.getString("blockReason", null));
-        }};
-    }
-
     public boolean getIsUsingBundleUrl() {
         return isUsingBundleUrl;
     }

android/src/newarch/cn/reactnative/modules/update/UpdateModule.java

@@ -45,7 +45,6 @@ public class UpdateModule extends NativePushySpec {
         if (rolledBackVersion != null) {
             updateContext.clearRollbackMark();
         }
-        constants.put("blockUpdate", updateContext.getBlockUpdate());
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
     }

android/src/oldarch/cn/reactnative/modules/update/UpdateModule.java

@@ -59,7 +59,6 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         if (rolledBackVersion != null) {
             updateContext.clearRollbackMark();
         }
-        constants.put("blockUpdate", updateContext.getBlockUpdate());
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
     }

ios/RCTPushy/RCTPushy.mm

@@ -16,7 +16,6 @@ static NSString *const paramLastVersion = @"lastVersion";
 static NSString *const paramCurrentVersion = @"currentVersion";
 static NSString *const paramIsFirstTime = @"isFirstTime";
 static NSString *const paramIsFirstLoadOk = @"isFirstLoadOK";
-static NSString *const keyBlockUpdate = @"REACTNATIVECN_PUSHY_BLOCKUPDATE";
 static NSString *const keyUuid = @"REACTNATIVECN_PUSHY_UUID";
 static NSString *const keyHashInfo = @"REACTNATIVECN_PUSHY_HASH_";
 static NSString *const keyFirstLoadMarked = @"REACTNATIVECN_PUSHY_FIRSTLOADMARKED_KEY";
@@ -157,7 +156,6 @@ RCT_EXPORT_MODULE(RCTPushy);
     ret[@"buildTime"] = [RCTPushy buildTime];
     ret[@"rolledBackVersion"] = [defaults objectForKey:keyRolledBackMarked];
     ret[@"isFirstTime"] = [defaults objectForKey:keyFirstLoadMarked];
-    ret[@"blockUpdate"] = [defaults objectForKey:keyBlockUpdate];
     ret[@"uuid"] = [defaults objectForKey:keyUuid];
     NSDictionary *pushyInfo = [defaults dictionaryForKey:keyPushyInfo];
     ret[@"currentVersion"] = [pushyInfo objectForKey:paramCurrentVersion];

package.json

@@ -1,8 +1,8 @@
 {
   "name": "react-native-update",
-  "version": "10.3.0",
+  "version": "10.5.2",
   "description": "react-native hot update",
-  "main": "src/index.ts",
+  "main": "src/index",
   "scripts": {
     "prepack": "yarn submodule && yarn lint",
     "lint": "eslint \"src/*.@(ts|tsx|js|jsx)\" && tsc --noEmit",

src/client.ts

@@ -1,10 +1,7 @@
 import { CheckResult, PushyOptions, ProgressData, EventType } from './type';
-import { assertRelease, log, testUrls } from './utils';
-import {
-  EmitterSubscription,
-  PermissionsAndroid,
-  Platform,
-} from 'react-native';
+import { log, testUrls } from './utils';
+import { EmitterSubscription, Platform } from 'react-native';
+import type { PermissionsAndroidStatic } from 'react-native';
 import {
   PushyModule,
   buildTime,
@@ -27,6 +24,10 @@ const defaultServer = {
 const empty = {};
 const noop = () => {};
 
+if (Platform.OS === 'web') {
+  console.warn('react-native-update 不支持 web 端热更，不会执行操作');
+}
+
 export class Pushy {
   options: PushyOptions = {
     appKey: '',
@@ -35,6 +36,7 @@ export class Pushy {
     useAlert: true,
     strategy: 'both',
     logger: noop,
+    debug: false,
   };
 
   lastChecking?: number;
@@ -112,8 +114,7 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    assertRelease();
-    if (this.marked) {
+    if (this.marked || __DEV__) {
       return;
     }
     this.marked = true;
@@ -121,7 +122,12 @@ export class Pushy {
     this.report({ type: 'markSuccess' });
   };
   switchVersion = (hash: string) => {
-    assertRelease();
+    if (__DEV__) {
+      console.warn(
+        '您调用了switchVersion方法，但是当前是开发环境，不会进行任何操作。',
+      );
+      return;
+    }
     if (this.assertHash(hash) && !this.applyingUpdate) {
       log('switchVersion: ' + hash);
       this.applyingUpdate = true;
@@ -130,14 +136,28 @@ export class Pushy {
   };
 
   switchVersionLater = (hash: string) => {
-    assertRelease();
+    if (__DEV__) {
+      console.warn(
+        '您调用了switchVersionLater方法，但是当前是开发环境，不会进行任何操作。',
+      );
+      return;
+    }
     if (this.assertHash(hash)) {
       log('switchVersionLater: ' + hash);
       PushyModule.setNeedUpdate({ hash });
     }
   };
   checkUpdate = async () => {
-    assertRelease();
+    if (__DEV__ && !this.options.debug) {
+      console.info(
+        '您当前处于开发环境且未启用 debug，不会进行热更检查。如需在开发环境中调试热更，请在 client 中设置 debug 为 true',
+      );
+      return;
+    }
+    if (Platform.OS === 'web') {
+      console.warn('web 端不支持热更新检查');
+      return;
+    }
     const now = Date.now();
     if (
       this.lastRespJson &&
@@ -148,18 +168,22 @@ export class Pushy {
     }
     this.lastChecking = now;
     this.report({ type: 'checking' });
+    const fetchBody = {
+      packageVersion,
+      hash: currentVersion,
+      buildTime,
+      cInfo,
+    };
+    if (__DEV__) {
+      delete fetchBody.buildTime;
+    }
     const fetchPayload = {
       method: 'POST',
       headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({
-        packageVersion,
-        hash: currentVersion,
-        buildTime,
-        cInfo,
-      }),
+      body: JSON.stringify(fetchBody),
     };
     let resp;
     try {
@@ -225,7 +249,6 @@ export class Pushy {
     info: CheckResult,
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
-    assertRelease();
     const {
       hash,
       diffUrl: _diffUrl,
@@ -275,7 +298,11 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
-        log(`diff error: ${e.message}, try pdiff`);
+        if (__DEV__) {
+          succeeded = true;
+        } else {
+          log(`diff error: ${e.message}, try pdiff`);
+        }
       }
     }
     const pdiffUrl = (await testUrls(pdiffUrls)) || _pdiffUrl;
@@ -288,7 +315,11 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
-        log(`pdiff error: ${e.message}, try full patch`);
+        if (__DEV__) {
+          succeeded = true;
+        } else {
+          log(`pdiff error: ${e.message}, try full patch`);
+        }
       }
     }
     const updateUrl = (await testUrls(updateUrls)) || _updateUrl;
@@ -301,13 +332,20 @@ export class Pushy {
         });
         succeeded = true;
       } catch (e: any) {
-        log(`full patch error: ${e.message}`);
+        if (__DEV__) {
+          succeeded = true;
+        } else {
+          log(`full patch error: ${e.message}`);
+        }
       }
     }
     if (this.progressHandlers[hash]) {
       this.progressHandlers[hash].remove();
       delete this.progressHandlers[hash];
     }
+    if (__DEV__) {
+      return hash;
+    }
     if (!succeeded) {
       return this.report({
         type: 'errorUpdate',
@@ -333,6 +371,8 @@ export class Pushy {
     this.report({ type: 'downloadingApk' });
     if (Platform.Version <= 23) {
       try {
+        const PermissionsAndroid =
+          require('react-native/Libraries/PermissionsAndroid/PermissionsAndroid') as PermissionsAndroidStatic;
         const granted = await PermissionsAndroid.request(
           PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
         );

src/client.web.js

@@ -1,13 +0,0 @@
-const noop = () => {};
-export class Pushy {
-  constructor() {
-    console.warn(
-      'react-native-update is not supported and will do nothing on web.',
-    );
-    return new Proxy(this, {
-      get() {
-        return noop;
-      },
-    });
-  }
-}

src/core.ts

@@ -8,9 +8,23 @@ const isTurboModuleEnabled =
   // @ts-expect-error
   global.__turboModuleProxy != null;
 
-export const PushyModule = isTurboModuleEnabled
-  ? require('./NativePushy').default
-  : NativeModules.Pushy;
+const noop = () => {};
+class EmptyModule {
+  constructor() {
+    return new Proxy(this, {
+      get() {
+        return noop;
+      },
+    });
+  }
+}
+
+export const PushyModule =
+  Platform.OS === 'web'
+    ? new EmptyModule()
+    : isTurboModuleEnabled
+    ? require('./NativePushy').default
+    : NativeModules.Pushy;
 
 if (!PushyModule) {
   throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');

src/provider.tsx

@@ -124,20 +124,20 @@ export const PushyProvider = ({
     setUpdateInfo(info);
     if (info.expired) {
       const { downloadUrl } = info;
-      showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
-        {
-          text: '更新',
-          onPress: () => {
-            if (downloadUrl) {
+      if (downloadUrl) {
+        showAlert('提示', '您的应用版本已更新，点击更新下载安装新版本', [
+          {
+            text: '更新',
+            onPress: () => {
               if (Platform.OS === 'android' && downloadUrl.endsWith('.apk')) {
                 downloadAndInstallApk(downloadUrl);
               } else {
                 Linking.openURL(downloadUrl);
               }
-            }
+            },
           },
-        },
-      ]);
+        ]);
+      }
     } else if (info.update) {
       showAlert(
         '提示',
@@ -159,8 +159,10 @@ export const PushyProvider = ({
   const markSuccess = client.markSuccess;
 
   useEffect(() => {
-    if (__DEV__) {
-      console.info('检测到在DEV环境，不会进行热更新检查');
+    if (__DEV__ && !options.debug) {
+      console.info(
+        '您当前处于开发环境且未启用debug，不会进行热更检查。如需在开发环境中调试热更，请在client中设置debug为true',
+      );
       return;
     }
     const { strategy, dismissErrorAfter, autoMarkSuccess } = options;

src/provider.web.js

@@ -1,2 +0,0 @@
-import { Fragment } from 'react';
-export const PushyProvider = Fragment;

src/type.ts

@@ -70,7 +70,8 @@ export interface PushyOptions {
   server?: PushyServerConfig;
   logger?: UpdateEventsLogger;
   useAlert?: boolean;
-  strategy?: 'onAppStart' | 'onAppResume' | 'both';
+  strategy?: 'onAppStart' | 'onAppResume' | 'both' | null;
   autoMarkSuccess?: boolean;
   dismissErrorAfter?: number;
+  debug?: boolean;
 }

src/utils.ts

@@ -1,20 +1,18 @@
+import { Platform } from 'react-native';
 export function log(...args: any[]) {
   console.log('pushy: ', ...args);
 }
 
-export function assertRelease() {
-  if (__DEV__) {
-    throw new Error('react-native-update 只能在 RELEASE 版本中运行.');
-  }
-}
-
-const ping = async (url: string) =>
-  Promise.race([
-    fetch(url, {
-      method: 'HEAD',
-    }).then(({ status }) => status === 200),
-    new Promise<false>(r => setTimeout(() => r(false), 2000)),
-  ]);
+const ping =
+  Platform.OS === 'web'
+    ? () => Promise.resolve(true)
+    : async (url: string) =>
+        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');