expo-dev-launcher 5.0.2 → 5.0.3

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 5.0.3 — 2024-10-24
+
+### 🐛 Bug fixes
+
+- Fixed network inspector support for react-native 0.76. ([#32290](https://github.com/expo/expo/pull/32290) by [@kudo](https://github.com/kudo))
+
 ## 5.0.2 — 2024-10-24
 
 ### 🎉 New features

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.0.2"
+    versionName "5.0.3"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -107,8 +107,7 @@ class DevLauncherController private constructor() :
 
   private var appIsLoading = false
 
-  @Suppress("unused")
-  private val networkInterceptor = DevLauncherNetworkInterceptor(this)
+  private var networkInterceptor: DevLauncherNetworkInterceptor? = null
 
   private fun isEASUpdateURL(url: Uri): Boolean {
     return url.host.equals("u.expo.dev") || url.host.equals("staging-u.expo.dev")
@@ -192,6 +191,11 @@ class DevLauncherController private constructor() :
     synchronized(this) {
       appIsLoading = false
     }
+    manifestURL?.let {
+      runBlockingOnMainThread {
+        networkInterceptor = DevLauncherNetworkInterceptor(it)
+      }
+    }
   }
 
   override fun onAppLoadedWithError() {
@@ -287,6 +291,8 @@ class DevLauncherController private constructor() :
   private fun ensureHostWasCleared(host: ReactHostWrapper, activityToBeInvalidated: ReactActivity? = null) {
     if (host.hasInstance) {
       runBlockingOnMainThread {
+        networkInterceptor?.close()
+        networkInterceptor = null
         clearHost(host, activityToBeInvalidated)
       }
     }

package/android/src/debug/java/expo/modules/devlauncher/launcher/DevLauncherNetworkInterceptor.kt

@@ -2,113 +2,42 @@
 
 package expo.modules.devlauncher.launcher
 
-import com.facebook.react.bridge.Inspector
-import com.facebook.react.common.LifecycleState
-import com.facebook.react.devsupport.DevServerHelper
-import com.facebook.react.devsupport.DevSupportManagerBase
-import com.facebook.react.devsupport.InspectorPackagerConnection
-import expo.modules.devlauncher.DevLauncherController
-import expo.interfaces.devmenu.ReactHostWrapper
+import android.net.Uri
+import com.facebook.react.packagerconnection.ReconnectingWebSocket
 import expo.modules.kotlin.devtools.ExpoRequestCdpInterceptor
 import java.io.Closeable
-import java.lang.ref.WeakReference
-import java.lang.reflect.Field
-import java.lang.reflect.Method
 
-internal class DevLauncherNetworkInterceptor(controller: DevLauncherController) : Closeable, ExpoRequestCdpInterceptor.Delegate {
-  private val weakController = WeakReference(controller)
-  private var reactHostHashCode: Int = 0
-  private var _inspectorPackagerConnection: InspectorPackagerConnectionWrapper? = null
-
-  private val inspectorPackagerConnection: InspectorPackagerConnectionWrapper
-    get() {
-      val reactHost = requireNotNull(weakController.get()?.appHost)
-      if (reactHostHashCode != reactHost.hashCode()) {
-        _inspectorPackagerConnection?.clear()
-        _inspectorPackagerConnection = null
-        reactHostHashCode = 0
-      }
-      if (_inspectorPackagerConnection == null) {
-        _inspectorPackagerConnection = InspectorPackagerConnectionWrapper(reactHost)
-        reactHostHashCode = reactHost.hashCode()
-      }
-      return requireNotNull(_inspectorPackagerConnection)
+internal class DevLauncherNetworkInterceptor(appUrl: Uri) : Closeable, ExpoRequestCdpInterceptor.Delegate {
+  private val metroConnection = ReconnectingWebSocket(
+    createNetworkInspectorUrl(appUrl),
+    null,
+    null
+  )
+    .apply {
+      connect()
     }
 
   init {
     ExpoRequestCdpInterceptor.setDelegate(this)
   }
 
-  /**
-   * Returns true when it is allowed to send CDP events
-   */
-  private fun shouldEmitEvents(): Boolean {
-    return DevLauncherController.wasInitialized() && weakController.get()?.appHost?.lifecycleState == LifecycleState.RESUMED
-  }
-
   //region Closeable implementations
   override fun close() {
     ExpoRequestCdpInterceptor.setDelegate(null)
+    metroConnection.closeQuietly()
   }
   //endregion Closeable implementations
 
   //region ExpoRequestCdpInterceptor.Delegate implementations
   override fun dispatch(event: String) {
-    if (shouldEmitEvents()) {
-      inspectorPackagerConnection.sendWrappedEventToAllPages(event)
-    }
+    metroConnection.sendMessage(event)
   }
   //endregion ExpoRequestCdpInterceptor.Delegate implementations
 }
 
-/**
- * A `InspectorPackagerConnection` wrapper to expose private members with reflection
- */
-internal class InspectorPackagerConnectionWrapper constructor(reactHost: ReactHostWrapper) {
-  private var inspectorPackagerConnectionWeak: WeakReference<InspectorPackagerConnection> = WeakReference(null)
-  private val devServerHelperWeak: WeakReference<DevServerHelper>
-  private val inspectorPackagerConnectionField: Field
-  private val sendWrappedEventMethod: Method
-
-  private val inspectorPackagerConnection: InspectorPackagerConnection?
-    get() {
-      var inspectorPackagerConnection = inspectorPackagerConnectionWeak.get()
-      if (inspectorPackagerConnection == null) {
-        val devServerHelper = devServerHelperWeak.get() ?: return null
-        inspectorPackagerConnection = inspectorPackagerConnectionField[devServerHelper] as? InspectorPackagerConnection
-
-        if (inspectorPackagerConnection != null) {
-          inspectorPackagerConnectionWeak = WeakReference(inspectorPackagerConnection)
-        }
-      }
-      return inspectorPackagerConnection
-    }
-
-  init {
-    val devSupportManager = requireNotNull(reactHost.devSupportManager)
-    val devSupportManagerBaseClass = DevSupportManagerBase::class.java
-    val mDevServerHelperField = devSupportManagerBaseClass.getDeclaredField("mDevServerHelper")
-    mDevServerHelperField.isAccessible = true
-    val devServerHelper = mDevServerHelperField[devSupportManager]
-    devServerHelperWeak = WeakReference(devServerHelper as DevServerHelper)
-
-    inspectorPackagerConnectionField = DevServerHelper::class.java.getDeclaredField("mInspectorPackagerConnection")
-    inspectorPackagerConnectionField.isAccessible = true
-
-    sendWrappedEventMethod = InspectorPackagerConnection::class.java.getDeclaredMethod("sendWrappedEvent", String::class.java, String::class.java)
-    sendWrappedEventMethod.isAccessible = true
-  }
-
-  fun clear() {
-    inspectorPackagerConnectionWeak.clear()
-  }
-
-  fun sendWrappedEventToAllPages(event: String) {
-    val inspectorPackagerConnection = this.inspectorPackagerConnection ?: return
-    for (page in Inspector.getPages()) {
-      if (!page.title.contains("Reanimated")) {
-        sendWrappedEventMethod.invoke(inspectorPackagerConnection, page.id.toString(), event)
-      }
-    }
-  }
+private fun createNetworkInspectorUrl(appUrl: Uri): String {
+  val host = appUrl.host ?: "localhost"
+  val port = if (appUrl.port > 0) appUrl.port else 8081
+  val scheme = if (appUrl.scheme == "https") "wss" else "ws"
+  return "$scheme://$host:$port/inspector/network"
 }

package/ios/DevLauncherNetworkInterceptor.swift

@@ -9,18 +9,18 @@ var isHookInstalled = false
 
 @objc(EXDevLauncherNetworkInterceptor)
 public final class DevLauncherNetworkInterceptor: NSObject, ExpoRequestCdpInterceptorDelegate {
-  fileprivate static var inspectorPackagerConn: RCTInspectorPackagerConnection?
+  private let metroConnection: RCTReconnectingWebSocket
 
-  public override init() {
-    super.init()
+  @objc
+  public init(bundleUrl: URL) {
     assert(Thread.isMainThread)
+    self.metroConnection = RCTReconnectingWebSocket(
+      url: Self.createNetworkInspectorUrl(bundleUrl: bundleUrl),
+      queue: .main)
+    self.metroConnection.start()
+    super.init()
 
     if !isHookInstalled {
-      EXDevLauncherUtils.swizzleClassMethod(
-        selector: #selector(RCTInspectorDevServerHelper.connect(withBundleURL:)),
-        withSelector: #selector(RCTInspectorDevServerHelper.EXDevLauncher_connect(withBundleURL:)),
-        forClass: RCTInspectorDevServerHelper.self
-      )
       EXDevLauncherUtils.swizzleClassMethod(
         selector: #selector(getter: URLSessionConfiguration.default),
         withSelector: #selector(URLSessionConfiguration.EXDevLauncher_urlSessionConfiguration),
@@ -35,70 +35,24 @@ public final class DevLauncherNetworkInterceptor: NSObject, ExpoRequestCdpInterc
   deinit {
     assert(Thread.isMainThread)
     ExpoRequestCdpInterceptor.shared.setDelegate(nil)
+    self.metroConnection.stop()
   }
 
-  // MARK: ExpoRequestCdpInterceptorDelegate implementations
-
-  public func dispatch(_ event: String) {
-    Self.inspectorPackagerConn?.sendWrappedEventToAllPages(event)
-  }
-}
-
-extension RCTInspectorDevServerHelper {
-  private typealias ConnectFunc = @convention(c) (AnyObject, Selector, URL)
-    -> RCTInspectorPackagerConnection?
-
-  /**
-   Swizzled `RCTInspectorDevServerHelper.connect(withBundleURL:)` for us to get the `RCTInspectorPackagerConnection` instance
-   */
-  @objc
-  static func EXDevLauncher_connect(withBundleURL bundleURL: URL)
-    -> RCTInspectorPackagerConnection? {
-    let inspectorPackagerConn = try? EXDevLauncherUtils.invokeOriginalClassMethod(
-      selector: #selector(RCTInspectorDevServerHelper.connect(withBundleURL:)),
-      forClass: RCTInspectorDevServerHelper.self,
-      A0: bundleURL
-    ) as? RCTInspectorPackagerConnection
-
-    // Exclude the connections for dev-client bundles
-    if !bundleURL.absoluteString.starts(with: Bundle.main.bundleURL.absoluteString) {
-      DevLauncherNetworkInterceptor.inspectorPackagerConn = inspectorPackagerConn
+  private static func createNetworkInspectorUrl(bundleUrl: URL) -> URL {
+    let host = bundleUrl.host ?? "localhost"
+    let port = bundleUrl.port ?? 8081
+    let scheme = bundleUrl.scheme == "https" ? "wss" : "ws"
+    let urlString = "\(scheme)://\(host):\(port)/inspector/network"
+    guard let url = URL(string: urlString) else {
+      fatalError("Invalid network inspector URL: \(urlString)")
     }
-    return inspectorPackagerConn
+    return url
   }
-}
 
-extension RCTInspectorPackagerConnection {
-  /**
-   Indicates whether the packager connection is established and ready to send messages
-   */
-  func isReadyToSend() -> Bool {
-    guard isConnected() else {
-      return false
-    }
-    guard let webSocket = value(forKey: "_webSocket") as? AnyObject,
-      let readyState = webSocket.value(forKey: "readyState") as? Int else {
-      return false
-    }
-    // To support both RCTSRWebSocket (RN < 0.72) and SRWebSocket (RN >= 0.72)
-    // and not to introduce extra podspec dependencies,
-    // we use the internal and hardcoded value here.
-    // Given the fact that both RCTSRWebSocket and SRWebSocket has the readyState property
-    // and the open state is 1.
-    let OPEN_STATE = 1
-    return readyState == OPEN_STATE
-  }
+  // MARK: ExpoRequestCdpInterceptorDelegate implementations
 
-  /**
-   Sends message from native to inspector proxy
-   */
-  func sendWrappedEventToAllPages(_ event: String) {
-    guard isReadyToSend() else {
-      return
-    }
-    for page in RCTInspector.pages() where !page.title.contains("Reanimated") {
-      perform(NSSelectorFromString("sendWrappedEvent:message:"), with: String(page.id), with: event)
-    }
+  public func dispatch(_ event: String) {
+    self.metroConnection.send(Data(event.utf8))
   }
 }
 

package/ios/EXDevLauncherController.m

@@ -56,7 +56,7 @@
 @property (nonatomic, strong) NSURL *possibleManifestURL;
 @property (nonatomic, strong) EXDevLauncherErrorManager *errorManager;
 @property (nonatomic, strong) EXDevLauncherInstallationIDHelper *installationIDHelper;
-@property (nonatomic, strong) EXDevLauncherNetworkInterceptor *networkInterceptor;
+@property (nonatomic, strong, nullable) EXDevLauncherNetworkInterceptor *networkInterceptor;
 @property (nonatomic, assign) BOOL isStarted;
 @property (nonatomic, strong) EXDevLauncherAppDelegate *appDelegate;
 @property (nonatomic, strong) NSURL *lastOpenedAppUrl;
@@ -84,7 +84,6 @@
     self.pendingDeepLinkRegistry = [EXDevLauncherPendingDeepLinkRegistry new];
     self.errorManager = [[EXDevLauncherErrorManager alloc] initWithController:self];
     self.installationIDHelper = [EXDevLauncherInstallationIDHelper new];
-    self.networkInterceptor = [EXDevLauncherNetworkInterceptor new];
     self.shouldPreferUpdatesInterfaceSourceUrl = NO;
 
     __weak __typeof(self) weakSelf = self;
@@ -323,6 +322,7 @@
 
   self.manifest = nil;
   self.manifestURL = nil;
+  self.networkInterceptor = nil;
 
   [self _applyUserInterfaceStyle:UIUserInterfaceStyleUnspecified];
 
@@ -576,6 +576,7 @@
     if (![bundleUrl.scheme isEqualToString:@"file"]) {
       [[RCTPackagerConnection sharedPackagerConnection] setSocketConnectionURL:bundleUrl];
     }
+    self.networkInterceptor = [[EXDevLauncherNetworkInterceptor alloc] initWithBundleUrl:bundleUrl];
 #endif
 
     UIUserInterfaceStyle userInterfaceStyle = [EXDevLauncherManifestHelper exportManifestUserInterfaceStyle:manifest.userInterfaceStyle];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -66,5 +66,5 @@
     ],
     "testTimeout": 15000
   },
-  "gitHead": "0a07b965c4bef67e7718355a0dc770d524ad3cee"
+  "gitHead": "2e4f18d41da033c5ced0a4a045d91cf5250016b7"
 }