wao 0.13.0 → 0.13.2

package/cjs/server.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _crypto = _interopRequireDefault(require("crypto"));
+var _hb = _interopRequireDefault(require("./hb.js"));
 var _express = _interopRequireDefault(require("express"));
 var _cors = _interopRequireDefault(require("cors"));
 var _base64url = _interopRequireDefault(require("base64url"));
@@ -98,6 +99,7 @@ var Server = /*#__PURE__*/function () {
       su = _ref$su === void 0 ? 4003 : _ref$su,
       _ref$cu = _ref.cu,
       cu = _ref$cu === void 0 ? 4004 : _ref$cu,
+      hb_url = _ref.hb_url,
       aoconnect = _ref.aoconnect,
       _ref$log = _ref.log,
       log = _ref$log === void 0 ? false : _ref$log,
@@ -112,9 +114,14 @@ var Server = /*#__PURE__*/function () {
       cu = port + 4;
       aoconnect = (0, _utils.optAO)(5000);
     }
+    var hb = null;
+    if (hb_url) hb = new _hb["default"]({
+      url: hb_url
+    });
     var _connect = (0, _aoconnect.connect)(aoconnect, {
         log: log,
-        cache: db
+        cache: db,
+        hb: hb
       }),
       _ar = _connect.ar,
       message = _connect.message,
@@ -124,7 +131,9 @@ var Server = /*#__PURE__*/function () {
       results = _connect.results,
       mem = _connect.mem,
       monitor = _connect.monitor,
-      unmonitor = _connect.unmonitor;
+      unmonitor = _connect.unmonitor,
+      recover = _connect.recover;
+    this.recover = recover;
     this.monitor = monitor;
     this.unmonitor = unmonitor;
     this.spawn = spawn;
@@ -163,7 +172,7 @@ var Server = /*#__PURE__*/function () {
       }));
       app.post("/tx", /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(req, res) {
-          var lines, sigs, currentKey, _iterator, _step, line, trimmed, headerMatch, _key, value, input, key, verifier, isValid, item, _iterator2, _step2, v, _res2, _res3;
+          var lines, sigs, currentKey, _iterator, _step, line, trimmed, headerMatch, _key, value, input, key, verifier, id, isValid, item, _iterator2, _step2, v, _res2, _iterator3, _step3, _v, _res3;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -228,8 +237,9 @@ var Server = /*#__PURE__*/function () {
                   key: key,
                   format: "jwk"
                 }), "rsa-pss-sha512");
