wao 0.10.1 → 0.10.2

package/cjs/{ar-base.js → bar.js}

@@ -62,18 +62,17 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "owner",
     value: function () {
       var _owner = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(di) {
-        var raw_owner, hashBuffer;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              raw_owner = di.rawOwner;
-              _context.t0 = Buffer;
+              _context.t0 = _base64url["default"];
+              _context.t1 = Buffer;
               _context.next = 4;
-              return crypto.subtle.digest("SHA-256", raw_owner);
+              return crypto.subtle.digest("SHA-256", di.rawOwner);
             case 4:
-              _context.t1 = _context.sent;
-              hashBuffer = _context.t0.from.call(_context.t0, _context.t1);
-              return _context.abrupt("return", _base64url["default"].encode(hashBuffer));
+              _context.t2 = _context.sent;
+              _context.t3 = _context.t1.from.call(_context.t1, _context.t2);
+              return _context.abrupt("return", _context.t0.encode.call(_context.t0, _context.t3));
             case 7:
             case "end":
               return _context.stop();
@@ -89,38 +88,37 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "dataitem",
     value: function () {
       var _dataitem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$target, target, _ref$data, data, _ref$tags, tags, signer, item, di, _tags, _item, owner;
+        var _ref$target, target, _ref$data, data, _ref$tags, tags, signer, item, di, _item, owner;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref$target = _ref.target, target = _ref$target === void 0 ? "" : _ref$target, _ref$data = _ref.data, data = _ref$data === void 0 ? "1984" : _ref$data, _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? {} : _ref$tags, signer = _ref.signer, item = _ref.item;
               di = item;
               if (di) {
-                _context2.next = 10;
+                _context2.next = 9;
                 break;
               }
-              _tags = (0, _utils.buildTags)(tags);
-              _context2.next = 6;
+              _context2.next = 5;
               return signer({
                 data: data,
-                tags: _tags,
+                tags: (0, _utils.buildTags)(tags),
                 target: target
               });
-            case 6:
+            case 5:
               _item = _context2.sent;
               di = new DataItem(_item.raw);
-              _context2.next = 11;
+              _context2.next = 10;
               break;
-            case 10:
+            case 9:
               tags = (0, _utils.tags)(di.tags);
-            case 11:
-              _context2.next = 13;
+            case 10:
+              _context2.next = 12;
               return this.owner(di);
-            case 13:
+            case 12:
               owner = _context2.sent;
-              _context2.next = 16;
+              _context2.next = 15;
               return di.id;
-            case 16:
+            case 15:
               _context2.t0 = _context2.sent;
               _context2.t1 = owner;
               _context2.t2 = di;
@@ -131,7 +129,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 item: _context2.t2,
                 tags: _context2.t3
               });
-            case 21:
+            case 20:
             case "end":
               return _context2.stop();
           }
@@ -146,7 +144,7 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "post",
     value: function () {
       var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var _ref2$data, data, _ref2$tags, tags, jwk, err, _yield$this$checkWall, tx, _tags, _iterator, _step, v;
+        var _ref2$data, data, _ref2$tags, tags, jwk, err, _yield$this$checkWall, tx, _iterator, _step, v;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -174,8 +172,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               });
             case 11:
               tx = _context3.sent;
