wao 0.15.7 → 0.16.1

package/cjs/adaptor.js

@@ -10,8 +10,6 @@ var _utils = require("./utils.js");
 var _aoconnect = require("./aoconnect.js");
 var _test = require("./test.js");
 var _ramda = require("ramda");
-var _httpMessageSignatures = require("http-message-signatures");
-var _nodeCrypto = require("node:crypto");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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 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; }
@@ -29,7 +27,9 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var 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 verifyMessage = _httpMessageSignatures.httpbis.verifyMessage;
+//import { httpbis, createVerifier } from "http-message-signatures"
+//import { createPublicKey } from "node:crypto"
+//const { verifyMessage } = httpbis
 var Adaptor = /*#__PURE__*/function () {
   function Adaptor(_ref) {
     var hb_url = _ref.hb_url,
@@ -75,21 +75,23 @@ var Adaptor = /*#__PURE__*/function () {
   return _createClass(Adaptor, [{
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req) {
+      var _get = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              _context.t0 = res;
+              _context.next = 3;
               return this[req.device](req);
-            case 2:
-              return _context.abrupt("return", _context.sent);
             case 3:
+              _context.t1 = _context.sent;
+              (0, _context.t0)(_context.t1);
+            case 5:
             case "end":
               return _context.stop();
           }
         }, _callee, this);
       }));
-      function get(_x) {
+      function get(_x, _x2) {
         return _get.apply(this, arguments);
       }
       return get;
@@ -111,7 +113,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee2, this);
       }));
-      function bd(_x2) {
+      function bd(_x3) {
         return _bd.apply(this, arguments);
       }
       return bd;
@@ -133,7 +135,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee3, this);
       }));
-      function ar(_x3) {
+      function ar(_x4) {
         return _ar2.apply(this, arguments);
       }
       return ar;
@@ -155,7 +157,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee4, this);
       }));
-      function su(_x4) {
+      function su(_x5) {
         return _su.apply(this, arguments);
       }
       return su;
@@ -177,7 +179,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee5, this);
       }));
-      function mu(_x5) {
+      function mu(_x6) {
         return _mu.apply(this, arguments);
       }
       return mu;
@@ -199,7 +201,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee6, this);
       }));
-      function cu(_x6) {
+      function cu(_x7) {
         return _cu.apply(this, arguments);
       }
       return cu;
@@ -220,7 +222,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee7);
       }));
-      function bd_get(_x7) {
+      function bd_get(_x8) {
         return _bd_get.apply(this, arguments);
       }
       return bd_get;
@@ -251,7 +253,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee8, this);
       }));
-      function bd_post(_x8) {
+      function bd_post(_x9) {
         return _bd_post.apply(this, arguments);
       }
       return bd_post;
@@ -317,7 +319,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee9, this);
       }));
-      function ar_get(_x9) {
+      function ar_get(_x10) {
         return _ar_get.apply(this, arguments);
       }
       return ar_get;
@@ -353,7 +355,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee10, this);
       }));
-      function ar_post(_x10) {
+      function ar_post(_x11) {
         return _ar_post.apply(this, arguments);
       }
       return ar_post;
@@ -394,7 +396,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee11, this);
       }));
-      function su_get(_x11) {
+      function su_get(_x12) {
         return _su_get.apply(this, arguments);
       }
       return su_get;
@@ -420,7 +422,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee12, this);
       }));
-      function su_post(_x12) {
+      function su_post(_x13) {
         return _su_post.apply(this, arguments);
       }
       return su_post;
@@ -456,7 +458,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee13, this);
       }));
-      function mu_get(_x13) {
+      function mu_get(_x14) {
         return _mu_get.apply(this, arguments);
       }
       return mu_get;
@@ -487,7 +489,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function mu_delete(_x14) {
+      function mu_delete(_x15) {
         return _mu_delete.apply(this, arguments);
       }
       return mu_delete;
@@ -523,7 +525,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function mu_post(_x15) {
+      function mu_post(_x16) {
         return _mu_post.apply(this, arguments);
       }
       return mu_post;
@@ -569,7 +571,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function cu_get(_x16) {
+      function cu_get(_x17) {
         return _cu_get.apply(this, arguments);
       }
       return cu_get;
@@ -605,7 +607,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee17, this);
       }));
