wao 0.32.0 → 0.32.2

package/cjs/http-message-signatures/structured-header.js

@@ -0,0 +1,129 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.List = exports.Item = exports.Dictionary = void 0;
+exports.parseHeader = parseHeader;
+exports.quoteString = quoteString;
+var _structuredHeaders = require("structured-headers");
+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 _toArray(r) { return _arrayWithHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _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 _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), 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); }
+var Dictionary = exports.Dictionary = /*#__PURE__*/function () {
+  function Dictionary(input) {
+    _classCallCheck(this, Dictionary);
+    this.raw = input;
+    this.parsed = (0, _structuredHeaders.parseDictionary)(input);
+  }
+  return _createClass(Dictionary, [{
+    key: "toString",
+    value: function toString() {
+      return this.serialize();
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return (0, _structuredHeaders.serializeDictionary)(this.parsed);
+    }
+  }, {
+    key: "has",
+    value: function has(key) {
+      return this.parsed.has(key);
+    }
+  }, {
+    key: "get",
+    value: function get(key) {
+      var value = this.parsed.get(key);
+      if (!value) {
+        return value;
+      }
+      if ((0, _structuredHeaders.isInnerList)(value)) {
+        return (0, _structuredHeaders.serializeInnerList)(value);
+      }
+      return (0, _structuredHeaders.serializeItem)(value);
+    }
+  }]);
+}();
+var List = exports.List = /*#__PURE__*/function () {
+  function List(input) {
+    _classCallCheck(this, List);
+    this.raw = input;
+    this.parsed = (0, _structuredHeaders.parseList)(input);
+  }
+  return _createClass(List, [{
+    key: "toString",
+    value: function toString() {
+      return this.serialize();
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return (0, _structuredHeaders.serializeList)(this.parsed);
+    }
+  }]);
+}();
+var Item = exports.Item = /*#__PURE__*/function () {
+  function Item(input) {
+    _classCallCheck(this, Item);
+    this.raw = input;
+    this.parsed = (0, _structuredHeaders.parseItem)(input);
+  }
+  return _createClass(Item, [{
+    key: "toString",
+    value: function toString() {
+      return this.serialize();
+    }
+  }, {
+    key: "serialize",
+    value: function serialize() {
+      return (0, _structuredHeaders.serializeItem)(this.parsed);
+    }
+  }]);
+}();
+function parseHeader(header) {
+  var classes = [List, Dictionary, Item];
+  for (var i = 0; i < classes.length; i++) {
+    try {
+      return new classes[i](header);
+    } catch (e) {
+      // noop
+    }
+  }
+  throw new Error("Unable to parse header as structured field");
+}
+
+/**
+ * This allows consumers of the library to supply field specifications that aren't
+ * strictly "structured fields". Really a string must start with a `"` but that won't
+ * tend to happen in our configs.
+ *
+ * @param {string} input
+ * @returns {string}
+ */
+function quoteString(input) {
+  // if it's not quoted, attempt to quote
+  if (!input.startsWith('"')) {
+    // try to split the structured field
+    var _input$split = input.split(";"),
+      _input$split2 = _toArray(_input$split),
+      name = _input$split2[0],
+      rest = _input$split2.slice(1);
+    // no params, just quote the whole thing
+    if (!rest.length) {
+      return "\"".concat(name, "\"");
+    }
+    // quote the first part and put the rest back as it was
+    return "\"".concat(name, "\";").concat(rest.join(";"));
+  }
+  return input;
+}

package/cjs/send.js

@@ -4,10 +4,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.httpSigName = void 0;
 exports.send = send;
 exports.toHttpSigner = void 0;
 var _base64url = _interopRequireDefault(require("base64url"));
-var _httpMessageSignatures = require("http-message-signatures");
+var _index = require("./http-message-signatures/index.js");
 var _structuredHeaders = require("structured-headers");
 var _httpsig = require("./httpsig.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -29,10 +30,10 @@ function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(
 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); }); }; }
-var augmentHeaders = _httpMessageSignatures.httpbis.augmentHeaders,
-  createSignatureBase = _httpMessageSignatures.httpbis.createSignatureBase,
-  createSigningParameters = _httpMessageSignatures.httpbis.createSigningParameters,
-  formatSignatureBase = _httpMessageSignatures.httpbis.formatSignatureBase;
+var augmentHeaders = _index.httpbis.augmentHeaders,
+  createSignatureBase = _index.httpbis.createSignatureBase,
+  createSigningParameters = _index.httpbis.createSigningParameters,
+  formatSignatureBase = _index.httpbis.formatSignatureBase;
 function send(_x) {
   return _send.apply(this, arguments);
 }
