More TS C trait conversion + drop unused get_obj_from_jcalls
[ldk-java] / typescript_strings.py
index 424764017ae6438b5ff2bb726f72e0430b25d159..e2201c77fdbe67ad286536bef9f04ef663c1978c 100644 (file)
@@ -1,21 +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(
             uint8_t = ['number', 'Uint8Array'],
             uint16_t = ['number', 'Uint16Array'],
             uint32_t = ['number', 'Uint32Array'],
-            long = ['number'],
+            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;
@@ -26,7 +73,7 @@ class Consts:
                     // TODO: finalize myself
                 }
             }
-        """
+"""
 
         self.c_file_pfx = """#include <rust_types.h>
 #include <stdatomic.h>
@@ -167,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")
@@ -206,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 ""
 
@@ -238,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, "")
 
@@ -257,13 +322,7 @@ 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 = ""
@@ -287,23 +346,75 @@ import * as bindings from '../bindings' // TODO: figure out location
 
         # 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);
@@ -315,116 +426,66 @@ 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();
-                    impl_holder.held = new {struct_name.replace("LDK", "")} (new bindings.{struct_name}() {{
+                    let structImplementation = <bindings.{struct_name}>{{
                         // 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 = ") {\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 = 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_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 += java_trait_constr + ");\n\t\treturn impl_holder.held;\n\t}\n"
+                out_typescript_bindings += f", {var[1]}: {var[0]}"
 
-        out_java = out_java + "\t}\n"
+        out_typescript_bindings += f"""): number {{
+            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"
         out_c = out_c + "\tatomic_size_t refcnt;\n"
-        out_c = out_c + "\tJavaVM *vm;\n"
-        out_c = out_c + "\tjweak o;\n"
+        out_c = out_c + "\t// TODO: Object pointer o;\n"
         for var in field_var_conversions:
             if isinstance(var, ConvInfo):
                 # We're a regular ol' field
@@ -434,7 +495,7 @@ import * as bindings from '../bindings' // TODO: figure out location
                 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 != "clone":
-                out_c = out_c + "\tjmethodID " + fn.fn_name + "_meth;\n"
+                out_c = out_c + "\t// TODO: Some kind of method pointer " + fn.fn_name + "_meth;\n"
         out_c = out_c + "} " + struct_name + "_JCalls;\n"
 
         for fn_line in field_function_lines:
@@ -442,9 +503,7 @@ import * as bindings from '../bindings' // TODO: figure out location
                 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"
-                out_c = out_c + "\t\tJNIEnv *env;\n"
-                out_c = out_c + "\t\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n"
-                out_c = out_c + "\t\t(*env)->DeleteWeakGlobalRef(env, j_calls->o);\n"
+                out_c = out_c + "\t\t// TODO: do any release required for j_calls->o (refcnt-- in java, but may be redundant)\n"
                 out_c = out_c + "\t\tFREE(j_calls);\n"
                 out_c = out_c + "\t}\n}\n"
 
@@ -462,8 +521,6 @@ import * as bindings from '../bindings' // TODO: figure out location
 
                 out_c = out_c + ") {\n"
                 out_c = out_c + "\t" + struct_name + "_JCalls *j_calls = (" + struct_name + "_JCalls*) this_arg;\n"
-                out_c = out_c + "\tJNIEnv *env;\n"
-                out_c = out_c + "\tDO_ASSERT((*j_calls->vm)->GetEnv(j_calls->vm, (void**)&env, JNI_VERSION_1_8) == JNI_OK);\n"
 
                 for arg_info in fn_line.args_ty:
                     if arg_info.ret_conv is not None:
@@ -471,13 +528,15 @@ import * as bindings from '../bindings' // TODO: figure out location
                         out_c = out_c + arg_info.arg_name
                         out_c = out_c + arg_info.ret_conv[1].replace('\n', '\n\t') + "\n"
 
-                out_c = out_c + "\tjobject obj = (*env)->NewLocalRef(env, j_calls->o);\n\tCHECK(obj != NULL);\n"
+                out_c = out_c + "\t//TODO: jobject obj = get object we can call against on j_calls->o\n"
                 if fn_line.ret_ty_info.c_ty.endswith("Array"):
-                    out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg = (*env)->CallObjectMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+                    out_c = out_c + "\t" + fn_line.ret_ty_info.c_ty + " arg; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning an object"
+                elif fn_line.ret_ty_info.java_ty == "void":
+                    out_c = out_c + "\treturn; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj"
                 elif not fn_line.ret_ty_info.passed_as_ptr:
-                    out_c = out_c + "\treturn (*env)->Call" + fn_line.ret_ty_info.java_ty.title() + "Method(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+                    out_c = out_c + "\treturn 0; //TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning " + fn_line.ret_ty_info.java_ty
                 else:
-                    out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret = (" + fn_line.ret_ty_info.rust_obj + "*)(*env)->CallLongMethod(env, obj, j_calls->" + fn_line.fn_name + "_meth"
+                    out_c = out_c + "\t" + fn_line.ret_ty_info.rust_obj + "* ret; // TODO: Call " + fn_line.fn_name + " on j_calls with instance obj, returning a pointer"
 
                 for idx, arg_info in enumerate(fn_line.args_ty):
                     if arg_info.ret_conv is not None:
@@ -500,20 +559,17 @@ import * as bindings from '../bindings' // TODO: figure out location
         out_c = out_c + "\treturn (void*) this_arg;\n"
         out_c = out_c + "}\n"
 
-        out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (" + self.c_fn_args_pfx + ", jobject o"
+        out_c = out_c + "static inline " + struct_name + " " + struct_name + "_init (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o"
         for var in field_var_conversions:
             if isinstance(var, ConvInfo):
                 out_c = out_c + ", " + var.c_ty + " " + var.arg_name
             else:
-                out_c = out_c + ", jobject " + var[1]
+                out_c = out_c + ", /*TODO: JS Object Reference */void* " + var[1]
         out_c = out_c + ") {\n"
 
-        out_c = out_c + "\tjclass c = (*env)->GetObjectClass(env, o);\n"
-        out_c = out_c + "\tCHECK(c != NULL);\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 + "\tDO_ASSERT((*env)->GetJavaVM(env, &calls->vm) == 0);\n"
-        out_c = out_c + "\tcalls->o = (*env)->NewWeakGlobalRef(env, o);\n"
+        out_c = out_c + "\t//TODO: Assign calls->o from o\n"
 
         for (fn_name, java_meth_descr) in java_meths:
             if fn_name != "free" and fn_name != "clone":
@@ -541,7 +597,7 @@ import * as bindings from '../bindings' // TODO: figure out location
                     out_c = out_c + "\t\t." + var.var_name + " = " + var.var_name + ",\n"
                     out_c = out_c + "\t\t.set_" + var.var_name + " = NULL,\n"
             else:
-                out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(env, clz, " + var[1] + "),\n"
+                out_c = out_c + "\t\t." + var[1] + " = " + var[0] + "_init(NULL, " + var[1] + "),\n"
         out_c = out_c + "\t};\n"
         for var in field_var_conversions:
             if not isinstance(var, ConvInfo):
@@ -549,15 +605,15 @@ import * as bindings from '../bindings' // TODO: figure out location
         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_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", jobject o"
+        out_c = out_c + self.c_fn_ty_pfx + "long " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1new (" + self.c_fn_args_pfx + ", /*TODO: JS Object Reference */void* o"
         for var in field_var_conversions:
             if isinstance(var, ConvInfo):
                 out_c = out_c + ", " + var.c_ty + " " + var.arg_name
             else:
-                out_c = out_c + ", jobject " + var[1]
+                out_c = out_c + ", /*TODO: JS Object Reference */ void* " + 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(env, clz, o"
+        out_c = out_c + "\t*res_ptr = " + struct_name + "_init(NULL, o"
         for var in field_var_conversions:
             if isinstance(var, ConvInfo):
                 out_c = out_c + ", " + var.arg_name
@@ -567,14 +623,10 @@ import * as bindings from '../bindings' // TODO: figure out location
         out_c = out_c + "\treturn (long)res_ptr;\n"
         out_c = out_c + "}\n"
 
-        out_c = out_c + self.c_fn_ty_pfx + "jobject " + self.c_fn_name_pfx + struct_name.replace("_", "_1") + "_1get_1obj_1from_1jcalls (" + self.c_fn_args_pfx + ", " + self.ptr_c_ty + " val) {\n"
-        out_c = out_c + "\tjobject ret = (*env)->NewLocalRef(env, ((" + struct_name + "_JCalls*)val)->o);\n"
-        out_c = out_c + "\tCHECK(ret != NULL);\n"
-        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", "")
@@ -652,3 +704,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