wao 0.29.3 → 0.30.2

package/cjs/hyperbeam.js

@@ -43,9 +43,10 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       c = _ref.c,
       cmake = _ref.cmake,
       faff = _ref.faff,
-      _ref$simplePay = _ref.simplePay,
-      simplePay = _ref$simplePay === void 0 ? false : _ref$simplePay,
-      simplePayPrice = _ref.simplePayPrice,
+      _ref$simple_pay = _ref.simple_pay,
+      simple_pay = _ref$simple_pay === void 0 ? false : _ref$simple_pay,
+      simple_pay_price = _ref.simple_pay_price,
+      p4_non_chargable_routes = _ref.p4_non_chargable_routes,
       p4_lua = _ref.p4_lua,
       store_prefix = _ref.store_prefix,
       operator = _ref.operator,
@@ -56,6 +57,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       devices = _ref.devices;
     _classCallCheck(this, HyperBEAM);
     this.devices = devices;
+    this.p4_non_chargable_routes = p4_non_chargable_routes;
     (_as2 = as) !== null && _as2 !== void 0 ? _as2 : as = shell ? [] : ["genesis_wasm"];
     this.console = console;
     if (clearCache) {
@@ -85,8 +87,8 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     this.cu = cu;
     this.store_prefix = store_prefix ? "cache-mainnet-" + Math.floor(Math.random() * 10000000) : "cache-mainnet";
     this.p4_lua = p4_lua;
-    this.simplePay = simplePay;
-    this.spp = simplePayPrice;
+    this.simple_pay = simple_pay;
+    this.spp = simple_pay_price;
     this.operator = operator;
     this.faff = faff;
     this.c = c;
@@ -311,7 +313,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var v = _step4.value;
-            if (_devs2["default"][v]) _devs.push("#{<<\"name\">> => <<\"".concat(_devs2["default"][v].name, "\">>, <<\"module\">> => ").concat(_devs2["default"][v].module, "}"));
+            if (_typeof(v) === "object") {
+              _devs.push("#{<<\"name\">> => <<\"".concat(v.name, "\">>, <<\"module\">> => ").concat(v.module, "}"));
+            } else if (_devs2["default"][v]) _devs.push("#{<<\"name\">> => <<\"".concat(_devs2["default"][v].name, "\">>, <<\"module\">> => ").concat(_devs2["default"][v].module, "}"));
           }
         } catch (err) {
           _iterator4.e(err);
@@ -329,7 +333,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       /*
       const _routes = `, routes => [#{ <<"template">> => <<"/result/.*">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${this.cu}">> } }, #{ <<\"template\">> => <<\"/dry-run\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:${this.cu}\">> } }, #{ <<"template">> => <<"/graphql">>, <<"nodes">> => [#{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => httpc, protocol => http2 } }, #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<"template">> => <<"/raw">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } } }]`
       */
-      var _p4_non_chargable = this.p4_lua ? ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }, #{ <<\"template\">> => <<\"/~wao@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]" : !this.simplePay ? "" : ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/~simple-pay@1.0/topup\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]";
+      var _p4_non_chargable = this.p4_non_chargable ? ", p4_non_chargable_routes => [".concat(this.p4_non_chargable_routes.map(function () {
+        return "#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }";
+      }).join(", "), "]") : this.p4_lua ? ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }, #{ <<\"template\">> => <<\"/~wao@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]" : !this.simple_pay ? "" : ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/~simple-pay@1.0/topup\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }, #{ <<\"template\">> => <<\"/~simple-pay@1.0/balance\">> }]";
       var _operator = this.operator ? ", operator => <<\"".concat(this.operator, "\">>") : "";
       var _spp = this.spp ? ", simple_pay_price => ".concat(this.spp) : "";
       var _node_processes = this.p4_lua ? ", node_processes => #{ <<\"ledger\">> => #{ <<\"device\">> => <<\"process@1.0\">>, <<\"execution-device\">> => <<\"lua@5.3a\">>, <<\"scheduler-device\">> => <<\"scheduler@1.0\">>, <<\"module\">> => <<\"".concat(this.p4_lua.processor, "\">>, <<\"operator\">> => <<\"").concat(this.operator, "\">> } }") : "";
@@ -338,7 +344,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       var _faff = (0, _ramda.isNil)(this.faff) ? "" : ", faff_allow_list => [ ".concat((0, _ramda.map)(function (addr) {
         return "<<\"".concat(addr, "\">>");
       })(this.faff).join(", "), " ]");
