wao 0.29.0 → 0.29.1

package/cjs/httpsig.js

@@ -12,16 +12,16 @@ function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArra
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -70,6 +70,17 @@ var extract = function extract(http, components) {
       extracted["ao-types"] = aoTypes;
     }
   }
+
+  // Extract ao-ids if it's signed
+  var hasAoIds = components.some(function (c) {
+    return c.replace(/"/g, "").toLowerCase() === "ao-ids";
+  });
+  if (hasAoIds) {
+    var aoIds = http.headers["ao-ids"] || http.headers["Ao-Ids"];
+    if (aoIds) {
+      extracted["ao-ids"] = aoIds;
+    }
+  }
   var _iterator2 = _createForOfIteratorHelper(components),
     _step2;
   try {
@@ -172,6 +183,27 @@ var toBuffer = exports.toBuffer = function toBuffer(body) {
   throw new Error("Unsupported body type");
 };
 
+/**
+ * Parse ao-ids dictionary
+ * @param {string} aoIds - The ao-ids header value
+ * @returns {Object} Parsed ID mappings
+ */
+var parseAoIds = function parseAoIds(aoIds) {
+  var result = {};
+
+  // Match pattern: ID="value"
+  var regex = /([A-Za-z0-9_-]{43})="([^"]*)"/g;
+  var match;
+  while ((match = regex.exec(aoIds)) !== null) {
+    var _match = match,
+      _match2 = _slicedToArray(_match, 3),
+      id = _match2[1],
+      value = _match2[2];
+    result[id] = value;
+  }
+  return result;
+};
+
 /**
  * Convert message to JSON with proper type conversions
  * Following the logic from dev_codec_structured, dev_codec_httpsig_conv, and dev_codec_flat
@@ -184,6 +216,14 @@ var _toJSON = function toJSON(msg) {
   }
   var result = _objectSpread({}, msg);
 
+  // Handle ao-ids parsing
+  if (result["ao-ids"]) {
+    var parsedIds = parseAoIds(result["ao-ids"]);
+    // Remove the ao-ids header and merge the parsed IDs
+    delete result["ao-ids"];
+    result = _objectSpread(_objectSpread({}, result), parsedIds);
+  }
+
   // First, handle the multipart body if present
   var contentType = result["content-type"];
   var body = result.body;
@@ -1034,9 +1074,9 @@ var verifyContentDigest = exports.verifyContentDigest = function verifyContentDi
       error: "Invalid content-digest format"
     };
   }
-  var _match = _slicedToArray(match, 3),
-    algorithm = _match[1],
-    expectedDigest = _match[2];
+  var _match3 = _slicedToArray(match, 3),
+    algorithm = _match3[1],
+    expectedDigest = _match3[2];
   try {
     // Convert body to Buffer if needed
     var bodyBuffer = typeof body === "string" ? Buffer.from(body, "utf-8") : body;

package/esm/httpsig.js

@@ -39,6 +39,17 @@ const extract = (http, components) => {
     }
   }
 
+  // Extract ao-ids if it's signed
+  const hasAoIds = components.some(
+    c => c.replace(/"/g, "").toLowerCase() === "ao-ids"
+  )
+  if (hasAoIds) {
+    const aoIds = http.headers["ao-ids"] || http.headers["Ao-Ids"]
+    if (aoIds) {
+      extracted["ao-ids"] = aoIds
+    }
+  }
+
   for (const component of components) {
     const cleanComponent = component.replace(/"/g, "")
 
@@ -139,6 +150,26 @@ export const toBuffer = body => {
   throw new Error("Unsupported body type")
 }
 
+/**
+ * Parse ao-ids dictionary
+ * @param {string} aoIds - The ao-ids header value
+ * @returns {Object} Parsed ID mappings
+ */
+const parseAoIds = aoIds => {
+  const result = {}
+
+  // Match pattern: ID="value"
+  const regex = /([A-Za-z0-9_-]{43})="([^"]*)"/g
+  let match
+
+  while ((match = regex.exec(aoIds)) !== null) {
+    const [, id, value] = match
+    result[id] = value
+  }
+
+  return result
+}
+
 /**
  * Convert message to JSON with proper type conversions
  * Following the logic from dev_codec_structured, dev_codec_httpsig_conv, and dev_codec_flat
@@ -152,6 +183,14 @@ const toJSON = msg => {
 
   let result = { ...msg }
 
+  // Handle ao-ids parsing
+  if (result["ao-ids"]) {
+    const parsedIds = parseAoIds(result["ao-ids"])
+    // Remove the ao-ids header and merge the parsed IDs
+    delete result["ao-ids"]
+    result = { ...result, ...parsedIds }
+  }
+
   // First, handle the multipart body if present
   const contentType = result["content-type"]
   const body = result.body

package/package.json

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