wao 0.10.3 → 0.10.4

package/cjs/server.js

@@ -340,6 +340,22 @@ var Server = /*#__PURE__*/function () {
           return _ref8.apply(this, arguments);
         };
       }());
+      app.get("*", /*#__PURE__*/function () {
+        var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(req, res) {
+          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+            while (1) switch (_context8.prev = _context8.next) {
+              case 0:
+                console.log("what");
+              case 1:
+              case "end":
+                return _context8.stop();
+            }
+          }, _callee8);
+        }));
+        return function (_x15, _x16) {
+          return _ref9.apply(this, arguments);
+        };
+      }());
       var server = app.listen(this.ports.ar, function () {
         console.log("AR on port ".concat(_this.ports.ar));
       });
@@ -358,11 +374,11 @@ var Server = /*#__PURE__*/function () {
         return res.send("ao messenger unit");
       });
       app.post("/monitor/:id", /*#__PURE__*/function () {
-        var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(req, res) {
-          return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-            while (1) switch (_context8.prev = _context8.next) {
+        var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(req, res) {
+          return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+            while (1) switch (_context9.prev = _context9.next) {
               case 0:
-                _context8.next = 2;
+                _context9.next = 2;
                 return _this2.monitor({
                   process: req.params.id
                 });
@@ -373,20 +389,20 @@ var Server = /*#__PURE__*/function () {
                 });
               case 3:
               case "end":
-                return _context8.stop();
+                return _context9.stop();
             }
-          }, _callee8);
+          }, _callee9);
         }));
-        return function (_x15, _x16) {
-          return _ref9.apply(this, arguments);
+        return function (_x17, _x18) {
+          return _ref10.apply(this, arguments);
         };
       }());
       app["delete"]("/monitor/:id", /*#__PURE__*/function () {
-        var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(req, res) {
-          return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-            while (1) switch (_context9.prev = _context9.next) {
+        var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(req, res) {
+          return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+            while (1) switch (_context10.prev = _context10.next) {
               case 0:
-                _context9.next = 2;
+                _context10.next = 2;
                 return _this2.unmonitor({
                   process: req.params.id
                 });
@@ -397,57 +413,57 @@ var Server = /*#__PURE__*/function () {
                 });
               case 3:
               case "end":
-                return _context9.stop();
+                return _context10.stop();
             }
-          }, _callee9);
+          }, _callee10);
         }));
-        return function (_x17, _x18) {
-          return _ref10.apply(this, arguments);
+        return function (_x19, _x20) {
+          return _ref11.apply(this, arguments);
         };
       }());
       app.post("/", /*#__PURE__*/function () {
-        var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(req, res) {
-          var binary, valid, type, item, _tags, err, _res;
-          return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-            while (1) switch (_context10.prev = _context10.next) {
+        var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(req, res) {
+          var binary, valid, type, item, _tags, err, _res2;
+          return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+            while (1) switch (_context11.prev = _context11.next) {
               case 0:
                 binary = req.body;
-                _context10.next = 3;
+                _context11.next = 3;
                 return _arbundles.DataItem.verify(binary);
               case 3:
-                valid = _context10.sent;
+                valid = _context11.sent;
                 type = null;
                 item = null;
                 if (valid) item = new _arbundles.DataItem(binary);
                 _tags = (0, _utils.tags)(item.tags);
                 err = null;
                 if (!(_tags.Type === "Process")) {
-                  _context10.next = 16;
+                  _context11.next = 16;
                   break;
                 }
-                _context10.next = 12;
+                _context11.next = 12;
                 return _this2.spawn({
                   item: item,
                   module: _tags.Module,
                   scheduler: _tags.Scheduler
                 });
               case 12:
-                _res = _context10.sent;
-                if (!_res) err = "bad requrest";
-                _context10.next = 22;
+                _res2 = _context11.sent;
+                if (!_res2) err = "bad requrest";
+                _context11.next = 22;
                 break;
               case 16:
                 if (!(_tags.Type === "Message")) {
-                  _context10.next = 21;
+                  _context11.next = 21;
                   break;
                 }
-                _context10.next = 19;
+                _context11.next = 19;
                 return _this2.message({
                   item: item,
                   process: item.target
                 });
               case 19:
-                _context10.next = 22;
+                _context11.next = 22;
                 break;
               case 21:
                 err = true;
@@ -464,12 +480,12 @@ var Server = /*#__PURE__*/function () {
                 }
               case 23:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
-          }, _callee10);
+          }, _callee11);
         }));
