wao 0.8.4 → 0.9.0

package/cjs/aoconnect.js

@@ -12,8 +12,6 @@ var _utils = require("./utils.js");
 var _armem = _interopRequireDefault(require("./armem.js"));
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
 var _aoLoader = _interopRequireDefault(require("@permaweb/ao-loader"));
-var _fs = require("fs");
-var _path = require("path");
 var _test = require("./test.js");
 var _ramda = require("ramda");
 var _tar = _interopRequireDefault(require("./tar.js"));
@@ -340,14 +338,18 @@ var connect = exports.connect = function connect(mem) {
               name: "Type",
               value: "Process"
             });
-            _context3.next = 18;
+            if (opt["for"]) opt.tags.push({
+              name: "Pushed-For",
+              value: opt["for"]
+            });
+            _context3.next = 19;
             return ar.dataitem({
               item: opt.item,
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags)
             });
-          case 18:
+          case 19:
             _yield$ar$dataitem = _context3.sent;
             id = _yield$ar$dataitem.id;
             owner = _yield$ar$dataitem.owner;
@@ -355,23 +357,23 @@ var connect = exports.connect = function connect(mem) {
             __tags = _yield$ar$dataitem.tags;
             opt.tags = (0, _utils.buildTags)(null, __tags);
             if (opt.item) opt.data = _base64url["default"].decode(item.data);
-            _context3.next = 27;
+            _context3.next = 28;
             return ar.postItems(item, _test.su.jwk);
-          case 27:
+          case 28:
             now = Date.now;
             t = (0, _utils.tags)(opt.tags);
             ext = t.Extension || "WeaveDrive";
             wdrive = extensions[ext];
             handle = null;
-            _context3.prev = 32;
+            _context3.prev = 33;
             _context3.t0 = _aoLoader["default"];
             _context3.t1 = wasm;
             _context3.t2 = format;
             _context3.t3 = wdrive;
             _context3.t4 = item;
-            _context3.next = 40;
+            _context3.next = 41;
             return mem.get("txs", mod);
-          case 40:
+          case 41:
             _context3.t5 = _context3.sent;
             _context3.t6 = {
               format: _context3.t2,
@@ -379,22 +381,22 @@ var connect = exports.connect = function connect(mem) {
               spawn: _context3.t4,
               module: _context3.t5
             };
-            _context3.next = 44;
+            _context3.next = 45;
             return (0, _context3.t0)(_context3.t1, _context3.t6);
-          case 44:
+          case 45:
             handle = _context3.sent;
-            _context3.next = 49;
+            _context3.next = 50;
             break;
-          case 47:
-            _context3.prev = 47;
-            _context3.t7 = _context3["catch"](32);
-          case 49:
+          case 48:
+            _context3.prev = 48;
+            _context3.t7 = _context3["catch"](33);
+          case 50:
             if (handle) {
-              _context3.next = 51;
+              _context3.next = 52;
               break;
             }
             return _context3.abrupt("return", null);
-          case 51:
+          case 52:
             _module = null;
             _module = {
               handle: handle,
@@ -422,124 +424,124 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!memory) {
-              _context3.next = 61;
+              _context3.next = 62;
               break;
             }
-            _context3.next = 103;
+            _context3.next = 104;
             break;
-          case 61:
+          case 62:
             if (!(_tags["On-Boot"] || true)) {
-              _context3.next = 102;
+              _context3.next = 103;
               break;
             }
             data = "";
             if (!(_tags["On-Boot"] === "Data")) {
-              _context3.next = 67;
+              _context3.next = 68;
               break;
             }
             data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";
-            _context3.next = 88;
+            _context3.next = 89;
             break;
-          case 67:
-            _context3.next = 69;
+          case 68:
+            _context3.next = 70;
             return mem.get("msgs", _tags["On-Boot"]);
-          case 69:
+          case 70:
             _context3.t10 = _yield$mem$get3 = _context3.sent;
             _context3.t9 = _context3.t10 === null;
             if (_context3.t9) {
-              _context3.next = 73;
+              _context3.next = 74;
               break;
             }
             _context3.t9 = _yield$mem$get3 === void 0;
-          case 73:
+          case 74:
             if (!_context3.t9) {
-              _context3.next = 77;
+              _context3.next = 78;
               break;
             }
             _context3.t11 = void 0;
-            _context3.next = 78;
+            _context3.next = 79;
             break;
-          case 77:
-            _context3.t11 = _yield$mem$get3.data;
           case 78:
+            _context3.t11 = _yield$mem$get3.data;
+          case 79:
             _context3.t12 = _yield$mem$get$data = _context3.t11;
             _context3.t8 = _context3.t12 !== null;
             if (!_context3.t8) {
-              _context3.next = 82;
+              _context3.next = 83;
               break;
             }
             _context3.t8 = _yield$mem$get$data !== void 0;
-          case 82:
+          case 83:
             if (!_context3.t8) {
-              _context3.next = 86;
+              _context3.next = 87;
               break;
             }
             _context3.t13 = _yield$mem$get$data;
-            _context3.next = 87;
+            _context3.next = 88;
             break;
-          case 86:
-            _context3.t13 = "";
           case 87:
-            data = _context3.t13;
+            _context3.t13 = "";
           case 88:
-            _context3.next = 90;
+            data = _context3.t13;
+          case 89:
+            _context3.next = 91;
             return genMsg(id, p, data, opt.tags, owner, _test.mu.addr, true);
-          case 90:
+          case 91:
             msg = _context3.sent;
-            _context3.next = 93;
+            _context3.next = 94;
             return genEnv({
               pid: p.id,
               owner: p.owner,
               module: p.module
             });
-          case 93:
+          case 94:
             _env = _context3.sent;
-            _context3.next = 96;
+            _context3.next = 97;
             return _module.handle(null, msg, _env);
-          case 96:
+          case 97:
             res = _context3.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context3.next = 103;
+            _context3.next = 104;
             break;
-          case 102:
-            p.height += 1;
           case 103:
-            _context3.next = 105;
+            p.height += 1;
+          case 104:
+            _context3.next = 106;
             return mem.set(opt, "msgs", id);
-          case 105:
+          case 106:
             if (!_tags["Cron-Interval"]) {
-              _context3.next = 129;
+              _context3.next = 130;
               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" ? 111 : _context3.t14 === "second" ? 113 : _context3.t14 === "minute" ? 115 : _context3.t14 === "hour" ? 117 : _context3.t14 === "day" ? 119 : _context3.t14 === "month" ? 121 : _context3.t14 === "year" ? 123 : 125;
+            _context3.next = _context3.t14 === "millisecond" ? 112 : _context3.t14 === "second" ? 114 : _context3.t14 === "minute" ? 116 : _context3.t14 === "hour" ? 118 : _context3.t14 === "day" ? 120 : _context3.t14 === "month" ? 122 : _context3.t14 === "year" ? 124 : 126;
             break;
-          case 111:
+          case 112:
             _int = num;
-            return _context3.abrupt("break", 125);
-          case 113:
+            return _context3.abrupt("break", 126);
+          case 114:
             _int = num * 1000;
-            return _context3.abrupt("break", 125);
-          case 115:
+            return _context3.abrupt("break", 126);
+          case 116:
             _int = num * 1000 * 60;
-            return _context3.abrupt("break", 125);
-          case 117:
+            return _context3.abrupt("break", 126);
+          case 118:
             _int = num * 1000 * 60 * 60;
-            return _context3.abrupt("break", 125);
-          case 119:
+            return _context3.abrupt("break", 126);
+          case 120:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context3.abrupt("break", 125);
-          case 121:
+            return _context3.abrupt("break", 126);
+          case 122:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context3.abrupt("break", 125);
-          case 123:
+            return _context3.abrupt("break", 126);
+          case 124:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context3.abrupt("break", 125);
-          case 125:
+            return _context3.abrupt("break", 126);
+          case 126:
             cronTags = [];
             for (_k in _tags) {
               if (/^Cron-Tag-/.test(_k)) {
@@ -551,16 +553,16 @@ var connect = exports.connect = function connect(mem) {
             }
             p.cronTags = cronTags;
             p.span = _int;
-          case 129:
-            _context3.next = 131;
+          case 130:
+            _context3.next = 132;
             return mem.set(p, "env", id);
-          case 131:
-            return _context3.abrupt("return", id);
           case 132:
+            return _context3.abrupt("return", id);
+          case 133:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[32, 47]]);
+      }, _callee3, null, [[33, 48]]);
     }));
     return function spawn() {
       return _ref7.apply(this, arguments);
@@ -762,6 +764,7 @@ var connect = exports.connect = function connect(mem) {
             }
             _context4.next = 108;
             return message({
+              "for": opt.message,
               process: v.Target,
               tags: v.Tags,
               data: v.Data,
@@ -795,6 +798,7 @@ var connect = exports.connect = function connect(mem) {
             __tags = (0, _utils.tags)(_v.Tags);
             _context4.next = 126;
             return spawn({
+              "for": opt.message,
               module: __tags.Module,
               scheduler: _test.scheduler,
               tags: _v.Tags,
@@ -891,7 +895,7 @@ var connect = exports.connect = function connect(mem) {
   var message = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(opt) {
       var _opt$item$id, _opt$item, _opt$owner;
-      var p, ex, id, owner, item, _opt$tags3, _iterator6, _step6, v, _yield$ar$dataitem3;
+      var p, ex, id, owner, item, _opt$tags3, _iterator6, _step6, v, _yield$mem$get$tags3, _yield$mem$get4, pr, module, _yield$ar$dataitem3;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -910,7 +914,7 @@ var connect = exports.connect = function connect(mem) {
             owner = (_opt$owner = opt.owner) !== null && _opt$owner !== void 0 ? _opt$owner : "";
             item = opt.item;
             if (!(!opt.item && opt.signer)) {
-              _context5.next = 19;
+              _context5.next = 46;
               break;
             }
             _iterator6 = _createForOfIteratorHelper(opt.tags);
@@ -930,23 +934,82 @@ var connect = exports.connect = function connect(mem) {
               Type: "Message",
               SDK: "aoconnect"
             }));
-            _context5.next = 15;
+            if (!opt["for"]) {
+              _context5.next = 39;
+              break;
+            }
+            opt.tags.push({
+              name: "Pushed-For",
+              value: opt["for"]
+            });
+            opt.tags.push({
+              name: "From-Process",
+              value: opt.from
+            });
+            _context5.next = 18;
+            return mem.get("txs", opt.from);
+          case 18:
+            _context5.t2 = _yield$mem$get4 = _context5.sent;
+            _context5.t1 = _context5.t2 === null;
+            if (_context5.t1) {
+              _context5.next = 22;
+              break;
+            }
+            _context5.t1 = _yield$mem$get4 === void 0;
+          case 22:
+            if (!_context5.t1) {
+              _context5.next = 26;
+              break;
+            }
+            _context5.t3 = void 0;
+            _context5.next = 27;
+            break;
+          case 26:
+            _context5.t3 = _yield$mem$get4.tags;
+          case 27:
+            _context5.t4 = _yield$mem$get$tags3 = _context5.t3;
+            _context5.t0 = _context5.t4 !== null;
+            if (!_context5.t0) {
+              _context5.next = 31;
+              break;
+            }
+            _context5.t0 = _yield$mem$get$tags3 !== void 0;
+          case 31:
+            if (!_context5.t0) {
+              _context5.next = 35;
+              break;
+            }
+            _context5.t5 = _yield$mem$get$tags3;
+            _context5.next = 36;
+            break;
+          case 35:
+            _context5.t5 = [];
+          case 36:
+            pr = _context5.t5;
+            module = (0, _utils.tags)(pr).Module;
+            if (module) opt.tags.push({
+              name: "From-Module",
+              value: module
+            });
+          case 39:
+            ;
+            _context5.next = 42;
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags),
               target: opt.process
             });
-          case 15:
+          case 42:
             _yield$ar$dataitem3 = _context5.sent;
             item = _yield$ar$dataitem3.item;
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
-          case 19:
-            _context5.next = 21;
+          case 46:
+            _context5.next = 48;
             return mem.set(opt, "msgs", id);
-          case 21:
-            _context5.next = 23;
+          case 48:
+            _context5.next = 50;
             return _assign({
               message_item: item,
               message: id,
@@ -954,9 +1017,9 @@ var connect = exports.connect = function connect(mem) {
               from: owner,
               signer: _test.mu.signer
             });
-          case 23:
+          case 50:
             return _context5.abrupt("return", id);
-          case 24:
+          case 51:
           case "end":
             return _context5.stop();
         }
@@ -1038,15 +1101,33 @@ var connect = exports.connect = function connect(mem) {
     ar: ar,
     result: function () {
       var _result = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(opt) {
+        var _yield$mem$get5;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               _context9.next = 2;
               return mem.get("env", opt.process);
             case 2:
-              _context9.t0 = opt.message;
-              return _context9.abrupt("return", _context9.sent.res[_context9.t0]);
-            case 4:
+              _context9.t1 = _yield$mem$get5 = _context9.sent;
+              _context9.t0 = _context9.t1 === null;
+              if (_context9.t0) {
+                _context9.next = 6;
+                break;
+              }
+              _context9.t0 = _yield$mem$get5 === void 0;
+            case 6:
+              if (!_context9.t0) {
+                _context9.next = 10;
+                break;
+              }
+              _context9.t2 = void 0;
+              _context9.next = 11;
+              break;
+            case 10:
+              _context9.t2 = _yield$mem$get5.res[opt.message];
+            case 11:
+              return _context9.abrupt("return", _context9.t2);
+            case 12:
             case "end":
               return _context9.stop();
           }