Use wasm's default memory instead of creating/accessing an (unused) one

[ldk-java] / typescript_strings.py

diff --git a/typescript_strings.py b/typescript_strings.py
index 45ae6d1dc9b0cc5b0633df9a8607b419af782483..faa13d572d623a6b09d4dbba495ba473b5692203 100644 (file)
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@ -97,10 +97,19 @@ export default class CommonBase {
                        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);
        }
-       public _test_only_get_ptr(): number { return this.ptr; }
+       protected static get_ptr_of(o: CommonBase) {
+               return o.ptr;
+       }
+       protected static set_null_skip_free(o: CommonBase) {
+               o.ptr = 0;
+               finalizer.unregister(o);
+       }
 }
 """
 
@@ -359,13 +368,9 @@ import * as InternalUtils from '../InternalUtils.mjs'
 
     def wasm_import_header(self, target):
         res = """
-const memory = new WebAssembly.Memory({initial: 256});
-
 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'});
 
@@ -432,16 +437,16 @@ const nextMultipleOfFour = (value: number) => {
 
 const encodeUint8Array = (inputArray) => {
        const cArrayPointer = wasm.TS_malloc(inputArray.length + 4);
-       const arrayLengthView = new Uint32Array(memory.buffer, cArrayPointer, 1);
+       const arrayLengthView = new Uint32Array(wasm.memory.buffer, cArrayPointer, 1);
        arrayLengthView[0] = inputArray.length;
-       const arrayMemoryView = new Uint8Array(memory.buffer, cArrayPointer + 4, inputArray.length);
+       const arrayMemoryView = new Uint8Array(wasm.memory.buffer, cArrayPointer + 4, inputArray.length);
        arrayMemoryView.set(inputArray);
        return cArrayPointer;
 }
 
 const encodeUint32Array = (inputArray) => {
        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;
        return cArrayPointer;
@@ -449,7 +454,7 @@ const encodeUint32Array = (inputArray) => {
 
 const getArrayLength = (arrayPointer) => {
        const arraySizeViewer = new Uint32Array(
-               memory.buffer, // value
+               wasm.memory.buffer, // value
                arrayPointer, // offset
                1 // one int
        );
@@ -458,7 +463,7 @@ const getArrayLength = (arrayPointer) => {
 const decodeUint8Array = (arrayPointer, free = true) => {
        const arraySize = getArrayLength(arrayPointer);
        const actualArrayViewer = new Uint8Array(
-               memory.buffer, // value
+               wasm.memory.buffer, // value
                arrayPointer + 4, // offset (ignoring length bytes)
                arraySize // uint8 count
        );
@@ -473,7 +478,7 @@ const decodeUint8Array = (arrayPointer, free = true) => {
 const decodeUint32Array = (arrayPointer, 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
        );
@@ -491,7 +496,7 @@ const encodeString = (string) => {
        const memoryNeed = nextMultipleOfFour(string.length + 1);
        const stringPointer = wasm.TS_malloc(memoryNeed);
        const stringMemoryView = new Uint8Array(
-               memory.buffer, // value
+               wasm.memory.buffer, // value
                stringPointer, // offset
                string.length + 1 // length
        );
@@ -503,7 +508,7 @@ const encodeString = (string) => {
 }
 
 const decodeString = (stringPointer, free = true) => {
-       const memoryView = new Uint8Array(memory.buffer, stringPointer);
+       const memoryView = new Uint8Array(wasm.memory.buffer, stringPointer);
        let cursor = 0;
        let result = '';
 
@@ -526,6 +531,11 @@ const decodeString = (stringPointer, free = true) => {
     def var_decl_statement(self, ty_string, var_name, statement):
         return "const " + var_name + ": " + ty_string + " = " + statement
 
+    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 + ")"