wao 0.13.0 → 0.13.2

package/esm/server.js

@@ -1,4 +1,5 @@
 import crypto from "crypto"
+import HB from "./hb.js"
 import express from "express"
 import cors from "cors"
 import base64url from "base64url"
@@ -8,9 +9,8 @@ import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import bodyParser from "body-parser"
 import { keys, map, isNil, reverse, omit } from "ramda"
-import { Bundle } from "arbundles"
 import { httpbis, createVerifier } from "http-message-signatures"
-import { createPublicKey, randomBytes } from "node:crypto"
+import { createPublicKey } from "node:crypto"
 const { verifyMessage } = httpbis
 
 function toANS104Request(fields) {
@@ -77,6 +77,7 @@ class Server {
     mu = 4002,
     su = 4003,
     cu = 4004,
+    hb_url,
     aoconnect,
     log = false,
     db,
@@ -90,6 +91,8 @@ class Server {
       cu = port + 4
       aoconnect = optAO(5000)
     }
+    let hb = null
+    if (hb_url) hb = new HB({ url: hb_url })
     const {
       ar: _ar,
       message,
@@ -100,7 +103,9 @@ class Server {
       mem,
       monitor,
       unmonitor,
-    } = connect(aoconnect, { log, cache: db })
+      recover,
+    } = connect(aoconnect, { log, cache: db, hb })
+    this.recover = recover
     this.monitor = monitor
     this.unmonitor = unmonitor
     this.spawn = spawn
@@ -156,6 +161,7 @@ class Server {
         createPublicKey({ key, format: "jwk" }),
         "rsa-pss-sha512"
       )
+      let id = null
       try {
         const isValid = await verifyMessage(
           { keyLookup: params => ({ verify: verifier }) },
@@ -166,15 +172,21 @@ class Server {
           }
         )
         const item = toANS104Request(sigs).item
+
         if (sigs.slot === "0" || sigs.type === "Process") {
-          for (let v of item.tags) if (v.name === "Type") v.value = "Process"
+          for (let v of item.tags) {
+            if (v.name === "Type") v.value = "Process"
+          }
+
           const res = await this.spawn({
             http_msg: item,
             module: sigs.module,
             scheduler: sigs.scheduler,
           })
         } else if (sigs.type === "Message") {
+          for (let v of item.tags) if (v.name === "id") id = v.value
           const res = await this.message({
+            slot: sigs.slot,
             http_msg: item,
             process: sigs.target,
           })
@@ -182,7 +194,6 @@ class Server {
       } catch (e) {
         console.log(e, req.originalUrl)
       }
-      console.log("bundler success [pid]", sigs.target, "[slot]", sigs.slot)
       return res.status(200).send("Success")
     })
     const server = app.listen(this.ports.bundler, () => {
@@ -396,14 +407,15 @@ class Server {
     const result = async (req, res) => {
       let message = req.params.mid
       const process = req.query["process-id"]
+      // check if recovery is ongoing and
       if (isNil(this.mem.env[process])) {
-        console.log("process not found:", req.query["process-id"])
-        res.status(404)
-        res.json({ error: `not found` })
-        setTimeout(() => {
-          console.log(this.mem.env)
-        }, 1000)
-        return
+        const { success } = await this.recover(process)
+        if (!success) {
+          console.log("process not found:", req.query["process-id"])
+          res.status(404)
+          res.json({ error: `not found` })
+          return
+        }
       }
       if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
         message = this.mem.env[process]?.results?.[message]

package/esm/tao.js

@@ -1,9 +1,11 @@
 import BAO from "./bao.js"
 import { connect } from "./aoconnect.js"
 import AR from "./tar.js"
+import HB from "./hb.js"
 
 class AO extends BAO {
   constructor(opt = {}) {
+    if (opt.hb_url) opt.hb = new HB({ url: opt.hb_url })
     super({ ...opt, connect, AR })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"