-      function cu_post(_x17) {
+      function cu_post(_x18) {
         return _cu_post.apply(this, arguments);
       }
       return cu_post;
@@ -628,7 +630,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee18);
       }));
-      function bad(_x18) {
+      function bad(_x19) {
         return _bad.apply(this, arguments);
       }
       return bad;
@@ -637,7 +639,7 @@ var Adaptor = /*#__PURE__*/function () {
     key: "bd_post_tx",
     value: function () {
       var _bd_post_tx = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(_ref3) {
-        var query, params, body, headers, method, lines, sigs, currentKey, _iterator, _step, line, trimmed, headerMatch, _key, value, input, key, verifier, id, isValid, item, _iterator2, _step2, v, res, _iterator3, _step3, _v, _res2;
+        var query, params, body, headers, method, lines, sigs, currentKey, _iterator, _step, line, trimmed, headerMatch, key, value, id, item, _iterator2, _step2, v, res, _iterator3, _step3, _v, _res2;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
@@ -668,10 +670,10 @@ var Adaptor = /*#__PURE__*/function () {
             case 17:
               headerMatch = trimmed.match(/^([a-zA-Z0-9_-]+):\s*(.*)$/);
               if (headerMatch && !headerMatch[2].includes(": ")) {
-                _key = headerMatch[1];
+                key = headerMatch[1];
                 value = headerMatch[2];
-                sigs[_key] = value;
-                currentKey = _key;
+                sigs[key] = value;
+                currentKey = key;
               } else if (currentKey) sigs[currentKey] += "\n" + line;
             case 19:
               _context19.next = 11;
@@ -690,35 +692,27 @@ var Adaptor = /*#__PURE__*/function () {
             case 29:
               sigs.target = headers.process;
               sigs.slot = headers.slot;
-              input = (0, _utils.parseSignatureInput)(headers["signature-input"]);
-              key = {
-                kty: "RSA",
-                n: input.keyid,
-                e: "AQAB"
-              };
-              verifier = (0, _httpMessageSignatures.createVerifier)((0, _nodeCrypto.createPublicKey)({
-                key: key,
-                format: "jwk"
-              }), "rsa-pss-sha512");
+              /*
+              const input = parseSignatureInput(headers["signature-input"])
+              const key = { kty: "RSA", n: input.keyid, e: "AQAB" }
+              const verifier = createVerifier(
+                createPublicKey({ key, format: "jwk" }),
+                "rsa-pss-sha512"
+              )*/
               id = null;
-              _context19.prev = 35;
-              _context19.next = 38;
-              return verifyMessage({
-                keyLookup: function keyLookup(params) {
-                  return {
-                    verify: verifier
-                  };
+              _context19.prev = 32;
+              /*
+              const isValid = await verifyMessage(
+                { keyLookup: params => ({ verify: verifier }) },
+                {
+                  method: method,
+                  headers: headers,
+                  url: `http://ao.com${headers.path}`,
                 }
-              }, {
-                method: method,
-                headers: headers,
-                url: "http://ao.com".concat(headers.path)
-              });
-            case 38:
-              isValid = _context19.sent;
+              )*/
               item = (0, _utils.toANS104Request)(sigs).item;
               if (!(sigs.slot === "0" || sigs.type === "Process")) {
-                _context19.next = 48;
+                _context19.next = 42;
                 break;
               }
               _iterator2 = _createForOfIteratorHelper(item.tags);
@@ -732,19 +726,19 @@ var Adaptor = /*#__PURE__*/function () {
               } finally {
                 _iterator2.f();
               }
-              _context19.next = 45;
+              _context19.next = 39;
               return this.spawn({
                 http_msg: item,
                 module: sigs.module,
                 scheduler: sigs.scheduler
               });
-            case 45:
+            case 39:
               res = _context19.sent;
-              _context19.next = 54;
+              _context19.next = 48;
               break;
-            case 48:
+            case 42:
               if (!(sigs.type === "Message")) {
-                _context19.next = 54;
+                _context19.next = 48;
                 break;
               }
               _iterator3 = _createForOfIteratorHelper(item.tags);
@@ -758,32 +752,32 @@ var Adaptor = /*#__PURE__*/function () {
               } finally {
                 _iterator3.f();
               }
-              _context19.next = 53;
+              _context19.next = 47;
               return this.message({
                 slot: sigs.slot,
                 http_msg: item,
                 process: sigs.target
               });
-            case 53:
+            case 47:
               _res2 = _context19.sent;
-            case 54:
-              _context19.next = 59;
+            case 48:
+              _context19.next = 53;
               break;
-            case 56:
-              _context19.prev = 56;
-              _context19.t1 = _context19["catch"](35);
+            case 50:
+              _context19.prev = 50;
+              _context19.t1 = _context19["catch"](32);
               console.log(_context19.t1);
-            case 59:
+            case 53:
               return _context19.abrupt("return", {
                 send: "Success"
               });
-            case 60:
+            case 54:
             case "end":
               return _context19.stop();
           }
-        }, _callee19, this, [[9, 23, 26, 29], [35, 56]]);
+        }, _callee19, this, [[9, 23, 26, 29], [32, 50]]);
       }));
-      function bd_post_tx(_x19) {
+      function bd_post_tx(_x20) {
         return _bd_post_tx.apply(this, arguments);
       }
       return bd_post_tx;
@@ -809,7 +803,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee20);
       }));
