hbsig 0.1.4 → 0.2.0

package/cjs/httpsig.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.httpsig_from = httpsig_from;
 exports.httpsig_to = httpsig_to;
+exports.structured_from = structured_from;
+exports.structured_to = structured_to;
 var _crypto = _interopRequireDefault(require("crypto"));
 var _flat = require("./flat.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _toArray(r) { return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableRest(); }
 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); }
@@ -342,7 +343,22 @@ function encodeBodyPart(partName, bodyPart, inlineKey) {
   return "";
 }
 
-// Parse multipart body
+// Helper to detect if a string contains binary data
+function isBinaryData(str) {
+  // Check first 100 chars for binary indicators
+  for (var i = 0; i < Math.min(str.length, 100); i++) {
+    var code = str.charCodeAt(i);
+    // Non-printable chars (except CR/LF/TAB)
+    if (code < 32 && code !== 9 && code !== 10 && code !== 13) return true;
+    // High byte range that's not valid text
+    if (code > 126 && code < 160) return true;
+    // Null byte is definitely binary
+    if (code === 0) return true;
+  }
+  return false;
+}
+
+// Parse multipart body - handles binary data in headers
 function parseMultipart(contentType, body) {
   var boundaryMatch = contentType.match(/boundary="?([^";\s]+)"?/);
   if (!boundaryMatch) return {};
