hbsig 0.2.8 → 0.3.0

package/cjs/commit.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -8,6 +7,8 @@ exports.commit = void 0;
 var _id = require("./id.js");
 var _utils = require("./utils.js");
 var _signerUtils = require("./signer-utils.js");
+var _crypto = _interopRequireDefault(require("crypto"));
+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; }
@@ -16,16 +17,58 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+// Helper to compute SHA-256 content-digest in RFC 9530 format
+var computeContentDigest = function computeContentDigest(body) {
+  var bodyBuffer;
+  if (Buffer.isBuffer(body)) {
+    bodyBuffer = body;
+  } else if (body instanceof Blob) {
+    return null; // Can't compute synchronously for Blob
+  } else if (typeof body === "string") {
+    bodyBuffer = Buffer.from(body, "binary");
+  } else {
+    bodyBuffer = Buffer.from(String(body), "binary");
+  }
+  var hash = _crypto["default"].createHash("sha256").update(bodyBuffer).digest("base64");
+  return "sha-256=:".concat(hash, ":");
+};
+
+// Helper to build ao-types string from an object
+var buildAoTypes = function buildAoTypes(obj) {
+  var types = [];
+  for (var _i = 0, _Object$entries = Object.entries(obj); _i < _Object$entries.length; _i++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
+      key = _Object$entries$_i[0],
+      value = _Object$entries$_i[1];
+    if (typeof value === "number") {
+      types.push("".concat(key, "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
+    } else if (typeof value === "boolean") {
+      types.push("".concat(key, "=\"atom\""));
+    } else if (value === null) {
+      types.push("".concat(key, "=\"atom\""));
+    } else if (_typeof(value) === "symbol") {
+      // Symbols are Erlang atoms
+      types.push("".concat(key, "=\"atom\""));
+    }
+  }
+  return types.length > 0 ? types.join(", ") : null;
+};
+
 // todo: handle @
 var commit = exports.commit = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(obj, opts) {
-    var msg, _yield$verify, components, body, inlineBodyKey, _iterator, _step, v, key, bodyContent, arrayBuffer, hmacId, rsaId, pub, committer, meta, meta2, sigs, committed;
+    var msg, _yield$verify, components, body, inlineBodyKey, NATIVE_BODY_KEYS, isNativeBodyKey, headerLookup, _i2, _Object$entries2, _Object$entries2$_i, k, v, objLookup, _i3, _Object$entries3, _Object$entries3$_i, _k, _v, _iterator, _step, _v2, _key, originalValue, headerValue, bodyContent, arrayBuffer, committedSetLower, bodyKeysLower, _i4, _Object$entries4, _Object$entries4$_i, key, value, aoTypes, rsaId, pub, pubKeyBase64, committer, extractKeyidFromSigInput, keyid, committedFields, bodyFieldName, extractSignature, rawSignature, meta, sigs, committed, _t;
     return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
           _context.n = 1;
           return opts.signer(obj, opts);
@@ -36,73 +79,250 @@ var commit = exports.commit = /*#__PURE__*/function () {
         case 2:
           _yield$verify = _context.v;
           components = _yield$verify.decodedSignatureInput.components;
-          body = {}; // Check for inline-body-key
-          inlineBodyKey = msg.headers["inline-body-key"]; // Build body from components
+          body = {}; // Check for inline-body-key (indicates a field was moved to HTTP body during encoding)
+          inlineBodyKey = msg.headers["inline-body-key"] || msg.headers["ao-body-key"]; // Body field names that HyperBEAM's inline_key() recognizes natively.
+          // For these, normalize_for_encoding() re-derives ao-body-key automatically.
+          // For custom names (e.g., "json"), we must keep ao-body-key in committed list
+          // so HyperBEAM knows which field to inline during verification.
+          NATIVE_BODY_KEYS = new Set(["body", "data"]);
+          isNativeBodyKey = !inlineBodyKey || NATIVE_BODY_KEYS.has(inlineBodyKey); // Build body from committed components.
+          // IMPORTANT: Use original typed values from obj (preserves integers, booleans, etc.)
+          // instead of string values from headers. This is critical because:
+          // 1. HTTP headers are always strings (e.g., quantity: 100 → "100")
+          // 2. We include ao-types to tell HyperBEAM the original types
+          // 3. HyperBEAM applies ao-types BEFORE signature verification
+          // 4. If we send strings, HyperBEAM converts to integers, breaking signature
+          // 5. If we send original integers, HyperBEAM re-encodes them as strings for verification
+          //
+          // Always skip content-digest and inline-body-key (transport artifacts re-derived by HyperBEAM).
+          // Skip ao-body-key only for native body keys (HyperBEAM re-derives it).
+          // Keep ao-body-key for custom body keys (HyperBEAM needs it to find the body field).
+          // Create case-insensitive lookup maps
+          headerLookup = new Map();
+          for (_i2 = 0, _Object$entries2 = Object.entries(msg.headers); _i2 < _Object$entries2.length; _i2++) {
+            _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2), k = _Object$entries2$_i[0], v = _Object$entries2$_i[1];
+            headerLookup.set(k.toLowerCase(), v);
+          }
+          // Case-insensitive lookup for original object values (preserves types)
+          objLookup = new Map();
+          for (_i3 = 0, _Object$entries3 = Object.entries(obj); _i3 < _Object$entries3.length; _i3++) {
+            _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2), _k = _Object$entries3$_i[0], _v = _Object$entries3$_i[1];
+            objLookup.set(_k.toLowerCase(), _v);
+          }
           _iterator = _createForOfIteratorHelper(components);
-          try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              v = _step.value;
-              key = v === "@path" ? "path" : v;
-              body[key] = msg.headers[key];
+          _context.p = 3;
+          _iterator.s();
+        case 4:
+          if ((_step = _iterator.n()).done) {
+            _context.n = 10;
+            break;
+          }
+          _v2 = _step.value;
+          _key = _v2 === "@path" ? "path" : _v2;
+          if (!(_key === "content-length")) {
+            _context.n = 5;
+            break;
+          }
+          return _context.a(3, 9);
+        case 5:
+          if (!(_key === "content-digest")) {
+            _context.n = 6;
+            break;
+          }
+          return _context.a(3, 9);
+        case 6:
+          if (!(_key === "inline-body-key")) {
+            _context.n = 7;
+            break;
+          }
+          return _context.a(3, 9);
+        case 7:
+          if (!(isNativeBodyKey && _key === "ao-body-key")) {
+            _context.n = 8;
+            break;
+          }
+          return _context.a(3, 9);
+        case 8:
+          // Prefer original value from input object (preserves integer/boolean/etc. types)
+          // Fall back to header string value if not found in original object
+          originalValue = objLookup.get(_key.toLowerCase());
+          if (originalValue !== undefined) {
+            body[_key] = originalValue;
+          } else {
+            headerValue = headerLookup.get(_key);
+            if (headerValue !== undefined) {
+              body[_key] = headerValue;
             }
-
-            // Handle body resolution
-          } catch (err) {
-            _iterator.e(err);
-          } finally {
-            _iterator.f();
           }
+        case 9:
+          _context.n = 4;
+          break;
+        case 10:
+          _context.n = 12;
+          break;
+        case 11:
+          _context.p = 11;
+          _t = _context.v;
+          _iterator.e(_t);
+        case 12:
+          _context.p = 12;
+          _iterator.f();
+          return _context.f(12);
+        case 13:
+          // Handle body resolution - restore the inlined field to its AO-Core name
+          bodyContent = null;
           if (!msg.body) {
-            _context.n = 6;
+            _context.n = 17;
             break;
           }
           if (!(msg.body instanceof Blob)) {
-            _context.n = 4;
+            _context.n = 15;
             break;
           }
-          _context.n = 3;
+          _context.n = 14;
           return msg.body.arrayBuffer();
-        case 3:
+        case 14:
           arrayBuffer = _context.v;
           bodyContent = Buffer.from(arrayBuffer);
-          _context.n = 5;
+          _context.n = 16;
           break;
-        case 4:
+        case 15:
           bodyContent = msg.body;
-        case 5:
-          // If inline-body-key is "data", put content in data field
-          if (inlineBodyKey === "data") {
-            body.data = bodyContent;
+        case 16:
+          // Put body content under the original field name (e.g., "data", "json")
+          if (inlineBodyKey) {
+            body[inlineBodyKey] = bodyContent;
           } else {
             body.body = bodyContent;
           }
-        case 6:
-          // Remove inline-body-key from the final body as it's just metadata
-          delete body["inline-body-key"];
-          hmacId = (0, _id.hmacid)(msg.headers);
+        case 17:
+          // Include non-committed fields from the original object as JSON values.
+          // This covers: (1) body-key fields (arrays/objects encoded as multipart,
+          // which can't be included as raw multipart in JSON), and (2) any other
+          // fields excluded from signing. These fields are unsigned but present
+          // so HyperBEAM can parse them directly as JSON types.
+          // Use case-insensitive matching: signing normalizes keys to lowercase,
+          // but the original object may use mixed case (e.g., "To" vs "to").
+          committedSetLower = new Set(components.map(function (v) {
+            return (v === "@path" ? "path" : v).toLowerCase();
+          })); // Also track lowercase keys already in body to prevent duplicates
+          bodyKeysLower = new Set(Object.keys(body).map(function (k) {
+            return k.toLowerCase();
+          }));
+          _i4 = 0, _Object$entries4 = Object.entries(obj);
+        case 18:
+          if (!(_i4 < _Object$entries4.length)) {
+            _context.n = 24;
+            break;
+          }
+          _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2), key = _Object$entries4$_i[0], value = _Object$entries4$_i[1];
+          if (!(key === "method")) {
+            _context.n = 19;
+            break;
+          }
+          return _context.a(3, 23);
+        case 19:
+          if (!committedSetLower.has(key.toLowerCase())) {
+            _context.n = 20;
+            break;
+          }
+          return _context.a(3, 23);
+        case 20:
+          if (!bodyKeysLower.has(key.toLowerCase())) {
+            _context.n = 21;
+            break;
+          }
+          return _context.a(3, 23);
+        case 21:
+          if (!(value === undefined)) {
+            _context.n = 22;
+            break;
+          }
+          return _context.a(3, 23);
+        case 22:
+          body[key] = value;
+          bodyKeysLower.add(key.toLowerCase());
+        case 23:
+          _i4++;
+          _context.n = 18;
+          break;
+        case 24:
+          // Include ao-types so HyperBEAM knows how to convert string values to proper types.
+          // First check if it was set by the signer, otherwise compute it from the original object
+          aoTypes = msg.headers["ao-types"];
+          if (!aoTypes) {
+            // Compute ao-types from the original typed values in obj
+            aoTypes = buildAoTypes(obj);
+          }
+          if (aoTypes) {
+            body["ao-types"] = aoTypes;
+          }
           rsaId = (0, _id.rsaid)(msg.headers);
           pub = (0, _signerUtils.extractPubKey)(msg.headers);
-          committer = (0, _utils.toAddr)(pub.toString("base64"));
+          pubKeyBase64 = pub.toString("base64");
+          committer = (0, _utils.toAddr)(pubKeyBase64); // Extract keyid from signature-input to ensure it matches what was signed
+          // Format: sig-xxx=("field1"...);alg="...";keyid="..."
+          // The keyid may already have a scheme prefix (e.g., "publickey:base64data")
+          extractKeyidFromSigInput = function extractKeyidFromSigInput(sigInput) {
+            if (!sigInput) return null;
+            var match = sigInput.match(/keyid="([^"]+)"/);
+            if (!match) return null;
+            // Return as-is - the keyid already includes the prefix from signing
+            return match[1];
+          };
+          keyid = extractKeyidFromSigInput(msg.headers["signature-input"]) || "publickey:".concat(pubKeyBase64); // Build the list of committed fields.
+          // Always transform HTTPSig transport keys to AO-Core keys:
+          // - Replace content-digest with the body field name (HyperBEAM re-derives content-digest)
+          // - For native body keys ("body", "data"): also remove ao-body-key (HyperBEAM re-derives it)
+          // - For custom body keys (e.g., "json"): keep ao-body-key (HyperBEAM needs it to find the field)
+          committedFields = components.map(function (v) {
+            return v === "@path" ? "path" : v;
+          });
+          if (committedFields.includes("content-digest") && (inlineBodyKey || msg.body)) {
+            bodyFieldName = inlineBodyKey || "body";
+            committedFields = committedFields.filter(function (k) {
+              return k !== "content-digest";
+            });
+            if (!committedFields.includes(bodyFieldName)) {
+              committedFields.push(bodyFieldName);
+            }
+          }
+          if (isNativeBodyKey) {
+            // For native body keys, ao-body-key is a transport artifact - remove it
+            committedFields = committedFields.filter(function (k) {
+              return k !== "ao-body-key";
+            });
+          }
+
+          // Extract just the base64 signature data from the header format "sig-xxx=:base64data:"
+          // HyperBEAM expects raw base64 without colons (uses b64fast:encode/decode)
+          extractSignature = function extractSignature(sigHeader) {
+            if (!sigHeader) return sigHeader;
+            // Match the base64 data between colons after the label
+            var match = sigHeader.match(/=:([^:]+):/);
+            return match ? match[1] : sigHeader;
+          };
+          rawSignature = extractSignature(msg.headers.signature);
           meta = {
+            type: "rsa-pss-sha512",
             alg: "rsa-pss-sha512",
-            "commitment-device": "httpsig@1.0"
-          };
-          meta2 = {
-            alg: "hmac-sha256",
-            "commitment-device": "httpsig@1.0"
+            "commitment-device": "httpsig@1.0",
+            keyid: keyid,
+            committed: committedFields
           };
           sigs = {
-            signature: msg.headers.signature,
+            signature: rawSignature,
             "signature-input": msg.headers["signature-input"]
-          };
+          }; // Only include the RSA commitment - HMAC commitments are created by HyperBEAM
+          // when needed and require the server's HMAC key which we don't have
           committed = _objectSpread({
-            commitments: _defineProperty(_defineProperty({}, rsaId, _objectSpread(_objectSpread({}, meta), {}, {
+            commitments: _defineProperty({}, rsaId, _objectSpread(_objectSpread({}, meta), {}, {
               committer: committer
-            }, sigs)), hmacId, _objectSpread(_objectSpread({}, meta2), sigs))
+            }, sigs))
           }, body);
           return _context.a(2, committed);
       }
