@fishjam-cloud/react-native-client 0.23.0 → 0.25.0-rc.1

package/android/src/main/java/io/fishjam/reactnative/AudioSwitchManager.kt

@@ -1,61 +0,0 @@
-package io.fishjam.reactnative
-
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import com.twilio.audioswitch.AudioDevice
-import com.twilio.audioswitch.AudioDeviceChangeListener
-import com.twilio.audioswitch.AudioSwitch
-
-class AudioSwitchManager(
-  private val context: Context
-) {
-  private var preferredDeviceList =
-    listOf(
-      AudioDevice.BluetoothHeadset::class.java,
-      AudioDevice.WiredHeadset::class.java,
-      AudioDevice.Speakerphone::class.java,
-      AudioDevice.Earpiece::class.java
-    )
-
-  // AudioSwitch is not threadsafe, so all calls should be done on the main thread.
-  private val handler: Handler = Handler(Looper.getMainLooper())
-
-  private var audioSwitch: AudioSwitch =
-    AudioSwitch(context, loggingEnabled = true, preferredDeviceList = preferredDeviceList)
-
-  fun start(listener: AudioDeviceChangeListener) {
-    handler.removeCallbacksAndMessages(null)
-    handler.postAtFrontOfQueue {
-      audioSwitch.start(listener)
-      audioSwitch.activate()
-    }
-  }
-
-  fun stop() {
-    handler.removeCallbacksAndMessages(null)
-    handler.postAtFrontOfQueue {
-      audioSwitch.stop()
-    }
-  }
-
-  fun selectedAudioDevice(): AudioDevice? = audioSwitch.selectedAudioDevice
-
-  fun availableAudioDevices(): List<AudioDevice> = audioSwitch.availableAudioDevices
-
-  fun selectAudioOutput(audioDeviceClass: Class<out AudioDevice?>) {
-    handler.post {
-      availableAudioDevices()
-        .find { it.javaClass == audioDeviceClass }
-        ?.let {
-          audioSwitch.selectDevice(it)
-        }
-    }
-  }
-
-  fun selectAudioOutput(kind: AudioDeviceKind?) {
-    if (kind != null) {
-      selectAudioOutput(kind.audioDeviceClass)
-    }
-  }
-}

package/android/src/main/java/io/fishjam/reactnative/EmitableEvents.kt

@@ -1,126 +0,0 @@
-package io.fishjam.reactnative
-
-import com.fishjamcloud.client.ReconnectionStatus
-import com.fishjamcloud.client.models.SimulcastConfig
-import com.twilio.audioswitch.AudioDevice
-import io.fishjam.reactnative.extensions.LocalCamera
-
-enum class PeerStatus(
-  val status: String
-) {
-  Connecting("connecting"),
-  Connected("connected"),
-  Idle("idle"),
-  Error("error")
-}
-
-class EmitableEvent private constructor(
-  private val event: EventName,
-  private val eventContent: Any? = null
-) {
-  enum class EventName {
-    IsMicrophoneOn,
-    IsScreenShareOn,
-    SimulcastConfigUpdate,
-    PeersUpdate,
-    AudioDeviceUpdate,
-    BandwidthEstimation,
-    Warning,
-    PeerStatusChanged,
-    ReconnectionStatusChanged,
-    CurrentCameraChanged,
-    TrackAspectRatioUpdated
-  }
-
-  val name: String
-    get() = event.name
-
-  val data: Map<String, Any?>
-    get() = mapOf(event.name to eventContent)
-
-  companion object {
-    fun isMicrophoneOn(enabled: Boolean) = EmitableEvent(EventName.IsMicrophoneOn, enabled)
-
-    fun isScreenShareOn(enabled: Boolean) = EmitableEvent(EventName.IsScreenShareOn, enabled)
-
-    fun bandwidthEstimation(estimation: Long) = EmitableEvent(EventName.BandwidthEstimation, estimation.toFloat())
-
-    fun warning(message: String) = EmitableEvent(EventName.Warning, message)
-
-    fun peerStatusChanged(peerStatus: PeerStatus) = EmitableEvent(EventName.PeerStatusChanged, peerStatus.status)
-
-    fun reconnectionStatusChanged(reconnectionStatus: ReconnectionStatus) =
-      EmitableEvent(EventName.ReconnectionStatusChanged, reconnectionStatus.status)
-
-    fun currentCameraChanged(
-      localCamera: LocalCamera?,
-      isCameraOn: Boolean,
-      isCameraInitialized: Boolean
-    ) = EmitableEvent(
-      EventName.CurrentCameraChanged,
-      mapOf(
-        "currentCamera" to localCamera,
-        "isCameraOn" to isCameraOn,
-        "isCameraInitialized" to isCameraInitialized
-      )
-    )
-
-    fun simulcastConfigUpdate(simulcastConfig: SimulcastConfig) =
-      EmitableEvent(
-        EventName.SimulcastConfigUpdate,
-        mapOf(
-          "enabled" to simulcastConfig.enabled,
-          "activeEncodings" to simulcastConfig.activeEncodings.map { it.rid }
-        )
-      )
-
-    fun peersUpdate(peersData: List<Map<String, Any?>>) = EmitableEvent(EventName.PeersUpdate, peersData)
-
-    fun audioDeviceUpdate(
-      audioDevices: List<AudioDevice>,
-      selectedDevice: AudioDevice?
-    ): EmitableEvent {
-      val audioDeviceAsMap = { audioDevice: AudioDevice ->
-        mapOf(
-          "name" to audioDevice.name,
-          "type" to AudioDeviceKind.fromAudioDevice(audioDevice)?.typeName
-        )
-      }
-
-      return EmitableEvent(
-        EventName.AudioDeviceUpdate,
-        mapOf(
-          "selectedDevice" to (
-            if (selectedDevice != null) {
-              audioDeviceAsMap(
-                selectedDevice
-              )
-            } else {
-              null
-            }
-          ),
-          "availableDevices" to
-            audioDevices.map { audioDevice ->
-              audioDeviceAsMap(
-                audioDevice
-              )
-            }
-        )
-      )
-    }
-
-    fun trackAspectRatioUpdated(
-      trackId: String,
-      aspectRatio: Double?
-    ) = EmitableEvent(
-      EventName.TrackAspectRatioUpdated,
-      mapOf(
-        "trackId" to trackId,
-        "aspectRatio" to aspectRatio
-      )
-    )
-
-    val allEvents: Array<String>
-      get() = EventName.entries.map { it.name }.toTypedArray()
-  }
-}

