wao 0.13.0 → 0.13.2

package/cjs/bao.js

@@ -71,10 +71,12 @@ var AO = /*#__PURE__*/function (_MAO) {
     })]);
     _this.in_memory = true;
     _this.createDataItemSigner = (_opt$createDataItemSi = opt.createDataItemSigner) !== null && _opt$createDataItemSi !== void 0 ? _opt$createDataItemSi : _aoconnect.createDataItemSigner;
+    _this.hb = opt.hb;
     var _opt$connect = opt.connect(opt.mem, {
         extensions: opt.extensions,
         cache: opt.cache,
-        reset: opt.reset
+        reset: opt.reset,
+        hb: _this.hb
       }),
       modules = _opt$connect.modules,
       results = _opt$connect.results,
@@ -85,7 +87,9 @@ var AO = /*#__PURE__*/function (_MAO) {
       dryrun = _opt$connect.dryrun,
       monitor = _opt$connect.monitor,
       unmonitor = _opt$connect.unmonitor,
+      recover = _opt$connect.recover,
       mem = _opt$connect.mem;
+    _this.recover = recover;
     _this.assign = assign;
     _this.result = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res,
@@ -168,8 +172,15 @@ var AO = /*#__PURE__*/function (_MAO) {
               _context4.next = 3;
               return this.ar.init(jwk);
             case 3:
+              if (!this.hb) {
+                _context4.next = 6;
+                break;
+              }
+              _context4.next = 6;
+              return this.hb.init(jwk);
+            case 6:
               return _context4.abrupt("return", this);
-            case 4:
+            case 7:
             case "end":
               return _context4.stop();
           }

package/cjs/bar.js

@@ -93,32 +93,41 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "httpmsg",
     value: function () {
       var _httpmsg = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(msg) {
-        var tags, _parseSignatureInput, n, owner;
+        var tags, owner, _parseSignatureInput, n, _tags$Owner;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               tags = (0, _utils.tags)(msg.tags);
+              owner = null;
+              _context.prev = 2;
               _parseSignatureInput = parseSignatureInput(tags["signature-input"]), n = _parseSignatureInput.keyid;
-              _context.next = 4;
+              _context.next = 6;
               return this.arweave.wallets.jwkToAddress({
                 n: n
               });
-            case 4:
+            case 6:
               owner = _context.sent;
-              _context.next = 7;
+              _context.next = 12;
+              break;
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](2);
+              owner = (_tags$Owner = tags.Owner) !== null && _tags$Owner !== void 0 ? _tags$Owner : null;
+            case 12:
+              _context.next = 14;
               return this.mem.set(msg, "txs", msg.id);
-            case 7:
+            case 14:
               return _context.abrupt("return", {
                 item: msg,
                 id: tags.id,
                 tags: tags,
                 owner: owner
               });
-            case 8:
+            case 15:
             case "end":
               return _context.stop();
           }
-        }, _callee, this);
+        }, _callee, this, [[2, 9]]);
       }));
       function httpmsg(_x) {
         return _httpmsg.apply(this, arguments);

package/cjs/hb.js

@@ -43,7 +43,7 @@ var HB = /*#__PURE__*/function () {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return fetch("".concat(this.url, "/metrics")).then(function (r) {
+              return fetch("".concat(this.url, "/~hyperbuddy@1.0/metrics")).then(function (r) {
                 return r.text();
               });
             case 2:
@@ -176,19 +176,80 @@ var HB = /*#__PURE__*/function () {
       return init;
     }()
   }, {
-    key: "process",
+    key: "messages",
     value: function () {
-      var _process = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _messages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+        var _this = this;
         var _ref2,
-          _ref2$tags,
+          target,
+          from,
+          to,
+          limit,
+          params,
+          res,
+          _args5 = arguments;
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
+            case 0:
+              _ref2 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, target = _ref2.target, from = _ref2.from, to = _ref2.to, limit = _ref2.limit;
+              params = "target=".concat(target);
+              if ((0, _ramda.isNotNil)(from)) params += "&from=".concat(from);
+              if ((0, _ramda.isNotNil)(to)) params += "&to=".concat(to);
+              params += "&accept=application/aos-2";
+              _context5.next = 7;
+              return fetch("".concat(this.url, "/~scheduler@1.0/schedule?").concat(params)).then(function (r) {
+                return r.json();
+              });
+            case 7:
+              res = _context5.sent;
+              if (res.page_info.has_next_page) {
+                res.next = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+                  var from2;
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
+                      case 0:
+                        from2 = (0, _ramda.last)(res.edges).cursor + 1;
+                        _context4.next = 3;
+                        return _this.message({
+                          target: target,
+                          from2: from2,
+                          to: to
+                        });
+                      case 3:
+                        return _context4.abrupt("return", _context4.sent);
+                      case 4:
+                      case "end":
+                        return _context4.stop();
+                    }
+                  }, _callee4);
+                }));
+              }
+              return _context5.abrupt("return", res);
+            case 10:
+            case "end":
+              return _context5.stop();
+          }
+        }, _callee5, this);
+      }));
+      function messages() {
+        return _messages.apply(this, arguments);
+      }
+      return messages;
+    }()
+  }, {
+    key: "process",
+    value: function () {
+      var _process = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var _ref4,
+          _ref4$tags,
           tags,
-          _ref2$data,
           data,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+          res,
+          _args6 = arguments;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              _ref2 = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {}, _ref2$tags = _ref2.tags, tags = _ref2$tags === void 0 ? {} : _ref2$tags, _ref2$data = _ref2.data, data = _ref2$data === void 0 ? "1984" : _ref2$data;
+              _ref4 = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {}, _ref4$tags = _ref4.tags, tags = _ref4$tags === void 0 ? {} : _ref4$tags, data = _ref4.data;
               tags = (0, _ramda.mergeLeft)(tags, {
                 data: data,
                 Type: "Process",
@@ -203,17 +264,21 @@ var HB = /*#__PURE__*/function () {
                 "scheduler-device": "scheduler@1.0",
                 "execution-device": "genesis-wasm@1.0"
               });
-              _context4.next = 4;
+              _context6.next = 4;
               return this.post({
                 tags: tags
               });
             case 4:
-              return _context4.abrupt("return", _context4.sent);
-            case 5:
+              res = _context6.sent;
+              _context6.next = 7;
+              return res.process.text();
+            case 7:
+              return _context6.abrupt("return", _context6.sent);
+            case 8:
             case "end":
-              return _context4.stop();
+              return _context6.stop();
           }
-        }, _callee4, this);
+        }, _callee6, this);
       }));
       function process() {
         return _process.apply(this, arguments);
@@ -223,19 +288,19 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "schedule",
     value: function () {
-      var _schedule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        var _ref3,
-          _ref3$tags,
+      var _schedule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+        var _ref5,
+          _ref5$tags,
           tags,
           data,
           process,
-          _ref3$action,
+          _ref5$action,
           action,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+          _args7 = arguments;
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _ref3 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, _ref3$tags = _ref3.tags, tags = _ref3$tags === void 0 ? {} : _ref3$tags, data = _ref3.data, process = _ref3.process, _ref3$action = _ref3.action, action = _ref3$action === void 0 ? "Eval" : _ref3$action;
+              _ref5 = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {}, _ref5$tags = _ref5.tags, tags = _ref5$tags === void 0 ? {} : _ref5$tags, data = _ref5.data, process = _ref5.process, _ref5$action = _ref5.action, action = _ref5$action === void 0 ? "Eval" : _ref5$action;
               tags = (0, _ramda.mergeLeft)(tags, {
                 path: "".concat(process, "/schedule"),
                 type: "Message",
@@ -244,17 +309,17 @@ var HB = /*#__PURE__*/function () {
                 "Data-Protocol": "ao",
                 Variant: "ao.N.1"
               });
-              _context5.next = 4;
+              _context7.next = 4;
               return this.post({
                 tags: tags
               });
             case 4:
-              return _context5.abrupt("return", _context5.sent.slot.text());
+              return _context7.abrupt("return", _context7.sent.slot.text());
             case 5:
             case "end":
-              return _context5.stop();
+              return _context7.stop();
           }
-        }, _callee5, this);
+        }, _callee7, this);
       }));
       function schedule() {
         return _schedule.apply(this, arguments);
@@ -264,29 +329,29 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "compute",
     value: function () {
-      var _compute = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _ref4,
-          _ref4$tags,
+      var _compute = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+        var _ref6,
+          _ref6$tags,
           tags,
           process,
           slot,
-          _args6 = arguments;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+          _args8 = arguments;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _ref4 = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {}, _ref4$tags = _ref4.tags, tags = _ref4$tags === void 0 ? {} : _ref4$tags, process = _ref4.process, slot = _ref4.slot;
-              _context6.next = 3;
+              _ref6 = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {}, _ref6$tags = _ref6.tags, tags = _ref6$tags === void 0 ? {} : _ref6$tags, process = _ref6.process, slot = _ref6.slot;
+              _context8.next = 3;
               return this.request({
                 method: "GET",
                 path: "/".concat(process, "/compute&slot+integer=").concat(slot, "/results/json")
               });
             case 3:
-              return _context6.abrupt("return", _context6.sent);
+              return _context8.abrupt("return", _context8.sent);
             case 4:
             case "end":
-              return _context6.stop();
+              return _context8.stop();
           }
-        }, _callee6, this);
+        }, _callee8, this);
       }));
       function compute() {
         return _compute.apply(this, arguments);
@@ -296,31 +361,35 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "dryrun",
     value: function () {
-      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-        var _ref5,
-          _ref5$tags,
+      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var _ref7,
+          _ref7$tags,
           tags,
           process,
           action,
-          _args7 = arguments;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
+          data,
+          json,
+          _args9 = arguments;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _ref5 = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {}, _ref5$tags = _ref5.tags, tags = _ref5$tags === void 0 ? {} : _ref5$tags, process = _ref5.process, action = _ref5.action;
+              _ref7 = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {}, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, process = _ref7.process, action = _ref7.action, data = _ref7.data;
               if (typeof action === "string") tags.Action = action;
-              _context7.next = 4;
-              return fetch("".concat(this.url, "/~relay@1.0/call?relay-method=POST&relay-path=/dry-run?process-id=").concat(process, "/&content-type=application/json&body=").concat(JSON.stringify({
+              json = {
                 Tags: (0, _utils.buildTags)(tags)
-              }))).then(function (r) {
+              };
+              if (data) json.Data = data;
+              _context9.next = 6;
+              return fetch("".concat(this.url, "/~relay@1.0/call?relay-method=POST&relay-path=/dry-run?process-id=").concat(process, "/&content-type=application/json&body=").concat(JSON.stringify(json))).then(function (r) {
                 return r.json();
               });
-            case 4:
-              return _context7.abrupt("return", _context7.sent);
-            case 5:
+            case 6:
+              return _context9.abrupt("return", _context9.sent);
+            case 7:
             case "end":
-              return _context7.stop();
+              return _context9.stop();
           }
-        }, _callee7, this);
+        }, _callee9, this);
       }));
       function dryrun() {
         return _dryrun.apply(this, arguments);
@@ -330,25 +399,25 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(_ref6) {
-        var device, _ref6$path, path;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
+      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref8) {
+        var device, _ref8$path, path;
+        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              device = _ref6.device, _ref6$path = _ref6.path, path = _ref6$path === void 0 ? "~meta@1.0/info" : _ref6$path;
-              _context8.next = 3;
+              device = _ref8.device, _ref8$path = _ref8.path, path = _ref8$path === void 0 ? "~meta@1.0/info" : _ref8$path;
+              _context10.next = 3;
               return this.request({
                 device: device,
                 path: path,
                 method: "GET"
               });
             case 3:
-              return _context8.abrupt("return", _context8.sent.body);
+              return _context10.abrupt("return", _context10.sent.body);
             case 4:
             case "end":
-              return _context8.stop();
+              return _context10.stop();
           }
-        }, _callee8, this);
+        }, _callee10, this);
       }));
       function get(_x2) {
         return _get.apply(this, arguments);
@@ -358,13 +427,13 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "post",
     value: function () {
-      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(_ref7) {
-        var device, tags, _ref7$path, path;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
+      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref9) {
+        var device, tags, _ref9$path, path;
+        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+          while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              device = _ref7.device, tags = _ref7.tags, _ref7$path = _ref7.path, path = _ref7$path === void 0 ? "/schedule" : _ref7$path;
-              _context9.next = 3;
+              device = _ref9.device, tags = _ref9.tags, _ref9$path = _ref9.path, path = _ref9$path === void 0 ? "/schedule" : _ref9$path;
+              _context11.next = 3;
               return this.request({
                 tags: tags,
                 device: device,
@@ -372,12 +441,12 @@ var HB = /*#__PURE__*/function () {
                 method: "POST"
               });
             case 3:
-              return _context9.abrupt("return", _context9.sent);
+              return _context11.abrupt("return", _context11.sent);
             case 4:
             case "end":
-              return _context9.stop();
+              return _context11.stop();
           }
-        }, _callee9, this);
+        }, _callee11, this);
       }));
       function post(_x3) {
         return _post.apply(this, arguments);
@@ -387,26 +456,26 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "request",
     value: function () {
-      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(_ref8) {
-        var device, tags, _ref8$method, method, _ref8$path, path, _tags;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
+      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref10) {
+        var device, tags, _ref10$method, method, _ref10$path, path, _tags;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              device = _ref8.device, tags = _ref8.tags, _ref8$method = _ref8.method, method = _ref8$method === void 0 ? "POST" : _ref8$method, _ref8$path = _ref8.path, path = _ref8$path === void 0 ? "/schedule" : _ref8$path;
+              device = _ref10.device, tags = _ref10.tags, _ref10$method = _ref10.method, method = _ref10$method === void 0 ? "POST" : _ref10$method, _ref10$path = _ref10.path, path = _ref10$path === void 0 ? "/schedule" : _ref10$path;
               _tags = (0, _ramda.mergeLeft)(tags, {
                 path: path,
                 method: method
               });
               if (device) _tags.device = device;
-              _context10.next = 5;
+              _context12.next = 5;
               return this._request(_tags);
             case 5:
-              return _context10.abrupt("return", _context10.sent);
+              return _context12.abrupt("return", _context12.sent);
             case 6:
             case "end":
-              return _context10.stop();
+              return _context12.stop();
           }
-        }, _callee10, this);
+        }, _callee12, this);
       }));
       function request(_x4) {
         return _request.apply(this, arguments);

package/cjs/run.js

@@ -18,7 +18,8 @@ var _yargs$argv = (0, _yargs["default"])(process.argv.slice(2)).argv,
   _yargs$argv$port = _yargs$argv.port,
   port = _yargs$argv$port === void 0 ? 4000 : _yargs$argv$port,
   _yargs$argv$db = _yargs$argv.db,
-  db = _yargs$argv$db === void 0 ? ".cache" : _yargs$argv$db;
+  db = _yargs$argv$db === void 0 ? ".cache" : _yargs$argv$db,
+  hb = _yargs$argv.hb;
 db = memory ? null : (0, _path.resolve)(process.cwd(), db);
 if (reset) {
   try {
@@ -33,7 +34,8 @@ var main = /*#__PURE__*/function () {
           return _context.abrupt("return", new _server["default"]({
             log: true,
             port: port,
-            db: db
+            db: db,
+            hb_url: hb
           }));
         case 1:
         case "end":