Merge pull request #77 from kuzzleio/1.3.1-proposal

Release 1.3.1
kuzzleio · May 17, 2022 · 8227e58 · 8227e58
2 parents d7f66c4 + 1ba29be
commit 8227e58
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 44 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 
 val artifactName = "sdk-jvm"
 val artifactGroup = "io.kuzzle"
-val artifactVersion = "1.3.0"
+val artifactVersion = "1.3.1"
 
 val pomUrl = "https://github.com/kuzzleio/sdk-jvm"
 val pomScmUrl = "https://github.com/kuzzleio/sdk-jvm"
@@ -35,7 +35,7 @@ val pomDeveloperId = "kuzzleio"
 val pomDeveloperName = "kuzzle"
 
 group = "io.kuzzle.sdk"
-version = "1.3.0"
+version = "1.3.1"
 val ktorVersion = "1.6.8"
 
 repositories {

diff --git a/doc/1/getting-started/java/index.md b/doc/1/getting-started/java/index.md
@@ -61,7 +61,7 @@ To build the project, add the following lines:
 <dependency>
   <groupId>io.kuzzle</groupId>
   <artifactId>sdk-jvm</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <type>pom</type>
 </dependency>
 ```
@@ -70,14 +70,14 @@ To build the project, add the following lines:
 
 ```groovy
 dependencies {
-  compile 'io.kuzzle:sdk-jvm:1.3.0'
+  compile 'io.kuzzle:sdk-jvm:1.3.1'
 }
 ```
 
 ### Ivy
 
 ```html
-<dependency org='io.kuzzle' name='sdk-jvm' rev='1.3.0'>
+<dependency org='io.kuzzle' name='sdk-jvm' rev='1.3.1'>
   <artifact name='sdk-jvm' ext='pom' ></artifact>
 </dependency>
 ```

diff --git a/doc/1/getting-started/kotlin/index.md b/doc/1/getting-started/kotlin/index.md
@@ -73,7 +73,7 @@ To build the project, add the following lines:
 <dependency>
   <groupId>io.kuzzle</groupId>
   <artifactId>sdk-jvm</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
   <type>pom</type>
 </dependency>
 ```
@@ -82,14 +82,14 @@ To build the project, add the following lines:
 
 ```groovy
 dependencies {
-  compile 'io.kuzzle:sdk-jvm:1.3.0'
+  compile 'io.kuzzle:sdk-jvm:1.3.1'
 }
 ```
 
 ### Ivy
 
 ```html
-<dependency org='io.kuzzle' name='sdk-jvm' rev='1.3.0'>
+<dependency org='io.kuzzle' name='sdk-jvm' rev='1.3.1'>
   <artifact name='sdk-jvm' ext='pom' ></artifact>
 </dependency>
 ```

diff --git a/src/main/kotlin/io/kuzzle/sdk/Kuzzle.kt b/src/main/kotlin/io/kuzzle/sdk/Kuzzle.kt
@@ -60,6 +60,8 @@ open class Kuzzle {
         if (event.requestId != null && queries[event.requestId!!] != null) {
             queries[event.requestId!!]?.completeExceptionally(event.exception)
             queries.remove(event.requestId!!)
+        } else {
+            protocol.trigger(UnhandledExceptionEvent(event.exception))
         }
     }
 
@@ -73,7 +75,7 @@ open class Kuzzle {
                 queries[event.requestId]?.completeExceptionally(InvalidJSON(event.message ?: "null"))
                 queries.remove(event.requestId)
             } else {
-                protocol.trigger(UnhandledResponseEvent(message))
+                protocol.trigger(UnhandledExceptionEvent(InvalidJSON(event.message ?: "null")))
             }
             return
         }
