X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=typescript_strings.py;h=e3dd3c602375f2ba6a50a18edc2b24cbc91d918a;hb=36a5d30e562005ee6ddd8d69b7c3b10749f4448b;hp=35331d89355a6f245d31fea201e59aff04a1ce26;hpb=e02f2f6fac64d403ecb4b69236d3f5e1feb7e3df;p=ldk-java diff --git a/typescript_strings.py b/typescript_strings.py index 35331d89..e3dd3c60 100644 --- a/typescript_strings.py +++ b/typescript_strings.py @@ -1,18 +1,68 @@ from bindingstypes import ConvInfo - +from enum import Enum def first_to_lower(string: str) -> str: first = string[0] return first.lower() + string[1:] +class Target(Enum): + NODEJS = 1, + BROWSER = 2 + class Consts: - def __init__(self, DEBUG): + def __init__(self, DEBUG: bool, target: Target, **kwargs): self.c_type_map = dict( - byte = ['number', 'Uint8Array'], + uint8_t = ['number', 'Uint8Array'], + uint16_t = ['number', 'Uint16Array'], + uint32_t = ['number', 'Uint32Array'], + uint64_t = ['number'], + ) + + self.to_hu_conv_templates = dict( + ptr = 'const {var_name}_hu_conv: {human_type} = new {human_type}(null, {var_name});', + 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.common_base = """ export default class CommonBase { ptr: number; @@ -23,7 +73,7 @@ class Consts: // TODO: finalize myself } } - """ +""" self.c_file_pfx = """#include #include @@ -164,7 +214,7 @@ import * as bindings from '../bindings' // TODO: figure out location self.c_fn_args_pfx = "void* ctx_TODO" self.file_ext = ".ts" self.ptr_c_ty = "uint32_t" - self.ptr_native_ty = "uint32_t" + self.ptr_native_ty = "number" # "uint32_t" self.result_c_ty = "uint32_t" self.ptr_arr = "uint32_tArray" self.get_native_arr_len_call = ("", ".len") @@ -203,6 +253,24 @@ import * as bindings from '../bindings' // TODO: figure out location else: return None + + def wasm_import_header(self, target): + if target == Target.NODEJS: + return """ +const path = require('path').join(__dirname, 'bindings.wasm'); +const bytes = require('fs').readFileSync(path); +let imports = {}; +// add all exports to dictionary and move down? +// use `module.exports`? +// imports['./bindings.js'] = require('./bindings.js'); + +const wasmModule = new WebAssembly.Module(bytes); +const wasmInstance = new WebAssembly.Instance(wasmModule, imports); +// module.exports = wasmInstance.exports; +const wasm = wasmInstance.exports; +""" + return '' + def init_str(self, c_array_class_caches): return "" @@ -235,7 +303,7 @@ import * as bindings from '../bindings' // TODO: figure out location export enum {struct_name} {{ {out_typescript_enum_fields} }} - """ +""" return (out_c, out_typescript_enum, "") @@ -254,20 +322,16 @@ import * as bindings from '../bindings' // TODO: figure out location return ret def native_c_map_trait(self, struct_name, field_var_conversions, field_function_lines): - out_java = "out_java:native_c_map_trait" - out_java_trait = "out_java_trait:native_c_map_trait" - out_c = "out_c:native_c_map_trait" - - - out_java_trait = "" - out_java = "" + out_typescript_bindings = "\n\n\n// OUT_TYPESCRIPT_BINDINGS :: MAP_TRAIT :: START\n\n" constructor_arguments = "" super_instantiator = "" pointer_to_adder = "" + impl_constructor_arguments = "" for var in 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}" if var.from_hu_conv is not None: super_instantiator += ", " + var.from_hu_conv[0] if var.from_hu_conv[1] != "": @@ -278,26 +342,79 @@ import * as bindings from '../bindings' // TODO: figure out location 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" # BUILD INTERFACE METHODS out_java_interface = "" + out_interface_implementation_overrides = "" + java_methods = [] for fn_line in field_function_lines: + java_method_descriptor = "" if fn_line.fn_name != "free" and fn_line.fn_name != "clone": out_java_interface += fn_line.fn_name + "(" + out_interface_implementation_overrides += f"{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: out_java_interface += ", " + out_interface_implementation_overrides += ", " 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" + 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_java_trait = f""" + 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 + "(" + else: + out_interface_implementation_overrides += f"{interface_implementation_inset}arg." + fn_line.fn_name + "(" + + for idx, arg_info in enumerate(fn_line.args_ty): + if idx != 0: + out_interface_implementation_overrides += ", " + if arg_info.to_hu_conv_name is not None: + out_interface_implementation_overrides += arg_info.to_hu_conv_name + else: + out_interface_implementation_overrides += arg_info.arg_name + + 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" + 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" + #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).bindings_instance" + + 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); @@ -309,112 +426,65 @@ import * as bindings from '../bindings' // TODO: figure out location {pointer_to_adder} }} }} - + protected finalize() {{ - if (this.ptr != 0) {{ - bindings.{struct_name.replace("LDK","")}_free(this.ptr); - }} + 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}); + }} }} - + export interface {struct_name.replace("LDK", "")}Interface {{ {out_java_interface} }} - """ - + class {struct_name}Holder {{ + held: {struct_name.replace("LDK", "")}; + }} +""" - java_trait_constr = "\tprivate static class " + struct_name + "Holder { " + struct_name.replace("LDK", "") + " held; }\n" - java_trait_constr = java_trait_constr + "\tpublic static " + struct_name.replace("LDK", "") + " new_impl(" + struct_name.replace("LDK", "") + "Interface arg" - for var in field_var_conversions: - if isinstance(var, ConvInfo): - java_trait_constr = java_trait_constr + ", " + var.java_hu_ty + " " + var.arg_name - else: - # Ideally we'd be able to take any instance of the interface, but our C code can only represent - # Java-implemented version, so we require users pass a Java implementation here :/ - java_trait_constr = java_trait_constr + ", " + var[0].replace("LDK", "") + "." + var[0].replace("LDK", "") + "Interface " + var[1] + "_impl" - java_trait_constr = java_trait_constr + ") {\n\t\tfinal " + struct_name + "Holder impl_holder = new " + struct_name + "Holder();\n" - java_trait_constr = java_trait_constr + "\t\timpl_holder.held = new " + struct_name.replace("LDK", "") + "(new bindings." + struct_name + "() {\n" - out_java_trait = out_java_trait + "\tpublic static interface " + struct_name.replace("LDK", "") + "Interface {\n" - out_java = out_java + "\tpublic interface " + struct_name + " {\n" + out_typescript_bindings += "\t\texport interface " + struct_name + " {\n" java_meths = [] for fn_line in field_function_lines: - java_meth_descr = "(" if fn_line.fn_name != "free" and fn_line.fn_name != "clone": - out_java = out_java + "\t\t " + fn_line.ret_ty_info.java_ty + " " + fn_line.fn_name + "(" - java_trait_constr = java_trait_constr + "\t\t\t@Override public " + fn_line.ret_ty_info.java_ty + " " + fn_line.fn_name + "(" - out_java_trait = out_java_trait + "\t\t" + fn_line.ret_ty_info.java_hu_ty + " " + fn_line.fn_name + "(" + out_typescript_bindings += f"\t\t\t{fn_line.fn_name} (" for idx, arg_conv_info in enumerate(fn_line.args_ty): if idx >= 1: - out_java = out_java + ", " - java_trait_constr = java_trait_constr + ", " - out_java_trait = out_java_trait + ", " - out_java = out_java + arg_conv_info.java_ty + " " + arg_conv_info.arg_name - out_java_trait = out_java_trait + arg_conv_info.java_hu_ty + " " + arg_conv_info.arg_name - java_trait_constr = java_trait_constr + arg_conv_info.java_ty + " " + arg_conv_info.arg_name - java_meth_descr = java_meth_descr + arg_conv_info.java_fn_ty_arg - java_meth_descr = java_meth_descr + ")" + fn_line.ret_ty_info.java_fn_ty_arg - java_meths.append((fn_line.fn_name, java_meth_descr)) - - out_java = out_java + ");\n" - out_java_trait = out_java_trait + ");\n" - java_trait_constr = java_trait_constr + ") {\n" + out_typescript_bindings = out_typescript_bindings + ", " + out_typescript_bindings += f"{arg_conv_info.arg_name}: {arg_conv_info.java_ty}" - for arg_info in fn_line.args_ty: - if arg_info.to_hu_conv is not None: - java_trait_constr = java_trait_constr + "\t\t\t\t" + arg_info.to_hu_conv.replace("\n", "\n\t\t\t\t") + "\n" + out_typescript_bindings += f"): {fn_line.ret_ty_info.java_ty};\n" - if fn_line.ret_ty_info.java_ty != "void": - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.java_hu_ty + " ret = arg." + fn_line.fn_name + "(" - else: - java_trait_constr = java_trait_constr + "\t\t\t\targ." + fn_line.fn_name + "(" + out_typescript_bindings = out_typescript_bindings + "\t\t}\n\n" - for idx, arg_info in enumerate(fn_line.args_ty): - if idx != 0: - java_trait_constr = java_trait_constr + ", " - if arg_info.to_hu_conv_name is not None: - java_trait_constr = java_trait_constr + arg_info.to_hu_conv_name - else: - java_trait_constr = java_trait_constr + arg_info.arg_name - - java_trait_constr = java_trait_constr + ");\n" - if fn_line.ret_ty_info.java_ty != "void": - if fn_line.ret_ty_info.from_hu_conv is not None: - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.java_ty + " result = " + fn_line.ret_ty_info.from_hu_conv[0] + ";\n" - if fn_line.ret_ty_info.from_hu_conv[1] != "": - java_trait_constr = java_trait_constr + "\t\t\t\t" + fn_line.ret_ty_info.from_hu_conv[1].replace("this", "impl_holder.held") + ";\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 - # java_trait_constr = java_trait_constr + "\t\t\t\tret.ptr = 0;\n" - java_trait_constr = java_trait_constr + "\t\t\t\treturn result;\n" - else: - java_trait_constr = java_trait_constr + "\t\t\t\treturn ret;\n" - java_trait_constr = java_trait_constr + "\t\t\t}\n" - java_trait_constr = java_trait_constr + "\t\t}" + out_typescript_bindings += f"\t\texport function {struct_name}_new(impl: {struct_name}" for var in field_var_conversions: if isinstance(var, ConvInfo): - java_trait_constr = java_trait_constr + ", " + var.arg_name + out_typescript_bindings += f", {var.arg_name}: {var.java_ty}" else: - java_trait_constr = java_trait_constr + ", " + var[1] + ".new_impl(" + var[1] + "_impl).bindings_instance" - out_java_trait = out_java_trait + "\t}\n" - out_java_trait = out_java_trait + java_trait_constr + ");\n\t\treturn impl_holder.held;\n\t}\n" + out_typescript_bindings += f", {var[1]}: {var[0]}" - print(java_trait_constr) + out_typescript_bindings += f"""): number {{ + throw new Error('unimplemented'); // TODO: bind to WASM + }} - out_java = out_java + "\t}\n" + export function {struct_name}_get_obj_from_jcalls(val: number): {struct_name} {{ + throw new Error('unimplemented'); // TODO: bind to WASM + }} +""" - out_java = out_java + "\tpublic static native long " + struct_name + "_new(" + struct_name + " impl" - for var in field_var_conversions: - if isinstance(var, ConvInfo): - out_java = out_java + ", " + var.java_ty + " " + var.arg_name - else: - out_java = out_java + ", " + var[0] + " " + var[1] - out_java = out_java + ");\n" - out_java = out_java + "\tpublic static native " + struct_name + " " + struct_name + "_get_obj_from_jcalls(long val);\n" + 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" @@ -569,8 +639,10 @@ import * as bindings from '../bindings' // TODO: figure out location out_c = out_c + "\treturn ret;\n" out_c = out_c + "}\n" + return (out_typescript_bindings, out_typescript_human, out_c) - return (out_java, out_java_trait, out_c) + def trait_struct_inc_refcnt(self, ty_info): + return "" def map_complex_enum(self, struct_name, variant_list, camel_to_snake): java_hu_type = struct_name.replace("LDK", "") @@ -648,3 +720,33 @@ import * as bindings from '../bindings' // TODO: figure out location out_java_enum += ("}\n") out_java_enum += (java_hu_subclasses) return (out_java, out_java_enum, out_c) + + def map_opaque_struct(self, struct_name): + implementations = "" + method_header = "" + if struct_name.startswith("LDKLocked"): + implementations += "implements AutoCloseable " + method_header = """ + public close() { +""" + else: + method_header = """ + protected finalize() { + super.finalize(); +""" + + out_opaque_struct_human = f""" + {self.hu_struct_file_prefix} + + export default class {struct_name.replace("LDK","")} extends CommonBase {implementations}{{ + constructor(_dummy: object, ptr: number) {{ + super(ptr); + }} + + {method_header} + if (this.ptr != 0) {{ + bindings.{struct_name.replace("LDK","")}_free(this.ptr); + }} + }} +""" + return out_opaque_struct_human