wao 0.5.4 → 0.5.5

package/cjs/ao.js

@@ -683,7 +683,7 @@ var AO = /*#__PURE__*/function () {
                         _context9.next = 15;
                         return (0, _utils.wait)(1);
                       case 15:
-                        if (!(Date.now() - start < (_this3.local ? timeout / 1000 : timeout))) {
+                        if (!(Date.now() - start < timeout)) {
                           _context9.next = 21;
                           break;
                         }

package/cjs/aoconnect.js

@@ -150,6 +150,7 @@ var connect = exports.connect = function connect(mem) {
         format,
         wasm,
         _mem$wasms$mod2,
+        now,
         handle,
         ex,
         _iterator,
@@ -215,24 +216,26 @@ var connect = exports.connect = function connect(mem) {
               format = mem.wasms[mod].format;
             }
             (_format = format) !== null && _format !== void 0 ? _format : format = "wasm64-unknown-emscripten-draft_2024_02_15";
-            _context.next = 16;
+            now = Date.now;
+            _context.next = 17;
             return (0, _aoLoader["default"])(wasm, {
               format: format,
               mode: "test",
               WeaveDrive: WeaveDrive
             });
-          case 16:
+          case 17:
             handle = _context.sent;
+            Date.now = now;
             _module = {
               handle: handle,
               id: mod
             };
             if (mod) {
-              _context.next = 20;
+              _context.next = 22;
               break;
             }
             throw Error("module not found");
-          case 20:
+          case 22:
             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",
@@ -259,14 +262,14 @@ var connect = exports.connect = function connect(mem) {
               name: "Type",
               value: "Process"
             });
-            _context.next = 28;
+            _context.next = 30;
             return ar.dataitem({
               item: opt.item,
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags)
             });
-          case 28:
+          case 30:
             _yield$ar$dataitem = _context.sent;
             id = _yield$ar$dataitem.id;
             owner = _yield$ar$dataitem.owner;
@@ -274,9 +277,9 @@ 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);
-            _context.next = 37;
+            _context.next = 39;
             return ar.postItem(item, _test.su.jwk);
-          case 37:
+          case 39:
             _tags = (0, _utils.tags)(opt.tags);
             res = null;
             memory = null;
@@ -295,7 +298,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 55;
+              _context.next = 57;
               break;
             }
             data = "";
@@ -308,51 +311,51 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 49;
+            _context.next = 51;
             return _module.handle(null, msg, _env);
-          case 49:
+          case 51:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 56;
+            _context.next = 58;
             break;
-          case 55:
+          case 57:
             p.height += 1;
-          case 56:
+          case 58:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 82;
+              _context.next = 84;
               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;
             _context.t0 = unit.replace(/s$/, "");
-            _context.next = _context.t0 === "millisecond" ? 64 : _context.t0 === "second" ? 66 : _context.t0 === "minute" ? 68 : _context.t0 === "hour" ? 70 : _context.t0 === "day" ? 72 : _context.t0 === "month" ? 74 : _context.t0 === "year" ? 76 : 78;
+            _context.next = _context.t0 === "millisecond" ? 66 : _context.t0 === "second" ? 68 : _context.t0 === "minute" ? 70 : _context.t0 === "hour" ? 72 : _context.t0 === "day" ? 74 : _context.t0 === "month" ? 76 : _context.t0 === "year" ? 78 : 80;
             break;
-          case 64:
-            _int = num;
-            return _context.abrupt("break", 78);
           case 66:
-            _int = num * 1000;
-            return _context.abrupt("break", 78);
+            _int = num;
+            return _context.abrupt("break", 80);
           case 68:
-            _int = num * 1000 * 60;
-            return _context.abrupt("break", 78);
+            _int = num * 1000;
+            return _context.abrupt("break", 80);
           case 70:
-            _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 78);
+            _int = num * 1000 * 60;
+            return _context.abrupt("break", 80);
           case 72:
-            _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 78);
+            _int = num * 1000 * 60 * 60;
+            return _context.abrupt("break", 80);
           case 74:
-            _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 78);
+            _int = num * 1000 * 60 * 60 * 24;
+            return _context.abrupt("break", 80);
           case 76:
-            _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 78);
+            _int = num * 1000 * 60 * 60 * 24 * 30;
+            return _context.abrupt("break", 80);
           case 78:
