wao 0.24.0 → 0.24.2

package/cjs/signer.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createRequest = createRequest;
+exports.extractPublicKeyFromHeaders = extractPublicKeyFromHeaders;
 exports.send = send;
 exports.verify = verify;
 var _base64url = _interopRequireDefault(require("base64url"));
@@ -12,6 +13,7 @@ var _httpMessageSignatures = require("http-message-signatures");
 var _structuredHeaders = require("structured-headers");
 var _excluded = ["path", "method"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _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 _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; }
@@ -160,6 +162,12 @@ function hbEncodeValue(value) {
         // Escape quotes and backslashes
         var escaped = v.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
         return "\"".concat(escaped, "\"");
+      } else if (typeof v === "number") {
+        // Numbers should be encoded as bare items, not strings
+        return String(v);
+      } else if (typeof v === "boolean") {
+        // Booleans as structured field tokens
+        return v ? "?1" : "?0";
       }
       return "\"".concat(String(v), "\"");
     }).join(", ");
@@ -194,9 +202,65 @@ function hbEncodeLift(obj) {
         }, {});
       }
 
-      // first/second lift object
+      // Store the original value for reference
+      var originalValue = value;
+
+      // first/second lift object - handle nested objects
       if (isPojo(value)) {
-        hbEncodeLift(value, storageKey, top);
+        // Check if this object has any nested objects or arrays with objects
+        var hasComplexValues = Object.values(value).some(function (v) {
+          return isPojo(v) || Array.isArray(v) && v.some(function (item) {
+            return isPojo(item);
+          });
+        });
+        if (!hasComplexValues) {
+          // Simple flat object - can be encoded as structured field dictionary
+          var items = [];
+          Object.entries(value).forEach(function (_ref4) {
+            var _ref5 = _slicedToArray(_ref4, 2),
+              k = _ref5[0],
+              v = _ref5[1];
+            var subKey = k.toLowerCase();
+            if (typeof v === "string") {
+              var escaped = v.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+              items.push("".concat(subKey, "=\"").concat(escaped, "\""));
+            } else if (typeof v === "number") {
+              items.push("".concat(subKey, "=").concat(v));
+              if (Number.isInteger(v)) {
+                // Use URL-encoded forward slash separator
+                acc[1]["".concat(key.toLowerCase(), "%2f").concat(subKey)] = "integer";
+              } else {
+                acc[1]["".concat(key.toLowerCase(), "%2f").concat(subKey)] = "float";
+              }
+            } else if (typeof v === "boolean") {
+              items.push("".concat(subKey, "=").concat(v ? "?1" : "?0"));
+            } else if (Array.isArray(v) && !v.some(function (item) {
+              return isPojo(item);
+            })) {
+              // Simple array (no objects) - encode as structured field inner list
+              var listItems = v.map(function (item) {
+                if (typeof item === "string") {
+                  return "\"".concat(item.replace(/\\/g, "\\\\").replace(/"/g, '\\"'), "\"");
+                } else if (typeof item === "number") {
+                  return String(item);
+                } else if (typeof item === "boolean") {
+                  return item ? "?1" : "?0";
+                } else {
+                  return "\"".concat(String(item), "\"");
+                }
+              });
+              items.push("".concat(subKey, "=(").concat(listItems.join(" "), ")"));
+            }
+          });
+          var encodedValue = items.join(", ");
+          acc[0][key] = encodedValue;
+          acc[1][key.toLowerCase()] = "map";
+        } else {
+          // Has nested objects - needs multipart encoding
+          hbEncodeLift(value, storageKey, top);
+          // Add the original object to flattened so it can be processed
+          acc[0][key] = value;
+        }
         return acc;
       }
 
@@ -206,8 +270,11 @@ function hbEncodeLift(obj) {
         type = _hbEncodeValue2[0],
         encoded = _hbEncodeValue2[1];
       if (encoded !== undefined) {
-        if (Buffer.from(String(encoded)).byteLength > MAX_HEADER_LENGTH) {
-          top[storageKey] = String(encoded);
+        // For binary data, check the byte length directly without converting to string
+        var byteLength = isBytes(encoded) ? encoded.byteLength : Buffer.from(String(encoded)).byteLength;
+        if (byteLength > MAX_HEADER_LENGTH) {
+          // Store large values, but preserve binary data as-is
+          top[storageKey] = isBytes(encoded) ? encoded : String(encoded);
         } else {
           // Preserve the original key casing
           var httpKey = key;
@@ -230,13 +297,14 @@ function hbEncodeLift(obj) {
   if (Object.keys(flattened).length === 0) return top;
   if (Object.keys(types).length > 0) {
     // Format as structured fields dictionary
-    var aoTypeItems = Object.entries(types).map(function (_ref4) {
-      var _ref5 = _slicedToArray(_ref4, 2),
-        key = _ref5[0],
-        value = _ref5[1];
-      var safeKey = key.toLowerCase().replace(/[^a-z0-9_-]/g, function (c) {
+    var aoTypeItems = Object.entries(types).map(function (_ref6) {
+      var _ref7 = _slicedToArray(_ref6, 2),
+        key = _ref7[0],
+        value = _ref7[1];
+      // The Erlang side expects keys with %2f for forward slashes
+      var safeKey = key.toLowerCase().replace(/[^a-z0-9_\-.*\/]/g, function (c) {
         return "%" + c.charCodeAt(0).toString(16).padStart(2, "0");
-      });
+      }).replace(/\//g, "%2f"); // Replace forward slashes AFTER other encoding
       return "".concat(safeKey, "=\"").concat(value, "\"");
     });
     aoTypeItems.sort();
@@ -255,13 +323,16 @@ function hbEncodeLift(obj) {
   }
   return top;
 }
-function encodePart(name, _ref6) {
-  var headers = _ref6.headers,
-    body = _ref6.body;
-  var parts = Object.entries(Object.fromEntries(headers)).reduce(function (acc, _ref7) {
-    var _ref8 = _slicedToArray(_ref7, 2),
-      name = _ref8[0],
-      value = _ref8[1];
+function encodePart(name, _ref8) {
+  var _ref8$headers = _ref8.headers,
+    headers = _ref8$headers === void 0 ? {} : _ref8$headers,
+    body = _ref8.body;
+  // Convert headers to a plain object if it's a Headers instance
+  var headerEntries = headers instanceof Headers ? Array.from(headers.entries()) : Object.entries(headers || {});
+  var parts = headerEntries.reduce(function (acc, _ref9) {
+    var _ref10 = _slicedToArray(_ref9, 2),
+      name = _ref10[0],
+      value = _ref10[1];
     acc.push("".concat(name, ": "), value, "\r\n");
     return acc;
   }, ["content-disposition: form-data;name=\"".concat(name, "\"\r\n")]);
@@ -275,7 +346,7 @@ function encode() {
  * Create HTTP signer wrapper
  */
 function _encode() {
-  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
     var obj,
       originalObj,
       flattened,
@@ -283,34 +354,43 @@ function _encode() {
       headerKeys,
       headers,
       body,
+      promoteToBody,
       bodyKey,
+      originalValue,
+      flattenedValue,
       bodyParts,
-      base,
+      allPartsBuffer,
       hash,
       boundary,
-      blobParts,
+      finalParts,
+      _iterator,
+      _step,
+      part,
       finalContent,
       contentDigest,
       base64,
-      _args6 = arguments;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+      _args7 = arguments;
+    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          obj = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          obj = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
           if (!(Object.keys(obj).length === 0)) {
-            _context6.next = 3;
+            _context7.next = 3;
             break;
           }
-          return _context6.abrupt("return");
+          return _context7.abrupt("return", {
+            headers: {},
+            body: undefined
+          });
         case 3:
           // Keep reference to original object for data field
           originalObj = obj;
           flattened = hbEncodeLift(obj);
           bodyKeys = [];
           headerKeys = []; // Process all flattened keys
-          _context6.next = 9;
+          _context7.next = 9;
           return Promise.all(Object.keys(flattened).map(/*#__PURE__*/function () {
-            var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key) {
+            var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(key) {
               var value, subPart, valueStr;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
@@ -334,43 +414,58 @@ function _encode() {
                     flattened[key] = encodePart(key, subPart);
                     return _context5.abrupt("return");
                   case 10:
-                    // Check if this should be a body field
+                    if (!isBytes(value)) {
+                      _context5.next = 14;
+                      break;
+                    }
+                    // Binary data should always go to body
+                    bodyKeys.push(key);
+                    flattened[key] = new Blob(["content-disposition: form-data;name=\"".concat(key, "\"\r\n\r\n"), new Uint8Array(value.buffer || value)]);
+                    return _context5.abrupt("return");
+                  case 14:
                     valueStr = String(value);
-                    _context5.next = 13;
+                    _context5.next = 17;
                     return hasNewline(valueStr);
-                  case 13:
-                    _context5.t1 = _context5.sent;
+                  case 17:
+                    _context5.t2 = _context5.sent;
+                    if (_context5.t2) {
+                      _context5.next = 20;
+                      break;
+                    }
+                    _context5.t2 = key.includes("/");
+                  case 20:
+                    _context5.t1 = _context5.t2;
                     if (_context5.t1) {
-                      _context5.next = 16;
+                      _context5.next = 23;
                       break;
                     }
-                    _context5.t1 = key.includes("/");
-                  case 16:
+                    _context5.t1 = Buffer.from(valueStr).byteLength > MAX_HEADER_LENGTH;
+                  case 23:
                     _context5.t0 = _context5.t1;
                     if (_context5.t0) {
-                      _context5.next = 19;
+                      _context5.next = 26;
                       break;
                     }
-                    _context5.t0 = Buffer.from(valueStr).byteLength > MAX_HEADER_LENGTH;
-                  case 19:
+                    _context5.t0 = isPojo(value) && valueStr === "[object Object]";
+                  case 26:
                     if (!_context5.t0) {
-                      _context5.next = 23;
+                      _context5.next = 30;
                       break;
                     }
                     bodyKeys.push(key);
                     flattened[key] = new Blob(["content-disposition: form-data;name=\"".concat(key, "\"\r\n\r\n"), value]);
                     return _context5.abrupt("return");
-                  case 23:
+                  case 30:
                     // It's a header
                     headerKeys.push(key);
-                  case 24:
+                  case 31:
                   case "end":
                     return _context5.stop();
                 }
               }, _callee5);
             }));
             return function (_x9) {
-              return _ref13.apply(this, arguments);
+              return _ref15.apply(this, arguments);
             };
           }()));
         case 9:
@@ -390,88 +485,133 @@ function _encode() {
             delete headers["body"]; // Remove from headers if it was there
           }
           body = undefined;
+          promoteToBody = true;
           if (!(bodyKeys.length > 0)) {
-            _context6.next = 47;
+            _context7.next = 44;
             break;
           }
-          if (!(bodyKeys.length === 1)) {
-            _context6.next = 21;
+          if (bodyKeys.length === 1) {
+            // If there is only one element, promote it to be the full body
+            bodyKey = bodyKeys[0];
+            originalValue = originalObj[bodyKey];
+            flattenedValue = flattened[bodyKey]; // Only promote if it's not a complex object
+            if (!isPojo(originalValue) || isPojo(originalValue) && typeof flattenedValue === "string") {
+              // For objects that were encoded as structured fields, use the encoded value
+              if ((bodyKey === "body" || bodyKey === "data") && isPojo(originalValue) && typeof flattenedValue === "string") {
+                body = new Blob([flattenedValue]);
+              } else {
+                body = new Blob([originalValue || flattenedValue]);
+              }
+              headers["inline-body-key"] = bodyKey;
+            } else {
+              // Complex object - don't promote, create multipart
+              promoteToBody = false;
+            }
+          }
+          if (!(!promoteToBody || bodyKeys.length > 1)) {
+            _context7.next = 34;
             break;
           }
-          // If there is only one element, promote it to be the full body
-          bodyKey = bodyKeys[0];
-          body = new Blob([originalObj[bodyKey] || flattened[bodyKey]]);
-          headers["inline-body-key"] = bodyKey;
-          _context6.next = 37;
-          break;
-        case 21:
-          _context6.next = 23;
-          return Promise.all(bodyKeys.map(function (name) {
-            if (flattened[name] instanceof Blob) {
-              return flattened[name].arrayBuffer();
-            }
-            // For raw values, create a blob
-            return new Blob([originalObj[name] || ""]).arrayBuffer();
-          }));
+          _context7.next = 20;
+          return Promise.all(bodyKeys.map(/*#__PURE__*/function () {
+            var _ref16 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(name) {
+              var value, _partBlob, partBlob;
+              return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                while (1) switch (_context6.prev = _context6.next) {
+                  case 0:
+                    if (!(flattened[name] instanceof Blob)) {
+                      _context6.next = 2;
+                      break;
+                    }
+                    return _context6.abrupt("return", flattened[name]);
+                  case 2:
+                    // For raw values, we need to create a proper multipart part
+                    value = originalObj[name] || flattened[name] || ""; // Special case: if this is a structured field encoded value, use the flattened value
+                    if (!(name === "body" && isPojo(originalObj[name]) && typeof flattened[name] === "string")) {
+                      _context6.next = 6;
+                      break;
+                    }
+                    _partBlob = new Blob(["content-disposition: form-data;name=\"".concat(name, "\"\r\n\r\n"), flattened[name]]);
+                    return _context6.abrupt("return", _partBlob);
+                  case 6:
+                    partBlob = new Blob(["content-disposition: form-data;name=\"".concat(name, "\"\r\n\r\n"), value]);
+                    return _context6.abrupt("return", partBlob);
+                  case 8:
+                  case "end":
+                    return _context6.stop();
+                }
+              }, _callee6);
+            }));
+            return function (_x10) {
+              return _ref16.apply(this, arguments);
+            };
+          }()));
+        case 20:
+          bodyParts = _context7.sent;
+          _context7.next = 23;
+          return new Blob(bodyParts).arrayBuffer();
         case 23:
-          bodyParts = _context6.sent;
-          base = new Blob(bodyParts.flatMap(function (p, i, arr) {
-            return i < arr.length - 1 ? [p, "\r\n"] : [p];
-          }));
-          _context6.t0 = sha256;
-          _context6.next = 28;
-          return base.arrayBuffer();
-        case 28:
-          _context6.t1 = _context6.sent;
-          _context6.next = 31;
-          return (0, _context6.t0)(_context6.t1);
-        case 31:
-          hash = _context6.sent;
-          boundary = _base64url["default"].encode(Buffer.from(hash));
-          blobParts = bodyParts.flatMap(function (p) {
-            return ["--".concat(boundary, "\r\n"), p, "\r\n"];
-          });
-          blobParts.push("--".concat(boundary, "--"));
+          allPartsBuffer = _context7.sent;
+          _context7.next = 26;
+          return sha256(allPartsBuffer);
+        case 26:
+          hash = _context7.sent;
+          boundary = _base64url["default"].encode(Buffer.from(hash)); // Build the multipart body with proper boundaries
+          finalParts = [];
+          _iterator = _createForOfIteratorHelper(bodyParts);
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              part = _step.value;
+              finalParts.push("--".concat(boundary, "\r\n"));
+              finalParts.push(part);
+              finalParts.push("\r\n");
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          finalParts.push("--".concat(boundary, "--"));
           headers["content-type"] = "multipart/form-data; boundary=\"".concat(boundary, "\"");
-          body = new Blob(blobParts);
-        case 37:
+          body = new Blob(finalParts);
+        case 34:
           if (!body) {
-            _context6.next = 47;
+            _context7.next = 44;
             break;
           }
-          _context6.next = 40;
+          _context7.next = 37;
           return body.arrayBuffer();
-        case 40:
-          finalContent = _context6.sent;
-          _context6.next = 43;
+        case 37:
+          finalContent = _context7.sent;
+          _context7.next = 40;
           return sha256(finalContent);
-        case 43:
-          contentDigest = _context6.sent;
+        case 40:
+          contentDigest = _context7.sent;
           base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest)); // Use lowercase to match what's in the other headers
           headers["content-digest"] = "sha-256=:".concat(base64, ":");
           headers["content-length"] = String(finalContent.byteLength);
-        case 47:
-          return _context6.abrupt("return", {
+        case 44:
+          return _context7.abrupt("return", {
             headers: headers,
             body: body
           });
-        case 48:
+        case 45:
         case "end":
-          return _context6.stop();
+          return _context7.stop();
       }
-    }, _callee6);
+    }, _callee7);
   }));
   return _encode.apply(this, arguments);
 }
 var toHttpSigner = function toHttpSigner(signer) {
   var params = ["alg", "keyid"].sort();
   return /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref9) {
+    var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref11) {
       var request, fields, signatureBase, signatureInput, createCalled, create, result, signatureBuffer, signedHeaders, finalHeaders, _i, _Object$entries, _Object$entries$_i, key, value;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            request = _ref9.request, fields = _ref9.fields;
+            request = _ref11.request, fields = _ref11.fields;
             createCalled = false;
             create = function create(injected) {
               createCalled = true;
@@ -489,9 +629,9 @@ var toHttpSigner = function toHttpSigner(signer) {
               var signatureBaseArray = createSignatureBase({
                 fields: fields
               }, request);
-              signatureInput = (0, _structuredHeaders.serializeList)([[signatureBaseArray.map(function (_ref11) {
-                var _ref12 = _slicedToArray(_ref11, 1),
-                  item = _ref12[0];
+              signatureInput = (0, _structuredHeaders.serializeList)([[signatureBaseArray.map(function (_ref13) {
+                var _ref14 = _slicedToArray(_ref13, 1),
+                  item = _ref14[0];
                 return (0, _structuredHeaders.parseItem)(item);
               }), signingParameters]]);
               signatureBaseArray.push(['"@signature-params"', [signatureInput]]);
@@ -535,7 +675,7 @@ var toHttpSigner = function toHttpSigner(signer) {
       }, _callee);
     }));
     return function (_x3) {
-      return _ref10.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
 };
@@ -589,8 +729,14 @@ function createRequest(config) {
             }
 
             // Get all header keys for signing (lowercase)
-            signingFields = Object.keys(lowercaseHeaders); // Sign the request with lowercase headers
-            _context2.next = 14;
+            signingFields = Object.keys(lowercaseHeaders); // If there are no fields to sign, add at least the content-length
+            if (signingFields.length === 0 && !body) {
+              lowercaseHeaders["content-length"] = "0";
+              signingFields.push("content-length");
+            }
+
+            // Sign the request with lowercase headers
+            _context2.next = 15;
             return toHttpSigner(signer)({
               request: {
                 url: _url,
@@ -599,7 +745,7 @@ function createRequest(config) {
               },
               fields: signingFields
             });
-          case 14:
+          case 15:
             signedRequest = _context2.sent;
             // Build final headers: use original casing for all headers except signature headers
             finalHeaders = {}; // First, add all original headers with their original casing
@@ -622,7 +768,7 @@ function createRequest(config) {
               result.body = body;
             }
             return _context2.abrupt("return", result);
-          case 22:
+          case 23:
           case "end":
             return _context2.stop();
         }
@@ -642,17 +788,17 @@ function getMessageId(_x5) {
   return _getMessageId.apply(this, arguments);
 }
 function _getMessageId() {
-  _getMessageId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(signedMessage) {
+  _getMessageId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(signedMessage) {
     var signatureHeader, match, signature, encoder, data, hashBuffer, hashArray, hashBase64;
-    return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
           // Extract signature from the Signature header
           signatureHeader = signedMessage.headers.Signature || signedMessage.headers.signature;
           match = signatureHeader.match(/Signature:\s*'http-sig-[^:]+:([^']+)'/);
           signature = match ? match[1] : null;
           if (signature) {
-            _context7.next = 5;
+            _context8.next = 5;
             break;
           }
           throw new Error("Could not extract signature from headers");
@@ -660,18 +806,18 @@ function _getMessageId() {
           // Hash the signature to get message ID
           encoder = new TextEncoder();
           data = encoder.encode(signature);
-          _context7.next = 9;
+          _context8.next = 9;
           return _crypto["default"].subtle.digest("SHA-256", data);
         case 9:
-          hashBuffer = _context7.sent;
+          hashBuffer = _context8.sent;
           hashArray = Array.from(new Uint8Array(hashBuffer));
           hashBase64 = btoa(String.fromCharCode.apply(String, hashArray));
-          return _context7.abrupt("return", hashBase64);
+          return _context8.abrupt("return", hashBase64);
         case 13:
         case "end":
-          return _context7.stop();
+          return _context8.stop();
       }
-    }, _callee7);
+    }, _callee8);
   }));
   return _getMessageId.apply(this, arguments);
 }
