Merge pull request #237 from RocketChat/new/video-call-support

[NEW] Video conference
RocketChat · Mar 18, 2019 · 38f60f1 · 38f60f1
2 parents 54676f5 + b74e73e
commit 38f60f1
Show file tree

Hide file tree

Showing 53 changed files with 403 additions and 542 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
-        classpath "gradle.plugin.org.jmailen.gradle:kotlinter-gradle:${versions.kotlinter}"
+        classpath "org.jmailen.gradle:kotlinter-gradle:${versions.kotlinter}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
     }
 }

diff --git a/compat/build.gradle b/compat/build.gradle
@@ -36,12 +36,6 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 dokka {
     outputFormat = 'html'
     outputDirectory = "$buildDir/javadoc"

diff --git a/compat/src/main/kotlin/chat/rocket/core/compat/Call.kt b/compat/src/main/kotlin/chat/rocket/core/compat/Call.kt
@@ -1,6 +1,6 @@
 package chat.rocket.core.compat
 
-import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.Job
 
 class Call(val job: Job) {
     fun cancel() {

diff --git a/compat/src/main/kotlin/chat/rocket/core/compat/Server.kt b/compat/src/main/kotlin/chat/rocket/core/compat/Server.kt
@@ -4,9 +4,10 @@ import chat.rocket.common.model.ServerInfo
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.compat.internal.callback
 import chat.rocket.core.internal.rest.serverInfo
-import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.Dispatchers
 
-fun RocketChatClient.serverInfo(future: Callback<ServerInfo>): Call =
-        callback(CommonPool, future) {
-            serverInfo()
-        }
+/**
+ * Returns the current logged server information.
+ * Must be used with a coroutine context (async, launch, etc)
+ */
+fun RocketChatClient.serverInfo(future: Callback<ServerInfo>): Call = callback(Dispatchers.IO, future) { serverInfo() }
diff --git a/compat/src/main/kotlin/chat/rocket/core/compat/User.kt b/compat/src/main/kotlin/chat/rocket/core/compat/User.kt
@@ -4,17 +4,10 @@ import chat.rocket.core.RocketChatClient
 import chat.rocket.core.compat.internal.callback
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.model.Myself
-import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.Dispatchers
 
 /**
  * Returns the current logged user information, useful to check if the Token from TokenProvider
  * is still valid. Must be used with a coroutine context (async, launch, etc)
- *
- * @return Call
- * @see
- * @see RocketChatException
  */
-fun RocketChatClient.me(future: Callback<Myself>): Call =
-        callback(CommonPool, future) {
-            me()
-        }
+fun RocketChatClient.me(future: Callback<Myself>): Call = callback(Dispatchers.IO, future) { me() }
diff --git a/compat/src/main/kotlin/chat/rocket/core/compat/internal/Callback.kt b/compat/src/main/kotlin/chat/rocket/core/compat/internal/Callback.kt
@@ -3,31 +3,35 @@ package chat.rocket.core.compat.internal
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.compat.Call
 import chat.rocket.core.compat.Callback
-import kotlinx.coroutines.experimental.AbstractCoroutine
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.DefaultDispatcher
-import kotlinx.coroutines.experimental.Job
-import kotlinx.coroutines.experimental.newCoroutineContext
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlin.coroutines.experimental.startCoroutine
+import kotlinx.coroutines.AbstractCoroutine
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.newCoroutineContext
+import kotlin.coroutines.CoroutineContext
+import kotlin.coroutines.startCoroutine
 
 @JvmOverloads
 fun <T> callback(
-    context: CoroutineContext = DefaultDispatcher,
+    context: CoroutineContext = Dispatchers.Default,
     callback: Callback<T>,
     block: suspend CoroutineScope.() -> T
 ): Call {
-    val newContext = newCoroutineContext(context)
+    val newContext = GlobalScope.newCoroutineContext(context)
     val job = Job(newContext[Job])
     val coroutine = CallbackCoroutine(newContext + job, callback)
     block.startCoroutine(coroutine, coroutine)
     return Call(job)
 }
 
+@UseExperimental(InternalCoroutinesApi::class)
 private class CallbackCoroutine<in T>(
     parentContext: CoroutineContext,
     private val callback: Callback<T>
 ) : AbstractCoroutine<T>(parentContext, true) {
+
     override fun onCompleted(value: T) {
         callback.onSuccess(value)
     }

diff --git a/core/build.gradle b/core/build.gradle
@@ -41,12 +41,6 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-kotlin {
-    experimental {
-        coroutines "enable"
-    }
-}
-
 dokka {
     outputFormat = 'html'
     outputDirectory = "$buildDir/javadoc"

diff --git a/core/src/main/kotlin/chat/rocket/core/RocketChatClient.kt b/core/src/main/kotlin/chat/rocket/core/RocketChatClient.kt
@@ -27,19 +27,25 @@ import chat.rocket.core.model.Myself
 import chat.rocket.core.model.Room
 import chat.rocket.core.model.url.MetaJsonAdapter
 import com.squareup.moshi.Moshi
-import kotlinx.coroutines.experimental.channels.Channel
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.Channel
 import okhttp3.HttpUrl
 import okhttp3.MediaType
 import okhttp3.OkHttpClient
 import java.security.InvalidParameterException
+import kotlin.coroutines.CoroutineContext
 
 class RocketChatClient private constructor(
     internal val httpClient: OkHttpClient,
     baseUrl: String,
     userAgent: String,
     internal val tokenRepository: TokenRepository,
     internal val logger: Logger
-) {
+) : CoroutineScope {
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Default
+
     internal val moshi: Moshi = Moshi.Builder()
         .add(FallbackSealedClassJsonAdapter.ADAPTER_FACTORY)
         .add(RestResult.JsonAdapterFactory())

diff --git a/core/src/main/kotlin/chat/rocket/core/internal/AttachmentAdapter.kt b/core/src/main/kotlin/chat/rocket/core/internal/AttachmentAdapter.kt
@@ -24,34 +24,34 @@ class AttachmentAdapter(moshi: Moshi, private val logger: Logger) : JsonAdapter<
     private val actionAdapter = moshi.adapter<ButtonAction>(ButtonAction::class.java)
 
     private val NAMES = arrayOf(
-            "title",                // 0
-            "type",                 // 1
-            "description",          // 2
-            "author_name",          // 3
-            "text",                 // 4
-            "thumb_url",            // 5
-            "color",                // 6
-            "title_link",           // 7
-            "title_link_download",  // 8
-            "image_url",            // 9
-            "image_type",           // 10
-            "image_size",           // 11
-            "video_url",            // 12
-            "video_type",           // 13
-            "video_size",           // 14
-            "audio_url",            // 15
-            "audio_type",           // 16
-            "audio_size",           // 17
-            "message_link",         // 18
-            "attachments",          // 19
-            "ts",                   // 20
-            "author_icon",          // 21
-            "author_link",          // 22
-            "image_preview",        // 23
-            "fields",               // 24
-            "fallback",             // 25
-            "button_alignment",     // 26
-            "actions"               // 27
+            "title", // 0
+            "type", // 1
+            "description", // 2
+            "author_name", // 3
+            "text", // 4
+            "thumb_url", // 5
+            "color", // 6
+            "title_link", // 7
+            "title_link_download", // 8
+            "image_url", // 9
+            "image_type", // 10
+            "image_size", // 11
+            "video_url", // 12
+            "video_type", // 13
+            "video_size", // 14
+            "audio_url", // 15
+            "audio_type", // 16
+            "audio_size", // 17
+            "message_link", // 18
+            "attachments", // 19
+            "ts", // 20
+            "author_icon", // 21
+            "author_link", // 22
+            "image_preview", // 23
+            "fields", // 24
+            "fallback", // 25
+            "button_alignment", // 26
+            "actions" // 27
     )
 
     private val OPTIONS = JsonReader.Options.of(*NAMES)
@@ -61,34 +61,34 @@ class AttachmentAdapter(moshi: Moshi, private val logger: Logger) : JsonAdapter<
             return reader.nextNull<Attachment>()
         }
 
-        var title: String? = null                 // 0
-        var type: String? = null                  // 1
-        var description: String? = null           // 2
-        var authorName: String? = null            // 3
-        var text: String? = null                  // 4
-        var thumbUrl: String? = null              // 5
-        var color: Color? = null                  // 6
-        var titleLink: String? = null             // 7
-        var titleLinkDownload = false             // 8
-        var imageUrl: String? = null              // 9
-        var imageType: String? = null             // 10
-        var imageSize: Long? = null               // 11
-        var videoUrl: String? = null              // 12
-        var videoType: String? = null             // 13
-        var videoSize: Long? = null               // 14
-        var audioUrl: String? = null              // 15
-        var audioType: String? = null             // 16
-        var audioSize: Long? = null               // 17
-        var messageLink: String? = null           // 18
+        var title: String? = null // 0
+        var type: String? = null // 1
+        var description: String? = null // 2
+        var authorName: String? = null // 3
+        var text: String? = null // 4
+        var thumbUrl: String? = null // 5
+        var color: Color? = null // 6
+        var titleLink: String? = null // 7
+        var titleLinkDownload = false // 8
+        var imageUrl: String? = null // 9
+        var imageType: String? = null // 10
+        var imageSize: Long? = null // 11
+        var videoUrl: String? = null // 12
+        var videoType: String? = null // 13
+        var videoSize: Long? = null // 14
+        var audioUrl: String? = null // 15
+        var audioType: String? = null // 16
+        var audioSize: Long? = null // 17
+        var messageLink: String? = null // 18
         var attachments: List<Attachment>? = null // 19
-        var timestamp: Long? = null               // 20
-        var authorIcon: String? = null            // 21
-        var authorLink: String? = null            // 22
-        var imagePreview: String? = null          // 23
-        var fields: List<Field>? = null           // 24
-        var fallback: String? = null              // 25
-        var buttonAlignment: String? = null       // 26
-        var actions: List<Action>? = null         // 27
+        var timestamp: Long? = null // 20
+        var authorIcon: String? = null // 21
+        var authorLink: String? = null // 22
+        var imagePreview: String? = null // 23
+        var fields: List<Field>? = null // 24
+        var fallback: String? = null // 25
+        var buttonAlignment: String? = null // 26
+        var actions: List<Action>? = null // 27
 
         reader.beginObject()
         while (reader.hasNext()) {

diff --git a/core/src/main/kotlin/chat/rocket/core/internal/RoomListAdapter.kt b/core/src/main/kotlin/chat/rocket/core/internal/RoomListAdapter.kt
@@ -24,7 +24,7 @@ internal class RoomListAdapter(moshi: Moshi, private val logger: Logger) : JsonA
     private val adapter = moshi.adapter<Room>(Room::class.java)
 
     override fun toJson(writer: JsonWriter, value: List<Room>?) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
     }
 
     override fun fromJson(reader: JsonReader): List<Room>? {

diff --git a/core/src/main/kotlin/chat/rocket/core/internal/model/CreateNewChannelPayload.kt b/core/src/main/kotlin/chat/rocket/core/internal/model/CreateNewChannelPayload.kt
@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import se.ansman.kotshi.JsonSerializable
 
 @JsonSerializable
-data class CreateNewChannelPayload (
+data class CreateNewChannelPayload(
     @Json(name = "name") val channelName: String,
     @Json(name = "members") val membersToInvite: List<String>?,
     val readOnly: Boolean?

diff --git a/core/src/main/kotlin/chat/rocket/core/internal/realtime/ChatRoom.kt b/core/src/main/kotlin/chat/rocket/core/internal/realtime/ChatRoom.kt
@@ -7,11 +7,11 @@ import chat.rocket.core.internal.realtime.message.roomsStreamMessage
 import chat.rocket.core.internal.realtime.message.streamRoomMessages
 import chat.rocket.core.internal.realtime.message.streamTypingMessage
 import chat.rocket.core.internal.realtime.message.typingMessage
-import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.withContext
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 suspend fun RocketChatClient.setTypingStatus(roomId: String, username: String, isTyping: Boolean) =
-    withContext(CommonPool) {
+    withContext(Dispatchers.IO) {
         socket.send(typingMessage(socket.generateId(), roomId, username, isTyping))
     }
 
@@ -52,4 +52,4 @@ fun RocketChatClient.createDirectMessage(username: String, callback: (Boolean, S
         subscriptionsMap[id] = callback
         return id
     }
-}
+}
diff --git a/core/src/main/kotlin/chat/rocket/core/internal/realtime/message/MethodCall.kt b/core/src/main/kotlin/chat/rocket/core/internal/realtime/message/MethodCall.kt
@@ -28,4 +28,4 @@ internal fun typingMessage(id: String, roomId: String, username: String, isTypin
 
 internal fun createDirectMessage(id: String, username: String): String {
     return newMessage("createDirectMessage", id, "\"$username\"")
-}
+}