react-native-update 10.39.0 → 10.40.0-beta.0

package/ios/RCTPushy/RCTPushyDownloader.mm

@@ -1,10 +1,15 @@
 #import "RCTPushyDownloader.h"
 
-@interface RCTPushyDownloader()<NSURLSessionDelegate>
+static NSString *const RCTPushyDownloaderErrorDomain = @"cn.reactnative.pushy";
 
+@interface RCTPushyDownloader()<NSURLSessionDownloadDelegate>
+
+@property (nonatomic, strong) NSURLSession *session;
 @property (copy) void (^progressHandler)(long long, long long);
 @property (copy) void (^completionHandler)(NSString*, NSError*);
 @property (copy) NSString *savePath;
+@property (nonatomic, strong) NSError *fileError;
+@property (nonatomic, assign) BOOL finished;
 @end
 
 @implementation RCTPushyDownloader
@@ -21,27 +26,50 @@ completionHandler:(void (^)(NSString *path, NSError *error))completionHandler
     downloader.completionHandler = completionHandler;
     downloader.savePath = savePath;
 
-    [downloader download:downloadPath];
+    [downloader startDownload:downloadPath];
 }
 
-- (void)dealloc
-{
-}
-
-- (void)download:(NSString *)path
+- (void)startDownload:(NSString *)path
 {
     NSURL *url = [NSURL URLWithString:path];
-    
+    if (url == nil) {
+        [self completeWithError:[NSError errorWithDomain:RCTPushyDownloaderErrorDomain
+                                                    code:-1
+                                                userInfo:@{
+                                                    NSLocalizedDescriptionKey: @"invalid download url",
+                                                }]];
+        return;
+    }
+
     NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
-    NSURLSession *session = [NSURLSession sessionWithConfiguration:sessionConfig
-                                                          delegate:self
-                                                     delegateQueue:nil];
-    
-    NSURLSessionDownloadTask *task = [session downloadTaskWithURL:url];
-    [session downloadTaskWithURL:url];
+    self.session = [NSURLSession sessionWithConfiguration:sessionConfig
+                                                 delegate:self
+                                            delegateQueue:nil];
+
+    NSURLSessionDownloadTask *task = [self.session downloadTaskWithURL:url];
     [task resume];
 }
 
+- (void)completeWithError:(NSError *)error
+{
+    if (self.finished) {
+        return;
+    }
+    self.finished = YES;
+
+    void (^completionHandler)(NSString *, NSError *) = self.completionHandler;
+    self.progressHandler = nil;
+    self.completionHandler = nil;
+    self.fileError = nil;
+
+    [self.session finishTasksAndInvalidate];
+    self.session = nil;
+
+    if (completionHandler) {
+        completionHandler(error == nil ? self.savePath : nil, error);
+    }
+}
+
 #pragma mark - session delegate
 
 - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask
@@ -49,10 +77,6 @@ completionHandler:(void (^)(NSString *path, NSError *error))completionHandler
  totalBytesWritten:(int64_t)totalBytesWritten
 totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
 {
-#ifdef DEBUG
-    NSLog(@"download progress, %lld, %lld, %lld", bytesWritten, totalBytesWritten, totalBytesExpectedToWrite);
-#endif
-    
     if (self.progressHandler) {
         self.progressHandler(totalBytesWritten ,totalBytesExpectedToWrite);
     }
@@ -61,23 +85,22 @@ totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
 - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask
 didFinishDownloadingToURL:(NSURL *)location
 {
-    NSData *data = [NSData dataWithContentsOfURL:location];
-    NSError *error;
-    [data writeToFile:self.savePath options:NSDataWritingAtomic error:&error];
-    if (error) {
-        if (self.completionHandler) {
-            self.completionHandler(nil, error);
-            self.completionHandler = nil;
-        }
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    [fileManager removeItemAtPath:self.savePath error:nil];
+
+    NSError *fileError = nil;
+    [fileManager moveItemAtURL:location
+                         toURL:[NSURL fileURLWithPath:self.savePath]
+                         error:&fileError];
+    if (fileError != nil) {
+        self.fileError = fileError;
     }
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
 didCompleteWithError:(NSError *)error
 {
-    if (self.completionHandler) {
-        self.completionHandler(self.savePath, error);
-    }
+    [self completeWithError:error ?: self.fileError];
 }
 
 @end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update",
-  "version": "10.39.0",
+  "version": "10.40.0-beta.0",
   "description": "react-native hot update",
   "main": "src/index",
   "scripts": {
@@ -13,7 +13,7 @@
     "test": "bun test src/__tests__",
     "test:patch-core": "./scripts/test-patch-core.sh",
     "build:harmony-har": "node scripts/build-harmony-har.js",
-    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/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 && ./scripts/prune-host-stl.sh android/lib",
+    "build:so": "bun submodule && $ANDROID_HOME/ndk/28.2.13676358/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 && bun && detox build --configuration ios.sim.debug",
     "build:ios-release": "cd Example/testHotUpdate && bun && detox build --configuration ios.sim.release",
     "test:ios-debug": "cd Example/testHotUpdate && E2E_PLATFORM=ios detox test --configuration ios.sim.debug",

package/react-native-update.podspec

@@ -88,7 +88,7 @@ Pod::Spec.new do |s|
 
   s.cocoapods_version = '>= 1.6.0'
 
-  s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => '#{s.version}' }
+  s.source = { :git => 'https://github.com/reactnativecn/react-native-update.git', :tag => "#{s.version}" }
 
   s.libraries = 'bz2', 'z'
   s.pod_target_xcconfig = { 
@@ -108,7 +108,7 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'RCTPushy' do |ss|
-    ss.source_files = ['ios/**/*.{h,m,mm,c}',
+    ss.source_files = ['ios/RCTPushy/*.{h,m,mm}',
                        'cpp/patch_core/archive_patch_core.{h,cpp}',
                        'cpp/patch_core/patch_core.{h,cpp}',
                        'cpp/patch_core/state_core.{h,cpp}',
@@ -117,7 +117,7 @@ Pod::Spec.new do |s|
                        '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/**/*.h']
+    ss.public_header_files = ['ios/RCTPushy/*.h']
   end
 
   # Conditionally add Expo subspec and check ExpoModulesCore version

package/harmony/pushy/src/main/ets/UpdateModuleImpl.ts

@@ -1,123 +0,0 @@
-import { bundleManager } from '@kit.AbilityKit';
-import common from '@ohos.app.ability.common';
-import { UpdateContext } from './UpdateContext';
-import logger from './Logger';
-
-const TAG = 'UpdateModuleImpl';
-
-export class UpdateModuleImpl {
-  static readonly NAME = 'Pushy';
-
-  static async downloadFullUpdate(
-    updateContext: UpdateContext,
-    options: { updateUrl: string; hash: string },
-  ): Promise<void> {
-    return updateContext.downloadFullUpdate(options.updateUrl, options.hash);
-  }
-
-  static async downloadPatchFromPackage(
-    updateContext: UpdateContext,
-    options: { updateUrl: string; hash: string },
-  ): Promise<void> {
-    return updateContext.downloadPatchFromPackage(
-      options.updateUrl,
-      options.hash,
-    );
-  }
-
-  static async downloadPatchFromPpk(
-    updateContext: UpdateContext,
-    options: { updateUrl: string; hash: string; originHash: string },
-  ): Promise<void> {
-    return updateContext.downloadPatchFromPpk(
-      options.updateUrl,
-      options.hash,
-      options.originHash,
-    );
-  }
-
-  static async reloadUpdate(
-    updateContext: UpdateContext,
-    context: common.UIAbilityContext,
-    options: { hash: string },
-  ): Promise<void> {
-    const hash = options.hash;
-    if (!hash) {
-      throw Error('hash不能为空');
-    }
-
-    try {
-      await updateContext.switchVersion(hash);
-      const bundleInfo = await bundleManager.getBundleInfoForSelf(
-        bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_REQUESTED_PERMISSION,
-      );
-      await context.terminateSelf();
-      const want = {
-        bundleName: bundleInfo.name,
-        abilityName: context.abilityInfo?.name,
-      };
-      await context.startAbility(want);
-    } catch (error) {
-      logger.error(TAG, `reloadUpdate failed: ${error}`);
-      throw Error(`switchVersion failed ${error.message}`);
-    }
-  }
-
-  static async setNeedUpdate(
-    updateContext: UpdateContext,
-    options: { hash: string },
-  ): Promise<boolean> {
-    const hash = options.hash;
-    if (!hash) {
-      throw Error('empty hash');
-    }
-
-    try {
-      await updateContext.switchVersion(hash);
-      return true;
-    } catch (error) {
-      logger.error(TAG, `setNeedUpdate failed: ${error}`);
-      throw Error(`switchVersionLater failed: ${error.message}`);
-    }
-  }
-
-  static async markSuccess(updateContext: UpdateContext): Promise<boolean> {
-    try {
-      await updateContext.markSuccess();
-      return true;
-    } catch (error) {
-      logger.error(TAG, `markSuccess failed: ${error}`);
-      throw error;
-    }
-  }
-
-  static async setUuid(
-    updateContext: UpdateContext,
-    uuid: string,
-  ): Promise<void> {
-    return updateContext.setKv('uuid', uuid);
-  }
-
-  static checkJson(json: string): boolean {
-    try {
-      JSON.parse(json);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  static setLocalHashInfo(
-    updateContext: UpdateContext,
-    hash: string,
-    info: string,
-  ): boolean {
-    updateContext.setKv(`hash_${hash}`, info);
-    return true;
-  }
-
-  static getLocalHashInfo(updateContext: UpdateContext, hash: string): string {
-    const value = updateContext.getKv(`hash_${hash}`);
-    return value;
-  }
-}

package/ios/ImportReact.h

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

package/ios/RCTPushy/HDiffPatch/HDiffPatch.h

@@ -1,16 +0,0 @@
-//
-//  HDiffPatch.h
-//  RCTPushy
-//
-//  Created by HouSisong, All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface HDiffPatch : NSObject
-
-+ (BOOL)hdiffPatch:(NSString *)path
-            origin:(NSString *)origin
-     toDestination:(NSString *)destination;
-
-@end

package/ios/RCTPushy/HDiffPatch/HDiffPatch.mm

@@ -1,35 +0,0 @@
-//
-//  HDiffPatch.m
-//  RCTPushy
-//
-//  Created by HouSisong, All rights reserved.
-//
-
-#import "HDiffPatch.h"
-#include "../../../android/jni/hpatch.h"
-
-@implementation HDiffPatch
-
-+ (BOOL)hdiffPatch:(NSString *)patch
-            origin:(NSString *)origin
-     toDestination:(NSString *)destination
-{
-    if (![[NSFileManager defaultManager] fileExistsAtPath:patch]) {
-        return NO;
-    }
-    if (![[NSFileManager defaultManager] fileExistsAtPath:origin]) {
-        return NO;
-    }
-    
-    if ([[NSFileManager defaultManager] fileExistsAtPath:destination]) {
-        [[NSFileManager defaultManager] removeItemAtPath:destination error:nil];
-    }
-    
-    int err = hpatch_by_file([origin UTF8String], [destination UTF8String], [patch UTF8String]);
-    if (err) {
-        return NO;
-    }
-    return YES;
-}
-
-@end

package/ios/RCTPushy/RCTPushyManager.h

@@ -1,27 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface RCTPushyManager : NSObject
-
-
-- (BOOL)createDir:(NSString *)dir;
-
-- (void)unzipFileAtPath:(NSString *)path
-          toDestination:(NSString *)destination
-        progressHandler:(void (^)(NSString *entry, long entryNumber, long total))progressHandler
-      completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler;
-
-- (void)hdiffFileAtPath:(NSString *)path
-             fromOrigin:(NSString *)origin
-          toDestination:(NSString *)destination
-      completionHandler:(void (^)(BOOL success))completionHandler;
-
-- (void)copyFiles:(NSDictionary *)filesDic
-          fromDir:(NSString *)fromDir
-            toDir:(NSString *)toDir
-          deletes:(NSDictionary *)deletes
-       completionHandler:(void (^)(NSError *error))completionHandler;
-
-- (void)removeFile:(NSString *)filePath
- completionHandler:(void (^)(NSError *error))completionHandler;
-
-@end

package/ios/RCTPushy/RCTPushyManager.mm

@@ -1,181 +0,0 @@
-#import "RCTPushyManager.h"
-#import "ZipArchive.h"
-#import "HDiffPatch.h"
-
-@implementation RCTPushyManager {
-    dispatch_queue_t _opQueue;
-}
-
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-        _opQueue = dispatch_queue_create("cn.reactnative.pushy", DISPATCH_QUEUE_SERIAL);
-    }
-    return self;
-}
-
-- (BOOL)createDir:(NSString *)dir
-{
-    __block BOOL success = false;
-    
-    dispatch_sync(_opQueue, ^{
-        BOOL isDir;
-        NSFileManager *fileManager = [NSFileManager defaultManager];
-        if ([fileManager fileExistsAtPath:dir isDirectory:&isDir]) {
-            if (isDir) {
-                success = true;
-                return;
-            }
-        }
-        
-        NSError *error;
-        [fileManager createDirectoryAtPath:dir
-               withIntermediateDirectories:YES
-                                attributes:nil
-                                     error:&error];
-        if (!error) {
-            success = true;
-            return;
-        }
-    });
-    
-    return success;
-}
-
-- (void)unzipFileAtPath:(NSString *)path
-          toDestination:(NSString *)destination
-        progressHandler:(void (^)(NSString *entry, long entryNumber, long total))progressHandler
-      completionHandler:(void (^)(NSString *path, BOOL succeeded, NSError *error))completionHandler
-{
-    dispatch_async(_opQueue, ^{
-        
-        if ([[NSFileManager defaultManager] fileExistsAtPath:destination]) {
-            [[NSFileManager defaultManager] removeItemAtPath:destination error:nil];
-        }
-        
-        [SSZipArchive unzipFileAtPath:path toDestination:destination progressHandler:^(NSString *entry, unz_file_info zipInfo, long entryNumber, long total) {
-            progressHandler(entry, entryNumber, total);
-        } completionHandler:^(NSString *path, BOOL succeeded, NSError *error) {
-            // 解压完，移除zip文件
-            [[NSFileManager defaultManager] removeItemAtPath:path error:nil];
-            if (completionHandler) {
-                completionHandler(path, succeeded, error);
-            }
-        }];
-    });
-}
-
-- (void)hdiffFileAtPath:(NSString *)path
-             fromOrigin:(NSString *)origin
-         toDestination:(NSString *)destination
-     completionHandler:(void (^)(BOOL success))completionHandler
-{
-    dispatch_async(_opQueue, ^{
-        BOOL success = [HDiffPatch hdiffPatch:path origin:origin toDestination:destination];
-        if (completionHandler) {
-            completionHandler(success);
-        }
-    });
-}
-
-- (void)copyFiles:(NSDictionary *)filesDic
-          fromDir:(NSString *)fromDir
-            toDir:(NSString *)toDir
-          deletes:(NSDictionary *)deletes
-completionHandler:(void (^)(NSError *error))completionHandler
-{
-    dispatch_async(_opQueue, ^{
-        NSFileManager *fm = [NSFileManager defaultManager];
-
-        // merge old files
-        if (deletes!= nil) {
-            NSString *srcDir = [fromDir stringByAppendingPathComponent:@"assets"];
-            NSString *desDir = [toDir stringByAppendingPathComponent:@"assets"];
-            [self _mergeContentsOfPath:srcDir intoPath:desDir deletes:deletes];
-        }
-        
-        // copy files
-        for (NSString *to in filesDic.allKeys) {
-            NSString *from = filesDic[to];
-            if (from.length <=0) {
-                from = to;
-            }
-            NSString *fromPath = [fromDir stringByAppendingPathComponent:from];
-            NSString *toPath = [toDir stringByAppendingPathComponent:to];
-            
-            if ([fm fileExistsAtPath:toPath]) {
-                [fm removeItemAtPath:toPath error:nil];
-            }
-            NSError *error = nil;
-            [fm copyItemAtPath:fromPath toPath:toPath error:&error];
-            if (error) {
-                NSLog(@"Pushy copy error: %@", error.localizedDescription);
-                // if (completionHandler) {
-                //     completionHandler(error);
-                // }
-                // return;
-            }
-        }
-        if (completionHandler) {
-            completionHandler(nil);
-        }
-    });
-}
-
-- (void)removeFile:(NSString *)filePath
- completionHandler:(void (^)(NSError *error))completionHandler
-{
-    dispatch_async(_opQueue, ^{
-        NSError *error = nil;
-        [[NSFileManager defaultManager] removeItemAtPath:filePath error:&error];
-        if (completionHandler) {
-            completionHandler(error);
-        }
-    });
-}
-
-- (void)_mergeContentsOfPath:(NSString *)srcDir intoPath:(NSString *)dstDir deletes:(NSDictionary *)deletes
-{
-    NSFileManager *fm = [NSFileManager defaultManager];
-    NSDirectoryEnumerator *srcDirEnum = [fm enumeratorAtPath:srcDir];
-    NSString *subPath;
-    while ((subPath = [srcDirEnum nextObject])) {
-        
-        NSString *srcFullPath =  [srcDir stringByAppendingPathComponent:subPath];
-        NSString *potentialDstPath = [dstDir stringByAppendingPathComponent:subPath];
-
-        NSError *error = nil;
-
-        BOOL inDeletes = NO;
-        if (deletes) {
-            NSString *path = [@"assets" stringByAppendingPathComponent:subPath];
-            if (deletes[path]) {
-                inDeletes = YES;
-            }
-        }
-        if (!inDeletes) {
-            BOOL isDirectory = ([fm fileExistsAtPath:srcFullPath isDirectory:&isDirectory] && isDirectory);
-            if (isDirectory) {
-                if (![fm fileExistsAtPath:potentialDstPath isDirectory:nil]) {
-                    [fm createDirectoryAtPath:potentialDstPath withIntermediateDirectories:YES attributes:nil error:&error];
-                    if (error) {
-                        NSLog(@"Pushy merge error: %@", error.localizedDescription);
-                        // return;
-                    }
-                }
-            }
-            else {
-                if (![fm fileExistsAtPath:potentialDstPath]) {
-                    [fm copyItemAtPath:srcFullPath toPath:potentialDstPath error:&error];
-                    if (error) {
-                        NSLog(@"Pushy merge error: %@", error.localizedDescription);
-                        // return;
-                    }
-                }
-            }
-        }
-    }
-}
-
-@end