@@ -350,8 +366,8 @@ function parseMultipart(contentType, body) {
   var boundaryDelim = "--".concat(boundary);
   var endBoundary = "--".concat(boundary, "--");
 
-  // Remove the final boundary terminator if present
-  var bodyContent = body;
+  // Use binary encoding to preserve all bytes as character codes 0-255
+  var bodyContent = typeof body === "string" ? body : body.toString("binary");
   if (bodyContent.endsWith(endBoundary)) {
     bodyContent = bodyContent.substring(0, bodyContent.lastIndexOf(endBoundary));
   }
@@ -365,59 +381,137 @@ function parseMultipart(contentType, body) {
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var part = _step3.value;
-      var _part$split = part.split(DOUBLE_CRLF),
-        _part$split2 = _toArray(_part$split),
-        headerBlock = _part$split2[0],
-        bodyParts = _part$split2.slice(1);
-      var partBody = bodyParts.join(DOUBLE_CRLF);
-
-      // Remove trailing CRLF
-      partBody = partBody.replace(/\r?\n?$/, "");
+      // First split to find the headers/body boundary (double CRLF)
+      var headerBodySplit = part.indexOf(DOUBLE_CRLF);
+      var headerBlock = void 0,
+        partBody = void 0;
+      if (headerBodySplit !== -1) {
+        headerBlock = part.substring(0, headerBodySplit);
+        partBody = part.substring(headerBodySplit + DOUBLE_CRLF.length);
+        // Remove trailing CRLF from body
+        partBody = partBody.replace(/\r?\n?$/, "");
+      } else {
+        headerBlock = part;
+        partBody = "";
+      }
       var headers = {};
-      var headerLines = headerBlock.split(/\r?\n/);
-      var _iterator4 = _createForOfIteratorHelper(headerLines),
-        _step4;
-      try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var line = _step4.value;
-          var colonIndex = line.indexOf(": ");
-          if (colonIndex > 0) {
-            var name = line.substring(0, colonIndex).toLowerCase();
-            var value = line.substring(colonIndex + 2);
-            headers[name] = value;
+
+      // Parse headers more carefully to handle binary data
+      var currentPos = 0;
+      while (currentPos < headerBlock.length) {
+        // Find next line ending (but be careful with binary data)
+        var lineEnd = headerBlock.indexOf("\r\n", currentPos);
+        if (lineEnd === -1) lineEnd = headerBlock.indexOf("\n", currentPos);
+        if (lineEnd === -1) lineEnd = headerBlock.length;
+        var line = headerBlock.substring(currentPos, lineEnd);
+        var colonIndex = line.indexOf(": ");
+        if (colonIndex > 0) {
+          var name = line.substring(0, colonIndex).toLowerCase();
+          var value = line.substring(colonIndex + 2);
+
+          // Special handling for known binary fields or detected binary data
+          if (name === "owner" || name === "signature") {
+            // These fields contain binary data that may have embedded newlines
+            // We need to read until we find the next header or end of headers
+            var valueStart = currentPos + colonIndex + 2;
+
+            // Look ahead to find where this field really ends
+            // The next header will start with a valid header name followed by ": "
+            var searchPos = valueStart;
+            var valueEnd = headerBlock.length;
+
+            // Look for the next valid header pattern
+            while (searchPos < headerBlock.length) {
+              var nextNewline = headerBlock.indexOf("\n", searchPos);
+              if (nextNewline === -1) break;
+
+              // Check if what follows looks like a header
+              var nextLineStart = nextNewline + 1;
+              var nextColon = headerBlock.indexOf(":", nextLineStart);
+
+              // Valid header should have colon relatively close to line start
+              if (nextColon > nextLineStart && nextColon < nextLineStart + 50) {
+                // Check if the text before colon looks like a header name (ASCII text)
+                var possibleHeaderName = headerBlock.substring(nextLineStart, nextColon);
+                var looksLikeHeader = /^[a-zA-Z0-9-]+$/.test(possibleHeaderName);
+                if (looksLikeHeader) {
+                  // Found the next header, value ends at the newline before it
+                  valueEnd = nextNewline;
+                  break;
+                }
+              }
+              searchPos = nextNewline + 1;
+            }
+
+            // Extract the full value, trimming any trailing whitespace
+            value = headerBlock.substring(valueStart, valueEnd);
+
+            // Remove trailing CR if present (since we found the LF)
+            if (value.endsWith("\r")) {
+              value = value.substring(0, value.length - 1);
+            }
+
+            // Convert to Buffer to preserve binary
+            headers[name] = Buffer.from(value, "binary");
+            currentPos = valueEnd + 1;
+          } else {
+            // Regular text field
+            if (isBinaryData(value)) {
+              headers[name] = Buffer.from(value, "binary");
+            } else {
+              headers[name] = value;
+            }
+            currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1);
           }
+        } else {
+          // No colon found, skip this line
+          currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1);
         }
-      } catch (err) {
-        _iterator4.e(err);
-      } finally {
-        _iterator4.f();
       }
       var disposition = headers["content-disposition"];
       if (!disposition) continue;
       var partName = void 0;
       if (disposition === "inline") {
+        // This is the inline part
         partName = "body";
         bodyKeysList.push("body");
+
+        // Extract all headers from inline part as top-level fields
+        var restHeaders = _objectSpread({}, headers);
+        delete restHeaders["content-disposition"];
+
+        // Add each header from the inline part to the top level of result
+        for (var _i8 = 0, _Object$entries8 = Object.entries(restHeaders); _i8 < _Object$entries8.length; _i8++) {
+          var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i8], 2),
+            key = _Object$entries8$_i[0],
+            _value2 = _Object$entries8$_i[1];
+          result[key] = _value2;
+        }
+
+        // If there's body content in the inline part, add it as 'body'
+        if (partBody) {
+          result[partName] = partBody;
+        }
       } else {
+        // Handle named form-data parts
         var nameMatch = disposition.match(/name="([^"]+)"/);
         partName = nameMatch ? nameMatch[1] : null;
         if (partName) {
-          // Add the top-level key for this part
           var topLevelKey = partName.split("/")[0];
           bodyKeysList.push(topLevelKey);
         }
