wao 0.6.0 → 0.6.1

package/cjs/ao.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var WarpArBundles = _interopRequireWildcard(require("warp-arbundles"));
-var _ar2 = _interopRequireDefault(require("./ar.js"));
+var _ar3 = _interopRequireDefault(require("./ar.js"));
 var _aoconnect = require("@permaweb/aoconnect");
 var _ramda = require("ramda");
 var _utils = require("./utils.js");
@@ -81,20 +81,32 @@ function createDataItemSigner2(wallet) {
 }
 var AO = /*#__PURE__*/function () {
   function AO() {
-    var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      _ref4$authority = _ref4.authority,
-      authority = _ref4$authority === void 0 ? _utils.srcs.authority : _ref4$authority,
-      module = _ref4.module,
-      _ref4$module_type = _ref4.module_type,
-      module_type = _ref4$module_type === void 0 ? "aos2" : _ref4$module_type,
-      _ref4$scheduler = _ref4.scheduler,
-      scheduler = _ref4$scheduler === void 0 ? _utils.srcs.scheduler : _ref4$scheduler,
-      aoconnect = _ref4.aoconnect,
-      _ref4$ar = _ref4.ar,
-      ar = _ref4$ar === void 0 ? {} : _ref4$ar,
-      _ref4$in_memory = _ref4.in_memory,
-      in_memory = _ref4$in_memory === void 0 ? false : _ref4$in_memory;
+    var _ar2;
+    var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, AO);
+    var _port = null;
+    if (typeof opt === "number") {
+      _port = opt;
+      opt = {};
+    }
+    var _opt = opt,
+      _opt$authority = _opt.authority,
+      authority = _opt$authority === void 0 ? _utils.srcs.authority : _opt$authority,
+      module = _opt.module,
+      _opt$module_type = _opt.module_type,
+      module_type = _opt$module_type === void 0 ? "aos2" : _opt$module_type,
+      _opt$scheduler = _opt.scheduler,
+      scheduler = _opt$scheduler === void 0 ? _utils.srcs.scheduler : _opt$scheduler,
+      aoconnect = _opt.aoconnect,
+      ar = _opt.ar,
+      _opt$in_memory = _opt.in_memory,
+      in_memory = _opt$in_memory === void 0 ? false : _opt$in_memory,
+      port = _opt.port;
+    if (!_port && port) _port = port;
+    if (!aoconnect && _port) aoconnect = (0, _utils.optAO)(_port);
+    if (!ar && _port) ar = {
+      port: _port
+    };
     if (!module) {
       switch (module_type) {
         case "sqlite":
@@ -108,11 +120,11 @@ var AO = /*#__PURE__*/function () {
       }
     }
     this.__type__ = "ao";
-    if ((ar === null || ar === void 0 ? void 0 : ar.__type__) === "ar") this.ar = ar;else {
+    if (((_ar2 = ar) === null || _ar2 === void 0 ? void 0 : _ar2.__type__) === "ar") this.ar = ar;else {
       var _ar = _typeof(ar) === "object" ? ar : {};
-      this.ar = new _ar2["default"](ar);
+      this.ar = new _ar3["default"](_ar);
     }
-    if (in_memory) {} else if (aoconnect) {
+    if (!in_memory && aoconnect) {
       var _connect = (0, _aoconnect.connect)(aoconnect),
         _results = _connect.results,
         _assign = _connect.assign,
@@ -180,30 +192,30 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "pipe",
     value: function () {
-      var _pipe = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref5) {
+      var _pipe = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
         var _fns$0$args, _ret2;
-        var jwk, _ref5$fns, fns, cb, _, out, res, i, nextArgs, ret, err, pid, mid, id, copy, binds, _iterator, _step, _binds$v$fn, _v$bind, _v$name, _v$fn, _fns$args, _fns, v, bind, name, fn, _fn, _res, _err, _ret, k;
+        var jwk, _ref4$fns, fns, cb, _, out, res, i, nextArgs, ret, err, pid, mid, id, copy, binds, _iterator, _step, _binds$v$fn, _v$bind, _v$name, _v$fn, _fns$args, _fns, v, bind, name, fn, _fn, _res, _err, _ret, k;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              jwk = _ref5.jwk, _ref5$fns = _ref5.fns, fns = _ref5$fns === void 0 ? [] : _ref5$fns, cb = _ref5.cb;
+              jwk = _ref4.jwk, _ref4$fns = _ref4.fns, fns = _ref4$fns === void 0 ? [] : _ref4$fns, cb = _ref4.cb;
               _ = {}, out = {}, res = [], i = 0;
               nextArgs = (_fns$0$args = fns[0].args) !== null && _fns$0$args !== void 0 ? _fns$0$args : {};
               ret = null, err = null, pid = null, mid = null, id = null;
               if (!jwk) fns.unshift({
                 fn: "checkWallet"
               });
-              copy = function copy(_ref6) {
+              copy = function copy(_ref5) {
                 var _args$_from$slice$joi, _out$_from$slice$join, _inp$_from$slice$join, _inp$from;
-                var _ = _ref6._,
-                  inp = _ref6.inp,
-                  out = _ref6.out,
-                  args = _ref6.args,
-                  from = _ref6.from,
-                  to = _ref6.to,
-                  pid = _ref6.pid,
-                  mid = _ref6.mid,
-                  id = _ref6.id;
+                var _ = _ref5._,
+                  inp = _ref5.inp,
+                  out = _ref5.out,
+                  args = _ref5.args,
+                  from = _ref5.from,
+                  to = _ref5.to,
+                  pid = _ref5.pid,
+                  mid = _ref5.mid,
+                  id = _ref5.id;
                 var _from = from.split(".");
                 var _to = to.split(".");
                 var field = null,
@@ -392,13 +404,13 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "postModule",
     value: function () {
-      var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref7) {
+      var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
         var _this = this;
-        var data, jwk, _ref7$tags, tags, _ref7$overwrite, overwrite, _tags, fns;
+        var data, jwk, _ref6$tags, tags, _ref6$overwrite, overwrite, _tags, fns;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              data = _ref7.data, jwk = _ref7.jwk, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, _ref7$overwrite = _ref7.overwrite, overwrite = _ref7$overwrite === void 0 ? false : _ref7$overwrite;
+              data = _ref6.data, jwk = _ref6.jwk, _ref6$tags = _ref6.tags, tags = _ref6$tags === void 0 ? {} : _ref6$tags, _ref6$overwrite = _ref6.overwrite, overwrite = _ref6$overwrite === void 0 ? false : _ref6$overwrite;
               _tags = (0, _ramda.mergeLeft)(tags, {
                 "Data-Protocol": "ao",
                 Variant: "ao.TN.1",
@@ -416,8 +428,8 @@ var AO = /*#__PURE__*/function () {
                   data: data,
                   tags: _tags
                 },
-                then: function then(_ref8) {
-                  var id = _ref8.id;
+                then: function then(_ref7) {
+                  var id = _ref7.id;
                   if (!_this.module || overwrite) _this.module = id;
                 }
               }];
@@ -442,13 +454,13 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "postScheduler",
     value: function () {
-      var _postScheduler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref9) {
+      var _postScheduler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref8) {
         var _this2 = this;
-        var jwk, url, _ref9$tags, tags, _ref9$overwrite, overwrite, _tags, then, fns;
+        var jwk, url, _ref8$tags, tags, _ref8$overwrite, overwrite, _tags, then, fns;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              jwk = _ref9.jwk, url = _ref9.url, _ref9$tags = _ref9.tags, tags = _ref9$tags === void 0 ? {} : _ref9$tags, _ref9$overwrite = _ref9.overwrite, overwrite = _ref9$overwrite === void 0 ? false : _ref9$overwrite;
+              jwk = _ref8.jwk, url = _ref8.url, _ref8$tags = _ref8.tags, tags = _ref8$tags === void 0 ? {} : _ref8$tags, _ref8$overwrite = _ref8.overwrite, overwrite = _ref8$overwrite === void 0 ? false : _ref8$overwrite;
               _tags = (0, _ramda.mergeLeft)(tags, {
                 "Data-Protocol": "ao",
                 Variant: "ao.TN.1",
@@ -457,12 +469,12 @@ var AO = /*#__PURE__*/function () {
                 "Time-To-Live": "3600000"
               });
               then = /*#__PURE__*/function () {
-                var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref10) {
+                var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref9) {
                   var jwk, out, _;
                   return _regeneratorRuntime().wrap(function _callee6$(_context6) {
                     while (1) switch (_context6.prev = _context6.next) {
                       case 0:
-                        jwk = _ref10.jwk, out = _ref10.out, _ = _ref10._;
+                        jwk = _ref9.jwk, out = _ref9.out, _ = _ref9._;
                         _context6.next = 3;
                         return _this2.ar.toAddr(jwk);
                       case 3:
@@ -475,7 +487,7 @@ var AO = /*#__PURE__*/function () {
                   }, _callee6);
                 }));
                 return function then(_x6) {
-                  return _ref11.apply(this, arguments);
+                  return _ref10.apply(this, arguments);
                 };
               }();
               fns = [{
@@ -507,14 +519,14 @@ var AO = /*#__PURE__*/function () {
     key: "spwn",
     value: function () {
       var _spwn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _ref12,
+        var _ref11,
           boot,
-          _ref12$module,
+          _ref11$module,
           module,
-          _ref12$scheduler,
+          _ref11$scheduler,
           scheduler,
           jwk,
-          _ref12$tags,
+          _ref11$tags,
           tags,
           data,
           auth,
@@ -526,7 +538,7 @@ var AO = /*#__PURE__*/function () {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              _ref12 = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {}, boot = _ref12.boot, _ref12$module = _ref12.module, module = _ref12$module === void 0 ? this.module : _ref12$module, _ref12$scheduler = _ref12.scheduler, scheduler = _ref12$scheduler === void 0 ? this.scheduler : _ref12$scheduler, jwk = _ref12.jwk, _ref12$tags = _ref12.tags, tags = _ref12$tags === void 0 ? {} : _ref12$tags, data = _ref12.data, auth = _ref12.auth;
+              _ref11 = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {}, boot = _ref11.boot, _ref11$module = _ref11.module, module = _ref11$module === void 0 ? this.module : _ref11$module, _ref11$scheduler = _ref11.scheduler, scheduler = _ref11$scheduler === void 0 ? this.scheduler : _ref11$scheduler, jwk = _ref11.jwk, _ref11$tags = _ref11.tags, tags = _ref11$tags === void 0 ? {} : _ref11$tags, data = _ref11.data, auth = _ref11.auth;
               err = null;
               _context8.next = 4;
               return this.ar.checkWallet({
@@ -586,13 +598,13 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "msg",
     value: function () {
-      var _msg = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref13) {
+      var _msg = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref12) {
         var _this3 = this;
-        var pid, jwk, data, _ref13$act, act, _ref13$tags, tags, _ref13$check, check, get, _ref13$timeout, timeout, err, _yield$this$ar$checkW2, res, out, mid, results, _tags, start, exRef, _getRef, cache, checks, isOK, _getResult, _yield$_getResult2;
+        var pid, jwk, data, _ref12$act, act, _ref12$tags, tags, _ref12$check, check, get, _ref12$timeout, timeout, err, _yield$this$ar$checkW2, res, out, mid, results, _tags, start, exRef, _getRef, cache, checks, isOK, _getResult, _yield$_getResult2;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              pid = _ref13.pid, jwk = _ref13.jwk, data = _ref13.data, _ref13$act = _ref13.act, act = _ref13$act === void 0 ? "Eval" : _ref13$act, _ref13$tags = _ref13.tags, tags = _ref13$tags === void 0 ? {} : _ref13$tags, _ref13$check = _ref13.check, check = _ref13$check === void 0 ? [] : _ref13$check, get = _ref13.get, _ref13$timeout = _ref13.timeout, timeout = _ref13$timeout === void 0 ? 10000 : _ref13$timeout;
+              pid = _ref12.pid, jwk = _ref12.jwk, data = _ref12.data, _ref12$act = _ref12.act, act = _ref12$act === void 0 ? "Eval" : _ref12$act, _ref12$tags = _ref12.tags, tags = _ref12$tags === void 0 ? {} : _ref12$tags, _ref12$check = _ref12.check, check = _ref12$check === void 0 ? [] : _ref12$check, get = _ref12.get, _ref12$timeout = _ref12.timeout, timeout = _ref12$timeout === void 0 ? 10000 : _ref12$timeout;
               err = null;
               _context11.next = 4;
               return this.ar.checkWallet({
@@ -640,7 +652,7 @@ var AO = /*#__PURE__*/function () {
                 return false;
               };
               _getRef = /*#__PURE__*/function () {
-                var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ref) {
+                var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ref) {
                   var txs,
                     ex,
                     _args9 = arguments;
@@ -705,12 +717,12 @@ var AO = /*#__PURE__*/function () {
                   }, _callee9);
                 }));
                 return function getRef(_x8) {
-                  return _ref14.apply(this, arguments);
+                  return _ref13.apply(this, arguments);
                 };
               }();
               cache = [], checks = [], isOK = false;
               _getResult = /*#__PURE__*/function () {
-                var _ref15 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(mid) {
+                var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(mid) {
                   var res, err, i, _iterator3, _step3, _checks$i, v, _checks, checks2, k, refs, _iterator4, _step4, _v, _ltags, _iterator5, _step5, _v2, _ltags3, txs, _iterator6, _step6, v2, _ltags2, _yield$_getResult, _res, _out, _err, _ok;
                   return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                     while (1) switch (_context10.prev = _context10.next) {
@@ -876,7 +888,7 @@ var AO = /*#__PURE__*/function () {
                   }, _callee10, null, [[11, 57, 60, 63], [22, 45, 48, 51]]);
                 }));
                 return function getResult(_x9) {
-                  return _ref15.apply(this, arguments);
+                  return _ref14.apply(this, arguments);
                 };
               }();
               _context11.next = 22;
@@ -914,12 +926,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "asgn",
     value: function () {
-      var _asgn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref16) {
+      var _asgn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref15) {
         var pid, mid, jwk, check, get, err, _yield$this$ar$checkW3, res, out, checks, i, _iterator7, _step7, _checks$i2, v, _checks, checks2, k;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              pid = _ref16.pid, mid = _ref16.mid, jwk = _ref16.jwk, check = _ref16.check, get = _ref16.get;
+              pid = _ref15.pid, mid = _ref15.mid, jwk = _ref15.jwk, check = _ref15.check, get = _ref15.get;
               err = null;
               _context12.next = 4;
               return this.ar.checkWallet({
@@ -1011,12 +1023,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "dry",
     value: function () {
-      var _dry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref17) {
-        var pid, jwk, data, _ref17$act, act, _ref17$tags, tags, check, get, _ref17$timeout, timeout, err, _yield$this$ar$checkW4, res, out, _tags, _res, checks, i, _iterator8, _step8, _checks$i3, v, _checks, checks2, k;
+      var _dry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref16) {
+        var pid, jwk, data, _ref16$act, act, _ref16$tags, tags, check, get, _ref16$timeout, timeout, err, _yield$this$ar$checkW4, res, out, _tags, _res, checks, i, _iterator8, _step8, _checks$i3, v, _checks, checks2, k;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              pid = _ref17.pid, jwk = _ref17.jwk, data = _ref17.data, _ref17$act = _ref17.act, act = _ref17$act === void 0 ? "Eval" : _ref17$act, _ref17$tags = _ref17.tags, tags = _ref17$tags === void 0 ? {} : _ref17$tags, check = _ref17.check, get = _ref17.get, _ref17$timeout = _ref17.timeout, timeout = _ref17$timeout === void 0 ? 10000 : _ref17$timeout;
+              pid = _ref16.pid, jwk = _ref16.jwk, data = _ref16.data, _ref16$act = _ref16.act, act = _ref16$act === void 0 ? "Eval" : _ref16$act, _ref16$tags = _ref16.tags, tags = _ref16$tags === void 0 ? {} : _ref16$tags, check = _ref16.check, get = _ref16.get, _ref16$timeout = _ref16.timeout, timeout = _ref16$timeout === void 0 ? 10000 : _ref16$timeout;
               err = null;
               _context13.next = 4;
               return this.ar.checkWallet({
@@ -1100,21 +1112,21 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "eval",
     value: function () {
-      var _eval2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(_ref18) {
+      var _eval2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(_ref17) {
         var pid, jwk, data, fns;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
-              pid = _ref18.pid, jwk = _ref18.jwk, data = _ref18.data;
+              pid = _ref17.pid, jwk = _ref17.jwk, data = _ref17.data;
               fns = [{
                 args: {
                   pid: pid,
                   data: data,
                   act: "Eval"
                 },
-                err: function err(_ref19) {
+                err: function err(_ref18) {
                   var _res$Output, _res$Output2, _res$Output3;
-                  var res = _ref19.res;
+                  var res = _ref18.res;
                   return _typeof(res === null || res === void 0 || (_res$Output = res.Output) === null || _res$Output === void 0 ? void 0 : _res$Output.data) !== "object" && !(typeof (res === null || res === void 0 || (_res$Output2 = res.Output) === null || _res$Output2 === void 0 ? void 0 : _res$Output2.prompt) === "string" && /aos\-/.test(res === null || res === void 0 || (_res$Output3 = res.Output) === null || _res$Output3 === void 0 ? void 0 : _res$Output3.prompt));
                 }
               }];
@@ -1139,12 +1151,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "transform",
     value: function () {
-      var _transform = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(_ref20) {
+      var _transform = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15(_ref19) {
         var src, data, fills, err, out, _data, k, text;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
-              src = _ref20.src, data = _ref20.data, fills = _ref20.fills;
+              src = _ref19.src, data = _ref19.data, fills = _ref19.fills;
               err = null, out = null;
               if (!(data !== null && data !== void 0)) {
                 _context15.next = 6;
@@ -1186,12 +1198,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "load",
     value: function () {
-      var _load = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(_ref21) {
+      var _load = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee16(_ref20) {
         var src, data, fills, pid, jwk, fns;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              src = _ref21.src, data = _ref21.data, fills = _ref21.fills, pid = _ref21.pid, jwk = _ref21.jwk;
+              src = _ref20.src, data = _ref20.data, fills = _ref20.fills, pid = _ref20.pid, jwk = _ref20.jwk;
               fns = [{
                 fn: this.transform,
                 args: {
@@ -1229,17 +1241,17 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "wait",
     value: function () {
-      var _wait2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(_ref22) {
-        var pid, _ref22$attempts, attempts, exist, err, _yield$this$dry, res, _err;
+      var _wait2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee17(_ref21) {
+        var pid, _ref21$attempts, attempts, exist, err, _yield$this$dry, res, _err;
         return _regeneratorRuntime().wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              pid = _ref22.pid, _ref22$attempts = _ref22.attempts, attempts = _ref22$attempts === void 0 ? 5 : _ref22$attempts;
+              pid = _ref21.pid, _ref21$attempts = _ref21.attempts, attempts = _ref21$attempts === void 0 ? 5 : _ref21$attempts;
               exist = false;
               err = null;
             case 3:
               if (!(attempts > 0)) {
-                _context17.next = 18;
+                _context17.next = 20;
                 break;
               }
               if (this.in_memory) {
@@ -1258,22 +1270,31 @@ var AO = /*#__PURE__*/function () {
               _yield$this$dry = _context17.sent;
               res = _yield$this$dry.res;
               _err = _yield$this$dry.err;
-              if (!(_typeof(res === null || res === void 0 ? void 0 : res.Output) === "object")) {
+              if (!(res !== null && res !== void 0 && res.error)) {
                 _context17.next = 14;
                 break;
               }
-              return _context17.abrupt("break", 18);
+              return _context17.abrupt("return", {
+                err: res.error,
+                pid: pid
+              });
             case 14:
+              if (!(_typeof(res === null || res === void 0 ? void 0 : res.Output) === "object")) {
+                _context17.next = 16;
+                break;
+              }
+              return _context17.abrupt("break", 20);
+            case 16:
               attempts -= 1;
               if (attempts === 0) err = "timeout";
               _context17.next = 3;
               break;
-            case 18:
+            case 20:
               return _context17.abrupt("return", {
                 err: err,
                 pid: pid
               });
-            case 19:
+            case 21:
             case "end":
               return _context17.stop();
           }
@@ -1287,12 +1308,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "attest",
     value: function () {
-      var _attest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(_ref23) {
+      var _attest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee18(_ref22) {
         var id, jwk, tags;
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              id = _ref23.id, jwk = _ref23.jwk, tags = _ref23.tags;
+              id = _ref22.id, jwk = _ref22.jwk, tags = _ref22.tags;
               _context18.next = 3;
               return this.ar.post({
                 tags: (0, _ramda.mergeLeft)(tags, {
@@ -1318,12 +1339,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "avail",
     value: function () {
-      var _avail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(_ref24) {
+      var _avail = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(_ref23) {
         var ids, jwk, tags;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              ids = _ref24.ids, jwk = _ref24.jwk, tags = _ref24.tags;
+              ids = _ref23.ids, jwk = _ref23.jwk, tags = _ref23.tags;
               _context19.next = 3;
               return this.ar.post({
                 tags: (0, _ramda.mergeLeft)(tags, {
@@ -1350,12 +1371,12 @@ var AO = /*#__PURE__*/function () {
   }, {
     key: "deploy",
     value: function () {
-      var _deploy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(_ref25) {
-        var boot, loads, src, src_data, _ref25$fills, fills, _ref25$module, module, _ref25$scheduler, scheduler, jwk, _ref25$tags, tags, data, fns, isBoot, i, _iterator9, _step9, v, args, result;
+      var _deploy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(_ref24) {
+        var boot, loads, src, src_data, _ref24$fills, fills, _ref24$module, module, _ref24$scheduler, scheduler, jwk, _ref24$tags, tags, data, fns, isBoot, i, _iterator9, _step9, v, args, result;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              boot = _ref25.boot, loads = _ref25.loads, src = _ref25.src, src_data = _ref25.src_data, _ref25$fills = _ref25.fills, fills = _ref25$fills === void 0 ? {} : _ref25$fills, _ref25$module = _ref25.module, module = _ref25$module === void 0 ? this.module : _ref25$module, _ref25$scheduler = _ref25.scheduler, scheduler = _ref25$scheduler === void 0 ? this.scheduler : _ref25$scheduler, jwk = _ref25.jwk, _ref25$tags = _ref25.tags, tags = _ref25$tags === void 0 ? {} : _ref25$tags, data = _ref25.data;
+              boot = _ref24.boot, loads = _ref24.loads, src = _ref24.src, src_data = _ref24.src_data, _ref24$fills = _ref24.fills, fills = _ref24$fills === void 0 ? {} : _ref24$fills, _ref24$module = _ref24.module, module = _ref24$module === void 0 ? this.module : _ref24$module, _ref24$scheduler = _ref24.scheduler, scheduler = _ref24$scheduler === void 0 ? this.scheduler : _ref24$scheduler, jwk = _ref24.jwk, _ref24$tags = _ref24.tags, tags = _ref24$tags === void 0 ? {} : _ref24$tags, data = _ref24.data;
               fns = [], isBoot = false;
               if (boot === true && !data) {
                 isBoot = true;

package/cjs/aoconnect.js

@@ -11,6 +11,7 @@ var _base64url = _interopRequireDefault(require("base64url"));
 var _utils = require("./utils.js");
 var _armem = _interopRequireDefault(require("./armem.js"));
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
+var _kv = _interopRequireDefault(require("./kv.js"));
 var _aoLoader = _interopRequireDefault(require("@permaweb/ao-loader"));
 var _fs = require("fs");
 var _path = require("path");
@@ -56,6 +57,7 @@ var connect = exports.connect = function connect(mem) {
     log: log
   });
   var WeaveDrive = new _weavedrive["default"](ar).drive;
+  var KV = new _kv["default"](ar).kv;
   var transform = function transform(input) {
     var _input$Tags;
     var output = {
@@ -162,6 +164,8 @@ var connect = exports.connect = function connect(mem) {
         item,
         __tags,
         now,
+        t,
+        wd,
         handle,
         _tags,
         res,
@@ -269,15 +273,17 @@ var connect = exports.connect = function connect(mem) {
             return ar.postItems(item, _test.su.jwk);
           case 33:
             now = Date.now;
-            _context.next = 36;
+            t = (0, _utils.tags)(opt.tags);
+            wd = t.Extension === "KV" ? KV : WeaveDrive;
+            _context.next = 38;
             return (0, _aoLoader["default"])(wasm, {
               format: format,
-              WeaveDrive: WeaveDrive,
+              WeaveDrive: wd,
               spawn: item,
               module: mem.txs[mod],
               blockHeight: "100"
             });
-          case 36:
+          case 38:
             handle = _context.sent;
             _module = {
               handle: handle,
@@ -302,7 +308,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!(_tags["On-Boot"] || true)) {
-              _context.next = 57;
+              _context.next = 59;
               break;
             }
             data = "";
@@ -315,51 +321,51 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context.next = 51;
+            _context.next = 53;
             return _module.handle(null, msg, _env);
-          case 51:
+          case 53:
             res = _context.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context.next = 58;
+            _context.next = 60;
             break;
-          case 57:
+          case 59:
             p.height += 1;
-          case 58:
+          case 60:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context.next = 84;
+              _context.next = 86;
               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" ? 66 : _context.t0 === "second" ? 68 : _context.t0 === "minute" ? 70 : _context.t0 === "hour" ? 72 : _context.t0 === "day" ? 74 : _context.t0 === "month" ? 76 : _context.t0 === "year" ? 78 : 80;
+            _context.next = _context.t0 === "millisecond" ? 68 : _context.t0 === "second" ? 70 : _context.t0 === "minute" ? 72 : _context.t0 === "hour" ? 74 : _context.t0 === "day" ? 76 : _context.t0 === "month" ? 78 : _context.t0 === "year" ? 80 : 82;
             break;
-          case 66:
-            _int = num;
-            return _context.abrupt("break", 80);
           case 68:
-            _int = num * 1000;
-            return _context.abrupt("break", 80);
+            _int = num;
+            return _context.abrupt("break", 82);
           case 70:
-            _int = num * 1000 * 60;
-            return _context.abrupt("break", 80);
+            _int = num * 1000;
+            return _context.abrupt("break", 82);
           case 72:
-            _int = num * 1000 * 60 * 60;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60;
+            return _context.abrupt("break", 82);
           case 74:
-            _int = num * 1000 * 60 * 60 * 24;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60;
+            return _context.abrupt("break", 82);
           case 76:
-            _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60 * 24;
+            return _context.abrupt("break", 82);
           case 78:
-            _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context.abrupt("break", 80);
+            _int = num * 1000 * 60 * 60 * 24 * 30;
+            return _context.abrupt("break", 82);
           case 80:
+            _int = num * 1000 * 60 * 60 * 24 * 365;
+            return _context.abrupt("break", 82);
+          case 82:
             cronTags = [];
             for (k in _tags) {
               if (/^Cron-Tag-/.test(k)) {
@@ -371,9 +377,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 84:
+          case 86:
             return _context.abrupt("return", id);
-          case 85:
+          case 87:
           case "end":
             return _context.stop();
         }
@@ -692,7 +698,6 @@ var connect = exports.connect = function connect(mem) {
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
           case 17:
-            //await ar.postItems(item, su.jwk)
             mem.msgs[id] = opt;
             _context3.next = 20;
             return _assign({
@@ -897,12 +902,11 @@ var connect = exports.connect = function connect(mem) {
             case 12:
               _context9.prev = 12;
               cloneMemory = function cloneMemory(memory) {
-                var buffer = memory.buffer.slice(0); // Clone the ArrayBuffer
+                var buffer = memory.buffer.slice(0);
                 return new WebAssembly.Memory({
                   initial: memory.buffer.byteLength / 65536,
-                  // Memory size in pages (64KB per page)
                   maximum: memory.maximum || undefined,
-                  shared: memory.shared || false // Retain sharing if applicable
+                  shared: memory.shared || false
                 });
               };
               msg = genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);