-              _tags = (0, _utils.buildTags)(null, tags);
-              _iterator = _createForOfIteratorHelper(_tags);
+              _iterator = _createForOfIteratorHelper((0, _utils.buildTags)(null, tags));
               try {
                 for (_iterator.s(); !(_step = _iterator.n()).done;) {
                   v = _step.value;
@@ -186,11 +183,11 @@ var AR = /*#__PURE__*/function (_MAR) {
               } finally {
                 _iterator.f();
               }
-              _context3.next = 17;
+              _context3.next = 16;
               return this.postTx(tx, jwk);
-            case 17:
+            case 16:
               return _context3.abrupt("return", _context3.sent);
-            case 18:
+            case 17:
             case "end":
               return _context3.stop();
           }
@@ -490,7 +487,9 @@ var AR = /*#__PURE__*/function (_MAR) {
               block.txs.push(item.id);
               _txs2.block = block.id;
               _context5.next = 58;
-              return this.mem.set(_txs2, "txs", item.id);
+              return this.mem.set({
+                bundle: tx.id
+              }, "txs", item.id);
             case 58:
               _context5.next = 43;
               break;
@@ -606,7 +605,7 @@ var AR = /*#__PURE__*/function (_MAR) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return this.mem.get("txs", id);
+              return this.mem.getTx(id);
             case 2:
               return _context6.abrupt("return", _context6.sent);
             case 3:
@@ -636,7 +635,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 if (!(0, _ramda.isNil)(_string.string)) string = _string.string;
               }
               _context7.next = 5;
-              return this.mem.get("txs", id);
+              return this.mem.getTx(id);
             case 5:
               tx = _context7.sent;
               _data = (_tx$data = tx === null || tx === void 0 ? void 0 : tx.data) !== null && _tx$data !== void 0 ? _tx$data : null;

package/cjs/lfdb.js

@@ -22,7 +22,6 @@ var _default = exports["default"] = function _default(_this) {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              console.log(key, val);
               _val = null;
               if (_typeof(val) === "object" && !(0, _ramda.is)(Array, val)) {
                 _val = {};
@@ -62,13 +61,13 @@ var _default = exports["default"] = function _default(_this) {
                   }
                 }
               } else _val = val;
-              _context.next = 5;
+              _context.next = 4;
               return _localforage["default"].setItem(key, _val);
-            case 5:
+            case 4:
               _this.keys[key] = true;
-              _context.next = 8;
+              _context.next = 7;
               return _localforage["default"].setItem("keys", (0, _ramda.keys)(_this.keys));
-            case 8:
+            case 7:
             case "end":
               return _context.stop();
           }

package/cjs/server.js

@@ -499,37 +499,57 @@ var Server = /*#__PURE__*/function () {
         });
       });
       app.get("/:pid", function (req, res) {
-        var _this3$mem$env$pid$tx, _this3$mem$env$pid;
+        var _this3$mem$env$pid$re, _this3$mem$env$pid;
         var pid = req.params.pid;
-        var edges = (0, _ramda.map)(function (v) {
-          var _mtx$anchor, _tx$anchor;
-          var tx = _this3.mem.txs[v.id];
-          var _tags = (0, _utils.tags)(v.tags);
-          var mid = _tags.Message;
-          var mtx = _this3.mem.txs[mid];
-          return {
-            cursor: v.id,
-            node: {
-              message: {
-                id: mtx.id,
-                tags: mtx.tags,
-                owner: _this3.mem.addrmap[mtx.owner],
-                anchor: (_mtx$anchor = mtx.anchor) !== null && _mtx$anchor !== void 0 ? _mtx$anchor : null,
-                target: pid,
-                signature: mtx.signature,
-                data: tx.data
-              },
-              assignment: {
-                id: tx.id,
-                tags: tx.tags,
-                owner: _this3.mem.addrmap[tx.owner],
-                anchor: (_tx$anchor = tx.anchor) !== null && _tx$anchor !== void 0 ? _tx$anchor : null,
-                target: null,
-                signature: tx.signature
+        var edges = (0, _ramda.map)(/*#__PURE__*/function () {
+          var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(v) {
+            var _mtx$anchor, _tx$anchor;
+            var tx, _tags, mid, mtx;
+            return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+              while (1) switch (_context11.prev = _context11.next) {
+                case 0:
+                  _context11.next = 2;
+                  return _this3.mem.getTx(v);
+                case 2:
+                  tx = _context11.sent;
+                  _tags = (0, _utils.tags)(v.tags);
+                  mid = _tags.Message;
+                  _context11.next = 7;
+                  return _this3.mem.getTx(mid);
+                case 7:
+                  mtx = _context11.sent;
+                  return _context11.abrupt("return", {
+                    cursor: v,
+                    node: {
+                      message: {
+                        id: mtx.id,
+                        tags: mtx.tags,
+                        owner: _this3.mem.addrmap[mtx.owner],
+                        anchor: (_mtx$anchor = mtx.anchor) !== null && _mtx$anchor !== void 0 ? _mtx$anchor : null,
+                        target: pid,
+                        signature: mtx.signature,
+                        data: tx.data
+                      },
+                      assignment: {
+                        id: tx.id,
+                        tags: tx.tags,
+                        owner: _this3.mem.addrmap[tx.owner],
+                        anchor: (_tx$anchor = tx.anchor) !== null && _tx$anchor !== void 0 ? _tx$anchor : null,
+                        target: null,
+                        signature: tx.signature
+                      }
+                    }
+                  });
+                case 9:
+                case "end":
+                  return _context11.stop();
               }
-            }
+            }, _callee11);
+          }));
+          return function (_x21) {
+            return _ref12.apply(this, arguments);
           };
-        })((0, _ramda.reverse)((_this3$mem$env$pid$tx = (_this3$mem$env$pid = _this3.mem.env[pid]) === null || _this3$mem$env$pid === void 0 ? void 0 : _this3$mem$env$pid.txs) !== null && _this3$mem$env$pid$tx !== void 0 ? _this3$mem$env$pid$tx : []));
+        }())((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({
           page_info: {
             has_next_page: false
@@ -556,38 +576,38 @@ var Server = /*#__PURE__*/function () {
         });
       });
       app.get("/result/:mid", /*#__PURE__*/function () {
-        var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(req, res) {
+        var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(req, res) {
           var res2;
-          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 _this4.result({
                   message: req.params.mid,
                   process: req.query["process-id"]
                 });
               case 2:
-                res2 = _context11.sent;
+                res2 = _context12.sent;
                 res.json(res2);
               case 4:
               case "end":
-                return _context11.stop();
+                return _context12.stop();
             }
-          }, _callee11);
+          }, _callee12);
         }));