@@ -684,15 +830,16 @@ function send(_x6) {
  * @returns {string} PEM formatted public key
  */
 function _send() {
-  _send = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(signedMsg) {
+  _send = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(signedMsg) {
     var fetchImpl,
       fetchOptions,
       response,
-      _args8 = arguments;
-    return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-      while (1) switch (_context8.prev = _context8.next) {
+      headers,
+      _args9 = arguments;
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          fetchImpl = _args8.length > 1 && _args8[1] !== undefined ? _args8[1] : fetch;
+          fetchImpl = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : fetch;
           fetchOptions = {
             method: signedMsg.method,
             headers: signedMsg.headers,
@@ -701,39 +848,48 @@ function _send() {
           if (signedMsg.body !== undefined && signedMsg.method !== "GET" && signedMsg.method !== "HEAD") {
             fetchOptions.body = signedMsg.body;
           }
-          _context8.next = 5;
+          _context9.next = 5;
           return fetchImpl(signedMsg.url, fetchOptions);
         case 5:
-          response = _context8.sent;
+          response = _context9.sent;
           if (!(response.status >= 400)) {
-            _context8.next = 14;
+            _context9.next = 14;
             break;
           }
-          _context8.t0 = Error;
-          _context8.t1 = "".concat(response.status, ": ");
-          _context8.next = 11;
+          _context9.t0 = Error;
+          _context9.t1 = "".concat(response.status, ": ");
+          _context9.next = 11;
           return response.text();
         case 11:
-          _context8.t2 = _context8.sent;
-          _context8.t3 = _context8.t1.concat.call(_context8.t1, _context8.t2);
-          throw new _context8.t0(_context8.t3);
+          _context9.t2 = _context9.sent;
+          _context9.t3 = _context9.t1.concat.call(_context9.t1, _context9.t2);
+          throw new _context9.t0(_context9.t3);
         case 14:
-          _context8.t4 = response.headers;
-          _context8.next = 17;
+          // Convert Headers object to plain object
+          headers = {};
+          if (response.headers && typeof response.headers.forEach === "function") {
+            response.headers.forEach(function (v, k) {
+              return headers[k] = v;
+            });
+          } else headers = response.headers;
+          _context9.t4 = response;
+          _context9.t5 = headers;
+          _context9.next = 20;
           return response.text();
-        case 17:
-          _context8.t5 = _context8.sent;
-          _context8.t6 = response.status;
-          return _context8.abrupt("return", {
-            headers: _context8.t4,
-            body: _context8.t5,
-            status: _context8.t6
-          });
         case 20:
+          _context9.t6 = _context9.sent;
+          _context9.t7 = response.status;
+          return _context9.abrupt("return", {
+            response: _context9.t4,
+            headers: _context9.t5,
+            body: _context9.t6,
+            status: _context9.t7
+          });
+        case 23:
         case "end":
-          return _context8.stop();
+          return _context9.stop();
       }
-    }, _callee8);
+    }, _callee9);
   }));
   return _send.apply(this, arguments);
 }
