wao 0.29.3 → 0.30.2

package/esm/hyperbeam.js

@@ -17,8 +17,9 @@ export default class HyperBEAM {
     c,
     cmake,
     faff,
-    simplePay = false,
-    simplePayPrice,
+    simple_pay = false,
+    simple_pay_price,
+    p4_non_chargable_routes,
     p4_lua,
     store_prefix,
     operator,
@@ -27,6 +28,7 @@ export default class HyperBEAM {
     devices,
   } = {}) {
     this.devices = devices
+    this.p4_non_chargable_routes = p4_non_chargable_routes
     as ??= shell ? [] : ["genesis_wasm"]
     this.console = console
     if (clearCache) {
@@ -46,8 +48,8 @@ export default class HyperBEAM {
       ? "cache-mainnet-" + Math.floor(Math.random() * 10000000)
       : "cache-mainnet"
     this.p4_lua = p4_lua
-    this.simplePay = simplePay
-    this.spp = simplePayPrice
+    this.simple_pay = simple_pay
+    this.spp = simple_pay_price
     this.operator = operator
     this.faff = faff
     this.c = c
@@ -175,7 +177,11 @@ export default class HyperBEAM {
     if (this.devices) {
       let _devs = []
       for (const v of this.devices) {
-        if (devs[v])
+        if (typeof v === "object") {
+          _devs.push(
+            `#{<<"name">> => <<"${v.name}">>, <<"module">> => ${v.module}}`
+          )
+        } else if (devs[v])
           _devs.push(
             `#{<<"name">> => <<"${devs[v].name}">>, <<"module">> => ${devs[v].module}}`
           )
@@ -197,11 +203,16 @@ export default class HyperBEAM {
     /*
     const _routes = `, routes => [#{ <<"template">> => <<"/result/.*">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${this.cu}">> } }, #{ <<\"template\">> => <<\"/dry-run\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:${this.cu}\">> } }, #{ <<"template">> => <<"/graphql">>, <<"nodes">> => [#{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => httpc, protocol => http2 } }, #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<"template">> => <<"/raw">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } } }]`
     */
-    const _p4_non_chargable = this.p4_lua
-      ? `, p4_non_chargable_routes => [#{ <<"template">> => <<"/*~node-process@1.0/*">> }, #{ <<"template">> => <<"/~wao@1.0/*">> }, #{ <<"template">> => <<"/~p4@1.0/balance">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }]`
-      : !this.simplePay
-        ? ""
-        : `, p4_non_chargable_routes => [#{ <<"template">> => <<"/~simple-pay@1.0/topup">> }, #{ <<"template">> => <<"/~p4@1.0/balance">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }, #{ <<"template">> => <<"/~p4@1.0/balance">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }]`
+    const _p4_non_chargable = this.p4_non_chargable
+      ? `, p4_non_chargable_routes => [${this.p4_non_chargable_routes
+          .map(() => `#{ <<"template">> => <<"/*~node-process@1.0/*">> }`)
+          .join(", ")}]`
+      : this.p4_lua
+        ? `, p4_non_chargable_routes => [#{ <<"template">> => <<"/*~node-process@1.0/*">> }, #{ <<"template">> => <<"/~wao@1.0/*">> }, #{ <<"template">> => <<"/~p4@1.0/balance">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }]`
+        : !this.simple_pay
+          ? ""
+          : `, p4_non_chargable_routes => [#{ <<"template">> => <<"/~simple-pay@1.0/topup">> }, #{ <<"template">> => <<"/~meta@1.0/*">> }, #{ <<"template">> => <<"/~simple-pay@1.0/balance">> }]`
+
     const _operator = this.operator
       ? `, operator => <<"${this.operator}">>`
       : ""
@@ -220,7 +231,7 @@ export default class HyperBEAM {
 
     const _on = this.p4_lua
       ? `, on => #{ <<"request">> => ${processor}, <<"response">> => ${processor} }`
-      : this.simplePay
+      : this.simple_pay
         ? `, on => #{ <<"request">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"simple-pay@1.0">>, <<"ledger-device">> => <<"simple-pay@1.0">> }, <<"response">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"simple-pay@1.0">>, <<"ledger-device">> => <<"simple-pay@1.0">> } }`
         : !isNil(this.faff)
           ? `, on => #{ <<"request">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"faff@1.0">>, <<"ledger-device">> => <<"faff@1.0">> }, <<"response">> => #{ <<"device">> => <<"p4@1.0">>, <<"pricing-device">> => <<"faff@1.0">>, <<"ledger-device">> => <<"faff@1.0">> } }`

package/esm/id.js

@@ -40,21 +40,6 @@ function base64urlToBase64(str) {
   return str.replace(/-/g, "+").replace(/_/g, "/")
 }
 
-/**
- * Convert Uint8Array to base64url string
- */
-function uint8ArrayToBase64url(bytes) {
-  // Convert to base64
-  let binary = ""
-  for (let i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i])
-  }
-  const base64 = btoa(binary)
-
-  // Convert to base64url
-  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
-}
-
 /**
  * Generate commitment ID for RSA-PSS and ECDSA signatures
  * The ID is the SHA256 hash of the raw signature bytes
@@ -62,7 +47,7 @@ function uint8ArrayToBase64url(bytes) {
  * @param {Object} commitment - The commitment object containing signature
  * @returns {string} The commitment ID in base64url format
  */
-function generateRsaCommitmentId(commitment) {
+function rsaid(commitment) {
   // Extract the base64 signature from structured field format
   // Format: "signature-name=:BASE64_SIGNATURE:"
   const match = commitment.signature.match(/^[^=]+=:([^:]+):/)
@@ -93,7 +78,7 @@ function generateRsaCommitmentId(commitment) {
  * @param {Object} message - The message with signature and signature-input
  * @returns {string} The commitment ID in base64url format
  */
-function generateHmacCommitmentId(message) {
+function hmacid(message) {
   // Parse signature-input to get components
   const parsed = parseStructuredFieldDictionary(message["signature-input"])
   if (!parsed || !parsed.components) {
@@ -156,13 +141,13 @@ function generateCommitmentId(commitment, fullMessage = null) {
   switch (commitment.alg) {
     case "rsa-pss-sha512":
     case "ecdsa-p256-sha256":
-      return generateRsaCommitmentId(commitment)
+      return rsaid(commitment)
 
     case "hmac-sha256":
       if (!fullMessage) {
         throw new Error("HMAC commitment IDs require full message context")
       }
-      return generateHmacCommitmentId(fullMessage)
+      return hmacid(fullMessage)
 
     default:
       throw new Error(`Unsupported algorithm: ${commitment.alg}`)
@@ -211,12 +196,264 @@ function verifyCommitmentId(commitment, expectedId, fullMessage = null) {
   }
 }
 
+/**
+ * Convert Uint8Array to base64url string
+ */
+function uint8ArrayToBase64url(bytes) {
+  let binary = ""
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i])
+  }
+  const base64 = btoa(binary)
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "")
+}
+
+/**
+ * Parse structured field dictionary to extract components
+ * Handles format: name=(components);params
+ */
+function parseSignatureInput(sigInput) {
+  // Extract components from format: name=(components);params
+  const match = sigInput.match(/[^=]+=\(([^)]+)\)/)
+  if (!match) return []
+
+  // Split components and clean quotes
+  return match[1].split(" ").map(c => c.replace(/"/g, ""))
+}
+
+/**
+ * Calculate HMAC commitment ID for HyperBEAM messages
+ */
+function calculateHmacId(message) {
+  if (!message["signature-input"]) {
+    throw new Error("HMAC calculation requires signature-input")
+  }
+
+  // Parse components from signature-input
+  const components = parseSignatureInput(message["signature-input"])
+
+  // Sort components AS-IS (with @ prefix)
+  const sortedComponents = [...components].sort()
+
+  // Build signature base in sorted order
+  const lines = []
+
+  for (const component of sortedComponents) {
+    let fieldName = component
+    let value
+
+    // For derived components (starting with @), remove @ in the signature base
+    if (component.startsWith("@")) {
+      fieldName = component.substring(1)
+      value = message[fieldName]
+    } else {
+      value = message[component]
+    }
+
+    if (value === undefined || value === null) {
+      value = ""
+    } else if (typeof value === "number") {
+      value = value.toString()
+    }
+
+    lines.push(`"${fieldName}": ${value}`)
+  }
+
+  // Add signature-params line with sorted components (keeping @ prefix)
+  const paramsComponents = sortedComponents.join(" ")
+  lines.push(
+    `"@signature-params": (${paramsComponents});alg="hmac-sha256";keyid="ao"`
+  )
+
+  const signatureBase = lines.join("\n")
+
+  // Generate HMAC with key "ao"
+  const messageBytes = new TextEncoder().encode(signatureBase)
+  const keyBytes = new TextEncoder().encode("ao")
+
+  const hmacResult = hmac(keyBytes, messageBytes)
+  return uint8ArrayToBase64url(hmacResult)
+}
+
+/**
+ * Calculate unsigned message ID following the exact Erlang flow
+ */
+function calculateUnsignedId(message) {
+  // Derived components from Erlang ?DERIVED_COMPONENTS
+  const DERIVED_COMPONENTS = [
+    "method",
+    "target-uri",
+    "authority",
+    "scheme",
+    "request-target",
+    "path",
+    "query",
+    "query-param",
+    "status",
+  ]
+
+  // Convert message for httpsig format
+  const httpsigMsg = {}
+  for (const [key, value] of Object.entries(message)) {
+    httpsigMsg[key.toLowerCase()] = value
+  }
+
+  // Get keys and add @ to derived components
+  const keys = Object.keys(httpsigMsg)
+  const componentsWithPrefix = keys
+    .map(key => {
+      // Check if this is a derived component
+      if (DERIVED_COMPONENTS.includes(key.replace(/_/g, "-"))) {
+        return "@" + key
+      }
+      return key
+    })
+    .sort() // Sort AFTER adding @ prefix
+
+  // Build signature base - use the components in order
+  const lines = []
+  for (const component of componentsWithPrefix) {
+    const key = component.replace("@", "")
+    const value = httpsigMsg[key]
+    const valueStr = typeof value === "string" ? value : String(value)
+    lines.push(`"${key}": ${valueStr}`)
+  }
+
+  // Add signature-params line with the @ prefixes
+  const componentsList = componentsWithPrefix.map(k => `"${k}"`).join(" ")
+  lines.push(
+    `"@signature-params": (${componentsList});alg="hmac-sha256";keyid="ao"`
+  )
+
+  const signatureBase = lines.join("\n")
+
+  // HMAC with key "ao"
+  const messageBytes = new TextEncoder().encode(signatureBase)
+  const keyBytes = new TextEncoder().encode("ao")
+
+  const hmacResult = hmac(keyBytes, messageBytes)
+  return uint8ArrayToBase64url(hmacResult)
+}
+
+function id(message) {
+  // Get commitment IDs
+  const commitmentIds = Object.keys(message.commitments || {})
+
+  if (commitmentIds.length === 0) {
+    // No commitments - calculate unsigned ID using HMAC
+    return calculateUnsignedId(message)
+  } else if (commitmentIds.length === 1) {
+    // Single commitment - the ID is just the commitment ID
+    return commitmentIds[0]
+  } else {
+    // Multiple commitments - sort, join with ", ", and hash
+    const sortedIds = commitmentIds.sort()
+    const idsLine = sortedIds.join(", ")
+
+    // Calculate SHA-256 hash using fast-sha256
+    const encoder = new TextEncoder()
+    const data = encoder.encode(idsLine)
+    const hashArray = hash(data)
+
+    // Convert to base64url
+    return uint8ArrayToBase64url(hashArray)
+  }
+}
 // Export all functions
 export {
+  id,
   generateCommitmentId,
-  generateRsaCommitmentId,
-  generateHmacCommitmentId,
+  rsaid,
+  hmacid,
   extractCommitmentIds,
   verifyCommitmentId,
   parseStructuredFieldDictionary,
 }
+
+/**
+ * Calculate the next base from a hashpath
+ * A hashpath has the format: base/request
+ * The next base is calculated as: sha256(base + request)
+ *
+ * @param {string} hashpath - The current hashpath in format "base/request"
+ * @returns {string} The next base in base64url format
+ */
+function base(hashpath) {
+  // Split the hashpath into base and request
+  const parts = hashpath.split("/")
+  if (parts.length !== 2) {
+    throw new Error("Invalid hashpath format. Expected 'base/request'")
+  }
+
+  const [base, request] = parts
+
+  // Convert base64url to native binary (Uint8Array)
+  const baseBinary = base64urlToUint8Array(base)
+  const requestBinary = base64urlToUint8Array(request)
+
+  // Concatenate base and request
+  const combined = new Uint8Array(baseBinary.length + requestBinary.length)
+  combined.set(baseBinary, 0)
+  combined.set(requestBinary, baseBinary.length)
+
+  // Calculate SHA256 of the combined data
+  const nextBaseHash = hash(combined)
+
+  // Convert to base64url
+  return uint8ArrayToBase64url(nextBaseHash)
+}
+
+/**
+ * Calculate the next hashpath given the current hashpath and a new message
+ *
+ * @param {string} currentHashpath - The current hashpath (or null for first operation)
+ * @param {Object} newMessage - The new message/request
+ * @returns {string} The next hashpath in format "nextBase/newMessageId"
+ */
+function hashpath(currentHashpath, newMessage) {
+  // Calculate the ID of the new message
+  const newMessageId = id(newMessage)
+
+  if (!currentHashpath) {
+    // First operation: the hashpath is just the message ID
+    // In the Erlang code, the first hashpath is "baseId/requestId"
+    // where baseId is the ID of the initial message
+    throw new Error(
+      "For first operation, provide the base message ID as currentHashpath"
+    )
+  }
+
+  // Check if this is the first operation (currentHashpath is just an ID, not a path)
+  if (!currentHashpath.includes("/")) {
+    // First operation: currentHashpath is the base message ID
+    return `${currentHashpath}/${newMessageId}`
+  }
+
+  // Subsequent operations: calculate the next base from current hashpath
+  const nextBase = base(currentHashpath)
+
+  // Return the new hashpath
+  return `${nextBase}/${newMessageId}`
+}
+
+/**
+ * Helper function to convert base64url string to Uint8Array
+ */
+function base64urlToUint8Array(base64url) {
+  // Convert base64url to base64
+  const base64 = base64urlToBase64(base64url)
+
+  // Decode base64 to binary string
+  const binaryString = atob(base64)
+
+  // Convert binary string to Uint8Array
+  const bytes = new Uint8Array(binaryString.length)
+  for (let i = 0; i < binaryString.length; i++) {
+    bytes[i] = binaryString.charCodeAt(i)
+  }
+
+  return bytes
+}
+
+// Export the new functions
+export { base, hashpath }

package/esm/signer.js

@@ -1,6 +1,7 @@
 import { toHttpSigner } from "./send.js"
 import { enc } from "./encode.js"
 import { createSigner } from "@permaweb/aoconnect"
+export { verify } from "./signer-utils.js"
 
 const joinUrl = ({ url, path }) => {
   if (path.startsWith("http://") || path.startsWith("https://")) return path
@@ -50,12 +51,12 @@ async function _sign({
   )
 
   if (_path) signingFields.push("path")
-
+  /*
   if (signingFields.length === 0 && !body) {
-    lowercaseHeaders["content-length"] = "0"
-    signingFields.push("content-length")
+    //lowercaseHeaders["content-length"] = "0"
+    //signingFields.push("content-length")
   }
-
+  */
   const signedRequest = await toHttpSigner(signer)({
     request: { url: _url, method, headers: lowercaseHeaders },
     fields: signingFields,

package/esm/utils.js

@@ -1,12 +1,6 @@
 import { graphql, parse, validate, buildSchema } from "graphql"
 import sha256 from "fast-sha256"
-import {
-  generateCommitmentId,
-  generateRsaCommitmentId,
-  generateHmacCommitmentId,
-  verifyCommitmentId,
-} from "./id.js"
-export { generateRsaCommitmentId as rsaid, generateHmacCommitmentId as hmacid }
+export { id, base, hashpath, rsaid, hmacid } from "./id.js"
 import {
   clone,
   is,

package/esm/workspace/test/hyperbeam.js

@@ -1,18 +1,21 @@
 import assert from "assert"
 import { describe, it, before, after, beforeEach } from "node:test"
-import { HyperBEAM, wait, toAddr } from "wao/test"
+import { HyperBEAM, toAddr } from "wao/test"
 import { HB } from "wao"
 import { resolve } from "path"
 import { readFileSync } from "fs"
 
 const cwd = "../../HyperBEAM"
-const wallet = ".wallet.json"
+const wallet = resolve(process.cwd(), cwd, ".wallet.json")
+
+const jwk = JSON.parse(readFileSync(wallet, "utf8"))
+const addr = toAddr(jwk.n)
 
 describe("HyperBEAM", function () {
   let hbeam, hb, jwk
 
   before(async () => {
-    hbeam = await new HyperBEAM({ c: "12", cmake: "3.5", cwd, wallet }).ready()
+    hbeam = await new HyperBEAM({ cwd }).ready()
     jwk = JSON.parse(readFileSync(resolve(process.cwd(), cwd, wallet), "utf8"))
   })
 
@@ -21,7 +24,7 @@ describe("HyperBEAM", function () {
   after(async () => hbeam.kill())
 
   it("should run a HyperBEAM node", async () => {
-    const info = await hb.getJSON({ path: "/~meta@1.0/info" })
-    assert.equal(info.address, toAddr(jwk.n))
+    const { out } = await hb.getJSON({ path: "/~meta@1.0/build" })
+    assert.equal(out.node, "HyperBEAM")
   })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.29.3",
+  "version": "0.30.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -24,6 +24,10 @@
     "./web": {
       "require": "./cjs/web.js",
       "import": "./esm/web.js"
+    },
+    "./signer": {
+      "require": "./cjs/signer.js",
+      "import": "./esm/signer.js"
     }
   },
   "dependencies": {