-                _context.prev = 32;
-                _context.next = 35;
+                id = null;
+                _context.prev = 33;
+                _context.next = 36;
                 return verifyMessage({
                   keyLookup: function keyLookup(params) {
                     return {
@@ -241,11 +251,11 @@ var Server = /*#__PURE__*/function () {
                   headers: req.headers,
                   url: "http://ao.com".concat(req.headers.path)
                 });
-              case 35:
+              case 36:
                 isValid = _context.sent;
                 item = toANS104Request(sigs).item;
                 if (!(sigs.slot === "0" || sigs.type === "Process")) {
-                  _context.next = 45;
+                  _context.next = 46;
                   break;
                 }
                 _iterator2 = _createForOfIteratorHelper(item.tags);
@@ -259,43 +269,54 @@ var Server = /*#__PURE__*/function () {
                 } finally {
                   _iterator2.f();
                 }
-                _context.next = 42;
+                _context.next = 43;
                 return _this.spawn({
                   http_msg: item,
                   module: sigs.module,
                   scheduler: sigs.scheduler
                 });
-              case 42:
+              case 43:
                 _res2 = _context.sent;
-                _context.next = 49;
+                _context.next = 52;
                 break;
-              case 45:
+              case 46:
                 if (!(sigs.type === "Message")) {
-                  _context.next = 49;
+                  _context.next = 52;
                   break;
                 }
-                _context.next = 48;
+                _iterator3 = _createForOfIteratorHelper(item.tags);
+                try {
+                  for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                    _v = _step3.value;
+                    if (_v.name === "id") id = _v.value;
+                  }
+                } catch (err) {
+                  _iterator3.e(err);
+                } finally {
+                  _iterator3.f();
+                }
+                _context.next = 51;
                 return _this.message({
+                  slot: sigs.slot,
                   http_msg: item,
                   process: sigs.target
                 });
-              case 48:
+              case 51:
                 _res3 = _context.sent;
-              case 49:
-                _context.next = 54;
+              case 52:
+                _context.next = 57;
                 break;
-              case 51:
-                _context.prev = 51;
-                _context.t1 = _context["catch"](32);
-                console.log(_context.t1, req.originalUrl);
               case 54:
-                console.log("bundler success [pid]", sigs.target, "[slot]", sigs.slot);
+                _context.prev = 54;
+                _context.t1 = _context["catch"](33);
+                console.log(_context.t1, req.originalUrl);
+              case 57:
                 return _context.abrupt("return", res.status(200).send("Success"));
-              case 56:
+              case 58:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[7, 21, 24, 27], [32, 51]]);
+          }, _callee, null, [[7, 21, 24, 27], [33, 54]]);
         }));
         return function (_x, _x2) {
           return _ref2.apply(this, arguments);
@@ -792,14 +813,23 @@ var Server = /*#__PURE__*/function () {
       });
       var result = /*#__PURE__*/function () {
         var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
-          var message, process, _this5$mem$env$proces, res2;
+          var message, process, _yield$_this5$recover, success, _this5$mem$env$proces, res2;
           return _regeneratorRuntime().wrap(function _callee13$(_context13) {
             while (1) switch (_context13.prev = _context13.next) {
               case 0:
                 message = req.params.mid;
-                process = req.query["process-id"];
+                process = req.query["process-id"]; // check if recovery is ongoing and
                 if (!(0, _ramda.isNil)(_this5.mem.env[process])) {
-                  _context13.next = 8;
+                  _context13.next = 12;
+                  break;
+                }
+                _context13.next = 5;
+                return _this5.recover(process);
+              case 5:
+                _yield$_this5$recover = _context13.sent;
+                success = _yield$_this5$recover.success;
+                if (success) {
+                  _context13.next = 12;
                   break;
                 }
                 console.log("process not found:", req.query["process-id"]);
@@ -807,16 +837,13 @@ var Server = /*#__PURE__*/function () {
                 res.json({
                   error: "not found"
                 });
-                setTimeout(function () {
-                  console.log(_this5.mem.env);
-                }, 1000);
                 return _context13.abrupt("return");
-              case 8:
+              case 12:
                 if (!/^--[0-9a-zA-Z_-]{43,44}$/.test(message)) {
                   message = (_this5$mem$env$proces = _this5.mem.env[process]) === null || _this5$mem$env$proces === void 0 || (_this5$mem$env$proces = _this5$mem$env$proces.results) === null || _this5$mem$env$proces === void 0 ? void 0 : _this5$mem$env$proces[message];
                 }
                 if (!(0, _ramda.isNil)(message)) {
-                  _context13.next = 14;
+                  _context13.next = 18;
                   break;
                 }
                 console.log("message not found", message, req.params);
@@ -825,16 +852,16 @@ var Server = /*#__PURE__*/function () {
                   error: "Not Found"
                 });
                 return _context13.abrupt("return");
-              case 14:
-                _context13.next = 16;
+              case 18:
+                _context13.next = 20;
                 return _this5.result({
                   message: message,
                   process: process
                 });
-              case 16:
+              case 20:
                 res2 = _context13.sent;
                 res.json(res2);
-              case 18:
+              case 22:
               case "end":
                 return _context13.stop();
             }
@@ -913,7 +940,7 @@ var Server = /*#__PURE__*/function () {
       app.get("/results/:pid", /*#__PURE__*/function () {
         var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
           var _this5$mem$env$pid$re, _this5$mem$env$pid2;
-          var pid, _req$query, _req$query$from, from, _req$query$to, to, _req$query$sort, sort, _req$query$limit, limit, results, _res, i, count, started, _iterator3, _step3, v, _this5$mem$msgs$v;
+          var pid, _req$query, _req$query$from, from, _req$query$to, to, _req$query$sort, sort, _req$query$limit, limit, results, _res, i, count, started, _iterator4, _step4, v, _this5$mem$msgs$v;
           return _regeneratorRuntime().wrap(function _callee16$(_context16) {
             while (1) switch (_context16.prev = _context16.next) {
               case 0:
@@ -925,15 +952,15 @@ var Server = /*#__PURE__*/function () {
                 i = 1;
                 count = 0;
                 started = (0, _ramda.isNil)(from);
-                _iterator3 = _createForOfIteratorHelper(results);
+                _iterator4 = _createForOfIteratorHelper(results);
                 _context16.prev = 9;
-                _iterator3.s();
+                _iterator4.s();
               case 11:
-                if ((_step3 = _iterator3.n()).done) {
+                if ((_step4 = _iterator4.n()).done) {
                   _context16.next = 26;
                   break;
                 }
-                v = _step3.value;
+                v = _step4.value;
                 if (!started) {
                   _context16.next = 22;
                   break;
@@ -970,10 +997,10 @@ var Server = /*#__PURE__*/function () {
               case 28:
                 _context16.prev = 28;
                 _context16.t0 = _context16["catch"](9);
-                _iterator3.e(_context16.t0);
+                _iterator4.e(_context16.t0);
               case 31:
                 _context16.prev = 31;
-                _iterator3.f();
+                _iterator4.f();
                 return _context16.finish(31);
               case 34:
                 res.json({
@@ -1000,11 +1027,11 @@ var Server = /*#__PURE__*/function () {
       var _this6 = this;
       return new Promise(function (res) {
         var count = 0;
-        var _iterator4 = _createForOfIteratorHelper(_this6.servers),
-          _step4;
+        var _iterator5 = _createForOfIteratorHelper(_this6.servers),
+          _step5;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var v = _step4.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var v = _step5.value;
             v.close(function () {
               count += 1;
               if (count >= 4) {
@@ -1014,9 +1041,9 @@ var Server = /*#__PURE__*/function () {
             });
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator4.f();
+          _iterator5.f();
         }
       });
     }

package/cjs/tao.js

@@ -8,6 +8,7 @@ exports["default"] = void 0;
 var _bao = _interopRequireDefault(require("./bao.js"));
 var _aoconnect = require("./aoconnect.js");
 var _tar = _interopRequireDefault(require("./tar.js"));
+var _hb = _interopRequireDefault(require("./hb.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -28,6 +29,9 @@ var AO = /*#__PURE__*/function (_BAO) {
   function AO() {
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, AO);
+    if (opt.hb_url) opt.hb = new _hb["default"]({
+      url: opt.hb_url
+    });
     return _callSuper(this, AO, [_objectSpread(_objectSpread({}, opt), {}, {
       connect: _aoconnect.connect,
       AR: _tar["default"]

package/esm/aoconnect-base.js

@@ -3,7 +3,7 @@ const pkg = WarpArBundles.default ?? WarpArBundles
 const { DataItem } = pkg
 import crypto from "crypto"
 import base64url from "base64url"
-
+import { wait } from "../src/utils.js"
 import {
   tags,
   action,
@@ -25,9 +25,10 @@ import {
   o,
   reverse,
 } from "ramda"
-let count = 0
+
+let onRecovery = {}
 export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
-  return (mem, { cache, log = false, extensions = {} } = {}) => {
+  return (mem, { cache, log = false, extensions = {}, hb } = {}) => {
     const isMem = mem?.__type__ === "mem"
     if (!isMem) {
       let args = { cache }
@@ -367,21 +368,30 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       }
       return null
     }
-
     const message = async opt => {
-      const p = await mem.get("env", opt.process)
-      if (!p) return null
       let id = ""
       let owner = ""
       let item = null
       if (ar.isHttpMsg(opt.http_msg)) {
-        ;({ owner, item } = await ar.httpmsg(opt.http_msg))
-        id = opt.http_msg.target
+        ;({ id, owner, item } = await ar.httpmsg(opt.http_msg))
+        // check if process exists, and recover if necessary
+        const p = await mem.get("env", opt.process)
+        const new_slot = opt.slot * 1
+        const last_slot = !p ? -1 : p.results.length - 1
+        if (last_slot + 1 !== new_slot) {
+          console.log("need process recovery from HB:", opt.process)
+          if (!hb || opt.recovery) return null
+          await recover(opt.process)
+        }
       } else {
         let id = opt?.item?.id ?? ""
         let owner = opt.owner ?? ""
         let item = opt.item
       }
+
+      const p = await mem.get("env", opt.process)
+      if (!p) return null
+
       if (!opt.item && opt.signer) {
         opt.tags = buildTags(
           null,
@@ -456,6 +466,77 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
       }
       return id
     }
+    const recover = async (pid, next) => {
+      let count = 0
+      let success = false
+      if (hb) {
+        if (onRecovery[pid]) {
+          let success = false
+          let i = 0
+          while (true) {
+            await wait(1000)
+            if (!onRecovery[pid]) {
+              success = true
+              break
+            }
+            if (i > 10) break
+            i++
+          }
+          return { success }
+        } else {
+          onRecovery[pid] = true
+          try {
+            const p = await mem.get("env", pid)
+            const from = p ? p.results.length : 0
+            const msgs = next
+              ? await next()
+              : await hb.messages({ target: pid, from })
+            for (let v of msgs.edges) {
+              let item = {}
+              for (let k in v.node.message) {
+                item[k.toLowerCase()] = v.node.message[k]
+              }
+
+              item.tags.push({ name: "signature-input", value: "http-sig-" })
+              item.tags.push({
+                name: "siot",
+                value: Number(v.cursor).toString(),
+              })
+              item.tags.push({ name: "Owner", value: v.node.message.Owner })
+              // todo:  why all the ids from Hyperbeam are the same?
+              item.tags.push({ name: "id", value: v.node.message.Id })
+              item.target = pid
+
+              let _tags = tags(item.tags)
+              if (_tags.Type === "Process") {
+                await spawn({
+                  http_msg: item,
+                  scheduler: _tags.Scheduler,
+                  module: _tags.Module,
+                  slot: v.cursor,
+                  recovery: true,
+                })
+              } else {
+                await message({
+                  process: pid,
+                  http_msg: item,
+                  slot: v.cursor,
+                  recovery: true,
+                })
+              }
+              count++
+            }
+            if (msgs.next) await recover(pid, msgs.next)
+          } catch (e) {
+            console.log(e)
+          }
+          delete onRecovery[pid]
+        }
+        success = true
+      }
+      return { recovered: count, pid, success }
+    }
+
     const result = async opt => (await mem.get("msgs", opt.message))?.res
     return {
       message,
@@ -552,6 +633,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         }
         return null
       },
+      recover,
       mem,
     }
   }

package/esm/bao.js

@@ -51,6 +51,7 @@ class AO extends MAO {
     super({ ...opt, in_memory: true })
     this.in_memory = true
     this.createDataItemSigner = opt.createDataItemSigner ?? createDataItemSigner
+    this.hb = opt.hb
     const {
       modules,
       results,
@@ -61,12 +62,15 @@ class AO extends MAO {
       dryrun,
       monitor,
       unmonitor,
+      recover,
       mem,
     } = opt.connect(opt.mem, {
       extensions: opt.extensions,
       cache: opt.cache,
       reset: opt.reset,
+      hb: this.hb,
     })
+    this.recover = recover
     this.assign = assign
     this.result = async (...opt) => {
       const res = await result(...opt)
@@ -95,6 +99,7 @@ class AO extends MAO {
   async init(jwk) {
     if (!jwk && this.acc[0]) jwk = this.acc[0].jwk
     await this.ar.init(jwk)
+    if (this.hb) await this.hb.init(jwk)
     return this
   }
 

package/esm/bar.js

@@ -37,8 +37,13 @@ class AR extends MAR {
   }
   async httpmsg(msg) {
     const tags = t(msg.tags)
-    const { keyid: n } = parseSignatureInput(tags["signature-input"])
-    const owner = await this.arweave.wallets.jwkToAddress({ n })
+    let owner = null
+    try {
+      const { keyid: n } = parseSignatureInput(tags["signature-input"])
+      owner = await this.arweave.wallets.jwkToAddress({ n })
+    } catch (e) {
+      owner = tags.Owner ?? null
+    }
     await this.mem.set(msg, "txs", msg.id)
     return { item: msg, id: tags.id, tags, owner }
   }
@@ -65,6 +70,7 @@ class AR extends MAR {
     for (const v of buildTags(null, tags)) tx.addTag(v.name, v.value)
     return await this.postTx(tx, jwk)
   }
+
   async postItems(items, jwk) {
     let err = null
     ;({ err, jwk } = await this.checkWallet({ jwk }))

package/esm/hb.js

@@ -1,14 +1,17 @@
 import { connect, createSigner } from "aoconnect-wao"
-import { mergeLeft } from "ramda"
+import { last, isNotNil, mergeLeft } from "ramda"
 import { randomBytes } from "node:crypto"
 import { buildTags } from "./utils.js"
+
 class HB {
   constructor({ url = "http://localhost:10000" } = {}) {
     this.url = url
   }
 
   async metrics() {
-    const txt = await fetch(`${this.url}/metrics`).then(r => r.text())
+    const txt = await fetch(`${this.url}/~hyperbuddy@1.0/metrics`).then(r =>
+      r.text()
+    )
     const parts = txt.split(/\r?\n/)
     let index = 0
     let _metrics = {}
@@ -59,7 +62,24 @@ class HB {
     return this
   }
 
-  async process({ tags = {}, data = "1984" } = {}) {
+  async messages({ target, from, to, limit } = {}) {
+    let params = `target=${target}`
+    if (isNotNil(from)) params += `&from=${from}`
+    if (isNotNil(to)) params += `&to=${to}`
+    params += `&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({ target, from2, to })
+      }
+    }
+    return res
+  }
+
+  async process({ tags = {}, data } = {}) {
     tags = mergeLeft(tags, {
       data,
       Type: "Process",
@@ -74,7 +94,8 @@ class HB {
       "scheduler-device": "scheduler@1.0",
       "execution-device": "genesis-wasm@1.0",
     })
-    return await this.post({ tags })
+    const res = await this.post({ tags })
+    return await res.process.text()
   }
 
   async schedule({ tags = {}, data, process, action = "Eval" } = {}) {
@@ -96,10 +117,12 @@ class HB {
     })
   }
 
-  async dryrun({ tags = {}, process, action } = {}) {
+  async dryrun({ tags = {}, process, action, data } = {}) {
     if (typeof action === "string") tags.Action = action
+    let json = { Tags: buildTags(tags) }
+    if (data) json.Data = data
     return await fetch(
-      `${this.url}/~relay@1.0/call?relay-method=POST&relay-path=/dry-run?process-id=${process}/&content-type=application/json&body=${JSON.stringify({ Tags: buildTags(tags) })}`
+      `${this.url}/~relay@1.0/call?relay-method=POST&relay-path=/dry-run?process-id=${process}/&content-type=application/json&body=${JSON.stringify(json)}`
     ).then(r => r.json())
   }
 

package/esm/run.js

@@ -8,6 +8,7 @@ let {
   memory = false,
   port = 4000,
   db = ".cache",
+  hb,
 } = yargs(process.argv.slice(2)).argv
 db = memory ? null : resolve(process.cwd(), db)
 if (reset) {
@@ -15,6 +16,6 @@ if (reset) {
     unlinkSync(db)
   } catch (e) {}
 }
-const main = async () => new Server({ log: true, port, db })
+const main = async () => new Server({ log: true, port, db, hb_url: hb })
 
 main()