wao 0.18.3 → 0.18.5

package/cjs/aoconnect-base.js

@@ -323,6 +323,7 @@ var _default = exports["default"] = function _default() {
           res,
           memory,
           p,
+          __msg,
           _opt$data,
           _yield$mem$get$data,
           _yield$mem$get,
@@ -508,127 +509,130 @@ var _default = exports["default"] = function _default() {
                 height: 0,
                 results: [id]
               };
+              __msg = null;
               if (!memory) {
-                _context3.next = 89;
+                _context3.next = 90;
                 break;
               }
-              _context3.next = 130;
+              _context3.next = 132;
               break;
-            case 89:
+            case 90:
               if (!(_tags["On-Boot"] || true)) {
-                _context3.next = 129;
+                _context3.next = 131;
                 break;
               }
               data = "";
               if (!(_tags["On-Boot"] === "Data")) {
-                _context3.next = 95;
+                _context3.next = 96;
                 break;
               }
               data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";
-              _context3.next = 116;
+              _context3.next = 117;
               break;
-            case 95:
-              _context3.next = 97;
+            case 96:
+              _context3.next = 98;
               return mem.get("msgs", _tags["On-Boot"]);
-            case 97:
+            case 98:
               _context3.t10 = _yield$mem$get = _context3.sent;
               _context3.t9 = _context3.t10 === null;
               if (_context3.t9) {
-                _context3.next = 101;
+                _context3.next = 102;
                 break;
               }
               _context3.t9 = _yield$mem$get === void 0;
-            case 101:
+            case 102:
               if (!_context3.t9) {
-                _context3.next = 105;
+                _context3.next = 106;
                 break;
               }
               _context3.t11 = void 0;
-              _context3.next = 106;
+              _context3.next = 107;
               break;
-            case 105:
-              _context3.t11 = _yield$mem$get.data;
             case 106:
+              _context3.t11 = _yield$mem$get.data;
+            case 107:
               _context3.t12 = _yield$mem$get$data = _context3.t11;
               _context3.t8 = _context3.t12 !== null;
               if (!_context3.t8) {
-                _context3.next = 110;
+                _context3.next = 111;
                 break;
               }
               _context3.t8 = _yield$mem$get$data !== void 0;
-            case 110:
+            case 111:
               if (!_context3.t8) {
-                _context3.next = 114;
+                _context3.next = 115;
                 break;
               }
               _context3.t13 = _yield$mem$get$data;
-              _context3.next = 115;
+              _context3.next = 116;
               break;
-            case 114:
-              _context3.t13 = "";
             case 115:
-              data = _context3.t13;
+              _context3.t13 = "";
             case 116:
-              _context3.next = 118;
+              data = _context3.t13;
+            case 117:
+              _context3.next = 119;
               return genMsg(id, p, data, opt.tags, owner, msg_owner, true);
-            case 118:
+            case 119:
               msg = _context3.sent;
-              _context3.next = 121;
+              __msg = msg;
+              _context3.next = 123;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 121:
+            case 123:
               _env = _context3.sent;
-              _context3.next = 124;
+              _context3.next = 126;
               return _module.handle(null, msg, _env);
-            case 124:
+            case 126:
               res = _context3.sent;
               p.memory = res.Memory;
               delete res.Memory;
-              _context3.next = 130;
+              _context3.next = 132;
               break;
-            case 129:
+            case 131:
               p.height += 1;
-            case 130:
+            case 132:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.o)((0, _ramda.dissoc)("signer"), (0, _ramda.dissoc)("memory"))(opt)), {}, {
-                res: res
+                res: res,
+                msg: __msg
               });
-              _context3.next = 133;
+              _context3.next = 135;
               return mem.set(_msg, "msgs", id);
-            case 133:
+            case 135:
               if (!_tags["Cron-Interval"]) {
-                _context3.next = 157;
+                _context3.next = 159;
                 break;
               }
               _tags$CronInterval$s = _tags["Cron-Interval"].split("-"), _tags$CronInterval$s2 = _slicedToArray(_tags$CronInterval$s, 2), num = _tags$CronInterval$s2[0], unit = _tags$CronInterval$s2[1];
               _int = 0;
               _context3.t14 = unit.replace(/s$/, "");
-              _context3.next = _context3.t14 === "millisecond" ? 139 : _context3.t14 === "second" ? 141 : _context3.t14 === "minute" ? 143 : _context3.t14 === "hour" ? 145 : _context3.t14 === "day" ? 147 : _context3.t14 === "month" ? 149 : _context3.t14 === "year" ? 151 : 153;
+              _context3.next = _context3.t14 === "millisecond" ? 141 : _context3.t14 === "second" ? 143 : _context3.t14 === "minute" ? 145 : _context3.t14 === "hour" ? 147 : _context3.t14 === "day" ? 149 : _context3.t14 === "month" ? 151 : _context3.t14 === "year" ? 153 : 155;
               break;
-            case 139:
-              _int = num;
-              return _context3.abrupt("break", 153);
             case 141:
