react-native-ota-hot-update 1.0.6 → 1.0.8

package/README.md

@@ -55,8 +55,8 @@ Here is the guideline to control bundle js by yourself, in here i am using Fireb
 #### 1.Add these script into your package.json to export bundlejs file:
 ```bash
 "scripts": {
-   "export-android": "mkdir -p android/output && react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/output/index.android.bundle --assets-dest android/app/src/main/res  && zip -j android/output/index.android.bundle.zip android/output/index.android.bundle && rm -rf android/output/index.android.bundle",
-   "export-ios": "mkdir -p ios/output && react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ios/output/main.jsbundle && zip -j ios/output/main.jsbundle.zip ios/output/main.jsbundle && rm -rf ios/output/main.jsbundle"
+  "export-android": "mkdir -p android/output && react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/output/index.android.bundle --assets-dest android/output  && cd android && find output -type f | zip index.android.bundle.zip -@ && cd .. && rm -rf android/output",
+  "export-ios": "mkdir -p ios/output && react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ios/output/main.jsbundle --assets-dest ios/output && cd ios && find output -type f | zip main.jsbundle.zip -@ && cd .. && rm -rf ios/output"
 }
 ```
 These commands are export bundle file and compress it as a zip file, one for android and one for ios. You can create your own script that export and auto upload to your server.

package/android/src/main/java/com/rnhotupdate/HotUpdateModule.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
@@ -23,12 +22,28 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         super(reactContext);
     }
 
+    private boolean deleteDirectory(File directory) {
+        if (directory.isDirectory()) {
+            // List all files and directories in the current directory
+            File[] files = directory.listFiles();
+            if (files != null) {
+                // Recursively delete all files and directories
+                for (File file : files) {
+                    if (!deleteDirectory(file)) {
+                        return false;
+                    }
+                }
+            }
+        }
+        // Finally, delete the empty directory or file
+        return directory.delete();
+    }
     private boolean deleteOldBundleIfneeded() {
         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
         String path = sharedPrefs.getString(Common.INSTANCE.getPATH());
         File file = new File(path);
         if (file.exists() && file.isFile()) {
-            boolean isDeleted = file.delete();
+            boolean isDeleted = deleteDirectory(file.getParentFile());
             sharedPrefs.clear();
             return isDeleted;
         } else {
@@ -38,7 +53,7 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
     private String unzip(File zipFile) {
         File destDir = zipFile.getParentFile(); // Directory of the zip file
 
-        String filePathExtracted = null;
+        String bundleFilePath = null;
         if (!destDir.exists()) {
             destDir.mkdirs();
         }
@@ -63,13 +78,15 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
                         }
                     }
                 }
-                filePathExtracted = newFile.getAbsolutePath();
-                zis.closeEntry();
+                if (newFile.getAbsolutePath().contains(".bundle")) {
+                    bundleFilePath = newFile.getAbsolutePath();
+                }
             }
+            zis.closeEntry();
         } catch (Exception e) {
             return null;
         }
-        return filePathExtracted;
+        return bundleFilePath;
     }
 
     @ReactMethod
@@ -99,6 +116,8 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void deleteBundle(Promise promise) {
         boolean isDeleted = deleteOldBundleIfneeded();
+        SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
+        sharedPrefs.putString(Common.INSTANCE.getVERSION(), "0");
         promise.resolve(isDeleted);
     }
     @ReactMethod

package/ios/RNhotupdate.m

@@ -14,8 +14,9 @@ RCT_EXPORT_MODULE()
 - (BOOL)removeBundleIfNeeded {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSString *retrievedString = [defaults stringForKey:@"PATH"];
+    NSError *error = nil;
     if (retrievedString && [self isFilePathValid:retrievedString]) {
-        BOOL isDeleted = [self deleteFileAtPath:retrievedString];
+        BOOL isDeleted = [self deleteAllContentsOfParentDirectoryOfFile:retrievedString error:&error];
         [defaults removeObjectForKey:@"PATH"];
         [defaults synchronize];
         return isDeleted;
@@ -34,6 +35,53 @@ RCT_EXPORT_MODULE()
     }
     return success;
 }
