Merge pull request AssemblyScript#24 from nearprotocol/wasm-new-read-api

Update to Wasm new read API

Author: vgrichina

bin/asinit

@@ -237,9 +237,9 @@ export class NEARBindingsBuilder extends ExportsWalker {
     let signature = element.signature;
     let returnType = signature.returnType;
     this.generateEncodeFunction(returnType);
-    this.sb.push(`export function near_func_${element.name}(): void {
-      let json = new Uint8Array(input_read_len());
-      input_read_into(json.buffer.data);
+    this.sb.push(`export function ${element.name}(): void {
+      // Reading input bytes.
+      let json = storage._internalReadBytes(4, 0, 0);
       let handler = new __near_ArgsParser_${element.name}();
       handler.buffer = json;
       handler.decoder = new JSONDecoder<__near_ArgsParser_${element.name}>(handler);
@@ -261,7 +261,8 @@ export class NEARBindingsBuilder extends ExportsWalker {
       this.generateFieldEncoder(returnType, '"result"', "result");
       this.sb.push(`
         encoder.popObject();
-        return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+        let val = encoder.serialize();
+        return_value(val.byteLength, val.buffer.data);
       `);
     }
     this.sb.push(`}`);
@@ -582,18 +583,14 @@ export class NEARBindingsBuilder extends ExportsWalker {
     let allExported = (<Element[]>this.exportedClasses).concat(<Element[]>this.exportedFunctions).filter(e => e.is(CommonFlags.MODULE_EXPORT));
     let allImportsStr = allExported.map(c => `${c.name} as wrapped_${c.name}`).join(", ");
     this.sb = [`
-      import { near } from "./near";
+      import { storage, near } from "./near";
       import { JSONEncoder} from "./json/encoder"
       import { JSONDecoder, ThrowingJSONHandler, DecoderState  } from "./json/decoder"
       import {${allImportsStr}} from "./${mainSource.normalizedPath.replace(".ts", "")}";
 
       // Runtime functions
       @external("env", "return_value")
-      declare function return_value(value_ptr: u32): void;
-      @external("env", "input_read_len")
-      declare function input_read_len(): u32;
-      @external("env", "input_read_into")
-      declare function input_read_into(ptr: usize): void;
+      declare function return_value(value_len: usize, value_ptr: usize): void;
     `].concat(this.sb);
     this.exportedClasses.forEach(c => {
       this.sb.push(`export class ${c.name} extends ${this.wrappedTypeName(c.type)} {

dist/assemblyscript.js

@@ -1,4 +1,4 @@
-import { near } from "./near";
+import { storage, near } from "./near";
 import { JSONEncoder } from "./json/encoder";
 import { JSONDecoder, ThrowingJSONHandler, DecoderState } from "./json/decoder";
 import {
@@ -11,9 +11,7 @@ import {
 } from "./main";
 
 // Runtime functions
-declare function return_value(value_ptr: u32): void;
-declare function input_read_len(): u32;
-declare function input_read_into(ptr: usize): void;
+declare function return_value(value_len: usize, value_ptr: usize): void;
 
 import { near } from "./near";
 import { near as bazinga_near } from "./near";
@@ -43,9 +41,9 @@ export class __near_ArgsParser_doNothing extends ThrowingJSONHandler {
     return super.pushArray(name);
   }
 }
-export function near_func_doNothing(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function doNothing(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_doNothing();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_doNothing>(handler);
@@ -100,9 +98,9 @@ export class __near_ArgsParser_add extends ThrowingJSONHandler {
     return super.pushArray(name);
   }
 }
-export function near_func_add(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function add(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_add();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_add>(handler);
@@ -115,7 +113,8 @@ export function near_func_add(): void {
   encoder.setInteger("result", result);
 
   encoder.popObject();
-  return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+  let val = encoder.serialize();
+  return_value(val.byteLength, val.buffer.data);
 }
 import { __near_decode_ContainerClass } from "./model_near";
 export class __near_ArgsParser_rewrapFoobar extends ThrowingJSONHandler {
@@ -156,9 +155,9 @@ export class __near_ArgsParser_rewrapFoobar extends ThrowingJSONHandler {
   }
 }
 import { __near_encode_AnotherContainerClass } from "./model_near";
-export function near_func_rewrapFoobar(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function rewrapFoobar(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_rewrapFoobar();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_rewrapFoobar>(handler);
@@ -177,7 +176,8 @@ export function near_func_rewrapFoobar(): void {
   }
 
   encoder.popObject();
-  return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+  let val = encoder.serialize();
+  return_value(val.byteLength, val.buffer.data);
 }
 import { __near_decode_AnotherContainerClass } from "./model_near";
 export class __near_ArgsParser_unwrapFoobar extends ThrowingJSONHandler {
@@ -218,9 +218,9 @@ export class __near_ArgsParser_unwrapFoobar extends ThrowingJSONHandler {
   }
 }
 import { __near_encode_FooBar } from "./model_near";
-export function near_func_unwrapFoobar(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function unwrapFoobar(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_unwrapFoobar();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_unwrapFoobar>(handler);
@@ -239,7 +239,8 @@ export function near_func_unwrapFoobar(): void {
   }
 
   encoder.popObject();
-  return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+  let val = encoder.serialize();
+  return_value(val.byteLength, val.buffer.data);
 }
 import { __near_decode_Array_String } from "./model_near";
 export class __near_ArgsParser_getStringArrayLength extends ThrowingJSONHandler {
@@ -280,9 +281,9 @@ export class __near_ArgsParser_getStringArrayLength extends ThrowingJSONHandler
     return super.pushArray(name);
   }
 }
-export function near_func_getStringArrayLength(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function getStringArrayLength(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_getStringArrayLength();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_getStringArrayLength>(
@@ -297,7 +298,8 @@ export function near_func_getStringArrayLength(): void {
   encoder.setInteger("result", result);
 
   encoder.popObject();
-  return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+  let val = encoder.serialize();
+  return_value(val.byteLength, val.buffer.data);
 }
 import { __near_decode_Array_FooBar } from "./model_near";
 export class __near_ArgsParser_convertFoobars extends ThrowingJSONHandler {
@@ -353,9 +355,9 @@ export function __near_encode_Array_ContainerClass(
     }
   }
 }
-export function near_func_convertFoobars(): void {
-  let json = new Uint8Array(input_read_len());
-  input_read_into(json.buffer.data);
+export function convertFoobars(): void {
+  // Reading input bytes.
+  let json = storage._internalReadBytes(4, 0, 0);
   let handler = new __near_ArgsParser_convertFoobars();
   handler.buffer = json;
   handler.decoder = new JSONDecoder<__near_ArgsParser_convertFoobars>(handler);
@@ -374,5 +376,6 @@ export function near_func_convertFoobars(): void {
   }
 
   encoder.popObject();
-  return_value(near.bufferWithSize(encoder.serialize()).buffer.data);
+  let val = encoder.serialize();
+  return_value(val.byteLength, val.buffer.data);
 }

dist/assemblyscript.js.map

@@ -1,4 +1,4 @@
-import { near } from "./near";
+import { storage, near } from "./near";
 import { JSONEncoder } from "./json/encoder";
 import { JSONDecoder, ThrowingJSONHandler, DecoderState } from "./json/decoder";
 import {
@@ -8,9 +8,7 @@ import {
 } from "./model";
 
 // Runtime functions
-declare function return_value(value_ptr: u32): void;
-declare function input_read_len(): u32;
-declare function input_read_into(ptr: usize): void;
+declare function return_value(value_len: usize, value_ptr: usize): void;
 
 export function __near_encode_Array_String(
   value: Array<String>,

src/definitions.ts

@@ -1,18 +1,49 @@
-export namespace near {
-  export function bufferWithSizeFromPtr(ptr: usize, length: usize): Uint8Array {
-    let withSize = new Uint8Array(length + 4);
-    store<u32>(withSize.buffer.data, length);
-    // TODO: Should use better copy routine or better avoid copy altogether
-    for (let i = <usize>0; i < length; i++) {
-        withSize[i + 4] = load<u8>(ptr + i);
+const DEFAULT_SCRATCH_BUFFER_SIZE: usize = 1 << 16;
+
+type DataTypeIndex = u32;
+
+export class Storage {
+  private _scratchBuf: Uint8Array = new Uint8Array(DEFAULT_SCRATCH_BUFFER_SIZE);
+  /**
+   * @hidden
+   * Reads given params into the internal scratch buffer and returns length.
+   */
+  private _internalBufferRead(dataType: DataTypeIndex, keyLen: usize, key: usize): usize {
+    for (let i = 0; i < 2; ++i) {
+      let len = data_read(
+        dataType,
+        keyLen,
+        key,
+        this._scratchBuf.byteLength,
+        this._scratchBuf.buffer.data,
+      );
+      if (len <= <usize>(this._scratchBuf.byteLength)) {
+        return len;
+      }
+      this._scratchBuf = new Uint8Array(len);
     }
-    return withSize;
+    assert(false, "Internal scratch buffer was resized more than once");
+    return 0;
   }
 
-  export function bufferWithSize(buf: Uint8Array): Uint8Array {
-    return bufferWithSizeFromPtr(buf.buffer.data, buf.byteLength);
+  /**
+   * @hidden
+   * Reads bytes for the given params.
+   */
+  _internalReadBytes(dataType: DataTypeIndex, keyLen: usize, key: usize): Uint8Array {
+    let len = this._internalBufferRead(dataType, keyLen, key);
+    if (len == 0) {
+      return null;
+    }
+    let res = new Uint8Array(len);
+    memory.copy(res.buffer.data, this._scratchBuf.buffer.data, len);
+    return res;
   }
+}
+
+export let storage: Storage = new Storage();
 
+export namespace near {
   export function str<T>(value: T): string {
     let arr: Array<T> = [value];
     return arr.toString();
@@ -25,3 +56,6 @@ export namespace near {
 
 @external("env", "log")
 declare function _near_log(msg_ptr: usize): void;
+
+@external("env", "data_read")
+declare function data_read(type_index: u32, key_len: usize, key: usize, max_buf_len: usize, buf_ptr: usize): usize;

tests/near-bindgen/main_near.ts.expected

@@ -22,14 +22,14 @@ async function loadModule(path) {
                 }
                 console.log(str);
             },
-            input_read_len() {
+            data_read(index, keyLen, key, maxBufPtr, bufPtr) {
+                assert(index == 4);
+                assert(maxBufPtr >= bufPtr);
+                copyToPtr(inputJson, bufPtr);
                 return inputJson.length;
             },
-            input_read_into(ptr) {
-                copyToPtr(inputJson, ptr);
-            },
-            return_value(ptr) {
-                outputJson = readBuffer(ptr);
+            return_value(valLen, valPtr) {
+                outputJson = readBuffer(valLen, valPtr);
             }
         }
     });
@@ -49,12 +49,10 @@ async function loadModule(path) {
         }
     }
 
-    function readBuffer(ptr) {
-        const len = module.U32[ptr / 4];
-        ptr += 4;
-        const result = new Uint8Array(len);
-        for (let i = 0; i < len; i++) {
-            result[i] = module.I8[ptr + i];
+    function readBuffer(valLen, valPtr) {
+        const result = new Uint8Array(valLen);
+        for (let i = 0; i < valLen; i++) {
+            result[i] = module.I8[valPtr + i];
         }
         return result;
     }

tests/near-bindgen/model_near.ts.expected

@@ -21,17 +21,17 @@ export function runTest(): void {
 }
 
 export function convertFoobars(): void {
-    main.near_func_convertFoobars();
+    main.convertFoobars();
 }
 
 export function getStringArrayLength(): void {
-    main.near_func_getStringArrayLength();
+    main.getStringArrayLength();
 }
 
 export function rewrapFoobar(): void {
-    main.near_func_rewrapFoobar();
+    main.rewrapFoobar();
 }
 
 export function unwrapFoobar(): void {
-    main.near_func_unwrapFoobar();
-}
+    main.unwrapFoobar();
+}