wao 0.22.2 → 0.22.3

package/cjs/aoconnect-base.js

@@ -1710,7 +1710,7 @@ var _default = exports["default"] = function _default() {
             case 32:
               _context9.next = 34;
               return hb.messages({
-                target: pid,
+                pid: pid,
                 from: from
               });
             case 34:

package/cjs/hb.js

@@ -588,7 +588,7 @@ var HB = /*#__PURE__*/function () {
                 "random-seed": seed(16),
                 Type: "Process",
                 "scheduler-device": "scheduler@1.0",
-                "execution-device": "wao@1.0"
+                "execution-device": "test-device@1.0"
               }));
             case 7:
               res = _context18.sent;
@@ -611,7 +611,7 @@ var HB = /*#__PURE__*/function () {
     key: "message",
     value: function () {
       var _message = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(args) {
-        var pid, slot, res;
+        var pid, _yield$this$schedule, slot, res;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -619,20 +619,21 @@ var HB = /*#__PURE__*/function () {
               _context19.next = 3;
               return this.schedule(args);
             case 3:
-              slot = _context19.sent;
-              _context19.next = 6;
+              _yield$this$schedule = _context19.sent;
+              slot = _yield$this$schedule.slot;
+              _context19.next = 7;
               return this.compute({
                 pid: pid,
                 slot: slot
               });
-            case 6:
+            case 7:
               res = _context19.sent;
               return _context19.abrupt("return", {
                 slot: slot,
                 pid: pid,
                 res: res
               });
-            case 8:
+            case 9:
             case "end":
               return _context19.stop();
           }
@@ -644,23 +645,61 @@ var HB = /*#__PURE__*/function () {
       return message;
     }()
   }, {
-    key: "schedule",
+    key: "scheduleLegacy",
     value: function () {
-      var _schedule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var _pid2, _scheduler;
+      var _scheduleLegacy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
         var _ref7,
           pid,
+          _ref7$action,
+          action,
           _ref7$tags,
           tags,
           data,
           scheduler,
-          _tags,
-          res,
           _args20 = arguments;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _ref7 = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {}, pid = _ref7.pid, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, data = _ref7.data, scheduler = _ref7.scheduler;
+              _ref7 = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {}, pid = _ref7.pid, _ref7$action = _ref7.action, action = _ref7$action === void 0 ? "Eval" : _ref7$action, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, data = _ref7.data, scheduler = _ref7.scheduler;
+              if (action) tags.Action = action;
+              _context20.next = 4;
+              return this.schedule({
+                pid: pid,
+                tags: tags,
+                data: data,
+                scheduler: scheduler
+              });
+            case 4:
+              return _context20.abrupt("return", _context20.sent);
+            case 5:
+            case "end":
+              return _context20.stop();
+          }
+        }, _callee20, this);
+      }));
+      function scheduleLegacy() {
+        return _scheduleLegacy.apply(this, arguments);
+      }
+      return scheduleLegacy;
+    }()
+  }, {
+    key: "schedule",
+    value: function () {
+      var _schedule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        var _pid2, _scheduler;
+        var _ref8,
+          pid,
+          _ref8$tags,
+          tags,
+          data,
+          scheduler,
+          _tags,
+          res,
+          _args21 = arguments;
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
+            case 0:
+              _ref8 = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {}, pid = _ref8.pid, _ref8$tags = _ref8.tags, tags = _ref8$tags === void 0 ? {} : _ref8$tags, data = _ref8.data, scheduler = _ref8.scheduler;
               (_pid2 = pid) !== null && _pid2 !== void 0 ? _pid2 : pid = this.pid;
               (_scheduler = scheduler) !== null && _scheduler !== void 0 ? _scheduler : scheduler = this.scheduler;
               _tags = (0, _ramda.mergeLeft)(tags, {
@@ -671,19 +710,19 @@ var HB = /*#__PURE__*/function () {
                 Target: pid
               });
               if (data) _tags.data = data;
-              _context20.next = 7;
+              _context21.next = 7;
               return this.send(_tags);
             case 7:
-              res = _context20.sent;
-              return _context20.abrupt("return", {
+              res = _context21.sent;
+              return _context21.abrupt("return", {
                 slot: res.headers.get("slot"),
                 res: res
               });
             case 9:
             case "end":
-              return _context20.stop();
+              return _context21.stop();
           }
-        }, _callee20, this);
+        }, _callee21, this);
       }));
       function schedule() {
         return _schedule.apply(this, arguments);
@@ -693,43 +732,43 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "spawnAOS",
     value: function () {
-      var _spawnAOS = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee21(image) {
+      var _spawnAOS = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22(image) {
         var _this$scheduler2, _image, _this$image, _this$pid;
         var addr, res, pid;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
-              _context21.next = 2;
+              _context22.next = 2;
               return this.meta.info({
                 key: "address"
               });
             case 2:
-              addr = _context21.sent;
+              addr = _context22.sent;
               (_this$scheduler2 = this.scheduler) !== null && _this$scheduler2 !== void 0 ? _this$scheduler2 : this.scheduler = addr;
               if (!((_image = image) !== null && _image !== void 0)) {
-                _context21.next = 8;
+                _context22.next = 8;
                 break;
               }
               _image;
-              _context21.next = 16;
+              _context22.next = 16;
               break;
             case 8:
               if (!((_this$image = this.image) !== null && _this$image !== void 0)) {
-                _context21.next = 12;
+                _context22.next = 12;
                 break;
               }
-              _context21.t0 = _this$image;
-              _context21.next = 15;
+              _context22.t0 = _this$image;
+              _context22.next = 15;
               break;
             case 12:
-              _context21.next = 14;
+              _context22.next = 14;
               return this.getImage();
             case 14:
-              _context21.t0 = _context21.sent;
+              _context22.t0 = _context22.sent;
             case 15:
-              image = _context21.t0;
+              image = _context22.t0;
             case 16:
-              _context21.next = 18;
+              _context22.next = 18;
               return this.send({
                 device: "process@1.0",
                 path: "/schedule",
@@ -750,18 +789,18 @@ var HB = /*#__PURE__*/function () {
                 passes: 2
               });
             case 18:
-              res = _context21.sent;
+              res = _context22.sent;
               pid = res.headers.get("process");
               (_this$pid = this.pid) !== null && _this$pid !== void 0 ? _this$pid : this.pid = pid;
-              return _context21.abrupt("return", {
+              return _context22.abrupt("return", {
                 pid: pid,
                 res: res
               });
             case 22:
             case "end":
-              return _context21.stop();
+              return _context22.stop();
           }
-        }, _callee21, this);
+        }, _callee22, this);
       }));
       function spawnAOS(_x18) {
         return _spawnAOS.apply(this, arguments);
@@ -853,38 +892,38 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "messages",
     value: function () {
-      var _messages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      var _messages = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _this2 = this;
-        var _ref8,
+        var _ref9,
           pid,
           from,
           to,
           limit,
           params,
           res,
-          _args23 = arguments;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+          _args24 = arguments;
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.next) {
             case 0:
-              _ref8 = _args23.length > 0 && _args23[0] !== undefined ? _args23[0] : {}, pid = _ref8.pid, from = _ref8.from, to = _ref8.to, limit = _ref8.limit;
+              _ref9 = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {}, pid = _ref9.pid, from = _ref9.from, to = _ref9.to, limit = _ref9.limit;
               params = "target=".concat(pid);
               if ((0, _ramda.isNotNil)(from)) params += "&from=".concat(from);
               if ((0, _ramda.isNotNil)(to)) params += "&to=".concat(to);
               params += "&accept=application/aos-2";
-              _context23.next = 7;
+              _context24.next = 7;
               return fetch("".concat(this.url, "/~scheduler@1.0/schedule?").concat(params)).then(function (r) {
                 return r.json();
               });
             case 7:
-              res = _context23.sent;
+              res = _context24.sent;
               if (res.page_info.has_next_page) {
-                res.next = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+                res.next = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
                   var from2;
-                  return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-                    while (1) switch (_context22.prev = _context22.next) {
+                  return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+                    while (1) switch (_context23.prev = _context23.next) {
                       case 0:
                         from2 = (0, _ramda.last)(res.edges).cursor + 1;
-                        _context22.next = 3;
+                        _context23.next = 3;
                         return _this2.message({
                           pid: pid,
                           from: from2,
@@ -892,20 +931,20 @@ var HB = /*#__PURE__*/function () {
                           limit: limit
                         });
                       case 3:
-                        return _context22.abrupt("return", _context22.sent);
+                        return _context23.abrupt("return", _context23.sent);
                       case 4:
                       case "end":
-                        return _context22.stop();
+                        return _context23.stop();
                     }
-                  }, _callee22);
+                  }, _callee23);
                 }));
               }