@@ -818,53 +974,53 @@ function verify(_x7, _x8) {
  * @returns {Buffer|null} The public key buffer or null
  */
 function _verify() {
-  _verify = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(signedMessage, publicKey) {
+  _verify = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(signedMessage, publicKey) {
     var url, method, headers, body, keyLookup, pem, _signatureName, extractedKey, _pem, _request2, signatureName, extractedPublicKey, signatureInputHeader, algMatch, algorithm, verified, verificationError, verificationResult;
-    return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-      while (1) switch (_context13.prev = _context13.next) {
+    return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+      while (1) switch (_context14.prev = _context14.next) {
         case 0:
-          _context13.prev = 0;
+          _context14.prev = 0;
           url = signedMessage.url, method = signedMessage.method, headers = signedMessage.headers, body = signedMessage.body; // Determine which public key to use
           if (!publicKey) {
-            _context13.next = 7;
+            _context14.next = 7;
             break;
           }
           // Use provided public key
           pem = typeof publicKey === "string" ? publicKey : jwkModulusToPem(publicKey);
           keyLookup = /*#__PURE__*/function () {
-            var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(keyId) {
-              return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-                while (1) switch (_context10.prev = _context10.next) {
+            var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(keyId) {
+              return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                while (1) switch (_context11.prev = _context11.next) {
                   case 0:
-                    return _context10.abrupt("return", {
+                    return _context11.abrupt("return", {
                       id: keyId,
                       algs: ["rsa-pss-sha512", "rsa-pss-sha256", "rsa-v1_5-sha256"],
                       verify: function () {
-                        var _verify2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(data, signature, parameters) {
+                        var _verify2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(data, signature, parameters) {
                           var verifier;
-                          return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-                            while (1) switch (_context9.prev = _context9.next) {
+                          return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                            while (1) switch (_context10.prev = _context10.next) {
                               case 0:
                                 verifier = _crypto["default"].createVerify("RSA-SHA".concat(parameters.alg.includes("512") ? "512" : "256"));
                                 verifier.update(data);
                                 if (!parameters.alg.startsWith("rsa-pss")) {
-                                  _context9.next = 6;
+                                  _context10.next = 6;
                                   break;
                                 }
-                                return _context9.abrupt("return", verifier.verify({
+                                return _context10.abrupt("return", verifier.verify({
                                   key: pem,
                                   padding: _crypto["default"].constants.RSA_PKCS1_PSS_PADDING,
                                   saltLength: _crypto["default"].constants.RSA_PSS_SALTLEN_DIGEST
                                 }, signature));
                               case 6:
-                                return _context9.abrupt("return", verifier.verify(pem, signature));
+                                return _context10.abrupt("return", verifier.verify(pem, signature));
                               case 7:
                               case "end":
-                                return _context9.stop();
+                                return _context10.stop();
                             }
-                          }, _callee9);
+                          }, _callee10);
                         }));
-                        function verify(_x11, _x12, _x13) {
+                        function verify(_x12, _x13, _x14) {
                           return _verify2.apply(this, arguments);
                         }
                         return verify;
@@ -872,45 +1028,45 @@ function _verify() {
                     });
                   case 1:
                   case "end":
-                    return _context10.stop();
+                    return _context11.stop();
                 }
-              }, _callee10);
+              }, _callee11);
             }));
-            return function keyLookup(_x10) {
-              return _ref14.apply(this, arguments);
+            return function keyLookup(_x11) {
+              return _ref17.apply(this, arguments);
             };
           }();
-          _context13.next = 13;
+          _context14.next = 13;
           break;
         case 7:
           // Extract public key from keyid
           _signatureName = extractSignatureName(headers);
           extractedKey = extractPublicKeyFromHeaders(headers, _signatureName);
           if (extractedKey) {
-            _context13.next = 11;
+            _context14.next = 11;
             break;
           }
-          return _context13.abrupt("return", {
+          return _context14.abrupt("return", {
             valid: false,
             error: "No public key provided and none found in signature"
           });
         case 11:
           _pem = jwkModulusToPem(extractedKey);
           keyLookup = /*#__PURE__*/function () {
-            var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(keyId) {
-              return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-                while (1) switch (_context12.prev = _context12.next) {
+            var _ref18 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(keyId) {
+              return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+                while (1) switch (_context13.prev = _context13.next) {
                   case 0:
-                    return _context12.abrupt("return", {
+                    return _context13.abrupt("return", {
                       id: keyId,
                       algs: ["rsa-pss-sha512", "rsa-pss-sha256", "rsa-v1_5-sha256"],
                       verify: function () {
-                        var _verify3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(data, signature, parameters) {
+                        var _verify3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data, signature, parameters) {
                           var verifier, _verified;
-                          return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-                            while (1) switch (_context11.prev = _context11.next) {
+                          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                            while (1) switch (_context12.prev = _context12.next) {
                               case 0:
-                                _context11.prev = 0;
+                                _context12.prev = 0;
                                 verifier = _crypto["default"].createVerify("RSA-SHA".concat(parameters.alg.includes("512") ? "512" : "256"));
                                 verifier.update(data);
                                 if (parameters.alg.startsWith("rsa-pss")) {
@@ -922,19 +1078,19 @@ function _verify() {
                                 } else {
                                   _verified = verifier.verify(_pem, signature);
                                 }
-                                return _context11.abrupt("return", _verified);
+                                return _context12.abrupt("return", _verified);
                               case 7:
-                                _context11.prev = 7;
-                                _context11.t0 = _context11["catch"](0);
-                                console.error("Verification error:", _context11.t0);
-                                return _context11.abrupt("return", false);
+                                _context12.prev = 7;
+                                _context12.t0 = _context12["catch"](0);
+                                console.error("Verification error:", _context12.t0);
+                                return _context12.abrupt("return", false);
                               case 11:
                               case "end":
-                                return _context11.stop();
+                                return _context12.stop();
                             }
-                          }, _callee11, null, [[0, 7]]);
+                          }, _callee12, null, [[0, 7]]);
                         }));
-                        function verify(_x15, _x16, _x17) {
+                        function verify(_x16, _x17, _x18) {
                           return _verify3.apply(this, arguments);
                         }
                         return verify;
@@ -942,12 +1098,12 @@ function _verify() {
                     });
                   case 1:
                   case "end":
-                    return _context12.stop();
+                    return _context13.stop();
                 }
-              }, _callee12);
+              }, _callee13);
             }));
-            return function keyLookup(_x14) {
-              return _ref15.apply(this, arguments);
+            return function keyLookup(_x15) {
+              return _ref18.apply(this, arguments);
             };
           }();
         case 13:
@@ -964,26 +1120,26 @@ function _verify() {
           algorithm = algMatch ? algMatch[1] : undefined; // Verify using the library
           verified = false;
           verificationError = null;
-          _context13.prev = 21;
-          _context13.next = 24;
+          _context14.prev = 21;
+          _context14.next = 24;
           return verifyMessage({
             keyLookup: keyLookup,
             requiredFields: [] // Don't require specific fields
           }, _request2);
         case 24:
-          verificationResult = _context13.sent;
+          verificationResult = _context14.sent;
           // If we get here without throwing, verification succeeded
           verified = true;
-          _context13.next = 32;
+          _context14.next = 32;
           break;
         case 28:
-          _context13.prev = 28;
-          _context13.t0 = _context13["catch"](21);
+          _context14.prev = 28;
+          _context14.t0 = _context14["catch"](21);
           // Verification failed
-          verificationError = _context13.t0.message;
+          verificationError = _context14.t0.message;
           verified = false;
         case 32:
-          return _context13.abrupt("return", _objectSpread({
+          return _context14.abrupt("return", _objectSpread({
             valid: true,
             // The signature format is valid
             verified: verified,
@@ -996,17 +1152,17 @@ function _verify() {
             error: verificationError
           }));
         case 35:
-          _context13.prev = 35;
-          _context13.t1 = _context13["catch"](0);
-          return _context13.abrupt("return", {
+          _context14.prev = 35;
+          _context14.t1 = _context14["catch"](0);
+          return _context14.abrupt("return", {
             valid: false,
-            error: _context13.t1.message
+            error: _context14.t1.message
           });
         case 38:
         case "end":
-          return _context13.stop();
+          return _context14.stop();
       }
-    }, _callee13, null, [[0, 35], [21, 28]]);
+    }, _callee14, null, [[0, 35], [21, 28]]);
   }));
   return _verify.apply(this, arguments);
 }