wao 0.14.3 → 0.14.5

package/cjs/aoconnect-base.js

@@ -300,6 +300,7 @@ var _default = exports["default"] = function _default() {
           __tags,
           msg_owner,
           _opt$id,
+          i,
           _yield$ar$httpmsg,
           _opt$tags,
           ex,
@@ -357,31 +358,33 @@ var _default = exports["default"] = function _default() {
               format = _yield$mem$getWasm.format;
               msg_owner = mu.addr;
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context3.next = 35;
+                _context3.next = 37;
                 break;
               }
               id = (_opt$id = opt.id) !== null && _opt$id !== void 0 ? _opt$id : opt.http_msg.target;
               if (!ongoing[id]) {
-                _context3.next = 23;
+                _context3.next = 25;
                 break;
               }
-            case 15:
-              if (!ongoing[id]) {
-                _context3.next = 20;
+              i = 0;
+            case 16:
+              if (!(i < 30 && ongoing[id])) {
+                _context3.next = 22;
                 break;
               }
-              _context3.next = 18;
+              _context3.next = 19;
               return (0, _utils.wait)(100);
-            case 18:
-              _context3.next = 15;
+            case 19:
+              i++;
+              _context3.next = 16;
               break;
-            case 20:
+            case 22:
               return _context3.abrupt("return", id);
-            case 23:
+            case 25:
               ongoing[id] = true;
-              _context3.next = 26;
+              _context3.next = 28;
               return ar.httpmsg(opt.http_msg, id);
-            case 26:
+            case 28:
               _yield$ar$httpmsg = _context3.sent;
               owner = _yield$ar$httpmsg.owner;
               item = _yield$ar$httpmsg.item;
@@ -389,10 +392,10 @@ var _default = exports["default"] = function _default() {
               opt.tags = (0, _utils.buildTags)(null, __tags);
               opt.data = opt.http_msg.data;
               msg_owner = owner;
-            case 33:
-              _context3.next = 52;
-              break;
             case 35:
+              _context3.next = 54;
+              break;
+            case 37:
               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",
@@ -423,14 +426,14 @@ var _default = exports["default"] = function _default() {
                 name: "Pushed-For",
                 value: opt["for"]
               });
-              _context3.next = 43;
+              _context3.next = 45;
               return ar.dataitem({
                 item: opt.item,
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags)
               });
-            case 43:
+            case 45:
               _yield$ar$dataitem = _context3.sent;
               id = _yield$ar$dataitem.id;
               owner = _yield$ar$dataitem.owner;
@@ -438,23 +441,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 = 52;
+              _context3.next = 54;
               return ar.postItems(item, su.jwk);
-            case 52:
+            case 54:
               now = Date.now;
               t = (0, _utils.tags)(opt.tags);
               ext = t.Extension || "WeaveDrive";
               wdrive = extensions[ext];
               handle = null;
-              _context3.prev = 57;
+              _context3.prev = 59;
               _context3.t0 = AoLoader;
               _context3.t1 = wasm;
               _context3.t2 = format;
               _context3.t3 = wdrive;
               _context3.t4 = item;
-              _context3.next = 65;
+              _context3.next = 67;
               return mem.getTx(mod);
-            case 65:
+            case 67:
               _context3.t5 = _context3.sent;
               _context3.t6 = {
                 format: _context3.t2,
@@ -462,23 +465,23 @@ var _default = exports["default"] = function _default() {
                 spawn: _context3.t4,
                 module: _context3.t5
               };
-              _context3.next = 69;
+              _context3.next = 71;
               return (0, _context3.t0)(_context3.t1, _context3.t6);
-            case 69:
+            case 71:
               handle = _context3.sent;
-              _context3.next = 75;
+              _context3.next = 77;
               break;
-            case 72:
-              _context3.prev = 72;
-              _context3.t7 = _context3["catch"](57);
+            case 74:
+              _context3.prev = 74;
+              _context3.t7 = _context3["catch"](59);
               console.log(mod, _context3.t7);
-            case 75:
+            case 77:
               if (handle) {
-                _context3.next = 77;
+                _context3.next = 79;
                 break;
               }
               return _context3.abrupt("return", null);
-            case 77:
+            case 79:
               _module = null;
               _module = {
                 handle: handle,
@@ -502,126 +505,126 @@ var _default = exports["default"] = function _default() {
                 results: [id]
               };
               if (!memory) {
-                _context3.next = 87;
+                _context3.next = 89;
                 break;
               }
-              _context3.next = 128;
+              _context3.next = 130;
               break;
-            case 87:
+            case 89:
               if (!(_tags["On-Boot"] || true)) {
-                _context3.next = 127;
+                _context3.next = 129;
                 break;
               }
               data = "";
               if (!(_tags["On-Boot"] === "Data")) {
-                _context3.next = 93;
+                _context3.next = 95;
                 break;
               }
               data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";
-              _context3.next = 114;
+              _context3.next = 116;
               break;
-            case 93:
-              _context3.next = 95;
-              return mem.get("msgs", _tags["On-Boot"]);
             case 95:
+              _context3.next = 97;
+              return mem.get("msgs", _tags["On-Boot"]);
+            case 97:
               _context3.t10 = _yield$mem$get = _context3.sent;
               _context3.t9 = _context3.t10 === null;
               if (_context3.t9) {
-                _context3.next = 99;
+                _context3.next = 101;
                 break;
               }
               _context3.t9 = _yield$mem$get === void 0;
-            case 99:
+            case 101:
               if (!_context3.t9) {
-                _context3.next = 103;
+                _context3.next = 105;
                 break;
               }
               _context3.t11 = void 0;
-              _context3.next = 104;
+              _context3.next = 106;
               break;
-            case 103:
+            case 105:
               _context3.t11 = _yield$mem$get.data;
-            case 104:
+            case 106:
               _context3.t12 = _yield$mem$get$data = _context3.t11;
               _context3.t8 = _context3.t12 !== null;
               if (!_context3.t8) {
-                _context3.next = 108;
+                _context3.next = 110;
                 break;
               }
               _context3.t8 = _yield$mem$get$data !== void 0;
-            case 108:
+            case 110:
               if (!_context3.t8) {
-                _context3.next = 112;
+                _context3.next = 114;
                 break;
               }
               _context3.t13 = _yield$mem$get$data;
-              _context3.next = 113;
+              _context3.next = 115;
               break;
-            case 112:
+            case 114:
               _context3.t13 = "";
-            case 113:
+            case 115:
               data = _context3.t13;
-            case 114:
-              _context3.next = 116;
-              return genMsg(id, p, data, opt.tags, owner, msg_owner, true);
             case 116:
+              _context3.next = 118;
+              return genMsg(id, p, data, opt.tags, owner, msg_owner, true);
+            case 118:
               msg = _context3.sent;
-              _context3.next = 119;
+              _context3.next = 121;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 119:
+            case 121:
               _env = _context3.sent;
-              _context3.next = 122;
+              _context3.next = 124;
               return _module.handle(null, msg, _env);
-            case 122:
+            case 124:
               res = _context3.sent;
               p.memory = res.Memory;
               delete res.Memory;
-              _context3.next = 128;
+              _context3.next = 130;
               break;
-            case 127:
+            case 129:
               p.height += 1;
-            case 128:
+            case 130:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.o)((0, _ramda.dissoc)("signer"), (0, _ramda.dissoc)("memory"))(opt)), {}, {
                 res: res
               });