-              return _context23.abrupt("return", res);
+              return _context24.abrupt("return", res);
             case 10:
             case "end":
-              return _context23.stop();
+              return _context24.stop();
           }
-        }, _callee23, this);
+        }, _callee24, this);
       }));
       function messages() {
         return _messages.apply(this, arguments);
@@ -915,17 +954,16 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "spawnLegacy",
     value: function () {
-      var _spawnLegacy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
-        var _ref10,
-          _ref10$tags,
+      var _spawnLegacy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
+        var _ref11,
+          _ref11$tags,
           tags,
           data,
-          res,
-          _args24 = arguments;
-        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
-          while (1) switch (_context24.prev = _context24.next) {
+          _args25 = arguments;
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.next) {
             case 0:
-              _ref10 = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {}, _ref10$tags = _ref10.tags, tags = _ref10$tags === void 0 ? {} : _ref10$tags, data = _ref10.data;
+              _ref11 = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {}, _ref11$tags = _ref11.tags, tags = _ref11$tags === void 0 ? {} : _ref11$tags, data = _ref11.data;
               tags = (0, _ramda.mergeLeft)(tags, {
                 data: data,
                 Type: "Process",
@@ -940,21 +978,15 @@ var HB = /*#__PURE__*/function () {
                 "scheduler-device": "scheduler@1.0",
                 "execution-device": "genesis-wasm@1.0"
               });
-              _context24.next = 4;
-              return this.post({
-                tags: tags
-              });
+              _context25.next = 4;
+              return this.spawn(tags);
             case 4:
-              res = _context24.sent;
-              return _context24.abrupt("return", {
-                pid: res.process,
-                res: res
-              });
-            case 6:
+              return _context25.abrupt("return", _context25.sent);
+            case 5:
             case "end":
-              return _context24.stop();
+              return _context25.stop();
           }
-        }, _callee24, this);
+        }, _callee25, this);
       }));
       function spawnLegacy() {
         return _spawnLegacy.apply(this, arguments);
@@ -977,26 +1009,26 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "dryrun",
     value: (function () {
-      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var _ref11,
-          _ref11$tags,
+      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26() {
+        var _ref12,
+          _ref12$tags,
           tags,
           pid,
           action,
           data,
           json,
           res,
-          _args25 = arguments;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+          _args26 = arguments;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
-              _ref11 = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {}, _ref11$tags = _ref11.tags, tags = _ref11$tags === void 0 ? {} : _ref11$tags, pid = _ref11.pid, action = _ref11.action, data = _ref11.data;
+              _ref12 = _args26.length > 0 && _args26[0] !== undefined ? _args26[0] : {}, _ref12$tags = _ref12.tags, tags = _ref12$tags === void 0 ? {} : _ref12$tags, pid = _ref12.pid, action = _ref12.action, data = _ref12.data;
               if (typeof action === "string") tags.Action = action;
               json = {
                 Tags: (0, _utils.buildTags)(tags)
               };
               if (data) json.Data = data;
-              _context25.next = 6;
+              _context26.next = 6;
               return this.send({
                 path: "/~relay@1.0/call",
                 "relay-method": "POST",
@@ -1005,13 +1037,13 @@ var HB = /*#__PURE__*/function () {
                 body: JSON.stringify(json)
               });
             case 6:
-              res = _context25.sent;
-              return _context25.abrupt("return", JSON.parse(res.body));
+              res = _context26.sent;
+              return _context26.abrupt("return", JSON.parse(res.body));
             case 8:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
       function dryrun() {
         return _dryrun.apply(this, arguments);
@@ -1021,25 +1053,25 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee26(_ref12) {
-        var device, _ref12$path, path;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref13) {
+        var device, _ref13$path, path;
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              device = _ref12.device, _ref12$path = _ref12.path, path = _ref12$path === void 0 ? "~meta@1.0/info" : _ref12$path;
-              _context26.next = 3;
+              device = _ref13.device, _ref13$path = _ref13.path, path = _ref13$path === void 0 ? "~meta@1.0/info" : _ref13$path;
+              _context27.next = 3;
               return this.request({
                 device: device,
                 path: path,
                 method: "GET"
               });
             case 3:
-              return _context26.abrupt("return", _context26.sent.body);
+              return _context27.abrupt("return", _context27.sent.body);
             case 4:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this);
+        }, _callee27, this);
       }));
       function get(_x19) {
         return _get.apply(this, arguments);
@@ -1049,13 +1081,13 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "post",
     value: function () {
-      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee27(_ref13) {
-        var device, tags, _ref13$path, path;
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28(_ref14) {
+        var device, tags, _ref14$path, path;
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
-              device = _ref13.device, tags = _ref13.tags, _ref13$path = _ref13.path, path = _ref13$path === void 0 ? "/schedule" : _ref13$path;
-              _context27.next = 3;
+              device = _ref14.device, tags = _ref14.tags, _ref14$path = _ref14.path, path = _ref14$path === void 0 ? "/schedule" : _ref14$path;
+              _context28.next = 3;
               return this.request({
                 tags: tags,
                 device: device,
@@ -1063,12 +1095,12 @@ var HB = /*#__PURE__*/function () {
                 method: "POST"
               });
             case 3:
-              return _context27.abrupt("return", _context27.sent);
+              return _context28.abrupt("return", _context28.sent);
             case 4:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
       function post(_x20) {
         return _post.apply(this, arguments);
@@ -1078,26 +1110,26 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "request",
     value: function () {
-      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee28(_ref14) {
-        var device, tags, _ref14$method, method, _ref14$path, path, _tags;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+      var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee29(_ref15) {
+        var device, tags, _ref15$method, method, _ref15$path, path, _tags;
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
-              device = _ref14.device, tags = _ref14.tags, _ref14$method = _ref14.method, method = _ref14$method === void 0 ? "POST" : _ref14$method, _ref14$path = _ref14.path, path = _ref14$path === void 0 ? "/schedule" : _ref14$path;
+              device = _ref15.device, tags = _ref15.tags, _ref15$method = _ref15.method, method = _ref15$method === void 0 ? "POST" : _ref15$method, _ref15$path = _ref15.path, path = _ref15$path === void 0 ? "/schedule" : _ref15$path;
               _tags = (0, _ramda.mergeLeft)(tags, {
                 path: path,
                 method: method
               });
               if (device) _tags.device = device;
-              _context28.next = 5;
+              _context29.next = 5;
               return this._request(_tags);
             case 5:
-              return _context28.abrupt("return", _context28.sent);
+              return _context29.abrupt("return", _context29.sent);
             case 6:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
       function request(_x21) {
         return _request.apply(this, arguments);

package/esm/aoconnect-base.js

@@ -659,9 +659,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           try {
             const p = await mem.get("env", pid)
             const from = p ? p.results.length : 0
-            const msgs = next
-              ? await next()
-              : await hb.messages({ target: pid, from })
+            const msgs = next ? await next() : await hb.messages({ pid, from })
             for (let v of msgs.edges) {
               let item = {}
               for (let k in v.node.message) {

package/esm/hb.js

@@ -158,7 +158,7 @@ class HB {
         "random-seed": seed(16),
         Type: "Process",
         "scheduler-device": "scheduler@1.0",
-        "execution-device": "wao@1.0",
+        "execution-device": "test-device@1.0",
       })
     )
     return { res, pid: res.headers.get("process") }
@@ -166,11 +166,20 @@ class HB {
 
   async message(args) {
     const pid = args.pid
-    const slot = await this.schedule(args)
+    const { slot } = await this.schedule(args)
     const res = await this.compute({ pid, slot })
     return { slot, pid, res }
   }
-
+  async scheduleLegacy({
+    pid,
+    action = "Eval",
+    tags = {},
+    data,
+    scheduler,
+  } = {}) {
+    if (action) tags.Action = action
+    return await this.schedule({ pid, tags, data, scheduler })
+  }
   async schedule({ pid, tags = {}, data, scheduler } = {}) {
     pid ??= this.pid
     scheduler ??= this.scheduler
@@ -283,8 +292,7 @@ class HB {
       "scheduler-device": "scheduler@1.0",
       "execution-device": "genesis-wasm@1.0",
     })
-    const res = await this.post({ tags })
-    return { pid: res.process, res }
+    return await this.spawn(tags)
   }
 
   /*

package/package.json

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