Cleanup boilerplate code for downcalls

MinnDevelopment · MinnDevelopment · commit 9366f866a1bc · 2026-02-07T18:14:05.000+01:00
diff --git a/api/src/main/java/club/minnced/discord/jdave/DaveDecryptor.java b/api/src/main/java/club/minnced/discord/jdave/DaveDecryptor.java
@@ -1,6 +1,7 @@
 package club.minnced.discord.jdave;
 
 import static club.minnced.discord.jdave.ffi.LibDave.*;
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.C_SIZE;
 
 import club.minnced.discord.jdave.ffi.LibDaveDecryptorBinding;
 import java.lang.foreign.Arena;
diff --git a/api/src/main/java/club/minnced/discord/jdave/DaveEncryptor.java b/api/src/main/java/club/minnced/discord/jdave/DaveEncryptor.java
@@ -1,7 +1,7 @@
 package club.minnced.discord.jdave;
 
-import static club.minnced.discord.jdave.ffi.LibDave.C_SIZE;
 import static club.minnced.discord.jdave.ffi.LibDave.readSize;
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.C_SIZE;
 
 import club.minnced.discord.jdave.ffi.LibDaveEncryptorBinding;
 import java.lang.foreign.Arena;
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDave.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDave.java
@@ -1,10 +1,10 @@
 package club.minnced.discord.jdave.ffi;
 
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.*;
 import static java.lang.foreign.ValueLayout.*;
 
 import club.minnced.discord.jdave.DaveLoggingSeverity;
 import club.minnced.discord.jdave.utils.DaveLogger;
-import club.minnced.discord.jdave.utils.NativeLibraryLoader;
 import java.lang.foreign.*;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -14,15 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 public class LibDave {
-    static final Linker LINKER = Linker.nativeLinker();
-    static final SymbolLookup SYMBOL_LOOKUP;
-    public static final MemoryLayout C_SIZE;
-
-    static {
-        SYMBOL_LOOKUP = NativeLibraryLoader.getSymbolLookup();
-        C_SIZE = LINKER.canonicalLayouts().get("size_t");
-    }
-
     private LibDave() {}
 
     static final Logger log = LoggerFactory.getLogger(LibDave.class);
@@ -33,17 +24,13 @@ private LibDave() {}
     static {
         try {
             // uint16_t daveMaxSupportedProtocolVersion(void);
-            daveMaxSupportedProtocolVersion = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveMaxSupportedProtocolVersion").orElseThrow(),
-                    FunctionDescriptor.of(JAVA_SHORT));
+            daveMaxSupportedProtocolVersion = find(JAVA_SHORT, "daveMaxSupportedProtocolVersion");
 
             // void daveSetLogSinkCallback(DAVELogSinkCallback callback);
-            daveSetLogSinkCallback = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveSetLogSinkCallback").orElseThrow(), FunctionDescriptor.ofVoid(ADDRESS));
+            daveSetLogSinkCallback = findVoid("daveSetLogSinkCallback", ADDRESS);
 
             // void daveFree(void*);
-            daveFree = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveFree").orElseThrow(), FunctionDescriptor.ofVoid(ADDRESS));
+            daveFree = findVoid("daveFree", ADDRESS);
         } catch (Throwable e) {
             throw new ExceptionInInitializerError(e);
         }
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveDecryptorBinding.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveDecryptorBinding.java
@@ -1,11 +1,10 @@
 package club.minnced.discord.jdave.ffi;
 
-import static club.minnced.discord.jdave.ffi.LibDave.*;
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.*;
 import static club.minnced.discord.jdave.ffi.NativeUtils.toSizeT;
 import static java.lang.foreign.ValueLayout.*;
 
 import club.minnced.discord.jdave.DaveMediaType;
-import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
 import org.jspecify.annotations.NonNull;
@@ -22,45 +21,36 @@ public class LibDaveDecryptorBinding {
     static {
         try {
             // DAVEDecryptorHandle daveDecryptorCreate(void);
-            daveDecryptorCreate = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveDecryptorCreate").orElseThrow(), FunctionDescriptor.of(ADDRESS));
+            daveDecryptorCreate = find(ADDRESS, "daveDecryptorCreate");
 
             // void daveDecryptorDestroy(DAVEDecryptorHandle decryptor);
-            daveDecryptorDestroy = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveDecryptorDestroy").orElseThrow(), FunctionDescriptor.ofVoid(ADDRESS));
+            daveDecryptorDestroy = findVoid("daveDecryptorDestroy", ADDRESS);
 
             // size_t daveDecryptorGetMaxPlaintextByteSize(DAVEDecryptorHandle decryptor, DAVEMediaType mediaType,
             // size_t encryptedFrameSize);
-            daveDecryptorGetMaxPlaintextByteSize = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveDecryptorGetMaxPlaintextByteSize").orElseThrow(),
-                    FunctionDescriptor.of(C_SIZE, ADDRESS, JAVA_INT, C_SIZE));
+            daveDecryptorGetMaxPlaintextByteSize =
+                    find(C_SIZE, "daveDecryptorGetMaxPlaintextByteSize", ADDRESS, JAVA_INT, C_SIZE);
 
             // DAVEDecryptorResultCode daveDecryptorDecrypt(DAVEDecryptorHandle decryptor, DAVEMediaType mediaType,
             // const uint8_t* encryptedFrame, size_t encryptedFrameLength, uint8_t* frame, size_t frameCapacity, size_t*
             // bytesWritten);
-            daveDecryptorDecrypt = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveDecryptorDecrypt").orElseThrow(),
-                    FunctionDescriptor.of(
-                            JAVA_INT,
-                            ADDRESS,
-                            JAVA_INT,
-                            ADDRESS,
-                            C_SIZE,
-                            ADDRESS,
-                            C_SIZE,
-                            ADDRESS.withTargetLayout(C_SIZE)));
+            daveDecryptorDecrypt = find(
+                    JAVA_INT,
+                    "daveDecryptorDecrypt",
+                    ADDRESS,
+                    JAVA_INT,
+                    ADDRESS,
+                    C_SIZE,
+                    ADDRESS,
+                    C_SIZE,
+                    ADDRESS.withTargetLayout(C_SIZE));
 
             // void daveDecryptorTransitionToKeyRatchet(DAVEDecryptorHandle decryptor, DAVEKeyRatchetHandle keyRatchet);
-            daveDecryptorTransitionToKeyRatchet = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveDecryptorTransitionToKeyRatchet").orElseThrow(),
-                    FunctionDescriptor.ofVoid(ADDRESS, ADDRESS));
+            daveDecryptorTransitionToKeyRatchet = findVoid("daveDecryptorTransitionToKeyRatchet", ADDRESS, ADDRESS);
 
             // void daveDecryptorTransitionToPassthroughMode(DAVEDecryptorHandle decryptor, bool passthroughMode);
-            daveDecryptorTransitionToPassthroughMode = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP
-                            .find("daveDecryptorTransitionToPassthroughMode")
-                            .orElseThrow(),
-                    FunctionDescriptor.ofVoid(ADDRESS, JAVA_BOOLEAN));
+            daveDecryptorTransitionToPassthroughMode =
+                    findVoid("daveDecryptorTransitionToPassthroughMode", ADDRESS, JAVA_BOOLEAN);
         } catch (Throwable e) {
             throw new ExceptionInInitializerError(e);
         }
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveEncryptorBinding.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveEncryptorBinding.java
@@ -1,12 +1,10 @@
 package club.minnced.discord.jdave.ffi;
 
