wao 0.36.6 → 0.37.0

package/cjs/hb.js

@@ -11,7 +11,6 @@ var _utils = require("./utils.js");
 var _hbsig = require("hbsig");
 var _hyperAos = _interopRequireDefault(require("./hyper-aos.js"));
 var _aos_wamr = _interopRequireDefault(require("./aos_wamr.js"));
-var _httpsigUtils = require("./httpsig-utils.js");
 var _sdk = require("@ar.io/sdk");
 var _arbundles = require("@dha-team/arbundles");
 var _excluded = ["path"],
@@ -41,8 +40,8 @@ function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.
 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 toMsg = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
-    var _req$headers, _req$text;
-    var msg;
+    var _req$headers;
+    var msg, arrayBuffer;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -50,17 +49,20 @@ var toMsg = /*#__PURE__*/function () {
           req === null || req === void 0 || (_req$headers = req.headers) === null || _req$headers === void 0 || _req$headers.forEach(function (v, k) {
             msg[k] = v;
           });
+          //if (req.body) msg.body = await req.text?.()
           if (!req.body) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
           _context.next = 5;
-          return (_req$text = req.text) === null || _req$text === void 0 ? void 0 : _req$text.call(req);
+          return req.arrayBuffer();
         case 5:
-          msg.body = _context.sent;
-        case 6:
-          return _context.abrupt("return", msg);
+          arrayBuffer = _context.sent;
+          msg.body = typeof Buffer !== "undefined" ? Buffer.from(arrayBuffer) // Node.js
+          : new Uint8Array(arrayBuffer); // Browser
         case 7:
+          return _context.abrupt("return", msg);
+        case 8:
         case "end":
           return _context.stop();
       }
@@ -693,16 +695,11 @@ var HB = /*#__PURE__*/function () {
               });
             case 3:
               res = _context19.sent;
-              _context19.t0 = _hbsig.structured_to;
-              _context19.t1 = _hbsig.httpsig_from;
-              _context19.next = 8;
-              return toMsg(res);
-            case 8:
-              _context19.t2 = _context19.sent;
-              _context19.t3 = (0, _context19.t1)(_context19.t2);
-              res.out = (0, _context19.t0)(_context19.t3);
-              return _context19.abrupt("return", res);
-            case 12:
+              _context19.next = 6;
+              return (0, _hbsig.result)(res);
+            case 6:
+              return _context19.abrupt("return", _context19.sent);
+            case 7:
             case "end":
               return _context19.stop();
           }
@@ -1498,8 +1495,6 @@ var HB = /*#__PURE__*/function () {
           i,
           k,
           response,
-          headers,
-          http,
           _args38 = arguments;
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
@@ -1521,23 +1516,11 @@ var HB = /*#__PURE__*/function () {
               return fetch("".concat(this.url).concat(path).concat(_json).concat(_params));
             case 9:
               response = _context37.sent;
-              headers = {};
-              response.headers.forEach(function (v, k) {
-                return headers[k] = v;
-              });
-              _context37.t0 = headers;
-              _context37.next = 15;
-              return response.text();
-            case 15:
-              _context37.t1 = _context37.sent;
-              _context37.t2 = response.status;
-              http = {
-                headers: _context37.t0,
-                body: _context37.t1,
-                status: _context37.t2
-              };
-              return _context37.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsigUtils.from)(http)), http));
-            case 19:
+              _context37.next = 12;
+              return (0, _hbsig.result)(response);
+            case 12:
+              return _context37.abrupt("return", _context37.sent);
+            case 13:
             case "end":
               return _context37.stop();
           }

package/cjs/workspace/package.json

@@ -9,7 +9,7 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "hbsig": "^0.1.4",
-    "wao": "^0.35.7"
+    "hbsig": "^0.2.0",
+    "wao": "^0.37.0"
   }
 }

package/esm/hb.js

@@ -10,11 +10,10 @@ import {
   signer,
   send as _send,
   commit,
+  result,
 } from "hbsig"
 import hyper_aos from "./hyper-aos.js"
 import aos_wamr from "./aos_wamr.js"
-import { from } from "./httpsig-utils.js"
-
 import { ArweaveSigner } from "@ar.io/sdk"
 import { createData } from "@dha-team/arbundles"
 
@@ -23,7 +22,14 @@ const toMsg = async req => {
   req?.headers?.forEach((v, k) => {
     msg[k] = v
   })
-  if (req.body) msg.body = await req.text?.()
+  //if (req.body) msg.body = await req.text?.()
+  if (req.body) {
+    const arrayBuffer = await req.arrayBuffer()
+    msg.body =
+      typeof Buffer !== "undefined"
+        ? Buffer.from(arrayBuffer) // Node.js
+        : new Uint8Array(arrayBuffer) // Browser
+  }
   return msg
 }
 
@@ -177,8 +183,7 @@ class HB {
       },
       body: item.binary,
     })
-    res.out = structured_to(httpsig_from(await toMsg(res)))
-    return res
+    return await result(res)
   }
   async post104({
     path = "/~process@1.0/schedule",
@@ -393,17 +398,7 @@ class HB {
       }
     }
     const response = await fetch(`${this.url}${path}${_json}${_params}`)
-    let headers = {}
-    response.headers.forEach((v, k) => (headers[k] = v))
-    const http = {
-      headers,
-      body: await response.text(),
-      status: response.status,
-    }
-    return {
-      ...from(http),
-      ...http,
-    }
+    return await result(response)
   }
 
   async postJSON(args, opt = {}) {

package/esm/workspace/package.json

@@ -9,7 +9,7 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "hbsig": "^0.1.4",
-    "wao": "^0.35.7"
+    "hbsig": "^0.2.0",
+    "wao": "^0.37.0"
   }
 }

