wao 0.32.2 → 0.33.1

package/cjs/hb.js

@@ -7,11 +7,10 @@ exports["default"] = void 0;
 var _aoconnect = require("@permaweb/aoconnect");
 var _ramda = require("ramda");
 var _utils = require("./utils.js");
-var _signer = require("./signer.js");
-var _send3 = require("./send.js");
+var _hbsig = require("hbsig");
 var _hyperAos = _interopRequireDefault(require("./lua/hyper-aos.js"));
 var _aos_wamr = _interopRequireDefault(require("./lua/aos_wamr.js"));
-var _httpsig = require("./httpsig.js");
+var _httpsigUtils = require("./httpsig-utils.js");
 var _excluded = ["path"],
   _excluded2 = ["action", "tags"],
   _excluded3 = ["action", "tags"],
@@ -38,11 +37,6 @@ 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 seed = function seed(num) {
-  var array = new Array(num);
-  for (var i = 0; i < num; i++) array[i] = Math.floor(Math.random() * 256);
-  return Buffer.from(array).toString("base64");
-};
 var HB = /*#__PURE__*/function () {
   function HB() {
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -66,7 +60,7 @@ var HB = /*#__PURE__*/function () {
             case 0:
               path = encoded.path, msg = _objectWithoutProperties(encoded, _excluded);
               _context.next = 3;
-              return (0, _signer.sign)({
+              return (0, _hbsig.sign)({
                 jwk: this.jwk,
                 msg: msg,
                 path: path,
@@ -91,18 +85,10 @@ var HB = /*#__PURE__*/function () {
       this.jwk = jwk;
       this.signer = (0, _aoconnect.createSigner)(jwk, this.url);
       this.addr = (0, _utils.toAddr)(jwk.n);
-      this.sign = (0, _signer.signer)({
+      this.sign = (0, _hbsig.signer)({
         signer: this.signer,
         url: this.url
       });
-      var _connect = (0, _aoconnect.connect)({
-          MODE: "mainnet",
-          URL: this.url,
-          device: "",
-          signer: this.signer
-        }),
-        request = _connect.request;
-      this._request = request;
     }
   }, {
     key: "setInfo",
@@ -168,7 +154,7 @@ var HB = /*#__PURE__*/function () {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return (0, _send3.send)(msg);
+              return (0, _hbsig.send)(msg);
             case 2:
               return _context4.abrupt("return", _context4.sent);
             case 3:
@@ -888,7 +874,7 @@ var HB = /*#__PURE__*/function () {
               _context25.t0 = this;
               _context25.next = 4;
               return this.commit((0, _ramda.mergeLeft)(tags, {
-                "random-seed": seed(16),
+                "random-seed": (0, _utils.seed)(16),
                 type: "Process",
                 "execution-device": "test-device@1.0",
                 device: "process@1.0",
@@ -1098,43 +1084,24 @@ var HB = /*#__PURE__*/function () {
   }, {
     key: "commit",
     value: function () {
-      var _commit = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee30(obj, opts) {
-        var msg, hmacId, rsaId, committer, meta, meta2, sigs;
+      var _commit2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee30(obj, opts) {
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
               _context30.next = 2;
-              return this.sign(obj, opts);
+              return (0, _hbsig.commit)(obj, _objectSpread(_objectSpread({}, opts), {}, {
+                signer: this.sign
+              }));
             case 2:
-              msg = _context30.sent;
-              hmacId = (0, _utils.hmacid)(msg.headers);
-              rsaId = (0, _utils.rsaid)(msg.headers);
-              committer = this.addr;
-              meta = {
-                alg: "rsa-pss-sha512",
-                "commitment-device": "httpsig@1.0"
-              };
-              meta2 = {
-                alg: "hmac-sha256",
-                "commitment-device": "httpsig@1.0"
-              };
-              sigs = {
-                signature: msg.headers.signature,
-                "signature-input": msg.headers["signature-input"]
-              };
-              return _context30.abrupt("return", _objectSpread({
-                commitments: _defineProperty(_defineProperty({}, rsaId, _objectSpread(_objectSpread({}, meta), {}, {
-                  committer: committer
-                }, sigs)), hmacId, _objectSpread(_objectSpread({}, meta2), sigs))
-              }, obj));
-            case 10:
+              return _context30.abrupt("return", _context30.sent);
+            case 3:
             case "end":
               return _context30.stop();
           }
         }, _callee30, this);
       }));
       function commit(_x18, _x19) {
-        return _commit.apply(this, arguments);
+        return _commit2.apply(this, arguments);
       }
       return commit;
     }()
@@ -1362,7 +1329,7 @@ var HB = /*#__PURE__*/function () {
                 body: _context34.t1,
                 status: _context34.t2
               };
-              return _context34.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsig.from)(http)), http));
+              return _context34.abrupt("return", _objectSpread(_objectSpread({}, (0, _httpsigUtils.from)(http)), http));
             case 19:
             case "end":
               return _context34.stop();