From 788101aa0fcbc05106bab84aa100e6996c6aeb99 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sun, 16 Jan 2022 15:55:28 +0100
Subject: [PATCH] Request timeouts

---
 .../reactiveapi/DynamicAtomixReactiveApiClient.java  |  3 +++
 .../reactiveapi/LiveAtomixReactiveApiClient.java     | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java b/src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java
index 08c9862..9700206 100644
--- a/src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java
+++ b/src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java
@@ -7,6 +7,7 @@ import it.tdlight.reactiveapi.Event.ClientBoundEvent;
 import it.tdlight.reactiveapi.Event.Request;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicLong;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
@@ -65,6 +66,8 @@ public class DynamicAtomixReactiveApiClient implements ReactiveApiClient, AutoCl
 				)).subscribeOn(Schedulers.boundedElastic()).onErrorMap(ex -> {
 					if (ex instanceof MessagingException.NoRemoteHandler) {
 						return new TdError(404, "Bot #IDU" + this.userId + " (liveId: " + liveId + ") is not found on the cluster");
+					} else if (ex instanceof TimeoutException) {
+						return new TdError(408, "Request Timeout", ex);
 					} else {
 						return ex;
 					}
diff --git a/src/main/java/it/tdlight/reactiveapi/LiveAtomixReactiveApiClient.java b/src/main/java/it/tdlight/reactiveapi/LiveAtomixReactiveApiClient.java
index e044ff4..d40de1a 100644
--- a/src/main/java/it/tdlight/reactiveapi/LiveAtomixReactiveApiClient.java
+++ b/src/main/java/it/tdlight/reactiveapi/LiveAtomixReactiveApiClient.java
@@ -1,6 +1,7 @@
 package it.tdlight.reactiveapi;
 
 import io.atomix.cluster.messaging.ClusterEventService;
+import io.atomix.cluster.messaging.MessagingException;
 import io.atomix.core.Atomix;
 import it.tdlight.jni.TdApi;
 import it.tdlight.reactiveapi.Event.ClientBoundEvent;
@@ -20,6 +21,7 @@ import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 import org.apache.commons.lang3.SerializationException;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -54,7 +56,15 @@ public class LiveAtomixReactiveApiClient implements ReactiveApiClient {
 						LiveAtomixReactiveApiClient::deserializeResponse,
 						Duration.between(Instant.now(), timeout)
 				))
-				.subscribeOn(Schedulers.boundedElastic())
+				.subscribeOn(Schedulers.boundedElastic()).onErrorMap(ex -> {
+					if (ex instanceof MessagingException.NoRemoteHandler) {
+						return new TdError(404, "Bot #IDU" + this.userId + " (liveId: " + liveId + ") is not found on the cluster");
+					} else if (ex instanceof TimeoutException) {
+						return new TdError(408, "Request Timeout", ex);
+					} else {
+						return ex;
+					}
+				})
 				.handle((item, sink) -> {
 					if (item instanceof TdApi.Error error) {
 						sink.error(new TdError(error.code, error.message));