hbsig 0.0.2 → 0.0.4

package/cjs/commit.js

@@ -0,0 +1,57 @@
+"use strict";
+
+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); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.commit = void 0;
+var _id = require("./id.js");
+var _utils = require("./utils.js");
+var _signerUtils = require("./signer-utils.js");
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, 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); }
+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); }
+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 commit = exports.commit = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(obj, opts) {
+    var msg, hmacId, rsaId, pub, committer, meta, meta2, sigs;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          _context.n = 1;
+          return opts.signer(obj, opts);
+        case 1:
+          msg = _context.v;
+          hmacId = (0, _id.hmacid)(msg.headers);
+          rsaId = (0, _id.rsaid)(msg.headers);
+          pub = (0, _signerUtils.extractPubKey)(msg.headers);
+          committer = (0, _utils.toAddr)(pub.toString("base64"));
+          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 _context.a(2, _objectSpread({
+            commitments: _defineProperty(_defineProperty({}, rsaId, _objectSpread(_objectSpread({}, meta), {}, {
+              committer: committer
+            }, sigs)), hmacId, _objectSpread(_objectSpread({}, meta2), sigs))
+          }, obj));
+      }
+    }, _callee);
+  }));
+  return function commit(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/cjs/index.js

@@ -9,6 +9,24 @@ Object.defineProperty(exports, "base", {
     return _id.base;
   }
 });