-      }
-      if (!partName) continue;
-      var restHeaders = _objectSpread({}, headers);
-      delete restHeaders["content-disposition"];
-      if (Object.keys(restHeaders).length === 0) {
-        result[partName] = partBody;
-      } else if (!partBody) {
-        result[partName] = restHeaders;
-      } else {
-        result[partName] = _objectSpread(_objectSpread({}, restHeaders), {}, {
-          body: partBody
-        });
+        if (!partName) continue;
+        var _restHeaders = _objectSpread({}, headers);
+        delete _restHeaders["content-disposition"];
+        if (Object.keys(_restHeaders).length === 0) {
+          result[partName] = partBody;
+        } else if (!partBody) {
+          result[partName] = _restHeaders;
+        } else {
+          result[partName] = _objectSpread(_objectSpread({}, _restHeaders), {}, {
+            body: partBody
+          });
+        }
       }
     }
   } catch (err) {
@@ -426,7 +520,6 @@ function parseMultipart(contentType, body) {
     _iterator3.f();
   }
   if (bodyKeysList.length > 0) {
-    // Format as structured field list, preserving order and duplicates
     result["body-keys"] = bodyKeysList.map(function (k) {
       return "\"".concat(k, "\"");
     }).join(", ");
@@ -492,10 +585,10 @@ function httpsig_from(http) {
 
     // Convert flat structure to nested using flat.js
     var flat = {};
-    for (var _i8 = 0, _Object$entries8 = Object.entries(withBodyKeys); _i8 < _Object$entries8.length; _i8++) {
-      var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i8], 2),
-        key = _Object$entries8$_i[0],
-        value = _Object$entries8$_i[1];
+    for (var _i9 = 0, _Object$entries9 = Object.entries(withBodyKeys); _i9 < _Object$entries9.length; _i9++) {
+      var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i9], 2),
+        key = _Object$entries9$_i[0],
+        value = _Object$entries9$_i[1];
       if (key.includes("/")) {
         flat[key] = value;
       }
@@ -503,14 +596,14 @@ function httpsig_from(http) {
     if (Object.keys(flat).length > 0) {
       // Use flat_from to convert flat structure to nested
       var nested = (0, _flat.flat_from)(flat);
-      for (var _i9 = 0, _Object$entries9 = Object.entries(nested); _i9 < _Object$entries9.length; _i9++) {
-        var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i9], 2),
-          _key2 = _Object$entries9$_i[0],
-          _value2 = _Object$entries9$_i[1];
-        withBodyKeys[_key2] = _value2;
+      for (var _i0 = 0, _Object$entries0 = Object.entries(nested); _i0 < _Object$entries0.length; _i0++) {
+        var _Object$entries0$_i = _slicedToArray(_Object$entries0[_i0], 2),
+          _key2 = _Object$entries0$_i[0],
+          _value3 = _Object$entries0$_i[1];
+        withBodyKeys[_key2] = _value3;
       }
-      for (var _i0 = 0, _Object$keys = Object.keys(flat); _i0 < _Object$keys.length; _i0++) {
-        var _key3 = _Object$keys[_i0];
+      for (var _i1 = 0, _Object$keys = Object.keys(flat); _i1 < _Object$keys.length; _i1++) {
+        var _key3 = _Object$keys[_i1];
         delete withBodyKeys[_key3];
       }
     }
@@ -529,8 +622,8 @@ function httpsig_from(http) {
   delete result["content-digest"];
 
   // Extract hashpaths if any
-  for (var _i1 = 0, _Object$keys2 = Object.keys(result); _i1 < _Object$keys2.length; _i1++) {
-    var _key4 = _Object$keys2[_i1];
+  for (var _i10 = 0, _Object$keys2 = Object.keys(result); _i10 < _Object$keys2.length; _i10++) {
+    var _key4 = _Object$keys2[_i10];
     if (_key4.startsWith("hashpath")) {
       delete result[_key4];
     }
@@ -570,10 +663,10 @@ function httpsig_to(tabm) {
     // For flat structures, just return with normalized keys
     // This matches Erlang which returns the map unchanged
     var result = _objectSpread({}, inlineFieldHdrs);
-    for (var _i10 = 0, _Object$entries0 = Object.entries(stripped); _i10 < _Object$entries0.length; _i10++) {
-      var _Object$entries0$_i = _slicedToArray(_Object$entries0[_i10], 2),
-        key = _Object$entries0$_i[0],
-        value = _Object$entries0$_i[1];
+    for (var _i11 = 0, _Object$entries1 = Object.entries(stripped); _i11 < _Object$entries1.length; _i11++) {
+      var _Object$entries1$_i = _slicedToArray(_Object$entries1[_i11], 2),
+        key = _Object$entries1$_i[0],
+        value = _Object$entries1$_i[1];
       // Convert Buffers to strings if they're UTF-8 text
       if (Buffer.isBuffer(value)) {
         try {
@@ -623,31 +716,31 @@ function httpsig_to(tabm) {
   var headers = _objectSpread({}, inlineFieldHdrs);
 
   // Process each field - ao-types at top level should go to headers
-  for (var _i11 = 0, _Object$entries1 = Object.entries(stripped); _i11 < _Object$entries1.length; _i11++) {
-    var _Object$entries1$_i = _slicedToArray(_Object$entries1[_i11], 2),
-      _key5 = _Object$entries1$_i[0],
-      _value3 = _Object$entries1$_i[1];
+  for (var _i12 = 0, _Object$entries10 = Object.entries(stripped); _i12 < _Object$entries10.length; _i12++) {
+    var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i12], 2),
+      _key5 = _Object$entries10$_i[0],
+      _value4 = _Object$entries10$_i[1];
     if (_key5 === "ao-types") {
       // Top-level ao-types goes to headers only
       // Convert Buffer to string if needed
-      if (Buffer.isBuffer(_value3)) {
-        headers[_key5] = _value3.toString("utf8");
+      if (Buffer.isBuffer(_value4)) {
+        headers[_key5] = _value4.toString("utf8");
       } else {
-        headers[_key5] = _value3;
+        headers[_key5] = _value4;
       }
     } else if (_key5 === "body" || _key5 === inlineKeyVal) {
-      bodyMap[_key5 === inlineKeyVal ? inlineKeyVal : "body"] = _value3;
-    } else if (_typeof(_value3) === "object" && _value3 !== null && !Array.isArray(_value3) && !Buffer.isBuffer(_value3)) {
-      bodyMap[_key5] = _value3;
-    } else if (typeof _value3 === "string" && _value3.length <= MAX_HEADER_LENGTH && _key5 !== "ao-types") {
-      headers[normalizeKey(_key5)] = _value3;
-    } else if (Buffer.isBuffer(_value3) && _value3.length <= MAX_HEADER_LENGTH && _key5 !== "ao-types") {
+      bodyMap[_key5 === inlineKeyVal ? inlineKeyVal : "body"] = _value4;
+    } else if (_typeof(_value4) === "object" && _value4 !== null && !Array.isArray(_value4) && !Buffer.isBuffer(_value4)) {
+      bodyMap[_key5] = _value4;
+    } else if (typeof _value4 === "string" && _value4.length <= MAX_HEADER_LENGTH && _key5 !== "ao-types") {
+      headers[normalizeKey(_key5)] = _value4;
+    } else if (Buffer.isBuffer(_value4) && _value4.length <= MAX_HEADER_LENGTH && _key5 !== "ao-types") {
       // Convert Buffers to strings for headers
-      var _str = _value3.toString("utf8");
+      var _str = _value4.toString("utf8");
       headers[normalizeKey(_key5)] = _str;
     } else if (_key5 !== "ao-types") {
       // Only add to bodyMap if it's not ao-types
-      bodyMap[_key5] = _value3;
+      bodyMap[_key5] = _value4;
     }
   }
 
@@ -671,22 +764,22 @@ function httpsig_to(tabm) {
         b = _ref8[0];
       return a.localeCompare(b);
     });
-    var _iterator5 = _createForOfIteratorHelper(sortedEntries),
-      _step5;
+    var _iterator4 = _createForOfIteratorHelper(sortedEntries),
+      _step4;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var _step5$value = _slicedToArray(_step5.value, 2),
-          _key6 = _step5$value[0],
-          _value4 = _step5$value[1];
-        if (_typeof(_value4) === "object" && _value4 !== null && Object.keys(_value4).length === 1 && "body" in _value4) {
-          var encoded = encodeBodyPart("".concat(_key6, "/body"), _value4, "body");
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var _step4$value = _slicedToArray(_step4.value, 2),
+          _key6 = _step4$value[0],
+          _value5 = _step4$value[1];
+        if (_typeof(_value5) === "object" && _value5 !== null && Object.keys(_value5).length === 1 && "body" in _value5) {
+          var encoded = encodeBodyPart("".concat(_key6, "/body"), _value5, "body");
           parts.push({
             name: "".concat(_key6, "/body"),
             body: encoded
           });
           bodyKeysList.push(_key6);
         } else {
-          var _encoded = encodeBodyPart(_key6, _value4, inlineKeyVal);
+          var _encoded = encodeBodyPart(_key6, _value5, inlineKeyVal);
           parts.push({
             name: _key6,
             body: _encoded
@@ -695,9 +788,9 @@ function httpsig_to(tabm) {
         }
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator5.f();
+      _iterator4.f();
     }
     var boundary = boundaryFromParts(parts);
     var bodyParts = parts.map(function (p) {
@@ -713,4 +806,18 @@ function httpsig_to(tabm) {
     });
     return addContentDigest(_result2);
   }
+}
+
+/**
+ * Convert structured message to flat format
+ */
+function structured_to(msg) {
+  return msg;
+}
+
+/**
+ * Convert flat format to structured message
+ */
+function structured_from(msg) {
+  return msg;
 }

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/httpsig.js

@@ -286,7 +286,22 @@ function encodeBodyPart(partName, bodyPart, inlineKey) {
   return ""
 }
 
-// Parse multipart body
+// Helper to detect if a string contains binary data
+function isBinaryData(str) {
+  // Check first 100 chars for binary indicators
+  for (let i = 0; i < Math.min(str.length, 100); i++) {
+    const code = str.charCodeAt(i)
+    // Non-printable chars (except CR/LF/TAB)
+    if (code < 32 && code !== 9 && code !== 10 && code !== 13) return true
+    // High byte range that's not valid text
+    if (code > 126 && code < 160) return true
+    // Null byte is definitely binary
+    if (code === 0) return true
+  }
+  return false
+}
+
+// Parse multipart body - handles binary data in headers
 function parseMultipart(contentType, body) {
   const boundaryMatch = contentType.match(/boundary="?([^";\s]+)"?/)
   if (!boundaryMatch) return {}
@@ -295,8 +310,8 @@ function parseMultipart(contentType, body) {
   const boundaryDelim = `--${boundary}`
   const endBoundary = `--${boundary}--`
 
-  // Remove the final boundary terminator if present
-  let bodyContent = body
+  // Use binary encoding to preserve all bytes as character codes 0-255
+  let bodyContent = typeof body === "string" ? body : body.toString("binary")
   if (bodyContent.endsWith(endBoundary)) {
     bodyContent = bodyContent.substring(0, bodyContent.lastIndexOf(endBoundary))
   }
@@ -309,20 +324,98 @@ function parseMultipart(contentType, body) {
   const bodyKeysList = []
 
   for (const part of parts) {
-    const [headerBlock, ...bodyParts] = part.split(DOUBLE_CRLF)
-    let partBody = bodyParts.join(DOUBLE_CRLF)
-
-    // Remove trailing CRLF
-    partBody = partBody.replace(/\r?\n?$/, "")
+    // First split to find the headers/body boundary (double CRLF)
+    const headerBodySplit = part.indexOf(DOUBLE_CRLF)
+    let headerBlock, partBody
+
+    if (headerBodySplit !== -1) {
+      headerBlock = part.substring(0, headerBodySplit)
+      partBody = part.substring(headerBodySplit + DOUBLE_CRLF.length)
+      // Remove trailing CRLF from body
+      partBody = partBody.replace(/\r?\n?$/, "")
+    } else {
+      headerBlock = part
+      partBody = ""
+    }
 
     const headers = {}
-    const headerLines = headerBlock.split(/\r?\n/)
-    for (const line of headerLines) {
+
+    // Parse headers more carefully to handle binary data
+    let currentPos = 0
+    while (currentPos < headerBlock.length) {
+      // Find next line ending (but be careful with binary data)
+      let lineEnd = headerBlock.indexOf("\r\n", currentPos)
+      if (lineEnd === -1) lineEnd = headerBlock.indexOf("\n", currentPos)
+      if (lineEnd === -1) lineEnd = headerBlock.length
+
+      const line = headerBlock.substring(currentPos, lineEnd)
       const colonIndex = line.indexOf(": ")
+
       if (colonIndex > 0) {
         const name = line.substring(0, colonIndex).toLowerCase()
-        const value = line.substring(colonIndex + 2)
-        headers[name] = value
+        let value = line.substring(colonIndex + 2)
+
+        // Special handling for known binary fields or detected binary data
+        if (name === "owner" || name === "signature") {
+          // These fields contain binary data that may have embedded newlines
+          // We need to read until we find the next header or end of headers
+          let valueStart = currentPos + colonIndex + 2
+
+          // Look ahead to find where this field really ends
+          // The next header will start with a valid header name followed by ": "
+          let searchPos = valueStart
+          let valueEnd = headerBlock.length
+
+          // Look for the next valid header pattern
+          while (searchPos < headerBlock.length) {
+            let nextNewline = headerBlock.indexOf("\n", searchPos)
+            if (nextNewline === -1) break
+
+            // Check if what follows looks like a header
+            let nextLineStart = nextNewline + 1
+            let nextColon = headerBlock.indexOf(":", nextLineStart)
+
+            // Valid header should have colon relatively close to line start
+            if (nextColon > nextLineStart && nextColon < nextLineStart + 50) {
+              // Check if the text before colon looks like a header name (ASCII text)
+              let possibleHeaderName = headerBlock.substring(
+                nextLineStart,
+                nextColon
+              )
+              let looksLikeHeader = /^[a-zA-Z0-9-]+$/.test(possibleHeaderName)
+
+              if (looksLikeHeader) {
+                // Found the next header, value ends at the newline before it
+                valueEnd = nextNewline
+                break
+              }
+            }
+            searchPos = nextNewline + 1
+          }
+
+          // Extract the full value, trimming any trailing whitespace
+          value = headerBlock.substring(valueStart, valueEnd)
+
+          // Remove trailing CR if present (since we found the LF)
+          if (value.endsWith("\r")) {
+            value = value.substring(0, value.length - 1)
+          }
+
+          // Convert to Buffer to preserve binary
+          headers[name] = Buffer.from(value, "binary")
+          currentPos = valueEnd + 1
+        } else {
+          // Regular text field
+          if (isBinaryData(value)) {
+            headers[name] = Buffer.from(value, "binary")
+          } else {
+            headers[name] = value
+          }
+          currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1)
+        }
+      } else {
+        // No colon found, skip this line
+        currentPos = lineEnd + (headerBlock[lineEnd] === "\r" ? 2 : 1)
       }
     }
 
@@ -331,34 +424,48 @@ function parseMultipart(contentType, body) {
 
     let partName
     if (disposition === "inline") {
+      // This is the inline part
       partName = "body"
       bodyKeysList.push("body")
+
+      // Extract all headers from inline part as top-level fields
+      const restHeaders = { ...headers }
+      delete restHeaders["content-disposition"]
+
+      // Add each header from the inline part to the top level of result
+      for (const [key, value] of Object.entries(restHeaders)) {
+        result[key] = value
+      }
+
+      // If there's body content in the inline part, add it as 'body'
+      if (partBody) {
+        result[partName] = partBody
+      }
     } else {
+      // Handle named form-data parts
       const nameMatch = disposition.match(/name="([^"]+)"/)
       partName = nameMatch ? nameMatch[1] : null
       if (partName) {
-        // Add the top-level key for this part
         const topLevelKey = partName.split("/")[0]
         bodyKeysList.push(topLevelKey)
       }
-    }
 
-    if (!partName) continue
+      if (!partName) continue
 
-    const restHeaders = { ...headers }
-    delete restHeaders["content-disposition"]
+      const restHeaders = { ...headers }
+      delete restHeaders["content-disposition"]
 
-    if (Object.keys(restHeaders).length === 0) {
-      result[partName] = partBody
-    } else if (!partBody) {
-      result[partName] = restHeaders
-    } else {
-      result[partName] = { ...restHeaders, body: partBody }
+      if (Object.keys(restHeaders).length === 0) {
+        result[partName] = partBody
+      } else if (!partBody) {
+        result[partName] = restHeaders
+      } else {
+        result[partName] = { ...restHeaders, body: partBody }
+      }
     }
   }
 
   if (bodyKeysList.length > 0) {
-    // Format as structured field list, preserving order and duplicates
     result["body-keys"] = bodyKeysList.map(k => `"${k}"`).join(", ")
   }
 
@@ -656,3 +763,17 @@ export function httpsig_to(tabm) {
     return addContentDigest(result)
   }
 }
+
+/**
+ * Convert structured message to flat format
+ */
+export function structured_to(msg) {
+  return msg
+}
+
+/**
+ * Convert flat format to structured message
+ */
+export function structured_from(msg) {
+  return msg
+}

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.4",
+  "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"
   },