wao 0.29.0 → 0.29.2

package/cjs/encode.js

@@ -1162,11 +1162,11 @@ function setFinalHeaders(headers, boundary, contentDigest, byteLength) {
   }
   headers["content-length"] = String(byteLength);
 }
-function encode() {
-  return _encode.apply(this, arguments);
+function enc() {
+  return _enc.apply(this, arguments);
 }
-function _encode() {
-  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+function _enc() {
+  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
     var obj,
       processedObj,
       emptyResult,
@@ -1334,25 +1334,5 @@ function _encode() {
       }
     }, _callee8);
   }));
-  return _encode.apply(this, arguments);
-}
-function enc(_x11) {
-  return _enc.apply(this, arguments);
-}
-function _enc() {
-  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(fields) {
-    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
-        case 0:
-          _context9.next = 2;
-          return encode(fields);
-        case 2:
-          return _context9.abrupt("return", _context9.sent);
-        case 3:
-        case "end":
-          return _context9.stop();
-      }
-    }, _callee9);
-  }));
   return _enc.apply(this, arguments);
 }

package/cjs/hb.js

@@ -1561,9 +1561,7 @@ var HB = /*#__PURE__*/function () {
                 body: _context38.t1,
                 status: _context38.t2
               };
-              return _context38.abrupt("return", _objectSpread({
-                out: (0, _httpsig.from)(http)
-              }, http));
+              return _context38.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
             case 19:
             case "end":
               return _context38.stop();

package/cjs/httpsig.js

