andreacavalli
/
tdlib-session-container
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update error handling

This commit is contained in:
Andrea Cavalli 2021-10-01 10:58:14 +02:00
parent f1c6fcf1a0
commit 82050a5f0b
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java
View File

@ -4,6 +4,7 @@ import io.vertx.core.eventbus.DeliveryOptions;
import io.vertx.core.json.JsonObject; import io.vertx.core.json.JsonObject;
import io.vertx.reactivex.core.Vertx; import io.vertx.reactivex.core.Vertx;
import io.vertx.reactivex.core.buffer.Buffer; import io.vertx.reactivex.core.buffer.Buffer;
import io.vertx.reactivex.core.eventbus.Message;
import io.vertx.reactivex.core.eventbus.MessageConsumer; import io.vertx.reactivex.core.eventbus.MessageConsumer;
import it.tdlight.jni.TdApi; import it.tdlight.jni.TdApi;
import it.tdlight.jni.TdApi.AuthorizationStateClosed; import it.tdlight.jni.TdApi.AuthorizationStateClosed;
@ -57,8 +58,6 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
private final Empty<Void> updatesStreamEnd = Sinks.one(); private final Empty<Void> updatesStreamEnd = Sinks.one();
// This will only result in a crash, never completes in other ways // This will only result in a crash, never completes in other ways
private final Empty<Void> crash = Sinks.one(); private final Empty<Void> crash = Sinks.one();
// Crash exception
private final AtomicReference<Throwable> crashException = new AtomicReference<>(null);
// This will only result in a successful completion, never completes in other ways // This will only result in a successful completion, never completes in other ways
private final Empty<Void> pingFail = Sinks.one(); private final Empty<Void> pingFail = Sinks.one();
// This will only result in a successful completion, never completes in other ways. // This will only result in a successful completion, never completes in other ways.
@ -280,7 +279,6 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
ex.setStackTrace(new StackTraceElement[0]); ex.setStackTrace(new StackTraceElement[0]);
throw ex; throw ex;
})).onErrorResume(ex -> MonoUtils.fromBlockingSingle(() -> { })).onErrorResume(ex -> MonoUtils.fromBlockingSingle(() -> {
crashException.set(ex);
EmitResult result; EmitResult result;
while ((result = this.crash.tryEmitError(ex)) == EmitResult.FAIL_NON_SERIALIZED) { while ((result = this.crash.tryEmitError(ex)) == EmitResult.FAIL_NON_SERIALIZED) {
// 10ms // 10ms
@ -329,18 +327,13 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
authStateClosing.tryEmitEmpty(); authStateClosing.tryEmitEmpty();
break; break;
case TdApi.AuthorizationStateClosed.CONSTRUCTOR: case TdApi.AuthorizationStateClosed.CONSTRUCTOR:
return Mono logger.info("Received AuthorizationStateClosed from tdlib");
.fromRunnable(() -> logger.info("Received AuthorizationStateClosed from tdlib")) return cluster.getEventBus()
.then(cluster.getEventBus() .<EndSessionMessage>rxRequest(this.botAddress + ".read-binlog", EMPTY)
.<EndSessionMessage>rxRequest(this.botAddress + ".read-binlog", EMPTY) .as(MonoUtils::toMono)
.as(MonoUtils::toMono) .mapNotNull(Message::body)
) .doOnNext(latestBinlog -> logger.info("Received binlog from server. Size: {}",
.flatMap(latestBinlogMsg -> Mono BinlogUtils.humanReadableByteCountBin(latestBinlog.binlog().length())))
.fromCallable(latestBinlogMsg::body)
.subscribeOn(Schedulers.parallel())
)
.doOnNext(latestBinlog -> logger.info("Received binlog from server. Size: "
+ BinlogUtils.humanReadableByteCountBin(latestBinlog.binlog().length())))
.flatMap(latestBinlog -> this.saveBinlog(latestBinlog.binlog())) .flatMap(latestBinlog -> this.saveBinlog(latestBinlog.binlog()))
.doOnSuccess(s -> logger.info("Overwritten binlog from server")) .doOnSuccess(s -> logger.info("Overwritten binlog from server"))
.thenReturn(update); .thenReturn(update);
@ -357,12 +350,9 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
.doOnSuccess(s -> logger.debug("Failed request {} because the TDLib session was already crashed", request)) .doOnSuccess(s -> logger.debug("Failed request {} because the TDLib session was already crashed", request))
.then(Mono.<TdResult<T>>empty()); .then(Mono.<TdResult<T>>empty());
var executionMono = Mono var executionMono = cluster.getEventBus()
.fromRunnable(() -> logger.trace("Executing request {}", request)) .<TdResultMessage>rxRequest(botAddress + ".execute", req, deliveryOptions)
.then(cluster.getEventBus() .as(MonoUtils::toMono)
.<TdResultMessage>rxRequest(botAddress + ".execute", req, deliveryOptions)
.as(MonoUtils::toMono)
)
.onErrorMap(ex -> ResponseError.newResponseError(request, botAlias, ex)) .onErrorMap(ex -> ResponseError.newResponseError(request, botAlias, ex))
.<TdResult<T>>handle((resp, sink) -> { .<TdResult<T>>handle((resp, sink) -> {
if (resp.body() == null) { if (resp.body() == null) {
@ -372,6 +362,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
sink.next(resp.body().toTdResult()); sink.next(resp.body().toTdResult());
} }
}) })
.doFirst(() -> logger.trace("Executing request {}", request))
.doOnSuccess(s -> logger.trace("Executed request {}", request)) .doOnSuccess(s -> logger.trace("Executed request {}", request))
.doOnError(ex -> logger.debug("Failed request {}: {}", req, ex)); .doOnError(ex -> logger.debug("Failed request {}: {}", req, ex));