package/android/src/main/java/io/fishjam/reactnative/Errors.kt

@@ -1,31 +0,0 @@
-package io.fishjam.reactnative
-
-import com.fishjamcloud.client.models.AuthError
-import expo.modules.kotlin.exception.CodedException
-
-class JoinError(
-  metadata: Any
-) : CodedException(message = "Join error: $metadata")
-
-class ConnectionError(
-  reason: AuthError
-) : CodedException(message = "Connection error: ${reason.error}")
-
-class MissingScreenSharePermission : CodedException(message = "No permission to start screen share.")
-
-class ClientNotConnectedError : CodedException(message = "Client not connected to server yet. Make sure to call connect() first!")
-
-class NoLocalVideoTrackError : CodedException(message = "No local video track. Make sure to call connect() first!")
-
-class NoLocalAudioTrackError : CodedException(message = "No local audio track. Make sure to call connect() first!")
-
-class NoScreenShareTrackError : CodedException(message = "No local screen share track. Make sure to toggle screen share on first!")
-
-class SocketClosedError(
-  code: Int,
-  reason: String
-) : CodedException(message = "Socket was closed with code = $code and reason = $reason")
-
-class SocketError(
-  message: String
-) : CodedException(message = "Socket error: $message")

package/android/src/main/java/io/fishjam/reactnative/PipContainerView.kt

@@ -1,282 +0,0 @@
-package io.fishjam.reactnative
-
-import android.app.PictureInPictureParams
-import android.content.Context
-import android.os.Build
-import android.util.Log
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.RequiresApi
-import androidx.fragment.app.FragmentActivity
-import expo.modules.kotlin.AppContext
-import expo.modules.kotlin.views.ExpoView
-import io.fishjam.reactnative.helpers.PictureInPictureHelperFragment
-import io.fishjam.reactnative.managers.TrackUpdateListener
-import java.lang.ref.WeakReference
-
-data class RemoteTrackInfo(
-    val videoTrack: com.fishjamcloud.client.media.VideoTrack?,
-    val displayName: String?,
-    val videoTrackActive: Boolean
-)
-
-class PipContainerView(
-    context: Context,
-    appContext: AppContext
-) : ExpoView(context, appContext), TrackUpdateListener {
-
-    companion object {
-        private const val TAG = "PipContainerView"
-    }
-
-    private val activityRef: WeakReference<FragmentActivity?> = WeakReference(
-        appContext.currentActivity as? FragmentActivity
-    )
-
-    private val decorView = activityRef.get()?.window?.decorView
-    private val rootView = decorView?.findViewById<ViewGroup>(android.R.id.content)
-    private val rootViewChildrenOriginalVisibility: ArrayList<Int> = arrayListOf()
-
-    private var pictureInPictureHelperTag: String? = null
-    private var pipViews: PipViewContainer? = null
-    private var isPipActive = false
-
-    private val trackSelector = PipTrackSelector()
-    private val viewFactory by lazy { PipViewFactory(context, appContext) }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-
-    var startAutomatically: Boolean = true
-        set(value) {
-            field = value
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                updateAutoEnterEnabled()
-            }
-        }
-
-    var stopAutomatically: Boolean = true
-
-    var primaryPlaceholderText: String = "No camera"
-        set(value) {
-            field = value
-            pipViews?.primaryPlaceholder?.text = value
-        }
-
-    var secondaryPlaceholderText: String = "No active speaker"
-        set(value) {
-            field = value
-            pipViews?.secondaryPlaceholder?.text = value
-        }
-
-    private var remoteTrackInfo: RemoteTrackInfo? = null
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    private fun updatePictureInPictureParams() {
-        val activity = activityRef.get()
-        if (activity == null) {
-            Log.w(TAG, "Cannot update PiP params: activity reference is null")
-            return
-        }
-
-        try {
-            activity.setPictureInPictureParams(pictureInPictureParamsBuilder.build())
-        } catch (e: IllegalStateException) {
-            Log.e(TAG, "Failed to update PiP params", e)
-            emitPipNotSupportedWarning()
-        }
-    }
-
-    private fun emitPipNotSupportedWarning() {
-        RNFishjamClient.sendEvent(
-            EmitableEvent.warning(
-                "Picture-in-Picture is not supported. Enable it in app.json."
-            )
-        )
-    }
-
-    @RequiresApi(Build.VERSION_CODES.S)
-    private fun updateAutoEnterEnabled() {
-        pictureInPictureParamsBuilder.setAutoEnterEnabled(startAutomatically)
-        updatePictureInPictureParams()
-    }
-
-    private fun updatePipViews() {
-        val views = pipViews ?: run {
-            Log.w(TAG, "Cannot update PiP views: pipViews is null")
-            return
-        }
-
-        val localCameraTrack = trackSelector.findLocalCameraTrack()
-        updatePrimaryView(views, localCameraTrack)
-
-        remoteTrackInfo = trackSelector.findSecondaryRemoteTrack(remoteTrackInfo)
-        updateSecondaryView(views, remoteTrackInfo)
-    }
-
-    private fun updatePrimaryView(
-        views: PipViewContainer,
-        localCameraTrack: com.fishjamcloud.client.media.VideoTrack?
-    ) {
-        if (localCameraTrack != null && localCameraTrack.isEnabled()) {
-            views.primaryVideoView.init(localCameraTrack.id())
-            views.primaryVideoView.visibility = View.VISIBLE
-            views.primaryPlaceholder.visibility = View.GONE
-        } else {
-            views.primaryVideoView.visibility = View.GONE
-            views.primaryPlaceholder.visibility = View.VISIBLE
-        }
-    }
-
-    private fun updateSecondaryView(
-        views: PipViewContainer,
-        trackInfo: RemoteTrackInfo?
-    ) {
-        trackInfo?.let { info ->
-            if (info.videoTrackActive && info.videoTrack != null) {
-                views.secondaryVideoView.init(info.videoTrack.id())
-                views.secondaryVideoView.visibility = View.VISIBLE
-                views.secondaryPlaceholder.visibility = View.GONE
-                
-                info.displayName?.let { displayName ->
-                    views.secondaryNameOverlay.text = displayName
-                    views.secondaryNameOverlay.visibility = View.VISIBLE
-                } ?: run {
-                    views.secondaryNameOverlay.visibility = View.GONE
-                }
-            } else {
-                views.secondaryVideoView.visibility = View.GONE
-                views.secondaryPlaceholder.text = info.displayName
-                views.secondaryPlaceholder.visibility = View.VISIBLE
-                views.secondaryNameOverlay.visibility = View.GONE
-            }
-        } ?: run {
-            views.secondaryVideoView.visibility = View.GONE
-            views.secondaryPlaceholder.text = secondaryPlaceholderText
-            views.secondaryPlaceholder.visibility = View.VISIBLE
-            views.secondaryNameOverlay.visibility = View.GONE
-        }
-        views.secondaryContainer.visibility = View.VISIBLE
-    }
-
-    @RequiresApi(Build.VERSION_CODES.O)
-    fun startPictureInPicture() {
-        val activity = activityRef.get()
-        if (activity == null) {
-            Log.w(TAG, "Cannot start PiP: activity reference is null")
-            return
-        }
-
-        try {
-            activity.enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
-        } catch (e: IllegalStateException) {
-            Log.e(TAG, "Failed to enter PiP mode", e)
-            emitPipNotSupportedWarning()
-        }
-    }
-
-    fun stopPictureInPicture() {
-        Log.d(TAG, "stopPictureInPicture called, but no-op on Android")
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-
-        activityRef.get()?.let { activity ->
-            val fragment = PictureInPictureHelperFragment(this)
-            pictureInPictureHelperTag = fragment.id
-            activity.supportFragmentManager.beginTransaction()
-                .add(fragment, fragment.id)
-                .commitAllowingStateLoss()
-        } ?: Log.w(TAG, "Cannot attach PiP helper: activity reference is null")
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            updateAutoEnterEnabled()
-        }
-
-        RNFishjamClient.trackUpdateListenersManager.add(this)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        activityRef.get()?.let { activity ->
-            pictureInPictureHelperTag?.let { tag ->
-                activity.supportFragmentManager.findFragmentByTag(tag)?.let { fragment ->
-                    activity.supportFragmentManager.beginTransaction()
-                        .remove(fragment)
-                        .commitAllowingStateLoss()
-                }
-            }
-        }
-
-        startAutomatically = false
-        RNFishjamClient.trackUpdateListenersManager.remove(this)
-    }
-
-    override fun onTracksUpdate() {
-        if (isPipActive) {
-            updatePipViews()
-        }
-    }
-
-    fun layoutForPiPEnter() {
-        val root = rootView
-        if (root == null) {
-            Log.w(TAG, "Cannot enter PiP layout: rootView is null")
-            return
-        }
-
-        isPipActive = true
-
-        hideAllRootViewChildren(root)
-        pipViews = viewFactory.createPipViews(primaryPlaceholderText, secondaryPlaceholderText)
-        pipViews?.let { views ->
-            root.addView(views.splitScreenContainer)
-        }
-
-        updatePipViews()
-    }
-
-    fun layoutForPiPExit() {
-        val root = rootView
-        if (root == null) {
-            Log.w(TAG, "Cannot exit PiP layout: rootView is null")
-            return
-        }
-
-        isPipActive = false
-
-        pipViews?.let { views ->
-            root.removeView(views.splitScreenContainer)
-            cleanUpViews(views)
-        }
-        pipViews = null
-
-        restoreRootViewChildren(root)
-    }
-
-    private fun cleanUpViews(views: PipViewContainer) {
-        views.primaryVideoView.dispose()
-        views.secondaryVideoView.dispose()
-    }
-
-    private fun hideAllRootViewChildren(rootView: ViewGroup) {
-        rootViewChildrenOriginalVisibility.clear()
-        (0 until rootView.childCount).forEach { i ->
-            val child = rootView.getChildAt(i)
-            rootViewChildrenOriginalVisibility.add(child.visibility)
-            child.visibility = View.GONE
-        }
-    }
-
-    private fun restoreRootViewChildren(rootView: ViewGroup) {
-        rootViewChildrenOriginalVisibility.forEachIndexed { index, originalVisibility ->
-            if (index < rootView.childCount) {
-                rootView.getChildAt(index).visibility = originalVisibility
-            }
-        }
-        rootViewChildrenOriginalVisibility.clear()
-    }
-}
-