+
+- (BOOL)deleteAllContentsOfParentDirectoryOfFile:(NSString *)filePath error:(NSError **)error {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+
+    // Get the parent directory of the file
+    NSString *parentDirectory = [filePath stringByDeletingLastPathComponent];
+
+    // Ensure the parent directory exists
+    BOOL isDirectory;
+    if (![fileManager fileExistsAtPath:parentDirectory isDirectory:&isDirectory] || !isDirectory) {
+        if (error) {
+            *error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadNoSuchFileError userInfo:@{NSLocalizedDescriptionKey: @"Parent directory does not exist or is not a directory."}];
+        }
+        return NO;
+    }
+
+    // Get the contents of the parent directory
+    NSArray *contents = [fileManager contentsOfDirectoryAtPath:parentDirectory error:error];
+    if (error && *error) {
+        return NO;
+    }
+
+    BOOL success = YES;
+    for (NSString *fileName in contents) {
+        NSString *filePathInDirectory = [parentDirectory stringByAppendingPathComponent:fileName];
+
+        BOOL isDirectory;
+        if ([fileManager fileExistsAtPath:filePathInDirectory isDirectory:&isDirectory]) {
+            NSError *removeError = nil;
+            if (isDirectory) {
+                // Recursively delete directory contents
+                if (![fileManager removeItemAtPath:filePathInDirectory error:&removeError]) {
+                    NSLog(@"Failed to delete directory at path: %@", filePathInDirectory);
+                    success = NO;
+                }
+            } else {
+                // Delete file
+                if (![fileManager removeItemAtPath:filePathInDirectory error:&removeError]) {
+                    NSLog(@"Failed to delete file at path: %@", filePathInDirectory);
+                    success = NO;
+                }
+            }
+        }
+    }
+
+    return success;
+}
 + (BOOL)isFilePathExist:(NSString *)path {
     NSFileManager *fileManager = [NSFileManager defaultManager];
     return [fileManager fileExistsAtPath:path];
@@ -49,7 +97,36 @@ RCT_EXPORT_MODULE()
         return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
     }
 }
+- (NSString *)searchForJsBundleInDirectory:(NSString *)directoryPath {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error;
+
+    // Get contents of the directory
+    NSArray *contents = [fileManager contentsOfDirectoryAtPath:directoryPath error:&error];
+    if (error) {
+        NSLog(@"Error reading directory contents: %@", error.localizedDescription);
+        return nil;
+    }
+
+    for (NSString *file in contents) {
+        NSString *filePath = [directoryPath stringByAppendingPathComponent:file];
+        BOOL isDirectory;
+        if ([fileManager fileExistsAtPath:filePath isDirectory:&isDirectory]) {
+            if (isDirectory) {
+                // Recursively search in subdirectories
+                NSString *foundPath = [self searchForJsBundleInDirectory:filePath];
+                if (foundPath) {
+                    return foundPath;
+                }
+            } else if ([filePath hasSuffix:@".jsbundle"]) {
+                // Return the path if it's a .jsbundle file
+                return filePath;
+            }
+        }
+    }
 
+    return nil;
+}
 - (NSString *)unzipFileAtPath:(NSString *)zipFilePath {
     // Define the directory where the files will be extracted
     NSString *extractedFolderPath = [[zipFilePath stringByDeletingPathExtension] stringByAppendingPathExtension:@"unzip"];
@@ -73,11 +150,8 @@ RCT_EXPORT_MODULE()
         NSLog(@"Failed to unzip file");
         return nil;
     }
-
-    // Find the extracted file (assuming only one file in the zip)
-    NSArray *contents = [fileManager contentsOfDirectoryAtPath:extractedFolderPath error:nil];
-    if (contents.count == 1) {
-        NSString *filePath = [extractedFolderPath stringByAppendingPathComponent:contents.firstObject];
+    // Find .jsbundle files in the extracted directory
+        NSString *jsbundleFilePath = [self searchForJsBundleInDirectory:extractedFolderPath];
 
         // Delete the zip file after extraction
         NSError *removeError = nil;
@@ -85,14 +159,9 @@ RCT_EXPORT_MODULE()
         if (removeError) {
             NSLog(@"Failed to delete zip file: %@", removeError.localizedDescription);
         }
-
-        // Return the exact file path
-        return filePath;
-    } else {
-        [self deleteFileAtPath:zipFilePath];
-        NSLog(@"Expected one file in the zip but found %lu", (unsigned long)contents.count);
-        return nil;
-    }
+        NSLog(@"File path----: %@", jsbundleFilePath);
+        // Return the .jsbundle file path or nil if not found
+        return jsbundleFilePath;
 }
 
 // Expose setupBundlePath method to JavaScript

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Hot update for react native",
   "main": "src/index",
   "repository": "https://github.com/vantuan88291/react-native-ota-hot-update",