-      function cu_get_root(_x20) {
+      function cu_get_root(_x21) {
         return _cu_get_root.apply(this, arguments);
       }
       return cu_get_root;
@@ -844,7 +838,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee21, this);
       }));
-      function cu_get_state(_x21) {
+      function cu_get_state(_x22) {
         return _cu_get_state.apply(this, arguments);
       }
       return cu_get_state;
@@ -889,7 +883,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee22, this);
       }));
-      function cu_post_dryrun(_x22) {
+      function cu_post_dryrun(_x23) {
         return _cu_post_dryrun.apply(this, arguments);
       }
       return cu_post_dryrun;
@@ -974,7 +968,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee23, this, [[10, 29, 32, 35]]);
       }));
-      function cu_post_results(_x23) {
+      function cu_post_results(_x24) {
         return _cu_post_results.apply(this, arguments);
       }
       return cu_post_results;
@@ -1050,7 +1044,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee24, this);
       }));
-      function cu_get_result(_x24) {
+      function cu_get_result(_x25) {
         return _cu_get_result.apply(this, arguments);
       }
       return cu_get_result;
@@ -1078,7 +1072,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee25, this);
       }));
-      function su_get_root(_x25) {
+      function su_get_root(_x26) {
         return _su_get_root.apply(this, arguments);
       }
       return su_get_root;
@@ -1104,7 +1098,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee26, this);
       }));
-      function su_get_timestamp(_x26) {
+      function su_get_timestamp(_x27) {
         return _su_get_timestamp.apply(this, arguments);
       }
       return su_get_timestamp;
@@ -1167,7 +1161,7 @@ var Adaptor = /*#__PURE__*/function () {
                     }
                   }, _callee27);
                 }));
-                return function (_x28) {
+                return function (_x29) {
                   return _ref12.apply(this, arguments);
                 };
               }())((0, _ramda.reverse)((_this$mem$env$pid$res2 = (_this$mem$env$pid3 = this.mem.env[pid]) === null || _this$mem$env$pid3 === void 0 ? void 0 : _this$mem$env$pid3.results) !== null && _this$mem$env$pid$res2 !== void 0 ? _this$mem$env$pid$res2 : [])); // need mod
@@ -1185,7 +1179,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee28, this);
       }));
-      function su_get_pid(_x27) {
+      function su_get_pid(_x28) {
         return _su_get_pid.apply(this, arguments);
       }
       return su_get_pid;
@@ -1208,7 +1202,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee29);
       }));
-      function mu_get_root(_x29) {
+      function mu_get_root(_x30) {
         return _mu_get_root.apply(this, arguments);
       }
       return mu_get_root;
@@ -1282,7 +1276,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee30, this);
       }));
-      function mu_post_root(_x30) {
+      function mu_post_root(_x31) {
         return _mu_post_root.apply(this, arguments);
       }
       return mu_post_root;
@@ -1313,7 +1307,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee31, this);
       }));
-      function mu_post_monitor(_x31) {
+      function mu_post_monitor(_x32) {
         return _mu_post_monitor.apply(this, arguments);
       }
       return mu_post_monitor;
@@ -1344,7 +1338,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee32, this);
       }));
