From 0f38d6573ecd337c16fc3e30dd654e763cbe3003 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 10 Mar 2021 12:35:56 +0100 Subject: [PATCH] Adapt to the future ids format --- pom.xml | 4 ++-- .../tdlibsession/remoteclient/TDLibRemoteClient.java | 6 +++--- .../tdlibsession/td/middle/StartSessionMessage.java | 6 +++--- .../tdlibsession/td/middle/StartSessionMessageCodec.java | 4 ++-- .../td/middle/client/AsyncTdMiddleEventBusClient.java | 8 ++++---- .../td/middle/server/AsyncTdMiddleEventBusServer.java | 5 +++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index 82207c6..2db06ac 100644 --- a/pom.xml +++ b/pom.xml @@ -108,12 +108,12 @@ io.projectreactor reactor-core - 3.4.2 + 3.4.3 io.projectreactor reactor-tools - 3.4.2 + 3.4.3 com.akaita.java diff --git a/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java b/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java index 3fee194..60d6665 100644 --- a/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java +++ b/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java @@ -217,15 +217,15 @@ public class TDLibRemoteClient implements AutoCloseable { .then(completion); } - public static Path getSessionDirectory(int botId) { + public static Path getSessionDirectory(long botId) { return Paths.get(".sessions-cache").resolve("id" + botId); } - public static Path getMediaDirectory(int botId) { + public static Path getMediaDirectory(long botId) { return Paths.get(".cache").resolve("media").resolve("id" + botId); } - public static Path getSessionBinlogDirectory(int botId) { + public static Path getSessionBinlogDirectory(long botId) { return getSessionDirectory(botId).resolve("td.binlog"); } diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessage.java b/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessage.java index 75687fe..1330b84 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessage.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessage.java @@ -7,13 +7,13 @@ import java.util.StringJoiner; public final class StartSessionMessage { - private final int id; + private final long id; private final String alias; private final Buffer binlog; private final long binlogDate; private final JsonObject implementationDetails; - public StartSessionMessage(int id, String alias, Buffer binlog, long binlogDate, JsonObject implementationDetails) { + public StartSessionMessage(long id, String alias, Buffer binlog, long binlogDate, JsonObject implementationDetails) { this.id = id; this.alias = alias; this.binlog = binlog; @@ -21,7 +21,7 @@ public final class StartSessionMessage { this.implementationDetails = implementationDetails; } - public int id() { + public long id() { return id; } diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessageCodec.java b/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessageCodec.java index b1f48f3..c54264d 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessageCodec.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/StartSessionMessageCodec.java @@ -18,7 +18,7 @@ public class StartSessionMessageCodec implements MessageCodec { - os.writeInt(t.id()); + os.writeLong(t.id()); UTFUtils.writeUTF(os, t.alias()); BufferUtils.writeBuf(os, t.binlog()); os.writeLong(t.binlogDate()); @@ -28,7 +28,7 @@ public class StartSessionMessageCodec implements MessageCodec new StartSessionMessage(is.readInt(), + return BufferUtils.decode(pos, buffer, is -> new StartSessionMessage(is.readLong(), UTFUtils.readUTF(is), BufferUtils.rxReadBuf(is), is.readLong(), diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java b/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java index 1c2ad48..9b3131e 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java @@ -59,7 +59,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { // If it's completed stop checking if the ping works or not private final Empty authStateClosing = Sinks.one(); - private int botId; + private long botId; private String botAddress; private String botAlias; private boolean local; @@ -83,7 +83,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { } public static Mono getAndDeployInstance(TdClusterManager clusterManager, - int botId, + long botId, String botAlias, boolean local, JsonObject implementationDetails, @@ -110,7 +110,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { * * @return optional result */ - public static Mono retrieveBinlog(Vertx vertx, Path binlogsArchiveDirectory, int botId) { + public static Mono retrieveBinlog(Vertx vertx, Path binlogsArchiveDirectory, long botId) { return BinlogUtils.retrieveBinlog(vertx.fileSystem(), binlogsArchiveDirectory.resolve(botId + ".binlog")); } @@ -118,7 +118,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { return this.binlog.asMono().flatMap(binlog -> BinlogUtils.saveBinlog(binlog, data)); } - public Mono start(int botId, + public Mono start(long botId, String botAlias, boolean local, JsonObject implementationDetails, diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java b/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java index 989c358..a5429c2 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java @@ -25,6 +25,7 @@ import it.tdlight.tdlibsession.td.middle.TdResultList; import it.tdlight.tdlibsession.td.middle.TdResultListMessageCodec; import it.tdlight.tdlibsession.td.middle.TdResultMessage; import it.tdlight.utils.BinlogUtils; +import it.tdlight.utils.BufferTimeOutPublisher; import it.tdlight.utils.MonoUtils; import java.net.ConnectException; import java.time.Duration; @@ -341,8 +342,8 @@ public class AsyncTdMiddleEventBusServer extends AbstractVerticle { } })) .limitRate(Math.max(1, tdOptions.getEventsSize())) - //.transform(normal -> new BufferTimeOutPublisher<>(normal, Math.max(1, tdOptions.getEventsSize()), local ? Duration.ofMillis(1) : Duration.ofMillis(100))) - .bufferTimeout(Math.max(1, tdOptions.getEventsSize()), local ? Duration.ofMillis(1) : Duration.ofMillis(100)) + .transform(normal -> new BufferTimeOutPublisher<>(normal, Math.max(1, tdOptions.getEventsSize()), local ? Duration.ofMillis(1) : Duration.ofMillis(100))) + //.bufferTimeout(Math.max(1, tdOptions.getEventsSize()), local ? Duration.ofMillis(1) : Duration.ofMillis(100)) //.map(List::of) .limitRate(Math.max(1, tdOptions.getEventsSize())) .map(TdResultList::new);