-      var _on = this.p4_lua ? ", on => #{ <<\"request\">> => ".concat(processor, ", <<\"response\">> => ").concat(processor, " }") : this.simplePay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : !(0, _ramda.isNil)(this.faff) ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }" : "";
+      var _on = this.p4_lua ? ", on => #{ <<\"request\">> => ".concat(processor, ", <<\"response\">> => ").concat(processor, " }") : this.simple_pay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : !(0, _ramda.isNil)(this.faff) ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }" : "";
       var start = "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_faff).concat(_bundler).concat(_on).concat(_p4_non_chargable).concat(_operator).concat(_spp).concat(_devices).concat(_node_processes, "}).");
       console.log(start);
       return start;

package/cjs/id.js

@@ -3,13 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.base = base;
 exports.extractCommitmentIds = extractCommitmentIds;
 exports.generateCommitmentId = generateCommitmentId;
-exports.generateHmacCommitmentId = generateHmacCommitmentId;
-exports.generateRsaCommitmentId = generateRsaCommitmentId;
+exports.hashpath = hashpath;
+exports.hmacid = hmacid;
+exports.id = id;
 exports.parseStructuredFieldDictionary = parseStructuredFieldDictionary;
+exports.rsaid = rsaid;
 exports.verifyCommitmentId = verifyCommitmentId;
 var _fastSha = require("fast-sha256");
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -69,21 +73,6 @@ function base64urlToBase64(str) {
   return str.replace(/-/g, "+").replace(/_/g, "/");
 }
 
