react-native-update 8.1.0 → 9.0.0-beta.0

package/e2e/starter.test.js

@@ -0,0 +1,23 @@
+describe('Example', () => {
+  beforeAll(async () => {
+    await device.launchApp();
+  });
+
+  beforeEach(async () => {
+    await device.reloadReactNative();
+  });
+
+  it('should have welcome screen', async () => {
+    await expect(element(by.id('welcome'))).toBeVisible();
+  });
+
+  it('should show hello screen after tap', async () => {
+    await element(by.id('hello_button')).tap();
+    await expect(element(by.text('Hello!!!'))).toBeVisible();
+  });
+
+  it('should show world screen after tap', async () => {
+    await element(by.id('world_button')).tap();
+    await expect(element(by.text('World!!!'))).toBeVisible();
+  });
+});

package/ios/RCTPushy/{RCTPushy.m → RCTPushy.mm}

@@ -1,7 +1,10 @@
 #import "RCTPushy.h"
 #import "RCTPushyDownloader.h"
 #import "RCTPushyManager.h"
-
+// Thanks to this guard, we won't import this header when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+#import "RCTPushySpec.h"
+#endif
 
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
@@ -189,29 +192,53 @@ RCT_EXPORT_MODULE(RCTPushy);
     return self;
 }
 
-RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(setBlockUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
     // NSMutableDictionary *blockUpdateInfo = [NSMutableDictionary new];
     // blockUpdateInfo[@"reason"] = options[@"reason"];
     // blockUpdateInfo[@"until"] = options[@"until"];
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:options forKey:keyBlockUpdate];
-    [defaults synchronize];
+    @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)
+RCT_EXPORT_METHOD(setUuid:(NSString *)uuid  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:uuid forKey:keyUuid];
-    [defaults synchronize];
+    @try {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:uuid forKey:keyUuid];
+        [defaults synchronize];
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"json格式校验报错", nil, nil);
+    }
 }
 
 RCT_EXPORT_METHOD(setLocalHashInfo:(NSString *)hash
-                  value:(NSString *)value)
+                  value:(NSString *)value resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    [defaults setObject:value forKey:[keyHashInfo stringByAppendingString:hash]];
-    [defaults synchronize];
+    NSData *data = [value dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *error = nil;
+    id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+    if (object && [object isKindOfClass:[NSDictionary class]]) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:value forKey:[keyHashInfo stringByAppendingString:hash]];
+        [defaults synchronize];
+        resolve(@true);
+    } else {
+        reject(@"json格式校验报错", nil, nil);
+    }
 }
 
 
@@ -266,7 +293,9 @@ RCT_EXPORT_METHOD(downloadPatchFromPpk:(NSDictionary *)options
     }];
 }
 
-RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString *hash = options[@"hash"];
     
@@ -287,45 +316,66 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options)
         [defaults setObject:newInfo forKey:keyPushyInfo];
         
         [defaults synchronize];
+        resolve(@true);
+    }else{
+        reject(@"执行报错", nil, nil);
     }
 }
 
-RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options)
+RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSString *hash = options[@"hash"];
-
-    if (hash.length) {
-        [self setNeedUpdate:options];
-        
-        // reload 0.62+
-        // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-        // RCTTriggerReloadCommandListeners(@"pushy reload");
-        
-       dispatch_async(dispatch_get_main_queue(), ^{
-           [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-           [self.bridge reload];
-       });
+    @try {
+        NSString *hash = options[@"hash"];
+        if (hash.length) {
+            [self setNeedUpdate:options resolver:resolve rejecter:reject];
+            
+            // reload 0.62+
+            // RCTReloadCommandSetBundleURL([[self class] bundleURL]);
+            // RCTTriggerReloadCommandListeners(@"pushy reload");
+            
+           dispatch_async(dispatch_get_main_queue(), ^{
+               [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
+               [self.bridge reload];
+           });
+            resolve(@true);
+        }else{
+            reject(@"执行报错", nil, nil);
+        }
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", nil, nil);
     }
 }
 
-RCT_EXPORT_METHOD(markSuccess)
+RCT_EXPORT_METHOD(markSuccess:
+                  resolver:(RCTPromiseResolveBlock)resolve
+                                    rejecter:(RCTPromiseRejectBlock)reject)
 {
-    // up package info
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSMutableDictionary *pushyInfo = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:keyPushyInfo]];
-    [pushyInfo setObject:@(NO) forKey:paramIsFirstTime];
-    [pushyInfo setObject:@(YES) forKey:paramIsFirstLoadOk];
     
-    NSString *lastVersion = pushyInfo[paramLastVersion];
-    NSString *curVersion = pushyInfo[paramCurrentVersion];
-    if (lastVersion != nil && ![lastVersion isEqualToString:curVersion]) {
-        [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
+    @try {
+        // up package info
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        NSMutableDictionary *pushyInfo = [[NSMutableDictionary alloc] initWithDictionary:[defaults objectForKey:keyPushyInfo]];
+        [pushyInfo setObject:@(NO) forKey:paramIsFirstTime];
+        [pushyInfo setObject:@(YES) forKey:paramIsFirstLoadOk];
+        
+        NSString *lastVersion = pushyInfo[paramLastVersion];
+        NSString *curVersion = pushyInfo[paramCurrentVersion];
+        if (lastVersion != nil && ![lastVersion isEqualToString:curVersion]) {
+            [pushyInfo removeObjectForKey:[keyHashInfo stringByAppendingString:lastVersion]];
+        }
+        [defaults setObject:pushyInfo forKey:keyPushyInfo];
+        [defaults synchronize];
+        
+        // clear other package dir
+        [self clearInvalidFiles];
+        resolve(@true);
+    }
+    @catch (NSException *exception) {
+        reject(@"执行报错", nil, nil);
     }
-    [defaults setObject:pushyInfo forKey:keyPushyInfo];
-    [defaults synchronize];
-    
-    // clear other package dir
-    [self clearInvalidFiles];
 }
 
 
@@ -351,6 +401,19 @@ RCT_EXPORT_METHOD(markSuccess)
     // Remove upstream listeners, stop unnecessary background tasks
 }
 
+- (BOOL) isBlankString:(NSString *)string {
+    if (string == nil || string == NULL) {
+        return YES;
+    }
+    if ([string isKindOfClass:[NSNull class]]) {
+        return YES;
+    }
+    if ([[string stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length]==0) {
+        return YES;
+    }
+    return NO;
+}
+
 
 - (void)doPushy:(PushyType)type options:(NSDictionary *)options callback:(void (^)(NSError *error))callback
 {
@@ -362,7 +425,7 @@ RCT_EXPORT_METHOD(markSuccess)
         return;
     }
     NSString *originHash = [RCTConvert NSString:options[@"originHash"]];
-    if (type == PushyTypePatchFromPpk && originHash <= 0) {
+    if (type == PushyTypePatchFromPpk && [self isBlankString:originHash]) {
         callback([self errorWithMessage:ERROR_OPTIONS]);
         return;
     }
@@ -562,4 +625,13 @@ RCT_EXPORT_METHOD(markSuccess)
 #endif
 }
 
+// Thanks to this guard, we won't compile this code when we build for the old architecture.
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeUpdateSpecJSI>(params);
+}
+#endif
+
 @end

package/ios/pushy_build_time.txt

@@ -1 +1 @@
-1654072539
+1680488830

package/lib/NativeUpdate.js

@@ -0,0 +1,51 @@
+/**
+ * @format
+ * @flow strict-local
+ */
+'use strict';
+
+import type { TurboModule } from 'react-native/Libraries/TurboModule/RCTExport';
+import { TurboModuleRegistry } from 'react-native';
+
+export interface Spec extends TurboModule {
+  getConstants: () => {
+    downloadRootDir: string,
+    packageVersion: string,
+    currentVersion: string,
+    isFirstTime: boolean,
+    rolledBackVersion: string,
+    buildTime: string,
+    blockUpdate: Object,
+    uuid: string,
+    isUsingBundleUrl: boolean,
+  };
+  setLocalHashInfo(hash: string, info: string): Promise<void>;
+  getLocalHashInfo(hash: string): Promise<string>;
+  setUuid(uuid: string): Promise<void>;
+  setBlockUpdate(options: { reason: string, until: number }): Promise<void>;
+  reloadUpdate(options: { hash: string }): Promise<void>;
+  setNeedUpdate(options: { hash: string }): Promise<void>;
+  markSuccess(): Promise<void>;
+  downloadPatchFromPpk(options: {
+    updateUrl: string,
+    hash: string,
+    originHash: string,
+  }): Promise<void>;
+  downloadPatchFromPackage(options: {
+    updateUrl: string,
+    hash: string,
+  }): Promise<void>;
+  downloadFullUpdate(options: {
+    updateUrl: string,
+    hash: string,
+  }): Promise<void>;
+  downloadAndInstallApk(options: {
+    url: string,
+    target: string,
+    hash: string,
+  }): Promise<void>;
+  addListener(eventName: string): void;
+  removeListeners(count: number): void;
+}
+
+export default (TurboModuleRegistry.get<Spec>('Pushy'): ?Spec);

package/lib/main.js

@@ -15,47 +15,53 @@ const {
   version: v,
 } = require('react-native/Libraries/Core/ReactNativeVersion');
 const RNVersion = `${v.major}.${v.minor}.${v.patch}`;
+const isTurboModuleEnabled = global.__turboModuleProxy != null;
 
-let Pushy = NativeModules.Pushy;
+export const PushyModule = isTurboModuleEnabled
+  ? require('./NativeUpdate').default
+  : NativeModules.Pushy;
 
-if (!Pushy) {
+if (!PushyModule) {
   throw new Error('react-native-update模块无法加载，请对照安装文档检查配置。');
 }
+const PushyConstants = isTurboModuleEnabled
+  ? PushyModule.getConstants()
+  : PushyModule;
 
-export const downloadRootDir = Pushy.downloadRootDir;
-export const packageVersion = Pushy.packageVersion;
-export const currentVersion = Pushy.currentVersion;
-export const isFirstTime = Pushy.isFirstTime;
-const rolledBackVersion = Pushy.rolledBackVersion;
+export const downloadRootDir = PushyConstants.downloadRootDir;
+export const packageVersion = PushyConstants.packageVersion;
+export const currentVersion = PushyConstants.currentVersion;
+export const isFirstTime = PushyConstants.isFirstTime;
+const rolledBackVersion = PushyConstants.rolledBackVersion;
 export const isRolledBack = typeof rolledBackVersion === 'string';
 
-export const buildTime = Pushy.buildTime;
-let blockUpdate = Pushy.blockUpdate;
-let uuid = Pushy.uuid;
+export const buildTime = PushyConstants.buildTime;
+let blockUpdate = PushyConstants.blockUpdate;
+let uuid = PushyConstants.uuid;
 
-if (Platform.OS === 'android' && !Pushy.isUsingBundleUrl) {
+if (Platform.OS === 'android' && !PushyConstants.isUsingBundleUrl) {
   throw new Error(
     'react-native-update模块无法加载，请对照文档检查Bundle URL的配置',
   );
 }
 
 function setLocalHashInfo(hash, info) {
-  Pushy.setLocalHashInfo(hash, JSON.stringify(info));
+  PushyModule.setLocalHashInfo(hash, JSON.stringify(info));
 }
 
 async function getLocalHashInfo(hash) {
-  return JSON.parse(await Pushy.getLocalHashInfo(hash));
+  return JSON.parse(await PushyModule.getLocalHashInfo(hash));
 }
 
 export async function getCurrentVersionInfo() {
   return currentVersion ? (await getLocalHashInfo(currentVersion)) || {} : {};
 }
 
-const eventEmitter = new NativeEventEmitter(Pushy);
+const eventEmitter = new NativeEventEmitter(PushyModule);
 
 if (!uuid) {
   uuid = require('nanoid/non-secure').nanoid();
-  Pushy.setUuid(uuid);
+  PushyModule.setUuid(uuid);
 }
 
 function logger(text) {
@@ -163,7 +169,7 @@ function checkOperation(op) {
         reason: action.reason,
         until: Math.round((Date.now() + action.duration) / 1000),
       };
-      Pushy.setBlockUpdate(blockUpdate);
+      PushyModule.setBlockUpdate(blockUpdate);
     }
   });
 }