@@ -99,7 +100,7 @@ function _send() {
   }));
   return _send.apply(this, arguments);
 }
-var httpSigName = function httpSigName(address) {
+var httpSigName = exports.httpSigName = function httpSigName(address) {
   var decoded = _base64url["default"].toBuffer(address);
   var hexString = _toConsumableArray(decoded.subarray(1, 9)).map(function (_byte) {
     return _byte.toString(16).padStart(2, "0");
@@ -135,8 +136,11 @@ var toHttpSigner = exports.toHttpSigner = function toHttpSigner(signer) {
                   alg: alg
                 }
               });
+
+              // SORT THE FIELDS HERE to match Erlang's lists:sort(maps:keys(Enc))
+              var sortedFields = _toConsumableArray(fields).sort();
               var signatureBaseArray = createSignatureBase({
-                fields: fields
+                fields: sortedFields
               }, request);
               signatureInput = (0, _structuredHeaders.serializeList)([[signatureBaseArray.map(function (_ref3) {
                 var _ref4 = _slicedToArray(_ref3, 1),

package/cjs/signer-utils.js

@@ -11,7 +11,7 @@ exports.toHttpSigner = void 0;
 exports.verify = verify;
 var _base64url = _interopRequireDefault(require("base64url"));
 var _crypto = _interopRequireDefault(require("crypto"));
-var _httpMessageSignatures = require("http-message-signatures");
+var _index = require("./http-message-signatures/index.js");
 var _structuredHeaders = require("structured-headers");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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; }
@@ -34,11 +34,11 @@ 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; }
-var augmentHeaders = _httpMessageSignatures.httpbis.augmentHeaders,
-  createSignatureBase = _httpMessageSignatures.httpbis.createSignatureBase,
-  createSigningParameters = _httpMessageSignatures.httpbis.createSigningParameters,
-  formatSignatureBase = _httpMessageSignatures.httpbis.formatSignatureBase;
-var verifyMessage = _httpMessageSignatures.httpbis.verifyMessage;
+var augmentHeaders = _index.httpbis.augmentHeaders,
+  createSignatureBase = _index.httpbis.createSignatureBase,
+  createSigningParameters = _index.httpbis.createSigningParameters,
+  formatSignatureBase = _index.httpbis.formatSignatureBase;
+var verifyMessage = _index.httpbis.verifyMessage;
 
 /**
  * Decode signature-input header to extract all components

package/cjs/signer.js

@@ -45,7 +45,7 @@ function _sign2() {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = _ref2.url, path = _ref2.path, encoded = _ref2.msg, jwk = _ref2.jwk, _ref2$signPath = _ref2.signPath, signPath = _ref2$signPath === void 0 ? false : _ref2$signPath;
+          url = _ref2.url, path = _ref2.path, encoded = _ref2.msg, jwk = _ref2.jwk, _ref2$signPath = _ref2.signPath, signPath = _ref2$signPath === void 0 ? true : _ref2$signPath;
           signer = (0, _aoconnect.createSigner)(jwk, url);
           _encoded$body = encoded.body, body = _encoded$body === void 0 ? null : _encoded$body, headers = _objectWithoutProperties(encoded, _excluded2);
           _enc = {
@@ -75,16 +75,17 @@ function _sign(_x2) {
 }
 function _sign3() {
   _sign3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref3) {
-    var encoded, signer, path, url, _ref3$method, method, _ref3$_path, _path, headersObj, body, _url, bodySize, lowercaseHeaders, _i, _Object$entries, _Object$entries$_i, key, value, bodyKeys, signingFields, signedRequest, finalHeaders, _i2, _Object$entries2, _Object$entries2$_i, _key, _value, result;
+    var encoded, signer, path, url, _ref3$method, method, _ref3$_path, _path, headersObj, body, url_path, _url, bodySize, lowercaseHeaders, _i, _Object$entries, _Object$entries$_i, key, value, bodyKeys, isPath, signingFields, signedRequest, finalHeaders, _i2, _Object$entries2, _Object$entries2$_i, _key, _value, result;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          encoded = _ref3.encoded, signer = _ref3.signer, path = _ref3.path, url = _ref3.url, _ref3$method = _ref3.method, method = _ref3$method === void 0 ? "POST" : _ref3$method, _ref3$_path = _ref3._path, _path = _ref3$_path === void 0 ? false : _ref3$_path;
+          encoded = _ref3.encoded, signer = _ref3.signer, path = _ref3.path, url = _ref3.url, _ref3$method = _ref3.method, method = _ref3$method === void 0 ? "POST" : _ref3$method, _ref3$_path = _ref3._path, _path = _ref3$_path === void 0 ? true : _ref3$_path;
           headersObj = encoded ? encoded.headers : {};
           body = encoded ? encoded.body : undefined;
+          url_path = typeof _path === "string" ? _path : path;
           _url = joinUrl({
             url: url,
-            path: path
+            path: url_path
           });
           headersObj["path"] = path;
           if (body && !headersObj["content-length"]) {
@@ -99,17 +100,13 @@ function _sign3() {
           bodyKeys = headersObj["body-keys"] ? headersObj["body-keys"].replace(/"/g, "").split(",").map(function (k) {
             return k.trim();
           }) : [];
+          isPath = false;
           signingFields = Object.keys(lowercaseHeaders).filter(function (key) {
+            if (key === "path") isPath = true;
             return key !== "body-keys" && key !== "path" && !bodyKeys.includes(key);
           });
-          if (_path) signingFields.push("path");
-          /*
-          if (signingFields.length === 0 && !body) {
-            //lowercaseHeaders["content-length"] = "0"
-            //signingFields.push("content-length")
-          }
-          */
-          _context3.next = 13;
+          if (_path !== false && isPath) signingFields.push("@path");
+          _context3.next = 15;
           return (0, _send.toHttpSigner)(signer)({
             request: {
               url: _url,
@@ -118,7 +115,7 @@ function _sign3() {
             },
             fields: signingFields
           });
-        case 13:
+        case 15:
           signedRequest = _context3.sent;
           finalHeaders = {};
           for (_i2 = 0, _Object$entries2 = Object.entries(headersObj); _i2 < _Object$entries2.length; _i2++) {
@@ -137,7 +134,7 @@ function _sign3() {
           };
           if (body) result.body = body;
           return _context3.abrupt("return", result);
-        case 22:
+        case 24:
         case "end":
           return _context3.stop();
       }
@@ -167,7 +164,7 @@ function signer(config) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _ref5 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, _ref5$encoded = _ref5.encoded, _encoded = _ref5$encoded === void 0 ? false : _ref5$encoded, _ref5$path = _ref5.path, _path = _ref5$path === void 0 ? false : _ref5$path;
+            _ref5 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, _ref5$encoded = _ref5.encoded, _encoded = _ref5$encoded === void 0 ? false : _ref5$encoded, _ref5$path = _ref5.path, _path = _ref5$path === void 0 ? true : _ref5$path;
             _fields$path = fields.path, path = _fields$path === void 0 ? "/relay/process" : _fields$path, _fields$method = fields.method, method = _fields$method === void 0 ? "POST" : _fields$method, aoFields = _objectWithoutProperties(fields, _excluded);
             if (!_encoded) {
               _context.next = 6;

package/cjs/workspace/package.json

@@ -9,6 +9,6 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "wao": "^0.32.0"
+    "wao": "^0.32.2"
   }
 }

package/esm/hb.js

@@ -53,6 +53,7 @@ class HB {
     if (!this._info) {
       try {
         this._info = await this.g("/~meta@1.0/info")
+        this.operator = this._info.address
       } catch (e) {}
     }
   }
@@ -81,23 +82,6 @@ class HB {
     return id
   }
 
-  async scheduleAOS({ pid, action = "Eval", tags = {}, data }) {
-    pid ??= this.pid
-    let _tags = mergeLeft(tags, {
-      device: "process@1.0",
-      method: "POST",
-      path: `/${pid}~process@1.0/schedule`,
-      scheduler: this.scheduler,
-      type: "Message",
-      Action: action,
-      target: pid,
-    })
-    if (data) _tags.data = data
-    let res = await this.post(_tags)
-    const slot = res.headers.slot
-    return { slot, res, pid }
-  }
-
   async messageAOS(args) {
     const { slot, pid } = await this.scheduleAOS(args)
     return { slot, outbox: await this.computeAOS({ pid, slot }) }
@@ -126,30 +110,15 @@ class HB {
     return JSON.parse(json.results.json.body)
   }
 
-  async spawn(tags = {}) {
-    const addr = await this.g("/~meta@1.0/info/address")
-    this.scheduler ??= addr
-    const _tags = mergeLeft(tags, {
-      device: "process@1.0",
-      path: "/schedule",
-      scheduler: this.scheduler,
-      "random-seed": seed(16),
-      type: "Process",
-      "execution-device": "test-device@1.0",
-    })
-    const res = await this.post(_tags)
-    return { res, pid: res.headers.process }
-  }
-
   async cacheScript(data, type = "application/lua") {
     if (!this.cache) {
       const { pid } = await this.spawn({})
       this.cache = pid
     }
-    const { slot } = await this.schedule({
+    const { slot } = await this.scheduleFlat({
       data,
       pid: this.cache,
-      "content-type": type,
+      tags: { "content-type": type },
     })
     const msgs = await this.messages({ pid: this.cache, from: slot, limit: 1 })
     return msgs.edges[0].node.message.Id
@@ -157,7 +126,7 @@ class HB {
 
   async cacheBinary(data, type) {
     const res = await this.post({ path: "/~wao@1.0/cache_module", data, type })
-    return res.headers.id
+    return res.out.id
   }
 
   async message(args) {
@@ -167,91 +136,48 @@ class HB {
     return { slot, pid, res }
   }
 
-  async scheduleLegacy({
-    pid,
-    action = "Eval",
-    tags = {},
-    data,
-    scheduler,
-  } = {}) {
-    if (action) tags.Action = action
-    return await this.schedule({ pid, tags, data, scheduler })
+  async scheduleFlat({ pid, tags = {}, data } = {}) {
+    let _tags = mergeLeft(tags, { type: "Message", target: pid })
+    if (data) _tags.data = data
+    let res = await this.post({ path: "/~process@1.0/schedule", body: _tags })
+    return { slot: res.out.slot, res, pid }
   }
 
-  async scheduleLua(...args) {
-    return await this.scheduleLegacy(...args)
+  async scheduleNP({ pid, tags = {}, data } = {}) {
+    if (data) tags.data = data
+    let res = await this.post({
+      path: `/${pid}~node-process@1.0/schedule`,
+      body: await this.commit(tags),
+    })
+    return { slot: res.out.slot, res, pid }
   }
-
   async schedule({ pid, tags = {}, data } = {}) {
-    pid ??= this.pid
-    let _tags = mergeLeft(tags, {
-      method: "POST",
+    let _tags = mergeLeft(tags, { type: "Message", target: pid })
+    if (data) _tags.data = data
+    let res = await this.post({
       path: `/${pid}/schedule`,
-      type: "Message",
-      target: pid,
+      body: await this.commit(_tags, { path: false }),
     })
-    if (data) _tags.data = data
-    let res = await this.post(_tags)
-    return { slot: res.headers.slot, res, pid }
+    return { slot: res.out.slot, res, pid }
   }
 
-  async spawnAOS(image) {
-    const addr = await this.g("/~meta@1.0/info/address")
-    this.scheduler ??= addr
-    image ??= this.image ?? (await this.getImage())
-    const res = await this.post({
-      device: "process@1.0",
-      path: "/schedule",
-      scheduler: this.scheduler,
-      "data-protocol": "ao",
-      variant: "ao.N.1",
-      "scheduler-location": this.scheduler,
-      authority: this.scheduler,
-      "random-seed": seed(16),
-      type: "Process",
-      image,
-      "execution-device": "stack@1.0",
-      "push-device": "push@1.0",
-      "device-stack": [
-        "wasi@1.0",
-        "json-iface@1.0",
-        "wasm-64@1.0",
-        "patch@1.0",
-        "multipass@1.0",
-      ],
-      "output-prefix": "wasm",
-      "patch-from": "/results/outbox",
-      "patch-mode": "patches",
-      "stack-keys": ["init", "compute", "snapshot", "normalize"],
-      passes: 2,
-    })
-    const pid = res.headers.process
-    this.pid ??= pid
-    return { pid, res }
+  async scheduleLua({ action = "Eval", tags = {}, ...rest }) {
+    if (action) tags.Action = action
+    return await this.schedule({ tags, ...rest })
   }
 
   async spawnLua(lua) {
-    const addr = await this.g("/~meta@1.0/info/address")
-    this.scheduler ??= addr
-    lua ??= this.lua ?? (await this.getLua())
-    const res = await this.post({
-      device: "process@1.0",
-      path: "/schedule",
-      scheduler: this.scheduler,
+    await this.setInfo()
+    const tags = {
       "data-protocol": "ao",
       variant: "ao.N.1",
-      "scheduler-location": this.scheduler,
-      authority: this.scheduler,
-      "random-seed": seed(16),
-      type: "Process",
-      module: lua,
+      authority: this.operator,
+      module: this.lua ?? (await this.getLua()),
       "execution-device": "lua@5.3a",
       "push-device": "push@1.0",
       "patch-from": "/results/outbox",
-    })
-    const pid = res.headers.process
-    this.pid ??= pid
-    return { pid, res }
+    }
+    return this.spawn(tags)
   }
 
   async now({ pid, path = "" }) {
@@ -280,29 +206,42 @@ class HB {
     }
     return res
   }
-
+  async spawn(tags = {}) {
+    const res = await this.post({
+      path: "/~process@1.0/schedule",
+      body: await this.commit(
+        mergeLeft(tags, {
+          "random-seed": seed(16),
+          type: "Process",
+          "execution-device": "test-device@1.0",
+          device: "process@1.0",
+          scheduler: this.addr,
+        }),
+        { path: false }
+      ),
+      scheduler: this.operator,
+    })
+    return { res, pid: res.out.process }
+  }
   async spawnLegacy({ module, tags = {}, data } = {}) {
     await this.setInfo()
-    let t = {
-      type: "Process",
+    let t = mergeLeft(tags, {
       "data-protocol": "ao",
       variant: "ao.TN.1",
-      scheduler: this._info.address,
       authority: this._info.address,
-      "scheduler-location": this._info.address,
-      "random-seed": seed(16),
       module: module ?? "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
       device: "process@1.0",
-      "scheduler-device": "scheduler@1.0",
       "execution-device": "stack@1.0",
       "push-device": "push@1.0",
       "device-stack": ["genesis-wasm@1.0", "patch@1.0"],
       "patch-from": "/results/outbox",
-      "stack-keys": ["init", "compute", "snapshot", "normalize"],
-    }
+    })
     if (data) t.data = data
-    tags = mergeLeft(tags, t)
-    return await this.spawn(tags)
+    return await this.spawn(t)
+  }
+  async scheduleLegacy({ action = "Eval", tags = {}, ...rest } = {}) {
+    if (action) tags.Action = action
+    return await this.schedule({ tags, ...rest })
   }
 
   async results({ process, limit, sort = "DESC", from, to } = {}) {
@@ -365,10 +304,11 @@ class HB {
     return (await this.post(..._args))?.out ?? null
   }
 
-  async post(obj, json) {
-    const _json = json ? "/~json@1.0/serialize" : ""
+  async post(obj, opt = {}) {
+    const _json = opt.json ? "/~json@1.0/serialize" : ""
     obj.path += _json
-    return await this.send(await this.sign(obj))
+    const signed = await this.sign(obj, opt)
+    return await this.send(signed)
   }
 
   async g(path, ...args) {
@@ -378,8 +318,8 @@ class HB {
     return (await this.get(..._args))?.out ?? null
   }
 
-  async get({ path, ...params }, json = false) {
-    const _json = json ? "/~json@1.0/serialize" : ""
+  async get({ path, ...params }, opt = {}) {
+    const _json = opt.json ? "/~json@1.0/serialize" : ""
     path ??= "/~message@1.0"
     if (!/^\//.test(path)) path = "/" + path
     let _params = ""
@@ -404,15 +344,44 @@ class HB {
     }
   }
 
-  async postJSON(args) {
-    const res = await this.post(args, true)
+  async postJSON(args, opt = {}) {
+    const res = await this.post(args, { ...opt, json: true })
     return JSON.parse(res.body)
   }
 
-  async getJSON(args) {
-    const res = await this.get(args, true)
+  async getJSON(args, opt = {}) {
+    const res = await this.get(args, { ...opt, json: true })
     return JSON.parse(res.body)
   }
+  async spawnAOS(image) {
+    await this.setInfo()
+    image ??= this.image ?? (await this.getImage())
+    const tags = {
+      "data-protocol": "ao",
+      variant: "ao.N.1",
+      authority: this.operator,
+      image,
+      "execution-device": "stack@1.0",
+      "push-device": "push@1.0",
+      "device-stack": [
+        "wasi@1.0",
+        "json-iface@1.0",
+        "wasm-64@1.0",
+        "patch@1.0",
+        "multipass@1.0",
+      ],
+      "output-prefix": "wasm",
+      "patch-from": "/results/outbox",
+      "patch-mode": "patches",
+      passes: 2,
+    }
+    return await this.spawn(tags)
+  }
+
+  async scheduleAOS({ action = "Eval", tags = {}, ...rest }) {
+    if (action) tags.Action = action
+    return await this.schedule({ tags, ...rest })
+  }
 }
 
 export default HB