X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=462a77fe951a135ab20a8727b5a0b2ebb9d19938;hb=7d372e434499e36b8be0d090ef733a03650dec6e;hp=84b27c5723a66521d7f737ac486313b1aac52cb2;hpb=e6173a79ce766cef7a660f22fc8fd1220975f6ea;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index 84b27c57..462a77fe 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -11,21 +11,22 @@ class Target(Enum): BROWSER = 2 class Consts: - def __init__(self, DEBUG: bool, target: Target, **kwargs): - + def __init__(self, DEBUG: bool, target: Target, outdir: str, **kwargs): + self.outdir = outdir + self.struct_file_suffixes = {} + 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 = ['number'], + uint8_t = ['number', 'number', 'Uint8Array'], + uint16_t = ['number', 'number', 'Uint16Array'], + uint32_t = ['number', 'number', 'Uint32Array'], + uint64_t = ['bigint', 'bigint', 'BigUint64Array'], ) - - self.wasm_decoding_map = dict( - int8_tArray = 'decodeArray' + self.java_type_map = dict( + String = "number" ) - - self.wasm_encoding_map = dict( - int8_tArray = 'encodeArray', + self.java_hu_type_map = dict( + String = "string" ) self.to_hu_conv_templates = dict( @@ -33,72 +34,64 @@ class Consts: default = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});', ) - self.bindings_header = self.wasm_import_header(target) + """ -export class VecOrSliceDef { - public dataptr: number; - public datalen: number; - public stride: number; - public constructor(dataptr: number, datalen: number, stride: number) { - this.dataptr = dataptr; - this.datalen = datalen; - this.stride = stride; - } -} - -/* -TODO: load WASM file -static { - System.loadLibrary(\"lightningjni\"); - init(java.lang.Enum.class, VecOrSliceDef.class); - init_class_cache(); -} - -static native void init(java.lang.Class c, java.lang.Class slicedef); -static native void init_class_cache(); - -public static native boolean deref_bool(long ptr); -public static native long deref_long(long ptr); -public static native void free_heap_ptr(long ptr); -public static native byte[] read_bytes(long ptr, long len); -public static native byte[] get_u8_slice_bytes(long slice_ptr); -public static native long bytes_to_u8_vec(byte[] bytes); -public static native long new_txpointer_copy_data(byte[] txdata); -public static native void txpointer_free(long ptr); -public static native byte[] txpointer_get_buffer(long ptr); -public static native long vec_slice_len(long vec); -public static native long new_empty_slice_vec(); -*/ - -""" + self.bindings_header = self.wasm_import_header(target) self.bindings_version_file = "" - self.bindings_footer = """ - export async function initializeWasm(allowDoubleInitialization: boolean = false): Promise { - if(isWasmInitialized && !allowDoubleInitialization) { - return; - } - const wasmInstance = await WebAssembly.instantiate(wasmModule, imports) - wasm = wasmInstance.exports; - isWasmInitialized = true; - } - """ - - self.util_fn_pfx = "" - self.util_fn_sfx = "" + self.bindings_footer = "" self.common_base = """ - export default class CommonBase { - ptr: number; - ptrs_to: object[] = []; // new LinkedList(); TODO: build linked list implementation - protected constructor(ptr: number) { this.ptr = ptr; } - public _test_only_get_ptr(): number { return this.ptr; } - protected finalize() { - // TODO: finalize myself - } - } +function freer(f: () => void) { f() } +const finalizer = new FinalizationRegistry(freer); +function get_freeer(ptr: number, free_fn: (ptr: number) => void) { + return () => { + free_fn(ptr); + } +} + +export default class CommonBase { + protected ptr: number; + protected ptrs_to: object[] = []; + protected constructor(ptr: number, free_fn: (ptr: number) => void) { + this.ptr = ptr; + if (Number.isFinite(ptr) && ptr != 0){ + finalizer.register(this, get_freeer(ptr, free_fn)); + } + } + // 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 get_ptr_of(o: CommonBase) { + return o.ptr; + } + protected static set_null_skip_free(o: CommonBase) { + o.ptr = 0; + finalizer.unregister(o); + } +} """ + 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; + + /* @internal */ + public constructor(_dummy: object, ptr: number) { + super(ptr, bindings.TxOut_free); + 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(bindings.encodeUint8Array(script_pubkey), value)); + } +}""" + self.obj_defined(["TxOut"], "structs") + self.c_file_pfx = """#include "js-wasm.h" #include #include @@ -108,10 +101,15 @@ void *memset(void *s, int c, size_t n); void *memcpy(void *dest, const void *src, size_t n); int memcmp(const void *s1, const void *s2, size_t n); -void __attribute__((noreturn)) abort(void); +extern void __attribute__((noreturn)) abort(void); static inline void assert(bool expression) { if (!expression) { abort(); } } + +uint32_t __attribute__((export_name("test_bigint_pass_deadbeef0badf00d"))) test_bigint_pass_deadbeef0badf00d(uint64_t val) { + return val == 0xdeadbeef0badf00dULL; +} + """ if not DEBUG: @@ -120,9 +118,11 @@ void *malloc(size_t size); void free(void *ptr); #define MALLOC(a, _) malloc(a) -#define FREE(p) if ((unsigned long)(p) > 1024) { free(p); } +#define FREE(p) if ((unsigned long)(p) > 4096) { free(p); } #define DO_ASSERT(a) (void)(a) #define CHECK(a) +#define CHECK_ACCESS(p) +#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v) """ else: self.c_file_pfx = self.c_file_pfx + """ @@ -174,11 +174,28 @@ static void alloc_freed(void* ptr) { __real_free(it); } static void FREE(void* ptr) { - if ((unsigned long)ptr < 1024) return; // Rust loves to create pointers to the NULL page for dummys + if ((unsigned long)ptr <= 4096) return; // Rust loves to create pointers to the NULL page for dummys alloc_freed(ptr); __real_free(ptr); } +static void CHECK_ACCESS(const void* ptr) { + allocation* it = allocation_ll; + while (it->ptr != ptr) { + it = it->next; + if (it == NULL) { + return; // addrsan should catch malloc-unknown and print more info than we have + } + } +} +#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v) \\ + if (v.is_owned && v.inner != NULL) { \\ + const void *p = __unmangle_inner_ptr(v.inner); \\ + if (p != NULL) { \\ + CHECK_ACCESS(p); \\ + } \\ + } + void* __wrap_malloc(size_t len) { void* res = __real_malloc(len); new_allocation(res, "malloc call"); @@ -222,32 +239,37 @@ _Static_assert(offsetof(LDKCVec_u8Z, datalen) == offsetof(LDKu8slice, datalen), _Static_assert(sizeof(void*) == 4, "Pointers mut be 32 bits"); -typedef uint32_t int64_tArray; -typedef uint32_t int8_tArray; -typedef uint32_t uint32_tArray; -typedef uint32_t ptrArray; -typedef uint32_t jstring; +#define DECL_ARR_TYPE(ty, name) \\ + struct name##array { \\ + uint32_t arr_len; \\ + 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"); \\ + arr->arr_len = arr_len; \\ + return arr; \\ + } -static inline uint32_t init_arr(size_t arr_len, size_t elem_size, const char *type_desc) { - uint32_t *elems = (uint32_t*)MALLOC(arr_len * elem_size + 4, type_desc); - elems[0] = arr_len; - return (uint32_t)elems; -} +DECL_ARR_TYPE(int64_t, int64_t); +DECL_ARR_TYPE(int8_t, int8_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) { - char* err_buf = MALLOC(len + 4, "str conv buf"); - *((uint32_t*)err_buf) = len; - memcpy(err_buf + 4, chars, len); - return (uint32_t) err_buf; + charArray arr = init_charArray(len); + memcpy(arr->elems, chars, len); + return arr; } -static inline LDKStr str_ref_to_owned_c(jstring str) { - uint32_t *str_len = (uint32_t*)str; - char* newchars = MALLOC(*str_len + 1, "String chars"); - memcpy(newchars, (const char*)(str + 4), *str_len); - newchars[*str_len] = 0; - LDKStr res= { +static inline LDKStr str_ref_to_owned_c(const jstring str) { + char* newchars = MALLOC(str->arr_len + 1, "String chars"); + memcpy(newchars, str->elems, str->arr_len); + newchars[str->arr_len] = 0; + LDKStr res = { .chars = newchars, - .len = *str_len, + .len = str->arr_len, .chars_is_owned = true }; return res; @@ -255,64 +277,58 @@ static inline LDKStr str_ref_to_owned_c(jstring str) { typedef bool jboolean; -uint32_t __attribute__((visibility("default"))) TS_malloc(uint32_t size) { +uint32_t __attribute__((export_name("TS_malloc"))) TS_malloc(uint32_t size) { return (uint32_t)MALLOC(size, "JS-Called malloc"); } -void __attribute__((visibility("default"))) TS_free(uint32_t ptr) { +void __attribute__((export_name("TS_free"))) TS_free(uint32_t ptr) { FREE((void*)ptr); } """ self.c_version_file = "" - self.hu_struct_file_prefix = f""" -import CommonBase from './CommonBase'; -import * as bindings from '../bindings' // TODO: figure out location + self.hu_struct_file_prefix = """ +import CommonBase from './CommonBase.mjs'; +import * as bindings from '../bindings.mjs' """ + 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 = ".ts" + self.file_ext = ".mts" self.ptr_c_ty = "uint32_t" self.ptr_native_ty = "number" self.result_c_ty = "uint32_t" self.ptr_arr = "ptrArray" self.is_arr_some_check = ("", " != 0") - self.get_native_arr_len_call = ("*((uint32_t*)", ")") + self.get_native_arr_len_call = ("", "->arr_len") 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 == "int8_tArray": - return "init_arr(" + arr_len + ", sizeof(uint8_t), \"Native int8_tArray Bytes\")" - elif ty_info.c_ty == "int64_tArray": - return "init_arr(" + arr_len + ", sizeof(uint64_t), \"Native int64_tArray Bytes\")" - elif ty_info.c_ty == "uint32_tArray": - return "init_arr(" + arr_len + ", sizeof(uint32_t), \"Native uint32_tArray Bytes\")" - elif ty_info.c_ty == "ptrArray": + if ty_info.c_ty == "ptrArray": assert ty_info.subty is not None and ty_info.subty.c_ty.endswith("Array") - return "init_arr(" + arr_len + ", sizeof(uint32_t), \"Native ptrArray Bytes\")" - else: - print("Need to create arr!", ty_info.c_ty) - return ty_info.c_ty + return "init_" + ty_info.c_ty + "(" + arr_len + ")" def set_native_arr_contents(self, arr_name, arr_len, ty_info): if ty_info.c_ty == "int8_tArray": - return ("memcpy((uint8_t*)(" + arr_name + " + 4), ", ", " + arr_len + ")") + return ("memcpy(" + arr_name + "->elems, ", ", " + arr_len + ")") 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 copy: - return "memcpy(" + dest_name + ", (uint8_t*)(" + arr_name + " + 4), " + arr_len + ")" - else: - return "(int8_t*)(" + arr_name + " + 4)" + return "memcpy(" + dest_name + ", " + arr_name + "->elems, " + arr_len + ")" + if ty_info.c_ty == "ptrArray": + return "(void*) " + arr_name + "->elems" else: - return "(" + ty_info.subty.c_ty + "*)(" + arr_name + " + 4)" + 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 + "*)(", " + 4)" - return "(" + ty_info.c_ty + "*)(", " + 4)" + return "(" + ty_info.subty.c_ty + "*)(((uint8_t*)", ") + 4)" + return "(" + ty_info.c_ty + "*)(((uint8_t*)", ") + 4)" 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): @@ -321,89 +337,162 @@ import * as bindings from '../bindings' // TODO: figure out location else: return None + def map_hu_array_elems(self, arr_name, conv_name, arr_ty, elem_ty): + assert elem_ty.c_ty == "uint32_t" or elem_ty.c_ty.endswith("Array") + return arr_name + " != null ? " + arr_name + ".map(" + conv_name + " => " + elem_ty.from_hu_conv[0] + ") : null" + 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__((visibility(\"default\"))) TS_" + fn_name + "(" + return " __attribute__((export_name(\"TS_" + fn_name + "\"))) TS_" + fn_name + "(" def wasm_import_header(self, target): - if target == Target.NODEJS: - return """ -import * as fs from 'fs'; -const source = fs.readFileSync('./ldk.wasm'); - -const memory = new WebAssembly.Memory({initial: 256}); -const wasmModule = new WebAssembly.Module(source); - + res = """ const imports: any = {}; imports.env = {}; -imports.env.memoryBase = 0; -imports.env.memory = memory; -imports.env.tableBase = 0; -imports.env.table = new WebAssembly.Table({initial: 4, element: 'anyfunc'}); - -imports.env["abort"] = function () { - console.error("ABORT"); +var js_objs: Array> = []; +var js_invoke: Function; + +imports.wasi_snapshot_preview1 = { + "fd_write": (fd: number, iovec_array_ptr: number, iovec_array_len: number) => { + // This should generally only be used to print panic messages + console.log("FD_WRITE to " + fd + " in " + iovec_array_len + " chunks."); + const ptr_len_view = new Uint32Array(wasm.memory.buffer, iovec_array_ptr, iovec_array_len * 2); + 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(String.fromCharCode(...bytes_view)); + } + return 0; + }, + "random_get": (buf_ptr: number, buf_len: number) => { + const buf = new Uint8Array(wasm.memory.buffer, buf_ptr, buf_len); + crypto.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 + console.log("wasi_snapshot_preview1:environ_sizes_get"); + const out_count_view = new Uint32Array(wasm.memory.buffer, environ_var_count_ptr, 1); + out_count_view[0] = 1; + const out_len_view = new Uint32Array(wasm.memory.buffer, environ_len_ptr, 1); + out_len_view[0] = "RUST_BACKTRACE=1".length + 1; // Note that string must be NULL-terminated + return 0; + }, + "environ_get": (environ_ptr: number, environ_buf_ptr: number) => { + // This is called before fd_write to format + print panic messages + console.log("wasi_snapshot_preview1:environ_get"); + const out_ptrs = new Uint32Array(wasm.memory.buffer, environ_ptr, 2); + out_ptrs[0] = environ_buf_ptr; + out_ptrs[1] = "RUST_BACKTRACE=1".length; + const out_environ = new Uint8Array(wasm.memory.buffer, environ_buf_ptr, out_ptrs[1]); + for (var i = 0; i < out_ptrs[1]; i++) { out_environ[i] = "RUST_BACKTRACE=1".codePointAt(i); } + out_environ[out_ptrs[1]] = 0; + return 0; + }, + "proc_exit" : () => { + console.log("wasi_snapshot_preview1:proc_exit"); + }, }; -let wasm = null; +var wasm: any = null; let isWasmInitialized: boolean = false; +""" + + if target == Target.NODEJS: + res += """import * as fs from 'fs'; +import { webcrypto as crypto } from 'crypto'; +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; + return Math.ceil(value / 4) * 4; } -const encodeUint8Array = (inputArray) => { +export function encodeUint8Array (inputArray: Uint8Array): number { const cArrayPointer = wasm.TS_malloc(inputArray.length + 4); - const arrayLengthView = new Uint32Array(memory.buffer, cArrayPointer, 1); - arrayLengthView[0] = inputArray.length; - const arrayMemoryView = new Uint8Array(memory.buffer, cArrayPointer + 4, inputArray.length); + 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) => { +export function encodeUint32Array (inputArray: Uint32Array|Array): number { const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 4); - const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length); + const arrayMemoryView = new Uint32Array(wasm.memory.buffer, cArrayPointer, inputArray.length); arrayMemoryView.set(inputArray, 1); - arrayMemoryView[0] = inputArray.length; + arrayMemoryView[0] = inputArray.length; + return cArrayPointer; +} +export function encodeUint64Array (inputArray: BigUint64Array|Array): number { + const cArrayPointer = wasm.TS_malloc(inputArray.length * 8 + 1); + const arrayLengthView = new Uint32Array(wasm.memory.buffer, cArrayPointer, 1); + arrayLengthView[0] = inputArray.length; + const arrayMemoryView = new BigUint64Array(wasm.memory.buffer, cArrayPointer + 4, inputArray.length); + arrayMemoryView.set(inputArray); return cArrayPointer; } -const getArrayLength = (arrayPointer) => { - const arraySizeViewer = new Uint32Array( - memory.buffer, // value - arrayPointer, // offset - 1 // one int - ); +export function check_arr_len(arr: Uint8Array, len: number): Uint8Array { + if (arr.length != len) { throw new Error("Expected array of length " + len + "got " + arr.length); } + return arr; +} + +export function getArrayLength(arrayPointer: number): number { + const arraySizeViewer = new Uint32Array(wasm.memory.buffer, arrayPointer, 1); return arraySizeViewer[0]; } -const decodeUint8Array = (arrayPointer, free = true) => { +export function decodeUint8Array (arrayPointer: number, free = true): Uint8Array { const arraySize = getArrayLength(arrayPointer); - const actualArrayViewer = new Uint8Array( - memory.buffer, // value - arrayPointer + 4, // offset (ignoring length bytes) - arraySize // uint8 count - ); + const actualArrayViewer = new Uint8Array(wasm.memory.buffer, arrayPointer + 4, 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; } -const decodeUint32Array = (arrayPointer, free = true) => { +const decodeUint32Array = (arrayPointer: number, free = true) => { const arraySize = getArrayLength(arrayPointer); const actualArrayViewer = new Uint32Array( - memory.buffer, // value + wasm.memory.buffer, // value arrayPointer + 4, // offset (ignoring length bytes) arraySize // uint32 count ); @@ -416,44 +505,88 @@ const decodeUint32Array = (arrayPointer, free = true) => { return actualArray; } -const encodeString = (string) => { - // make malloc count divisible by 4 - const memoryNeed = nextMultipleOfFour(string.length + 1); - const stringPointer = wasm.TS_malloc(memoryNeed); - const stringMemoryView = new Uint8Array( - 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; +export function getU32ArrayElem(arrayPointer: number, idx: number): number { + const actualArrayViewer = new Uint32Array(wasm.memory.buffer, arrayPointer + 4, idx + 1); + return actualArrayViewer[idx]; } -const decodeString = (stringPointer, free = true) => { - const memoryView = new Uint8Array(memory.buffer, stringPointer); - let cursor = 0; - let result = ''; +export function encodeString(str: string): number { + const charArray = new TextEncoder().encode(str); + return encodeUint8Array(charArray); +} - while (memoryView[cursor] !== 0) { - result += String.fromCharCode(memoryView[cursor]); - cursor++; - } +export function decodeString(stringPointer: number, free = true): string { + const arraySize = getArrayLength(stringPointer); + const memoryView = new Uint8Array(wasm.memory.buffer, stringPointer + 4, arraySize); + const result = new TextDecoder("utf-8").decode(memoryView); - if (free) { - wasm.wasm_free(stringPointer); - } + if (free) { + wasm.TS_free(stringPointer); + } - return result; -}; + return result; +} """ - return '' 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 == "uint32_t" or elem_ty.c_ty == "uintptr_t" or elem_ty.c_ty.endswith("Array"): + 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 primitive_arr_from_hu(self, mapped_ty, fixed_len, arr_name): + inner = arr_name + if fixed_len is not None: + assert mapped_ty.c_ty == "int8_t" + inner = "bindings.check_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 == "uint32_t": + return ("bindings.encodeUint32Array(" + inner + ")", "") + elif mapped_ty.c_ty == "int64_t": + return ("bindings.encodeUint64Array(" + inner + ")", "") + else: + print(mapped_ty.c_ty) + assert False + + def primitive_arr_to_hu(self, mapped_ty, fixed_len, arr_name, conv_name): + assert mapped_ty.c_ty == "uint8_t" or mapped_ty.c_ty == "int8_t" + return "const " + conv_name + ": Uint8Array = bindings.decodeUint8Array(" + arr_name + ");" + + 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): + return (arr_name + ".forEach((" + n + ": " + arr_elem_ty.java_hu_ty + ") => { ", " })") + + def get_ptr(self, var): + return "CommonBase.get_ptr_of(" + var + ")" + def set_null_skip_free(self, var): + return "CommonBase.set_null_skip_free(" + var + ");" + + def add_ref(self, holder, referent): + return "CommonBase.add_ref_from(" + holder + ", " + referent + ")" + + def obj_defined(self, struct_names, folder): + with open(self.outdir + "/index.mts", 'a') as index: + index.write(f"export * from './{folder}/{struct_names[0]}.mjs';\n") + 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 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" @@ -461,9 +594,11 @@ const decodeString = (stringPointer, free = true) => { out_typescript_enum_fields = "" - for var in variants: + for var, var_docs in variants: 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" out_c = out_c + "\t}\n" out_c = out_c + "\tabort();\n" @@ -472,57 +607,63 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "static inline int32_t LDK" + struct_name + "_to_js(LDK" + struct_name + " val) {\n" out_c = out_c + "\tswitch (val) {\n" ord_v = 0 - for var in variants: + for var, _ in variants: out_c = out_c + "\t\tcase " + var + ": return %d;\n" % ord_v ord_v = ord_v + 1 out_c = out_c + "\t\tdefault: abort();\n" out_c = out_c + "\t}\n" out_c = out_c + "}\n" - out_typescript_enum = f""" + out_typescript = f""" export enum {struct_name} {{ {out_typescript_enum_fields} }} """ - - return (out_c, out_typescript_enum, "") + out_typescript_enum = f"export {{ {struct_name} }} from \"../bindings.mjs\";" + self.obj_defined([struct_name], "enums") + return (out_c, out_typescript_enum, out_typescript) def c_unitary_enum_to_native_call(self, ty_info): return (ty_info.rust_obj + "_to_js(", ")") 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" - constructor_arguments = "" super_instantiator = "" + bindings_instantiator = "" pointer_to_adder = "" impl_constructor_arguments = "" for var in flattened_field_var_conversions: if isinstance(var, ConvInfo): - constructor_arguments += f", {first_to_lower(var.arg_name)}?: {var.java_hu_ty}" 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: - super_instantiator += ", " + var.from_hu_conv[0] + bindings_instantiator += ", " + var.from_hu_conv[0] if var.from_hu_conv[1] != "": - pointer_to_adder += var.from_hu_conv[1] + ";\n" + pointer_to_adder += "\t\t\t" + var.from_hu_conv[1] + ";\n" else: - super_instantiator += ", " + first_to_lower(var.arg_name) + bindings_instantiator += ", " + first_to_lower(var.arg_name) else: - constructor_arguments += f", {first_to_lower(var[1])}?: bindings.{var[0]}" - super_instantiator += ", " + first_to_lower(var[1]) - pointer_to_adder += "this.ptrs_to.push(" + first_to_lower(var[1]) + ");\n" - impl_constructor_arguments += f", {first_to_lower(var[1])}_impl: {var[0].replace('LDK', '')}.{var[0].replace('LDK', '')}Interface" + bindings_instantiator += ", " + first_to_lower(var[1]) + ".bindings_instance" + super_instantiator += first_to_lower(var[1]) + "_impl, " + 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" + + super_constructor_statements = "" + trait_constructor_arguments = "" + for var in field_var_conversions: + 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" + for suparg in var[2]: + if isinstance(suparg, ConvInfo): + trait_constructor_arguments += ", " + suparg.arg_name + else: + trait_constructor_arguments += ", " + suparg[1] # BUILD INTERFACE METHODS out_java_interface = "" @@ -531,8 +672,8 @@ const decodeString = (stringPointer, free = true) => { 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 += fn_line.fn_name + "(" - out_interface_implementation_overrides += f"{fn_line.fn_name} (" + out_java_interface += "\t" + fn_line.fn_name + "(" + out_interface_implementation_overrides += f"\t\t\t{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: @@ -541,22 +682,20 @@ const decodeString = (stringPointer, free = true) => { out_java_interface += f"{arg_conv_info.arg_name}: {arg_conv_info.java_hu_ty}" out_interface_implementation_overrides += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}" java_method_descriptor += arg_conv_info.java_fn_ty_arg - out_java_interface += f"): {fn_line.ret_ty_info.java_hu_ty};\n\t\t\t\t" + out_java_interface += f"): {fn_line.ret_ty_info.java_hu_ty};\n" java_method_descriptor += ")" + fn_line.ret_ty_info.java_fn_ty_arg java_methods.append((fn_line.fn_name, java_method_descriptor)) out_interface_implementation_overrides += f"): {fn_line.ret_ty_info.java_ty} {{\n" - interface_method_override_inset = "\t\t\t\t\t\t" - interface_implementation_inset = "\t\t\t\t\t\t\t" for arg_info in fn_line.args_ty: if arg_info.to_hu_conv is not None: - out_interface_implementation_overrides += interface_implementation_inset + arg_info.to_hu_conv.replace("\n", "\n\t\t\t\t") + "\n" + out_interface_implementation_overrides += "\t\t\t\t" + arg_info.to_hu_conv.replace("\n", "\n\t\t\t\t") + "\n" if fn_line.ret_ty_info.java_ty != "void": - out_interface_implementation_overrides += interface_implementation_inset + fn_line.ret_ty_info.java_hu_ty + " ret = arg." + fn_line.fn_name + "(" + out_interface_implementation_overrides += "\t\t\t\tconst ret: " + fn_line.ret_ty_info.java_hu_ty + " = arg." + fn_line.fn_name + "(" else: - out_interface_implementation_overrides += f"{interface_implementation_inset}arg." + fn_line.fn_name + "(" + out_interface_implementation_overrides += f"\t\t\t\targ." + fn_line.fn_name + "(" for idx, arg_info in enumerate(fn_line.args_ty): if idx != 0: @@ -569,86 +708,56 @@ const decodeString = (stringPointer, free = true) => { out_interface_implementation_overrides += ");\n" if fn_line.ret_ty_info.java_ty != "void": if fn_line.ret_ty_info.from_hu_conv is not None: - out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\t" + f"result: {fn_line.ret_ty_info.java_ty} = " + fn_line.ret_ty_info.from_hu_conv[0] + ";\n" + out_interface_implementation_overrides += "\t\t\t\t" + f"const result: {fn_line.ret_ty_info.java_ty} = " + fn_line.ret_ty_info.from_hu_conv[0].replace("\n", "\n\t\t\t\t") + ";\n" if fn_line.ret_ty_info.from_hu_conv[1] != "": - out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held") + ";\n" + out_interface_implementation_overrides += "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held").replace("\n", "\n\t\t\t\t") + ";\n" #if fn_line.ret_ty_info.rust_obj in result_types: # XXX: We need to handle this in conversion logic so that its cross-language! # Avoid double-free by breaking the result - we should learn to clone these and then we can be safe instead # out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\tret.ptr = 0;\n" - out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\treturn result;\n" - else: - out_interface_implementation_overrides = out_interface_implementation_overrides + "\t\t\t\treturn ret;\n" - out_interface_implementation_overrides += f"{interface_method_override_inset}}},\n\n{interface_method_override_inset}" - - trait_constructor_arguments = "" - for var in field_var_conversions: - if isinstance(var, ConvInfo): - trait_constructor_arguments += ", " + var.arg_name - else: - trait_constructor_arguments += ", " + var[1] + ".new_impl(" + var[1] + "_impl" - for suparg in var[2]: - if isinstance(suparg, ConvInfo): - trait_constructor_arguments += ", " + suparg.arg_name - else: - trait_constructor_arguments += ", " + suparg[1] - trait_constructor_arguments += ").bindings_instance" - for suparg in var[2]: - if isinstance(suparg, ConvInfo): - trait_constructor_arguments += ", " + suparg.arg_name + out_interface_implementation_overrides += "\t\t\t\treturn result;\n" else: - trait_constructor_arguments += ", " + suparg[1] + out_interface_implementation_overrides += "\t\t\t\treturn ret;\n" + out_interface_implementation_overrides += f"\t\t\t}},\n" out_typescript_human = f""" - {self.hu_struct_file_prefix} - - export class {struct_name.replace("LDK","")} extends CommonBase {{ - - bindings_instance?: bindings.{struct_name}; - - constructor(ptr?: number, arg?: bindings.{struct_name}{constructor_arguments}) {{ - if (Number.isFinite(ptr)) {{ - super(ptr); - this.bindings_instance = null; - }} else {{ - // TODO: private constructor instantiation - super(bindings.{struct_name}_new(arg{super_instantiator})); - this.ptrs_to.push(arg); - {pointer_to_adder} - }} - }} - - protected finalize() {{ - if (this.ptr != 0) {{ - bindings.{struct_name.replace("LDK","")}_free(this.ptr); - }} - super.finalize(); - }} - - 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 = {{ - // todo: in-line interface filling - {out_interface_implementation_overrides} - }}; - impl_holder.held = new {struct_name.replace("LDK", "")} (null, structImplementation{trait_constructor_arguments}); - }} - }} +{self.hu_struct_file_prefix} - export interface {struct_name.replace("LDK", "")}Interface {{ - {out_java_interface} - }} +export interface {struct_name.replace("LDK", "")}Interface {{ +{out_java_interface}}} - class {struct_name}Holder {{ - held: {struct_name.replace("LDK", "")}; - }} +class {struct_name}Holder {{ + held: {struct_name.replace("LDK", "")}; +}} + +export class {struct_name.replace("LDK","")} extends CommonBase {{ + /* @internal */ + public bindings_instance?: bindings.{struct_name}; + + /* @internal */ + constructor(_dummy: object, ptr: number) {{ + 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", "")} {{ + 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}); + + impl_holder.held = new {struct_name.replace("LDK", "")}(null, ptr); + impl_holder.held.bindings_instance = structImplementation; +{pointer_to_adder} return impl_holder.held; + }} """ + self.obj_defined([struct_name.replace("LDK", ""), struct_name.replace("LDK", "") + "Interface"], "structs") - out_typescript_bindings += "\t\texport interface " + struct_name + " {\n" + out_typescript_bindings += "export 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 += f"\t\t\t{fn_line.fn_name} (" + out_typescript_bindings += f"\t{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: @@ -657,9 +766,9 @@ const decodeString = (stringPointer, free = true) => { out_typescript_bindings += f"): {fn_line.ret_ty_info.java_ty};\n" - out_typescript_bindings = out_typescript_bindings + "\t\t}\n\n" + out_typescript_bindings += "}\n\n" - out_typescript_bindings += f"\t\texport function {struct_name}_new(impl: {struct_name}" + out_typescript_bindings += f"export 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}" @@ -667,15 +776,24 @@ const decodeString = (stringPointer, free = true) => { out_typescript_bindings += f", {var[1]}: {var[0]}" out_typescript_bindings += f"""): number {{ - throw new Error('unimplemented'); // TODO: bind to WASM - }} + if(!isWasmInitialized) {{ + throw new Error("initializeWasm() must be awaited first!"); + }} + var new_obj_idx = js_objs.length; + for (var i = 0; i < js_objs.length; i++) {{ + 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); +}} """ 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 = out_c + "\tatomic_size_t refcnt;\n" + out_c += "\tatomic_size_t refcnt;\n" + out_c += "\tuint32_t instance_ptr;\n" for var in flattened_field_var_conversions: if isinstance(var, ConvInfo): # We're a regular ol' field @@ -683,9 +801,6 @@ const decodeString = (stringPointer, free = true) => { else: # We're a supertrait out_c = out_c + "\t" + var[0] + "_JCalls* " + var[1] + ";\n" - for fn in field_function_lines: - if fn.fn_name != "free" and fn.fn_name != "cloned": - out_c = out_c + "\tuint32_t " + fn.fn_name + "_meth;\n" out_c = out_c + "} " + struct_name + "_JCalls;\n" for fn_line in field_function_lines: @@ -693,9 +808,6 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "static void " + struct_name + "_JCalls_free(void* this_arg) {\n" out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n" out_c = out_c + "\tif (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {\n" - for fn in field_function_lines: - if fn.fn_name != "free" and fn.fn_name != "cloned": - out_c = out_c + "\t\tjs_free(j_calls->" + fn.fn_name + "_meth);\n" out_c = out_c + "\t\tFREE(j_calls);\n" out_c = out_c + "\t}\n}\n" @@ -721,21 +833,25 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n" if fn_line.ret_ty_info.c_ty.endswith("Array"): - out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" + 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) elif fn_line.ret_ty_info.java_ty == "void": - out_c = out_c + "\tjs_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" - elif fn_line.ret_ty_info.java_ty == "String": - out_c = out_c + "\tuint32_t ret = js_invoke_function_" + str(len(fn_line.args_ty)) + "(j_calls->" + fn_line.fn_name + "_meth" + 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_hu_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->" + fn_line.fn_name + "_meth" + out_c = out_c + "\treturn js_invoke_function_" + str(len(fn_line.args_ty)) + "(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->" + fn_line.fn_name + "_meth" + 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) + + 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 + ", " + arg_info.ret_conv_name + out_c = out_c + ", (uint32_t)" + arg_info.ret_conv_name else: - out_c = out_c + ", " + arg_info.arg_name + out_c = out_c + ", (uint32_t)" + arg_info.arg_name 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" @@ -751,17 +867,17 @@ const decodeString = (stringPointer, free = true) => { out_c = out_c + "\tatomic_fetch_add_explicit(&j_calls->" + var[1] + "->refcnt, 1, memory_order_release);\n" out_c = out_c + "}\n" - out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (/*TODO: JS Object Reference */void* o" + out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (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 + ", /*TODO: JS Object Reference */void* " + var[1] + out_c = out_c + ", JSValue " + var[1] out_c = out_c + ") {\n" out_c = out_c + "\t" + struct_name + "_JCalls *calls = MALLOC(sizeof(" + struct_name + "_JCalls), \"" + struct_name + "_JCalls\");\n" out_c = out_c + "\tatomic_init(&calls->refcnt, 1);\n" - out_c = out_c + "\t//TODO: Assign calls->o from o\n" + out_c = out_c + "\tcalls->instance_ptr = o;\n" for (fn_name, java_meth_descr) in java_meths: if fn_name != "free" and fn_name != "cloned": @@ -803,12 +919,12 @@ const decodeString = (stringPointer, free = true) => { 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) + "/*TODO: JS Object Reference */void* o" + out_c = out_c + self.c_fn_ty_pfx + "long " + 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 + ", /*TODO: JS Object Reference */ void* " + var[1] + out_c = out_c + ", JSValue " + var[1] out_c = out_c + ") {\n" out_c = out_c + "\t" + struct_name + " *res_ptr = MALLOC(sizeof(" + struct_name + "), \"" + struct_name + "\");\n" out_c = out_c + "\t*res_ptr = " + struct_name + "_init(o" @@ -827,67 +943,61 @@ const decodeString = (stringPointer, free = true) => { return "" def map_complex_enum(self, struct_name, variant_list, camel_to_snake, enum_doc_comment): - java_hu_type = struct_name.replace("LDK", "") + bindings_type = struct_name.replace("LDK", "") + java_hu_type = struct_name.replace("LDK", "").replace("COption", "Option") out_java_enum = "" out_java = "" out_c = "" out_java_enum += (self.hu_struct_file_prefix) - out_java_enum += ("export default class " + java_hu_type + " extends CommonBase {\n") - out_java_enum += ("\tprotected constructor(_dummy: object, ptr: number) { super(ptr); }\n") - out_java_enum += ("\tprotected finalize() {\n") - out_java_enum += ("\t\tsuper.finalize();\n") - out_java_enum += ("\t\tif (this.ptr != 0) { bindings." + java_hu_type + "_free(this.ptr); }\n") - out_java_enum += ("\t}\n") - out_java_enum += f"\tstatic constr_from_ptr(ptr: number): {java_hu_type} {{\n" - out_java_enum += (f"\t\tconst raw_val: bindings.{struct_name} = bindings." + struct_name + "_ref_from_ptr(ptr);\n") + + java_hu_class = "" + 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 += "\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_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 + "*)(ptr & ~1);\n" + out_c += "\tswitch(obj->tag) {\n" + java_hu_class += "\t\tswitch (raw_ty) {\n" java_hu_subclasses = "" - out_java += ("\tpublic static class " + struct_name + " {\n") - out_java += ("\t\tprivate " + struct_name + "() {}\n") + out_java += "export class " + struct_name + " {\n" + out_java += "\tprotected constructor() {}\n" + var_idx = 0 for var in variant_list: - out_java += ("\t\texport class " + var.var_name + " extends " + struct_name + " {\n") - java_hu_subclasses = java_hu_subclasses + "export class " + var.var_name + " extends " + java_hu_type + " {\n" - out_java_enum += ("\t\tif (raw_val instanceof bindings." + struct_name + "." + var.var_name + ") {\n") - out_java_enum += ("\t\t\treturn new " + var.var_name + "(this.ptr, raw_val);\n") - init_meth_params = "" - init_meth_body = "" + java_hu_subclasses = 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): - out_java += ("\t\t\tpublic " + field_ty.java_ty + " " + field_ty.arg_name + ";\n") java_hu_subclasses = 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 + ", " - init_meth_params = init_meth_params + field_ty.java_ty + " " + field_ty.arg_name - init_meth_body = init_meth_body + "this." + field_ty.arg_name + " = " + field_ty.arg_name + "; " - out_java += ("\t\t\t" + var.var_name + "(" + init_meth_params + ") { ") - out_java += (init_meth_body) - out_java += ("}\n") - out_java += ("\t\t}\n") - out_java_enum += ("\t\t}\n") - java_hu_subclasses = java_hu_subclasses + "\tprivate constructor(ptr: number, obj: bindings." + struct_name + "." + var.var_name + ") {\n\t\tsuper(null, ptr);\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) {\n\t\tsuper(null, ptr);\n" java_hu_subclasses = java_hu_subclasses + hu_conv_body java_hu_subclasses = java_hu_subclasses + "\t}\n}\n" - out_java += ("\t\tstatic native void init();\n") - out_java += ("\t}\n") - out_java_enum += ("\t\tthrow new Error('oops, this should be unreachable'); // Unreachable without extending the (internal) bindings interface\n\t}\n\n") - out_java += ("\tstatic { " + struct_name + ".init(); }\n") - out_java += ("\tpublic static native " + struct_name + " " + struct_name + "_ref_from_ptr(long ptr);\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") + var_idx += 1 + out_java += "}\n" + 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: number", "ptr") + out_c += ("\t\tdefault: abort();\n") + out_c += ("\t}\n}\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 + "*)(ptr & ~1);\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")) if var.tuple_variant: @@ -895,59 +1005,119 @@ const decodeString = (stringPointer, free = true) => { 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_java_enum += ("}\n") - out_java_enum += (java_hu_subclasses) + 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: number", "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"): - implementations += "implements AutoCloseable " - method_header = """ - public close() { + out_opaque_struct_human += "/** XXX: DO NOT USE THIS - it remains locked until the GC runs (if that ever happens */" + out_opaque_struct_human += f""" +export class {hu_name} extends CommonBase {implementations}{{ + /* @internal */ + public constructor(_dummy: object, ptr: number) {{ + super(ptr, bindings.{struct_name.replace("LDK","")}_free); + }} + """ + self.obj_defined([hu_name], "structs") + return out_opaque_struct_human + + def map_tuple(self, struct_name): + return self.map_opaque_struct(struct_name, "A Tuple") + + def map_result(self, struct_name, res_map, err_map): + human_ty = struct_name.replace("LDKCResult", "Result") + + suffixes = f"export class {human_ty}_OK extends {human_ty} {{\n" + if res_map.java_hu_ty != "void": + suffixes += "\tpublic res: " + res_map.java_hu_ty + ";\n" + suffixes += f""" + /* @internal */ + public constructor(_dummy: object, ptr: number) {{ + super(_dummy, ptr); +""" + if res_map.java_hu_ty == "void": + pass + elif res_map.to_hu_conv is not None: + suffixes += "\t\tconst res: " + res_map.java_ty + " = bindings." + struct_name.replace("LDK", "") + "_get_ok(ptr);\n" + suffixes += "\t\t" + res_map.to_hu_conv.replace("\n", "\n\t\t") + suffixes += "\n\t\tthis.res = " + res_map.to_hu_conv_name + ";\n" else: - method_header = """ - protected finalize() { - super.finalize(); + suffixes += "\t\tthis.res = bindings." + struct_name.replace("LDK", "") + "_get_ok(ptr);\n" + suffixes += "\t}\n}\n" + + suffixes += f"export class {human_ty}_Err extends {human_ty} {{\n" + if err_map.java_hu_ty != "void": + suffixes += "\tpublic err: " + err_map.java_hu_ty + ";\n" + suffixes += f""" + /* @internal */ + public constructor(_dummy: object, ptr: number) {{ + super(_dummy, ptr); """ + if err_map.java_hu_ty == "void": + pass + elif err_map.to_hu_conv is not None: + suffixes += "\t\tconst err: " + err_map.java_ty + " = bindings." + struct_name.replace("LDK", "") + "_get_err(ptr);\n" + suffixes += "\t\t" + err_map.to_hu_conv.replace("\n", "\n\t\t") + suffixes += "\n\t\tthis.err = " + err_map.to_hu_conv_name + ";\n" + else: + suffixes += "\t\tthis.err = bindings." + struct_name.replace("LDK", "") + "_get_err(ptr);\n" + suffixes += "\t}\n}" - out_opaque_struct_human = f""" - {self.hu_struct_file_prefix} + self.struct_file_suffixes[human_ty] = suffixes + self.obj_defined([human_ty], "structs") - export default class {struct_name.replace("LDK","")} extends CommonBase {implementations}{{ - constructor(_dummy: object, ptr: number) {{ - super(ptr); - }} + return f"""{self.hu_struct_file_prefix} - {method_header} - if (this.ptr != 0) {{ - bindings.{struct_name.replace("LDK","")}_free(this.ptr); - }} - }} +export class {human_ty} extends CommonBase {{ + protected constructor(_dummy: object, ptr: number) {{ + super(ptr, bindings.{struct_name.replace("LDK","")}_free); + }} + /* @internal */ + public static constr_from_ptr(ptr: number): {human_ty} {{ + if (bindings.{struct_name.replace("LDK", "")}_is_ok(ptr)) {{ + return new {human_ty}_OK(null, ptr); + }} else {{ + return new {human_ty}_Err(null, ptr); + }} + }} """ - return out_opaque_struct_human - def map_tuple(self, struct_name): - return self.map_opaque_struct(struct_name, "A Tuple") + 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' + return_statement = 'return nativeResponseValue;' + if not has_return_value: + return_statement = '// debug statements here' + return f"""export function {method_name}({method_argument_string}): {return_java_ty} {{ + if(!isWasmInitialized) {{ + throw new Error("initializeWasm() must be awaited first!"); + }} + const nativeResponseValue = wasm.TS_{method_name}({native_call_argument_string}); + {return_statement} +}} +""" def map_function(self, argument_types, c_call_string, method_name, meth_n, return_type_info, struct_meth, default_constructor_args, takes_self, takes_self_as_ref, args_known, type_mapping_generator, doc_comment): out_java = "" out_c = "" out_java_struct = None - out_java += ("\tpublic static native ") + out_java += ("\t") out_c += (self.c_fn_ty_pfx) out_c += (return_type_info.c_ty) out_java += (return_type_info.java_ty) @@ -965,31 +1135,9 @@ const decodeString = (stringPointer, free = true) => { 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 - - has_return_value = return_type_info.c_ty != 'void' - needs_decoding = return_type_info.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_type_info.c_ty] - return_statement = f"return {converter}(nativeResponseValue);" - - out_java = f"""\texport function {method_name}({method_argument_string}): {return_type_info.java_ty} {{ - if(!isWasmInitialized) {{ - throw new Error("initializeWasm() must be awaited first!"); - }} - const nativeResponseValue = wasm.{method_name}({native_call_argument_string}); - {return_statement} - }} -""" + 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 not args_known: @@ -997,9 +1145,9 @@ const decodeString = (stringPointer, free = true) => { else: if not takes_self: out_java_struct += ( - "\tpublic static " + return_type_info.java_hu_ty + " constructor_" + meth_n + "(") + "\tpublic static constructor_" + meth_n + "(") else: - out_java_struct += ("\tpublic " + return_type_info.java_hu_ty + " " + meth_n + "(") + out_java_struct += ("\tpublic " + meth_n + "(") for idx, arg in enumerate(argument_types): if idx != 0: if not takes_self or idx > 1: @@ -1011,14 +1159,13 @@ const decodeString = (stringPointer, free = true) => { for explode_idx, explode_arg in enumerate(default_constructor_args[arg.arg_name]): if explode_idx != 0: out_java_struct += (", ") - out_java_struct += ( - explode_arg.java_hu_ty + " " + arg.arg_name + "_" + explode_arg.arg_name) + out_java_struct += arg.arg_name + "_" + explode_arg.arg_name + ": " + explode_arg.java_hu_ty else: - out_java_struct += (arg.java_hu_ty + " " + arg.arg_name) + out_java_struct += arg.arg_name + ": " + arg.java_hu_ty out_c += (") {\n") if out_java_struct is not None: - out_java_struct += (") {\n") + out_java_struct += "): " + return_type_info.java_hu_ty + " {\n" for info in argument_types: if info.arg_conv is not None: out_c += ("\t" + info.arg_conv.replace('\n', "\n\t") + "\n") @@ -1056,7 +1203,7 @@ const decodeString = (stringPointer, free = true) => { if args_known: out_java_struct += ("\t\t") if return_type_info.java_ty != "void": - out_java_struct += (return_type_info.java_ty + " ret = ") + out_java_struct += "const ret: " + return_type_info.java_ty + " = " out_java_struct += ("bindings." + method_name + "(") for idx, info in enumerate(argument_types): if idx != 0: @@ -1111,3 +1258,39 @@ const decodeString = (stringPointer, free = true) => { out_java_struct += ("\t}\n\n") return (out_java, out_c, out_java_struct) + + def cleanup(self): + for struct in self.struct_file_suffixes: + with open(self.outdir + "/structs/" + struct + self.file_ext, "a") as src: + src.write(self.struct_file_suffixes[struct]) + + 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 = 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(); + 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!"); + } + var fn; +""") + bindings.write("\tswitch (fn_id) {\n") + for f in self.function_ptrs: + 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!"); + } + if (fn == null || fn == undefined) { + console.error("Got function call on incorrect JS object!"); + throw new Error("Got function call on incorrect JS object!"); + } + return fn.value.bind(obj)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); +}""")