sync bundling progress between Metro cli and app hints (#55655)

vzaidman · meta-codesync[bot] · commit 887069c48fe1 · 2026-02-23T02:13:20.000-08:00
Summary: Pull Request resolved: #55655 Changelog: [Android][Fixed] sync bundling progress between Metro cli and app hints Reviewed By: cortinico Differential Revision: D93738119
diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/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 {
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BundleDownloader.kt b/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())
           )
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevLoadingViewImplementation.kt b/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 =
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt b/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) {
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevBundleDownloadListener.kt b/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)
 }
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevLoadingViewManager.kt b/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()
 }

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,14 @@ public class DefaultDevLoadingViewImplementation(`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
`54`		`- override fun updateProgress(status: String?, done: Int?, total: Int?) {`
	`54`	`+ override fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?) {`
`55`	`55`	`if (!isEnabled) {`
`56`	`56`	`return`
`57`	`57`	`}`
`58`	`58`	`UiThreadUtil.runOnUiThread {`
`59`	`59`	`val percentage =`
`60`		`- if (done != null && total != null && total > 0)`
	`60`	`+ if (percent != null) String.format(Locale.getDefault(), " %d%%", percent)`
	`61`	`+ else if (done != null && total != null && total > 0)`
`61`	`62`	`String.format(Locale.getDefault(), " %.1f%%", done.toFloat() / total * 100)`
`62`	`63`	`else ""`
`63`	`64`	`devLoadingView?.text =`
Original file line number	Diff line number	Diff line change
`@@ -789,8 +789,8 @@ public abstract class DevSupportManagerBase(`
`789`	`789`	`callback.onSuccess(bundleLoader)`
`790`	`790`	`}`
`791`	`791`
`792`		`- override fun onProgress(status: String?, done: Int?, total: Int?) {`
`793`		`- devLoadingViewManager?.updateProgress(status, done, total)`
	`792`	`+ override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {`
	`793`	`+ devLoadingViewManager?.updateProgress(status, done, total, percent)`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`override fun onFailure(cause: Exception) {`
`@@ -856,9 +856,9 @@ public abstract class DevSupportManagerBase(`
`856`	`856`	`callback.onSuccess()`
`857`	`857`	`}`
`858`	`858`
`859`		`- override fun onProgress(status: String?, done: Int?, total: Int?) {`
`860`		`- devLoadingViewManager?.updateProgress(status, done, total)`
`861`		`- devBundleDownloadListener?.onProgress(status, done, total)`
	`859`	`+ override fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?) {`
	`860`	`+ devLoadingViewManager?.updateProgress(status, done, total, percent)`
	`861`	`+ devBundleDownloadListener?.onProgress(status, done, total, percent)`
`862`	`862`	`}`
`863`	`863`
`864`	`864`	`override fun onFailure(cause: Exception) {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ package com.facebook.react.devsupport.interfaces`
`10`	`10`	`public interface DevBundleDownloadListener {`
`11`	`11`	`public fun onSuccess()`
`12`	`12`
`13`		`- public fun onProgress(status: String?, done: Int?, total: Int?)`
	`13`	`+ public fun onProgress(status: String?, done: Int?, total: Int?, percent: Int?)`
`14`	`14`
`15`	`15`	`public fun onFailure(cause: Exception)`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public interface DevLoadingViewManager {`
`18`	`18`	`dismissButton: Boolean?,`
`19`	`19`	`)`
`20`	`20`
`21`		`- public fun updateProgress(status: String?, done: Int?, total: Int?)`
	`21`	`+ public fun updateProgress(status: String?, done: Int?, total: Int?, percent: Int?)`
`22`	`22`
`23`	`23`	`public fun hide()`
`24`	`24`	`}`