react-native-stallion 2.0.0-alpha.3 → 2.0.0-alpha.5

package/android/src/main/java/com/stallion/StallionModule.java

@@ -27,19 +27,27 @@ import java.util.List;
 
 @ReactModule(name = StallionConfigConstants.MODULE_NAME)
 public class StallionModule extends ReactContextBaseJavaModule implements LifecycleEventListener {
-  private final ReactApplicationContext currentReactContext;
   private final StallionStateManager stallionStateManager;
 
   public StallionModule(ReactApplicationContext reactContext) {
     super(reactContext);
     StallionStateManager.init(reactContext);
     this.stallionStateManager = StallionStateManager.getInstance();
-    this.currentReactContext = reactContext;
+    StallionEventManager.init(this.stallionStateManager);
     reactContext.addLifecycleEventListener(this);
   }
 
   @Override
   public void onHostResume() {
+    if (
+        StallionEventManager.getInstance().getEmitter() == null
+          && getReactApplicationContext().getCatalystInstance() != null
+    ) {
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = getReactApplicationContext().getJSModule(
+        DeviceEventManagerModule.RCTDeviceEventEmitter.class
+      );
+      StallionEventManager.getInstance().setEmitter(eventEmitter);
+    }
     StallionSyncHandler.sync();
   }
 
@@ -52,7 +60,8 @@ public class StallionModule extends ReactContextBaseJavaModule implements Lifecy
   @Override
   public void onCatalystInstanceDestroy() {
     super.onCatalystInstanceDestroy();
-    this.currentReactContext.removeLifecycleEventListener(this);
+    stallionStateManager.setIsMounted(false);
+    getReactApplicationContext().removeLifecycleEventListener(this);
   }
 
   @Override
@@ -64,12 +73,6 @@ public class StallionModule extends ReactContextBaseJavaModule implements Lifecy
   @ReactMethod
   public void onLaunch(String launchData) {
     stallionStateManager.setIsMounted(true);
-
-    DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = this.currentReactContext.getJSModule(
-      DeviceEventManagerModule.RCTDeviceEventEmitter.class
-    );
-    StallionEventManager.getInstance().setEmitter(eventEmitter);
-
     checkPendingDownloads();
   }
 

package/android/src/main/java/com/stallion/events/StallionEventManager.java

@@ -12,6 +12,7 @@ import org.json.JSONObject;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class StallionEventManager {
   public  static final String STALLION_NATIVE_EVENT_NAME = "STALLION_NATIVE_EVENT";
@@ -20,7 +21,7 @@ public class StallionEventManager {
 
   private static StallionEventManager instance;
   private final StallionStateManager stallionStateManager;
-  private DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter;
+  private final AtomicReference<DeviceEventManagerModule.RCTDeviceEventEmitter> eventEmitterRef = new AtomicReference<>();
 
   // Private constructor for Singleton
   private StallionEventManager(StallionStateManager stateManager) {
@@ -35,7 +36,11 @@ public class StallionEventManager {
   }
 
   public void setEmitter(DeviceEventManagerModule.RCTDeviceEventEmitter deviceEmitter) {
-    eventEmitter = deviceEmitter;
+    eventEmitterRef.set(deviceEmitter);
+  }
+
+  public DeviceEventManagerModule.RCTDeviceEventEmitter getEmitter() {
+    return eventEmitterRef.get();
   }
 
   // Get instance method
@@ -49,9 +54,9 @@ public class StallionEventManager {
   public void sendEventWithoutCaching(String eventName, JSONObject eventPayload) {
     try {
       eventPayload.put("type", eventName);
-
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = eventEmitterRef.get();
       // Emit the event to React Native
-      if (eventEmitter != null) {
+      if (eventEmitter != null && stallionStateManager.getIsMounted()) {
         eventEmitter.emit(STALLION_NATIVE_EVENT_NAME, eventPayload.toString());
       }
 
@@ -69,8 +74,9 @@ public class StallionEventManager {
 
       eventPayload.put("type", eventName);
 
+      DeviceEventManagerModule.RCTDeviceEventEmitter eventEmitter = eventEmitterRef.get();
       // Emit the event to React Native
-      if (eventEmitter != null) {
+      if (eventEmitter != null && stallionStateManager.getIsMounted()) {
         eventEmitter.emit(STALLION_NATIVE_EVENT_NAME, eventPayload.toString());
       }
 

package/android/src/main/java/com/stallion/networkmanager/StallionFileDownloader.java

@@ -128,7 +128,7 @@ public class StallionFileDownloader {
 
       // Ensure totalBytes is valid
       if (totalBytes <= 0) {
-        callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "Invalid content length: " + totalBytes);
+        callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "Invalid content length: ");
         return;
       }
 
@@ -158,7 +158,7 @@ public class StallionFileDownloader {
         return;
       }
     } catch (IOException e) {
-      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "IOException occurred: " + e.getMessage());
+      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, "IOException occurred: ");
       throw e;
     } finally {
       if (connection != null) {
@@ -205,8 +205,11 @@ public class StallionFileDownloader {
         callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, StallionApiConstants.CORRUPTED_FILE_ERROR);
       }
     } catch (Exception e) {
-      String filesystemError = e.getMessage();
-      callback.onReject(StallionApiConstants.DOWNLOAD_ERROR_PREFIX, StallionApiConstants.DOWNLOAD_FILESYSTEM_ERROR_MESSAGE + filesystemError);
+      String filesystemError = e.getMessage() != null ? e.getMessage() : "Unknown filesystem error";
+      callback.onReject(
+        StallionApiConstants.DOWNLOAD_ERROR_PREFIX,
+        StallionApiConstants.DOWNLOAD_FILESYSTEM_ERROR_MESSAGE + filesystemError
+      );
     } finally {
       StallionFileManager.deleteFileOrFolderSilently(downloadedZip);
     }

package/android/src/main/java/com/stallion/networkmanager/StallionSyncHandler.java

@@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class StallionSyncHandler {
 
   private static final AtomicBoolean isSyncInProgress = new AtomicBoolean(false);
+  private static final AtomicBoolean isDownloadInProgress = new AtomicBoolean(false);
 
   public static void sync() {
     // Ensure only one sync job runs at a time
@@ -99,47 +100,58 @@ public class StallionSyncHandler {
   }
 
   public static void downloadNewRelease(String newReleaseHash, String newReleaseUrl) {
-    StallionStateManager stateManager = StallionStateManager.getInstance();
-    String downloadPath = stateManager.getStallionConfig().getFilesDirectory()
-      + StallionConfigConstants.PROD_DIRECTORY
-      + StallionConfigConstants.TEMP_FOLDER_SLOT;
-    String projectId = stateManager.getStallionConfig().getProjectId();
-
-    emitDownloadStarted(newReleaseHash);
-
-    StallionFileDownloader.downloadBundle(
-      newReleaseUrl + "?projectId=" + projectId,
-      downloadPath,
-      new StallionDownloadCallback() {
-        @Override
-        public void onReject(String prefix, String error) {
-          emitDownloadError(newReleaseHash, prefix + error);
-        }
+    // Ensure only one download job runs at a time
+    if (!isDownloadInProgress.compareAndSet(false, true)) {
+      return; // Exit if another job is already running
+    }
+    try {
+      StallionStateManager stateManager = StallionStateManager.getInstance();
+      String downloadPath = stateManager.getStallionConfig().getFilesDirectory()
+        + StallionConfigConstants.PROD_DIRECTORY
+        + StallionConfigConstants.TEMP_FOLDER_SLOT;
+      String projectId = stateManager.getStallionConfig().getProjectId();
+
+      emitDownloadStarted(newReleaseHash);
+
+      StallionFileDownloader.downloadBundle(
+        newReleaseUrl + "?projectId=" + projectId,
+        downloadPath,
+        new StallionDownloadCallback() {
+          @Override
+          public void onReject(String prefix, String error) {
+            isDownloadInProgress.set(false);
+            emitDownloadError(newReleaseHash, prefix + error);
+          }
 
-        @Override
-        public void onSuccess(String successPayload) {
-          stateManager.stallionMeta.setCurrentProdSlot(StallionMetaConstants.SlotStates.NEW_SLOT);
-          stateManager.stallionMeta.setProdTempHash(newReleaseHash);
-          String currentProdNewHash = stateManager.stallionMeta.getProdNewHash();
-          if(currentProdNewHash != null && !currentProdNewHash.isEmpty()) {
-           StallionSlotManager.stabilizeProd();
+          @Override
+          public void onSuccess(String successPayload) {
+            isDownloadInProgress.set(false);
+            stateManager.stallionMeta.setCurrentProdSlot(StallionMetaConstants.SlotStates.NEW_SLOT);
+            stateManager.stallionMeta.setProdTempHash(newReleaseHash);
+            String currentProdNewHash = stateManager.stallionMeta.getProdNewHash();
+            if(currentProdNewHash != null && !currentProdNewHash.isEmpty()) {
+              StallionSlotManager.stabilizeProd();
+            }
+            stateManager.syncStallionMeta();
+            emitDownloadSuccess(newReleaseHash);
           }
-          stateManager.syncStallionMeta();
-          emitDownloadSuccess(newReleaseHash);
-        }
 
-        @Override
-        public void onProgress(double downloadFraction) {
-          // Optional: Handle progress updates
+          @Override
+          public void onProgress(double downloadFraction) {
+            // Optional: Handle progress updates
+          }
         }
-      }
-    );
+      );
+    } catch (Exception ignored) {
+      isDownloadInProgress.set(false);
+    }
   }
 
   private static void emitSyncError(Exception e) {
     JSONObject syncErrorPayload = new JSONObject();
     try {
-      syncErrorPayload.put("meta", e.toString());
+      String syncErrorString = e.getMessage() != null ? e.getMessage() : "Unknown error";
+      syncErrorPayload.put("meta", syncErrorString);
     } catch (Exception ignored) { }
     StallionEventManager.getInstance().sendEvent(
       NativeProdEventTypes.SYNC_ERROR_PROD.toString(),

package/android/src/main/java/com/stallion/storage/StallionMeta.java

@@ -57,7 +57,7 @@ public class StallionMeta {
 
   public String getActiveReleaseHash() {
     if(!this.prodTempHash.isEmpty()) {
-      return this.prodNewHash;
+      return this.prodTempHash;
     }
     switch (this.currentProdSlot) {
       case NEW_SLOT:

package/ios/main/StallionSyncHandler.swift

@@ -10,17 +10,16 @@ import Foundation
 class StallionSyncHandler {
 
     private static var isSyncInProgress = false
+    private static var isDownloadInProgress = false
     private static let syncQueue = DispatchQueue(label: "com.stallion.syncQueue")
 
-  static func sync() {
+    static func sync() {
           syncQueue.async {
               guard !isSyncInProgress else { return }
               isSyncInProgress = true
           }
 
           DispatchQueue.global().async {
-              defer { isSyncInProgress = false }
-
               do {
                   // Fetch StallionStateManager and StallionConfig
                   let stateManager = StallionStateManager.sharedInstance()
@@ -44,6 +43,7 @@ class StallionSyncHandler {
                   makeApiCall(payload: requestPayload, appVersion: appVersion)
 
               } catch {
+                  defer { isSyncInProgress = false }
                   emitSyncError(error)
               }
           }
@@ -69,17 +69,20 @@ class StallionSyncHandler {
               let jsonData = try JSONSerialization.data(withJSONObject: payload, options: [])
               request.httpBody = jsonData
           } catch {
+              defer { isSyncInProgress = false }
               emitSyncError(error)
               return
           }
 
           let task = URLSession.shared.dataTask(with: request) { data, response, error in
               if let error = error {
+                  defer { isSyncInProgress = false }
                   emitSyncError(error)
                   return
               }
             
               guard let data = data, let httpResponse = response as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+                  defer { isSyncInProgress = false }
                   let responseError = NSError(domain: "Invalid response from server", code: -2)
                   emitSyncError(responseError)
                   return
@@ -88,12 +91,15 @@ class StallionSyncHandler {
               // Parse the JSON response
               do {
                   if let releaseMeta = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                      defer { isSyncInProgress = false }
                       processReleaseMeta(releaseMeta, appVersion: appVersion)
                   } else {
+                      defer { isSyncInProgress = false }
                       let parsingError = NSError(domain: "Invalid JSON format", code: -3)
                       emitSyncError(parsingError)
                   }
               } catch {
+                  defer { isSyncInProgress = false }
                   emitSyncError(error)
               }
           }
@@ -145,6 +151,11 @@ class StallionSyncHandler {
     static func downloadNewRelease(newReleaseHash: String, newReleaseUrl: String) {
         guard let stateManager = StallionStateManager.sharedInstance(),
               let config = stateManager.stallionConfig else { return }
+      
+      syncQueue.async {
+          guard !isDownloadInProgress else { return }
+          isDownloadInProgress = true
+      }
 
       let downloadPath = config.filesDirectory + "/" + StallionConstants.PROD_DIRECTORY + "/" + StallionConstants.TEMP_FOLDER_SLOT
       let projectId = config.projectId ?? ""
@@ -156,6 +167,7 @@ class StallionSyncHandler {
       StallionFileDownloader().downloadBundle(url: fromUrl, downloadDirectory: downloadPath, onProgress: { progress in
         // Handle progress updates if necessary
     }, resolve: { _ in
+      defer { isDownloadInProgress = false }
       stateManager.stallionMeta?.currentProdSlot =  SlotStates.newSlot
       stateManager.stallionMeta?.prodTempHash =  newReleaseHash
       if let currentProdNewHash = stateManager.stallionMeta?.prodNewHash,
@@ -165,6 +177,7 @@ class StallionSyncHandler {
       stateManager.syncStallionMeta()
       emitDownloadSuccess(releaseHash: newReleaseHash)
     }, reject: { code, prefix, error  in
+      defer { isDownloadInProgress = false }
       emitDownloadError(
         releaseHash: newReleaseHash,
         error: "\(String(describing: prefix))\(String(describing: error))"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-stallion",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.5",
   "description": "Offical React Native SDK for Stallion",
   "main": "index",
   "types": "types/index.d.ts",