react-native-tvos 0.79.2-0 → 0.80.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/OkHttpCompat.java

@@ -7,6 +7,8 @@
 
 package com.facebook.react.modules.network;
 
+import androidx.annotation.Nullable;
+import com.facebook.infer.annotation.Nullsafe;
 import java.util.Collections;
 import java.util.Map;
 import okhttp3.Headers;
@@ -20,12 +22,13 @@ import okhttp3.OkHttpClient;
  * different RN platform environments, and then consider getting rid of this compat layer
  * altogether.
  */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 public class OkHttpCompat {
   public static CookieJarContainer getCookieJarContainer(OkHttpClient client) {
     return (CookieJarContainer) client.cookieJar();
   }
 
-  public static Headers getHeadersFromMap(Map<String, String> headers) {
+  public static Headers getHeadersFromMap(@Nullable Map<String, String> headers) {
     if (headers == null) {
       return Headers.of(Collections.emptyMap());
     } else {

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressResponseBody.kt

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+@file:Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+
+package com.facebook.react.modules.network
+
+import java.io.IOException
+import okhttp3.MediaType
+import okhttp3.ResponseBody
+import okio.Buffer
+import okio.BufferedSource
+import okio.ForwardingSource
+import okio.Okio
+import okio.Source
+
+public class ProgressResponseBody
+public constructor(
+    private val responseBody: ResponseBody,
+    private val progressListener: ProgressListener
+) : ResponseBody() {
+  private lateinit var bufferedSource: BufferedSource
+  private var totalBytesRead = 0L
+
+  public override fun contentType(): MediaType? = responseBody.contentType()
+
+  override fun contentLength(): Long = responseBody.contentLength()
+
+  public fun totalBytesRead(): Long = totalBytesRead
+
+  public override fun source(): BufferedSource {
+    if (!::bufferedSource.isInitialized) {
+      bufferedSource = Okio.buffer(source(responseBody.source()))
+    }
+    return bufferedSource
+  }
+
+  private fun source(source: Source): Source {
+    return object : ForwardingSource(source) {
+      @Throws(IOException::class)
+      override fun read(sink: Buffer, byteCount: Long): Long {
+        // read() returns the number of bytes read, or -1 if this source is exhausted.
+        return super.read(sink, byteCount).also { bytesRead ->
+          if (bytesRead != -1L) {
+            totalBytesRead += bytesRead
+          }
+          progressListener.onProgress(
+              totalBytesRead, responseBody.contentLength(), bytesRead == -1L)
+        }
+      }
+    }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/PermissionsModule.kt

@@ -48,7 +48,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
    * message is only displayed if the user has revoked this permission once before, and if the
    * permission dialog will be shown to the user (the user can choose to not be shown that dialog
    * again). For devices before Android M, this always returns false. See
-   * [permissionAwareActivity.shouldShowRequestPermissionRationale].
+   * [PermissionAwareActivity.shouldShowRequestPermissionRationale].
    */
   public override fun shouldShowRequestPermissionRationale(
       permission: String,
@@ -175,7 +175,7 @@ public class PermissionsModule(reactContext: ReactApplicationContext?) :
 
   private val permissionAwareActivity: PermissionAwareActivity
     get() {
-      val activity = getCurrentActivity()
+      val activity = reactApplicationContext.getCurrentActivity()
       checkNotNull(activity) { "Tried to use permissions API while not attached to an Activity." }
       check(activity is PermissionAwareActivity) {
         ("Tried to use permissions API but the host Activity doesn't implement PermissionAwareActivity.")

package/ReactAndroid/src/main/java/com/facebook/react/modules/share/ShareModule.kt

@@ -17,7 +17,7 @@ import com.facebook.react.module.annotations.ReactModule
 
 /** Intent module. Launch other activities or open URLs. */
 @ReactModule(name = NativeShareModuleSpec.NAME)
-public class ShareModule(reactContext: ReactApplicationContext) :
+internal class ShareModule(reactContext: ReactApplicationContext) :
     NativeShareModuleSpec(reactContext) {
 
   /**
@@ -28,7 +28,7 @@ public class ShareModule(reactContext: ReactApplicationContext) :
    * @param content the data to send
    * @param dialogTitle the title of the chooser dialog
    */
-  public override fun share(content: ReadableMap?, dialogTitle: String?, promise: Promise) {
+  override fun share(content: ReadableMap?, dialogTitle: String?, promise: Promise) {
     if (content == null) {
       promise.reject(ERROR_INVALID_CONTENT, "Content cannot be null")
       return
@@ -44,7 +44,7 @@ public class ShareModule(reactContext: ReactApplicationContext) :
       }
       val chooser = Intent.createChooser(intent, dialogTitle)
       chooser.addCategory(Intent.CATEGORY_DEFAULT)
-      val currentActivity = getCurrentActivity()
+      val currentActivity = reactApplicationContext.getCurrentActivity()
       if (currentActivity != null) {
         currentActivity.startActivity(chooser)
       } else {
@@ -58,10 +58,10 @@ public class ShareModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  public companion object {
-    public const val NAME: String = NativeShareModuleSpec.NAME
+  companion object {
+    const val NAME: String = NativeShareModuleSpec.NAME
     private const val ACTION_SHARED: String = "sharedAction"
-    public const val ERROR_INVALID_CONTENT: String = "E_INVALID_CONTENT"
+    const val ERROR_INVALID_CONTENT: String = "E_INVALID_CONTENT"
     private const val ERROR_UNABLE_TO_OPEN_DIALOG: String = "E_UNABLE_TO_OPEN_DIALOG"
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/sound/SoundManagerModule.kt

@@ -16,15 +16,15 @@ import com.facebook.react.module.annotations.ReactModule
 
 /** [NativeModule] that allows Playing device sounds from JS. */
 @ReactModule(name = NativeSoundManagerSpec.NAME)
-public class SoundManagerModule(reactContext: ReactApplicationContext?) :
+internal class SoundManagerModule(reactContext: ReactApplicationContext?) :
     NativeSoundManagerSpec(reactContext) {
-  public override fun playTouchSound() {
+  override fun playTouchSound() {
     val audioManager =
         getReactApplicationContext().getSystemService(Context.AUDIO_SERVICE) as AudioManager
     audioManager.playSoundEffect(AudioManager.FX_KEY_CLICK)
   }
 
-  public companion object {
-    public const val NAME: String = NativeSoundManagerSpec.NAME
+  companion object {
+    const val NAME: String = NativeSoundManagerSpec.NAME
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt

@@ -29,13 +29,13 @@ import com.facebook.react.views.view.setStatusBarVisibility
 
 /** [NativeModule] that allows changing the appearance of the status bar. */
 @ReactModule(name = NativeStatusBarManagerAndroidSpec.NAME)
-public class StatusBarModule(reactContext: ReactApplicationContext?) :
+internal class StatusBarModule(reactContext: ReactApplicationContext?) :
     NativeStatusBarManagerAndroidSpec(reactContext) {
 
   @Suppress("DEPRECATION")
   override fun getTypedExportedConstants(): Map<String, Any> {
     val statusBarColor =
-        currentActivity?.window?.statusBarColor?.let { color ->
+        reactApplicationContext.getCurrentActivity()?.window?.statusBarColor?.let { color ->
           String.format("#%06X", 0xFFFFFF and color)
         } ?: "black"
     return mapOf(
@@ -44,10 +44,13 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
     )
   }
 
-  @Suppress("DEPRECATION")
   private fun getStatusBarHeightPx(): Float {
     val windowInsets =
-        currentActivity?.window?.decorView?.let(ViewCompat::getRootWindowInsets) ?: return 0f
+        reactApplicationContext
+            .getCurrentActivity()
+            ?.window
+            ?.decorView
+            ?.let(ViewCompat::getRootWindowInsets) ?: return 0f
     return windowInsets
         .getInsets(
             WindowInsetsCompat.Type.statusBars() or
@@ -60,7 +63,7 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
   @Suppress("DEPRECATION")
   override fun setColor(colorDouble: Double, animated: Boolean) {
     val color = colorDouble.toInt()
-    val activity = currentActivity
+    val activity = reactApplicationContext.getCurrentActivity()
     if (activity == null) {
       FLog.w(
           ReactConstants.TAG,
@@ -87,9 +90,8 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
         })
   }
 
-  @Suppress("DEPRECATION")
   override fun setTranslucent(translucent: Boolean) {
-    val activity = currentActivity
+    val activity = reactApplicationContext.getCurrentActivity()
     if (activity == null) {
       FLog.w(
           ReactConstants.TAG,
@@ -104,9 +106,8 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
         })
   }
 
-  @Suppress("DEPRECATION")
   override fun setHidden(hidden: Boolean) {
-    val activity = currentActivity
+    val activity = reactApplicationContext.getCurrentActivity()
     if (activity == null) {
       FLog.w(
           ReactConstants.TAG,
@@ -118,7 +119,7 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
 
   @Suppress("DEPRECATION")
   override fun setStyle(style: String?) {
-    val activity = currentActivity
+    val activity = reactApplicationContext.getCurrentActivity()
     if (activity == null) {
       FLog.w(
           ReactConstants.TAG,
@@ -153,9 +154,9 @@ public class StatusBarModule(reactContext: ReactApplicationContext?) :
         })
   }
 
-  public companion object {
+  companion object {
     private const val HEIGHT_KEY = "HEIGHT"
     private const val DEFAULT_BACKGROUND_COLOR_KEY = "DEFAULT_BACKGROUND_COLOR"
-    public const val NAME: String = NativeStatusBarManagerAndroidSpec.NAME
+    const val NAME: String = NativeStatusBarManagerAndroidSpec.NAME
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt

@@ -30,10 +30,14 @@ public object AndroidInfoHelpers {
   private fun isRunningOnStockEmulator(): Boolean =
       Build.FINGERPRINT.contains("generic") || Build.FINGERPRINT.startsWith("google/sdk_gphone")
 
-  @JvmStatic public fun getServerHost(port: Int): String = getServerIpAddress(port)
+  @JvmStatic public fun getServerHost(port: Int): String = getServerIpAddress(null, port)
 
   @JvmStatic
-  public fun getServerHost(context: Context): String = getServerIpAddress(getDevServerPort(context))
+  public fun getServerHost(context: Context): String =
+      getServerIpAddress(context, getDevServerPort(context))
+
+  @JvmStatic
+  public fun getServerHost(context: Context, port: Int): String = getServerIpAddress(context, port)
 
   @JvmStatic
   public fun getAdbReverseTcpCommand(port: Int): String = "adb reverse tcp:$port tcp:$port"
@@ -86,7 +90,7 @@ public object AndroidInfoHelpers {
   private fun getDevServerPort(context: Context): Int =
       context.resources.getInteger(R.integer.react_native_dev_server_port)
 
-  private fun getServerIpAddress(port: Int): String {
+  private fun getServerIpAddress(context: Context?, port: Int): String {
     val ipAddress: String =
         when {
           getMetroHostPropValue().isNotEmpty() -> getMetroHostPropValue()
@@ -97,6 +101,13 @@ public object AndroidInfoHelpers {
     return String.format(Locale.US, "%s:%d", ipAddress, port)
   }
 
+  /**
+   * Returns the devserver Network IP from the local network (LAN/Wifi) so that a physical device
+   * could connect to the bundler through it.
+   */
+  internal fun getDevServerNetworkIpAndPort(context: Context): String =
+      "${context.resources.getString(R.string.react_native_dev_server_ip)}:${getDevServerPort(context)}"
+
   @Synchronized
   private fun getMetroHostPropValue(): String {
     if (metroHostPropValue != null) {

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoModule.kt

@@ -25,11 +25,6 @@ import com.facebook.react.module.annotations.ReactModule
 public class AndroidInfoModule(reactContext: ReactApplicationContext) :
     NativePlatformConstantsAndroidSpec(reactContext) {
 
-  private companion object {
-    private const val IS_TESTING = "IS_TESTING"
-    private const val IS_DISABLE_ANIMATIONS = "IS_DISABLE_ANIMATIONS"
-  }
-
   /**
    * See:
    * https://developer.android.com/reference/android/app/UiModeManager.html#getCurrentModeType()
@@ -84,4 +79,10 @@ public class AndroidInfoModule(reactContext: ReactApplicationContext) :
       false
     }
   }
+
+  public companion object {
+    public const val NAME: String = NativePlatformConstantsAndroidSpec.NAME
+    private const val IS_TESTING = "IS_TESTING"
+    private const val IS_DISABLE_ANIMATIONS = "IS_DISABLE_ANIMATIONS"
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by scripts/releases/set-version.js
+ */
+
+package com.facebook.react.modules.systeminfo
+
+public object ReactNativeVersion {
+  @JvmField
+  public val VERSION: Map<String, Any?> = mapOf(
+    "major" to 0,
+    "minor" to 80,
+    "patch" to 0,
+    "prerelease" to null
+  )
+}

package/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt

@@ -17,10 +17,10 @@ import com.facebook.react.module.annotations.ReactModule
 
 /** [NativeModule] that allows JS to show an Android Toast. */
 @ReactModule(name = NativeToastAndroidSpec.NAME)
-public class ToastModule(reactContext: ReactApplicationContext) :
+internal class ToastModule(reactContext: ReactApplicationContext) :
     NativeToastAndroidSpec(reactContext) {
 
-  public override fun getTypedExportedConstants(): Map<String, Any> =
+  override fun getTypedExportedConstants(): Map<String, Any> =
       mutableMapOf(
           DURATION_SHORT_KEY to Toast.LENGTH_SHORT,
           DURATION_LONG_KEY to Toast.LENGTH_LONG,
@@ -29,17 +29,13 @@ public class ToastModule(reactContext: ReactApplicationContext) :
           GRAVITY_CENTER to (Gravity.CENTER_HORIZONTAL or Gravity.CENTER_VERTICAL),
       )
 
-  public override fun show(message: String?, durationDouble: Double) {
+  override fun show(message: String?, durationDouble: Double) {
     val duration = durationDouble.toInt()
     UiThreadUtil.runOnUiThread(
         Runnable { Toast.makeText(getReactApplicationContext(), message, duration).show() })
   }
 
-  public override fun showWithGravity(
-      message: String?,
-      durationDouble: Double,
-      gravityDouble: Double
-  ) {
+  override fun showWithGravity(message: String?, durationDouble: Double, gravityDouble: Double) {
     val duration = durationDouble.toInt()
     val gravity = gravityDouble.toInt()
     UiThreadUtil.runOnUiThread(
@@ -50,7 +46,7 @@ public class ToastModule(reactContext: ReactApplicationContext) :
         })
   }
 
-  public override fun showWithGravityAndOffset(
+  override fun showWithGravityAndOffset(
       message: String?,
       durationDouble: Double,
       gravityDouble: Double,
@@ -69,8 +65,8 @@ public class ToastModule(reactContext: ReactApplicationContext) :
         })
   }
 
-  public companion object {
-    public const val NAME: String = NativeToastAndroidSpec.NAME
+  companion object {
+    const val NAME: String = NativeToastAndroidSpec.NAME
     private const val DURATION_SHORT_KEY = "SHORT"
     private const val DURATION_LONG_KEY = "LONG"
     private const val GRAVITY_TOP_KEY = "TOP"

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/FileIoHandler.kt

@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.packagerconnection
+
+import android.os.Handler
+import android.os.Looper
+import android.util.Base64
+import com.facebook.common.logging.FLog
+import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.io.IOException
+import org.json.JSONObject
+
+public class FileIoHandler : Runnable {
+
+  private class TtlFileInputStream(path: String?) {
+    private val stream = FileInputStream(path)
+    private var ttl: Long = System.currentTimeMillis() + FILE_TTL
+
+    private fun extendTtl() {
+      ttl = System.currentTimeMillis() + FILE_TTL
+    }
+
+    fun expiredTtl(): Boolean = System.currentTimeMillis() >= ttl
+
+    @Throws(IOException::class)
+    fun read(size: Int): String {
+      extendTtl()
+      val buffer = ByteArray(size)
+      val bytesRead = stream.read(buffer)
+      return Base64.encodeToString(buffer, 0, bytesRead, Base64.DEFAULT)
+    }
+
+    @Throws(IOException::class)
+    fun close() {
+      stream.close()
+    }
+  }
+
+  private var nextHandle = 1
+  private val handler = Handler(Looper.getMainLooper())
+  private val openFiles: MutableMap<Int, TtlFileInputStream> = mutableMapOf()
+  private val requestHandlers: MutableMap<String, RequestHandler> = mutableMapOf()
+
+  init {
+    requestHandlers["fopen"] =
+        object : RequestOnlyHandler() {
+          override fun onRequest(params: Any?, responder: Responder) {
+            synchronized(openFiles) {
+              try {
+                val paramsObj =
+                    params as JSONObject?
+                        ?: throw Exception(
+                            "params must be an object { mode: string, filename: string }")
+                val mode = paramsObj.optString("mode") ?: throw Exception("missing params.mode")
+                val filename =
+                    paramsObj.optString("filename") ?: throw Exception("missing params.filename")
+                require(mode == "r") { "unsupported mode: $mode" }
+
+                responder.respond(addOpenFile(filename))
+              } catch (e: Exception) {
+                responder.error(e.toString())
+              }
+            }
+          }
+        }
+    requestHandlers["fclose"] =
+        object : RequestOnlyHandler() {
+          override fun onRequest(params: Any?, responder: Responder) {
+            synchronized(openFiles) {
+              try {
+                if (params !is Number) {
+                  throw Exception("params must be a file handle")
+                }
+                val stream =
+                    openFiles[params]
+                        ?: throw Exception("invalid file handle, it might have timed out")
+
+                openFiles.remove(params)
+                stream.close()
+                responder.respond("")
+              } catch (e: Exception) {
+                responder.error(e.toString())
+              }
+            }
+          }
+        }
+    requestHandlers["fread"] =
+        object : RequestOnlyHandler() {
+          override fun onRequest(params: Any?, responder: Responder) {
+            synchronized(openFiles) {
+              try {
+                val paramsObj =
+                    params as JSONObject?
+                        ?: throw Exception(
+                            "params must be an object { file: handle, size: number }")
+                val file = paramsObj.optInt("file")
+                if (file == 0) {
+                  throw Exception("invalid or missing file handle")
+                }
+                val size = paramsObj.optInt("size")
+                if (size == 0) {
+                  throw Exception("invalid or missing read size")
+                }
+                val stream =
+                    openFiles[file]
+                        ?: throw Exception("invalid file handle, it might have timed out")
+
+                responder.respond(stream.read(size))
+              } catch (e: Exception) {
+                responder.error(e.toString())
+              }
+            }
+          }
+        }
+  }
+
+  public fun handlers(): Map<String, RequestHandler> = requestHandlers
+
+  @Throws(FileNotFoundException::class)
+  private fun addOpenFile(filename: String): Int {
+    val handle = nextHandle++
+    openFiles[handle] = TtlFileInputStream(filename)
+    if (openFiles.size == 1) {
+      handler.postDelayed(this@FileIoHandler, FILE_TTL)
+    }
+    return handle
+  }
+
+  override fun run() {
+    // clean up files that are past their expiry date
+    synchronized(openFiles) {
+      openFiles.entries.removeAll { (_, stream) ->
+        if (stream.expiredTtl()) {
+          try {
+            stream.close()
+          } catch (e: IOException) {
+            FLog.e(TAG, "Failed to close expired file", e)
+          }
+          true
+        } else {
+          false
+        }
+      }
+
+      if (openFiles.isNotEmpty()) {
+        handler.postDelayed(this, FILE_TTL)
+      }
+    }
+  }
+
+  private companion object {
+    private val TAG: String = JSPackagerClient::class.java.simpleName
+    private const val FILE_TTL = 30_000L
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt

@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.packagerconnection
+
+import android.net.Uri
+import com.facebook.common.logging.FLog
+import com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName
+import com.facebook.react.packagerconnection.ReconnectingWebSocket.MessageCallback
+import okio.ByteString
+import org.json.JSONObject
+
+/** A client for packager that uses WebSocket connection. */
+public class JSPackagerClient
+@JvmOverloads
+public constructor(
+    clientId: String,
+    settings: PackagerConnectionSettings,
+    private val requestHandlers: Map<String, RequestHandler>,
+    connectionCallback: ReconnectingWebSocket.ConnectionCallback? = null
+) : MessageCallback {
+  private val webSocket: ReconnectingWebSocket
+
+  init {
+    val url =
+        Uri.Builder()
+            .scheme("ws")
+            .encodedAuthority(settings.debugServerHost)
+            .appendPath("message")
+            .appendQueryParameter("device", getFriendlyDeviceName())
+            .appendQueryParameter("app", settings.packageName)
+            .appendQueryParameter("clientid", clientId)
+            .build()
+            .toString()
+
+    webSocket = ReconnectingWebSocket(url, this, connectionCallback)
+  }
+
+  public fun init() {
+    webSocket.connect()
+  }
+
+  public fun close() {
+    webSocket.closeQuietly()
+  }
+
+  override fun onMessage(text: String) {
+    try {
+      val message = JSONObject(text)
+
+      val version = message.optInt("version")
+      val method = message.optString("method")
+      val id = message.opt("id")
+      val params = message.opt("params")
+
+      if (version != PROTOCOL_VERSION) {
+        FLog.e(TAG, "Message with incompatible or missing version of protocol received: $version")
+        return
+      }
+
+      if (method == null) {
+        abortOnMessage(id, "No method provided")
+        return
+      }
+
+      val handler = requestHandlers[method]
+      if (handler == null) {
+        abortOnMessage(id, "No request handler for method: $method")
+        return
+      }
+
+      if (id == null) {
+        handler.onNotification(params)
+      } else {
+        handler.onRequest(params, ResponderImpl(id))
+      }
+    } catch (e: Exception) {
+      FLog.e(TAG, "Handling the message failed", e)
+    }
+  }
+
+  override fun onMessage(bytes: ByteString) {
+    FLog.w(TAG, "Websocket received message with payload of unexpected type binary")
+  }
+
+  private fun abortOnMessage(id: Any?, reason: String) {
+    id?.let { ResponderImpl(it).error(reason) }
+
+    FLog.e(TAG, "Handling the message failed with reason: $reason")
+  }
+
+  private inner class ResponderImpl(private val id: Any) : Responder {
+    override fun respond(result: Any) {
+      try {
+        val message =
+            JSONObject().apply {
+              put("version", PROTOCOL_VERSION)
+              put("id", id)
+              put("result", result)
+            }
+        webSocket.sendMessage(message.toString())
+      } catch (e: Exception) {
+        FLog.e(TAG, "Responding failed", e)
+      }
+    }
+
+    override fun error(error: Any) {
+      try {
+        val message =
+            JSONObject().apply {
+              put("version", PROTOCOL_VERSION)
+              put("id", id)
+              put("error", error)
+            }
+        webSocket.sendMessage(message.toString())
+      } catch (e: Exception) {
+        FLog.e(TAG, "Responding with error failed", e)
+      }
+    }
+  }
+
+  private companion object {
+    private val TAG: String = JSPackagerClient::class.java.simpleName
+    private const val PROTOCOL_VERSION = 2
+  }
+}