v10.4.0

.npmignore

@@ -47,4 +47,6 @@ Example
 yarn.lock
 
 domains.json
-endpoints.json
+endpoints.json
+
+tea.yaml

Example/testHotUpdate/e2e/NativeModule.test.ts

@@ -28,14 +28,7 @@ describe('测试Native模块的方法', () => {
     await element(by.id('done')).longPress();
     await expect(element(by.id('done'))).toBeNotVisible();
   });
-
-  it('setBlockUpdate', async () => {
-    await element(by.id('setBlockUpdate')).longPress();
-    await element(by.id('submit')).longPress();
-    await expect(element(by.text('done'))).toBeVisible();
-    await element(by.id('done')).longPress();
-    await expect(element(by.id('done'))).toBeNotVisible();
-  });
+  
   if (device.getPlatform() === 'android') {
     it('reloadUpdate', async () => {
       await element(by.id('reloadUpdate')).longPress();

Example/testHotUpdate/src/TestConsole.js

@@ -66,13 +66,6 @@ export default function TestConsole({visible}) {
           setText(`setUuid\n${UUID}`);
         },
       },
-      {
-        name: 'setBlockUpdate',
-        invoke: () => {
-          setText('setBlockUpdate');
-          setOptions({reason: 'application has been block', until: 1673082950});
-        },
-      },
       {
         name: 'reloadUpdate',
         invoke: () => {

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;
     }
@@ -166,13 +159,6 @@ public class UpdateContext {
         return sp.getString(key, null);
     }
 
-    public void setBlockUpdate(int until, String reason) {
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putInt("blockUntil", until);
-        editor.putString("blockReason", reason);
-        editor.apply();
-    }
-
     public String getCurrentVersion() {
         return sp.getString("currentVersion", null);
     }

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

@@ -192,23 +192,6 @@ public class UpdateModuleImpl {
         }
     }
 
-    public static void setBlockUpdate(UpdateContext updateContext, ReadableMap options,Promise promise) {
-        try {
-            final int until = options.getInt("until");
-            final String reason = options.getString("reason");
-            UiThreadUtil.runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    updateContext.setBlockUpdate(until, reason);
-                }
-            });
-            promise.resolve(true);
-        }catch (Exception e){
-            promise.reject("执行报错:"+e.getMessage());
-        }
-
-    }
-
     public static void setUuid(UpdateContext updateContext, String uuid, Promise promise) {
         try {
             UiThreadUtil.runOnUiThread(new Runnable() {

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

@@ -14,7 +14,7 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-public class UpdateModule extends NativeUpdateSpec {
+public class UpdateModule extends NativePushySpec {
     UpdateContext updateContext;
     public static ReactApplicationContext mContext;
     public UpdateModule(ReactApplicationContext reactContext, UpdateContext updateContext) {
@@ -45,7 +45,6 @@ public class UpdateModule extends NativeUpdateSpec {
         if (rolledBackVersion != null) {
             updateContext.clearRollbackMark();
         }
-        constants.put("blockUpdate", updateContext.getBlockUpdate());
         constants.put("uuid", updateContext.getKv("uuid"));
         return constants;
     }
@@ -108,11 +107,6 @@ public class UpdateModule extends NativeUpdateSpec {
         UpdateModuleImpl.markSuccess(updateContext,promise);
     }
 
-    @Override
-    public void setBlockUpdate(ReadableMap options,Promise promise) {
-        UpdateModuleImpl.setBlockUpdate(updateContext,options,promise);
-    }
-
     @Override
     public void setUuid(final String uuid, Promise promise) {
         UpdateModuleImpl.setUuid(updateContext,uuid,promise);

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;
     }
@@ -239,18 +238,6 @@ public class UpdateModule extends ReactContextBaseJavaModule {
         });
     }
 
-    @ReactMethod
-    public void setBlockUpdate(ReadableMap options) {
-        final int until = options.getInt("until");
-        final String reason = options.getString("reason");
-        UiThreadUtil.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                updateContext.setBlockUpdate(until, reason);
-            }
-        });
-    }
-
     @ReactMethod
     public void setUuid(final String uuid) {
         UiThreadUtil.runOnUiThread(new Runnable() {

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];
@@ -192,24 +190,6 @@ RCT_EXPORT_MODULE(RCTPushy);
     return self;
 }
 
-RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options
-                  resolver:(RCTPromiseResolveBlock)resolve
-                                    rejecter:(RCTPromiseRejectBlock)reject)
-{
-    // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new];
-    // blockUpdateInfo[@"reason"] = options[@"reason"];
-    // blockUpdateInfo[@"until"] = options[@"until"];
-    @try {
-        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        [defaults setObject:options forKey:keyBlockUpdate];
-        [defaults synchronize];
-        resolve(@true);
-    }
-    @catch (NSException *exception) {
-        reject(@"执行报错", nil, nil);
-    }
-}
-
 RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.3.0-beta.0",
+  "version": "10.4.0",
   "description": "react-native hot update",
   "main": "src/index.ts",
   "scripts": {
@@ -48,13 +48,9 @@
     "nanoid": "^3.3.3"
   },
   "codegenConfig": {
-    "libraries": [
-      {
-        "name": "RCTPushySpec",
-        "type": "modules",
-        "jsSrcsDir": "src"
-      }
-    ]
+    "name": "RCTPushySpec",
+    "type": "modules",
+    "jsSrcsDir": "src"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",

src/NativePushy.ts

@@ -1,5 +1,4 @@
-import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
-import { TurboModuleRegistry } from 'react-native';
+import { TurboModule, TurboModuleRegistry } from 'react-native';
 
 export interface Spec extends TurboModule {
   getConstants: () => {

src/client.tsx

@@ -1,5 +1,5 @@
 import { CheckResult, PushyOptions, ProgressData, EventType } from './type';
-import { assertRelease, log, testUrls } from './utils';
+import { log, testUrls } from './utils';
 import {
   EmitterSubscription,
   PermissionsAndroid,
@@ -112,8 +112,7 @@ export class Pushy {
     return true;
   };
   markSuccess = () => {
-    assertRelease();
-    if (this.marked) {
+    if (this.marked || __DEV__) {
       return;
     }
     this.marked = true;
@@ -121,7 +120,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 +134,18 @@ 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();
     const now = Date.now();
     if (
       this.lastRespJson &&
@@ -148,18 +156,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 +237,6 @@ export class Pushy {
     info: CheckResult,
     onDownloadProgress?: (data: ProgressData) => void,
   ) => {
-    assertRelease();
     const {
       hash,
       diffUrl: _diffUrl,
@@ -275,7 +286,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 +303,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 +320,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',

src/core.ts

@@ -9,7 +9,7 @@ const isTurboModuleEnabled =
   global.__turboModuleProxy != null;
 
 export const PushyModule = isTurboModuleEnabled
-  ? require('./turboModuleSpec').default
+  ? require('./NativePushy').default
   : NativeModules.Pushy;
 
 if (!PushyModule) {

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(
         '提示',

src/type.ts

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

src/utils.ts

@@ -2,12 +2,6 @@ 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, {