@@ -7,21 +7,22 @@ exports.verifyContentDigest = exports.toBuffer = exports.hasValidSignature = exp
 var _ramda = require("ramda");
 var _signerUtils = require("./signer-utils.js");
 var _base64url = _interopRequireDefault(require("base64url"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -70,6 +71,17 @@ var extract = function extract(http, components) {
       extracted["ao-types"] = aoTypes;
     }
   }
+
+  // Extract ao-ids if it's signed
+  var hasAoIds = components.some(function (c) {
+    return c.replace(/"/g, "").toLowerCase() === "ao-ids";
+  });
+  if (hasAoIds) {
+    var aoIds = http.headers["ao-ids"] || http.headers["Ao-Ids"];
+    if (aoIds) {
+      extracted["ao-ids"] = aoIds;
+    }
+  }
   var _iterator2 = _createForOfIteratorHelper(components),
     _step2;
   try {
@@ -172,6 +184,27 @@ var toBuffer = exports.toBuffer = function toBuffer(body) {
   throw new Error("Unsupported body type");
 };
 
+/**
+ * Parse ao-ids dictionary
+ * @param {string} aoIds - The ao-ids header value
+ * @returns {Object} Parsed ID mappings
+ */
+var parseAoIds = function parseAoIds(aoIds) {
+  var result = {};
+
+  // Match pattern: ID="value"
+  var regex = /([A-Za-z0-9_-]{43})="([^"]*)"/g;
+  var match;
+  while ((match = regex.exec(aoIds)) !== null) {
+    var _match = match,
+      _match2 = _slicedToArray(_match, 3),
+      id = _match2[1],
+      value = _match2[2];
+    result[id] = value;
+  }
+  return result;
+};
+
 /**
  * Convert message to JSON with proper type conversions
  * Following the logic from dev_codec_structured, dev_codec_httpsig_conv, and dev_codec_flat
@@ -184,6 +217,14 @@ var _toJSON = function toJSON(msg) {
   }
   var result = _objectSpread({}, msg);
 
+  // Handle ao-ids parsing
+  if (result["ao-ids"]) {
+    var parsedIds = parseAoIds(result["ao-ids"]);
+    // Remove the ao-ids header and merge the parsed IDs
+    delete result["ao-ids"];
+    result = _objectSpread(_objectSpread({}, result), parsedIds);
+  }
+
   // First, handle the multipart body if present
   var contentType = result["content-type"];
   var body = result.body;
@@ -349,7 +390,9 @@ var _toJSON = function toJSON(msg) {
       _value2 = _Object$entries7$_i[1];
     // Skip internal keys and headers we don't want in the final result
     if (_key5.startsWith("__")) continue;
-    if (_key5.startsWith("@")) continue; // Skip all @ fields
+
+    // Skip @ fields EXCEPT @path which we want to include
+    if (_key5.startsWith("@") && _key5 !== "@path") continue;
     if (_key5 === "ao-types") continue;
     if (_key5 === "content-type") continue;
     if (_key5 === "content-digest") continue;
@@ -870,12 +913,6 @@ var stringToBuffer = function stringToBuffer(str) {
   }
   return buffer;
 };
-
-/**
- * Original from function - extracts and converts only signed components
- * @param {Object} http - HTTP message object with headers, body, and status
- * @returns {Object|null} Converted signed components or null if not signed
- */
 var from = exports.from = function from(http) {
   var input = http.headers["signature-input"] || http.headers["Signature-Input"];
   if (!input) {
@@ -884,34 +921,71 @@ var from = exports.from = function from(http) {
 
   // Decode signature inputs
   var inputs = (0, _signerUtils.decodeSigInput)(input);
-
   // Process the first signature (following the original logic)
   for (var k in inputs) {
+    var _sigData$params$tag, _sigData$params;
     var sigData = inputs[k];
-
     // Extract only the signed components
     var extractedComponents = extract(http, sigData.components);
+    var ret = {
+      hashpath: (_sigData$params$tag = sigData === null || sigData === void 0 || (_sigData$params = sigData.params) === null || _sigData$params === void 0 ? void 0 : _sigData$params.tag) !== null && _sigData$params$tag !== void 0 ? _sigData$params$tag : null
+    };
+    try {
+      ret.signer = (0, _utils.toAddr)(sigData.params.keyid);
+    } catch (e) {}
+
+    // Check if @path was in the signed components
+    var hasPathComponent = sigData.components.some(function (c) {
+      return c.replace(/"/g, "") === "@path";
+    });
+
+    // If @path is signed, add the path header to extracted components
+    if (hasPathComponent) {
+      extractedComponents["path"] = http.headers.path;
+    }
 
-    // Check if ao-result header is present and points to body
+    // Check if ao-result header is present
     var aoResult = http.headers["ao-result"] || http.headers["Ao-Result"];
-    if (aoResult === "body" && extractedComponents.body) {
+
+    // Handle ao-result pointing to body
+    if (aoResult === "body") {
+      // Handle empty body case
+      if (!extractedComponents.body) {
+        return _objectSpread({
+          out: ""
+        }, ret); // Return empty string for empty body
+      }
       // Check if body is binary data
       if (isBinaryString(extractedComponents.body)) {
-        return stringToBuffer(extractedComponents.body);
+        return _objectSpread({
+          out: stringToBuffer(extractedComponents.body)
+        }, ret);
       }
+      // Return body as-is if it's not binary
+      return _objectSpread({
+        out: extractedComponents.body
+      }, ret);
     }
 
     // Convert the extracted components to JSON format
     var result = _toJSON(extractedComponents);
 
-    // Handle ao-result if present
-    if (aoResult && result[aoResult] !== undefined) {
+    // Handle ao-result if present and pointing to other fields
+    if (aoResult && aoResult !== "body") {
       // Return the value of the key specified by ao-result
-      return result[aoResult];
+      // If the key doesn't exist, return undefined (or could return null/empty string)
+      return _objectSpread({
+        out: result[aoResult] !== undefined ? result[aoResult] : ""
+      }, ret);
     }
-    return result;
+    return _objectSpread({
+      out: result
+    }, ret);
   }
-  return null;
+  return {
+    out: null,
+    hashpath: null
+  };
 };
 
 /**
@@ -1034,9 +1108,9 @@ var verifyContentDigest = exports.verifyContentDigest = function verifyContentDi
       error: "Invalid content-digest format"
     };
   }
-  var _match = _slicedToArray(match, 3),
-    algorithm = _match[1],
-    expectedDigest = _match[2];
+  var _match3 = _slicedToArray(match, 3),
+    algorithm = _match3[1],
+    expectedDigest = _match3[2];
   try {
     // Convert body to Buffer if needed
     var bodyBuffer = typeof body === "string" ? Buffer.from(body, "utf-8") : body;

package/cjs/send.js

@@ -48,8 +48,6 @@ function _send() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           fetchImpl = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : fetch;
-          // IMPORTANT: Use the URL from signedMsg.url, NOT from any path header
-          // This ensures we send to the correct URL even if path header is different
           fetchOptions = {
             method: signedMsg.method,
             headers: signedMsg.headers,
@@ -58,8 +56,6 @@ function _send() {
           if (signedMsg.body !== undefined && signedMsg.method !== "GET" && signedMsg.method !== "HEAD") {
             fetchOptions.body = signedMsg.body;
           }
-
-          // Use the URL as provided, ignoring any path header
           _context2.next = 5;
           return fetchImpl(signedMsg.url, fetchOptions);
         case 5:
@@ -94,9 +90,7 @@ function _send() {
             body: _context2.t5,
             status: _context2.t6
           };
-          return _context2.abrupt("return", _objectSpread({
-            out: (0, _httpsig.from)(http)
-          }, http));
+          return _context2.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
         case 23:
         case "end":
           return _context2.stop();

package/cjs/signer.js

@@ -4,22 +4,20 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.sign = sign;
 exports.signer = signer;
 var _send = require("./send.js");
 var _encode = require("./encode.js");
-var _excluded = ["path", "method"];
-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; }
+var _aoconnect = require("@permaweb/aoconnect");
+var _excluded = ["path", "method"],
+  _excluded2 = ["body"];
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 _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; }
 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); }
@@ -27,140 +25,174 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 var joinUrl = function joinUrl(_ref) {
   var url = _ref.url,
     path = _ref.path;
-  if (path.startsWith("http://") || path.startsWith("https://")) {
-    return path;
-  }
-  // Ensure path starts with /
+  if (path.startsWith("http://") || path.startsWith("https://")) return path;
   var normalizedPath = path.startsWith("/") ? path : "/" + path;
   return url.endsWith("/") ? url.slice(0, -1) + normalizedPath : url + normalizedPath;
 };
+function sign(_x) {
+  return _sign2.apply(this, arguments);
+}
+function _sign2() {
+  _sign2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+    var url, path, encoded, jwk, _ref2$signPath, signPath, signer, _encoded$body, body, headers, _enc;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = _ref2.url, path = _ref2.path, encoded = _ref2.msg, jwk = _ref2.jwk, _ref2$signPath = _ref2.signPath, signPath = _ref2$signPath === void 0 ? false : _ref2$signPath;
+          signer = (0, _aoconnect.createSigner)(jwk, url);
+          _encoded$body = encoded.body, body = _encoded$body === void 0 ? null : _encoded$body, headers = _objectWithoutProperties(encoded, _excluded2);
+          _enc = {
+            headers: headers
+          };
+          if (body) _enc.body = new Blob([body]);
+          _context2.next = 7;
+          return _sign({
+            signer: signer,
+            encoded: _enc,
+            url: url,
+            path: path,
+            _path: signPath
+          });
+        case 7:
+          return _context2.abrupt("return", _context2.sent);
+        case 8:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _sign2.apply(this, arguments);
+}
+function _sign(_x2) {
+  return _sign3.apply(this, arguments);
+}
+function _sign3() {
+  _sign3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3) {
+    var encoded, signer, path, url, _ref3$method, method, _ref3$_path, _path, headersObj, body, _url, bodySize, lowercaseHeaders, _i, _Object$entries, _Object$entries$_i, key, value, bodyKeys, signingFields, signedRequest, finalHeaders, _i2, _Object$entries2, _Object$entries2$_i, _key, _value, result;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          encoded = _ref3.encoded, signer = _ref3.signer, path = _ref3.path, url = _ref3.url, _ref3$method = _ref3.method, method = _ref3$method === void 0 ? "POST" : _ref3$method, _ref3$_path = _ref3._path, _path = _ref3$_path === void 0 ? false : _ref3$_path;
+          headersObj = encoded ? encoded.headers : {};
+          body = encoded ? encoded.body : undefined;
+          _url = joinUrl({
+            url: url,
+            path: path
+          });
+          headersObj["path"] = path;
+          if (body && !headersObj["content-length"]) {
+            bodySize = body.size || body.byteLength || 0;
+            if (bodySize > 0) headersObj["content-length"] = String(bodySize);
+          }
+          lowercaseHeaders = {};
+          for (_i = 0, _Object$entries = Object.entries(headersObj); _i < _Object$entries.length; _i++) {
+            _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2), key = _Object$entries$_i[0], value = _Object$entries$_i[1];
+            lowercaseHeaders[key.toLowerCase()] = value;
+          }
+          bodyKeys = headersObj["body-keys"] ? headersObj["body-keys"].replace(/"/g, "").split(",").map(function (k) {
+            return k.trim();
+          }) : [];
+          signingFields = Object.keys(lowercaseHeaders).filter(function (key) {
+            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");
+          }
+          _context3.next = 14;
+          return (0, _send.toHttpSigner)(signer)({
+            request: {
+              url: _url,
+              method: method,
+              headers: lowercaseHeaders
+            },
+            fields: signingFields
+          });
+        case 14:
+          signedRequest = _context3.sent;
+          finalHeaders = {};
+          for (_i2 = 0, _Object$entries2 = Object.entries(headersObj); _i2 < _Object$entries2.length; _i2++) {
+            _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2), _key = _Object$entries2$_i[0], _value = _Object$entries2$_i[1];
+            finalHeaders[_key] = _value;
+          }
+          finalHeaders["signature"] = signedRequest.headers["signature"];
+          finalHeaders["signature-input"] = signedRequest.headers["signature-input"];
+          if (headersObj["body-keys"]) {
+            finalHeaders["body-keys"] = headersObj["body-keys"];
+          }
+          result = {
+            url: _url,
+            method: method,
+            headers: finalHeaders
+          };
+          if (body) result.body = body;
+          return _context3.abrupt("return", result);
+        case 23:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _sign3.apply(this, arguments);
+}
 function signer(config) {
   var signer = config.signer,
     _config$url = config.url,
     url = _config$url === void 0 ? "http://localhost:10001" : _config$url;
-  if (!signer) {
-    throw new Error("Signer is required for mainnet mode");
-  }
+  if (!signer) throw new Error("Signer is required for mainnet mode");
   return /*#__PURE__*/function () {
-    var _sign = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(fields) {
-      var _ref2,
-        _ref2$path,
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(fields) {
+      var _ref5,
+        _ref5$encoded,
+        _encoded,
+        _ref5$path,
         _path,
         _fields$path,
         path,
         _fields$method,
         method,
-        restFields,
         aoFields,
         encoded,
-        headersObj,
-        body,
-        _url,
-        bodySize,
-        lowercaseHeaders,
-        _i,
-        _Object$entries,
-        _Object$entries$_i,
-        key,
-        value,
-        bodyKeys,
-        signingFields,
-        signedRequest,
-        finalHeaders,
-        _i2,
-        _Object$entries2,
-        _Object$entries2$_i,
-        _key,
-        _value,
-        result,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _ref2 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, _ref2$path = _ref2.path, _path = _ref2$path === void 0 ? false : _ref2$path;
-            _fields$path = fields.path, path = _fields$path === void 0 ? "/relay/process" : _fields$path, _fields$method = fields.method, method = _fields$method === void 0 ? "POST" : _fields$method, restFields = _objectWithoutProperties(fields, _excluded);
-            aoFields = _objectSpread({}, restFields);
-            _context.next = 5;
+            _ref5 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, _ref5$encoded = _ref5.encoded, _encoded = _ref5$encoded === void 0 ? false : _ref5$encoded, _ref5$path = _ref5.path, _path = _ref5$path === void 0 ? false : _ref5$path;
+            _fields$path = fields.path, path = _fields$path === void 0 ? "/relay/process" : _fields$path, _fields$method = fields.method, method = _fields$method === void 0 ? "POST" : _fields$method, aoFields = _objectWithoutProperties(fields, _excluded);
+            if (!_encoded) {
+              _context.next = 6;
+              break;
+            }
+            _context.t0 = aoFields;
+            _context.next = 9;
+            break;
+          case 6:
+            _context.next = 8;
             return (0, _encode.enc)(aoFields);
-          case 5:
-            encoded = _context.sent;
-            headersObj = encoded ? encoded.headers : {};
-            body = encoded ? encoded.body : undefined;
-            _url = joinUrl({
+          case 8:
+            _context.t0 = _context.sent;
+          case 9:
+            encoded = _context.t0;
+            _context.next = 12;
+            return _sign({
               url: url,
-              path: path
-            });
-            headersObj["path"] = path;
-            if (body && !headersObj["content-length"]) {
-              bodySize = body.size || body.byteLength || 0;
-              if (bodySize > 0) {
-                headersObj["content-length"] = String(bodySize);
-              }
-            }
-            lowercaseHeaders = {};
-            for (_i = 0, _Object$entries = Object.entries(headersObj); _i < _Object$entries.length; _i++) {
-              _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2), key = _Object$entries$_i[0], value = _Object$entries$_i[1];
-              lowercaseHeaders[key.toLowerCase()] = value;
-            }
-            if (lowercaseHeaders.path && /^\//.test(lowercaseHeaders.path)) {
-              //const sp = lowercaseHeaders.path.split("/")
-              //lowercaseHeaders.path = sp.slice(sp.length - 1).join("/")
-            }
-            // Parse body-keys if present
-            bodyKeys = headersObj["body-keys"] ? headersObj["body-keys"].replace(/"/g, "").split(",").map(function (k) {
-              return k.trim();
-            }) : []; // Collect fields to sign from headers
-            signingFields = Object.keys(lowercaseHeaders).filter(function (key) {
-              return key !== "body-keys" && key !== "path" && !bodyKeys.includes(key);
-            } // Also exclude fields that are in body-keys
-            ); // Always include @path in the signature
-            //if (!signingFields.includes("path")) signingFields.push("path")
-
-            if (_path) signingFields.push("path");
-            // Ensure we have at least one field to sign
-            if (signingFields.length === 0 && !body) {
-              lowercaseHeaders["content-length"] = "0";
-              signingFields.push("content-length");
-            }
-            _context.next = 20;
-            return (0, _send.toHttpSigner)(signer)({
-              request: {
-                url: _url,
-                method: method,
-                headers: lowercaseHeaders
-              },
-              fields: signingFields
-            });
-          case 20:
-            signedRequest = _context.sent;
-            finalHeaders = {};
-            for (_i2 = 0, _Object$entries2 = Object.entries(headersObj); _i2 < _Object$entries2.length; _i2++) {
-              _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2), _key = _Object$entries2$_i[0], _value = _Object$entries2$_i[1];
-              finalHeaders[_key] = _value;
-            }
-            finalHeaders["signature"] = signedRequest.headers["signature"];
-            finalHeaders["signature-input"] = signedRequest.headers["signature-input"];
-            if (headersObj["body-keys"]) {
-              finalHeaders["body-keys"] = headersObj["body-keys"];
-            }
-            result = {
-              url: _url,
               method: method,
-              headers: finalHeaders
-            };
-            if (body) result.body = body;
-            return _context.abrupt("return", result);
-          case 29:
+              path: path,
+              _path: _path,
+              encoded: encoded,
+              signer: signer
+            });
+          case 12:
+            return _context.abrupt("return", _context.sent);
+          case 13:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    function sign(_x) {
-      return _sign.apply(this, arguments);
-    }
-    return sign;
+    return function (_x3) {
+      return _ref4.apply(this, arguments);
+    };
   }();
-}
-
-// stack / simple-pay / patch / hyperbeam / hyperbeam-aos / scheduler / cron
+}

package/esm/encode.js

@@ -14,6 +14,7 @@ import {
   isBytes,
   isPojo,
 } from "./encode-utils.js"
+
 import encodeArrayItem from "./encode-array-item.js"
 import collectBodyKeys from "./collect-body-keys.js"
 const MAX_HEADER_LENGTH = 4096
@@ -1100,7 +1101,7 @@ function setFinalHeaders(headers, boundary, contentDigest, byteLength) {
   headers["content-length"] = String(byteLength)
 }
 
-async function encode(obj = {}) {
+export async function enc(obj = {}) {
   // Step 1: Process and normalize input values
   const processedObj = processInputValues(obj)
 
@@ -1213,7 +1214,3 @@ async function encode(obj = {}) {
   // Step 18: Return result
   return { headers, body }
 }
-
-export async function enc(fields) {
-  return await encode(fields)
-}

package/esm/hb.js

@@ -460,7 +460,7 @@ class HB {
       status: response.status,
     }
     return {
-      out: from(http),
+      ...from(http),
       ...http,
     }
   }

package/esm/httpsig.js

@@ -1,7 +1,7 @@
 import { trim } from "ramda"
 import { decodeSigInput } from "./signer-utils.js"
 import base64url from "base64url"
-
+import { toAddr } from "./utils.js"
 /**
  * Get multipart boundary from content-type header
  */
@@ -39,6 +39,17 @@ const extract = (http, components) => {
     }
   }
 
+  // Extract ao-ids if it's signed
+  const hasAoIds = components.some(
+    c => c.replace(/"/g, "").toLowerCase() === "ao-ids"
+  )
+  if (hasAoIds) {
+    const aoIds = http.headers["ao-ids"] || http.headers["Ao-Ids"]
+    if (aoIds) {
+      extracted["ao-ids"] = aoIds
+    }
+  }
+
   for (const component of components) {
     const cleanComponent = component.replace(/"/g, "")
 
@@ -139,6 +150,26 @@ export const toBuffer = body => {
   throw new Error("Unsupported body type")
 }
 
+/**
+ * Parse ao-ids dictionary
+ * @param {string} aoIds - The ao-ids header value
+ * @returns {Object} Parsed ID mappings
+ */
+const parseAoIds = aoIds => {
+  const result = {}
+
+  // Match pattern: ID="value"
+  const regex = /([A-Za-z0-9_-]{43})="([^"]*)"/g
+  let match
+
+  while ((match = regex.exec(aoIds)) !== null) {
+    const [, id, value] = match
+    result[id] = value
+  }
+
+  return result
+}
+
 /**
  * Convert message to JSON with proper type conversions
  * Following the logic from dev_codec_structured, dev_codec_httpsig_conv, and dev_codec_flat
@@ -152,6 +183,14 @@ const toJSON = msg => {
 
   let result = { ...msg }
 
+  // Handle ao-ids parsing
+  if (result["ao-ids"]) {
+    const parsedIds = parseAoIds(result["ao-ids"])
+    // Remove the ao-ids header and merge the parsed IDs
+    delete result["ao-ids"]
+    result = { ...result, ...parsedIds }
+  }
+
   // First, handle the multipart body if present
   const contentType = result["content-type"]
   const body = result.body
@@ -280,7 +319,10 @@ const toJSON = msg => {
   for (const [key, value] of Object.entries(result)) {
     // Skip internal keys and headers we don't want in the final result
     if (key.startsWith("__")) continue
-    if (key.startsWith("@")) continue // Skip all @ fields
+
+    // Skip @ fields EXCEPT @path which we want to include
+    if (key.startsWith("@") && key !== "@path") continue
+
     if (key === "ao-types") continue
     if (key === "content-type") continue
     if (key === "content-digest") continue
@@ -814,11 +856,6 @@ const stringToBuffer = str => {
   return buffer
 }
 
-/**
- * Original from function - extracts and converts only signed components
- * @param {Object} http - HTTP message object with headers, body, and status
- * @returns {Object|null} Converted signed components or null if not signed
- */
 export const from = http => {
   const input =
     http.headers["signature-input"] || http.headers["Signature-Input"]
@@ -828,36 +865,60 @@ export const from = http => {
 
   // Decode signature inputs
   const inputs = decodeSigInput(input)
-
   // Process the first signature (following the original logic)
   for (const k in inputs) {
     const sigData = inputs[k]
-
     // Extract only the signed components
     const extractedComponents = extract(http, sigData.components)
+    let ret = { hashpath: sigData?.params?.tag ?? null }
+    try {
+      ret.signer = toAddr(sigData.params.keyid)
+    } catch (e) {}
+
+    // Check if @path was in the signed components
+    const hasPathComponent = sigData.components.some(
+      c => c.replace(/"/g, "") === "@path"
+    )
+
+    // If @path is signed, add the path header to extracted components
+    if (hasPathComponent) {
+      extractedComponents["path"] = http.headers.path
+    }
 
-    // Check if ao-result header is present and points to body
+    // Check if ao-result header is present
     const aoResult = http.headers["ao-result"] || http.headers["Ao-Result"]
-    if (aoResult === "body" && extractedComponents.body) {
+
+    // Handle ao-result pointing to body
+    if (aoResult === "body") {
+      // Handle empty body case
+      if (!extractedComponents.body) {
+        return { out: "", ...ret } // Return empty string for empty body
+      }
       // Check if body is binary data
       if (isBinaryString(extractedComponents.body)) {
-        return stringToBuffer(extractedComponents.body)
+        return { out: stringToBuffer(extractedComponents.body), ...ret }
       }
+      // Return body as-is if it's not binary
+      return { out: extractedComponents.body, ...ret }
     }
 
     // Convert the extracted components to JSON format
     const result = toJSON(extractedComponents)
 
-    // Handle ao-result if present
-    if (aoResult && result[aoResult] !== undefined) {
+    // Handle ao-result if present and pointing to other fields
+    if (aoResult && aoResult !== "body") {
       // Return the value of the key specified by ao-result
-      return result[aoResult]
+      // If the key doesn't exist, return undefined (or could return null/empty string)
+      return {
+        out: result[aoResult] !== undefined ? result[aoResult] : "",
+        ...ret,
+      }
     }
 
-    return result
+    return { out: result, ...ret }
   }
 
-  return null
+  return { out: null, hashpath: null }
 }
 
 /**

package/esm/send.js

@@ -10,8 +10,6 @@ const {
 import { from } from "./httpsig.js"
 
 export async function send(signedMsg, fetchImpl = fetch) {
-  // IMPORTANT: Use the URL from signedMsg.url, NOT from any path header
-  // This ensures we send to the correct URL even if path header is different
   const fetchOptions = {
     method: signedMsg.method,
     headers: signedMsg.headers,
@@ -25,7 +23,6 @@ export async function send(signedMsg, fetchImpl = fetch) {
     fetchOptions.body = signedMsg.body
   }
 
-  // Use the URL as provided, ignoring any path header
   const response = await fetchImpl(signedMsg.url, fetchOptions)
   if (response.status >= 400) {
     throw new Error(`${response.status}: ${await response.text()}`)
@@ -36,10 +33,7 @@ export async function send(signedMsg, fetchImpl = fetch) {
     response.headers.forEach((v, k) => (headers[k] = v))
   } else headers = response.headers
   const http = { headers, body: await response.text(), status: response.status }
-  return {
-    out: from(http),
-    ...http,
-  }
+  return { ...from(http), ...http }
 }
 
 const httpSigName = address => {

package/esm/signer.js

@@ -1,97 +1,93 @@
 import { toHttpSigner } from "./send.js"
 import { enc } from "./encode.js"
+import { createSigner } from "@permaweb/aoconnect"
 
 const joinUrl = ({ url, path }) => {
-  if (path.startsWith("http://") || path.startsWith("https://")) {
-    return path
-  }
-  // Ensure path starts with /
+  if (path.startsWith("http://") || path.startsWith("https://")) return path
   const normalizedPath = path.startsWith("/") ? path : "/" + path
   return url.endsWith("/")
     ? url.slice(0, -1) + normalizedPath
     : url + normalizedPath
 }
 
-export function signer(config) {
-  const { signer, url = "http://localhost:10001" } = config
+export async function sign({ url, path, msg: encoded, jwk, signPath = false }) {
+  const signer = createSigner(jwk, url)
+  const { body = null, ...headers } = encoded
+  let _enc = { headers }
+  if (body) _enc.body = new Blob([body])
+  return await _sign({ signer, encoded: _enc, url, path, _path: signPath })
+}
 
-  if (!signer) {
-    throw new Error("Signer is required for mainnet mode")
+async function _sign({
+  encoded,
+  signer,
+  path,
+  url,
+  method = "POST",
+  _path = false,
+}) {
+  const headersObj = encoded ? encoded.headers : {}
+  const body = encoded ? encoded.body : undefined
+  const _url = joinUrl({ url, path })
+  headersObj["path"] = path
+  if (body && !headersObj["content-length"]) {
+    const bodySize = body.size || body.byteLength || 0
+    if (bodySize > 0) headersObj["content-length"] = String(bodySize)
+  }
+  const lowercaseHeaders = {}
+  for (const [key, value] of Object.entries(headersObj)) {
+    lowercaseHeaders[key.toLowerCase()] = value
+  }
+  const bodyKeys = headersObj["body-keys"]
+    ? headersObj["body-keys"]
+        .replace(/"/g, "")
+        .split(",")
+        .map(k => k.trim())
+    : []
+
+  const signingFields = Object.keys(lowercaseHeaders).filter(
+    key => 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")
   }
 
-  return async function sign(fields, { path: _path = false } = {}) {
-    const { path = "/relay/process", method = "POST", ...restFields } = fields
-    const aoFields = { ...restFields }
-    const encoded = await enc(aoFields)
-    const headersObj = encoded ? encoded.headers : {}
-    const body = encoded ? encoded.body : undefined
-
-    const _url = joinUrl({ url, path })
-
-    headersObj["path"] = path
-
-    if (body && !headersObj["content-length"]) {
-      const bodySize = body.size || body.byteLength || 0
-      if (bodySize > 0) {
-        headersObj["content-length"] = String(bodySize)
-      }
-    }
-
-    const lowercaseHeaders = {}
-    for (const [key, value] of Object.entries(headersObj)) {
-      lowercaseHeaders[key.toLowerCase()] = value
-    }
-    if (lowercaseHeaders.path && /^\//.test(lowercaseHeaders.path)) {
-      //const sp = lowercaseHeaders.path.split("/")
-      //lowercaseHeaders.path = sp.slice(sp.length - 1).join("/")
-    }
-    // Parse body-keys if present
-    const bodyKeys = headersObj["body-keys"]
-      ? headersObj["body-keys"]
-          .replace(/"/g, "")
-          .split(",")
-          .map(k => k.trim())
-      : []
-
-    // Collect fields to sign from headers
-    const signingFields = Object.keys(lowercaseHeaders).filter(
-      key => key !== "body-keys" && key !== "path" && !bodyKeys.includes(key) // Also exclude fields that are in body-keys
-    )
-    // Always include @path in the signature
-    //if (!signingFields.includes("path")) signingFields.push("path")
-    if (_path) signingFields.push("path")
-    // Ensure we have at least one field to sign
-    if (signingFields.length === 0 && !body) {
-      lowercaseHeaders["content-length"] = "0"
-      signingFields.push("content-length")
-    }
+  const signedRequest = await toHttpSigner(signer)({
+    request: { url: _url, method, headers: lowercaseHeaders },
+    fields: signingFields,
+  })
 
-    const signedRequest = await toHttpSigner(signer)({
-      request: {
-        url: _url,
-        method,
-        headers: lowercaseHeaders,
-      },
-      fields: signingFields,
-    })
-    const finalHeaders = {}
+  const finalHeaders = {}
 
-    for (const [key, value] of Object.entries(headersObj)) {
-      finalHeaders[key] = value
-    }
+  for (const [key, value] of Object.entries(headersObj)) {
+    finalHeaders[key] = value
+  }
 
-    finalHeaders["signature"] = signedRequest.headers["signature"]
-    finalHeaders["signature-input"] = signedRequest.headers["signature-input"]
+  finalHeaders["signature"] = signedRequest.headers["signature"]
+  finalHeaders["signature-input"] = signedRequest.headers["signature-input"]
 
-    if (headersObj["body-keys"]) {
-      finalHeaders["body-keys"] = headersObj["body-keys"]
-    }
-    const result = { url: _url, method, headers: finalHeaders }
+  if (headersObj["body-keys"]) {
+    finalHeaders["body-keys"] = headersObj["body-keys"]
+  }
+  const result = { url: _url, method, headers: finalHeaders }
 
-    if (body) result.body = body
+  if (body) result.body = body
 
-    return result
+  return result
+}
+export function signer(config) {
+  const { signer, url = "http://localhost:10001" } = config
+  if (!signer) throw new Error("Signer is required for mainnet mode")
+  return async (
+    fields,
+    { encoded: _encoded = false, path: _path = false } = {}
+  ) => {
+    const { path = "/relay/process", method = "POST", ...aoFields } = fields
+    const encoded = _encoded ? aoFields : await enc(aoFields)
+    return await _sign({ url, method, path, _path, encoded, signer })
   }
 }
-
-// stack / simple-pay / patch / hyperbeam / hyperbeam-aos / scheduler / cron

package/package.json

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