-/**
- * Convert Uint8Array to base64url string
- */
-function uint8ArrayToBase64url(bytes) {
-  // Convert to base64
-  var binary = "";
-  for (var i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-  var base64 = btoa(binary);
-
-  // Convert to base64url
-  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-}
-
 /**
  * Generate commitment ID for RSA-PSS and ECDSA signatures
  * The ID is the SHA256 hash of the raw signature bytes
@@ -91,7 +80,7 @@ function uint8ArrayToBase64url(bytes) {
  * @param {Object} commitment - The commitment object containing signature
  * @returns {string} The commitment ID in base64url format
  */
-function generateRsaCommitmentId(commitment) {
+function rsaid(commitment) {
   // Extract the base64 signature from structured field format
   // Format: "signature-name=:BASE64_SIGNATURE:"
   var match = commitment.signature.match(/^[^=]+=:([^:]+):/);
@@ -120,7 +109,7 @@ function generateRsaCommitmentId(commitment) {
  * @param {Object} message - The message with signature and signature-input
  * @returns {string} The commitment ID in base64url format
  */
-function generateHmacCommitmentId(message) {
+function hmacid(message) {
   // Parse signature-input to get components
   var parsed = parseStructuredFieldDictionary(message["signature-input"]);
   if (!parsed || !parsed.components) {
@@ -177,12 +166,12 @@ function generateCommitmentId(commitment) {
   switch (commitment.alg) {
     case "rsa-pss-sha512":
     case "ecdsa-p256-sha256":
-      return generateRsaCommitmentId(commitment);
+      return rsaid(commitment);
     case "hmac-sha256":
       if (!fullMessage) {
         throw new Error("HMAC commitment IDs require full message context");
       }
-      return generateHmacCommitmentId(fullMessage);
+      return hmacid(fullMessage);
     default:
       throw new Error("Unsupported algorithm: ".concat(commitment.alg));
   }
@@ -201,9 +190,9 @@ function extractCommitmentIds(message) {
   }
   for (var _i = 0, _Object$entries = Object.entries(message.commitments); _i < _Object$entries.length; _i++) {
     var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-      id = _Object$entries$_i[0],
+      _id = _Object$entries$_i[0],
       commitment = _Object$entries$_i[1];
-    ids[id] = {
+    ids[_id] = {
       alg: commitment.alg,
       committer: commitment.committer,
       device: commitment["commitment-device"]
@@ -231,4 +220,251 @@ function verifyCommitmentId(commitment, expectedId) {
   }
 }
 
-// Export all functions
+/**
+ * Convert Uint8Array to base64url string
+ */
+function uint8ArrayToBase64url(bytes) {
+  var binary = "";
+  for (var i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  var base64 = btoa(binary);
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+
+/**
+ * Parse structured field dictionary to extract components
+ * Handles format: name=(components);params
+ */
+function parseSignatureInput(sigInput) {
+  // Extract components from format: name=(components);params
+  var match = sigInput.match(/[^=]+=\(([^)]+)\)/);
+  if (!match) return [];
+
+  // Split components and clean quotes
+  return match[1].split(" ").map(function (c) {
+    return c.replace(/"/g, "");
+  });
+}
+
+/**
+ * Calculate HMAC commitment ID for HyperBEAM messages
+ */
+function calculateHmacId(message) {
+  if (!message["signature-input"]) {
+    throw new Error("HMAC calculation requires signature-input");
+  }
+
+  // Parse components from signature-input
+  var components = parseSignatureInput(message["signature-input"]);
+
+  // Sort components AS-IS (with @ prefix)
+  var sortedComponents = _toConsumableArray(components).sort();
+
+  // Build signature base in sorted order
+  var lines = [];
+  var _iterator = _createForOfIteratorHelper(sortedComponents),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var component = _step.value;
+      var fieldName = component;
+      var value = void 0;
+
+      // For derived components (starting with @), remove @ in the signature base
+      if (component.startsWith("@")) {
+        fieldName = component.substring(1);
+        value = message[fieldName];
+      } else {
+        value = message[component];
+      }
+      if (value === undefined || value === null) {
+        value = "";
+      } else if (typeof value === "number") {
+        value = value.toString();
+      }
+      lines.push("\"".concat(fieldName, "\": ").concat(value));
+    }
+
+    // Add signature-params line with sorted components (keeping @ prefix)
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var paramsComponents = sortedComponents.join(" ");
+  lines.push("\"@signature-params\": (".concat(paramsComponents, ");alg=\"hmac-sha256\";keyid=\"ao\""));
+  var signatureBase = lines.join("\n");
+
+  // Generate HMAC with key "ao"
+  var messageBytes = new TextEncoder().encode(signatureBase);
+  var keyBytes = new TextEncoder().encode("ao");
+  var hmacResult = (0, _fastSha.hmac)(keyBytes, messageBytes);
+  return uint8ArrayToBase64url(hmacResult);
+}
+
+/**
+ * Calculate unsigned message ID following the exact Erlang flow
+ */
+function calculateUnsignedId(message) {
+  // Derived components from Erlang ?DERIVED_COMPONENTS
+  var DERIVED_COMPONENTS = ["method", "target-uri", "authority", "scheme", "request-target", "path", "query", "query-param", "status"];
+
+  // Convert message for httpsig format
+  var httpsigMsg = {};
+  for (var _i2 = 0, _Object$entries2 = Object.entries(message); _i2 < _Object$entries2.length; _i2++) {
+    var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+      key = _Object$entries2$_i[0],
+      value = _Object$entries2$_i[1];
+    httpsigMsg[key.toLowerCase()] = value;
+  }
+
+  // Get keys and add @ to derived components
+  var keys = Object.keys(httpsigMsg);
+  var componentsWithPrefix = keys.map(function (key) {
+    // Check if this is a derived component
+    if (DERIVED_COMPONENTS.includes(key.replace(/_/g, "-"))) {
+      return "@" + key;
+    }
+    return key;
+  }).sort(); // Sort AFTER adding @ prefix
+
+  // Build signature base - use the components in order
+  var lines = [];
+  var _iterator2 = _createForOfIteratorHelper(componentsWithPrefix),
+    _step2;
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var component = _step2.value;
+      var _key = component.replace("@", "");
+      var _value = httpsigMsg[_key];
+      var valueStr = typeof _value === "string" ? _value : String(_value);
+      lines.push("\"".concat(_key, "\": ").concat(valueStr));
+    }
+
+    // Add signature-params line with the @ prefixes
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+  var componentsList = componentsWithPrefix.map(function (k) {
+    return "\"".concat(k, "\"");
+  }).join(" ");
+  lines.push("\"@signature-params\": (".concat(componentsList, ");alg=\"hmac-sha256\";keyid=\"ao\""));
+  var signatureBase = lines.join("\n");
+
+  // HMAC with key "ao"
+  var messageBytes = new TextEncoder().encode(signatureBase);
+  var keyBytes = new TextEncoder().encode("ao");
+  var hmacResult = (0, _fastSha.hmac)(keyBytes, messageBytes);
+  return uint8ArrayToBase64url(hmacResult);
+}
+function id(message) {
+  // Get commitment IDs
+  var commitmentIds = Object.keys(message.commitments || {});
+  if (commitmentIds.length === 0) {
+    // No commitments - calculate unsigned ID using HMAC
+    return calculateUnsignedId(message);
+  } else if (commitmentIds.length === 1) {
+    // Single commitment - the ID is just the commitment ID
+    return commitmentIds[0];
+  } else {
+    // Multiple commitments - sort, join with ", ", and hash
+    var sortedIds = commitmentIds.sort();
+    var idsLine = sortedIds.join(", ");
+
+    // Calculate SHA-256 hash using fast-sha256
+    var encoder = new TextEncoder();
+    var data = encoder.encode(idsLine);
+    var hashArray = (0, _fastSha.hash)(data);
+
+    // Convert to base64url
+    return uint8ArrayToBase64url(hashArray);
+  }
+}
+// Export all functions
+
+/**
+ * Calculate the next base from a hashpath
+ * A hashpath has the format: base/request
+ * The next base is calculated as: sha256(base + request)
+ *
+ * @param {string} hashpath - The current hashpath in format "base/request"
+ * @returns {string} The next base in base64url format
+ */
+function base(hashpath) {
+  // Split the hashpath into base and request
+  var parts = hashpath.split("/");
+  if (parts.length !== 2) {
+    throw new Error("Invalid hashpath format. Expected 'base/request'");
+  }
+  var _parts = _slicedToArray(parts, 2),
+    base = _parts[0],
+    request = _parts[1];
+
+  // Convert base64url to native binary (Uint8Array)
+  var baseBinary = base64urlToUint8Array(base);
+  var requestBinary = base64urlToUint8Array(request);
+
+  // Concatenate base and request
+  var combined = new Uint8Array(baseBinary.length + requestBinary.length);
+  combined.set(baseBinary, 0);
+  combined.set(requestBinary, baseBinary.length);
+
+  // Calculate SHA256 of the combined data
+  var nextBaseHash = (0, _fastSha.hash)(combined);
+
+  // Convert to base64url
+  return uint8ArrayToBase64url(nextBaseHash);
+}
+
+/**
+ * Calculate the next hashpath given the current hashpath and a new message
+ *
+ * @param {string} currentHashpath - The current hashpath (or null for first operation)
+ * @param {Object} newMessage - The new message/request
+ * @returns {string} The next hashpath in format "nextBase/newMessageId"
+ */
+function hashpath(currentHashpath, newMessage) {
+  // Calculate the ID of the new message
+  var newMessageId = id(newMessage);
+  if (!currentHashpath) {
+    // First operation: the hashpath is just the message ID
+    // In the Erlang code, the first hashpath is "baseId/requestId"
+    // where baseId is the ID of the initial message
+    throw new Error("For first operation, provide the base message ID as currentHashpath");
+  }
+
+  // Check if this is the first operation (currentHashpath is just an ID, not a path)
+  if (!currentHashpath.includes("/")) {
+    // First operation: currentHashpath is the base message ID
+    return "".concat(currentHashpath, "/").concat(newMessageId);
+  }
+
+  // Subsequent operations: calculate the next base from current hashpath
+  var nextBase = base(currentHashpath);
+
+  // Return the new hashpath
+  return "".concat(nextBase, "/").concat(newMessageId);
+}
+
+/**
+ * Helper function to convert base64url string to Uint8Array
+ */
+function base64urlToUint8Array(base64url) {
+  // Convert base64url to base64
+  var base64 = base64urlToBase64(base64url);
+
+  // Decode base64 to binary string
+  var binaryString = atob(base64);
+
+  // Convert binary string to Uint8Array
+  var bytes = new Uint8Array(binaryString.length);
+  for (var i = 0; i < binaryString.length; i++) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+  return bytes;
+}
+
+// Export the new functions

package/cjs/signer.js

@@ -6,9 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sign = sign;
 exports.signer = signer;
+Object.defineProperty(exports, "verify", {
+  enumerable: true,
+  get: function get() {
+    return _signerUtils.verify;
+  }
+});
 var _send = require("./send.js");
 var _encode = require("./encode.js");
 var _aoconnect = require("@permaweb/aoconnect");
+var _signerUtils = require("./signer-utils.js");
 var _excluded = ["path", "method"],
   _excluded2 = ["body"];
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -96,11 +103,13 @@ function _sign3() {
             return key !== "body-keys" && key !== "path" && !bodyKeys.includes(key);
           });
           if (_path) signingFields.push("path");
+          /*
           if (signingFields.length === 0 && !body) {
-            lowercaseHeaders["content-length"] = "0";
-            signingFields.push("content-length");
+            //lowercaseHeaders["content-length"] = "0"
+            //signingFields.push("content-length")
           }
-          _context3.next = 14;
+          */
+          _context3.next = 13;
           return (0, _send.toHttpSigner)(signer)({
             request: {
               url: _url,
@@ -109,7 +118,7 @@ function _sign3() {
             },
             fields: signingFields
           });
-        case 14:
+        case 13:
           signedRequest = _context3.sent;
           finalHeaders = {};
           for (_i2 = 0, _Object$entries2 = Object.entries(headersObj); _i2 < _Object$entries2.length; _i2++) {
@@ -128,7 +137,7 @@ function _sign3() {
           };
           if (body) result.body = body;
           return _context3.abrupt("return", result);
-        case 23:
+        case 22:
         case "end":
           return _context3.stop();
       }

package/cjs/utils.js

@@ -3,11 +3,30 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = exports.allChecked = exports.action = void 0;
+exports.allChecked = exports.action = void 0;
+Object.defineProperty(exports, "base", {
+  enumerable: true,
+  get: function get() {
+    return _id.base;
+  }
+});
+exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = void 0;
+Object.defineProperty(exports, "hashpath", {
+  enumerable: true,
+  get: function get() {
+    return _id.hashpath;
+  }
+});
 Object.defineProperty(exports, "hmacid", {
   enumerable: true,
   get: function get() {
-    return _id.generateHmacCommitmentId;
+    return _id.hmacid;
+  }
+});
+Object.defineProperty(exports, "id", {
+  enumerable: true,
+  get: function get() {
+    return _id.id;
   }
 });
 exports.isData = exports.isCheckComplete = void 0;
@@ -17,7 +36,7 @@ exports.parseSignatureInput = parseSignatureInput;
 Object.defineProperty(exports, "rsaid", {
   enumerable: true,
   get: function get() {
-    return _id.generateRsaCommitmentId;
+    return _id.rsaid;
   }
 });
 exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = void 0;

package/cjs/workspace/test/hyperbeam.js

@@ -1,18 +1,21 @@
 import assert from "assert"
 import { describe, it, before, after, beforeEach } from "node:test"
-import { HyperBEAM, wait, toAddr } from "wao/test"
+import { HyperBEAM, toAddr } from "wao/test"
 import { HB } from "wao"
 import { resolve } from "path"
 import { readFileSync } from "fs"
 
 const cwd = "../../HyperBEAM"
-const wallet = ".wallet.json"
+const wallet = resolve(process.cwd(), cwd, ".wallet.json")
+
+const jwk = JSON.parse(readFileSync(wallet, "utf8"))
+const addr = toAddr(jwk.n)
 
 describe("HyperBEAM", function () {
   let hbeam, hb, jwk
 
   before(async () => {
-    hbeam = await new HyperBEAM({ c: "12", cmake: "3.5", cwd, wallet }).ready()
+    hbeam = await new HyperBEAM({ cwd }).ready()
     jwk = JSON.parse(readFileSync(resolve(process.cwd(), cwd, wallet), "utf8"))
   })
 
@@ -21,7 +24,7 @@ describe("HyperBEAM", function () {
   after(async () => hbeam.kill())
 
   it("should run a HyperBEAM node", async () => {
-    const info = await hb.getJSON({ path: "/~meta@1.0/info" })
-    assert.equal(info.address, toAddr(jwk.n))
+    const { out } = await hb.getJSON({ path: "/~meta@1.0/build" })
+    assert.equal(out.node, "HyperBEAM")
   })
 })

package/esm/ao.js

@@ -767,7 +767,7 @@ class AO {
     jwk,
     tags = {},
     data,
-  }) {
+  } = {}) {
     let [fns, isBoot] = [[], false]
     if (boot === true && !data) {
       isBoot = true

package/esm/hb.js

@@ -1,15 +1,16 @@
 import { connect, createSigner } from "@permaweb/aoconnect"
 import { isEmpty, last, isNotNil, mergeLeft } from "ramda"
-import { toAddr, buildTags } from "./utils.js"
-import { signer } from "./signer.js"
+import { rsaid, hmacid, toAddr, buildTags } from "./utils.js"
+import { sign, signer } from "./signer.js"
 import { send as _send } from "./send.js"
 import hyper_aos from "./lua/hyper-aos.js"
 import aos_wamr from "./lua/aos_wamr.js"
 import { from } from "./httpsig.js"
 
 const seed = num => {
-  const array = new Uint8Array(num)
-  return crypto.getRandomValues(array).toString()
+  const array = new Array(num)
+  for (let i = 0; i < num; i++) array[i] = Math.floor(Math.random() * 256)
+  return Buffer.from(array).toString("base64")
 }
 
 class HB {
@@ -71,8 +72,17 @@ class HB {
     }
     if (jwk) this._init(jwk)
   }
-
+  async signEncoded(encoded) {
+    const { path, ...msg } = encoded
+    return await sign({
+      jwk: this.jwk,
+      msg,
+      path,
+      url: this.url,
+    })
+  }
   _init(jwk) {
+    this.jwk = jwk
     this.signer = createSigner(jwk, this.url)
     this.addr = toAddr(jwk.n)
     this.sign = signer({ signer: this.signer, url: this.url })
@@ -108,7 +118,7 @@ class HB {
 
   async getLua() {
     const lua = Buffer.from(hyper_aos, "base64")
-    const id = await this.cacheModule(lua, "application/lua")
+    const id = await this.cacheScript(lua, "application/lua")
     this.lua ??= id
     return id
   }
@@ -132,7 +142,11 @@ class HB {
     const { slot, pid } = await this.scheduleAOS(args)
     return { slot, outbox: await this.computeAOS({ pid, slot }) }
   }
-
+  async messageLegacy(args) {
+    const { slot, pid } = await this.scheduleLegacy(args)
+    console.log(slot, pid, args)
+    return { slot, res: await this.computeLegacy({ pid, slot }) }
+  }
   path({
     dev = "message",
     path,
@@ -214,7 +228,7 @@ class HB {
     return { res, pid: res.headers.process }
   }
 
-  async cacheModule(data, type) {
+  async cacheScript(data, type = "application/lua") {
     if (!this.cache) {
       const { pid } = await this.spawn({})
       this.cache = pid
@@ -261,7 +275,7 @@ class HB {
     })
     if (data) _tags.data = data
     let res = await this.post(_tags)
-    return { slot: res.headers.slot, res }
+    return { slot: res.headers.slot, res, pid }
   }
 
   async spawnAOS(image) {
@@ -368,13 +382,21 @@ class HB {
     if (isNotNil(from)) params += `&from=${from}`
     if (isNotNil(to)) params += `&to=${to}`
     params += `&accept=application/aos-2`
+    const {
+      out: { body },
+    } = await this.get({
+      path: "/~scheduler@1.0/schedule",
+      target: pid,
+      from,
+      accept: "application/aos-2",
+    })
     let res = await fetch(`${this.url}/~scheduler@1.0/schedule?${params}`).then(
       r => r.json()
     )
     if (res.page_info.has_next_page) {
       res.next = async () => {
         const from2 = last(res.edges).cursor + 1
-        return await this.message({ pid, from: from2, to, limit })
+        return await this.messages({ pid, from: from2, to, limit })
       }
     }
     return res
@@ -433,7 +455,26 @@ class HB {
     })
     return JSON.parse(res.body)
   }
+  async commit(obj, opts) {
+    const msg = await this.sign(obj, opts)
+    const hmacId = hmacid(msg.headers)
+    const rsaId = rsaid(msg.headers)
+    const committer = this.addr
+    const meta = { alg: "rsa-pss-sha512", "commitment-device": "httpsig@1.0" }
+    const meta2 = { alg: "hmac-sha256", "commitment-device": "httpsig@1.0" }
 
+    const sigs = {
+      signature: msg.headers.signature,
+      "signature-input": msg.headers["signature-input"],
+    }
+    return {
+      commitments: {
+        [rsaId]: { ...meta, committer, ...sigs },
+        [hmacId]: { ...meta2, ...sigs },
+      },
+      ...obj,
+    }
+  }
   async post(obj, json) {
     const _json = json ? "/~json@1.0/serialize" : ""
     obj.path += _json