Update dependencies, add sendMessage, add CompletableFuture variants to SimpleClient methods.

Author: cavallium

README.md

@@ -86,11 +86,11 @@ If you are using Maven, edit your `pom.xml` file as below:
 			<!-- Java 8 is supported if you use the following dependency classifier: <classifier>jdk8</classifier> -->
 			<!-- don't specify the version here -->
 		</dependency>
-		<!-- Example linux amd64 (GCC) ssl1 natives -->
+		<!-- Example linux amd64 (GNU GCC) ssl1 natives -->
 		<dependency>
 			<groupId>it.tdlight</groupId>
 			<artifactId>tdlight-natives</artifactId>
-			<classifier>linux_amd64_gcc_ssl1</classifier>
+			<classifier>linux_amd64_gnu_ssl1</classifier>
 			<!-- don't specify the version here -->
 		</dependency>
 		<!-- Example windows amd64 natives -->
@@ -124,8 +124,8 @@ dependencies {
 
 	// do not specify the versions on the dependencies below!
 	implementation group: 'it.tdlight', name: 'tdlight-java' // Java 8 is supported if you use the following dependency classifier: `jdk8`
-	implementation group: 'it.tdlight', name: 'tdlight-natives', classifier: 'linux_amd64_gcc_ssl1'
-	// Include other native classifiers, for example linux_amd64_ssl1, linux_amd64_ssl3, macos_amd64, ... -->
+	implementation group: 'it.tdlight', name: 'tdlight-natives', classifier: 'linux_amd64_gnu_ssl1'
+	// Include other native classifiers, for example linux_amd64_clang_ssl3, macos_amd64, ... -->
 }
 ```
 
@@ -136,13 +136,16 @@ it [here](https://github.com/tdlight-team/tdlight-java/releases).
 
 To use TDLight Java you need to include the native libraries, by specifying one of the following classifier for each tdlight-natives dependency:
 
-- `linux_amd64_ssl1`
-- `linux_amd64_ssl3`
-- `linux_amd64_gcc_ssl1`
-- `linux_amd64_gcc_ssl3`
-- `linux_arm64_ssl1`
-- `linux_arm64_ssl3`
-- `linux_ppc64le_ssl3`
+- `linux_amd64_clang_ssl3`
+- `linux_amd64_gnu_ssl1`
+- `linux_amd64_gnu_ssl3`
+- `linux_arm64_clang_ssl3`
+- `linux_arm64_gnu_ssl1`
+- `linux_arm64_gnu_ssl3`
+- `linux_armhf_gnu_ssl1`
+- `linux_armhf_gnu_ssl3`
+- `linux_ppc64el_gnu_ssl3`
+- `linux_riscv64_gnu_ssl3`
 - `windows_amd64`
 - `macos_amd64`
 

bom/pom.xml

@@ -8,8 +8,8 @@
 	<name>TDLight Java BOM</name>
 	<properties>
 		<revision>3.0.0.0-SNAPSHOT</revision>
-		<tdlight.natives.version>4.0.440</tdlight.natives.version>
-		<tdlight.api.version>4.0.410</tdlight.api.version>
+		<tdlight.natives.version>4.0.480</tdlight.natives.version>
+		<tdlight.api.version>4.0.450</tdlight.api.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
@@ -82,43 +82,61 @@
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_amd64_ssl1</classifier>
+				<classifier>linux_amd64_clang_ssl3</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_amd64_ssl3</classifier>
+				<classifier>linux_amd64_gnu_ssl1</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_amd64_gcc_ssl1</classifier>
+				<classifier>linux_amd64_gnu_ssl3</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_amd64_gcc_ssl3</classifier>
+				<classifier>linux_arm64_clang_ssl3</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_arm64_ssl1</classifier>
+				<classifier>linux_arm64_gnu_ssl1</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_arm64_ssl3</classifier>
+				<classifier>linux_arm64_gnu_ssl3</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlight-natives</artifactId>
 				<version>${tdlight.natives.version}</version>
-				<classifier>linux_ppc64le_ssl3</classifier>
+				<classifier>linux_armhf_gnu_ssl1</classifier>
+			</dependency>
+			<dependency>
+				<groupId>it.tdlight</groupId>
+				<artifactId>tdlight-natives</artifactId>
+				<version>${tdlight.natives.version}</version>
+				<classifier>linux_armhf_gnu_ssl3</classifier>
+			</dependency>
+			<dependency>
+				<groupId>it.tdlight</groupId>
+				<artifactId>tdlight-natives</artifactId>
+				<version>${tdlight.natives.version}</version>
+				<classifier>linux_ppc64el_gnu_ssl3</classifier>
+			</dependency>
+			<dependency>
+				<groupId>it.tdlight</groupId>
+				<artifactId>tdlight-natives</artifactId>
+				<version>${tdlight.natives.version}</version>
+				<classifier>linux_riscv64_gnu_ssl3</classifier>
 			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>

example/pom.xml

@@ -44,22 +44,17 @@
 		<dependency>
 			<groupId>it.tdlight</groupId>
 			<artifactId>tdlight-natives</artifactId>
-			<classifier>linux_amd64_ssl1</classifier>
+			<classifier>linux_amd64_gnu_ssl1</classifier>
 		</dependency>
 		<dependency>
 			<groupId>it.tdlight</groupId>
 			<artifactId>tdlight-natives</artifactId>
-			<classifier>linux_amd64_gcc_ssl1</classifier>
+			<classifier>linux_amd64_clang_ssl3</classifier>
 		</dependency>
 		<dependency>
 			<groupId>it.tdlight</groupId>
 			<artifactId>tdlight-natives</artifactId>
-			<classifier>linux_amd64_ssl3</classifier>
-		</dependency>
-		<dependency>
-			<groupId>it.tdlight</groupId>
-			<artifactId>tdlight-natives</artifactId>
-			<classifier>linux_amd64_gcc_ssl3</classifier>
+			<classifier>linux_amd64_gnu_ssl3</classifier>
 		</dependency>
 		<dependency>
 			<groupId>it.tdlight</groupId>

tdlight-java/src/main/java/it/tdlight/client/AuthorizationStateWaitForExit.java

@@ -7,16 +7,16 @@
 
 final class AuthorizationStateWaitForExit implements GenericUpdateHandler<TdApi.UpdateAuthorizationState> {
 
-	private final CountDownLatch closed;
+	private final Runnable setClosed;
 
-	public AuthorizationStateWaitForExit(CountDownLatch closed) {
-		this.closed = closed;
+	public AuthorizationStateWaitForExit(Runnable setClosed) {
+		this.setClosed = setClosed;
 	}
 
 	@Override
 	public void onUpdate(UpdateAuthorizationState update) {
 		if (update.authorizationState.getConstructor() == AuthorizationStateClosed.CONSTRUCTOR) {
-			closed.countDown();
+			setClosed.run();
 		}
 	}
 }

tdlight-java/src/main/java/it/tdlight/client/MutableTelegramClient.java

@@ -9,7 +9,7 @@ public interface MutableTelegramClient {
 
 	<T extends TdApi.Update> void addCommandHandler(String commandName, CommandHandler handler);
 
-	<T extends TdApi.Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<T> handler);
+	<T extends TdApi.Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<? super T> handler);
 
 	void addUpdatesHandler(GenericUpdateHandler<TdApi.Update> handler);
 

tdlight-java/src/main/java/it/tdlight/client/SimpleResultHandler.java

@@ -8,9 +8,9 @@
 class SimpleResultHandler<T extends Update> implements ResultHandler<Update> {
 
 	private final int updateConstructor;
-	private final GenericUpdateHandler<T> handler;
+	private final GenericUpdateHandler<? super T> handler;
 
-	public SimpleResultHandler(Class<T> type, GenericUpdateHandler<T> handler) {
+	public SimpleResultHandler(Class<T> type, GenericUpdateHandler<? super T> handler) {
 		this.updateConstructor = ConstructorDetector.getConstructor(type);
 		this.handler = handler;
 	}

tdlight-java/src/main/java/it/tdlight/client/SimpleTelegramClient.java

@@ -6,6 +6,7 @@
 import it.tdlight.Init;
 import it.tdlight.ResultHandler;
 import it.tdlight.TelegramClient;
+import it.tdlight.jni.TdApi.Message;
 import it.tdlight.jni.TdApi.Update;
 import it.tdlight.util.UnsupportedNativeLibraryException;
 import it.tdlight.jni.TdApi;
@@ -20,7 +21,12 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +60,8 @@ public final class SimpleTelegramClient implements Authenticable, MutableTelegra
 	private final AuthorizationStateReadyLoadChats mainChatsLoader;
 	private final AuthorizationStateReadyLoadChats archivedChatsLoader;
 
-	private final CountDownLatch closed = new CountDownLatch(1);
+	private final CompletableFuture<Void> closed = new CompletableFuture<>();
+	private final ConcurrentMap<TemporaryMessageURL, CompletableFuture<Message>> temporaryMessages = new ConcurrentHashMap<>();
 
 	SimpleTelegramClient(ClientFactory clientFactory,
 			TDLibSettings settings,
@@ -109,12 +116,15 @@ public final class SimpleTelegramClient implements Authenticable, MutableTelegra
 						this::handleDefaultException
 				)
 		);
-		this.addUpdateHandler(TdApi.UpdateAuthorizationState.class, new AuthorizationStateWaitForExit(this.closed));
+		this.addUpdateHandler(TdApi.UpdateAuthorizationState.class, new AuthorizationStateWaitForExit(this::onCloseUpdate));
 		this.mainChatsLoader = new AuthorizationStateReadyLoadChats(client, new ChatListMain());
 		this.archivedChatsLoader = new AuthorizationStateReadyLoadChats(client, new ChatListArchive());
 		this.addUpdateHandler(TdApi.UpdateAuthorizationState.class,
 				this.meGetter = new AuthorizationStateReadyGetMe(client, mainChatsLoader, archivedChatsLoader));
 		this.addUpdateHandler(TdApi.UpdateNewMessage.class, new CommandsHandler(client, this.commandHandlers, this::getMe));
+		var temporaryMessageHandler = new TemporaryMessageHandler(this.temporaryMessages);
+		this.addUpdateHandler(TdApi.UpdateMessageSendSucceeded.class, temporaryMessageHandler);
+		this.addUpdateHandler(TdApi.UpdateMessageSendFailed.class, temporaryMessageHandler);
 		this.authenticationData = authenticationData;
 		createDirectories();
 		client.initialize(this::handleUpdate, this::handleUpdateException, this::handleDefaultException);
@@ -191,7 +201,7 @@ public <T extends TdApi.Update> void addCommandHandler(String commandName, Comma
 	}
 
 	@Override
-	public <T extends TdApi.Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<T> handler) {
+	public <T extends TdApi.Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<? super T> handler) {
 		this.updateHandlers.put(new SimpleResultHandler<>(updateType, handler), null);
 	}
 
@@ -257,6 +267,44 @@ public <R extends TdApi.Object> void send(TdApi.Function<R> function, GenericRes
 		client.send(function, result -> resultHandler.onResult(Result.of(result)), resultHandlerExceptionHandler);
 	}
 
+	/**
+	 * Sends a request to TDLib and get the result.
+	 *
+	 * @param function         The request to TDLib.
+	 * @throws NullPointerException if function is null.
+	 */
+	@SuppressWarnings("unchecked")
+	public <R extends TdApi.Object> CompletableFuture<R> send(TdApi.Function<R> function) {
+		CompletableFuture<R> future = new CompletableFuture<>();
+		client.send(function, result -> {
+			if (result instanceof TdApi.Error) {
+				future.completeExceptionally(new TelegramError((TdApi.Error) result));
+			} else {
+				future.complete((R) result);
+			}
+		}, future::completeExceptionally);
+		return future;
+	}
+
+	/**
+	 * Sends a message
+	 *
+	 * @param function The request to TDLib.
+	 * @param wait     Wait until the message has been sent.
+	 *                  If false, the returned message will not represent the real message, but it will be a temporary message.
+	 * @throws NullPointerException if function is null.
+	 */
+	public CompletableFuture<TdApi.Message> sendMessage(TdApi.SendMessage function, boolean wait) {
+		return this.send(function).thenCompose(msg -> {
+			CompletableFuture<TdApi.Message> future = new CompletableFuture<>();
+			CompletableFuture<?> prev = temporaryMessages.put(new TemporaryMessageURL(msg.chatId, msg.id), future);
+			if (prev != null) {
+				prev.completeExceptionally(new IllegalStateException("Another temporary message has the same id"));
+			}
+			return future;
+		});
+	}
+
 	/**
 	 * Execute a synchronous function.
 	 * <strong>Please note that only some functions can be executed using this method.</strong>
@@ -266,6 +314,13 @@ public <R extends TdApi.Object> Result<R> execute(TdApi.Function<R> function) {
 		return Result.of(client.execute(function));
 	}
 
+	/**
+	 * Send the close signal but don't wait
+	 */
+	public CompletableFuture<Void> close() {
+		return this.send(new TdApi.Close()).thenCompose(x -> this.waitForExitAsync());
+	}
+
 	/**
 	 * Send the close signal but don't wait
 	 */
@@ -293,7 +348,23 @@ public void closeAndWait() throws InterruptedException {
 	 * Wait until TDLight is closed
 	 */
 	public void waitForExit() throws InterruptedException {
-		closed.await();
+		try {
+			closed.get();
+		} catch (ExecutionException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Wait until TDLight is closed
+	 */
+	public CompletableFuture<Void> waitForExitAsync() {
+		return closed.copy();
+	}
+
+	private void onCloseUpdate() {
+		this.closed.complete(null);
+		this.temporaryMessages.clear();
 	}
 
 	private final class SimpleTelegramClientInteraction implements ClientInteraction {

tdlight-java/src/main/java/it/tdlight/client/SimpleTelegramClientBuilder.java

@@ -39,7 +39,7 @@ public <T extends Update> void addCommandHandler(String commandName, CommandHand
 	}
 
 	@Override
-	public <T extends Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<T> handler) {
+	public <T extends Update> void addUpdateHandler(Class<T> updateType, GenericUpdateHandler<? super T> handler) {
 		this.updateHandlers.add(new SimpleResultHandler<>(updateType, handler));
 	}