wao 0.33.0 → 0.33.2

package/cjs/hb.js

@@ -10,7 +10,7 @@ var _utils = require("./utils.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("./httpsig2.js");
+var _httpsigUtils = require("./httpsig-utils.js");
 var _excluded = ["path"],
   _excluded2 = ["action", "tags"],
   _excluded3 = ["action", "tags"],
@@ -1084,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, _hbsig.hmacid)(msg.headers);
-              rsaId = (0, _hbsig.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;
     }()
@@ -1348,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();

package/cjs/{httpsig2.js → httpsig-utils.js}

@@ -7,7 +7,6 @@ exports.verifyContentDigest = exports.toBuffer = exports.hasValidSignature = exp
 var _ramda = require("ramda");
 var _hbsig = require("hbsig");
 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."); }
@@ -931,7 +930,7 @@ var from = exports.from = function from(http) {
       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);
+      ret.signer = (0, _hbsig.toAddr)(sigData.params.keyid);
     } catch (e) {}
 
     // Check if @path was in the signed components

package/cjs/workspace/package.json

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

package/esm/hb.js

@@ -1,10 +1,10 @@
 import { createSigner } from "@permaweb/aoconnect"
 import { isEmpty, last, isNotNil, mergeLeft, clone } from "ramda"
 import { toAddr, buildTags, seed } from "./utils.js"
-import { rsaid, hmacid, sign, signer, send as _send } from "hbsig"
+import { rsaid, hmacid, sign, signer, send as _send, commit } from "hbsig"
 import hyper_aos from "./lua/hyper-aos.js"
 import aos_wamr from "./lua/aos_wamr.js"
-import { from } from "./httpsig2.js"
+import { from } from "./httpsig-utils.js"
 
 class HB {
   constructor({
@@ -262,23 +262,7 @@ class HB {
   }
 
   async commit(obj, opts) {
-    const msg = await this.sign(obj, opts)
-    const hmacId = hmacid(msg.headers)
-    const rsaId = rsaid(msg.headers)
-    const committer = this.addr
-    const meta = { alg: "rsa-pss-sha512", "commitment-device": "httpsig@1.0" }
-    const meta2 = { alg: "hmac-sha256", "commitment-device": "httpsig@1.0" }
-    const sigs = {
-      signature: msg.headers.signature,
-      "signature-input": msg.headers["signature-input"],
-    }
-    return {
-      commitments: {
-        [rsaId]: { ...meta, committer, ...sigs },
-        [hmacId]: { ...meta2, ...sigs },
-      },
-      ...obj,
-    }
+    return await commit(obj, { ...opts, signer: this.sign })
   }
 
   async p(path, ...args) {

package/esm/{httpsig2.js → httpsig-utils.js}

@@ -1,7 +1,6 @@
 import { trim } from "ramda"
-import { decodeSigInput } from "hbsig"
+import { toAddr, decodeSigInput } from "hbsig"
 import base64url from "base64url"
-import { toAddr } from "./utils.js"
 
 /**
  * Get multipart boundary from content-type header

package/esm/workspace/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.33.0",
+  "version": "0.33.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -48,7 +48,7 @@
     "express": "^5.1.0",
     "fast-sha256": "^1.3.0",
     "graphql": "^16.10.0",
-    "hbsig": "^0.0.3",
+    "hbsig": "^0.0.6",
     "http-message-signatures": "^1.0.4",
     "lmdb": "^3.2.2",
     "localforage": "^1.10.0",