-              _context3.next = 131;
+              _context3.next = 133;
               return mem.set(_msg, "msgs", id);
-            case 131:
+            case 133:
               if (!_tags["Cron-Interval"]) {
-                _context3.next = 155;
+                _context3.next = 157;
                 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" ? 137 : _context3.t14 === "second" ? 139 : _context3.t14 === "minute" ? 141 : _context3.t14 === "hour" ? 143 : _context3.t14 === "day" ? 145 : _context3.t14 === "month" ? 147 : _context3.t14 === "year" ? 149 : 151;
+              _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;
               break;
-            case 137:
-              _int = num;
-              return _context3.abrupt("break", 151);
             case 139:
-              _int = num * 1000;
-              return _context3.abrupt("break", 151);
+              _int = num;
+              return _context3.abrupt("break", 153);
             case 141:
-              _int = num * 1000 * 60;
-              return _context3.abrupt("break", 151);
+              _int = num * 1000;
+              return _context3.abrupt("break", 153);
             case 143:
-              _int = num * 1000 * 60 * 60;
-              return _context3.abrupt("break", 151);
+              _int = num * 1000 * 60;
+              return _context3.abrupt("break", 153);
             case 145:
-              _int = num * 1000 * 60 * 60 * 24;
-              return _context3.abrupt("break", 151);
+              _int = num * 1000 * 60 * 60;
+              return _context3.abrupt("break", 153);
             case 147:
-              _int = num * 1000 * 60 * 60 * 24 * 30;
-              return _context3.abrupt("break", 151);
+              _int = num * 1000 * 60 * 60 * 24;
+              return _context3.abrupt("break", 153);
             case 149:
-              _int = num * 1000 * 60 * 60 * 24 * 365;
-              return _context3.abrupt("break", 151);
+              _int = num * 1000 * 60 * 60 * 24 * 30;
+              return _context3.abrupt("break", 153);
             case 151:
+              _int = num * 1000 * 60 * 60 * 24 * 365;
+              return _context3.abrupt("break", 153);
+            case 153:
               cronTags = [];
               for (_k in _tags) {
                 if (/^Cron-Tag-/.test(_k)) {
@@ -633,16 +636,17 @@ var _default = exports["default"] = function _default() {
               }
               p.cronTags = cronTags;
               p.span = _int;
-            case 155:
-              _context3.next = 157;
-              return mem.set(p, "env", id);
             case 157:
+              _context3.next = 159;
+              return mem.set(p, "env", id);
+            case 159:
+              delete ongoing[id];
               return _context3.abrupt("return", id);
-            case 158:
+            case 161:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[57, 72]]);
+        }, _callee3, null, [[59, 74]]);
       }));
       return function spawn() {
         return _ref8.apply(this, arguments);
@@ -999,7 +1003,7 @@ var _default = exports["default"] = function _default() {
     }();
     var message = /*#__PURE__*/function () {
       var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(opt) {
-        var id, owner, item, _opt$id2, _yield$ar$httpmsg2, _p, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, _id, _owner, _item, p, _opt$tags3, _yield$mem$getTx$tags3, _yield$mem$getTx4, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from2, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx5, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg2;
+        var id, owner, item, _opt$id2, _key, i, _yield$ar$httpmsg2, _p, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, _id, _owner, _item, p, _opt$tags3, _yield$mem$getTx$tags3, _yield$mem$getTx4, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from2, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx5, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg2, key;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -1007,72 +1011,75 @@ var _default = exports["default"] = function _default() {
               owner = "";
               item = null;
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context5.next = 32;
+                _context5.next = 35;
                 break;
               }
               id = (_opt$id2 = opt.id) !== null && _opt$id2 !== void 0 ? _opt$id2 : opt.http_msg.target;
-              if (!ongoing[id]) {
-                _context5.next = 14;
+              _key = "".concat(opt.process, ":").concat(id, "}");
+              if (!ongoing[_key]) {
+                _context5.next = 17;
                 break;
               }
-            case 6:
-              if (!ongoing[id]) {
-                _context5.next = 11;
+              i = 0;
+            case 8:
+              if (!(i < 30 && ongoing[_key])) {
+                _context5.next = 14;
                 break;
               }
-              _context5.next = 9;
+              _context5.next = 11;
               return (0, _utils.wait)(100);
-            case 9:
-              _context5.next = 6;
-              break;
             case 11:
-              return _context5.abrupt("return", id);
+              i++;
+              _context5.next = 8;
+              break;
             case 14:
-              ongoing[id] = true;
-              _context5.next = 17;
-              return ar.httpmsg(opt.http_msg, id);
+              return _context5.abrupt("return", id);
             case 17:
+              ongoing[_key] = true;
+              _context5.next = 20;
+              return ar.httpmsg(opt.http_msg, id);
+            case 20:
               _yield$ar$httpmsg2 = _context5.sent;
               owner = _yield$ar$httpmsg2.owner;
               item = _yield$ar$httpmsg2.item;
-              _context5.next = 22;
+              _context5.next = 25;
               return mem.get("env", opt.process);
-            case 22:
+            case 25:
               _p = _context5.sent;
               new_slot = opt.slot * 1;
               last_slot = !_p ? -1 : _p.results.length - 1;
               if (!(last_slot + 1 < new_slot)) {
-                _context5.next = 30;
+                _context5.next = 33;
                 break;
               }
               if (!(!hb || opt.recovery)) {
-                _context5.next = 28;
+                _context5.next = 31;
                 break;
               }
               return _context5.abrupt("return", null);
-            case 28:
-              _context5.next = 30;
+            case 31:
+              _context5.next = 33;
               return _recover(opt.process);
-            case 30:
-              _context5.next = 35;
+            case 33:
+              _context5.next = 38;
               break;
-            case 32:
+            case 35:
               _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 35:
-              _context5.next = 37;
+            case 38:
+              _context5.next = 40;
               return mem.get("env", opt.process);
-            case 37:
+            case 40:
               p = _context5.sent;
               if (p) {
-                _context5.next = 40;
+                _context5.next = 43;
                 break;
               }
               return _context5.abrupt("return", null);
-            case 40:
+            case 43:
               if (!(!opt.item && opt.signer)) {
-                _context5.next = 75;
+                _context5.next = 78;
                 break;
               }
               opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags3 = opt.tags) !== null && _opt$tags3 !== void 0 ? _opt$tags3 : []), {
@@ -1082,7 +1089,7 @@ var _default = exports["default"] = function _default() {
                 SDK: "aoconnect"
               }));
               if (!opt["for"]) {
-                _context5.next = 68;
+                _context5.next = 71;
                 break;
               }
               opt.tags.push({
@@ -1093,100 +1100,100 @@ var _default = exports["default"] = function _default() {
                 name: "From-Process",
                 value: opt.from
               });
-              _context5.next = 47;
+              _context5.next = 50;
               return mem.getTx(opt.from);
-            case 47:
+            case 50:
               _context5.t2 = _yield$mem$getTx4 = _context5.sent;
               _context5.t1 = _context5.t2 === null;
               if (_context5.t1) {
-                _context5.next = 51;
+                _context5.next = 54;
                 break;
               }
               _context5.t1 = _yield$mem$getTx4 === void 0;
-            case 51:
+            case 54:
               if (!_context5.t1) {
-                _context5.next = 55;
+                _context5.next = 58;
                 break;
               }
               _context5.t3 = void 0;
-              _context5.next = 56;
+              _context5.next = 59;
               break;
-            case 55:
+            case 58:
               _context5.t3 = _yield$mem$getTx4.tags;
-            case 56:
+            case 59:
               _context5.t4 = _yield$mem$getTx$tags3 = _context5.t3;
               _context5.t0 = _context5.t4 !== null;
               if (!_context5.t0) {
-                _context5.next = 60;
+                _context5.next = 63;
                 break;
               }
               _context5.t0 = _yield$mem$getTx$tags3 !== void 0;
-            case 60:
+            case 63:
               if (!_context5.t0) {
-                _context5.next = 64;
+                _context5.next = 67;
                 break;
               }
               _context5.t5 = _yield$mem$getTx$tags3;
-              _context5.next = 65;
+              _context5.next = 68;
               break;
-            case 64:
+            case 67:
               _context5.t5 = [];
-            case 65:
+            case 68:
               pr = _context5.t5;
               module = (0, _utils.tags)(pr).Module;
               if (module) opt.tags.push({
                 name: "From-Module",
                 value: module
               });
-            case 68:
+            case 71:
               ;
-              _context5.next = 71;
+              _context5.next = 74;
               return ar.dataitem({
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags),
                 target: opt.process
               });
-            case 71:
+            case 74:
               _yield$ar$dataitem3 = _context5.sent;
               item = _yield$ar$dataitem3.item;
               id = _yield$ar$dataitem3.id;
               owner = _yield$ar$dataitem3.owner;
-            case 75:
+            case 78:
               _msg = (0, _ramda.dissoc)("signer", opt);
-              _context5.next = 78;
+              _context5.next = 81;
               return mem.set(_msg, "msgs", id);
-            case 78:
+            case 81:
               if (!ar.isHttpMsg(opt.http_msg)) {
-                _context5.next = 143;
+                _context5.next = 145;
                 break;
               }
               p.epochs.push([id]);
               _opt = opt;
-              _context5.prev = 81;
+              _context5.prev = 84;
               // 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 = 87;
+              _context5.next = 90;
               return genMsg(opt.http_msg, p, data, _tags, from, owner);
-            case 87:
+            case 90:
               msg = _context5.sent;
-              _context5.next = 90;
+              _context5.next = 93;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 90:
+            case 93:
               _env = _context5.sent;
               if (p.handle) {
-                _context5.next = 123;
+                _context5.next = 126;
                 break;
               }
-              _context5.next = 94;
+              _context5.next = 97;
               return mem.getWasm(p.modulea);
-            case 94:
+            case 97:
               _yield$mem$getWasm3 = _context5.sent;
               format = _yield$mem$getWasm3.format;
               mod = _yield$mem$getWasm3.mod;
@@ -1196,31 +1203,31 @@ var _default = exports["default"] = function _default() {
               _context5.t7 = wasm;
               _context5.t8 = format;
               _context5.t9 = wdrive;
-              _context5.next = 105;
+              _context5.next = 108;
               return mem.getTx(p.id);
-            case 105:
+            case 108:
               _context5.t11 = _yield$mem$getTx5 = _context5.sent;
               _context5.t10 = _context5.t11 === null;
               if (_context5.t10) {
-                _context5.next = 109;
+                _context5.next = 112;
                 break;
               }
               _context5.t10 = _yield$mem$getTx5 === void 0;
-            case 109:
+            case 112:
               if (!_context5.t10) {
-                _context5.next = 113;
+                _context5.next = 116;
                 break;
               }
               _context5.t12 = void 0;
-              _context5.next = 114;
+              _context5.next = 117;
               break;
-            case 113:
+            case 116:
               _context5.t12 = _yield$mem$getTx5.item;
-            case 114:
+            case 117:
               _context5.t13 = _context5.t12;
-              _context5.next = 117;
+              _context5.next = 120;
               return mem.getTx(mod);
-            case 117:
+            case 120:
               _context5.t14 = _context5.sent;
               _context5.t15 = {
                 format: _context5.t8,
@@ -1228,43 +1235,44 @@ var _default = exports["default"] = function _default() {
                 spawn: _context5.t13,
                 module: _context5.t14
               };
-              _context5.next = 121;
+              _context5.next = 124;
               return (0, _context5.t6)(_context5.t7, _context5.t15);
-            case 121:
+            case 124:
               p.handle = _context5.sent;
               mem.env[opt.process].handle = p.handle;
-            case 123:
+            case 126:
               if (p.compressed) {
                 start = Date.now();
                 p.memory = mem.waosm.decompress(p.memory, p.original_size);
                 p.compressed = false;
               }
-              _context5.next = 126;
+              _context5.next = 129;
               return p.handle(p.memory, msg, _env);
-            case 126:
+            case 129:
               res = _context5.sent;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(id);
-              _context5.next = 132;
+              _context5.next = 135;
               return mem.set(p, "env", opt.process);
-            case 132:
+            case 135:
               _msg2 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res
               });
-              _context5.next = 135;
+              _context5.next = 138;
               return mem.set(_msg2, "msgs", id);
-            case 135:
-              return _context5.abrupt("return", id);
             case 138:
-              _context5.prev = 138;
-              _context5.t16 = _context5["catch"](81);
-              console.log(_context5.t16);
-            case 141:
-              _context5.next = 145;
+              _context5.next = 143;
               break;
+            case 140:
+              _context5.prev = 140;
+              _context5.t16 = _context5["catch"](84);
+              console.log(_context5.t16);
             case 143:
-              _context5.next = 145;
+              _context5.next = 147;
+              break;
+            case 145:
+              _context5.next = 147;
               return _assign({
                 message_item: item,
                 message: id,
@@ -1272,14 +1280,15 @@ var _default = exports["default"] = function _default() {
                 from: owner,
                 signer: mu.signer
               });
-            case 145:
-              delete ongoing[id];
-              return _context5.abrupt("return", id);
             case 147:
+              key = "".concat(opt.process, ":").concat(id, "}");
+              delete ongoing[key];
+              return _context5.abrupt("return", id);
+            case 150:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, null, [[81, 138]]);
+        }, _callee5, null, [[84, 140]]);
       }));
       return function message(_x9) {
         return _ref11.apply(this, arguments);

package/cjs/server.js

@@ -176,33 +176,28 @@ var Server = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (Buffer.isBuffer(req.body)) {
-                  _context.next = 3;
-                  break;
-                }
-                console.log("BD: Invalid body | expected raw Buffer");
-                return _context.abrupt("return", res.status(400).send("Invalid body: expected raw Buffer"));
-              case 3:
+                return _context.abrupt("return", res.status(200).send("Success"));
+              case 4:
                 lines = req.body.toString("utf8").split(/\r?\n/);
                 sigs = {};
                 currentKey = null;
                 _iterator = _createForOfIteratorHelper(lines);
-                _context.prev = 7;
+                _context.prev = 8;
                 _iterator.s();
-              case 9:
+              case 10:
                 if ((_step = _iterator.n()).done) {
-                  _context.next = 19;
+                  _context.next = 20;
                   break;
                 }
                 line = _step.value;
                 trimmed = line.trim();
                 if (!/^--[a-zA-Z0-9_\-=]+/.test(trimmed)) {
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
                 }
                 currentKey = null;
-                return _context.abrupt("continue", 17);
-              case 15:
+                return _context.abrupt("continue", 18);
+              case 16:
                 headerMatch = trimmed.match(/^([a-zA-Z0-9_-]+):\s*(.*)$/);
                 if (headerMatch && !headerMatch[2].includes(": ")) {
                   _key = headerMatch[1];
@@ -210,21 +205,21 @@ var Server = /*#__PURE__*/function () {
                   sigs[_key] = value;
                   currentKey = _key;
                 } else if (currentKey) sigs[currentKey] += "\n" + line;
-              case 17:
-                _context.next = 9;
+              case 18:
+                _context.next = 10;
                 break;
-              case 19:
-                _context.next = 24;
+              case 20:
+                _context.next = 25;
                 break;
-              case 21:
-                _context.prev = 21;
-                _context.t0 = _context["catch"](7);
+              case 22:
+                _context.prev = 22;
+                _context.t0 = _context["catch"](8);
                 _iterator.e(_context.t0);
-              case 24:
-                _context.prev = 24;
+              case 25:
+                _context.prev = 25;
                 _iterator.f();
-                return _context.finish(24);
-              case 27:
+                return _context.finish(25);
+              case 28:
                 sigs.target = req.headers.process;
                 sigs.slot = req.headers.slot;
                 input = parseSignatureInput(req.headers["signature-input"]);
@@ -238,8 +233,8 @@ var Server = /*#__PURE__*/function () {
                   format: "jwk"
                 }), "rsa-pss-sha512");
                 id = null;
