wao 0.30.0 → 0.30.2

package/cjs/id.js

@@ -1,21 +1,19 @@
 "use strict";
 
-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); }
 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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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 asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 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); }
@@ -82,7 +80,7 @@ function base64urlToBase64(str) {
  * @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(/^[^=]+=:([^:]+):/);
@@ -111,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) {
@@ -168,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));
   }
@@ -252,177 +250,221 @@ function parseSignatureInput(sigInput) {
 /**
  * Calculate HMAC commitment ID for HyperBEAM messages
  */
-function calculateHmacId(_x) {
-  return _calculateHmacId.apply(this, arguments);
+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 _calculateHmacId() {
-  _calculateHmacId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(message) {
-    var components, sortedComponents, lines, _iterator, _step, component, fieldName, value, paramsComponents, signatureBase, messageBytes, keyBytes, hmacResult;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          if (message["signature-input"]) {
-            _context.next = 2;
-            break;
-          }
-          throw new Error("HMAC calculation requires signature-input");
-        case 2:
-          // Parse components from signature-input
-          components = parseSignatureInput(message["signature-input"]); // Sort components AS-IS (with @ prefix)
-          sortedComponents = _toConsumableArray(components).sort(); // Build signature base in sorted order
-          lines = [];
-          _iterator = _createForOfIteratorHelper(sortedComponents);
-          try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              component = _step.value;
-              fieldName = component;
-              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();
-          }
-          paramsComponents = sortedComponents.join(" ");
-          lines.push("\"@signature-params\": (".concat(paramsComponents, ");alg=\"hmac-sha256\";keyid=\"ao\""));
-          signatureBase = lines.join("\n"); // Generate HMAC with key "ao"
-          messageBytes = new TextEncoder().encode(signatureBase);
-          keyBytes = new TextEncoder().encode("ao");
-          _context.next = 14;
-          return (0, _fastSha.hmac)(keyBytes, messageBytes);
-        case 14:
-          hmacResult = _context.sent;
-          return _context.abrupt("return", uint8ArrayToBase64url(hmacResult));
-        case 16:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _calculateHmacId.apply(this, arguments);
+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 calculateUnsignedId(_x2) {
-  return _calculateUnsignedId.apply(this, arguments);
+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);
+  }
 }
-function _calculateUnsignedId() {
-  _calculateUnsignedId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(message) {
-    var DERIVED_COMPONENTS, httpsigMsg, _i2, _Object$entries2, _Object$entries2$_i, key, value, keys, componentsWithPrefix, lines, _iterator2, _step2, component, _key, _value, valueStr, componentsList, signatureBase, messageBytes, keyBytes, hmacResult;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          // Derived components from Erlang ?DERIVED_COMPONENTS
-          DERIVED_COMPONENTS = ["method", "target-uri", "authority", "scheme", "request-target", "path", "query", "query-param", "status"]; // Convert message for httpsig format
-          httpsigMsg = {};
-          for (_i2 = 0, _Object$entries2 = Object.entries(message); _i2 < _Object$entries2.length; _i2++) {
-            _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
-          keys = Object.keys(httpsigMsg);
-          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
-          lines = [];
-          _iterator2 = _createForOfIteratorHelper(componentsWithPrefix);
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              component = _step2.value;
-              _key = component.replace("@", "");
-              _value = httpsigMsg[_key];
-              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();
-          }
-          componentsList = componentsWithPrefix.map(function (k) {
-            return "\"".concat(k, "\"");
-          }).join(" ");
-          lines.push("\"@signature-params\": (".concat(componentsList, ");alg=\"hmac-sha256\";keyid=\"ao\""));
-          signatureBase = lines.join("\n"); // HMAC with key "ao"
-          messageBytes = new TextEncoder().encode(signatureBase);
-          keyBytes = new TextEncoder().encode("ao");
-          _context2.next = 15;
-          return (0, _fastSha.hmac)(keyBytes, messageBytes);
-        case 15:
-          hmacResult = _context2.sent;
-          return _context2.abrupt("return", uint8ArrayToBase64url(hmacResult));
-        case 17:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return _calculateUnsignedId.apply(this, arguments);
+// 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);
 }
-function id(_x3) {
-  return _id2.apply(this, arguments);
-} // Export all functions
-function _id2() {
-  _id2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(message) {
-    var commitmentIds, sortedIds, idsLine, encoder, data, hashBuffer, hashArray, base64, base64url;
-    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          // Get commitment IDs
-          commitmentIds = Object.keys(message.commitments || {});
-          if (!(commitmentIds.length === 0)) {
-            _context3.next = 5;
-            break;
-          }
-          return _context3.abrupt("return", calculateUnsignedId(message));
-        case 5:
-          if (!(commitmentIds.length === 1)) {
-            _context3.next = 9;
-            break;
-          }
-          return _context3.abrupt("return", commitmentIds[0]);
-        case 9:
-          // Multiple commitments - sort, join with ", ", and hash
-          sortedIds = commitmentIds.sort();
-          idsLine = sortedIds.join(", "); // Calculate SHA-256 hash
-          encoder = new TextEncoder();
-          data = encoder.encode(idsLine);
-          _context3.next = 15;
-          return crypto.subtle.digest("SHA-256", data);
-        case 15:
-          hashBuffer = _context3.sent;
-          hashArray = new Uint8Array(hashBuffer); // Convert to base64url
-          base64 = btoa(String.fromCharCode.apply(String, _toConsumableArray(hashArray)));
-          base64url = base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-          return _context3.abrupt("return", base64url);
-        case 20:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return _id2.apply(this, arguments);
-}
+
+/**
+ * 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/utils.js

@@ -3,11 +3,24 @@
 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", {
@@ -23,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/esm/id.js

@@ -47,7 +47,7 @@ function base64urlToBase64(str) {
  * @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:"
   const match = commitment.signature.match(/^[^=]+=:([^:]+):/)
@@ -78,7 +78,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
   const parsed = parseStructuredFieldDictionary(message["signature-input"])
   if (!parsed || !parsed.components) {
@@ -141,13 +141,13 @@ function generateCommitmentId(commitment, fullMessage = null) {
   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: ${commitment.alg}`)
@@ -224,7 +224,7 @@ function parseSignatureInput(sigInput) {
 /**
  * Calculate HMAC commitment ID for HyperBEAM messages
  */
-async function calculateHmacId(message) {
+function calculateHmacId(message) {
   if (!message["signature-input"]) {
     throw new Error("HMAC calculation requires signature-input")
   }
@@ -271,14 +271,14 @@ async function calculateHmacId(message) {
   const messageBytes = new TextEncoder().encode(signatureBase)
   const keyBytes = new TextEncoder().encode("ao")
 
-  const hmacResult = await hmac(keyBytes, messageBytes)
+  const hmacResult = hmac(keyBytes, messageBytes)
   return uint8ArrayToBase64url(hmacResult)
 }
 
 /**
  * Calculate unsigned message ID following the exact Erlang flow
  */
-async function calculateUnsignedId(message) {
+function calculateUnsignedId(message) {
   // Derived components from Erlang ?DERIVED_COMPONENTS
   const DERIVED_COMPONENTS = [
     "method",
@@ -331,11 +331,11 @@ async function calculateUnsignedId(message) {
   const messageBytes = new TextEncoder().encode(signatureBase)
   const keyBytes = new TextEncoder().encode("ao")
 
-  const hmacResult = await hmac(keyBytes, messageBytes)
+  const hmacResult = hmac(keyBytes, messageBytes)
   return uint8ArrayToBase64url(hmacResult)
 }
 
-async function id(message) {
+function id(message) {
   // Get commitment IDs
   const commitmentIds = Object.keys(message.commitments || {})
 
@@ -350,30 +350,110 @@ async function id(message) {
     const sortedIds = commitmentIds.sort()
     const idsLine = sortedIds.join(", ")
 
-    // Calculate SHA-256 hash
+    // Calculate SHA-256 hash using fast-sha256
     const encoder = new TextEncoder()
     const data = encoder.encode(idsLine)
-    const hashBuffer = await crypto.subtle.digest("SHA-256", data)
-    const hashArray = new Uint8Array(hashBuffer)
+    const hashArray = hash(data)
 
     // Convert to base64url
-    const base64 = btoa(String.fromCharCode(...hashArray))
-    const base64url = base64
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=/g, "")
-
-    return base64url
+    return uint8ArrayToBase64url(hashArray)
   }
 }
-
 // Export all functions
 export {
   id,
   generateCommitmentId,
-  generateRsaCommitmentId,
-  generateHmacCommitmentId,
+  rsaid,
+  hmacid,
   extractCommitmentIds,
   verifyCommitmentId,
   parseStructuredFieldDictionary,
 }
+
+/**
+ * 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
+  const parts = hashpath.split("/")
+  if (parts.length !== 2) {
+    throw new Error("Invalid hashpath format. Expected 'base/request'")
+  }
+
+  const [base, request] = parts
+
+  // Convert base64url to native binary (Uint8Array)
+  const baseBinary = base64urlToUint8Array(base)
+  const requestBinary = base64urlToUint8Array(request)
+
+  // Concatenate base and request
+  const combined = new Uint8Array(baseBinary.length + requestBinary.length)
+  combined.set(baseBinary, 0)
+  combined.set(requestBinary, baseBinary.length)
+
+  // Calculate SHA256 of the combined data
+  const nextBaseHash = 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
+  const 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 `${currentHashpath}/${newMessageId}`
+  }
+
+  // Subsequent operations: calculate the next base from current hashpath
+  const nextBase = base(currentHashpath)
+
+  // Return the new hashpath
+  return `${nextBase}/${newMessageId}`
+}
+
+/**
+ * Helper function to convert base64url string to Uint8Array
+ */
+function base64urlToUint8Array(base64url) {
+  // Convert base64url to base64
+  const base64 = base64urlToBase64(base64url)
+
+  // Decode base64 to binary string
+  const binaryString = atob(base64)
+
+  // Convert binary string to Uint8Array
+  const bytes = new Uint8Array(binaryString.length)
+  for (let i = 0; i < binaryString.length; i++) {
+    bytes[i] = binaryString.charCodeAt(i)
+  }
+
+  return bytes
+}
+
+// Export the new functions
+export { base, hashpath }

package/esm/utils.js

@@ -1,13 +1,6 @@
 import { graphql, parse, validate, buildSchema } from "graphql"
 import sha256 from "fast-sha256"
-import {
-  id,
-  generateCommitmentId,
-  generateRsaCommitmentId,
-  generateHmacCommitmentId,
-  verifyCommitmentId,
-} from "./id.js"
-export { generateRsaCommitmentId as rsaid, generateHmacCommitmentId as hmacid }
+export { id, base, hashpath, rsaid, hmacid } from "./id.js"
 import {
   clone,
   is,
@@ -771,5 +764,4 @@ export {
   isJSON,
   dirname,
   toAddr,
-  id,
 }

package/package.json

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