wao 0.29.2 → 0.30.0

package/esm/hb.js

@@ -1,15 +1,16 @@
 import { connect, createSigner } from "@permaweb/aoconnect"
 import { isEmpty, last, isNotNil, mergeLeft } from "ramda"
-import { toAddr, buildTags } from "./utils.js"
-import { signer } from "./signer.js"
+import { rsaid, hmacid, toAddr, buildTags } from "./utils.js"
+import { sign, signer } from "./signer.js"
 import { send as _send } from "./send.js"
 import hyper_aos from "./lua/hyper-aos.js"
 import aos_wamr from "./lua/aos_wamr.js"
 import { from } from "./httpsig.js"
 
 const seed = num => {
-  const array = new Uint8Array(num)
-  return crypto.getRandomValues(array).toString()
+  const array = new Array(num)
+  for (let i = 0; i < num; i++) array[i] = Math.floor(Math.random() * 256)
+  return Buffer.from(array).toString("base64")
 }
 
 class HB {
@@ -71,8 +72,17 @@ class HB {
     }
     if (jwk) this._init(jwk)
   }
-
+  async signEncoded(encoded) {
+    const { path, ...msg } = encoded
+    return await sign({
+      jwk: this.jwk,
+      msg,
+      path,
+      url: this.url,
+    })
+  }
   _init(jwk) {
+    this.jwk = jwk
     this.signer = createSigner(jwk, this.url)
     this.addr = toAddr(jwk.n)
     this.sign = signer({ signer: this.signer, url: this.url })
@@ -108,7 +118,7 @@ class HB {
 
   async getLua() {
     const lua = Buffer.from(hyper_aos, "base64")
-    const id = await this.cacheModule(lua, "application/lua")
+    const id = await this.cacheScript(lua, "application/lua")
     this.lua ??= id
     return id
   }
@@ -132,7 +142,11 @@ class HB {
     const { slot, pid } = await this.scheduleAOS(args)
     return { slot, outbox: await this.computeAOS({ pid, slot }) }
   }
-
+  async messageLegacy(args) {
+    const { slot, pid } = await this.scheduleLegacy(args)
+    console.log(slot, pid, args)
+    return { slot, res: await this.computeLegacy({ pid, slot }) }
+  }
   path({
     dev = "message",
     path,
@@ -214,7 +228,7 @@ class HB {
     return { res, pid: res.headers.process }
   }
 
-  async cacheModule(data, type) {
+  async cacheScript(data, type = "application/lua") {
     if (!this.cache) {
       const { pid } = await this.spawn({})
       this.cache = pid
@@ -261,7 +275,7 @@ class HB {
     })
     if (data) _tags.data = data
     let res = await this.post(_tags)
-    return { slot: res.headers.slot, res }
+    return { slot: res.headers.slot, res, pid }
   }
 
   async spawnAOS(image) {
@@ -368,13 +382,21 @@ class HB {
     if (isNotNil(from)) params += `&from=${from}`
     if (isNotNil(to)) params += `&to=${to}`
     params += `&accept=application/aos-2`
+    const {
+      out: { body },
+    } = await this.get({
+      path: "/~scheduler@1.0/schedule",
+      target: pid,
+      from,
+      accept: "application/aos-2",
+    })
     let res = await fetch(`${this.url}/~scheduler@1.0/schedule?${params}`).then(
       r => r.json()
     )
     if (res.page_info.has_next_page) {
       res.next = async () => {
         const from2 = last(res.edges).cursor + 1
-        return await this.message({ pid, from: from2, to, limit })
+        return await this.messages({ pid, from: from2, to, limit })
       }
     }
     return res
@@ -433,7 +455,26 @@ class HB {
     })
     return JSON.parse(res.body)
   }
+  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,
+    }
+  }
   async post(obj, json) {
     const _json = json ? "/~json@1.0/serialize" : ""
     obj.path += _json

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,14 +177,17 @@ 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}}`
           )
       }
       _devices = `, preloaded_devices => [${_devs.join(", ")}]`
     }
-
     const _wallet = `, priv_key_location => <<"${wallet}">>`
     const _gateway = gateway
       ? `, gateway => <<"http://localhost:${gateway}">>`
@@ -198,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}">>`
       : ""
@@ -221,12 +231,13 @@ 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">> } }`
           : ""
     const start = `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_faff}${_bundler}${_on}${_p4_non_chargable}${_operator}${_spp}${_devices}${_node_processes}}).`
+    console.log(start)
     return start
   }
 

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
@@ -211,8 +196,180 @@ 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
+ */
+async 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 = await hmac(keyBytes, messageBytes)
+  return uint8ArrayToBase64url(hmacResult)
+}
+
+/**
+ * Calculate unsigned message ID following the exact Erlang flow
+ */
+async 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 = await hmac(keyBytes, messageBytes)
+  return uint8ArrayToBase64url(hmacResult)
+}
+
+async 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
+    const encoder = new TextEncoder()
+    const data = encoder.encode(idsLine)
+    const hashBuffer = await crypto.subtle.digest("SHA-256", data)
+    const hashArray = new Uint8Array(hashBuffer)
+
+    // Convert to base64url
+    const base64 = btoa(String.fromCharCode(...hashArray))
+    const base64url = base64
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=/g, "")
+
+    return base64url
+  }
+}
+
 // Export all functions
 export {
+  id,
   generateCommitmentId,
   generateRsaCommitmentId,
   generateHmacCommitmentId,

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,6 +1,7 @@
 import { graphql, parse, validate, buildSchema } from "graphql"
 import sha256 from "fast-sha256"
 import {
+  id,
   generateCommitmentId,
   generateRsaCommitmentId,
   generateHmacCommitmentId,
@@ -770,4 +771,5 @@ export {
   isJSON,
   dirname,
   toAddr,
+  id,
 }

package/esm/workspace/package.json

@@ -8,6 +8,6 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "wao": "^0.28.0"
+    "wao": "^0.29.2"
   }
 }

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.2",
+  "version": "0.30.0",
   "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": {