Merge 7773a3fd83f46ba018503a477e3f304b55eb503f into d0ee90dbbcf04d91b1683646eb13b0e7c4794642

Fixes #2009

README.md

@@ -148,6 +148,16 @@ version installed, you can replace `./gradlew` with `gradle` in the following st
       ./gradlew run --args="--help"
       ```
 
+### JSON Schemas for the JSON-RPC mode
+
+1. Generate [JSON Schema](https://json-schema.org/) files for all the JSON-RPC data classes (`src/main/java/org/asamk/signal/json`):
+
+    ```sh
+    ./gradlew jsonSchemas
+    ```
+
+2. The generated files can be found in the `build/generated/META-INF/schemas` folder.
+
 ### Building a native binary with GraalVM (EXPERIMENTAL)
 
 It is possible to build a native binary with [GraalVM](https://www.graalvm.org). This is still experimental and will not

build.gradle.kts

@@ -1,3 +1,5 @@
+import groovy.json.JsonOutput
+
 plugins {
     java
     application
@@ -72,6 +74,11 @@ val excludePatterns = mapOf(
     )
 )
 
+val schemaAnnotationProcessor by configurations.creating {
+    isCanBeConsumed = false
+    isCanBeResolved = true
+}
+
 dependencies {
     registerTransform(JarFileExcluder::class) {
         from.attribute(minified, false).attribute(artifactType, "jar")
@@ -82,6 +89,8 @@ dependencies {
         }
     }
 
+    schemaAnnotationProcessor(libs.micronaut.json.schema.processor)
+    schemaAnnotationProcessor(libs.micronaut.inject.java)
     implementation(libs.bouncycastle)
     implementation(libs.jackson.databind)
     implementation(libs.argparse4j)
@@ -90,6 +99,10 @@ dependencies {
     implementation(libs.slf4j.jul)
     implementation(libs.logback)
     implementation(libs.zxing)
+    implementation(libs.micronaut.json.schema.annotations)
+    if (gradle.startParameter.taskNames.any { it.contains("jsonSchemas") }) {
+        implementation(libs.micronaut.json.schema.generator)
+    }    
     implementation(project(":libsignal-cli"))
 
     testImplementation(libs.junit.jupiter)
@@ -160,3 +173,30 @@ tasks.register("writeLibsignalVersion") {
         }
     }
 }
+
+tasks.register<JavaCompile>("jsonSchemas") {
+    dependsOn(tasks.compileJava)
+    val schemaBaseUri = "http://localhost:8080/schemas/"
+    source = sourceSets.main.get().java
+    include("org/asamk/signal/json/**/*.java")
+    classpath = sourceSets.main.get().compileClasspath + files(sourceSets.main.get().java.destinationDirectory)
+    destinationDirectory.set(layout.buildDirectory.dir("generated"))
+    options.annotationProcessorPath = schemaAnnotationProcessor
+    options.compilerArgs.addAll(
+        listOf(
+            "-Amicronaut.processing.group=org.asamk",
+            "-Amicronaut.processing.module=signal-cli",
+            "-Amicronaut.processing.annotations=org.asamk.signal.json.*",
+            "-Amicronaut.jsonschema.baseUri=$schemaBaseUri",
+        )
+    )
+    doLast {
+        fileTree(destinationDirectory.get().dir("META-INF/schemas").asFile) {
+            include("*.schema.json")
+        }.forEach { schemaFile ->
+            val normalized = schemaFile.readText().replace("\"$schemaBaseUri/", "\"")
+            val prettyJson = JsonOutput.prettyPrint(normalized)
+            schemaFile.writeText("$prettyJson\n")
+        }
+    }
+}

gradle/libs.versions.toml

@@ -1,6 +1,8 @@
 [versions]
 slf4j = "2.0.17"
 junit = "6.0.2"
+micronaut-json-schema = "2.0.0-M6"
+micronaut-core = "4.9.3"
 
 [libraries]
 bouncycastle = "org.bouncycastle:bcprov-jdk18on:1.83"
@@ -8,6 +10,10 @@ jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.20.2"
 argparse4j = "net.sourceforge.argparse4j:argparse4j:0.9.0"
 dbusjava = "com.github.hypfvieh:dbus-java-transport-native-unixsocket:5.0.0"
 zxing = "com.google.zxing:core:3.5.4"
+micronaut-json-schema-annotations = { module = "io.micronaut.jsonschema:micronaut-json-schema-annotations", version.ref = "micronaut-json-schema" }
+micronaut-json-schema-processor = { module = "io.micronaut.jsonschema:micronaut-json-schema-processor", version.ref = "micronaut-json-schema" }
+micronaut-json-schema-generator = { module = "io.micronaut.jsonschema:micronaut-json-schema-generator", version.ref = "micronaut-json-schema" }
+micronaut-inject-java = { module = "io.micronaut:micronaut-inject-java", version.ref = "micronaut-core" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
 logback = "ch.qos.logback:logback-classic:1.5.32"

lib/src/main/java/org/asamk/signal/manager/api/CallOffer.java

@@ -1,9 +1,7 @@
 package org.asamk.signal.manager.api;
 
 public record CallOffer(
-        long callId,
-        Type type,
-        byte[] opaque
+        long callId, Type type, byte[] opaque
 ) {
 
     public enum Type {

lib/src/main/java/org/asamk/signal/manager/api/MessageEnvelope.java

@@ -268,19 +268,19 @@ public record MessageEnvelope(
                         quote.getMentions() == null
                                 ? List.of()
                                 : quote.getMentions()
-                                        .stream()
-                                        .map(m -> Mention.from(m, recipientResolver, addressResolver))
-                                        .toList(),
+                                  .stream()
+                                  .map(m -> Mention.from(m, recipientResolver, addressResolver))
+                                  .toList(),
                         quote.getAttachments() == null
                                 ? List.of()
                                 : quote.getAttachments().stream().map(a -> Attachment.from(a, fileProvider)).toList(),
                         quote.getBodyRanges() == null
                                 ? List.of()
                                 : quote.getBodyRanges()
-                                        .stream()
-                                        .filter(r -> r.style != null)
-                                        .map(TextStyle::from)
-                                        .toList());
+                                  .stream()
+                                  .filter(r -> r.style != null)
+                                  .map(TextStyle::from)
+                                  .toList());
             }
         }
 
@@ -599,7 +599,7 @@ public record MessageEnvelope(
                         Boolean.TRUE.equals(pinnedMessage.getForever())
                                 ? -1
                                 : pinnedMessage.getPinDurationInSeconds() == null
-                                        ? 0
+                                  ? 0
                                         : pinnedMessage.getPinDurationInSeconds());
             }
         }
@@ -1032,14 +1032,14 @@ public record MessageEnvelope(
         final var source = !envelope.isUnidentifiedSender() && serviceId != null
                 ? recipientResolver.resolveRecipient(serviceId)
                 : envelope.isUnidentifiedSender() && content != null
-                        ? recipientResolver.resolveRecipient(content.getSender())
+                  ? recipientResolver.resolveRecipient(content.getSender())
                         : exception instanceof ProtocolException e
-                                ? recipientResolver.resolveRecipient(e.getSender())
+                          ? recipientResolver.resolveRecipient(e.getSender())
                                 : null;
         final var sourceDevice = envelope.hasSourceDevice()
                 ? envelope.getSourceDevice()
                 : content != null
-                        ? content.getSenderDevice()
+                  ? content.getSenderDevice()
                         : exception instanceof ProtocolException e ? e.getSenderDevice() : 0;
 
         Optional<Receipt> receipt;

lib/src/main/java/org/asamk/signal/manager/api/ReceiveConfig.java

@@ -1,3 +1,9 @@
 package org.asamk.signal.manager.api;
 
-public record ReceiveConfig(boolean ignoreAttachments, boolean ignoreStories, boolean ignoreAvatars, boolean ignoreStickers, boolean sendReadReceipts) {}
+public record ReceiveConfig(
+        boolean ignoreAttachments,
+        boolean ignoreStories,
+        boolean ignoreAvatars,
+        boolean ignoreStickers,
+        boolean sendReadReceipts
+) {}

lib/src/main/java/org/asamk/signal/manager/api/TurnServer.java

@@ -3,8 +3,5 @@ package org.asamk.signal.manager.api;
 import java.util.List;
 
 public record TurnServer(
-        String username,
-        String password,
-        List<String> urls
-) {
-}
+        String username, String password, List<String> urls
+) {}

lib/src/main/java/org/asamk/signal/manager/helper/ContactHelper.java

@@ -55,7 +55,7 @@ public class ContactHelper {
         final var version = contact == null
                 ? 1
                 : contact.messageExpirationTimeVersion() == Integer.MAX_VALUE
-                        ? Integer.MAX_VALUE
+                  ? Integer.MAX_VALUE
                         : contact.messageExpirationTimeVersion() + 1;
         account.getContactStore()
                 .storeContact(recipientId,

lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java

@@ -726,7 +726,7 @@ public class GroupHelper {
                 result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
             final var newMembers = new HashSet<>(members);
-            newMembers.removeAll(group.getMembers());
+            newMembers.removeAll(group.getMemberRecipientIds());
             newMembers.removeAll(group.getRequestingMembers());
             if (!newMembers.isEmpty()) {
                 var groupGroupChangePair = groupV2Helper.addMembers(group, newMembers);
@@ -768,12 +768,8 @@ public class GroupHelper {
             newAdmins.retainAll(group.getMemberRecipientIds());
             newAdmins.removeAll(group.getAdminMemberRecipientIds());
             if (!newAdmins.isEmpty()) {
-                for (var admin : newAdmins) {
-                    var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, true);
-                    result = sendUpdateGroupV2Message(group,
-                            groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
-                }
+                var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, newAdmins, true);
+                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
         }
 
@@ -781,12 +777,8 @@ public class GroupHelper {
             final var existingRemoveAdmins = new HashSet<>(removeAdmins);
             existingRemoveAdmins.retainAll(group.getAdminMemberRecipientIds());
             if (!existingRemoveAdmins.isEmpty()) {
-                for (var admin : existingRemoveAdmins) {
-                    var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, admin, false);
-                    result = sendUpdateGroupV2Message(group,
-                            groupGroupChangePair.first(),
-                            groupGroupChangePair.second());
-                }
+                var groupGroupChangePair = groupV2Helper.setMemberAdmin(group, existingRemoveAdmins, false);
+                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
             }
         }
 

lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java

@@ -501,18 +501,25 @@ class GroupV2Helper {
 
     Pair<DecryptedGroup, GroupChangeResponse> setMemberAdmin(
             GroupInfoV2 groupInfoV2,
-            RecipientId recipientId,
+            Set<RecipientId> recipientIds,
             boolean admin
     ) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
-        final var address = context.getRecipientHelper().resolveSignalServiceAddress(recipientId);
         final var newRole = admin ? Member.Role.ADMINISTRATOR : Member.Role.DEFAULT;
-        if (address.getServiceId() instanceof ACI aci) {
-            final var change = groupOperations.createChangeMemberRole(aci, newRole);
-            return commitChange(groupInfoV2, change);
-        } else {
+        final var change = new GroupChange.Actions.Builder();
+        final var memberRoles = recipientIds.stream()
+                .map(context.getRecipientHelper()::resolveSignalServiceAddress)
+                .map(SignalServiceAddress::getServiceId)
+                .filter(m -> m instanceof ACI)
+                .map(m -> (ACI) m)
+                .map(aci -> new GroupChange.Actions.ModifyMemberRoleAction.Builder().userId(groupOperations.encryptServiceId(
+                        aci)).role(newRole).build())
+                .toList();
+        if (memberRoles.size() < recipientIds.size()) {
             throw new IllegalArgumentException("Can't make a PNI a group admin.");
         }
+        change.modifyMemberRoles(memberRoles);
+        return commitChange(groupInfoV2, change);
     }
 
     Pair<DecryptedGroup, GroupChangeResponse> setMessageExpirationTimer(

lib/src/main/java/org/asamk/signal/manager/helper/ProfileHelper.java

@@ -191,9 +191,11 @@ public final class ProfileHelper {
         if (uploadProfile) {
             final var streamDetails = avatar != null && avatar.isPresent()
                     ? Utils.createStreamDetails(avatar.get())
-                    .first()
-                    : forceUploadAvatar && avatar == null ? context.getAvatarStore()
-                            .retrieveProfileAvatar(account.getSelfRecipientAddress()) : null;
+                      .first()
+                    : forceUploadAvatar && avatar == null
+                      ? context.getAvatarStore()
+                        .retrieveProfileAvatar(account.getSelfRecipientAddress())
+                            : null;
             try (streamDetails) {
                 final var avatarUploadParams = streamDetails != null
                         ? AvatarUploadParams.forAvatar(streamDetails)

lib/src/main/java/org/asamk/signal/manager/helper/SendHelper.java

@@ -524,11 +524,11 @@ public class SendHelper {
         Set<RecipientId> senderKeyTargets = groupInfo.getDistributionId() == null || groupSendEndorsements == null
                 ? Set.of()
                 : recipientIds.stream()
-                        .filter(s -> this.isSenderKeyCapable(s,
-                                addressesMap.get(s),
-                                unidentifiedAccessesMap.get(s),
-                                groupSendEndorsements))
-                        .collect(Collectors.toSet());
+                  .filter(s -> this.isSenderKeyCapable(s,
+                          addressesMap.get(s),
+                          unidentifiedAccessesMap.get(s),
+                          groupSendEndorsements))
+                  .collect(Collectors.toSet());
         if (senderKeyTargets.size() < 2) {
             logger.debug("Too few sender-key-capable users ({}). Doing all legacy sends.", senderKeyTargets.size());
             senderKeyTargets = Set.of();
@@ -590,11 +590,11 @@ public class SendHelper {
             final var expirationMs = Instant.ofEpochMilli(groupSendEndorsementsExpirationMs);
             final var groupSendTokens = groupSendEndorsements != null && groupSecretParams != null
                     ? legacyTargets.stream()
-                    .map(groupSendEndorsements::get)
-                    .map(endorsement -> Optional.ofNullable(endorsement)
-                            .map(e -> e.toFullToken(groupSecretParams, expirationMs))
-                            .orElse(null))
-                    .toList()
+                      .map(groupSendEndorsements::get)
+                      .map(endorsement -> Optional.ofNullable(endorsement)
+                                          .map(e -> e.toFullToken(groupSecretParams, expirationMs))
+                                          .orElse(null))
+                      .toList()
                     : null;
             final var sealedSenderAccesses = SealedSenderAccess.forFanOutGroupSend(groupSendTokens,
                     senderCertificate,

lib/src/main/java/org/asamk/signal/manager/storage/SignalAccount.java

@@ -941,7 +941,7 @@ public class SignalAccount implements Closeable {
                             profile.isUnrestrictedUnidentifiedAccess()
                                     ? Profile.UnidentifiedAccessMode.UNRESTRICTED
                                     : profile.getUnidentifiedAccess() != null
-                                            ? Profile.UnidentifiedAccessMode.ENABLED
+                                      ? Profile.UnidentifiedAccessMode.ENABLED
                                             : Profile.UnidentifiedAccessMode.DISABLED,
                             capabilities,
                             null);

lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupStore.java

@@ -152,6 +152,7 @@ public class GroupStore {
                 statement.setBytes(2, groupId.serialize());
                 final var result = Utils.executeQueryForOptional(statement, Utils::getIdMapper);
                 if (result.isEmpty()) {
+                    connection.commit();
                     return;
                 }
                 internalId = result.get();
@@ -876,9 +877,9 @@ public class GroupStore {
         final var members = membersString == null
                 ? Set.<RecipientId>of()
                 : Arrays.stream(membersString.split(","))
-                        .map(Integer::valueOf)
-                        .map(recipientIdCreator::create)
-                        .collect(Collectors.toSet());
+                  .map(Integer::valueOf)
+                  .map(recipientIdCreator::create)
+                  .collect(Collectors.toSet());
         final var expirationTime = resultSet.getInt("expiration_time");
         final var blocked = resultSet.getBoolean("blocked");
         final var archived = resultSet.getBoolean("archived");

lib/src/main/java/org/asamk/signal/manager/storage/protocol/LegacyJsonIdentityKeyStore.java

@@ -115,7 +115,7 @@ public class LegacyJsonIdentityKeyStore {
                         var trustLevel = trustedKey.hasNonNull("trustLevel") ? TrustLevel.fromInt(trustedKey.get(
                                 "trustLevel").asInt()) : TrustLevel.TRUSTED_UNVERIFIED;
                         var added = trustedKey.hasNonNull("addedTimestamp") ? new Date(trustedKey.get("addedTimestamp")
-                                .asLong()) : new Date();
+                                                                                       .asLong()) : new Date();
                         identities.add(new LegacyIdentityInfo(address, id, trustLevel, added));
                     } catch (InvalidKeyException e) {
                         logger.warn("Error while decoding key for {}: {}", trustedKeyName, e.getMessage());

lib/src/main/java/org/asamk/signal/manager/storage/recipients/RecipientStore.java

@@ -28,6 +28,7 @@ import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,7 +51,7 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     private final Map<Long, Long> recipientsMerged = new HashMap<>();
 
-    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = new HashMap<>();
+    private final Map<ServiceId, RecipientWithAddress> recipientAddressCache = Collections.synchronizedMap(new HashMap<>());
 
     public static void createSql(Connection connection) throws SQLException {
         // When modifying the CREATE statement here, also add a migration in AccountDatabase.java
@@ -184,12 +185,12 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
 
     @Override
     public RecipientId resolveRecipient(final ServiceId serviceId) {
+        final var recipientWithAddress = recipientAddressCache.get(serviceId);
+        if (recipientWithAddress != null) {
+            return recipientWithAddress.id();
+        }
         try (final var connection = database.getConnection()) {
             connection.setAutoCommit(false);
-            final var recipientWithAddress = recipientAddressCache.get(serviceId);
-            if (recipientWithAddress != null) {
-                return recipientWithAddress.id();
-            }
             final var recipientId = resolveRecipientLocked(connection, serviceId);
             connection.commit();
             return recipientId;
@@ -1605,9 +1606,9 @@ public class RecipientStore implements RecipientIdCreator, RecipientResolver, Re
                 profileCapabilities == null
                         ? Set.of()
                         : Arrays.stream(profileCapabilities.split(","))
-                                .map(Profile.Capability::valueOfOrNull)
-                                .filter(Objects::nonNull)
-                                .collect(Collectors.toSet()),
+                          .map(Profile.Capability::valueOfOrNull)
+                          .filter(Objects::nonNull)
+                          .collect(Collectors.toSet()),
                 PhoneNumberSharingMode.valueOfOrNull(resultSet.getString("profile_phone_number_sharing")));
     }
 

lib/src/main/java/org/asamk/signal/manager/storage/sendLog/MessageSendLogStore.java

@@ -303,6 +303,7 @@ public class MessageSendLogStore implements AutoCloseable {
             }
             if (contentId == -1) {
                 logger.warn("Failed to insert message send log content");
+                connection.commit();
                 return -1;
             }
             insertRecipientsForExistingContent(contentId, recipientDevices, connection);
@@ -320,10 +321,10 @@ public class MessageSendLogStore implements AutoCloseable {
             return content.dataMessage == null
                     ? null
                     : content.dataMessage.group != null && content.dataMessage.group.id != null
-                            ? content.dataMessage.group.id.toByteArray()
+                      ? content.dataMessage.group.id.toByteArray()
                             : content.dataMessage.groupV2 != null && content.dataMessage.groupV2.masterKey != null
-                                    ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray()))
-                                    .serialize()
+                              ? GroupUtils.getGroupIdV2(new GroupMasterKey(content.dataMessage.groupV2.masterKey.toByteArray()))
+                                .serialize()
                                     : null;
         } catch (InvalidInputException e) {
             logger.warn("Failed to parse groupId id from content");

lib/src/main/java/org/asamk/signal/manager/storage/sessions/SessionStore.java

@@ -194,8 +194,9 @@ public class SessionStore implements SignalServiceSessionStore {
             if (session != null) {
                 session.archiveCurrentState();
                 storeSession(connection, key, session);
-                connection.commit();
+
             }
+            connection.commit();
         } catch (SQLException e) {
             throw new RuntimeException("Failed update session store", e);
         }

lib/src/main/java/org/asamk/signal/manager/util/StickerUtils.java

@@ -78,8 +78,10 @@ public class StickerUtils {
                 throw new StickerPackInvalidException("Could not find find " + pack.cover().file());
             }
 
-            var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty() ? pack.cover()
-                    .contentType() : getContentType(rootPath, zip, pack.cover().file());
+            var contentType = pack.cover().contentType() != null && !pack.cover().contentType().isEmpty()
+                    ? pack.cover()
+                      .contentType()
+                    : getContentType(rootPath, zip, pack.cover().file());
             cover = new SignalServiceStickerManifestUpload.StickerInfo(data.first(),
                     data.second(),
                     Optional.ofNullable(pack.cover().emoji()).orElse(""),

src/main/java/org/asamk/signal/App.java

@@ -204,9 +204,9 @@ public class App {
     private OutputWriter getOutputWriter(final Command command) throws UserErrorException {
         final var outputTypeInput = ns.<OutputType>get("output");
         final var outputType = outputTypeInput == null ? command.getSupportedOutputTypes()
-                .stream()
-                .findFirst()
-                .orElse(null) : outputTypeInput;
+                                                         .stream()
+                                                         .findFirst()
+                                                         .orElse(null) : outputTypeInput;
         final var writer = new BufferedWriter(new OutputStreamWriter(System.out, IOUtils.getConsoleCharset()));
         final var outputWriter = outputType == null
                 ? null

src/main/java/org/asamk/signal/ReceiveMessageHandler.java

@@ -612,8 +612,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Size: {}{}",
                     attachment.size().isPresent() ? attachment.size().get() + " bytes" : "<unavailable>",
                     attachment.preview().isPresent() ? " (Preview is available: "
-                            + attachment.preview().get().length
-                            + " bytes)" : "");
+                                                       + attachment.preview().get().length
+                                                       + " bytes)" : "");
         }
         if (attachment.thumbnail().isPresent()) {
             writer.println("Thumbnail:");

src/main/java/org/asamk/signal/commands/AcceptCallCommand.java

@@ -23,10 +23,7 @@ public class AcceptCallCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Accept an incoming voice call.");
-        subparser.addArgument("--call-id")
-                .type(long.class)
-                .required(true)
-                .help("The call ID to accept.");
+        subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to accept.");
     }
 
     @Override

src/main/java/org/asamk/signal/commands/HangupCallCommand.java

@@ -21,10 +21,7 @@ public class HangupCallCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Hang up an active voice call.");
-        subparser.addArgument("--call-id")
-                .type(long.class)
-                .required(true)
-                .help("The call ID to hang up.");
+        subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to hang up.");
     }
 
     @Override

src/main/java/org/asamk/signal/commands/ListCallsCommand.java

@@ -5,13 +5,10 @@ import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.api.CallInfo;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 
-import java.util.List;
-
 public class ListCallsCommand implements JsonRpcLocalCommand {
 
     @Override

src/main/java/org/asamk/signal/commands/ListContactsCommand.java

@@ -109,7 +109,7 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                                         r.getProfile().getPhoneNumberSharingMode() == null
                                                 ? ""
                                                 : String.valueOf(r.getProfile().getPhoneNumberSharingMode()
-                                                        == PhoneNumberSharingMode.EVERYBODY),
+                                                                 == PhoneNumberSharingMode.EVERYBODY),
                                         r.getDiscoverable() == null ? "" : String.valueOf(r.getDiscoverable()));
                     }
                 }
@@ -121,17 +121,17 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                     final var jsonInternal = !internal
                             ? null
                             : new JsonContact.JsonInternal(r.getProfile()
-                                    .getCapabilities()
-                                    .stream()
-                                    .map(Enum::name)
-                                    .toList(),
+                                                           .getCapabilities()
+                                                           .stream()
+                                                           .map(Enum::name)
+                                                           .toList(),
                                     r.getProfile().getUnidentifiedAccessMode() == Profile.UnidentifiedAccessMode.UNKNOWN
-                                            ? null
+                                    ? null
                                             : r.getProfile().getUnidentifiedAccessMode().name(),
                                     r.getProfile().getPhoneNumberSharingMode() == null
-                                            ? null
+                                    ? null
                                             : r.getProfile().getPhoneNumberSharingMode()
-                                                    == PhoneNumberSharingMode.EVERYBODY,
+                                              == PhoneNumberSharingMode.EVERYBODY,
                                     r.getDiscoverable());
                     return new JsonContact(address.number().orElse(null),
                             address.uuid().map(UUID::toString).orElse(null),
@@ -159,9 +159,9 @@ public class ListContactsCommand implements JsonRpcLocalCommand {
                                             r.getProfile().getAboutEmoji(),
                                             r.getProfile().getAvatarUrlPath() != null,
                                             r.getProfile().getMobileCoinAddress() == null
-                                                    ? null
+                                            ? null
                                                     : Base64.getEncoder()
-                                                            .encodeToString(r.getProfile().getMobileCoinAddress())),
+                                                      .encodeToString(r.getProfile().getMobileCoinAddress())),
                             jsonInternal);
                 }).toList();
                 writer.write(jsonContacts);

src/main/java/org/asamk/signal/commands/RejectCallCommand.java

@@ -21,10 +21,7 @@ public class RejectCallCommand implements JsonRpcLocalCommand {
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Reject an incoming voice call.");
-        subparser.addArgument("--call-id")
-                .type(long.class)
-                .required(true)
-                .help("The call ID to reject.");
+        subparser.addArgument("--call-id").type(long.class).required(true).help("The call ID to reject.");
     }
 
     @Override

src/main/java/org/asamk/signal/commands/SendPollCreateCommand.java

@@ -82,7 +82,11 @@ public class SendPollCreateCommand implements JsonRpcLocalCommand {
                 throw new UserErrorException("Poll options must not be empty");
             }
             if (option.length() > MAX_POLL_OPTION_LENGTH) {
-                throw new UserErrorException("Poll option \"" + option + "\" exceeds the maximum length of " + MAX_POLL_OPTION_LENGTH + " characters");
+                throw new UserErrorException("Poll option \""
+                        + option
+                        + "\" exceeds the maximum length of "
+                        + MAX_POLL_OPTION_LENGTH
+                        + " characters");
             }
         }
 

src/main/java/org/asamk/signal/json/JsonAdminDelete.java

@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "AdminDelete")
 public record JsonAdminDelete(
         @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp
 ) {

src/main/java/org/asamk/signal/json/JsonAttachment.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "Attachment")
 record JsonAttachment(
         String contentType,
         String filename,

src/main/java/org/asamk/signal/json/JsonAttachmentData.java

@@ -1,5 +1,8 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
+@JsonSchema(title = "AttachmentData")
 public record JsonAttachmentData(
         String data
 ) {}

src/main/java/org/asamk/signal/json/JsonCallEvent.java

@@ -18,15 +18,13 @@ public record JsonCallEvent(
 ) {
 
     public static JsonCallEvent from(CallInfo callInfo, String reason) {
-        return new JsonCallEvent(
-                callInfo.callId(),
+        return new JsonCallEvent(callInfo.callId(),
                 callInfo.state().name(),
                 callInfo.recipient().number().orElse(null),
                 callInfo.recipient().aci().orElse(null),
                 callInfo.isOutgoing(),
                 callInfo.inputDeviceName(),
                 callInfo.outputDeviceName(),
-                reason
-        );
+                reason);
     }
 }

src/main/java/org/asamk/signal/json/JsonCallMessage.java

@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
@@ -10,6 +11,7 @@ import java.util.List;
 
 import static org.asamk.signal.manager.util.Utils.callIdUnsigned;
 
+@JsonSchema(title = "CallMessage")
 record JsonCallMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) Offer offerMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) Answer answerMessage,

src/main/java/org/asamk/signal/json/JsonContact.java

@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import java.util.List;
 
+@JsonSchema(title = "Contact")
 public record JsonContact(
         String number,
         String uuid,
@@ -26,6 +28,7 @@ public record JsonContact(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal
 ) {
 
+    @JsonSchema(title = "Profile")
     public record JsonProfile(
             long lastUpdateTimestamp,
             String givenName,
@@ -36,6 +39,7 @@ public record JsonContact(
             String mobileCoinAddress
     ) {}
 
+    @JsonSchema(title = "Internal")
     public record JsonInternal(
             List<String> capabilities,
             String unidentifiedAccessMode,

src/main/java/org/asamk/signal/json/JsonContactAddress.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@JsonSchema(title = "ContactAddress")
 public record JsonContactAddress(
         String type,
         String label,

src/main/java/org/asamk/signal/json/JsonContactAvatar.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "ContactAvatar")
 public record JsonContactAvatar(JsonAttachment attachment, boolean isProfile) {
 
     static JsonContactAvatar from(MessageEnvelope.Data.SharedContact.Avatar avatar) {

src/main/java/org/asamk/signal/json/JsonContactEmail.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@JsonSchema(title = "ContactEmail")
 public record JsonContactEmail(String value, String type, String label) {
 
     static JsonContactEmail from(MessageEnvelope.Data.SharedContact.Email email) {

src/main/java/org/asamk/signal/json/JsonContactName.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@JsonSchema(title = "ContactName")
 public record JsonContactName(
         String nickname, String given, String family, String prefix, String suffix, String middle
 ) {

src/main/java/org/asamk/signal/json/JsonContactPhone.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Util;
 
+@JsonSchema(title = "ContactPhone")
 public record JsonContactPhone(String value, String type, String label) {
 
     static JsonContactPhone from(MessageEnvelope.Data.SharedContact.Phone phone) {

src/main/java/org/asamk/signal/json/JsonDataMessage.java

@@ -1,12 +1,14 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@JsonSchema(title = "DataMessage")
 record JsonDataMessage(
         long timestamp,
         String message,
@@ -36,7 +38,7 @@ record JsonDataMessage(
     static JsonDataMessage from(MessageEnvelope.Data dataMessage, Manager m) {
         final var timestamp = dataMessage.timestamp();
         final var groupInfo = dataMessage.groupContext().isPresent() ? JsonGroupInfo.from(dataMessage.groupContext()
-                .get(), m) : null;
+                                                                                          .get(), m) : null;
         final var storyContext = dataMessage.storyContext().isPresent()
                 ? JsonStoryContext.from(dataMessage.storyContext().get())
                 : null;
@@ -48,32 +50,32 @@ record JsonDataMessage(
         final var quote = dataMessage.quote().isPresent() ? JsonQuote.from(dataMessage.quote().get()) : null;
         final var payment = dataMessage.payment().isPresent() ? JsonPayment.from(dataMessage.payment().get()) : null;
         final var mentions = !dataMessage.mentions().isEmpty() ? dataMessage.mentions()
-                .stream()
-                .map(JsonMention::from)
-                .toList() : null;
+                                                                 .stream()
+                                                                 .map(JsonMention::from)
+                                                                 .toList() : null;
         final var previews = !dataMessage.previews().isEmpty() ? dataMessage.previews()
-                .stream()
-                .map(JsonPreview::from)
-                .toList() : null;
+                                                                 .stream()
+                                                                 .map(JsonPreview::from)
+                                                                 .toList() : null;
         final var remoteDelete = dataMessage.remoteDeleteId().isPresent()
                 ? new JsonRemoteDelete(dataMessage.remoteDeleteId().get())
                 : null;
         final var attachments = !dataMessage.attachments().isEmpty() ? dataMessage.attachments()
-                .stream()
-                .map(JsonAttachment::from)
-                .toList() : null;
+                                                                       .stream()
+                                                                       .map(JsonAttachment::from)
+                                                                       .toList() : null;
         final var sticker = dataMessage.sticker().isPresent() ? JsonSticker.from(dataMessage.sticker().get()) : null;
         final var contacts = !dataMessage.sharedContacts().isEmpty() ? dataMessage.sharedContacts()
-                .stream()
-                .map(JsonSharedContact::from)
-                .toList() : null;
+                                                                       .stream()
+                                                                       .map(JsonSharedContact::from)
+                                                                       .toList() : null;
         final var pollCreate = dataMessage.pollCreate().map(JsonPollCreate::from).orElse(null);
         final var pollVote = dataMessage.pollVote().map(JsonPollVote::from).orElse(null);
         final var pollTerminate = dataMessage.pollTerminate().map(JsonPollTerminate::from).orElse(null);
         final var textStyles = !dataMessage.textStyles().isEmpty() ? dataMessage.textStyles()
-                .stream()
-                .map(JsonTextStyle::from)
-                .toList() : null;
+                                                                     .stream()
+                                                                     .map(JsonTextStyle::from)
+                                                                     .toList() : null;
         final var pinMessage = dataMessage.pinMessage().map(JsonPinMessage::from).orElse(null);
         final var unpinMessage = dataMessage.unpinMessage().map(JsonUnpinMessage::from).orElse(null);
         final var adminDelete = dataMessage.adminDelete().map(JsonAdminDelete::from).orElse(null);

src/main/java/org/asamk/signal/json/JsonEditMessage.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "EditMessage")
 record JsonEditMessage(long targetSentTimestamp, JsonDataMessage dataMessage) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {

src/main/java/org/asamk/signal/json/JsonError.java

@@ -1,5 +1,8 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
+@JsonSchema(title = "Error")
 public record JsonError(String message, String type) {
 
     public static JsonError from(Throwable exception) {

src/main/java/org/asamk/signal/json/JsonGroupInfo.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "GroupInfo")
 record JsonGroupInfo(String groupId, String groupName, int revision, String type) {
 
     static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) {

src/main/java/org/asamk/signal/json/JsonMention.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "Mention")
 public record JsonMention(@Deprecated String name, String number, String uuid, int start, int length) {
 
     static JsonMention from(MessageEnvelope.Data.Mention mention) {

src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java

@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -10,6 +11,7 @@ import org.asamk.signal.manager.api.UntrustedIdentityException;
 
 import java.util.UUID;
 
+@JsonSchema(title = "MessageEnvelope")
 public record JsonMessageEnvelope(
         @Deprecated String source,
         String sourceNumber,

src/main/java/org/asamk/signal/json/JsonPayment.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "Payment")
 public record JsonPayment(String note, byte[] receipt) {
 
     static JsonPayment from(MessageEnvelope.Data.Payment payment) {

src/main/java/org/asamk/signal/json/JsonPinMessage.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "PinMessage")
 public record JsonPinMessage(
         @Deprecated String targetAuthor,
         String targetAuthorNumber,

src/main/java/org/asamk/signal/json/JsonPollCreate.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@JsonSchema(title = "PollCreate")
 public record JsonPollCreate(
         String question, boolean allowMultiple, List<String> options
 ) {

src/main/java/org/asamk/signal/json/JsonPollTerminate.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "PollTerminate")
 public record JsonPollTerminate(long targetSentTimestamp) {
 
     static JsonPollTerminate from(MessageEnvelope.Data.PollTerminate pollTerminate) {

src/main/java/org/asamk/signal/json/JsonPollVote.java

@@ -1,10 +1,13 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
+@JsonSchema(title = "PollVote")
 public record JsonPollVote(
         @Deprecated String author,
         String authorNumber,

src/main/java/org/asamk/signal/json/JsonPreview.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "Preview")
 public record JsonPreview(String url, String title, String description, JsonAttachment image) {
 
     static JsonPreview from(MessageEnvelope.Data.Preview preview) {

src/main/java/org/asamk/signal/json/JsonQuote.java

@@ -1,12 +1,14 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 import java.util.UUID;
 
+@JsonSchema(title = "Quote")
 public record JsonQuote(
         long id,
         @Deprecated String author,
@@ -31,14 +33,14 @@ public record JsonQuote(
                 : null;
 
         final var attachments = !quote.attachments().isEmpty() ? quote.attachments()
-                .stream()
-                .map(JsonQuotedAttachment::from)
-                .toList() : List.<JsonQuotedAttachment>of();
+                                                                 .stream()
+                                                                 .map(JsonQuotedAttachment::from)
+                                                                 .toList() : List.<JsonQuotedAttachment>of();
 
         final var textStyles = !quote.textStyles().isEmpty() ? quote.textStyles()
-                .stream()
-                .map(JsonTextStyle::from)
-                .toList() : null;
+                                                               .stream()
+                                                               .map(JsonTextStyle::from)
+                                                               .toList() : null;
 
         return new JsonQuote(id, author, authorNumber, authorUuid, text, mentions, attachments, textStyles);
     }

src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java

@@ -1,9 +1,11 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "QuotedAttachment")
 public record JsonQuotedAttachment(
         String contentType, String filename, @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
 ) {

src/main/java/org/asamk/signal/json/JsonReaction.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "Reaction")
 public record JsonReaction(
         String emoji,
         @Deprecated String targetAuthor,

src/main/java/org/asamk/signal/json/JsonReceiptMessage.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@JsonSchema(title = "ReceiptMessage")
 record JsonReceiptMessage(long when, boolean isDelivery, boolean isRead, boolean isViewed, List<Long> timestamps) {
 
     static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) {

src/main/java/org/asamk/signal/json/JsonRecipientAddress.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
+@JsonSchema(title = "RecipientAddress")
 public record JsonRecipientAddress(String uuid, String number, String username) {
 
     public static JsonRecipientAddress from(RecipientAddress address) {

src/main/java/org/asamk/signal/json/JsonRemoteDelete.java

@@ -1,3 +1,6 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
+@JsonSchema(title = "RemoteDelete")
 record JsonRemoteDelete(long timestamp) {}

src/main/java/org/asamk/signal/json/JsonSendMessageResult.java

@@ -1,10 +1,12 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.SendMessageResult;
 
+@JsonSchema(title = "SendMessageResult")
 public record JsonSendMessageResult(
         JsonRecipientAddress recipientAddress,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
@@ -23,13 +25,13 @@ public record JsonSendMessageResult(
                 result.isSuccess()
                         ? Type.SUCCESS
                         : result.isRateLimitFailure()
-                                ? Type.RATE_LIMIT_FAILURE
+                          ? Type.RATE_LIMIT_FAILURE
                                 : result.isNetworkFailure()
-                                        ? Type.NETWORK_FAILURE
+                                  ? Type.NETWORK_FAILURE
                                         : result.isUnregisteredFailure()
-                                                ? Type.UNREGISTERED_FAILURE
+                                          ? Type.UNREGISTERED_FAILURE
                                                 : result.isInvalidPreKeyFailure()
-                                                        ? Type.INVALID_PRE_KEY_FAILURE
+                                                  ? Type.INVALID_PRE_KEY_FAILURE
                                                         : Type.IDENTITY_FAILURE,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getToken() : null,
                 result.proofRequiredFailure() != null ? result.proofRequiredFailure().getRetryAfterSeconds() : null);

src/main/java/org/asamk/signal/json/JsonSharedContact.java

@@ -1,11 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@JsonSchema(title = "SharedContact")
 public record JsonSharedContact(
         JsonContactName name,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonContactAvatar avatar,
@@ -28,9 +30,9 @@ public record JsonSharedContact(
                 : null;
 
         final var address = !contact.address().isEmpty() ? contact.address()
-                .stream()
-                .map(JsonContactAddress::from)
-                .toList() : null;
+                                                           .stream()
+                                                           .map(JsonContactAddress::from)
+                                                           .toList() : null;
 
         final var organization = contact.organization().orElse(null);
 

src/main/java/org/asamk/signal/json/JsonSticker.java

@@ -1,8 +1,11 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 import org.asamk.signal.util.Hex;
 
+@JsonSchema(title = "Sticker")
 public record JsonSticker(String packId, int stickerId) {
 
     static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {

src/main/java/org/asamk/signal/json/JsonStoryContext.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "StoryContext")
 record JsonStoryContext(
         String authorNumber, String authorUuid, long sentTimestamp
 ) {

src/main/java/org/asamk/signal/json/JsonStoryMessage.java

@@ -1,6 +1,7 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.Color;
 import org.asamk.signal.manager.api.GroupId;
@@ -8,6 +9,7 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.List;
 
+@JsonSchema(title = "StoryMessage")
 record JsonStoryMessage(
         boolean allowsReplies,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,

src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java

@@ -2,6 +2,7 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.MessageEnvelope;
@@ -9,6 +10,7 @@ import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.UUID;
 
+@JsonSchema(title = "SyncDataMessage")
 record JsonSyncDataMessage(
         @Deprecated String destination,
         String destinationNumber,

src/main/java/org/asamk/signal/json/JsonSyncMessage.java

@@ -9,12 +9,15 @@ import org.asamk.signal.manager.api.RecipientAddress;
 
 import java.util.List;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 enum JsonSyncMessageType {
     CONTACTS_SYNC,
     GROUPS_SYNC,
     REQUEST_SYNC
 }
 
+@JsonSchema(title = "SyncMessage")
 record JsonSyncMessage(
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncStoryMessage sentStoryMessage,
@@ -47,9 +50,9 @@ record JsonSyncMessage(
         }
 
         final var readMessages = !syncMessage.read().isEmpty() ? syncMessage.read()
-                .stream()
-                .map(JsonSyncReadMessage::from)
-                .toList() : null;
+                                                                 .stream()
+                                                                 .map(JsonSyncReadMessage::from)
+                                                                 .toList() : null;
 
         final JsonSyncMessageType type;
         if (syncMessage.contacts().isPresent()) {

src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "SyncReadMessage")
 record JsonSyncReadMessage(
         @Deprecated String sender, String senderNumber, String senderUuid, long timestamp
 ) {

src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java

@@ -1,11 +1,13 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "SyncStoryMessage")
 record JsonSyncStoryMessage(
         String destinationNumber, String destinationUuid, @JsonUnwrapped JsonStoryMessage dataMessage
 ) {

src/main/java/org/asamk/signal/json/JsonTextStyle.java

@@ -1,7 +1,10 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.TextStyle;
 
+@JsonSchema(title = "TextStyle")
 public record JsonTextStyle(String style, int start, int length) {
 
     static JsonTextStyle from(TextStyle textStyle) {

src/main/java/org/asamk/signal/json/JsonTypingMessage.java

@@ -1,10 +1,12 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import io.micronaut.jsonschema.JsonSchema;
 
 import org.asamk.signal.manager.api.GroupId;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
+@JsonSchema(title = "TypingMessage")
 record JsonTypingMessage(
         String action, long timestamp, @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
 ) {

src/main/java/org/asamk/signal/json/JsonUnpinMessage.java

@@ -1,9 +1,12 @@
 package org.asamk.signal.json;
 
+import io.micronaut.jsonschema.JsonSchema;
+
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
 
+@JsonSchema(title = "UnpinMessage")
 public record JsonUnpinMessage(
         @Deprecated String targetAuthor, String targetAuthorNumber, String targetAuthorUuid, long targetSentTimestamp
 ) {

src/test/java/org/asamk/signal/json/JsonCallEventTest.java

@@ -2,11 +2,8 @@ package org.asamk.signal.json;
 
 import org.asamk.signal.manager.api.CallInfo;
 import org.asamk.signal.manager.api.RecipientAddress;
-
 import org.junit.jupiter.api.Test;
 
-import java.util.Optional;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -17,7 +14,12 @@ class JsonCallEventTest {
     @Test
     void fromWithNumberAndUuid() {
         var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, "+15551234567", null);
-        var callInfo = new CallInfo(123L, CallInfo.State.CONNECTED, recipient, "signal_input_123", "signal_output_123", true);
+        var callInfo = new CallInfo(123L,
+                CallInfo.State.CONNECTED,
+                recipient,
+                "signal_input_123",
+                "signal_output_123",
+                true);
 
         var event = JsonCallEvent.from(callInfo, null);
 
@@ -34,7 +36,12 @@ class JsonCallEventTest {
     @Test
     void fromWithUuidOnly() {
         var recipient = new RecipientAddress("a1b2c3d4-e5f6-7890-abcd-ef1234567890", null, null, null);
-        var callInfo = new CallInfo(456L, CallInfo.State.RINGING_INCOMING, recipient, "signal_input_456", "signal_output_456", false);
+        var callInfo = new CallInfo(456L,
+                CallInfo.State.RINGING_INCOMING,
+                recipient,
+                "signal_input_456",
+                "signal_output_456",
+                false);
 
         var event = JsonCallEvent.from(callInfo, null);
 
@@ -48,7 +55,12 @@ class JsonCallEventTest {
     @Test
     void fromWithNumberOnly() {
         var recipient = new RecipientAddress(null, null, "+15559876543", null);
-        var callInfo = new CallInfo(789L, CallInfo.State.RINGING_OUTGOING, recipient, "signal_input_789", "signal_output_789", true);
+        var callInfo = new CallInfo(789L,
+                CallInfo.State.RINGING_OUTGOING,
+                recipient,
+                "signal_input_789",
+                "signal_output_789",
+                true);
 
         var event = JsonCallEvent.from(callInfo, null);
 
@@ -81,7 +93,12 @@ class JsonCallEventTest {
     @Test
     void fromConnectingState() {
         var recipient = new RecipientAddress("uuid-5678", null, "+15552222222", null);
-        var callInfo = new CallInfo(200L, CallInfo.State.CONNECTING, recipient, "signal_input_200", "signal_output_200", true);
+        var callInfo = new CallInfo(200L,
+                CallInfo.State.CONNECTING,
+                recipient,
+                "signal_input_200",
+                "signal_output_200",
+                true);
 
         var event = JsonCallEvent.from(callInfo, null);
 
@@ -97,8 +114,17 @@ class JsonCallEventTest {
     void fromWithVariousEndReasons() {
         var recipient = new RecipientAddress("uuid-1234", null, "+15551111111", null);
 
-        var reasons = new String[]{"local_hangup", "remote_hangup", "rejected", "remote_busy",
-                "ring_timeout", "ice_failed", "tunnel_exit", "tunnel_error", "shutdown"};
+        var reasons = new String[]{
+                "local_hangup",
+                "remote_hangup",
+                "rejected",
+                "remote_busy",
+                "ring_timeout",
+                "ice_failed",
+                "tunnel_exit",
+                "tunnel_error",
+                "shutdown"
+        };
 
         for (var reason : reasons) {
             var callInfo = new CallInfo(1L, CallInfo.State.ENDED, recipient, null, null, false);