self.function_ptr_counter = 0
self.function_ptrs = {}
self.c_type_map = dict(
- uint8_t = ['number', 'Uint8Array'],
- uint16_t = ['number', 'Uint16Array'],
- uint32_t = ['number', 'Uint32Array'],
- uint64_t = ['BigInt'],
+ bool = ['boolean', 'boolean', 'XXX'],
+ uint8_t = ['number', 'number', 'Uint8Array'],
+ uint16_t = ['number', 'number', 'Uint16Array'],
+ uint32_t = ['number', 'number', 'Uint32Array'],
+ int64_t = ['bigint', 'bigint', 'BigInt64Array'],
+ uint64_t = ['bigint', 'bigint', 'BigUint64Array'],
+ double = ['number', 'number', 'Float64Array'],
)
-
- self.wasm_decoding_map = dict(
- int8_tArray = 'decodeUint8Array'
+ self.java_type_map = dict(
+ String = "number"
)
-
- self.wasm_encoding_map = dict(
- int8_tArray = 'encodeUint8Array',
+ self.java_hu_type_map = dict(
+ String = "string"
)
self.to_hu_conv_templates = dict(
default = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});',
)
- self.bindings_header = self.wasm_import_header(target)
+ self.bindings_header = """
+import * as version from './version.mjs';
+import { UInt5, WitnessVersion } from './structs/CommonBase.mjs';
+
+const imports: any = {};
+imports.env = {};
+
+var js_objs: Array<WeakRef<object>> = [];
+var js_invoke: Function;
+var getRandomValues: Function;
+
+imports.wasi_snapshot_preview1 = {
+ "fd_write": (fd: number, iovec_array_ptr: number, iovec_array_len: number, bytes_written_ptr: number) => {
+ // This should generally only be used to print panic messages
+ const ptr_len_view = new Uint32Array(wasm.memory.buffer, iovec_array_ptr, iovec_array_len * 2);
+ var bytes_written = 0;
+ for (var i = 0; i < iovec_array_len; i++) {
+ const bytes_view = new Uint8Array(wasm.memory.buffer, ptr_len_view[i*2], ptr_len_view[i*2+1]);
+ console.log("[fd " + fd + "]: " + String.fromCharCode(...bytes_view));
+ bytes_written += ptr_len_view[i*2+1]!;
+ }
+ const written_view = new Uint32Array(wasm.memory.buffer, bytes_written_ptr, 1);
+ written_view[0] = bytes_written;
+ return 0;
+ },
+ "fd_close": (_fd: number) => {
+ // This is not generally called, but may be referenced in debug builds
+ console.log("wasi_snapshot_preview1:fd_close");
+ return 58; // Not Supported
+ },
+ "fd_seek": (_fd: number, _offset: bigint, _whence: number, _new_offset: number) => {
+ // This is not generally called, but may be referenced in debug builds
+ console.log("wasi_snapshot_preview1:fd_seek");
+ return 58; // Not Supported
+ },
+ "random_get": (buf_ptr: number, buf_len: number) => {
+ const buf = new Uint8Array(wasm.memory.buffer, buf_ptr, buf_len);
+ getRandomValues(buf);
+ return 0;
+ },
+ "environ_sizes_get": (environ_var_count_ptr: number, environ_len_ptr: number) => {
+ // This is called before fd_write to format + print panic messages
+ const out_count_view = new Uint32Array(wasm.memory.buffer, environ_var_count_ptr, 1);
+ out_count_view[0] = 0;
+ const out_len_view = new Uint32Array(wasm.memory.buffer, environ_len_ptr, 1);
+ out_len_view[0] = 0;
+ return 0;
+ },
+ "environ_get": (_environ_ptr: number, _environ_buf_ptr: number) => {
+ // This is called before fd_write to format + print panic messages,
+ // but only if we have variables in environ_sizes_get, so shouldn't ever actually happen!
+ console.log("wasi_snapshot_preview1:environ_get");
+ return 58; // Note supported - we said there were 0 environment entries!
+ },
+ "proc_exit" : () => {
+ console.log("wasi_snapshot_preview1:proc_exit");
+ },
+};
+
+var wasm: any = null;
+let isWasmInitialized: boolean = false;
+
+async function finishInitializeWasm(wasmInstance: WebAssembly.Instance) {
+ if (typeof crypto === "undefined") {
+ var crypto_import = (await import('crypto')).webcrypto;
+ getRandomValues = crypto_import.getRandomValues.bind(crypto_import);
+ } else {
+ getRandomValues = crypto.getRandomValues.bind(crypto);
+ }
+
+ wasm = wasmInstance.exports;
+ if (!wasm.test_bigint_pass_deadbeef0badf00d(BigInt("0xdeadbeef0badf00d"))) {
+ throw new Error(\"Currently need BigInt-as-u64 support, try ----experimental-wasm-bigint");
+ }
+
+ if (decodeString(wasm.TS_get_lib_version_string()) !== version.get_ldk_java_bindings_version())
+ throw new Error(\"Compiled LDK library and LDK class files do not match\");
+ // Fetching the LDK versions from C also checks that the header and binaries match
+ const c_bindings_ver: number = wasm.TS_get_ldk_c_bindings_version();
+ const ldk_ver: number = wasm.TS_get_ldk_version();
+ if (c_bindings_ver == 0)
+ throw new Error(\"LDK version did not match the header we built against\");
+ if (ldk_ver == 0)
+ throw new Error(\"LDK C bindings version did not match the header we built against\");
+ const c_bindings_version: string = decodeString(c_bindings_ver)
+ const ldk_version: string = decodeString(ldk_ver);
+ console.log(\"Loaded LDK-Java Bindings with LDK \" + ldk_version + \" and LDK-C-Bindings \" + c_bindings_version);
+
+ isWasmInitialized = true;
+}
- self.bindings_version_file = ""
+const fn_list = ["uuuuuu", "buuuuu", "bbuuuu", "bbbuuu", "bbbbuu", "bbbbbu",
+ "bbbbbb", "ubuubu", "ubuuuu", "ubbuuu", "uubuuu", "uubbuu", "uububu", "ububuu"];
- self.bindings_footer = ""
+/* @internal */
+export async function initializeWasmFromUint8Array(wasmBinary: Uint8Array) {
+ for (const fn of fn_list) { imports.env["js_invoke_function_" + fn] = js_invoke; }
+ const { instance: wasmInstance } = await WebAssembly.instantiate(wasmBinary, imports);
+ await finishInitializeWasm(wasmInstance);
+}
+
+/* @internal */
+export async function initializeWasmFetch(uri: string) {
+ for (const fn of fn_list) { imports.env["js_invoke_function_" + fn] = js_invoke; }
+ const stream = fetch(uri);
+ const { instance: wasmInstance } = await WebAssembly.instantiateStreaming(stream, imports);
+ await finishInitializeWasm(wasmInstance);
+}"""
+
+ self.bindings_header += """
+// WASM CODEC
+
+/* @internal */
+export function uint5ArrToBytes(inputArray: Array<UInt5>): Uint8Array {
+ const arr = new Uint8Array(inputArray.length);
+ for (var i = 0; i < inputArray.length; i++) {
+ arr[i] = inputArray[i]!.getVal();
+ }
+ return arr;
+}
+
+/* @internal */
+export function WitnessVersionArrToBytes(inputArray: Array<WitnessVersion>): Uint8Array {
+ const arr = new Uint8Array(inputArray.length);
+ for (var i = 0; i < inputArray.length; i++) {
+ arr[i] = inputArray[i]!.getVal();
+ }
+ return arr;
+}
+
+
+
+/* @internal */
+export function encodeUint128 (inputVal: bigint): number {
+ if (inputVal >= 0x10000000000000000000000000000000n) throw "U128s cannot exceed 128 bits";
+ const cArrayPointer = wasm.TS_malloc(16 + 8);
+ const arrayLengthView = new BigUint64Array(wasm.memory.buffer, cArrayPointer, 1);
+ arrayLengthView[0] = BigInt(16);
+ const arrayMemoryView = new Uint8Array(wasm.memory.buffer, cArrayPointer + 8, 16);
+ for (var i = 0; i < 16; i++) arrayMemoryView[i] = Number((inputVal >> BigInt(i)*8n) & 0xffn);
+ return cArrayPointer;
+}
+/* @internal */
+export function encodeUint8Array (inputArray: Uint8Array|null): number {
+ if (inputArray == null) return 0;
+ const cArrayPointer = wasm.TS_malloc(inputArray.length + 8);
+ const arrayLengthView = new BigUint64Array(wasm.memory.buffer, cArrayPointer, 1);
+ arrayLengthView[0] = BigInt(inputArray.length);
+ const arrayMemoryView = new Uint8Array(wasm.memory.buffer, cArrayPointer + 8, inputArray.length);
+ arrayMemoryView.set(inputArray);
+ return cArrayPointer;
+}
+/* @internal */
+export function encodeUint16Array (inputArray: Uint16Array|Array<number>|null): number {
+ if (inputArray == null) return 0;
+ const cArrayPointer = wasm.TS_malloc((inputArray.length + 4) * 2);
+ const arrayLengthView = new BigUint64Array(wasm.memory.buffer, cArrayPointer, 1);
+ arrayLengthView[0] = BigInt(inputArray.length);
+ const arrayMemoryView = new Uint16Array(wasm.memory.buffer, cArrayPointer + 8, inputArray.length);
+ arrayMemoryView.set(inputArray);
+ return cArrayPointer;
+}
+/* @internal */
+export function encodeUint32Array (inputArray: Uint32Array|Array<number>|null): number {
+ if (inputArray == null) return 0;
+ const cArrayPointer = wasm.TS_malloc((inputArray.length + 2) * 4);
+ const arrayLengthView = new BigUint64Array(wasm.memory.buffer, cArrayPointer, 1);
+ arrayLengthView[0] = BigInt(inputArray.length);
+ const arrayMemoryView = new Uint32Array(wasm.memory.buffer, cArrayPointer + 8, inputArray.length);
+ arrayMemoryView.set(inputArray);
+ return cArrayPointer;
+}
+/* @internal */
+export function encodeUint64Array (inputArray: BigUint64Array|Array<bigint>|null): number {
+ if (inputArray == null) return 0;
+ const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 8);
+ const arrayMemoryView = new BigUint64Array(wasm.memory.buffer, cArrayPointer, inputArray.length + 1);
+ arrayMemoryView[0] = BigInt(inputArray.length);
+ arrayMemoryView.set(inputArray, 1);
+ return cArrayPointer;
+}
+
+/* @internal */
+export function check_arr_len(arr: Uint8Array|null, len: number): Uint8Array|null {
+ if (arr !== null && arr.length != len) { throw new Error("Expected array of length " + len + " got " + arr.length); }
+ return arr;
+}
+
+/* @internal */
+export function check_16_arr_len(arr: Uint16Array|null, len: number): Uint16Array|null {
+ if (arr !== null && arr.length != len) { throw new Error("Expected array of length " + len + " got " + arr.length); }
+ return arr;
+}
+
+/* @internal */
+export function getArrayLength(arrayPointer: number): number {
+ const arraySizeViewer = new BigUint64Array(wasm.memory.buffer, arrayPointer, 1);
+ const len = arraySizeViewer[0]!;
+ if (len >= (2n ** 32n)) throw new Error("Bogus Array Size");
+ return Number(len % (2n ** 32n));
+}
+/* @internal */
+export function decodeUint128 (arrayPointer: number, free = true): bigint {
+ const arraySize = getArrayLength(arrayPointer);
+ if (arraySize != 16) throw "Need 16 bytes for a uint128";
+ const actualArrayViewer = new Uint8Array(wasm.memory.buffer, arrayPointer + 8, arraySize);
+ var val = 0n;
+ for (var i = 0; i < 16; i++) {
+ val <<= 8n;
+ val |= BigInt(actualArrayViewer[i]!);
+ }
+ if (free) {
+ wasm.TS_free(arrayPointer);
+ }
+ return val;
+}
+/* @internal */
+export function decodeUint8Array (arrayPointer: number, free = true): Uint8Array {
+ const arraySize = getArrayLength(arrayPointer);
+ const actualArrayViewer = new Uint8Array(wasm.memory.buffer, arrayPointer + 8, arraySize);
+ // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
+ // will free the underlying memory when it becomes unreachable instead of copying here.
+ // Note that doing so may have edge-case interactions with memory resizing (invalidating the buffer).
+ const actualArray = actualArrayViewer.slice(0, arraySize);
+ if (free) {
+ wasm.TS_free(arrayPointer);
+ }
+ return actualArray;
+}
+/* @internal */
+export function decodeUint16Array (arrayPointer: number, free = true): Uint16Array {
+ const arraySize = getArrayLength(arrayPointer);
+ const actualArrayViewer = new Uint16Array(wasm.memory.buffer, arrayPointer + 8, arraySize);
+ // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
+ // will free the underlying memory when it becomes unreachable instead of copying here.
+ // Note that doing so may have edge-case interactions with memory resizing (invalidating the buffer).
+ const actualArray = actualArrayViewer.slice(0, arraySize);
+ if (free) {
+ wasm.TS_free(arrayPointer);
+ }
+ return actualArray;
+}
+/* @internal */
+export function decodeUint64Array (arrayPointer: number, free = true): bigint[] {
+ const arraySize = getArrayLength(arrayPointer);
+ const actualArrayViewer = new BigUint64Array(
+ wasm.memory.buffer, // value
+ arrayPointer + 8, // offset (ignoring length bytes)
+ arraySize // uint32 count
+ );
+ // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
+ // will free the underlying memory when it becomes unreachable instead of copying here.
+ const actualArray = new Array(arraySize);
+ for (var i = 0; i < arraySize; i++) actualArray[i] = actualArrayViewer[i];
+ if (free) {
+ wasm.TS_free(arrayPointer);
+ }
+ return actualArray;
+}
+
+export function freeWasmMemory(pointer: number) { wasm.TS_free(pointer); }
+
+/* @internal */
+export function getU64ArrayElem(arrayPointer: number, idx: number): bigint {
+ const actualArrayViewer = new BigUint64Array(wasm.memory.buffer, arrayPointer + 8, idx + 1);
+ return actualArrayViewer[idx]!;
+}
+
+/* @internal */
+export function getU32ArrayElem(arrayPointer: number, idx: number): number {
+ const actualArrayViewer = new Uint32Array(wasm.memory.buffer, arrayPointer + 8, idx + 1);
+ return actualArrayViewer[idx]!;
+}
+
+/* @internal */
+export function getU8ArrayElem(arrayPointer: number, idx: number): number {
+ const actualArrayViewer = new Uint8Array(wasm.memory.buffer, arrayPointer + 8, idx + 1);
+ return actualArrayViewer[idx]!;
+}
+
+
+/* @internal */
+export function encodeString(str: string): number {
+ const charArray = new TextEncoder().encode(str);
+ return encodeUint8Array(charArray);
+}
+
+/* @internal */
+export function decodeString(stringPointer: number, free = true): string {
+ const arraySize = getArrayLength(stringPointer);
+ const memoryView = new Uint8Array(wasm.memory.buffer, stringPointer + 8, arraySize);
+ const result = new TextDecoder("utf-8").decode(memoryView);
+
+ if (free) {
+ wasm.TS_free(stringPointer);
+ }
+
+ return result;
+}
+"""
+ if DEBUG:
+ self.bindings_header += """
+/* @internal */
+export function getRemainingAllocationCount(): number {
+ return wasm.TS_allocs_remaining();
+}
+/* @internal */
+export function debugPrintRemainingAllocs() {
+ wasm.TS_print_leaks();
+}
+"""
+ else:
+ self.bindings_header += "\n/* @internal */ export function getRemainingAllocationCount(): number { return 0; }\n"
+ self.bindings_header += "/* @internal */ export function debugPrintRemainingAllocs() { }\n"
+
+ with open(outdir + "/index.mts", 'a') as index:
+ index.write("""import { initializeWasmFetch, initializeWasmFromUint8Array } from './bindings.mjs';
+/** Initializes the WASM backend by calling `fetch()` on the given URI - Browser only */
+export async function initializeWasmWebFetch(uri: string) {
+ await initializeWasmFetch(uri);
+}
+/** Initializes the WASM backend given a Uint8Array of the .wasm binary file - Browser or Node.JS */
+export async function initializeWasmFromBinary(bin: Uint8Array) {
+ await initializeWasmFromUint8Array(bin);
+}
+
+export * from './structs/UtilMethods.mjs';
+""")
+
+ self.bindings_version_file = """export function get_ldk_java_bindings_version(): String {
+ return "<git_version_ldk_garbagecollected>";
+}"""
self.common_base = """
function freer(f: () => void) { f() }
const finalizer = new FinalizationRegistry(freer);
-function get_freeer(ptr: number, free_fn: (ptr: number) => void) {
+function get_freeer(ptr: bigint, free_fn: (ptr: bigint) => void) {
return () => {
free_fn(ptr);
}
}
-export default class CommonBase {
- protected ptr: number;
+export class CommonBase {
+ protected ptr: bigint;
protected ptrs_to: object[] = [];
- protected constructor(ptr: number, free_fn: (ptr: number) => void) {
+ protected constructor(ptr: bigint, free_fn: (ptr: bigint) => void) {
this.ptr = ptr;
- if (Number.isFinite(ptr) && ptr != 0){
- finalizer.register(this, get_freeer(ptr, free_fn));
+ if (ptr != 0n){
+ finalizer.register(this, get_freeer(ptr, free_fn), this);
}
}
// In Java, protected means "any subclass can access fields on any other subclass'"
// In TypeScript, protected means "any subclass can access parent fields on instances of itself"
// To work around this, we add accessors for other instances' protected fields here.
- protected static add_ref_from(holder: CommonBase, referent: object) {
- holder.ptrs_to.push(referent);
+ protected static add_ref_from(holder: CommonBase|null, referent: object|null) {
+ if (holder !== null && referent !== null) { holder.ptrs_to.push(referent); }
}
protected static get_ptr_of(o: CommonBase) {
return o.ptr;
}
protected static set_null_skip_free(o: CommonBase) {
- o.ptr = 0;
- finalizer.unregister(o);
+ o.ptr = 0n;
+ // @ts-ignore TypeScript is wrong about the returnvalue of unregister here!
+ const did_unregister: boolean = finalizer.unregister(o);
+ if (!did_unregister)
+ throw new Error("FinalizationRegistry unregister should always unregister unless you double-free'd");
+ }
+}
+
+export class UInt5 {
+ public constructor(private val: number) {
+ if (val > 32 || val < 0) throw new Error("UInt5 value is out of range");
+ }
+ public getVal(): number {
+ return this.val;
}
}
+
+export class WitnessVersion {
+ public constructor(private val: number) {
+ if (val > 16 || val < 0) throw new Error("WitnessVersion value is out of range");
+ }
+ public getVal(): number {
+ return this.val;
+ }
+}
+
+export class UnqualifiedError {
+ public constructor(_val: number) {}
+}
"""
self.txout_defn = """export class TxOut extends CommonBase {
/** The script_pubkey in this output */
public script_pubkey: Uint8Array;
/** The value, in satoshis, of this output */
- public value: BigInt;
+ public value: bigint;
/* @internal */
- public constructor(_dummy: object, ptr: number) {
+ public constructor(_dummy: null, ptr: bigint) {
super(ptr, bindings.TxOut_free);
- this.script_pubkey = bindings.TxOut_get_script_pubkey(ptr);
+ this.script_pubkey = bindings.decodeUint8Array(bindings.TxOut_get_script_pubkey(ptr));
this.value = bindings.TxOut_get_value(ptr);
}
- public constructor_new(value: BigInt, script_pubkey: Uint8Array): TxOut {
- return new TxOut(null, bindings.TxOut_new(script_pubkey, value));
+ public static constructor_new(value: bigint, script_pubkey: Uint8Array): TxOut {
+ return new TxOut(null, bindings.TxOut_new(bindings.encodeUint8Array(script_pubkey), value));
}
}"""
self.obj_defined(["TxOut"], "structs")
+ self.txin_defn = """export class TxIn extends CommonBase {
+ /** The witness in this input, in serialized form */
+ public witness: Uint8Array;
+ /** The script_sig in this input */
+ public script_sig: Uint8Array;
+ /** The transaction output's sequence number */
+ public sequence: number;
+ /** The txid this input is spending */
+ public previous_txid: Uint8Array;
+ /** The output index within the spent transaction of the output this input is spending */
+ public previous_vout: number;
+
+ /* @internal */
+ public constructor(_dummy: null, ptr: bigint) {
+ super(ptr, bindings.TxIn_free);
+ this.witness = bindings.decodeUint8Array(bindings.TxIn_get_witness(ptr));
+ this.script_sig = bindings.decodeUint8Array(bindings.TxIn_get_script_sig(ptr));
+ this.sequence = bindings.TxIn_get_sequence(ptr);
+ this.previous_txid = bindings.decodeUint8Array(bindings.TxIn_get_previous_txid(ptr));
+ this.previous_vout = bindings.TxIn_get_previous_vout(ptr);
+ }
+ public static constructor_new(witness: Uint8Array, script_sig: Uint8Array, sequence: number, previous_txid: Uint8Array, previous_vout: number): TxIn {
+ return new TxIn(null, bindings.TxIn_new(bindings.encodeUint8Array(witness), bindings.encodeUint8Array(script_sig), sequence, bindings.encodeUint8Array(previous_txid), previous_vout));
+ }
+}"""
+ self.obj_defined(["TxIn"], "structs")
+
+ self.scalar_defn = """export class BigEndianScalar extends CommonBase {
+ /** The bytes of the scalar value, in big endian */
+ public scalar_bytes: Uint8Array;
+
+ /* @internal */
+ public constructor(_dummy: null, ptr: bigint) {
+ super(ptr, bindings.BigEndianScalar_free);
+ this.scalar_bytes = bindings.decodeUint8Array(bindings.BigEndianScalar_get_bytes(ptr));
+ }
+ public static constructor_new(scalar_bytes: Uint8Array): BigEndianScalar {
+ return new BigEndianScalar(null, bindings.BigEndianScalar_new(bindings.encodeUint8Array(scalar_bytes)));
+ }
+}"""
+ self.obj_defined(["BigEndianScalar"], "structs")
+
+ self.witness_program_defn = """export class WitnessProgram extends CommonBase {
+ /** The witness program bytes themselves */
+ public program: Uint8Array;
+ /** The witness program version */
+ public version: WitnessVersion;
+
+ /* @internal */
+ public constructor(_dummy: null, ptr: bigint) {
+ super(ptr, bindings.WitnessProgram_free);
+ this.program = bindings.decodeUint8Array(bindings.WitnessProgram_get_program(ptr));
+ this.version = new WitnessVersion(bindings.WitnessProgram_get_version(ptr));
+ }
+ public static constructor_new(program: Uint8Array, version: WitnessVersion): WitnessProgram {
+ if (program.length < 2 || program.length > 40)
+ throw new Error("WitnessProgram must be between 2 and 40 bytes long");
+ if (version.getVal() == 0 && program.length != 20 && program.length != 32)
+ throw new Error("WitnessProgram for version 0 must be between either 20 or 30 bytes");
+ return new WitnessProgram(null, bindings.WitnessProgram_new(version.getVal(), bindings.encodeUint8Array(program)));
+ }
+}"""
+ self.obj_defined(["WitnessProgram"], "structs")
+
self.c_file_pfx = """#include "js-wasm.h"
#include <stdatomic.h>
#include <lightning.h>
"""
if not DEBUG:
- self.c_file_pfx = self.c_file_pfx + """
+ self.c_file_pfx += """
void *malloc(size_t size);
void free(void *ptr);
#define MALLOC(a, _) malloc(a)
+#define do_MALLOC(a, _b, _c) malloc(a)
#define FREE(p) if ((unsigned long)(p) > 4096) { free(p); }
#define DO_ASSERT(a) (void)(a)
#define CHECK(a)
#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v)
"""
else:
- self.c_file_pfx = self.c_file_pfx + """
+ self.c_file_pfx += """
+extern int snprintf(char *str, size_t size, const char *format, ...);
+typedef int32_t ssize_t;
+ssize_t write(int fd, const void *buf, size_t count);
+#define DEBUG_PRINT(...) do { \\
+ char debug_str[1024]; \\
+ int s_len = snprintf(debug_str, 1023, __VA_ARGS__); \\
+ write(2, debug_str, s_len); \\
+} while (0);
+
// Always run a, then assert it is true:
#define DO_ASSERT(a) do { bool _assert_val = (a); assert(_assert_val); } while(0)
// Assert a is true or do nothing
struct allocation* next;
void* ptr;
const char* struct_name;
+ int lineno;
} allocation;
static allocation* allocation_ll = NULL;
+static allocation* freed_ll = NULL;
-void* __real_malloc(size_t len);
-void* __real_calloc(size_t nmemb, size_t len);
-static void new_allocation(void* res, const char* struct_name) {
+extern void* __real_malloc(size_t len);
+extern void* __real_calloc(size_t nmemb, size_t len);
+extern void* __real_aligned_alloc(size_t alignment, size_t size);
+static void new_allocation(void* res, const char* struct_name, int lineno) {
allocation* new_alloc = __real_malloc(sizeof(allocation));
new_alloc->ptr = res;
new_alloc->struct_name = struct_name;
new_alloc->next = allocation_ll;
+ new_alloc->lineno = lineno;
allocation_ll = new_alloc;
}
-static void* MALLOC(size_t len, const char* struct_name) {
+static void* do_MALLOC(size_t len, const char* struct_name, int lineno) {
void* res = __real_malloc(len);
- new_allocation(res, struct_name);
+ new_allocation(res, struct_name, lineno);
return res;
}
+#define MALLOC(len, struct_name) do_MALLOC(len, struct_name, __LINE__)
+
void __real_free(void* ptr);
-static void alloc_freed(void* ptr) {
+static void alloc_freed(void* ptr, int lineno) {
allocation* p = NULL;
allocation* it = allocation_ll;
while (it->ptr != ptr) {
p = it; it = it->next;
if (it == NULL) {
- //XXX: fprintf(stderr, "Tried to free unknown pointer %p\\n", ptr);
- return; // addrsan should catch malloc-unknown and print more info than we have
+ p = NULL;
+ it = freed_ll;
+ while (it && it->ptr != ptr) { p = it; it = it->next; }
+ if (it == NULL) {
+ DEBUG_PRINT("Tried to free unknown pointer %p at line %d.\\n", ptr, lineno);
+ } else {
+ DEBUG_PRINT("Tried to free unknown pointer %p at line %d.\\n Possibly double-free from %s, allocated on line %d.", ptr, lineno, it->struct_name, it->lineno);
+ }
+ abort();
}
}
if (p) { p->next = it->next; } else { allocation_ll = it->next; }
DO_ASSERT(it->ptr == ptr);
- __real_free(it);
+ it->next = freed_ll;
+ freed_ll = it;
}
-static void FREE(void* ptr) {
+static void do_FREE(void* ptr, int lineno) {
if ((unsigned long)ptr <= 4096) return; // Rust loves to create pointers to the NULL page for dummys
- alloc_freed(ptr);
+ alloc_freed(ptr, lineno);
__real_free(ptr);
}
+#define FREE(ptr) do_FREE(ptr, __LINE__)
static void CHECK_ACCESS(const void* ptr) {
allocation* it = allocation_ll;
void* __wrap_malloc(size_t len) {
void* res = __real_malloc(len);
- new_allocation(res, "malloc call");
+ new_allocation(res, "malloc call", 0);
return res;
}
void* __wrap_calloc(size_t nmemb, size_t len) {
void* res = __real_calloc(nmemb, len);
- new_allocation(res, "calloc call");
+ new_allocation(res, "calloc call", 0);
+ return res;
+}
+void* __wrap_aligned_alloc(size_t alignment, size_t size) {
+ void* res = __real_aligned_alloc(alignment, size);
+ new_allocation(res, "aligned_alloc call", 0);
return res;
}
void __wrap_free(void* ptr) {
if (ptr == NULL) return;
- alloc_freed(ptr);
+ alloc_freed(ptr, 0);
__real_free(ptr);
}
void* __real_realloc(void* ptr, size_t newlen);
void* __wrap_realloc(void* ptr, size_t len) {
- if (ptr != NULL) alloc_freed(ptr);
+ if (ptr != NULL) alloc_freed(ptr, 0);
void* res = __real_realloc(ptr, len);
- new_allocation(res, "realloc call");
+ new_allocation(res, "realloc call", 0);
return res;
}
void __wrap_reallocarray(void* ptr, size_t new_sz) {
DO_ASSERT(false);
}
-void __attribute__((destructor)) check_leaks() {
+uint32_t __attribute__((export_name("TS_allocs_remaining"))) allocs_remaining() {
+ uint32_t count = 0;
for (allocation* a = allocation_ll; a != NULL; a = a->next) {
- //XXX: fprintf(stderr, "%s %p remains\\n", a->struct_name, a->ptr);
+ count++;
+ }
+ return count;
+}
+void __attribute__((export_name("TS_print_leaks"))) print_leaks() {
+ for (allocation* a = allocation_ll; a != NULL; a = a->next) {
+ DEBUG_PRINT("%s %p remains. Allocated on line %d\\n", a->struct_name, a->ptr, a->lineno);
}
- DO_ASSERT(allocation_ll == NULL);
}
"""
self.c_file_pfx = self.c_file_pfx + """
#define DECL_ARR_TYPE(ty, name) \\
struct name##array { \\
- uint32_t arr_len; \\
+ uint64_t arr_len; /* uint32_t would suffice but we want to align uint64_ts as well */ \\
ty elems[]; \\
}; \\
typedef struct name##array * name##Array; \\
- static inline name##Array init_##name##Array(size_t arr_len) { \\
- name##Array arr = (name##Array)MALLOC(arr_len * sizeof(ty) + sizeof(uint32_t), "##name array init"); \\
+ static inline name##Array init_##name##Array(size_t arr_len, int lineno) { \\
+ name##Array arr = (name##Array)do_MALLOC(arr_len * sizeof(ty) + sizeof(uint64_t), #name" array init", lineno); \\
arr->arr_len = arr_len; \\
return arr; \\
}
DECL_ARR_TYPE(int64_t, int64_t);
+DECL_ARR_TYPE(uint64_t, uint64_t);
DECL_ARR_TYPE(int8_t, int8_t);
+DECL_ARR_TYPE(int16_t, int16_t);
DECL_ARR_TYPE(uint32_t, uint32_t);
DECL_ARR_TYPE(void*, ptr);
DECL_ARR_TYPE(char, char);
typedef charArray jstring;
static inline jstring str_ref_to_ts(const char* chars, size_t len) {
- charArray arr = init_charArray(len);
+ charArray arr = init_charArray(len, __LINE__);
memcpy(arr->elems, chars, len);
return arr;
}
void __attribute__((export_name("TS_free"))) TS_free(uint32_t ptr) {
FREE((void*)ptr);
}
+
+jstring __attribute__((export_name("TS_get_ldk_c_bindings_version"))) TS_get_ldk_c_bindings_version() {
+ const char *res = check_get_ldk_bindings_version();
+ if (res == NULL) return NULL;
+ return str_ref_to_ts(res, strlen(res));
+}
+jstring __attribute__((export_name("TS_get_ldk_version"))) get_ldk_version() {
+ const char *res = check_get_ldk_version();
+ if (res == NULL) return NULL;
+ return str_ref_to_ts(res, strlen(res));
+}
+#include "version.c"
"""
- self.c_version_file = ""
+ self.c_version_file = """jstring __attribute__((export_name("TS_get_lib_version_string"))) TS_get_lib_version_string() {
+ return str_ref_to_ts("<git_version_ldk_garbagecollected>", strlen("<git_version_ldk_garbagecollected>"));
+}"""
self.hu_struct_file_prefix = """
-import CommonBase from './CommonBase.mjs';
+import { CommonBase, UInt5, WitnessVersion, UnqualifiedError } from './CommonBase.mjs';
import * as bindings from '../bindings.mjs'
-import * as InternalUtils from '../InternalUtils.mjs'
"""
+ self.hu_struct_file_suffix = ""
self.util_fn_pfx = self.hu_struct_file_prefix + "\nexport class UtilMethods extends CommonBase {\n"
self.util_fn_sfx = "}"
self.c_fn_ty_pfx = ""
self.file_ext = ".mts"
- self.ptr_c_ty = "uint32_t"
- self.ptr_native_ty = "number"
- self.result_c_ty = "uint32_t"
+ self.ptr_c_ty = "uint64_t"
+ self.ptr_native_ty = "bigint"
+ self.u128_native_ty = "bigint"
+ self.usize_c_ty = "uint32_t"
+ self.usize_native_ty = "number"
+ self.native_zero_ptr = "0n"
+ self.unitary_enum_c_ty = "uint32_t"
self.ptr_arr = "ptrArray"
self.is_arr_some_check = ("", " != 0")
self.get_native_arr_len_call = ("", "->arr_len")
- with open(outdir + "/InternalUtils.mts", "w") as f:
- f.write("export function check_arr_len(arr: Uint8Array, len: number): Uint8Array {\n")
- f.write("\tif (arr.length != len) { throw new Error(\"Expected array of length \" + len + \"got \" + arr.length); }\n")
- f.write("\treturn arr;\n")
- f.write("}")
+ def bindings_footer(self):
+ return ""
def release_native_arr_ptr_call(self, ty_info, arr_var, arr_ptr_var):
return None
def create_native_arr_call(self, arr_len, ty_info):
if ty_info.c_ty == "ptrArray":
- assert ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array")
- return "init_" + ty_info.c_ty + "(" + arr_len + ")"
+ assert ty_info.rust_obj == "LDKCVec_U5Z" or (ty_info.subty is not None and (ty_info.subty.c_ty.endswith("Array") or ty_info.subty.rust_obj == "LDKStr"))
+ return "init_" + ty_info.c_ty + "(" + arr_len + ", __LINE__)"
def set_native_arr_contents(self, arr_name, arr_len, ty_info):
if ty_info.c_ty == "int8_tArray":
return ("memcpy(" + arr_name + "->elems, ", ", " + arr_len + ")")
+ elif ty_info.c_ty == "int16_tArray":
+ return ("memcpy(" + arr_name + "->elems, ", ", " + arr_len + " * 2)")
else:
assert False
def get_native_arr_contents(self, arr_name, dest_name, arr_len, ty_info, copy):
- if ty_info.c_ty == "int8_tArray":
+ if ty_info.c_ty == "int8_tArray" or ty_info.c_ty == "int16_tArray":
if copy:
- return "memcpy(" + dest_name + ", " + arr_name + "->elems, " + arr_len + ")"
+ byte_len = arr_len
+ if ty_info.c_ty == "int16_tArray":
+ byte_len = arr_len + " * 2"
+ return "memcpy(" + dest_name + ", " + arr_name + "->elems, " + byte_len + "); FREE(" + arr_name + ")"
+ assert not copy
if ty_info.c_ty == "ptrArray":
return "(void*) " + arr_name + "->elems"
else:
- assert not copy
return arr_name + "->elems"
def get_native_arr_elem(self, arr_name, idxc, ty_info):
assert False # Only called if above is None
def get_native_arr_ptr_call(self, ty_info):
if ty_info.subty is not None:
- return "(" + ty_info.subty.c_ty + "*)(((uint8_t*)", ") + 4)"
- return "(" + ty_info.c_ty + "*)(((uint8_t*)", ") + 4)"
+ return "(" + ty_info.subty.c_ty + "*)(((uint8_t*)", ") + 8)"
+ return "(" + ty_info.c_ty + "*)(((uint8_t*)", ") + 8)"
def get_native_arr_entry_call(self, ty_info, arr_name, idxc, entry_access):
return None
def cleanup_native_arr_ref_contents(self, arr_name, dest_name, arr_len, ty_info):
if ty_info.c_ty == "int8_tArray":
- return None
+ return "FREE(" + arr_name + ");"
else:
- return None
-
- def map_hu_array_elems(self, arr_name, conv_name, arr_ty, elem_ty):
- return arr_name + " != null ? " + arr_name + ".map(" + conv_name + " => " + elem_ty.from_hu_conv[0] + ") : null"
+ return "FREE(" + arr_name + ")"
+
+ def map_hu_array_elems(self, arr_name, conv_name, arr_ty, elem_ty, is_nullable):
+ if elem_ty.rust_obj == "LDKU5":
+ return arr_name + " != null ? bindings.uint5ArrToBytes(" + arr_name + ") : null"
+ assert elem_ty.c_ty == "uint64_t" or elem_ty.c_ty.endswith("Array") or elem_ty.rust_obj == "LDKStr"
+ if is_nullable:
+ return arr_name + " != null ? " + arr_name + ".map(" + conv_name + " => " + elem_ty.from_hu_conv[0] + ") : null"
+ else:
+ return arr_name + ".map(" + conv_name + " => " + elem_ty.from_hu_conv[0] + ")"
def str_ref_to_native_call(self, var_name, str_len):
return "str_ref_to_ts(" + var_name + ", " + str_len + ")"
def str_ref_to_c_call(self, var_name):
return "str_ref_to_owned_c(" + var_name + ")"
+ def str_to_hu_conv(self, var_name):
+ return "const " + var_name + "_conv: string = bindings.decodeString(" + var_name + ");"
+ def str_from_hu_conv(self, var_name):
+ return ("bindings.encodeString(" + var_name + ")", "")
def c_fn_name_define_pfx(self, fn_name, have_args):
return " __attribute__((export_name(\"TS_" + fn_name + "\"))) TS_" + fn_name + "("
- def wasm_import_header(self, target):
- res = """
-const imports: any = {};
-imports.env = {};
-
-var js_objs: Array<WeakRef<object>> = [];
-var js_invoke: Function;
-
-imports.wasi_snapshot_preview1 = {
- "fd_write" : () => {
- console.log("ABORT");
- },
- "random_get" : () => {
- console.log("RAND GET");
- },
- "environ_sizes_get" : () => {
- console.log("wasi_snapshot_preview1:environ_sizes_get");
- },
- "proc_exit" : () => {
- console.log("wasi_snapshot_preview1:proc_exit");
- },
- "environ_get" : () => {
- console.log("wasi_snapshot_preview1:environ_get");
- },
-};
-
-var wasm: any = null;
-let isWasmInitialized: boolean = false;
-"""
-
- if target == Target.NODEJS:
- res += """import * as fs from 'fs';
-export async function initializeWasm(path: string) {
- const source = fs.readFileSync(path);
- imports.env["js_invoke_function"] = js_invoke;
- const { instance: wasmInstance } = await WebAssembly.instantiate(source, imports);
- wasm = wasmInstance.exports;
- if (!wasm.test_bigint_pass_deadbeef0badf00d(BigInt("0xdeadbeef0badf00d"))) {
- throw new Error(\"Currently need BigInt-as-u64 support, try ----experimental-wasm-bigint");
- }
- isWasmInitialized = true;
-};
-"""
- else:
- res += """
-export async function initializeWasm(uri: string) {
- const stream = fetch(uri);
- imports.env["js_invoke_function"] = js_invoke;
- const { instance: wasmInstance } = await WebAssembly.instantiateStreaming(stream, imports);
- wasm = wasmInstance.exports;
- if (!wasm.test_bigint_pass_deadbeef0badf00d(BigInt("0xdeadbeef0badf00d"))) {
- throw new Error(\"Currently need BigInt-as-u64 support, try ----experimental-wasm-bigint");
- }
- isWasmInitialized = true;
-};
-
-"""
-
- return res + """
-
-
-// WASM CODEC
-
-const nextMultipleOfFour = (value: number) => {
- return Math.ceil(value / 4) * 4;
-}
-
-const encodeUint8Array = (inputArray: Uint8Array) => {
- const cArrayPointer = wasm.TS_malloc(inputArray.length + 4);
- const arrayLengthView = new Uint32Array(wasm.memory.buffer, cArrayPointer, 1);
- arrayLengthView[0] = inputArray.length;
- const arrayMemoryView = new Uint8Array(wasm.memory.buffer, cArrayPointer + 4, inputArray.length);
- arrayMemoryView.set(inputArray);
- return cArrayPointer;
-}
-
-const encodeUint32Array = (inputArray: Uint32Array) => {
- const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 4);
- const arrayMemoryView = new Uint32Array(wasm.memory.buffer, cArrayPointer, inputArray.length);
- arrayMemoryView.set(inputArray, 1);
- arrayMemoryView[0] = inputArray.length;
- return cArrayPointer;
-}
-
-const getArrayLength = (arrayPointer: number) => {
- const arraySizeViewer = new Uint32Array(
- wasm.memory.buffer, // value
- arrayPointer, // offset
- 1 // one int
- );
- return arraySizeViewer[0];
-}
-const decodeUint8Array = (arrayPointer: number, free = true) => {
- const arraySize = getArrayLength(arrayPointer);
- const actualArrayViewer = new Uint8Array(
- wasm.memory.buffer, // value
- arrayPointer + 4, // offset (ignoring length bytes)
- arraySize // uint8 count
- );
- // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
- // will free the underlying memory when it becomes unreachable instead of copying here.
- const actualArray = actualArrayViewer.slice(0, arraySize);
- if (free) {
- wasm.TS_free(arrayPointer);
- }
- return actualArray;
-}
-const decodeUint32Array = (arrayPointer: number, free = true) => {
- const arraySize = getArrayLength(arrayPointer);
- const actualArrayViewer = new Uint32Array(
- wasm.memory.buffer, // value
- arrayPointer + 4, // offset (ignoring length bytes)
- arraySize // uint32 count
- );
- // Clone the contents, TODO: In the future we should wrap the Viewer in a class that
- // will free the underlying memory when it becomes unreachable instead of copying here.
- const actualArray = actualArrayViewer.slice(0, arraySize);
- if (free) {
- wasm.TS_free(arrayPointer);
- }
- return actualArray;
-}
-
-const encodeString = (string: string) => {
- // make malloc count divisible by 4
- const memoryNeed = nextMultipleOfFour(string.length + 1);
- const stringPointer = wasm.TS_malloc(memoryNeed);
- const stringMemoryView = new Uint8Array(
- wasm.memory.buffer, // value
- stringPointer, // offset
- string.length + 1 // length
- );
- for (let i = 0; i < string.length; i++) {
- stringMemoryView[i] = string.charCodeAt(i);
- }
- stringMemoryView[string.length] = 0;
- return stringPointer;
-}
-
-const decodeString = (stringPointer: number, free = true) => {
- const memoryView = new Uint8Array(wasm.memory.buffer, stringPointer);
- let cursor = 0;
- let result = '';
-
- while (memoryView[cursor] !== 0) {
- result += String.fromCharCode(memoryView[cursor]);
- cursor++;
- }
-
- if (free) {
- wasm.wasm_free(stringPointer);
- }
-
- return result;
-};
-"""
-
def init_str(self):
return ""
+ def get_java_arr_len(self, arr_name):
+ return "bindings.getArrayLength(" + arr_name + ")"
+ def get_java_arr_elem(self, elem_ty, arr_name, idx):
+ if elem_ty.c_ty.endswith("Array") or elem_ty.c_ty == "uintptr_t":
+ return "bindings.getU32ArrayElem(" + arr_name + ", " + idx + ")"
+ elif elem_ty.c_ty == "uint64_t":
+ return "bindings.getU64ArrayElem(" + arr_name + ", " + idx + ")"
+ elif elem_ty.rust_obj == "LDKU5":
+ return "bindings.getU8ArrayElem(" + arr_name + ", " + idx + ")"
+ elif elem_ty.rust_obj == "LDKStr":
+ return "bindings.getU32ArrayElem(" + arr_name + ", " + idx + ")"
+ else:
+ assert False
def constr_hu_array(self, ty_info, arr_len):
return "new Array(" + arr_len + ").fill(null)"
+ def cleanup_converted_native_array(self, ty_info, arr_name):
+ return "bindings.freeWasmMemory(" + arr_name + ")"
+
+ def primitive_arr_from_hu(self, arr_ty, fixed_len, arr_name):
+ mapped_ty = arr_ty.subty
+ inner = arr_name
+ if arr_ty.rust_obj == "LDKU128":
+ return ("bindings.encodeUint128(" + inner + ")", "")
+ if fixed_len is not None:
+ if mapped_ty.c_ty == "int8_t":
+ inner = "bindings.check_arr_len(" + arr_name + ", " + fixed_len + ")"
+ elif mapped_ty.c_ty == "int16_t":
+ inner = "bindings.check_16_arr_len(" + arr_name + ", " + fixed_len + ")"
+ if mapped_ty.c_ty.endswith("Array"):
+ return ("bindings.encodeUint32Array(" + inner + ")", "")
+ elif mapped_ty.c_ty == "uint8_t" or mapped_ty.c_ty == "int8_t":
+ return ("bindings.encodeUint8Array(" + inner + ")", "")
+ elif mapped_ty.c_ty == "uint16_t" or mapped_ty.c_ty == "int16_t":
+ return ("bindings.encodeUint16Array(" + inner + ")", "")
+ elif mapped_ty.c_ty == "uint32_t" or mapped_ty.rust_obj == "LDKStr":
+ return ("bindings.encodeUint32Array(" + inner + ")", "")
+ elif mapped_ty.c_ty == "int64_t" or mapped_ty.c_ty == "uint64_t":
+ return ("bindings.encodeUint64Array(" + inner + ")", "")
+ else:
+ print(mapped_ty.c_ty)
+ assert False
+
+ def primitive_arr_to_hu(self, arr_ty, fixed_len, arr_name, conv_name):
+ mapped_ty = arr_ty.subty
+ if arr_ty.rust_obj == "LDKU128":
+ return "const " + conv_name + ": bigint = bindings.decodeUint128(" + arr_name + ");"
+ elif mapped_ty.c_ty == "uint8_t" or mapped_ty.c_ty == "int8_t":
+ return "const " + conv_name + ": Uint8Array = bindings.decodeUint8Array(" + arr_name + ");"
+ elif mapped_ty.c_ty == "uint16_t" or mapped_ty.c_ty == "int16_t":
+ return "const " + conv_name + ": Uint16Array = bindings.decodeUint16Array(" + arr_name + ");"
+ elif mapped_ty.c_ty == "uint64_t" or mapped_ty.c_ty == "int64_t":
+ return "const " + conv_name + ": bigint[] = bindings.decodeUint64Array(" + arr_name + ");"
+ else:
+ assert False
def var_decl_statement(self, ty_string, var_name, statement):
return "const " + var_name + ": " + ty_string + " = " + statement
+ def java_arr_ty_str(self, elem_ty_str):
+ return "number"
+
def for_n_in_range(self, n, minimum, maximum):
return "for (var " + n + " = " + minimum + "; " + n + " < " + maximum + "; " + n + "++) {"
def for_n_in_arr(self, n, arr_name, arr_elem_ty):
with open(self.outdir + "/imports.mts.part", 'a') as imports:
imports.write(f"import {{ {', '.join(struct_names)} }} from '../{folder}/{struct_names[0]}.mjs';\n")
+ def fully_qualified_hu_ty_path(self, ty):
+ return ty.java_hu_ty
+
def native_c_unitary_enum_map(self, struct_name, variants, enum_doc_comment):
out_c = "static inline LDK" + struct_name + " LDK" + struct_name + "_from_js(int32_t ord) {\n"
out_c = out_c + "\tswitch (ord) {\n"
out_c = out_c + "\t\tcase %d: return %s;\n" % (ord_v, var)
ord_v = ord_v + 1
if var_docs is not None:
- out_typescript_enum_fields += f"/**\n * {var_docs}\n */\n"
- out_typescript_enum_fields += f"{var},\n\t\t\t\t"
+ var_docs_repld = var_docs.replace("\n", "\n\t")
+ out_typescript_enum_fields += f"/**\n\t * {var_docs_repld}\n\t */\n"
+ out_typescript_enum_fields += f"\t{var},\n\t"
out_c = out_c + "\t}\n"
out_c = out_c + "\tabort();\n"
out_c = out_c + "}\n"
out_c = out_c + "\t}\n"
out_c = out_c + "}\n"
+ # Note that this is *not* marked /* @internal */ as we re-expose it directly in enums/
+ enum_comment_formatted = enum_doc_comment.replace("\n", "\n * ")
out_typescript = f"""
- export enum {struct_name} {{
- {out_typescript_enum_fields}
- }}
+/**
+ * {enum_comment_formatted}
+ */
+export enum {struct_name} {{
+ {out_typescript_enum_fields}
+}}
"""
out_typescript_enum = f"export {{ {struct_name} }} from \"../bindings.mjs\";"
self.obj_defined([struct_name], "enums")
def native_unitary_enum_to_c_call(self, ty_info):
return (ty_info.rust_obj + "_from_js(", ")")
- def c_complex_enum_pass_ty(self, struct_name):
- return "uint32_t"
-
- def c_constr_native_complex_enum(self, struct_name, variant, c_params):
- ret = "0 /* " + struct_name + " - " + variant + " */"
- for param in c_params:
- ret = ret + "; (void) " + param
- return ret
-
def native_c_map_trait(self, struct_name, field_var_conversions, flattened_field_var_conversions, field_function_lines, trait_doc_comment):
- out_typescript_bindings = "\n\n\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: START\n\n"
-
+ out_typescript_bindings = ""
super_instantiator = ""
bindings_instantiator = ""
pointer_to_adder = ""
for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
impl_constructor_arguments += f", {var.arg_name}: {var.java_hu_ty}"
- super_instantiator += first_to_lower(var.arg_name) + ", "
if var.from_hu_conv is not None:
bindings_instantiator += ", " + var.from_hu_conv[0]
if var.from_hu_conv[1] != "":
else:
bindings_instantiator += ", " + first_to_lower(var.arg_name)
else:
- bindings_instantiator += ", " + first_to_lower(var[1]) + ".bindings_instance"
- super_instantiator += first_to_lower(var[1]) + "_impl, "
+ bindings_instantiator += ", " + first_to_lower(var[1]) + ".instance_idx!"
pointer_to_adder += "\t\timpl_holder.held.ptrs_to.push(" + first_to_lower(var[1]) + ");\n"
impl_constructor_arguments += f", {first_to_lower(var[1])}_impl: {var[0].replace('LDK', '')}Interface"
if isinstance(var, ConvInfo):
trait_constructor_arguments += ", " + var.arg_name
else:
- super_constructor_statements += "\t\tconst " + first_to_lower(var[1]) + " = " + var[1] + ".new_impl(" + super_instantiator + ");\n"
- trait_constructor_arguments += ", " + first_to_lower(var[1]) + ".bindings_instance"
+ super_constructor_statements += "\t\tconst " + first_to_lower(var[1]) + " = " + var[1] + ".new_impl(" + first_to_lower(var[1]) + "_impl"
+ super_instantiator = ""
+ for suparg in var[2]:
+ if isinstance(suparg, ConvInfo):
+ super_instantiator += ", " + suparg.arg_name
+ else:
+ super_instantiator += ", " + first_to_lower(suparg[1]) + "_impl"
+ super_constructor_statements += super_instantiator + ");\n"
+ trait_constructor_arguments += ", " + first_to_lower(var[1]) + ".instance_idx!"
for suparg in var[2]:
if isinstance(suparg, ConvInfo):
trait_constructor_arguments += ", " + suparg.arg_name
else:
+ # Blindly assume that we can just strip the first arg to build the args for the supertrait
+ super_constructor_statements += "\t\tconst " + first_to_lower(suparg[1]) + " = " + suparg[1] + ".new_impl(" + super_instantiator.split(", ", 1)[1] + ");\n"
trait_constructor_arguments += ", " + suparg[1]
# BUILD INTERFACE METHODS
for fn_line in field_function_lines:
java_method_descriptor = ""
if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
+ out_java_interface += "\t/**" + fn_line.docs.replace("\n", "\n\t * ") + "\n\t */\n"
out_java_interface += "\t" + fn_line.fn_name + "("
out_interface_implementation_overrides += f"\t\t\t{fn_line.fn_name} ("
out_interface_implementation_overrides += "\t\t\t\treturn ret;\n"
out_interface_implementation_overrides += f"\t\t\t}},\n"
+ formatted_trait_docs = trait_doc_comment.replace("\n", "\n * ")
out_typescript_human = f"""
{self.hu_struct_file_prefix}
+/** An implementation of {struct_name.replace("LDK","")} */
export interface {struct_name.replace("LDK", "")}Interface {{
{out_java_interface}}}
class {struct_name}Holder {{
- held: {struct_name.replace("LDK", "")};
+ held: {struct_name.replace("LDK", "")}|null = null;
}}
+/**
+ * {formatted_trait_docs}
+ */
export class {struct_name.replace("LDK","")} extends CommonBase {{
/* @internal */
- public bindings_instance?: bindings.{struct_name};
+ public bindings_instance: bindings.{struct_name}|null;
/* @internal */
- constructor(_dummy: object, ptr: number) {{
+ public instance_idx?: number;
+
+ /* @internal */
+ constructor(_dummy: null, ptr: bigint) {{
super(ptr, bindings.{struct_name.replace("LDK","")}_free);
this.bindings_instance = null;
}}
- static new_impl(arg: {struct_name.replace("LDK", "")}Interface{impl_constructor_arguments}): {struct_name.replace("LDK", "")} {{
+ /** Creates a new instance of {struct_name.replace("LDK","")} from a given implementation */
+ public static new_impl(arg: {struct_name.replace("LDK", "")}Interface{impl_constructor_arguments}): {struct_name.replace("LDK", "")} {{
const impl_holder: {struct_name}Holder = new {struct_name}Holder();
let structImplementation = {{
{out_interface_implementation_overrides} }} as bindings.{struct_name};
-{super_constructor_statements} const ptr: number = bindings.{struct_name}_new(structImplementation{bindings_instantiator});
+{super_constructor_statements} const ptr_idx: [bigint, number] = bindings.{struct_name}_new(structImplementation{bindings_instantiator});
- impl_holder.held = new {struct_name.replace("LDK", "")}(null, ptr);
+ impl_holder.held = new {struct_name.replace("LDK", "")}(null, ptr_idx[0]);
+ impl_holder.held.instance_idx = ptr_idx[1];
impl_holder.held.bindings_instance = structImplementation;
-{pointer_to_adder} return impl_holder.held;
+{pointer_to_adder} return impl_holder.held!;
}}
+
"""
self.obj_defined([struct_name.replace("LDK", ""), struct_name.replace("LDK", "") + "Interface"], "structs")
- out_typescript_bindings += "export interface " + struct_name + " {\n"
+ out_typescript_bindings += "/* @internal */\nexport interface " + struct_name + " {\n"
java_meths = []
for fn_line in field_function_lines:
if fn_line.fn_name != "free" and fn_line.fn_name != "cloned":
out_typescript_bindings += "}\n\n"
- out_typescript_bindings += f"export function {struct_name}_new(impl: {struct_name}"
+ c_call_extra_args = ""
+ out_typescript_bindings += f"/* @internal */\nexport function {struct_name}_new(impl: {struct_name}"
for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_typescript_bindings += f", {var.arg_name}: {var.java_ty}"
+ c_call_extra_args += f", {var.arg_name}"
else:
- out_typescript_bindings += f", {var[1]}: {var[0]}"
+ out_typescript_bindings += f", {var[1]}: number"
+ c_call_extra_args += f", {var[1]}"
- out_typescript_bindings += f"""): number {{
+
+ out_typescript_bindings += f"""): [bigint, number] {{
if(!isWasmInitialized) {{
throw new Error("initializeWasm() must be awaited first!");
}}
if (js_objs[i] == null || js_objs[i] == undefined) {{ new_obj_idx = i; break; }}
}}
js_objs[i] = new WeakRef(impl);
- return wasm.TS_{struct_name}_new(i);
+ return [wasm.TS_{struct_name}_new(i{c_call_extra_args}), i];
}}
"""
- out_typescript_bindings += '\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: END\n\n\n'
-
# Now that we've written out our java code (and created java_meths), generate C
out_c = "typedef struct " + struct_name + "_JCalls {\n"
out_c += "\tatomic_size_t refcnt;\n"
out_c = out_c + arg_info.arg_name
out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n"
+ fn_suffix = ""
+ assert len(fn_line.args_ty) < 7
+ for arg_info in fn_line.args_ty:
+ if arg_info.c_ty == "uint64_t" or arg_info.c_ty == "int64_t":
+ fn_suffix += "b"
+ else:
+ fn_suffix += "u"
+ for i in range(0, 6 - len(fn_line.args_ty)):
+ fn_suffix += "u"
if fn_line.ret_ty_info.c_ty.endswith("Array"):
out_c += "\t" + fn_line.ret_ty_info.c_ty + " ret = (" + fn_line.ret_ty_info.c_ty + ")"
- out_c += "js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
+ out_c += "js_invoke_function_" + fn_suffix + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
elif fn_line.ret_ty_info.java_ty == "void":
- out_c = out_c + "\tjs_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
- elif fn_line.ret_ty_info.java_ty == "String":
- out_c = out_c + "\tjstring ret = (jstring)js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
- elif not fn_line.ret_ty_info.passed_as_ptr:
- out_c = out_c + "\treturn js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
+ out_c = out_c + "\tjs_invoke_function_" + fn_suffix + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
+ elif fn_line.ret_ty_info.java_hu_ty == "string":
+ out_c += "\tjstring ret = (jstring)js_invoke_function_" + fn_suffix + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
+ elif fn_line.ret_ty_info.arg_conv is None:
+ out_c += "\treturn js_invoke_function_" + fn_suffix + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
else:
- out_c = out_c + "\tuint32_t ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
+ out_c += "\tuint64_t ret = js_invoke_function_" + fn_suffix + "(j_calls->instance_ptr, " + str(self.function_ptr_counter)
self.function_ptrs[self.function_ptr_counter] = (struct_name, fn_line.fn_name)
self.function_ptr_counter += 1
for idx, arg_info in enumerate(fn_line.args_ty):
if arg_info.ret_conv is not None:
- out_c = out_c + ", (uint32_t)" + arg_info.ret_conv_name
+ if arg_info.c_ty.endswith("Array"):
+ out_c += ", (uint32_t)" + arg_info.ret_conv_name
+ else:
+ out_c += ", " + arg_info.ret_conv_name
else:
- out_c = out_c + ", (uint32_t)" + arg_info.arg_name
+ assert False # TODO: Would we need some conversion here?
+ out_c += ", (uint32_t)" + arg_info.arg_name
+ for i in range(0, 6 - len(fn_line.args_ty)):
+ out_c += ", 0"
out_c = out_c + ");\n"
if fn_line.ret_ty_info.arg_conv is not None:
out_c = out_c + "\t" + fn_line.ret_ty_info.arg_conv.replace("\n", "\n\t") + "\n\treturn " + fn_line.ret_ty_info.arg_conv_name + ";\n"
out_c = out_c + "static void " + struct_name + "_JCalls_cloned(" + struct_name + "* new_obj) {\n"
out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) new_obj->this_arg;\n"
out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);\n"
- for var in field_var_conversions:
+ for var in flattened_field_var_conversions:
if not isinstance(var, ConvInfo):
- out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[1] + "->refcnt, 1, memory_order_release);\n"
+ out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[2].replace(".", "->") + "->refcnt, 1, memory_order_release);\n"
out_c = out_c + "}\n"
out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (JSValue o"
out_c = out_c + "\t};\n"
for var in flattened_field_var_conversions:
if not isinstance(var, ConvInfo):
- out_c = out_c + "\tcalls->" + var[1] + " = ret." + var[1] + ".this_arg;\n"
+ out_c = out_c + "\tcalls->" + var[1] + " = ret." + var[2] + ".this_arg;\n"
out_c = out_c + "\treturn ret;\n"
out_c = out_c + "}\n"
- out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "JSValue o"
+ out_c = out_c + self.c_fn_ty_pfx + "uint64_t " + self.c_fn_name_define_pfx(struct_name + "_new", True) + "JSValue o"
for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
out_c = out_c + ", " + var.c_ty + " " + var.arg_name
else:
out_c = out_c + ", " + var[1]
out_c = out_c + ");\n"
- out_c = out_c + "\treturn (long)res_ptr;\n"
+ out_c = out_c + "\treturn tag_ptr(res_ptr, true);\n"
out_c = out_c + "}\n"
return (out_typescript_bindings, out_typescript_human, out_c)
def trait_struct_inc_refcnt(self, ty_info):
- return ""
+ base_conv = "\nif (" + ty_info.var_name + "_conv.free == " + ty_info.rust_obj + "_JCalls_free) {\n"
+ base_conv = base_conv + "\t// If this_arg is a JCalls struct, then we need to increment the refcnt in it.\n"
+ base_conv = base_conv + "\t" + ty_info.rust_obj + "_JCalls_cloned(&" + ty_info.var_name + "_conv);\n}"
+ return base_conv
def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment):
bindings_type = struct_name.replace("LDK", "")
out_java_enum += (self.hu_struct_file_prefix)
- java_hu_class = ""
+ java_hu_class = "/**\n * " + enum_doc_comment.replace("\n", "\n * ") + "\n */\n"
java_hu_class += "export class " + java_hu_type + " extends CommonBase {\n"
- java_hu_class += "\tprotected constructor(_dummy: object, ptr: number) { super(ptr, bindings." + bindings_type + "_free); }\n"
+ java_hu_class += "\tprotected constructor(_dummy: null, ptr: bigint) { super(ptr, bindings." + bindings_type + "_free); }\n"
java_hu_class += "\t/* @internal */\n"
- java_hu_class += f"\tpublic static constr_from_ptr(ptr: number): {java_hu_type} {{\n"
- java_hu_class += f"\t\tconst raw_val: bindings.{struct_name} = bindings." + struct_name + "_ref_from_ptr(ptr);\n"
+ java_hu_class += f"\tpublic static constr_from_ptr(ptr: bigint): {java_hu_type} {{\n"
+ java_hu_class += f"\t\tconst raw_ty: number = bindings." + struct_name + "_ty_from_ptr(ptr);\n"
+ out_c += self.c_fn_ty_pfx + "uint32_t" + self.c_fn_name_define_pfx(struct_name + "_ty_from_ptr", True) + self.ptr_c_ty + " ptr) {\n"
+ out_c += "\t" + struct_name + " *obj = (" + struct_name + "*)untag_ptr(ptr);\n"
+ out_c += "\tswitch(obj->tag) {\n"
+ java_hu_class += "\t\tswitch (raw_ty) {\n"
java_hu_subclasses = ""
- out_java += "export class " + struct_name + " {\n"
+ out_java += "/* @internal */\nexport class " + struct_name + " {\n"
out_java += "\tprotected constructor() {}\n"
- java_subclasses = ""
+ var_idx = 0
for var in variant_list:
- java_subclasses += "export class " + struct_name + "_" + var.var_name + " extends " + struct_name + " {\n"
- java_hu_subclasses = java_hu_subclasses + "export class " + java_hu_type + "_" + var.var_name + " extends " + java_hu_type + " {\n"
- java_hu_class += "\t\tif (raw_val instanceof bindings." + struct_name + "_" + var.var_name + ") {\n"
- java_hu_class += "\t\t\treturn new " + java_hu_type + "_" + var.var_name + "(ptr, raw_val);\n"
- init_meth_params = ""
+ java_hu_subclasses += "/** A " + java_hu_type + " of type " + var.var_name + " */\n"
+ java_hu_subclasses += "export class " + java_hu_type + "_" + var.var_name + " extends " + java_hu_type + " {\n"
+ java_hu_class += f"\t\t\tcase {var_idx}: "
+ java_hu_class += "return new " + java_hu_type + "_" + var.var_name + "(ptr);\n"
+ out_c += f"\t\tcase {struct_name}_{var.var_name}: return {var_idx};\n"
hu_conv_body = ""
for idx, (field_ty, field_docs) in enumerate(var.fields):
- java_hu_subclasses = java_hu_subclasses + "\tpublic " + field_ty.arg_name + f": {field_ty.java_hu_ty};\n"
+ if field_docs is not None:
+ java_hu_subclasses += "\t/**\n\t * " + field_docs.replace("\n", "\n\t * ") + "\n\t */\n"
+ java_hu_subclasses += "\tpublic " + field_ty.arg_name + f": {field_ty.java_hu_ty};\n"
if field_ty.to_hu_conv is not None:
- hu_conv_body = hu_conv_body + "\t\tconst " + field_ty.arg_name + f": {field_ty.java_ty} = obj." + field_ty.arg_name + ";\n"
- hu_conv_body = hu_conv_body + "\t\t" + field_ty.to_hu_conv.replace("\n", "\n\t\t\t") + "\n"
- hu_conv_body = hu_conv_body + "\t\tthis." + field_ty.arg_name + " = " + field_ty.to_hu_conv_name + ";\n"
+ hu_conv_body += f"\t\tconst {field_ty.arg_name}: {field_ty.java_ty} = bindings.{struct_name}_{var.var_name}_get_{field_ty.arg_name}(ptr);\n"
+ hu_conv_body += f"\t\t" + field_ty.to_hu_conv.replace("\n", "\n\t\t\t") + "\n"
+ hu_conv_body += f"\t\tthis." + field_ty.arg_name + " = " + field_ty.to_hu_conv_name + ";\n"
else:
- hu_conv_body = hu_conv_body + "\t\tthis." + field_ty.arg_name + " = obj." + field_ty.arg_name + ";\n"
- if idx > 0:
- init_meth_params += ", "
- init_meth_params += "public " + field_ty.arg_name + ": " + field_ty.java_ty
- java_subclasses += "\tconstructor(" + init_meth_params + ") { super(); }\n"
- java_subclasses += "}\n"
- java_hu_class += "\t\t}\n"
+ hu_conv_body += f"\t\tthis.{field_ty.arg_name} = bindings.{struct_name}_{var.var_name}_get_{field_ty.arg_name}(ptr);\n"
java_hu_subclasses += "\t/* @internal */\n"
- java_hu_subclasses += "\tpublic constructor(ptr: number, obj: bindings." + struct_name + "_" + var.var_name + ") {\n\t\tsuper(null, ptr);\n"
+ java_hu_subclasses += "\tpublic constructor(ptr: bigint) {\n\t\tsuper(null, ptr);\n"
java_hu_subclasses = java_hu_subclasses + hu_conv_body
java_hu_subclasses = java_hu_subclasses + "\t}\n}\n"
+ var_idx += 1
out_java += "}\n"
- out_java += java_subclasses
- java_hu_class += "\t\tthrow new Error('oops, this should be unreachable'); // Unreachable without extending the (internal) bindings interface\n\t}\n\n"
- out_java += self.fn_call_body(struct_name + "_ref_from_ptr", "uint32_t", "number", "ptr: number", "ptr")
+ java_hu_class += "\t\t\tdefault:\n\t\t\t\tthrow new Error('oops, this should be unreachable'); // Unreachable without extending the (internal) bindings interface\n\t\t}\n\t}\n\n"
+ out_java += self.fn_call_body(struct_name + "_ty_from_ptr", "uint32_t", "number", "ptr: bigint", "ptr")
+ out_c += ("\t\tdefault: abort();\n")
+ out_c += ("\t}\n}\n")
- out_c += (self.c_fn_ty_pfx + self.c_complex_enum_pass_ty(struct_name) + self.c_fn_name_define_pfx(struct_name + "_ref_from_ptr", True) + self.ptr_c_ty + " ptr) {\n")
- out_c += ("\t" + struct_name + " *obj = (" + struct_name + "*)(ptr & ~1);\n")
- out_c += ("\tswitch(obj->tag) {\n")
for var in variant_list:
- out_c += ("\t\tcase " + struct_name + "_" + var.var_name + ": {\n")
- c_params = []
for idx, (field_map, _) in enumerate(var.fields):
+ fn_name = f"{struct_name}_{var.var_name}_get_{field_map.arg_name}"
+ out_c += self.c_fn_ty_pfx + field_map.c_ty + self.c_fn_name_define_pfx(fn_name, True) + self.ptr_c_ty + " ptr) {\n"
+ out_c += "\t" + struct_name + " *obj = (" + struct_name + "*)untag_ptr(ptr);\n"
+ out_c += f"\tassert(obj->tag == {struct_name}_{var.var_name});\n"
if field_map.ret_conv is not None:
- out_c += ("\t\t\t" + field_map.ret_conv[0].replace("\n", "\n\t\t\t"))
+ out_c += ("\t" + field_map.ret_conv[0].replace("\n", "\n\t"))
if var.tuple_variant:
out_c += "obj->" + camel_to_snake(var.var_name)
else:
out_c += "obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name
out_c += (field_map.ret_conv[1].replace("\n", "\n\t\t\t") + "\n")
- c_params.append(field_map.ret_conv_name)
+ out_c += "\treturn " + field_map.ret_conv_name + ";\n"
else:
if var.tuple_variant:
- c_params.append("obj->" + camel_to_snake(var.var_name))
+ out_c += "\treturn " + "obj->" + camel_to_snake(var.var_name) + ";\n"
else:
- c_params.append("obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name)
- out_c += ("\t\t\treturn " + self.c_constr_native_complex_enum(struct_name, var.var_name, c_params) + ";\n")
- out_c += ("\t\t}\n")
- out_c += ("\t\tdefault: abort();\n")
- out_c += ("\t}\n}\n")
+ out_c += "\treturn " + "obj->" + camel_to_snake(var.var_name) + "." + field_map.arg_name + ";\n"
+ out_c += "}\n"
+ out_java += self.fn_call_body(fn_name, field_map.c_ty, field_map.java_ty, "ptr: bigint", "ptr")
out_java_enum += java_hu_class
self.struct_file_suffixes[java_hu_type] = java_hu_subclasses
self.obj_defined([java_hu_type], "structs")
return (out_java, out_java_enum, out_c)
def map_opaque_struct(self, struct_name, struct_doc_comment):
- implementations = ""
method_header = ""
hu_name = struct_name.replace("LDKC2Tuple", "TwoTuple").replace("LDKC3Tuple", "ThreeTuple").replace("LDK", "")
out_opaque_struct_human = f"{self.hu_struct_file_prefix}"
- if struct_name.startswith("LDKLocked"):
- out_opaque_struct_human += "/** XXX: DO NOT USE THIS - it remains locked until the GC runs (if that ever happens */"
+ constructor_body = "super(ptr, bindings." + struct_name.replace("LDK","") + "_free);"
+ extra_docs = ""
+ extra_body = ""
+ if struct_name.startswith("LDKLocked") or struct_name.startswith("LDKReadOnly"):
+ extra_docs = "\n * This type represents a lock and MUST BE MANUALLY FREE'd!"
+ constructor_body = 'super(ptr, () => { throw new Error("Locks must be manually freed with free()"); });'
+ extra_body = f"""
+ /** Releases this lock */
+ public free() {{
+ bindings.{struct_name.replace("LDK","")}_free(this.ptr);
+ CommonBase.set_null_skip_free(this);
+ }}"""
+ formatted_doc_comment = struct_doc_comment.replace("\n", "\n * ")
out_opaque_struct_human += f"""
-export class {hu_name} extends CommonBase {implementations}{{
+/**{extra_docs}
+ * {formatted_doc_comment}
+ */
+export class {hu_name} extends CommonBase {{
/* @internal */
- public constructor(_dummy: object, ptr: number) {{
- super(ptr, bindings.{struct_name.replace("LDK","")}_free);
- }}
+ public constructor(_dummy: null, ptr: bigint) {{
+ {constructor_body}
+ }}{extra_body}
"""
self.obj_defined([hu_name], "structs")
suffixes += "\tpublic res: " + res_map.java_hu_ty + ";\n"
suffixes += f"""
/* @internal */
- public constructor(_dummy: object, ptr: number) {{
+ public constructor(_dummy: null, ptr: bigint) {{
super(_dummy, ptr);
"""
if res_map.java_hu_ty == "void":
suffixes += "\tpublic err: " + err_map.java_hu_ty + ";\n"
suffixes += f"""
/* @internal */
- public constructor(_dummy: object, ptr: number) {{
+ public constructor(_dummy: null, ptr: bigint) {{
super(_dummy, ptr);
"""
if err_map.java_hu_ty == "void":
return f"""{self.hu_struct_file_prefix}
export class {human_ty} extends CommonBase {{
- protected constructor(_dummy: object, ptr: number) {{
+ protected constructor(_dummy: null, ptr: bigint) {{
super(ptr, bindings.{struct_name.replace("LDK","")}_free);
}}
/* @internal */
- public static constr_from_ptr(ptr: number): {human_ty} {{
+ public static constr_from_ptr(ptr: bigint): {human_ty} {{
if (bindings.{struct_name.replace("LDK", "")}_is_ok(ptr)) {{
return new {human_ty}_OK(null, ptr);
}} else {{
def fn_call_body(self, method_name, return_c_ty, return_java_ty, method_argument_string, native_call_argument_string):
has_return_value = return_c_ty != 'void'
- needs_decoding = return_c_ty in self.wasm_decoding_map
return_statement = 'return nativeResponseValue;'
if not has_return_value:
return_statement = '// debug statements here'
- elif needs_decoding:
- converter = self.wasm_decoding_map[return_c_ty]
- return_statement = f"return {converter}(nativeResponseValue);"
- return f"""export function {method_name}({method_argument_string}): {return_java_ty} {{
+ return f"""/* @internal */
+export function {method_name}({method_argument_string}): {return_java_ty} {{
if(!isWasmInitialized) {{
throw new Error("initializeWasm() must be awaited first!");
}}
out_c += (", ")
if arg_conv_info.c_ty != "void":
out_c += (arg_conv_info.c_ty + " " + arg_conv_info.arg_name)
- needs_encoding = arg_conv_info.c_ty in self.wasm_encoding_map
- native_argument = arg_conv_info.arg_name
- if needs_encoding:
- converter = self.wasm_encoding_map[arg_conv_info.c_ty]
- native_argument = f"{converter}({arg_conv_info.arg_name})"
method_argument_string += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}"
- native_call_argument_string += native_argument
+ native_call_argument_string += arg_conv_info.arg_name
out_java = self.fn_call_body(method_name, return_type_info.c_ty, return_type_info.java_ty, method_argument_string, native_call_argument_string)
out_java_struct = ""
+ if doc_comment is not None:
+ out_java_struct = "\t/**\n\t * " + doc_comment.replace("\n", "\n\t * ") + "\n\t */\n"
+
if not args_known:
out_java_struct += ("\t// Skipped " + method_name + "\n")
else:
out_java_struct += arg.arg_name + "_" + explode_arg.arg_name + ": " + explode_arg.java_hu_ty
else:
out_java_struct += arg.arg_name + ": " + arg.java_hu_ty
+ if arg.nullable:
+ out_java_struct += "|null"
out_c += (") {\n")
if out_java_struct is not None:
with open(self.outdir + "/bindings.mts", "a") as bindings:
bindings.write("""
-js_invoke = function(obj_ptr: number, fn_id: number, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: number, arg7: number, arg8: number, arg9: number, arg10: number) {
- const weak: WeakRef<object> = js_objs[obj_ptr];
+js_invoke = function(obj_ptr: number, fn_id: number, arg1: bigint|number, arg2: bigint|number, arg3: bigint|number, arg4: bigint|number, arg5: bigint|number, arg6: bigint|number, arg7: bigint|number, arg8: bigint|number, arg9: bigint|number, arg10: bigint|number) {
+ const weak: WeakRef<object>|undefined = js_objs[obj_ptr];
if (weak == null || weak == undefined) {
console.error("Got function call on unknown/free'd JS object!");
throw new Error("Got function call on unknown/free'd JS object!");
}
- const obj: object = weak.deref();
+ const obj = weak.deref();
if (obj == null || obj == undefined) {
console.error("Got function call on GC'd JS object!");
throw new Error("Got function call on GC'd JS object!");
bindings.write(f"\t\tcase {str(f)}: fn = Object.getOwnPropertyDescriptor(obj, \"{self.function_ptrs[f][1]}\"); break;\n")
bindings.write("""\t\tdefault:
- console.error("Got unknown function call from C!");
- throw new Error("Got unknown function call from C!");
+ console.error("Got unknown function call with id " + fn_id + " from C!");
+ throw new Error("Got unknown function call with id " + fn_id + " from C!");
}
if (fn == null || fn == undefined) {
- console.error("Got function call on incorrect JS object!");
- throw new Error("Got function call on incorrect JS object!");
+ console.error("Got function call with id " + fn_id + " on incorrect JS object: " + obj);
+ throw new Error("Got function call with id " + fn_id + " on incorrect JS object: " + obj);
+ }
+ var ret;
+ try {
+ ret = fn.value.bind(obj)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+ } catch (e) {
+ console.error("Got an exception calling function with id " + fn_id + "! This is fatal.");
+ console.error(e);
+ throw e;
}
- return fn.value.bind(obj)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+ if (ret === undefined || ret === null) return BigInt(0);
+ return BigInt(ret);
}""")
projects / ldk-java / blobdiff