-import static club.minnced.discord.jdave.ffi.LibDave.*;
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.*;
 import static club.minnced.discord.jdave.ffi.NativeUtils.toSizeT;
 import static java.lang.foreign.ValueLayout.*;
 
-import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
-import java.lang.foreign.ValueLayout;
 import java.lang.invoke.MethodHandle;
 import org.jspecify.annotations.NonNull;
 
@@ -23,54 +21,42 @@ public class LibDaveEncryptorBinding {
     static {
         try {
             // DAVEEncryptorHandle daveEncryptorCreate(void);
-            daveEncryptorCreate = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorCreate").orElseThrow(), FunctionDescriptor.of(ADDRESS));
+            daveEncryptorCreate = find(ADDRESS, "daveEncryptorCreate");
 
             // void daveEncryptorDestroy(DAVEEncryptorHandle encryptor);
-            daveEncryptorDestroy = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorDestroy").orElseThrow(), FunctionDescriptor.ofVoid(ADDRESS));
+            daveEncryptorDestroy = findVoid("daveEncryptorDestroy", ADDRESS);
 
             // void daveEncryptorSetKeyRatchet(DAVEEncryptorHandle encryptor, DAVEKeyRatchetHandle keyRatchet);
-            daveEncryptorSetKeyRatchet = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorSetKeyRatchet").orElseThrow(),
-                    FunctionDescriptor.ofVoid(ADDRESS, ADDRESS));
+            daveEncryptorSetKeyRatchet = findVoid("daveEncryptorSetKeyRatchet", ADDRESS, ADDRESS);
 
             // void daveEncryptorSetPassthroughMode(DAVEEncryptorHandle encryptor, bool passthroughMode);
-            daveEncryptorSetPassthroughMode = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorSetPassthroughMode").orElseThrow(),
-                    FunctionDescriptor.ofVoid(ADDRESS, JAVA_BOOLEAN));
+            daveEncryptorSetPassthroughMode = findVoid("daveEncryptorSetPassthroughMode", ADDRESS, JAVA_BOOLEAN);
 
             // uint16_t daveEncryptorGetProtocolVersion(DAVEEncryptorHandle encryptor);
-            daveEncryptorGetProtocolVersion = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorGetProtocolVersion").orElseThrow(),
-                    FunctionDescriptor.of(ValueLayout.JAVA_SHORT, ADDRESS));
+            daveEncryptorGetProtocolVersion = find(JAVA_SHORT, "daveEncryptorGetProtocolVersion", ADDRESS);
 
             // size_t daveEncryptorGetMaxCiphertextByteSize(DAVEEncryptorHandle encryptor, DAVEMediaType mediaType,
             // size_t frameSize);
