wao 0.25.3 → 0.25.4

package/cjs/armem-base.js

@@ -225,7 +225,8 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       this.msgs = {};
       this.wasms = {
         "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s": {
-          file: "aos2_0_6"
+          file: "aos2_0_6",
+          variant: "ao.TN.1"
         },
         "WASM32-D8q2OmZ4Mok00sD2Y_6SYEQ7Hjx-6VZ_jl3g": {
           file: "aos2_0_4_32",
@@ -248,7 +249,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       }
       var txs = [];
       for (var key in this.wasms) {
-        var _this$variant, _w$format, _w$input_encoding, _w$output_encoding, _w$memory_limit, _w$compute_limit, _w$extension;
+        var _ref2, _w$variant, _w$format, _w$input_encoding, _w$output_encoding, _w$memory_limit, _w$compute_limit, _w$extension;
         var w = this.wasms[key];
         txs.push(key);
         this.txs[key] = {
@@ -256,7 +257,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
           block: 0,
           tags: (0, _utils.buildTags)(null, {
             "Data-Protocol": "ao",
-            Variant: (_this$variant = this.variant) !== null && _this$variant !== void 0 ? _this$variant : "ao.TN.1",
+            Variant: (_ref2 = (_w$variant = w.variant) !== null && _w$variant !== void 0 ? _w$variant : this.variant) !== null && _ref2 !== void 0 ? _ref2 : "ao.TN.1",
             Type: "Module",
             "Module-Format": (_w$format = w.format) !== null && _w$format !== void 0 ? _w$format : "wasm64-unknown-emscripten-draft_2024_02_15",
             "Input-Encoding": (_w$input_encoding = w.input_encoding) !== null && _w$input_encoding !== void 0 ? _w$input_encoding : "JSON-V1",
@@ -268,7 +269,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
         };
       }
       if (this.scheduler && this.SU_URL) {
-        var _this$variant2;
+        var _this$variant;
         var _key = this.scheduler;
         txs.push(_key);
         this.addrmap[this.scheduler] = {
@@ -280,7 +281,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
           owner: this.scheduler,
           tags: (0, _utils.buildTags)(null, {
             "Data-Protocol": "ao",
-            Variant: (_this$variant2 = this.variant) !== null && _this$variant2 !== void 0 ? _this$variant2 : "ao.TN.1",
+            Variant: (_this$variant = this.variant) !== null && _this$variant !== void 0 ? _this$variant : "ao.TN.1",
             Type: "Scheduler-Location",
             Url: this.SU_URL,
             "Time-To-Live": 1000 * 60 * 60 * 24 * 365 * 10

package/cjs/hb.js

@@ -10,7 +10,10 @@ var _utils = require("./utils.js");
 var _signer = require("./signer.js");
 var _path4 = require("path");
 var _fs = require("fs");
+var _hyperAos = _interopRequireDefault(require("./lua/hyper-aos.js"));
+var _aos_wamr = _interopRequireDefault(require("./lua/aos_wamr.js"));
 var _excluded = ["path"];
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
@@ -335,7 +338,7 @@ var HB = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
-              wasm = (0, _fs.readFileSync)((0, _path4.resolve)(import.meta.dirname, "./lua/aos2-wamr.wasm"));
+              wasm = Buffer.from(_aos_wamr["default"], "base64");
               _context10.next = 3;
               return this.cacheModule(wasm, "application/wasm");
             case 3:
@@ -362,7 +365,7 @@ var HB = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              lua = (0, _fs.readFileSync)((0, _path4.resolve)(import.meta.dirname, "./lua/hyper-aos.lua"));
+              lua = Buffer.from(_hyperAos["default"], "base64");
               _context11.next = 3;
               return this.cacheModule(lua, "application/lua");
             case 3:
@@ -1028,6 +1031,7 @@ var HB = /*#__PURE__*/function () {
                 Type: "Process",
                 image: image,
                 "execution-device": "stack@1.0",
+                "push-device": "push@1.0",
                 "device-stack": ["wasi@1.0", "json-iface@1.0", "wasm-64@1.0", "patch@1.0", "multipass@1.0"],
                 "output-prefix": "wasm",
                 "patch-from": "/results/outbox",
@@ -1106,6 +1110,7 @@ var HB = /*#__PURE__*/function () {
                 Type: "Process",
                 module: lua,
                 "execution-device": "lua@5.3a",
+                "push-device": "push@1.0",
                 "patch-from": "/results/outbox"
               });
             case 18:
@@ -1321,10 +1326,11 @@ var HB = /*#__PURE__*/function () {
                 Authority: this._info.address,
                 "scheduler-location": this._info.address,
                 "random-seed": seed(16),
-                module: "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
+                module: module !== null && module !== void 0 ? module : "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
                 device: "process@1.0",
                 "scheduler-device": "scheduler@1.0",
                 "execution-device": "stack@1.0",
+                "push-device": "push@1.0",
                 "device-stack": ["genesis-wasm@1.0", "patch@1.0"],
                 "patch-from": "/results/outbox",
                 "stack-keys": ["init", "compute", "snapshot", "normalize"]
@@ -1345,44 +1351,93 @@ var HB = /*#__PURE__*/function () {
       return spawnLegacy;
     }()
   }, {
-    key: "dryrun",
+    key: "results",
     value: function () {
-      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
+      var _results = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
         var _ref15,
-          _ref15$tags,
+          process,
+          limit,
+          _ref15$sort,
+          sort,
+          from,
+          to,
+          params,
+          addParam,
+          res,
+          _args34 = arguments;
+        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
+          while (1) switch (_context34.prev = _context34.next) {
+            case 0:
+              _ref15 = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : {}, process = _ref15.process, limit = _ref15.limit, _ref15$sort = _ref15.sort, sort = _ref15$sort === void 0 ? "DESC" : _ref15$sort, from = _ref15.from, to = _ref15.to;
+              params = "";
+              addParam = function addParam(key, val) {
+                params += params === "" ? "?" : "&";
+                params += "".concat(key, "=").concat(val);
+              };
+              if (limit) addParam("limit", limit);
+              if (sort) addParam("sort", sort);
+              if (from) addParam("from", from);
+              if (to) addParam("to", to);
+              _context34.next = 9;
+              return this.post({
+                path: "/~relay@1.0/call",
+                method: "GET",
+                "relay-path": "".concat(this.cu, "/results/").concat(process).concat(params),
+                "content-type": "application/json"
+              });
+            case 9:
+              res = _context34.sent;
+              return _context34.abrupt("return", JSON.parse(res.body));
+            case 11:
+            case "end":
+              return _context34.stop();
+          }
+        }, _callee34, this);
+      }));
+      function results() {
+        return _results.apply(this, arguments);
+      }
+      return results;
+    }()
+  }, {
+    key: "dryrun",
+    value: function () {
+      var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee35() {
+        var _ref16,
+          _ref16$tags,
           tags,
           pid,
           action,
           data,
           json,
           res,
-          _args34 = arguments;
-        return _regeneratorRuntime().wrap(function _callee34$(_context34) {
-          while (1) switch (_context34.prev = _context34.next) {
+          _args35 = arguments;
+        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
+          while (1) switch (_context35.prev = _context35.next) {
             case 0:
-              _ref15 = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : {}, _ref15$tags = _ref15.tags, tags = _ref15$tags === void 0 ? {} : _ref15$tags, pid = _ref15.pid, action = _ref15.action, data = _ref15.data;
+              _ref16 = _args35.length > 0 && _args35[0] !== undefined ? _args35[0] : {}, _ref16$tags = _ref16.tags, tags = _ref16$tags === void 0 ? {} : _ref16$tags, pid = _ref16.pid, action = _ref16.action, data = _ref16.data;
               if (typeof action === "string") tags.Action = action;
               json = {
                 Tags: (0, _utils.buildTags)(_objectSpread({}, tags)),
                 Owner: this.addr
               };
               if (data) json.Data = data;
-              _context34.next = 6;
+              _context35.next = 6;
               return this.post({
                 path: "/~relay@1.0/call",
-                "relay-method": "POST",
+                method: "POST",
                 "relay-path": "".concat(this.cu, "/dry-run?process-id=").concat(pid),
                 "content-type": "application/json",
                 "relay-body": JSON.stringify(json)
               });
             case 6:
-              res = _context34.sent;
-              return _context34.abrupt("return", JSON.parse(res.body));
+              res = _context35.sent;
+              return _context35.abrupt("return", JSON.parse(res.body));
             case 8:
             case "end":
-              return _context34.stop();
+              return _context35.stop();
           }
-        }, _callee34, this);
+        }, _callee35, this);
       }));
       function dryrun() {
         return _dryrun.apply(this, arguments);
@@ -1392,27 +1447,27 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "post",
     value: function () {
-      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee35(obj, json) {
+      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee36(obj, json) {
         var _json;
-        return _regeneratorRuntime().wrap(function _callee35$(_context35) {
-          while (1) switch (_context35.prev = _context35.next) {
+        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
+          while (1) switch (_context36.prev = _context36.next) {
             case 0:
               _json = json ? "/~json@1.0/serialize" : "";
               obj.path += _json;
-              _context35.t0 = this;
-              _context35.next = 5;
+              _context36.t0 = this;
+              _context36.next = 5;
               return this.sign(obj);
             case 5:
-              _context35.t1 = _context35.sent;
-              _context35.next = 8;
-              return _context35.t0.send.call(_context35.t0, _context35.t1);
+              _context36.t1 = _context36.sent;
+              _context36.next = 8;
+              return _context36.t0.send.call(_context36.t0, _context36.t1);
             case 8:
-              return _context35.abrupt("return", _context35.sent);
+              return _context36.abrupt("return", _context36.sent);
             case 9:
             case "end":
-              return _context35.stop();
+              return _context36.stop();
           }
-        }, _callee35, this);
+        }, _callee36, this);
       }));
       function post(_x27, _x28) {
         return _post.apply(this, arguments);
@@ -1422,7 +1477,7 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee36(_ref16) {
+      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee37(_ref17) {
         var _path3;
         var path,
           params,
@@ -1433,12 +1488,12 @@ var HB = /*#__PURE__*/function () {
           k,
           response,
           headers,
-          _args36 = arguments;
-        return _regeneratorRuntime().wrap(function _callee36$(_context36) {
-          while (1) switch (_context36.prev = _context36.next) {
+          _args37 = arguments;
+        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
+          while (1) switch (_context37.prev = _context37.next) {
             case 0:
-              path = _ref16.path, params = _objectWithoutProperties(_ref16, _excluded);
-              json = _args36.length > 1 && _args36[1] !== undefined ? _args36[1] : false;
+              path = _ref17.path, params = _objectWithoutProperties(_ref17, _excluded);
+              json = _args37.length > 1 && _args37[1] !== undefined ? _args37[1] : false;
               _json = json ? "/~json@1.0/serialize" : "";
               (_path3 = path) !== null && _path3 !== void 0 ? _path3 : path = "/~message@1.0";
               if (!/^\//.test(path)) path = "/" + path;
@@ -1450,32 +1505,32 @@ var HB = /*#__PURE__*/function () {
                   i++;
                 }
               }
-              _context36.next = 9;
+              _context37.next = 9;
               return fetch("".concat(this.url).concat(path).concat(_json).concat(_params));
             case 9:
-              response = _context36.sent;
+              response = _context37.sent;
               headers = {};
               response.headers.forEach(function (v, k) {
                 return headers[k] = v;
               });
-              _context36.t0 = response;
-              _context36.t1 = headers;
-              _context36.next = 16;
+              _context37.t0 = response;
+              _context37.t1 = headers;
+              _context37.next = 16;
               return response.text();
             case 16:
-              _context36.t2 = _context36.sent;
-              _context36.t3 = response.status;
-              return _context36.abrupt("return", {
-                response: _context36.t0,
-                headers: _context36.t1,
-                body: _context36.t2,
-                status: _context36.t3
+              _context37.t2 = _context37.sent;
+              _context37.t3 = response.status;
+              return _context37.abrupt("return", {
+                response: _context37.t0,
+                headers: _context37.t1,
+                body: _context37.t2,
+                status: _context37.t3
               });
             case 19:
             case "end":
-              return _context36.stop();
+              return _context37.stop();
           }
-        }, _callee36, this);
+        }, _callee37, this);
       }));
       function get(_x29) {
         return _get.apply(this, arguments);
@@ -1485,21 +1540,21 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "postJSON",
     value: function () {
-      var _postJSON = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee37(args) {
+      var _postJSON = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee38(args) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee37$(_context37) {
-          while (1) switch (_context37.prev = _context37.next) {
+        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
+          while (1) switch (_context38.prev = _context38.next) {
             case 0:
-              _context37.next = 2;
+              _context38.next = 2;
               return this.post(args, true);
             case 2:
-              res = _context37.sent;
-              return _context37.abrupt("return", JSON.parse(res.body));
+              res = _context38.sent;
+              return _context38.abrupt("return", JSON.parse(res.body));
             case 4:
             case "end":
-              return _context37.stop();
+              return _context38.stop();
           }
-        }, _callee37, this);
+        }, _callee38, this);
       }));
       function postJSON(_x30) {
         return _postJSON.apply(this, arguments);
@@ -1509,21 +1564,21 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "getJSON",
     value: function () {
-      var _getJSON = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee38(args) {
+      var _getJSON = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee39(args) {
         var res;
-        return _regeneratorRuntime().wrap(function _callee38$(_context38) {
-          while (1) switch (_context38.prev = _context38.next) {
+        return _regeneratorRuntime().wrap(function _callee39$(_context39) {
+          while (1) switch (_context39.prev = _context39.next) {
             case 0:
-              _context38.next = 2;
+              _context39.next = 2;
               return this.get(args, true);
             case 2:
-              res = _context38.sent;
-              return _context38.abrupt("return", JSON.parse(res.body));
+              res = _context39.sent;
+              return _context39.abrupt("return", JSON.parse(res.body));
             case 4:
             case "end":
-              return _context38.stop();
+              return _context39.stop();
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
       function getJSON(_x31) {
         return _getJSON.apply(this, arguments);

package/cjs/hyperbeam.js

@@ -40,16 +40,17 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       cwd = _ref$cwd === void 0 ? "./HyperBEAM" : _ref$cwd,
       c = _ref.c,
       cmake = _ref.cmake,
-      _ref$legacy = _ref.legacy,
-      legacy = _ref$legacy === void 0 ? false : _ref$legacy,
       faff = _ref.faff,
       _ref$simplePay = _ref.simplePay,
       simplePay = _ref$simplePay === void 0 ? false : _ref$simplePay,
       simplePayPrice = _ref.simplePayPrice,
       p4_lua = _ref.p4_lua,
       store_prefix = _ref.store_prefix,
-      operator = _ref.operator;
+      operator = _ref.operator,
+      _ref$console = _ref.console,
+      console = _ref$console === void 0 ? true : _ref$console;
     _classCallCheck(this, HyperBEAM);
+    this.console = console;
     if (clearCache) {
       var dirname = (0, _path.resolve)(process.cwd(), cwd);
       var _iterator = _createForOfIteratorHelper((0, _fs.readdirSync)(dirname)),
@@ -102,18 +103,20 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
         env: _objectSpread(_objectSpread({}, process.env), this.genEnv()),
         cwd: (0, _path.resolve)(process.cwd(), this.cwd)
       });
-      this.hbeam.stdout.on("data", function (chunk) {
-        return console.log(chunk.toString());
-      });
-      this.hbeam.stderr.on("data", function (err) {
-        return console.error(err.toString());
-      });
-      this.hbeam.on("error", function (err) {
-        return console.error("failed to start process: ".concat(err));
-      });
-      this.hbeam.on("close", function (code) {
-        return console.log("child process exited with code ".concat(code));
-      });
+      if (this.console) {
+        this.hbeam.stdout.on("data", function (chunk) {
+          return console.log(chunk.toString());
+        });
+        this.hbeam.stderr.on("data", function (err) {
+          return console.error(err.toString());
+        });
+        this.hbeam.on("error", function (err) {
+          return console.error("failed to start process: ".concat(err));
+        });
+        this.hbeam.on("close", function (code) {
+          return console.log("child process exited with code ".concat(code));
+        });
+      }
     }
   }, {
     key: "ok",