package/package.json

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

package/cjs/encode-array-item.js

@@ -1,110 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = encodeArrayItem;
-var _encodeUtils = require("./encode-utils.js");
-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); }
-// Helper to generate the correct number of backslashes for a given nesting level
-function getBackslashes(level) {
-  return "\\".repeat(Math.pow(2, level) - 1);
-}
-
-// Helper to encode primitive values at a specific nesting level
-function encodePrimitiveAtLevel(value, level) {
-  var bs = getBackslashes(level);
-  if (typeof value === "number") {
-    if (Number.isInteger(value)) {
-      return "".concat(bs, "\"(ao-type-integer) ").concat(value).concat(bs, "\"");
-    } else {
-      return "".concat(bs, "\"(ao-type-float) ").concat((0, _encodeUtils.formatFloat)(value)).concat(bs, "\"");
-    }
-  } else if (typeof value === "string") {
-    return "".concat(bs, "\"").concat(value).concat(bs, "\"");
-  } else if (value === null) {
-    var innerBs = getBackslashes(level + 1);
-    return "".concat(bs, "\"(ao-type-atom) ").concat(innerBs, "\"null").concat(innerBs, "\"").concat(bs, "\"");
-  } else if (value === undefined) {
-    var _innerBs = getBackslashes(level + 1);
-    return "".concat(bs, "\"(ao-type-atom) ").concat(_innerBs, "\"undefined").concat(_innerBs, "\"").concat(bs, "\"");
-  } else if (_typeof(value) === "symbol") {
-    var desc = value.description || "Symbol.for()";
-    var _innerBs2 = getBackslashes(level + 1);
-    return "".concat(bs, "\"(ao-type-atom) ").concat(_innerBs2, "\"").concat(desc).concat(_innerBs2, "\"").concat(bs, "\"");
-  } else if (typeof value === "boolean") {
-    var _innerBs3 = getBackslashes(level + 1);
-    return "".concat(bs, "\"(ao-type-atom) ").concat(_innerBs3, "\"").concat(value).concat(_innerBs3, "\"").concat(bs, "\"");
-  } else {
-    return "".concat(bs, "\"").concat(String(value)).concat(bs, "\"");
-  }
-}
-
-// Recursive function to handle arrays at any nesting level
-function encodeArrayAtLevel(items, level) {
-  // The original code only goes 3 levels deep for arrays
-  if (level >= 3) {
-    var bs = getBackslashes(level);
-    var stringItems = items.map(function (item) {
-      if (typeof item === "number") {
-        if (Number.isInteger(item)) {
-          return "".concat(bs, "\"(ao-type-integer) ").concat(item).concat(bs, "\"");
-        } else {
-          return "".concat(bs, "\"(ao-type-float) ").concat((0, _encodeUtils.formatFloat)(item)).concat(bs, "\"");
-        }
-      } else if (typeof item === "string") {
-        return "".concat(bs, "\"").concat(item).concat(bs, "\"");
-      } else {
-        return "".concat(bs, "\"").concat(String(item)).concat(bs, "\"");
-      }
-    }).join(", ");
-    return "".concat(getBackslashes(level - 1), "\"(ao-type-list) ").concat(stringItems).concat(getBackslashes(level - 1), "\"");
-  }
-  var encodedItems = items.map(function (item) {
-    if (Array.isArray(item)) {
-      return encodeArrayAtLevel(item, level + 1);
-    } else {
-      return encodePrimitiveAtLevel(item, level);
-    }
-  }).join(", ");
-  if (level === 0) {
-    return "\"(ao-type-list) ".concat(encodedItems, "\"");
-  } else {
-    var _bs = getBackslashes(level - 1);
-    return "".concat(_bs, "\"(ao-type-list) ").concat(encodedItems).concat(_bs, "\"");
-  }
-}
-function encodeArrayItem(item) {
-  if (typeof item === "number") {
-    if (Number.isInteger(item)) {
-      return "\"(ao-type-integer) ".concat(item, "\"");
-    } else {
-      return "\"(ao-type-float) ".concat((0, _encodeUtils.formatFloat)(item), "\"");
-    }
-  } else if (typeof item === "string") {
-    return "\"".concat(item, "\"");
-  } else if (item === null) {
-    return "\"(ao-type-atom) \\\"null\\\"\"";
-  } else if (item === undefined) {
-    return "\"(ao-type-atom) \\\"undefined\\\"\"";
-  } else if (_typeof(item) === "symbol") {
-    var desc = item.description || "Symbol.for()";
-    return "\"(ao-type-atom) \\\"".concat(desc, "\\\"\"");
-  } else if (typeof item === "boolean") {
-    return "\"(ao-type-atom) \\\"".concat(item, "\\\"\"");
-  } else if (Array.isArray(item)) {
-    return encodeArrayAtLevel(item, 1);
-  } else if ((0, _encodeUtils.isBytes)(item)) {
-    var buffer = (0, _encodeUtils.toBuffer)(item);
-    if (buffer.length === 0 || buffer.byteLength === 0) {
-      return "\"\"";
-    }
-    return "\"(ao-type-binary)\"";
-  } else if ((0, _encodeUtils.isPojo)(item)) {
-    var json = JSON.stringify(item);
-    var escaped = json.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    return "\"(ao-type-map) ".concat(escaped, "\"");
-  } else {
-    return "\"".concat(String(item), "\"");
-  }
-}