+Object.defineProperty(exports, "createSigner", {
+  enumerable: true,
+  get: function get() {
+    return _signer.createSigner;
+  }
+});
+Object.defineProperty(exports, "decodeSigInput", {
+  enumerable: true,
+  get: function get() {
+    return _signerUtils.decodeSigInput;
+  }
+});
+Object.defineProperty(exports, "extractPublicKeyFromHeaders", {
+  enumerable: true,
+  get: function get() {
+    return _signerUtils.extractPublicKeyFromHeaders;
+  }
+});
 Object.defineProperty(exports, "hashpath", {
   enumerable: true,
   get: function get() {
@@ -60,4 +78,5 @@ Object.defineProperty(exports, "toAddr", {
 var _id = require("./id.js");
 var _utils = require("./utils.js");
 var _signer = require("./signer.js");
-var _send = require("./send.js");
+var _send = require("./send.js");
+var _signerUtils = require("./signer-utils.js");

package/cjs/signer-utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.decodeSigInput = decodeSigInput;
-exports.extractPublicKeyFromHeaders = extractPublicKeyFromHeaders;
+exports.extractPubKey = extractPubKey;
 exports.send = send;
 exports.toHttpSigner = void 0;
 exports.verify = verify;
@@ -270,7 +270,7 @@ function _verify() {
         case 1:
           // Extract public key from keyid
           _signatureName = extractSignatureName(headers);
-          extractedKey = extractPublicKeyFromHeaders(headers, _signatureName);
+          extractedKey = extractPubKey(headers, _signatureName);
           if (extractedKey) {
             _context6.n = 2;
             break;
@@ -337,7 +337,7 @@ function _verify() {
             headers: _objectSpread({}, headers)
           }; // Extract additional info from headers
           signatureName = extractSignatureName(headers);
-          extractedPublicKey = extractPublicKeyFromHeaders(headers, signatureName); // Extract algorithm from signature-input
+          extractedPublicKey = extractPubKey(headers, signatureName); // Extract algorithm from signature-input
           signatureInputHeader = headers["signature-input"] || headers["Signature-Input"];
           decodedSigInput = decodeSigInput(signatureInputHeader, signatureName);
           algorithm = decodedSigInput === null || decodedSigInput === void 0 || (_decodedSigInput$para = decodedSigInput.params) === null || _decodedSigInput$para === void 0 ? void 0 : _decodedSigInput$para.alg; // Verify using the library
@@ -387,7 +387,7 @@ function _verify() {
   }));
   return _verify.apply(this, arguments);
 }
-function extractPublicKeyFromHeaders(headers, signatureName) {
+function extractPubKey(headers, signatureName) {
   var _Object$values$;
   var signatureInput = headers["signature-input"] || headers["Signature-Input"];
   if (!signatureInput) return null;
@@ -414,7 +414,7 @@ function extractPublicKeyFromHeaders(headers, signatureName) {
  */
 function extractPublicKeyFromMessage(signedMessage) {
   var signatureName = extractSignatureName(signedMessage.headers);
-  return extractPublicKeyFromHeaders(signedMessage.headers, signatureName);
+  return extractPubKey(signedMessage.headers, signatureName);
 }
 function send(_x3) {
   return _send.apply(this, arguments);

package/cjs/signer.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createSigner = void 0;
 exports.sign = sign;
 exports.signInternal = void 0;
 exports.signer = signer;
@@ -602,5 +603,10 @@ function signer(config) {
     };
   }();
 }
-
-// Export the internal sign function for backward compatibility
+var createSigner = exports.createSigner = function createSigner(jwk, url) {
+  var _signer = (0, _aoconnect.createSigner)(jwk, url);
+  return signer({
+    signer: _signer,
+    url: url
+  });
+};

package/cjs/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.toAddr = toAddr;
 var _fastSha = _interopRequireDefault(require("fast-sha256"));
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -36,6 +37,7 @@ function base64urlEncode(bytes) {
   return b64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/g, "");
 }
 function toAddr(n) {
+  if (_typeof(n) === "object" && typeof n.n === "string") n = n.n;
   var pubBytes = base64urlDecode(n);
   var hash = (0, _fastSha["default"])(pubBytes);
   return base64urlEncode(hash);

package/esm/commit.js

@@ -0,0 +1,24 @@
+import { id, base, hashpath, rsaid, hmacid } from "./id.js"
+import { toAddr } from "./utils.js"
+import { extractPubKey } from "./signer-utils.js"
+
+export const commit = async (obj, opts) => {
+  const msg = await opts.signer(obj, opts)
+  const hmacId = hmacid(msg.headers)
+  const rsaId = rsaid(msg.headers)
+  const pub = extractPubKey(msg.headers)
+  const committer = toAddr(pub.toString("base64"))
+  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,
+  }
+}

package/esm/index.js

@@ -1,4 +1,5 @@
 export { id, base, hashpath, rsaid, hmacid } from "./id.js"
 export { toAddr } from "./utils.js"
-export { sign, signer } from "./signer.js"
+export { sign, signer, createSigner } from "./signer.js"
 export { send } from "./send.js"
+export { extractPublicKeyFromHeaders, decodeSigInput } from "./signer-utils.js"

package/esm/signer-utils.js

@@ -190,7 +190,7 @@ export async function verify(signedMessage, publicKey) {
     } else {
       // Extract public key from keyid
       const signatureName = extractSignatureName(headers)
-      const extractedKey = extractPublicKeyFromHeaders(headers, signatureName)
+      const extractedKey = extractPubKey(headers, signatureName)
       if (!extractedKey) {
         return {
           valid: false,
@@ -245,10 +245,7 @@ export async function verify(signedMessage, publicKey) {
 
     // Extract additional info from headers
     const signatureName = extractSignatureName(headers)
-    const extractedPublicKey = extractPublicKeyFromHeaders(
-      headers,
-      signatureName
-    )
+    const extractedPublicKey = extractPubKey(headers, signatureName)
 
     // Extract algorithm from signature-input
     const signatureInputHeader =
@@ -302,7 +299,7 @@ export async function verify(signedMessage, publicKey) {
  * @param {string} [signatureName] - Optional signature name to look for
  * @returns {Buffer|null} Public key buffer or null
  */
-export function extractPublicKeyFromHeaders(headers, signatureName) {
+export function extractPubKey(headers, signatureName) {
   const signatureInput =
     headers["signature-input"] || headers["Signature-Input"]
   if (!signatureInput) return null
@@ -335,7 +332,7 @@ export function extractPublicKeyFromHeaders(headers, signatureName) {
  */
 function extractPublicKeyFromMessage(signedMessage) {
   const signatureName = extractSignatureName(signedMessage.headers)
-  return extractPublicKeyFromHeaders(signedMessage.headers, signatureName)
+  return extractPubKey(signedMessage.headers, signatureName)
 }
 
 export async function send(signedMsg, fetchImpl = fetch) {

package/esm/signer.js

@@ -3,7 +3,7 @@ import { structured_from, structured_to } from "./structured.js"
 import { erl_json_from, erl_json_to, normalize } from "./erl_json.js"
 import { enc } from "./encode.js"
 import { isBytes } from "./encode-utils.js"
-import { createSigner } from "@permaweb/aoconnect"
+import { createSigner as _createSigner } from "@permaweb/aoconnect"
 import { toHttpSigner } from "./send.js"
 
 // Export verify from signer-utils.js for compatibility
@@ -204,7 +204,7 @@ const smartSign = async (obj, path) => {
           message[key] = encodeAsStructuredFieldList(value)
         } else if (typeof value === "number") {
           types.push(
-            `${key}="${Number.isInteger(value) ? "integer" : "float"}"`
+            `${key}="${Number.isInteger(value) ? "integer" : "float"}"`,
           )
           message[key] = String(value)
         } else if (typeof value === "boolean") {
@@ -276,9 +276,9 @@ const _sign = async (obj, path) => {
   const encoded = httpsig_to(
     normalize(
       structured_from(
-        normalize({ ...filtered, path: path || "/~wao@1.0/httpsig" })
-      )
-    )
+        normalize({ ...filtered, path: path || "/~wao@1.0/httpsig" }),
+      ),
+    ),
   )
 
   // Check if the encoded result is valid for HTTP headers
@@ -300,7 +300,7 @@ const joinUrl = ({ url, path }) => {
 
 // Main sign function that matches signer.js API
 export async function sign({ url, path, msg: encoded, jwk, signPath = true }) {
-  const signer = createSigner(jwk, url)
+  const signer = _createSigner(jwk, url)
   const { body = null, ...headers } = encoded
   let _enc = { headers }
   if (body) _enc.body = new Blob([body])
@@ -385,7 +385,7 @@ export function signer(config) {
 
   return async (
     fields,
-    { encoded: _encoded = false, path: _path = true } = {}
+    { encoded: _encoded = false, path: _path = true } = {},
   ) => {
     const { path = "/relay/process", method = "POST", ...aoFields } = fields
 
@@ -448,5 +448,9 @@ export function signer(config) {
   }
 }
 
-// Export the internal sign function for backward compatibility
+export const createSigner = (jwk, url) => {
+  const _signer = _createSigner(jwk, url)
+  return signer({ signer: _signer, url })
+}
+
 export { _sign as signInternal }

package/esm/utils.js

@@ -20,6 +20,7 @@ function base64urlEncode(bytes) {
 }
 
 function toAddr(n) {
+  if (typeof n === "object" && typeof n.n === "string") n = n.n
   const pubBytes = base64urlDecode(n)
   const hash = sha256(pubBytes)
   return base64urlEncode(hash)

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "hbsig",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "main": "cjs/index.js",
   "license": "MIT",
   "devDependencies": {
-    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
     "@babel/cli": "^7.24.8",
     "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.3"
+    "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+    "@babel/preset-env": "^7.25.3",
+    "wao": "^0.33.0"
   },
   "dependencies": {
-    "wao": "^0.32.2",
     "@permaweb/aoconnect": "^0.0.85",
     "base64url": "^3.0.1",
     "fast-sha256": "^1.3.0",