wao 0.24.0 → 0.24.2

package/cjs/utils.js

@@ -606,6 +606,7 @@ var toGraphObj = exports.toGraphObj = function toGraphObj(_ref12) {
   if (fields) args.fields = fields;
   if (args.sort && args.sort === "HEIGHT_ASC") args.asc = true;
   delete args.sort;
+  if (!Array.isArray(args.tags)) args.tags = [args.tags];
   if (args.tags) {
     var _tags = {};
     var _iterator9 = _createForOfIteratorHelper(args.tags),

package/esm/hb.js

@@ -17,41 +17,50 @@ class HB {
     this.dev.hyperbuddy = {
       metrics: async (args = {}) => {
         return this.parseMetrics(
-          await this.fetch(this.path("hyperbuddy", "metrics", false), false)
+          await this.fetch(
+            this.path({ dev: "hyperbuddy", path: "metrics", json: false }),
+            false
+          )
         )
       },
     }
 
     this.dev.json = {
       commit: async args => {
-        return await this.send({ path: "/~json@1.0/commit", ...args })
+        return await this.post({ path: "/~json@1.0/commit", ...args })
       },
       verify: async args => {
-        return await this.send({ path: "/~json@1.0/verify", ...args })
+        return await this.post({ path: "/~json@1.0/verify", ...args })
       },
       deserialize: async args => {
-        return await this.send({ path: "/~json@1.0/deserialize", ...args })
+        return await this.post({ path: "/~json@1.0/deserialize", ...args })
       },
       serialize: async args => {
-        return await this.send({ path: "/~json@1.0/serialize", ...args })
+        return await this.post({ path: "/~json@1.0/serialize", ...args })
       },
     }
     this.dev.meta = {
       info: async (args = {}) => {
         let { method = "GET", json = true, key } = args
         if (method.toLowerCase() === "post") {
-          return await this.send({ path: "/~meta@1.0/info", ...args })
+          return await this.post({ path: "/~meta@1.0/info", ...args })
         } else {
           return key
             ? await this.fetch(
-                this.path("meta", `info/${key}`, args.json ?? false),
+                this.path({
+                  dev: "meta",
+                  path: `info/${key}`,
+                  json: args.json ?? false,
+                }),
                 args.json ?? false
               )
-            : await this.fetch(this.path("meta", "info", json))
+            : await this.fetch(
+                this.path({ dev: "meta", path: "info", json: json })
+              )
         }
       },
       build: async () => {
-        return await this.fetch(this.path("meta", "build"))
+        return await this.fetch(this.path({ dev: "meta", path: "build" }))
       },
     }
     if (jwk) this._init(jwk)
@@ -60,7 +69,7 @@ class HB {
   _init(jwk) {
     this.signer = createSigner(jwk, this.url)
     this.addr = toAddr(jwk.n)
-    this._request2 = createRequest({ signer: this.signer, url: this.url })
+    this.sign = createRequest({ signer: this.signer, url: this.url })
 
     const { request } = connect({
       MODE: "mainnet",
@@ -78,8 +87,8 @@ class HB {
     return this
   }
 
-  async send(args) {
-    return await _send(await this._request2(args))
+  async send(msg) {
+    return await _send(msg)
   }
 
   async getImage() {
@@ -91,15 +100,6 @@ class HB {
     return id
   }
 
-  async getLegacy() {
-    const wasm = readFileSync(
-      resolve(import.meta.dirname, "./lua/aos2_0_6.wasm")
-    )
-    const id = await this.cacheModule(wasm, "application/wasm")
-    this.legacy ??= id
-    return id
-  }
-
   async getLua() {
     const lua = readFileSync(
       resolve(import.meta.dirname, "./lua/hyper-aos.lua")
@@ -108,25 +108,35 @@ class HB {
     this.lua ??= id
     return id
   }
-
-  async messageAOS({ pid, action = "Eval", tags = {}, data }) {
+  async scheduleAOS({ pid, action = "Eval", tags = {}, data }) {
     pid ??= this.pid
     let _tags = mergeLeft(tags, {
       device: "process@1.0",
       method: "POST",
-      path: `/${pid}/schedule`,
+      path: `/${pid}~process@1.0/schedule`,
       scheduler: this.scheduler,
       Type: "Message",
       Action: action,
       Target: pid,
     })
     if (data) _tags.data = data
-    let res = await this.send(_tags)
-    const slot = res.headers.get("slot")
+    let res = await this.post(_tags)
+    const slot = res.headers.slot
+    return { slot, res, pid }
+  }
+  async messageAOS(args) {
+    const { slot, pid } = await this.scheduleAOS(args)
     return { slot, outbox: await this.computeAOS({ pid, slot }) }
   }
 
-  path(dev = "message", path, json = true, params = {}, pid = "", tail = "") {
+  path({
+    dev = "message",
+    path,
+    json = true,
+    params = {},
+    pid = "",
+    tail = "",
+  }) {
     if (!/@/.test(dev)) dev += "@1.0"
     let _params = ""
     if (!isEmpty(params)) {
@@ -136,7 +146,8 @@ class HB {
         i++
       }
     }
-    return `${this.url}/${pid}~${dev}${path ? `/${path}` : ""}${tail}${json ? "/~json@1.0/serialize" : ""}${_params}`
+    if (path && !/^\//.test(path)) path = "/" + path
+    return `/${pid}~${dev}${path ?? ""}${tail}${json ? "/~json@1.0/serialize" : ""}${_params}`
   }
 
   async text(dev, path, params = {}, tail) {
@@ -146,7 +157,7 @@ class HB {
       dev = "process"
     }
     return await this.fetch(
-      this.path(dev, path, false, params, pid, tail),
+      this.path({ dev, path, json: false, params, pid, tail }),
       false
     )
   }
@@ -157,29 +168,26 @@ class HB {
       pid = dev
       dev = "process"
     }
-    return await this.fetch(this.path(dev, path, true, params, pid, tail))
+    return await this.fetch(
+      this.path({ dev, path, json: true, params, pid, tail })
+    )
   }
 
-  async fetch(url, json = true) {
-    return await fetch(url).then(r => (json ? r.json() : r.text()))
+  async fetch(path, json = true) {
+    return await fetch(this.url + path).then(r => (json ? r.json() : r.text()))
   }
 
   async computeAOS({ pid, slot }) {
-    return await fetch(
-      `${this.url}/${pid}/compute/results/outbox/~json@1.0/serialize?slot=${slot}`
-    ).then(r => r.json())
+    return await this.getJSON({ path: `/${pid}/compute/results/outbox`, slot })
   }
 
   async computeLua({ pid, slot }) {
-    return await fetch(
-      `${this.url}/${pid}/compute/results/~json@1.0/serialize?slot=${slot}`
-    ).then(r => r.json())
+    return await this.getJSON({ path: `/${pid}/compute/results`, slot })
   }
 
-  async compute({ pid, slot }) {
-    return await fetch(
-      `${this.url}/${pid}/compute/~json@1.0/serialize?slot=${slot}`
-    ).then(r => r.json())
+  async compute({ pid, slot, path = "" }) {
+    if (path && !/^\//.test(path)) path = "/" + path
+    return await this.getJSON({ path: `/${pid}/compute${path}`, slot })
   }
 
   async computeLegacy({ pid, slot }) {
@@ -190,26 +198,35 @@ class HB {
   async spawn(tags = {}) {
     const addr = await this.dev.meta.info({ key: "address" })
     this.scheduler ??= addr
-    const res = await this.send(
-      mergeLeft(tags, {
-        device: "process@1.0",
-        path: "/schedule",
-        scheduler: this.scheduler,
-        "random-seed": seed(16),
-        Type: "Process",
-        "scheduler-device": "scheduler@1.0",
-        "execution-device": "test-device@1.0",
-      })
-    )
-    return { res, pid: res.headers.get("process") }
+    const _tags = mergeLeft(tags, {
+      device: "process@1.0",
+      path: "/schedule",
+      scheduler: this.scheduler,
+      "random-seed": seed(16),
+      Type: "Process",
+      "execution-device": "test-device@1.0",
+    })
+    const res = await this.post(_tags)
+    return { res, pid: res.headers.process }
   }
-  async cacheModule(data, type) {
-    const res = await this.send({
-      path: "/~wao@1.0/cache_module",
+
+  async cacheModule2(data, type) {
+    if (!this.cache) {
+      const { pid } = await this.spawn({})
+      this.cache = pid
+    }
+    const { slot } = await this.schedule({
       data,
-      type,
+      pid: this.cache,
+      "content-type": type,
     })
-    return res.headers.get("id")
+    const msgs = await this.messages({ pid: this.cache, from: slot, limit: 1 })
+    return msgs.edges[0].node.message.Id
+  }
+
+  async cacheModule(data, type) {
+    const res = await this.post({ path: "/~wao@1.0/cache_module", data, type })
+    return res.headers.id
   }
   async message(args) {
     const pid = args.pid
@@ -230,26 +247,24 @@ class HB {
   async scheduleLua(...args) {
     return await this.scheduleLegacy(...args)
   }
-  async schedule({ pid, tags = {}, data, scheduler } = {}) {
+  async schedule({ pid, tags = {}, data } = {}) {
     pid ??= this.pid
-    scheduler ??= this.scheduler
     let _tags = mergeLeft(tags, {
       method: "POST",
       path: `/${pid}/schedule`,
-      scheduler,
       Type: "Message",
       Target: pid,
     })
     if (data) _tags.data = data
-    let res = await this.send(_tags)
-    return { slot: res.headers.get("slot"), res }
+    let res = await this.post(_tags)
+    return { slot: res.headers.slot, res }
   }
 
   async spawnAOS(image) {
     const addr = await this.dev.meta.info({ key: "address" })
     this.scheduler ??= addr
     image ??= this.image ?? (await this.getImage())
-    const res = await this.send({
+    const res = await this.post({
       device: "process@1.0",
       path: "/schedule",
       scheduler: this.scheduler,
@@ -260,12 +275,12 @@ class HB {
       "random-seed": seed(16),
       Type: "Process",
       image,
-      "scheduler-device": "scheduler@1.0",
       "execution-device": "stack@1.0",
       "device-stack": [
         "wasi@1.0",
         "json-iface@1.0",
         "wasm-64@1.0",
+        "patch@1.0",
         "multipass@1.0",
       ],
       "output-prefix": "wasm",
@@ -273,7 +288,7 @@ class HB {
       "stack-keys": ["init", "compute", "snapshot", "normalize"],
       passes: 2,
     })
-    const pid = res.headers.get("process")
+    const pid = res.headers.process
     this.pid ??= pid
     return { pid, res }
   }
@@ -282,7 +297,7 @@ class HB {
     const addr = await this.dev.meta.info({ key: "address" })
     this.scheduler ??= addr
     lua ??= this.lua ?? (await this.getLua())
-    const res = await this.send({
+    const res = await this.post({
       device: "process@1.0",
       path: "/schedule",
       scheduler: this.scheduler,
@@ -293,11 +308,10 @@ class HB {
       "random-seed": seed(16),
       Type: "Process",
       module: lua,
-      "scheduler-device": "scheduler@1.0",
       "execution-device": "lua@5.3a",
       "patch-from": "/results/outbox",
     })
-    const pid = res.headers.get("process")
+    const pid = res.headers.process
     this.pid ??= pid
     return { pid, res }
   }
@@ -333,6 +347,10 @@ class HB {
     }
     return _metrics
   }
+  async now({ pid, path = "" }) {
+    if (path && !/^\//.test(path)) path = "/" + path
+    return await this.getJSON({ path: `/${pid}/now${path}` })
+  }
 
   async messages({ pid, from, to, limit } = {}) {
     let params = `target=${pid}`
@@ -373,7 +391,7 @@ class HB {
     if (typeof action === "string") tags.Action = action
     let json = { Tags: buildTags(tags) }
     if (data) json.Data = data
-    const res = await this.send({
+    const res = await this.post({
       path: "/~relay@1.0/call",
       "relay-method": "POST",
       "relay-path": `/dry-run?process-id=${pid}`,
@@ -383,18 +401,40 @@ class HB {
     return JSON.parse(res.body)
   }
 
-  async get({ device, path = "~meta@1.0/info" }) {
-    return (await this.request({ device, path, method: "GET" })).body
+  async post(obj, json) {
+    const _json = json ? "/~json@1.0/serialize" : ""
+    obj.path += _json
+    return await this.send(await this.sign(obj))
   }
-
-  async post({ device, tags, path = "/schedule" }) {
-    return await this.request({ tags, device, path, method: "POST" })
+  async get({ path, ...params }, json = false) {
+    const _json = json ? "/~json@1.0/serialize" : ""
+    path ??= "/~message@1.0"
+    if (!/^\//.test(path)) path = "/" + path
+    let _params = ""
+    if (!isEmpty(params)) {
+      let i = 0
+      for (const k in params) {
+        _params += `${i === 0 ? "?" : "&"}${k}=${params[k]}`
+        i++
+      }
+    }
+    const response = await fetch(`${this.url}${path}${_json}${_params}`)
+    let headers = {}
+    response.headers.forEach((v, k) => (headers[k] = v))
+    return {
+      response,
+      headers,
+      body: await response.text(),
+      status: response.status,
+    }
   }
-
-  async request({ device, tags, method = "POST", path = "/schedule" }) {
-    let _tags = mergeLeft(tags, { path, method })
-    if (device) _tags.device = device
-    return await this._request(_tags)
+  async postJSON(args) {
+    const res = await this.post(args, true)
+    return JSON.parse(res.body)
+  }
+  async getJSON(args) {
+    const res = await this.get(args, true)
+    return JSON.parse(res.body)
   }
 }
 

package/esm/hyperbeam.js

@@ -1,7 +1,8 @@
 import { spawn } from "child_process"
 import { resolve } from "path"
 import { isNil, map } from "ramda"
-import { readFileSync } from "fs"
+import { rmSync, readFileSync, readdirSync } from "fs"
+
 export default class HyperBEAM {
   constructor({
     port = 10001,
@@ -9,6 +10,7 @@ export default class HyperBEAM {
     bundler,
     gateway,
     wallet,
+    clearCache,
     cwd = "./HyperBEAM",
     c,
     cmake,
@@ -20,9 +22,22 @@ export default class HyperBEAM {
     store_prefix,
     operator,
   } = {}) {
+    if (clearCache) {
+      const dirname = resolve(process.cwd(), cwd)
+      for (let v of readdirSync(dirname)) {
+        if (/^cache-/.test(v)) {
+          try {
+            rmSync(resolve(dirname, v), { recursive: true, force: true })
+          } catch (e) {
+            console.log(e)
+          }
+        }
+      }
+    }
     this.cu = cu
-    this.store_prefix =
-      store_prefix ?? "cache-mainnet-" + Math.floor(Math.random() * 10000000)
+    this.store_prefix = store_prefix
+      ? "cache-mainnet-" + Math.floor(Math.random() * 10000000)
+      : "cache-mainnet"
     this.p4_lua = p4_lua
     this.simplePay = simplePay
     this.spp = simplePayPrice
@@ -66,6 +81,8 @@ export default class HyperBEAM {
     const _gateway = gateway
       ? `, gateway => <<"http://localhost:${gateway}">>`
       : ""
+
+    // store option will be overwritten by hb.erl
     const _store = this.store_prefix
       ? `, store => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }, #{ <<"store-module">> => hb_store_gateway, <<"subindex">> => [#{ <<"name">> => <<"Data-Protocol">>, <<"value">> => <<"ao">> }], <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }] }, #{ <<"store-module">> => hb_store_gateway, <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }] }]`
       : ""
@@ -102,7 +119,7 @@ export default class HyperBEAM {
         : !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}${_store}${_faff}${_bundler}${_routes}${_on}${_p4_non_chargable}${_operator}${_spp}${_node_processes} }).`
+    const start = `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_faff}${_bundler}${_routes}${_on}${_p4_non_chargable}${_operator}${_spp}${_node_processes}}).`
     return start
   }