-              _int = num * 1000;
-              return _context3.abrupt("break", 153);
+              _int = num;
+              return _context3.abrupt("break", 155);
             case 143:
-              _int = num * 1000 * 60;
-              return _context3.abrupt("break", 153);
+              _int = num * 1000;
+              return _context3.abrupt("break", 155);
             case 145:
-              _int = num * 1000 * 60 * 60;
-              return _context3.abrupt("break", 153);
+              _int = num * 1000 * 60;
+              return _context3.abrupt("break", 155);
             case 147:
-              _int = num * 1000 * 60 * 60 * 24;
-              return _context3.abrupt("break", 153);
+              _int = num * 1000 * 60 * 60;
+              return _context3.abrupt("break", 155);
             case 149:
-              _int = num * 1000 * 60 * 60 * 24 * 30;
-              return _context3.abrupt("break", 153);
+              _int = num * 1000 * 60 * 60 * 24;
+              return _context3.abrupt("break", 155);
             case 151:
-              _int = num * 1000 * 60 * 60 * 24 * 365;
-              return _context3.abrupt("break", 153);
+              _int = num * 1000 * 60 * 60 * 24 * 30;
+              return _context3.abrupt("break", 155);
             case 153:
+              _int = num * 1000 * 60 * 60 * 24 * 365;
+              return _context3.abrupt("break", 155);
+            case 155:
               cronTags = [];
               for (_k in _tags) {
                 if (/^Cron-Tag-/.test(_k)) {
@@ -640,13 +644,13 @@ var _default = exports["default"] = function _default() {
               }
               p.cronTags = cronTags;
               p.span = _int;
-            case 157:
-              _context3.next = 159;
-              return mem.set(p, "env", id);
             case 159:
+              _context3.next = 161;
+              return mem.set(p, "env", id);
+            case 161:
               delete ongoing[id];
               return _context3.abrupt("return", id);
-            case 161:
+            case 163:
             case "end":
               return _context3.stop();
           }
@@ -851,7 +855,8 @@ var _default = exports["default"] = function _default() {
               return mem.set(p, "env", opt.process);
             case 98:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
-                res: res
+                res: res,
+                msg: msg
               });
               _context4.next = 101;
               return mem.set(_msg, "msgs", opt.message);
@@ -1257,7 +1262,8 @@ var _default = exports["default"] = function _default() {
               return mem.set(p, "env", opt.process);
             case 135:
               _msg2 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
-                res: res
+                res: res,
+                msg: msg
               });
               _context5.next = 138;
               return mem.set(_msg2, "msgs", id);

package/cjs/armem-base.js