-      function mu_delete_monitor(_x32) {
+      function mu_delete_monitor(_x33) {
         return _mu_delete_monitor.apply(this, arguments);
       }
       return mu_delete_monitor;
@@ -1373,7 +1367,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee33, this);
       }));
-      function ar_get_root(_x33) {
+      function ar_get_root(_x34) {
         return _ar_get_root.apply(this, arguments);
       }
       return ar_get_root;
@@ -1396,7 +1390,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee34);
       }));
-      function ar_get_wallet_balance(_x34) {
+      function ar_get_wallet_balance(_x35) {
         return _ar_get_wallet_balance.apply(this, arguments);
       }
       return ar_get_wallet_balance;
@@ -1421,7 +1415,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee35);
       }));
-      function ar_get_mint(_x35) {
+      function ar_get_mint(_x36) {
         return _ar_get_mint.apply(this, arguments);
       }
       return ar_get_mint;
@@ -1445,7 +1439,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee36);
       }));
-      function ar_get_tx_offset(_x36) {
+      function ar_get_tx_offset(_x37) {
         return _ar_get_tx_offset.apply(this, arguments);
       }
       return ar_get_tx_offset;
@@ -1468,7 +1462,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee37, this);
       }));
-      function ar_get_tx_anchor(_x37) {
+      function ar_get_tx_anchor(_x38) {
         return _ar_get_tx_anchor.apply(this, arguments);
       }
       return ar_get_tx_anchor;
@@ -1491,7 +1485,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee38);
       }));
-      function ar_get_mine(_x38) {
+      function ar_get_mine(_x39) {
         return _ar_get_mine.apply(this, arguments);
       }
       return ar_get_mine;
@@ -1527,7 +1521,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee39, this);
       }));
-      function ar_get_id(_x39) {
+      function ar_get_id(_x40) {
         return _ar_get_id.apply(this, arguments);
       }
       return ar_get_id;
@@ -1550,7 +1544,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee40);
       }));
-      function ar_get_price(_x40) {
+      function ar_get_price(_x41) {
         return _ar_get_price.apply(this, arguments);
       }
       return ar_get_price;
@@ -1623,7 +1617,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee41, this, [[1, 19]]);
       }));
-      function ar_post_graphql(_x41) {
+      function ar_post_graphql(_x42) {
         return _ar_post_graphql.apply(this, arguments);
       }
       return ar_post_graphql;
@@ -1691,7 +1685,7 @@ var Adaptor = /*#__PURE__*/function () {
           }
         }, _callee42, this);
       }));
