bump version to 10.29.8 and include new version data in downloading report

Example/testHotUpdate/src/index.tsx

@@ -52,7 +52,7 @@ function App() {
 
   return (
     <View style={styles.container}>
-      <Text style={styles.welcome}>欢迎使用Pushy热更新服务</Text>
+      <Text style={styles.welcome}>欢迎xxx使用Pushy热更新服务</Text>
       <View style={{flexDirection: 'row'}}>
         <Text>
           {useDefaultAlert ? '当前使用' : '当前不使用'}默认的alert更新提示

endpoints.json

@@ -1 +1 @@
-["https://pushy-koa-qgbgqmcpis.cn-beijing.fcapp.run", "https://p.reactnative.cn/api"]
+["https://p.reactnative.cn/api"]

ios/ImportReact.h

@@ -0,0 +1,2 @@
+@import React;
+

ios/RCTPushy/RCTPushy.mm

@@ -315,16 +315,15 @@ RCT_EXPORT_METHOD(reloadUpdate:(NSDictionary *)options
         if (hash.length) {
             // 只在 setNeedUpdate 成功后 resolve
             [self setNeedUpdate:options resolver:^(id result) {
-                // reload in earlier version
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self.bridge setValue:[[self class] bundleURL] forKey:@"bundleURL"];
-                    [self.bridge reload];
-                });
                     #if __has_include("RCTReloadCommand.h")
                         // reload 0.62+
                         RCTReloadCommandSetBundleURL([[self class] bundleURL]);
-                    RCTTriggerReloadCommandListeners(@"pushy reload");
+                        RCTTriggerReloadCommandListeners(@"pushy reloadUpdate");
+                    #else
+                        [self.bridge reload];
                     #endif
+                });
                 resolve(@true);
             } rejecter:^(NSString *code, NSString *message, NSError *error) {
                 reject(code, message, error);
@@ -343,13 +342,14 @@ RCT_EXPORT_METHOD(restartApp:(RCTPromiseResolveBlock)resolve
 {
     @try {
         dispatch_async(dispatch_get_main_queue(), ^{
-            [self.bridge reload];
-        });
             #if __has_include("RCTReloadCommand.h")
                 // reload 0.62+
                 RCTReloadCommandSetBundleURL([[self class] bundleURL]);
                 RCTTriggerReloadCommandListeners(@"pushy restartApp");
+            #else
+                [self.bridge reload];
             #endif
+        });
 
         resolve(@true);
     }
@@ -542,7 +542,15 @@ RCT_EXPORT_METHOD(markSuccess:(RCTPromiseResolveBlock)resolve
             callback([self errorWithMessage:ERROR_HDIFFPATCH]);
         }
     };
+    
+    @try {
         [_fileManager hdiffFileAtPath:bundlePatch fromOrigin:bundleOrigin toDestination:destination completionHandler:completionHandler];
+    }
+    @catch (NSException *exception) {
+        NSLog(@"Pushy _dopatch error: exception occurred during hdiffFileAtPath: %@, reason: %@", 
+              exception.name, exception.reason);
+        callback([self errorWithMessage:ERROR_HDIFFPATCH]);
+    }
 }
 
 - (void)patch:(NSString *)hash fromBundle:(NSString *)bundleOrigin source:(NSString *)sourceOrigin callback:(void (^)(NSError *error))callback

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.29.5",
+  "version": "10.29.8",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {

react-native-update.podspec

@@ -90,13 +90,6 @@ Pod::Spec.new do |s|
 
   s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
 
-  # Conditionally set source files
-  if valid_expo_project
-    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}") # Include Expo files
-  else
-    s.source_files = Dir.glob("ios/**/*.{h,m,mm,swift}").reject { |f| f.start_with?("ios/Expo/") } # Exclude Expo files
-  end
-
   s.libraries = 'bz2', 'z'
   s.vendored_libraries = 'RCTPushy/libRCTPushy.a'
   s.pod_target_xcconfig = { 
@@ -112,22 +105,18 @@ Pod::Spec.new do |s|
 
   # Conditionally add Expo dependency
   if valid_expo_project
+    s.public_header_files = ['ios/ImportReact.h']
     s.dependency 'ExpoModulesCore'
   end
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = 'ios/RCTPushy/*.{h,m,mm,swift}'
-    ss.public_header_files = ['ios/RCTPushy/*.h']
-  end
-
-  s.subspec 'HDiffPatch' do |ss|
-    ss.source_files = ['ios/RCTPushy/HDiffPatch/**/*.{h,m,c}',
+    ss.source_files = ['ios/RCTPushy/**/*.{h,m,mm,c}',
                        'android/jni/hpatch.{h,c}',
                        'android/jni/HDiffPatch/libHDiffPatch/HPatch/*.{h,c}',
                        'android/jni/HDiffPatch/file_for_patch.{h,c}',
                        'android/jni/lzma/C/LzmaDec.{h,c}',
                        'android/jni/lzma/C/Lzma2Dec.{h,c}']
-    ss.public_header_files = 'ios/RCTPushy/HDiffPatch/**/*.h'
+    ss.public_header_files = ['ios/RCTPushy/**/*.h']
   end
 
   # Conditionally add Expo subspec and check ExpoModulesCore version

src/client.ts

@@ -148,6 +148,7 @@ export class Pushy {
     await this.loggerPromise.promise;
     const { logger = noop, appKey } = this.options;
     const info = await getCurrentVersionInfo();
+    const overridePackageVersion = this.options.overridePackageVersion;
     logger({
       type,
       data: {
@@ -155,6 +156,7 @@ export class Pushy {
         currentVersion,
         cInfo,
         packageVersion,
+        overridePackageVersion,
         buildTime,
         message,
         ...info,
@@ -233,7 +235,7 @@ export class Pushy {
     }
     this.lastChecking = now;
     const fetchBody = {
-      packageVersion,
+      packageVersion: this.options.overridePackageVersion || packageVersion,
       hash: currentVersion,
       buildTime,
       cInfo,
@@ -391,7 +393,12 @@ export class Pushy {
       }
     }
     let succeeded = '';
-    this.report({ type: 'downloading' });
+    this.report({
+      type: 'downloading',
+      data: {
+        newVersion: hash,
+      },
+    });
     let lastError: any;
     let errorMessages: string[] = [];
     const diffUrl = await testUrls(joinUrls(paths, diff));

src/type.ts

@@ -93,6 +93,7 @@ export interface ClientOptions {
   beforeDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
   afterDownloadUpdate?: (info: CheckResult) => Promise<boolean>;
   onPackageExpired?: (info: CheckResult) => Promise<boolean>;
+  overridePackageVersion?: string;
 }
 
 export interface UpdateTestPayload {