+            _int = num * 1000 * 60 * 60 * 24 * 365;
+            return _context.abrupt("break", 80);
+          case 80:
             cronTags = [];
             for (k in _tags) {
               if (/^Cron-Tag-/.test(k)) {
@@ -364,9 +367,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 82:
+          case 84:
             return _context.abrupt("return", id);
-          case 83:
+          case 85:
           case "end":
             return _context.stop();
         }
@@ -393,6 +396,12 @@ var connect = exports.connect = function connect(mem) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             p = mem.env[opt.process];
+            if (p) {
+              _context2.next = 3;
+              break;
+            }
+            return _context2.abrupt("return", null);
+          case 3:
             _opt = mem.msgs[opt.message];
             hash = genHashChain(p.hash, opt.message);
             p.hash = hash;
@@ -410,52 +419,52 @@ var connect = exports.connect = function connect(mem) {
               "Hash-Chain": hash
             }));
             p.epochs.push([opt.message]);
-            _context2.next = 8;
+            _context2.next = 10;
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags),
               target: opt.process
             });
-          case 8:
+          case 10:
             _yield$ar$dataitem2 = _context2.sent;
             id = _yield$ar$dataitem2.id;
             owner = _yield$ar$dataitem2.owner;
             item = _yield$ar$dataitem2.item;
-            _context2.next = 14;
+            _context2.next = 16;
             return ar.postItem(item, _test.su.jwk);
-          case 14:
-            _context2.prev = 14;
+          case 16:
+            _context2.prev = 16;
             data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
             _tags = _opt.tags;
             from = (_ref6 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref6 !== void 0 ? _ref6 : owner;
             if (!_opt.item) {
-              _context2.next = 35;
+              _context2.next = 37;
               break;
             }
-            _context2.prev = 19;
+            _context2.prev = 21;
             data = _base64url["default"].decode(_opt.item.data);
             _tags = _opt.item.tags;
             if (from) {
-              _context2.next = 30;
+              _context2.next = 32;
               break;
             }
             raw_owner = _opt.item.rawOwner;
             _context2.t0 = Buffer;
-            _context2.next = 27;
+            _context2.next = 29;
             return _crypto["default"].subtle.digest("SHA-256", raw_owner);
-          case 27:
+          case 29:
             _context2.t1 = _context2.sent;
             hashBuffer = _context2.t0.from.call(_context2.t0, _context2.t1);
             from = _base64url["default"].encode(hashBuffer);
-          case 30:
-            _context2.next = 35;
-            break;
           case 32:
-            _context2.prev = 32;
-            _context2.t2 = _context2["catch"](19);
+            _context2.next = 37;
+            break;
+          case 34:
+            _context2.prev = 34;
+            _context2.t2 = _context2["catch"](21);
             console.log(_context2.t2);
-          case 35:
+          case 37:
             // check: is owner=mu.addr right?
             msg = genMsg(opt.message, p, data, _tags, from, _test.mu.addr);
             _env = genEnv({
@@ -464,32 +473,32 @@ var connect = exports.connect = function connect(mem) {
               module: p.module,
               auth: _test.mu.addr
             });
-            _context2.next = 39;
+            _context2.next = 41;
             return p.handle(p.memory, msg, _env);
-          case 39:
+          case 41:
             res = _context2.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[opt.message] = res;
             p.results.push(opt.message);
             p.txs.unshift(_objectSpread({
-              id: opt.message
+              id: id
             }, opt));
             mem.msgs[opt.message] = _opt;
             _iterator2 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-            _context2.prev = 47;
+            _context2.prev = 49;
             _iterator2.s();
-          case 49:
+          case 51:
             if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 56;
+              _context2.next = 58;
               break;
             }
             v = _step2.value;
             if (!mem.env[v.Target]) {
-              _context2.next = 54;
+              _context2.next = 56;
               break;
             }
-            _context2.next = 54;
+            _context2.next = 56;
             return message({
               process: v.Target,
               tags: v.Tags,
@@ -497,32 +506,32 @@ var connect = exports.connect = function connect(mem) {
               signer: _test.mu.signer,
               from: opt.process
             });
-          case 54:
-            _context2.next = 49;
-            break;
           case 56:
-            _context2.next = 61;
+            _context2.next = 51;
             break;
           case 58:
-            _context2.prev = 58;
-            _context2.t3 = _context2["catch"](47);
+            _context2.next = 63;
+            break;
+          case 60:
+            _context2.prev = 60;
+            _context2.t3 = _context2["catch"](49);
             _iterator2.e(_context2.t3);
-          case 61:
-            _context2.prev = 61;
+          case 63:
+            _context2.prev = 63;
             _iterator2.f();
-            return _context2.finish(61);
-          case 64:
+            return _context2.finish(63);
+          case 66:
             _iterator3 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-            _context2.prev = 65;
+            _context2.prev = 67;
             _iterator3.s();
-          case 67:
+          case 69:
             if ((_step3 = _iterator3.n()).done) {
-              _context2.next = 74;
+              _context2.next = 76;
               break;
             }
             _v = _step3.value;
             __tags = (0, _utils.tags)(_v.Tags);
-            _context2.next = 72;
+            _context2.next = 74;
             return spawn({
               module: __tags.Module,
               scheduler: _test.scheduler,
@@ -531,87 +540,87 @@ var connect = exports.connect = function connect(mem) {
               from: __tags["From-Process"],
               signer: _test.mu.signer
             });
-          case 72:
-            _context2.next = 67;
-            break;
           case 74:
-            _context2.next = 79;
+            _context2.next = 69;
             break;
           case 76:
-            _context2.prev = 76;
-            _context2.t4 = _context2["catch"](65);
+            _context2.next = 81;
+            break;
+          case 78:
+            _context2.prev = 78;
+            _context2.t4 = _context2["catch"](67);
             _iterator3.e(_context2.t4);
-          case 79:
-            _context2.prev = 79;
+          case 81:
+            _context2.prev = 81;
             _iterator3.f();
-            return _context2.finish(79);
-          case 82:
+            return _context2.finish(81);
+          case 84:
             _iterator4 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-            _context2.prev = 83;
+            _context2.prev = 85;
             _iterator4.s();
-          case 85:
+          case 87:
             if ((_step4 = _iterator4.n()).done) {
-              _context2.next = 106;
+              _context2.next = 108;
               break;
             }
             _v2 = _step4.value;
             _iterator5 = _createForOfIteratorHelper(_v2.Processes);
-            _context2.prev = 88;
+            _context2.prev = 90;
             _iterator5.s();
-          case 90:
+          case 92:
             if ((_step5 = _iterator5.n()).done) {
-              _context2.next = 96;
+              _context2.next = 98;
               break;
             }
             v2 = _step5.value;
-            _context2.next = 94;
+            _context2.next = 96;
             return _assign({
               message: _v2.Message,
               process: v2,
               from: opt.process,
               signer: _test.mu.signer
             });
-          case 94:
-            _context2.next = 90;
-            break;
           case 96:
-            _context2.next = 101;
+            _context2.next = 92;
             break;
           case 98:
-            _context2.prev = 98;
-            _context2.t5 = _context2["catch"](88);
+            _context2.next = 103;
+            break;
+          case 100:
+            _context2.prev = 100;
+            _context2.t5 = _context2["catch"](90);
             _iterator5.e(_context2.t5);
-          case 101:
-            _context2.prev = 101;
+          case 103:
+            _context2.prev = 103;
             _iterator5.f();
-            return _context2.finish(101);
-          case 104:
-            _context2.next = 85;
-            break;
+            return _context2.finish(103);
           case 106:
-            _context2.next = 111;
+            _context2.next = 87;
             break;
           case 108:
-            _context2.prev = 108;
-            _context2.t6 = _context2["catch"](83);
+            _context2.next = 113;
+            break;
+          case 110:
+            _context2.prev = 110;
+            _context2.t6 = _context2["catch"](85);
             _iterator4.e(_context2.t6);
-          case 111:
-            _context2.prev = 111;
+          case 113:
+            _context2.prev = 113;
             _iterator4.f();
-            return _context2.finish(111);
-          case 114:
+            return _context2.finish(113);
+          case 116:
             return _context2.abrupt("return", id);
-          case 117:
-            _context2.prev = 117;
-            _context2.t7 = _context2["catch"](14);
+          case 119:
+            _context2.prev = 119;
+            _context2.t7 = _context2["catch"](16);
             console.log(_context2.t7);
-          case 120:
+          case 122:
             return _context2.abrupt("return", null);
-          case 121:
+          case 123:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[14, 117], [19, 32], [47, 58, 61, 64], [65, 76, 79, 82], [83, 108, 111, 114], [88, 98, 101, 104]]);
+      }, _callee2, null, [[16, 119], [21, 34], [49, 60, 63, 66], [67, 78, 81, 84], [85, 110, 113, 116], [90, 100, 103, 106]]);
     }));
     return function assign(_x) {
       return _ref5.apply(this, arguments);
@@ -625,12 +634,18 @@ var connect = exports.connect = function connect(mem) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             p = mem.env[opt.process];
+            if (p) {
+              _context3.next = 3;
+              break;
+            }
+            return _context3.abrupt("return", null);
+          case 3:
             ex = false;
             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;
             if (!(!opt.item && opt.signer)) {
-              _context3.next = 15;
+              _context3.next = 17;
               break;
             }
             _iterator6 = _createForOfIteratorHelper(opt.tags);
@@ -650,33 +665,33 @@ var connect = exports.connect = function connect(mem) {
               Type: "Message",
               SDK: "aoconnect"
             }));
-            _context3.next = 11;
+            _context3.next = 13;
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags),
               target: opt.process
             });
-          case 11:
+          case 13:
             _yield$ar$dataitem3 = _context3.sent;
             item = _yield$ar$dataitem3.item;
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
-          case 15:
-            _context3.next = 17;
-            return ar.postItem(item, _test.su.jwk);
           case 17:
+            _context3.next = 19;
+            return ar.postItem(item, _test.su.jwk);
+          case 19:
             mem.msgs[id] = opt;
-            _context3.next = 20;
+            _context3.next = 22;
             return _assign({
               message: id,
               process: opt.process,
               from: owner,
               signer: _test.mu.signer
             });
-          case 20:
+          case 22:
             return _context3.abrupt("return", id);
-          case 21:
+          case 23:
           case "end":
             return _context3.stop();
         }
@@ -845,23 +860,29 @@ var connect = exports.connect = function connect(mem) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
               p = mem.env[opt.process];
+              if (p) {
+                _context9.next = 3;
+                break;
+              }
+              return _context9.abrupt("return", null);
+            case 3:
               id = (_opt$id = opt.id) !== null && _opt$id !== void 0 ? _opt$id : "";
               owner = (_opt$owner2 = opt.owner) !== null && _opt$owner2 !== void 0 ? _opt$owner2 : "";
               if (!(!opt.id && opt.signer)) {
-                _context9.next = 10;
+                _context9.next = 12;
                 break;
               }
               ;
-              _context9.next = 7;
+              _context9.next = 9;
               return ar.dataitem(_objectSpread(_objectSpread({}, opt), {}, {
                 target: opt.process
               }));
-            case 7:
+            case 9:
               _yield$ar$dataitem4 = _context9.sent;
               id = _yield$ar$dataitem4.id;
               owner = _yield$ar$dataitem4.owner;
-            case 10:
-              _context9.prev = 10;
+            case 12:
+              _context9.prev = 12;
               cloneMemory = function cloneMemory(memory) {
                 var buffer = memory.buffer.slice(0); // Clone the ArrayBuffer
                 return new WebAssembly.Memory({
@@ -878,22 +899,22 @@ var connect = exports.connect = function connect(mem) {
                 module: p.module,
                 auth: _test.mu.addr
               });
-              _context9.next = 16;
+              _context9.next = 18;
               return p.handle(p.memory, msg, _env);
-            case 16:
+            case 18:
               res = _context9.sent;
               return _context9.abrupt("return", res);
-            case 20:
-              _context9.prev = 20;
-              _context9.t0 = _context9["catch"](10);
+            case 22:
+              _context9.prev = 22;
+              _context9.t0 = _context9["catch"](12);
               console.log(_context9.t0);
-            case 23:
+            case 25:
               return _context9.abrupt("return", null);
-            case 24:
+            case 26:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, null, [[10, 20]]);
+        }, _callee9, null, [[12, 22]]);
       }));
       function dryrun(_x7) {
         return _dryrun.apply(this, arguments);

package/cjs/helpers.js

@@ -80,7 +80,6 @@ var Src = exports.Src = /*#__PURE__*/function () {
     key: "data",
     value: function data(file) {
       var ext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "lua";
-      console.log(this.dir);
       return (0, _fs.readFileSync)("".concat(this.dir, "/").concat(file, ".").concat(ext), ext === "wasm" ? null : "utf8");
     }
   }, {