hbsig 0.1.5 → 0.2.0

package/cjs/index.js

@@ -105,6 +105,12 @@ Object.defineProperty(exports, "normalize", {
     return _erl_json.normalize;
   }
 });
+Object.defineProperty(exports, "result", {
+  enumerable: true,
+  get: function get() {
+    return _sendUtils.result;
+  }
+});
 Object.defineProperty(exports, "rsaid", {
   enumerable: true,
   get: function get() {
@@ -158,6 +164,7 @@ var _utils = require("./utils.js");
 var _signer = require("./signer.js");
 var _send = require("./send.js");
 var _commit = require("./commit.js");
+var _sendUtils = require("./send-utils.js");
 var _signerUtils = require("./signer-utils.js");
 var _erl_json = require("./erl_json.js");
 var _erl_str = require("./erl_str.js");

package/cjs/{httpsig2.js → send-utils.js}

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.verifyContentDigest = exports.toBuffer = exports.hasValidSignature = exports.getSignatureNames = exports.from = exports.extractKeys = void 0;
+exports.verifyContentDigest = exports.toBuffer = exports.result = exports.hasValidSignature = exports.getSignatureNames = exports.from = exports.extractKeys = void 0;
 var _ramda = require("ramda");
+var _utils = require("./utils.js");
 var _signerUtils = require("./signer-utils.js");
+var _httpsig = require("./httpsig.js");
+var _structured = require("./structured.js");
 var _base64url = _interopRequireDefault(require("base64url"));
-var _utils = require("./utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, 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); }
+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); }
@@ -913,11 +919,75 @@ var stringToBuffer = function stringToBuffer(str) {
   }
   return buffer;
 };
+var toMsg = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req) {
+    var _req$headers;
+    var msg, arrayBuffer;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          msg = {};
+          req === null || req === void 0 || (_req$headers = req.headers) === null || _req$headers === void 0 || _req$headers.forEach(function (v, k) {
+            msg[k] = v;
+          });
+          if (!req.body) {
+            _context.n = 2;
+            break;
+          }
+          _context.n = 1;
+          return req.arrayBuffer();
+        case 1:
+          arrayBuffer = _context.v;
+          msg.body = typeof Buffer !== "undefined" ? Buffer.from(arrayBuffer) : new Uint8Array(arrayBuffer);
+        case 2:
+          return _context.a(2, msg);
+      }
+    }, _callee);
+  }));
+  return function toMsg(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var result = exports.result = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(response) {
+    var _from$signer, _from$hashpath;
+    var headers, msg, out, body, http, _from;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          headers = {};
+          response.headers.forEach(function (v, k) {
+            return headers[k] = v;
+          });
+          _context2.n = 1;
+          return toMsg(response);
+        case 1:
+          msg = _context2.v;
+          out = (0, _structured.structured_to)((0, _httpsig.httpsig_from)(msg));
+          body = Buffer.from(msg.body).toString();
+          http = {
+            headers: headers,
+            body: body
+          };
+          _from = from(http);
+          return _context2.a(2, {
+            signer: (_from$signer = _from === null || _from === void 0 ? void 0 : _from.signer) !== null && _from$signer !== void 0 ? _from$signer : null,
+            hashpath: (_from$hashpath = _from === null || _from === void 0 ? void 0 : _from.hashpath) !== null && _from$hashpath !== void 0 ? _from$hashpath : null,
+            headers: headers,
+            status: response.status,
+            body: body,
+            out: out["ao-result"] ? _from === null || _from === void 0 ? void 0 : _from.out : out
+          });
+      }
+    }, _callee2);
+  }));
+  return function result(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var from = exports.from = function from(http) {
   var input = http.headers["signature-input"] || http.headers["Signature-Input"];
-  if (!input) {
-    return null;
-  }
+  if (!input) return null;
 
   // Decode signature inputs
   var inputs = (0, _signerUtils.decodeSigInput)(input);
@@ -968,18 +1038,18 @@ var from = exports.from = function from(http) {
     }
 
     // Convert the extracted components to JSON format
-    var result = _toJSON(extractedComponents);
+    var _result2 = _toJSON(extractedComponents);
 
     // Handle ao-result if present and pointing to other fields
     if (aoResult && aoResult !== "body") {
       // Return the value of the key specified by ao-result
       // If the key doesn't exist, return undefined (or could return null/empty string)
       return _objectSpread({
-        out: result[aoResult] !== undefined ? result[aoResult] : ""
+        out: _result2[aoResult] !== undefined ? _result2[aoResult] : ""
       }, ret);
     }
     return _objectSpread({
-      out: result
+      out: _result2
     }, ret);
   }
   return {

package/cjs/send.js

@@ -10,10 +10,10 @@ exports.toHttpSigner = void 0;
 var _base64url = _interopRequireDefault(require("base64url"));
 var _index = require("./http-message-signatures/index.js");
 var _structuredHeaders = require("structured-headers");
-var _httpsig = require("./httpsig2.js");
+var _httpsig = require("./httpsig.js");
+var _structured = require("./structured.js");
+var _sendUtils = require("./send-utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
 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; }
@@ -29,34 +29,61 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 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 _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 _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, 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); }
 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); }); }; }
 var augmentHeaders = _index.httpbis.augmentHeaders,
   createSignatureBase = _index.httpbis.createSignatureBase,
   createSigningParameters = _index.httpbis.createSigningParameters,
   formatSignatureBase = _index.httpbis.formatSignatureBase;
