sync bundling progress between Metro cli and app hints

packages/react-native/React/Base/RCTJavaScriptLoader.h

@@ -33,6 +33,7 @@ NS_ENUM(NSInteger){
 @property (nonatomic, copy) NSString *status;
 @property (strong, nonatomic) NSNumber *done;
 @property (strong, nonatomic) NSNumber *total;
+@property (strong, nonatomic) NSNumber *percent;
 
 @end
 

packages/react-native/React/Base/RCTJavaScriptLoader.mm

@@ -53,8 +53,9 @@ - (NSString *)description
 {
   NSMutableString *desc = [NSMutableString new];
   [desc appendString:_status ?: @"Bundling"];
-
-  if ([_total integerValue] > 0 && [_done integerValue] > [_total integerValue]) {
+  if (_percent != nil) {
+    [desc appendFormat:@" %ld%%", (long)[_percent integerValue]];
+  } else if ([_total integerValue] > 0 && [_done integerValue] > [_total integerValue]) {
     [desc appendFormat:@" %ld%%", (long)100];
   } else if ([_total integerValue] > 0) {
     [desc appendFormat:@" %ld%%", (long)(100 * [_done integerValue] / [_total integerValue])];
@@ -348,6 +349,9 @@ static void attemptAsynchronousLoadOfBundleAtURL(
   progress.status = info[@"status"];
   progress.done = info[@"done"];
   progress.total = info[@"total"];
+  if (info[@"percent"] != nil) {
+    progress.percent = info[@"percent"];
+  }
   return progress;
 }
 

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -1864,7 +1864,7 @@ public final class com/facebook/react/devsupport/DefaultDevLoadingViewImplementa
 	public fun hide ()V
 	public fun showMessage (Ljava/lang/String;)V
 	public fun showMessage (Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Boolean;)V
-	public fun updateProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)V
+	public fun updateProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
 }
 
 public final class com/facebook/react/devsupport/DefaultDevLoadingViewImplementation$Companion {
@@ -2108,15 +2108,15 @@ public abstract interface class com/facebook/react/devsupport/interfaces/BundleL
 
 public abstract interface class com/facebook/react/devsupport/interfaces/DevBundleDownloadListener {
 	public abstract fun onFailure (Ljava/lang/Exception;)V
-	public abstract fun onProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)V
+	public abstract fun onProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
 	public abstract fun onSuccess ()V
 }
 
 public abstract interface class com/facebook/react/devsupport/interfaces/DevLoadingViewManager {
 	public abstract fun hide ()V
 	public abstract fun showMessage (Ljava/lang/String;)V
 	public abstract fun showMessage (Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;Ljava/lang/Boolean;)V
-	public abstract fun updateProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;)V
+	public abstract fun updateProgress (Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V
 }
 
 public abstract interface class com/facebook/react/devsupport/interfaces/DevOptionHandler {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt

@@ -169,12 +169,12 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
           DebugServerException(
               ("""
                     Error while reading multipart response.
-                    
+
                     Response body was empty: ${response.code()}
-                    
+
                     URL: $url
-                    
-                    
+
+
                     """
                   .trimIndent())
           )
@@ -231,7 +231,11 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
                     if (progress.has("total")) {
                       total = progress.getInt("total")
                     }
-                    callback.onProgress(status, done, total)
+                    var percent: Int? = null
+                    if (progress.has("percent")) {
+                      percent = progress.getInt("percent")
+                    }
+                    callback.onProgress(status, done, total, percent)
                   } catch (e: JSONException) {
                     FLog.e(ReactConstants.TAG, "Error parsing progress JSON. $e")
                   }
@@ -248,6 +252,7 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
                       "Downloading",
                       (loaded / 1024).toInt(),
                       (total / 1024).toInt(),
+                      null,
                   )
                 }
               }
@@ -258,12 +263,12 @@ public class BundleDownloader public constructor(private val client: OkHttpClien
           DebugServerException(
               ("""
                     Error while reading multipart response.
-                    
+
                     Response code: ${response.code()}
-                    
+
                     URL: $url
-                    
-                    
+
+
                     """
                   .trimIndent())
           )

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt

@@ -51,13 +51,14 @@ public class DefaultDevLoadingViewImplementation(
     }
   }
 
-  override fun updateProgress(status: String?, done: Int?, total: Int?) {
+  override fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
     if (!isEnabled) {
       return
     }
     UiThreadUtil.runOnUiThread {
       val percentage =
-          if (done != null && total != null && total > 0)
+          if (percent != null) String.format(Locale.getDefault(), " %d%%", percent)
+          else if (done != null && total != null && total > 0)
               String.format(Locale.getDefault(), " %.1f%%", done.toFloat() / total * 100)
           else ""
       devLoadingView?.text =

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -789,8 +789,8 @@ public abstract class DevSupportManagerBase(
               callback.onSuccess(bundleLoader)
             }
 
-            override fun onProgress(status: String?, done: Int?, total: Int?) {
-              devLoadingViewManager?.updateProgress(status, done, total)
+            override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
+              devLoadingViewManager?.updateProgress(status, done, total, percent)
             }
 
             override fun onFailure(cause: Exception) {
@@ -856,9 +856,9 @@ public abstract class DevSupportManagerBase(
             callback.onSuccess()
           }
 
-          override fun onProgress(status: String?, done: Int?, total: Int?) {
-            devLoadingViewManager?.updateProgress(status, done, total)
-            devBundleDownloadListener?.onProgress(status, done, total)
+          override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {
+            devLoadingViewManager?.updateProgress(status, done, total, percent)
+            devBundleDownloadListener?.onProgress(status, done, total, percent)
           }
 
           override fun onFailure(cause: Exception) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.kt

@@ -10,7 +10,7 @@ package com.facebook.react.devsupport.interfaces
 public interface DevBundleDownloadListener {
   public fun onSuccess()
 
-  public fun onProgress(status: String?, done: Int?, total: Int?)
+  public fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?)
 
   public fun onFailure(cause: Exception)
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevLoadingViewManager.kt

@@ -18,7 +18,7 @@ public interface DevLoadingViewManager {
       dismissButton: Boolean?,
   )
 
-  public fun updateProgress(status: String?, done: Int?, total: Int?)
+  public fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?)
 
   public fun hide()
 }