Updated Room implementation to initialize features based on provided …

…roomOptions,

Added validations for the same

chat-android/src/main/java/com/ably/chat/Room.kt

@@ -2,6 +2,7 @@
 
 package com.ably.chat
 
+import io.ably.lib.types.AblyException
 import io.ably.lib.types.ErrorInfo
 import io.ably.lib.util.Log.LogHandler
 import kotlinx.coroutines.CoroutineName
@@ -132,85 +133,139 @@ internal class DefaultRoom(
 
     private val clientId get() = realtimeClient.auth.clientId
 
-    private val _messages = DefaultMessages(
+    override val messages = DefaultMessages(
         roomId = roomId,
         realtimeChannels = realtimeClient.channels,
         chatApi = chatApi,
     )
 
-    override val messages: Messages = _messages
-
-    override val presence: Presence = DefaultPresence(
-        channel = messages.channel,
-        clientId = clientId,
-        presence = messages.channel.presence,
-    )
+    private var _presence: Presence? = null
+    override val presence: Presence
+        get() {
+            if (_presence == null) {
+                throw AblyException.fromErrorInfo(
+                    ErrorInfo.fromResponseStatus(
+                        "Presence is not enabled for this room",
+                        HttpStatusCodes.BadRequest,
+                    ),
+                )
+            }
+            return _presence as Presence
+        }
 
-    override val reactions: RoomReactions = DefaultRoomReactions(
-        roomId = roomId,
-        clientId = clientId,
-        realtimeChannels = realtimeClient.channels,
-    )
+    private var _reactions: RoomReactions? = null
+    override val reactions: RoomReactions
+        get() {
+            if (_reactions == null) {
+                throw AblyException.fromErrorInfo(
+                    ErrorInfo.fromResponseStatus(
+                        "Reactions are not enabled for this room",
+                        HttpStatusCodes.BadRequest,
+                    ),
+                )
+            }
+            return _reactions as RoomReactions
+        }
 
-    override val typing: Typing = DefaultTyping(
-        roomId = roomId,
-        realtimeClient = realtimeClient,
-    )
+    private var _typing: Typing? = null
+    override val typing: Typing
+        get() {
+            if (_typing == null) {
+                throw AblyException.fromErrorInfo(
+                    ErrorInfo.fromResponseStatus(
+                        "Typing is not enabled for this room",
+                        HttpStatusCodes.BadRequest,
+                    ),
+                )
+            }
+            return _typing as Typing
+        }
 
-    override val occupancy: Occupancy = DefaultOccupancy(
-        messages = messages,
-    )
-    private var _lifecycleManager: RoomLifecycleManager? = null
+    private var _occupancy: Occupancy? = null
+    override val occupancy: Occupancy
+        get() {
+            if (_occupancy == null) {
+                throw AblyException.fromErrorInfo(
+                    ErrorInfo.fromResponseStatus(
+                        "Occupancy is not enabled for this room",
+                        HttpStatusCodes.BadRequest,
+                    ),
+                )
+            }
+            return _occupancy as Occupancy
+        }
 
-    private val _statusLifecycle = DefaultRoomLifecycle(logger)
-    internal val statusLifecycle: DefaultRoomLifecycle
-        get() = _statusLifecycle
+    private val statusLifecycle = DefaultRoomLifecycle(logger)
 
     override val status: RoomStatus
-        get() = _statusLifecycle.status
+        get() = statusLifecycle.status
 
     override val error: ErrorInfo?
-        get() = _statusLifecycle.error
+        get() = statusLifecycle.error
+
+    private var lifecycleManager: RoomLifecycleManager
 
     init {
-        /**
-         * TODO
-         * Initialize features based on provided RoomOptions.
-         * By default, only messages feature should be initialized.
-         * Currently, all features are initialized by default.
-         */
-        val features = listOf(messages, presence, typing, reactions, occupancy)
-        _lifecycleManager = RoomLifecycleManager(roomScope, _statusLifecycle, features, _logger)
-        /**
-         * TODO
-         * Make sure previous release op. for same was a success.
-         * Make sure channels were removed using realtime.channels.release(contributor.channel.name);
-         * Once this is a success, set room to initialized, if not set it to failed and throw error.
-         * Note that impl. can change based on recent proposed changes to chat-room-lifecycle DR.
-         */
-        this._statusLifecycle.setStatus(RoomStatus.Initialized)
+        options.validateRoomOptions()
+
+        val roomFeatures = mutableListOf<ContributesToRoomLifecycle>(messages)
+
+        options.presence?.let {
+            val presenceContributor = DefaultPresence(
+                clientId = clientId,
+                channel = messages.channel,
+                presence = messages.channel.presence,
+            )
+            roomFeatures.add(presenceContributor)
+            _presence = presenceContributor
+        }
+
+        options.typing?.let {
+            val typingContributor = DefaultTyping(
+                roomId = roomId,
+                realtimeClient = realtimeClient,
+            )
+            roomFeatures.add(typingContributor)
+            _typing = typingContributor
+        }
+
+        options.reactions?.let {
+            val reactionsContributor = DefaultRoomReactions(
+                roomId = roomId,
+                clientId = clientId,
+                realtimeChannels = realtimeClient.channels,
+            )
+            roomFeatures.add(reactionsContributor)
+            _reactions = reactionsContributor
+        }
+
+        options.occupancy?.let {
+            val occupancyContributor = DefaultOccupancy(
+                messages = messages,
+            )
+            roomFeatures.add(occupancyContributor)
+            _occupancy = occupancyContributor
+        }
+
+        lifecycleManager = RoomLifecycleManager(roomScope, statusLifecycle, roomFeatures, _logger)
     }
 
-    override fun onStatusChange(listener: RoomLifecycle.Listener): Subscription = _statusLifecycle.onChange(listener)
+    override fun onStatusChange(listener: RoomLifecycle.Listener): Subscription =
+        statusLifecycle.onChange(listener)
 
     override fun offAllStatusChange() {
-        _statusLifecycle.offAll()
+        statusLifecycle.offAll()
     }
 
     override suspend fun attach() {
-        if (_lifecycleManager == null) {
-            // TODO - wait for room to be initialized inside init
-        }
-        _lifecycleManager?.attach()
+        lifecycleManager.attach()
     }
 
     override suspend fun detach() {
-        messages.channel.detachCoroutine()
-        typing.channel.detachCoroutine()
-        reactions.channel.detachCoroutine()
+        lifecycleManager.detach()
     }
 
     override suspend fun release() {
-        _lifecycleManager?.release()
+        lifecycleManager.release()
     }
 }

chat-android/src/main/java/com/ably/chat/RoomOptions.kt

@@ -1,5 +1,8 @@
 package com.ably.chat
 
+import io.ably.lib.types.AblyException
+import io.ably.lib.types.ErrorInfo
+
 /**
  * Represents the options for a given chat room.
  */
@@ -58,9 +61,9 @@ data class TypingOptions(
     /**
      * The timeout for typing events in milliseconds. If typing.start() is not called for this amount of time, a stop
      * typing event will be fired, resulting in the user being removed from the currently typing set.
-     * @defaultValue 10000
+     * @defaultValue 5000
      */
-    val timeoutMs: Long = 10_000,
+    val timeoutMs: Long = 5000,
 )
 
 /**
@@ -72,3 +75,17 @@ object RoomReactionsOptions
  * Represents the occupancy options for a chat room.
  */
 object OccupancyOptions
+
+/**
+ * Throws AblyException for invalid room configuration.
+ */
+fun RoomOptions.validateRoomOptions() {
+    if (typing != null && typing.timeoutMs <= 0) {
+        throw AblyException.fromErrorInfo(
+            ErrorInfo.fromResponseStatus(
+                "Typing timeout must be greater than 0",
+                HttpStatusCodes.BadRequest,
+            ),
+        )
+    }
+}

chat-android/src/test/java/com/ably/utils/RoomTestHelpers.kt

@@ -41,7 +41,10 @@ fun createRoomFeatureMocks(roomId: String = "1234"): List<ContributesToRoomLifec
     val chatApi = mockk<ChatApi>(relaxed = true)
 
     val messagesContributor = spyk(DefaultMessages(roomId, realtimeClient.channels, chatApi), recordPrivateCalls = true)
-    val presenceContributor = spyk(DefaultPresence(messagesContributor), recordPrivateCalls = true)
+    val presenceContributor = spyk(
+        DefaultPresence("client1", messagesContributor.channel, messagesContributor.channel.presence),
+        recordPrivateCalls = true,
+    )
     val occupancyContributor = spyk(DefaultOccupancy(messagesContributor), recordPrivateCalls = true)
     val typingContributor = spyk(DefaultTyping(roomId, realtimeClient), recordPrivateCalls = true)
     val reactionsContributor = spyk(DefaultRoomReactions(roomId, "client1", realtimeClient.channels), recordPrivateCalls = true)