wao 0.9.2 → 0.10.2

package/esm/{ar-base.js → bar.js}

@@ -3,7 +3,7 @@ import { buildTags, tags as t } from "./utils.js"
 import * as WarpArBundles from "warp-arbundles"
 const pkg = WarpArBundles.default ?? WarpArBundles
 const { DataItem } = pkg
-import { bundleAndSignData, ArweaveSigner } from "arbundles"
+import { Bundle, bundleAndSignData, ArweaveSigner } from "arbundles"
 import base64url from "base64url"
 import GQL from "./tgql.js"
 import { last, is, includes, isNil } from "ramda"
@@ -18,21 +18,16 @@ class AR extends MAR {
     this.arweave = this.mem.arweave
   }
   async owner(di) {
-    const raw_owner = di.rawOwner
-    const hashBuffer = Buffer.from(
-      await crypto.subtle.digest("SHA-256", raw_owner),
+    return base64url.encode(
+      Buffer.from(await crypto.subtle.digest("SHA-256", di.rawOwner)),
     )
-    return base64url.encode(hashBuffer)
   }
   async dataitem({ target = "", data = "1984", tags = {}, signer, item }) {
     let di = item
     if (!di) {
-      const _tags = buildTags(tags)
-      const _item = await signer({ data, tags: _tags, target })
+      const _item = await signer({ data, tags: buildTags(tags), target })
       di = new DataItem(_item.raw)
-    } else {
-      tags = t(di.tags)
-    }
+    } else tags = t(di.tags)
     const owner = await this.owner(di)
     return { id: await di.id, owner, item: di, tags }
   }
@@ -42,8 +37,7 @@ class AR extends MAR {
     ;({ err, jwk } = await this.checkWallet({ jwk }))
     if (err) return { err }
     let tx = await this.arweave.createTransaction({ data: data })
-    let _tags = buildTags(null, tags)
-    for (const v of _tags) tx.addTag(v.name, v.value)
+    for (const v of buildTags(null, tags)) tx.addTag(v.name, v.value)
     return await this.postTx(tx, jwk)
   }
 
@@ -129,7 +123,7 @@ class AR extends MAR {
         }
         block.txs.push(item.id)
         _txs.block = block.id
-        await this.mem.set(_txs, "txs", item.id)
+        await this.mem.set({ bundle: tx.id }, "txs", item.id)
       }
     }
     let _tags = []