@@ -90,28 +92,26 @@ open class Kuzzle {
 
         val requestId = event.requestId ?: response.room ?: response.requestId
 
-        if (queries.size == 0 || requestId == null || queries[requestId] == null) {
-            protocol.trigger(UnhandledResponseEvent(message))
-            return
+        if (response.error?.id == "security.token.expired") {
+            protocol.trigger(TokenExpiredEvent())
         }
 
-        if (response.error == null) {
-            queries[requestId]?.complete(response)
-            queries.remove(requestId)
+        if (queries.isEmpty() || requestId == null || queries[requestId] == null) {
+            if (response.error != null) {
+                protocol.trigger(UnhandledExceptionEvent(ApiErrorException(response)))
+                return
+            }
+            protocol.trigger(RoomMessageEvent(response))
             return
         }
 
-        if (response.error?.id == null ||
-            response.error?.id != "security.token.expired"
-        ) {
+        if (response.error != null) {
             queries[requestId]?.completeExceptionally(ApiErrorException(response))
-            queries.remove(requestId)
-            return
+        } else {
+            queries[requestId]?.complete(response)
         }
 
-        queries[requestId]?.completeExceptionally(ApiErrorException(response))
         queries.remove(requestId)
-        protocol.trigger(TokenExpiredEvent())
     }
 
     private fun onNetworkStateChange(event: NetworkStateChangeEvent) {

diff --git a/src/main/kotlin/io/kuzzle/sdk/controllers/RealtimeController.kt b/src/main/kotlin/io/kuzzle/sdk/controllers/RealtimeController.kt
@@ -1,11 +1,10 @@
 package io.kuzzle.sdk.controllers
 
 import io.kuzzle.sdk.Kuzzle
-import io.kuzzle.sdk.coreClasses.json.JsonSerializer
 import io.kuzzle.sdk.coreClasses.maps.KuzzleMap
 import io.kuzzle.sdk.coreClasses.responses.Response
 import io.kuzzle.sdk.events.NetworkStateChangeEvent
-import io.kuzzle.sdk.events.TokenExpiredEvent
+import io.kuzzle.sdk.events.RoomMessageEvent
 import io.kuzzle.sdk.events.UnhandledResponseEvent
 import io.kuzzle.sdk.handlers.NotificationHandler
 import io.kuzzle.sdk.protocol.ProtocolState
@@ -25,28 +24,20 @@ class RealtimeController(kuzzle: Kuzzle) : BaseController(kuzzle) {
     )
 
     init {
-        kuzzle.protocol.addListener<UnhandledResponseEvent> {
-            val response = Response().apply {
-                fromMap(JsonSerializer.deserialize(it.message) as Map<String?, Any?>)
-            }
-
-            if (response.error != null && response.error!!.id.equals("security.token.expired")) {
-                kuzzle.protocol.trigger(TokenExpiredEvent())
-            } else {
-                var sdkInstanceId = ""
-                if (response.Volatile != null) {
-                    sdkInstanceId = response.Volatile!!["sdkInstanceId"].toString()
-                }
+        kuzzle.protocol.addListener<RoomMessageEvent> { event ->
+            val response: Response = event.response
+            var sdkInstanceId = response.Volatile?.get("sdkInstanceId")?.toString()
 
-                val subs: ArrayList<Subscription>? = currentSubscriptions[response.room]
-                if (subs != null) {
-                    val instanceId = sdkInstanceId
-                    subs.forEach {
-                        if (instanceId == kuzzle.instanceId && it.subscribeToSelf || instanceId != kuzzle.instanceId) {
-                            it.handler(response)
-                        }
+            val subscriptions: ArrayList<Subscription>? = currentSubscriptions[response.room]
+            if (subscriptions != null) {
+                val instanceId = sdkInstanceId
+                subscriptions.forEach {
+                    if (instanceId == kuzzle.instanceId && it.subscribeToSelf || instanceId != kuzzle.instanceId) {
+                        it.handler(response)
                     }
                 }
+            } else {
+                kuzzle.protocol.trigger(UnhandledResponseEvent(response))
             }
         }
 

diff --git a/src/main/kotlin/io/kuzzle/sdk/events/RoomMessageEvent.kt b/src/main/kotlin/io/kuzzle/sdk/events/RoomMessageEvent.kt
@@ -0,0 +1,5 @@
+package io.kuzzle.sdk.events
+
+import io.kuzzle.sdk.coreClasses.responses.Response
+
+data class RoomMessageEvent(val response: Response)
diff --git a/src/main/kotlin/io/kuzzle/sdk/events/UnhandledExceptionEvent.kt b/src/main/kotlin/io/kuzzle/sdk/events/UnhandledExceptionEvent.kt
@@ -0,0 +1,3 @@
+package io.kuzzle.sdk.events
+
+data class UnhandledExceptionEvent(val exception: Exception)
diff --git a/src/main/kotlin/io/kuzzle/sdk/events/UnhandledResponseEvent.kt b/src/main/kotlin/io/kuzzle/sdk/events/UnhandledResponseEvent.kt
@@ -1,3 +1,5 @@
 package io.kuzzle.sdk.events
 
-data class UnhandledResponseEvent(var message: String?)
+import io.kuzzle.sdk.coreClasses.responses.Response
+
+data class UnhandledResponseEvent(var message: Response?)