package/android/src/main/java/io/fishjam/reactnative/PipContainerViewModule.kt

@@ -1,41 +0,0 @@
-package io.fishjam.reactnative
-
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-
-class PipContainerViewModule : Module() {
-  override fun definition() =
-    ModuleDefinition {
-      Name("PipContainerViewModule")
-
-      View(PipContainerView::class) {
-        Prop("startAutomatically") { view: PipContainerView, value: Boolean ->
-          view.startAutomatically = value
-        }
-
-        Prop("stopAutomatically") { view: PipContainerView, value: Boolean ->
-          view.stopAutomatically = value
-        }
-
-        // iOS-only property, no-op on Android
-        Prop("allowsCameraInBackground") { _: PipContainerView, _: Boolean -> }
-
-        Prop("primaryPlaceholderText") { view: PipContainerView, value: String ->
-          view.primaryPlaceholderText = value
-        }
-
-        Prop("secondaryPlaceholderText") { view: PipContainerView, value: String ->
-          view.secondaryPlaceholderText = value
-        }
-
-        AsyncFunction("startPictureInPicture") { view: PipContainerView ->
-          view.startPictureInPicture()
-        }
-
-        AsyncFunction("stopPictureInPicture") { view: PipContainerView ->
-          view.stopPictureInPicture()
-        }
-      }
-    }
-}
-