-        return function (_x19, _x20) {
-          return _ref11.apply(this, arguments);
+        return function (_x21, _x22) {
+          return _ref12.apply(this, arguments);
         };
       }());
       var server = app.listen(this.ports.mu, function () {
@@ -502,23 +518,23 @@ var Server = /*#__PURE__*/function () {
         var _this3$mem$env$pid$re, _this3$mem$env$pid;
         var pid = req.params.pid;
         var edges = (0, _ramda.map)(/*#__PURE__*/function () {
-          var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(v) {
+          var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(v) {
             var _mtx$anchor, _tx$anchor;
             var tx, _tags, mid, mtx;
-            return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-              while (1) switch (_context11.prev = _context11.next) {
+            return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+              while (1) switch (_context12.prev = _context12.next) {
                 case 0:
-                  _context11.next = 2;
+                  _context12.next = 2;
                   return _this3.mem.getTx(v);
                 case 2:
-                  tx = _context11.sent;
+                  tx = _context12.sent;
                   _tags = (0, _utils.tags)(v.tags);
                   mid = _tags.Message;
-                  _context11.next = 7;
+                  _context12.next = 7;
                   return _this3.mem.getTx(mid);
                 case 7:
-                  mtx = _context11.sent;
-                  return _context11.abrupt("return", {
+                  mtx = _context12.sent;
+                  return _context12.abrupt("return", {
                     cursor: v,
                     node: {
                       message: {
@@ -542,12 +558,12 @@ var Server = /*#__PURE__*/function () {
                   });
                 case 9:
                 case "end":
-                  return _context11.stop();
+                  return _context12.stop();
               }
-            }, _callee11);
+            }, _callee12);
           }));
-          return function (_x21) {
-            return _ref12.apply(this, arguments);
+          return function (_x23) {
+            return _ref13.apply(this, arguments);
           };
         }())((0, _ramda.reverse)((_this3$mem$env$pid$re = (_this3$mem$env$pid = _this3.mem.env[pid]) === null || _this3$mem$env$pid === void 0 ? void 0 : _this3$mem$env$pid.results) !== null && _this3$mem$env$pid$re !== void 0 ? _this3$mem$env$pid$re : [])); // need mod
         res.json({
@@ -557,6 +573,22 @@ var Server = /*#__PURE__*/function () {
           edges: edges
         });
       });
+      app.get("*", /*#__PURE__*/function () {
+        var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
+          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+            while (1) switch (_context13.prev = _context13.next) {
+              case 0:
+                console.log("what2");
+              case 1:
+              case "end":
+                return _context13.stop();
+            }
+          }, _callee13);
+        }));
+        return function (_x24, _x25) {
+          return _ref14.apply(this, arguments);
+        };
+      }());
       var server = app.listen(this.ports.su, function () {
         return console.log("SU on port ".concat(_this3.ports.su));
       });
@@ -576,38 +608,38 @@ var Server = /*#__PURE__*/function () {
         });
       });
       app.get("/result/:mid", /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(req, res) {
+        var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(req, res) {
           var res2;
-          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-            while (1) switch (_context12.prev = _context12.next) {
+          return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+            while (1) switch (_context14.prev = _context14.next) {
               case 0:
-                _context12.next = 2;
+                _context14.next = 2;
                 return _this4.result({
                   message: req.params.mid,
                   process: req.query["process-id"]
                 });
               case 2:
-                res2 = _context12.sent;
+                res2 = _context14.sent;
                 res.json(res2);
               case 4:
               case "end":
-                return _context12.stop();
+                return _context14.stop();
             }
-          }, _callee12);
+          }, _callee14);
         }));
