wao 0.11.1 → 0.11.2

package/cjs/aoconnect-base.js

@@ -1301,7 +1301,7 @@ var _default = exports["default"] = function _default() {
                   break;
                 }
                 _context11.next = 25;
-                return mem.getWasm(p.modulea);
+                return mem.getWasm(p.module);
               case 25:
                 _yield$mem$getWasm3 = _context11.sent;
                 format = _yield$mem$getWasm3.format;

package/cjs/armem-base.js

@@ -25,6 +25,27 @@ function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r),
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var Arweave = (_Arweave$default = _arweave["default"]["default"]) !== null && _Arweave$default !== void 0 ? _Arweave$default : _arweave["default"];
+function eq(buf1, buf2) {
+  var chunkSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1024 * 1024;
+  if (buf1.byteLength !== buf2.byteLength) return false;
+  var view1 = new Uint8Array(buf1);
+  var view2 = new Uint8Array(buf2);
+  var _loop = function _loop() {
+      var slice1 = view1.subarray(i, i + chunkSize);
+      var slice2 = view2.subarray(i, i + chunkSize);
+      if (!slice1.every(function (val, idx) {
+        return val === slice2[idx];
+      })) return {
+        v: false
+      };
+    },
+    _ret;
+  for (var i = 0; i < buf1.byteLength; i += chunkSize) {
+    _ret = _loop();
+    if (_ret) return _ret.v;
+  }
+  return true;
+}
 var ArMemBase = exports["default"] = /*#__PURE__*/function () {
   function ArMemBase() {
     var _this = this;
@@ -36,13 +57,11 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       scheduler = _ref.scheduler,
       cache = _ref.cache,
       init = _ref.init,
-      Compressor = _ref.Compressor,
-      Decompressor = _ref.Decompressor;
+      Waosm = _ref.Waosm;
     _classCallCheck(this, ArMemBase);
     this.__type__ = "mem";
     this._init = init;
-    this.Compressor = Compressor;
-    this.Decompressor = Decompressor;
+    this.Waosm = Waosm;
     this.isInit = false;
     this.keyInit = false;
     this.keys = {};
@@ -139,35 +158,36 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
               _context3.next = 7;
               return this.db.put("".concat(key), this[key]);
             case 7:
-              _context3.next = 21;
+              _context3.next = 22;
               break;
             case 9:
               (_this$key2 = this[key]) !== null && _this$key2 !== void 0 ? _this$key2 : this[key] = {};
               this[key][field] = val;
               if (!this.db) {
-                _context3.next = 21;
+                _context3.next = 22;
                 break;
               }
               if (!(key === "env")) {
-                _context3.next = 19;
+                _context3.next = 20;
                 break;
               }
               memory = val.memory;
               try {
-                memory = Array.from(this.compressor.compress(val.memory));
+                memory = this.waosm.compress(val.memory);
               } catch (e) {
                 console.log(e);
                 memory = (0, _compress.compress)(val.memory);
               }
-              _context3.next = 17;
+              this[key][field].original_size = val.memory.length;
+              _context3.next = 18;
               return this.db.put("".concat(key, ".").concat(field), (0, _ramda.assoc)("memory", memory, this[key][field]));
-            case 17:
-              _context3.next = 21;
+            case 18:
+              _context3.next = 22;
               break;
-            case 19:
-              _context3.next = 21;
+            case 20:
+              _context3.next = 22;
               return this.db.put("".concat(key, ".").concat(field), this[key][field]);
-            case 21:
+            case 22:
             case "end":
               return _context3.stop();
           }
@@ -310,136 +330,136 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
               _context5.next = 6;
               return this._init();
             case 6:
-              this.compressor = new this.Compressor();
-              this.decompressor = new this.Decompressor();
+              this.waosm = new this.Waosm();
               if (!this.db) {
-                _context5.next = 59;
+                _context5.next = 58;
                 break;
               }
               _i = 0, _arr = ["height", "blocks"];
-            case 10:
+            case 9:
               if (!(_i < _arr.length)) {
-                _context5.next = 18;
+                _context5.next = 17;
                 break;
               }
               v = _arr[_i];
-              _context5.next = 14;
+              _context5.next = 13;
               return this.get(v);
-            case 14:
+            case 13:
               this[v] = _context5.sent;
-            case 15:
+            case 14:
               _i++;
-              _context5.next = 10;
+              _context5.next = 9;
               break;
-            case 18:
+            case 17:
               _i2 = 0, _arr2 = ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
-            case 19:
+            case 18:
               if (!(_i2 < _arr2.length)) {
-                _context5.next = 57;
+                _context5.next = 56;
                 break;
               }
               _v = _arr2[_i2];
               (_this$_v = this[_v]) !== null && _this$_v !== void 0 ? _this$_v : this[_v] = {};
-              _context5.next = 24;
+              _context5.next = 23;
               return this.db.getKeys({
                 start: _v,
                 end: _v + "a"
               });
-            case 24:
+            case 23:
               items = _context5.sent;
               _iterator = _createForOfIteratorHelper(items || []);
-              _context5.prev = 26;
+              _context5.prev = 25;
               _iterator.s();
-            case 28:
+            case 27:
               if ((_step = _iterator.n()).done) {
-                _context5.next = 46;
+                _context5.next = 45;
                 break;
               }
               v2 = _step.value;
               key = v2.split(".")[0];
               field = v2.split(".")[1];
               if (!(key === _v)) {
-                _context5.next = 44;
+                _context5.next = 43;
                 break;
               }
               if (!key.match(/^env/)) {
-                _context5.next = 41;
+                _context5.next = 40;
                 break;
               }
-              _context5.next = 36;
+              _context5.next = 35;
               return this.db.get(v2);
-            case 36:
+            case 35:
               v3 = _context5.sent;
-              if ((0, _ramda.is)(Array, v3.memory)) {
+              if ((0, _ramda.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 = (0, _compress.decompress)(v3.memory);
                 }
               }
               this[_v][field] = v3;
-              _context5.next = 44;
-              break;
-            case 41:
               _context5.next = 43;
+              break;
+            case 40:
+              _context5.next = 42;
               return this.db.get(v2);
-            case 43:
+            case 42:
               this[_v][field] = _context5.sent;
-            case 44:
-              _context5.next = 28;
+            case 43:
+              _context5.next = 27;
               break;
-            case 46:
-              _context5.next = 51;
+            case 45:
+              _context5.next = 50;
               break;
-            case 48:
-              _context5.prev = 48;
-              _context5.t0 = _context5["catch"](26);
+            case 47:
+              _context5.prev = 47;
+              _context5.t0 = _context5["catch"](25);
               _iterator.e(_context5.t0);
-            case 51:
-              _context5.prev = 51;
+            case 50:
+              _context5.prev = 50;
               _iterator.f();
-              return _context5.finish(51);
-            case 54:
+              return _context5.finish(50);
+            case 53:
               _i2++;
-              _context5.next = 19;
+              _context5.next = 18;
               break;
-            case 57:
-              _context5.next = 75;
+            case 56:
+              _context5.next = 74;
               break;
-            case 59:
+            case 58:
               _i3 = 0, _arr3 = ["height", "blocks"];
-            case 60:
+            case 59:
               if (!(_i3 < _arr3.length)) {
-                _context5.next = 67;
+                _context5.next = 66;
                 break;
               }
               _v2 = _arr3[_i3];
-              _context5.next = 64;
+              _context5.next = 63;
               return this.set(this[_v2], _v2);
-            case 64:
+            case 63:
               _i3++;
-              _context5.next = 60;
+              _context5.next = 59;
               break;
-            case 67:
+            case 66:
               _i4 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
-            case 68:
+            case 67:
               if (!(_i4 < _arr4.length)) {
-                _context5.next = 75;
+                _context5.next = 74;
                 break;
               }
               _v3 = _arr4[_i4];
-              _context5.next = 72;
+              _context5.next = 71;
               return this.putAll(_v3);
-            case 72:
+            case 71:
               _i4++;
-              _context5.next = 68;
+              _context5.next = 67;
               break;
-            case 75:
+            case 74:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[26, 48, 51, 54]]);
+        }, _callee5, this, [[25, 47, 50, 53]]);
       }));
       function init() {
         return _init.apply(this, arguments);

package/cjs/armem-web.js

@@ -37,10 +37,9 @@ var ArMem = exports["default"] = /*#__PURE__*/function (_Base) {
     _classCallCheck(this, ArMem);
     _this = _callSuper(this, ArMem, [_objectSpread(_objectSpread({}, args), {}, {
       init: _waosm["default"],
-      Compressor: _waosm.Compressor,
-      Decompressor: _waosm.Decompressor
+      Waosm: _waosm.Waosm
     })]);
-    //this.db = db(this)
+    _this.db = (0, _lfdb["default"])(_this);
     _this.initSync();
     return _this;
   }

package/cjs/armem.js

@@ -39,8 +39,7 @@ var ArMem = exports["default"] = /*#__PURE__*/function (_Base) {
     _classCallCheck(this, ArMem);
     var cache = args.cache;
     _this = _callSuper(this, ArMem, [_objectSpread(_objectSpread({}, args), {}, {
-      Compressor: _waosmNode.Compressor,
-      Decompressor: _waosmNode.Decompressor
+      Waosm: _waosmNode.Waosm
     })]);
     if (cache) _this.db = (0, _lmdb.open)({
       path: cache,

package/cjs/compress.js

@@ -135,7 +135,6 @@ var decompress = exports.decompress = function 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/cjs/waosm/waosm.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Decompressor = exports.Compressor = void 0;
+exports["default"] = exports.Waosm = void 0;
 exports.initSync = initSync;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -68,86 +68,57 @@ function passArray8ToWasm0(arg, malloc) {
   WASM_VECTOR_LEN = arg.length;
   return ptr;
 }
-var CompressorFinalization = typeof FinalizationRegistry === 'undefined' ? {
+var WaosmFinalization = typeof FinalizationRegistry === 'undefined' ? {
   register: function register() {},
   unregister: function unregister() {}
 } : new FinalizationRegistry(function (ptr) {
-  return wasm.__wbg_compressor_free(ptr >>> 0, 1);
+  return wasm.__wbg_waosm_free(ptr >>> 0, 1);
 });
-var Compressor = exports.Compressor = /*#__PURE__*/function () {
-  function Compressor() {
-    _classCallCheck(this, Compressor);
-    var ret = wasm.compressor_new();
+var Waosm = exports.Waosm = /*#__PURE__*/function () {
+  function Waosm() {
+    _classCallCheck(this, Waosm);
+    var 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;
   }
   /**
    * @param {Uint8Array} data
    * @returns {Uint8Array}
    */
-  return _createClass(Compressor, [{
+  return _createClass(Waosm, [{
     key: "__destroy_into_raw",
     value: function __destroy_into_raw() {
       var ptr = this.__wbg_ptr;
       this.__wbg_ptr = 0;
-      CompressorFinalization.unregister(this);
+      WaosmFinalization.unregister(this);
       return ptr;
     }
   }, {
     key: "free",
     value: function free() {
       var ptr = this.__destroy_into_raw();
-      wasm.__wbg_compressor_free(ptr, 0);
+      wasm.__wbg_waosm_free(ptr, 0);
     }
   }, {
     key: "compress",
     value: function compress(data) {
       var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
       var len0 = WASM_VECTOR_LEN;
-      var ret = wasm.compressor_compress(this.__wbg_ptr, ptr0, len0);
+      var ret = wasm.waosm_compress(this.__wbg_ptr, ptr0, len0);
       return takeObject(ret);
     }
-  }]);
-}();
-var DecompressorFinalization = typeof FinalizationRegistry === 'undefined' ? {
-  register: function register() {},
-  unregister: function unregister() {}
-} : new FinalizationRegistry(function (ptr) {
-  return wasm.__wbg_decompressor_free(ptr >>> 0, 1);
-});
-var Decompressor = exports.Decompressor = /*#__PURE__*/function () {
-  function Decompressor() {
-    _classCallCheck(this, Decompressor);
-    var ret = wasm.compressor_new();
-    this.__wbg_ptr = ret >>> 0;
-    DecompressorFinalization.register(this, this.__wbg_ptr, this);
-    return this;
-  }
-  /**
-   * @param {Uint8Array} data
-   * @returns {Uint8Array}
-   */
-  return _createClass(Decompressor, [{
-    key: "__destroy_into_raw",
-    value: function __destroy_into_raw() {
-      var ptr = this.__wbg_ptr;
-      this.__wbg_ptr = 0;
-      DecompressorFinalization.unregister(this);
-      return ptr;
-    }
-  }, {
-    key: "free",
-    value: function free() {
-      var ptr = this.__destroy_into_raw();
-      wasm.__wbg_decompressor_free(ptr, 0);
-    }
+    /**
+     * @param {Uint8Array} data
+     * @param {number} decompressed_size
+     * @returns {Uint8Array}
+     */
   }, {
     key: "decompress",
-    value: function decompress(data) {
+    value: function decompress(data, decompressed_size) {
       var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
       var len0 = WASM_VECTOR_LEN;
-      var ret = wasm.decompressor_decompress(this.__wbg_ptr, ptr0, len0);
+      var ret = wasm.waosm_decompress(this.__wbg_ptr, ptr0, len0, decompressed_size);
       return takeObject(ret);
     }
   }]);

package/cjs/waosm-node/waosm_bg.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Decompressor = exports.Compressor = void 0;
+exports.Waosm = void 0;
 exports.__wbg_buffer_609cc3eee51ed158 = __wbg_buffer_609cc3eee51ed158;
 exports.__wbg_length_a446193dc22c12f8 = __wbg_length_a446193dc22c12f8;
 exports.__wbg_newwithbyteoffsetandlength_d97e637ebe145a9a = __wbg_newwithbyteoffsetandlength_d97e637ebe145a9a;
@@ -70,86 +70,57 @@ function passArray8ToWasm0(arg, malloc) {
   WASM_VECTOR_LEN = arg.length;
   return ptr;
 }
-var CompressorFinalization = typeof FinalizationRegistry === 'undefined' ? {
+var WaosmFinalization = typeof FinalizationRegistry === 'undefined' ? {
   register: function register() {},
   unregister: function unregister() {}
 } : new FinalizationRegistry(function (ptr) {
-  return wasm.__wbg_compressor_free(ptr >>> 0, 1);
+  return wasm.__wbg_waosm_free(ptr >>> 0, 1);
 });
-var Compressor = exports.Compressor = /*#__PURE__*/function () {
-  function Compressor() {
-    _classCallCheck(this, Compressor);
-    var ret = wasm.compressor_new();
+var Waosm = exports.Waosm = /*#__PURE__*/function () {
+  function Waosm() {
+    _classCallCheck(this, Waosm);
+    var 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;
   }
   /**
    * @param {Uint8Array} data
    * @returns {Uint8Array}
    */
-  return _createClass(Compressor, [{
+  return _createClass(Waosm, [{
     key: "__destroy_into_raw",
     value: function __destroy_into_raw() {
       var ptr = this.__wbg_ptr;
       this.__wbg_ptr = 0;
-      CompressorFinalization.unregister(this);
+      WaosmFinalization.unregister(this);
       return ptr;
     }
   }, {
     key: "free",
     value: function free() {
       var ptr = this.__destroy_into_raw();
-      wasm.__wbg_compressor_free(ptr, 0);
+      wasm.__wbg_waosm_free(ptr, 0);
     }
   }, {
     key: "compress",
     value: function compress(data) {
       var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
       var len0 = WASM_VECTOR_LEN;
-      var ret = wasm.compressor_compress(this.__wbg_ptr, ptr0, len0);
+      var ret = wasm.waosm_compress(this.__wbg_ptr, ptr0, len0);
       return takeObject(ret);
     }
-  }]);
-}();
-var DecompressorFinalization = typeof FinalizationRegistry === 'undefined' ? {
-  register: function register() {},
-  unregister: function unregister() {}
-} : new FinalizationRegistry(function (ptr) {
-  return wasm.__wbg_decompressor_free(ptr >>> 0, 1);
-});
-var Decompressor = exports.Decompressor = /*#__PURE__*/function () {
-  function Decompressor() {
-    _classCallCheck(this, Decompressor);
-    var ret = wasm.compressor_new();
-    this.__wbg_ptr = ret >>> 0;
-    DecompressorFinalization.register(this, this.__wbg_ptr, this);
-    return this;
-  }
-  /**
-   * @param {Uint8Array} data
-   * @returns {Uint8Array}
-   */
-  return _createClass(Decompressor, [{
-    key: "__destroy_into_raw",
-    value: function __destroy_into_raw() {
-      var ptr = this.__wbg_ptr;
-      this.__wbg_ptr = 0;
-      DecompressorFinalization.unregister(this);
-      return ptr;
-    }
-  }, {
-    key: "free",
-    value: function free() {
-      var ptr = this.__destroy_into_raw();
-      wasm.__wbg_decompressor_free(ptr, 0);
-    }
+    /**
+     * @param {Uint8Array} data
+     * @param {number} decompressed_size
+     * @returns {Uint8Array}
+     */
   }, {
     key: "decompress",
-    value: function decompress(data) {
+    value: function decompress(data, decompressed_size) {
       var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
       var len0 = WASM_VECTOR_LEN;
-      var ret = wasm.decompressor_decompress(this.__wbg_ptr, ptr0, len0);
+      var ret = wasm.waosm_decompress(this.__wbg_ptr, ptr0, len0, decompressed_size);
       return takeObject(ret);
     }
   }]);

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,11 +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]),
@@ -155,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 [
@@ -178,9 +192,10 @@ 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,12 +1,12 @@
 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 })
-    //this.db = db(this)
+    super({ ...args, init, Waosm })
+    this.db = db(this)
     this.initSync()
   }
   async _getWasm(file) {

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/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/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"