wao 0.11.0 → 0.11.2

package/esm/aoconnect-base.js

@@ -467,7 +467,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
             })
           }
           if (!p.handle) {
-            const { format, mod, wasm } = await mem.getWasm(p.modulea)
+            const { format, mod, wasm } = await mem.getWasm(p.module)
             const wdrive = extensions[p.extention]
             p.handle = await AoLoader(wasm, {
               format,

package/esm/armem-base.js

@@ -6,6 +6,22 @@ import { last, assoc, is } from "ramda"
 import { buildTags, tags } from "./utils.js"
 import base64url from "base64url"
 
+function eq(buf1, buf2, chunkSize = 1024 * 1024) {
+  if (buf1.byteLength !== buf2.byteLength) return false
+
+  const view1 = new Uint8Array(buf1)
+  const view2 = new Uint8Array(buf2)
+
+  for (let i = 0; i < buf1.byteLength; i += chunkSize) {
+    const slice1 = view1.subarray(i, i + chunkSize)
+    const slice2 = view2.subarray(i, i + chunkSize)
+
+    if (!slice1.every((val, idx) => val === slice2[idx])) return false
+  }
+
+  return true
+}
+
 export default class ArMemBase {
   constructor({
     MU_URL,
@@ -15,13 +31,11 @@ export default class ArMemBase {
     scheduler,
     cache,
     init,
-    Compressor,
-    Decompressor,
+    Waosm,
   } = {}) {
     this.__type__ = "mem"
     this._init = init
-    this.Compressor = Compressor
-    this.Decompressor = Decompressor
+    this.Waosm = Waosm
     this.isInit = false
     this.keyInit = false
     this.keys = {}
@@ -58,10 +72,12 @@ export default class ArMemBase {
         if (key === "env") {
           let memory = val.memory
           try {
-            memory = Array.from(this.compressor.compress(val.memory))
+            memory = this.waosm.compress(val.memory)
           } catch (e) {
+            console.log(e)
             memory = compress(val.memory)
           }
+          this[key][field].original_size = val.memory.length
           await this.db.put(
             `${key}.${field}`,
             assoc("memory", memory, this[key][field]),
@@ -154,8 +170,7 @@ export default class ArMemBase {
     if (this.isInit) return
     this.isInit = true
     if (typeof this._init === "function") await this._init()
-    this.compressor = new this.Compressor()
-    this.decompressor = new this.Decompressor()
+    this.waosm = new this.Waosm()
     if (this.db) {
       for (const v of ["height", "blocks"]) this[v] = await this.get(v)
       for (const v of [
@@ -177,10 +192,12 @@ export default class ArMemBase {
           if (key === v) {
             if (key.match(/^env/)) {
               let v3 = await this.db.get(v2)
-              if (is(Array, v3.memory)) {
+              if (is(Uint8Array, v3.memory)) {
                 try {
-                  v3.memory = this.decompressor.decompress(v3.memory)
+                  v3.memory = this.waosm.decompress(v3.memory, v3.original_size)
+                  console.log(v3)
                 } catch (e) {
+                  console.log(e)
                   v3.memory = decompress(v3.memory)
                 }
               }

package/esm/armem-web.js

@@ -1,11 +1,11 @@
 import wdb from "./lua/weavedb-lite.js"
 import Base from "./armem-base.js"
 import db from "./lfdb.js"
-import init, { Compressor, Decompressor } from "./waosm/waosm.js"
+import init, { Waosm } from "./waosm/waosm.js"
 
 export default class ArMem extends Base {
   constructor(args = {}) {
-    super({ ...args, init, Compressor, Decompressor })
+    super({ ...args, init, Waosm })
     this.db = db(this)
     this.initSync()
   }

package/esm/armem.js

@@ -5,12 +5,12 @@ import { open } from "lmdb"
 import { readFileSync } from "fs"
 import { resolve } from "path"
 import Base from "./armem-base.js"
-import { Compressor, Decompressor } from "./waosm-node.js"
+import { Waosm } from "./waosm-node.js"
 
 export default class ArMem extends Base {
   constructor(args = {}) {
     const { cache } = args
-    super({ ...args, Compressor, Decompressor })
+    super({ ...args, Waosm })
     if (cache) this.db = open({ path: cache, compression: true })
     this.initSync()
   }

package/esm/bao.js

@@ -50,6 +50,7 @@ class AO extends MAO {
   constructor(opt = {}) {
     super({ ...opt, in_memory: true })
     this.in_memory = true
+    this.createDataItemSigner = opt.createDataItemSigner ?? createDataItemSigner
     const {
       modules,
       results,
@@ -111,8 +112,7 @@ class AO extends MAO {
       "Memory-Limit": "1-gb",
       "Compute-Limit": "9000000000000",
     })
-    console.log(tags, t)
-    const signer = createDataItemSigner(jwk)
+    const signer = this.createDataItemSigner(jwk)
     const { id, owner, item } = await this.ar.dataitem({
       tags: t,
       data,

package/esm/compress.js

@@ -85,7 +85,6 @@ export const decompress = d => {
         nums.push(third)
         elm = second - 1
       } else elm = second
-      console.log(flag, first, second, third, elm, nums)
     } else if (sum === 0) {
       elm -= 1
       nums.push(v)

package/esm/wao.js

@@ -1,10 +1,28 @@
 import BAO from "./bao.js"
 import { connect } from "./aoconnect-web.js"
 import AR from "./war.js"
+import * as WarpArBundles from "warp-arbundles"
+const pkg = WarpArBundles.default ?? WarpArBundles
+const { createData, ArweaveSigner } = pkg
+
+function createDataItemSigner(wallet) {
+  const signer = async ({ data, tags, target, anchor }) => {
+    const signer = new ArweaveSigner(wallet)
+    const dataItem = createData(data, signer, { tags, target, anchor })
+    const sig = dataItem.sign(signer).then(async () => {
+      return {
+        id: await dataItem.id,
+        raw: await dataItem.getRaw(),
+      }
+    })
+    return sig
+  }
+  return signer
+}
 
 class AO extends BAO {
   constructor(opt = {}) {
-    super({ ...opt, connect, AR })
+    super({ ...opt, connect, AR, createDataItemSigner })
   }
 }
 

package/esm/waosm/README.md

@@ -11,13 +11,17 @@ yarn build
 Using Waosm in nodejs.
 
 ```js
-import init, { Compressor, Decompressor } from "../src/waosm-node.js"
+import { Compressor, Decompressor } from "../src/waosm-node.js"
 
 const main = async ()=>{
-  await init()
   const compressor = new Compressor()
   const decompressor = new Decompressor()
-  const memory = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
+  const memory = new Uint8Array(
+    [ 
+	  1, 2, 3, 4, 5, 5, 5, 6, 7, 8, 9, 0, 0, 0, 
+	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 
+    ]
+  )
   console.log(memory)
   const compressed = compressor.compress(memory)
   console.log(compressed)

package/esm/waosm/waosm.d.ts

@@ -1,26 +1,20 @@
 /* tslint:disable */
 /* eslint-disable */
-export class Compressor {
+export class Waosm {
   free(): void;
   constructor();
   compress(data: Uint8Array): Uint8Array;
-}
-export class Decompressor {
-  free(): void;
-  constructor();
-  decompress(data: Uint8Array): Uint8Array;
+  decompress(data: Uint8Array, decompressed_size: number): Uint8Array;
 }
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly __wbg_compressor_free: (a: number, b: number) => void;
-  readonly compressor_new: () => number;
-  readonly compressor_compress: (a: number, b: number, c: number) => number;
-  readonly decompressor_decompress: (a: number, b: number, c: number) => number;
-  readonly __wbg_decompressor_free: (a: number, b: number) => void;
-  readonly decompressor_new: () => number;
+  readonly __wbg_waosm_free: (a: number, b: number) => void;
+  readonly waosm_new: () => number;
+  readonly waosm_compress: (a: number, b: number, c: number) => number;
+  readonly waosm_decompress: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
 }
 

package/esm/waosm/waosm.js

@@ -56,27 +56,27 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 
-const CompressorFinalization = (typeof FinalizationRegistry === 'undefined')
+const WaosmFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
-    : new FinalizationRegistry(ptr => wasm.__wbg_compressor_free(ptr >>> 0, 1));
+    : new FinalizationRegistry(ptr => wasm.__wbg_waosm_free(ptr >>> 0, 1));
 
-export class Compressor {
+export class Waosm {
 
     __destroy_into_raw() {
         const ptr = this.__wbg_ptr;
         this.__wbg_ptr = 0;
-        CompressorFinalization.unregister(this);
+        WaosmFinalization.unregister(this);
         return ptr;
     }
 
     free() {
         const ptr = this.__destroy_into_raw();
-        wasm.__wbg_compressor_free(ptr, 0);
+        wasm.__wbg_waosm_free(ptr, 0);
     }
     constructor() {
-        const ret = wasm.compressor_new();
+        const ret = wasm.waosm_new();
         this.__wbg_ptr = ret >>> 0;
-        CompressorFinalization.register(this, this.__wbg_ptr, this);
+        WaosmFinalization.register(this, this.__wbg_ptr, this);
         return this;
     }
     /**
@@ -86,42 +86,18 @@ export class Compressor {
     compress(data) {
         const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.compressor_compress(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.waosm_compress(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
-}
-
-const DecompressorFinalization = (typeof FinalizationRegistry === 'undefined')
-    ? { register: () => {}, unregister: () => {} }
-    : new FinalizationRegistry(ptr => wasm.__wbg_decompressor_free(ptr >>> 0, 1));
-
-export class Decompressor {
-
-    __destroy_into_raw() {
-        const ptr = this.__wbg_ptr;
-        this.__wbg_ptr = 0;
-        DecompressorFinalization.unregister(this);
-        return ptr;
-    }
-
-    free() {
-        const ptr = this.__destroy_into_raw();
-        wasm.__wbg_decompressor_free(ptr, 0);
-    }
-    constructor() {
-        const ret = wasm.compressor_new();
-        this.__wbg_ptr = ret >>> 0;
-        DecompressorFinalization.register(this, this.__wbg_ptr, this);
-        return this;
-    }
     /**
      * @param {Uint8Array} data
+     * @param {number} decompressed_size
      * @returns {Uint8Array}
      */
-    decompress(data) {
+    decompress(data, decompressed_size) {
         const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.decompressor_decompress(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.waosm_decompress(this.__wbg_ptr, ptr0, len0, decompressed_size);
         return takeObject(ret);
     }
 }

package/esm/waosm/waosm_bg.wasm.d.ts

@@ -1,10 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const __wbg_compressor_free: (a: number, b: number) => void;
-export const compressor_new: () => number;
-export const compressor_compress: (a: number, b: number, c: number) => number;
-export const decompressor_decompress: (a: number, b: number, c: number) => number;
-export const __wbg_decompressor_free: (a: number, b: number) => void;
-export const decompressor_new: () => number;
+export const __wbg_waosm_free: (a: number, b: number) => void;
+export const waosm_new: () => number;
+export const waosm_compress: (a: number, b: number, c: number) => number;
+export const waosm_decompress: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_malloc: (a: number, b: number) => number;

package/esm/waosm-node/README.md

@@ -11,13 +11,17 @@ yarn build
 Using Waosm in nodejs.
 
 ```js
-import init, { Compressor, Decompressor } from "../src/waosm-node.js"
+import { Compressor, Decompressor } from "../src/waosm-node.js"
 
 const main = async ()=>{
-  await init()
   const compressor = new Compressor()
   const decompressor = new Decompressor()
-  const memory = new Uint8Array([1, 2, 3, 4, 5, 6, 7, 8, 9, 0])
+  const memory = new Uint8Array(
+    [ 
+	  1, 2, 3, 4, 5, 5, 5, 6, 7, 8, 9, 0, 0, 0, 
+	  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 
+    ]
+  )
   console.log(memory)
   const compressed = compressor.compress(memory)
   console.log(compressed)

package/esm/waosm-node/waosm.d.ts

@@ -1,12 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
-export class Compressor {
+export class Waosm {
   free(): void;
   constructor();
   compress(data: Uint8Array): Uint8Array;
-}
-export class Decompressor {
-  free(): void;
-  constructor();
-  decompress(data: Uint8Array): Uint8Array;
+  decompress(data: Uint8Array, decompressed_size: number): Uint8Array;
 }

package/esm/waosm-node/waosm_bg.js

@@ -62,27 +62,27 @@ function passArray8ToWasm0(arg, malloc) {
     return ptr;
 }
 
-const CompressorFinalization = (typeof FinalizationRegistry === 'undefined')
+const WaosmFinalization = (typeof FinalizationRegistry === 'undefined')
     ? { register: () => {}, unregister: () => {} }
-    : new FinalizationRegistry(ptr => wasm.__wbg_compressor_free(ptr >>> 0, 1));
+    : new FinalizationRegistry(ptr => wasm.__wbg_waosm_free(ptr >>> 0, 1));
 
-export class Compressor {
+export class Waosm {
 
     __destroy_into_raw() {
         const ptr = this.__wbg_ptr;
         this.__wbg_ptr = 0;
-        CompressorFinalization.unregister(this);
+        WaosmFinalization.unregister(this);
         return ptr;
     }
 
     free() {
         const ptr = this.__destroy_into_raw();
-        wasm.__wbg_compressor_free(ptr, 0);
+        wasm.__wbg_waosm_free(ptr, 0);
     }
     constructor() {
-        const ret = wasm.compressor_new();
+        const ret = wasm.waosm_new();
         this.__wbg_ptr = ret >>> 0;
-        CompressorFinalization.register(this, this.__wbg_ptr, this);
+        WaosmFinalization.register(this, this.__wbg_ptr, this);
         return this;
     }
     /**
@@ -92,42 +92,18 @@ export class Compressor {
     compress(data) {
         const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.compressor_compress(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.waosm_compress(this.__wbg_ptr, ptr0, len0);
         return takeObject(ret);
     }
-}
-
-const DecompressorFinalization = (typeof FinalizationRegistry === 'undefined')
-    ? { register: () => {}, unregister: () => {} }
-    : new FinalizationRegistry(ptr => wasm.__wbg_decompressor_free(ptr >>> 0, 1));
-
-export class Decompressor {
-
-    __destroy_into_raw() {
-        const ptr = this.__wbg_ptr;
-        this.__wbg_ptr = 0;
-        DecompressorFinalization.unregister(this);
-        return ptr;
-    }
-
-    free() {
-        const ptr = this.__destroy_into_raw();
-        wasm.__wbg_decompressor_free(ptr, 0);
-    }
-    constructor() {
-        const ret = wasm.compressor_new();
-        this.__wbg_ptr = ret >>> 0;
-        DecompressorFinalization.register(this, this.__wbg_ptr, this);
-        return this;
-    }
     /**
      * @param {Uint8Array} data
+     * @param {number} decompressed_size
      * @returns {Uint8Array}
      */
-    decompress(data) {
+    decompress(data, decompressed_size) {
         const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         const len0 = WASM_VECTOR_LEN;
-        const ret = wasm.decompressor_decompress(this.__wbg_ptr, ptr0, len0);
+        const ret = wasm.waosm_decompress(this.__wbg_ptr, ptr0, len0, decompressed_size);
         return takeObject(ret);
     }
 }

package/esm/waosm-node/waosm_bg.wasm.d.ts

@@ -1,10 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const __wbg_compressor_free: (a: number, b: number) => void;
-export const compressor_new: () => number;
-export const compressor_compress: (a: number, b: number, c: number) => number;
-export const decompressor_decompress: (a: number, b: number, c: number) => number;
-export const __wbg_decompressor_free: (a: number, b: number) => void;
-export const decompressor_new: () => number;
+export const __wbg_waosm_free: (a: number, b: number) => void;
+export const waosm_new: () => number;
+export const waosm_compress: (a: number, b: number, c: number) => number;
+export const waosm_decompress: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_malloc: (a: number, b: number) => number;