@@ -325,7 +325,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
     key: "init",
     value: function () {
       var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _i, _arr, v, _i2, _arr2, _this$_v, _v, items, _iterator, _step, v2, key, field, v3, _i3, _arr3, _v2, _i4, _arr4, _v3;
+        var _i, _arr, v, val, _i2, _arr2, _this$_v, _v, items, _iterator, _step, v2, key, field, v3, _i3, _arr3, _v2, _i4, _arr4, _v3;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -344,128 +344,129 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
               return this._init();
             case 6:
               if (!this.db) {
-                _context5.next = 57;
+                _context5.next = 58;
                 break;
               }
               _i = 0, _arr = ["height", "blocks"];
             case 8:
               if (!(_i < _arr.length)) {
-                _context5.next = 16;
+                _context5.next = 17;
                 break;
               }
               v = _arr[_i];
               _context5.next = 12;
-              return this.get(v);
+              return this.db.get(v);
             case 12:
-              this[v] = _context5.sent;
-            case 13:
+              val = _context5.sent;
+              if (val) this[v] = val;
+            case 14:
               _i++;
               _context5.next = 8;
               break;
-            case 16:
-              _i2 = 0, _arr2 = ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
             case 17:
+              _i2 = 0, _arr2 = ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
+            case 18:
               if (!(_i2 < _arr2.length)) {
-                _context5.next = 55;
+                _context5.next = 56;
                 break;
               }
               _v = _arr2[_i2];
               (_this$_v = this[_v]) !== null && _this$_v !== void 0 ? _this$_v : this[_v] = {};
-              _context5.next = 22;
+              _context5.next = 23;
               return this.db.getKeys({
                 start: _v,
                 end: _v + "a"
               });
-            case 22:
+            case 23:
               items = _context5.sent;
               _iterator = _createForOfIteratorHelper(items || []);
-              _context5.prev = 24;
+              _context5.prev = 25;
               _iterator.s();
-            case 26:
+            case 27:
               if ((_step = _iterator.n()).done) {
-                _context5.next = 44;
+                _context5.next = 45;
                 break;
               }
               v2 = _step.value;
               key = v2.split(".")[0];
               field = v2.split(".")[1];
               if (!(key === _v)) {
-                _context5.next = 42;
+                _context5.next = 43;
                 break;
               }
               if (!key.match(/^env/)) {
-                _context5.next = 39;
+                _context5.next = 40;
                 break;
               }
-              _context5.next = 34;
+              _context5.next = 35;
               return this.db.get(v2);
-            case 34:
+            case 35:
               v3 = _context5.sent;
               if ((0, _ramda.is)(Uint8Array, v3.memory)) {
                 v3.compressed = true;
               }
               this[_v][field] = v3;
-              _context5.next = 42;
+              _context5.next = 43;
               break;
-            case 39:
-              _context5.next = 41;
+            case 40:
+              _context5.next = 42;
               return this.db.get(v2);
-            case 41:
-              this[_v][field] = _context5.sent;
             case 42:
-              _context5.next = 26;
+              this[_v][field] = _context5.sent;
+            case 43:
+              _context5.next = 27;
               break;
-            case 44:
-              _context5.next = 49;
+            case 45:
+              _context5.next = 50;
               break;
-            case 46:
-              _context5.prev = 46;
-              _context5.t0 = _context5["catch"](24);
+            case 47:
+              _context5.prev = 47;
+              _context5.t0 = _context5["catch"](25);
               _iterator.e(_context5.t0);
-            case 49:
-              _context5.prev = 49;
+            case 50:
+              _context5.prev = 50;
               _iterator.f();
-              return _context5.finish(49);
-            case 52:
+              return _context5.finish(50);
+            case 53:
               _i2++;
-              _context5.next = 17;
+              _context5.next = 18;
               break;
-            case 55:
-              _context5.next = 73;
+            case 56:
+              _context5.next = 74;
               break;
-            case 57:
-              _i3 = 0, _arr3 = ["height", "blocks"];
             case 58:
+              _i3 = 0, _arr3 = ["height", "blocks"];
+            case 59:
               if (!(_i3 < _arr3.length)) {
-                _context5.next = 65;
+                _context5.next = 66;
                 break;
               }
               _v2 = _arr3[_i3];
-              _context5.next = 62;
+              _context5.next = 63;
               return this.set(this[_v2], _v2);
-            case 62:
+            case 63:
               _i3++;
-              _context5.next = 58;
+              _context5.next = 59;
               break;
-            case 65:
-              _i4 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
             case 66:
+              _i4 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
+            case 67:
               if (!(_i4 < _arr4.length)) {
-                _context5.next = 73;
+                _context5.next = 74;
                 break;
               }
               _v3 = _arr4[_i4];
-              _context5.next = 70;
+              _context5.next = 71;
               return this.putAll(_v3);
-            case 70:
+            case 71:
               _i4++;
-              _context5.next = 66;
+              _context5.next = 67;
               break;
-            case 73:
+            case 74:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[24, 46, 49, 52]]);
+        }, _callee5, this, [[25, 47, 50, 53]]);
       }));
       function init() {
         return _init.apply(this, arguments);

package/esm/aoconnect-base.js

@@ -199,6 +199,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         height: 0,
         results: [id],
       }
+      let __msg = null
       if (memory) {
         // forking...
       } else if (_tags["On-Boot"] || true) {
@@ -206,6 +207,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
         else data = (await mem.get("msgs", _tags["On-Boot"]))?.data ?? ""
         let msg = await genMsg(id, p, data, opt.tags, owner, msg_owner, true)
+        __msg = msg
         const _env = await genEnv({
           pid: p.id,
           owner: p.owner,
@@ -217,7 +219,11 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       } else {
         p.height += 1
       }
-      const _msg = { ...o(dissoc("signer"), dissoc("memory"))(opt), res }
+      const _msg = {
+        ...o(dissoc("signer"), dissoc("memory"))(opt),
+        res,
+        msg: __msg,
+      }
       await mem.set(_msg, "msgs", id)
       if (_tags["Cron-Interval"]) {
         let [num, unit] = _tags["Cron-Interval"].split("-")
@@ -349,7 +355,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         delete res.Memory
         p.results.push(opt.message)
         await mem.set(p, "env", opt.process)
-        const _msg = { ...dissoc("signer", _opt), res }
+        const _msg = { ...dissoc("signer", _opt), res, msg }
         await mem.set(_msg, "msgs", opt.message)
         for (const v of res.Messages ?? []) {
           if (await mem.get("env", v.Target)) {
@@ -486,7 +492,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           delete res.Memory
           p.results.push(id)
           await mem.set(p, "env", opt.process)
-          const _msg = { ...dissoc("signer", _opt), res }
+          const _msg = { ...dissoc("signer", _opt), res, msg }
           await mem.set(_msg, "msgs", id)
         } catch (e) {
           console.log(e)

package/esm/armem-base.js

@@ -173,7 +173,10 @@ export default class ArMemBase {
     this.isInit = true
     if (typeof this._init === "function") await this._init()
     if (this.db) {
-      for (const v of ["height", "blocks"]) this[v] = await this.get(v)
+      for (const v of ["height", "blocks"]) {
+        const val = await this.db.get(v)
+        if (val) this[v] = val
+      }
       for (const v of [
         "items",
         "txs",

package/package.json

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