-    }, _callee);
+    }, _callee, null, [[3, 11, 12, 13]]);
   }));
   return function commit(_x, _x2) {
     return _ref.apply(this, arguments);

package/cjs/encode-utils.js

@@ -154,21 +154,27 @@ function getValueByPath(obj, path) {
 }
 
 // Get the ao-type for a value
+// Note: dev_codec_structured.erl only supports: integer, float, atom, list, map
+// Do NOT use empty-binary, empty-list, empty-message as they cause binary_to_existing_atom errors
 function getAoType(value) {
   if (typeof value === "boolean" || value === null || value === undefined || _typeof(value) === "symbol") {
     return "atom";
   } else if (typeof value === "number") {
     return Number.isInteger(value) ? "integer" : "float";
   } else if (typeof value === "string" && value.length === 0) {
-    return "empty-binary";
+    // Empty strings become empty binaries naturally - no type annotation needed
+    return null;
   } else if (isBytes(value) && (value.length === 0 || value.byteLength === 0)) {
-    return "empty-binary";
+    // Empty buffers become empty binaries naturally - no type annotation needed
+    return null;
   } else if (Array.isArray(value) && value.length === 0) {
-    return "empty-list";
+    // Use "list" for empty arrays (structured codec compatible)
+    return "list";
   } else if (Array.isArray(value)) {
     return "list";
   } else if (isPojo(value) && Object.keys(value).length === 0) {
-    return "empty-message";
+    // Use "map" for empty objects (structured codec compatible)
+    return "map";
   }
   return null;
 }

package/cjs/encode.js

@@ -48,7 +48,19 @@ function handleSingleEmptyBinaryField(obj) {
     var fieldValue = obj[fieldName];
     if ((0, _encodeUtils.isBytes)(fieldValue) && (fieldValue.length === 0 || fieldValue.byteLength === 0)) {
       var headers = {};
-      headers["ao-types"] = "".concat(fieldName.toLowerCase(), "=\"empty-binary\"");
+      // For 'body' field, we can't send it as a header (reserved name, gets stripped).
+      // Use inline-body-key to signal that body was present but empty.
+      // The modOut function will reconstruct body: <<>> when it sees inline-body-key: body
+      // with no actual body content.
+      if (fieldName.toLowerCase() === "body") {
+        headers["inline-body-key"] = "body";
+        return {
+          headers: headers,
+          body: undefined
+        };
+      }
+      // Include the key with empty value - empty string becomes empty binary in Erlang
+      headers[fieldName.toLowerCase()] = "";
       return {
         headers: headers,
         body: undefined
@@ -261,14 +273,17 @@ function processHeaderFields(obj, bodyKeys, headers, headerTypes) {
         headerTypes.push("".concat(key.toLowerCase(), "=\"").concat(Number.isInteger(value) ? "integer" : "float", "\""));
       } else if (typeof value === "string") {
         if (value.length === 0) {
-          headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+          // Empty string becomes empty binary in Erlang - no ao-types needed
+          headers[key] = "";
         } else if ((0, _encodeUtils.hasNonAscii)(value)) {
           return 1; // continue
         } else {
           headers[key] = value;
         }
       } else if (Array.isArray(value) && value.length === 0) {
-        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-list\""));
+        // Empty array - use list type annotation
+        headers[key] = "";
+        headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
       } else if (Array.isArray(value) && !value.some(function (item) {
         return (0, _encodeUtils.isPojo)(item);
       })) {
@@ -283,9 +298,18 @@ function processHeaderFields(obj, bodyKeys, headers, headerTypes) {
           headerTypes.push("".concat(key.toLowerCase(), "=\"list\""));
         }
       } else if ((0, _encodeUtils.isBytes)(value) && (value.length === 0 || value.byteLength === 0)) {
-        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-binary\""));
+        // Empty buffer becomes empty binary in Erlang - no ao-types needed
+        // For 'body' field, we can't send it as a header (reserved name, gets stripped).
+        // Use inline-body-key to signal that body was present but empty.
+        if (key.toLowerCase() === "body") {
+          headers["inline-body-key"] = "body";
+        } else {
+          headers[key] = "";
+        }
       } else if ((0, _encodeUtils.isPojo)(value) && Object.keys(value).length === 0) {
-        headerTypes.push("".concat(key.toLowerCase(), "=\"empty-message\""));
+        // Empty object - use map type annotation
+        headers[key] = "";
+        headerTypes.push("".concat(key.toLowerCase(), "=\"map\""));
       }
     } else {
       // Fields that need body still get type annotations
@@ -354,18 +378,31 @@ function handleSingleBodyKeyOptimization(_x5, _x6, _x7, _x8) {
 } // Step 11: Sort body keys
 function _handleSingleBodyKeyOptimization() {
   _handleSingleBodyKeyOptimization = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(obj, bodyKeys, headers, headerTypes) {
-    var singleKey, value, contentToHash, bodyContent, bodyBuffer, encoder, encoded, contentDigest, base64;
+    var otherFields, singleKey, value, contentToHash, bodyContent, bodyBuffer, encoder, encoded, contentDigest, base64;
     return _regenerator().w(function (_context5) {
       while (1) switch (_context5.n) {
         case 0:
+          // Skip this optimization if there are other header fields - need full multipart encoding
+          // to be compatible with HyperBEAM scheduler endpoint
+          otherFields = Object.keys(obj).filter(function (k) {
+            return !bodyKeys.includes(k) && !bodyKeys.some(function (bk) {
+              return bk.startsWith("".concat(k, "/"));
+            });
+          });
+          if (!(otherFields.length > 0 && bodyKeys.length === 1)) {
+            _context5.n = 1;
+            break;
+          }
+          return _context5.a(2, null);
+        case 1:
           if (!(bodyKeys.length === 1)) {
-            _context5.n = 2;
+            _context5.n = 3;
             break;
           }
           singleKey = bodyKeys[0];
           value = (0, _encodeUtils.getValueByPath)(obj, singleKey); // Apply optimization for binary data OR strings with newlines
           if (!((0, _encodeUtils.isBytes)(value) && value.length > 0 || typeof value === "string" && value.includes("\n"))) {
-            _context5.n = 2;
+            _context5.n = 3;
             break;
           }
           bodyContent = value;
@@ -379,9 +416,9 @@ function _handleSingleBodyKeyOptimization() {
             contentToHash = encoded.buffer;
             bodyContent = value;
           }
-          _context5.n = 1;
+          _context5.n = 2;
           return (0, _encodeUtils.sha256)(contentToHash);
-        case 1:
+        case 2:
           contentDigest = _context5.v;
           base64 = _base64url["default"].toBase64(_base64url["default"].encode(contentDigest));
           headers["content-digest"] = "sha-256=:".concat(base64, ":");
@@ -395,7 +432,7 @@ function _handleSingleBodyKeyOptimization() {
             headers: headers,
             body: bodyContent
           });
-        case 2:
+        case 3:
           return _context5.a(2, null);
       }
     }, _callee5);
@@ -520,14 +557,16 @@ function processArrayItems(value, indicesWithOwnParts, hasNestedObjectParts, pat
       return;
     }
     if (typeof item === "string" && item === "") {
-      partTypes.push("".concat(index, "=\"empty-binary\""));
+      // Empty strings become empty binaries naturally - no type annotation needed
     } else if ((0, _encodeUtils.isPojo)(item) && Object.keys(item).length === 0) {
-      partTypes.push("".concat(index, "=\"empty-message\""));
+      // Use "map" instead of "empty-message" for structured codec compatibility
+      partTypes.push("".concat(index, "=\"map\""));
     } else if ((0, _encodeUtils.isPojo)(item)) {
       // Non-empty objects are handled elsewhere
     } else if (Array.isArray(item)) {
       if (item.length === 0) {
-        partTypes.push("".concat(index, "=\"empty-list\""));
+        // Use "list" instead of "empty-list" for structured codec compatibility
+        partTypes.push("".concat(index, "=\"list\""));
       } else {
         partTypes.push("".concat(index, "=\"list\""));
         var encodedItems = item.map(function (subItem) {
@@ -591,7 +630,7 @@ function processArrayItems(value, indicesWithOwnParts, hasNestedObjectParts, pat
     } else if ((0, _encodeUtils.isBytes)(item)) {
       var buffer = (0, _encodeUtils.toBuffer)(item);
       if (buffer.length === 0) {
-        partTypes.push("".concat(index, "=\"empty-binary\""));
+        // Empty buffers become empty binaries naturally - no type annotation needed
       } else {
         partTypes.push("".concat(index, "=\"binary\""));
       }
@@ -681,12 +720,13 @@ function processObjectFields(value, bodyKey, sortedBodyKeys) {
   var arrayTypes = [];
 
   // First collect array types
+  // Note: Use "list" for both empty and non-empty arrays for structured codec compatibility
   for (var _i3 = 0, _Object$entries3 = Object.entries(value); _i3 < _Object$entries3.length; _i3++) {
     var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
       k = _Object$entries3$_i[0],
       v = _Object$entries3$_i[1];
     if (Array.isArray(v)) {
-      arrayTypes.push("".concat(k.toLowerCase(), "=\"").concat(v.length === 0 ? "empty-list" : "list", "\""));
+      arrayTypes.push("".concat(k.toLowerCase(), "=\"list\""));
     }
   }
 
@@ -716,11 +756,12 @@ function processObjectFields(value, bodyKey, sortedBodyKeys) {
     } else if (typeof _v === "number") {
       objectTypes.push("".concat(_k.toLowerCase(), "=\"").concat(Number.isInteger(_v) ? "integer" : "float", "\""));
     } else if (typeof _v === "string" && _v.length === 0) {
-      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-binary\""));
+      // Empty strings become empty binaries naturally - no type annotation needed
     } else if ((0, _encodeUtils.isBytes)(_v) && (_v.length === 0 || _v.byteLength === 0)) {
-      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-binary\""));
+      // Empty buffers become empty binaries naturally - no type annotation needed
     } else if ((0, _encodeUtils.isPojo)(_v) && Object.keys(_v).length === 0) {
-      objectTypes.push("".concat(_k.toLowerCase(), "=\"empty-message\""));
+      // Use "map" instead of "empty-message" for structured codec compatibility
+      objectTypes.push("".concat(_k.toLowerCase(), "=\"map\""));
     }
     if (typeof _v === "string") {
       if (_v.length === 0) {
@@ -745,6 +786,12 @@ function processObjectFields(value, bodyKey, sortedBodyKeys) {
         key: _k,
         buffer: buffer
       });
+    } else if (Array.isArray(_v) && _v.length === 0) {
+      // Empty array - include the key so Erlang knows it exists
+      fieldLines.push("".concat(_k, ": "));
+    } else if ((0, _encodeUtils.isPojo)(_v) && Object.keys(_v).length === 0) {
+      // Empty object - include the key so Erlang knows it exists
+      fieldLines.push("".concat(_k, ": "));
     } else if (Array.isArray(_v) && _v.length > 0) {
       var _childPath = "".concat(bodyKey, "/").concat(_k);
       if (!sortedBodyKeys.includes(_childPath)) {

package/cjs/erl_json.js

@@ -8,10 +8,14 @@ exports.erl_json_to = erl_json_to;
 exports.normalize = normalize;
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _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 _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _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 _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 /**
  * Codec for converting between JS objects with Erlang types and annotated JSON
@@ -76,7 +80,12 @@ function normalize(obj) {
     }
     if (binaryMode) {
       // In binary mode, convert strings to buffers
-      return Buffer.from(obj, "utf8");
+      // Use binary/latin1 encoding only if all chars are <= 255 (preserves raw bytes)
+      // Use UTF-8 for strings with chars > 255 (proper multi-byte encoding)
+      var needsUtf8 = _toConsumableArray(obj).some(function (ch) {
+        return ch.codePointAt(0) > 255;
+      });
+      return Buffer.from(obj, needsUtf8 ? "utf8" : "binary");
     } else {
       // In string mode, strings stay as strings
       return obj;

package/cjs/erl_str.js

@@ -38,6 +38,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
  */
 function erl_str_from(str) {
   var binaryMode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  // Handle null/undefined input
+  if (str === null || str === undefined) {
+    return null;
+  }
+
   // Handle the new response format
   if (str.startsWith("#erl_response{")) {
     var rawMatch = str.match(/#erl_response\{raw=([^]*?),formatted=([^]*?)\}$/);