wao 0.13.7 → 0.14.0

package/cjs/aoconnect-base.js

@@ -21,9 +21,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 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); }
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
@@ -99,15 +99,33 @@ var _default = exports["default"] = function _default() {
       });
       return output;
     };
+    var capitalize = function capitalize(__tags) {
+      var cap = {
+        authority: "Authority",
+        action: "Action",
+        "on-boot": "On-Boot",
+        scheduler: "Scheduler",
+        module: "Module"
+      };
+      var _iterator = _createForOfIteratorHelper(__tags),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var _cap$v$name;
+          var v = _step.value;
+          v.name = (_cap$v$name = cap[v.name]) !== null && _cap$v$name !== void 0 ? _cap$v$name : v.name;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      return __tags;
+    };
     var genMsg = /*#__PURE__*/function () {
       var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(Id, p, data, Tags, from, Owner) {
         var dry,
           __tags,
-          cap,
-          _iterator,
-          _step,
-          _cap$v$name,
-          v,
           _args = arguments;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -115,36 +133,18 @@ var _default = exports["default"] = function _default() {
               dry = _args.length > 6 && _args[6] !== undefined ? _args[6] : false;
               if (!dry) p.height += 1;
               __tags = Tags !== null && Tags !== void 0 && Tags.length ? Tags : [];
-              cap = {
-                authority: "Authority",
-                action: "Action",
-                "on-boot": "On-Boot",
-                scheduler: "Scheduler",
-                module: "Module"
-              };
-              _iterator = _createForOfIteratorHelper(__tags);
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  v = _step.value;
-                  v.name = (_cap$v$name = cap[v.name]) !== null && _cap$v$name !== void 0 ? _cap$v$name : v.name;
-                }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
               _context.t0 = Id;
               _context.t1 = p.id;
               _context.t2 = Owner;
               _context.t3 = data !== null && data !== void 0 && data.length ? data : "";
-              _context.next = 12;
+              _context.next = 9;
               return mem.get("height");
-            case 12:
+            case 9:
               _context.t4 = _context.sent.toString();
               _context.t5 = Date.now().toString();
               _context.t6 = p.module;
               _context.t7 = from;
-              _context.t8 = __tags;
+              _context.t8 = capitalize(__tags);
               return _context.abrupt("return", {
                 Id: _context.t0,
                 Target: _context.t1,
@@ -157,7 +157,7 @@ var _default = exports["default"] = function _default() {
                 Cron: false,
                 Tags: _context.t8
               });
-            case 18:
+            case 15:
             case "end":
               return _context.stop();
           }
@@ -176,102 +176,106 @@ var _default = exports["default"] = function _default() {
             case 0:
               pid = _ref6.pid, _ref6$owner = _ref6.owner, owner = _ref6$owner === void 0 ? "" : _ref6$owner, _ref6$module = _ref6.module, module = _ref6$module === void 0 ? "" : _ref6$module;
               _context2.t0 = pid;
-              _context2.next = 4;
+              _context2.t1 = capitalize;
+              _context2.next = 5;
               return mem.getTx(pid);
-            case 4:
-              _context2.t3 = _yield$mem$getTx = _context2.sent;
-              _context2.t2 = _context2.t3 === null;
-              if (_context2.t2) {
-                _context2.next = 8;
+            case 5:
+              _context2.t4 = _yield$mem$getTx = _context2.sent;
+              _context2.t3 = _context2.t4 === null;
+              if (_context2.t3) {
+                _context2.next = 9;
                 break;
               }
-              _context2.t2 = _yield$mem$getTx === void 0;
-            case 8:
-              if (!_context2.t2) {
-                _context2.next = 12;
+              _context2.t3 = _yield$mem$getTx === void 0;
+            case 9:
+              if (!_context2.t3) {
+                _context2.next = 13;
                 break;
               }
-              _context2.t4 = void 0;
-              _context2.next = 13;
+              _context2.t5 = void 0;
+              _context2.next = 14;
               break;
-            case 12:
-              _context2.t4 = _yield$mem$getTx.tags;
             case 13:
-              _context2.t5 = _yield$mem$getTx$tags = _context2.t4;
-              _context2.t1 = _context2.t5 !== null;
-              if (!_context2.t1) {
-                _context2.next = 17;
+              _context2.t5 = _yield$mem$getTx.tags;
+            case 14:
+              _context2.t6 = _yield$mem$getTx$tags = _context2.t5;
+              _context2.t2 = _context2.t6 !== null;
+              if (!_context2.t2) {
+                _context2.next = 18;
                 break;
               }
-              _context2.t1 = _yield$mem$getTx$tags !== void 0;
-            case 17:
-              if (!_context2.t1) {
-                _context2.next = 21;
+              _context2.t2 = _yield$mem$getTx$tags !== void 0;
+            case 18:
+              if (!_context2.t2) {
+                _context2.next = 22;
                 break;
               }
-              _context2.t6 = _yield$mem$getTx$tags;
-              _context2.next = 22;
+              _context2.t7 = _yield$mem$getTx$tags;
+              _context2.next = 23;
               break;
-            case 21:
-              _context2.t6 = [];
             case 22:
-              _context2.t7 = _context2.t6;
-              _context2.t8 = owner;
-              _context2.t9 = {
+              _context2.t7 = [];
+            case 23:
+              _context2.t8 = _context2.t7;
+              _context2.t9 = (0, _context2.t1)(_context2.t8);
+              _context2.t10 = owner;
+              _context2.t11 = {
                 Id: _context2.t0,
-                Tags: _context2.t7,
-                Owner: _context2.t8
+                Tags: _context2.t9,
+                Owner: _context2.t10
               };
-              _context2.t10 = module;
-              _context2.next = 28;
+              _context2.t12 = module;
+              _context2.t13 = capitalize;
+              _context2.next = 31;
               return mem.getTx(module);
-            case 28:
-              _context2.t13 = _yield$mem$getTx2 = _context2.sent;
-              _context2.t12 = _context2.t13 === null;
-              if (_context2.t12) {
-                _context2.next = 32;
+            case 31:
+              _context2.t16 = _yield$mem$getTx2 = _context2.sent;
+              _context2.t15 = _context2.t16 === null;
+              if (_context2.t15) {
+                _context2.next = 35;
                 break;
               }
-              _context2.t12 = _yield$mem$getTx2 === void 0;
-            case 32:
-              if (!_context2.t12) {
-                _context2.next = 36;
+              _context2.t15 = _yield$mem$getTx2 === void 0;
+            case 35:
+              if (!_context2.t15) {
+                _context2.next = 39;
                 break;
               }
-              _context2.t14 = void 0;
-              _context2.next = 37;
+              _context2.t17 = void 0;
+              _context2.next = 40;
               break;
-            case 36:
-              _context2.t14 = _yield$mem$getTx2.tags;
-            case 37:
-              _context2.t15 = _yield$mem$getTx$tags2 = _context2.t14;
-              _context2.t11 = _context2.t15 !== null;
-              if (!_context2.t11) {
-                _context2.next = 41;
+            case 39:
+              _context2.t17 = _yield$mem$getTx2.tags;
+            case 40:
+              _context2.t18 = _yield$mem$getTx$tags2 = _context2.t17;
+              _context2.t14 = _context2.t18 !== null;
+              if (!_context2.t14) {
+                _context2.next = 44;
                 break;
               }
-              _context2.t11 = _yield$mem$getTx$tags2 !== void 0;
-            case 41:
-              if (!_context2.t11) {
-                _context2.next = 45;
+              _context2.t14 = _yield$mem$getTx$tags2 !== void 0;
+            case 44:
+              if (!_context2.t14) {
+                _context2.next = 48;
                 break;
               }
-              _context2.t16 = _yield$mem$getTx$tags2;
-              _context2.next = 46;
+              _context2.t19 = _yield$mem$getTx$tags2;
+              _context2.next = 49;
               break;
-            case 45:
-              _context2.t16 = [];
-            case 46:
-              _context2.t17 = _context2.t16;
-              _context2.t18 = {
-                Id: _context2.t10,
-                Tags: _context2.t17
+            case 48:
+              _context2.t19 = [];
+            case 49:
+              _context2.t20 = _context2.t19;
+              _context2.t21 = (0, _context2.t13)(_context2.t20);
+              _context2.t22 = {
+                Id: _context2.t12,
+                Tags: _context2.t21
               };
               return _context2.abrupt("return", {
-                Process: _context2.t9,
-                Module: _context2.t18
+                Process: _context2.t11,
+                Module: _context2.t22
               });
-            case 49:
+            case 53:
             case "end":
               return _context2.stop();
           }
@@ -351,24 +355,23 @@ var _default = exports["default"] = function _default() {
               format = _yield$mem$getWasm.format;
               msg_owner = mu.addr;
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context3.next = 26;
+                _context3.next = 25;
                 break;
               }
-              ;
+              id = opt.http_msg.target;
               _context3.next = 16;
-              return ar.httpmsg(opt.http_msg);
+              return ar.httpmsg(opt.http_msg, id);
             case 16:
               _yield$ar$httpmsg = _context3.sent;
               owner = _yield$ar$httpmsg.owner;
               item = _yield$ar$httpmsg.item;
               __tags = _yield$ar$httpmsg.tags;
-              id = opt.http_msg.target;
               opt.tags = (0, _utils.buildTags)(null, __tags);
               opt.data = opt.http_msg.data;
               msg_owner = owner;
-              _context3.next = 43;
+              _context3.next = 42;
               break;
-            case 26:
+            case 25:
               opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags = opt.tags) !== null && _opt$tags !== void 0 ? _opt$tags : []), {
                 "Data-Protocol": "ao",
                 Variant: "ao.TN.1",
@@ -399,14 +402,14 @@ var _default = exports["default"] = function _default() {
                 name: "Pushed-For",
                 value: opt["for"]
               });
-              _context3.next = 34;
+              _context3.next = 33;
               return ar.dataitem({
                 item: opt.item,
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags)
               });
-            case 34:
+            case 33:
               _yield$ar$dataitem = _context3.sent;
               id = _yield$ar$dataitem.id;
               owner = _yield$ar$dataitem.owner;
@@ -414,23 +417,23 @@ var _default = exports["default"] = function _default() {
               __tags = _yield$ar$dataitem.tags;
               opt.tags = (0, _utils.buildTags)(null, __tags);
               if (opt.item) opt.data = _base64url["default"].decode(item.data);
-              _context3.next = 43;
+              _context3.next = 42;
               return ar.postItems(item, su.jwk);
-            case 43:
+            case 42:
               now = Date.now;
               t = (0, _utils.tags)(opt.tags);
               ext = t.Extension || "WeaveDrive";
               wdrive = extensions[ext];
               handle = null;
-              _context3.prev = 48;
+              _context3.prev = 47;
               _context3.t0 = AoLoader;
               _context3.t1 = wasm;
               _context3.t2 = format;
               _context3.t3 = wdrive;
               _context3.t4 = item;
-              _context3.next = 56;
+              _context3.next = 55;
               return mem.getTx(mod);
-            case 56:
+            case 55:
               _context3.t5 = _context3.sent;
               _context3.t6 = {
                 format: _context3.t2,
@@ -438,23 +441,23 @@ var _default = exports["default"] = function _default() {
                 spawn: _context3.t4,
                 module: _context3.t5
               };
-              _context3.next = 60;
+              _context3.next = 59;
               return (0, _context3.t0)(_context3.t1, _context3.t6);
-            case 60:
+            case 59:
               handle = _context3.sent;
-              _context3.next = 66;
+              _context3.next = 65;
               break;
-            case 63:
-              _context3.prev = 63;
-              _context3.t7 = _context3["catch"](48);
+            case 62:
+              _context3.prev = 62;
+              _context3.t7 = _context3["catch"](47);
               console.log(mod, _context3.t7);
-            case 66:
+            case 65:
               if (handle) {
-                _context3.next = 68;
+                _context3.next = 67;
                 break;
               }
               return _context3.abrupt("return", null);
-            case 68:
+            case 67:
               _module = null;
               _module = {
                 handle: handle,
@@ -478,126 +481,126 @@ var _default = exports["default"] = function _default() {
                 results: [id]
               };
               if (!memory) {
-                _context3.next = 78;
+                _context3.next = 77;
                 break;
               }
-              _context3.next = 119;
+              _context3.next = 118;
               break;
-            case 78:
+            case 77:
               if (!(_tags["On-Boot"] || true)) {
-                _context3.next = 118;
+                _context3.next = 117;
                 break;
               }
               data = "";
               if (!(_tags["On-Boot"] === "Data")) {
-                _context3.next = 84;
+                _context3.next = 83;
                 break;
               }
               data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";
-              _context3.next = 105;
+              _context3.next = 104;
               break;
-            case 84:
-              _context3.next = 86;
+            case 83:
+              _context3.next = 85;
               return mem.get("msgs", _tags["On-Boot"]);
-            case 86:
+            case 85:
               _context3.t10 = _yield$mem$get = _context3.sent;
               _context3.t9 = _context3.t10 === null;
               if (_context3.t9) {
-                _context3.next = 90;
+                _context3.next = 89;
                 break;
               }
               _context3.t9 = _yield$mem$get === void 0;
-            case 90:
+            case 89:
               if (!_context3.t9) {
-                _context3.next = 94;
+                _context3.next = 93;
                 break;
               }
               _context3.t11 = void 0;
-              _context3.next = 95;
+              _context3.next = 94;
               break;
-            case 94:
+            case 93:
               _context3.t11 = _yield$mem$get.data;
-            case 95:
+            case 94:
               _context3.t12 = _yield$mem$get$data = _context3.t11;
               _context3.t8 = _context3.t12 !== null;
               if (!_context3.t8) {
-                _context3.next = 99;
+                _context3.next = 98;
                 break;
               }
               _context3.t8 = _yield$mem$get$data !== void 0;
-            case 99:
+            case 98:
               if (!_context3.t8) {
-                _context3.next = 103;
+                _context3.next = 102;
                 break;
               }
               _context3.t13 = _yield$mem$get$data;
-              _context3.next = 104;
+              _context3.next = 103;
               break;
-            case 103:
+            case 102:
               _context3.t13 = "";
-            case 104:
+            case 103:
               data = _context3.t13;
-            case 105:
-              _context3.next = 107;
+            case 104:
+              _context3.next = 106;
               return genMsg(id, p, data, opt.tags, owner, msg_owner, true);
-            case 107:
+            case 106:
               msg = _context3.sent;
-              _context3.next = 110;
+              _context3.next = 109;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 110:
+            case 109:
               _env = _context3.sent;
-              _context3.next = 113;
+              _context3.next = 112;
               return _module.handle(null, msg, _env);
-            case 113:
+            case 112:
               res = _context3.sent;
               p.memory = res.Memory;
               delete res.Memory;
-              _context3.next = 119;
+              _context3.next = 118;
               break;
-            case 118:
+            case 117:
               p.height += 1;
-            case 119:
+            case 118:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.o)((0, _ramda.dissoc)("signer"), (0, _ramda.dissoc)("memory"))(opt)), {}, {
                 res: res
               });
-              _context3.next = 122;
+              _context3.next = 121;
               return mem.set(_msg, "msgs", id);
-            case 122:
+            case 121:
               if (!_tags["Cron-Interval"]) {
-                _context3.next = 146;
+                _context3.next = 145;
                 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" ? 128 : _context3.t14 === "second" ? 130 : _context3.t14 === "minute" ? 132 : _context3.t14 === "hour" ? 134 : _context3.t14 === "day" ? 136 : _context3.t14 === "month" ? 138 : _context3.t14 === "year" ? 140 : 142;
+              _context3.next = _context3.t14 === "millisecond" ? 127 : _context3.t14 === "second" ? 129 : _context3.t14 === "minute" ? 131 : _context3.t14 === "hour" ? 133 : _context3.t14 === "day" ? 135 : _context3.t14 === "month" ? 137 : _context3.t14 === "year" ? 139 : 141;
               break;
-            case 128:
+            case 127:
               _int = num;
-              return _context3.abrupt("break", 142);
-            case 130:
+              return _context3.abrupt("break", 141);
+            case 129:
               _int = num * 1000;
-              return _context3.abrupt("break", 142);
-            case 132:
+              return _context3.abrupt("break", 141);
+            case 131:
               _int = num * 1000 * 60;
-              return _context3.abrupt("break", 142);
-            case 134:
+              return _context3.abrupt("break", 141);
+            case 133:
               _int = num * 1000 * 60 * 60;
-              return _context3.abrupt("break", 142);
-            case 136:
+              return _context3.abrupt("break", 141);
+            case 135:
               _int = num * 1000 * 60 * 60 * 24;
-              return _context3.abrupt("break", 142);
-            case 138:
+              return _context3.abrupt("break", 141);
+            case 137:
               _int = num * 1000 * 60 * 60 * 24 * 30;
-              return _context3.abrupt("break", 142);
-            case 140:
+              return _context3.abrupt("break", 141);
+            case 139:
               _int = num * 1000 * 60 * 60 * 24 * 365;
-              return _context3.abrupt("break", 142);
-            case 142:
+              return _context3.abrupt("break", 141);
+            case 141:
               cronTags = [];
               for (_k in _tags) {
                 if (/^Cron-Tag-/.test(_k)) {
@@ -609,16 +612,16 @@ var _default = exports["default"] = function _default() {
               }
               p.cronTags = cronTags;
               p.span = _int;
-            case 146:
-              _context3.next = 148;
+            case 145:
+              _context3.next = 147;
               return mem.set(p, "env", id);
-            case 148:
+            case 147:
               return _context3.abrupt("return", id);
-            case 149:
+            case 148:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[48, 63]]);
+        }, _callee3, null, [[47, 62]]);
       }));
       return function spawn() {
         return _ref8.apply(this, arguments);
@@ -960,56 +963,54 @@ var _default = exports["default"] = function _default() {
               owner = "";
               item = null;
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context5.next = 24;
+                _context5.next = 22;
                 break;
               }
-              ;
+              id = opt.http_msg.target;
               _context5.next = 7;
-              return ar.httpmsg(opt.http_msg);
+              return ar.httpmsg(opt.http_msg, id);
             case 7:
               _yield$ar$httpmsg2 = _context5.sent;
-              id = _yield$ar$httpmsg2.id;
               owner = _yield$ar$httpmsg2.owner;
               item = _yield$ar$httpmsg2.item;
-              _context5.next = 13;
+              _context5.next = 12;
               return mem.get("env", opt.process);
-            case 13:
+            case 12:
               _p = _context5.sent;
               new_slot = opt.slot * 1;
               last_slot = !_p ? -1 : _p.results.length - 1;
               if (!(last_slot + 1 !== new_slot)) {
-                _context5.next = 22;
+                _context5.next = 20;
                 break;
               }
-              console.log("need process recovery from HB:", opt.process);
               if (!(!hb || opt.recovery)) {
-                _context5.next = 20;
+                _context5.next = 18;
                 break;
               }
               return _context5.abrupt("return", null);
-            case 20:
-              _context5.next = 22;
+            case 18:
+              _context5.next = 20;
               return _recover(opt.process);
-            case 22:
-              _context5.next = 27;
+            case 20:
+              _context5.next = 25;
               break;
-            case 24:
+            case 22:
               _id = (_opt$item$id = opt === null || opt === void 0 || (_opt$item = opt.item) === null || _opt$item === void 0 ? void 0 : _opt$item.id) !== null && _opt$item$id !== void 0 ? _opt$item$id : "";
               _owner = (_opt$owner = opt.owner) !== null && _opt$owner !== void 0 ? _opt$owner : "";
               _item = opt.item;
-            case 27:
-              _context5.next = 29;
+            case 25:
+              _context5.next = 27;
               return mem.get("env", opt.process);
-            case 29:
+            case 27:
               p = _context5.sent;
               if (p) {
-                _context5.next = 32;
+                _context5.next = 30;
                 break;
               }
               return _context5.abrupt("return", null);
-            case 32:
+            case 30:
               if (!(!opt.item && opt.signer)) {
-                _context5.next = 67;
+                _context5.next = 65;
                 break;
               }
               opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags3 = opt.tags) !== null && _opt$tags3 !== void 0 ? _opt$tags3 : []), {
@@ -1019,7 +1020,7 @@ var _default = exports["default"] = function _default() {
                 SDK: "aoconnect"
               }));
               if (!opt["for"]) {
-                _context5.next = 60;
+                _context5.next = 58;
                 break;
               }
               opt.tags.push({
@@ -1030,100 +1031,100 @@ var _default = exports["default"] = function _default() {
                 name: "From-Process",
                 value: opt.from
               });
-              _context5.next = 39;
+              _context5.next = 37;
               return mem.getTx(opt.from);
-            case 39:
+            case 37:
               _context5.t2 = _yield$mem$getTx3 = _context5.sent;
               _context5.t1 = _context5.t2 === null;
               if (_context5.t1) {
-                _context5.next = 43;
+                _context5.next = 41;
                 break;
               }
               _context5.t1 = _yield$mem$getTx3 === void 0;
-            case 43:
+            case 41:
               if (!_context5.t1) {
-                _context5.next = 47;
+                _context5.next = 45;
                 break;
               }
               _context5.t3 = void 0;
-              _context5.next = 48;
+              _context5.next = 46;
               break;
-            case 47:
+            case 45:
               _context5.t3 = _yield$mem$getTx3.tags;
-            case 48:
+            case 46:
               _context5.t4 = _yield$mem$getTx$tags3 = _context5.t3;
               _context5.t0 = _context5.t4 !== null;
               if (!_context5.t0) {
-                _context5.next = 52;
+                _context5.next = 50;
                 break;
               }
               _context5.t0 = _yield$mem$getTx$tags3 !== void 0;
-            case 52:
+            case 50:
               if (!_context5.t0) {
-                _context5.next = 56;
+                _context5.next = 54;
                 break;
               }
               _context5.t5 = _yield$mem$getTx$tags3;
-              _context5.next = 57;
+              _context5.next = 55;
               break;
-            case 56:
+            case 54:
               _context5.t5 = [];
-            case 57:
+            case 55:
               pr = _context5.t5;
               module = (0, _utils.tags)(pr).Module;
               if (module) opt.tags.push({
                 name: "From-Module",
                 value: module
               });
-            case 60:
+            case 58:
               ;
-              _context5.next = 63;
+              _context5.next = 61;
               return ar.dataitem({
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags),
                 target: opt.process
               });
-            case 63:
+            case 61:
               _yield$ar$dataitem3 = _context5.sent;
               item = _yield$ar$dataitem3.item;
               id = _yield$ar$dataitem3.id;
               owner = _yield$ar$dataitem3.owner;
-            case 67:
+            case 65:
               _msg = (0, _ramda.dissoc)("signer", opt);
-              _context5.next = 70;
+              _context5.next = 68;
               return mem.set(_msg, "msgs", id);
-            case 70:
+            case 68:
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context5.next = 125;
+                _context5.next = 123;
                 break;
               }
               p.epochs.push([id]);
               _opt = opt;
-              _context5.prev = 73;
+              _context5.prev = 71;
               // todo: not sure if this is correct
               from = (_ref12 = (_opt$from2 = _opt.from) !== null && _opt$from2 !== void 0 ? _opt$from2 : opt.from) !== null && _ref12 !== void 0 ? _ref12 : owner;
               data = (_opt$http_msg$data = opt.http_msg.data) !== null && _opt$http_msg$data !== void 0 ? _opt$http_msg$data : "";
               _tags = _opt.http_msg.tags; // todo: check if owner=mu.addr right?
-              _context5.next = 79;
+              _context5.next = 77;
               return genMsg(opt.http_msg, p, data, _tags, from, owner);
-            case 79:
+            case 77:
               msg = _context5.sent;
-              _context5.next = 82;
+              _context5.next = 80;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 82:
+            case 80:
               _env = _context5.sent;
               if (p.handle) {
-                _context5.next = 106;
+                _context5.next = 104;
                 break;
               }
-              _context5.next = 86;
+              _context5.next = 84;
               return mem.getWasm(p.modulea);
-            case 86:
+            case 84:
               _yield$mem$getWasm3 = _context5.sent;
               format = _yield$mem$getWasm3.format;
               mod = _yield$mem$getWasm3.mod;
@@ -1133,13 +1134,13 @@ var _default = exports["default"] = function _default() {
               _context5.t7 = wasm;
               _context5.t8 = format;
               _context5.t9 = wdrive;
-              _context5.next = 97;
+              _context5.next = 95;
               return mem.getTx(p.id);
-            case 97:
+            case 95:
               _context5.t10 = _context5.sent.item;
-              _context5.next = 100;
+              _context5.next = 98;
               return mem.getTx(mod);
-            case 100:
+            case 98:
               _context5.t11 = _context5.sent;
               _context5.t12 = {
                 format: _context5.t8,
@@ -1147,38 +1148,38 @@ var _default = exports["default"] = function _default() {
                 spawn: _context5.t10,
                 module: _context5.t11
               };
-              _context5.next = 104;
+              _context5.next = 102;
               return (0, _context5.t6)(_context5.t7, _context5.t12);
-            case 104:
+            case 102:
               p.handle = _context5.sent;
               mem.env[opt.process].handle = p.handle;
-            case 106:
-              _context5.next = 108;
+            case 104:
+              _context5.next = 106;
               return p.handle(p.memory, msg, _env);
-            case 108:
+            case 106:
               res = _context5.sent;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(id);
-              _context5.next = 114;
+              _context5.next = 112;
               return mem.set(p, "env", opt.process);
-            case 114:
+            case 112:
               _msg2 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res
               });
-              _context5.next = 117;
+              _context5.next = 115;
               return mem.set(_msg2, "msgs", id);
-            case 117:
+            case 115:
               return _context5.abrupt("return", id);
-            case 120:
-              _context5.prev = 120;
-              _context5.t13 = _context5["catch"](73);
+            case 118:
+              _context5.prev = 118;
+              _context5.t13 = _context5["catch"](71);
               console.log(_context5.t13);
-            case 123:
-              _context5.next = 127;
+            case 121:
+              _context5.next = 125;
               break;
-            case 125:
-              _context5.next = 127;
+            case 123:
+              _context5.next = 125;
               return _assign({
                 message_item: item,
                 message: id,
@@ -1186,13 +1187,13 @@ var _default = exports["default"] = function _default() {
                 from: owner,
                 signer: mu.signer
               });
-            case 127:
+            case 125:
               return _context5.abrupt("return", id);
-            case 128:
+            case 126:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, null, [[73, 120]]);
+        }, _callee5, null, [[71, 118]]);
       }));
       return function message(_x9) {
         return _ref11.apply(this, arguments);
@@ -1676,18 +1677,19 @@ var _default = exports["default"] = function _default() {
                 return p.handle(p.memory, msg, _env);
               case 47:
                 res = _context12.sent;
+                delete res.Memory;
                 return _context12.abrupt("return", res);
-              case 51:
-                _context12.prev = 51;
+              case 52:
+                _context12.prev = 52;
                 _context12.t7 = _context12["catch"](14);
                 console.log(_context12.t7);
-              case 54:
-                return _context12.abrupt("return", null);
               case 55:
+                return _context12.abrupt("return", null);
+              case 56:
               case "end":
                 return _context12.stop();
             }
-          }, _callee12, null, [[14, 51]]);
+          }, _callee12, null, [[14, 52]]);
         }));
         function dryrun(_x16) {
           return _dryrun.apply(this, arguments);

package/cjs/bao.js

@@ -35,6 +35,13 @@ function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var wait = function wait(ms) {
+  return new Promise(function (res) {
+    return setTimeout(function () {
+      return res();
+    }, ms);
+  });
+};
 var log = "\nlocal json = require(\"json\")\nao = ao or {}\n\nfunction ao.log(...)\n    local args = {...}\n    local txt = json.encode(args)\n    if type(ao.outbox.Output) == 'string' then\n      ao.outbox.Output = {ao.outbox.Output}\n    end\n    table.insert(ao.outbox.Output, txt)\n    ao.outbox.Logs = ao.outbox.Logs or {}\n    table.insert(ao.outbox.Logs, txt)\nend\n\nfunction ao.result(result)\n    if ao.outbox.Error or result.Error then\n      return { Error = result.Error or ao.outbox.Error, Output = ao.outbox.Logs }\n    end\n    return {\n        Output = ao.outbox.Logs or result.Output or ao.outbox.Output,\n        Messages = ao.outbox.Messages,\n        Spawns = ao.outbox.Spawns,\n        Assignments = ao.outbox.Assignments,\n    }\nend\n";
 var renderLogs = function renderLogs(logs) {
   if ((0, _ramda.is)(Array, logs) && logs.length > 0) {
@@ -101,9 +108,20 @@ var AO = /*#__PURE__*/function (_MAO) {
             return result.apply(void 0, _args);
           case 2:
             res = _context.sent;
-            renderLogs(res.Output);
+            if (res) {
+              _context.next = 9;
+              break;
+            }
+            _context.next = 6;
+            return wait(100);
+          case 6:
+            _context.next = 8;
+            return result.apply(void 0, _args);
+          case 8:
+            res = _context.sent;
+          case 9:
             return _context.abrupt("return", res);
-          case 5:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -112,41 +130,48 @@ var AO = /*#__PURE__*/function (_MAO) {
     _this.results = results;
     _this.message = message;
     _this.spawn = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var res,
+      var _len,
+        opt,
+        _key,
+        res,
         _args2 = arguments;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context2.next = 2;
-            return spawn.apply(void 0, _args2);
-          case 2:
+            for (_len = _args2.length, opt = new Array(_len), _key = 0; _key < _len; _key++) {
+              opt[_key] = _args2[_key];
+            }
+            _context2.next = 3;
+            return spawn.apply(void 0, opt);
+          case 3:
             res = _context2.sent;
-            _context2.next = 5;
+            if (opt[0].http_msg) {
+              _context2.next = 7;
+              break;
+            }
+            _context2.next = 7;
             return _this.load({
               data: log,
               pid: res
             });
-          case 5:
+          case 7:
             return _context2.abrupt("return", res);
-          case 6:
+          case 8:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     _this.dryrun = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var res,
-        _args3 = arguments;
+      var _args3 = arguments;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
             return dryrun.apply(void 0, _args3);
           case 2:
-            res = _context3.sent;
-            renderLogs(res.Output);
-            return _context3.abrupt("return", res);
-          case 5:
+            return _context3.abrupt("return", _context3.sent);
+          case 3:
           case "end":
             return _context3.stop();
         }

package/cjs/server.js

@@ -288,7 +288,7 @@ var Server = /*#__PURE__*/function () {
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                     _v = _step3.value;
-                    if (_v.name === "id") id = _v.value;
+                    if (_v.name === "id") item.target = _v.value;
                   }
                 } catch (err) {
                   _iterator3.e(err);

package/esm/aoconnect-base.js

@@ -60,10 +60,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
 
       return output
     }
-
-    const genMsg = async (Id, p, data, Tags, from, Owner, dry = false) => {
-      if (!dry) p.height += 1
-      let __tags = Tags?.length ? Tags : []
+    const capitalize = __tags => {
       let cap = {
         authority: "Authority",
         action: "Action",
@@ -72,6 +69,12 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         module: "Module",
       }
       for (let v of __tags) v.name = cap[v.name] ?? v.name
+      return __tags
+    }
+
+    const genMsg = async (Id, p, data, Tags, from, Owner, dry = false) => {
+      if (!dry) p.height += 1
+      let __tags = Tags?.length ? Tags : []
       return {
         Id,
         Target: p.id,
@@ -82,7 +85,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         Module: p.module,
         From: from,
         Cron: false,
-        Tags: __tags,
+        Tags: capitalize(__tags),
       }
     }
 
@@ -90,12 +93,12 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       return {
         Process: {
           Id: pid,
-          Tags: (await mem.getTx(pid))?.tags ?? [],
+          Tags: capitalize((await mem.getTx(pid))?.tags ?? []),
           Owner: owner,
         },
         Module: {
           Id: module,
-          Tags: (await mem.getTx(module))?.tags ?? [],
+          Tags: capitalize((await mem.getTx(module))?.tags ?? []),
         },
       }
     }
@@ -107,8 +110,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       let id, owner, item, __tags
       let msg_owner = mu.addr
       if (ar.isHttpMsg(opt.http_msg)) {
-        ;({ owner, item, tags: __tags } = await ar.httpmsg(opt.http_msg))
         id = opt.http_msg.target
+        ;({ owner, item, tags: __tags } = await ar.httpmsg(opt.http_msg, id))
         opt.tags = buildTags(null, __tags)
         opt.data = opt.http_msg.data
         msg_owner = owner
@@ -373,13 +376,13 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       let owner = ""
       let item = null
       if (ar.isHttpMsg(opt.http_msg)) {
-        ;({ id, owner, item } = await ar.httpmsg(opt.http_msg))
+        id = opt.http_msg.target
+        ;({ owner, item } = await ar.httpmsg(opt.http_msg, id))
         // check if process exists, and recover if necessary
         const p = await mem.get("env", opt.process)
         const new_slot = opt.slot * 1
         const last_slot = !p ? -1 : p.results.length - 1
         if (last_slot + 1 !== new_slot) {
-          console.log("need process recovery from HB:", opt.process)
           if (!hb || opt.recovery) return null
           await recover(opt.process)
         }
@@ -538,6 +541,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
     }
 
     const result = async opt => (await mem.get("msgs", opt.message))?.res
+
     return {
       message,
       unmonitor: async opt => {
@@ -627,6 +631,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
             mem.env[opt.process].handle = p.handle
           }
           const res = await p.handle(p.memory, msg, _env)
+          delete res.Memory
           return res
         } catch (e) {
           console.log(e)

package/esm/bao.js

@@ -3,6 +3,7 @@ import { createDataItemSigner } from "@permaweb/aoconnect"
 import { srcs, buildTags } from "./utils.js"
 import { mergeLeft, is, map } from "ramda"
 
+const wait = ms => new Promise(res => setTimeout(() => res(), ms))
 let log = `
 local json = require("json")
 ao = ao or {}
@@ -73,8 +74,11 @@ class AO extends MAO {
     this.recover = recover
     this.assign = assign
     this.result = async (...opt) => {
-      const res = await result(...opt)
-      renderLogs(res.Output)
+      let res = await result(...opt)
+      if (!res) {
+        await wait(100) // todo: why do we need to wait?
+        res = await result(...opt)
+      }
       return res
     }
 
@@ -82,14 +86,13 @@ class AO extends MAO {
     this.message = message
     this.spawn = async (...opt) => {
       const res = await spawn(...opt)
-      await this.load({ data: log, pid: res })
-      return res
-    }
-    this.dryrun = async (...opt) => {
-      const res = await dryrun(...opt)
-      renderLogs(res.Output)
+      if (!opt[0].http_msg) {
+        await this.load({ data: log, pid: res })
+      }
       return res
     }
+    this.dryrun = async (...opt) => await dryrun(...opt)
+
     this.monitor = monitor
     this.unmonitor = unmonitor
     this.mem = mem

package/esm/server.js

@@ -174,17 +174,14 @@ class Server {
         const item = toANS104Request(sigs).item
 
         if (sigs.slot === "0" || sigs.type === "Process") {
-          for (let v of item.tags) {
-            if (v.name === "Type") v.value = "Process"
-          }
-
+          for (let v of item.tags) if (v.name === "Type") v.value = "Process"
           const res = await this.spawn({
             http_msg: item,
             module: sigs.module,
             scheduler: sigs.scheduler,
           })
         } else if (sigs.type === "Message") {
-          for (let v of item.tags) if (v.name === "id") id = v.value
+          for (let v of item.tags) if (v.name === "id") item.target = v.value
           const res = await this.message({
             slot: sigs.slot,
             http_msg: item,

package/package.json

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