-        return function (_x21, _x22) {
-          return _ref12.apply(this, arguments);
+        return function (_x22, _x23) {
+          return _ref13.apply(this, arguments);
         };
       }());
       app.post("/dry-run", /*#__PURE__*/function () {
-        var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(req, res) {
+        var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(req, res) {
           var process, _req$body2, id, owner, tags, data, res2;
-          return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-            while (1) switch (_context12.prev = _context12.next) {
+          return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+            while (1) switch (_context13.prev = _context13.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;
-                _context12.next = 4;
+                _context13.next = 4;
                 return _this4.dryrun({
                   id: id,
                   owner: owner,
@@ -596,7 +616,7 @@ var Server = /*#__PURE__*/function () {
                   process: process
                 });
               case 4:
-                res2 = _context12.sent;
+                res2 = _context13.sent;
                 if (!res2) {
                   res.status(400);
                   res.json({
@@ -608,12 +628,12 @@ var Server = /*#__PURE__*/function () {
                 }
               case 6:
               case "end":
-                return _context12.stop();
+                return _context13.stop();
             }
-          }, _callee12);
+          }, _callee13);
         }));
-        return function (_x23, _x24) {
-          return _ref13.apply(this, arguments);
+        return function (_x24, _x25) {
+          return _ref14.apply(this, arguments);
         };
       }());
       var server = app.listen(this.ports.cu, function () {

package/cjs/tar.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _arBase = _interopRequireDefault(require("./ar-base.js"));
+var _bar = _interopRequireDefault(require("./bar.js"));
 var _armem = _interopRequireDefault(require("./armem.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; }
@@ -33,5 +33,5 @@ var AR = /*#__PURE__*/function (_BAR) {
   }
   _inherits(AR, _BAR);
   return _createClass(AR);
-}(_arBase["default"]);
+}(_bar["default"]);
 var _default = exports["default"] = AR;

package/cjs/tgql.js

@@ -213,7 +213,7 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
               _iterator3.s();
             case 22:
               if ((_step3 = _iterator3.n()).done) {
-                _context2.next = 111;
+                _context2.next = 113;
                 break;
               }
               v = _step3.value;
@@ -222,13 +222,13 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
                 _context2.next = 27;
                 break;
               }
-              return _context2.abrupt("continue", 109);
+              return _context2.abrupt("continue", 111);
             case 27:
               if (!(!(0, _ramda.isNil)(_block.max) && block.height > _block.max)) {
                 _context2.next = 29;
                 break;
               }
-              return _context2.abrupt("continue", 109);
+              return _context2.abrupt("continue", 111);
             case 29:
               _txs2 = block.txs;
               if (opt.asc !== true) _txs2 = (0, _ramda.reverse)(_txs2);
@@ -237,7 +237,7 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
               _iterator4.s();
             case 34:
               if ((_step4 = _iterator4.n()).done) {
-                _context2.next = 99;
+                _context2.next = 101;
                 break;
               }
               v2 = _step4.value;
@@ -246,113 +246,116 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
                 break;
               }
               after = true;
-              return _context2.abrupt("break", 99);
+              return _context2.abrupt("break", 101);
             case 39:
               if (!(!(0, _ramda.isNil)(opt.after) && count === 0 && !after)) {
                 _context2.next = 41;
                 break;
               }
-              return _context2.abrupt("continue", 97);
+              return _context2.abrupt("continue", 99);
             case 41:
-              tx = this.mem.txs[v2];
+              _context2.next = 43;
+              return this.mem.getTx(v2);
+            case 43:
+              tx = _context2.sent;
               if (!(!(0, _ramda.isNil)(ids) && ids.length > 0)) {
-                _context2.next = 45;
+                _context2.next = 47;
                 break;
               }
               if ((0, _ramda.includes)(tx.id, ids)) {
-                _context2.next = 45;
+                _context2.next = 47;
                 break;
               }
-              return _context2.abrupt("continue", 97);
-            case 45:
+              return _context2.abrupt("continue", 99);
+            case 47:
               if (!(!(0, _ramda.isNil)(owners) && owners.length > 0)) {
-                _context2.next = 48;
+                _context2.next = 50;
                 break;
               }
               if ((0, _ramda.includes)(tx.owner, owners)) {
-                _context2.next = 48;
+                _context2.next = 50;
                 break;
               }
-              return _context2.abrupt("continue", 97);
-            case 48:
+              return _context2.abrupt("continue", 99);
+            case 50:
               if (!(!(0, _ramda.isNil)(recipients) && recipients.length > 0)) {
-                _context2.next = 51;
+                _context2.next = 53;
                 break;
               }
               if ((0, _ramda.includes)(tx.recipient, recipients)) {
-                _context2.next = 51;
+                _context2.next = 53;
                 break;
               }
-              return _context2.abrupt("continue", 97);
-            case 51:
+              return _context2.abrupt("continue", 99);
+            case 53:
               tag_unmatch = false;
               _iterator5 = _createForOfIteratorHelper(tags);
-              _context2.prev = 53;
+              _context2.prev = 55;
               _iterator5.s();
-            case 55:
+            case 57:
               if ((_step5 = _iterator5.n()).done) {
-                _context2.next = 81;
+                _context2.next = 83;
                 break;
               }
               _v2 = _step5.value;
               ex = false;
               _iterator8 = _createForOfIteratorHelper(tx.tags);
-              _context2.prev = 59;
+              _context2.prev = 61;
               _iterator8.s();
-            case 61:
+            case 63:
               if ((_step8 = _iterator8.n()).done) {
-                _context2.next = 68;
+                _context2.next = 70;
                 break;
               }
               _v3 = _step8.value;
               if (!(_v3.name === _v2.name && (0, _ramda.includes)(_v3.value, _v2.values))) {
-                _context2.next = 66;
+                _context2.next = 68;
                 break;
               }
               ex = true;
-              return _context2.abrupt("break", 68);
-            case 66:
-              _context2.next = 61;
-              break;
+              return _context2.abrupt("break", 70);
             case 68:
-              _context2.next = 73;
+              _context2.next = 63;
               break;
             case 70:
-              _context2.prev = 70;
-              _context2.t0 = _context2["catch"](59);
+              _context2.next = 75;
+              break;
+            case 72:
+              _context2.prev = 72;
+              _context2.t0 = _context2["catch"](61);
               _iterator8.e(_context2.t0);
-            case 73:
-              _context2.prev = 73;
+            case 75:
+              _context2.prev = 75;
               _iterator8.f();
-              return _context2.finish(73);
-            case 76:
+              return _context2.finish(75);
+            case 78:
               if (ex) {
-                _context2.next = 79;
+                _context2.next = 81;
                 break;
               }
               tag_unmatch = true;
-              return _context2.abrupt("break", 81);
-            case 79:
-              _context2.next = 55;
-              break;
+              return _context2.abrupt("break", 83);
             case 81:
-              _context2.next = 86;
+              _context2.next = 57;
               break;
             case 83:
-              _context2.prev = 83;
-              _context2.t1 = _context2["catch"](53);
+              _context2.next = 88;
+              break;
+            case 85:
+              _context2.prev = 85;
+              _context2.t1 = _context2["catch"](55);
               _iterator5.e(_context2.t1);
-            case 86:
-              _context2.prev = 86;
+            case 88:
+              _context2.prev = 88;
               _iterator5.f();
-              return _context2.finish(86);
-            case 89:
+              return _context2.finish(88);
+            case 91:
               if (!tag_unmatch) {
-                _context2.next = 91;
+                _context2.next = 93;
                 break;
               }
-              return _context2.abrupt("continue", 97);
-            case 91:
+              return _context2.abrupt("continue", 99);
+            case 93:
               _tx = _defineProperty({
                 cursor: tx.id,
                 id: tx.id,
@@ -444,47 +447,47 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
               data.push(_tx);
               count += 1;
               if (!(count >= first)) {
-                _context2.next = 97;
+                _context2.next = 99;
                 break;
               }
-              return _context2.abrupt("break", 99);
-            case 97:
-              _context2.next = 34;
-              break;
+              return _context2.abrupt("break", 101);
             case 99:
-              _context2.next = 104;
+              _context2.next = 34;
               break;
             case 101:
-              _context2.prev = 101;
+              _context2.next = 106;
+              break;
+            case 103:
+              _context2.prev = 103;
               _context2.t2 = _context2["catch"](32);
               _iterator4.e(_context2.t2);
-            case 104:
-              _context2.prev = 104;
+            case 106:
+              _context2.prev = 106;
               _iterator4.f();
-              return _context2.finish(104);
-            case 107:
+              return _context2.finish(106);
+            case 109:
               if (!(count >= first)) {
-                _context2.next = 109;
+                _context2.next = 111;
                 break;
               }
-              return _context2.abrupt("break", 111);
-            case 109:
-              _context2.next = 22;
-              break;
+              return _context2.abrupt("break", 113);
             case 111:
-              _context2.next = 116;
+              _context2.next = 22;
               break;
             case 113:
-              _context2.prev = 113;
+              _context2.next = 118;
+              break;
+            case 115:
+              _context2.prev = 115;
               _context2.t3 = _context2["catch"](20);
               _iterator3.e(_context2.t3);
-            case 116:
-              _context2.prev = 116;
+            case 118:
+              _context2.prev = 118;
               _iterator3.f();
-              return _context2.finish(116);
-            case 119:
+              return _context2.finish(118);
+            case 121:
               if (!(opt.next === true)) {
-                _context2.next = 126;
+                _context2.next = 128;
                 break;
               }
               cursor = null;
@@ -510,13 +513,13 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
                 data: data,
                 next: next
               });
-            case 126:
+            case 128:
               return _context2.abrupt("return", data);
-            case 127:
+            case 129:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[20, 113, 116, 119], [32, 101, 104, 107], [53, 83, 86, 89], [59, 70, 73, 76]]);
+        }, _callee2, this, [[20, 115, 118, 121], [32, 103, 106, 109], [55, 85, 88, 91], [61, 72, 75, 78]]);
       }));
       function txs() {
         return _txs.apply(this, arguments);

package/cjs/war.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _arBase = _interopRequireDefault(require("./ar-base.js"));
+var _bar = _interopRequireDefault(require("./bar.js"));
 var _armemWeb = _interopRequireDefault(require("./armem-web.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; }
@@ -33,5 +33,5 @@ var AR = /*#__PURE__*/function (_BAR) {
   }
   _inherits(AR, _BAR);
   return _createClass(AR);
-}(_arBase["default"]);
+}(_bar["default"]);
 var _default = exports["default"] = AR;