package/android/src/main/java/io/fishjam/reactnative/PipTrackSelector.kt

@@ -1,98 +0,0 @@
-package io.fishjam.reactnative
-
-import com.fishjamcloud.client.media.RemoteAudioTrack
-import com.fishjamcloud.client.media.Track
-import com.fishjamcloud.client.media.VideoTrack
-import com.fishjamcloud.client.models.Peer
-import fishjam.media_events.server.Server
-
-class PipTrackSelector {
-    companion object {
-        private const val METADATA_TYPE = "type"
-        private const val METADATA_CAMERA = "camera"
-        private const val METADATA_DISPLAY_NAME = "displayName"
-        private const val METADATA_NAME = "name"
-    }
-
-    fun findLocalCameraTrack(): VideoTrack? {
-        val peers = RNFishjamClient.getAllPeers()
-        val localEndpointId = RNFishjamClient.fishjamClient.getLocalEndpoint().id
-        val localPeer = peers.find { it.id == localEndpointId } ?: return null
-
-        return localPeer.tracks.values
-            .filterIsInstance<VideoTrack>()
-            .firstOrNull { track ->
-                (track.metadata as? Map<*, *>)?.get(METADATA_TYPE) == METADATA_CAMERA
-            }
-    }
-
-    fun findSecondaryRemoteTrack(currentTrackInfo: RemoteTrackInfo?): RemoteTrackInfo? {
-        val peers = RNFishjamClient.getAllPeers()
-        val localEndpointId = RNFishjamClient.fishjamClient.getLocalEndpoint().id
-        val remotePeers = peers.filter { it.id != localEndpointId }
-
-        if (remotePeers.isEmpty()) {
-            return null
-        }
-
-        remotePeers.firstOrNull { it.hasActiveVoiceActivity() }?.let { activeSpeaker ->
-            return activeSpeaker.toRemoteTrackInfo()
-        }
-
-        currentTrackInfo?.let { currentInfo ->
-          val existingPeer = remotePeers.firstOrNull() { peer -> peer.hasTrack(currentInfo.videoTrack) }
-            if (existingPeer != null) {
-                return existingPeer.toRemoteTrackInfo()
-            }
-        }
-
-        remotePeers.firstOrNull { it.hasVideoTrack() }?.let { peerWithVideo ->
-            return peerWithVideo.toRemoteTrackInfo()
-        }
-
-        return null
-    }
-}
-
-private fun Peer.hasActiveVoiceActivity(): Boolean {
-    return tracks.values
-        .filterIsInstance<RemoteAudioTrack>()
-        .any { it.vadStatus == Server.MediaEvent.VadNotification.Status.STATUS_SPEECH }
-}
-
-private fun Peer.hasTrack(videoTrack: VideoTrack?): Boolean {
-    return videoTrack != null && tracks.values.contains(videoTrack)
-}
-
-private fun Peer.hasVideoTrack(): Boolean {
-    return tracks.values.any { it is VideoTrack }
-}
-
-private fun Peer.getDisplayName(): String {
-    val serverMetadata = metadata?.get("peer") as? Map<*, *>
-    val displayName = serverMetadata?.get("displayName") as? String
-    return displayName ?: id
-}
-
-private fun Track.getTrackActive(): Boolean {
-
-  if (metadata["active"] as? Boolean == false) {
-    return false
-  }
-
-  if (metadata["paused"] as? Boolean == true) {
-    return false
-  }
-
-  return true
-}
-
-private fun Peer.toRemoteTrackInfo(): RemoteTrackInfo {
-    val videoTrack = tracks.values.filterIsInstance<VideoTrack>().firstOrNull()
-    return RemoteTrackInfo(
-        videoTrack = videoTrack,
-        displayName = getDisplayName(),
-        videoTrackActive = videoTrack?.getTrackActive() ?: false
-    )
-}
-