-function send(_x) {
+var toMsg = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(req) {
+    var _req$headers;
+    var msg, arrayBuffer;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          msg = {};
+          req === null || req === void 0 || (_req$headers = req.headers) === null || _req$headers === void 0 || _req$headers.forEach(function (v, k) {
+            msg[k] = v;
+          });
+          if (!req.body) {
+            _context.n = 2;
+            break;
+          }
+          _context.n = 1;
+          return req.arrayBuffer();
+        case 1:
+          arrayBuffer = _context.v;
+          msg.body = typeof Buffer !== "undefined" ? Buffer.from(arrayBuffer) // Node.js
+          : new Uint8Array(arrayBuffer); // Browser
+        case 2:
+          return _context.a(2, msg);
+      }
+    }, _callee);
+  }));
+  return function toMsg(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+function send(_x2) {
   return _send.apply(this, arguments);
 }
 function _send() {
-  _send = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(signedMsg) {
+  _send = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(signedMsg) {
     var fetchImpl,
       fetchOptions,
       response,
-      headers,
-      http,
-      _args2 = arguments,
+      _args3 = arguments,
       _t,
       _t2,
       _t3,
-      _t4,
-      _t5,
-      _t6,
-      _t7;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+      _t4;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
         case 0:
-          fetchImpl = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : fetch;
+          fetchImpl = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : fetch;
           fetchOptions = {
             method: signedMsg.method,
             headers: signedMsg.headers,
@@ -65,43 +92,29 @@ function _send() {
           if (signedMsg.body !== undefined && signedMsg.method !== "GET" && signedMsg.method !== "HEAD") {
             fetchOptions.body = signedMsg.body;
           }
-          _context2.n = 1;
+          _context3.n = 1;
           return fetchImpl(signedMsg.url, fetchOptions);
         case 1:
-          response = _context2.v;
+          response = _context3.v;
           if (!(response.status >= 400)) {
-            _context2.n = 3;
+            _context3.n = 3;
             break;
           }
           _t = Error;
           _t2 = "".concat(response.status, ": ");
-          _context2.n = 2;
+          _context3.n = 2;
           return response.text();
         case 2:
-          _t3 = _context2.v;
+          _t3 = _context3.v;
           _t4 = _t2.concat.call(_t2, _t3);
           throw new _t(_t4);
         case 3:
-          headers = {};
-          if (response.headers && typeof response.headers.forEach === "function") {
-            response.headers.forEach(function (v, k) {
-              return headers[k] = v;
-            });
-          } else headers = response.headers;
-          _t5 = headers;
-          _context2.n = 4;
-          return response.text();
+          _context3.n = 4;
+          return (0, _sendUtils.result)(response);
         case 4:
-          _t6 = _context2.v;
-          _t7 = response.status;
-          http = {
-            headers: _t5,
-            body: _t6,
-            status: _t7
-          };
-          return _context2.a(2, _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
+          return _context3.a(2, _context3.v);
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _send.apply(this, arguments);
 }
@@ -121,12 +134,12 @@ var toView = function toView(value) {
 var toHttpSigner = exports.toHttpSigner = function toHttpSigner(signer) {
   var params = ["alg", "keyid"].sort();
   return /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(_ref) {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref2) {
       var request, fields, signatureBase, signatureInput, createCalled, create, result, signatureBuffer, signedHeaders, finalHeaders, _i, _Object$entries, _Object$entries$_i, key, value;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
-            request = _ref.request, fields = _ref.fields;
+            request = _ref2.request, fields = _ref2.fields;
             createCalled = false;
             create = function create(injected) {
               createCalled = true;
@@ -147,27 +160,27 @@ var toHttpSigner = exports.toHttpSigner = function toHttpSigner(signer) {
               var signatureBaseArray = createSignatureBase({
                 fields: sortedFields
               }, request);
-              signatureInput = (0, _structuredHeaders.serializeList)([[signatureBaseArray.map(function (_ref3) {
-                var _ref4 = _slicedToArray(_ref3, 1),
-                  item = _ref4[0];
+              signatureInput = (0, _structuredHeaders.serializeList)([[signatureBaseArray.map(function (_ref4) {
+                var _ref5 = _slicedToArray(_ref4, 1),
+                  item = _ref5[0];
                 return (0, _structuredHeaders.parseItem)(item);
               }), signingParameters]]);
               signatureBaseArray.push(['"@signature-params"', [signatureInput]]);
               signatureBase = formatSignatureBase(signatureBaseArray);
               return new TextEncoder().encode(signatureBase);
             };
-            _context.n = 1;
+            _context2.n = 1;
             return signer(create, "httpsig");
           case 1:
-            result = _context.v;
+            result = _context2.v;
             if (createCalled) {
-              _context.n = 2;
+              _context2.n = 2;
               break;
             }
             throw new Error("create() must be invoked in order to construct the data to sign");
           case 2:
             if (!(!result.signature || !result.address)) {
-              _context.n = 3;
+              _context2.n = 3;
               break;
             }
             throw new Error("Signer must return signature and address");
@@ -181,14 +194,14 @@ var toHttpSigner = exports.toHttpSigner = function toHttpSigner(signer) {
                 finalHeaders[key.toLowerCase()] = value;
               } else finalHeaders[key] = value;
             }
-            return _context.a(2, _objectSpread(_objectSpread({}, request), {}, {
+            return _context2.a(2, _objectSpread(_objectSpread({}, request), {}, {
               headers: finalHeaders
             }));
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function (_x2) {
-      return _ref2.apply(this, arguments);
+    return function (_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
 };

package/esm/index.js

@@ -3,6 +3,7 @@ export { toAddr } from "./utils.js"
 export { sign, signer, createSigner } from "./signer.js"
 export { send } from "./send.js"
 export { commit } from "./commit.js"
+export { result } from "./send-utils.js"
 export { extractPubKey, decodeSigInput, verify } from "./signer-utils.js"
 export { normalize, erl_json_to, erl_json_from } from "./erl_json.js"
 export { erl_str_from, erl_str_to } from "./erl_str.js"

package/esm/{httpsig2.js → send-utils.js}

@@ -1,7 +1,10 @@
 import { trim } from "ramda"
+import { toAddr } from "./utils.js"
 import { decodeSigInput } from "./signer-utils.js"
+import { httpsig_from } from "./httpsig.js"
+import { structured_to } from "./structured.js"
 import base64url from "base64url"
-import { toAddr } from "./utils.js"
+
 /**
  * Get multipart boundary from content-type header
  */
@@ -856,12 +859,43 @@ const stringToBuffer = str => {
   return buffer
 }
 
+const toMsg = async req => {
+  let msg = {}
+  req?.headers?.forEach((v, k) => {
+    msg[k] = v
+  })
+  if (req.body) {
+    const arrayBuffer = await req.arrayBuffer()
+    msg.body =
+      typeof Buffer !== "undefined"
+        ? Buffer.from(arrayBuffer)
+        : new Uint8Array(arrayBuffer)
+  }
+  return msg
+}
+
+export const result = async response => {
+  let headers = {}
+  response.headers.forEach((v, k) => (headers[k] = v))
+  const msg = await toMsg(response)
+  const out = structured_to(httpsig_from(msg))
+  const body = Buffer.from(msg.body).toString()
+  const http = { headers, body }
+  const _from = from(http)
+  return {
+    signer: _from?.signer ?? null,
+    hashpath: _from?.hashpath ?? null,
+    headers,
+    status: response.status,
+    body,
+    out: out["ao-result"] ? _from?.out : out,
+  }
+}
+
 export const from = http => {
   const input =
     http.headers["signature-input"] || http.headers["Signature-Input"]
-  if (!input) {
-    return null
-  }
+  if (!input) return null
 
   // Decode signature inputs
   const inputs = decodeSigInput(input)

package/esm/send.js

@@ -1,13 +1,32 @@
 import base64url from "base64url"
 import { httpbis } from "./http-message-signatures/index.js"
 import { parseItem, serializeList } from "structured-headers"
+import { httpsig_from } from "./httpsig.js"
+import { structured_to } from "./structured.js"
+import { result } from "./send-utils.js"
+
 const {
   augmentHeaders,
   createSignatureBase,
   createSigningParameters,
   formatSignatureBase,
 } = httpbis
-import { from } from "./httpsig2.js"
+
+const toMsg = async req => {
+  let msg = {}
+  req?.headers?.forEach((v, k) => {
+    msg[k] = v
+  })
+  if (req.body) {
+    const arrayBuffer = await req.arrayBuffer()
+    msg.body =
+      typeof Buffer !== "undefined"
+        ? Buffer.from(arrayBuffer) // Node.js
+        : new Uint8Array(arrayBuffer) // Browser
+  }
+
+  return msg
+}
 
 export async function send(signedMsg, fetchImpl = fetch) {
   const fetchOptions = {
@@ -27,13 +46,7 @@ export async function send(signedMsg, fetchImpl = fetch) {
   if (response.status >= 400) {
     throw new Error(`${response.status}: ${await response.text()}`)
   }
-
-  let headers = {}
-  if (response.headers && typeof response.headers.forEach === "function") {
-    response.headers.forEach((v, k) => (headers[k] = v))
-  } else headers = response.headers
-  const http = { headers, body: await response.text(), status: response.status }
-  return { ...from(http), ...http }
+  return await result(response)
 }
 
 export const httpSigName = address => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hbsig",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "main": "cjs/index.js",
   "license": "MIT",
   "devDependencies": {
@@ -14,6 +14,7 @@
     "@permaweb/aoconnect": "^0.0.85",
     "base64url": "^3.0.1",
     "fast-sha256": "^1.3.0",
+    "hbsig": "^0.1.5",
     "ramda": "^0.31.3",
     "structured-headers": "1.0.1"
   },