)
self.wasm_decoding_map = dict(
- int8_tArray = 'decodeArray'
+ int8_tArray = 'decodeUint8Array'
)
self.wasm_encoding_map = dict(
- int8_tArray = 'encodeArray',
+ int8_tArray = 'encodeUint8Array',
)
self.to_hu_conv_templates = dict(
self.bindings_version_file = ""
- self.bindings_footer = """
- export async function initializeWasm(allowDoubleInitialization: boolean = false): Promise<void> {
- if(isWasmInitialized && !allowDoubleInitialization) {
- return;
- }
- const wasmInstance = await WebAssembly.instantiate(wasmModule, imports)
- wasm = wasmInstance.exports;
- isWasmInitialized = true;
- }
- """
+ self.bindings_footer = ""
self.util_fn_pfx = ""
self.util_fn_sfx = ""
self.hu_struct_file_prefix = f"""
import CommonBase from './CommonBase';
-import * as bindings from '../bindings' // TODO: figure out location
+import * as bindings from '../bindings.mjs'
"""
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"
return " __attribute__((visibility(\"default\"))) 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');
-
+ res = """
+function freer(f: () => void) { f() }
+const finalizer = new FinalizationRegistry(freer);
const memory = new WebAssembly.Memory({initial: 256});
-const wasmModule = new WebAssembly.Module(source);
const imports: any = {};
imports.env = {};
imports.env.table = new WebAssembly.Table({initial: 4, element: 'anyfunc'});
imports.env["abort"] = function () {
- console.error("ABORT");
+ console.error("ABORT");
+};
+imports.env["js_invoke_function"] = function(fn: number, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: number, arg7: number, arg8: number, arg9: number, arg10: number) {
+ console.log('function called from wasm:', fn, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
+};
+imports.env["js_free_function_ptr"] = function(fn: number) {
+ console.log("function ptr free'd from wasm:", fn);
+};
+
+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");
+ },
};
-let wasm = null;
+var wasm = null;
let isWasmInitialized: boolean = false;
+"""
+
+ if target == Target.NODEJS:
+ res += """import * as fs from 'fs';
+export async function initializeWasm(path) {
+ const source = fs.readFileSync(path);
+ const { instance: wasmInstance } = await WebAssembly.instantiate(source, imports);
+ wasm = wasmInstance.exports;
+ isWasmInitialized = true;
+};
+"""
+ else:
+ res += """
+export async function initializeWasm(uri) {
+ const stream = fetch(uri);
+ const { instance: wasmInstance } = await WebAssembly.instantiateStreaming(stream, imports);
+ wasm = wasmInstance.exports;
+ 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) => {
const cArrayPointer = wasm.TS_malloc(inputArray.length + 4);
const arrayLengthView = new Uint32Array(memory.buffer, cArrayPointer, 1);
- arrayLengthView[0] = inputArray.length;
+ arrayLengthView[0] = inputArray.length;
const arrayMemoryView = new Uint8Array(memory.buffer, cArrayPointer + 4, inputArray.length);
arrayMemoryView.set(inputArray);
return cArrayPointer;
const cArrayPointer = wasm.TS_malloc((inputArray.length + 1) * 4);
const arrayMemoryView = new Uint32Array(memory.buffer, cArrayPointer, inputArray.length);
arrayMemoryView.set(inputArray, 1);
- arrayMemoryView[0] = inputArray.length;
+ arrayMemoryView[0] = inputArray.length;
return cArrayPointer;
}
}
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;
+ // 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;
}
const decodeString = (stringPointer, free = true) => {
- const memoryView = new Uint8Array(memory.buffer, stringPointer);
- let cursor = 0;
- let result = '';
+ const memoryView = new Uint8Array(memory.buffer, stringPointer);
+ let cursor = 0;
+ let result = '';
- while (memoryView[cursor] !== 0) {
- result += String.fromCharCode(memoryView[cursor]);
- cursor++;
- }
+ while (memoryView[cursor] !== 0) {
+ result += String.fromCharCode(memoryView[cursor]);
+ cursor++;
+ }
- if (free) {
- wasm.wasm_free(stringPointer);
- }
+ if (free) {
+ wasm.wasm_free(stringPointer);
+ }
- return result;
+ return result;
};
"""
- return ''
def init_str(self):
return ""
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\";"
+ 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(", ")")
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\tjs_free_function_ptr(j_calls->" + fn.fn_name + "_meth);\n"
out_c = out_c + "\t\tFREE(j_calls);\n"
out_c = out_c + "\t}\n}\n"
out_java_enum += (f"\t\tconst raw_val: bindings.{struct_name} = bindings." + struct_name + "_ref_from_ptr(ptr);\n")
java_hu_subclasses = ""
- out_java += ("\tpublic static class " + struct_name + " {\n")
- out_java += ("\t\tprivate " + struct_name + "() {}\n")
+ out_java += "\texport class " + struct_name + " {\n"
+ out_java += "\t\tprotected constructor() {}\n"
+ java_subclasses = ""
for var in variant_list:
- out_java += ("\t\texport class " + var.var_name + " extends " + struct_name + " {\n")
+ java_subclasses += "\texport class " + struct_name + "_" + 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 = ""
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"
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")
+ init_meth_params += ", "
+ init_meth_params += "public " + field_ty.arg_name + ": " + field_ty.java_ty
+ java_subclasses += "\t\tconstructor(" + init_meth_params + ") { super(); }\n"
+ java_subclasses += "\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"
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 += java_subclasses
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_java += self.fn_call_body(struct_name + "_ref_from_ptr", "uint32_t", "number", "ptr: number", "ptr")
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")
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'
+ 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"""\texport 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)
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}
- }}
-"""
+ 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: