wao 0.2.2 → 0.2.4

package/cjs/ar.js

@@ -56,7 +56,7 @@ var AR = /*#__PURE__*/function () {
     key: "init",
     value: function () {
       var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(jwk) {
-        var isGen, isWallet;
+        var isGen, _jwk, isWallet;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -67,59 +67,60 @@ var AR = /*#__PURE__*/function () {
                 break;
               }
               isGen = true;
-              _context.next = 30;
+              _context.next = 31;
               break;
             case 6:
+              jwk = _typeof((_jwk = jwk) === null || _jwk === void 0 ? void 0 : _jwk.jwk) === "object" ? jwk.jwk : jwk;
               this.jwk = jwk;
               isWallet = this.isArConnect(this.jwk);
               if (!isWallet) {
-                _context.next = 26;
+                _context.next = 27;
                 break;
               }
-              _context.prev = 9;
-              _context.next = 12;
+              _context.prev = 10;
+              _context.next = 13;
               return this.jwk.connect(["ACCESS_ADDRESS", "ACCESS_PUBLIC_KEY", "SIGN_TRANSACTION"]);
-            case 12:
-              _context.next = 14;
+            case 13:
+              _context.next = 15;
               return this.jwk.getActiveAddress();
-            case 14:
+            case 15:
               this.addr = _context.sent;
-              _context.next = 17;
+              _context.next = 18;
               return this.jwk.getActivePublicKey();
-            case 17:
+            case 18:
               this.pub = _context.sent;
               this.isWallet = true;
-              _context.next = 24;
+              _context.next = 25;
               break;
-            case 21:
-              _context.prev = 21;
-              _context.t0 = _context["catch"](9);
+            case 22:
+              _context.prev = 22;
+              _context.t0 = _context["catch"](10);
               isGen = true;
-            case 24:
-              _context.next = 30;
+            case 25:
+              _context.next = 31;
               break;
-            case 26:
-              _context.next = 28;
+            case 27:
+              _context.next = 29;
               return this.toAddr(jwk);
-            case 28:
+            case 29:
               this.addr = _context.sent;
               this.pub = jwk.n;
-            case 30:
+            case 31:
               if (!isGen) {
-                _context.next = 35;
+                _context.next = 36;
                 break;
               }
               this.isWallet = false;
               this.addr = this.pub = this.jwk = null;
-              _context.next = 35;
+              _context.next = 36;
               return this.gen("100");
-            case 35:
-              return _context.abrupt("return", this);
             case 36:
+              return _context.abrupt("return", this);
+            case 37:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[9, 21]]);
+        }, _callee, this, [[10, 22]]);
       }));
       function init(_x) {
         return _init.apply(this, arguments);
@@ -152,6 +153,7 @@ var AR = /*#__PURE__*/function () {
       var _checkWallet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         var _ref2,
           jwk,
+          start,
           err,
           addr,
           pub,
@@ -164,104 +166,105 @@ var AR = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _ref2 = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {}, jwk = _ref2.jwk;
+              start = Date.now();
               if (!jwk) {
-                _context3.next = 3;
+                _context3.next = 4;
                 break;
               }
               return _context3.abrupt("return", {
                 err: null,
                 jwk: jwk
               });
-            case 3:
+            case 4:
               err = null, addr = null, pub = null;
               existWallet = (typeof window === "undefined" ? "undefined" : _typeof(window)) === "object" && window.arweaveWallet;
               isJwkWallet = this.isArConnect(this.jwk);
               if (this.jwk) {
-                _context3.next = 24;
+                _context3.next = 25;
                 break;
               }
               if (!this._jwk) {
-                _context3.next = 15;
+                _context3.next = 16;
                 break;
               }
               jwk = this._jwk;
               pub = this._jwk.n;
-              _context3.next = 12;
+              _context3.next = 13;
               return this.toAddr(jwk);
-            case 12:
+            case 13:
               addr = _context3.sent;
-              _context3.next = 22;
+              _context3.next = 23;
               break;
-            case 15:
+            case 16:
               ;
-              _context3.next = 18;
+              _context3.next = 19;
               return this.gen("100", false);
-            case 18:
+            case 19:
               _yield$this$gen = _context3.sent;
               jwk = _yield$this$gen.jwk;
               addr = _yield$this$gen.addr;
               pub = _yield$this$gen.pub;
-            case 22:
-              _context3.next = 52;
+            case 23:
+              _context3.next = 53;
               break;
-            case 24:
+            case 25:
               if (!(this.jwk && !isJwkWallet)) {
-                _context3.next = 30;
+                _context3.next = 31;
                 break;
               }
               jwk = this.jwk;
               addr = this.addr;
               pub = this.pub;
-              _context3.next = 52;
+              _context3.next = 53;
               break;
-            case 30:
+            case 31:
               if (!existWallet) {
-                _context3.next = 51;
+                _context3.next = 52;
                 break;
               }
-              _context3.next = 33;
+              _context3.next = 34;
               return arweaveWallet.connect(["ACCESS_ADDRESS", "ACCESS_PUBLIC_KEY", "SIGN_TRANSACTION"]);
-            case 33:
-              _context3.next = 35;
+            case 34:
+              _context3.next = 36;
               return arweaveWallet.getActiveAddress();
-            case 35:
+            case 36:
               _addr = _context3.sent;
               if (!_addr) {
-                _context3.next = 48;
+                _context3.next = 49;
                 break;
               }
               if (!(this.addr && this.addr !== _addr)) {
-                _context3.next = 41;
+                _context3.next = 42;
                 break;
               }
               err = "the wrong wallet";
-              _context3.next = 46;
+              _context3.next = 47;
               break;
-            case 41:
+            case 42:
               addr = _addr;
-              _context3.next = 44;
+              _context3.next = 45;
               return arweaveWallet.getActivePublicKey();
-            case 44:
+            case 45:
               pub = _context3.sent;
               jwk = arweaveWallet;
-            case 46:
-              _context3.next = 49;
+            case 47:
+              _context3.next = 50;
               break;
-            case 48:
-              err = "no wallet found";
             case 49:
-              _context3.next = 52;
-              break;
-            case 51:
               err = "no wallet found";
+            case 50:
+              _context3.next = 53;
+              break;
             case 52:
+              err = "no wallet found";
+            case 53:
               return _context3.abrupt("return", {
                 addr: addr,
                 jwk: jwk,
                 pub: pub,
                 err: err
               });
-            case 53:
+            case 54:
             case "end":
               return _context3.stop();
           }

package/cjs/helpers.js

@@ -4,31 +4,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "AO", {
-  enumerable: true,
-  get: function get() {
-    return _tao["default"];
-  }
-});
-Object.defineProperty(exports, "AR", {
-  enumerable: true,
-  get: function get() {
-    return _index.AR;
-  }
-});
-exports.Src = void 0;
-Object.defineProperty(exports, "connect", {
-  enumerable: true,
-  get: function get() {
-    return _aoconnect3.connect;
-  }
-});
-exports.setup = exports.ok = exports.fail = void 0;
-var _aoconnect3 = require("./aoconnect.js");
+exports.setup = exports.ok = exports.fail = exports.Src = void 0;
 var _index = require("./index.js");
-var _tao = _interopRequireDefault(require("./tao.js"));
 var _assert = _interopRequireDefault(require("assert"));
-var _aoconnect4 = require("@permaweb/aoconnect");
+var _aoconnect3 = require("@permaweb/aoconnect");
 var _path = require("path");
 var _fs = require("fs");
 var _yargs = _interopRequireDefault(require("yargs"));
@@ -219,11 +198,11 @@ var setup = exports.setup = /*#__PURE__*/function () {
             dir: dir
           });
           _context3.next = 25;
-          return new _tao["default"](opt.ao).init(opt.jwk);
+          return new AO(opt.ao).init(opt.jwk);
         case 25:
           _ao = _context3.sent;
           _context3.next = 28;
-          return new _tao["default"](opt.ao2).init(opt.jwk);
+          return new AO(opt.ao2).init(opt.jwk);
         case 28:
           _ao2 = _context3.sent;
           console.log("cache:\t", optPath);
@@ -281,7 +260,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
           return src.upload("aos2_0_1", "wasm");
         case 51:
           wasm_aos2 = _context3.sent;
-          ao = new _tao["default"]({
+          ao = new AO({
             aoconnect: aoconnect,
             ar: ar,
             authority: auth
@@ -345,7 +324,7 @@ var setup = exports.setup = /*#__PURE__*/function () {
 
           // ao2
           _context3.next = 87;
-          return new _tao["default"]({
+          return new AO({
             aoconnect: aoconnect,
             ar: ar,
             authority: auth,

package/cjs/tao.js

@@ -46,8 +46,10 @@ var AO = /*#__PURE__*/function (_MAO) {
       message = _connect.message,
       spawn = _connect.spawn,
       dryrun = _connect.dryrun,
+      monitor = _connect.monitor,
+      unmonitor = _connect.unmonitor,
       txs = _connect.txs;
-    _this.module = modules.aos_2_0_1;
+    _this.module = modules.aos2_0_1;
     _this.assign = assign;
     _this.result = result;
     _this.results = results;
@@ -55,6 +57,8 @@ var AO = /*#__PURE__*/function (_MAO) {
     _this.spawn = spawn;
     _this.dryrun = dryrun;
     _this.ar.txs = txs;
+    _this.monitor = monitor;
+    _this.unmonitor = unmonitor;
     _this.accounts = accounts;
     return _this;
   }

package/cjs/test.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "AO", {
+  enumerable: true,
+  get: function get() {
+    return _tao["default"];
+  }
+});
+Object.defineProperty(exports, "acc", {
+  enumerable: true,
+  get: function get() {
+    return _aoconnect.acc;
+  }
+});
+Object.defineProperty(exports, "connect", {
+  enumerable: true,
+  get: function get() {
+    return _aoconnect.connect;
+  }
+});
+Object.defineProperty(exports, "mu", {
+  enumerable: true,
+  get: function get() {
+    return _aoconnect.mu;
+  }
+});
+var _aoconnect = require("./aoconnect.js");
+var _tao = _interopRequireDefault(require("./tao.js"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }

package/esm/ao.js

@@ -11,6 +11,8 @@ import {
   message,
   spawn,
   dryrun,
+  monitor,
+  unmonitor,
 } from "@permaweb/aoconnect"
 
 import {
@@ -88,14 +90,24 @@ class AO {
     }
     if (in_memory) {
     } else if (aoconnect) {
-      const { results, assign, result, message, spawn, dryrun } =
-        connect(aoconnect)
+      const {
+        results,
+        assign,
+        result,
+        message,
+        spawn,
+        dryrun,
+        monitor,
+        unmonitor,
+      } = connect(aoconnect)
       this.assign = assign
       this.result = result
       this.results = results
       this.message = message
       this.spawn = spawn
       this.dryrun = dryrun
+      this.monitor = monitor
+      this.unmonitor = unmonitor
     } else {
       this.assign = assign
       this.result = result
@@ -103,6 +115,8 @@ class AO {
       this.message = message
       this.spawn = spawn
       this.dryrun = dryrun
+      this.monitor = monitor
+      this.unmonitor = unmonitor
     }
     this.module = module
     this.scheduler = scheduler
@@ -601,7 +615,7 @@ class AO {
     let exist = false
     let err = null
     while (attempts > 0) {
-      await wait(1000)
+      if (!this.in_memory) await wait(1000)
       const { res, err: _err } = await this.dry({ pid, data: "#Inbox" })
       if (typeof res?.Output === "object") break
       attempts -= 1
@@ -648,7 +662,11 @@ class AO {
     }
     fns.push({ fn: this.wait, then: { "args.pid": "pid" } })
     let i = 0
-    for (const v of !loads ? [{ data: src_data, src, fills }] : loads) {
+    for (const v of !loads
+      ? src_data
+        ? [{ data: src_data, src, fills }]
+        : []
+      : loads) {
       if (!isBoot || i !== 0) {
         fns.push({ fn: this.load, args: v, then: { "args.pid": "pid" } })
       }