wao 0.25.3 → 0.26.0

package/esm/hb.js

@@ -4,6 +4,8 @@ import { toAddr, buildTags } from "./utils.js"
 import { send as _send, createRequest } from "./signer.js"
 import { resolve } from "path"
 import { readFileSync } from "fs"
+import hyper_aos from "./lua/hyper-aos.js"
+import aos_wamr from "./lua/aos_wamr.js"
 
 const seed = num => {
   const array = new Uint8Array(num)
@@ -29,7 +31,6 @@ class HB {
         )
       },
     }
-
     this.dev.json = {
       commit: async args => {
         return await this.post({ path: "/~json@1.0/commit", ...args })
@@ -97,18 +98,14 @@ class HB {
   }
 
   async getImage() {
-    const wasm = readFileSync(
-      resolve(import.meta.dirname, "./lua/aos2-wamr.wasm")
-    )
+    const wasm = Buffer.from(aos_wamr, "base64")
     const id = await this.cacheModule(wasm, "application/wasm")
     this.image ??= id
     return id
   }
 
   async getLua() {
-    const lua = readFileSync(
-      resolve(import.meta.dirname, "./lua/hyper-aos.lua")
-    )
+    const lua = Buffer.from(hyper_aos, "base64")
     const id = await this.cacheModule(lua, "application/lua")
     this.lua ??= id
     return id
@@ -281,6 +278,7 @@ class HB {
       Type: "Process",
       image,
       "execution-device": "stack@1.0",
+      "push-device": "push@1.0",
       "device-stack": [
         "wasi@1.0",
         "json-iface@1.0",
@@ -315,6 +313,7 @@ class HB {
       Type: "Process",
       module: lua,
       "execution-device": "lua@5.3a",
+      "push-device": "push@1.0",
       "patch-from": "/results/outbox",
     })
     const pid = res.headers.process
@@ -357,6 +356,10 @@ class HB {
     if (path && !/^\//.test(path)) path = "/" + path
     return await this.getJSON({ path: `/${pid}/now${path}` })
   }
+  async slot({ pid, path = "" }) {
+    if (path && !/^\//.test(path)) path = "/" + path
+    return await this.getJSON({ path: `/${pid}/slot${path}` })
+  }
 
   async messages({ pid, from, to, limit } = {}) {
     let params = `target=${pid}`
@@ -376,8 +379,7 @@ class HB {
   }
 
   async spawnLegacy({ module, tags = {}, data } = {}) {
-    tags = mergeLeft(tags, {
-      data,
+    let t = {
       Type: "Process",
       "Data-Protocol": "ao",
       Variant: "ao.TN.1",
@@ -385,24 +387,44 @@ class HB {
       Authority: this._info.address,
       "scheduler-location": this._info.address,
       "random-seed": seed(16),
-      module: "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
+      module: module ?? "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
       device: "process@1.0",
       "scheduler-device": "scheduler@1.0",
       "execution-device": "stack@1.0",
+      "push-device": "push@1.0",
       "device-stack": ["genesis-wasm@1.0", "patch@1.0"],
       "patch-from": "/results/outbox",
       "stack-keys": ["init", "compute", "snapshot", "normalize"],
-    })
+    }
+    if (data) t.data = data
+    tags = mergeLeft(tags, t)
     return await this.spawn(tags)
   }
-
+  async results({ process, limit, sort = "DESC", from, to } = {}) {
+    let params = ""
+    const addParam = (key, val) => {
+      params += params === "" ? "?" : "&"
+      params += `${key}=${val}`
+    }
+    if (limit) addParam("limit", limit)
+    if (sort) addParam("sort", sort)
+    if (from) addParam("from", from)
+    if (to) addParam("to", to)
+    const res = await this.post({
+      path: "/~relay@1.0/call",
+      method: "GET",
+      "relay-path": `${this.cu}/results/${process}${params}`,
+      "content-type": "application/json",
+    })
+    return JSON.parse(res.body)
+  }
   async dryrun({ tags = {}, pid, action, data } = {}) {
     if (typeof action === "string") tags.Action = action
     let json = { Tags: buildTags({ ...tags }), Owner: this.addr }
     if (data) json.Data = data
     const res = await this.post({
       path: "/~relay@1.0/call",
-      "relay-method": "POST",
+      method: "POST",
       "relay-path": `${this.cu}/dry-run?process-id=${pid}`,
       "content-type": "application/json",
       "relay-body": JSON.stringify(json),

package/esm/hyperbeam.js

@@ -15,14 +15,15 @@ export default class HyperBEAM {
     cwd = "./HyperBEAM",
     c,
     cmake,
-    legacy = false,
     faff,
     simplePay = false,
     simplePayPrice,
     p4_lua,
     store_prefix,
     operator,
+    console = true,
   } = {}) {
+    this.console = console
     if (clearCache) {
       const dirname = resolve(process.cwd(), cwd)
       for (let v of readdirSync(dirname)) {
@@ -69,14 +70,16 @@ export default class HyperBEAM {
         cwd: resolve(process.cwd(), this.cwd),
       }
     )
-    this.hbeam.stdout.on("data", chunk => console.log(chunk.toString()))
-    this.hbeam.stderr.on("data", err => console.error(err.toString()))
-    this.hbeam.on("error", err =>
-      console.error(`failed to start process: ${err}`)
-    )
-    this.hbeam.on("close", code =>
-      console.log(`child process exited with code ${code}`)
-    )
+    if (this.console) {
+      this.hbeam.stdout.on("data", chunk => console.log(chunk.toString()))
+      this.hbeam.stderr.on("data", err => console.error(err.toString()))
+      this.hbeam.on("error", err =>
+        console.error(`failed to start process: ${err}`)
+      )
+      this.hbeam.on("close", code =>
+        console.log(`child process exited with code ${code}`)
+      )
+    }
   }
   async ok() {
     try {