-            daveEncryptorGetMaxCiphertextByteSize = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorGetMaxCiphertextByteSize").orElseThrow(),
-                    FunctionDescriptor.of(C_SIZE, ADDRESS, JAVA_INT, C_SIZE));
+            daveEncryptorGetMaxCiphertextByteSize =
+                    find(C_SIZE, "daveEncryptorGetMaxCiphertextByteSize", ADDRESS, JAVA_INT, C_SIZE);
 
             // DAVEEncryptorResultCode daveEncryptorEncrypt(DAVEEncryptorHandle encryptor, DAVEMediaType mediaType,
             // uint32_t ssrc, const uint8_t* frame, size_t frameLength, uint8_t* encryptedFrame, size_t
             // encryptedFrameCapacity, size_t* bytesWritten);
-            daveEncryptorEncrypt = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorEncrypt").orElseThrow(),
-                    FunctionDescriptor.of(
-                            JAVA_INT,
-                            ADDRESS,
-                            JAVA_INT,
-                            JAVA_INT,
-                            ADDRESS,
-                            C_SIZE,
-                            ADDRESS,
-                            C_SIZE,
-                            ADDRESS.withTargetLayout(C_SIZE)));
+            daveEncryptorEncrypt = find(
+                    JAVA_INT,
+                    "daveEncryptorEncrypt",
+                    ADDRESS,
+                    JAVA_INT,
+                    JAVA_INT,
+                    ADDRESS,
+                    C_SIZE,
+                    ADDRESS,
+                    C_SIZE,
+                    ADDRESS.withTargetLayout(C_SIZE));
 
             // void daveEncryptorAssignSsrcToCodec(DAVEEncryptorHandle encryptor, uint32_t ssrc, DAVECodec codecType);
-            daveEncryptorAssignSsrcToCodec = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveEncryptorAssignSsrcToCodec").orElseThrow(),
-                    FunctionDescriptor.ofVoid(ADDRESS, JAVA_INT, JAVA_INT));
+            daveEncryptorAssignSsrcToCodec = findVoid("daveEncryptorAssignSsrcToCodec", ADDRESS, JAVA_INT, JAVA_INT);
         } catch (Throwable e) {
             throw new ExceptionInInitializerError(e);
         }
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveKeyRatchetBinding.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveKeyRatchetBinding.java
@@ -1,10 +1,8 @@
 package club.minnced.discord.jdave.ffi;
 
-import static club.minnced.discord.jdave.ffi.LibDave.LINKER;
-import static club.minnced.discord.jdave.ffi.LibDave.SYMBOL_LOOKUP;
+import static club.minnced.discord.jdave.ffi.LibDaveLookup.findVoid;
 import static java.lang.foreign.ValueLayout.ADDRESS;
 
-import java.lang.foreign.FunctionDescriptor;
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
 import org.jspecify.annotations.NonNull;
@@ -15,8 +13,7 @@ public class LibDaveKeyRatchetBinding {
     static {
         try {
             // void daveKeyRatchetDestroy(DAVEKeyRatchetHandle keyRatchet);
-            destroyKeyRatchet = LINKER.downcallHandle(
-                    SYMBOL_LOOKUP.find("daveKeyRatchetDestroy").orElseThrow(), FunctionDescriptor.ofVoid(ADDRESS));
+            destroyKeyRatchet = findVoid("daveKeyRatchetDestroy", ADDRESS);
         } catch (Throwable e) {
             throw new ExceptionInInitializerError(e);
         }
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveLookup.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveLookup.java
@@ -0,0 +1,27 @@
+package club.minnced.discord.jdave.ffi;
+
+import club.minnced.discord.jdave.utils.NativeLibraryLoader;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.SymbolLookup;
+import java.lang.invoke.MethodHandle;
+
+public class LibDaveLookup {
+    static final Linker LINKER = Linker.nativeLinker();
+    static final SymbolLookup SYMBOL_LOOKUP;
+    public static final MemoryLayout C_SIZE;
+
+    static {
+        SYMBOL_LOOKUP = NativeLibraryLoader.getSymbolLookup();
+        C_SIZE = LINKER.canonicalLayouts().get("size_t");
+    }
+
+    public static MethodHandle findVoid(String name, MemoryLayout... args) {
+        return LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow(name), FunctionDescriptor.ofVoid(args));
+    }
+
+    public static MethodHandle find(MemoryLayout returnType, String name, MemoryLayout... args) {
+        return LINKER.downcallHandle(SYMBOL_LOOKUP.findOrThrow(name), FunctionDescriptor.of(returnType, args));
+    }
+}
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveSessionBinding.java b/api/src/main/java/club/minnced/discord/jdave/ffi/LibDaveSessionBinding.java
diff --git a/api/src/main/java/club/minnced/discord/jdave/ffi/NativeUtils.java b/api/src/main/java/club/minnced/discord/jdave/ffi/NativeUtils.java