-        return function (_x22, _x23) {
-          return _ref13.apply(this, arguments);
+        return function (_x26, _x27) {
+          return _ref15.apply(this, arguments);
         };
       }());
       app.post("/dry-run", /*#__PURE__*/function () {
-        var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
+        var _ref16 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(req, res) {
           var process, _req$body2, id, owner, tags, data, res2;
-          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-            while (1) switch (_context13.prev = _context13.next) {
+          return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+            while (1) switch (_context15.prev = _context15.next) {
               case 0:
                 process = req.query["process-id"];
                 _req$body2 = req.body, id = _req$body2.Id, owner = _req$body2.Owner, tags = _req$body2.Tags, data = _req$body2.Data;
-                _context13.next = 4;
+                _context15.next = 4;
                 return _this4.dryrun({
                   id: id,
                   owner: owner,
@@ -616,7 +648,7 @@ var Server = /*#__PURE__*/function () {
                   process: process
                 });
               case 4:
-                res2 = _context13.sent;
+                res2 = _context15.sent;
                 if (!res2) {
                   res.status(400);
                   res.json({
@@ -628,12 +660,91 @@ var Server = /*#__PURE__*/function () {
                 }
               case 6:
               case "end":
-                return _context13.stop();
+                return _context15.stop();
             }
-          }, _callee13);
+          }, _callee15);
         }));
-        return function (_x24, _x25) {
-          return _ref14.apply(this, arguments);
+        return function (_x28, _x29) {
+          return _ref16.apply(this, arguments);
+        };
+      }());
+      app.get("/results/:pid", /*#__PURE__*/function () {
+        var _ref17 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(req, res) {
+          var _this4$mem$env$pid$re, _this4$mem$env$pid;
+          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, _iterator, _step, v, _this4$mem$msgs$v;
+          return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+            while (1) switch (_context16.prev = _context16.next) {
+              case 0:
+                pid = req.params.pid;
+                _req$query = req.query, _req$query$from = _req$query.from, from = _req$query$from === void 0 ? null : _req$query$from, _req$query$to = _req$query.to, to = _req$query$to === void 0 ? null : _req$query$to, _req$query$sort = _req$query.sort, sort = _req$query$sort === void 0 ? "ASC" : _req$query$sort, _req$query$limit = _req$query.limit, limit = _req$query$limit === void 0 ? 25 : _req$query$limit;
+                results = (_this4$mem$env$pid$re = (_this4$mem$env$pid = _this4.mem.env[pid]) === null || _this4$mem$env$pid === void 0 ? void 0 : _this4$mem$env$pid.results) !== null && _this4$mem$env$pid$re !== void 0 ? _this4$mem$env$pid$re : [];
+                if (sort.toLowerCase() === "desc") results = (0, _ramda.reverse)(results);
+                _res = [];
+                i = 1;
+                count = 0;
+                started = (0, _ramda.isNil)(from);
+                _iterator = _createForOfIteratorHelper(results);
+                _context16.prev = 9;
+                _iterator.s();
+              case 11:
+                if ((_step = _iterator.n()).done) {
+                  _context16.next = 26;
+                  break;
+                }
+                v = _step.value;
+                if (!started) {
+                  _context16.next = 22;
+                  break;
+                }
+                _res.push({
+                  cursor: v,
+                  node: (_this4$mem$msgs$v = _this4.mem.msgs[v]) === null || _this4$mem$msgs$v === void 0 ? void 0 : _this4$mem$msgs$v.res
+                });
+                count++;
+                if (!(!(0, _ramda.isNil)(to) && v === to)) {
+                  _context16.next = 18;
+                  break;
+                }
+                return _context16.abrupt("break", 26);
+              case 18:
+                if (!(limit <= count)) {
+                  _context16.next = 20;
+                  break;
+                }
+                return _context16.abrupt("break", 26);
+              case 20:
+                _context16.next = 23;
+                break;
+              case 22:
+                if (from === v) started = true;
+              case 23:
+                i++;
+              case 24:
+                _context16.next = 11;
+                break;
+              case 26:
+                _context16.next = 31;
+                break;
+              case 28:
+                _context16.prev = 28;
+                _context16.t0 = _context16["catch"](9);
+                _iterator.e(_context16.t0);
+              case 31:
+                _context16.prev = 31;
+                _iterator.f();
+                return _context16.finish(31);
+              case 34:
+                res.json({
+                  edges: _res
+                });
+              case 35:
+              case "end":
+                return _context16.stop();
+            }
+          }, _callee16, null, [[9, 28, 31, 34]]);
+        }));
+        return function (_x30, _x31) {
+          return _ref17.apply(this, arguments);
         };
       }());
       var server = app.listen(this.ports.cu, function () {
@@ -647,11 +758,11 @@ var Server = /*#__PURE__*/function () {
       var _this5 = this;
       return new Promise(function (res) {
         var count = 0;
-        var _iterator = _createForOfIteratorHelper(_this5.servers),
-          _step;
+        var _iterator2 = _createForOfIteratorHelper(_this5.servers),
+          _step2;
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var v = _step.value;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var v = _step2.value;
             v.close(function () {
               count += 1;
               if (count >= 4) {
@@ -661,9 +772,9 @@ var Server = /*#__PURE__*/function () {
             });
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator.f();
+          _iterator2.f();
         }
       });
     }

package/esm/server.js

@@ -6,7 +6,7 @@ import { tags, toGraphObj, optAO } from "./utils.js"
 import { connect } from "./aoconnect.js"
 import { GQL, cu, su, mu } from "./test.js"
 import bodyParser from "body-parser"
-import { keys, map, reverse } from "ramda"
+import { keys, map, isNil, reverse } from "ramda"
 
 class Server {
   constructor({
@@ -148,7 +148,9 @@ class Server {
         res.json({ id: req.body.id })
       }
     })
-
+    app.get("*", async (req, res) => {
+      console.log("what")
+    })
     const server = app.listen(this.ports.ar, () => {
       console.log(`AR on port ${this.ports.ar}`)
     })
@@ -246,6 +248,10 @@ class Server {
       })(reverse(this.mem.env[pid]?.results ?? [])) // need mod
       res.json({ page_info: { has_next_page: false }, edges })
     })
+    app.get("*", async (req, res) => {
+      console.log("what2")
+    })
+
     const server = app.listen(this.ports.su, () =>
       console.log(`SU on port ${this.ports.su}`),
     )
@@ -277,6 +283,28 @@ class Server {
         res.json(res2)
       }
     })
+    app.get("/results/:pid", async (req, res) => {
+      const pid = req.params.pid
+      const { from = null, to = null, sort = "ASC", limit = 25 } = req.query
+      let results = this.mem.env[pid]?.results ?? []
+      if (sort.toLowerCase() === "desc") results = reverse(results)
+      let _res = []
+      let i = 1
+      let count = 0
+      let started = isNil(from)
+      for (let v of results) {
+        if (started) {
+          _res.push({ cursor: v, node: this.mem.msgs[v]?.res })
+          count++
+          if (!isNil(to) && v === to) break
+          if (limit <= count) break
+        } else if (from === v) started = true
+
+        i++
+      }
+      res.json({ edges: _res })
+    })
+
     const server = app.listen(this.ports.cu, () =>
       console.log(`CU on port ${this.ports.cu}`),
     )

package/package.json

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