@@ -179,7 +173,7 @@ class AR extends MAR {
   }
 
   async tx(id) {
-    return await this.mem.get("txs", id)
+    return await this.mem.getTx(id)
   }
 
   async data(id, _string, log) {
@@ -189,7 +183,7 @@ class AR extends MAR {
       if (!isNil(_string.decode)) decode = _string.decode
       if (!isNil(_string.string)) string = _string.string
     }
-    let tx = await this.mem.get("txs", id)
+    let tx = await this.mem.getTx(id)
     let _data = tx?.data ?? null
     if (tx?.format === 2 && _data) {
       _data = Buffer.from(_data, "base64")

package/esm/build.js

@@ -0,0 +1,7 @@
+import fs from "fs"
+
+const wasmBytes = fs.readFileSync("./waosm/waosm_bg.wasm")
+const wasmB64 = wasmBytes.toString("base64")
+
+const exports = `export const wasmB64 = "${wasmB64}";`
+fs.writeFileSync("./waosm/waosm_b64.js", exports)

package/esm/compress.js

@@ -0,0 +1,113 @@
+function toBase256(n) {
+  let result = []
+  while (n > 0) {
+    result.unshift(n % 256)
+    n = Math.floor(n / 256)
+  }
+  return [result.length, ...result]
+}
+
+const _comp = (arr, _arr, mode) => {
+  let _nums = null
+  let _elms = null
+  let len = _arr.length
+  let flag = 0
+  if (mode === 1 && _arr[0] !== 0) {
+    flag += 100
+    _elms = [_arr[0]]
+  } else if (mode === 2) {
+    flag += 200
+    _elms = _arr
+  }
+  if (len < 10) flag += len
+  else if (len !== 10) {
+    const [elm, ...nums] = toBase256(len)
+    _nums = nums
+    flag += elm * 10
+    if (_nums[0] < 10) flag += _nums.shift()
+  }
+  arr.push(flag)
+  if (_nums) for (const n of _nums) arr.push(n)
+  if (_elms) for (const n of _elms) arr.push(n)
+}
+
+export const compress = d => {
+  let _arr = []
+  let mode = 1
+  let prev = null
+  let max = 0
+  let arr = []
+  for (const v of d) {
+    if (prev === null) _arr.push(v)
+    else if (_arr.length === 1) {
+      mode = prev !== v ? 2 : 1
+      _arr.push(v)
+    } else {
+      if (prev !== v && mode === 1) {
+        _comp(arr, _arr, mode)
+        _arr = [v]
+        mode = 2
+      } else if (prev === v && mode === 2) {
+        const last = _arr.pop()
+        _comp(arr, _arr, mode)
+        _arr = [last, v]
+        mode = 1
+      } else {
+        _arr.push(v)
+      }
+    }
+    prev = v
+  }
+  if (_arr.length > 0) _comp(arr, _arr, mode)
+  return arr
+}
+
+export const decompress = d => {
+  let arr = []
+  let flag = null
+  let elm = 0
+  let sum = 0
+  let nums = []
+  let first = null
+  let second = null
+  let third = null
+  for (let v of d) {
+    if (flag === null) {
+      flag = v
+      first = Math.floor(flag / 100)
+      second = Math.floor((flag - first * 100) / 10)
+      third = flag - first * 100 - second * 10
+      nums = []
+      if (second === 0) {
+        nums.push(third === 0 ? 10 : third)
+        elm = 0
+      } else if (third !== 0) {
+        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)
+    }
+    if (sum > 0) {
+      if (first === 2) arr.push(v)
+      else if (first === 1) for (let i = 0; i < to10(nums); i++) arr.push(v)
+      sum -= 1
+      if (sum === 0) flag = null
+    } else if (elm === 0) {
+      if (first === 0) {
+        for (let i = 0; i < to10(nums); i++) arr.push(0)
+        flag = null
+      } else if (first === 2) sum = to10(nums)
+      else sum = 1
+    }
+  }
+  return new Uint8Array(arr)
+}
+
+function to10(arr) {
+  let num = 0
+  for (let i = 0; i < arr.length; i++) num = num * 256 + arr[i]
+  return num
+}

package/esm/lfdb.js

@@ -48,9 +48,7 @@ export default _this => {
       _this.keys[key] = true
       await lf.setItem("keys", keys(_this.keys))
     },
-    get: async key => {
-      return await lf.getItem(key)
-    },
+    get: async key => await lf.getItem(key),
     getKeys: async ({ start, end }) => {
       if (!_this.keyInit) {
         const _keys = (await lf.getItem("keys")) ?? []

package/esm/server.js

@@ -216,13 +216,13 @@ class Server {
     )
     app.get("/:pid", (req, res) => {
       const pid = req.params.pid
-      const edges = map(v => {
-        const tx = this.mem.txs[v.id]
+      const edges = map(async v => {
+        const tx = await this.mem.getTx(v)
         const _tags = tags(v.tags)
         const mid = _tags.Message
-        const mtx = this.mem.txs[mid]
+        const mtx = await this.mem.getTx(mid)
         return {
-          cursor: v.id,
+          cursor: v,
           node: {
             message: {
               id: mtx.id,
@@ -243,7 +243,7 @@ class Server {
             },
           },
         }
-      })(reverse(this.mem.env[pid]?.txs ?? []))
+      })(reverse(this.mem.env[pid]?.results ?? [])) // need mod
       res.json({ page_info: { has_next_page: false }, edges })
     })
     const server = app.listen(this.ports.su, () =>

package/esm/tar.js

@@ -1,4 +1,4 @@
-import BAR from "./ar-base.js"
+import BAR from "./bar.js"
 import ArMem from "./armem.js"
 
 class AR extends BAR {

package/esm/tgql.js

@@ -10,6 +10,7 @@ const subs = {
   parent: ["id"],
   bundledIn: ["id"],
 }
+
 const field = (key, val = true) => {
   if (includes(key, ["id", "anchor", "signature", "recipient"])) {
     return { key }
@@ -101,8 +102,7 @@ export default class GQL {
           break
         }
         if (!isNil(opt.after) && count === 0 && !after) continue
-        let tx = this.mem.txs[v2]
-
+        let tx = await this.mem.getTx(v2)
         if (!isNil(ids) && ids.length > 0) {
           if (!includes(tx.id, ids)) continue
         }

package/esm/waosm/README.md

@@ -0,0 +1,79 @@
+# Waosm Compressor
+
+Waosm is a lightweight new compression algorithm to efficiently compress Wasm memory.
+
+It is implemented in Rust and compiled to Wasm for better performance in browsers.
+
+```bash
+yarn build
+```
+
+Using Waosm in nodejs.
+
+```js
+import init, { 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])
+  console.log(memory)
+  const compressed = compressor.compress(memory)
+  console.log(compressed)
+  const decompressed = decompressor.decompress(compressed)
+  console.log(decompressed)
+}
+main()
+```
+
+## How Compression Works
+
+Waosm Compression is a simple LRF variant that sequentially processes 8-bit integers. It is specifically optimized for zero-padded Wasm memory, achieving a 99% compression rate for largely idle WebAssembly memory. This enables efficient handling of large WebAssembly modules in browser environments.
+
+The algorithm packs integers into chunks with 3 parts.
+
+- flag
+- 256-base number to tell the number of element in the current chunk
+- actuall 8-bit intergers
+
+### Flag
+
+A flag is a 1 byte (8 bits) integer, which ranges from 0 to 255. So there are 3 digits.
+
+- 1st digit: `mode`
+  - `0`: a sequence of 0s
+  - `1`: a sequence of a single repeating 8 bit integer
+  - `2`: a sequence of multiple unique 8 bit integer
+- 2nd digit:
+  - `0`: the 3rd digit is the number of elements, no 256-base number required in this case
+  - `1-9`: the number of integers to represent the 256-base number
+- 3rd digit:
+    - if the 2nd digit is `0`, the 3rd digit represents the number of the elements, `0` represents `10`
+	- otherwise, the 3rd digit represents the first integer in the 256-base number representation
+	
+### 256-Base Number
+
+This part tells how many 8-bit integers are in the current chunk. For instance,
+- `2, 200` = (256 ** 1 * 2) + 200 = 712
+- `5, 50, 200` = (256 ** 2 * 5) + (256 ** 1 * 50) + 200 = 340680
+
+Note that for space efficiency, the first integer is in the flag in some cases.
+
+### 8 Bit Elements
+
+- `Mode 0`: no need for this part since we know it's a sequence of 0
+- `Mode 1`: 1 integer to tell which integer of a sequence this chunk is
+- `Mode 2`: the entire integers are required
+
+## Examples
+
+`[ 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 ]` (28 bytes)
+
+- `204` | `-` | `1, 2, 3, 4`
+- `103` | `-` | `5`
+- `204` | `-` | `6, 7, 8, 9`
+- `010` | `17` | `-`
+
+It becomes `[204, 1, 2, 3, 4, 103, 5, 204, 6, 7, 8, 9, 10, 17]` (14 bytes - 50% compression rate).
+

package/esm/waosm/package.json

@@ -0,0 +1,14 @@
+{
+  "name": "waosm",
+  "version": "0.1.0",
+  "files": [
+    "waosm_bg.wasm",
+    "waosm.js",
+    "waosm.d.ts"
+  ],
+  "module": "waosm.js",
+  "types": "waosm.d.ts",
+  "sideEffects": [
+    "./snippets/*"
+  ]
+}

package/esm/waosm/waosm.d.ts

@@ -0,0 +1,46 @@
+/* tslint:disable */
+/* eslint-disable */
+export class Compressor {
+  free(): void;
+  constructor();
+  compress(data: Uint8Array): Uint8Array;
+}
+export class Decompressor {
+  free(): void;
+  constructor();
+  decompress(data: Uint8Array): 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 __wbindgen_malloc: (a: number, b: number) => number;
+}
+
+export type SyncInitInput = BufferSource | WebAssembly.Module;
+/**
+* Instantiates the given `module`, which can either be bytes or
+* a precompiled `WebAssembly.Module`.
+*
+* @param {{ module: SyncInitInput }} module - Passing `SyncInitInput` directly is deprecated.
+*
+* @returns {InitOutput}
+*/
+export function initSync(module: { module: SyncInitInput } | SyncInitInput): InitOutput;
+
+/**
+* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
+* for everything else, calls `WebAssembly.instantiate` directly.
+*
+* @param {{ module_or_path: InitInput | Promise<InitInput> }} module_or_path - Passing `InitInput` directly is deprecated.
+*
+* @returns {Promise<InitOutput>}
+*/
+export default function __wbg_init (module_or_path?: { module_or_path: InitInput | Promise<InitInput> } | InitInput | Promise<InitInput>): Promise<InitOutput>;

package/esm/waosm/waosm.js

@@ -0,0 +1,264 @@
+let wasm;
+
+const heap = new Array(128).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+function getObject(idx) { return heap[idx]; }
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
+function dropObject(idx) {
+    if (idx < 132) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+
+const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
+
+if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
+
+let cachedUint8ArrayMemory0 = null;
+
+function getUint8ArrayMemory0() {
+    if (cachedUint8ArrayMemory0 === null || cachedUint8ArrayMemory0.byteLength === 0) {
+        cachedUint8ArrayMemory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachedUint8ArrayMemory0;
+}
+
+function getStringFromWasm0(ptr, len) {
+    ptr = ptr >>> 0;
+    return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
+}
+
+let WASM_VECTOR_LEN = 0;
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1, 1) >>> 0;
+    getUint8ArrayMemory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+const CompressorFinalization = (typeof FinalizationRegistry === 'undefined')
+    ? { register: () => {}, unregister: () => {} }
+    : new FinalizationRegistry(ptr => wasm.__wbg_compressor_free(ptr >>> 0, 1));
+
+export class Compressor {
+
+    __destroy_into_raw() {
+        const ptr = this.__wbg_ptr;
+        this.__wbg_ptr = 0;
+        CompressorFinalization.unregister(this);
+        return ptr;
+    }
+
+    free() {
+        const ptr = this.__destroy_into_raw();
+        wasm.__wbg_compressor_free(ptr, 0);
+    }
+    constructor() {
+        const ret = wasm.compressor_new();
+        this.__wbg_ptr = ret >>> 0;
+        CompressorFinalization.register(this, this.__wbg_ptr, this);
+        return this;
+    }
+    /**
+     * @param {Uint8Array} data
+     * @returns {Uint8Array}
+     */
+    compress(data) {
+        const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.compressor_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
+     * @returns {Uint8Array}
+     */
+    decompress(data) {
+        const ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
+        const len0 = WASM_VECTOR_LEN;
+        const ret = wasm.decompressor_decompress(this.__wbg_ptr, ptr0, len0);
+        return takeObject(ret);
+    }
+}
+
+async function __wbg_load(module, imports) {
+    if (typeof Response === 'function' && module instanceof Response) {
+        if (typeof WebAssembly.instantiateStreaming === 'function') {
+            try {
+                return await WebAssembly.instantiateStreaming(module, imports);
+
+            } catch (e) {
+                if (module.headers.get('Content-Type') != 'application/wasm') {
+                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+
+                } else {
+                    throw e;
+                }
+            }
+        }
+
+        const bytes = await module.arrayBuffer();
+        return await WebAssembly.instantiate(bytes, imports);
+
+    } else {
+        const instance = await WebAssembly.instantiate(module, imports);
+
+        if (instance instanceof WebAssembly.Instance) {
+            return { instance, module };
+
+        } else {
+            return instance;
+        }
+    }
+}
+
+function __wbg_get_imports() {
+    const imports = {};
+    imports.wbg = {};
+    imports.wbg.__wbg_buffer_609cc3eee51ed158 = function(arg0) {
+        const ret = getObject(arg0).buffer;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_length_a446193dc22c12f8 = function(arg0) {
+        const ret = getObject(arg0).length;
+        return ret;
+    };
+    imports.wbg.__wbg_newwithbyteoffsetandlength_d97e637ebe145a9a = function(arg0, arg1, arg2) {
+        const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_newwithlength_a381634e90c276d4 = function(arg0) {
+        const ret = new Uint8Array(arg0 >>> 0);
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_set_65595bdd868b3009 = function(arg0, arg1, arg2) {
+        getObject(arg0).set(getObject(arg1), arg2 >>> 0);
+    };
+    imports.wbg.__wbindgen_memory = function() {
+        const ret = wasm.memory;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
+        takeObject(arg0);
+    };
+    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
+        throw new Error(getStringFromWasm0(arg0, arg1));
+    };
+
+    return imports;
+}
+
+function __wbg_init_memory(imports, memory) {
+
+}
+
+function __wbg_finalize_init(instance, module) {
+    wasm = instance.exports;
+    __wbg_init.__wbindgen_wasm_module = module;
+    cachedUint8ArrayMemory0 = null;
+
+
+
+    return wasm;
+}
+
+function initSync(module) {
+    if (wasm !== undefined) return wasm;
+
+
+    if (typeof module !== 'undefined') {
+        if (Object.getPrototypeOf(module) === Object.prototype) {
+            ({module} = module)
+        } else {
+            console.warn('using deprecated parameters for `initSync()`; pass a single object instead')
+        }
+    }
+
+    const imports = __wbg_get_imports();
+
+    __wbg_init_memory(imports);
+
+    if (!(module instanceof WebAssembly.Module)) {
+        module = new WebAssembly.Module(module);
+    }
+
+    const instance = new WebAssembly.Instance(module, imports);
+
+    return __wbg_finalize_init(instance, module);
+}
+
+async function __wbg_init(module_or_path) {
+    if (wasm !== undefined) return wasm;
+
+
+    if (typeof module_or_path !== 'undefined') {
+        if (Object.getPrototypeOf(module_or_path) === Object.prototype) {
+            ({module_or_path} = module_or_path)
+        } else {
+            console.warn('using deprecated parameters for the initialization function; pass a single object instead')
+        }
+    }
+
+    if (typeof module_or_path === 'undefined') {
+        module_or_path = new URL('waosm_bg.wasm', import.meta.url);
+    }
+    const imports = __wbg_get_imports();
+
+    if (typeof module_or_path === 'string' || (typeof Request === 'function' && module_or_path instanceof Request) || (typeof URL === 'function' && module_or_path instanceof URL)) {
+        module_or_path = fetch(module_or_path);
+    }
+
+    __wbg_init_memory(imports);
+
+    const { instance, module } = await __wbg_load(await module_or_path, imports);
+
+    return __wbg_finalize_init(instance, module);
+}
+
+export { initSync };
+export default __wbg_init;

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

@@ -0,0 +1,10 @@
+/* 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 __wbindgen_malloc: (a: number, b: number) => number;