-                _context.prev = 33;
-                _context.next = 36;
+                _context.prev = 34;
+                _context.next = 37;
                 return verifyMessage({
                   keyLookup: function keyLookup(params) {
                     return {
@@ -251,11 +246,11 @@ var Server = /*#__PURE__*/function () {
                   headers: req.headers,
                   url: "http://ao.com".concat(req.headers.path)
                 });
-              case 36:
+              case 37:
                 isValid = _context.sent;
                 item = toANS104Request(sigs).item;
                 if (!(sigs.slot === "0" || sigs.type === "Process")) {
-                  _context.next = 46;
+                  _context.next = 47;
                   break;
                 }
                 _iterator2 = _createForOfIteratorHelper(item.tags);
@@ -269,19 +264,19 @@ var Server = /*#__PURE__*/function () {
                 } finally {
                   _iterator2.f();
                 }
-                _context.next = 43;
+                _context.next = 44;
                 return _this.spawn({
                   http_msg: item,
                   module: sigs.module,
                   scheduler: sigs.scheduler
                 });
-              case 43:
+              case 44:
                 _res2 = _context.sent;
-                _context.next = 52;
+                _context.next = 53;
                 break;
-              case 46:
+              case 47:
                 if (!(sigs.type === "Message")) {
-                  _context.next = 52;
+                  _context.next = 53;
                   break;
                 }
                 _iterator3 = _createForOfIteratorHelper(item.tags);
@@ -295,28 +290,28 @@ var Server = /*#__PURE__*/function () {
                 } finally {
                   _iterator3.f();
                 }
-                _context.next = 51;
+                _context.next = 52;
                 return _this.message({
                   slot: sigs.slot,
                   http_msg: item,
                   process: sigs.target
                 });
-              case 51:
-                _res3 = _context.sent;
               case 52:
-                _context.next = 57;
+                _res3 = _context.sent;
+              case 53:
+                _context.next = 58;
                 break;
-              case 54:
-                _context.prev = 54;
-                _context.t1 = _context["catch"](33);
+              case 55:
+                _context.prev = 55;
+                _context.t1 = _context["catch"](34);
                 console.log(_context.t1, req.originalUrl);
-              case 57:
-                return _context.abrupt("return", res.status(200).send("Success"));
               case 58:
+                return _context.abrupt("return", res.status(200).send("Success"));
+              case 59:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[7, 21, 24, 27], [33, 54]]);
+          }, _callee, null, [[8, 22, 25, 28], [34, 55]]);
         }));
         return function (_x, _x2) {
           return _ref2.apply(this, arguments);
@@ -375,7 +370,7 @@ var Server = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
-                res.send(_this2.mem.getAnchor());
+                return _context3.abrupt("return", res.send(_this2.mem.getAnchor()));
               case 1:
               case "end":
                 return _context3.stop();
@@ -391,7 +386,7 @@ var Server = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee4$(_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
-                res.json(req.params);
+                return _context4.abrupt("return", res.json(req.params));
               case 1:
               case "end":
                 return _context4.stop();
@@ -433,7 +428,7 @@ var Server = /*#__PURE__*/function () {
           return _regeneratorRuntime().wrap(function _callee6$(_context6) {
             while (1) switch (_context6.prev = _context6.next) {
               case 0:
-                res.send("0");
+                return _context6.abrupt("return", res.send("0"));
               case 1:
               case "end":
                 return _context6.stop();
@@ -813,7 +808,7 @@ var Server = /*#__PURE__*/function () {
       });
       var result = /*#__PURE__*/function () {
         var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
-          var message, process, _yield$_this5$recover, success, _this5$mem$env$proces, res2;
+          var message, process, _yield$_this5$recover, success, slot, _this5$mem$env$proces, _this5$mem$env$proces2, res2;
           return _regeneratorRuntime().wrap(function _callee13$(_context13) {
             while (1) switch (_context13.prev = _context13.next) {
               case 0:
@@ -839,29 +834,37 @@ var Server = /*#__PURE__*/function () {
                 });
                 return _context13.abrupt("return");
               case 12:
+                slot = message;
                 if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
-                  message = (_this5$mem$env$proces = _this5.mem.env[process]) === null || _this5$mem$env$proces === void 0 || (_this5$mem$env$proces = _this5$mem$env$proces.results) === null || _this5$mem$env$proces === void 0 ? void 0 : _this5$mem$env$proces[message];
+                  message = (_this5$mem$env$proces = _this5.mem.env[process]) === null || _this5$mem$env$proces === void 0 || (_this5$mem$env$proces = _this5$mem$env$proces.results) === null || _this5$mem$env$proces === void 0 ? void 0 : _this5$mem$env$proces[slot];
+                }
+                if (!(0, _ramda.isNil)(message)) {
+                  _context13.next = 22;
+                  break;
                 }
+                _context13.next = 17;
+                return _this5.recover(process);
+              case 17:
+                message = (_this5$mem$env$proces2 = _this5.mem.env[process]) === null || _this5$mem$env$proces2 === void 0 || (_this5$mem$env$proces2 = _this5$mem$env$proces2.results) === null || _this5$mem$env$proces2 === void 0 ? void 0 : _this5$mem$env$proces2[slot];
                 if (!(0, _ramda.isNil)(message)) {
-                  _context13.next = 18;
+                  _context13.next = 22;
                   break;
                 }
-                console.log("message not found", message, req.params);
                 res.status(404);
                 res.json({
                   error: "Not Found"
                 });
                 return _context13.abrupt("return");
-              case 18:
-                _context13.next = 20;
+              case 22:
+                _context13.next = 24;
                 return _this5.result({
                   message: message,
                   process: process
                 });
-              case 20:
+              case 24:
                 res2 = _context13.sent;
                 res.json(res2);
-              case 22:
+              case 26:
               case "end":
                 return _context13.stop();
             }

package/esm/aoconnect-base.js

@@ -114,7 +114,11 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       if (ar.isHttpMsg(opt.http_msg)) {
         id = opt.id ?? opt.http_msg.target
         if (ongoing[id]) {
-          while (ongoing[id]) await wait(100)
+          let i = 0
+          while (i < 30 && ongoing[id]) {
+            await wait(100)
+            i++
+          }
           return id
         } else {
           ongoing[id] = true
@@ -248,6 +252,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         p.span = int
       }
       await mem.set(p, "env", id)
+      delete ongoing[id]
       return id
     }
 
@@ -377,7 +382,6 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
             })
           }
         }
-
         return id
       } catch (e) {
         console.log(e)
@@ -390,11 +394,16 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       let item = null
       if (ar.isHttpMsg(opt.http_msg)) {
         id = opt.id ?? opt.http_msg.target
-        if (ongoing[id]) {
-          while (ongoing[id]) await wait(100)
+        const key = `${opt.process}:${id}}`
+        if (ongoing[key]) {
+          let i = 0
+          while (i < 30 && ongoing[key]) {
+            await wait(100)
+            i++
+          }
           return id
         } else {
-          ongoing[id] = true
+          ongoing[key] = true
           ;({ 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)
@@ -477,7 +486,6 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           await mem.set(p, "env", opt.process)
           const _msg = { ...dissoc("signer", _opt), res }
           await mem.set(_msg, "msgs", id)
-          return id
         } catch (e) {
           console.log(e)
         }
@@ -490,7 +498,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           signer: mu.signer,
         })
       }
-      delete ongoing[id]
+      const key = `${opt.process}:${id}}`
+      delete ongoing[key]
       return id
     }
     const recover = async (pid, next) => {

package/esm/server.js

@@ -4,7 +4,7 @@ import express from "express"
 import cors from "cors"
 import base64url from "base64url"
 import { DataItem } from "arbundles"
-import { tags, toGraphObj, optAO } from "./utils.js"
+import { tags, toGraphObj, optAO, wait } from "./utils.js"
 import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import bodyParser from "body-parser"
@@ -130,6 +130,8 @@ class Server {
     app.use(cors())
     app.use("/tx", bodyParser.raw({ type: "*/*", limit: "100mb" }))
     app.post("/tx", async (req, res) => {
+      // todo: items from HB has wrong sigs and ids
+      return res.status(200).send("Success")
       if (!Buffer.isBuffer(req.body)) {
         console.log("BD: Invalid body | expected raw Buffer")
         return res.status(400).send("Invalid body: expected raw Buffer")
@@ -218,12 +220,8 @@ class Server {
       res.status(400)
       res.send(null)
     })
-    app.get("/tx_anchor", async (req, res) => {
-      res.send(this.mem.getAnchor())
-    })
-    app.get("/mine", async (req, res) => {
-      res.json(req.params)
-    })
+    app.get("/tx_anchor", async (req, res) => res.send(this.mem.getAnchor()))
+    app.get("/mine", async (req, res) => res.json(req.params))
     app.get("/:id", async (req, res) => {
       const _data = await this._ar.data(req.params.id)
       if (!_data) {
@@ -233,9 +231,7 @@ class Server {
         res.send(Buffer.from(_data, "base64"))
       }
     })
-    app.get("/price/:id", async (req, res) => {
-      res.send("0")
-    })
+    app.get("/price/:id", async (req, res) => res.send("0"))
     app.post("/graphql", async (req, res) => {
       try {
         const { query, variables } = req.body
@@ -414,14 +410,18 @@ class Server {
           return
         }
       }
+      const slot = message
       if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
-        message = this.mem.env[process]?.results?.[message]
+        message = this.mem.env[process]?.results?.[slot]
       }
       if (isNil(message)) {
-        console.log("message not found", message, req.params)
-        res.status(404)
-        res.json({ error: `Not Found` })
-        return
+        await this.recover(process)
+        message = this.mem.env[process]?.results?.[slot]
+        if (isNil(message)) {
+          res.status(404)
+          res.json({ error: `Not Found` })
+          return
+        }
       }
       const res2 = await this.result({
         message,

package/package.json

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