react-native-ota-hot-update 1.1.5 → 1.1.7

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

@@ -15,6 +15,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import androidx.annotation.NonNull;
@@ -39,13 +42,14 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         // Finally, delete the empty directory or file
         return directory.delete();
     }
-    private boolean deleteOldBundleIfneeded() {
+    private boolean deleteOldBundleIfneeded(String pathKey) {
+        String pathName = pathKey != null ? pathKey : Common.INSTANCE.getPREVIOUS_PATH();
         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
-        String path = sharedPrefs.getString(Common.INSTANCE.getPATH());
+        String path = sharedPrefs.getString(pathName);
         File file = new File(path);
         if (file.exists() && file.isFile()) {
             boolean isDeleted = deleteDirectory(file.getParentFile());
-            sharedPrefs.clear();
+            sharedPrefs.putString(pathName, "");
             return isDeleted;
         } else {
             return false;
@@ -53,7 +57,8 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
     }
     private String unzip(File zipFile, String extension) {
         File destDir = zipFile.getParentFile(); // Directory of the zip file
-
+        String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date());
+        String topLevelFolder = null;
         String bundleFilePath = null;
         if (!destDir.exists()) {
             destDir.mkdirs();
@@ -65,6 +70,12 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
             ZipEntry zipEntry;
             while ((zipEntry = zis.getNextEntry()) != null) {
                 File newFile = new File(destDir, zipEntry.getName());
+                if (topLevelFolder == null) {
+                    String[] parts = zipEntry.getName().split("/");
+                    if (parts.length > 1) {
+                        topLevelFolder = parts[0];
+                    }
+                }
                 if (zipEntry.isDirectory()) {
                     newFile.mkdirs();
                 } else {
@@ -87,6 +98,14 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         } catch (Exception e) {
             return null;
         }
+        if (topLevelFolder != null) {
+            File extractedFolder = new File(destDir, topLevelFolder);
+            File renameFolder = new File(destDir, "output_" + timestamp);
+            if (extractedFolder.exists()) {
+                extractedFolder.renameTo(renameFolder);
+                bundleFilePath = bundleFilePath.replace(extractedFolder.getAbsolutePath(), renameFolder.getAbsolutePath());
+            }
+        }
         return bundleFilePath;
     }
 
@@ -95,12 +114,16 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         if (path != null) {
             File file = new File(path);
             if (file.exists() && file.isFile()) {
-                deleteOldBundleIfneeded();
+                deleteOldBundleIfneeded(null);
                 String fileUnzip = unzip(file, extension != null ? extension : ".bundle");
                 if (fileUnzip != null) {
                     Log.d("setupBundlePath: ", fileUnzip);
                     file.delete();
                     SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
+                    String oldPath = sharedPrefs.getString(Common.INSTANCE.getPATH());
+                    if (!oldPath.equals("")) {
+                        sharedPrefs.putString(Common.INSTANCE.getPREVIOUS_PATH(), oldPath);
+                    }
                     sharedPrefs.putString(Common.INSTANCE.getPATH(), fileUnzip);
                     PackageInfo info = OtaHotUpdate.packageInfo(getReactApplicationContext());
                     String latestVer = null;
@@ -126,10 +149,11 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void deleteBundle(Promise promise) {
-        boolean isDeleted = deleteOldBundleIfneeded();
+        boolean isDeleted = deleteOldBundleIfneeded(null);
+        boolean isDeletedOld = deleteOldBundleIfneeded(Common.INSTANCE.getPATH());
         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
         sharedPrefs.putString(Common.INSTANCE.getVERSION(), "0");
-        promise.resolve(isDeleted);
+        promise.resolve(isDeleted && isDeletedOld);
     }
     @ReactMethod
     public void restart() {
@@ -147,6 +171,24 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         }
     }
     @ReactMethod
+    public void rollbackToPreviousBundle(Promise promise) {
+        SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
+        String oldPath = sharedPrefs.getString(Common.INSTANCE.getPREVIOUS_PATH());
+        if (!oldPath.equals("")) {
+            boolean isDeleted = deleteOldBundleIfneeded(Common.INSTANCE.getPATH());
+            if (isDeleted) {
+                sharedPrefs.putString(Common.INSTANCE.getPATH(), oldPath);
+                sharedPrefs.putString(Common.INSTANCE.getPREVIOUS_PATH(), "");
+                promise.resolve(true);
+            } else {
+                promise.resolve(false);
+            }
+        } else {
+            promise.resolve(false);
+        }
+
+    }
+    @ReactMethod
     public void getCurrentVersion(Promise promise) {
         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
         String version = sharedPrefs.getString(Common.INSTANCE.getVERSION());
@@ -159,13 +201,13 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
     }
     @ReactMethod
     public void setCurrentVersion(String version, Promise promise) {
-         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
-         sharedPrefs.putString(Common.INSTANCE.getVERSION(), version);
-         promise.resolve(true);
+        SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
+        sharedPrefs.putString(Common.INSTANCE.getVERSION(), version);
+        promise.resolve(true);
     }
 
     @ReactMethod
-     public void setExactBundlePath(String path, Promise promise) {
+    public void setExactBundlePath(String path, Promise promise) {
         SharedPrefs sharedPrefs = new SharedPrefs(getReactApplicationContext());
         sharedPrefs.putString(Common.INSTANCE.getPATH(), path);
         PackageInfo info = OtaHotUpdate.packageInfo(getReactApplicationContext());
@@ -175,7 +217,7 @@ public class HotUpdateModule extends ReactContextBaseJavaModule {
         }
         sharedPrefs.putString(Common.INSTANCE.getCURRENT_VERSION_NAME(), latestVer);
         promise.resolve(true);
-     }
+    }
 
     @NonNull
     @Override

package/ios/RNhotupdate.m

@@ -11,13 +11,14 @@ RCT_EXPORT_MODULE()
     return [fileManager fileExistsAtPath:path];
 }
 
-- (BOOL)removeBundleIfNeeded {
+- (BOOL)removeBundleIfNeeded:(NSString *)pathKey {
+    NSString *keyToUse = pathKey ? pathKey : @"OLD_PATH";
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSString *retrievedString = [defaults stringForKey:@"PATH"];
+    NSString *retrievedString = [defaults stringForKey:keyToUse];
     NSError *error = nil;
     if (retrievedString && [self isFilePathValid:retrievedString]) {
         BOOL isDeleted = [self deleteAllContentsOfParentDirectoryOfFile:retrievedString error:&error];
-        [defaults removeObjectForKey:@"PATH"];
+        [defaults removeObjectForKey:keyToUse];
         [defaults synchronize];
         return isDeleted;
     } else {
@@ -130,6 +131,34 @@ RCT_EXPORT_MODULE()
 
     return nil;
 }
+- (NSString *)renameExtractedFolderInDirectory:(NSString *)directoryPath {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error = nil;
+
+    // Get the contents of the extracted directory
+    NSArray *contents = [fileManager contentsOfDirectoryAtPath:directoryPath error:&error];
+    if (error || contents.count != 1) {
+        NSLog(@"Error retrieving extracted folder or unexpected structure: %@", error.localizedDescription);
+        return nil;
+    }
+
+    // Get the original extracted folder name (assuming only one folder exists)
+    NSString *originalFolderName = contents.firstObject;
+    NSString *originalFolderPath = [directoryPath stringByAppendingPathComponent:originalFolderName];
+
+    // Generate new folder name with timestamp
+    NSString *timestamp = [NSString stringWithFormat:@"output_%ld", (long)[[NSDate date] timeIntervalSince1970]];
+    NSString *newFolderPath = [directoryPath stringByAppendingPathComponent:timestamp];
+
+    // Rename the extracted folder
+    if (![fileManager moveItemAtPath:originalFolderPath toPath:newFolderPath error:&error]) {
+        NSLog(@"Failed to rename folder: %@", error.localizedDescription);
+        return nil;
+    }
+
+    NSLog(@"Renamed extracted folder to: %@", newFolderPath);
+    return newFolderPath;
+}
 - (NSString *)unzipFileAtPath:(NSString *)zipFilePath extension:(NSString *)extension  {
     // Define the directory where the files will be extracted
     NSString *extractedFolderPath = [[zipFilePath stringByDeletingPathExtension] stringByAppendingPathExtension:@"unzip"];
@@ -153,8 +182,13 @@ RCT_EXPORT_MODULE()
         NSLog(@"Failed to unzip file");
         return nil;
     }
+    // Try renaming the extracted folder
+        NSString *renamedFolderPath = [self renameExtractedFolderInDirectory:extractedFolderPath];
+
+          // If renaming fails, use the original extracted folder path
+        NSString *finalFolderPath = renamedFolderPath ? renamedFolderPath : extractedFolderPath;
     // Find .jsbundle files in the extracted directory
-    NSString *jsbundleFilePath = [self searchForJsBundleInDirectory:extractedFolderPath extension:extension];
+        NSString *jsbundleFilePath = [self searchForJsBundleInDirectory:finalFolderPath extension:extension];
 
         // Delete the zip file after extraction
         NSError *removeError = nil;
@@ -170,12 +204,16 @@ RCT_EXPORT_MODULE()
 // Expose setupBundlePath method to JavaScript
 RCT_EXPORT_METHOD(setupBundlePath:(NSString *)path extension:(NSString *)extension withResolver:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject) {
     if ([self isFilePathValid:path]) {
-        [self removeBundleIfNeeded];
+        [self removeBundleIfNeeded:nil];
         //Unzip file
         NSString *extractedFilePath = [self unzipFileAtPath:path extension:(extension != nil) ? extension : @".jsbundle"];
         if (extractedFilePath) {
             NSLog(@"file extraction----- %@", extractedFilePath);
             NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+             NSString *oldPath = [defaults stringForKey:@"PATH"];
+             if (oldPath) {
+                [defaults setObject:oldPath forKey:@"OLD_PATH"];
+             }
             [defaults setObject:extractedFilePath forKey:@"PATH"];
             [defaults setObject:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] forKey:@"VERSION_NAME"];
             [defaults synchronize];
@@ -190,10 +228,34 @@ RCT_EXPORT_METHOD(setupBundlePath:(NSString *)path extension:(NSString *)extensi
 
 // Expose deleteBundle method to JavaScript
 RCT_EXPORT_METHOD(deleteBundle:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject) {
-    BOOL isDeleted = [self removeBundleIfNeeded];
-    resolve(@(isDeleted));
+        BOOL isDeleted = [self removeBundleIfNeeded:@"PATH"];
+        BOOL isDeletedOld = [self removeBundleIfNeeded:nil];
+        if (isDeleted && isDeletedOld) {
+              resolve(@(YES));
+          } else {
+              resolve(@(NO));
+          }
+}
+// Expose deleteBundle method to JavaScript
+RCT_EXPORT_METHOD(rollbackToPreviousBundle:(double)i
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+  NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+  NSString *oldPath = [defaults stringForKey:@"OLD_PATH"];
+    if (oldPath && [self isFilePathValid:oldPath]) {
+      BOOL isDeleted = [self removeBundleIfNeeded:@"PATH"];
+      if (isDeleted) {
+        [defaults setObject:oldPath forKey:@"PATH"];
+        [defaults removeObjectForKey:@"OLD_PATH"];
+        [defaults synchronize];
+        resolve(@(YES));
+      } else {
+          resolve(@(NO));
+        }
+      } else {
+          resolve(@(NO));
+      }
 }
-
 RCT_EXPORT_METHOD(getCurrentVersion:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject) {
      NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
      NSString *version = [defaults stringForKey:@"VERSION"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ota-hot-update",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Hot update for react native",
   "main": "src/index",
   "repository": "https://github.com/vantuan88291/react-native-ota-hot-update",
@@ -12,7 +12,7 @@
   "homepage": "https://github.com/vantuan88291/react-native-ota-hot-update",
   "dependencies": {
     "buffer": "^6.0.3",
-    "isomorphic-git": "git+https://github.com/vantuan88291/isomorphic-git.git"
+    "isomorphic-git": "1.27.3"
   },
   "peerDependencies": {
     "react-native": ">=0.63.4",

package/src/index.tsx

@@ -46,6 +46,9 @@ function deleteBundlePath(): Promise<boolean> {
 function getCurrentVersion(): Promise<string> {
   return RNhotupdate.getCurrentVersion();
 }
+function rollbackToPreviousBundle(): Promise<boolean> {
+  return RNhotupdate.rollbackToPreviousBundle();
+}
 async function getVersionAsNumber() {
   const rawVersion = await getCurrentVersion();
   return +rawVersion;
@@ -168,6 +171,7 @@ export default {
   resetApp,
   getCurrentVersion: getVersionAsNumber,
   setCurrentVersion,
+  rollbackToPreviousBundle,
   git: {
     checkForGitUpdate,
     ...git,