-      function ar_post_id(_x42) {
+      function ar_post_id(_x43) {
         return _ar_post_id.apply(this, arguments);
       }
       return ar_post_id;

package/cjs/server.js

@@ -137,18 +137,20 @@ var Server = /*#__PURE__*/function () {
       });
     }
   }, {
-    key: "send",
-    value: function send(res, data) {
-      if (data.status) res.status(data.status);
-      if (data.error) {
-        res.json({
-          error: data.error
-        });
-      } else if (data.json) {
-        res.json(data.json);
-      } else {
-        res.send(data.send);
-      }
+    key: "res",
+    value: function res(_res) {
+      return function (data) {
+        if (data.status) _res.status(data.status);
+        if (data.error) {
+          _res.json({
+            error: data.error
+          });
+        } else if (data.json) {
+          _res.json(data.json);
+        } else {
+          _res.send(data.send);
+        }
+      };
     }
   }, {
     key: "req",
@@ -180,14 +182,11 @@ var Server = /*#__PURE__*/function () {
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      _context.t0 = _this;
-                      _context.t1 = res;
-                      _context.next = 4;
-                      return _this.adaptor.get(_this.req(req, name.toLowerCase(), path));
-                    case 4:
-                      _context.t2 = _context.sent;
-                      return _context.abrupt("return", _context.t0.send.call(_context.t0, _context.t1, _context.t2));
-                    case 6:
+                      _context.next = 2;
+                      return _this.adaptor.get(_this.req(req, name.toLowerCase(), path), _this.res(res));
+                    case 2:
+                      return _context.abrupt("return", _context.sent);
+                    case 3:
                     case "end":
                       return _context.stop();
                   }

package/cjs/test.js

@@ -16,6 +16,12 @@ Object.defineProperty(exports, "AR", {
     return _tar["default"];
   }
 });
+Object.defineProperty(exports, "Adaptor", {
+  enumerable: true,
+  get: function get() {
+    return _adaptor["default"];
+  }
+});
 Object.defineProperty(exports, "ArMem", {
   enumerable: true,
   get: function get() {
@@ -107,6 +113,7 @@ var _armem = _interopRequireDefault(require("./armem.js"));
 var _utils = require("./utils.js");
 var _helpers = require("./helpers.js");
 var _server = _interopRequireDefault(require("./server.js"));
+var _adaptor = _interopRequireDefault(require("./adaptor.js"));
 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; }
 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); }

package/esm/adaptor.js

@@ -9,9 +9,9 @@ import {
 import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import { keys, map, isNil, reverse, omit } from "ramda"
-import { httpbis, createVerifier } from "http-message-signatures"
-import { createPublicKey } from "node:crypto"
-const { verifyMessage } = httpbis
+//import { httpbis, createVerifier } from "http-message-signatures"
+//import { createPublicKey } from "node:crypto"
+//const { verifyMessage } = httpbis
 
 class Adaptor {
   constructor({ hb_url, aoconnect, log = false, db }) {
@@ -42,8 +42,8 @@ class Adaptor {
     this.mem = mem
     this.gql = new GQL({ mem })
   }
-  async get(req) {
-    return await this[req.device](req)
+  async get(req, res) {
+    res(await this[req.device](req))
   }
   async bd(req) {
     return await this[`bd_${req.method.toLowerCase()}`](req)
@@ -216,15 +216,16 @@ class Adaptor {
     }
     sigs.target = headers.process
     sigs.slot = headers.slot
-
+    /*
     const input = parseSignatureInput(headers["signature-input"])
     const key = { kty: "RSA", n: input.keyid, e: "AQAB" }
     const verifier = createVerifier(
       createPublicKey({ key, format: "jwk" }),
       "rsa-pss-sha512"
-    )
+    )*/
     let id = null
     try {
+      /*
       const isValid = await verifyMessage(
         { keyLookup: params => ({ verify: verifier }) },
         {
@@ -232,7 +233,7 @@ class Adaptor {
           headers: headers,
           url: `http://ao.com${headers.path}`,
         }
-      )
+      )*/
       const item = toANS104Request(sigs).item
 
       if (sigs.slot === "0" || sigs.type === "Process") {

package/esm/index.js

@@ -2,5 +2,4 @@ import AR from "./ar.js"
 import AO from "./ao.js"
 import HB from "./hb.js"
 import GQL from "./gql.js"
-
 export { AO, AR, HB, GQL }

package/esm/server.js

@@ -88,14 +88,16 @@ class Server {
     })
   }
 
-  send(res, data) {
-    if (data.status) res.status(data.status)
-    if (data.error) {
-      res.json({ error: data.error })
-    } else if (data.json) {
-      res.json(data.json)
-    } else {
-      res.send(data.send)
+  res(res) {
+    return data => {
+      if (data.status) res.status(data.status)
+      if (data.error) {
+        res.json({ error: data.error })
+      } else if (data.json) {
+        res.json(data.json)
+      } else {
+        res.send(data.send)
+      }
     }
   }
   req(req, device, path) {
@@ -115,11 +117,13 @@ class Server {
     const port = this.ports[name.toLowerCase()]
     for (const method in paths) {
       for (const path of paths[method]) {
-        app[method](path, async (req, res) =>
-          this.send(
-            res,
-            await this.adaptor.get(this.req(req, name.toLowerCase(), path))
-          )
+        app[method](
+          path,
+          async (req, res) =>
+            await this.adaptor.get(
+              this.req(req, name.toLowerCase(), path),
+              this.res(res)
+            )
         )
       }
     }

package/esm/test.js

@@ -9,6 +9,7 @@ import ArMem from "./armem.js"
 import { dirname } from "./utils.js"
 import { Testnet, Src, setup, ok, fail } from "./helpers.js"
 import Server from "./server.js"
+import Adaptor from "./adaptor.js"
 
 const blueprint = async pkg => {
   return readFileSync(resolve(await dirname(), `lua/${pkg}.lua`), "utf8")
@@ -16,6 +17,7 @@ const blueprint = async pkg => {
 const scheduler = "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA"
 
 export {
+  Adaptor,
   Testnet,
   Server,
   GQL,

package/package.json

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