wao 0.6.3 → 0.7.1

package/cjs/aoconnect.js

@@ -38,9 +38,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 var pkg = (_WarpArBundles$defaul = WarpArBundles["default"]) !== null && _WarpArBundles$defaul !== void 0 ? _WarpArBundles$defaul : WarpArBundles;
 var DataItem = pkg.DataItem;
-var connect = exports.connect = function connect(mem, _ref) {
+var connect = exports.connect = function connect(mem) {
   var _mem;
-  var _ref$log = _ref.log,
+  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+    _ref$log = _ref.log,
     log = _ref$log === void 0 ? false : _ref$log,
     _ref$extensions = _ref.extensions,
     extensions = _ref$extensions === void 0 ? {} : _ref$extensions;
@@ -167,6 +168,7 @@ var connect = exports.connect = function connect(mem, _ref) {
         __tags,
         now,
         t,
+        wdrive,
         handle,
         _tags,
         res,
@@ -275,16 +277,30 @@ var connect = exports.connect = function connect(mem, _ref) {
           case 33:
             now = Date.now;
             t = (0, _utils.tags)(opt.tags);
-            _context.next = 37;
+            wdrive = extensions[t.Extension || "WeaveDrive"];
+            handle = null;
+            _context.prev = 37;
+            _context.next = 40;
             return (0, _aoLoader["default"])(wasm, {
               format: format,
-              WeaveDrive: extensions[t.Extension],
+              WeaveDrive: wdrive,
               spawn: item,
-              module: mem.txs[mod],
-              blockHeight: "100"
+              module: mem.txs[mod]
             });
-          case 37:
+          case 40:
             handle = _context.sent;
+            _context.next = 45;
+            break;
+          case 43:
+            _context.prev = 43;
+            _context.t0 = _context["catch"](37);
+          case 45:
+            if (handle) {
+              _context.next = 47;
+              break;
+            }
+            return _context.abrupt("return", null);
+          case 47:
             _module = {
               handle: handle,
               id: mod
@@ -308,7 +324,7 @@ var connect = exports.connect = function connect(mem, _ref) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 58;
+              _context.next = 67;
               break;
             }
             data = "";
@@ -321,51 +337,51 @@ var connect = exports.connect = function connect(mem, _ref) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 52;
+            _context.next = 61;
             return _module.handle(null, msg, _env);
-          case 52:
+          case 61:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 59;
+            _context.next = 68;
             break;
-          case 58:
+          case 67:
             p.height += 1;
-          case 59:
+          case 68:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 85;
+              _context.next = 94;
               break;
             }
             _tags$CronInterval$s = _tags["Cron-Interval"].split("-"), _tags$CronInterval$s2 = _slicedToArray(_tags$CronInterval$s, 2), num = _tags$CronInterval$s2[0], unit = _tags$CronInterval$s2[1];
             _int = 0;
-            _context.t0 = unit.replace(/s$/, "");
-            _context.next = _context.t0 === "millisecond" ? 67 : _context.t0 === "second" ? 69 : _context.t0 === "minute" ? 71 : _context.t0 === "hour" ? 73 : _context.t0 === "day" ? 75 : _context.t0 === "month" ? 77 : _context.t0 === "year" ? 79 : 81;
+            _context.t1 = unit.replace(/s$/, "");
+            _context.next = _context.t1 === "millisecond" ? 76 : _context.t1 === "second" ? 78 : _context.t1 === "minute" ? 80 : _context.t1 === "hour" ? 82 : _context.t1 === "day" ? 84 : _context.t1 === "month" ? 86 : _context.t1 === "year" ? 88 : 90;
             break;
-          case 67:
+          case 76:
             _int = num;
-            return _context.abrupt("break", 81);
-          case 69:
+            return _context.abrupt("break", 90);
+          case 78:
             _int = num * 1000;
-            return _context.abrupt("break", 81);
-          case 71:
+            return _context.abrupt("break", 90);
+          case 80:
             _int = num * 1000 * 60;
-            return _context.abrupt("break", 81);
-          case 73:
+            return _context.abrupt("break", 90);
+          case 82:
             _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 81);
-          case 75:
+            return _context.abrupt("break", 90);
+          case 84:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 81);
-          case 77:
+            return _context.abrupt("break", 90);
+          case 86:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 81);
-          case 79:
+            return _context.abrupt("break", 90);
+          case 88:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 81);
-          case 81:
+            return _context.abrupt("break", 90);
+          case 90:
             cronTags = [];
             for (_k in _tags) {
               if (/^Cron-Tag-/.test(_k)) {
@@ -377,13 +393,13 @@ var connect = exports.connect = function connect(mem, _ref) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 85:
+          case 94:
             return _context.abrupt("return", id);
-          case 86:
+          case 95:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[37, 43]]);
     }));
     return function spawn() {
       return _ref5.apply(this, arguments);

package/cjs/run.js

@@ -2,18 +2,22 @@
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _yargs = _interopRequireDefault(require("yargs"));
 var _server = _interopRequireDefault(require("./server.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+var _yargs$argv$port = (0, _yargs["default"])(process.argv.slice(2)).argv.port,
+  port = _yargs$argv$port === void 0 ? 4000 : _yargs$argv$port;
 var main = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           return _context.abrupt("return", new _server["default"]({
-            log: true
+            log: true,
+            port: port
           }));
         case 1:
         case "end":

package/cjs/server.js

@@ -42,8 +42,16 @@ var Server = /*#__PURE__*/function () {
       cu = _ref$cu === void 0 ? 4004 : _ref$cu,
       aoconnect = _ref.aoconnect,
       _ref$log = _ref.log,
-      log = _ref$log === void 0 ? false : _ref$log;
+      log = _ref$log === void 0 ? false : _ref$log,
+      port = _ref.port;
     _classCallCheck(this, Server);
+    if (port) {
+      ar = port;
+      mu = port + 2;
+      su = port + 3;
+      cu = port + 4;
+      aoconnect = (0, _utils.optAO)(5000);
+    }
     var _connect = (0, _aoconnect.connect)(aoconnect, {
         log: log
       }),
@@ -89,6 +97,15 @@ var Server = /*#__PURE__*/function () {
       app.use(_bodyParser["default"].json({
         limit: "100mb"
       }));
+      app.get("/", function (req, res) {
+        return res.json({
+          version: 1,
+          timestamp: Date.now(),
+          height: _this.mem.height,
+          network: "wao.LN.1",
+          current: _this.mem.getAnchor()
+        });
+      });
       app.get("/wallet/:id/balance", function (req, res) {
         return res.send("0");
       });
@@ -293,7 +310,7 @@ var Server = /*#__PURE__*/function () {
                 res.json({
                   id: req.body.id
                 });
-                _context7.next = 21;
+                _context7.next = 22;
                 break;
               case 14:
                 if (!(req.body.data_root && req.body.data === "")) {
@@ -301,16 +318,17 @@ var Server = /*#__PURE__*/function () {
                   break;
                 }
                 data[req.body.data_root] = req.body;
-                _context7.next = 20;
+                _context7.next = 21;
                 break;
               case 18:
-                _context7.next = 20;
+                console.log("or here...", req.body);
+                _context7.next = 21;
                 return _this._ar.postTx(req.body);
-              case 20:
+              case 21:
                 res.json({
                   id: req.body.id
                 });
-              case 21:
+              case 22:
               case "end":
                 return _context7.stop();
             }
@@ -387,7 +405,7 @@ var Server = /*#__PURE__*/function () {
       }());
       app.post("/", /*#__PURE__*/function () {
         var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(req, res) {
-          var binary, valid, type, item, _tags, err;
+          var binary, valid, type, item, _tags, err, _res;
           return _regeneratorRuntime().wrap(function _callee10$(_context10) {
             while (1) switch (_context10.prev = _context10.next) {
               case 0:
@@ -402,7 +420,7 @@ var Server = /*#__PURE__*/function () {
                 _tags = (0, _utils.tags)(item.tags);
                 err = null;
                 if (!(_tags.Type === "Process")) {
-                  _context10.next = 14;
+                  _context10.next = 16;
                   break;
                 }
                 _context10.next = 12;
@@ -412,24 +430,26 @@ var Server = /*#__PURE__*/function () {
                   scheduler: _tags.Scheduler
                 });
               case 12:
-                _context10.next = 20;
+                _res = _context10.sent;
+                if (!_res) err = "bad requrest";
+                _context10.next = 22;
                 break;
-              case 14:
+              case 16:
                 if (!(_tags.Type === "Message")) {
-                  _context10.next = 19;
+                  _context10.next = 21;
                   break;
                 }
-                _context10.next = 17;
+                _context10.next = 19;
                 return _this2.message({
                   item: item,
                   process: item.target
                 });
-              case 17:
-                _context10.next = 20;
-                break;
               case 19:
+                _context10.next = 22;
+                break;
+              case 21:
                 err = true;
-              case 20:
+              case 22:
                 if (err) {
                   res.status(400);
                   res.send({
@@ -440,7 +460,7 @@ var Server = /*#__PURE__*/function () {
                     id: item.id
                   });
                 }
-              case 21:
+              case 23:
               case "end":
                 return _context10.stop();
             }

package/cjs/tao.js

@@ -231,14 +231,10 @@ var AO = /*#__PURE__*/function (_MAO) {
               _context5.next = 19;
               return this.ar.postItems(item, jwk);
             case 19:
-              this.mem.wasms[id] = {
-                data: data,
-                format: t["Module-Format"]
-              };
               return _context5.abrupt("return", {
                 id: id
               });
-            case 21:
+            case 20:
             case "end":
               return _context5.stop();
           }

package/cjs/tar.js

@@ -265,7 +265,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               };
               data = di.data;
               try {
-                data = _base64url["default"].decode(di.data);
+                //data = base64url.decode(di.data)
               } catch (e) {}
               _context4.t0 = {
                 size: data_size,
@@ -364,6 +364,7 @@ var AR = /*#__PURE__*/function (_MAR) {
           _iterator6,
           _step6,
           _v,
+          __tags,
           owner,
           _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -462,12 +463,19 @@ var AR = /*#__PURE__*/function (_MAR) {
               } finally {
                 _iterator6.f();
               }
+              __tags = (0, _utils.tags)(_tags);
+              if (__tags.Type === "Module") {
+                this.mem.wasms[tx.id] = {
+                  data: Buffer.from(tx.data, "base64"),
+                  format: __tags["Module-Format"]
+                };
+              }
               tx.tags = _tags;
-              _context5.next = 23;
+              _context5.next = 25;
               return this.arweave.wallets.jwkToAddress({
                 n: tx.owner
               });
-            case 23:
+            case 25:
               tx.owner = _context5.sent;
               this.mem.txs[tx.id] = tx;
               block.txs.push(tx.id);
@@ -475,18 +483,18 @@ var AR = /*#__PURE__*/function (_MAR) {
               this.mem.blocks.push(block.id);
               this.mem.blockmap[block.id] = block;
               if (!jwk) {
-                _context5.next = 34;
+                _context5.next = 36;
                 break;
               }
-              _context5.next = 32;
+              _context5.next = 34;
               return this.arweave.wallets.jwkToAddress(jwk);
-            case 32:
+            case 34:
               owner = _context5.sent;
               this.mem.addrmap[owner] = {
                 address: owner,
                 key: jwk.n
               };
-            case 34:
+            case 36:
               res = {
                 id: tx.id,
                 status: 200,
@@ -504,7 +512,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 err: err,
                 id: tx.id
               });
-            case 37:
+            case 39:
             case "end":
               return _context5.stop();
           }
@@ -537,7 +545,7 @@ var AR = /*#__PURE__*/function (_MAR) {
   }, {
     key: "data",
     value: function () {
-      var _data2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id, _string) {
+      var _data2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id, _string, log) {
         var _tx$data;
         var decode, string, tx, _data, isBuf, isStr;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -551,35 +559,40 @@ var AR = /*#__PURE__*/function (_MAR) {
               }
               tx = this.mem.txs[id];
               _data = (_tx$data = tx === null || tx === void 0 ? void 0 : tx.data) !== null && _tx$data !== void 0 ? _tx$data : null;
+              if ((tx === null || tx === void 0 ? void 0 : tx.format) === 2 && _data) {
+                _data = Buffer.from(_data, "base64");
+              } else {
+                _data = Buffer.from(_base64url["default"].decode(_data));
+              }
               isBuf = (0, _ramda.is)(Uint8Array, _data) || (0, _ramda.is)(ArrayBuffer, _data);
               isStr = (0, _ramda.is)(String, _data);
               if (!(decode === false)) {
-                _context7.next = 12;
+                _context7.next = 13;
                 break;
               }
               if (isStr) _data = new TextEncoder().encode(_data);
               return _context7.abrupt("return", _base64url["default"].encode(_data));
-            case 12:
+            case 13:
               if (!(isBuf && string)) {
-                _context7.next = 16;
+                _context7.next = 17;
                 break;
               }
-              return _context7.abrupt("return", Buffer.from(_data).toString());
-            case 16:
+              return _context7.abrupt("return", _data.toString());
+            case 17:
               if (!(isStr && string !== true)) {
-                _context7.next = 18;
+                _context7.next = 19;
                 break;
               }
               return _context7.abrupt("return", new TextEncoder().encode(_data));
-            case 18:
-              return _context7.abrupt("return", _data);
             case 19:
+              return _context7.abrupt("return", _data);
+            case 20:
             case "end":
               return _context7.stop();
           }
         }, _callee7, this);
       }));
-      function data(_x9, _x10) {
+      function data(_x9, _x10, _x11) {
         return _data2.apply(this, arguments);
       }
       return data;

package/cjs/weavedrive.js

@@ -317,9 +317,7 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 dst_ptr = Number(raw_dst_ptr);
                 stream = 0;
                 for (i = 0; i < FS.streams.length; i++) {
-                  if (FS.streams[i].fd === fd) {
-                    stream = FS.streams[i];
-                  }
+                  if (FS.streams[i].fd === fd) stream = FS.streams[i];
                 }
                 // read block headers
                 if (!stream.path.includes("/block")) {
@@ -357,7 +355,7 @@ var WeaveDrive = exports["default"] = /*#__PURE__*/_createClass(function WeaveDr
                 to = Math.min(stream.node.total_size, stream.position + chunk_download_sz); //console.log("WeaveDrive: fd: ", fd, " Read length: ", to_read, " Reading ahead:", to - to_read - stream.position)
                 // fetch(`/${stream.node.name}`)
                 _context6.next = 21;
-                return ar.data(stream.node.name);
+                return ar.data(stream.node.name, null, log);
               case 21:
                 data = _context6.sent;
                 // Extract the Range header to determine the start and end of the requested chunk

package/esm/.db/885449/data/ppl/bob.json

@@ -0,0 +1 @@
+{"name":"Bob","age":40}

package/esm/.db/929039/data/ppl/bob.json

@@ -0,0 +1 @@
+{"name":"Bob","age":40}

package/esm/aoconnect.js

@@ -23,7 +23,7 @@ import { scheduler, mu, su, cu, acc } from "./test.js"
 import { is, clone, fromPairs, map, mergeLeft, isNil } from "ramda"
 import AR from "./tar.js"
 
-export const connect = (mem, { log = false, extensions = {} }) => {
+export const connect = (mem, { log = false, extensions = {} } = {}) => {
   const isMem = mem?.__type__ === "mem"
   if (!isMem) {
     let args = {}
@@ -151,13 +151,17 @@ export const connect = (mem, { log = false, extensions = {} }) => {
     await ar.postItems(item, su.jwk)
     const now = Date.now
     const t = tags(opt.tags)
-    const handle = await AoLoader(wasm, {
-      format,
-      WeaveDrive: extensions[t.Extension],
-      spawn: item,
-      module: mem.txs[mod],
-      blockHeight: "100",
-    })
+    const wdrive = extensions[t.Extension || "WeaveDrive"]
+    let handle = null
+    try {
+      handle = await AoLoader(wasm, {
+        format,
+        WeaveDrive: wdrive,
+        spawn: item,
+        module: mem.txs[mod],
+      })
+    } catch (e) {}
+    if (!handle) return null
     _module = { handle, id: mod }
     Date.now = now
 
@@ -189,7 +193,6 @@ export const connect = (mem, { log = false, extensions = {} }) => {
         module: p.module,
         auth: mu.addr,
       })
-
       const _t = tags(msg.Tags)
       res = await _module.handle(null, msg, _env)
       p.memory = res.Memory

package/esm/run.js

@@ -1,7 +1,9 @@
 #!/usr/bin/env -S node --experimental-wasm-memory64
+import yargs from "yargs"
+let { port = 4000 } = yargs(process.argv.slice(2)).argv
 
 import Server from "./server.js"
 
-const main = async () => new Server({ log: true })
+const main = async () => new Server({ log: true, port })
 
 main()

package/esm/server.js

@@ -2,7 +2,7 @@ import express from "express"
 import cors from "cors"
 import base64url from "base64url"
 import { DataItem } from "arbundles"
-import { tags, toGraphObj } from "./utils.js"
+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"
@@ -16,7 +16,15 @@ class Server {
     cu = 4004,
     aoconnect,
     log = false,
+    port,
   } = {}) {
+    if (port) {
+      ar = port
+      mu = port + 2
+      su = port + 3
+      cu = port + 4
+      aoconnect = optAO(5000)
+    }
     const {
       ar: _ar,
       message,
@@ -49,6 +57,15 @@ class Server {
     const app = express()
     app.use(cors())
     app.use(bodyParser.json({ limit: "100mb" }))
+    app.get("/", (req, res) =>
+      res.json({
+        version: 1,
+        timestamp: Date.now(),
+        height: this.mem.height,
+        network: "wao.LN.1",
+        current: this.mem.getAnchor(),
+      }),
+    )
     app.get("/wallet/:id/balance", (req, res) => res.send("0"))
     app.get("/mint/:id/:amount", (req, res) => res.json({ id: "0" }))
     app.get("/tx/:id/offset", async (req, res) => {
@@ -124,6 +141,7 @@ class Server {
         if (req.body.data_root && req.body.data === "") {
           data[req.body.data_root] = req.body
         } else {
+          console.log("or here...", req.body)
           await this._ar.postTx(req.body)
         }
         res.json({ id: req.body.id })
@@ -157,11 +175,12 @@ class Server {
       const _tags = tags(item.tags)
       let err = null
       if (_tags.Type === "Process") {
-        await this.spawn({
+        const res = await this.spawn({
           item,
           module: _tags.Module,
           scheduler: _tags.Scheduler,
         })
+        if (!res) err = "bad requrest"
       } else if (_tags.Type === "Message") {
         await this.message({ item, process: item.target })
       } else {

package/esm/tao.js

@@ -118,7 +118,6 @@ class AO extends MAO {
       signer,
     })
     await this.ar.postItems(item, jwk)
-    this.mem.wasms[id] = { data, format: t["Module-Format"] }
     return { id }
   }
 }

package/esm/tar.js

@@ -63,7 +63,7 @@ class AR extends MAR {
       this.mem.addrmap[owner] = { key: di.owner, address: owner }
       let data = di.data
       try {
-        data = base64url.decode(di.data)
+        //data = base64url.decode(di.data)
       } catch (e) {}
       let _item = {
         _data: { size: data_size, type: data_type },
@@ -134,7 +134,6 @@ class AR extends MAR {
         this.mem.txs[item.id].block = block.id
       }
     }
-
     let _tags = []
     for (const v of tx.tags) {
       _tags.push({
@@ -142,6 +141,13 @@ class AR extends MAR {
         value: base64url.decode(v.value),
       })
     }
+    const __tags = t(_tags)
+    if (__tags.Type === "Module") {
+      this.mem.wasms[tx.id] = {
+        data: Buffer.from(tx.data, "base64"),
+        format: __tags["Module-Format"],
+      }
+    }
     tx.tags = _tags
     tx.owner = await this.arweave.wallets.jwkToAddress({ n: tx.owner })
     this.mem.txs[tx.id] = tx
@@ -171,16 +177,20 @@ class AR extends MAR {
     return this.mem.txs[id]
   }
 
-  async data(id, _string) {
+  async data(id, _string, log) {
     let decode = true
     let string = _string
     if (is(Object, _string)) {
       if (!isNil(_string.decode)) decode = _string.decode
       if (!isNil(_string.string)) string = _string.string
     }
-
     let tx = this.mem.txs[id]
     let _data = tx?.data ?? null
+    if (tx?.format === 2 && _data) {
+      _data = Buffer.from(_data, "base64")
+    } else {
+      _data = Buffer.from(base64url.decode(_data))
+    }
     let isBuf = is(Uint8Array, _data) || is(ArrayBuffer, _data)
     let isStr = is(String, _data)
     if (decode === false) {
@@ -188,7 +198,7 @@ class AR extends MAR {
       return base64url.encode(_data)
     } else {
       if (isBuf && string) {
-        return Buffer.from(_data).toString()
+        return _data.toString()
       } else if (isStr && string !== true) {
         return new TextEncoder().encode(_data)
       }

package/esm/weavedrive.js

@@ -122,7 +122,6 @@ export default class WeaveDrive {
             false,
           )
           var stream = FS.open("/tx2/" + id, "r")
-
           return stream
         },
         async open(filename) {
@@ -190,9 +189,7 @@ export default class WeaveDrive {
 
           var stream = 0
           for (var i = 0; i < FS.streams.length; i++) {
-            if (FS.streams[i].fd === fd) {
-              stream = FS.streams[i]
-            }
+            if (FS.streams[i].fd === fd) stream = FS.streams[i]
           }
           // read block headers
           if (stream.path.includes("/block")) {
@@ -226,8 +223,7 @@ export default class WeaveDrive {
           //console.log("WeaveDrive: fd: ", fd, " Read length: ", to_read, " Reading ahead:", to - to_read - stream.position)
 
           // fetch(`/${stream.node.name}`)
-          const data = await ar.data(stream.node.name)
-
+          const data = await ar.data(stream.node.name, null, log)
           // Extract the Range header to determine the start and end of the requested chunk
           const start = 0
           const end = data.length

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.6.3",
+  "version": "0.7.1",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",