wao 0.29.1 → 0.29.3

package/cjs/devs.js

@@ -5,125 +5,113 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = exports["default"] = {
-  ans104: {
-    name: "ans104@1.0",
-    module: "dev_codec_ans104"
+  // fundamental
+  meta: {
+    name: "meta@1.0",
+    module: "dev_meta"
   },
-  compute: {
-    name: "compute@1.0",
-    module: "dev_cu"
+  json: {
+    name: "json@1.0",
+    module: "dev_codec_json"
   },
-  cache: {
-    name: "cache@1.0",
-    module: "dev_cache"
+  flat: {
+    name: "flat@1.0",
+    module: "dev_codec_flat"
   },
-  cacheviz: {
-    name: "cacheviz@1.0",
-    module: "dev_cacheviz"
+  httpsig: {
+    name: "httpsig@1.0",
+    module: "dev_codec_httpsig"
   },
-  cron: {
-    name: "cron@1.0",
-    module: "dev_cron"
+  structured: {
+    name: "structured@1.0",
+    module: "dev_codec_structured"
   },
-  dedup: {
-    name: "dedup@1.0",
-    module: "dev_dedup"
+  wao: {
+    name: "wao@1.0",
+    module: "dev_wao"
   },
+  // process
+  process: {
+    name: "process@1.0",
+    module: "dev_process"
+  },
+  message: {
+    name: "message@1.0",
+    module: "dev_message"
+  },
+  scheduler: {
+    name: "scheduler@1.0",
+    module: "dev_scheduler"
+  },
+  // legacynet aos
   "delegated-compute": {
     name: "delegated-compute@1.0",
     module: "dev_delegated_compute"
   },
-  faff: {
-    name: "faff@1.0",
-    module: "dev_faff"
-  },
-  flat: {
-    name: "flat@1.0",
-    module: "dev_codec_flat"
-  },
   "genesis-wasm": {
     name: "genesis-wasm@1.0",
     module: "dev_genesis_wasm"
   },
-  greenzone: {
-    name: "greenzone@1.0",
-    module: "dev_green_zone"
-  },
-  httpsig: {
-    name: "httpsig@1.0",
-    module: "dev_codec_httpsig"
+  // hyper aos
+  lua: {
+    name: "lua@5.3a",
+    module: "dev_lua"
   },
-  hyperbuddy: {
-    name: "hyperbuddy@1.0",
-    module: "dev_hyperbuddy"
+  // mainnet aos
+  wasi: {
+    name: "wasi@1.0",
+    module: "dev_wasi"
   },
-  json: {
-    name: "json@1.0",
-    module: "dev_codec_json"
+  "wasm-64": {
+    name: "wasm-64@1.0",
+    module: "dev_wasm"
   },
   "json-iface": {
     name: "json-iface@1.0",
     module: "dev_json_iface"
   },
-  "local-name": {
-    name: "local-name@1.0",
-    module: "dev_local_name"
-  },
-  lookup: {
-    name: "lookup@1.0",
-    module: "dev_lookup"
-  },
-  lua: {
-    name: "lua@5.3a",
-    module: "dev_lua"
-  },
-  manifest: {
-    name: "manifest@1.0",
-    module: "dev_manifest"
+  // process utils
+  "test-device": {
+    name: "test-device@1.0",
+    module: "dev_test"
   },
-  message: {
-    name: "message@1.0",
-    module: "dev_message"
+  patch: {
+    name: "patch@1.0",
+    module: "dev_patch"
   },
-  meta: {
-    name: "meta@1.0",
-    module: "dev_meta"
+  push: {
+    name: "push@1.0",
+    module: "dev_push"
   },
-  monitor: {
-    name: "monitor@1.0",
-    module: "dev_monitor"
+  stack: {
+    name: "stack@1.0",
+    module: "dev_stack"
   },
   multipass: {
     name: "multipass@1.0",
     module: "dev_multipass"
   },
-  name: {
-    name: "name@1.0",
-    module: "dev_name"
-  },
-  "node-process": {
-    name: "node-process@1.0",
-    module: "dev_node_process"
+  // payment
+  faff: {
+    name: "faff@1.0",
+    module: "dev_faff"
   },
   p4: {
     name: "p4@1.0",
     module: "dev_p4"
   },
-  patch: {
-    name: "patch@1.0",
-    module: "dev_patch"
-  },
-  poda: {
-    name: "poda@1.0",
-    module: "dev_poda"
+  "node-process": {
+    name: "node-process@1.0",
+    module: "dev_node_process"
   },
-  process: {
-    name: "process@1.0",
-    module: "dev_process"
+  "simple-pay": {
+    name: "simple-pay@1.0",
+    module: "dev_simple_pay"
   },
-  push: {
-    name: "push@1.0",
-    module: "dev_push"
+  // tested
+  cron: {
+    name: "cron@1.0",
+    module: "dev_cron"
   },
   relay: {
     name: "relay@1.0",
@@ -133,44 +121,68 @@ var _default = exports["default"] = {
     name: "router@1.0",
     module: "dev_router"
   },
-  scheduler: {
-    name: "scheduler@1.0",
-    module: "dev_scheduler"
+  // storage
+  cache: {
+    name: "cache@1.0",
+    module: "dev_cache"
   },
-  "simple-pay": {
-    name: "simple-pay@1.0",
-    module: "dev_simple_pay"
+  "local-name": {
+    name: "local-name@1.0",
+    module: "dev_local_name"
   },
-  snp: {
-    name: "snp@1.0",
-    module: "dev_snp"
+  lookup: {
+    name: "lookup@1.0",
+    module: "dev_lookup"
   },
-  stack: {
-    name: "stack@1.0",
-    module: "dev_stack"
+  name: {
+    name: "name@1.0",
+    module: "dev_name"
   },
-  structured: {
-    name: "structured@1.0",
-    module: "dev_codec_structured"
+  // others
+  compute: {
+    name: "compute@1.0",
+    module: "dev_cu"
   },
-  "test-device": {
-    name: "test-device@1.0",
-    module: "dev_test"
+  dedup: {
+    name: "dedup@1.0",
+    module: "dev_dedup"
+  },
+  manifest: {
+    name: "manifest@1.0",
+    module: "dev_manifest"
+  },
+  monitor: {
+    name: "monitor@1.0",
+    module: "dev_monitor"
+  },
+  // advanced
+  snp: {
+    name: "snp@1.0",
+    module: "dev_snp"
   },
   volume: {
     name: "volume@1.0",
     module: "dev_volume"
   },
-  wasi: {
-    name: "wasi@1.0",
-    module: "dev_wasi"
+  poda: {
+    name: "poda@1.0",
+    module: "dev_poda"
   },
-  "wasm-64": {
-    name: "wasm-64@1.0",
-    module: "dev_wasm"
+  greenzone: {
+    name: "greenzone@1.0",
+    module: "dev_green_zone"
   },
-  wao: {
-    name: "wao@1.0",
-    module: "dev_wao"
+  // misc
+  hyperbuddy: {
+    name: "hyperbuddy@1.0",
+    module: "dev_hyperbuddy"
+  },
+  ans104: {
+    name: "ans104@1.0",
+    module: "dev_codec_ans104"
+  },
+  cacheviz: {
+    name: "cacheviz@1.0",
+    module: "dev_cacheviz"
   }
 };

package/cjs/encode.js

@@ -1162,11 +1162,11 @@ function setFinalHeaders(headers, boundary, contentDigest, byteLength) {
   }
   headers["content-length"] = String(byteLength);
 }
-function encode() {
-  return _encode.apply(this, arguments);
+function enc() {
+  return _enc.apply(this, arguments);
 }
-function _encode() {
-  _encode = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+function _enc() {
+  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
     var obj,
       processedObj,
       emptyResult,
@@ -1334,25 +1334,5 @@ function _encode() {
       }
     }, _callee8);
   }));
-  return _encode.apply(this, arguments);
-}
-function enc(_x11) {
-  return _enc.apply(this, arguments);
-}
-function _enc() {
-  _enc = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(fields) {
-    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
-        case 0:
-          _context9.next = 2;
-          return encode(fields);
-        case 2:
-          return _context9.abrupt("return", _context9.sent);
-        case 3:
-        case "end":
-          return _context9.stop();
-      }
-    }, _callee9);
-  }));
   return _enc.apply(this, arguments);
 }

package/cjs/hb.js

@@ -1561,9 +1561,7 @@ var HB = /*#__PURE__*/function () {
                 body: _context38.t1,
                 status: _context38.t2
               };
-              return _context38.abrupt("return", _objectSpread({
-                out: (0, _httpsig.from)(http)
-              }, http));
+              return _context38.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
             case 19:
             case "end":
               return _context38.stop();

package/cjs/httpsig.js

@@ -7,6 +7,7 @@ exports.verifyContentDigest = exports.toBuffer = exports.hasValidSignature = exp
 var _ramda = require("ramda");
 var _signerUtils = require("./signer-utils.js");
 var _base64url = _interopRequireDefault(require("base64url"));
+var _utils = require("./utils.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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."); }
@@ -389,7 +390,9 @@ var _toJSON = function toJSON(msg) {
       _value2 = _Object$entries7$_i[1];
     // Skip internal keys and headers we don't want in the final result
     if (_key5.startsWith("__")) continue;
-    if (_key5.startsWith("@")) continue; // Skip all @ fields
+
+    // Skip @ fields EXCEPT @path which we want to include
+    if (_key5.startsWith("@") && _key5 !== "@path") continue;
     if (_key5 === "ao-types") continue;
     if (_key5 === "content-type") continue;
     if (_key5 === "content-digest") continue;
@@ -910,12 +913,6 @@ var stringToBuffer = function stringToBuffer(str) {
   }
   return buffer;
 };
-
-/**
- * Original from function - extracts and converts only signed components
- * @param {Object} http - HTTP message object with headers, body, and status
- * @returns {Object|null} Converted signed components or null if not signed
- */
 var from = exports.from = function from(http) {
   var input = http.headers["signature-input"] || http.headers["Signature-Input"];
   if (!input) {
@@ -924,34 +921,71 @@ var from = exports.from = function from(http) {
 
   // Decode signature inputs
   var inputs = (0, _signerUtils.decodeSigInput)(input);
-
   // Process the first signature (following the original logic)
   for (var k in inputs) {
+    var _sigData$params$tag, _sigData$params;
     var sigData = inputs[k];
-
     // Extract only the signed components
     var extractedComponents = extract(http, sigData.components);
+    var ret = {
+      hashpath: (_sigData$params$tag = sigData === null || sigData === void 0 || (_sigData$params = sigData.params) === null || _sigData$params === void 0 ? void 0 : _sigData$params.tag) !== null && _sigData$params$tag !== void 0 ? _sigData$params$tag : null
+    };
+    try {
+      ret.signer = (0, _utils.toAddr)(sigData.params.keyid);
+    } catch (e) {}
 
-    // Check if ao-result header is present and points to body
+    // Check if @path was in the signed components
+    var hasPathComponent = sigData.components.some(function (c) {
+      return c.replace(/"/g, "") === "@path";
+    });
+
+    // If @path is signed, add the path header to extracted components
+    if (hasPathComponent) {
+      extractedComponents["path"] = http.headers.path;
+    }
+
+    // Check if ao-result header is present
     var aoResult = http.headers["ao-result"] || http.headers["Ao-Result"];
-    if (aoResult === "body" && extractedComponents.body) {
+
+    // Handle ao-result pointing to body
+    if (aoResult === "body") {
+      // Handle empty body case
+      if (!extractedComponents.body) {
+        return _objectSpread({
+          out: ""
+        }, ret); // Return empty string for empty body
+      }
       // Check if body is binary data
       if (isBinaryString(extractedComponents.body)) {
-        return stringToBuffer(extractedComponents.body);
+        return _objectSpread({
+          out: stringToBuffer(extractedComponents.body)
+        }, ret);
       }
+      // Return body as-is if it's not binary
+      return _objectSpread({
+        out: extractedComponents.body
+      }, ret);
     }
 
     // Convert the extracted components to JSON format
     var result = _toJSON(extractedComponents);
 
-    // Handle ao-result if present
-    if (aoResult && result[aoResult] !== undefined) {
+    // Handle ao-result if present and pointing to other fields
+    if (aoResult && aoResult !== "body") {
       // Return the value of the key specified by ao-result
-      return result[aoResult];
+      // If the key doesn't exist, return undefined (or could return null/empty string)
+      return _objectSpread({
+        out: result[aoResult] !== undefined ? result[aoResult] : ""
+      }, ret);
     }
-    return result;
+    return _objectSpread({
+      out: result
+    }, ret);
   }
-  return null;
+  return {
+    out: null,
+    hashpath: null
+  };
 };
 
 /**

package/cjs/hyperbeam.js

@@ -340,6 +340,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       })(this.faff).join(", "), " ]");
       var _on = this.p4_lua ? ", on => #{ <<\"request\">> => ".concat(processor, ", <<\"response\">> => ").concat(processor, " }") : this.simplePay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : !(0, _ramda.isNil)(this.faff) ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }" : "";
       var start = "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_faff).concat(_bundler).concat(_on).concat(_p4_non_chargable).concat(_operator).concat(_spp).concat(_devices).concat(_node_processes, "}).");
+      console.log(start);
       return start;
     }
   }, {

package/cjs/send.js

@@ -48,8 +48,6 @@ function _send() {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           fetchImpl = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : fetch;
-          // IMPORTANT: Use the URL from signedMsg.url, NOT from any path header
-          // This ensures we send to the correct URL even if path header is different
           fetchOptions = {
             method: signedMsg.method,
             headers: signedMsg.headers,
@@ -58,8 +56,6 @@ function _send() {
           if (signedMsg.body !== undefined && signedMsg.method !== "GET" && signedMsg.method !== "HEAD") {
             fetchOptions.body = signedMsg.body;
           }
-
-          // Use the URL as provided, ignoring any path header
           _context2.next = 5;
           return fetchImpl(signedMsg.url, fetchOptions);
         case 5:
@@ -94,9 +90,7 @@ function _send() {
             body: _context2.t5,
             status: _context2.t6
           };
-          return _context2.abrupt("return", _objectSpread({
-            out: (0, _httpsig.from)(http)
-          }, http));
+          return _context2.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
         case 23:
         case "end":
           return _context2.stop();