@@ -209,7 +215,7 @@ export async function downloadUpdate(options, eventListeners) {
   if (options.diffUrl) {
     logger('downloading diff');
     try {
-      await Pushy.downloadPatchFromPpk({
+      await PushyModule.downloadPatchFromPpk({
         updateUrl: options.diffUrl,
         hash: options.hash,
         originHash: currentVersion,
@@ -222,7 +228,7 @@ export async function downloadUpdate(options, eventListeners) {
   if (!succeeded && options.pdiffUrl) {
     logger('downloading pdiff');
     try {
-      await Pushy.downloadPatchFromPackage({
+      await PushyModule.downloadPatchFromPackage({
         updateUrl: options.pdiffUrl,
         hash: options.hash,
       });
@@ -234,7 +240,7 @@ export async function downloadUpdate(options, eventListeners) {
   if (!succeeded && options.updateUrl) {
     logger('downloading full patch');
     try {
-      await Pushy.downloadFullUpdate({
+      await PushyModule.downloadFullUpdate({
         updateUrl: options.updateUrl,
         hash: options.hash,
       });
@@ -273,7 +279,7 @@ export function switchVersion(hash) {
   assertRelease();
   if (assertHash(hash)) {
     logger('switchVersion: ' + hash);
-    Pushy.reloadUpdate({ hash });
+    PushyModule.reloadUpdate({ hash });
   }
 }
 
@@ -281,7 +287,7 @@ export function switchVersionLater(hash) {
   assertRelease();
   if (assertHash(hash)) {
     logger('switchVersionLater: ' + hash);
-    Pushy.setNeedUpdate({ hash });
+    PushyModule.setNeedUpdate({ hash });
   }
 }
 
@@ -293,7 +299,7 @@ export function markSuccess() {
     return;
   }
   marked = true;
-  Pushy.markSuccess();
+  PushyModule.markSuccess();
   report(currentVersion, 'success');
 }
 
@@ -323,7 +329,7 @@ export async function downloadAndInstallApk({ url, onDownloadProgress }) {
       },
     );
   }
-  await Pushy.downloadAndInstallApk({
+  await PushyModule.downloadAndInstallApk({
     url,
     target: 'update.apk',
     hash,

package/package.json

@@ -1,13 +1,27 @@
 {
   "name": "react-native-update",
-  "version": "8.1.0",
+  "version": "9.0.0-beta.0",
   "description": "react-native hot update",
   "main": "lib/index.js",
   "scripts": {
     "prepublish": "yarn submodule",
     "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"
+    "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",
+    "build:ios-debug": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.debug",
+    "build:ios-release": "cd Example/testHotUpdate && yarn && detox build --configuration ios.sim.release",
+    "test:ios-debug": "cd Example/testHotUpdate && detox test --configuration ios.sim.debug",
+    "test:ios-release": "cd Example/testHotUpdate && yarn detox test --configuration ios.sim.release",
+    "build:android-debug": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.debug",
+    "build:android-release": "cd Example/testHotUpdate && yarn && detox build --configuration android.emu.release",
+    "test:android-release": "cd Example/testHotUpdate && yarn detox test --configuration android.emu.release --headless --record-logs all",
+    "test:android-debug": "cd Example/testHotUpdate && detox test --configuration android.emu.debug --headless --record-logs all",
+    "e2e:ios": "npm run build:ios-release && npm run test:ios-release",
+    "e2e:android": "npm run build:android-release && npm run test:android-release",
+    "tests:emulator:prepare": "cd .github/workflows/scripts/functions && yarn && yarn build",
+    "tests:emulator:start-ci": "yarn tests:emulator:prepare && cd ./.github/workflows/scripts && ./start-firebase-emulator.sh",
+    "tests:packager:jet-ci": "cd Example/testHotUpdate && cross-env TMPDIR=$HOME/.metro REACT_DEBUGGER=\"echo nope\" node_modules/.bin/react-native start --no-interactive",
+    "tests:ios:pod:install": "cd Example/testHotUpdate && yarn && yarn pod-install"
   },
   "repository": {
     "type": "git",
@@ -30,5 +44,25 @@
   "homepage": "https://github.com/reactnativecn/react-native-pushy#readme",
   "dependencies": {
     "nanoid": "^3.3.3"
+  },
+  "codegenConfig": {
+    "libraries": [
+      {
+        "name": "RCTPushySpec",
+        "type": "modules",
+        "jsSrcsDir": "lib"
+      }
+    ]
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^9.0.13",
+    "@types/jest": "^29.2.1",
+    "detox": "^20.5.0",
+    "firebase-tools": "^11.24.1",
+    "fs-extra": "^9.1.0",
+    "jest": "^29.2.1",
+    "pod-install": "^0.1.37",
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.1.3"
   }
 }

package/react-native-update.podspec

@@ -1,7 +1,8 @@
 require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
+folly_version = '2021.06.28.00-v2'
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 Pod::Spec.new do |s|
   s.name         = package['name']
   s.version      = package['version']
@@ -13,7 +14,9 @@ Pod::Spec.new do |s|
 
   s.cocoapods_version = '>= 1.6.0'
   s.platform = :ios, "8.0"
+  s.platforms = { :ios => "11.0" }
   s.source = { :git => 'https://github.com/reactnativecn/react-native-pushy.git', :tag => '#{s.version}' }
+  s.source_files    = "ios/**/*.{h,m,mm,swift}"
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 'USER_HEADER_SEARCH_PATHS' => '"$(SRCROOT)/../node_modules/react-native-update/ios"' }
@@ -21,10 +24,11 @@ Pod::Spec.new do |s|
   s.script_phase = { :name => 'Generate build time', :script => 'set -x;date +%s > ${PODS_ROOT}/../../node_modules/react-native-update/ios/pushy_build_time.txt', :execution_position => :before_compile }
 
   s.dependency 'React'
+  s.dependency "React-Core"
   s.dependency 'SSZipArchive'
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = 'ios/RCTPushy/*.{h,m}'
+    ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
     ss.public_header_files = ['ios/RCTPushy/RCTPushy.h']
   end
   
@@ -37,4 +41,18 @@ Pod::Spec.new do |s|
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
     ss.private_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
   end
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+  s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+  s.pod_target_xcconfig    = {
+      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+  }
+
+  s.dependency "React-Codegen"
+  s.dependency "RCT-Folly", folly_version
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency "ReactCommon/turbomodule/core"
+end
 end